Merge remote branch 'origin/master'

Documentation.html

@@ -9,7 +9,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.0-alpha3-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.0-beta1 - Documentation</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -17,7 +17,7 @@ vim: expandtab ts=4 sw=4 sts=4 tw=78
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.0-alpha3-dev 
+        3.4.0-beta1
         Documentation
     </h1>
 </div>

README

@@ -3,8 +3,8 @@ phpMyAdmin - Readme
 
 A set of PHP-scripts to manage MySQL over the web.
 
-Version 3.4.0-alpha3-dev
-------------------------
+Version 3.4.0-beta1
+-------------------
 
 http://www.phpmyadmin.net/
 

libraries/Config.class.php

@@ -96,7 +96,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '3.4.0-alpha3-dev');
+        $this->set('PMA_VERSION', '3.4.0-beta1');
         /**
          * @deprecated
          */

scripts/create-release.sh

@@ -54,8 +54,7 @@ shift
 
 cat <<END
 
-Please ensure you have:
-  1. incremented rc count or version in the repository :
+Please ensure you have incremented rc count or version in the repository :
      - in libraries/Config.class.php PMA_Config::__constructor() the line
           " \$this->set( 'PMA_VERSION', '$version' ); "
      - in Documentation.html the 2 lines
@@ -63,8 +62,6 @@ Please ensure you have:
           " <h1>phpMyAdmin $version Documentation</h1> "
      - in translators.html
      - in README
-  2. checked that all language files are valid (use
-     the "./scripts/check_lang.php" script to do it).
 
 Continue (y/n)?
 END

translators.html

@@ -10,7 +10,7 @@
     <link rel="icon" href="./favicon.ico" type="image/x-icon" />
     <link rel="shortcut icon" href="./favicon.ico" type="image/x-icon" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>phpMyAdmin 3.4.0-alpha3-dev - Official translators</title>
+    <title>phpMyAdmin 3.4.0-beta1 - Official translators</title>
     <link rel="stylesheet" type="text/css" href="docs.css" />
 </head>
 
@@ -18,7 +18,7 @@
 <div id="header">
     <h1>
         <a href="http://www.phpmyadmin.net/">php<span class="myadmin">MyAdmin</span></a>
-        3.4.0-alpha3-dev 
+        3.4.0-beta1
         official translators list
     </h1>
 </div>