From 122f3296264ae635b5a9605db51665a56890b63e Mon Sep 17 00:00:00 2001 From: diprofinfiniti Date: Thu, 27 Aug 2015 11:04:43 +0200 Subject: [PATCH 1/7] Translated using Weblate (Malay) Currently translated at 11.5% (350 of 3040 strings) [CI skip] --- po/ms.po | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/po/ms.po b/po/ms.po index 14b40ca538..8798911833 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2,18 +2,18 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2014-11-05 10:35+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Malay \n" +"PO-Revision-Date: 2015-08-27 11:04+0200\n" +"Last-Translator: diprofinfiniti \n" +"Language-Team: Malay " +"\n" "Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.0-dev\n" +"X-Generator: Weblate 2.4-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -30,18 +30,18 @@ msgstr "" #: db_central_columns.php:113 msgid "Click to sort." -msgstr "" +msgstr "Klik untuk susun" #: db_central_columns.php:129 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows" msgid "Showing rows %1$s - %2$s." -msgstr "Papar baris" +msgstr "Papar baris %1$s - %2$s." #: db_create.php:61 #, php-format msgid "Database %1$s has been created." -msgstr "Pengkalan data %1$s telah dijana." +msgstr "Pangkalan data %1$s telah dijana." #: db_datadict.php:48 libraries/operations.lib.php:32 msgid "Database comment:" @@ -75,9 +75,8 @@ msgstr "Komen jadual" #: libraries/tbl_relation.lib.php:373 libraries/tbl_relation.lib.php:609 #: libraries/tbl_relation.lib.php:619 libraries/tracking.lib.php:877 #: libraries/tracking.lib.php:966 -#, fuzzy msgid "Column" -msgstr "Pangkalan data %1$s telah dijana." +msgstr "Lajur" #: db_datadict.php:104 db_printview.php:50 libraries/Index.class.php:648 #: libraries/TableSearch.class.php:186 libraries/central_columns.lib.php:654 @@ -248,27 +247,27 @@ msgid "The database name is empty!" msgstr "Tiada nama pangkalan data!" #: db_operations.php:132 -#, 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 "Pangkalan data %1$s telah ditukarnama ke %2$s" #: db_operations.php:138 -#, 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 "Pengkalan data %1$s telah disalin ke %2$s" +msgstr "Pangkalan data %1$s telah di salin ke %2$s" #: db_operations.php:259 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" -"Kunfigurasi simpanan phpMyAdmin telah dinyahaktifkan. Untuk mengetahuinya " -"klik %shere%s." +"Konfigurasi simpanan phpMyAdmin telah dinyah-aktifkan. Untuk mengetahuinya " +"klik %Kenal pasti Kenapa%s." #: db_printview.php:48 db_tracking.php:125 db_tracking.php:287 #: libraries/Menu.class.php:241 libraries/config/messages.inc.php:784 @@ -328,10 +327,9 @@ msgid_plural "%s tables" msgstr[0] "%s jadual" #: db_qbe.php:103 -#, fuzzy #| msgid "You have to choose at least one column to display" msgid "You have to choose at least one column to display!" -msgstr "Anda mesti pilih sekurang-kurangnya satu Kolum untuk dipapar" +msgstr "Anda mesti pilih sekurang-kurangnya satu lajur untuk dipapar!" #: db_qbe.php:120 #, php-format From 3a81bed47fd47b7f55ae221380170876b0b01283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Aug 2015 12:46:49 +0200 Subject: [PATCH 2/7] Translated using Weblate (Malay) Currently translated at 11.5% (350 of 3040 strings) [CI skip] --- po/ms.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ms.po b/po/ms.po index 8798911833..429b7dafcf 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-27 11:04+0200\n" -"Last-Translator: diprofinfiniti \n" +"PO-Revision-Date: 2015-08-27 12:46+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Malay " "\n" "Language: ms\n" @@ -267,7 +267,7 @@ msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." msgstr "" "Konfigurasi simpanan phpMyAdmin telah dinyah-aktifkan. Untuk mengetahuinya " -"klik %Kenal pasti Kenapa%s." +"klik %sKenal pasti Kenapa%s." #: db_printview.php:48 db_tracking.php:125 db_tracking.php:287 #: libraries/Menu.class.php:241 libraries/config/messages.inc.php:784 From b1466d0d273ef38afa946249f87f60a42ebbc5e7 Mon Sep 17 00:00:00 2001 From: Xavier Navarro Date: Thu, 27 Aug 2015 13:54:26 +0200 Subject: [PATCH 3/7] Translated using Weblate (Catalan) Currently translated at 100.0% (3040 of 3040 strings) [CI skip] --- po/ca.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/ca.po b/po/ca.po index a390d80a57..0133ed56bb 100644 --- a/po/ca.po +++ b/po/ca.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" -"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-07-20 08:07+0200\n" -"Last-Translator: josep constanti \n" -"Language-Team: Catalan \n" +"PO-Revision-Date: 2015-08-27 13:54+0200\n" +"Last-Translator: Xavier Navarro \n" +"Language-Team: Catalan " +"\n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13436,10 +13436,10 @@ msgid "Run SQL query/queries on database %s" msgstr "Executa consulta/s SQL a la Base de Dades %s" #: libraries/sql_query_form.lib.php:192 -#, fuzzy, php-format +#, php-format #| msgid "Run SQL query/queries on database %s" msgid "Run SQL query/queries on table %s" -msgstr "Executa consulta/s SQL a la Base de Dades %s" +msgstr "Executa consulta/s SQL a la taula %s" #: libraries/sql_query_form.lib.php:241 msgid "Get auto-saved query" @@ -14626,10 +14626,9 @@ msgid "Row: %1$s, Column: %2$s, Error: %3$s" msgstr "Fila: %1$s, Columna: %2$s, Error: %3$s" #: tbl_row_action.php:65 -#, fuzzy #| msgid "No versions selected." msgid "No row selected." -msgstr "No s'han triat versions." +msgstr "No s'ha triat la fila." #: tbl_structure.php:63 #, php-format From bf3d1574c10df7f291a0be6831cc2e8346ab4948 Mon Sep 17 00:00:00 2001 From: diprofinfiniti Date: Fri, 28 Aug 2015 04:47:50 +0200 Subject: [PATCH 4/7] Translated using Weblate (Malay) Currently translated at 11.6% (355 of 3040 strings) [CI skip] --- po/ms.po | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/po/ms.po b/po/ms.po index 429b7dafcf..76571fdf35 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-27 12:46+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2015-08-28 04:47+0200\n" +"Last-Translator: diprofinfiniti \n" "Language-Team: Malay " "\n" "Language: ms\n" @@ -26,7 +26,7 @@ msgstr "" #: db_central_columns.php:89 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "Senarai utama lajur untuk pangkalan data semasa adalah kosong" #: db_central_columns.php:113 msgid "Click to sort." @@ -51,10 +51,9 @@ msgstr "Komen pangkalan data:" #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:943 #: libraries/tbl_columns_definition_form.lib.php:71 #: libraries/tbl_printview.lib.php:581 -#, fuzzy #| msgid "Table comments" msgid "Table comments:" -msgstr "Komen jadual" +msgstr "Jadual Komen:" #: db_datadict.php:103 libraries/Index.class.php:651 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1292 @@ -344,22 +343,22 @@ msgid "Access denied!" msgstr "Akses dinafikan!" #: db_tracking.php:39 db_tracking.php:64 -#, fuzzy #| msgid "Chart generated successfully." msgid "Tracking data deleted successfully." -msgstr "Bebenang %s telah berjaya dimatikan." +msgstr "Penjejak data telah berjaya dihapuskan." #: db_tracking.php:48 #, php-format msgid "" "Version %1$s was created for selected tables, tracking is active for them." msgstr "" +"Versi %1$s telah dicipta untuk jadual-jadual terpilih, penjejak telah " +"diaktifkan." #: db_tracking.php:79 -#, fuzzy #| msgid "With selected:" msgid "No tables selected." -msgstr "Dengan pilihan:" +msgstr "Tiada jadual dipilih." #: db_tracking.php:114 #, fuzzy From 333f5551ed6ec9e76880dda6cc76ef0ac86deb6c Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Thu, 27 Aug 2015 13:32:57 +0200 Subject: [PATCH 5/7] Translated using Weblate (Chinese (Taiwan)) Currently translated at 99.7% (3032 of 3040 strings) [CI skip] --- po/zh_TW.po | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index f9a7699272..79b9b9bb41 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-26 14:34+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2015-08-27 13:32+0200\n" +"Last-Translator: Chien Wei Lin \n" "Language-Team: Chinese (Taiwan) " "\n" "Language: zh_TW\n" @@ -8680,7 +8680,7 @@ msgstr "重新讀取導覽面板" msgid "" "There are large item groups in navigation panel which may affect the " "performance. Consider disabling item grouping in the navigation panel." -msgstr "" +msgstr "導覽面板有群組含有大量項目可能會影響效能，請考慮關閉導覽面板的項目群組功能。" #: libraries/navigation/NavigationTree.class.php:871 #, php-format @@ -8875,6 +8875,7 @@ msgid "" "There is no primary key; please add one.
Hint: A primary key is a column " "(or combination of columns) that uniquely identify all rows." msgstr "" +"目前沒有主鍵(Primary Key)，請新增一個。
提示：主鍵是一個欄位 (或多個欄位組合而成)，它獨一無二、可以用來辨識所有資料列。" #: libraries/normalization.lib.php:185 msgid "Add a primary key on existing column(s)" @@ -8957,7 +8958,7 @@ msgstr "尋找部份相依" msgid "" "No partial dependencies possible as no non-primary column exists since " "primary key ( %1$s ) is composed of all the columns in the table." -msgstr "" +msgstr "當主鍵 ( %1$s ) 由所有資料表的欄位組成時，由於沒有非主要欄位存在，因此不會有部份相依。" #: libraries/normalization.lib.php:318 libraries/normalization.lib.php:360 msgid "Table is already in second normal form." @@ -8968,7 +8969,7 @@ msgstr "資料表己完成第二正規化。" msgid "" "The primary key ( %1$s ) consists of more than one column so we need to find " "the partial dependencies." -msgstr "" +msgstr "由於主鍵 ( %1$s ) 由多個欄位組成，所以我們需要尋找部分相依。" #: libraries/normalization.lib.php:327 libraries/normalization.lib.php:692 msgid "" @@ -8997,14 +8998,14 @@ msgstr "'%1$s' 相依於:" msgid "" "No partial dependencies possible as the primary key ( %1$s ) has just one " "column." -msgstr "" +msgstr "當主鍵 ( %1$s ) 只使用一個欄位時不會有部份相依。" #: libraries/normalization.lib.php:381 #, php-format msgid "" "In order to put the original table '%1$s' into Second normal form we need to " "create the following tables:" -msgstr "" +msgstr "為了要將原始資料 '%1$s' 轉換至第二階正規化需要建立以下資料表：" #: libraries/normalization.lib.php:417 #, php-format @@ -9021,7 +9022,7 @@ msgstr "處理時發生錯誤！" msgid "" "In order to put the original table '%1$s' into Third normal form we need to " "create the following tables:" -msgstr "" +msgstr "為了要將原始資料 '%1$s' 轉換至第三階正規化需要建立以下資料表：" #: libraries/normalization.lib.php:548 msgid "The third step of normalization is complete." @@ -9052,7 +9053,7 @@ msgstr "" msgid "" "No Transitive dependencies possible as the table doesn't have any non " "primary key columns" -msgstr "" +msgstr "當資料表沒有任何非主鍵的欄位時不會有遞移相依" #: libraries/normalization.lib.php:747 msgid "Table is already in Third normal form!" @@ -9084,7 +9085,7 @@ msgstr "提示：請謹心慎依照程序以完成正確的正規化" msgid "" "This list is based on a subset of the table's data and is not necessarily " "accurate. " -msgstr "" +msgstr "此清單依據資料表資料的子集合組成，不需要準確。 " #: libraries/normalization.lib.php:859 msgid "No partial dependencies found!" @@ -10176,7 +10177,7 @@ msgstr "SQL 使用語法明顯標示的 CodeMirror 編輯器。" #: libraries/plugins/transformations/input/Text_Plain_XmlEditor.class.php:33 msgid "Syntax highlighted CodeMirror editor for XML (and HTML)." -msgstr "" +msgstr "支援 XML (與 HTML) 的語法強調 CodeMirror 編輯器。" #: libraries/plugins/transformations/output/Text_Plain_Json.class.php:44 msgid "Formats text as JSON with syntax highlighting." @@ -11365,17 +11366,17 @@ msgstr "需要 SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 msgid "Requires that a specific cipher method be used for a connection." -msgstr "" +msgstr "需要使用指定的加密方式連線。" #: libraries/server_privileges.lib.php:778 #: libraries/server_privileges.lib.php:787 msgid "Requires that a valid X509 certificate issued by this CA be presented." -msgstr "" +msgstr "需要由此 CA 發行且有效的 X509 憑証存在。" #: libraries/server_privileges.lib.php:797 #: libraries/server_privileges.lib.php:806 msgid "Requires that a valid X509 certificate with this subject be presented." -msgstr "" +msgstr "需要使用此主旨且有效的 X509 憑証存在。" #: libraries/server_privileges.lib.php:818 msgid "Requires a valid X509 cetrificate." From 6df17fd2229f56bc4c5d30c8cff0d76994fcbb73 Mon Sep 17 00:00:00 2001 From: Amir Hamzah Date: Fri, 28 Aug 2015 06:06:50 +0200 Subject: [PATCH 6/7] Translated using Weblate (Malay) Currently translated at 11.6% (355 of 3040 strings) [CI skip] --- po/ms.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ms.po b/po/ms.po index 76571fdf35..10da17a35f 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.14-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-08 13:51-0400\n" -"PO-Revision-Date: 2015-08-28 04:47+0200\n" -"Last-Translator: diprofinfiniti \n" +"PO-Revision-Date: 2015-08-28 06:06+0200\n" +"Last-Translator: Amir Hamzah \n" "Language-Team: Malay " "\n" "Language: ms\n" @@ -26,7 +26,7 @@ msgstr "" #: db_central_columns.php:89 msgid "The central list of columns for the current database is empty." -msgstr "Senarai utama lajur untuk pangkalan data semasa adalah kosong" +msgstr "Senarai utama lajur untuk pangkalan data semasa adalah kosong." #: db_central_columns.php:113 msgid "Click to sort." From 9642af4ed5df69a939726e4b8f361bfc9e26f04f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 31 Aug 2015 08:32:50 -0400 Subject: [PATCH 7/7] Fixes #11447 MySQL 5.5 and the language system variable Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/DatabaseInterface.class.php | 55 ++++++++++++++------------- libraries/dbi/DBIDummy.class.php | 2 +- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce556ea72a..a1a3865daf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - issue #11421 Stored-proc / routine - broken parameter parsing - issue Missing name for configuration read_as_multibytes - issue #11431 Incorrect "No row selected" message +- issue #11447 MySQL 5.5 and the language system variable 4.4.14.0 (2015-08-20) - issue #11367 Export after search, missing WHERE clause diff --git a/libraries/DatabaseInterface.class.php b/libraries/DatabaseInterface.class.php index 6f1f7241b4..3913426054 100644 --- a/libraries/DatabaseInterface.class.php +++ b/libraries/DatabaseInterface.class.php @@ -228,42 +228,43 @@ class PMA_DatabaseInterface public function convertMessage($message) { // latin always last! + // @todo some values are missing, + // see https://mariadb.com/kb/en/mariadb/server-locale/ + $encodings = array( - 'japanese' => 'EUC-JP', //'ujis', - 'japanese-sjis' => 'Shift-JIS', //'sjis', - 'korean' => 'EUC-KR', //'euckr', - 'russian' => 'KOI8-R', //'koi8r', - 'ukrainian' => 'KOI8-U', //'koi8u', - 'greek' => 'ISO-8859-7', //'greek', - 'serbian' => 'CP1250', //'cp1250', - 'estonian' => 'ISO-8859-13', //'latin7', - 'slovak' => 'ISO-8859-2', //'latin2', - 'czech' => 'ISO-8859-2', //'latin2', - 'hungarian' => 'ISO-8859-2', //'latin2', - 'polish' => 'ISO-8859-2', //'latin2', - 'romanian' => 'ISO-8859-2', //'latin2', - 'spanish' => 'CP1252', //'latin1', - 'swedish' => 'CP1252', //'latin1', - 'italian' => 'CP1252', //'latin1', - 'norwegian-ny' => 'CP1252', //'latin1', - 'norwegian' => 'CP1252', //'latin1', - 'portuguese' => 'CP1252', //'latin1', - 'danish' => 'CP1252', //'latin1', - 'dutch' => 'CP1252', //'latin1', - 'english' => 'CP1252', //'latin1', - 'french' => 'CP1252', //'latin1', - 'german' => 'CP1252', //'latin1', + 'ja' => 'EUC-JP', //'ujis', + 'ko' => 'EUC-KR', //'euckr', + 'ru' => 'KOI8-R', //'koi8r', + 'uk' => 'KOI8-U', //'koi8u', + 'sr' => 'CP1250', //'cp1250', + 'et' => 'ISO-8859-13', //'latin7', + 'sk' => 'ISO-8859-2', //'latin2', + 'cz' => 'ISO-8859-2', //'latin2', + 'hu' => 'ISO-8859-2', //'latin2', + 'pl' => 'ISO-8859-2', //'latin2', + 'ro' => 'ISO-8859-2', //'latin2', + 'es' => 'CP1252', //'latin1', + 'sv' => 'CP1252', //'latin1', + 'it' => 'CP1252', //'latin1', + 'no' => 'CP1252', //'latin1', + 'pt' => 'CP1252', //'latin1', + 'da' => 'CP1252', //'latin1', + 'nl' => 'CP1252', //'latin1', + 'en' => 'CP1252', //'latin1', + 'fr' => 'CP1252', //'latin1', + 'de' => 'CP1252', //'latin1', ); $server_language = $this->fetchValue( - 'SHOW VARIABLES LIKE \'language\';', + 'SELECT @@lc_messages;', 0, - 1 + 0 ); + if ($server_language) { $found = array(); $match = preg_match( - '&(?:\\\|\\/)([^\\\\\/]*)(?:\\\|\\/)$&i', + '&([a-z][a-z])_&i', $server_language, $found ); diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index fef75e867c..07208bc3b8 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -122,7 +122,7 @@ $GLOBALS['dummy_queries'] = array( ) ), array( - 'query' => 'SHOW VARIABLES LIKE \'language\';', + 'query' => 'SELECT @@lc_messages;', 'result' => array(), ), array(