From c76187732bea3c95c6beab20229c9584803396f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 24 May 2011 08:53:10 +0200 Subject: [PATCH 1/4] Update from master --- po/zh_TW.po | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 17a1037205..a17815cce4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -869,6 +869,8 @@ msgid "" "file size exceeded the maximum size permitted by your PHP configuration. See " "[a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]." msgstr "" +"未接收到要匯入的資料. 可能是檔案名稱未送出, 也可能是檔案大小超出 PHP 限制. 請" +"參閱 [a@./Documentation.html#faq1_16@Documentation]FAQ 1.16[/a]。" #: import.php:371 libraries/display_import.lib.php:23 msgid "Could not load import plugins, please check your installation!" @@ -903,6 +905,8 @@ 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 "" +"在最後一次執行時, 解析失敗. 請增加 PHP 運行時間限制, 否則 phpMyAdmin 將無法完" +"成資料匯入." #: import.php:453 libraries/Message.class.php:185 #: libraries/display_tbl.lib.php:2074 libraries/sql_query_form.lib.php:140 @@ -974,7 +978,7 @@ msgstr "您將要關閉一個BLOB儲存" #: js/messages.php:41 #, php-format msgid "Are you sure you want to disable all BLOB references for database %s?" -msgstr "" +msgstr "您確定要在資料庫 %s 上停用 BLOB 功能?" #: js/messages.php:44 msgid "Missing value in the form!" @@ -1130,7 +1134,7 @@ msgstr "儲存" #: js/messages.php:90 libraries/display_tbl.lib.php:593 pmd_general.php:158 #: tbl_change.php:315 tbl_change.php:321 msgid "Hide" -msgstr "" +msgstr "隱藏" #: js/messages.php:93 #, fuzzy From 24a77645339b9cb32c524456a10dcd0272fdb926 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 May 2011 10:35:04 -0400 Subject: [PATCH 2/4] bug #3306958 [interface] Unnecessary Details slider --- ChangeLog | 1 + tbl_structure.php | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 07a810aaf1..c7dd43f693 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ - bug #3305883 [interface] Table is dropped regardless of confirmation - [auth] Fixed error handling for signon auth method. - bug #3276001 [core] Avoid caching of index.php. +- bug #3306958 [interface] Unnecessary Details slider 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/tbl_structure.php b/tbl_structure.php index 99ec0e90a4..bb4cc06e70 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -700,8 +700,6 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { Date: Tue, 24 May 2011 10:51:26 -0400 Subject: [PATCH 3/4] Put back the div that was generated by previous slider --- tbl_structure.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tbl_structure.php b/tbl_structure.php index bb4cc06e70..ffdb0d2d82 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -706,6 +706,7 @@ if (! $tbl_is_view && ! $db_is_information_schema && 'ARCHIVE' != $tbl_type) { // BEGIN - Calc Table Space // Get valid statistics whatever is the table type if ($cfg['ShowStats']) { + echo '
'; if (empty($showtable)) { $showtable = PMA_Table::sGetStatusInfo($GLOBALS['db'], $GLOBALS['table'], null, true); } @@ -924,7 +925,7 @@ if ($cfg['ShowStats']) { - +
Date: Wed, 25 May 2011 06:55:33 +0200 Subject: [PATCH 4/4] Ignore file which is present on demo server --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a773f8e3e7..b492910cc1 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ locale sources # API documentation apidoc +# Demo server +revision-info.php