From 33a333fe57c7856d514afa9b715e68b8d9c37111 Mon Sep 17 00:00:00 2001 From: Dhananjay Nakrani Date: Wed, 12 Feb 2014 14:57:23 +0530 Subject: [PATCH 01/35] Fix For Bug#4279 Signed-off-by: Dhananjay Nakrani --- js/keyhandler.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/js/keyhandler.js b/js/keyhandler.js index a308da6b07..a378249c7a 100644 --- a/js/keyhandler.js +++ b/js/keyhandler.js @@ -1,4 +1,9 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ + +// gloabl vars to hold Arrow Down event timeStamps +var prevTimeStamp = 0; +var curTimeStamp = 0; + /** * Allows moving around inputs/select by Ctrl+arrows * @@ -7,6 +12,17 @@ function onKeyDownArrowsHandler(e) { e = e || window.event; + + curTimeStamp = e.timeStamp; + if( prevTimeStamp == 0 ) { + prevTimeStamp = curTimeStamp; + } + else if( Math.abs(curTimeStamp-prevTimeStamp) < 150 ) { + // event in a very quick succession + return; + } + prevTimeStamp = curTimeStamp; + var o = (e.srcElement || e.target); if (!o) { return; @@ -14,7 +30,6 @@ function onKeyDownArrowsHandler(e) if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") { return; } - console.log(e); if (navigator.userAgent.toLowerCase().indexOf('applewebkit/') != -1) { if (e.ctrlKey || e.shiftKey || !e.altKey) { return; From 7baa79c28cde1ce72003e85e964c26920f483ca2 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Fri, 21 Feb 2014 00:11:33 +0530 Subject: [PATCH 02/35] BugFix #4294 Signed-off-by: Umair Khan --- js/export.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/js/export.js b/js/export.js index a16bd29221..f169004727 100644 --- a/js/export.js +++ b/js/export.js @@ -185,9 +185,10 @@ AJAX.registerOnload('export.js', function () { var active_plugin = $("#plugins option:selected").val(); var force_file = $("#force_file_" + active_plugin).val(); if (force_file == "true") { + $("#radio_dump_asfile").prop('checked', true); $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4); } else { - $("#radio_view_as_text").removeProp('disabled').parent().fadeTo('fast', 1); + $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1); } }); }); From 5107df976ed7aff38201b2081084353f26c04f94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 24 Feb 2014 07:36:51 +0100 Subject: [PATCH 03/35] Translated using Weblate (Bengali) Currently translated at 98.0% (2696 of 2749) --- po/bn.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/bn.po b/po/bn.po index 53989a2726..ed87becd6f 100644 --- a/po/bn.po +++ b/po/bn.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-20 07:47+0200\n" +"PO-Revision-Date: 2014-02-24 07:36+0200\n" "Last-Translator: Michal Čihař \n" "Language-Team: Bengali \n" "Language: bn\n" @@ -557,7 +557,7 @@ msgstr "একটি ভিতরের গোলক যোগ কর" #, php-format #| msgid "Polygon" msgid "Polygon %d:" -msgstr "পলিগন" +msgstr "পলিগন %d:" #: gis_data_editor.php:386 js/messages.php:336 msgid "Add a polygon" From 961c567013e4afc40c947cb630122e1f648042a3 Mon Sep 17 00:00:00 2001 From: minsung kang Date: Sun, 23 Feb 2014 05:41:47 +0100 Subject: [PATCH 04/35] Translated using Weblate (Korean) Currently translated at 75.1% (2065 of 2749) --- po/ko.po | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/po/ko.po b/po/ko.po index 76aa87d01c..9117803ce7 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-19 16:50+0200\n" +"PO-Revision-Date: 2014-02-23 05:41+0200\n" "Last-Translator: minsung kang \n" "Language-Team: Korean \n" "Language: ko\n" @@ -5972,10 +5972,9 @@ msgid "" msgstr "" #: libraries/config/messages.inc.php:438 -#, fuzzy #| msgid "Copy column name" msgid "Display columns table" -msgstr "열(컬럼) 이름 복사" +msgstr "열 목록 표시" #: libraries/config/messages.inc.php:439 msgid "" @@ -6061,32 +6060,27 @@ msgid "User preferences storage table" msgstr "사용자 설정 스토리지 테이블" #: libraries/config/messages.inc.php:455 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/" #| "kbd]" msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]pma__users" "[/kbd]" -msgstr "" -"PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]" +msgstr "설정을 변경할 수 있는 메뉴를 지정하지 않는 경우 빈칸으로 남겨두십시오. 권장: [kbd]pma__pdf_pages[/kbd]" #: libraries/config/messages.inc.php:456 -#, fuzzy #| msgid "Use Tables" msgid "Users table" -msgstr "사용할 테이블" +msgstr "사용자 목록" #: libraries/config/messages.inc.php:457 -#, fuzzy #| msgid "" #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/" #| "kbd]" msgid "" "Leave blank to disable configurable menus feature, suggested: [kbd]" "pma__usergroups[/kbd]" -msgstr "" -"PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]" +msgstr "설정을 변경할 수 있는 메뉴를 지정하지 않는 경우 빈칸으로 남겨두십시오. 권장: [kbd]pma__pdf_pages[/kbd]" #: libraries/config/messages.inc.php:458 #| msgid "Use Tables" @@ -6094,7 +6088,6 @@ msgid "User groups table" msgstr "사용자 그룹 테이블" #: libraries/config/messages.inc.php:459 -#, fuzzy #| msgid "" #| "Leave blank for no SQL query tracking support, suggested: [kbd]" #| "pma__tracking[/kbd]" @@ -6102,8 +6095,8 @@ msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]" msgstr "" -"SQL 쿼리 추적 기능을 사용하지 않으려면 빈 칸으로 비워두세요. 권장: [kbd]" -"pma__tracking[/kbd]" +"네비게이션 항목의 표시 설정을 사용하지 않는 경우 빈칸으로 남겨두십시오. 권장: " +"[kbd]pma__navigationhiding[/kbd]" #: libraries/config/messages.inc.php:460 msgid "Hidden navigation items table" From f7a887715b94ffd4e6fd88405907ca5b42f08190 Mon Sep 17 00:00:00 2001 From: Domen Date: Sat, 22 Feb 2014 15:17:31 +0100 Subject: [PATCH 05/35] Translated using Weblate (Slovenian) Currently translated at 100.0% (2749 of 2749) --- po/sl.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/po/sl.po b/po/sl.po index 583fa6046f..2bd4a0b000 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,9 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-19 20:25+0200\n" +"PO-Revision-Date: 2014-02-22 15:17+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12772,10 +12773,10 @@ msgid "" "level directory as described in [doc@setup_script]documentation[/doc]. " "Otherwise you will be only able to download or display it." msgstr "" -"Prosimo, na spletnem strežniku ustvarite zapisljivo mapo [em]config[/em] v " -"najvišjem nivoju mape phpMyAdmina, kot opisuje [doc@setup_script]" -"dokumentacija[/doc]. V naprotnem primeru jo boste lahko samo prenesli ali jo " -"prikazali." +"Prosimo, da na spletnem strežniku ustvarite zapisljivo mapo [em]config[/em] " +"v najvišjem nivoju mape phpMyAdmina, kot opisuje " +"[doc@setup_script]dokumentacija[/doc]. V nasprotnem primeru jo boste lahko " +"samo prenesli ali jo prikazali." #: setup/frames/index.inc.php:68 msgid "" @@ -12829,7 +12830,7 @@ msgstr "Nov strežnik" #: setup/frames/index.inc.php:229 msgid "Default language" -msgstr "Privzet jezik" +msgstr "Privzeti jezik" #: setup/frames/index.inc.php:239 msgid "let the user choose" @@ -12841,7 +12842,7 @@ msgstr "- noben -" #: setup/frames/index.inc.php:254 msgid "Default server" -msgstr "Privzet strežnik" +msgstr "Privzeti strežnik" #: setup/frames/index.inc.php:266 msgid "End of line" From 68548f6960b1fd9a690fe85b21288af5194dc7be Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 24 Feb 2014 07:43:05 -0500 Subject: [PATCH 06/35] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index f9d1a75ee2..e6ea0c8576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.1.9.0 (not yet released) +- bug #4279 CTRL + up or down moves two fields (part one) 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry From 2ca57354430244fcc4903bbc4888a898e70fd759 Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Mon, 24 Feb 2014 18:21:17 +0530 Subject: [PATCH 07/35] Fix empty filename during export Signed-off-by: Umair Khan --- js/export.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/js/export.js b/js/export.js index f169004727..03dd329249 100644 --- a/js/export.js +++ b/js/export.js @@ -132,8 +132,8 @@ function toggle_save_to_file() $("#ul_save_asfile > li> select").prop('disabled', true); } else { $("#ul_save_asfile > li").fadeTo('fast', 1); - $("#ul_save_asfile > li > input").removeProp('disabled'); - $("#ul_save_asfile > li> select").removeProp('disabled'); + $("#ul_save_asfile > li > input").prop('disabled', false); + $("#ul_save_asfile > li> select").prop('disabled', false); } } @@ -185,7 +185,10 @@ AJAX.registerOnload('export.js', function () { var active_plugin = $("#plugins option:selected").val(); var force_file = $("#force_file_" + active_plugin).val(); if (force_file == "true") { - $("#radio_dump_asfile").prop('checked', true); + if ($("#radio_dump_asfile").prop('checked') !== true) { + $("#radio_dump_asfile").prop('checked', true); + toggle_save_to_file(); + } $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4); } else { $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1); From 42202fe883253a3d0ae54e59cf17902d3a19435c Mon Sep 17 00:00:00 2001 From: "cmdr.by" Date: Mon, 24 Feb 2014 17:20:45 +0100 Subject: [PATCH 08/35] Translated using Weblate (Belarusian) Currently translated at 31.4% (865 of 2749) --- po/be.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/be.po b/po/be.po index 38ee691980..ea199b9aa7 100644 --- a/po/be.po +++ b/po/be.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2013-08-23 11:32+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Belarusian \n" +"PO-Revision-Date: 2014-02-24 17:20+0200\n" +"Last-Translator: cmdr.by \n" +"Language-Team: Belarusian " +"\n" "Language: be\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.7-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -35,7 +35,6 @@ msgstr "Камэнтар да базы дадзеных: " #: db_datadict.php:159 libraries/schema/Pdf_Relation_Schema.class.php:1348 #: libraries/tbl_columns_definition_form.lib.php:70 #: libraries/tbl_printview.lib.php:579 -#, fuzzy #| msgid "Table comments" msgid "Table comments:" msgstr "Камэнтар да табліцы" From 02ce9e3a98668862175b07b03fb484823f2ddd4f Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 24 Feb 2014 16:09:51 -0500 Subject: [PATCH 09/35] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index e6ea0c8576..90a1fbd548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.1.9.0 (not yet released) - bug #4279 CTRL + up or down moves two fields (part one) +- bug #4294 output as text radio clickable for "OpenDocument Text" export 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry From 10dae53a2d921dea8885540827ee98e621f6774a Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 25 Feb 2014 16:56:33 +0100 Subject: [PATCH 10/35] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 1056 +++++++++++++++++++-------------------------------- 1 file changed, 388 insertions(+), 668 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 1d1118bb57..4f9f574e7e 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -20,7 +20,7 @@ msgstr "" msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." -msgstr "系統上查無 %s 檔案，詳情請參考 www.phpmyadmin.net。" +msgstr "系統上找不到 %s 檔案，詳情請參考 www.phpmyadmin.net。" #: db_create.php:61 #, php-format @@ -593,9 +593,7 @@ msgstr "輸出" msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field" -msgstr "" -"從 \"Function\" 的欄位中選擇 \"GeomFromText\"，然後將下方的字串貼到 \"Value" -"\" 欄位" +msgstr "從 \"Function\" 的欄位中選擇 \"GeomFromText\"，然後將下方的字串貼到 \"Value\" 欄位" #: import.php:116 #, php-format @@ -623,9 +621,7 @@ msgstr "無法讀取檔案" msgid "" "You attempted to load file with unsupported compression (%s). Either support " "for it is not implemented or disabled by your configuration." -msgstr "" -"您試圖載入未支援的壓縮檔(%s)。可能是檔案格式尚未被支援或該檔案在您的設定檔中" -"被停用。" +msgstr "您試圖載入未支援的壓縮檔(%s)。可能是檔案格式尚未被支援或該檔案在您的設定檔中被停用。" #: import.php:461 msgid "" @@ -633,8 +629,7 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[doc@faq1-16]FAQ 1.16[/doc]." msgstr "" -"沒有接收到要匯入的資料。 可能是檔案名稱沒有被送出或是檔案大小超出 PHP 限制。 " -"請參考 [doc@faq1-16]FAQ 1.16[/doc]。" +"沒有接收到要匯入的資料。 可能是檔案名稱沒有被送出或是檔案大小超出 PHP 限制。 請參考 [doc@faq1-16]FAQ 1.16[/doc]。" #: import.php:481 msgid "" @@ -659,16 +654,13 @@ msgstr "匯入成功完成，共執行了 %d 個查詢指令。" msgid "" "Script timeout passed, if you want to finish import, please resubmit same " "file and import will resume." -msgstr "" -"Script 執行已逾時，若要繼續完成匯入，請重新送出相同檔案，匯入動作會繼續執行。" +msgstr "Script 執行已逾時，若要繼續完成匯入，請重新送出相同檔案，匯入動作會繼續執行。" #: import.php:595 msgid "" "However on last run no data has been parsed, this usually means phpMyAdmin " "won't be able to finish this import unless you increase php time limits." -msgstr "" -"最近一次執行的匯入沒有資料可以解析，通常是 phpMyAdmin 無法在時間內完成匯入的" -"動作，您可增加 PHP 執行時間的限制。" +msgstr "最近一次執行的匯入沒有資料可以解析，通常是 phpMyAdmin 無法在時間內完成匯入的動作，您可增加 PHP 執行時間的限制。" #: import_status.php:87 libraries/Util.class.php:735 #: libraries/schema/Export_Relation_Schema.class.php:246 user_password.php:239 @@ -685,9 +677,7 @@ msgid "" "You are using the demo server. You can do anything here, but please do not " "change root, debian-sys-maint and pma users. More information is available " "at %s." -msgstr "" -"您正在使用展示主機，您可以在此做任何事情，但請勿更改 root、debian-sys-maint " -"及 pma 使用者。這兒有更多的資訊 %s。" +msgstr "您正在使用展示主機，您可以在此做任何事情，但請勿更改 root、debian-sys-maint 及 pma 使用者。這兒有更多的資訊 %s。" #: index.php:129 msgid "General Settings" @@ -778,7 +768,7 @@ msgstr "官方首頁" #: index.php:376 msgid "Contribute" -msgstr "我要貢獻" +msgstr "貢獻" #: index.php:383 msgid "Get support" @@ -795,18 +785,15 @@ msgid "" "running with this default, is open to intrusion, and you really should fix " "this security hole by setting a password for user 'root'." msgstr "" -"您的設定檔當中使用了 (無設定密碼的 root) 的設定，該設定是 MySQL 預設的管理帳" -"號。若您繼續使用預設 MySQL 管理帳號執行伺服器，可能會導致伺服器被入侵，強烈建" -"議您設定管理者帳號 'root' 的密碼以避免這個安全性的漏洞。" +"您的設定檔當中使用了 (無設定密碼的 root) 的設定，該設定是 MySQL 預設的管理帳號。若您繼續使用預設 MySQL " +"管理帳號執行伺服器，可能會導致伺服器被入侵，強烈建議您設定管理者帳號 'root' 的密碼以避免這個安全性的漏洞。" #: index.php:429 msgid "" "You have enabled mbstring.func_overload in your PHP configuration. This " "option is incompatible with phpMyAdmin and might cause some data to be " "corrupted!" -msgstr "" -"您已啟用了 PHP 設定中的 mbstring.func_overload。此選項與 phpMyAdmin 不相容，" -"可能會導致一些資料損壞！" +msgstr "您已啟用了 PHP 設定中的 mbstring.func_overload。此選項與 phpMyAdmin 不相容，可能會導致一些資料損壞！" #: index.php:444 msgid "" @@ -814,9 +801,8 @@ msgid "" "multibyte charset. Without the mbstring extension phpMyAdmin is unable to " "split strings correctly and it may result in unexpected results." msgstr "" -"找不到 PHP 的 mbstring 擴充套件，且您正使用多位元(Multibyte)字元編碼。 若沒" -"有 mbstring 擴充套件 phpMyAdmin 將無法正確分割字串，這可能造成意料之外的錯" -"誤。" +"找不到 PHP 的 mbstring 擴充套件，且您正使用多位元(Multibyte)字元編碼。 若沒有 mbstring 擴充套件 " +"phpMyAdmin 將無法正確分割字串，這可能造成意料之外的錯誤。" #: index.php:459 msgid "" @@ -825,18 +811,18 @@ 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] 所設定的時間" -"短於您在 phpMyAdmin 中設定的 Cookies 有效期間，因此您的登入連線有效期間將會比" -"您在 phpMyAdmin 中設定的時間要更短。" +"您在 PHP 設定參數中 " +"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-" +"maxlifetime@_blank]session.gc_maxlifetime[/a] 所設定的時間短於您在 phpMyAdmin 中設定的 " +"Cookies 有效期間，因此您的登入連線有效期間將會比您在 phpMyAdmin 中設定的時間要更短。" #: index.php:471 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 "" -"phpMyAdmin 中所設定的登入 cookie 儲存時間小於 cookie 有效期間，因此您的登入連" -"線有效期間將會比您在 phpMyAdmin 中設定的時間要更短。" +"phpMyAdmin 中所設定的登入 cookie 儲存時間小於 cookie 有效期間，因此您的登入連線有效期間將會比您在 phpMyAdmin " +"中設定的時間要更短。" #: index.php:483 msgid "The configuration file now needs a secret passphrase (blowfish_secret)." @@ -849,27 +835,22 @@ msgid "" "once phpMyAdmin has been configured. Otherwise the security of your server " "may be compromised by unauthorized people downloading your configuration." msgstr "" -"安裝時所用的 [code]config[/code] 資料夾尚未被刪除。強烈建議在 phpMyAdmin 設定" -"完成之後移除該資料夾，否則會有未經授權的人下載你的設定檔而對伺服器安全性造成" -"威脅。" +"安裝時所用的 [code]config[/code] 資料夾尚未被刪除。強烈建議在 phpMyAdmin " +"設定完成之後移除該資料夾，否則會有未經授權的人下載你的設定檔而對伺服器安全性造成威脅。" #: index.php:504 #, php-format msgid "" "The phpMyAdmin configuration storage is not completely configured, some " "extended features have been deactivated. To find out why click %shere%s." -msgstr "" -"尚未設定 phpMyAdmin 資料庫，某些進階功能將無法使用。請點選 %s此處%s 取得詳細" -"資訊。" +msgstr "尚未設定 phpMyAdmin 資料庫，某些進階功能將無法使用。請點選 %s此處%s 取得詳細資訊。" #: index.php:540 #, php-format msgid "" "Your PHP MySQL library version %s differs from your MySQL server version %s. " "This may cause unpredictable behavior." -msgstr "" -"您的 PHP MySQL 函式庫版本 %s 與您的 MySQL 伺服器版本 %s 不同，這可能造成一些" -"無法預期的問題。" +msgstr "您的 PHP MySQL 函式庫版本 %s 與您的 MySQL 伺服器版本 %s 不同，這可能造成一些無法預期的問題。" #: index.php:564 #, php-format @@ -1019,9 +1000,7 @@ msgid "" "compatible anymore to the newer version of the monitor dialog. It is very " "likely that your current configuration will not work anymore. Please reset " "your configuration to default in the Settings menu." -msgstr "" -"在您瀏覽器內的圖表版面設定無法相容於新版的即時監控，可能已無法使用。 請於" -"「設定」選單中重新設定以避免發生不可預期的錯誤。" +msgstr "在您瀏覽器內的圖表版面設定無法相容於新版的即時監控，可能已無法使用。 請於「設定」選單中重新設定以避免發生不可預期的錯誤。" #: js/messages.php:81 msgid "Query cache efficiency" @@ -1225,8 +1204,8 @@ msgid "" "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, " "depending on your system." msgstr "" -"slow_query_log 已啟用，但伺服器只記錄執行時間超過 %d 秒的查詢。建議根據您的系" -"統狀況將 long_query_time 設定為 0-2 秒之間。" +"slow_query_log 已啟用，但伺服器只記錄執行時間超過 %d 秒的查詢。建議根據您的系統狀況將 long_query_time 設定為 0-2 " +"秒之間。" #: js/messages.php:136 #, php-format @@ -1324,18 +1303,14 @@ msgid "" "This column shows the amount of identical queries that are grouped together. " "However only the SQL query itself has been used as a grouping criteria, so " "the other attributes of queries, such as start time, may differ." -msgstr "" -"此欄位將完全相同的查詢合併以數量顯示。系統僅使用 SQL 查詢條件做為群組的依據其" -"餘的查詢參數，可能會有所不同，如: 開始時間。" +msgstr "此欄位將完全相同的查詢合併以數量顯示。系統僅使用 SQL 查詢條件做為群組的依據其餘的查詢參數，可能會有所不同，如: 開始時間。" #: js/messages.php:168 msgid "" "Since grouping of INSERTs queries has been selected, INSERT queries into the " "same table are also being grouped together, disregarding of the inserted " "data." -msgstr "" -"當您選擇將新增(INSERT)查詢分群組顯示，則所有新增至相同資料表的查詢將會合併顯" -"示，但不包含資料。" +msgstr "當您選擇將新增(INSERT)查詢分群組顯示，則所有新增至相同資料表的查詢將會合併顯示，但不包含資料。" #: js/messages.php:169 msgid "Log data loaded. Queries executed in this time span:" @@ -1436,9 +1411,7 @@ msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" -"在向伺服器取得新的圖表資料時取得無效的回應，可能是您的連線階段已經過期。 請重" -"新整理頁面並重新輸入帳號密碼解決此問題。" +msgstr "在向伺服器取得新的圖表資料時取得無效的回應，可能是您的連線階段已經過期。 請重新整理頁面並重新輸入帳號密碼解決此問題。" #: js/messages.php:198 msgid "Reload page" @@ -1744,7 +1717,7 @@ msgstr "放大，請使用滑鼠選擇一個區域。" #: js/messages.php:309 msgid "Click reset zoom button to come back to original state." -msgstr "點擊「重設縮放大小」按鈕可以回到原始大小。" +msgstr "點選「重設縮放大小」按鈕可以回到原始大小。" #: js/messages.php:311 msgid "Click a data point to view and possibly edit the data row." @@ -1827,7 +1800,7 @@ msgstr "請選擇要顯示的欄位" msgid "" "You haven't saved the changes in the layout. They will be lost if you don't " "save them. Do you want to continue?" -msgstr "你尚未儲存修改的資料。請確認是否要捨棄這些資料？" +msgstr "你尚未儲存修改的資料，請確認是否要捨棄這些資料？" #: js/messages.php:352 msgid "Add an option for column " @@ -1862,7 +1835,7 @@ msgstr "點此標記或取消標記" #: js/messages.php:361 msgid "Double-click to copy column name" -msgstr "雙擊點選以複製欄位名稱" +msgstr "點兩下以複製欄位名稱。" #: js/messages.php:363 msgid "Click the drop-down arrow
to toggle column's visibility" @@ -1879,17 +1852,15 @@ msgstr "全部顯示" msgid "" "This table does not contain a unique column. Features related to the grid " "edit, checkbox, Edit, Copy and Delete links may not work after saving." -msgstr "" -"此資料表沒有唯一欄位用來辦示資料。 有關資料表修改、複製、刪除的功能可能會無法" -"儲存。" +msgstr "此資料表沒有唯一欄位用來辦示資料。 有關資料表修改、複製、刪除的功能可能會無法儲存。" #: js/messages.php:371 msgid "You can also edit most values
by double-clicking directly on them." -msgstr "您可以雙擊點選表格內容
直接做編輯修改。" +msgstr "您可以點兩下以選表格內容
直接做編輯修改。" #: js/messages.php:374 msgid "You can also edit most values
by clicking directly on them." -msgstr "您可以單擊點選表格內容
直接做編輯修改。" +msgstr "您可以直接點選數值
以進行編輯修改。" #: js/messages.php:379 msgid "Go to link" @@ -1944,13 +1915,12 @@ msgstr "已無歷史記錄頁面或頁面已經逾期。" msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "" -"新的 phpMyAdmin 已經發佈，請考慮升級至最新的版本（版本 %s，於 %s 發佈）。" +msgstr "新的 phpMyAdmin 已經發佈，請考慮升級至最新的版本（版本 %s，於 %s 發佈）。" #. l10n: Latest available phpMyAdmin version #: js/messages.php:403 msgid ", latest stable version:" -msgstr "，最新的穩定版本:" +msgstr "，最新的穩定版:" #: js/messages.php:404 msgid "up to date" @@ -3107,11 +3077,11 @@ msgstr "查詢快取" #: libraries/ServerStatusData.class.php:193 msgid "Threads" -msgstr "程序" +msgstr "執行緒" #: libraries/ServerStatusData.class.php:195 msgid "Temporary data" -msgstr "臨時資料" +msgstr "暫存資料" #: libraries/ServerStatusData.class.php:196 msgid "Delayed inserts" @@ -3259,9 +3229,7 @@ msgstr "無法儲存資料表「介面偏好」" msgid "" "Failed to cleanup table UI preferences (see $cfg['Servers'][$i]" "['MaxTableUiprefs'] %s)" -msgstr "" -"在清空資料表「介面偏好」時發生錯誤。（詳見 $cfg['Servers'][$i]" -"['MaxTableUiprefs'] %s）" +msgstr "在清空資料表「介面偏好」時發生錯誤。（詳見 $cfg['Servers'][$i]['MaxTableUiprefs'] %s）" #: libraries/Table.class.php:1650 #, php-format @@ -3269,9 +3237,7 @@ msgid "" "Cannot save UI property \"%s\". The changes made will not be persistent " "after you refresh this page. Please check if the table structure has been " "changed." -msgstr "" -"無法儲存介面偏好「%s」，這個修改在下次將不會生效。請檢查該資料表的架構是否被" -"修改過。" +msgstr "無法儲存介面偏好「%s」，這個修改在下次將不會生效。請檢查該資料表的架構是否被修改過。" #: libraries/TableSearch.class.php:181 libraries/insert_edit.lib.php:211 #: libraries/insert_edit.lib.php:217 @@ -3435,32 +3401,27 @@ msgstr "2 位元組整數，有號數範圍由 -32,768 至 32,767，無號數範 msgid "" "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is " "0 to 16,777,215" -msgstr "" -"3 位元組整數，有號數範圍由 -8,388,608 至 8,388,607，無號數範圍由 0 至 " -"16,777,215" +msgstr "3 位元組整數，有號數範圍由 -8,388,608 至 8,388,607，無號數範圍由 0 至 16,777,215" #: libraries/Types.class.php:303 msgid "" "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned " "range is 0 to 4,294,967,295" -msgstr "" -"四個位元組的整數，如果包含負數，範圍將在-2147483648至2147483647，如果不包含負" -"數，範圍則在0至4294967295" +msgstr "四個位元組的整數，如果包含負數，範圍將在-2147483648至2147483647，如果不包含負數，範圍則在0至4294967295" #: libraries/Types.class.php:305 msgid "" "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615" msgstr "" -"8 位元組整數，有號數範圍由 -9,223,372,036,854,775,808 至 " -"9,223,372,036,854,775,807，無號數範圍由 0 至 18,446,744,073,709,551,615" +"8 位元組整數，有號數範圍由 -9,223,372,036,854,775,808 至 9,223,372,036,854,775,807，無號數範圍由 " +"0 至 18,446,744,073,709,551,615" #: libraries/Types.class.php:307 libraries/Types.class.php:714 msgid "" "A fixed-point number (M, D) - the maximum number of digits (M) is 65 " "(default 10), the maximum number of decimals (D) is 30 (default 0)" -msgstr "" -"定點數 (M, D) - (M) 最大為 65 位數 (預設 10)，(D) 小數位數最大為 30 (預設 0)" +msgstr "定點數 (M, D) - (M) 最大為 65 位數 (預設 10)，(D) 小數位數最大為 30 (預設 0)" #: libraries/Types.class.php:309 msgid "" @@ -3476,8 +3437,8 @@ msgid "" "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and " "2.2250738585072014E-308 to 1.7976931348623157E+308" msgstr "" -"倍準浮點數，範圍為 -1.7976931348623157E+308 至 -2.2250738585072014E-308、0 " -"及 2.2250738585072014E-308 至 1.7976931348623157E+308" +"倍準浮點數，範圍為 -1.7976931348623157E+308 至 -2.2250738585072014E-308、0 及 " +"2.2250738585072014E-308 至 1.7976931348623157E+308" #: libraries/Types.class.php:313 msgid "" @@ -3516,8 +3477,8 @@ msgid "" "A timestamp, range is 1970-01-01 00:00:01 UTC to 2038-01-09 03:14:07 UTC, " "stored as the number of seconds since the epoch (1970-01-01 00:00:00 UTC)" msgstr "" -"時間戳記的有效範圍為 1970-01-01 00:00:01 UTC 至 2038-01-09 03:14:07 UTC，使用" -"自 1970-01-01 00:00:00 UTC 計算的秒數儲存" +"時間戳記的有效範圍為 1970-01-01 00:00:01 UTC 至 2038-01-09 03:14:07 UTC，使用自 1970-01-01 " +"00:00:00 UTC 計算的秒數儲存" #: libraries/Types.class.php:327 libraries/Types.class.php:730 #, php-format @@ -3528,9 +3489,7 @@ msgstr "時間的有效範圍為 %1$s 至 %2$s" msgid "" "A year in four-digit (4, default) or two-digit (2) format, the allowable " "values are 70 (1970) to 69 (2069) or 1901 to 2155 and 0000" -msgstr "" -"以 4 位數或 2 位數的方式表示年份的有效範圍為 70 (1970) 至 69 (2069) 或 1901 " -"至 2155 和 0000" +msgstr "以 4 位數或 2 位數的方式表示年份的有效範圍為 70 (1970) 至 69 (2069) 或 1901 至 2155 和 0000" #: libraries/Types.class.php:331 msgid "" @@ -3549,34 +3508,26 @@ msgstr "可變長度 (%s) 的字串，最大的有效長度需視資料列大小 msgid "" "A TEXT column with a maximum length of 255 (2^8 - 1) characters, stored with " "a one-byte prefix indicating the length of the value in bytes" -msgstr "" -"純文字(TEXT)欄位，最大長度為 255 (2^8 - 1) 個字元，儲存時會附加 1 個位元組在" -"最前面用來記錄長度" +msgstr "純文字(TEXT)欄位，最大長度為 255 (2^8 - 1) 個字元，儲存時會附加 1 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:337 libraries/Types.class.php:734 msgid "" "A TEXT column with a maximum length of 65,535 (2^16 - 1) characters, stored " "with a two-byte prefix indicating the length of the value in bytes" -msgstr "" -"純文字(TEXT)欄位，最大長度為 65,535 (2^16 - 1) 個字元，儲存時會附加 2 個位元" -"組在最前面用來記錄長度" +msgstr "純文字(TEXT)欄位，最大長度為 65,535 (2^16 - 1) 個字元，儲存時會附加 2 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:339 msgid "" "A TEXT column with a maximum length of 16,777,215 (2^24 - 1) characters, " "stored with a three-byte prefix indicating the length of the value in bytes" -msgstr "" -"純文字(TEXT)欄位，最大長度為 16,777,215 (2^24 - 1) 個字元，儲存時會附加 3 個" -"位元組在最前面用來記錄長度" +msgstr "純文字(TEXT)欄位，最大長度為 16,777,215 (2^24 - 1) 個字元，儲存時會附加 3 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:341 msgid "" "A TEXT column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "characters, stored with a four-byte prefix indicating the length of the " "value in bytes" -msgstr "" -"純文字(TEXT)欄位，最大長度為 4GiB (2^32 - 1) 個字元，儲存時會附加 4 個位元組" -"在最前面用來記錄長度" +msgstr "純文字(TEXT)欄位，最大長度為 4GiB (2^32 - 1) 個字元，儲存時會附加 4 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:343 msgid "" @@ -3594,33 +3545,28 @@ msgstr "類似 VARCHAR 型態，但此類型以二進位的方式儲存字串 msgid "" "A BLOB column with a maximum length of 255 (2^8 - 1) bytes, stored with a " "one-byte prefix indicating the length of the value" -msgstr "" -"大型二進位物件(BLOB)欄位，最大長度為 255 (2^8 - 1) 個位元組，儲存時會附加 1 " -"個位元組在最前面用來記錄長度" +msgstr "大型二進位物件(BLOB)欄位，最大長度為 255 (2^8 - 1) 個位元組，儲存時會附加 1 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:349 msgid "" "A BLOB column with a maximum length of 16,777,215 (2^24 - 1) bytes, stored " "with a three-byte prefix indicating the length of the value" msgstr "" -"大型二進位物件(BLOB)欄位，最大長度為 16,777,215 (2^24 - 1) 個位元組，儲存時會" -"附加 3 個位元組在最前面用來記錄長度" +"大型二進位物件(BLOB)欄位，最大長度為 16,777,215 (2^24 - 1) 個位元組，儲存時會附加 3 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:351 libraries/Types.class.php:738 msgid "" "A BLOB column with a maximum length of 65,535 (2^16 - 1) bytes, stored with " "a two-byte prefix indicating the length of the value" -msgstr "" -"大型二進位物件(BLOB)欄位，最大長度為 65,535 (2^16 - 1) 個位元組，儲存時會附" -"加 2 個位元組在最前面用來記錄長度" +msgstr "大型二進位物件(BLOB)欄位，最大長度為 65,535 (2^16 - 1) 個位元組，儲存時會附加 2 個位元組在最前面用來記錄長度" #: libraries/Types.class.php:353 msgid "" "A BLOB column with a maximum length of 4,294,967,295 or 4GiB (2^32 - 1) " "bytes, stored with a four-byte prefix indicating the length of the value" msgstr "" -"大型二進位物件(BLOB)欄位，最大長度為 4,294,967,295 or 4GiB (2^32 - 1) 個位元" -"組，儲存時會附加 4 個位元組在最前面用來記錄長度" +"大型二進位物件(BLOB)欄位，最大長度為 4,294,967,295 or 4GiB (2^32 - 1) 個位元組，儲存時會附加 4 " +"個位元組在最前面用來記錄長度" #: libraries/Types.class.php:355 msgid "" @@ -3692,9 +3638,7 @@ msgstr "4 個位元組整數，範圍是 -2,147,483,648 到 2,147,483,647 之間 msgid "" "An 8-byte integer, range is -9,223,372,036,854,775,808 to " "9,223,372,036,854,775,807" -msgstr "" -"8 個位元組整數，範圍是 -9,223,372,036,854,775,808 到 " -"9,223,372,036,854,775,807" +msgstr "8 個位元組整數，範圍是 -9,223,372,036,854,775,808 到 9,223,372,036,854,775,807" #: libraries/Types.class.php:716 msgid "A system's default double-precision floating-point number" @@ -3717,8 +3661,8 @@ msgid "" "A timestamp, range is '0001-01-01 00:00:00' UTC to '9999-12-31 23:59:59' " "UTC; TIMESTAMP(6) can store microseconds" msgstr "" -"時間戳記，範圍由 '0001-01-01 00:00:00' UTC 到 '9999-12-31 23:59:59' UTC；" -"TIMESTAMP(6) 可以存儲到微秒" +"時間戳記，範圍由 '0001-01-01 00:00:00' UTC 到 '9999-12-31 23:59:59' UTC；TIMESTAMP(6) " +"可以存儲到微秒" #: libraries/Types.class.php:736 msgid "" @@ -4039,7 +3983,7 @@ msgstr "右" #: libraries/config.values.php:82 msgid "Click" -msgstr "點擊" +msgstr "點選" #: libraries/config.values.php:83 msgid "Double click" @@ -4217,7 +4161,7 @@ msgstr "允許使用者自訂此值" #: libraries/config/FormDisplay.tpl.php:391 msgid "Apply" -msgstr "應用" +msgstr "套用" #: libraries/config/FormDisplay.tpl.php:393 libraries/insert_edit.lib.php:1604 #: libraries/schema/User_Schema.class.php:567 prefs_manage.php:327 @@ -4266,7 +4210,7 @@ msgstr "輸入的值不正確：" #: libraries/config/Validator.class.php:456 #, php-format msgid "Incorrect IP address: %s" -msgstr "%s 是一個錯誤的 IP 網址" +msgstr "%s 是一個錯誤的 IP 位址" #: libraries/config/messages.inc.php:17 msgid "" @@ -4283,8 +4227,8 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" -"開啓虍功能將允許其它網域的網頁透過框架頁使用 phpMyAdmin，這潛藏跨框架腳本攻擊" -"(Cross-frame scripting attack)的[strong]安全漏洞[/strong]" +"開啓虍功能將允許其它網域的網頁透過框架頁使用 phpMyAdmin，這潛藏跨框架腳本攻擊(Cross-frame scripting " +"attack)的[strong]安全漏洞[/strong]" #: libraries/config/messages.inc.php:20 msgid "Allow third party framing" @@ -4339,8 +4283,8 @@ msgid "" "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/" "kbd] - allows newlines in columns" msgstr "" -"定義在修改 CHAR 和 VARCHAR 類型欄位時可使用何種編輯元件，[kbd]文字方塊(input)" -"[/kbd] - 可以限制輸入長度，[kbd]文字區塊(textarea)[/kbd] - 可以輸入多行資料" +"定義在修改 CHAR 和 VARCHAR 類型欄位時可使用何種編輯元件，[kbd]文字方塊(input)[/kbd] - " +"可以限制輸入長度，[kbd]文字區塊(textarea)[/kbd] - 可以輸入多行資料" #: libraries/config/messages.inc.php:31 msgid "CHAR columns editing" @@ -4351,8 +4295,7 @@ msgid "" "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]" "CodeMirror[/a]) with syntax highlighting and line numbers" msgstr "" -"使用 [a@http://codemirror.net/]CodeMirror[/a] 編輯器來編輯 SQL 查詢語法 (具語" -"法加強顯示和行號功能)" +"使用 [a@http://codemirror.net/]CodeMirror[/a] 編輯器來編輯 SQL 查詢語法 (具語法加強顯示和行號功能)" #: libraries/config/messages.inc.php:33 msgid "Enable CodeMirror" @@ -4738,9 +4681,7 @@ msgstr "強制 SSL 連線" msgid "" "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is " "the referenced data, [kbd]id[/kbd] is the key value" -msgstr "" -"外鍵下拉選單中選項的排序順序，[kbd]content[/kbd] 爲關聯內容，[kbd]id[/kbd] 爲" -"鍵值" +msgstr "外鍵下拉選單中選項的排序順序，[kbd]content[/kbd] 爲關聯內容，[kbd]id[/kbd] 爲鍵值" #: libraries/config/messages.inc.php:151 msgid "Foreign key dropdown order" @@ -4882,9 +4823,7 @@ msgstr "頁面標題" msgid "" "Specify browser's title bar text. Refer to [doc@cfg_TitleTable]documentation" "[/doc] for magic strings that can be used to get special values." -msgstr "" -"設定瀏覽器標題列顯示的文字。請參考 [doc@cfg_TitleTable]說明文件[/doc] 中的變" -"數字串會替換為特殊內容。" +msgstr "設定瀏覽器標題列顯示的文字。請參考 [doc@cfg_TitleTable]說明文件[/doc] 中的變數字串會替換為特殊內容。" #: libraries/config/messages.inc.php:194 #: libraries/navigation/NavigationHeader.class.php:216 @@ -4941,8 +4880,7 @@ msgid "" "features, see [doc@linked-tables]phpMyAdmin configuration storage[/doc] in " "documentation" msgstr "" -"設定 phpMyAdmin 進階功能以開啟其他進階功能，請參考 [doc@linked-tables]" -"phpMyAdmin 進階功能[/doc]" +"設定 phpMyAdmin 進階功能以開啟其他進階功能，請參考 [doc@linked-tables]phpMyAdmin 進階功能[/doc]" #: libraries/config/messages.inc.php:206 msgid "Changes tracking" @@ -4998,9 +4936,9 @@ msgid "" "strong].[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL Validator[/a], " "Copyright 2002 Upright Database Technology. All rights reserved.[/em]" msgstr "" -"若您要使用 SQL 檢驗服務，需要注意[strong]所有 SQL 指令會以匿名方式儲存用於統" -"計[/strong]。[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL 檢驗器[/a]，" -"版權所有 2002 Upright Database Technology. 保留所有權利。[/em]" +"若您要使用 SQL 檢驗服務，需要注意[strong]所有 SQL " +"指令會以匿名方式儲存用於統計[/strong]。[br][em][a@http://sqlvalidator.mimer.com/]Mimer SQL " +"檢驗器[/a]，版權所有 2002 Upright Database Technology. 保留所有權利。[/em]" #: libraries/config/messages.inc.php:222 msgid "Startup" @@ -5068,8 +5006,7 @@ msgstr "停用部分 phpMyAdmin 發出的警告訊息" msgid "" "Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import " "and export operations" -msgstr "" -"允許在匯入和匯出時使用 [a@http://en.wikipedia.org/wiki/Gzip]gzip [/a] 壓縮" +msgstr "允許在匯入和匯出時使用 [a@http://en.wikipedia.org/wiki/Gzip]gzip [/a] 壓縮" #: libraries/config/messages.inc.php:241 msgid "GZip" @@ -5083,9 +5020,7 @@ msgstr "iconv 的額外參數" msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" -msgstr "" -"如果開啟此選項，在執行多條指令查詢的時候，即使有一條或多條指令發生錯誤，" -"phpMyAdmin 仍會繼續執行其他的指令" +msgstr "如果開啟此選項，在執行多條指令查詢的時候，即使有一條或多條指令發生錯誤，phpMyAdmin 仍會繼續執行其他的指令" #: libraries/config/messages.inc.php:244 msgid "Ignore multiple statement errors" @@ -5097,8 +5032,7 @@ msgid "" "This might be a good way to import large files, however it can break " "transactions." msgstr "" -"允許在程式偵測到執行時間快到上限時自動中斷匯入。若要匯入大型檔案這是很好的方" -"法之一，不過使用這種方法會破壞指令中的交易(Transaction)動作。" +"允許在程式偵測到執行時間快到上限時自動中斷匯入。若要匯入大型檔案這是很好的方法之一，不過使用這種方法會破壞指令中的交易(Transaction)動作。" #: libraries/config/messages.inc.php:246 msgid "Partial import: allow interrupt" @@ -5119,8 +5053,7 @@ msgstr "使用檔案取代資料表資料" msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" -msgstr "" -"預設格式，此列表根據位置(資料庫或資料表)不同將有所改變，只有 SQL 總是可用的" +msgstr "預設格式，此列表根據位置(資料庫或資料表)不同將有所改變，只有 SQL 總是可用的" #: libraries/config/messages.inc.php:255 msgid "Format of imported file" @@ -5187,9 +5120,7 @@ msgid "" "If TRUE, logout deletes cookies for all servers; when set to FALSE, logout " "only occurs for the current server. Setting this to FALSE makes it easy to " "forget to log out from other servers when connected to multiple servers." -msgstr "" -"如果設爲 TRUE，在登出時將會自動刪除所有伺服器的 Cookies。如果設爲 FALSE，在您" -"登入多台伺服器的時候，很可能會使您忘記登出。" +msgstr "如果設爲 TRUE，在登出時將會自動刪除所有伺服器的 Cookies。如果設爲 FALSE，在您登入多台伺服器的時候，很可能會使您忘記登出。" #: libraries/config/messages.inc.php:278 msgid "Delete all cookies on logout" @@ -5212,8 +5143,7 @@ msgid "" "and will be deleted as soon as you close the browser window. This is " "recommended for non-trusted environments." msgstr "" -"設定瀏覽器可儲存登入用的 cookie 時間(秒)。預設爲 0，代表不保留 cookie 直至瀏" -"覽器關閉即刪除。建議在不安全的環境下使用此預設值。" +"設定瀏覽器可儲存登入用的 cookie 時間(秒)。預設爲 0，代表不保留 cookie 直至瀏覽器關閉即刪除。建議在不安全的環境下使用此預設值。" #: libraries/config/messages.inc.php:282 msgid "Login cookie store" @@ -5270,9 +5200,7 @@ msgid "" "Number of rows displayed when browsing a result set. If the result set " "contains more rows, "Previous" and "Next" links will be " "shown." -msgstr "" -"瀏覽查詢結果時一次最多顯示的列數。如果結果超過此列數，則會顯示「上一頁」和" -"「下一頁」的連結。" +msgstr "瀏覽查詢結果時一次最多顯示的列數。如果結果超過此列數，則會顯示「上一頁」和「下一頁」的連結。" #: libraries/config/messages.inc.php:295 msgid "Maximum number of rows to display" @@ -5300,8 +5228,7 @@ msgstr "mcrypt 的警告" msgid "" "The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] " "([kbd]0[/kbd] for no limit)" -msgstr "" -"執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]0[/kbd]爲不限制)" +msgstr "執行 Script 時可配置的記憶體大小，例 [kbd]32MB[/kbd] ([kbd]0[/kbd]爲不限制)" #: libraries/config/messages.inc.php:302 msgid "Memory limit" @@ -5442,9 +5369,7 @@ msgstr "GZip 輸出快取" msgid "" "[kbd]SMART[/kbd] - i.e. descending order for columns of type TIME, DATE, " "DATETIME and TIMESTAMP, ascending order otherwise" -msgstr "" -"[kbd]SMART[/kbd] - 如: 對 TIME、DATE、DATETIME 和 TIMESTAMP 類型的欄位遞減排" -"序，其他欄位遞增" +msgstr "[kbd]SMART[/kbd] - 如: 對 TIME、DATE、DATETIME 和 TIMESTAMP 類型的欄位遞減排序，其他欄位遞增" #: libraries/config/messages.inc.php:335 msgid "Default sorting order" @@ -5463,9 +5388,7 @@ msgid "" "Disable the default warning that is displayed on the database details " "Structure page if any of the required tables for the phpMyAdmin " "configuration storage could not be found" -msgstr "" -"關閉在缺少 phpMyAdmin 進階功能所需資料表時在資料庫結構頁面中顯示的預設警告訊" -"息" +msgstr "關閉在缺少 phpMyAdmin 進階功能所需資料表時在資料庫結構頁面中顯示的預設警告訊息" #: libraries/config/messages.inc.php:339 msgid "Missing phpMyAdmin configuration storage tables" @@ -5513,8 +5436,8 @@ msgid "" "storage). If disabled, this utilizes JS-routines to display query history " "(lost by window close)." msgstr "" -"開啟使用資料庫保存查詢歷史記錄 (需要開啟 phpMyAdmin 進階功能)。如果未開啟上述" -"功能，將採用 Javascript 來保存查詢歷史記錄 (只會保留至瀏覽器關閉為止)。" +"開啟使用資料庫保存查詢歷史記錄 (需要開啟 phpMyAdmin 進階功能)。如果未開啟上述功能，將採用 Javascript 來保存查詢歷史記錄 " +"(只會保留至瀏覽器關閉為止)。" #: libraries/config/messages.inc.php:351 msgid "Permanent query history" @@ -5630,8 +5553,8 @@ msgid "" "authentication[/a] (not located in your document root; suggested: /etc/" "swekey.conf)" msgstr "" -"[a@http://swekey.com]SweKey 硬件認證 [/a]的設定檔案路徑 (請勿置於您的檔案根資" -"料夾，推薦使用: /etc/swekey.conf)" +"[a@http://swekey.com]SweKey 硬體認證 [/a]的設定檔案路徑 (請勿放置於您的檔案根資料夾，建議使用: " +"/etc/swekey.conf)。" #: libraries/config/messages.inc.php:381 msgid "SweKey config file" @@ -5650,8 +5573,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] " "support, suggested: [kbd]pma__bookmark[/kbd]" msgstr "" -"在不支援[a@http://wiki.phpmyadmin.net/pma/bookmark]書籤[/a]功能時請留空，建議" -"用: [kbd]pma__bookmark[/kbd]" +"在不支援[a@http://wiki.phpmyadmin.net/pma/bookmark]書籤[/a]功能時請留空，建議用: " +"[kbd]pma__bookmark[/kbd]" #: libraries/config/messages.inc.php:385 msgid "Bookmark table" @@ -5692,8 +5615,8 @@ msgid "" "A special MySQL user configured with limited permissions, more information " "available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]" msgstr "" -"只擁有部份權限的 MySQL 特殊使用者，詳情請參考 [a@http://wiki.phpmyadmin.net/" -"pma/controluser]wiki [/a]" +"只擁有部份權限的 MySQL 特殊使用者，詳情請參考 " +"[a@http://wiki.phpmyadmin.net/pma/controluser]wiki [/a]" #: libraries/config/messages.inc.php:394 msgid "Control user" @@ -5750,11 +5673,11 @@ msgstr "隱藏資料庫" msgid "" "Leave blank for no SQL query history support, suggested: [kbd]pma__history[/" "kbd]" -msgstr "不使用 SQL 查詢歷史功能請留空，建議值: [kbd]pma__history[/kbd]" +msgstr "不使用 SQL 查詢紀錄功能請留空，建議值: [kbd]pma__history[/kbd]。" #: libraries/config/messages.inc.php:406 msgid "SQL query history table" -msgstr "SQL 查詢歷史表" +msgstr "SQL 查詢紀錄表" #: libraries/config/messages.inc.php:407 msgid "Hostname where MySQL server is running" @@ -5762,7 +5685,7 @@ msgstr "MySQL 伺服器的主機名" #: libraries/config/messages.inc.php:408 msgid "Server hostname" -msgstr "伺服器主機名" +msgstr "伺服器主機名稱" #: libraries/config/messages.inc.php:409 msgid "Logout URL" @@ -5792,8 +5715,8 @@ msgid "" "use their literal instances, i.e. use [kbd]'my\\_db'[/kbd] and not " "[kbd]'my_db'[/kbd]." msgstr "" -"您可以使用 MySQL 萬用字元 (% 和 _)，如果想要表示萬用字元本身，請在前面加上反" -"斜線。例: 用 [kbd]'my\\_db'[/kbd] 而不是 [kbd]'my_db'[/kbd]。" +"您可以使用 MySQL 萬用字元 (% 和 _)，如果想要表示萬用字元本身，請在前面加上反斜線。例: 用 [kbd]'my\\_db'[/kbd] 而不是 " +"[kbd]'my_db'[/kbd]。" #: libraries/config/messages.inc.php:415 msgid "Show only listed databases" @@ -5822,9 +5745,8 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" -"關聯、書籤與 PDF 功能所使用的資料庫，請參考 [a@http://wiki.phpmyadmin.net/" -"pma/pmadb]pmadb [/a] 取得更多資訊。留空則關閉此功能，建議為: [kbd]phpmyadmin" -"[/kbd]" +"關聯、書籤與 PDF 功能所使用的資料庫，請參考 [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb [/a] " +"取得更多資訊。留空則關閉此功能，建議為: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:421 #: libraries/display_create_database.lib.php:31 @@ -5843,8 +5765,7 @@ msgstr "伺服器端口" msgid "" "Leave blank for no \"persistent\" recently used tables across sessions, " "suggested: [kbd]pma__recent[/kbd]" -msgstr "" -"如果不想要自動使用最近的資料表，本欄為請留空。建議設定: [kbd]pma_config[/kbd]" +msgstr "如果不想要自動使用最近的資料表，本欄為請留空。建議設定: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:425 msgid "Recently used table" @@ -5855,8 +5776,8 @@ msgid "" "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links" "[/a] support, suggested: [kbd]pma__relation[/kbd]" msgstr "" -"不使用[a@http://wiki.phpmyadmin.net/pma/relation]關聯連結 [/a]功能請留空，建" -"議值: [kbd]pma__relation[/kbd]" +"不使用[a@http://wiki.phpmyadmin.net/pma/relation]關聯連結 [/a]功能請留空，建議值: " +"[kbd]pma__relation[/kbd]" #: libraries/config/messages.inc.php:427 msgid "Relation table" @@ -5866,9 +5787,7 @@ msgstr "關係表" msgid "" "See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types" "[/a] for an example" -msgstr "" -"請參考 [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]認證模式[/a] 中的" -"範例" +msgstr "請參考 [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]認證模式[/a] 中的範例" #: libraries/config/messages.inc.php:429 msgid "Signon session name" @@ -5928,8 +5847,7 @@ msgstr "「介面偏好」資料表" msgid "" "Whether a DROP DATABASE IF EXISTS statement will be added as first line to " "the log when creating a database." -msgstr "" -"設定當資料庫建立時，是否在記錄檔第一行加上 DROP DATABASE IF EXISTS 指令。" +msgstr "設定當資料庫建立時，是否在記錄檔第一行加上 DROP DATABASE IF EXISTS 指令。" #: libraries/config/messages.inc.php:442 msgid "Add DROP DATABASE" @@ -6017,8 +5935,7 @@ msgstr "使用者群組資料表" msgid "" "Leave blank to disable the feature to hide and show navigation items, " "suggested: [kbd]pma__navigationhiding[/kbd]" -msgstr "" -"空白為禁用隱藏和顯示項目的功能，建議值：[kbd]pma__navigationhiding[/kbd]" +msgstr "空白為禁用隱藏和顯示項目的功能，建議值：[kbd]pma__navigationhiding[/kbd]" #: libraries/config/messages.inc.php:460 msgid "Hidden navigation items table" @@ -6051,9 +5968,7 @@ msgid "" "Please note that enabling this has no effect with [kbd]config[/kbd] " "authentication mode because the password is hard coded in the configuration " "file; this does not limit the ability to execute the same command directly" -msgstr "" -"注意: 該選項不影響 [kbd]config[/kbd] 認證方式，因爲密碼是儲存在設定檔案中，該" -"選項也不限制直接執行可實現相同功能的指令" +msgstr "注意: 該選項不影響 [kbd]config[/kbd] 認證方式，因爲密碼是儲存在設定檔案中，該選項也不限制直接執行可實現相同功能的指令" #: libraries/config/messages.inc.php:468 msgid "Show password change form" @@ -6129,8 +6044,7 @@ msgstr "顯示提示" msgid "" "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] " "output" -msgstr "" -"顯示 [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] 輸出的連結" +msgstr "顯示 [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] 輸出的連結" #: libraries/config/messages.inc.php:485 msgid "Show phpinfo() link" @@ -6219,9 +6133,7 @@ msgstr "Suhosin 的警告" msgid "" "Textarea size (columns) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" -msgstr "" -"編輯模式的文字框大小 (欄數)，此值將用於 SQL 查詢文字框 (*2) 和查詢視窗 " -"(*1.25)" +msgstr "編輯模式的文字框大小 (欄數)，此值將用於 SQL 查詢文字框 (*2) 和查詢視窗 (*1.25)" #: libraries/config/messages.inc.php:509 msgid "Textarea columns" @@ -6231,9 +6143,7 @@ msgstr "文字框寬度 (字數)" msgid "" "Textarea size (rows) in edit mode, this value will be emphasized for SQL " "query textareas (*2) and for query window (*1.25)" -msgstr "" -"編輯模式的文字框大小 (列數)，此值將用於 SQL 查詢文字框 (*2) 和查詢視窗 " -"(*1.25)" +msgstr "編輯模式的文字框大小 (列數)，此值將用於 SQL 查詢文字框 (*2) 和查詢視窗 (*1.25)" #: libraries/config/messages.inc.php:511 msgid "Textarea rows" @@ -6266,9 +6176,9 @@ msgid "" "For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: " "HTTP_X_FORWARDED_FOR[/kbd]" msgstr "" -"輸入代理伺服器的 [kbd]IP: 信認的 HTTP 標頭[/kbd]。下列例子為指定 phpMyAdmin " -"信任來自 1.2.3.4 代理伺服器所發出的 HTTP_X_FORWARDED_FOR (X-Forwarded-For) 標" -"頭: [br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]" +"輸入代理伺服器的 [kbd]IP: 信認的 HTTP 標頭[/kbd]。下列例子為指定 phpMyAdmin 信任來自 1.2.3.4 " +"代理伺服器所發出的 HTTP_X_FORWARDED_FOR (X-Forwarded-For) 標頭: [br][kbd]1.2.3.4: " +"HTTP_X_FORWARDED_FOR[/kbd]" #: libraries/config/messages.inc.php:521 msgid "List of trusted proxies for IP allow/deny" @@ -6322,9 +6232,8 @@ msgid "" "if the server where phpMyAdmin is installed does not have direct access to " "the internet. The format is: \"hostname:portnumber\"" msgstr "" -"代理伺服器(Proxy)的 URL 是用來取得 phpMyAdmin 版本的最新資訊或傳送錯誤報告使" -"用。若您的伺服器所在位置無法直接存取網際網路的話，將會需要此設定。格式為：" -"\"主機名稱:埠號\"" +"代理伺服器(Proxy)的 URL 是用來取得 phpMyAdmin " +"版本的最新資訊或傳送錯誤報告使用。若您的伺服器所在位置無法直接存取網際網路的話，將會需要此設定。格式為：\"主機名稱:埠號\"" #: libraries/config/messages.inc.php:532 msgid "Proxy url" @@ -6335,9 +6244,7 @@ msgid "" "The username for authenticating with the proxy. By default, no " "authentication is performed. If a username is supplied, Basic Authentication " "will be performed. No other types of authentication are currently supported." -msgstr "" -"使用代理伺服器進行身份驗證的使用者名稱，預設無身份驗證。如果提供了使用者名" -"稱，則會執行基本驗證。目前不支援其他類型的身份驗證。" +msgstr "使用代理伺服器進行身份驗證的使用者名稱，預設無身份驗證。如果提供了使用者名稱，則會執行基本驗證。目前不支援其他類型的身份驗證。" #: libraries/config/messages.inc.php:534 msgid "Proxy username" @@ -6356,8 +6263,7 @@ msgid "" "Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression " "for import and export operations" msgstr "" -"允許在匯入和匯出時使用 [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP " -"[/a] 壓縮" +"允許在匯入和匯出時使用 [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP [/a] 壓縮" #: libraries/config/messages.inc.php:539 msgid "ZIP" @@ -6641,9 +6547,8 @@ msgid "" "formatting strings. Additionally the following transformations will happen: " "%3$s. Other text will be kept as is. See the %4$sFAQ%5$s for details." msgstr "" -"此數值會使用 %1$sstrftime%2$s 來解析，所以您可以使用時間格式的字串。除此之" -"外，以下資料格式也會被轉換: %3$s。其他的文字則會保持原樣。請參考 %4$s常見問" -"題 (FAQ)%5$s 了解詳情。" +"此數值會使用 %1$sstrftime%2$s 來解析，所以您可以使用時間格式的字串。除此之外，以下資料格式也會被轉換: %" +"3$s。其他的文字則會保持原樣。請參考 %4$s常見問題 (FAQ)%5$s 了解詳情。" #: libraries/display_export.lib.php:510 msgid "use this for future exports" @@ -6744,7 +6649,7 @@ msgstr "部分匯入:" #, php-format msgid "" "Previous import timed out, after resubmitting will continue from position %d." -msgstr "上一個匯入操作超時，隨後重新送出將會從 %d 處開始。" +msgstr "上一個匯入逾時，隨後重新送出將會從 %d 處開始。" #: libraries/display_import.lib.php:293 msgid "" @@ -6752,9 +6657,8 @@ msgid "" "to the PHP timeout limit. (This might be a good way to import large " "files, however it can break transactions.)" msgstr "" -"允許中斷匯入的動作，當偵測到執行時間已接近 PHP 執行時間的限制時。(若要匯入" -"大型檔案這是很好的方法之一，不過使用這種方法會破壞指令中的交易(Transaction)動" -"作。)" +"允許中斷匯入的動作，當偵測到執行時間已接近 PHP " +"執行時間的限制時。(若要匯入大型檔案這是很好的方法之一，不過使用這種方法會破壞指令中的交易(Transaction)動作。)" #: libraries/display_import.lib.php:303 msgid "" @@ -6772,8 +6676,7 @@ msgid "" "this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) " "browsers." msgstr "" -"上傳的檔案可能超過了限制的大小，也可能是以 webkit 為基礎的瀏覽器 (Safari, " -"Google Chrome, Arora 等) 的已知問題。" +"上傳的檔案可能超過了限制的大小，也可能是以 webkit 為基礎的瀏覽器 (Safari, Google Chrome, Arora 等) 的已知問題。" #: libraries/display_import.lib.php:456 #, php-format @@ -6914,9 +6817,7 @@ msgstr "資料指標大小" msgid "" "The default pointer size in bytes, to be used by CREATE TABLE for MyISAM " "tables when no MAX_ROWS option is specified." -msgstr "" -"預設資料指標的大小 (單位: 字元)，用於在沒有指定 MAX_ROWS 選項的情況下建立 " -"MyISAM 資料表。" +msgstr "預設資料指標的大小 (單位: 字元)，用於在沒有指定 MAX_ROWS 選項的情況下建立 MyISAM 資料表。" #: libraries/engines/myisam.lib.php:33 msgid "Automatic recovery mode" @@ -6926,8 +6827,7 @@ msgstr "自動恢復模式" msgid "" "The mode for automatic recovery of crashed MyISAM tables, as set via the --" "myisam-recover server startup option." -msgstr "" -"該模式用於自動恢復崩潰的 MyISAM 表，可在啓動時使用 --myisam-recover 參數。" +msgstr "該模式用於自動恢復崩潰的 MyISAM 表，可在啓動時使用 --myisam-recover 參數。" #: libraries/engines/myisam.lib.php:37 msgid "Maximum size for temporary sort files" @@ -6939,21 +6839,19 @@ msgid "" "creating a MyISAM index (during REPAIR TABLE, ALTER TABLE, or LOAD DATA " "INFILE)." msgstr "" -"重建 MyISAM 索引時 MySQL 最多可以使用的臨時檔案大小 (在 REPAIR TABLE、ALTER " -"TABLE 或 LOAD DATA INFILE 時)。" +"重建 MyISAM 索引時 MySQL 最多可以使用的暫存檔案大小 (在 REPAIR TABLE、ALTER TABLE 或 LOAD DATA " +"INFILE 時)。" #: libraries/engines/myisam.lib.php:42 msgid "Maximum size for temporary files on index creation" -msgstr "建立索引的臨時檔案最大大小" +msgstr "建立索引的暫存檔案最大大小" #: libraries/engines/myisam.lib.php:43 msgid "" "If the temporary file used for fast MyISAM index creation would be larger " "than using the key cache by the amount specified here, prefer the key cache " "method." -msgstr "" -"如果用於建立 MyISAM 快速索引的臨時檔案大於在此指定的鍵快取，則建議使用鍵快" -"取。" +msgstr "如果用於建立 MyISAM 快速索引的暫存檔案大於在此指定的鍵快取，則建議使用鍵快取。" #: libraries/engines/myisam.lib.php:47 msgid "Repair threads" @@ -6963,9 +6861,7 @@ msgstr "修復程序" msgid "" "If this value is greater than 1, MyISAM table indexes are created in " "parallel (each index in its own thread) during the repair by sorting process." -msgstr "" -"如果該值大於 1，在進行排序過程的修復操作時 MyISAM 表的索引將會同時 (每個索引" -"都有自己的程序) 建立。" +msgstr "如果該值大於 1，在進行排序過程的修復操作時 MyISAM 表的索引將會同時 (每個索引都有自己的程序) 建立。" #: libraries/engines/myisam.lib.php:52 msgid "Sort buffer size" @@ -6976,8 +6872,8 @@ msgid "" "The buffer that is allocated when sorting MyISAM indexes during a REPAIR " "TABLE or when creating indexes with CREATE INDEX or ALTER TABLE." msgstr "" -"在修復表 (REPAIR TABLE) 的過程中進行排序 MyISAM 的索引或透過建立索引 (CREATE " -"INDEX) 和修改表 (ALTER TABLE) 建立索引時所要分配的快取大小。" +"在修復表 (REPAIR TABLE) 的過程中進行排序 MyISAM 的索引或透過建立索引 (CREATE INDEX) 和修改表 (ALTER " +"TABLE) 建立索引時所要分配的快取大小。" #: libraries/engines/pbxt.lib.php:28 msgid "Index cache size" @@ -6998,9 +6894,7 @@ msgid "" "This is the amount of memory allocated to the record cache used to cache " "table data. The default value is 32MB. This memory is used to cache changes " "to the handle data (.xtd) and row pointer (.xtr) files." -msgstr "" -"用於快取表資料的快取記憶體大小。預設值爲 32MB。該快取用於記錄處理器資料 (*." -"xtd) 和行指標 (*.xtr) 檔案。" +msgstr "用於快取表資料的快取記憶體大小。預設值爲 32MB。該快取用於記錄處理器資料 (*.xtd) 和行指標 (*.xtr) 檔案。" #: libraries/engines/pbxt.lib.php:38 msgid "Log cache size" @@ -7020,8 +6914,7 @@ msgstr "記錄檔案門檻值" msgid "" "The size of a transaction log before rollover, and a new log is created. The " "default value is 16MB." -msgstr "" -"新記錄建立及回滾(Rollover)之前的交易(Transaction)記錄大小。預設值爲 16MB。" +msgstr "新記錄建立及回滾(Rollover)之前的交易(Transaction)記錄大小。預設值爲 16MB。" #: libraries/engines/pbxt.lib.php:48 msgid "Transaction buffer size" @@ -7031,8 +6924,7 @@ msgstr "交易快取大小" msgid "" "The size of the global transaction log buffer (the engine allocates 2 " "buffers of this size). The default is 1MB." -msgstr "" -"全域交易記錄緩衝區大小(資料庫引擎會分配此值兩倍大小的緩衝區)。預設值爲 1MB。" +msgstr "全域交易記錄緩衝區大小(資料庫引擎會分配此值兩倍大小的緩衝區)。預設值爲 1MB。" #: libraries/engines/pbxt.lib.php:53 msgid "Checkpoint frequency" @@ -7042,9 +6934,7 @@ msgstr "檢查點頻率" msgid "" "The amount of data written to the transaction log before a checkpoint is " "performed. The default value is 24MB." -msgstr "" -"在執行檢查點(Checkpoint)之前最大可以寫入交易(Transaction)記錄的資料大小。預設" -"值爲 24MB。" +msgstr "在執行檢查點(Checkpoint)之前最大可以寫入交易(Transaction)記錄的資料大小。預設值爲 24MB。" #: libraries/engines/pbxt.lib.php:58 msgid "Data log threshold" @@ -7057,8 +6947,7 @@ msgid "" "value of this variable can be increased to increase the total amount of data " "that can be stored in the database." msgstr "" -"資料記錄檔案的最大大小。預設值爲 64MB。PBXT 最多可以建立 32000 個資料記錄，可" -"用於所有的表。增加該值可以增加資料庫所能儲存資料的大小。" +"資料記錄檔案的最大大小。預設值爲 64MB。PBXT 最多可以建立 32000 個資料記錄，可用於所有的表。增加該值可以增加資料庫所能儲存資料的大小。" #: libraries/engines/pbxt.lib.php:63 msgid "Garbage threshold" @@ -7079,9 +6968,7 @@ msgid "" "The size of the buffer used when writing a data log. The default is 256MB. " "The engine allocates one buffer per thread, but only if the thread is " "required to write a data log." -msgstr "" -"寫入資料記錄時使用的快取大小。預設值爲 256MB。資料引擎會爲每一個需要進行資料" -"記錄寫入的程序分配一個快取區。" +msgstr "寫入資料記錄時使用的快取大小。預設值爲 256MB。資料引擎會爲每一個需要進行資料記錄寫入的程序分配一個快取區。" #: libraries/engines/pbxt.lib.php:73 msgid "Data file grow size" @@ -7109,9 +6996,7 @@ msgid "" "system will maintain. If the number of logs exceeds this value then old logs " "will be deleted, otherwise they are renamed and given the next highest " "number." -msgstr "" -"系統會維護的交易記錄檔(pbxt/system/*.xt)數量 。如果記錄檔數量大於此值，舊的記" -"錄將會被刪除或者使用下一個編號重新命名。" +msgstr "系統會維護的交易記錄檔(pbxt/system/*.xt)數量 。如果記錄檔數量大於此值，舊的記錄將會被刪除或者使用下一個編號重新命名。" #: libraries/engines/pbxt.lib.php:149 #, php-format @@ -7133,9 +7018,7 @@ msgid "" "phpMyAdmin has encountered an error. We have collected data about this error " "as well as information about relevant configuration settings to send to the " "phpMyAdmin team to help us in debugging the problem." -msgstr "" -"phpMyAdmin 已發生錯誤，系統已收集錯誤資訊與相關的系統設定並傳送給 phpMyAdmin " -"開發團隊以協助問題的解決。" +msgstr "phpMyAdmin 已發生錯誤，系統已收集錯誤資訊與相關的系統設定並傳送給 phpMyAdmin 開發團隊以協助問題的解決。" #: libraries/error_report.lib.php:286 msgid "You may examine the data in the error report:" @@ -7383,7 +7266,7 @@ msgstr "字典" #: libraries/mysql_charsets.lib.php:186 msgid "phone book" -msgstr "電話本" +msgstr "電話簿" #: libraries/mysql_charsets.lib.php:189 msgid "Hungarian" @@ -7546,7 +7429,7 @@ msgstr "登出" #: libraries/navigation/NavigationHeader.class.php:226 msgid "phpMyAdmin documentation" -msgstr "phpMyAdmin 操作文件" +msgstr "phpMyAdmin 說明文件" #: libraries/navigation/NavigationHeader.class.php:250 msgid "Reload navigation panel" @@ -7878,8 +7761,8 @@ msgid "" "configuration and make sure that they correspond to the information given by " "the administrator of the MySQL server." msgstr "" -"phpMyAdmin 嘗試連線到 MySQL 伺服器，但伺服器拒絕連線。您應該檢查設定檔案中的" -"主機、帳號和密碼，並確認這些資訊與 MySQL 伺服器管理員所給出的資訊一致。" +"phpMyAdmin 嘗試連線到 MySQL 伺服器，但伺服器拒絕連線。您應該檢查設定檔案中的主機、帳號和密碼，並確認這些資訊與 MySQL " +"伺服器管理員所給出的資訊一致。" #: libraries/plugins/auth/AuthenticationConfig.class.php:142 msgid "Retry to connect" @@ -7888,8 +7771,8 @@ msgstr "重試連接" #: libraries/plugins/auth/AuthenticationCookie.class.php:44 msgid "Failed to use Blowfish from mcrypt!" msgstr "" -"無法使用 Blowfish 密文進行加密！（參考資料）" +"無法使用 Blowfish 密文進行加密！（參考資料）" #: libraries/plugins/auth/AuthenticationCookie.class.php:82 #: libraries/plugins/auth/AuthenticationCookie.class.php:196 @@ -7903,7 +7786,7 @@ msgstr "您的連線已過期，請重新登入。" #: libraries/plugins/auth/AuthenticationCookie.class.php:204 #: libraries/plugins/auth/AuthenticationCookie.class.php:214 msgid "You can enter hostname/IP address and port separated by space." -msgstr "您可以輸入以空格分隔的 主機名/IP網址 和 連結埠。" +msgstr "您可以輸入以空格分隔的 主機名稱/IP位址 和 連結埠。" #: libraries/plugins/auth/AuthenticationCookie.class.php:219 msgid "Username:" @@ -8200,9 +8083,7 @@ msgstr "加入指令(Statement):" msgid "" "Enclose table and column names with backquotes (Protects column and table " "names formed with special characters or keywords)" -msgstr "" -"給資料表名稱和欄位名稱加上反引號 (保護名稱中含有特殊字元或保留字的欄位和" -"表)" +msgstr "給資料表名稱和欄位名稱加上反引號 (保護名稱中含有特殊字元或保留字的欄位和表)" #: libraries/plugins/export/ExportSql.class.php:311 msgid "Data creation options" @@ -8240,8 +8121,8 @@ msgid "" "    Example: INSERT INTO tbl_name (col_A,col_B,col_C) VALUES " "(1,2,3)" msgstr "" -"每個新增指令 INSERT 圴加上欄位名稱
      " -"如: INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)" +"每個新增指令 INSERT 圴加上欄位名稱
      如: " +"INSERT INTO tbl_name (col_A,col_B,col_C) VALUES (1,2,3)" #: libraries/plugins/export/ExportSql.class.php:377 msgid "" @@ -8249,16 +8130,16 @@ msgid "" "    Example: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), " "(7,8,9)" msgstr "" -"每個新增指令 INSERT 均新增多筆資料
      " -"如: INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)" +"每個新增指令 INSERT 均新增多筆資料
      如: " +"INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:382 msgid "" "both of the above
      Example: INSERT INTO " "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" -"以上皆是
      如: INSERT INTO tbl_name (col_A," -"col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" +"以上皆是
      如: INSERT INTO tbl_name (col_A,col_B) " +"VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:387 msgid "" @@ -8272,17 +8153,13 @@ msgstr "" msgid "" "Dump binary columns in hexadecimal notation (for example, \"abc\" becomes " "0x616263)" -msgstr "" -"匯出二進位欄位時用 16 進位(HEX)表示法 (例: \"abc\" 將使用 0x616263 表示)" +msgstr "匯出二進位欄位時用 16 進位(HEX)表示法 (例: \"abc\" 將使用 0x616263 表示)" #: libraries/plugins/export/ExportSql.class.php:419 msgid "" "Dump TIMESTAMP columns in UTC (enables TIMESTAMP columns to be dumped and " "reloaded between servers in different time zones)" -msgstr "" -"匯出 TIMESTAMP 欄位時用 UTC 時區 (可讓 TIMESTAMP 欄位匯出的資料並重新載入" -"到不同時區的伺服器)" +msgstr "匯出 TIMESTAMP 欄位時用 UTC 時區 (可讓 TIMESTAMP 欄位匯出的資料並重新載入到不同時區的伺服器)" #: libraries/plugins/export/ExportSql.class.php:1209 msgid "Constraints for dumped tables" @@ -8311,7 +8188,7 @@ msgstr "讀取資料錯誤:" #: libraries/plugins/export/ExportXml.class.php:102 msgid "Object creation options (all are recommended)" -msgstr "物件建立選項 (推薦全選)" +msgstr "物件建立選項 (建議全選)" #: libraries/plugins/export/ExportXml.class.php:137 msgid "Export contents" @@ -8333,9 +8210,7 @@ msgid "" "If the data in each row of the file is not in the same order as in the " "database, list the corresponding column names here. Column names must be " "separated by commas and not enclosed in quotations." -msgstr "" -"若檔案每行的資料和資料庫中的順序不一致，請在此列出對應的欄位名稱。欄位名稱間" -"用半角逗號分隔且不能用引號括起。" +msgstr "若檔案每行的資料和資料庫中的順序不一致，請在此列出對應的欄位名稱。欄位名稱間用半角逗號分隔且不能用引號括起。" #: libraries/plugins/import/ImportCsv.class.php:81 #: libraries/plugins/import/ImportLdi.class.php:68 @@ -8355,9 +8230,7 @@ msgstr "匯入 CSV 檔案 %s 時有無效參數" msgid "" "Invalid column (%s) specified! Ensure that columns names are spelled " "correctly, separated by commas, and not enclosed in quotes." -msgstr "" -"無效欄位 (%s)！請檢查欄位名稱是否拼寫正確，使用半角逗號分隔，並且不要用引號括" -"起。" +msgstr "無效欄位 (%s)！請檢查欄位名稱是否拼寫正確，使用半角逗號分隔，並且不要用引號括起。" #: libraries/plugins/import/ImportCsv.class.php:298 #: libraries/plugins/import/ImportCsv.class.php:576 @@ -8407,8 +8280,7 @@ msgstr "無法解析 OpenOffice 表格!" msgid "ESRI Shape File" msgstr "" "ESRI Shape " -"File" +"href=\"http://zh.wikipedia.org/wiki/Shapefile\" target=\"_blank\">Shape File" #: libraries/plugins/import/ImportShp.class.php:148 #, php-format @@ -8451,8 +8323,7 @@ msgstr "MySQL 不支援幾何類型 '%s'。" msgid "" "Appends text to a string. The only option is the text to be appended " "(enclosed in single quotes, default empty string)." -msgstr "" -"將文字加到字串後面。要附加的文字是唯一的選擇 (括在單引號中，預設為空字串)。" +msgstr "將文字加到字串後面。要附加的文字是唯一的選擇 (括在單引號中，預設為空字串)。" #: libraries/plugins/transformations/abstract/DateFormatTransformationsPlugin.class.php:31 msgid "" @@ -8465,11 +8336,10 @@ msgid "" "documentation for PHP's strftime() function and for \"utc\" it is done using " "gmdate() function." msgstr "" -"將 TIME、TIMESTAMP、DATETIME 或 UNIX 時間戳記欄位以格式化後的日期顯示。第一個" -"選項是小時偏移量，該值將會加到時間戳記中 (預設: 0)。第二個選項用於指定時間格" -"式字元串。第三個選項決定顯示本地時間還是 UTC 時間 (填入 \"local \" 或 \"utc " -"\" )，所以填 \"local \" (請參考 PHP 的 strftime() 函數檔案) 和“utc”(請參考 " -"PHP 的 gmdate() 函數文檔) 所得到的結果是不一樣的。" +"將 TIME、TIMESTAMP、DATETIME 或 UNIX 時間戳記欄位以格式化後的日期顯示。第一個選項是小時偏移量，該值將會加到時間戳記中 " +"(預設: 0)。第二個選項用於指定時間格式字元串。第三個選項決定顯示本地時間還是 UTC 時間 (填入 \"local \" 或 \"utc \" )，所以填 " +" \"local \" (請參考 PHP 的 strftime() 函數檔案) 和“utc”(請參考 PHP 的 gmdate() 函數文件) " +"所得到的結果是不一樣的。" #: libraries/plugins/transformations/abstract/DownloadTransformationsPlugin.class.php:31 msgid "" @@ -8478,8 +8348,7 @@ msgid "" "of a column which contains the filename. If you use the second option, you " "need to set the first option to the empty string." msgstr "" -"欄位中顯示一個二進位資料的下載連線。第一個選項是檔案名稱，或使用第二個選項，" -"用資料表中的一個欄位值作爲檔案名稱。如果想使用欄位值作爲檔案名稱，第一個選項" +"欄位中顯示一個二進位資料的下載連線。第一個選項是檔案名稱，或使用第二個選項，用資料表中的一個欄位值作爲檔案名稱。如果想使用欄位值作爲檔案名稱，第一個選項" "必須留空。" #: libraries/plugins/transformations/abstract/ExternalTransformationsPlugin.class.php:31 @@ -8495,27 +8364,23 @@ msgid "" "option, if set to 1, will prevent wrapping and ensure that the output " "appears all on one line (Default 1)." msgstr "" -"僅 LINUX: 調用外部程序並透過標準輸入傳入欄位資料。返回此套用程序的標準輸出，" -"預設爲 Tidy，可以很好的列印 HTML 程式碼。爲了安全起見，您需要手動編輯 " -"libraries/plugins/transformations/Text_Plain_External.class.php 檔案來加入可" -"以運行的工具。第一個選項是您想要使用的程序編號，第二個選項是程序的參數。第三" -"個參數如果設爲 1 的話將會用 htmlspecialchars() 處理輸出 (預設爲 1)。第四個參" -"數如果設爲 1 的話，將禁止換行，確保所有內容顯示在一行中 (預設爲 1)。" +"僅 LINUX: 調用外部程序並透過標準輸入傳入欄位資料。返回此套用程序的標準輸出，預設爲 Tidy，可以很好的列印 HTML " +"程式碼。爲了安全起見，您需要手動編輯 " +"libraries/plugins/transformations/Text_Plain_External.class.php " +"檔案來加入可以運行的工具。第一個選項是您想要使用的程序編號，第二個選項是程序的參數。第三個參數如果設爲 1 的話將會用 " +"htmlspecialchars() 處理輸出 (預設爲 1)。第四個參數如果設爲 1 的話，將禁止換行，確保所有內容顯示在一行中 (預設爲 1)。" #: libraries/plugins/transformations/abstract/FormattedTransformationsPlugin.class.php:31 msgid "" "Displays the contents of the column as-is, without running it through " "htmlspecialchars(). That is, the column is assumed to contain valid HTML." -msgstr "" -"顯示欄位的原始內容，不使用 htmlspecialchars() 處理。即假定內容爲合法的 HTML " -"程式碼。" +msgstr "顯示欄位的原始內容，不使用 htmlspecialchars() 處理。即假定內容爲合法的 HTML 程式碼。" #: libraries/plugins/transformations/abstract/HexTransformationsPlugin.class.php:31 msgid "" "Displays hexadecimal representation of data. Optional first parameter " "specifies how often space will be added (defaults to 2 nibbles)." -msgstr "" -"顯示 16 進位的資料。第一個參數設定需要增加多少個空格 (預設值爲一個字元寬度)。" +msgstr "顯示 16 進位的資料。第一個參數設定需要增加多少個空格 (預設值爲一個字元寬度)。" #: libraries/plugins/transformations/abstract/ImageLinkTransformationsPlugin.class.php:33 msgid "Displays a link to download this image." @@ -8531,7 +8396,7 @@ msgstr "顯示可點選的縮圖。在原比例不變的情況下，可按像素 msgid "" "Converts an (IPv4) Internet network address into a string in Internet " "standard dotted format." -msgstr "將一個 IPv4 (互聯網協定第四版) 網址轉換成點分十進位標準格式。" +msgstr "將一個 IPv4 (網際網路協定第4版) 位置轉換成點分十進位標準格式。" #: libraries/plugins/transformations/abstract/SQLTransformationsPlugin.class.php:31 msgid "Formats text as SQL query with syntax highlighting." @@ -8545,9 +8410,8 @@ msgid "" "option is the string to append and/or prepend when truncation occurs " "(Default: \"…\")." msgstr "" -"顯示部分字元串。第一個選項定義了文字開始輸出的字數 (預設爲 0)。第二個選項是要" -"返回的字數 (預設直到結尾)。第三個選項是當發生截取的時候，將會加在字元串之前/" -"後的輸出 (預設爲: \"… \")。" +"顯示部分字元串。第一個選項定義了文字開始輸出的字數 (預設爲 0)。第二個選項是要返回的字數 " +"(預設直到結尾)。第三個選項是當發生截取的時候，將會加在字元串之前/後的輸出 (預設爲: \"… \")。" #: libraries/plugins/transformations/abstract/TextImageLinkTransformationsPlugin.class.php:33 msgid "" @@ -8555,8 +8419,8 @@ msgid "" "option is a URL prefix like \"http://www.example.com/\". The second and " "third options are the width and the height in pixels." msgstr "" -"顯示圖片和連結，欄位內包含檔案名稱。第一個選項是類似 \"http://www.example." -"com/ \" 這樣的 URL 前綴。第二和第三個選項是以像素爲單位的寬度和高度。" +"顯示圖片和連結，欄位內包含檔案名稱。第一個選項是類似 \"http://www.example.com/ \" 這樣的 URL " +"前綴。第二和第三個選項是以像素爲單位的寬度和高度。" #: libraries/plugins/transformations/abstract/TextLinkTransformationsPlugin.class.php:33 msgid "" @@ -8564,8 +8428,7 @@ msgid "" "prefix like \"http://www.example.com/\". The second option is a title for " "the link." msgstr "" -"顯示連結，欄位內包含檔案名稱。第一個選項是類似 \"http://www.example.com/ \" " -"這樣的 URL 前綴。第二個選項是連結的標題。" +"顯示連結，欄位內包含檔案名稱。第一個選項是類似 \"http://www.example.com/ \" 這樣的 URL 前綴。第二個選項是連結的標題。" #: libraries/relation.lib.php:89 msgid "not OK" @@ -8613,7 +8476,7 @@ msgstr "SQL 查詢書籤" #: libraries/relation.lib.php:196 querywindow.php:70 msgid "SQL history" -msgstr "SQL 歷史" +msgstr "SQL 紀錄" #: libraries/relation.lib.php:218 msgid "Persistent recently used tables" @@ -8653,8 +8516,8 @@ msgid "" "Enable advanced features in configuration file (config.inc.php), for example by starting from config.sample.inc.php." msgstr "" -"在設定檔 (config.inc.php) 中啓用進階功能，請參考 config." -"sample.inc.php 中的範例。" +"在設定檔 (config.inc.php) 中啓用進階功能，請參考 " +"config.sample.inc.php 中的範例。" #: libraries/relation.lib.php:308 msgid "Re-login to phpMyAdmin to load the updated configuration file." @@ -8693,9 +8556,8 @@ msgid "" "ignore all databases by default and allow only certain databases to be " "replicated. Please select the mode:" msgstr "" -"此伺服器尚未設定爲一個備援程序中的主要(Master)伺服器。您可以選擇複製所有但忽" -"略某些資料庫 (當您想備援大多數資料庫時很有用) 或者僅備援某些資料庫。請選擇模" -"式:" +"此伺服器尚未設定爲一個備援程序中的主要(Master)伺服器。您可以選擇複製所有但忽略某些資料庫 (當您想備援大多數資料庫時很有用) " +"或者僅備援某些資料庫。請選擇模式:" #: libraries/replication_gui.lib.php:98 msgid "Replicate all databases; Ignore:" @@ -8713,18 +8575,14 @@ msgstr "請選擇資料庫:" msgid "" "Now, add the following lines at the end of [mysqld] section in your my.cnf " "and please restart the MySQL server afterwards." -msgstr "" -"現在，將下列設定新增到您的 my.cnf 設定檔中 [mysqld] 設定區塊的最末端，然後重" -"新啓動 MySQL 伺服器。" +msgstr "現在，將下列設定新增到您的 my.cnf 設定檔中 [mysqld] 設定區塊的最末端，然後重新啓動 MySQL 伺服器。" #: libraries/replication_gui.lib.php:113 msgid "" "Once you restarted MySQL server, please click on Go button. Afterwards, you " "should see a message informing you, that this server is configured as " "master." -msgstr "" -"當 MySQL 伺服器重新啓動後，請點選 執行 按鈕。您應該看見資訊提示說明此伺服器" -"已經被設定爲主要伺服器。" +msgstr "當 MySQL 伺服器重新啓動後，請點選 執行 按鈕。您應該看見資訊提示說明此伺服器已經被設定爲主要伺服器。" #: libraries/replication_gui.lib.php:140 #: libraries/server_databases.lib.php:396 @@ -8789,9 +8647,7 @@ msgstr "修改或重新設定主要(Master)伺服器" msgid "" "This server is not configured as slave in a replication process. Would you " "like to configure it?" -msgstr "" -"此伺服器尚未設定爲一個備援程序中的次要(Slave)伺服器。您想現在" -"設定嗎？" +msgstr "此伺服器尚未設定爲一個備援程序中的次要(Slave)伺服器。您想現在設定嗎？" #: libraries/replication_gui.lib.php:279 msgid "Error management:" @@ -8818,9 +8674,7 @@ msgstr "個錯誤。" msgid "" "This server is not configured as master in a replication process. Would you " "like to configure it?" -msgstr "" -"此伺服器尚未設定爲一個備援程序中的主要(Master)伺服器。您想現在" -"設定嗎？" +msgstr "此伺服器尚未設定爲一個備援程序中的主要(Master)伺服器。您想現在設定嗎？" #: libraries/replication_gui.lib.php:356 msgid "Uncheck All" @@ -8835,8 +8689,7 @@ msgid "" "Make sure, you have unique server-id in your configuration file (my.cnf). If " "not, please add the following line into [mysqld] section:" msgstr "" -"請確認在您的設定檔(my.cnf)中已設定了一個唯一的伺服器代號(server-id)。若沒有，" -"請將下列設定新增到 [mysqld] 設定區塊中:" +"請確認在您的設定檔(my.cnf)中已設定了一個唯一的伺服器代號(server-id)。若沒有，請將下列設定新增到 [mysqld] 設定區塊中:" #: libraries/replication_gui.lib.php:388 libraries/replication_gui.lib.php:772 #: libraries/server_privileges.lib.php:1259 @@ -8897,7 +8750,7 @@ msgstr "任意主機" #: libraries/replication_gui.lib.php:734 #: libraries/server_privileges.lib.php:1385 msgid "Local" -msgstr "本地" +msgstr "本機" #: libraries/replication_gui.lib.php:741 #: libraries/server_privileges.lib.php:1394 @@ -9134,9 +8987,8 @@ msgid "" "fail![/strong] Please use the improved 'mysqli' extension to avoid any " "problems." msgstr "" -"您目前使用 PHP 已不建議使用的擴充套件 'mysql'，該擴充套件無法處理多查詢，並且" -"[strong]在執行某些預存程序(Stored routine)的可能會導致失敗[/strong]，請使用 " -"'mysqli' 擴充套件以避免發生錯誤。" +"您目前使用 PHP 已不建議使用的擴充套件 'mysql'，該擴充套件無法處理多查詢，並且[strong]在執行某些預存程序(Stored " +"routine)的可能會導致失敗[/strong]，請使用 'mysqli' 擴充套件以避免發生錯誤。" #: libraries/rte/rte_routines.lib.php:292 #: libraries/rte/rte_routines.lib.php:1130 @@ -9225,8 +9077,7 @@ msgstr "給予的參數方向 \"%s\" 無效。" msgid "" "You must provide length/values for routine parameters of type ENUM, SET, " "VARCHAR and VARBINARY." -msgstr "" -"您必須為預存程序提供長度/數值的參數型別為列舉、集合、VARCHAR 和 VARBINARY。" +msgstr "您必須為預存程序提供長度/數值的參數型別為列舉、集合、VARCHAR 和 VARBINARY。" #: libraries/rte/rte_routines.lib.php:1217 msgid "You must provide a name and a type for each routine parameter." @@ -9587,8 +9438,7 @@ msgstr "資料庫統計" msgid "" "Note: Enabling the database statistics here might cause heavy traffic " "between the web server and the MySQL server." -msgstr "" -"注意: 在此開啟資料庫統計可能導致網頁伺服器和 MySQL 伺服器之間的流量驟增。" +msgstr "注意: 在此開啟資料庫統計可能導致網頁伺服器和 MySQL 伺服器之間的流量驟增。" #: libraries/server_databases.lib.php:371 #: libraries/server_databases.lib.php:372 @@ -9728,9 +9578,7 @@ msgid "" "Allows connecting, even if maximum number of connections is reached; " "required for most administrative operations like setting global variables or " "killing threads of other users." -msgstr "" -"允許在到達連線數量限制時仍可登入資料庫。擁有最高管理權限可設定全域變數或中止" -"其他使用者的執行序。" +msgstr "允許在到達連線數量限制時仍可登入資料庫。擁有最高管理權限可設定全域變數或中止其他使用者的執行緒。" #: libraries/server_privileges.lib.php:328 #: libraries/server_privileges.lib.php:1084 server_privileges.php:65 @@ -9740,7 +9588,7 @@ msgstr "允許建立暫存資料表。" #: libraries/server_privileges.lib.php:333 #: libraries/server_privileges.lib.php:1175 server_privileges.php:79 msgid "Allows locking tables for the current thread." -msgstr "允許鎖定目前執行序的資料表。" +msgstr "允許鎖定目前執行緒的資料表。" #: libraries/server_privileges.lib.php:338 #: libraries/server_privileges.lib.php:1188 server_privileges.php:101 @@ -10108,9 +9956,9 @@ msgid "" "server uses, if they have been changed manually. In this case, you should " "%sreload the privileges%s before you continue." msgstr "" -"注意: phpMyAdmin 直接由 MySQL 權限表取得使用者權限。若有使用者中途手動更改權" -"限，則表中顯示的內容可能與伺服器實際使用的使用者權限有異。在這種情況下，您應" -"在繼續前 %s重新載入權限%s。" +"注意: phpMyAdmin 直接由 MySQL " +"權限表取得使用者權限。若有使用者中途手動更改權限，則表中顯示的內容可能與伺服器實際使用的使用者權限有異。在這種情況下，您應在繼續前 %s重新載入權限%" +"s。" #: libraries/server_privileges.lib.php:3886 msgid "The selected user was not found in the privilege table." @@ -10135,13 +9983,11 @@ msgid "" "This MySQL server works as master and slave in replication process." msgstr "" -"此 MySQL 伺服器在備援程序中同時扮演主要(Master)伺服器和次要" -"(Slave)伺服器的身份。" +"此 MySQL 伺服器在備援程序中同時扮演主要(Master)伺服器和次要(Slave)伺服器的身份。" #: libraries/server_status.lib.php:84 msgid "This MySQL server works as master in replication process." -msgstr "" -"此 MySQL 伺服器在備援程序中扮演主要(Master)伺服器的身份。" +msgstr "此 MySQL 伺服器在備援程序中扮演主要(Master)伺服器的身份。" #: libraries/server_status.lib.php:89 msgid "This MySQL server works as slave in replication process." @@ -10155,9 +10001,7 @@ msgstr "備援狀態" msgid "" "On a busy server, the byte counters may overrun, so those statistics as " "reported by the MySQL server may be incorrect." -msgstr "" -"在高負載的伺服器上，字元計數器可能會溢出，因此由 MySQL 返回的統計值可能會不正" -"確。" +msgstr "在高負載的伺服器上，字元計數器可能會溢出，因此由 MySQL 返回的統計值可能會不正確。" #: libraries/server_status.lib.php:142 msgid "Received" @@ -10209,18 +10053,14 @@ msgid "" "Prior to changing any of the configuration, be sure to know what you are " "changing (by reading the documentation) and how to undo the change. Wrong " "tuning can have a very negative effect on performance." -msgstr "" -"在更改任何配置之前, 一定要知道您在改什麼 (請參閱文件) 以及如何還原變更。錯誤" -"的調校對效能會有重大的負面影響。" +msgstr "在更改任何配置之前, 一定要知道您在改什麼 (請參閱文件) 以及如何還原變更。錯誤的調校對效能會有重大的負面影響。" #: libraries/server_status_advisor.lib.php:50 msgid "" "The best way to tune your system would be to change only one setting at a " "time, observe or benchmark your database, and undo the change if there was " "no clearly measurable improvement." -msgstr "" -"最好的調校您系統的方法是一次只更改一個設置，觀察比較您資料庫的效能，如果沒有" -"明顯的改善，那麼還原這個變更。" +msgstr "最好的調校您系統的方法是一次只更改一個設置，觀察比較您資料庫的效能，如果沒有明顯的改善，那麼還原這個變更。" #: libraries/server_status_monitor.lib.php:77 #, php-format @@ -10274,9 +10114,8 @@ msgid "" "enabled. Note however, that the general_log produces a lot of data and " "increases server load by up to 15%." msgstr "" -"phpMyAdmin 監測器可以幫您最佳化伺服器的配置和追蹤有耗時的查詢。對後者您需要" -"將 log_output 設為 'TABLE'，並啟用 slow_query_log 或 general_log。但請注意 " -"general_log 會產生大量的資料，並可能增加伺服器的負載達 15%。" +"phpMyAdmin 監測器可以幫您最佳化伺服器的配置和追蹤有耗時的查詢。對後者您需要將 log_output 設為 'TABLE'，並啟用 " +"slow_query_log 或 general_log。但請注意 general_log 會產生大量的資料，並可能增加伺服器的負載達 15%。" #: libraries/server_status_monitor.lib.php:154 msgid "" @@ -10285,9 +10124,8 @@ msgid "" "table is supported by MySQL 5.1.6 and onwards. You may still use the server " "charting features however." msgstr "" -"您的資料庫伺服器不支援資料表記錄，phpMyAdmin 必須要透過這個功能才有辦法進行資" -"料庫記錄的分析，自 MySQL 5.1.6 起已支援資料表記錄。不論如何，您仍可以使用伺服" -"器圖表的功能。" +"您的資料庫伺服器不支援資料表記錄，phpMyAdmin 必須要透過這個功能才有辦法進行資料庫記錄的分析，自 MySQL 5.1.6 " +"起已支援資料表記錄。不論如何，您仍可以使用伺服器圖表的功能。" #: libraries/server_status_monitor.lib.php:169 msgid "Using the monitor:" @@ -10298,9 +10136,7 @@ msgid "" "Your browser will refresh all displayed charts in a regular interval. You " "may add charts and change the refresh rate under 'Settings', or remove any " "chart using the cog icon on each respective chart." -msgstr "" -"您瀏覽器在固定的時間內會刷新顯示所有圖表。你可以增加圖表和更改 '設置' 下的更" -"新率，或在各個圖表上用齒輪圖示來刪除該圖表。" +msgstr "您瀏覽器在固定的時間內會刷新顯示所有圖表。你可以增加圖表和更改 '設置' 下的更新率，或在各個圖表上用齒輪圖示來刪除該圖表。" #: libraries/server_status_monitor.lib.php:178 msgid "" @@ -10309,8 +10145,8 @@ msgid "" "confirmed, this will load a table of grouped queries, there you may click on " "any occurring SELECT statements to further analyze them." msgstr "" -"要從日誌中來顯示查詢，請在任何圖表上按下滑鼠左鍵並拖拽選擇一段時間範圍。確定" -"後將會載入分好组別的查詢，然後您可以點擊任意 SELECT 語句做進一步分析。" +"要從日誌中來顯示查詢，請在任何圖表上按下滑鼠左鍵並拖拽選擇一段時間範圍。確定後將會載入分好组別的查詢，然後您可以點選任意 SELECT " +"語句做進一步分析。" #: libraries/server_status_monitor.lib.php:188 msgid "Please note:" @@ -10323,9 +10159,8 @@ msgid "" "it is advisable to select only a small time span and to disable the " "general_log and empty its table once monitoring is not required any more." msgstr "" -"啟用 general_log 可能會增加伺服器的負載 5-15%。此外請注意從記錄生成統計資訊是" -"沉重的任務，所以最好只選擇短的時間片段，並禁用 general_log，一但不再使用監控" -"時應該要將這個表清空。" +"啟用 general_log 可能會增加伺服器的負載 5-15%。此外請注意從記錄生成統計資訊是沉重的任務，所以最好只選擇短的時間片段，並禁用 " +"general_log，一但不再使用監控時應該要將這個表清空。" #: libraries/server_status_monitor.lib.php:213 #: libraries/server_status_monitor.lib.php:323 @@ -10481,9 +10316,7 @@ msgid "" "The number of transactions that used the temporary binary log cache but that " "exceeded the value of binlog_cache_size and used a temporary file to store " "statements from the transaction." -msgstr "" -"使用暫存二進位記錄快取的交易，但因超出 binlog_cache_size 限制而採用暫存檔案儲" -"存交易指令的數量。" +msgstr "使用暫存二進位記錄快取的交易，但因超出 binlog_cache_size 限制而採用暫存檔案儲存交易指令的數量。" #: libraries/server_status_variables.lib.php:341 msgid "The number of transactions that used the temporary binary log cache." @@ -10501,19 +10334,18 @@ msgid "" "to increase the tmp_table_size value to cause temporary tables to be memory-" "based instead of disk-based." msgstr "" -"伺服器執行指令時自動在硬碟上建立的臨時表的數量。如果 Created_tmp_disk_tables " -"很大，您可以增加 tmp_table_size 的值，讓伺服器使用記憶體來儲存臨時表而非硬" -"碟。" +"伺服器執行指令時自動在硬碟上建立的暫存表的數量。如果 Created_tmp_disk_tables 很大，您可以增加 tmp_table_size " +"的值，讓伺服器使用記憶體來儲存暫存表而非硬碟。" #: libraries/server_status_variables.lib.php:355 msgid "How many temporary files mysqld has created." -msgstr "mysqld 已建立的臨時檔案的數量。" +msgstr "mysqld 已建立的暫存檔案的數量。" #: libraries/server_status_variables.lib.php:358 msgid "" "The number of in-memory temporary tables created automatically by the server " "while executing statements." -msgstr "伺服器執行指令時自動在記憶體中建立的臨時表的數量。" +msgstr "伺服器執行指令時自動在記憶體中建立的暫存表的數量。" #: libraries/server_status_variables.lib.php:362 msgid "" @@ -10549,8 +10381,8 @@ msgid "" "table with a given name. This is called discovery. Handler_discover " "indicates the number of time tables have been discovered." msgstr "" -"如果知道一個資料表的名稱，MySQL 伺服器可以詢問 NDB 集羣儲存引擎，這被稱爲“發" -"現”Handler_discovery 表明瞭一個資料表被發現的次數。" +"如果知道一個資料表的名稱，MySQL 伺服器可以詢問 NDB 叢集儲存引擎，這被稱爲“發現”Handler_discovery " +"表示一個資料表被發現的次數。" #: libraries/server_status_variables.lib.php:389 msgid "" @@ -10558,32 +10390,27 @@ msgid "" "it suggests that the server is doing a lot of full index scans; for example, " "SELECT col1 FROM foo, assuming that col1 is indexed." msgstr "" -"讀取一個索引入口點的次數。如果該值很大，說明您的伺服器執行了很多完整索引掃" -"描。例如，假設欄位 col1 已經建立了索引，然後執行 SELECT col1 FROM foo。" +"讀取一個索引入口點的次數。如果該值很大，說明您的伺服器執行了很多完整索引掃描。例如，假設欄位 col1 已經建立了索引，然後執行 SELECT col1 " +"FROM foo。" #: libraries/server_status_variables.lib.php:395 msgid "" "The number of requests to read a row based on a key. If this is high, it is " "a good indication that your queries and tables are properly indexed." -msgstr "" -"根據索引讀取行的請求數。如果該值很大，說明您的查詢和表都建立了很好的索引。" +msgstr "根據索引讀取行的請求數。如果該值很大，說明您的查詢和表都建立了很好的索引。" #: libraries/server_status_variables.lib.php:400 msgid "" "The number of requests to read the next row in key order. This is " "incremented if you are querying an index column with a range constraint or " "if you are doing an index scan." -msgstr "" -"根據索引順序讀取下一行的請求數。如果您在查詢一個已索引的欄位且限制了範圍，或" -"進行完整表掃描，該值將會不斷增長。" +msgstr "根據索引順序讀取下一行的請求數。如果您在查詢一個已索引的欄位且限制了範圍，或進行完整表掃描，該值將會不斷增長。" #: libraries/server_status_variables.lib.php:405 msgid "" "The number of requests to read the previous row in key order. This read " "method is mainly used to optimize ORDER BY … DESC." -msgstr "" -"根據索引順序讀取上一行的請求數。這種讀取方式通常用於最佳化帶有 ORDER BY … " -"DESC 的查詢。" +msgstr "根據索引順序讀取上一行的請求數。這種讀取方式通常用於最佳化帶有 ORDER BY … DESC 的查詢。" #: libraries/server_status_variables.lib.php:409 msgid "" @@ -10591,9 +10418,7 @@ msgid "" "if you are doing a lot of queries that require sorting of the result. You " "probably have a lot of queries that require MySQL to scan whole tables or " "you have joins that don't use keys properly." -msgstr "" -"根據固定位置讀取行的請求數。如果您執行很多需要排序的查詢，該值會很高。您可能" -"有很多需要完整表掃描的查詢，或者您使用了不正確的索引用來多表查詢。" +msgstr "根據固定位置讀取行的請求數。如果您執行很多需要排序的查詢，該值會很高。您可能有很多需要完整表掃描的查詢，或者您使用了不正確的索引用來多表查詢。" #: libraries/server_status_variables.lib.php:416 msgid "" @@ -10602,9 +10427,8 @@ msgid "" "tables are not properly indexed or that your queries are not written to take " "advantage of the indexes you have." msgstr "" -"請求由資料檔案中讀取下一列(Row)的數量，此值會因掃描資料表的數量增加而增加。一" -"般情況下這代表您的資料表未正確建立索引，或者您使用的查詢指令沒有使用已建立索" -"引的欄位。" +"請求由資料檔案中讀取下一列(Row)的數量，此值會因掃描資料表的數量增加而增加。一般情況下這代表您的資料表未正確建立索引，或者您使用的查詢指令沒有使用已" +"建立索引的欄位。" #: libraries/server_status_variables.lib.php:423 msgid "The number of internal ROLLBACK statements." @@ -10639,9 +10463,7 @@ msgid "" "The number of latched pages in InnoDB buffer pool. These are pages currently " "being read or written or that can't be flushed or removed for some other " "reason." -msgstr "" -"InnoDB 快取池中鎖定頁的數量。這些頁是正在被讀取或寫入的，或者是因其他原因不能" -"被重新整理或刪除的。" +msgstr "InnoDB 快取池中鎖定頁的數量。這些頁是正在被讀取或寫入的，或者是因其他原因不能被重新整理或刪除的。" #: libraries/server_status_variables.lib.php:450 msgid "" @@ -10650,9 +10472,8 @@ msgid "" "be calculated as Innodb_buffer_pool_pages_total - " "Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data." msgstr "" -"負載頁的數量，像鎖定行或適應性的散列索引這樣的管理操作時分配的頁。該值可用此" -"公式計算: Innodb_buffer_pool_pages_total - Innodb_buffer_pool_pages_free - " -"Innodb_buffer_pool_pages_data。" +"負載頁的數量，像鎖定行或適應性的散列索引這樣的管理操作時分配的頁。該值可用此公式計算: Innodb_buffer_pool_pages_total " +"- Innodb_buffer_pool_pages_free - Innodb_buffer_pool_pages_data。" #: libraries/server_status_variables.lib.php:457 msgid "Total size of buffer pool, in pages." @@ -10662,16 +10483,13 @@ msgstr "快取池總大小 (單位: 頁)。" msgid "" "The number of \"random\" read-aheads InnoDB initiated. This happens when a " "query is to scan a large portion of a table but in random order." -msgstr "" -"InnoDB 原始化的“隨機”預讀數。這通常會在對一個資料表進行大範圍的隨機排序查詢時" -"發生。" +msgstr "InnoDB 初始化的“隨機”預讀數。這通常會在對一個資料表進行大範圍的隨機排序查詢時發生。" #: libraries/server_status_variables.lib.php:465 msgid "" "The number of sequential read-aheads InnoDB initiated. This happens when " "InnoDB does a sequential full table scan." -msgstr "" -"InnoDB 原始化的順序預讀數。這會在 InnoDB 執行一個順序完整表掃描時發生。" +msgstr "InnoDB 初始化的順序預讀數。這會在 InnoDB 執行一個順序完整表掃描時發生。" #: libraries/server_status_variables.lib.php:469 msgid "The number of logical read requests InnoDB has done." @@ -10691,9 +10509,8 @@ msgid "" "counter counts instances of these waits. If the buffer pool size was set " "properly, this value should be small." msgstr "" -"寫入 InnoDB 快取池通常在後臺進行，但有必要在沒有乾淨頁的時候讀取或建立頁，有" -"必要先等待頁被重新整理。該計數器統計了這種等待的數量。如果快取池大小設定正" -"確，這個值應該會很小。" +"寫入 InnoDB 快取池通常在後臺進行，但有必要在沒有乾淨頁的時候讀取或建立頁，有必要先等待頁被重新整理。該計數器統計了這種等待的數量。如果快取池大小" +"設定正確，這個值應該會很小。" #: libraries/server_status_variables.lib.php:484 msgid "The number writes done to the InnoDB buffer pool." @@ -10777,9 +10594,7 @@ msgstr "已建立的頁數。" msgid "" "The compiled-in InnoDB page size (default 16KB). Many values are counted in " "pages; the page size allows them to be easily converted to bytes." -msgstr "" -"編譯的 InnoDB 頁大小 (預設 16KB)。許多值都以頁爲單位進行統計，頁大小可以很方" -"便地將這些值轉化爲字元數。" +msgstr "編譯的 InnoDB 頁大小 (預設 16KB)。許多值都以頁爲單位進行統計，頁大小可以很方便地將這些值轉化爲字元數。" #: libraries/server_status_variables.lib.php:548 msgid "The number of pages read." @@ -10829,8 +10644,7 @@ msgstr "InnoDB 中更新的列數。" msgid "" "The number of key blocks in the key cache that have changed but haven't yet " "been flushed to disk. It used to be known as Not_flushed_key_blocks." -msgstr "" -"鍵快取中還沒有被寫入到硬碟的鍵塊數。該值過去名爲 Not_flushed_key_blocks。" +msgstr "鍵快取中還沒有被寫入到硬碟的鍵塊數。該值過去名爲 Not_flushed_key_blocks。" #: libraries/server_status_variables.lib.php:586 msgid "" @@ -10859,8 +10673,8 @@ msgid "" "then your key_buffer_size value is probably too small. The cache miss rate " "can be calculated as Key_reads/Key_read_requests." msgstr "" -"從硬碟中物理讀取鍵塊的次數。如果 Key_reads 很大，則說明您的 key_buffer_size " -"可能設定得太小了。快取缺失率可以由 Key_reads/Key_read_requests 計算得出。" +"從硬碟中物理讀取鍵塊的次數。如果 Key_reads 很大，則說明您的 key_buffer_size 可能設定得太小了。快取缺失率可以由 " +"Key_reads/Key_read_requests 計算得出。" #: libraries/server_status_variables.lib.php:607 msgid "" @@ -10886,9 +10700,7 @@ msgid "" "The total cost of the last compiled query as computed by the query " "optimizer. Useful for comparing the cost of different query plans for the " "same query. The default value of 0 means that no query has been compiled yet." -msgstr "" -"最後編譯的查詢的總開銷由查詢最佳化器計算得出，可用於比較使用不同的查詢指令進" -"行相同的查詢時的效率差異。預設值0表示還沒有查詢被編譯。" +msgstr "最後編譯的查詢的總開銷由查詢最佳化器計算得出，可用於比較使用不同的查詢指令進行相同的查詢時的效率差異。預設值0表示還沒有查詢被編譯。" #: libraries/server_status_variables.lib.php:627 msgid "" @@ -10923,9 +10735,7 @@ msgid "" "The number of free memory blocks in query cache. High numbers can indicate " "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE " "statement." -msgstr "" -"查詢快取中的閒置區塊數。數字越高表示有記憶體碎片問題，也許可用 FLUSH QUERY " -"CACHE 語句解決。" +msgstr "查詢快取中的閒置區塊數。數字越高表示有記憶體碎片問題，也許可用 FLUSH QUERY CACHE 語句解決。" #: libraries/server_status_variables.lib.php:652 msgid "The amount of free memory for query cache." @@ -10945,17 +10755,13 @@ msgid "" "memory for caching new queries. This information can help you tune the query " "cache size. The query cache uses a least recently used (LRU) strategy to " "decide which queries to remove from the cache." -msgstr "" -"爲快取新的查詢而被刪除的已快取查詢的個數，由最近最少使用算法 (LRU) 確定應刪除" -"哪個已快取的查詢。該資訊可幫助您調整查詢快取大小。" +msgstr "爲快取新的查詢而被刪除的已快取查詢的個數，由最近最少使用算法 (LRU) 確定應刪除哪個已快取的查詢。該資訊可幫助您調整查詢快取大小。" #: libraries/server_status_variables.lib.php:668 msgid "" "The number of non-cached queries (not cachable, or not cached due to the " "query_cache_type setting)." -msgstr "" -"未快取的查詢數 (包括不能被快取，或因爲 query_cache_type 的設定而沒有被快取的" -"查詢)。" +msgstr "未快取的查詢數 (包括不能被快取，或因爲 query_cache_type 的設定而沒有被快取的查詢)。" #: libraries/server_status_variables.lib.php:672 msgid "The number of queries registered in the cache." @@ -10963,7 +10769,7 @@ msgstr "在快取中註冊的查詢數。" #: libraries/server_status_variables.lib.php:675 msgid "The total number of blocks in the query cache." -msgstr "查詢快取中的總塊數。" +msgstr "查詢快取中的總區塊數。" #: libraries/server_status_variables.lib.php:678 msgid "The status of failsafe replication (not yet implemented)." @@ -10973,9 +10779,7 @@ msgstr "備援失敗保護器的狀態 (尚未實作)。" msgid "" "The number of joins that do not use indexes. If this value is not 0, you " "should carefully check the indexes of your tables." -msgstr "" -"沒有使用索引的多表查詢數。如果該值不爲0，您應該仔細檢查是否已經爲表建立了適當" -"的索引。" +msgstr "沒有使用索引的多表查詢數。如果該值不爲0，您應該仔細檢查是否已經爲表建立了適當的索引。" #: libraries/server_status_variables.lib.php:685 msgid "The number of joins that used a range search on a reference table." @@ -10985,17 +10789,13 @@ msgstr "使用在關聯表上使用範圍搜尋的多表查詢的數量。" msgid "" "The number of joins without keys that check for key usage after each row. " "(If this is not 0, you should carefully check the indexes of your tables.)" -msgstr "" -"沒有使用索引但在每行之後檢查索引使用的多表查詢數。(如果該值不爲 0，您應該仔細" -"檢查是否已經爲表建立了適當的索引。)" +msgstr "沒有使用索引但在每行之後檢查索引使用的多表查詢數。(如果該值不爲 0，您應該仔細檢查是否已經爲表建立了適當的索引。)" #: libraries/server_status_variables.lib.php:693 msgid "" "The number of joins that used ranges on the first table. (It's normally not " "critical even if this is big.)" -msgstr "" -"在第一個資料表上使用範圍查詢的多表查詢數。(即使該值很大，通常也不會有致命的影" -"響。)" +msgstr "在第一個資料表上使用範圍查詢的多表查詢數。(即使該值很大，通常也不會有致命的影響。)" #: libraries/server_status_variables.lib.php:697 msgid "The number of joins that did a full scan of the first table." @@ -11003,7 +10803,7 @@ msgstr "在第一個資料表上進行了完整表掃描的多表查詢數。" #: libraries/server_status_variables.lib.php:700 msgid "The number of temporary tables currently open by the slave SQL thread." -msgstr "目前由從 SQL 程序開啟的臨時表的數量。" +msgstr "目前由從 SQL 程序開啟的暫存表的數量。" #: libraries/server_status_variables.lib.php:704 msgid "" @@ -11031,9 +10831,7 @@ msgid "" "The number of merge passes the sort algorithm has had to do. If this value " "is large, you should consider increasing the value of the sort_buffer_size " "system variable." -msgstr "" -"排序算法使用歸併的次數。如果該值很大，您應該考慮增加系統變數 " -"sort_buffer_size 的值。" +msgstr "排序算法使用合併的次數。如果該值很大，您應該考慮增加系統變數 sort_buffer_size 的值。" #: libraries/server_status_variables.lib.php:724 msgid "The number of sorts that were done with ranges." @@ -11057,9 +10855,7 @@ msgid "" "a wait was needed. If this is high, and you have performance problems, you " "should first optimize your queries, and then either split your table or " "tables or use replication." -msgstr "" -"無法立即取得鎖定表而必須等待的次數。如果該值很高，且您遇到了性能方面的問題，" -"則應該首先檢查您的查詢指令，然後使用備援操作來分開表。" +msgstr "無法立即取得鎖定表而必須等待的次數。如果該值很高，且您遇到了性能方面的問題，則應該首先檢查您的查詢指令，然後使用備援操作來分開表。" #: libraries/server_status_variables.lib.php:742 msgid "" @@ -11067,8 +10863,8 @@ msgid "" "calculated as Threads_created/Connections. If this value is red you should " "raise your thread_cache_size." msgstr "" -"程序快取中程序的數量。快取命中率可以由 Threads_created/Connections 計算得出如" -"果該值是紅色的，則應該增加 thread_cache_size 的值。" +"執行緒快取中執行緒的數量。快取命中率可以由 Threads_created/Connections 計算得出如果該值是紅色的，則應該增加 " +"thread_cache_size 的值。" #: libraries/server_status_variables.lib.php:747 msgid "The number of currently open connections." @@ -11081,12 +10877,12 @@ msgid "" "doesn't give a notable performance improvement if you have a good thread " "implementation.)" msgstr "" -"目前用於控制連線的程序數。如果 Threads_created 很大，您可能需要增加 " -"thread_cache_size 的值 (如果程序狀況良好，這麼做通常並不會帶來顯著的性能提升)" +"目前用於控制連線的執行緒數量。如果 Threads_created 很大，您可能需要增加 thread_cache_size 的值 " +"(如果執行緒狀況良好，這麼做通常並不會帶來顯著的性能提升)" #: libraries/server_status_variables.lib.php:757 msgid "Thread cache hit rate (calculated value)" -msgstr "執行序緩存命中率(計算值)" +msgstr "執行緒緩存命中率(計算值)" #: libraries/server_status_variables.lib.php:760 msgid "The number of threads that are not sleeping." @@ -11178,7 +10974,7 @@ msgstr "效能分析明細" #: libraries/sql.lib.php:471 msgid "Order" -msgstr "項次" +msgstr "排序" #: libraries/sql.lib.php:473 libraries/sql.lib.php:489 msgid "State" @@ -11237,9 +11033,7 @@ msgstr "已校驗的 SQL" msgid "" "Current selection does not contain a unique column. Grid edit, checkbox, " "Edit, Copy and Delete features are not available." -msgstr "" -"目前選擇的項目不含唯一(Unique)的資料欄位，將無法執行修改、複製、刪除等相關的" -"功能。" +msgstr "目前選擇的項目不含唯一(Unique)的資料欄位，將無法執行修改、複製、刪除等相關的功能。" #: libraries/sql.lib.php:1954 #, php-format @@ -11288,9 +11082,7 @@ msgstr "僅查看" msgid "" "There seems to be an error in your SQL query. The MySQL server error output " "below, if there is any, may also help you in diagnosing the problem." -msgstr "" -"您的 SQL 查詢可能有錯。如果可能的話，以下會列出 MySQL 伺服器的錯誤輸出，這可" -"能對您解決問題有一定的幫助。" +msgstr "您的 SQL 查詢可能有錯。如果可能的話，以下會列出 MySQL 伺服器的錯誤輸出，這可能對您解決問題有一定的幫助。" #: libraries/sqlparser.lib.php:178 msgid "" @@ -11304,12 +11096,11 @@ msgid "" "please reduce your SQL query input to the single query that causes problems, " "and submit a bug report with the data chunk in the CUT section below:" msgstr "" -"您可能發現了 SQL 解析器的缺陷 (bug)。請仔細檢查您的查詢，包括引號是否正確及是" -"否符合。其它可能的失敗原因也許由於您上傳了超過引號文字外的二進位資料。您還可" -"以在 MySQL 指令行界面試一下您的查詢。如果可能的話，以下會列出 MySQL 服務器的" -"錯誤輸出，這可能對您解決問題有一定的幫助。如果您仍然有問題，或者命令行界面執" -"行成功而解析器出錯，請將您的 SQL 查詢縮減到導致問題的某一條指令，然後和下面剪" -"切區中的資料一起送出一個缺陷 (bug) 報告:" +"您可能發現了 SQL 解析器的缺陷 " +"(bug)。請仔細檢查您的查詢，包括引號是否正確及是否符合。其它可能的失敗原因也許由於您上傳了超過引號文字外的二進位資料。您還可以在 MySQL " +"指令行界面試一下您的查詢。如果可能的話，以下會列出 MySQL " +"服務器的錯誤輸出，這可能對您解決問題有一定的幫助。如果您仍然有問題，或者命令行界面執行成功而解析器出錯，請將您的 SQL " +"查詢縮減到導致問題的某一條指令，然後和下面剪切區中的資料一起送出一個缺陷 (bug) 報告:" #: libraries/sqlparser.lib.php:191 msgid "BEGIN CUT" @@ -11348,9 +11139,7 @@ msgstr "未知的標點符號字元串" msgid "" "The SQL validator could not be initialized. Please check if you have " "installed the necessary PHP extensions as described in the %sdocumentation%s." -msgstr "" -"SQL 檢驗程序無法原始化。請檢查是否已安裝了 %s說明文件%s 內說明的必要 PHP 擴充" -"套件。" +msgstr "SQL 檢驗程序無法初始化。請檢查是否已安裝了 %s說明文件%s 內說明的必要 PHP 擴充套件。" #: libraries/structure.lib.php:68 tbl_operations.php:340 #, php-format @@ -11654,9 +11443,8 @@ msgid "" "single quote (\"'\") amongst those values, precede it with a backslash (for " "example '\\\\xyz' or 'a\\'b')." msgstr "" -"如果欄位類型為 \"enum\" 或 \"set\"，請使用以下格式輸入值: 'a','b','c'…
" -"如果您需要輸入反斜線(\"\\\")或單引號(\"'\")，請在前面加上反斜線(如 '\\\\xyz' " -"或 'a\\'b')。" +"如果欄位類型為 \"enum\" 或 \"set\"，請使用以下格式輸入值: 'a','b','c'…
如果您需要輸入反斜線(\"\\\")或單引號(\"'\")，請在前面加上反斜線(如 '\\\\xyz' 或 'a\\'b')。" #: libraries/tbl_columns_definition_form.lib.php:291 msgid "" @@ -11679,8 +11467,8 @@ msgid "" "quote (\"'\") amongst those values, precede it with a backslash (for example " "'\\\\xyz' or 'a\\'b')." msgstr "" -"請使用此格式輸入轉換選項的值: 'a',100,b,'c'…
如果您需要在值中輸入反斜槓 " -"(\"\\\")或單引號(\"'\")，請在前面加上反斜槓 (如 '\\\\xyz' 或 'a\\'b')。" +"請使用此格式輸入轉換選項的值: 'a',100,b,'c'…
如果您需要在值中輸入反斜槓 (\"\\\")或單引號(\"'\")，請在前面加上反斜槓 " +"(如 '\\\\xyz' 或 'a\\'b')。" #: libraries/tbl_columns_definition_form.lib.php:742 msgid "first" @@ -11924,8 +11712,7 @@ msgstr "追蹤資料操作已刪除" msgid "" "You can execute the dump by creating and using a temporary database. Please " "ensure that you have the privileges to do so." -msgstr "" -"您可以透過建立與使用暫存資料庫來執行資料匯出，請先確認您是否有足夠的權限。" +msgstr "您可以透過建立與使用暫存資料庫來執行資料匯出，請先確認您是否有足夠的權限。" #: libraries/tbl_tracking.lib.php:971 msgid "Comment out these two lines if you do not need them." @@ -11972,8 +11759,7 @@ msgstr "已儲存設定" msgid "" "Your preferences will be saved for current session only. Storing them " "permanently requires %sphpMyAdmin configuration storage%s." -msgstr "" -"您的偏好設定僅作用於本次連線。永久儲存需要開啟 %sphpMyAdmin 進階功能%s。" +msgstr "您的偏好設定僅作用於本次連線。永久儲存需要開啟 %sphpMyAdmin 進階功能%s。" #: libraries/user_preferences.lib.php:129 msgid "Could not save configuration" @@ -12146,7 +11932,7 @@ msgstr "按比例匯出/匯入：" #: pmd_pdf.php:152 msgid "recommended" -msgstr "推薦" +msgstr "建議" #: pmd_relation_new.php:36 msgid "Error: relation already exists." @@ -12206,7 +11992,7 @@ msgstr "從瀏覽器記錄匯入" #: prefs_manage.php:255 msgid "Settings will be imported from your browser's local storage." -msgstr "使用瀏覽器的本地儲存記錄匯入設定。" +msgstr "將使用瀏覽器的本機儲存記錄匯入設定。" #: prefs_manage.php:261 msgid "You have no saved settings!" @@ -12225,9 +12011,7 @@ msgstr "與目前設定合併" msgid "" "You can set more settings by modifying config.inc.php, eg. by using %sSetup " "script%s." -msgstr "" -"透過修改 config.inc.php 設定檔您可以調整更多的設定項目，如: 使用 %s安裝程" -"式%s 。" +msgstr "透過修改 config.inc.php 設定檔您可以調整更多的設定項目，如: 使用 %s安裝程式%s 。" #: prefs_manage.php:308 msgid "Save to browser's storage" @@ -12235,7 +12019,7 @@ msgstr "儲存到瀏覽器記錄" #: prefs_manage.php:312 msgid "Settings will be saved in your browser's local storage." -msgstr "設定將儲存到瀏覽器的本地記錄。" +msgstr "設定將儲存到瀏覽器的本機記錄。" #: prefs_manage.php:314 msgid "Existing settings will be overwritten!" @@ -12255,7 +12039,7 @@ msgstr "全部" #: querywindow.php:154 msgid "SQL history:" -msgstr "SQL 歷史：" +msgstr "SQL 紀錄：" #: schema_edit.php:37 schema_edit.php:43 schema_edit.php:49 schema_edit.php:54 #, php-format @@ -12295,8 +12079,8 @@ msgid "" "level directory as described in [doc@setup_script]documentation[/doc]. " "Otherwise you will be only able to download or display it." msgstr "" -"請在 phpMyAdmin 的根資料夾下建立 [doc@setup_script]檔案[/doc]中所述的網站伺服" -"器可以寫入的 [em]config[/em] 資料夾。否則您只能下載或顯示配置。" +"請在 phpMyAdmin 的根資料夾下建立 [doc@setup_script]檔案[/doc]中所述的網站伺服器可以寫入的 " +"[em]config[/em] 資料夾。否則您只能下載或顯示設定。" #: setup/frames/index.inc.php:68 msgid "" @@ -12309,13 +12093,11 @@ msgstr "您現在未使用安全協定連線，所有資料(包括敏感資訊 msgid "" "If your server is also configured to accept HTTPS requests follow [a@%s]this " "link[/a] to use a secure connection." -msgstr "" -"如果您的伺服器已經設定為接受 HTTPS 協定，請依 [a@%s]此處[/a] 說明以使用安全協" -"定連線。" +msgstr "如果您的伺服器已經設定為接受 HTTPS 協定，請依 [a@%s]此處[/a] 說明以使用安全協定連線。" #: setup/frames/index.inc.php:87 msgid "Insecure connection" -msgstr "非安全連線" +msgstr "不安全的連線" #: setup/frames/index.inc.php:116 msgid "Configuration saved." @@ -12325,9 +12107,7 @@ msgstr "設定已儲存。" msgid "" "Configuration saved to file config/config.inc.php in phpMyAdmin top level " "directory, copy it to top level one and delete directory config to use it." -msgstr "" -"配置保存到 phpMyAdmin 目錄下的 config/config.inc.php 檔，請將它複製到上層後再" -"刪除 config 目錄。" +msgstr "配置保存到 phpMyAdmin 目錄下的 config/config.inc.php 檔，請將它複製到上層後再刪除 config 目錄。" #: setup/frames/index.inc.php:130 setup/frames/menu.inc.php:15 msgid "Overview" @@ -12375,7 +12155,7 @@ msgstr "讀取" #: setup/frames/index.inc.php:305 msgid "phpMyAdmin homepage" -msgstr "phpMyAdmin 主頁 (外鏈，英文)" +msgstr "phpMyAdmin 主頁 (外部連結，英文)" #: setup/frames/index.inc.php:307 msgid "Donate" @@ -12432,9 +12212,7 @@ msgstr "無法解析版本" msgid "" "You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable " "version is %s, released on %s." -msgstr "" -"您現在使用的是 Git 開發版，請透過 [kbd]git pull[/kbd] 檢查更新 :-)[br]最新正" -"式版爲 %s，於 %s 發佈。" +msgstr "您現在使用的是 Git 開發版，請透過 [kbd]git pull[/kbd] 檢查更新 :-)[br]最新正式版爲 %s，於 %s 發佈。" #: setup/lib/index.lib.php:172 msgid "No newer stable version is available" @@ -12448,8 +12226,8 @@ msgid "" "proxies list%s. However, IP-based protection may not be reliable if your IP " "belongs to an ISP where thousands of users, including you, are connected to." msgstr "" -"該%s選項%s應該被關閉以防止有人嘗試暴力破解 MySQL 伺服器。如果有必要，您可以使" -"用%s可信代理表%s。但如果您和許多人共用一個 IP 網址，該措施的安全性將下降。" +"該%s選項%s應該被關閉以防止有人嘗試暴力破解 MySQL 伺服器。如果有必要，您可以使用%s可信代理表%s。但如果您和許多人共用一個 IP " +"網址，該措施的安全性將下降。" #: setup/lib/index.lib.php:225 msgid "" @@ -12457,8 +12235,7 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" -"您開啟了 Cookies 認證方式，但沒有設定短語密碼，因此系統自動產生了一個短語密" -"碼，該密語用於加密 Cookies。您不需要記住這個短語密碼。" +"您開啟了 Cookies 認證方式，但沒有設定短語密碼，因此系統自動產生了一個短語密碼，該密語用於加密 Cookies。您不需要記住這個短語密碼。" #: setup/lib/index.lib.php:226 #, php-format @@ -12471,9 +12248,7 @@ msgstr "此系統目前不支援 %sBzip2 壓縮和解壓縮%s所必須的 (%s) msgid "" "This value should be double checked to ensure that this directory is neither " "world accessible nor readable or writable by other users on your server." -msgstr "" -"對該值應該進行小心謹慎的檢查，確保伺服器上的其他使用者對該資料夾都沒有讀取和" -"寫入的權限。" +msgstr "對該值應該進行小心謹慎的檢查，確保伺服器上的其他使用者對該資料夾都沒有讀取和寫入的權限。" #: setup/lib/index.lib.php:233 #, php-format @@ -12493,26 +12268,22 @@ msgid "" "%sLogin cookie validity%s greater than %ssession.gc_maxlifetime%s may cause " "random session invalidation (currently session.gc_maxlifetime is %d)." msgstr "" -"如果%s登錄 cookie 有效期%s超過 %ssession.gc_maxlifetime%s 的值則可能導致連線" -"隨機失效 (目前 session.gc_maxlifetime 值為 %d)。" +"如果%s登錄 cookie 有效期%s超過 %ssession.gc_maxlifetime%s 的值則可能導致連線隨機失效 (目前 " +"session.gc_maxlifetime 值為 %d)。" #: setup/lib/index.lib.php:257 #, php-format msgid "" "%sLogin cookie validity%s should be set to 1800 seconds (30 minutes) at " "most. Values larger than 1800 may pose a security risk such as impersonation." -msgstr "" -"%s登入 cookie 有效期%s不應超過 1800 秒 (30 分鐘)。如果有效期大於 1800 秒，將" -"會增加安全風險。" +msgstr "%s登入 cookie 有效期%s不應超過 1800 秒 (30 分鐘)。如果有效期大於 1800 秒，將會增加安全風險。" #: setup/lib/index.lib.php:263 #, php-format msgid "" "If using cookie authentication and %sLogin cookie store%s is not 0, %sLogin " "cookie validity%s must be set to a value less or equal to it." -msgstr "" -"如果使用 cookie 認證且%s登入 cookie 儲存時間%s不爲 0，%s登入 cookie 有效期%s" -"的值不能超過前者。" +msgstr "如果使用 cookie 認證且%s登入 cookie 儲存時間%s不爲 0，%s登入 cookie 有效期%s的值不能超過前者。" #: setup/lib/index.lib.php:270 #, php-format @@ -12521,9 +12292,7 @@ msgid "" "authentication%s settings and %strusted proxies list%s. However, IP-based " "protection may not be reliable if your IP belongs to an ISP where thousands " "of users, including you, are connected to." -msgstr "" -"如果有必要，您可以使用額外的保護設定 - %s主機認證%s和%s可信代理表%s。但如果您" -"和許多人共用一個 IP 網址，該措施的安全性將下降。" +msgstr "如果有必要，您可以使用額外的保護設定 - %s主機認證%s和%s可信代理表%s。但如果您和許多人共用一個 IP 網址，該措施的安全性將下降。" #: setup/lib/index.lib.php:278 #, php-format @@ -12534,9 +12303,8 @@ msgid "" "phpMyAdmin panel. Set %sauthentication type%s to [kbd]cookie[/kbd] or [kbd]" "http[/kbd]." msgstr "" -"您設定了 [kbd]config[/kbd] 認證方式，且爲了能夠自動登入而儲存了帳號和密碼，但" -"在常用主機上不建議這樣設定。如果有人知道 phpMyAdmin 的網址，他們就能夠進入 " -"phpMyAdmin 的管理界面。建議將%s認證方式%s設定爲 [kbd]cookie 認證[/kbd]或 " +"您設定了 [kbd]config[/kbd] 認證方式，且爲了能夠自動登入而儲存了帳號和密碼，但在常用主機上不建議這樣設定。如果有人知道 " +"phpMyAdmin 的網址，他們就能夠進入 phpMyAdmin 的管理界面。建議將%s認證方式%s設定爲 [kbd]cookie 認證[/kbd]或 " "[kbd]HTTP 認證[/kbd]。" #: setup/lib/index.lib.php:284 @@ -12676,22 +12444,22 @@ msgstr "刪除檢視表 (DROP)" #: libraries/advisory_rules.txt:49 msgid "Uptime below one day" -msgstr "執行時間不到一天" +msgstr "上線時間不到一天" #: libraries/advisory_rules.txt:52 msgid "Uptime is less than 1 day, performance tuning may not be accurate." -msgstr "執行時間不到 1 天，效能調整的數據可能不準確。" +msgstr "上線時間不到 1 天，效能調整的資料可能不準確。" #: libraries/advisory_rules.txt:53 msgid "" "To have more accurate averages it is recommended to let the server run for " "longer than a day before running this analyzer" -msgstr "若要取得更準確的平均數據，建議在執行分析前讓伺服器執行至少一天" +msgstr "若要取得更準確的平均資料，建議在執行分析前讓伺服器執行至少一天" #: libraries/advisory_rules.txt:54 #, php-format msgid "The uptime is only %s" -msgstr "僅執行了 %s" +msgstr "上線時間僅有 %s" #: libraries/advisory_rules.txt:56 msgid "Questions below 1,000" @@ -12758,16 +12526,13 @@ msgstr "超長查詢時間" msgid "" "{long_query_time} is set to 10 seconds or more, thus only slow queries that " "take above 10 seconds are logged." -msgstr "" -"{long_query_time} 目前設定為超過 10 秒，只有執行時間超過 10 秒的查詢會被記" -"錄。" +msgstr "{long_query_time} 目前設定為超過 10 秒，只有執行時間超過 10 秒的查詢會被記錄。" #: libraries/advisory_rules.txt:81 msgid "" "It is suggested to set {long_query_time} to a lower value, depending on your " "environment. Usually a value of 1-5 seconds is suggested." -msgstr "" -"建議您依據您的環境將 {long_query_time} 設定值調低，通常建議設在 1-5 秒之間。" +msgstr "建議您依據您的環境將 {long_query_time} 設定值調低，通常建議設在 1-5 秒之間。" #: libraries/advisory_rules.txt:82 #, php-format @@ -12786,9 +12551,7 @@ msgstr "未啟用緩慢查詢記錄(Slow query log)。" msgid "" "Enable slow query logging by setting {log_slow_queries} to 'ON'. This will " "help troubleshooting badly performing queries." -msgstr "" -"要啟用緩慢查詢記錄請將 {log_slow_queries} 設為 'ON'，這將有助於不良查詢的故障" -"排除。" +msgstr "要啟用緩慢查詢記錄請將 {log_slow_queries} 設為 'ON'，這將有助於不良查詢的故障排除。" #: libraries/advisory_rules.txt:89 msgid "log_slow_queries is set to 'OFF'" @@ -12798,9 +12561,7 @@ msgstr "log_slow_queries 目前設定為 'OFF'" msgid "" "Enable slow query logging by setting {slow_query_log} to 'ON'. This will " "help troubleshooting badly performing queries." -msgstr "" -"要啟用緩慢查詢記錄請將 {slow_query_log} 設為 'ON'，這將有助於不良查詢的故障排" -"除。" +msgstr "要啟用緩慢查詢記錄請將 {slow_query_log} 設為 'ON'，這將有助於不良查詢的故障排除。" #: libraries/advisory_rules.txt:96 msgid "slow_query_log is set to 'OFF'" @@ -12832,17 +12593,17 @@ msgstr "次要版本" #: libraries/advisory_rules.txt:110 msgid "Version less than 5.1.30 (the first GA release of 5.1)." -msgstr "版本小於 5.1.30 (5.1 官方第一個推薦版本)。" +msgstr "版本小於 5.1.30 (5.1 第一個釋出的正式版本)。" #: libraries/advisory_rules.txt:111 msgid "" "You should upgrade, as recent versions of MySQL 5.1 have improved " "performance and MySQL 5.5 even more so." -msgstr "您應該升級到 MySQL 5.1 或 5.5 最近的版本，以獲得更好的性能。" +msgstr "您應該升級到 MySQL 5.1 或 5.5 最近的版本，以取得更好的性能。" #: libraries/advisory_rules.txt:117 msgid "Version less than 5.5.8 (the first GA release of 5.5)." -msgstr "版本低於 5.5.8 (5.5 官方第一個推薦版本)。" +msgstr "版本低於 5.5.8 (5.5 第一個釋出的正式版本)。" #: libraries/advisory_rules.txt:118 msgid "You should upgrade, to a stable version of MySQL 5.5" @@ -12855,8 +12616,7 @@ msgstr "發行版" #: libraries/advisory_rules.txt:124 msgid "Version is compiled from source, not a MySQL official binary." -msgstr "" -"您的伺服器版本是自行從原始碼編譯而來的，並非 MySQL 官方所釋出的已編譯版本。" +msgstr "您的伺服器版本是自行從原始碼編譯而來的，並非 MySQL 官方所編譯。" #: libraries/advisory_rules.txt:125 msgid "" @@ -12864,9 +12624,8 @@ msgid "" "distribution. The MySQL manual only is accurate for official MySQL binaries, " "not any package distributions (such as RedHat, Debian/Ubuntu etc)." msgstr "" -"如果您並未自行編譯原始程式碼，那麼您可能是使用 Linux 發行版(Distribution)所修" -"改的套件版本。而 MySQL 操作文件是依據的官方版本所搛寫，並不是依據發行版的套" -"件 (例如 RedHat、Debian/Ubuntu 等)。" +"如果您並未自行編譯原始程式碼，那麼您可能是使用 Linux 發行版(Distribution)所修改的套件版本。而 MySQL " +"說明文件是依據的官方版本所撰寫，並不是依據發行版的套件 (例如 RedHat、Debian/Ubuntu 等)。" #: libraries/advisory_rules.txt:126 msgid "'source' found in version_comment" @@ -12874,11 +12633,11 @@ msgstr "在 version_comment 中找到 'source'" #: libraries/advisory_rules.txt:131 libraries/advisory_rules.txt:138 msgid "The MySQL manual only is accurate for official MySQL binaries." -msgstr "MySQL 手冊只基於的官方的編譯版本。" +msgstr "MySQL 手冊的內容適用於官方編譯的版本。" #: libraries/advisory_rules.txt:132 msgid "Percona documentation is at http://www.percona.com/docs/wiki/" -msgstr "Percona 的文檔在 http://www.percona.com/docs/wiki/" +msgstr "Percona 的文件在 http://www.percona.com/docs/wiki/" #: libraries/advisory_rules.txt:133 msgid "'percona' found in version_comment" @@ -12886,7 +12645,7 @@ msgstr "在 version_comment 中找到的 'percona'" #: libraries/advisory_rules.txt:139 msgid "Drizzle documentation is at http://docs.drizzle.org/" -msgstr "Drizzle 文檔在 http://docs.drizzle.org/" +msgstr "Drizzle 文件在 http://docs.drizzle.org/" #: libraries/advisory_rules.txt:140 #, php-format @@ -12899,16 +12658,14 @@ msgstr "MySQL 架構" #: libraries/advisory_rules.txt:145 msgid "MySQL is not compiled as a 64-bit package." -msgstr "MySQL 並不是編譯為 64 位元套件。" +msgstr "MySQL 並非被編譯為 64 位元套件。" #: libraries/advisory_rules.txt:146 msgid "" "Your memory capacity is above 3 GiB (assuming the Server is on localhost), " "so MySQL might not be able to access all of your memory. You might want to " "consider installing the 64-bit version of MySQL." -msgstr "" -"您的記憶體空間超過 3 GB (若伺服器是在本機上)，MySQL 可能無法使用所有的記憶體" -"空間。請考慮安裝 64 位元版本的 MySQL。" +msgstr "您的記憶體空間超過 3 GB (若伺服器是在本機上)，MySQL 可能無法使用所有的記憶體空間。請考慮安裝 64 位元版本的 MySQL。" #: libraries/advisory_rules.txt:147 #, php-format @@ -12930,9 +12687,8 @@ msgid "" "and setting {query_cache_type} to 'ON'. Note: If you are using " "memcached, ignore this recommendation." msgstr "" -"正確的設定查詢快取可以大幅增進效能。將 {query_cache_size} 設定為兩位數的 MiB " -"值，並將 {query_cache_type} 設定為 'ON'，即可啟用查詢快取。注意: 若您" -"已啟用 memcached，則可忽略這個建議。" +"正確的設定查詢快取可以大幅增進效能。將 {query_cache_size} 設定為兩位數的 MiB 值，並將 {query_cache_type} " +"設定為 'ON'，即可啟用查詢快取。注意: 若您已啟用 memcached，則可忽略這個建議。" #: libraries/advisory_rules.txt:158 msgid "query_cache_size is set to 0 or query_cache_type is set to 'OFF'" @@ -12953,18 +12709,16 @@ msgid "" "refman/5.5/en/ha-memcached.html\">memcached instead of the MySQL Query " "cache, especially if you have multiple slaves." msgstr "" -"您在一台有相當大流量的資料庫上使用的 MySQL 查詢快取。除非您有多台資料庫，否則" -"可以考慮使用 memcached 來取代 MySQL 查詢快取。" +"您在一台有相當大流量的資料庫上使用的 MySQL 查詢快取。除非您有多台資料庫，否則可以考慮使用 " +"memcached 來取代 MySQL 查詢快取。" #: libraries/advisory_rules.txt:165 #, php-format msgid "" "The query cache is enabled and the server receives %d queries per second. " "This rule fires if there is more than 100 queries per second." -msgstr "" -"查詢快取已啟用，伺服器每秒收到 %d 個查詢。如果每秒超過 100 個查詢，將觸發此規" -"則。" +msgstr "查詢快取已啟用，伺服器每秒收到 %d 個查詢。如果每秒超過 100 個查詢，將觸發此規則。" #: libraries/advisory_rules.txt:167 #, php-format @@ -12997,8 +12751,7 @@ msgstr "查詢快取的使用比例低於 80%%。" msgid "" "This might be caused by {query_cache_limit} being too low. Flushing the " "query cache might help as well." -msgstr "" -"可能是 {query_cache_limit} 太低所引起的。清空查詢快取可能可以改善狀況。" +msgstr "可能是 {query_cache_limit} 太低所引起的。清空查詢快取可能可以改善狀況。" #: libraries/advisory_rules.txt:179 #, php-format @@ -13026,12 +12779,10 @@ msgid "" "using this formula: (query_cache_size - qcache_free_memory) / " "qcache_queries_in_cache" msgstr "" -"快取資料嚴重分散會促使 Qcache_lowmem_prunes 增加。 這可能是因為 " -"{query_cache_size} 太小導致太多查詢快取超出限制而被從記憶體刪除。 若要即時短" -"暫的解決問題您可以清空(Flush)查詢快取 (可能會造成查詢快取被鎖定一段時間)。 小" -"心調整將 {query_cache_min_res_unit} 降低也可以解決問題，註: 您可以可將其設為" -"查詢大小的平均值，使用以下公式: (query_cache_size - qcache_free_memory) / " -"qcache_queries_in_cache" +"快取資料嚴重分散會促使 Qcache_lowmem_prunes 增加。 這可能是因為 {query_cache_size} " +"太小導致太多查詢快取超出限制而被從記憶體刪除。 若要即時短暫的解決問題您可以清空(Flush)查詢快取 (可能會造成查詢快取被鎖定一段時間)。 " +"小心調整將 {query_cache_min_res_unit} 降低也可以解決問題，註: 您可以可將其設為查詢大小的平均值，使用以下公式: " +"(query_cache_size - qcache_free_memory) / qcache_queries_in_cache" #: libraries/advisory_rules.txt:186 #, php-format @@ -13039,9 +12790,7 @@ msgid "" "The cache is currently fragmented by %s%% , with 100%% fragmentation meaning " "that the query cache is an alternating pattern of free and used blocks. This " "value should be below 20%%." -msgstr "" -"快取資料目前的分散率為 %s%%，當 100%% 分散時代表查詢快取變成直接替換資料無快" -"取作用，此值應低於 20%%。" +msgstr "快取資料目前的分散率為 %s%%，當 100%% 分散時代表查詢快取變成直接替換資料無快取作用，此值應低於 20%%。" #: libraries/advisory_rules.txt:188 msgid "Query cache low memory prunes" @@ -13059,8 +12808,7 @@ msgid "" "overhead of maintaining the cache is likely to increase with its size, so do " "this in small increments and monitor the results." msgstr "" -"你可能需要增加 {query_cache_size}，但是請注意，維護快取額外消耗的資源通常的主" -"因是過度增加快取，因此請小幅增加快取並監控結果。" +"你可能需要增加 {query_cache_size}，但是請注意，維護快取額外消耗的資源通常的主因是過度增加快取，因此請小幅增加快取並監控結果。" #: libraries/advisory_rules.txt:193 #, php-format @@ -13110,12 +12858,10 @@ msgid "" "(often invalidated due to table updates) increasing {query_cache_limit} " "might reduce efficiency." msgstr "" -"更改 {query_cache_limit} 可以提高效率 (通常是增加)，這個變數用來限制可以儲存" -"在查詢快取中的查詢結果。如果有許多超過 1 MB 的查詢是適合快取的 (讀取多，寫入" -"少)，那麼增加 {query_cache_limit} 將會增加效率。反之，若許多超過 1 MB 的查詢" -"結果是不適合快取的 (當資料表更新時快取就會無效) 那麼增加 {query_cache_limit} " -"就會降地效率。如果許多查詢結果在 1 MB 以上存入快取狀態良好 (多次讀取、少量寫" -"入)，那麼增加 {query_cache_limit} 可以提高效率。反之，在存入快取狀態是不良 " +"更改 {query_cache_limit} 可以提高效率 (通常是增加)，這個變數用來限制可以儲存在查詢快取中的查詢結果。如果有許多超過 1 MB " +"的查詢是適合快取的 (讀取多，寫入少)，那麼增加 {query_cache_limit} 將會增加效率。反之，若許多超過 1 MB " +"的查詢結果是不適合快取的 (當資料表更新時快取就會無效) 那麼增加 {query_cache_limit} 就會降地效率。如果許多查詢結果在 1 MB " +"以上存入快取狀態良好 (多次讀取、少量寫入)，那麼增加 {query_cache_limit} 可以提高效率。反之，在存入快取狀態是不良 " "(往往因資料表更新而失效) 的情況下，增加 {query_cache_limit} 反而會降低效率。" #: libraries/advisory_rules.txt:207 @@ -13124,35 +12870,34 @@ msgstr "query_cache_limit 目前設定為 1 MB" #: libraries/advisory_rules.txt:211 msgid "Percentage of sorts that cause temporary tables" -msgstr "因排序建立的臨時表百分比" +msgstr "因排序建立的暫存表百分比" #: libraries/advisory_rules.txt:214 libraries/advisory_rules.txt:221 msgid "Too many sorts are causing temporary tables." -msgstr "太多排序產生的臨時表。" +msgstr "太多排序產生的暫存表。" #: libraries/advisory_rules.txt:215 libraries/advisory_rules.txt:222 msgid "" "Consider increasing {sort_buffer_size} and/or {read_rnd_buffer_size}, " "depending on your system memory limits" -msgstr "" -"根據您的系統記憶體多寡，考慮增加 {sort_buffer_size} 和 {read_rnd_buffer_size}" +msgstr "根據您的系統記憶體多寡，考慮增加 {sort_buffer_size} 和 {read_rnd_buffer_size}" #: libraries/advisory_rules.txt:216 #, php-format msgid "" "%s%% of all sorts cause temporary tables, this value should be lower than " "10%%." -msgstr "有 %s%% 的排序會產生臨時表，這個值應低於 10%%。" +msgstr "有 %s%% 的排序會產生暫存表，這個值應低於 10%%。" #: libraries/advisory_rules.txt:218 msgid "Rate of sorts that cause temporary tables" -msgstr "排序產生的臨時表比率" +msgstr "排序產生的暫存表比率" #: libraries/advisory_rules.txt:223 #, php-format msgid "" "Temporary tables average: %s, this value should be less than 1 per hour." -msgstr "平均臨時表: %s，此值應每小時小於 1。" +msgstr "平均暫存表: %s，此值應每小時小於 1。" #: libraries/advisory_rules.txt:225 msgid "Sort rows" @@ -13168,9 +12913,7 @@ msgid "" "want to make sure that the queries which require a lot of sorting use " "indexed columns in the ORDER BY clause, as this will result in much faster " "sorting" -msgstr "" -"大量的排序不是什麼嚴重的問題，但請您確保在 ORDER BY 子句中使用索引欄位來排" -"序，以加速排序的執行速度" +msgstr "大量的排序不是什麼嚴重的問題，但請您確保在 ORDER BY 子句中使用索引欄位來排序，以加速排序的執行速度" #: libraries/advisory_rules.txt:230 #, php-format @@ -13189,9 +12932,7 @@ msgstr "有太多的資料表合併(Join)未使用索引。" msgid "" "This means that joins are doing full table scans. Adding indexes for the " "columns being used in the join conditions will greatly speed up table joins" -msgstr "" -"這代表資料表合併(Join)時會掃描完整的資料表內容，,將合併條件中所使用的欄位設定" -"為索引欄位可大幅加快資料表合併時的速度" +msgstr "這代表資料表合併(Join)時會掃描完整的資料表內容，,將合併條件中所使用的欄位設定為索引欄位可大幅加快資料表合併時的速度" #: libraries/advisory_rules.txt:238 #, php-format @@ -13215,10 +12956,9 @@ msgid "" "scans. Other than that full index scans can only be reduced by rewriting " "queries." msgstr "" -"這通常表示資料庫時常掃描全部索引(Full index scan)。雖然掃描全部索引會比掃描資" -"料表速度還要快，但在擁有大量資料的資料表仍需消耗不少 CPU 時間，如果這些資料表" -"有大量的更新和刪除操作，執行 'OPTIMIZE TABLE' 可以減少掃描全部索引的次數或提" -"升速度，除此之外只能靠重寫查詢來減少掃描全部索引。" +"這通常表示資料庫時常掃描全部索引(Full index scan)。雖然掃描全部索引會比掃描資料表速度還要快，但在擁有大量資料的資料表仍需消耗不少 " +"CPU 時間，如果這些資料表有大量的更新和刪除操作，執行 'OPTIMIZE TABLE' " +"可以減少掃描全部索引的次數或提升速度，除此之外只能靠重寫查詢來減少掃描全部索引。" #: libraries/advisory_rules.txt:245 #, php-format @@ -13239,8 +12979,7 @@ msgid "" "scan, including join queries that do not use indexes. Add indexes where " "applicable." msgstr "" -"這表示許多查詢的結果需要排序或掃描全部資料表(Full table scan)，這包括未使用索" -"引的資料表合併(Join)查詢。請在適當的地方增加索引。" +"這表示許多查詢的結果需要排序或掃描全部資料表(Full table scan)，這包括未使用索引的資料表合併(Join)查詢。請在適當的地方增加索引。" #: libraries/advisory_rules.txt:252 #, php-format @@ -13283,9 +13022,7 @@ msgid "" "value of either to determine the maximum size of in-memory tables. So if you " "wish to increase the in-memory table limit you will have to increase the " "other value as well." -msgstr "" -"如果您是有意更改其中之一: 伺服器會使用較低的值來決定記憶體中資料表的最大大" -"小。如果您想要增加的記憶體中資料表大小，您應該同時增加另一個值。" +msgstr "如果您是有意更改其中之一: 伺服器會使用較低的值來決定記憶體中資料表的最大大小。如果您想要增加的記憶體中資料表大小，您應該同時增加另一個值。" #: libraries/advisory_rules.txt:267 #, php-format @@ -13294,7 +13031,7 @@ msgstr "目前的值是 tmp_table_size: %s，max_heap_table_size: %s" #: libraries/advisory_rules.txt:269 msgid "Percentage of temp tables on disk" -msgstr "臨時表在磁碟的比率" +msgstr "暫存表在磁碟的比率" #: libraries/advisory_rules.txt:272 libraries/advisory_rules.txt:279 msgid "" @@ -13312,11 +13049,10 @@ msgid "" "mentioned in the beginning of an Article by the Pythian Group" msgstr "" -"增加 {max_heap_table_size} 和 {tmp_table_size} 可能有所幫助，但某些暫存資料表" -"仍然會寫到磁碟與這些變數無關。要解決這個問題您必須重寫查詢條件避免在暫存資料" -"表中儲存 BLOB 或 TEXT 型態的欄位或者使用長度大於 512 位元組的欄位，如 Pythian 小組文章 文中所提到的狀況" +"增加 {max_heap_table_size} 和 {tmp_table_size} " +"可能有所幫助，但某些暫存資料表仍然會寫到磁碟與這些變數無關。要解決這個問題您必須重寫查詢條件避免在暫存資料表中儲存 BLOB 或 TEXT " +"型態的欄位或者使用長度大於 512 位元組的欄位，如 Pythian 小組文章 文中所提到的狀況" #: libraries/advisory_rules.txt:274 #, php-format @@ -13339,11 +13075,10 @@ msgid "" "mentioned in the MySQL Documentation" msgstr "" -"增加 {max_heap_table_size} 和 {tmp_table_size} 可能有所幫助，但某些暫存資料表" -"仍然會寫到磁碟與這些變數無關。要解決這個問題您必須重寫查詢條件避免在暫存資料" -"表中儲存 BLOB 或 TEXT 型態的欄位或者使用長度大於 512 位元組的欄位，如 MySQL 說明文件 中所提到的狀況" +"增加 {max_heap_table_size} 和 {tmp_table_size} " +"可能有所幫助，但某些暫存資料表仍然會寫到磁碟與這些變數無關。要解決這個問題您必須重寫查詢條件避免在暫存資料表中儲存 BLOB 或 TEXT " +"型態的欄位或者使用長度大於 512 位元組的欄位，如 MySQL 說明文件 中所提到的狀況" #: libraries/advisory_rules.txt:281 #, php-format @@ -13364,9 +13099,7 @@ msgstr "鍵值緩衝區未初始化。將無法快取 MyISAM 索引。" msgid "" "Set {key_buffer_size} depending on the size of your MyISAM indexes. 64M is a " "good start." -msgstr "" -"請根據您的 MyISAM 索引的大小來設定 {key_buffer_size}。一開始通常會設定為 " -"64M。" +msgstr "請根據您的 MyISAM 索引的大小來設定 {key_buffer_size}。一開始通常會設定為 64M。" #: libraries/advisory_rules.txt:301 msgid "key_buffer_size is 0" @@ -13387,9 +13120,7 @@ msgid "" "You may need to decrease the size of {key_buffer_size}, re-examine your " "tables to see if indexes have been removed, or examine queries and " "expectations about what indexes are being used." -msgstr "" -"您可能需要減少 {key_buffer_size} 的值，重新檢查資料表是否曾刪除過索引或檢查查" -"詢是否如預期的使用了索引。" +msgstr "您可能需要減少 {key_buffer_size} 的值，重新檢查資料表是否曾刪除過索引或檢查查詢是否如預期的使用了索引。" #: libraries/advisory_rules.txt:308 #, php-format @@ -13436,8 +13167,7 @@ msgstr "資料表開啟比率過高。" msgid "" "Opening tables requires disk I/O which is costly. Increasing " "{table_open_cache} might avoid this." -msgstr "" -"開啟資料表會大量使用磁碟存取，請增加 {table_open_cache} 可以避免此問題。" +msgstr "開啟資料表會大量使用磁碟存取，請增加 {table_open_cache} 可以避免此問題。" #: libraries/advisory_rules.txt:332 #, php-format @@ -13452,17 +13182,14 @@ msgstr "已使用檔案開啟限制比例" msgid "" "The number of open files is approaching the max number of open files. You " "may get a \"Too many open files\" error." -msgstr "" -"檔案開啟的數量已接近限制，您可能會發生開啟過多檔案 \"Too many open files\" 的" -"錯誤。" +msgstr "檔案開啟的數量已接近限制，您可能會發生開啟過多檔案 \"Too many open files\" 的錯誤。" #: libraries/advisory_rules.txt:338 libraries/advisory_rules.txt:345 msgid "" "Consider increasing {open_files_limit}, and check the error log when " "restarting after changing {open_files_limit}." msgstr "" -"請評估增加 {open_files_limit}，並在更改 {open_files_limit} 設定值後重新啟動" -"伺服器檢查錯誤記錄是否有異常。" +"請評估增加 {open_files_limit}，並在更改 {open_files_limit} 設定值後重新啟動伺服器檢查錯誤記錄是否有異常。" #: libraries/advisory_rules.txt:339 #, php-format @@ -13518,7 +13245,7 @@ msgstr "執行緒快取" msgid "" "Thread cache is disabled, resulting in more overhead from new connections to " "MySQL." -msgstr "執行緒快取未啟用，在新連線到 MySQL 時消耗更多額外資源。" +msgstr "執行緒快取未啟用，將導致建立新的連線到 MySQL 時消耗更多的額外資源。" #: libraries/advisory_rules.txt:366 msgid "Enable the thread cache by setting {thread_cache_size} > 0." @@ -13600,8 +13327,8 @@ msgid "" "that do not close database handlers properly get killed sooner. Make sure " "the code closes database handlers properly." msgstr "" -"增加 {max_connections} 或減少 {wait_timeout} 可以使得未正常結束資料庫連線者更" -"快速的被移除，以確保程式碼能正確的結束資料庫連線。" +"增加 {max_connections} 或減少 {wait_timeout} " +"可以使得未正常結束資料庫連線者更快速的被移除，以確保程式碼能正確的結束資料庫連線。" #: libraries/advisory_rules.txt:397 #, php-format @@ -13624,9 +13351,9 @@ msgid "" "source-of-aborted_connects/\">This article might help you track down the " "source." msgstr "" -"連線通常會因此無法取得授權而中斷，請參考 此文章 可能對您追查連線中斷的原因有所幫助。" +"連線通常會因此無法取得授權而中斷，請參考 此文章 " +"可能對您追查連線中斷的原因有所幫助。" #: libraries/advisory_rules.txt:404 #, php-format @@ -13645,34 +13372,32 @@ msgstr "已中斷的連線的比率是 %s，此值應每小時小於 1" #: libraries/advisory_rules.txt:413 msgid "Percentage of aborted clients" -msgstr "客戶連線不正常中斷比例" +msgstr "用戶端連線不正常中斷比例" #: libraries/advisory_rules.txt:416 libraries/advisory_rules.txt:423 msgid "Too many clients are aborted." -msgstr "有太多的客戶連線不正常中斷。" +msgstr "有太多的用戶端連線被中斷。" #: libraries/advisory_rules.txt:417 libraries/advisory_rules.txt:424 msgid "" "Clients are usually aborted when they did not close their connection to " "MySQL properly. This can be due to network issues or code not closing a " "database handler properly. Check your network and code." -msgstr "" -"通常是客戶端未正確結束 MySQL 的連線，可能是由於網路的問題或使用的程式未正確關" -"閉資料庫的連線，請檢查您的網路及程式碼。" +msgstr "通常是用戶端未正確結束 MySQL 的連線，可能是由於網路的問題或使用的程式未正確關閉資料庫的連線，請檢查您的網路及程式碼。" #: libraries/advisory_rules.txt:418 #, php-format msgid "%s%% of all clients are aborted. This value should be below 2%%" -msgstr "有 %s%% 的用戶不正常中斷連線，此值應低於 2%%" +msgstr "有 %s%% 的用戶端不正常中斷連線，此值應低於 2%%" #: libraries/advisory_rules.txt:420 msgid "Rate of aborted clients" -msgstr "客戶連線不正常中斷比率" +msgstr "用戶端連線不正常中斷比率" #: libraries/advisory_rules.txt:425 #, php-format msgid "Aborted client rate is at %s, this value should be less than 1 per hour" -msgstr "客戶連線不正常中斷比率為 %s，此值每小時應低於 1" +msgstr "用戶端連線不正常中斷比率為 %s，此值每小時應低於 1" #: libraries/advisory_rules.txt:429 msgid "Is InnoDB disabled?" @@ -13713,10 +13438,9 @@ msgid "" "fine. See also this blog entry" msgstr "" -"特別在某些會大量寫入資料到 InnoDB 資料表的系統上，您應設定 " -"{innodb_log_file_size} 為 {innodb_buffer_pool_size} 的 25%%。不論如何，這個值" -"越大，在資料庫當機時還原資料庫的時間將越長，所以這個值不應該高於 256 MB。請注" -"意，修改這個數值必須關閉伺服器並刪除所有已存在的 InnoDB 的記錄檔，在 my.cnf " +"特別在某些會大量寫入資料到 InnoDB 資料表的系統上，您應設定 {innodb_log_file_size} 為 " +"{innodb_buffer_pool_size} 的 25%%。不論如何，這個值越大，在資料庫當機時還原資料庫的時間將越長，所以這個值不應該高於 " +"256 MB。請注意，修改這個數值必須關閉伺服器並刪除所有已存在的 InnoDB 的記錄檔，在 my.cnf " "設定檔中設定新的值，然後啟動伺服器並檢查錯誤記錄查看是否一切順利。請參考 此部落格文章" @@ -13734,7 +13458,7 @@ msgstr "InnoDB 記錄大小限制" #: libraries/advisory_rules.txt:446 msgid "The InnoDB log file size is inadequately large." -msgstr "不適當的 InnoDB 記錄檔大小限制。" +msgstr "InnoDB 記錄檔大小不足。" #: libraries/advisory_rules.txt:447 #, php-format @@ -13749,14 +13473,13 @@ msgid "" "mysqldatabaseadministration.blogspot.com/2007/01/increase-innodblogfilesize-" "proper-way.html\">this blog entry" msgstr "" -"通常將 {innodb_log_file_size} 設為 {innodb_buffer_pool_size} 的 25%% 就已足" -"夠。過大的 {innodb_log_file_size} 會增加資料庫當機後資料還原的時間，請參考 " -"此篇文章。修改這個數值必須關閉伺服器並刪除所有已" -"存在的 InnoDB 的記錄檔，在 my.cnf 設定檔中設定新的值，然後啟動伺服器並檢查錯" -"誤記錄查看是否一切順利。請參考 此部落格文" -"章" +"通常將 {innodb_log_file_size} 設為 {innodb_buffer_pool_size} 的 25%% 就已足夠。過大的 " +"{innodb_log_file_size} 會增加資料庫當機後資料還原的時間，請參考 此篇文章。修改這個數值必須關閉伺服器並刪除所有已存在的 InnoDB 的記錄檔，在 my.cnf " +"設定檔中設定新的值，然後啟動伺服器並檢查錯誤記錄查看是否一切順利。請參考 此部落格文章" #: libraries/advisory_rules.txt:448 #, php-format @@ -13785,11 +13508,9 @@ msgid "" "\"http://www.mysqlperformanceblog.com/2007/11/03/choosing-" "innodb_buffer_pool_size/\">this article" msgstr "" -"InnoDB 緩衝池對 InnoDB 資料表的性能有重大影響，請將您剩餘的記憶體分配給此緩衝" -"區。如果資料庫伺服器僅有 InnoDB 作為儲存引擎，並沒有運行的其他服務 (如網頁伺" -"服器)，您可以將高達 80%% 的可用記憶體分配給它。如果情況並非如此，您需要仔細評" -"估其他服務和非 InnoDB 資料表的記憶體消耗狀況，並相對應地設定此變數。如果將它" -"設置得太高，您的系統將會開始記憶體和磁碟的切換，因而大大降低性能。請參考 這篇文章" @@ -13801,9 +13522,8 @@ msgid "" "perfectly adequate for your system if you don't have much InnoDB tables or " "other services running on the same machine." msgstr "" -"您目前的 InnoDB 緩衝池已使用記憶體的 %s%%。如果您指派少於 60%% 將觸發此規則，" -"然而也許因為沒有太多的 InnoDB 資料表或其他服務同時運行於此機器，所以這樣也許" -"十分適用於您的系統。" +"您目前的 InnoDB 緩衝池已使用記憶體的 %s%%。如果您指派少於 60%% 將觸發此規則，然而也許因為沒有太多的 InnoDB " +"資料表或其他服務同時運行於此機器，所以這樣也許十分適用於您的系統。" #: libraries/advisory_rules.txt:459 msgid "MyISAM concurrent inserts" @@ -13820,8 +13540,8 @@ msgid "" "refman/5.5/en/concurrent-inserts.html\">MySQL Documentation" msgstr "" "將 {concurrent_insert} 設為 1 可以減少在相同表上的讀取和寫入衝突，請參考 MySQL 文件" +"href=\"http://dev.mysql.com/doc/refman/5.5/en/concurrent-inserts.html\">MySQL " +"文件" #: libraries/advisory_rules.txt:464 msgid "concurrent_insert is set to 0" From c16078613418b081ae4eb2b0c8f1fc571154422b Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 25 Feb 2014 17:10:27 +0100 Subject: [PATCH 11/35] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 4f9f574e7e..dbf694f386 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -25,7 +25,7 @@ msgstr "系統上找不到 %s 檔案，詳情請參考 www.phpmyadmin.net。" #: 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: " @@ -139,7 +139,7 @@ msgstr "連結到" #: libraries/tbl_columns_definition_form.lib.php:307 #: libraries/tbl_printview.lib.php:480 msgid "Comments" -msgstr "說明" +msgstr "備註" #: db_datadict.php:240 js/messages.php:250 libraries/Index.class.php:435 #: libraries/Index.class.php:474 libraries/Index.class.php:883 From 630078e4aabdf6059f9f306eef233560a4675d10 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 25 Feb 2014 17:12:05 +0100 Subject: [PATCH 12/35] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index dbf694f386..956e975389 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -298,7 +298,7 @@ msgstr "切換至 %sVisual Builder%s" #: libraries/plugins/auth/AuthenticationHttp.class.php:69 #: libraries/plugins/auth/AuthenticationSignon.class.php:268 msgid "Access denied" -msgstr "拒絕存取" +msgstr "存取被拒" #: db_tracking.php:75 msgid "Tracked tables" From 67dc3ac9e8b836b0f4c5b30a6a1f8e23776b3b9d Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 25 Feb 2014 17:26:00 +0100 Subject: [PATCH 13/35] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 956e975389..d0e4a0c6ac 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -638,7 +638,7 @@ msgstr "沒有字元集轉換函式庫，無法轉換檔案字元集" #: import.php:519 libraries/display_import.inc.php:32 msgid "Could not load import plugins, please check your installation!" -msgstr "無法載入匯入插件，請檢查您的安裝！" +msgstr "無法載入匯入外掛程式，請檢查您的安裝！" #: import.php:553 libraries/sql.lib.php:1026 libraries/sql.lib.php:1807 #, php-format @@ -740,7 +740,7 @@ msgstr "資料庫用戶端版本:" #: index.php:307 msgid "PHP extension:" -msgstr "PHP 套件:" +msgstr "PHP 擴充套件:" #: index.php:321 msgid "Show PHP information" @@ -6444,7 +6444,7 @@ msgstr "欄位數" #: libraries/display_export.inc.php:36 msgid "Could not load export plugins, please check your installation!" -msgstr "無法載入匯出插件，請檢查安裝！" +msgstr "無法載入匯出外掛程式，請檢查安裝！" #: libraries/display_export.lib.php:165 msgid "Exporting databases from the current server" @@ -8245,7 +8245,7 @@ msgstr "CSV 輸入的第 %d 行欄位數有錯。" #: libraries/plugins/import/ImportLdi.class.php:112 msgid "This plugin does not support compressed imports!" -msgstr "該插件不支援匯入檔案！" +msgstr "該外掛程式不支援匯入檔案！" #: libraries/plugins/import/ImportMediawiki.class.php:56 msgid "MediaWiki Table" @@ -9463,7 +9463,7 @@ msgstr "開始" #: libraries/server_plugins.lib.php:75 msgid "Plugin" -msgstr "插件" +msgstr "外掛程式" #: libraries/server_plugins.lib.php:76 libraries/server_plugins.lib.php:132 msgid "Module" @@ -9496,7 +9496,7 @@ msgstr "沒有權限。" #: libraries/server_privileges.lib.php:176 server_privileges.php:59 msgid "Includes all privileges except GRANT." -msgstr "除了GRANT以外，包括了所有的權限。" +msgstr "除了GRANT以外的所有權限。" #: libraries/server_privileges.lib.php:249 #: libraries/server_privileges.lib.php:861 @@ -9508,7 +9508,7 @@ msgstr "允許讀取資料。" #: libraries/server_privileges.lib.php:866 #: libraries/server_privileges.lib.php:1038 server_privileges.php:78 msgid "Allows inserting and replacing data." -msgstr "允許新增與替換資料。" +msgstr "允許新增與取代資料。" #: libraries/server_privileges.lib.php:259 #: libraries/server_privileges.lib.php:871 @@ -9544,7 +9544,7 @@ msgstr "允許關閉伺服器。" #: libraries/server_privileges.lib.php:289 #: libraries/server_privileges.lib.php:1158 server_privileges.php:93 msgid "Allows viewing processes of all users" -msgstr "允許查看所有使用者的程序" +msgstr "允許查看所有使用者的處理程序" #: libraries/server_privileges.lib.php:294 #: libraries/server_privileges.lib.php:1046 server_privileges.php:73 @@ -9570,7 +9570,7 @@ msgstr "允許修改現有資料表的結構。" #: libraries/server_privileges.lib.php:314 #: libraries/server_privileges.lib.php:1170 server_privileges.php:103 msgid "Gives access to the complete list of databases." -msgstr "允許訪問完整的資料庫列表。" +msgstr "允許存取完整的資料庫列表。" #: libraries/server_privileges.lib.php:320 #: libraries/server_privileges.lib.php:1150 server_privileges.php:107 From b0cd85663205d4a251dae5195f7c47116ced0369 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 26 Feb 2014 06:47:41 +0530 Subject: [PATCH 14/35] bug #4297 DROP DATABASE tick box in export no longer works Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + export.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 90a1fbd548..3c4a6eb4a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.1.9.0 (not yet released) - bug #4279 CTRL + up or down moves two fields (part one) - bug #4294 output as text radio clickable for "OpenDocument Text" export +- bug #4297 DROP DATABASE tick box in export no longer works 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/export.php b/export.php index d874e9ef76..b93d9994e2 100644 --- a/export.php +++ b/export.php @@ -119,6 +119,7 @@ if (!defined('TESTSUITE')) { 'sql_max_query_size', 'sql_hex_for_blob', 'sql_utc_time', + 'sql_drop_database', 'csv_separator', 'csv_enclosed', 'csv_escaped', From ff064833ec46523c04b91aced2def15a63bef354 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 26 Feb 2014 07:22:04 +0530 Subject: [PATCH 15/35] bug #4291 Unable to export comments in OpenDocument text format Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + export.php | 3 ++- libraries/config.default.php | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3c4a6eb4a8..d992e6e237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4279 CTRL + up or down moves two fields (part one) - bug #4294 output as text radio clickable for "OpenDocument Text" export - bug #4297 DROP DATABASE tick box in export no longer works +- bug #4291 Unable to export comments in OpenDocument text format 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/export.php b/export.php index b93d9994e2..cac8b3c8b0 100644 --- a/export.php +++ b/export.php @@ -655,7 +655,8 @@ if (!defined('TESTSUITE')) { // Will we need relation & co. setup? $do_relation = isset($GLOBALS[$what . '_relation']); - $do_comments = isset($GLOBALS[$what . '_include_comments']); + $do_comments = isset($GLOBALS[$what . '_include_comments']) + || isset($GLOBALS[$what . '_comments']) ; $do_mime = isset($GLOBALS[$what . '_mime']); if ($do_relation || $do_comments || $do_mime) { $cfgRelation = PMA_getRelationsParam(); diff --git a/libraries/config.default.php b/libraries/config.default.php index bb19273a46..c6290c3ea9 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1898,13 +1898,6 @@ $cfg['Export']['sql_type'] = 'INSERT'; */ $cfg['Export']['sql_max_query_size'] = 50000; -/** - * - * - * @global boolean $cfg['Export']['sql_comments'] - */ -$cfg['Export']['sql_comments'] = false; - /** * * From 02a2314b1fe16f3cfdd93f8f74a5774c5c6d0294 Mon Sep 17 00:00:00 2001 From: Valter Georgiev Date: Tue, 25 Feb 2014 04:27:51 +0100 Subject: [PATCH 16/35] Translated using Weblate (Bulgarian) Currently translated at 71.5% (1966 of 2749) --- po/bg.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/bg.po b/po/bg.po index eb1e7bfeb4..b21de8654b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-20 07:47+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2014-02-25 04:27+0200\n" +"Last-Translator: Valter Georgiev \n" "Language-Team: Bulgarian " "\n" "Language: bg\n" @@ -10364,7 +10364,7 @@ msgstr "Специфични за колоната права" #: libraries/server_privileges.lib.php:2785 #| msgid "Add privileges on the following database" msgid "Add privileges on the following database:" -msgstr "Добавяне на права" +msgstr "Добавяне на права върху ДБ" #: libraries/server_privileges.lib.php:2812 msgid "Wildcards % and _ should be escaped with a \\ to use them literally." From 495eda9df35a156ccacd743d4176f26c04904518 Mon Sep 17 00:00:00 2001 From: minhaz Date: Thu, 27 Feb 2014 04:23:43 +0530 Subject: [PATCH 17/35] testBlowFishDecrypt() testcase added Signed-off-by: A V Minhaz --- .../classes/plugin/auth/PMA_AuthenticationCookie_test.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index b00e9ad51c..0862fe22e2 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -1101,7 +1101,13 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase public function testBlowfishDecrypt() { if (function_exists('mcrypt_encrypt')) { - $this->markTestIncomplete('Not testing mcrypt support'); + $this->assertEquals( + 'root', + $this->object->blowfishDecrypt( + 'UG1MQSH8SSM=', + '04a4f0a762b42202d7c90fb0a1b83451' + ) + ); } else { $this->assertEquals( 'data123', From 501d25fe622a83826b0d57541eb4f2551c49f5af Mon Sep 17 00:00:00 2001 From: minhaz Date: Thu, 27 Feb 2014 14:46:57 +0530 Subject: [PATCH 18/35] fixing build test and adding test cases Test case added for testBlowfishDecrypt() and modified for testBlowfishEncrypt() Signed-off-by: A V Minhaz --- .../auth/PMA_AuthenticationCookie_test.php | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 0862fe22e2..9cefe5e2b6 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -1078,18 +1078,14 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $this->object->blowfishEncrypt('data123', 'sec321') ); } else { + //using our own iv for testing + $tmp = $GLOBALS['iv']; + $GLOBALS['iv'] = "testiv09"; $this->assertEquals( - base64_encode( - mcrypt_encrypt( - MCRYPT_BLOWFISH, - 'sec321', - 'data123', - MCRYPT_MODE_CBC, - $GLOBALS['iv'] - ) - ), + 'x/2GwHKoPyc=', $this->object->blowfishEncrypt('data123', 'sec321') ); + $GLOBALS['iv'] = $tmp; } } @@ -1101,13 +1097,16 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase public function testBlowfishDecrypt() { if (function_exists('mcrypt_encrypt')) { - $this->assertEquals( - 'root', - $this->object->blowfishDecrypt( - 'UG1MQSH8SSM=', - '04a4f0a762b42202d7c90fb0a1b83451' - ) - ); + + //using our own iv for testing + $tmp = $GLOBALS['iv']; + $GLOBALS['iv'] = "testiv09"; + $this->assertEquals( + 'data123', + $this->object->blowfishDecrypt('x/2GwHKoPyc=', 'sec321') + ); + $GLOBALS['iv'] = $tmp; + } else { $this->assertEquals( 'data123', From bd2f9d13562113c31a89247e66475a1cb60d4a9b Mon Sep 17 00:00:00 2001 From: "cmdr.by" Date: Wed, 26 Feb 2014 17:35:36 +0100 Subject: [PATCH 19/35] Translated using Weblate (Belarusian) Currently translated at 31.6% (871 of 2749) --- po/be.po | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/po/be.po b/po/be.po index ea199b9aa7..ca5ce5305f 100644 --- a/po/be.po +++ b/po/be.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-24 17:20+0200\n" +"PO-Revision-Date: 2014-02-26 17:35+0200\n" "Last-Translator: cmdr.by \n" "Language-Team: Belarusian " "\n" @@ -22,6 +22,8 @@ msgid "" "The %s file is not available on this system, please visit www.phpmyadmin.net " "for more information." msgstr "" +"Файл %s недаступны на гэтай сістэме, падрабязнасці на сайце " +"www.phpmyadmin.net." #: db_create.php:61 #, php-format @@ -58,10 +60,9 @@ msgstr "Камэнтар да табліцы" #: libraries/tbl_relation.lib.php:328 libraries/tbl_relation.lib.php:416 #: libraries/tbl_relation.lib.php:544 libraries/tbl_tracking.lib.php:731 #: libraries/tbl_tracking.lib.php:818 -#, fuzzy #| msgid "Column names" msgid "Column" -msgstr "Назвы калёнак" +msgstr "Калонка" #: db_datadict.php:169 db_printview.php:49 libraries/Index.class.php:564 #: libraries/TableSearch.class.php:186 libraries/insert_edit.lib.php:243 @@ -232,16 +233,14 @@ msgid "Database %1$s has been copied to %2$s" msgstr "База дадзеных %s была скапіяваная ў %s" #: db_operations.php:260 -#, fuzzy, php-format +#, php-format #| msgid "" #| " additional features for working with linked tables have been ctivated. " #| "To find out why click %shere%s." msgid "" "The phpMyAdmin configuration storage has been deactivated. To find out why " "click %shere%s." -msgstr "" -"Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб " -"высьветліць чаму, націсьніце %sтут%s." +msgstr "Сховішча канфігурацыі PHPMyAdmin дэактываванае. %sДаведацца%s чаму." #: db_printview.php:47 db_tracking.php:81 db_tracking.php:208 #: libraries/Menu.class.php:235 libraries/config/messages.inc.php:519 @@ -275,10 +274,9 @@ msgstr "выкарыстоўваецца" #: db_printview.php:119 libraries/plugins/export/ExportSql.class.php:1042 #: libraries/schema/Pdf_Relation_Schema.class.php:1353 -#, fuzzy #| msgid "Creation" msgid "Creation:" -msgstr "Створаная" +msgstr "Створаная:" #: db_printview.php:128 libraries/plugins/export/ExportSql.class.php:1055 #: libraries/schema/Pdf_Relation_Schema.class.php:1358 @@ -15049,16 +15047,14 @@ msgid "Your absolute InnoDB log size is %s MiB" msgstr "" #: libraries/advisory_rules.txt:450 -#, fuzzy #| msgid "Buffer pool size" msgid "InnoDB buffer pool size" -msgstr "Памер пулу буфэру" +msgstr "Памер пулу буфэру InnoDB" #: libraries/advisory_rules.txt:453 -#, fuzzy #| msgid "Buffer pool size" msgid "Your InnoDB buffer pool is fairly small." -msgstr "Памер пулу буфэру" +msgstr "Недастатковы памер буферу InnoDB." #: libraries/advisory_rules.txt:454 #, php-format From 105ace3e5d4d0cf8cc0249532d4b1a76dbc8bf07 Mon Sep 17 00:00:00 2001 From: Fahad Abdullah Alshareef Date: Thu, 27 Feb 2014 00:38:44 +0100 Subject: [PATCH 20/35] Translated using Weblate (Arabic) Currently translated at 45.7% (1257 of 2749) --- po/ar.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ar.po b/po/ar.po index 74c525d5fe..74f6068679 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-02 11:01+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Arabic \n" +"PO-Revision-Date: 2014-02-27 00:38+0200\n" +"Last-Translator: Fahad Abdullah Alshareef \n" +"Language-Team: Arabic \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -423,12 +423,12 @@ 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 "" From 7c4f69914a2d81b6f10cc2ca49cb8cacb0decd60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 10:40:56 +0100 Subject: [PATCH 21/35] Translated using Weblate (Belarusian) Currently translated at 31.6% (871 of 2749) --- po/be.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/be.po b/po/be.po index ca5ce5305f..f65596365d 100644 --- a/po/be.po +++ b/po/be.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-26 17:35+0200\n" -"Last-Translator: cmdr.by \n" +"PO-Revision-Date: 2014-02-27 10:40+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Belarusian " "\n" "Language: be\n" @@ -39,7 +39,7 @@ msgstr "Камэнтар да базы дадзеных: " #: libraries/tbl_printview.lib.php:579 #| msgid "Table comments" msgid "Table comments:" -msgstr "Камэнтар да табліцы" +msgstr "Камэнтар да табліцы:" #: db_datadict.php:168 libraries/Index.class.php:567 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1282 From 6d587f2cd40c9dccae5e5e5199687c0b76d9c567 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 26 Feb 2014 21:29:52 +0100 Subject: [PATCH 22/35] Translated using Weblate (French) Currently translated at 100.0% (2749 of 2749) --- po/fr.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/po/fr.po b/po/fr.po index 06bee8e8c9..0df4014d83 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-02 10:54+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: French \n" +"PO-Revision-Date: 2014-02-26 21:29+0200\n" +"Last-Translator: Marc Delisle \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1061,15 +1061,15 @@ msgstr "" #: js/messages.php:81 msgid "Query cache efficiency" -msgstr "Efficacité de la cache de requêtes" +msgstr "Efficacité du cache de requêtes" #: js/messages.php:82 msgid "Query cache usage" -msgstr "Utilisation de la cache de requêtes" +msgstr "Utilisation du cache de requêtes" #: js/messages.php:83 msgid "Query cache used" -msgstr "Cache de requêtes utilisée" +msgstr "Cache de requêtes utilisé" #: js/messages.php:85 msgid "System CPU Usage" @@ -3262,7 +3262,7 @@ msgstr "Montrer l'état des serveurs esclaves" #: libraries/ServerStatusData.class.php:244 msgid "Flush query cache" -msgstr "Vider la cache des requêtes" +msgstr "Vider le cache des requêtes" #: libraries/ServerStatusData.class.php:263 #: libraries/engines/innodb.lib.php:144 From f5656d4a4d257ee3db7a1885ad8c155b5840cfbc Mon Sep 17 00:00:00 2001 From: Giovanni Sora Date: Wed, 26 Feb 2014 22:56:30 +0100 Subject: [PATCH 23/35] Translated using Weblate (Interlingua) Currently translated at 41.3% (1137 of 2749) --- po/ia.po | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/po/ia.po b/po/ia.po index 8f698b1ac8..54d4883f73 100644 --- a/po/ia.po +++ b/po/ia.po @@ -8,10 +8,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-10 14:21+0200\n" +"PO-Revision-Date: 2014-02-26 22:56+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua " -"\n" +"\n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5372,6 +5372,10 @@ msgid "" "only occurs for the current server. Setting this to FALSE makes it easy to " "forget to log out from other servers when connected to multiple servers." msgstr "" +"Si TRUE (ver), le processo de abandonar (logout) remove omne cookies pro " +"omne le servitores; si FALSE, le processo de logout solmente occurre pro le " +"servitor currente, Si on fixa isto a FALSE il es facile oblidar de abandonar " +"(logout) altere servitores quando on connecte a servitores multiple." #: libraries/config/messages.inc.php:278 msgid "Delete all cookies on logout" @@ -5537,6 +5541,8 @@ msgstr "Minime numero de elementos de monstrar in le quadro de filtro" #: libraries/config/messages.inc.php:314 msgid "Minimum number of databases to display the database filter box" msgstr "" +"Le numero minime de base de datos pro monstrar le quadro de filtrar base de " +"datos" #: libraries/config/messages.inc.php:315 msgid "" @@ -5546,7 +5552,7 @@ msgstr "" #: libraries/config/messages.inc.php:316 msgid "Group items in the tree" -msgstr "" +msgstr "Elementos de gruppo in le arbore" #: libraries/config/messages.inc.php:317 msgid "String that separates databases into different tree levels" @@ -5554,7 +5560,7 @@ msgstr "" #: libraries/config/messages.inc.php:318 msgid "Database tree separator" -msgstr "" +msgstr "Separator de arbore de base de datos" #: libraries/config/messages.inc.php:319 msgid "String that separates tables into different tree levels" @@ -5562,11 +5568,11 @@ msgstr "" #: libraries/config/messages.inc.php:320 msgid "Table tree separator" -msgstr "" +msgstr "Separator de arbore de tabellas" #: libraries/config/messages.inc.php:321 msgid "Maximum table tree depth" -msgstr "" +msgstr "Maxime profunditate de arbore de tabellas" #: libraries/config/messages.inc.php:322 msgid "Highlight server under the mouse cursor" @@ -5574,7 +5580,7 @@ msgstr "" #: libraries/config/messages.inc.php:323 msgid "Enable highlighting" -msgstr "" +msgstr "Habilita evidentiar" #: libraries/config/messages.inc.php:324 msgid "Maximum number of recently used tables; set 0 to disable" @@ -5582,7 +5588,7 @@ msgstr "" #: libraries/config/messages.inc.php:325 msgid "Recently used tables" -msgstr "" +msgstr "Tabellas usate recentemente" #: libraries/config/messages.inc.php:326 msgid "These are Edit, Copy and Delete links" @@ -5590,7 +5596,7 @@ msgstr "" #: libraries/config/messages.inc.php:327 msgid "Where to show the table row links" -msgstr "" +msgstr "Ubi monstrar le ligamines de rango de tabellas" #: libraries/config/messages.inc.php:328 msgid "Use natural order for sorting table and database names" @@ -5598,7 +5604,7 @@ msgstr "" #: libraries/config/messages.inc.php:329 msgid "Natural order" -msgstr "" +msgstr "Ordine natural" #: libraries/config/messages.inc.php:330 libraries/config/messages.inc.php:344 #: libraries/config/messages.inc.php:346 @@ -5625,7 +5631,7 @@ msgstr "" #: libraries/config/messages.inc.php:335 msgid "Default sorting order" -msgstr "" +msgstr "Modo de ordinar predefinite" #: libraries/config/messages.inc.php:336 msgid "Use persistent connections to MySQL databases" @@ -5633,7 +5639,7 @@ msgstr "" #: libraries/config/messages.inc.php:337 msgid "Persistent connections" -msgstr "" +msgstr "Connexiones persistente" #: libraries/config/messages.inc.php:338 msgid "" @@ -12385,6 +12391,9 @@ msgid "" "so a key was automatically generated for you. It is used to encrypt cookies; " "you don't need to remember it." msgstr "" +"Tu non habeva fixate le parola clave de blowfish e tu ha habilitate " +"authentication de cookie, assi un clave ha essite create pro te. Illo es " +"usate pro cryptar cookie; tu non necessita memorar lo." #: setup/lib/index.lib.php:226 #, php-format From 988b586a64061ec3b6b741656f6adc42fa71a518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:33:07 +0100 Subject: [PATCH 24/35] Translated using Weblate (Arabic) Currently translated at 45.7% (1257 of 2749) --- po/ar.po | 71 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/po/ar.po b/po/ar.po index 74f6068679..2455a909e6 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-27 00:38+0200\n" -"Last-Translator: Fahad Abdullah Alshareef \n" +"PO-Revision-Date: 2014-02-27 11:33+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Arabic \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -293,12 +293,12 @@ msgstr "آخر فحص" #, php-format msgid "%s table" msgid_plural "%s tables" -msgstr[0] "%s جدول (جداول)" -msgstr[1] "%s جدول (جداول)" -msgstr[2] "%s جدول (جداول)" -msgstr[3] "%s جدول (جداول)" -msgstr[4] "%s جدول (جداول)" -msgstr[5] "%s جدول (جداول)" +msgstr[0] "%s جدول (جداول)" +msgstr[1] "%s جدول (جداول)" +msgstr[2] "%s جدول (جداول)" +msgstr[3] "%s جدول (جداول)" +msgstr[4] "%s جدول (جداول)" +msgstr[5] "%s جدول (جداول)" #: db_qbe.php:50 msgid "You have to choose at least one column to display" @@ -2306,17 +2306,17 @@ msgstr "ألقى PHP بالخطأ التالي: %s" #: libraries/Advisor.class.php:107 #, php-format msgid "Failed evaluating precondition for rule '%s'." -msgstr "فشلت في تقييم مسبق للقاعدة '%s'" +msgstr "فشلت في تقييم مسبق للقاعدة '%s'." #: libraries/Advisor.class.php:124 #, php-format msgid "Failed calculating value for rule '%s'." -msgstr "فشلت في حساب القيمة للقاعدة '%s'" +msgstr "فشلت في حساب القيمة للقاعدة '%s'." #: libraries/Advisor.class.php:143 #, php-format msgid "Failed running test for rule '%s'." -msgstr "فشلت في تشغيل الإختبار للقاعدة '%s'" +msgstr "فشلت في تشغيل الإختبار للقاعدة '%s'." #: libraries/Advisor.class.php:225 #, php-format @@ -2328,7 +2328,8 @@ msgstr "فشل تنسيق النص لـ '%s'." msgid "" "Invalid rule declaration on line %1$s, expected line %2$s of previous rule." msgstr "" -"إعلان قاعدة غير صالح على السطر %1$s، السطر المتوقع هو %2$s من القاعدة السابقة" +"إعلان قاعدة غير صالح على السطر %1$s، السطر المتوقع هو %2$s من القاعدة " +"السابقة." #: libraries/Advisor.class.php:417 #, php-format @@ -2967,7 +2968,7 @@ msgstr "لقد تم حذف المفتاح الأساسي" #: libraries/Index.class.php:610 #, php-format msgid "Index %s has been dropped." -msgstr "تم حذف الفهرس %s" +msgstr "تم حذف الفهرس %s." #: libraries/Index.class.php:738 #, php-format @@ -3140,34 +3141,34 @@ msgstr "خطأ" #, php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "%1$d صف تأثر" -msgstr[1] "%1$d صف تأثر" -msgstr[2] "%1$d صفوف تأثرت" -msgstr[3] "%1$d صفوف تأثرت" -msgstr[4] "%1$d صفوف تأثرت" -msgstr[5] "%1$d صفوف تأثرت" +msgstr[0] "%1$d صف تأثر." +msgstr[1] "%1$d صف تأثر." +msgstr[2] "%1$d صفوف تأثرت." +msgstr[3] "%1$d صفوف تأثرت." +msgstr[4] "%1$d صفوف تأثرت." +msgstr[5] "%1$d صفوف تأثرت." #: libraries/Message.class.php:273 #, php-format msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "%1$d صف حذف" -msgstr[1] "%1$d صف حذف" -msgstr[2] "%1$d صفوف حذفت" -msgstr[3] "%1$d صفوف حذفت" -msgstr[4] "%1$d صفوف حذفت" -msgstr[5] "%1$d صفوف حذفت" +msgstr[0] "%1$d صف حذف." +msgstr[1] "%1$d صف حذف." +msgstr[2] "%1$d صفوف حذفت." +msgstr[3] "%1$d صفوف حذفت." +msgstr[4] "%1$d صفوف حذفت." +msgstr[5] "%1$d صفوف حذفت." #: libraries/Message.class.php:292 #, php-format msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "%1$d صف أضيف" -msgstr[1] "%1$d صف أضيف" -msgstr[2] "%1$d صفوف أضيفت" -msgstr[3] "%1$d صفوف أضيفت" -msgstr[4] "%1$d صفوف أضيفت" -msgstr[5] "%1$d صفوف أضيفت" +msgstr[0] "%1$d صف أضيف." +msgstr[1] "%1$d صف أضيف." +msgstr[2] "%1$d صفوف أضيفت." +msgstr[3] "%1$d صفوف أضيفت." +msgstr[4] "%1$d صفوف أضيفت." +msgstr[5] "%1$d صفوف أضيفت." #: libraries/PDF.class.php:70 libraries/Util.class.php:2475 #: libraries/browse_foreigners.lib.php:393 @@ -3925,7 +3926,7 @@ msgstr "إختر مجلد الرفع من الخادم %s:" #: libraries/Util.class.php:3376 libraries/insert_edit.lib.php:1234 #: libraries/sql_query_form.lib.php:487 msgid "The directory you set for upload work cannot be reached." -msgstr "لا يمكن الوصول إلى الدليل اللذي عينته لعمل التحميل" +msgstr "لا يمكن الوصول إلى الدليل اللذي عينته لعمل التحميل." #: libraries/Util.class.php:3387 msgid "There are no files to upload" @@ -4293,7 +4294,7 @@ msgstr "أقصى %s" #: libraries/config/FormDisplay.tpl.php:216 msgid "This setting is disabled, it will not be applied to your configuration." -msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين" +msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين." #: libraries/config/FormDisplay.tpl.php:308 #, php-format @@ -8072,7 +8073,7 @@ msgstr "" #: libraries/plugins/auth/AuthenticationSignon.class.php:271 #, php-format msgid "No activity within %s seconds; please log in again." -msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد" +msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد." #: libraries/plugins/auth/AuthenticationCookie.class.php:691 #: libraries/plugins/auth/AuthenticationCookie.class.php:693 @@ -8096,7 +8097,7 @@ msgstr "الملف %s لايحتوي على أي مفتاح تعريف" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:185 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:205 msgid "Hardware authentication failed!" -msgstr "فشلت المصادقة المحسوسة" +msgstr "فشلت المصادقة المحسوسة!" #: libraries/plugins/auth/swekey/swekey.auth.lib.php:192 msgid "No valid authentication key plugged" From 17d4e81634a21a465d6fdc16eb65795d92291b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 10:58:12 +0100 Subject: [PATCH 25/35] Translated using Weblate (Armenian) Currently translated at 3.8% (106 of 2749) --- po/hy.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/hy.po b/po/hy.po index 9613bf9e00..160e99f572 100644 --- a/po/hy.po +++ b/po/hy.po @@ -8,16 +8,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2013-03-30 12:19+0200\n" -"Last-Translator: Hamlet Muradyan \n" -"Language-Team: Armenian \n" +"PO-Revision-Date: 2014-02-27 10:58+0200\n" +"Last-Translator: Michal Čihař \n" +"Language-Team: Armenian \n" "Language: hy\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 1.5-dev\n" +"X-Generator: Weblate 1.9-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -11508,7 +11507,7 @@ msgstr "" #: libraries/tbl_indexes.lib.php:283 msgid "Comment:" -msgstr "Մեկնաբանություն" +msgstr "Մեկնաբանություն՝" #: libraries/tbl_indexes.lib.php:298 msgid "Index type:" From 21e489b6bceabdcf2d17102a8b1d778851efaa59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:30:26 +0100 Subject: [PATCH 26/35] Translated using Weblate (German) Currently translated at 100.0% (2749 of 2749) --- po/de.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 37e35bb376..c0e8d7de6c 100644 --- a/po/de.po +++ b/po/de.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-03 14:41+0200\n" -"Last-Translator: Ann + J.M. \n" -"Language-Team: German \n" +"PO-Revision-Date: 2014-02-27 11:30+0200\n" +"Last-Translator: Michal Čihař \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -435,7 +435,7 @@ msgstr "" #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." -msgstr "Danke für die Übermittlung dieses Berichts." +msgstr "Vielen Dank für das Absenden des Berichtes." #: error_report.php:74 msgid "Unfortunately the submission failed." From cdb19d28bd39e2490dac8dc6dedade6ff27d4fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:31:19 +0100 Subject: [PATCH 27/35] Translated using Weblate (Italian) Currently translated at 89.4% (2459 of 2749) --- po/it.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/it.po b/po/it.po index 7e32f1ca99..9ac1cd4ef4 100644 --- a/po/it.po +++ b/po/it.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-20 11:22+0200\n" +"PO-Revision-Date: 2014-02-27 11:31+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Italian \n" +"Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -13034,7 +13034,7 @@ msgstr "Relazione FOREIGN KEY aggiunta" #: pmd_relation_new.php:84 msgid "Error: Relational features are disabled!" -msgstr "Errore: le funzionalità relazionali sono disabilitate!" +msgstr "Errore: Le funzionalità relazionali sono disabilitate!" #: pmd_relation_new.php:100 msgid "Internal relation added" From c2dcf6826907f58c680ccecbd887e9179a5e4513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:32:40 +0100 Subject: [PATCH 28/35] Translated using Weblate (Malay) Currently translated at 13.7% (377 of 2749) --- po/ms.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ms.po b/po/ms.po index eb78bf788d..c6d2e63106 100644 --- a/po/ms.po +++ b/po/ms.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-03 14:17+0200\n" +"PO-Revision-Date: 2014-02-27 11:32+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Malay \n" +"Language-Team: Malay \n" "Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8151,7 +8151,7 @@ msgstr "" #: libraries/operations.lib.php:1154 libraries/structure.lib.php:317 msgid "Analyze table" -msgstr "Analyze table" +msgstr "" #: libraries/operations.lib.php:1167 libraries/structure.lib.php:314 msgid "Repair table" From 5862f12636009a9006e28a4324a05145f7678a63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:34:41 +0100 Subject: [PATCH 29/35] Translated using Weblate (Polish) Currently translated at 92.5% (2545 of 2749) --- po/pl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/pl.po b/po/pl.po index 00b25ed035..30ef5ae766 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-01-10 09:11+0200\n" +"PO-Revision-Date: 2014-02-27 11:34+0200\n" "Last-Translator: Michal Čihař \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12980,7 +12980,7 @@ msgstr "Relacja FOREIGN KEY została dodana" #: pmd_relation_new.php:84 msgid "Error: Relational features are disabled!" -msgstr "Błąd: funkcjonalność relacyjna jest wyłączona!" +msgstr "Błąd: Funkcjonalność relacyjna jest wyłączona!" #: pmd_relation_new.php:100 msgid "Internal relation added" From f4acba4a7efebe3042f7de3a483e683695048a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 27 Feb 2014 11:34:47 +0100 Subject: [PATCH 30/35] Translated using Weblate (Portuguese) Currently translated at 61.2% (1683 of 2749) --- po/pt.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/pt.po b/po/pt.po index 7089be23e3..3ee97f8091 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-04 08:40+0200\n" -"Last-Translator: Daniel Silva \n" +"PO-Revision-Date: 2014-02-27 11:34+0200\n" +"Last-Translator: Michal Čihař \n" "Language-Team: Portuguese " -"\n" +"\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -12790,7 +12790,7 @@ msgstr "Relação FOREIGN KEY adicionada" #: pmd_relation_new.php:84 msgid "Error: Relational features are disabled!" -msgstr "Erro: as características relacionais estão desactivadas!" +msgstr "Erro: As características relacionais estão desactivadas!" #: pmd_relation_new.php:100 msgid "Internal relation added" From 431c2ad5d803e989b01aa2a807f4e0ef42645e38 Mon Sep 17 00:00:00 2001 From: Sampath Liyanage Date: Fri, 28 Feb 2014 01:50:33 +0530 Subject: [PATCH 31/35] DB Search bug fix Signed-off-by: Sampath Liyanage --- db_search.php | 7 +++++- js/db_search.js | 46 +++++++++++++++++++++--------------- libraries/DbSearch.class.php | 9 +++---- 3 files changed, 38 insertions(+), 24 deletions(-) diff --git a/db_search.php b/db_search.php index acfec8e55b..793fe91e88 100644 --- a/db_search.php +++ b/db_search.php @@ -40,11 +40,12 @@ $db_search = new PMA_DbSearch($GLOBALS['db']); if ( $GLOBALS['is_ajax_request'] != true) { include 'libraries/db_info.inc.php'; } -$response->addHTML('
'); // Main search form has been submitted, get results if (isset($_REQUEST['submit_search'])) { $response->addHTML($db_search->getSearchResults()); +} else { + $response->addHTML('
'); } // If we are in an Ajax request, we need to exit after displaying all the HTML @@ -53,5 +54,9 @@ if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request']) } // Display the search form +$response->addHTML('
' + . '
' + . '
'); $response->addHTML($db_search->getSelectionForm($url_params)); +$response->addHTML($db_search->_getResultDivs()); ?> diff --git a/js/db_search.js b/js/db_search.js index 6518aa062b..82fcec2ec1 100644 --- a/js/db_search.js +++ b/js/db_search.js @@ -44,15 +44,21 @@ function loadResult(result_path, table_name, link) /** Load the browse results to the page */ $("#table-info").show(); $('#table-link').attr({"href" : 'sql.php?' + link }).text(table_name); - var url = result_path + " #sqlqueryresults"; - $('#browse-results').load(url, null, function () { - $('html, body') - .animate({ - scrollTop: $("#browse-results").offset().top - }, 1000); - PMA_ajaxRemoveMessage($msg); - PMA_makegrid($('#table_results')[0], true, true, true, true); - }).show(); + var url = result_path + "#sqlqueryresults"; + $.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) { + if (data.success) { + $('#browse-results').html(data.message); + $('html, body') + .animate({ + scrollTop: $("#browse-results").offset().top + }, 1000); + PMA_ajaxRemoveMessage($msg); + PMA_makegrid($('#table_results')[0], true, true, true, true); + $('#browse-results').show(); + } else { + PMA_ajaxShowMessage(data.error, false); + } + }); }); } @@ -69,7 +75,6 @@ function deleteResult(result_path, msg) $(function () { /** Hides the results shown by the browse criteria */ $("#table-info").hide(); - $('#browse-results').hide(); $('#sqlqueryform').hide(); $('#togglequerybox').hide(); /** Conformation message for deletion */ @@ -77,13 +82,16 @@ function deleteResult(result_path, msg) var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false); /** Load the deleted option to the page*/ $('#sqlqueryform').html(''); - var url = result_path + " #result_query, #sqlqueryform"; - $('#browse-results').load(url, function () { + var url = result_path + "#result_query, #sqlqueryform"; + $.get(url, {'ajax_request': true, 'is_js_confirmed': true}, + function (data) { + if (data.success) { + $('#sqlqueryform').html(data.sql_query); /** Refresh the search results after the deletion */ document.getElementById('buttonGo').click(); $('#togglequerybox').html(PMA_messages.strHideQueryBox); /** Show the results of the deletion option */ - $('#browse-results').show(); + $('#browse-results').hide(); $('#sqlqueryform').show(); $('#togglequerybox').show(); $('html, body') @@ -91,7 +99,10 @@ function deleteResult(result_path, msg) scrollTop: $("#browse-results").offset().top }, 1000); PMA_ajaxRemoveMessage($msg); - }); + } else { + PMA_ajaxShowMessage(data.error, false); + } + }); } }); } @@ -111,12 +122,10 @@ AJAX.registerOnload('db_search.js', function () { /** * Prepare a div containing a link for toggle the search results */ - $('
') - .insertAfter('#searchresults') + $('#togglesearchresultsdiv') /** don't show it until we have results on-screen */ .hide(); - $('
').insertAfter("#togglesearchresultsdiv").show(); /** * Changing the displayed text according to * the hide/show criteria in search result forms @@ -139,8 +148,7 @@ AJAX.registerOnload('db_search.js', function () { * Prepare a div containing a link for toggle the search form, * otherwise it's incorrectly displayed after a couple of clicks */ - $('
') - .insertAfter('#db_search_form') + $('#togglesearchformdiv') .hide(); // don't show it until we have results on-screen /** diff --git a/libraries/DbSearch.class.php b/libraries/DbSearch.class.php index a6d877608e..faf7a42db0 100644 --- a/libraries/DbSearch.class.php +++ b/libraries/DbSearch.class.php @@ -342,7 +342,7 @@ class PMA_DbSearch if ($res_cnt > 0) { $this_url_params['sql_query'] = $newsearchsqls['select_columns']; $browse_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params); - $html_output .= ''; $html_output .= ''; $html_output .= ''; - $html_output .= $this->_getResultDivs(); + $html_output .= ''; return $html_output; } @@ -475,7 +476,7 @@ class PMA_DbSearch * * @return string div tags */ - private function _getResultDivs() + public function _getResultDivs() { $html_output = ''; From 5f93f45c042e59521845c1e67413429a6b7505c2 Mon Sep 17 00:00:00 2001 From: Sampath Liyanage Date: Sat, 1 Mar 2014 00:15:08 +0530 Subject: [PATCH 32/35] test failure fixed Signed-off-by: Sampath Liyanage --- test/classes/PMA_DbSearch_test.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/test/classes/PMA_DbSearch_test.php b/test/classes/PMA_DbSearch_test.php index 6b721d64b8..19fbfed967 100644 --- a/test/classes/PMA_DbSearch_test.php +++ b/test/classes/PMA_DbSearch_test.php @@ -153,14 +153,16 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase ), true, '2 matches in table1' - . 'BrowseBrowse' + . '' . '
' - . '

' - . '
', + . '
' + . '
', $this->object->getSelectionForm($url_params) ); } From 72d11b7a7c786a47928fbd068acdff95b0363f1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Bellone?= Date: Thu, 27 Feb 2014 18:03:14 +0100 Subject: [PATCH 33/35] Translated using Weblate (Spanish) Currently translated at 100.0% (2749 of 2749) --- po/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/es.po b/po/es.po index 98841d2285..17828a95f4 100644 --- a/po/es.po +++ b/po/es.po @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-01-19 08:19-0500\n" -"PO-Revision-Date: 2014-02-04 00:07+0200\n" +"PO-Revision-Date: 2014-02-27 18:03+0200\n" "Last-Translator: Matías Bellone \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4660,7 +4660,7 @@ msgstr "Muestra los servidores en una lista en lugar de un drop down" #: libraries/config/messages.inc.php:61 msgid "Display servers as a list" -msgstr "Muestra los servidores en una lista" +msgstr "Mostrar los servidores en una lista" #: libraries/config/messages.inc.php:62 msgid "" From 93578eb96335fedc77d15a8929c815aad7db27af Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 28 Feb 2014 15:14:36 -0500 Subject: [PATCH 34/35] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d992e6e237..8e6c8a8c18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog - bug #4294 output as text radio clickable for "OpenDocument Text" export - bug #4297 DROP DATABASE tick box in export no longer works - bug #4291 Unable to export comments in OpenDocument text format +- bug #4299 Deletion even when the user says "No" to the confirmation message 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry From 58f0552e314b71ac9e7aa9f3ba4e15c16945a027 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 1 Mar 2014 07:42:53 -0500 Subject: [PATCH 35/35] bug #4303 "New" link in navi panel is shown even if no privileges Signed-off-by: Marc Delisle --- ChangeLog | 1 + .../Nodes/Node_Database_Container.class.php | 30 ++++++++++--------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e6c8a8c18..55d67a3905 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - bug #4297 DROP DATABASE tick box in export no longer works - bug #4291 Unable to export comments in OpenDocument text format - bug #4299 Deletion even when the user says "No" to the confirmation message +- bug #4303 "New" link in navi panel is shown even if no privileges 4.1.8.0 (2014-02-22) - bug #4276 Login loop on session expiry diff --git a/libraries/navigation/Nodes/Node_Database_Container.class.php b/libraries/navigation/Nodes/Node_Database_Container.class.php index 6396b03cb0..c76da069d1 100644 --- a/libraries/navigation/Nodes/Node_Database_Container.class.php +++ b/libraries/navigation/Nodes/Node_Database_Container.class.php @@ -29,19 +29,21 @@ class Node_Database_Container extends Node { parent::__construct($name, Node::CONTAINER); - $new = PMA_NodeFactory::getInstance( - 'Node', _pgettext('Create new database', 'New') - ); - $new->isNew = $GLOBALS['is_create_db_priv']; - $new->icon = PMA_Util::getImage('b_newdb.png', ''); - $new->links = array( - 'text' => 'server_databases.php?server=' . $GLOBALS['server'] - . '&token=' . $GLOBALS['token'], - 'icon' => 'server_databases.php?server=' . $GLOBALS['server'] - . '&token=' . $GLOBALS['token'], - ); - $new->classes = 'new_database italics'; - $this->addChild($new); + if ($GLOBALS['is_create_db_priv']) { + $new = PMA_NodeFactory::getInstance( + 'Node', _pgettext('Create new database', 'New') + ); + $new->isNew = true; + $new->icon = PMA_Util::getImage('b_newdb.png', ''); + $new->links = array( + 'text' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $GLOBALS['token'], + 'icon' => 'server_databases.php?server=' . $GLOBALS['server'] + . '&token=' . $GLOBALS['token'], + ); + $new->classes = 'new_database italics'; + $this->addChild($new); + } } } -?> \ No newline at end of file +?>