Merge remote branch 'origin/master'

ChangeLog

@@ -1,8 +1,6 @@
 phpMyAdmin - ChangeLog
 ======================
 
-3.5.0.0 (not yet released)
-
 3.4.0.0 (not yet released)
 + rfe #2890226 [view] Enable VIEW rename 
 + rfe #838637 [privileges] Export a user's privileges 

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.5.0-dev - Documentation</title>
+    <title>phpMyAdmin 3.4.0-alpha3-dev - 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.5.0-dev 
+        3.4.0-alpha3-dev 
         Documentation
     </h1>
 </div>

README

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

libraries/Config.class.php

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

po/sr@latin.po

@@ -112,7 +112,7 @@ msgstr "Neuspelo otvaranje udaljene URL adrese"
 #: db_create.php:58
 #, php-format
 msgid "Database %1$s has been created."
-msgstr "Baza %1$ je kreirana."
+msgstr "Baza %1$s je kreirana."
 
 #: db_datadict.php:48 db_operations.php:360
 msgid "Database comment: "

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.5.0-dev - Official translators</title>
+    <title>phpMyAdmin 3.4.0-alpha3-dev - 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.5.0-dev 
+        3.4.0-alpha3-dev 
         official translators list
     </h1>
 </div>