From 483979aece52e7b07c88f5eba0d9d4000ee9d489 Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Wed, 16 Sep 2015 05:35:37 +0200 Subject: [PATCH 01/13] Translated using Weblate (Chinese (Taiwan)) Currently translated at 100.0% (3209 of 3209 strings) [CI skip] --- po/zh_TW.po | 127 +++++++++++++++------------------------------------- 1 file changed, 37 insertions(+), 90 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 9ed04db4e4..f0771a3efe 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-08-27 13:45+0200\n" +"PO-Revision-Date: 2015-09-16 05:35+0200\n" "Last-Translator: Chien Wei Lin \n" -"Language-Team: Chinese (Taiwan) \n" +"Language-Team: Chinese (Taiwan) " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -631,7 +631,6 @@ msgstr "" "及 pma 使用者。這兒有更多的資訊 %s。" #: index.php:163 -#, fuzzy #| msgid "General Settings" msgid "General settings" msgstr "一般設定" @@ -647,7 +646,6 @@ msgid "Server connection collation" msgstr "伺服器連線編碼與排序" #: index.php:229 -#, fuzzy #| msgid "Appearance Settings" msgid "Appearance settings" msgstr "外觀設定" @@ -971,7 +969,6 @@ msgid "" msgstr "您確定您要更改所有欄位編碼與排序(Collation)並轉換資料？" #: js/messages.php:88 -#, fuzzy #| msgid "Save & Close" msgid "Save & close" msgstr "儲存並關閉" @@ -983,7 +980,6 @@ msgid "Reset" msgstr "重新設定" #: js/messages.php:90 -#, fuzzy #| msgid "Reset All" msgid "Reset all" msgstr "全部重設" @@ -1009,7 +1005,6 @@ msgid "Add index" msgstr "新增索引" #: js/messages.php:98 -#, fuzzy #| msgid "Edit Index" msgid "Edit index" msgstr "編輯索引" @@ -1060,7 +1055,6 @@ msgstr "SQL 查詢：" #. l10n: Default label for the y-Axis of Charts #: js/messages.php:118 -#, fuzzy #| msgid "Y Values" msgid "Y values" msgstr "Y 軸值" @@ -1155,7 +1149,6 @@ msgid "Query cache used" msgstr "查詢快取已使用" #: js/messages.php:151 -#, fuzzy #| msgid "System CPU Usage" msgid "System CPU usage" msgstr "系統 CPU 使用率" @@ -1193,28 +1186,24 @@ msgid "Used memory" msgstr "已使用記憶體" #: js/messages.php:162 -#, fuzzy #| msgid "Total Swap" msgid "Total swap" -msgstr "暫存區總計" +msgstr "交換空間總計" #: js/messages.php:163 -#, fuzzy #| msgid "Cached Swap" msgid "Cached swap" -msgstr "已快取暫存區" +msgstr "已快取交換空間" #: js/messages.php:164 -#, fuzzy #| msgid "Used Swap" msgid "Used swap" -msgstr "已使用暫存區" +msgstr "已使用交換空間" #: js/messages.php:165 -#, fuzzy #| msgid "Free Swap" msgid "Free swap" -msgstr "閒置的暫存區" +msgstr "未使用交換空間" #: js/messages.php:167 msgid "Bytes sent" @@ -1615,7 +1604,6 @@ msgid "No files available on server for import!" msgstr "伺服器上無可用來匯入的檔案！" #: js/messages.php:275 -#, fuzzy #| msgid "Analyse Query" msgid "Analyse query" msgstr "分析查詢" @@ -1681,25 +1669,21 @@ msgid "Loading…" msgstr "載入中…" #: js/messages.php:301 -#, fuzzy #| msgid "Request Aborted!!" msgid "Request aborted!!" -msgstr "請求失敗!!" +msgstr "已放棄請求!!" #: js/messages.php:302 -#, fuzzy #| msgid "Processing Request" msgid "Processing request" msgstr "請求處理中" #: js/messages.php:303 -#, fuzzy #| msgid "Request Failed!!" msgid "Request failed!!" msgstr "請求失敗!!" #: js/messages.php:304 -#, fuzzy #| msgid "Error in processing request:" msgid "Error in processing request" msgstr "處理要求時發生錯誤：" @@ -1720,16 +1704,14 @@ msgid "No databases selected." msgstr "尚未選擇任何資料庫。" #: js/messages.php:308 -#, fuzzy #| msgid "Dropping Column" msgid "Dropping column" msgstr "刪除欄位" #: js/messages.php:309 -#, fuzzy #| msgid "Add primary key" msgid "Adding primary key" -msgstr "新增主鍵" +msgstr "新增主鍵中" #: js/messages.php:310 #: templates/database/designer/aggregate_query_panel.phtml:59 @@ -1746,19 +1728,16 @@ msgid "Click to dismiss this notification" msgstr "點選關閉此通知" #: js/messages.php:314 -#, fuzzy #| msgid "Renaming Databases" msgid "Renaming databases" msgstr "更改資料庫名稱中" #: js/messages.php:315 -#, fuzzy #| msgid "Copying Database" msgid "Copying database" msgstr "複製資料庫中" #: js/messages.php:316 -#, fuzzy #| msgid "Changing Charset" msgid "Changing charset" msgstr "更改字元編碼" @@ -2141,16 +2120,14 @@ msgid "Geometry" msgstr "幾何形" #: js/messages.php:440 -#, fuzzy #| msgid "Inner Ring" msgid "Inner ring" msgstr "內環" #: js/messages.php:441 -#, fuzzy #| msgid "Outer ring:" msgid "Outer ring" -msgstr "外環:" +msgstr "外環" #: js/messages.php:445 msgid "Do you want to copy encryption key?" @@ -2381,16 +2358,14 @@ msgid "More" msgstr "更多" #: js/messages.php:531 -#, fuzzy #| msgid "Show Panel" msgid "Show panel" -msgstr "顯示控制面板" +msgstr "顯示面板" #: js/messages.php:532 -#, fuzzy #| msgid "Hide Panel" msgid "Hide panel" -msgstr "隱藏控制面板" +msgstr "隱藏面板" #: js/messages.php:533 msgid "Show hidden navigation tree items." @@ -2461,13 +2436,11 @@ msgid "Create view" msgstr "新增檢視表" #: js/messages.php:556 -#, fuzzy #| msgid "Send error reports" msgid "Send error report" msgstr "傳送錯誤報告" #: js/messages.php:557 -#, fuzzy #| msgid "Submit Error Report" msgid "Submit error report" msgstr "送出錯誤報告" @@ -2479,13 +2452,11 @@ msgid "" msgstr "發生 JavaScript 嚴重錯誤，您是否要回報錯誤報告?" #: js/messages.php:561 -#, fuzzy #| msgid "Change Report Settings" msgid "Change report settings" msgstr "更改報告設定" #: js/messages.php:562 -#, fuzzy #| msgid "Show Report Details" msgid "Show report details" msgstr "顯示報告詳細資訊" @@ -3438,7 +3409,6 @@ msgstr "於下列資料表中:" #: libraries/DbSearch.class.php:450 libraries/display_export.lib.php:50 #: libraries/replication_gui.lib.php:380 -#, fuzzy #| msgid "Unselect All" msgid "Unselect all" msgstr "全部取消" @@ -3611,7 +3581,6 @@ msgstr "已選擇項目:" #: libraries/server_user_groups.lib.php:231 #: templates/database/structure/check_all_tables.phtml:3 #: templates/database/structure/check_all_tables.phtml:4 -#, fuzzy #| msgid "Check All" msgid "Check all" msgstr "全選" @@ -4682,7 +4651,6 @@ msgid "Without PHP Code" msgstr "關閉 PHP 程式碼" #: libraries/Util.class.php:1223 libraries/config/messages.inc.php:898 -#, fuzzy #| msgid "Create PHP Code" msgid "Create PHP code" msgstr "產生 PHP 程式碼" @@ -4812,7 +4780,6 @@ msgid "Check privileges for database \"%s\"." msgstr "檢查資料庫 「%s」 之權限." #: libraries/build_html_for_db.lib.php:181 -#, fuzzy #| msgid "Check Privileges" msgid "Check privileges" msgstr "檢查權限" @@ -4880,7 +4847,7 @@ msgstr "屬性" #: libraries/central_columns.lib.php:710 #: libraries/central_columns.lib.php:1384 msgid "A_I" -msgstr "" +msgstr "流水號(A_I)" #: libraries/central_columns.lib.php:750 msgid "Select a table" @@ -5395,7 +5362,7 @@ msgid "" "Restricts the MySQL servers the user can enter when a login to an arbitrary " "MySQL server is enabled by matching the IP or hostname of the MySQL server " "to the given regular expression." -msgstr "" +msgstr "限制使用者登入任意 MySQL 伺服器時，該 MySQL 伺服器的 IP 或主機名稱需要符合指定的正規表示法。" #: libraries/config/messages.inc.php:26 msgid "Restrict login to MySQL server" @@ -6439,7 +6406,6 @@ msgid "Maximum tables" msgstr "資料表數量上限" #: libraries/config/messages.inc.php:465 -#, fuzzy #| msgid "" #| "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " #| "([kbd]0[/kbd] for no limit)." @@ -6447,7 +6413,8 @@ msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change)." msgstr "" -"執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]0[/kbd]爲不限制)。" +"執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]-1[/kbd] 爲不限制、[kbd]0[/kbd] " +"為不做變更)。" #: libraries/config/messages.inc.php:468 msgid "Memory limit" @@ -7349,10 +7316,9 @@ msgid "Show or hide a column displaying the Creation timestamp for all tables." msgstr "顯示或隱藏所有資料表欄位建立的時間。" #: libraries/config/messages.inc.php:853 -#, fuzzy #| msgid "Show Creation timestamp" msgid "Show creation timestamp" -msgstr "顯示建立時間戳記" +msgstr "顯示建立時間" #: libraries/config/messages.inc.php:855 msgid "" @@ -7360,10 +7326,9 @@ msgid "" msgstr "顯示或隱藏所有資料表的最後更新時間欄位。" #: libraries/config/messages.inc.php:857 -#, fuzzy #| msgid "Show Last update timestamp" msgid "Show last update timestamp" -msgstr "顯示最後更新的時間戳記" +msgstr "顯示最後更新時間" #: libraries/config/messages.inc.php:859 msgid "" @@ -7371,10 +7336,9 @@ msgid "" msgstr "顯示或隱藏所有資料表的最後檢查時間欄位。" #: libraries/config/messages.inc.php:861 -#, fuzzy #| msgid "Show Last check timestamp" msgid "Show last check timestamp" -msgstr "顯示最後檢查時間戳記" +msgstr "顯示最後檢查時間" #: libraries/config/messages.inc.php:863 msgid "" @@ -8011,10 +7975,9 @@ msgid "Custom - display all possible options" msgstr "自訂 - 顯示所有可用的選項" #: libraries/display_export.lib.php:335 -#, fuzzy #| msgid "Databases" msgid "Databases:" -msgstr "資料庫" +msgstr "資料庫：" #: libraries/display_export.lib.php:337 #: libraries/navigation/Navigation.class.php:196 @@ -8216,10 +8179,9 @@ msgid "" msgstr "壓縮檔案名稱必須以 .[格式].[壓縮方式] 結尾。如: .sql.zip" #: libraries/display_import.lib.php:224 -#, fuzzy #| msgid "File to Import:" msgid "File to import:" -msgstr "要匯入的檔案:" +msgstr "要匯入的檔案：" #: libraries/display_import.lib.php:234 libraries/display_import.lib.php:251 msgid "You may also drag and drop a file on any page." @@ -8230,10 +8192,9 @@ msgid "File uploads are not allowed on this server." msgstr "此伺服器不允許上傳檔案。" #: libraries/display_import.lib.php:278 -#, fuzzy #| msgid "Partial Import:" msgid "Partial import:" -msgstr "部分匯入:" +msgstr "部分匯入：" #: libraries/display_import.lib.php:285 #, php-format @@ -8258,7 +8219,6 @@ msgid "" msgstr "跳過此數量的查詢(SQL)或者行數(其他格式)，由第一行開始:" #: libraries/display_import.lib.php:340 -#, fuzzy #| msgid "Other Options:" msgid "Other options:" msgstr "其他選項：" @@ -9403,7 +9363,7 @@ msgid "" "For each column below, please select the minimal set of columns among " "given set whose values combined together are sufficient to determine the " "value of the column." -msgstr "" +msgstr "以下欄位，請選擇可足夠用來辨識欄位值的最少欄位值組合。" #: libraries/normalization.lib.php:372 libraries/normalization.lib.php:764 #, php-format @@ -9464,7 +9424,7 @@ msgid "" "given set whose values combined together are sufficient to determine the " "value of the column.
Note: A column may have no transitive dependency, " "in that case you don't have to select any." -msgstr "" +msgstr "以下欄位，請選擇可足夠用來辨識欄位值的最少欄位值組合。
注意：欄位可能沒有遞移相依，因此您可能不用做任何選擇。" #: libraries/normalization.lib.php:777 msgid "" @@ -9525,7 +9485,6 @@ msgstr "您的權限不足以執行此操作，請參考說明文件了解詳細 #: libraries/operations.lib.php:879 libraries/operations.lib.php:973 #: libraries/operations.lib.php:1327 libraries/rte/rte_routines.lib.php:998 #: templates/columns_definitions/table_fields_definitions.phtml:47 -#, fuzzy #| msgid "Adjust Privileges" msgid "Adjust privileges" msgstr "調整權限" @@ -9703,10 +9662,9 @@ msgid "Truncate" msgstr "清空" #: libraries/operations.lib.php:1619 -#, fuzzy #| msgid "Collapse" msgid "Coalesce" -msgstr "Coalesce" +msgstr "合併" #: libraries/operations.lib.php:1628 msgid "Partition maintenance" @@ -10082,7 +10040,7 @@ msgstr "檢視結構" #: libraries/plugins/export/ExportPdf.class.php:289 msgid "Stand in" -msgstr "" +msgstr "加入" #: libraries/plugins/export/ExportSql.class.php:91 msgid "" @@ -10499,7 +10457,6 @@ msgstr "顯示網格" #: libraries/plugins/schema/SchemaPdf.class.php:94 #: templates/database/structure/print_view_data_dictionary_link.phtml:6 -#, fuzzy #| msgid "Data Dictionary" msgid "Data dictionary" msgstr "資料字典" @@ -11209,10 +11166,9 @@ msgid "Re-type" msgstr "重新輸入" #: libraries/replication_gui.lib.php:895 -#, fuzzy #| msgid "Generate password" msgid "Generate password:" -msgstr "產生密碼" +msgstr "產生密碼：" #: libraries/replication_gui.lib.php:933 msgid "Replication started successfully." @@ -11672,10 +11628,9 @@ msgid "Ignoring unsupported language code." msgstr "忽略不支援的語言代碼。" #: libraries/select_server.lib.php:43 libraries/select_server.lib.php:48 -#, fuzzy #| msgid "Current server" msgid "Current server:" -msgstr "目前伺服器" +msgstr "目前伺服器：" #: libraries/server_bin_log.lib.php:30 msgid "Select binary log to view" @@ -11733,7 +11688,6 @@ msgstr "" #: libraries/server_databases.lib.php:366 #: libraries/server_databases.lib.php:371 -#, fuzzy #| msgid "Enable Statistics" msgid "Enable statistics" msgstr "開啟統計資訊" @@ -12166,10 +12120,9 @@ msgid "table-specific" msgstr "指定資料表" #: libraries/server_privileges.lib.php:2628 -#, fuzzy #| msgid "Edit privileges:" msgid "Edit privileges" -msgstr "編輯權限：" +msgstr "編輯權限" #: libraries/server_privileges.lib.php:2631 msgid "Revoke" @@ -12564,10 +12517,9 @@ msgid "Clear series" msgstr "清除序列" #: libraries/server_status_monitor.lib.php:233 -#, fuzzy #| msgid "Series in Chart:" msgid "Series in chart:" -msgstr "圖表中的序列:" +msgstr "圖表中的序列：" #: libraries/server_status_monitor.lib.php:254 msgid "Start Monitor" @@ -13990,16 +13942,14 @@ msgid "Username and hostname didn't change." msgstr "使用者名稱與主機名稱未變更。" #: server_status.php:39 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server status." -msgstr "權限不足檢視使用者。" +msgstr "權限不足檢視伺服器狀態。" #: server_status_advisor.php:39 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view the advisor." -msgstr "權限不足檢視使用者。" +msgstr "權限不足檢視建議。" #: server_status_processes.php:36 #, php-format @@ -14013,22 +13963,20 @@ msgid "" msgstr "phpMyAdmin 無法中止程序 %s。該程序可能已經關閉。" #: server_status_queries.php:55 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view query statistics." -msgstr "權限不足檢視使用者。" +msgstr "權限不足檢視查詢統計資訊。" #: server_status_variables.php:57 -#, fuzzy #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view status variables." -msgstr "權限不足檢視使用者。" +msgstr "權限不足檢視狀態變數。" #: server_variables.php:83 -#, fuzzy, php-format +#, php-format #| msgid "Not enough privilege to view users." msgid "Not enough privilege to view server variables and settings. %s" -msgstr "權限不足檢視使用者。" +msgstr "權限不足檢視伺服器變數與設定。%s" #: setup/frames/config.inc.php:41 setup/frames/index.inc.php:277 msgid "Download" @@ -14387,10 +14335,9 @@ msgid "Operator" msgstr "運算子" #: templates/database/designer/database_tables.phtml:29 -#, fuzzy #| msgid "Move columns" msgid "Show/hide columns" -msgstr "移動欄位" +msgstr "顯示/隱藏欄位" #: templates/database/designer/database_tables.phtml:40 msgid "See table structure" From 340be9d0974787f3bf5fea1e4f72eec266c0208f Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:20:05 +0200 Subject: [PATCH 02/13] Translated using Weblate (Danish) Currently translated at 93.2% (2991 of 3209 strings) [CI skip] --- po/da.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/da.po b/po/da.po index 5bd41f4349..d1068a14a6 100644 --- a/po/da.po +++ b/po/da.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-01 14:48+0200\n" +"PO-Revision-Date: 2015-09-16 13:20+0200\n" "Last-Translator: Claus Svalekjaer \n" -"Language-Team: Danish \n" +"Language-Team: Danish " +"\n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2566,7 +2566,7 @@ msgstr "%s forespørgsler udført %s gange på %s sekunder." #: js/messages.php:602 #, php-format msgid "%s argument(s) passed" -msgstr "" +msgstr "%s argument(er) sendt" #: js/messages.php:603 msgid "Show arguments" From 4d2a7d8ddbfe10f6e62021995aee4c3e1e00a2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aputsia=C4=B8=20Niels=20Janussen?= Date: Wed, 16 Sep 2015 13:20:38 +0200 Subject: [PATCH 03/13] Translated using Weblate (Danish) Currently translated at 93.2% (2992 of 3209 strings) [CI skip] --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index d1068a14a6..e83f6bd3c8 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" "PO-Revision-Date: 2015-09-16 13:20+0200\n" -"Last-Translator: Claus Svalekjaer \n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -2573,10 +2573,9 @@ msgid "Show arguments" msgstr "Tabel kommentarer" #: js/messages.php:604 -#, fuzzy #| msgid "Hide search results" msgid "Hide arguments" -msgstr "Slet søgeresultater" +msgstr "Skjul argumenterne" #: js/messages.php:605 libraries/Console.class.php:321 msgid "Time taken:" From c36a31719e416416fc746237e186f9d6471bf95a Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:21:04 +0200 Subject: [PATCH 04/13] Translated using Weblate (Danish) Currently translated at 93.2% (2993 of 3209 strings) [CI skip] --- po/da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/da.po b/po/da.po index e83f6bd3c8..08bbf93c8c 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" "PO-Revision-Date: 2015-09-16 13:20+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"Last-Translator: Claus Svalekjaer \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -2894,7 +2894,7 @@ msgstr "Angiv mindst {0} tegn" #: js/messages.php:787 msgid "Please enter a value between {0} and {1} characters long" -msgstr "" +msgstr "Indtast venligst en værdi mellem {0} og {1} karakterer" #: js/messages.php:788 msgid "Please enter a value between {0} and {1}" From 180fc5748582d3d3ab792206c2f66314704d462e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aputsia=C4=B8=20Niels=20Janussen?= Date: Wed, 16 Sep 2015 13:21:32 +0200 Subject: [PATCH 05/13] Translated using Weblate (Danish) Currently translated at 93.2% (2993 of 3209 strings) [CI skip] --- po/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 08bbf93c8c..6e96d6ff09 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:20+0200\n" -"Last-Translator: Claus Svalekjaer \n" +"PO-Revision-Date: 2015-09-16 13:21+0200\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -2894,7 +2894,7 @@ msgstr "Angiv mindst {0} tegn" #: js/messages.php:787 msgid "Please enter a value between {0} and {1} characters long" -msgstr "Indtast venligst en værdi mellem {0} og {1} karakterer" +msgstr "Indtast venligst en værdi med en længde på mellem {0} og {1} tegn" #: js/messages.php:788 msgid "Please enter a value between {0} and {1}" From 567b18717087f35e4e65b2af2beb746ff801f348 Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:22:49 +0200 Subject: [PATCH 06/13] Translated using Weblate (Danish) Currently translated at 93.3% (2996 of 3209 strings) [CI skip] --- po/da.po | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/po/da.po b/po/da.po index 6e96d6ff09..50e7164ac7 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:21+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"PO-Revision-Date: 2015-09-16 13:22+0200\n" +"Last-Translator: Claus Svalekjaer \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -2901,26 +2901,23 @@ msgid "Please enter a value between {0} and {1}" msgstr "Indtast venligst en værdi mellem {0} og {1}" #: js/messages.php:789 -#, fuzzy #| msgid "Please enter a valid length!" msgid "Please enter a value less than or equal to {0}" -msgstr "Angiv venligst en gyldig længde!" +msgstr "Angiv venligst værdi der er mindre end eller lig med {0}" #: js/messages.php:790 -#, fuzzy #| msgid "Please enter a valid page name" msgid "Please enter a value greater than or equal to {0}" -msgstr "Angiv venligst et gyldigt sidenavn" +msgstr "Angiv venligst værdi der er større end eller lig med {0}" #: js/messages.php:792 msgid "Please enter a valid date or time" msgstr "Angiv venligst en gyldig dato eller tid" #: js/messages.php:793 -#, fuzzy #| msgid "Please enter a valid number!" msgid "Please enter a valid HEX input" -msgstr "Angiv venligst et gyldigt nummer!" +msgstr "Angiv venligst et gyldigt HEX tal!" #: js/messages.php:794 libraries/Message.class.php:199 #: libraries/Util.class.php:657 libraries/core.lib.php:245 From 246ba2cab35c68f305ca553d4ae1ff12b0b87a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aputsia=C4=B8=20Niels=20Janussen?= Date: Wed, 16 Sep 2015 13:23:37 +0200 Subject: [PATCH 07/13] Translated using Weblate (Danish) Currently translated at 93.3% (2997 of 3209 strings) [CI skip] --- po/da.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/da.po b/po/da.po index 50e7164ac7..1f1cc0032e 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:22+0200\n" -"Last-Translator: Claus Svalekjaer \n" +"PO-Revision-Date: 2015-09-16 13:23+0200\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -2917,7 +2917,7 @@ msgstr "Angiv venligst en gyldig dato eller tid" #: js/messages.php:793 #| msgid "Please enter a valid number!" msgid "Please enter a valid HEX input" -msgstr "Angiv venligst et gyldigt HEX tal!" +msgstr "Angiv venligst et gyldigt HEX-tal" #: js/messages.php:794 libraries/Message.class.php:199 #: libraries/Util.class.php:657 libraries/core.lib.php:245 @@ -3169,10 +3169,9 @@ msgid "Count" msgstr "Antal" #: libraries/Console.class.php:292 -#, fuzzy #| msgid "Execute every" msgid "Execution order" -msgstr "Udfør hver" +msgstr "Rækkefølge for udførelse" #: libraries/Console.class.php:295 msgid "Time taken" From 1351f9eb4776a53d50957a041808d6134bfb2f26 Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:24:03 +0200 Subject: [PATCH 08/13] Translated using Weblate (Danish) Currently translated at 93.4% (2999 of 3209 strings) [CI skip] --- po/da.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/da.po b/po/da.po index 1f1cc0032e..540e279277 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:23+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"PO-Revision-Date: 2015-09-16 13:24+0200\n" +"Last-Translator: Claus Svalekjaer \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -3175,17 +3175,16 @@ msgstr "Rækkefølge for udførelse" #: libraries/Console.class.php:295 msgid "Time taken" -msgstr "" +msgstr "Tidsforbrug" #: libraries/Console.class.php:298 msgid "Order by:" msgstr "Rækkefølge:" #: libraries/Console.class.php:301 -#, fuzzy #| msgid "SQL queries" msgid "Group queries" -msgstr "SQL-forespørgsler" +msgstr "Gruppe SQL-forespørgsler" #: libraries/Console.class.php:304 #, fuzzy From b84b42b03cc51ab135c0f1a044474a9c5ca24017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aputsia=C4=B8=20Niels=20Janussen?= Date: Wed, 16 Sep 2015 13:29:09 +0200 Subject: [PATCH 09/13] Translated using Weblate (Danish) Currently translated at 93.4% (2999 of 3209 strings) [CI skip] --- po/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 540e279277..3288d81ee5 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:24+0200\n" -"Last-Translator: Claus Svalekjaer \n" +"PO-Revision-Date: 2015-09-16 13:29+0200\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -3184,7 +3184,7 @@ msgstr "Rækkefølge:" #: libraries/Console.class.php:301 #| msgid "SQL queries" msgid "Group queries" -msgstr "Gruppe SQL-forespørgsler" +msgstr "Gruppér SQL-forespørgsler" #: libraries/Console.class.php:304 #, fuzzy From 6eb779a8b2a25151f9c3f051e5f2bbd32ee8738d Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:29:57 +0200 Subject: [PATCH 10/13] Translated using Weblate (Danish) Currently translated at 93.4% (3000 of 3209 strings) [CI skip] --- po/da.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index 3288d81ee5..ff5d84752c 100644 --- a/po/da.po +++ b/po/da.po @@ -5,7 +5,7 @@ msgstr "" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" "PO-Revision-Date: 2015-09-16 13:29+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"Last-Translator: Claus Svalekjaer \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -3187,10 +3187,9 @@ msgid "Group queries" msgstr "Gruppér SQL-forespørgsler" #: libraries/Console.class.php:304 -#, fuzzy #| msgid "SQL queries" msgid "Ungroup queries" -msgstr "SQL-forespørgsler" +msgstr "Afgruppe SQL-forespørgsler" #: libraries/Console.class.php:315 #, fuzzy From fa94aba1821cd6309c01dc43772f1dd96927abbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aputsia=C4=B8=20Niels=20Janussen?= Date: Wed, 16 Sep 2015 13:30:13 +0200 Subject: [PATCH 11/13] Translated using Weblate (Danish) Currently translated at 93.4% (3000 of 3209 strings) [CI skip] --- po/da.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/da.po b/po/da.po index ff5d84752c..5eb0bfd5b7 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:29+0200\n" -"Last-Translator: Claus Svalekjaer \n" +"PO-Revision-Date: 2015-09-16 13:30+0200\n" +"Last-Translator: Aputsiaĸ Niels Janussen \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -3189,7 +3189,7 @@ msgstr "Gruppér SQL-forespørgsler" #: libraries/Console.class.php:304 #| msgid "SQL queries" msgid "Ungroup queries" -msgstr "Afgruppe SQL-forespørgsler" +msgstr "Opløs gruppering af SQL-forespørgsler" #: libraries/Console.class.php:315 #, fuzzy From 8ae09ac242f5500d26e3cfe6e122f941a12b0cf7 Mon Sep 17 00:00:00 2001 From: Claus Svalekjaer Date: Wed, 16 Sep 2015 13:31:12 +0200 Subject: [PATCH 12/13] Translated using Weblate (Danish) Currently translated at 93.5% (3003 of 3209 strings) [CI skip] --- po/da.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/da.po b/po/da.po index 5eb0bfd5b7..9fcc9cfee9 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-16 13:30+0200\n" -"Last-Translator: Aputsiaĸ Niels Janussen \n" +"PO-Revision-Date: 2015-09-16 13:31+0200\n" +"Last-Translator: Claus Svalekjaer \n" "Language-Team: Danish " "\n" "Language: da\n" @@ -3192,16 +3192,14 @@ msgid "Ungroup queries" msgstr "Opløs gruppering af SQL-forespørgsler" #: libraries/Console.class.php:315 -#, fuzzy #| msgid "Show create" msgid "Show trace" -msgstr "Vis opret" +msgstr "Vis sporing" #: libraries/Console.class.php:317 -#, fuzzy #| msgid "Hide Panel" msgid "Hide trace" -msgstr "Skjul panel" +msgstr "Skjul sporing" #: libraries/Console.class.php:319 msgid "Count:" @@ -3880,6 +3878,8 @@ msgstr "" msgid "" "Linting is disabled for this query because it exceeds the maximum length." msgstr "" +"Linting er deaktiveret for denne forespørgsel, da den overstiger max. " +"længden." #: libraries/Linter.class.php:162 #, php-format From 6d67dc258baaf6b667b028a228e1f3dc793aaceb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 16 Sep 2015 08:09:08 -0400 Subject: [PATCH 13/13] Fixes #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/server_variables.lib.php | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 665a72c344..8277a46fb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - issue Invalid argument supplied for foreach() - issue array_key_exists() expects parameter 2 to be array - issue #11480 Notice Undefined index: drop_database +- issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value 4.5.0.0 (not yet released) + rfe Pagination for GIS visualization diff --git a/libraries/server_variables.lib.php b/libraries/server_variables.lib.php index ec9164313b..807aef8efe 100644 --- a/libraries/server_variables.lib.php +++ b/libraries/server_variables.lib.php @@ -25,9 +25,11 @@ function PMA_getAjaxReturnForGetVal($variable_doc_links) // Send with correct charset header('Content-Type: text/html; charset=UTF-8'); + // Do not use double quotes inside the query to avoid a problem + // when server is running in ANSI_QUOTES sql_mode $varValue = $GLOBALS['dbi']->fetchSingleRow( - 'SHOW GLOBAL VARIABLES WHERE Variable_name="' - . PMA_Util::sqlAddSlashes($_REQUEST['varName']) . '";', + 'SHOW GLOBAL VARIABLES WHERE Variable_name=\'' + . PMA_Util::sqlAddSlashes($_REQUEST['varName']) . '\';', 'NUM' ); if (isset($variable_doc_links[$_REQUEST['varName']][3])