From 6638dd17f4d5b01502392462b806bc16da571497 Mon Sep 17 00:00:00 2001 From: Wolf Chou Date: Mon, 20 Aug 2012 10:34:09 +0200 Subject: [PATCH 1/8] Translated using Weblate. --- po/zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 274c5d451c..f89c57561f 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-06-04 13:42+0200\n" -"PO-Revision-Date: 2012-08-10 09:38+0200\n" -"Last-Translator: Nathan Wu \n" +"PO-Revision-Date: 2012-08-20 10:34+0200\n" +"Last-Translator: Wolf Chou \n" "Language-Team: Chinese (Taiwan) " "\n" "Language: zh_TW\n" @@ -885,7 +885,7 @@ msgstr "使用OpenStreetMaps" #: gis_data_editor.php:134 msgid "SRID" -msgstr "" +msgstr "SRID" #: gis_data_editor.php:151 js/messages.php:326 #: libraries/display_tbl.lib.php:693 From a483935cf8aac81a2d87390af36f387100f3bdf2 Mon Sep 17 00:00:00 2001 From: "J.M" Date: Wed, 22 Aug 2012 11:14:45 +0200 Subject: [PATCH 2/8] bug #3559925 [privileges] Incorrect updating of the list of users --- ChangeLog | 1 + js/server_privileges.js | 3 +++ server_privileges.php | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 440bda9f83..8800c15556 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog - bug #3546277 [core] Call to undefined function __() when config file has wrong permissions - bug #3540922 [edit] Error searching table with many fields - bug #3555104 [edit] Cannot copy a DB with table & views +- bug #3559925 [privileges] Incorrect updating of the list of users 3.5.2.2 (2012-08-12) - [security] Fixed XSS vulnerabilities, see PMASA-2012-4 diff --git a/js/server_privileges.js b/js/server_privileges.js index 6f30165a47..11c6a8a178 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -415,6 +415,9 @@ $(document).ready(function() { if (data.db_specific_privs == false || (db_priv_page == data.db_specific_privs)) { reload_privs = true; } + if (data.db_wildcard_privs) { + reload_privs = false; + } //Change privileges, if they were edited and need to be reloaded if(data.new_privileges && reload_privs) { diff --git a/server_privileges.php b/server_privileges.php index 6fcb0b9b40..1fe9e8fa54 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1507,8 +1507,10 @@ if ($GLOBALS['is_ajax_request'] && ! isset($_REQUEST['export']) && (! isset($_RE if (isset($update_privs)) { $extra_data['db_specific_privs'] = false; + $extra_data['db_wildcard_privs'] = false; if (isset($dbname_is_wildcard)) { $extra_data['db_specific_privs'] = ! $dbname_is_wildcard; + $extra_data['db_wildcard_privs'] = $dbname_is_wildcard; } $new_privileges = join(', ', PMA_extractPrivInfo('', true)); @@ -1891,7 +1893,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs . '' . "\n" . '' . "\n" . '
' . "\n" - . '' . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges')) . '' . "\n" + . 'xx' . (! isset($dbname) ? __('Database-specific privileges') : __('Table-specific privileges')) . '' . "\n" . '' . "\n" . '' . "\n" . '' . "\n" From 11102c07f0bb868b508222efcbfd1ed509cae474 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 22 Aug 2012 06:31:47 -0400 Subject: [PATCH 3/8] Remove unnecessary caps --- server_status.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server_status.php b/server_status.php index fd6e6803b0..0ebf32d7ec 100644 --- a/server_status.php +++ b/server_status.php @@ -804,7 +804,7 @@ echo __('Runtime Information');
' . (! isset($dbname) ? __('Database') : __('Table')) . '
' . "\n" . '' . "\n" . '' . "\n" From 8b26aad9e0212223424058e380ca0b22267d352d Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 22 Aug 2012 12:46:49 +0200 Subject: [PATCH 6/8] Translated using Weblate. --- po/el.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/el.po b/po/el.po index 50b2dae462..a7ba20920f 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,13 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-08-08 14:01+0200\n" +"PO-Revision-Date: 2012-08-22 12:47+0200\n" "Last-Translator: Panagiotis Papazoglou \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Weblate 1.2\n" @@ -8644,7 +8644,6 @@ msgstr "" "αποτελέσματα." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8656,10 +8655,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"Η παράμετρος PHP [a@http://php.net/manual/en/session.configuration.php#ini." -"session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] είναι μικρότερη από " -"την ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή " -"σας θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin." +"Η παράμετρος PHP " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] είναι μικρότερη από την " +"ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας " +"θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin." #: main.php:299 msgid "" @@ -9822,10 +9822,9 @@ msgid "Advisor" msgstr "Σύμβουλος" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Αριθμός εγγραφών:" +msgstr "Αριθμός σημείων δεδομένων:" #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From 909608a58b50937cb018227f81759abc3f39f22f Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Wed, 22 Aug 2012 12:47:37 +0200 Subject: [PATCH 7/8] Translated using Weblate. --- po/el.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/el.po b/po/el.po index a7ba20920f..d4d0678502 100644 --- a/po/el.po +++ b/po/el.po @@ -9824,7 +9824,7 @@ msgstr "Σύμβουλος" #: server_status.php:807 server_status.php:833 #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Αριθμός σημείων δεδομένων:" +msgstr "Αριθμός σημείων δεδομένων: " #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From 4009a06427e2e557d2f4a3196998a8722205a986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Aug 2012 13:26:59 +0200 Subject: [PATCH 8/8] Translated using Weblate. --- po/cs.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/cs.po b/po/cs.po index d191cd77cd..f265bb5ec3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-08-22 06:32-0400\n" -"PO-Revision-Date: 2012-06-18 10:12+0200\n" +"PO-Revision-Date: 2012-08-22 13:27+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: czech \n" +"Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Weblate 1.0\n" +"X-Generator: Weblate 1.2\n" #: browse_foreigners.php:35 browse_foreigners.php:53 js/messages.php:353 #: libraries/display_tbl.lib.php:359 server_privileges.php:1679 @@ -8512,7 +8512,6 @@ msgstr "" "rozdělovat řetězce a proto to může mít nečekané následky." #: main.php:292 -#, fuzzy #| msgid "" #| "Your PHP parameter [a@http://php.net/manual/en/session.configuration." #| "php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a] is lower " @@ -8524,10 +8523,11 @@ msgid "" "cookie validity configured in phpMyAdmin, because of this, your login will " "expire sooner than configured in phpMyAdmin." msgstr "" -"Vaše nastavení PHP ([a@http://php.net/manual/en/session.configuration." -"php#ini.session.gc-maxlifetime@_blank]session.gc_maxlifetime[/a]) je menší " -"než platnost cookies nastavená v phpMyAdminovi. Z tohoto důvodu bude vaše " -"přilášení neplatné dříve, než je nastaveno v phpMyAdminovi." +"Vaše nastavení PHP " +"([a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a]) je menší než platnost cookies " +"nastavená v phpMyAdminovi. Z tohoto důvodu bude vaše přilášení neplatné " +"dříve, než je nastaveno v phpMyAdminovi." #: main.php:299 msgid "" @@ -9666,10 +9666,9 @@ msgid "Advisor" msgstr "Poradce" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Počet řádků:" +msgstr "Počet datových bodů: " #: server_status.php:811 server_status.php:837 msgid "Refresh rate: "
' . (! isset($dbname) ? __('Database') : __('Table')) . '