gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Madhura Jayaratne 2015-10-28 18:44:31 +11:00
commit 4fd5a3a0ad
4 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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
- issue #11614 Undefined variable: db
4.5.1.0 (2015-10-23)

8
libraries/server_privileges.lib.php
View File

@ -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,

11
po/fr.po
View File

@ -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 <marc@infomarc.info>\n"
"Language-Team: French <https://hosted.weblate.org/projects/phpmyadmin/4-5/fr/"
">\n"
"Language-Team: French "
"<https://hosted.weblate.org/projects/phpmyadmin/4-5/fr/>\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."

12
po/sl.po
View File

@ -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 <mitenem@outlook.com>\n"
"Language-Team: Slovenian <https://hosted.weblate.org/projects/phpmyadmin/4-5/"
"sl/>\n"
"Language-Team: Slovenian "
"<https://hosted.weblate.org/projects/phpmyadmin/4-5/sl/>\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."