Merge branch 'QA_4_5' of github.com:phpmyadmin/phpmyadmin into QA_4_5

Conflicts:
	ChangeLog

ChangeLog

@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - issue #11691 Query was empty on creating User in 4.5.2
 - issue #11695 PMA_getDataForDeleteUsers() warning
 - issue #11698 Cannot create user on Percona Server
+- issue        Properly report error on connecting
 - issue #11706 Database export template not saving compression option
 
 4.5.2.0 (2015-11-23)

libraries/DatabaseInterface.class.php

@@ -2959,9 +2959,6 @@ public function getClientInfo()
     public function getError($link = null)
     {
         $link = $this->getLink($link);
-        if ($link === false) {
-            return false;
-        }
         return $this->_extension->getError($link);
     }
 

po/ia.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.2-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-10-26 19:59-0400\n"
-"PO-Revision-Date: 2015-11-18 13:41+0000\n"
+"PO-Revision-Date: 2015-12-02 22:06+0000\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-5/ia/>\n"
@@ -10184,16 +10184,18 @@ msgstr "Iste formato ha nulle optiones"
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
 msgstr ""
+"Authentication sin contrasigno es prohibite per le configuration (vide "
+"AllowNoPassword)"
 
 #: libraries/plugins/AuthenticationPlugin.class.php:73
 #, php-format
 msgid "No activity within %s seconds; please log in again."
-msgstr ""
+msgstr "Necun activitate intra %s secundas; pro favor authentica te de novo."
 
 #: libraries/plugins/AuthenticationPlugin.class.php:82
 #: libraries/plugins/AuthenticationPlugin.class.php:84
 msgid "Cannot log in to the MySQL server"
-msgstr ""
+msgstr "On non pote authenticar se in le servitor de MySQL"
 
 #: libraries/plugins/SchemaPlugin.class.php:68
 msgid "Show color"
@@ -10205,14 +10207,14 @@ msgstr "Monstra solo claves"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:95
 msgid "Cannot connect: invalid settings."
-msgstr ""
+msgstr "Non pote connecter se: fixationes invalide."
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:108
 #: libraries/plugins/auth/AuthenticationCookie.class.php:138
 #: libraries/plugins/auth/AuthenticationHttp.class.php:96
 #, php-format
 msgid "Welcome to %s"
-msgstr ""
+msgstr "Benvenite a %s"
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:124
 #, php-format
@@ -10231,11 +10233,11 @@ msgstr ""
 
 #: libraries/plugins/auth/AuthenticationConfig.class.php:166
 msgid "Retry to connect"
-msgstr ""
+msgstr "Reessaya a connecter te"
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:150
 msgid "Your session has expired. Please log in again."
-msgstr ""
+msgstr "Tu session ha expirate. Pro favor authentica te de novo."
 
 #: libraries/plugins/auth/AuthenticationCookie.class.php:174
 msgid "Log in"
@@ -12097,6 +12099,8 @@ msgid ""
 "Note: Enabling the database statistics here might cause heavy traffic "
 "between the web server and the MySQL server."
 msgstr ""
+"Nota: habilitar ci le statisticas de base de datos poterea causar traffico "
+"intense inter le servitor web e le servitor de MySQL."
 
 #: libraries/server_databases.lib.php:366
 #: libraries/server_databases.lib.php:371
@@ -12107,8 +12111,8 @@ msgstr "Habilita statisticas"
 #, php-format
 msgid "%1$d database has been dropped successfully."
 msgid_plural "%1$d databases have been dropped successfully."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%1$d base de datos ha essite delite con successo."
+msgstr[1] "%1$d bases de datos ha essite delite con successo."
 
 #: libraries/server_plugins.lib.php:31
 msgid "Modules"

po/tr.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.2-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-10-26 19:59-0400\n"
-"PO-Revision-Date: 2015-11-21 22:43+0000\n"
+"PO-Revision-Date: 2015-12-03 20:25+0000\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: Turkish "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-5/tr/>\n"
@@ -3743,7 +3743,7 @@ msgstr "Gönderilen dosya okunamıyor."
 #: libraries/Footer.class.php:74
 #, php-format
 msgid "Currently running Git revision %1$s from the %2$s branch."
-msgstr "Şu anda %2$s dalından Git gözden geçirme %1$s çalışıyor."
+msgstr "Şu anda çalışan %2$s dalından Git gözden geçirme sürümü %1$s."
 
 #: libraries/Footer.class.php:81
 msgid "Git information missing!"