Fix merge conflicts

ChangeLog

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
 
 4.0.1.0 (not yet released)
 - bug #3879 Import broken for CSV using LOAD DATA
+- bug When login fails and error display is active, login data is displayed
 
 4.0.0.0 (not yet released)
 + Patch #3481047 for rfe #3480477 Insert as new row enhancement

libraries/Error.class.php

@@ -300,9 +300,21 @@ class PMA_Error extends PMA_Message
             'require',
             'require_once',
         );
+        $connect_functions = array(
+            'mysql_connect',
+            'mysql_pconnect',
+            'mysqli_connect',
+            'mysqli_real_connect',
+            'PMA_DBI_connect',
+            'PMA_DBI_real_connect',
+        );
 
         if (in_array($function, $include_functions)) {
             $retval .= PMA_Error::relPath($arg);
+        } elseif (in_array($function, $connect_functions)
+            && getType($arg) === 'string'
+        ) {
+            $retval .= getType($arg) . ' ********';
         } elseif (is_scalar($arg)) {
             $retval .= getType($arg) . ' ' . htmlspecialchars($arg);
         } else {

po/fr.po

@@ -114,7 +114,7 @@ msgstr "La base de données %1$s a été créée."
 
 #: db_datadict.php:51 libraries/operations.lib.php:32
 msgid "Database comment: "
-msgstr "Commentaire sur la base de données: "
+msgstr "Commentaire sur la base de données : "
 
 #: db_datadict.php:157 libraries/schema/Pdf_Relation_Schema.class.php:1332
 #: libraries/tbl_columns_definition_form.inc.php:836 tbl_printview.php:120