From 072191e678d5ed3fe41a8f33faf2c0bfe1fdea8f Mon Sep 17 00:00:00 2001 From: Dhananjay Nakrani Date: Thu, 26 Jun 2014 20:35:13 +0200 Subject: [PATCH 1/3] Translated using Weblate (Hindi) Currently translated at 46.2% (1282 of 2770) --- po/hi.po | 56 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/po/hi.po b/po/hi.po index 15c014f007..39c284a833 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4,16 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-03-28 09:51+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Hindi \n" +"PO-Revision-Date: 2014-06-26 20:35+0200\n" +"Last-Translator: Dhananjay Nakrani \n" +"Language-Team: Hindi \n" +"Language: hi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hi\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -27,7 +26,7 @@ msgstr "" #: db_create.php:61 #, php-format msgid "Database %1$s has been created." -msgstr "%1$s डेटाबेस बनाया गया है." +msgstr "%1$s डेटाबेस बनाया गया है।" #: db_datadict.php:52 libraries/operations.lib.php:32 msgid "Database comment:" @@ -163,7 +162,7 @@ msgstr "टिप्पणी" #: libraries/tbl_tracking.lib.php:931 libraries/tbl_tracking.lib.php:936 #: libraries/user_preferences.lib.php:296 prefs_manage.php:138 msgid "No" -msgstr "नहीं" +msgstr "ना" #: db_datadict.php:240 js/messages.php:322 libraries/Index.class.php:436 #: libraries/Index.class.php:473 libraries/Index.class.php:884 @@ -196,7 +195,7 @@ msgstr "हाँ" #: db_export.php:29 msgid "View dump (schema) of database" -msgstr "डेटाबेस का डंप (स्कीमा) नजारा" +msgstr "डेटाबेस का डंप (स्कीमा) दिखाए" #: db_export.php:33 db_printview.php:41 db_structure.php:165 #: db_tracking.php:51 export.php:337 libraries/DBQbe.class.php:312 @@ -218,16 +217,16 @@ msgid "The database name is empty!" msgstr "डेटाबेस का नाम खाली है!" #: db_operations.php:130 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been renamed to %2$s." msgid "Database %1$s has been renamed to %2$s." msgstr "डेटाबेस %1$s का नाम बदल कर %2$s रखा गया है" #: db_operations.php:136 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been copied to %2$s." msgid "Database %1$s has been copied to %2$s." -msgstr "डेटाबेस %1$s से %2$s में नकल किया गया है" +msgstr "डेटाबेस को %1$s से %2$s में नकल किया गया है।" #: db_operations.php:260 #, php-format @@ -291,7 +290,7 @@ msgstr "पिछली जाँच:" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s टेबलें" +msgstr[0] "%s टेबल" msgstr[1] "%s टेबल" #: db_qbe.php:102 @@ -419,32 +418,36 @@ msgstr "टेबलओं को ट्रैक करें" #: db_tracking.php:249 msgid "Database Log" -msgstr "डेटाबेस का रोजनामचा" +msgstr "डेटाबेस का रोजनामचा (log)" #: error_report.php:33 msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." 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 "" +"सोफ्टवेर मे एक खामि पकड़ी गई है और उसका रिपोर्ट भी बनाया गया हे, पर उसेको " +"भेजना असफल रहा।" #: 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." @@ -582,7 +585,7 @@ msgstr "जाएँ" #: gis_data_editor.php:407 msgid "Output" -msgstr "उत्पादन" +msgstr "आउटपुट" #: gis_data_editor.php:410 #, fuzzy @@ -621,10 +624,9 @@ msgstr "" #: import.php:409 import.php:470 libraries/File.class.php:433 #: libraries/File.class.php:527 -#, fuzzy #| msgid "File could not be read" msgid "File could not be read!" -msgstr "फाइल पढ़ी नहीं जा सकती" +msgstr "फाइल पढ़ी नहीं जा सकती!" #: import.php:418 import.php:429 import.php:450 import.php:461 #: libraries/File.class.php:593 @@ -633,8 +635,8 @@ msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." msgstr "" -"आप असमर्थित सम्पीडन (%s) के साथ फाइल लोड करने का प्रयास कर रहे हैं. इसके लिए या तो " -"समर्थन कार्यान्वित नहीं है या आपने विन्यास को अक्षम कर रखा है." +"आप असमर्थित कम्प्रेशन (%s) के साथ फाइल लोड करने का प्रयास कर रहे हैं. इसके लि" +"ए या तो समर्थन कार्यान्वित नहीं है या आपने विन्यास को अक्षम कर रखा है." #: import.php:476 msgid "" @@ -705,7 +707,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 @@ -733,10 +735,9 @@ msgid "Server:" msgstr "सर्वर:" #: index.php:266 -#, fuzzy #| msgid "Server port" msgid "Server type:" -msgstr "सर्वर" +msgstr "सर्वर प्रकार:" #: index.php:270 libraries/plugins/export/ExportLatex.class.php:225 #: libraries/plugins/export/ExportSql.class.php:657 @@ -747,10 +748,9 @@ msgid "Server version:" msgstr "संस्करण दिखाएँ" #: index.php:276 -#, fuzzy #| msgid "Protocol version" msgid "Protocol version:" -msgstr "अधिक सेटिंग्स" +msgstr "प्रोटोकॉल वर्ज़न" #: index.php:280 #, fuzzy @@ -15012,7 +15012,7 @@ msgstr "" #: libraries/advisory_rules.txt:464 msgid "concurrent_insert is set to 0" -msgstr "समवर्ती डालना 0 पर सेट है" +msgstr "concurrent_insert 0 पर सेट है" #~ msgid "Failed to connect to SQL validator!" #~ msgstr "SQL सत्यापनकर्ता से जुड़ने में विफल!" From 960407f74c0e857718a897d793ecac993723731f Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Thu, 26 Jun 2014 18:51:59 +0200 Subject: [PATCH 2/3] Translated using Weblate (Traditional Chinese) Currently translated at 99.9% (2768 of 2770) --- po/zh_TW.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 6a7afbf3c0..47476310cc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-04-25 15:05+0200\n" +"PO-Revision-Date: 2014-06-26 18:51+0200\n" "Last-Translator: Chien Wei Lin \n" -"Language-Team: Traditional Chinese \n" +"Language-Team: Traditional Chinese " +"\n" +"Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 1.9-dev\n" +"X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -204,7 +204,7 @@ msgstr "資料庫中沒有任何資料表。" #: db_export.php:41 libraries/DbSearch.class.php:445 #: libraries/display_export.lib.php:42 msgid "Select All" -msgstr "全選" +msgstr "全部選擇" #: db_export.php:47 libraries/DbSearch.class.php:449 #: libraries/display_export.lib.php:48 @@ -4863,10 +4863,9 @@ msgid "Add %s" msgstr "加入 %s" #: libraries/config/messages.inc.php:178 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "爲 BLOB 欄位使用16進位 (HEX)" +msgstr "於 BINARY 與 BLOB 欄位使用 16 進位(HEX)表示" #: libraries/config/messages.inc.php:180 msgid "Use ignore inserts" From 920f83da2d6129aae62303b10eb7dfb0741f3156 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Tue, 24 Jun 2014 21:21:14 +0200 Subject: [PATCH 3/3] Fix #4471: Undefined index warning with referenced column. Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + libraries/relation.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 93e3a7effe..d395fd47b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.2.6.0 (not yet released) +- bug #4471 Undefined index warning with referenced column. 4.2.5.0 (2014-06-26) - bug #4467 shell_exec() has been disabled for security reasons diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 36394089b9..349eb49f8f 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1600,7 +1600,7 @@ function PMA_checkChildForeignReferences($db, $table, $column) } } - if (sizeof($foreigners[$column], 0) > 0) { + if (!empty($foreigners[$column]) && sizeof($foreigners[$column], 0) > 0) { $column_status['isForeignKey'] = true; } } else {