Git May 2011

git@phpmyadmin.net

7 participants
287 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2770-g310466c
by Michal Čihař 30 May '11

30 May '11

The branch, master has been updated via 310466c489603511a1a615db8e36f1714e249bcd (commit) via 60411dd4c6ebc898cedfbab14186e2c3037246db (commit) via 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 (commit) via 61c6ae73b0da27d4c057a55bf27db139d5168e71 (commit) via eaf3734ffd8ad7841c39c8627dea33c8dac5a96d (commit) via fdc105e0527ec41d2c2d016b5650bcc7eaba42d0 (commit) via e2f35b29465e5ea6a04992eed78187a1079faf4f (commit) from fd2712dfde5f41e626c4f19505b1b12b538d5f23 (commit) - Log ----------------------------------------------------------------- commit 310466c489603511a1a615db8e36f1714e249bcd Merge: 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 60411dd4c6ebc898cedfbab14186e2c3037246db Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 30 11:20:31 2011 +0200 Merge remote-tracking branch 'origin/QA_3_4' commit 1af6d2e6ed6040b625c1c387c91c54a0cdf5c9c6 Author: Martin Lacina <martin(a)whistler.sk> Date: Mon May 30 10:55:01 2011 +0200 Translation update done using Pootle. commit 61c6ae73b0da27d4c057a55bf27db139d5168e71 Author: Martin Lacina <martin(a)whistler.sk> Date: Mon May 30 10:52:58 2011 +0200 Translation update done using Pootle. commit eaf3734ffd8ad7841c39c8627dea33c8dac5a96d Author: Martin Lacina <martin(a)whistler.sk> Date: Mon May 30 10:51:28 2011 +0200 Translation update done using Pootle. commit fdc105e0527ec41d2c2d016b5650bcc7eaba42d0 Author: Martin Lacina <martin(a)whistler.sk> Date: Mon May 30 10:49:45 2011 +0200 Translation update done using Pootle. commit e2f35b29465e5ea6a04992eed78187a1079faf4f Author: Martin Lacina <martin(a)whistler.sk> Date: Mon May 30 10:43:10 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/sk.po | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/po/sk.po b/po/sk.po index 68daedb..ec3c474 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-22 20:33+0200\n" +"PO-Revision-Date: 2011-05-30 10:55+0200\n" "Last-Translator: Martin Lacina <martin(a)whistler.sk>\n" "Language-Team: slovak <sk(a)li.org>\n" "Language: sk\n" @@ -3810,6 +3810,11 @@ msgid "" "their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" +"Môžete použiť nahradzujúce znaky (% a _). Pokiaľ ich potrebujete použiť v " +"ich pôvodnom význame, vložte spätné lomítko \\ pred, napríklad " +"[kbd]'moja\\_db'[/kbd] namiesto [kbd]'moja_db'[/kbd]. Použitím tejto voľby " +"môžete ovplyvniť triedenie databáz v zozname. Stačí na konci zoznamu uviesť " +"[kbd]*[/kbd] na konci pre zobrazenie ostatných v abecednom poradí." #: libraries/config/messages.inc.php:394 msgid "Show only listed databases" @@ -3840,6 +3845,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Databáza použitá pre ralácie, záložky a PDF možností. Pre kompletný popis " +"viď [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]. Ak ponecháte prázdne, " +"bude táto možnosť vypnutá. Doporučená hodnota: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:400 msgid "Database name" @@ -3923,6 +3931,8 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" +"Tabuľka obsahujúca popisy polí. Nechajte prázdnu pre vypnutie tejto funkcie. " +"Odporúčaná hodnota: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:417 msgid "Display columns table" @@ -4003,6 +4013,8 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie možnosti ukladania užívateľských nastavení v " +"databáze. Odporúčaná hodnota: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:431 msgid "User preferences storage table" @@ -4017,6 +4029,8 @@ msgid "" "Disable if you know that your pma_* tables are up to date. This prevents " "compatibility checks and thereby increases performance" msgstr "" +"Vypnite, pokiaľ viete, že vaše pma_* tabuľky sú aktuálne. Tým zabránite " +"kontrolám kompatibility a urýchlite zabrazovanie stránok." #: libraries/config/messages.inc.php:435 msgid "Verbose check" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-46-g60411dd
by Michal Čihař 30 May '11

30 May '11

The branch, QA_3_4 has been updated via 60411dd4c6ebc898cedfbab14186e2c3037246db (commit) from c9c800eb29c9077aea5117707b05b9a4bf642a8c (commit) - Log ----------------------------------------------------------------- commit 60411dd4c6ebc898cedfbab14186e2c3037246db Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 30 11:19:02 2011 +0200 Update from master ----------------------------------------------------------------------- Summary of changes: po/sk.po | 14 ++++++++++++++ po/zh_TW.po | 28 +++++++++++++++------------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/po/sk.po b/po/sk.po index abb5b01..c88bb74 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3964,6 +3964,11 @@ msgid "" "their names in order and use [kbd]*[/kbd] at the end to show the rest in " "alphabetical order." msgstr "" +"Môžete použiť nahradzujúce znaky (% a _). Pokiaľ ich potrebujete použiť v " +"ich pôvodnom význame, vložte spätné lomítko \\ pred, napríklad [kbd]'moja" +"\\_db'[/kbd] namiesto [kbd]'moja_db'[/kbd]. Použitím tejto voľby môžete " +"ovplyvniť triedenie databáz v zozname. Stačí na konci zoznamu uviesť [kbd]*[/" +"kbd] na konci pre zobrazenie ostatných v abecednom poradí." #: libraries/config/messages.inc.php:394 msgid "Show only listed databases" @@ -3994,6 +3999,9 @@ msgid "" "phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for " "no support. Suggested: [kbd]phpmyadmin[/kbd]" msgstr "" +"Databáza použitá pre ralácie, záložky a PDF možností. Pre kompletný popis " +"viď [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a]. Ak ponecháte prázdne, " +"bude táto možnosť vypnutá. Doporučená hodnota: [kbd]phpmyadmin[/kbd]" #: libraries/config/messages.inc.php:400 #, fuzzy @@ -4082,6 +4090,8 @@ msgid "" "Table to describe the display columns, leave blank for no support; " "suggested: [kbd]pma_table_info[/kbd]" msgstr "" +"Tabuľka obsahujúca popisy polí. Nechajte prázdnu pre vypnutie tejto funkcie. " +"Odporúčaná hodnota: [kbd]pma_table_info[/kbd]" #: libraries/config/messages.inc.php:417 #, fuzzy @@ -4167,6 +4177,8 @@ msgid "" "Leave blank for no user preferences storage in database, suggested: [kbd]" "pma_config[/kbd]" msgstr "" +"Nechajte prázdne pre vypnutie možnosti ukladania užívateľských nastavení v " +"databáze. Odporúčaná hodnota: [kbd]pma_config[/kbd]" #: libraries/config/messages.inc.php:431 msgid "User preferences storage table" @@ -4181,6 +4193,8 @@ msgid "" "Disable if you know that your pma_* tables are up to date. This prevents " "compatibility checks and thereby increases performance" msgstr "" +"Vypnite, pokiaľ viete, že vaše pma_* tabuľky sú aktuálne. Tým zabránite " +"kontrolám kompatibility a urýchlite zabrazovanie stránok." #: libraries/config/messages.inc.php:435 msgid "Verbose check" diff --git a/po/zh_TW.po b/po/zh_TW.po index 45f07b5..760d8a4 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3221,7 +3221,7 @@ msgstr "部分匯入：允許中斷" #: libraries/config/messages.inc.php:240 libraries/config/messages.inc.php:247 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "不在發生新增錯誤時中斷" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:249 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3233,6 +3233,8 @@ msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" msgstr "" +"預設格式。此列表將依據所在位置(資料庫或資料表)不同而有所改變，只有 SQL 指令是" +"通用的" #: libraries/config/messages.inc.php:244 msgid "Format of imported file" @@ -3251,15 +3253,15 @@ msgstr "將欄位名稱放在首行" #: libraries/config/messages.inc.php:252 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "不匯入空的資料行" #: libraries/config/messages.inc.php:253 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "匯入貨幣格式 (開啟此功能 $5.00 將被匯入為 5.00)" #: libraries/config/messages.inc.php:254 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "將百分比匯入為小數點格式 (開啟此功能 12.00% 將被匯入為 .12)" #: libraries/config/messages.inc.php:255 #, fuzzy @@ -3269,7 +3271,7 @@ msgstr "開始時略過多少行記錄 (語法)" #: libraries/config/messages.inc.php:256 msgid "Partial import: skip queries" -msgstr "" +msgstr "部分匯入：忽略指令" #: libraries/config/messages.inc.php:258 #, fuzzy @@ -3279,35 +3281,35 @@ msgstr "新增 AUTO_INCREMENT 數值" #: libraries/config/messages.inc.php:261 msgid "Initial state for sliders" -msgstr "" +msgstr "滑動顯示初始狀態" #: libraries/config/messages.inc.php:262 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "可一次新增多少資料列" #: libraries/config/messages.inc.php:263 msgid "Number of inserted rows" -msgstr "" +msgstr "新增的資料列數" #: libraries/config/messages.inc.php:264 msgid "Target for quick access icon" -msgstr "" +msgstr "捷徑圖示的目標" #: libraries/config/messages.inc.php:265 msgid "Show logo in left frame" -msgstr "" +msgstr "在左側頁框顯示LOGO" #: libraries/config/messages.inc.php:266 msgid "Display logo" -msgstr "" +msgstr "顯示LOGO" #: libraries/config/messages.inc.php:267 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "在左側頁框頂端顯示伺服器選單" #: libraries/config/messages.inc.php:268 msgid "Display servers selection" -msgstr "" +msgstr "顯示伺服器選單" #: libraries/config/messages.inc.php:269 msgid "Minimum number of tables to display the table filter box" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2763-gfd2712d
by Michal Čihař 30 May '11

30 May '11

The branch, master has been updated via fd2712dfde5f41e626c4f19505b1b12b538d5f23 (commit) via 4d133b4268ac148185d410962acb838ef4b7ee53 (commit) via b2e5f7b18241579620ddaceaffed36b11259f591 (commit) via 9796c0f8193dbf6bdc8a77ea55891078e64711fe (commit) via 6ff6b7dcd75163aae5fce7594fe6465dd5fedcd4 (commit) via 9d5aa954fe72c731378db67bac5cc61015548cbb (commit) via a043f9f16e7c1d765fbb6eac4495c68cd22ff5ee (commit) via 4e521ea2c929431bf0283836b0cf88f76c58a59b (commit) via 46fea4d4b1753b857fd1d1bc262b917756b393cf (commit) via 140e0f7d3cfa154db729e9cf0cc77a5f678c17b3 (commit) via b93bd091342eaa9ddbf8b2cfff9cbcf7c1c57918 (commit) via d17b9f8e0fbf887e208c9df1debe0b664a98627e (commit) via 54c33c5da878fa0bf536d671435fb091f740b5f7 (commit) via 583fdf73efdba5489b393feee2abcceaf466a30b (commit) via ba6ed110ab140237dcbd79c71851fabe4e6a39fc (commit) via 45e120a4daf2b172614dfa7834e49db96dad1234 (commit) via 015e2166046b8c5394105a4a485fdfbd6e47e81b (commit) via b2fb75920a76d51072e637f1f4c435d54f56c9a8 (commit) via fa3f08f3a9dc21d101ac0c788543f5d64e7e5bad (commit) via 4bd80ee3756da633da99ff63547e939861d76520 (commit) via 312ac5799c0862513d30de30b52dfdad2d6b5880 (commit) via 1502820d259836346caa9f9d79b6ec9d885563e6 (commit) via d6f0cb77f0d170d66b5ba864832e0768c30d80a8 (commit) via bee7fc94fc9243dc0aa6972356d2bab21c96195f (commit) via 4189de50324e9d7f970987a0a76c05c6f0dfe5d1 (commit) via 6c2bd28229fbf2416f28c7ad2d106a758161005a (commit) via cfa3e6e9e98f659a9d0118b65af78d0fd0ee27f2 (commit) via 0e6a9321ef526eba1483ad3826db0dd88458f9f0 (commit) via bdded3c4b962c4d19c1e4e0c72c4249a246e5f76 (commit) via 6378c8af46856e87c6f2bd460a2f145be3d63b51 (commit) via b5a198a7ca8fdc684fc66c56e80b7b2dc79c08c5 (commit) via b99845c6ca0b14e54faa4d925d2c917b3e0440f3 (commit) via a03d337d682bd8e25a4062b6d3f679c26795ba44 (commit) via b685bdb5b87fa2c607e912fbbf5fe6243021e265 (commit) via fb903b07c77050c1c4bc448729803f8a0c6f4fc0 (commit) via 07db2fcc740466cf929e94df0b4170d4d1651cb2 (commit) via ed775b252c53873c3b2231f6fee1e128ecd99291 (commit) via 615da35686a1591a1a44e65a05d55d28c5eaa73c (commit) via 56ed73390bad4ea2cd822c187596d45b2a694488 (commit) via 2696597bf877ef6c76e6560ff24b6d681600ed41 (commit) via a04e35e67ef6113b698b3f44ff809be24e4177d7 (commit) via 23d9d6b7f3b7b72abd7aca2d2fc7223e2a034999 (commit) via 89a50c4a8fde9c6b983f5220b24310ca33473b82 (commit) via 803e32034b95ae020c28575d0b03321ca377930e (commit) via dab4bb863bdcdf0dbac646d90b817bed86ef4c32 (commit) via 6e91a6aa633e17e12185037dc611e077db47737b (commit) via 6ffd4cae53ecdf5dccfe2a8f1996f20fbb121b02 (commit) via fcf87c1c6f12a7919a0a54f37336ceb5ac7f35a9 (commit) via abc0e2204199184859d484181aad091586f39201 (commit) via 550ce415cd4929eb8d5dbdf106ad225d1b35b671 (commit) via a8aebc171f349265c9b9c0e8e51836ba40f00447 (commit) via 59d560a4846f1e5cab940535c6442b3772f90456 (commit) from b71c47ca26d98b500229ac250aa7a69bb0af2411 (commit) - Log ----------------------------------------------------------------- commit fd2712dfde5f41e626c4f19505b1b12b538d5f23 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:47:55 2011 +0200 Translation update done using Pootle. commit 4d133b4268ac148185d410962acb838ef4b7ee53 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:47:19 2011 +0200 Translation update done using Pootle. commit b2e5f7b18241579620ddaceaffed36b11259f591 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:46:25 2011 +0200 Translation update done using Pootle. commit 9796c0f8193dbf6bdc8a77ea55891078e64711fe Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:45:41 2011 +0200 Translation update done using Pootle. commit 6ff6b7dcd75163aae5fce7594fe6465dd5fedcd4 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:45:00 2011 +0200 Translation update done using Pootle. commit 9d5aa954fe72c731378db67bac5cc61015548cbb Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:44:52 2011 +0200 Translation update done using Pootle. commit a043f9f16e7c1d765fbb6eac4495c68cd22ff5ee Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:43:19 2011 +0200 Translation update done using Pootle. commit 4e521ea2c929431bf0283836b0cf88f76c58a59b Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:40:45 2011 +0200 Translation update done using Pootle. commit 46fea4d4b1753b857fd1d1bc262b917756b393cf Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:40:26 2011 +0200 Translation update done using Pootle. commit 140e0f7d3cfa154db729e9cf0cc77a5f678c17b3 Author: shanyan baishui <Siramizu(a)gmail.com> Date: Mon May 30 05:38:17 2011 +0200 Translation update done using Pootle. commit b93bd091342eaa9ddbf8b2cfff9cbcf7c1c57918 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:51:09 2011 +0200 Translation update done using Pootle. commit d17b9f8e0fbf887e208c9df1debe0b664a98627e Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:50:56 2011 +0200 Translation update done using Pootle. commit 54c33c5da878fa0bf536d671435fb091f740b5f7 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:50:21 2011 +0200 Translation update done using Pootle. commit 583fdf73efdba5489b393feee2abcceaf466a30b Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:50:07 2011 +0200 Translation update done using Pootle. commit ba6ed110ab140237dcbd79c71851fabe4e6a39fc Author: star <star(a)origin.club.tw> Date: Mon May 30 04:42:33 2011 +0200 Translation update done using Pootle. commit 45e120a4daf2b172614dfa7834e49db96dad1234 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:42:28 2011 +0200 Translation update done using Pootle. commit 015e2166046b8c5394105a4a485fdfbd6e47e81b Author: star <star(a)origin.club.tw> Date: Mon May 30 04:42:24 2011 +0200 Translation update done using Pootle. commit b2fb75920a76d51072e637f1f4c435d54f56c9a8 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:42:07 2011 +0200 Translation update done using Pootle. commit fa3f08f3a9dc21d101ac0c788543f5d64e7e5bad Author: star <star(a)origin.club.tw> Date: Mon May 30 04:42:01 2011 +0200 Translation update done using Pootle. commit 4bd80ee3756da633da99ff63547e939861d76520 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:41:51 2011 +0200 Translation update done using Pootle. commit 312ac5799c0862513d30de30b52dfdad2d6b5880 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:40:23 2011 +0200 Translation update done using Pootle. commit 1502820d259836346caa9f9d79b6ec9d885563e6 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:30:00 2011 +0200 Translation update done using Pootle. commit d6f0cb77f0d170d66b5ba864832e0768c30d80a8 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:22:25 2011 +0200 Translation update done using Pootle. commit bee7fc94fc9243dc0aa6972356d2bab21c96195f Author: star <star(a)origin.club.tw> Date: Mon May 30 04:21:45 2011 +0200 Translation update done using Pootle. commit 4189de50324e9d7f970987a0a76c05c6f0dfe5d1 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:21:32 2011 +0200 Translation update done using Pootle. commit 6c2bd28229fbf2416f28c7ad2d106a758161005a Author: star <star(a)origin.club.tw> Date: Mon May 30 04:19:38 2011 +0200 Translation update done using Pootle. commit cfa3e6e9e98f659a9d0118b65af78d0fd0ee27f2 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:19:23 2011 +0200 Translation update done using Pootle. commit 0e6a9321ef526eba1483ad3826db0dd88458f9f0 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:18:59 2011 +0200 Translation update done using Pootle. commit bdded3c4b962c4d19c1e4e0c72c4249a246e5f76 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:16:54 2011 +0200 Translation update done using Pootle. commit 6378c8af46856e87c6f2bd460a2f145be3d63b51 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:13:23 2011 +0200 Translation update done using Pootle. commit b5a198a7ca8fdc684fc66c56e80b7b2dc79c08c5 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:13:03 2011 +0200 Translation update done using Pootle. commit b99845c6ca0b14e54faa4d925d2c917b3e0440f3 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:12:40 2011 +0200 Translation update done using Pootle. commit a03d337d682bd8e25a4062b6d3f679c26795ba44 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:11:41 2011 +0200 Translation update done using Pootle. commit b685bdb5b87fa2c607e912fbbf5fe6243021e265 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:11:02 2011 +0200 Translation update done using Pootle. commit fb903b07c77050c1c4bc448729803f8a0c6f4fc0 Author: joehorn <joehorn(a)gmail.com> Date: Mon May 30 04:09:07 2011 +0200 Translation update done using Pootle. commit 07db2fcc740466cf929e94df0b4170d4d1651cb2 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:08:42 2011 +0200 Translation update done using Pootle. commit ed775b252c53873c3b2231f6fee1e128ecd99291 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:07:57 2011 +0200 Translation update done using Pootle. commit 615da35686a1591a1a44e65a05d55d28c5eaa73c Author: star <star(a)origin.club.tw> Date: Mon May 30 04:07:02 2011 +0200 Translation update done using Pootle. commit 56ed73390bad4ea2cd822c187596d45b2a694488 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:06:21 2011 +0200 Translation update done using Pootle. commit 2696597bf877ef6c76e6560ff24b6d681600ed41 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:05:53 2011 +0200 Translation update done using Pootle. commit a04e35e67ef6113b698b3f44ff809be24e4177d7 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:05:14 2011 +0200 Translation update done using Pootle. commit 23d9d6b7f3b7b72abd7aca2d2fc7223e2a034999 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:04:47 2011 +0200 Translation update done using Pootle. commit 89a50c4a8fde9c6b983f5220b24310ca33473b82 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:03:21 2011 +0200 Translation update done using Pootle. commit 803e32034b95ae020c28575d0b03321ca377930e Author: star <star(a)origin.club.tw> Date: Mon May 30 04:02:30 2011 +0200 Translation update done using Pootle. commit dab4bb863bdcdf0dbac646d90b817bed86ef4c32 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:01:05 2011 +0200 Translation update done using Pootle. commit 6e91a6aa633e17e12185037dc611e077db47737b Author: star <star(a)origin.club.tw> Date: Mon May 30 04:00:58 2011 +0200 Translation update done using Pootle. commit 6ffd4cae53ecdf5dccfe2a8f1996f20fbb121b02 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:00:47 2011 +0200 Translation update done using Pootle. commit fcf87c1c6f12a7919a0a54f37336ceb5ac7f35a9 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:00:35 2011 +0200 Translation update done using Pootle. commit abc0e2204199184859d484181aad091586f39201 Author: star <star(a)origin.club.tw> Date: Mon May 30 04:00:14 2011 +0200 Translation update done using Pootle. commit 550ce415cd4929eb8d5dbdf106ad225d1b35b671 Author: star <star(a)origin.club.tw> Date: Mon May 30 03:59:33 2011 +0200 Translation update done using Pootle. commit a8aebc171f349265c9b9c0e8e51836ba40f00447 Author: star <star(a)origin.club.tw> Date: Mon May 30 03:59:21 2011 +0200 Translation update done using Pootle. commit 59d560a4846f1e5cab940535c6442b3772f90456 Author: star <star(a)origin.club.tw> Date: Mon May 30 03:58:58 2011 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/zh_CN.po | 30 +++++++++++------------------- po/zh_TW.po | 59 ++++++++++++++++++++++++++--------------------------------- 2 files changed, 37 insertions(+), 52 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9c2332a..ab918fd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-27 03:57+0200\n" +"PO-Revision-Date: 2011-05-30 05:47+0200\n" "Last-Translator: shanyan baishui <Siramizu(a)gmail.com>\n" "Language-Team: chinese_simplified <zh_CN(a)li.org>\n" "Language: zh_CN\n" @@ -698,22 +698,19 @@ msgid "Analyze table" msgstr "分析表" #: db_structure.php:521 -#, fuzzy #| msgid "Go to table" msgid "Add prefix to table" -msgstr "转到数据表" +msgstr "添加表前缀" #: db_structure.php:523 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "将表的数据用此文件替换" +msgstr "修改表前缀" #: db_structure.php:525 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "将表的数据用此文件替换" +msgstr "复制表为新前缀" #: db_structure.php:574 libraries/schema/User_Schema.class.php:387 msgid "Data Dictionary" @@ -4437,7 +4434,6 @@ msgstr "MySQL 4.0 兼容" #: libraries/display_create_database.lib.php:21 #: libraries/display_create_database.lib.php:39 -#, fuzzy #| msgid "Create new database" msgid "Create database" msgstr "新建数据库" @@ -5687,14 +5683,13 @@ msgid "Convert to Kana" msgstr "转换为假名" #: libraries/mult_submits.inc.php:249 -#, fuzzy #| msgid "Fr" msgid "From" -msgstr "五" +msgstr "从" #: libraries/mult_submits.inc.php:252 msgid "To" -msgstr "" +msgstr "到" #: libraries/mult_submits.inc.php:257 libraries/mult_submits.inc.php:271 #: libraries/sql_query_form.lib.php:440 @@ -7671,10 +7666,10 @@ msgid "Unable to change master" msgstr "无法修改主服务器" #: server_replication.php:72 -#, fuzzy, php-format +#, php-format #| msgid "Master server changed succesfully to %s" msgid "Master server changed successfully to %s" -msgstr "成功修改主服务器为 %s" +msgstr "已成功修改主服务器到 %s" #: server_replication.php:180 msgid "This server is configured as master in a replication process." @@ -9572,10 +9567,9 @@ msgid "Version %s snapshot (SQL code)" msgstr "版本 %s 的快照 (SQL 代码)" #: tbl_tracking.php:382 -#, fuzzy #| msgid "Track these data definition statements:" msgid "Tracking data definition successfully deleted" -msgstr "追踪下列数据定义语句:" +msgstr "追踪数据定义删除成功" #: tbl_tracking.php:384 tbl_tracking.php:401 #| msgid "Gather errors" @@ -9583,10 +9577,9 @@ msgid "Query error" msgstr "查询错误" #: tbl_tracking.php:399 -#, fuzzy #| msgid "Track these data manipulation statements:" msgid "Tracking data manipulation successfully deleted" -msgstr "追踪下列数据操作语句:" +msgstr "追踪数据操作删除成功" #: tbl_tracking.php:411 msgid "Tracking statements" @@ -9598,10 +9591,9 @@ msgid "Show %s with dates from %s to %s by user %s %s" msgstr "显示自 %2$s 起至 %3$s 用户 %4$s 执行的 %1$s %5$s" #: tbl_tracking.php:432 -#, fuzzy #| msgid "Delete tracking data for this table" msgid "Delete tracking data row from report" -msgstr "删除追踪数据" +msgstr "从报告中删除追踪数据" #: tbl_tracking.php:443 #| msgid "No databases" diff --git a/po/zh_TW.po b/po/zh_TW.po index a1c1b3f..8196166 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2011-05-18 07:46-0400\n" -"PO-Revision-Date: 2011-05-29 22:00+0200\n" -"Last-Translator: <xuan311(a)gmail.com>\n" +"PO-Revision-Date: 2011-05-30 04:51+0200\n" +"Last-Translator: <joehorn(a)gmail.com>\n" "Language-Team: chinese_traditional <zh_TW(a)li.org>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -707,21 +707,18 @@ msgid "Analyze table" msgstr "分析資料表" #: db_structure.php:521 -#, fuzzy msgid "Add prefix to table" -msgstr "增加檔案於資料表" +msgstr "資料表名稱增加前綴文字" #: db_structure.php:523 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Replace table prefix" -msgstr "以檔案置換資料表" +msgstr "覆蓋資料表名稱的前綴文字" #: db_structure.php:525 libraries/mult_submits.inc.php:246 -#, fuzzy #| msgid "Replace table data with file" msgid "Copy table with prefix" -msgstr "將檔案複製至資料表" +msgstr "複製資料表名稱的前綴文字" #: db_structure.php:574 libraries/schema/User_Schema.class.php:387 msgid "Data Dictionary" @@ -2175,10 +2172,10 @@ msgid "Browse your computer:" msgstr "瀏覽你的電腦：" #: libraries/common.lib.php:2979 -#, php-format, fuzzy +#, php-format #| msgid "web server upload directory" msgid "Select from the web server upload directory <b>%s</b>:" -msgstr "Web 伺服器上傳目錄" +msgstr "選擇 Web 伺服器上傳目錄 <b>%s</b>：" #: libraries/common.lib.php:2991 libraries/sql_query_form.lib.php:501 #: tbl_change.php:962 @@ -2759,9 +2756,8 @@ msgid "Maximal length of created query" msgstr "建立查詢指令最大長度" #: libraries/config/messages.inc.php:135 -#, fuzzy msgid "Export type" -msgstr "輸出方式" +msgstr "輸出類型" #: libraries/config/messages.inc.php:136 libraries/export/sql.php:50 msgid "Enclose export in a transaction" @@ -3140,7 +3136,7 @@ msgstr "部分匯入：允許中斷" #: libraries/config/messages.inc.php:240 libraries/config/messages.inc.php:247 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 msgid "Do not abort on INSERT error" -msgstr "" +msgstr "不在發生新增錯誤時中斷" #: libraries/config/messages.inc.php:241 libraries/config/messages.inc.php:249 #: libraries/import/csv.php:25 libraries/import/ldi.php:38 @@ -3151,7 +3147,7 @@ msgstr "以檔案取代資料表資料" msgid "" "Default format; be aware that this list depends on location (database, " "table) and only SQL is always available" -msgstr "" +msgstr "預設格式。此列表將依據所在位置(資料庫或資料表)不同而有所改變，只有 SQL 指令是通用的" #: libraries/config/messages.inc.php:244 msgid "Format of imported file" @@ -3159,74 +3155,71 @@ msgstr "載入檔案格式" #: libraries/config/messages.inc.php:248 libraries/import/ldi.php:45 msgid "Use LOCAL keyword" -msgstr "使用 LOCAL 關鍵字" +msgstr "使用本地(LOCAL)關鍵字" #: libraries/config/messages.inc.php:251 libraries/config/messages.inc.php:259 #: libraries/config/messages.inc.php:260 -#, fuzzy #| msgid "Put fields names in the first row" msgid "Column names in first row" -msgstr "將欄位名稱放在首行" +msgstr "首行資料為欄位名稱" #: libraries/config/messages.inc.php:252 libraries/import/ods.php:27 msgid "Do not import empty rows" -msgstr "" +msgstr "不匯入空的資料行" #: libraries/config/messages.inc.php:253 msgid "Import currencies ($5.00 to 5.00)" -msgstr "" +msgstr "匯入貨幣格式 (開啟此功能 $5.00 將被匯入為 5.00)" #: libraries/config/messages.inc.php:254 msgid "Import percentages as proper decimals (12.00% to .12)" -msgstr "" +msgstr "將百分比匯入為小數點格式 (開啟此功能 12.00% 將被匯入為 .12)" #: libraries/config/messages.inc.php:255 -#, fuzzy #| msgid "Number of records (queries) to skip from start" msgid "Number of queries to skip from start" -msgstr "開始時略過多少行記錄 (語法)" +msgstr "略過指定行數的資料" #: libraries/config/messages.inc.php:256 msgid "Partial import: skip queries" -msgstr "" +msgstr "部分匯入：忽略指令" #: libraries/config/messages.inc.php:258 -#, fuzzy #| msgid "Add AUTO_INCREMENT value" msgid "Do not use AUTO_INCREMENT for zero values" -msgstr "新增 AUTO_INCREMENT 數值" +msgstr "請勿為數值為零的資料加上 AUTO_INCREMENT 屬性" #: libraries/config/messages.inc.php:261 msgid "Initial state for sliders" -msgstr "" +msgstr "滑動顯示初始狀態" #: libraries/config/messages.inc.php:262 msgid "How many rows can be inserted at one time" -msgstr "" +msgstr "可一次新增多少資料列" #: libraries/config/messages.inc.php:263 msgid "Number of inserted rows" -msgstr "" +msgstr "新增的資料列數" #: libraries/config/messages.inc.php:264 msgid "Target for quick access icon" -msgstr "" +msgstr "捷徑圖示的目標" #: libraries/config/messages.inc.php:265 msgid "Show logo in left frame" -msgstr "" +msgstr "在左側頁框顯示LOGO" #: libraries/config/messages.inc.php:266 msgid "Display logo" -msgstr "" +msgstr "顯示LOGO" #: libraries/config/messages.inc.php:267 msgid "Display server choice at the top of the left frame" -msgstr "" +msgstr "在左側頁框頂端顯示伺服器選單" #: libraries/config/messages.inc.php:268 msgid "Display servers selection" -msgstr "" +msgstr "顯示伺服器選單" #: libraries/config/messages.inc.php:269 msgid "Minimum number of tables to display the table filter box" hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 405496f24f34f13d2aad06123d9ad85fe7fdeba9
by Michal Čihař 30 May '11

30 May '11

The branch, master has been updated via 405496f24f34f13d2aad06123d9ad85fe7fdeba9 (commit) via 270ed4cba580e884882aef1b1ca4f3ac4fa4fed5 (commit) from 2288a005cce79eaa795e6b5782145e60999f010f (commit) - Log ----------------------------------------------------------------- commit 405496f24f34f13d2aad06123d9ad85fe7fdeba9 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon May 30 10:12:16 2011 +0200 Formatting commit 270ed4cba580e884882aef1b1ca4f3ac4fa4fed5 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon May 30 10:08:12 2011 +0200 Add information for Fedora and RHEL ----------------------------------------------------------------------- Summary of changes: templates/downloads.tpl | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/templates/downloads.tpl b/templates/downloads.tpl index c692300..abf2a79 100644 --- a/templates/downloads.tpl +++ b/templates/downloads.tpl @@ -79,11 +79,11 @@ <h2><a id="distributions"></a>Distributions</h2> <h3>Debian</h3> <p> - Debian's package repositories include a phpMyAdmin package, but be aware - that the configuration file is maintained in /etc/phpmyadmin and may - differ in some ways from the official phpMyAdmin documentation. The - package maintainer often visits the official IRC channel (#phpmyadmin on - irc.freenode.net). + Debian's package repositories include a phpMyAdmin package, but be + aware that the configuration file is maintained in + <code>/etc/phpmyadmin</code> and may differ in some ways from the + official phpMyAdmin documentation. The package maintainer often visits + the official IRC channel (#phpmyadmin on irc.freenode.net). </p> <h3>OpenSUSE</h3> <p> @@ -111,6 +111,25 @@ and can be installed via the usual Control Center. </p> + <h3>Fedora</h3> + <p> + Fedora ships the phpMyAdmin package, but be aware that the + configuration file is maintained in <code>/etc/phpMyAdmin/</code> and + may differ in some ways from the official phpMyAdmin documentation. + </p> + + <h3>Red Hat Enterprise Linux</h3> + <p> + Red Hat Enterprise Linux itself and thus derivates like CentOS don't + ship phpMyAdmin, but the Fedora-driven repository <a + href="http://fedoraproject.org/wiki/EPEL">Extra Packages for Enterprise + Linux</a> (EPEL) is doing so, if it's <a + href="http://fedoraproject.org/wiki/EPEL/FAQ#howtouse">enabled</a>. + But be aware that the configuration file is maintained in + <code>/etc/phpMyAdmin/</code> and may differ in some ways from the + official phpMyAdmin documentation. + </p> + <h3>Amahi Linux Home Server</h3> <p> phpMyAdmin is available as a one-click install on the <a href="http://www.amahi.org/apps">Amahi Home Server</a>. hooks/post-receive -- phpMyAdmin website

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2711-gb71c47c
by Marc Delisle 30 May '11

30 May '11

The branch, master has been updated via b71c47ca26d98b500229ac250aa7a69bb0af2411 (commit) from 285833752d3fbcd6ab8260cad5c003d51dda966e (commit) - Log ----------------------------------------------------------------- commit b71c47ca26d98b500229ac250aa7a69bb0af2411 Author: Marc Delisle <marc(a)infomarc.info> Date: Sun May 29 19:43:13 2011 -0400 Remove comment for old function behavior ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 633acb2..39b78f9 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -812,9 +812,7 @@ function PMA_getTableList($db, $tables = null, $limit_offset = 0, $limit_count = * or array of it * @param boolean $do_it a flag to bypass this function (used by dump * functions) - * @return mixed the "backquoted" database, table or field name if the - * current MySQL release is >= 3.23.6, the original one - * else + * @return mixed the "backquoted" database, table or field name * @access public */ function PMA_backquote($a_name, $do_it = true) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-45-gc9c800e
by Michal Čihař 29 May '11

29 May '11

The branch, QA_3_4 has been updated via c9c800eb29c9077aea5117707b05b9a4bf642a8c (commit) from f0fcf7e11f0804ad2a951645aa05bf570f2bf884 (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: po/bg.po | 6 +- po/hu.po | 79 ++++++++------ po/zh_TW.po | 354 ++++++++++++++++++++++++++++++++--------------------------- 3 files changed, 237 insertions(+), 202 deletions(-) diff --git a/po/bg.po b/po/bg.po index 52823b2..7f81d91 100644 --- a/po/bg.po +++ b/po/bg.po @@ -5798,7 +5798,7 @@ msgstr "" #: libraries/relation.lib.php:151 msgid "Quick steps to setup advanced features:" -msgstr "" +msgstr "Лесни стъпки за настройка на разширените свойства:" #: libraries/relation.lib.php:153 msgid "" @@ -6991,7 +6991,7 @@ msgstr "" #: prefs_manage.php:258 prefs_manage.php:312 msgid "This feature is not supported by your web browser" -msgstr "" +msgstr "Тази функционалност не се поддържа от вашия браузър" #: prefs_manage.php:263 msgid "Merge with current configuration" @@ -9173,7 +9173,7 @@ msgstr "" #: tbl_operations.php:688 msgid "Empty the table (TRUNCATE)" -msgstr "" +msgstr "Изпразване на таблицата (TRUNCATE)" #: tbl_operations.php:708 msgid "Delete the table (DROP)" diff --git a/po/hu.po b/po/hu.po index 87c3062..aa4a688 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3914,34 +3914,41 @@ 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 utasítás hozzá lesz adva a napló első sora ként az " +"adatbázis létrehozása során." #: libraries/config/messages.inc.php:419 msgid "Add DROP DATABASE" -msgstr "" +msgstr "DROP DATABASE hozzáadása" #: libraries/config/messages.inc.php:420 msgid "" "Whether a DROP TABLE IF EXISTS statement will be added as first line to the " "log when creating a table." msgstr "" +"DROP TABLE IF EXISTS utasítás hozzá lesz adva a napló első sora ként a tábla " +"létrehozása során." #: libraries/config/messages.inc.php:421 msgid "Add DROP TABLE" -msgstr "" +msgstr "DROP TABLE hozzáadása" #: libraries/config/messages.inc.php:422 msgid "" "Whether a DROP VIEW IF EXISTS statement will be added as first line to the " "log when creating a view." msgstr "" +"DROP VIEW IF EXISTS utasítás hozzá lesz adva a napló első sora ként a nézet " +"létrehozása során." #: libraries/config/messages.inc.php:423 msgid "Add DROP VIEW" -msgstr "" +msgstr "DROP VIEW hozzáadása" #: libraries/config/messages.inc.php:424 msgid "Defines the list of statements the auto-creation uses for new versions." msgstr "" +"Állítások listájának definiálása az új verziójú automata-létrehozások során." #: libraries/config/messages.inc.php:425 #, fuzzy @@ -4155,7 +4162,7 @@ msgstr "A zárolt táblák kihagyása" #: libraries/config/messages.inc.php:465 msgid "Requires SQL Validator to be enabled" -msgstr "" +msgstr "Szükséges az SQL Validator engedélyezése" #: libraries/config/messages.inc.php:467 #: libraries/display_change_password.lib.php:40 @@ -4175,13 +4182,15 @@ msgstr "" #: libraries/config/messages.inc.php:469 msgid "Enable SQL Validator" -msgstr "" +msgstr "SQL Validator engedélyezése" #: libraries/config/messages.inc.php:470 msgid "" "If you have a custom username, specify it here (defaults to [kbd]anonymous[/" "kbd])" msgstr "" +"Ha Önnek egyedi felhasználóneve van, itt megnevezheti (alapértelmezett: [kbd]" +"anonymous[/kbd])" #: libraries/config/messages.inc.php:471 tbl_tracking.php:405 #: tbl_tracking.php:456 @@ -4203,11 +4212,11 @@ msgstr "Új adatbázisnév javasolása" #: libraries/config/messages.inc.php:474 msgid "A warning is displayed on the main page if Suhosin is detected" -msgstr "" +msgstr "Figyelmeztetés megjelenítése a főoldalon, Suhosin észlelésekor" #: libraries/config/messages.inc.php:475 msgid "Suhosin warning" -msgstr "" +msgstr "Suhosin figyelmeztetés" #: libraries/config/messages.inc.php:476 msgid "" @@ -4235,11 +4244,11 @@ msgstr "CHAR szövegterület sorai" #: libraries/config/messages.inc.php:480 msgid "Title of browser window when a database is selected" -msgstr "" +msgstr "A böngésző ablak címe, ha ki van választva egy adatbázis" #: libraries/config/messages.inc.php:482 msgid "Title of browser window when nothing is selected" -msgstr "" +msgstr "A böngésző ablak címe, ha semmi sincs kiválasztva" #: libraries/config/messages.inc.php:483 #, fuzzy @@ -4249,11 +4258,11 @@ msgstr "Alapértelmezett tábla fül" #: libraries/config/messages.inc.php:484 msgid "Title of browser window when a server is selected" -msgstr "" +msgstr "A böngésző ablak címe, ha ki van választva egy szerver" #: libraries/config/messages.inc.php:486 msgid "Title of browser window when a table is selected" -msgstr "" +msgstr "A böngésző ablak címe, ha ki van választva egy tábla" #: libraries/config/messages.inc.php:488 msgid "" @@ -4373,14 +4382,14 @@ msgstr "CSV a LOAD DATA használatával" #: libraries/config/user_preferences.forms.php:245 libraries/export/xls.php:17 #: libraries/import/xls.php:20 msgid "Excel 97-2003 XLS Workbook" -msgstr "" +msgstr "Excel 97-2003 XLS Workbook" #: libraries/config/setup.forms.php:252 libraries/config/setup.forms.php:347 #: libraries/config/user_preferences.forms.php:155 #: libraries/config/user_preferences.forms.php:249 #: libraries/export/xlsx.php:17 libraries/import/xlsx.php:20 msgid "Excel 2007 XLSX Workbook" -msgstr "" +msgstr "Excel 2007 XLSX Workbook" #: libraries/config/setup.forms.php:255 libraries/config/setup.forms.php:356 #: libraries/config/user_preferences.forms.php:158 @@ -4392,7 +4401,7 @@ msgstr "Open Document munkafüzet" #: libraries/config/setup.forms.php:262 #: libraries/config/user_preferences.forms.php:165 msgid "Quick" -msgstr "" +msgstr "Quick" #: libraries/config/setup.forms.php:266 #: libraries/config/user_preferences.forms.php:169 @@ -4468,7 +4477,7 @@ msgstr "en" #: libraries/core.lib.php:278 #, php-format msgid "The %s extension is missing. Please check your PHP configuration." -msgstr "" +msgstr "A %s kiterjesztés hiányzik. Kérem ellenőrizze a PHP beállításokat." #: libraries/db_events.inc.php:14 libraries/db_events.inc.php:16 #: libraries/export/sql.php:493 @@ -4489,7 +4498,7 @@ msgstr "Üresnek tűnik az adatbázis!" #: libraries/db_links.inc.php:66 libraries/relation.lib.php:143 #: libraries/tbl_links.inc.php:90 msgid "Tracking" -msgstr "" +msgstr "Követés" #: libraries/db_links.inc.php:71 msgid "Query" @@ -4623,7 +4632,7 @@ msgstr "Exportálás típusa" #: libraries/display_export.lib.php:113 msgid "Quick - display only the minimal options" -msgstr "" +msgstr "Gyors - csak minimális opció megjelenítése" #: libraries/display_export.lib.php:129 #, fuzzy @@ -4661,7 +4670,7 @@ msgstr "Mezők száma" #: libraries/display_export.lib.php:162 msgid "Row to begin at:" -msgstr "" +msgstr "Ettől a sortól kezdve:" #: libraries/display_export.lib.php:173 msgid "Dump all rows" @@ -4669,7 +4678,7 @@ msgstr "" #: libraries/display_export.lib.php:181 libraries/display_export.lib.php:202 msgid "Output:" -msgstr "" +msgstr "Kimenet:" #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214 #, fuzzy, php-format @@ -4691,15 +4700,15 @@ msgstr "Fájlnévsablon" #: libraries/display_export.lib.php:229 msgid "@SERVER@ will become the server name" -msgstr "" +msgstr "@SERVER@ lesz a szerver neve" #: libraries/display_export.lib.php:231 msgid ", @DATABASE@ will become the database name" -msgstr "" +msgstr ", @DATABASE@ lesz az adatbázis neve" #: libraries/display_export.lib.php:233 msgid ", @TABLE@ will become the table name" -msgstr "" +msgstr ", @TABLE@ lesz a tábla neve" #: libraries/display_export.lib.php:237 #, fuzzy, php-format @@ -4718,7 +4727,7 @@ msgstr "" #: libraries/display_export.lib.php:275 msgid "use this for future exports" -msgstr "" +msgstr "használja ezt a későbbi exportálásokhoz" #: libraries/display_export.lib.php:281 libraries/display_import.lib.php:188 #: libraries/display_import.lib.php:201 libraries/sql_query_form.lib.php:517 @@ -9707,7 +9716,7 @@ msgstr "Beszúrás új sorként" #: tbl_change.php:1059 msgid "Insert as new row and ignore errors" -msgstr "" +msgstr "Új sor beillesztése és a hibák figyelmen kívül hagyása" #: tbl_change.php:1060 #, fuzzy @@ -9799,11 +9808,11 @@ msgstr "márc." #: tbl_chart.php:135 msgid "Line" -msgstr "" +msgstr "Vonal" #: tbl_chart.php:136 msgid "Radar" -msgstr "" +msgstr "Radar" #: tbl_chart.php:138 #, fuzzy @@ -9825,11 +9834,11 @@ msgstr "Csomagolt" #: tbl_chart.php:147 msgid "Multi" -msgstr "" +msgstr "Többszörös" #: tbl_chart.php:152 msgid "Continuous image" -msgstr "" +msgstr "Folyamatos kép" #: tbl_chart.php:155 msgid "" @@ -10130,7 +10139,7 @@ msgstr "A különböző értékek tallózása" #: tbl_structure.php:166 tbl_structure.php:167 msgid "Add primary key" -msgstr "" +msgstr "Elsődleges kuly hozzáadása" #: tbl_structure.php:168 tbl_structure.php:169 msgid "Add index" @@ -10142,7 +10151,7 @@ msgstr "Elsődleges kulcs hozzáadása" #: tbl_structure.php:172 tbl_structure.php:173 msgid "Add FULLTEXT index" -msgstr "" +msgstr "FULLTEXT index hozzáadása" #: tbl_structure.php:385 #, fuzzy @@ -10256,7 +10265,7 @@ msgstr "" #: tbl_tracking.php:375 msgid "Tracking statements" -msgstr "" +msgstr "Nyomkövetési utasítások" #: tbl_tracking.php:391 tbl_tracking.php:498 #, php-format @@ -10270,19 +10279,19 @@ msgstr "Adatok" #: tbl_tracking.php:406 msgid "Data definition statement" -msgstr "" +msgstr "Adat definiáló utasítás" #: tbl_tracking.php:457 msgid "Data manipulation statement" -msgstr "" +msgstr "Adat manipuláló utasítás" #: tbl_tracking.php:501 msgid "SQL dump (file download)" -msgstr "" +msgstr "SQL dump (fájl letöltés)" #: tbl_tracking.php:502 msgid "SQL dump" -msgstr "" +msgstr "SQL dump" #: tbl_tracking.php:503 msgid "This option will replace your table and contained data." diff --git a/po/zh_TW.po b/po/zh_TW.po index a17815c..45f07b5 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -1200,7 +1200,7 @@ msgstr "Mon" msgid "" "A newer version of phpMyAdmin is available and you should consider " "upgrading. The newest version is %s, released on %s." -msgstr "" +msgstr "有新的 phpMyAdmin 可用，請考慮升級。最新的版本是 %s，於 %s 發佈。" #. l10n: Latest available phpMyAdmin version #: js/messages.php:119 @@ -1246,7 +1246,7 @@ msgstr "二進制碼" #: js/messages.php:147 msgid "February" -msgstr "" +msgstr "二月" #: js/messages.php:148 #, fuzzy @@ -1284,7 +1284,7 @@ msgstr "Aug" #: js/messages.php:154 msgid "September" -msgstr "" +msgstr "九月" #: js/messages.php:155 #, fuzzy @@ -1294,11 +1294,11 @@ msgstr "Oct" #: js/messages.php:156 msgid "November" -msgstr "" +msgstr "十一月" #: js/messages.php:157 msgid "December" -msgstr "" +msgstr "十二月" #. l10n: Short month name #: js/messages.php:161 libraries/common.lib.php:1569 @@ -1383,11 +1383,11 @@ msgstr "Tue" #: js/messages.php:189 msgid "Wednesday" -msgstr "" +msgstr "星期三" #: js/messages.php:190 msgid "Thursday" -msgstr "" +msgstr "星期四" #: js/messages.php:191 #, fuzzy @@ -1397,7 +1397,7 @@ msgstr "Fri" #: js/messages.php:192 msgid "Saturday" -msgstr "" +msgstr "星期六" #. l10n: Short week day name #: js/messages.php:196 libraries/common.lib.php:1594 @@ -1486,11 +1486,11 @@ msgstr "Sat" #. l10n: Column header for week of the year in calendar #: js/messages.php:226 msgid "Wk" -msgstr "" +msgstr "週" #: js/messages.php:228 msgid "Hour" -msgstr "" +msgstr "時" #: js/messages.php:229 #, fuzzy @@ -1506,37 +1506,37 @@ msgstr "每秒" #: libraries/Config.class.php:1190 tbl_chart.php:159 msgid "Font size" -msgstr "" +msgstr "字體大小" #: libraries/File.class.php:310 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini." -msgstr "" +msgstr "上傳文件的大小超過 php.ini 文件中 upload_max_filesize 的限制。" #: libraries/File.class.php:313 msgid "" "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in " "the HTML form." -msgstr "" +msgstr "上傳文件的大小超過 HTML 表單中指定的 MAX_FILE_SIZE 值。" #: libraries/File.class.php:316 msgid "The uploaded file was only partially uploaded." -msgstr "" +msgstr "僅上傳了文件的部分內容。" #: libraries/File.class.php:319 msgid "Missing a temporary folder." -msgstr "" +msgstr "找不到暫存資料夾。" #: libraries/File.class.php:322 msgid "Failed to write file to disk." -msgstr "" +msgstr "檔案存入磁碟失敗" #: libraries/File.class.php:325 msgid "File upload stopped by extension." -msgstr "" +msgstr "檔案上傳因為擴充功能而停止" #: libraries/File.class.php:328 msgid "Unknown error in file upload." -msgstr "" +msgstr "檔案上傳時發生未知錯誤" #: libraries/File.class.php:559 #, fuzzy @@ -1562,7 +1562,7 @@ msgstr "唯一鍵 UNIQUE" #: libraries/Index.class.php:444 tbl_tracking.php:317 msgid "Packed" -msgstr "" +msgstr "緊湊" #: libraries/Index.class.php:446 tbl_tracking.php:319 msgid "Cardinality" @@ -1595,7 +1595,7 @@ msgstr "索引 %s 已被刪除" msgid "" "The indexes %1$s and %2$s seem to be equal and one of them could possibly be " "removed." -msgstr "" +msgstr "索引 %1$s 和 %2$s 可能是相同的，建議可刪除其中一組" #: libraries/List_Database.class.php:430 libraries/config/messages.inc.php:174 #: libraries/server_links.inc.php:42 server_databases.php:100 @@ -1655,16 +1655,16 @@ msgstr "這 MySQL 版本並不接受 %s 儲存引擎." #: libraries/Table.class.php:1017 msgid "Invalid database" -msgstr "" +msgstr "無效的資料庫" #: libraries/Table.class.php:1031 tbl_get_field.php:25 msgid "Invalid table name" -msgstr "" +msgstr "無效的資料表名" #: libraries/Table.class.php:1046 #, php-format msgid "Error renaming table %1$s to %2$s" -msgstr "" +msgstr "將資料表 %1$s 改名為 %2$s 時發生錯誤" #: libraries/Table.class.php:1129 #, php-format @@ -1747,7 +1747,7 @@ msgstr "phpMyAdmin 說明文件" #: libraries/auth/cookie.auth.lib.php:243 #: libraries/auth/cookie.auth.lib.php:244 msgid "You can enter hostname/IP address and port separated by space." -msgstr "" +msgstr "您可以輸入以空格分隔的主機名/IP位址和Port編號。" #: libraries/auth/cookie.auth.lib.php:243 msgid "Server:" @@ -1773,7 +1773,7 @@ msgstr "Cookies 必須啟動才能登入." #: libraries/auth/signon.auth.lib.php:206 msgid "" "Login without a password is forbidden by configuration (see AllowNoPassword)" -msgstr "" +msgstr "禁止使用空密碼登入 (請參考 [AllowNoPassword] 設定說明)" #: libraries/auth/cookie.auth.lib.php:647 #: libraries/auth/signon.auth.lib.php:210 @@ -1794,24 +1794,24 @@ msgstr "錯誤的使用者名稱或密碼，拒絕存取" #: libraries/auth/swekey/swekey.auth.lib.php:118 #, php-format msgid "File %s does not contain any key id" -msgstr "" +msgstr "檔案 %s 未包含任何密鑰" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "" +msgstr "硬體認證失敗" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" -msgstr "" +msgstr "沒有插入可用的密鑰" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." -msgstr "" +msgstr "認證中..." #: libraries/blobstreaming.lib.php:241 msgid "PBMS error" -msgstr "" +msgstr "PBMS 錯誤" #: libraries/blobstreaming.lib.php:267 #, fuzzy @@ -1821,36 +1821,36 @@ msgstr "MySQL 連線校對" #: libraries/blobstreaming.lib.php:312 msgid "PBMS get BLOB info failed:" -msgstr "" +msgstr "PBMS 擷取 BLOB 資訊失敗：" #: libraries/blobstreaming.lib.php:320 msgid "get BLOB Content-Type failed" -msgstr "" +msgstr "擷取 BLOB 內容型別失敗" #: libraries/blobstreaming.lib.php:347 msgid "View image" -msgstr "" +msgstr "檢視圖片" #: libraries/blobstreaming.lib.php:351 msgid "Play audio" -msgstr "" +msgstr "播放音樂" #: libraries/blobstreaming.lib.php:356 msgid "View video" -msgstr "" +msgstr "檢視影片" #: libraries/blobstreaming.lib.php:360 msgid "Download file" -msgstr "" +msgstr "下載檔案" #: libraries/blobstreaming.lib.php:421 #, php-format msgid "Could not open file: %s" -msgstr "" +msgstr "無法開啟檔案：%s" #: libraries/bookmark.lib.php:83 msgid "shared" -msgstr "" +msgstr "已分享" #: libraries/build_html_for_db.lib.php:25 #: libraries/config/messages.inc.php:180 libraries/export/xml.php:36 @@ -1889,7 +1889,7 @@ msgstr "沒有資料庫" #: libraries/build_html_for_db.lib.php:130 msgid "Not replicated" -msgstr "" +msgstr "未複製" #: libraries/build_html_for_db.lib.php:136 #, fuzzy @@ -1913,7 +1913,7 @@ msgstr "資料列統計數值" #: libraries/chart.lib.php:63 msgid "Query execution time comparison (in microseconds)" -msgstr "" +msgstr "查詢執行時間比對 (單位：微秒)" #: libraries/chart.lib.php:83 #, fuzzy @@ -1923,15 +1923,15 @@ msgstr "查詢結果操作" #: libraries/chart.lib.php:109 msgid "No data found for the chart." -msgstr "" +msgstr "未找到圖表所需資料。" #: libraries/chart.lib.php:249 msgid "GD extension is needed for charts." -msgstr "" +msgstr "繪製圖表需要 GD 元件。" #: libraries/chart.lib.php:252 msgid "JSON encoder is needed for chart tooltips." -msgstr "" +msgstr "繪製圖表提示訊息提示需要 JSON 元件" #: libraries/common.inc.php:576 msgid "" @@ -2030,7 +2030,7 @@ msgstr "MySQL 傳回： " #: libraries/common.lib.php:1098 msgid "Failed to connect to SQL validator!" -msgstr "" +msgstr "連接到 SQL 驗證失敗！" #: libraries/common.lib.php:1139 libraries/config/messages.inc.php:462 msgid "Explain SQL" @@ -2063,7 +2063,7 @@ msgstr "檢查 SQL" #: libraries/common.lib.php:1265 msgid "Inline edit of this query" -msgstr "" +msgstr "在此次查詢中，使用快速編輯" #: libraries/common.lib.php:1267 #, fuzzy @@ -2073,7 +2073,7 @@ msgstr "引擎" #: libraries/common.lib.php:1334 libraries/common.lib.php:1350 msgid "Profiling" -msgstr "" +msgstr "概要" #: libraries/common.lib.php:1355 libraries/tbl_triggers.lib.php:27 #: server_processlist.php:70 @@ -2154,7 +2154,7 @@ msgstr "跳到資料庫 "%s"." #: libraries/common.lib.php:2466 #, php-format msgid "The %s functionality is affected by a known bug, see %s" -msgstr "" +msgstr "%s 功能受到一個已知的缺陷 (bug) 影響，請參考 %s" #: libraries/common.lib.php:2826 libraries/common.lib.php:2833 #: libraries/common.lib.php:3018 libraries/config/setup.forms.php:291 @@ -2191,7 +2191,7 @@ msgstr "管理" #: libraries/common.lib.php:2966 msgid "Browse your computer:" -msgstr "" +msgstr "瀏覽你的電腦：" #: libraries/common.lib.php:2979 #, fuzzy, php-format @@ -2206,15 +2206,15 @@ msgstr "設定之上載目錄錯誤，未能使用" #: libraries/common.lib.php:2999 msgid "There are no files to upload" -msgstr "" +msgstr "沒有可上傳的檔案" #: libraries/config.values.php:45 libraries/config.values.php:50 msgid "Both" -msgstr "" +msgstr "全部" #: libraries/config.values.php:74 msgid "Open" -msgstr "" +msgstr "開啟" #: libraries/config.values.php:74 #, fuzzy @@ -2234,7 +2234,7 @@ msgstr "結構" #: libraries/export/latex.php:41 libraries/export/odt.php:33 #: libraries/export/sql.php:79 libraries/export/texytext.php:23 msgid "data" -msgstr "" +msgstr "資料" #: libraries/config.values.php:97 libraries/export/htmlword.php:24 #: libraries/export/latex.php:41 libraries/export/odt.php:33 @@ -2246,15 +2246,15 @@ msgstr "結構與資料" #: libraries/config.values.php:99 msgid "Quick - display only the minimal options to configure" -msgstr "" +msgstr "快速 - 僅顯示必須的設定項" #: libraries/config.values.php:100 msgid "Custom - display all possible options to configure" -msgstr "" +msgstr "自行定義 - 顯示所有可用的設定項" #: libraries/config.values.php:101 msgid "Custom - like above, but without the quick/custom choice" -msgstr "" +msgstr "自行定義 - 不顯示快速/自定義選擇" #: libraries/config.values.php:119 #, fuzzy @@ -2270,43 +2270,43 @@ msgstr "伸延新增模式" #: libraries/config.values.php:121 msgid "both of the above" -msgstr "" +msgstr "以上兼有" #: libraries/config.values.php:122 msgid "neither of the above" -msgstr "" +msgstr "以上均不" #: libraries/config/FormDisplay.class.php:83 #: libraries/config/validate.lib.php:422 msgid "Not a positive number" -msgstr "" +msgstr "輸入值不是正數" #: libraries/config/FormDisplay.class.php:84 #: libraries/config/validate.lib.php:435 msgid "Not a non-negative number" -msgstr "" +msgstr "輸入值不是非負數" #: libraries/config/FormDisplay.class.php:85 #: libraries/config/validate.lib.php:409 msgid "Not a valid port number" -msgstr "" +msgstr "錯誤的Port編號" #: libraries/config/FormDisplay.class.php:86 #: libraries/config/FormDisplay.class.php:574 #: libraries/config/validate.lib.php:360 libraries/config/validate.lib.php:450 msgid "Incorrect value" -msgstr "" +msgstr "輸入的值不正確" #: libraries/config/FormDisplay.class.php:87 #: libraries/config/validate.lib.php:464 #, php-format msgid "Value must be equal or lower than %s" -msgstr "" +msgstr "輸入的值應小於等於 %s" #: libraries/config/FormDisplay.class.php:538 #, php-format msgid "Missing data for %s" -msgstr "" +msgstr "在 %s 中遺失資料" #: libraries/config/FormDisplay.class.php:736 #: libraries/config/FormDisplay.class.php:740 @@ -2319,21 +2319,21 @@ msgstr "資訊" #: libraries/config/FormDisplay.class.php:741 #, php-format msgid "\"%s\" requires %s extension" -msgstr "" +msgstr "「%s」功能需要 %s 元件" #: libraries/config/FormDisplay.class.php:755 #, php-format msgid "import will not work, missing function (%s)" -msgstr "" +msgstr "缺少函數 (%s)，導入資料功能無效" #: libraries/config/FormDisplay.class.php:759 #, php-format msgid "export will not work, missing function (%s)" -msgstr "" +msgstr "缺少函數 (%s)，導出資料功能無效" #: libraries/config/FormDisplay.class.php:766 msgid "SQL Validator is disabled" -msgstr "" +msgstr "SQL 驗證已停用" #: libraries/config/FormDisplay.class.php:773 #, fuzzy @@ -2344,11 +2344,11 @@ msgstr "找不到連結" #: libraries/config/FormDisplay.class.php:781 #, php-format msgid "maximum %s" -msgstr "" +msgstr "最大 %s" #: libraries/config/FormDisplay.tpl.php:173 msgid "This setting is disabled, it will not be applied to your configuration" -msgstr "" +msgstr "此設定已禁用，無法套用到你的設定中" #: libraries/config/FormDisplay.tpl.php:173 libraries/relation.lib.php:89 #: libraries/relation.lib.php:96 pmd_relation_new.php:68 @@ -2358,16 +2358,16 @@ msgstr "未啟動" #: libraries/config/FormDisplay.tpl.php:248 #, php-format msgid "Set value: %s" -msgstr "" +msgstr "設定值: %s" #: libraries/config/FormDisplay.tpl.php:253 #: libraries/config/messages.inc.php:350 msgid "Restore default value" -msgstr "" +msgstr "還原預設值" #: libraries/config/FormDisplay.tpl.php:269 msgid "Allow users to customize this value" -msgstr "" +msgstr "允許使用者自定資料" #: libraries/config/FormDisplay.tpl.php:333 #: libraries/schema/User_Schema.class.php:470 prefs_manage.php:320 @@ -2377,7 +2377,7 @@ msgstr "重設" #: libraries/config/messages.inc.php:17 msgid "Improves efficiency of screen refresh" -msgstr "" +msgstr "提高更新效率" #: libraries/config/messages.inc.php:18 #, fuzzy @@ -2388,7 +2388,7 @@ msgstr "啟動" #: libraries/config/messages.inc.php:19 msgid "" "If enabled user can enter any MySQL server in login form for cookie auth" -msgstr "" +msgstr "如果啟用，使用者可以在 cookie 認證方式中輸入任意 MySQL 伺服器" #: libraries/config/messages.inc.php:20 #, fuzzy @@ -2401,50 +2401,54 @@ msgid "" "inside a frame, and is a potential [strong]security hole[/strong] allowing " "cross-frame scripting attacks" msgstr "" +"開啟這個功能將允許其它不同網域的網頁透過頁框嵌入使用 phpMyAdmin，這將允許潛在" +"的跨框架腳本攻擊[strong]安全漏洞[/strong]" #: libraries/config/messages.inc.php:22 msgid "Allow third party framing" -msgstr "" +msgstr "允許第三方框架" #: libraries/config/messages.inc.php:23 msgid "Show "Drop database" link to normal users" -msgstr "" +msgstr "顯示 [刪除資料庫] 連結給普通使用者" #: libraries/config/messages.inc.php:24 msgid "" "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] " "authentication" -msgstr "" +msgstr "在cookie認證方式下用於加密 cookies 的加密字串" #: libraries/config/messages.inc.php:25 msgid "Blowfish secret" -msgstr "" +msgstr "加密字串" #: libraries/config/messages.inc.php:26 msgid "Highlight selected rows" -msgstr "" +msgstr "醒目顯示選取的資料行" #: libraries/config/messages.inc.php:27 msgid "Row marker" -msgstr "" +msgstr "標記資料行" #: libraries/config/messages.inc.php:28 msgid "Highlight row pointed by the mouse cursor" -msgstr "" +msgstr "醒目顯示滑鼠指標停留的資料行" #: libraries/config/messages.inc.php:29 msgid "Highlight pointer" -msgstr "" +msgstr "醒目指標" #: libraries/config/messages.inc.php:30 msgid "" "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for " "import and export operations" msgstr "" +"輸入及輸出資料時，開啟[a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] 壓縮功" +"能" #: libraries/config/messages.inc.php:31 msgid "Bzip2" -msgstr "" +msgstr "Bzip2" #: libraries/config/messages.inc.php:32 msgid "" @@ -2452,59 +2456,64 @@ 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] - 可以輸入多" +"行資料" #: libraries/config/messages.inc.php:33 msgid "CHAR columns editing" -msgstr "" +msgstr "編輯CHAR 資料欄位" #: libraries/config/messages.inc.php:34 msgid "Number of columns for CHAR/VARCHAR textareas" -msgstr "" +msgstr "CHAR/VARCHAR欄位輸入區塊的列數" #: libraries/config/messages.inc.php:35 msgid "CHAR textarea columns" -msgstr "" +msgstr "CHAR 欄位輸入區塊" #: libraries/config/messages.inc.php:36 msgid "Number of rows for CHAR/VARCHAR textareas" -msgstr "" +msgstr "CHAR/VARCHAR欄位輸入區塊的行數" #: libraries/config/messages.inc.php:37 msgid "CHAR textarea rows" -msgstr "" +msgstr "CHAR 輸入區塊資料行" #: libraries/config/messages.inc.php:38 msgid "Check config file permissions" -msgstr "" +msgstr "檢查設定檔案文件的權限" #: libraries/config/messages.inc.php:39 msgid "" "Compress gzip/bzip2 exports on the fly without the need for much memory; if " "you encounter problems with created gzip/bzip2 files disable this feature" msgstr "" +"使用較少的記憶體進行gzip/bzip2即時壓縮。如果建立壓縮檔按時發生錯誤，請關閉此" +"選項。" #: libraries/config/messages.inc.php:40 msgid "Compress on the fly" -msgstr "" +msgstr "即時壓縮" #: libraries/config/messages.inc.php:41 setup/frames/config.inc.php:25 #: setup/frames/index.inc.php:153 msgid "Configuration file" -msgstr "" +msgstr "設定檔案" #: libraries/config/messages.inc.php:42 msgid "" "Whether a warning ("Are your really sure...") should be displayed " "when you're about to lose data" -msgstr "" +msgstr "當SQL命令將可能刪除資料時，是否顯示警告訊息：("您真的要...")" #: libraries/config/messages.inc.php:43 msgid "Confirm DROP queries" -msgstr "" +msgstr "警示確認刪除(DROP)命令" #: libraries/config/messages.inc.php:44 msgid "Debug SQL" -msgstr "" +msgstr "SQL指令偵錯" #: libraries/config/messages.inc.php:45 #, fuzzy @@ -2516,14 +2525,16 @@ msgid "" "[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates " "maximum number for which vertical model is used" msgstr "" +"[kbd]horizontal (水平)[/kbd]、[kbd]vertical (垂直)[/kbd] 或限定使用垂直模式的" +"最大數值" #: libraries/config/messages.inc.php:47 msgid "Display direction for altering/creating columns" -msgstr "" +msgstr "修改/新建欄位時的顯示模式" #: libraries/config/messages.inc.php:48 msgid "Tab that is displayed when entering a database" -msgstr "" +msgstr "在進入資料庫頁籤時預設的顯示頁面" #: libraries/config/messages.inc.php:49 #, fuzzy @@ -2532,47 +2543,47 @@ msgstr "更改資料庫名稱到" #: libraries/config/messages.inc.php:50 msgid "Tab that is displayed when entering a server" -msgstr "" +msgstr "在進入伺服器頁籤時預設顯示的頁面" #: libraries/config/messages.inc.php:51 msgid "Default server tab" -msgstr "" +msgstr "預設伺服器頁籤" #: libraries/config/messages.inc.php:52 msgid "Tab that is displayed when entering a table" -msgstr "" +msgstr "在進入資料表頁籤時預設顯示的頁面" #: libraries/config/messages.inc.php:53 msgid "Default table tab" -msgstr "" +msgstr "預設資料表頁籤" #: libraries/config/messages.inc.php:54 msgid "Show binary contents as HEX by default" -msgstr "" +msgstr "預設以十六進位顯示二進位內容" #: libraries/config/messages.inc.php:55 libraries/display_tbl.lib.php:585 msgid "Show binary contents as HEX" -msgstr "" +msgstr "以十六進位顯示二進位內容" #: libraries/config/messages.inc.php:56 msgid "Show database listing as a list instead of a drop down" -msgstr "" +msgstr "直接顯示資料庫列表而不使用下拉選單" #: libraries/config/messages.inc.php:57 msgid "Display databases as a list" -msgstr "" +msgstr "將資料庫用列表方式顯示" #: libraries/config/messages.inc.php:58 msgid "Show server listing as a list instead of a drop down" -msgstr "" +msgstr "直接顯示伺服器列表，而不使用下拉選單" #: libraries/config/messages.inc.php:59 msgid "Display servers as a list" -msgstr "" +msgstr "將伺服器用列表方式顯示" #: libraries/config/messages.inc.php:60 msgid "Edit SQL queries in popup window" -msgstr "" +msgstr "在新的彈出視窗中編輯SQL指令" #: libraries/config/messages.inc.php:61 #, fuzzy @@ -2588,25 +2599,25 @@ msgstr "功能顯示" #: libraries/config/messages.inc.php:63 msgid "Gather errors" -msgstr "" +msgstr "收集錯誤" #: libraries/config/messages.inc.php:64 msgid "Show icons for warning, error and information messages" -msgstr "" +msgstr "在警告、錯誤和訊息上顯示圖示" #: libraries/config/messages.inc.php:65 msgid "Iconic errors" -msgstr "" +msgstr "圖示錯誤" #: libraries/config/messages.inc.php:66 msgid "" "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no " "limit)" -msgstr "" +msgstr "設定指令最長執行時間 (單位：秒，[kbd]0[/kbd] 為不限制)" #: libraries/config/messages.inc.php:67 msgid "Maximum execution time" -msgstr "" +msgstr "最長執行時間" #: libraries/config/messages.inc.php:68 prefs_manage.php:299 msgid "Save as file" @@ -2666,7 +2677,7 @@ msgstr "將 NULL 取代為" #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:82 msgid "Remove CRLF characters within columns" -msgstr "" +msgstr "刪除欄位中的換行符號" #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:242 #: libraries/config/messages.inc.php:250 libraries/import/csv.php:62 @@ -2749,7 +2760,7 @@ msgstr "輸出方式" #: libraries/config/messages.inc.php:112 libraries/config/messages.inc.php:114 msgid "Save on server" -msgstr "" +msgstr "儲存在伺服器上" #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:115 #: libraries/display_export.lib.php:195 libraries/display_export.lib.php:221 @@ -2774,7 +2785,7 @@ msgstr "SQL 兼容模式" #: libraries/config/messages.inc.php:120 msgid "Syntax to use when inserting data" -msgstr "" +msgstr "在插入資料時使用的語法" #: libraries/config/messages.inc.php:121 msgid "Creation/Update/Check dates" @@ -2790,7 +2801,7 @@ msgstr "暫定外來鍵 (Foreign Key) 檢查" #: libraries/config/messages.inc.php:126 msgid "Use hexadecimal for BLOB" -msgstr "" +msgstr "BLOB 資料使用16進位" #: libraries/config/messages.inc.php:128 msgid "Use ignore inserts" @@ -2816,37 +2827,39 @@ msgstr "輸出方式" #: libraries/config/messages.inc.php:145 msgid "Force secured connection while using phpMyAdmin" -msgstr "" +msgstr "強制使用安全連線方式進入 phpMyAdmin" #: libraries/config/messages.inc.php:146 msgid "Force SSL connection" -msgstr "" +msgstr "強制 SSL 連線" #: libraries/config/messages.inc.php:147 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] 為" +"鍵值" #: libraries/config/messages.inc.php:148 msgid "Foreign key dropdown order" -msgstr "" +msgstr "外鍵下拉選單順序" #: libraries/config/messages.inc.php:149 msgid "A dropdown will be used if fewer items are present" -msgstr "" +msgstr "下拉框中選項數量的限制" #: libraries/config/messages.inc.php:150 msgid "Foreign key limit" -msgstr "" +msgstr "外鍵限制" #: libraries/config/messages.inc.php:151 msgid "Browse mode" -msgstr "" +msgstr "瀏覽模式" #: libraries/config/messages.inc.php:152 msgid "Customize browse mode" -msgstr "" +msgstr "自定瀏覽模式" #: libraries/config/messages.inc.php:154 libraries/config/messages.inc.php:156 #: libraries/config/messages.inc.php:173 libraries/config/messages.inc.php:184 @@ -2866,32 +2879,32 @@ msgstr "CSV 資料" #: libraries/config/messages.inc.php:157 msgid "Developer" -msgstr "" +msgstr "開發" #: libraries/config/messages.inc.php:158 msgid "Settings for phpMyAdmin developers" -msgstr "" +msgstr "phpMyAdmin 開發設定" #: libraries/config/messages.inc.php:159 msgid "Edit mode" -msgstr "" +msgstr "編輯模式" #: libraries/config/messages.inc.php:160 msgid "Customize edit mode" -msgstr "" +msgstr "自定編輯模式" #: libraries/config/messages.inc.php:162 msgid "Export defaults" -msgstr "" +msgstr "輸出選項" #: libraries/config/messages.inc.php:163 msgid "Customize default export options" -msgstr "" +msgstr "自定輸出預設值" #: libraries/config/messages.inc.php:164 libraries/config/messages.inc.php:206 #: setup/frames/menu.inc.php:16 msgid "Features" -msgstr "" +msgstr "功能" #: libraries/config/messages.inc.php:165 #, fuzzy @@ -2901,7 +2914,7 @@ msgstr "產生" #: libraries/config/messages.inc.php:166 msgid "Set some commonly used options" -msgstr "" +msgstr "設定某些常用選項" #: libraries/config/messages.inc.php:167 libraries/db_links.inc.php:83 #: libraries/server_links.inc.php:73 libraries/tbl_links.inc.php:82 @@ -2916,15 +2929,15 @@ msgstr "輸入檔案" #: libraries/config/messages.inc.php:169 msgid "Customize default common import options" -msgstr "" +msgstr "自定輸入選項的預設值" #: libraries/config/messages.inc.php:170 msgid "Import / export" -msgstr "" +msgstr "輸入 / 輸出" #: libraries/config/messages.inc.php:171 msgid "Set import and export directories and compression options" -msgstr "" +msgstr "設定輸入和輸出資料夾以及壓縮選項" #: libraries/config/messages.inc.php:172 libraries/export/latex.php:26 msgid "LaTeX" @@ -2937,11 +2950,11 @@ msgstr "資料庫輸出選項" #: libraries/config/messages.inc.php:176 setup/frames/menu.inc.php:18 msgid "Navigation frame" -msgstr "" +msgstr "導覽頁框" #: libraries/config/messages.inc.php:177 msgid "Customize appearance of the navigation frame" -msgstr "" +msgstr "自定導覽頁框" #: libraries/config/messages.inc.php:178 libraries/select_server.lib.php:42 #: setup/frames/index.inc.php:98 @@ -2951,15 +2964,15 @@ msgstr "伺服器" #: libraries/config/messages.inc.php:179 msgid "Servers display options" -msgstr "" +msgstr "伺服器顯示選項" #: libraries/config/messages.inc.php:181 msgid "Tables display options" -msgstr "" +msgstr "資料表顯示選項" #: libraries/config/messages.inc.php:182 setup/frames/menu.inc.php:19 msgid "Main frame" -msgstr "" +msgstr "主頁框" #: libraries/config/messages.inc.php:183 #, fuzzy @@ -2975,11 +2988,11 @@ msgstr "說明文件" #: libraries/config/messages.inc.php:187 msgid "Other core settings" -msgstr "" +msgstr "其他核心設定" #: libraries/config/messages.inc.php:188 msgid "Settings that didn't fit enywhere else" -msgstr "" +msgstr "其他設定" #: libraries/config/messages.inc.php:189 #, fuzzy @@ -2993,6 +3006,8 @@ msgid "" "html#cfg_TitleTable]documentation[/a] for magic strings that can be used to " "get special values." msgstr "" +"設定瀏覽器標題欄所顯示的文字。參見[a(a)Documentation.xn--html#cfg_titletable][/-7e19amz24a" +"a]中關於可以取得特殊值的魔術字串符號。" #: libraries/config/messages.inc.php:191 #: libraries/navigation_header.inc.php:83 @@ -3003,21 +3018,21 @@ msgstr "查詢視窗" #: libraries/config/messages.inc.php:192 msgid "Customize query window options" -msgstr "" +msgstr "自定查詢視窗選項" #: libraries/config/messages.inc.php:193 msgid "Security" -msgstr "" +msgstr "安全" #: libraries/config/messages.inc.php:194 msgid "" "Please note that phpMyAdmin is just a user interface and its features do not " "limit MySQL" -msgstr "" +msgstr "注意：phpMyAdmin 只是一個使用者介面，其設定不會對 MySQL 有任何限制" #: libraries/config/messages.inc.php:195 msgid "Basic settings" -msgstr "" +msgstr "基本設定" #: libraries/config/messages.inc.php:196 #, fuzzy @@ -3032,21 +3047,21 @@ msgstr "複製" #: libraries/config/messages.inc.php:198 msgid "Server configuration" -msgstr "" +msgstr "伺服器設定" #: libraries/config/messages.inc.php:199 msgid "" "Advanced server configuration, do not change these options unless you know " "what they are for" -msgstr "" +msgstr "進階伺服器設定，如果你不知道這些是什麼，請不要修改" #: libraries/config/messages.inc.php:200 msgid "Enter server connection parameters" -msgstr "" +msgstr "伺服器連接參數" #: libraries/config/messages.inc.php:201 msgid "Configuration storage" -msgstr "" +msgstr "儲存設定" #: libraries/config/messages.inc.php:202 msgid "" @@ -3054,16 +3069,18 @@ msgid "" "features, see [a(a)Documentation.html#linked-tables]phpMyAdmin configuration " "storage[/a] in documentation" msgstr "" +"設定 phpMyAdmin 進階功能，參見文件[a(a)Documentation.html#linked-tables]" +"phpMyAdmin 進階功能[/a]" #: libraries/config/messages.inc.php:203 msgid "Changes tracking" -msgstr "" +msgstr "修改追蹤" #: libraries/config/messages.inc.php:204 msgid "" "Tracking of changes made in database. Requires the phpMyAdmin configuration " "storage." -msgstr "" +msgstr "追蹤資料庫的修改。需要開啟 phpMyAdmin 進階功能。" #: libraries/config/messages.inc.php:205 #, fuzzy @@ -3072,15 +3089,15 @@ msgstr "資料庫輸出選項" #: libraries/config/messages.inc.php:207 msgid "Customize import defaults" -msgstr "" +msgstr "自定輸入預設值" #: libraries/config/messages.inc.php:208 msgid "Customize navigation frame" -msgstr "" +msgstr "自定導覽頁框" #: libraries/config/messages.inc.php:209 msgid "Customize main frame" -msgstr "" +msgstr "自定主頁框" #: libraries/config/messages.inc.php:210 libraries/config/messages.inc.php:215 #: setup/frames/menu.inc.php:17 @@ -3095,7 +3112,7 @@ msgstr "SQL 語法" #: libraries/config/messages.inc.php:213 msgid "Customize links shown in SQL Query boxes" -msgstr "" +msgstr "自定顯示在 SQL 語法輸入框中的連結" #: libraries/config/messages.inc.php:216 #, fuzzy @@ -3115,6 +3132,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]" #: libraries/config/messages.inc.php:219 #, fuzzy @@ -3123,7 +3143,7 @@ msgstr "狀態" #: libraries/config/messages.inc.php:220 msgid "Customize startup page" -msgstr "" +msgstr "自定起始頁" #: libraries/config/messages.inc.php:221 #, fuzzy @@ -3132,7 +3152,7 @@ msgstr "資料表" #: libraries/config/messages.inc.php:222 msgid "Choose how you want tabs to work" -msgstr "" +msgstr "選擇你希望頁籤如何運作" #: libraries/config/messages.inc.php:223 #, fuzzy @@ -3147,39 +3167,43 @@ msgstr "資料庫輸出選項" #: libraries/config/messages.inc.php:225 libraries/export/texytext.php:17 msgid "Texy! text" -msgstr "" +msgstr "Texy! 格式文字" #: libraries/config/messages.inc.php:227 msgid "Warnings" -msgstr "" +msgstr "警告" #: libraries/config/messages.inc.php:228 msgid "Disable some of the warnings shown by phpMyAdmin" -msgstr "" +msgstr "關閉 phpMyAdmin 發出的部分警告" #: libraries/config/messages.inc.php:229 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] 壓縮" #: libraries/config/messages.inc.php:230 msgid "GZip" -msgstr "" +msgstr "GZip" #: libraries/config/messages.inc.php:231 msgid "Extra parameters for iconv" -msgstr "" +msgstr "iconv 的額外參數" #: libraries/config/messages.inc.php:232 msgid "" "If enabled, phpMyAdmin continues computing multiple-statement queries even " "if one of the queries failed" msgstr "" +"如果開啟此選項，在執行多語句查詢的時候，即使有一條或多條語句發生錯誤，" +"phpMyAdmin 也會繼續執行其他的語句" #: libraries/config/messages.inc.php:233 msgid "Ignore multiple statement errors" -msgstr "" +msgstr "忽略執行多指令時的語句錯誤" #: libraries/config/messages.inc.php:234 msgid "" @@ -3187,10 +3211,12 @@ msgid "" "This might be good way to import large files, however it can break " "transactions." msgstr "" +"允許開啟指令檢查將可能花費較長的時間。這可能會導致輸入資料中段，但在輸入大量" +"資料時還是一個推薦的方法。" #: libraries/config/messages.inc.php:235 msgid "Partial import: allow interrupt" -msgstr "" +msgstr "部分匯入：允許中斷" #: libraries/config/messages.inc.php:240 libraries/config/messages.inc.php:247 #: libraries/import/csv.php:26 libraries/import/ldi.php:39 hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2065-g78685cc
by Piotr Przybylski 29 May '11

29 May '11

The branch, master has been updated via 78685cc3ae4a5664bb993c1e00f4ac481d02299a (commit) from ae0af9e5c6855c0b5535bfa6d2e27974c2b9f3ae (commit) - Log ----------------------------------------------------------------- commit 78685cc3ae4a5664bb993c1e00f4ac481d02299a Author: Piotr Przybylski <piotrprz(a)gmail.com> Date: Sun May 29 18:22:56 2011 +0200 Disallow text wrapping of status links in pmahomme Removed empty CSS declarations ----------------------------------------------------------------------- Summary of changes: themes/pmahomme/css/theme_right.css.php | 13 +------------ 1 files changed, 1 insertions(+), 12 deletions(-) diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index fc1b36c..5d6c66b 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1193,16 +1193,6 @@ div#serverstatus table tbody td.descr a, div#serverstatus table .tblFooters a { white-space: nowrap; } -div#serverstatus div#statuslinks a:before, -div#serverstatus div#sectionlinks a:before, -div#serverstatus table tbody td.descr a:before, -div#serverstatus table .tblFooters a:before { -} -div#serverstatus div#statuslinks a:after, -div#serverstatus div#sectionlinks a:after, -div#serverstatus table tbody td.descr a:after, -div#serverstatus table .tblFooters a:after { -} /* end serverstatus */ /* querywindow */ @@ -1266,11 +1256,9 @@ div#querywindowcontainer fieldset { border-radius:5px; -webkit-border-radius:5px; -moz-border-radius:5px; - box-shadow:0px 1px 1px #fff inset; -webkit-box-shadow:0px 1px 1px #fff inset; -moz-box-shadow:0px 1px 1px #fff inset; - } #sectionlinks a, #statuslinks a{ font-size:0.88em; @@ -1283,6 +1271,7 @@ div#querywindowcontainer fieldset { color: #111; text-decoration: none; background: #ddd; + white-space: nowrap; border-radius: 20px; -webkit-border-radius: 20px; -moz-border-radius: 20px; hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2064-gae0af9e
by Marc Delisle 28 May '11

28 May '11

The branch, master has been updated via ae0af9e5c6855c0b5535bfa6d2e27974c2b9f3ae (commit) from eeeca229de40bd4599ebc84aa0b219ca174537c5 (commit) - Log ----------------------------------------------------------------- commit ae0af9e5c6855c0b5535bfa6d2e27974c2b9f3ae Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 28 08:29:38 2011 -0400 Remove author name ----------------------------------------------------------------------- Summary of changes: db_datadict.php | 2 +- db_qbe.php | 1 - libraries/common.lib.php | 4 ++-- libraries/export/htmlword.php | 2 +- libraries/export/latex.php | 2 +- libraries/export/odt.php | 2 +- libraries/export/sql.php | 2 +- libraries/export/texytext.php | 2 +- libraries/schema/Pdf_Relation_Schema.class.php | 4 ++-- tbl_printview.php | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/db_datadict.php b/db_datadict.php index e9d18fd..9941ef4 100644 --- a/db_datadict.php +++ b/db_datadict.php @@ -135,7 +135,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) { $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); } - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if (!empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/db_qbe.php b/db_qbe.php index a076798..a5bd7a7 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -686,7 +686,6 @@ if (!empty($qry_select)) { // 2. FROM // Create LEFT JOINS out of Relations -// Code originally by Mike Beck <mike.beck(a)ibmiller.de> // If we can use Relations we could make some left joins. // First find out if relations are available in this database. diff --git a/libraries/common.lib.php b/libraries/common.lib.php index f0d174f..633acb2 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1090,7 +1090,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view $edit_link = 'server_sql.php'; } - // Want to have the query explained (Mike Beck 2002-05-22) + // Want to have the query explained // but only explain a SELECT (that has not been explained) /* SQL-Parser-Analyzer */ $explain_link = ''; @@ -1137,7 +1137,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view $url_qpart = PMA_generate_common_url($url_params); // Also we would like to get the SQL formed in some nice - // php-code (Mike Beck 2002-05-22) + // php-code if (! empty($cfg['SQLQuery']['ShowAsPHP']) && ! $query_too_big) { $php_params = $url_params; diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index f5425bc..d23640a 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -210,7 +210,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $result = PMA_DBI_query($local_query); $fields_cnt = PMA_DBI_num_rows($result); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 5ff1868..2a434ae 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -330,7 +330,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $result = PMA_DBI_query($local_query); $fields_cnt = PMA_DBI_num_rows($result); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if ($do_relation && !empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/libraries/export/odt.php b/libraries/export/odt.php index b70388d..d1324f0 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -265,7 +265,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $result = PMA_DBI_query($local_query); $fields_cnt = PMA_DBI_num_rows($result); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if ($do_relation && !empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/libraries/export/sql.php b/libraries/export/sql.php index acfdf11..19f9873 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -777,7 +777,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim $schema_create = ''; - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if ($do_relation && !empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index 8ed6a74..1895bcf 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -192,7 +192,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $result = PMA_DBI_query($local_query); $fields_cnt = PMA_DBI_num_rows($result); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if ($do_relation && ! empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/libraries/schema/Pdf_Relation_Schema.class.php b/libraries/schema/Pdf_Relation_Schema.class.php index ef60264..39fa62b 100644 --- a/libraries/schema/Pdf_Relation_Schema.class.php +++ b/libraries/schema/Pdf_Relation_Schema.class.php @@ -1064,7 +1064,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema $pdf->SetFontSize(14); $pdf->SetLineWidth(0.2); $pdf->SetDisplayMode('fullpage'); - // Get the name of this pdfpage to use as filename (Mike Beck) + // Get the name of this pdfpage to use as filename $_name_sql = 'SELECT page_descr FROM ' . PMA_backquote($GLOBALS['cfgRelation']['db']) . '.' . PMA_backquote($cfgRelation['pdf_pages']) . ' WHERE page_nr = ' . $pageNumber; $_name_rs = PMA_query_as_controluser($_name_sql); @@ -1189,7 +1189,7 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema */ $result = PMA_DBI_query('SHOW FIELDS FROM ' . PMA_backquote($table) . ';', null, PMA_DBI_QUERY_STORE); $fields_cnt = PMA_DBI_num_rows($result); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations if (!empty($cfgRelation['relation'])) { // Find which tables are related with the current one and write it in // an array diff --git a/tbl_printview.php b/tbl_printview.php index f2b80ab..6bfe3be 100644 --- a/tbl_printview.php +++ b/tbl_printview.php @@ -114,7 +114,7 @@ foreach ($the_tables as $key => $table) { 0, 1); $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($show_create_table)); - // Check if we can use Relations (Mike Beck) + // Check if we can use Relations // Find which tables are related with the current one and write it in // an array $res_rel = PMA_getForeigners($db, $table); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2063-geeeca22
by Marc Delisle 28 May '11

28 May '11

The branch, master has been updated via eeeca229de40bd4599ebc84aa0b219ca174537c5 (commit) from 7d8be177ef55d867c567dec3c78b80af406fae65 (commit) - Log ----------------------------------------------------------------- commit eeeca229de40bd4599ebc84aa0b219ca174537c5 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 28 08:23:56 2011 -0400 Undefined variable when query is too big ----------------------------------------------------------------------- Summary of changes: libraries/common.lib.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 538d8ac..f0d174f 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1094,6 +1094,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view // but only explain a SELECT (that has not been explained) /* SQL-Parser-Analyzer */ $explain_link = ''; + $is_select = false; if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) { $explain_params = $url_params; // Detect if we are validating as well @@ -1101,7 +1102,6 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($GLOBALS['validatequery'])) { $explain_params['validatequery'] = 1; } - $is_select = false; if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) { $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query; $_message = __('Explain SQL'); hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2062-g7d8be17
by Marc Delisle 28 May '11

28 May '11

The branch, master has been updated via 7d8be177ef55d867c567dec3c78b80af406fae65 (commit) from 66e72d9a0cec97ce0f52fd879b2c16e62446f26f (commit) - Log ----------------------------------------------------------------- commit 7d8be177ef55d867c567dec3c78b80af406fae65 Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 28 07:00:37 2011 -0400 ChangeLog for three features from GSoC 2011 ----------------------------------------------------------------------- Summary of changes: ChangeLog | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7457914..915e38c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ + Patch #3256122 [search] Show/hide db search results + Patch #3302354 Add gettext wrappers around a message + Remove deprecated function PMA_DBI_get_fields ++ rfe #2098927 Remember recent tables ++ rfe #3078542 Remember the last sort order for each table ++ AJAX for Create table in navigation panel 3.4.2.0 (not yet released) - bug #3301249 [interface] Iconic table operations does not remove inline edit label hooks/post-receive -- phpMyAdmin

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git May 2011