From 1b2cd3c39fe87cf8334d1e9507bc02afea3a8898 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 27 Oct 2015 12:43:53 +0100 Subject: [PATCH 1/4] Translated using Weblate (French) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/fr.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 4ae6e66583..f3cb381d1f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-24 11:52+0200\n" +"PO-Revision-Date: 2015-10-27 12:43+0200\n" "Last-Translator: Marc Delisle \n" -"Language-Team: French \n" +"Language-Team: French " +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3897,7 +3897,7 @@ msgstr "" msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" -"«Linter» est désactivé pour cette requête car elle dépasse la longueur " +"« Linter » est désactivé pour cette requête car elle dépasse la longueur " "maximum." #: libraries/Linter.class.php:162 @@ -14644,6 +14644,9 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Le nom d'utilisateur et le nom d'hôte n'ont pas changé. Si vous voulez " +"seulement changer le mot de passe, vous devriez utiliser l'onglet « Modifier " +"le mot de passe » ." #: server_status.php:39 msgid "Not enough privilege to view server status." From 1e6f128202922a94a9153f021ea3c9efea462a8b Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Wed, 28 Oct 2015 03:17:51 +0530 Subject: [PATCH 2/4] Fix issue 11605 Signed-off-by: Deven Bansod --- libraries/server_privileges.lib.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 8521967f54..3bc697191a 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -5085,7 +5085,7 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) $create_user_real = $create_user_show = $create_user_stmt; - $password_set_stmt = 'SET PASSWORD FOR \'%s\'@\'%s\' = PASSWORD(\'%s\')'; + $password_set_stmt = 'SET PASSWORD FOR \'%s\'@\'%s\' = \'%s\''; $password_set_show = sprintf( $password_set_stmt, $slashedUsername, @@ -5132,11 +5132,12 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) null ); } else { + $hashedPassword = PMA_getHashedPassword($_POST['pma_pw']); $password_set_real = sprintf( $password_set_stmt, $slashedUsername, $slashedHostname, - $_POST['pma_pw'] + $hashedPassword ); } } else { @@ -5157,10 +5158,9 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password) $create_user_real = $create_user_show = $create_user_stmt; if ($_POST['pred_password'] == 'keep') { - $hashedPassword = PMA_getHashedPassword($password); $create_user_real = sprintf( $create_user_stmt, - $hashedPassword + $slashedPassword ); $create_user_show = sprintf( $create_user_stmt, From 2838f2505b5da31f409af35bf0d0c0129127141f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 27 Oct 2015 12:56:27 -0400 Subject: [PATCH 3/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 3b3e1ebc3e..33616a285f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #11610 Undefined variable: res_rel - issue #11611 Warning while exporting schema to PDF - issue #11612 Undefined index: new_row_format +- issue #11605 Changing hostname kills password 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() From 2936ecc41830be86fc90352e6b19706b55cc26ae Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 25 Oct 2015 23:52:45 +0100 Subject: [PATCH 4/4] Translated using Weblate (Slovenian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/sl.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9af2558a4b..d6e3eaaae2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ 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-10-25 23:52+0200\n" +"PO-Revision-Date: 2015-10-28 00:33+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" "X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 @@ -14488,6 +14488,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Uporabniškega imena in gostitelja niste spremenili. Če želite spremeniti " +"samo geslo, uporabite zavihek »Spremeni geslo«." #: server_status.php:39 msgid "Not enough privilege to view server status."