From 92ef2afd6f18129e62fe06a7ac0ed0aaced94849 Mon Sep 17 00:00:00 2001 From: Dennis Jakobsen Date: Thu, 23 Oct 2014 09:53:44 +0200 Subject: [PATCH 1/5] Translated using Weblate (Danish) Currently translated at 100.0% (2768 of 2768 strings) [CI skip] --- po/da.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/po/da.po b/po/da.po index 22f167f13e..5e65c84fd7 100644 --- a/po/da.po +++ b/po/da.po @@ -4,15 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-10 16:29+0200\n" -"Last-Translator: Aputsiaq Niels Janussen \n" -"Language-Team: Danish \n" +"PO-Revision-Date: 2014-10-23 09:53+0200\n" +"Last-Translator: Dennis Jakobsen \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -2750,7 +2751,7 @@ msgstr "%d i alt" #: libraries/DisplayResults.class.php:5082 libraries/sql.lib.php:1687 #, php-format msgid "Query took %01.4f seconds." -msgstr "Forepørgsel tog %01.4f sekunder." +msgstr "Forespørgsel tog %01.4f sekunder." #: libraries/DisplayResults.class.php:5166 #: libraries/DisplayResults.class.php:5172 libraries/mult_submits.inc.php:46 From 12b7effa0cb3dfa790f58df1ce93f321fb2d67d2 Mon Sep 17 00:00:00 2001 From: Eyal Visoker Date: Wed, 22 Oct 2014 15:46:07 +0200 Subject: [PATCH 2/5] Translated using Weblate (Hebrew) Currently translated at 21.4% (595 of 2768 strings) [CI skip] --- po/he.po | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/po/he.po b/po/he.po index 418d8ac23f..5ca65135f4 100644 --- a/po/he.po +++ b/po/he.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-03-27 15:19+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Hebrew \n" +"PO-Revision-Date: 2014-10-22 15:46+0200\n" +"Last-Translator: Eyal Visoker \n" +"Language-Team: Hebrew " +"\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -420,26 +420,26 @@ msgstr "יומן מסד נתונים" msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." -msgstr "" +msgstr "זוהתה שגיאה ודוח שגיאות נשלח אוטומטית, מבוסס על ההגדרות שלך." #: error_report.php:37 error_report.php:54 error_report.php:65 #: error_report.php:81 msgid "You may want to refresh the page." -msgstr "" +msgstr "כדאי שתרענן את הדף." #: error_report.php:45 msgid "" "An error has been detected and an error report has been generated but failed " "to be sent." -msgstr "" +msgstr "זוהתה שגיאה ונוצר דוח שגיאות אבל משלוח הדוח נכשל." #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." -msgstr "" +msgstr "אם אתה נתקל בבעיות אנא שלח דוח באגים ידנית." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." -msgstr "" +msgstr "תודה לך על משלוח הדוח." #: error_report.php:74 msgid "Unfortunately the submission failed." @@ -580,7 +580,6 @@ msgid "Output" msgstr "פלט" #: gis_data_editor.php:410 -#, fuzzy #| msgid "" #| "Choose \"GeomFromText\" from the \"Function\" column and paste the string " #| "below into the \"Value\" field" @@ -588,8 +587,7 @@ msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field." msgstr "" -"בוחר \"GeomFromText\" מהעמודה \"פונקציה\" ולהדביק את המחרוזת מלמטה לשדה \"ערך" -"\"" +"בחר \"GeomFromText\" מהעמודה \"פונקציה\" והדבק את המחרוזת מלמטה לשדה \"ערך\"." #: import.php:116 #, php-format @@ -614,6 +612,8 @@ msgid "" "Uploaded file cannot be moved, because the server has open_basedir enabled " "without access to the %s directory (for temporary files)." msgstr "" +"הקובץ שהועלה לא יכול להיות מועבר כי בשרת מוגדר open_basedir אבל אין גישה " +"למחיצה %s (עבור קבצים זמניים)." #: import.php:412 import.php:473 libraries/File.class.php:433 #: libraries/File.class.php:527 @@ -688,9 +688,8 @@ msgid "Back" msgstr "חזרה" #: index.php:127 libraries/Footer.class.php:70 -#, fuzzy msgid "phpMyAdmin Demo Server" -msgstr "תיעוד phpMyAdmin" +msgstr "שרת הדגמה של phpMyAdmin" #: index.php:131 #, php-format @@ -702,7 +701,7 @@ msgstr "" #: index.php:141 msgid "General Settings" -msgstr "תכונות כלליות" +msgstr "הגדרות כלליות" #: index.php:169 libraries/display_change_password.lib.php:51 #: libraries/display_change_password.lib.php:52 user_password.php:233 From 7ec994435507f935dea1977403e6876687969ebc Mon Sep 17 00:00:00 2001 From: Ion Adrian-Ionut Date: Thu, 23 Oct 2014 14:29:36 +0200 Subject: [PATCH 3/5] Translated using Weblate (Romanian) Currently translated at 62.4% (1729 of 2768 strings) [CI skip] --- po/ro.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/ro.po b/po/ro.po index 67527bc61d..1abcdbd3d8 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-10-02 13:29+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2014-10-23 14:29+0200\n" +"Last-Translator: Ion Adrian-Ionut \n" "Language-Team: Romanian " "\n" "Language: ro\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.0-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -870,10 +870,11 @@ msgstr "" "dumneavoastră va expira mai devreme decât este configurat în phpMyAdmin." #: index.php:483 +#, fuzzy msgid "" "Login cookie store is lower than cookie validity configured in phpMyAdmin, " "because of this, your login will expire sooner than configured in phpMyAdmin." -msgstr "" +msgstr "vag" #: index.php:495 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." From 1e51819d6ea46b211892c38e42d047a1b126b7f1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 25 Oct 2014 08:58:20 -0400 Subject: [PATCH 4/5] bug in makegrid.js: where_clause is undefined Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/makegrid.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index b30760c4ef..a015f20880 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4557 PHP fatal error, undefined function __() - bug #4568 Date displayed incorrectly when charting a timeline - bug #4571 Database Privileges link does not work +- bug makegrid.js: where_clause is undefined 4.2.10.1 (2014-10-21) - bug #4562 [security] XSS in debug SQL output diff --git a/js/makegrid.js b/js/makegrid.js index 20f671426c..85482ce853 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1102,6 +1102,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $('td.to_be_saved').parents('tr').each(function () { var $tr = $(this); var where_clause = $tr.find('.where_clause').val(); + if (typeof where_clause === 'undefined') { + where_clause = ''; + } full_where_clause.push(PMA_urldecode(where_clause)); var condition_array = jQuery.parseJSON($tr.find('.condition_array').val()); From 7d110fa4f409824413e459ff830bb4fd5fd16df6 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 25 Oct 2014 09:00:54 -0400 Subject: [PATCH 5/5] 4.2.10.1 release date Signed-off-by: Marc Delisle --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e129984730..07270f3c62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,7 +64,7 @@ phpMyAdmin - ChangeLog - bug #4571 Database Privileges link does not work - bug makegrid.js: where_clause is undefined -4.2.10.1 (not yet released) +4.2.10.1 (2014-10-21) - bug #4562 [security] XSS in debug SQL output - bug #4563 [security] XSS in monitor query analyzer