- Git - lists.phpmyadmin.net

[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 29 May '11

29 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

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

28 May '11

The branch, master has been updated via 66e72d9a0cec97ce0f52fd879b2c16e62446f26f (commit) via e4ba1dc06605fd81718d1991ad509d8e47f159fc (commit) via 42800318aa89a5fa189bbbd2475041b30f2a4f7f (commit) via a55873c9871bfb05bac8a3f42b6c30e23c88677d (commit) via 889a047fbc90d7dde5b3099fe0acc7cecabbe6b2 (commit) via e98446c6c9f1098e7ffc147426dcb4bea0ac5b87 (commit) via cc7eade6a5d4b17b67b0ec22ff5df0876d906d56 (commit) via b7a4d0736c44fde5ea79f23ab9c7f29102d9a28b (commit) via 20f2e2011d9d732b3144f88c9ed894c0374fafc0 (commit) via 96a253bfccfbb48102d83998282537a759956842 (commit) via c1cd10a14ff54d8d3d321b27c1a95a8fb7f410da (commit) via 07de5495c424bb1aa888d897ac02f4a201a979d5 (commit) via 81f95377787abe9ffbc901ad07adb24f4e9110e0 (commit) via 5bb9808ae272617e51c4c6043159b30911c23b7e (commit) via be32b88ec0d30e79d5e523aa5d425d0187963a92 (commit) via 8f99ac7a286f5dc043d4e62d533e600fb864c665 (commit) from ecc81cc23884fd2797bc19a2a1f36beea772ff68 (commit) - Log ----------------------------------------------------------------- commit 66e72d9a0cec97ce0f52fd879b2c16e62446f26f Merge: ecc81cc23884fd2797bc19a2a1f36beea772ff68 e4ba1dc06605fd81718d1991ad509d8e47f159fc Author: Marc Delisle <marc(a)infomarc.info> Date: Sat May 28 06:46:27 2011 -0400 Merge commit 'e4ba1dc06605fd81718d1991ad509d8e47f159fc' commit e4ba1dc06605fd81718d1991ad509d8e47f159fc Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Fri May 27 18:52:00 2011 +0700 Add table pma_ui_prefs for remembering table sorting persistently commit 42800318aa89a5fa189bbbd2475041b30f2a4f7f Merge: a55873c9871bfb05bac8a3f42b6c30e23c88677d 434d233e5b710dc6d3ac82b6825cf726aac22cb3 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Fri May 27 08:29:17 2011 +0700 Merge remote-tracking branch 'origin/master' into browsemode commit a55873c9871bfb05bac8a3f42b6c30e23c88677d Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 20:01:16 2011 +0700 Recent tables: Additional fix for frame_navigation.PMA_reloadRecentTable() not found commit 889a047fbc90d7dde5b3099fe0acc7cecabbe6b2 Merge: e98446c6c9f1098e7ffc147426dcb4bea0ac5b87 6c938c0f7339b7c7263e0b0e7e055254827b0b1b Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 19:58:17 2011 +0700 Merge remote-tracking branch 'origin/master' into browsemode commit e98446c6c9f1098e7ffc147426dcb4bea0ac5b87 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 09:08:18 2011 +0700 Recent tables: Fix for frame_navigation reference not found commit cc7eade6a5d4b17b67b0ec22ff5df0876d906d56 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Wed May 25 09:01:07 2011 +0700 Remember table sorting: Fix for table_ref error commit b7a4d0736c44fde5ea79f23ab9c7f29102d9a28b Merge: 20f2e2011d9d732b3144f88c9ed894c0374fafc0 8f2a040f41f2cd03e359bcadeb8d9f24c23290fa Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 19:35:08 2011 +0700 Merge remote-tracking branch 'origin/master' into browsemode commit 20f2e2011d9d732b3144f88c9ed894c0374fafc0 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 16:57:01 2011 +0700 Change default value for RememberSorting to true, for testing in the demo server commit 96a253bfccfbb48102d83998282537a759956842 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 16:51:30 2011 +0700 Remove debugging message commit c1cd10a14ff54d8d3d321b27c1a95a8fb7f410da Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 16:41:51 2011 +0700 Only remember sorting in Browse tab, modify the so SQL pretty printer works commit 07de5495c424bb1aa888d897ac02f4a201a979d5 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 15:11:39 2011 +0700 RememberSorting: add some checking before retrieving/remembering sorting commit 81f95377787abe9ffbc901ad07adb24f4e9110e0 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 14:50:47 2011 +0700 Add new configuration field for RememberSorting commit 5bb9808ae272617e51c4c6043159b30911c23b7e Merge: be32b88ec0d30e79d5e523aa5d425d0187963a92 4b3780760ce251cdcb351ba51a5374f1529951ad Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 14:21:16 2011 +0700 Merge remote-tracking branch 'origin/master' into browsemode commit be32b88ec0d30e79d5e523aa5d425d0187963a92 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 13:49:00 2011 +0700 Remember table sorting in session variable commit 8f99ac7a286f5dc043d4e62d533e600fb864c665 Merge: ab6d16ed2f4728c9f066353a851621a352ef969f e6026f6fafb40081bb8014dd25c8102c8d97a746 Author: Aris Feryanto <aris_feryanto(a)yahoo.com> Date: Tue May 24 08:42:32 2011 +0700 Merge remote-tracking branch 'origin/master' into browsemode ----------------------------------------------------------------------- Summary of changes: Documentation.html | 22 ++++ config.sample.inc.php | 1 + libraries/Table.class.php | 146 +++++++++++++++++++++++++++ libraries/config.default.php | 14 +++ libraries/config/messages.inc.php | 4 + libraries/config/setup.forms.php | 4 +- libraries/config/user_preferences.forms.php | 3 +- libraries/relation.lib.php | 19 +++- scripts/create_tables.sql | 15 +++ sql.php | 25 +++++ 10 files changed, 248 insertions(+), 5 deletions(-) diff --git a/Documentation.html b/Documentation.html index 3bbb832..2ff0881 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1077,6 +1077,25 @@ ALTER TABLE `pma_column_comments` </ul> </dd> + <dt id="table_uiprefs"> + <span id="cfg_Servers_table_uiprefs">$cfg['Servers'][$i]['table_uiprefs']</span> string + </dt> + <dd> + Since release 3.5.0 phpMyAdmin can be configured to remember several things + (table sorting + <a href="#cfg_RememberSorting" class="configrule">$cfg['RememberSorting']</a> + , etc.) for browsing tables. + Without configuring the storage, these features still can be used, + but the values will disappear after you logout.<br/><br/> + + To allow the usage of these functionality persistently: + + <ul> + <li>set up <a href="#pmadb">pmadb</a> and the phpMyAdmin configuration storage</li> + <li>put the table name in <tt>$cfg['Servers'][$i]['table_uiprefs']</tt> (e.g. 'pma_table_uiprefs')</li> + </ul> + </dd> + <dt id="tracking"> <span id="cfg_Servers_tracking">$cfg['Servers'][$i]['tracking']</span> string </dt> @@ -1934,6 +1953,9 @@ $cfg['TrustedProxies'] = each row on a vertical lineup. </dd> + <dt id="cfg_RememberSorting">$cfg['RememberSorting'] boolean</dt> + <dd>If enabled, when browsing tables, the sorting of each table is remembered.</dd> + <dt id="cfg_HeaderFlipType">$cfg['HeaderFlipType'] string</dt> <dd> The HeaderFlipType can be set to 'auto', 'css' or 'fake'. When using diff --git a/config.sample.inc.php b/config.sample.inc.php index 95d3a1a..edffd03 100644 --- a/config.sample.inc.php +++ b/config.sample.inc.php @@ -53,6 +53,7 @@ $cfg['Servers'][$i]['AllowNoPassword'] = false; // $cfg['Servers'][$i]['column_info'] = 'pma_column_info'; // $cfg['Servers'][$i]['history'] = 'pma_history'; // $cfg['Servers'][$i]['recent'] = 'pma_recent'; +// $cfg['Servers'][$i]['table_uiprefs'] = 'pma_table_uiprefs'; // $cfg['Servers'][$i]['tracking'] = 'pma_tracking'; // $cfg['Servers'][$i]['designer_coords'] = 'pma_designer_coords'; // $cfg['Servers'][$i]['userconfig'] = 'pma_userconfig'; diff --git a/libraries/Table.class.php b/libraries/Table.class.php index d41eadc..c73eb31 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -11,6 +11,10 @@ */ class PMA_Table { + /** + * UI preferences property: sorted column + */ + const PROP_SORTED_COLUMN = 'sorted_col'; static $cache = array(); @@ -40,6 +44,11 @@ class PMA_Table var $settings = array(); /** + * @var array UI preferences + */ + var $uiprefs; + + /** * @var array errors occured */ var $errors = array(); @@ -1185,5 +1194,142 @@ class PMA_Table return $return; } + + /** + * Return UI preferences for this table from phpMyAdmin database. + * + * @uses PMA_query_as_controluser() + * @uses PMA_DBI_fetch_array() + * @uses json_decode() + * + * @return array + */ + protected function getUiPrefsFromDb() + { + $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".". + PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']); + + // Read from phpMyAdmin database + $sql_query = + " SELECT `prefs` FROM " . $pma_table . + " WHERE `username` = '" . $GLOBALS['cfg']['Server']['user'] . "'" . + " AND `db_name` = '" . $this->db_name . "'" . + " AND `table_name` = '" . $this->name . "'"; + + $row = PMA_DBI_fetch_array(PMA_query_as_controluser($sql_query)); + if (isset($row[0])) { + return json_decode($row[0], true); + } else { + return array(); + } + } + + /** + * Save this table's UI preferences into phpMyAdmin database. + * + * @uses PMA_DBI_try_query() + * @uses json_decode() + * @uses PMA_Message + * + * @return true|PMA_Message + */ + protected function saveUiPrefsToDb() + { + $pma_table = PMA_backquote($GLOBALS['cfg']['Server']['pmadb']) .".". + PMA_backquote($GLOBALS['cfg']['Server']['table_uiprefs']); + + $username = $GLOBALS['cfg']['Server']['user']; + $sql_query = + " REPLACE INTO " . $pma_table . + " VALUES ('" . $username . "', '" . $this->db_name . "', '" . + $this->name . "', '" . PMA_sqlAddslashes(json_encode($this->uiprefs)) . "')"; + + $success = PMA_DBI_try_query($sql_query, $GLOBALS['controllink']); + + if (!$success) { + $message = PMA_Message::error(__('Could not save table UI preferences')); + $message->addMessage('<br /><br />'); + $message->addMessage(PMA_Message::rawError(PMA_DBI_getError($GLOBALS['controllink']))); + return $message; + } + return true; + } + + /** + * Loads the UI preferences for this table. + * If pmadb and table_uiprefs is set, it will load the UI preferences from + * phpMyAdmin database. + * + * @uses getUiPrefsFromDb() + */ + protected function loadUiPrefs() + { + // set session variable if it's still undefined + if (! isset($_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name])) { + $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name] = + // check whether we can get from pmadb + (strlen($GLOBALS['cfg']['Server']['pmadb']) + && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) ? + $this->getUiPrefsFromDb() : array(); + } + $this->uiprefs =& $_SESSION['tmp_user_values']['table_uiprefs'][$this->db_name][$this->name]; + } + + /** + * Get UI preferences array for this table. + * If pmadb and table_uiprefs is set, it will get the UI preferences from + * phpMyAdmin database. + * + * @return array + */ + public function getUiPrefs() + { + if (! isset($this->uiprefs)) { + $this->loadUiPrefs(); + } + return $this->uiprefs; + } + + /** + * Get a property from UI preferences. + * Return false if the property is not found. + * Available property: + * - PROP_SORTED_COLUMN + * + * @uses loadUiPrefs() + * + * @param string $property + * @return mixed + */ + public function getUiProp($property) + { + if (! isset($this->uiprefs)) { + $this->loadUiPrefs(); + } + return isset($this->uiprefs[$property]) ? $this->uiprefs[$property] : false; + } + + /** + * Set a property from UI preferences. + * If pmadb and table_uiprefs is set, it will save the UI preferences to + * phpMyAdmin database. + * + * @param string $property + * @param mixed $value + * @return true|PMA_Message + */ + public function setUiProp($property, $value) + { + if (! isset($this->uiprefs)) { + $this->loadUiPrefs(); + } + $this->uiprefs[$property] = $value; + // check if pmadb is set + if (strlen($GLOBALS['cfg']['Server']['pmadb']) + && strlen($GLOBALS['cfg']['Server']['table_uiprefs'])) { + return $this->saveUiprefsToDb(); + } + return true; + } } ?> diff --git a/libraries/config.default.php b/libraries/config.default.php index 5c0b1b2..aa883d2 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -346,6 +346,13 @@ $cfg['Servers'][$i]['designer_coords'] = ''; $cfg['Servers'][$i]['recent'] = ''; /** + * table to store UI preferences for tables + * - leave blank for no "persistent" UI preferences + * SUGGESTED: 'pma_table_uiprefs' + */ +$cfg['Servers'][$i]['table_uiprefs'] = ''; + +/** * table to store SQL tracking * - leave blank for no SQL tracking * SUGGESTED: 'pma_tracking' @@ -2265,6 +2272,13 @@ $cfg['ModifyDeleteAtRight'] = false; $cfg['DefaultDisplay'] = 'horizontal'; /** + * remember the last way a table sorted + * + * @global string $cfg['RememberSorting'] + */ +$cfg['RememberSorting'] = true; + +/** * default display direction for altering/creating columns (tbl_properties) * (horizontal|vertical|<number>) * number indicates maximum number for which vertical model is used diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index e8ce0df..034214c 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -346,6 +346,8 @@ $strConfigQueryWindowWidth_desc = __('Query window width (in pixels)'); $strConfigQueryWindowWidth_name = __('Query window width'); $strConfigRecodingEngine_desc = __('Select which functions will be used for character set conversion'); $strConfigRecodingEngine_name = __('Recoding engine'); +$strConfigRememberSorting_desc = __('When browsing tables, the sorting of each table is remembered'); +$strConfigRememberSorting_name = __('Remember table\'s sorting'); $strConfigRepeatCells_desc = __('Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature'); $strConfigRepeatCells_name = __('Repeat headers'); $strConfigReplaceHelpImg_desc = __('Show help button instead of Documentation text'); @@ -420,6 +422,8 @@ $strConfigServers_table_coords_desc = __('Leave blank for no PDF schema support, $strConfigServers_table_coords_name = __('PDF schema: table coordinates'); $strConfigServers_table_info_desc = __('Table to describe the display columns, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'); $strConfigServers_table_info_name = __('Display columns table'); +$strConfigServers_table_uiprefs_desc = __('Leave blank for no "persistent" tables\'UI preferences across sessions, suggested: [kbd]pma_table_uiprefs[/kbd]'); +$strConfigServers_table_uiprefs_name = __('UI preferences table'); $strConfigServers_tracking_add_drop_database_desc = __('Whether a DROP DATABASE IF EXISTS statement will be added as first line to the log when creating a database.'); $strConfigServers_tracking_add_drop_database_name = __('Add DROP DATABASE'); $strConfigServers_tracking_add_drop_table_desc = __('Whether a DROP TABLE IF EXISTS statement will be added as first line to the log when creating a table.'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 7269823..5cf5111 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -74,6 +74,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array( 'column_info' => 'pma_column_info', 'history' => 'pma_history', 'recent' => 'pma_recent', + 'table_uiprefs' => 'pma_table_uiprefs', 'tracking' => 'pma_tracking', 'table_coords' => 'pma_table_coords', 'pdf_pages' => 'pma_pdf_pages', @@ -200,7 +201,8 @@ $forms['Main_frame']['Browse'] = array( 'LimitChars', 'ModifyDeleteAtLeft', 'ModifyDeleteAtRight', - 'DefaultDisplay'); + 'DefaultDisplay', + 'RememberSorting'); $forms['Main_frame']['Edit'] = array( 'ProtectBinary', 'ShowFunctionFields', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index ffe0366..68619c9 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -111,7 +111,8 @@ $forms['Main_frame']['Browse'] = array( 'LimitChars', 'ModifyDeleteAtLeft', 'ModifyDeleteAtRight', - 'DefaultDisplay'); + 'DefaultDisplay', + 'RememberSorting'); $forms['Main_frame']['Edit'] = array( 'ProtectBinary', 'ShowFunctionFields', diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 87521a9..20ddf97 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -142,6 +142,10 @@ function PMA_printRelationsParamDiagnostic($cfgRelation) PMA_printDiagMessageForFeature(__('Persistent recently used tables'), 'recentwork', $messages); + PMA_printDiagMessageForParameter('table_uiprefs', isset($cfgRelation['table_uiprefs']), $messages, 'table_uiprefs'); + + PMA_printDiagMessageForFeature(__('Persistent tables\' UI preferences'), 'uiprefswork', $messages); + PMA_printDiagMessageForParameter('tracking', isset($cfgRelation['tracking']), $messages, 'tracking'); PMA_printDiagMessageForFeature(__('Tracking'), 'trackingwork', $messages); @@ -225,6 +229,7 @@ function PMA__getRelationsParam() $cfgRelation['mimework'] = false; $cfgRelation['historywork'] = false; $cfgRelation['recentwork'] = false; + $cfgRelation['uiprefswork'] = false; $cfgRelation['trackingwork'] = false; $cfgRelation['designerwork'] = false; $cfgRelation['userconfigwork'] = false; @@ -278,6 +283,8 @@ function PMA__getRelationsParam() $cfgRelation['history'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['recent']) { $cfgRelation['recent'] = $curr_table[0]; + } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['table_uiprefs']) { + $cfgRelation['table_uiprefs'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['tracking']) { $cfgRelation['tracking'] = $curr_table[0]; } elseif ($curr_table[0] == $GLOBALS['cfg']['Server']['userconfig']) { @@ -292,9 +299,11 @@ function PMA__getRelationsParam() $cfgRelation['displaywork'] = true; } } + if (isset($cfgRelation['table_coords']) && isset($cfgRelation['pdf_pages'])) { $cfgRelation['pdfwork'] = true; } + if (isset($cfgRelation['column_info'])) { $cfgRelation['commwork'] = true; @@ -336,6 +345,10 @@ function PMA__getRelationsParam() $cfgRelation['recentwork'] = true; } + if (isset($cfgRelation['table_uiprefs'])) { + $cfgRelation['uiprefswork'] = true; + } + if (isset($cfgRelation['tracking'])) { $cfgRelation['trackingwork'] = true; } @@ -357,9 +370,9 @@ function PMA__getRelationsParam() if ($cfgRelation['relwork'] && $cfgRelation['displaywork'] && $cfgRelation['pdfwork'] && $cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfgRelation['historywork'] - && $cfgRelation['recentwork'] && $cfgRelation['trackingwork'] - && $cfgRelation['userconfigwork'] && $cfgRelation['bookmarkwork'] - && $cfgRelation['designerwork']) { + && $cfgRelation['recentwork'] && $cfgRelation['uiprefswork'] + && $cfgRelation['trackingwork'] && $cfgRelation['userconfigwork'] + && $cfgRelation['bookmarkwork'] && $cfgRelation['designerwork']) { $cfgRelation['allworks'] = true; } diff --git a/scripts/create_tables.sql b/scripts/create_tables.sql index 2d6cb56..a537462 100644 --- a/scripts/create_tables.sql +++ b/scripts/create_tables.sql @@ -117,6 +117,21 @@ CREATE TABLE IF NOT EXISTS `pma_recent` ( -- -------------------------------------------------------- +-- +-- Table structure for table `pma_table_uiprefs` +-- + +CREATE TABLE IF NOT EXISTS `pma_table_uiprefs` ( + `username` varchar(64) COLLATE utf8_bin NOT NULL, + `db_name` varchar(64) COLLATE utf8_bin NOT NULL, + `table_name` varchar(64) COLLATE utf8_bin NOT NULL, + `prefs` blob NOT NULL, + PRIMARY KEY (`username`,`db_name`,`table_name`) +) ENGINE=MyISAM COMMENT='tables'' UI preferences' + DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + +-- -------------------------------------------------------- + -- -- Table structure for table `pma_relation` -- diff --git a/sql.php b/sql.php index d07022b..1053a9d 100644 --- a/sql.php +++ b/sql.php @@ -356,6 +356,31 @@ if ($is_select) { // see line 141 $is_maint = true; } +// Handle remembered sorting order, only for single table query +if ($GLOBALS['cfg']['RememberSorting'] + && basename($GLOBALS['PMA_PHP_SELF']) == 'sql.php' + && ! ($is_count || $is_export || $is_func || $is_analyse) + && isset($analyzed_sql[0]['queryflags']['select_from']) + && count($analyzed_sql[0]['table_ref']) == 1 + ) { + $pmatable = new PMA_Table($table, $db); + if (empty($analyzed_sql[0]['order_by_clause'])) { + $sorted_col = $pmatable->getUiProp(PMA_Table::PROP_SORTED_COLUMN); + if ($sorted_col) { + // retrieve the remembered sorting order for current table + $sql_order_to_append = ' ORDER BY ' . $sorted_col . ' '; + $sql_query = $analyzed_sql[0]['section_before_limit'] . $sql_order_to_append . $analyzed_sql[0]['section_after_limit']; + + // update the $analyzed_sql + $analyzed_sql[0]['section_before_limit'] .= $sql_order_to_append; + $analyzed_sql[0]['order_by_clause'] = $sorted_col; + } + } else { + // store the remembered table into session + $pmatable->setUiProp(PMA_Table::PROP_SORTED_COLUMN, $analyzed_sql[0]['order_by_clause']); + } +} + // Do append a "LIMIT" clause? if ((! $cfg['ShowAll'] || $_SESSION['tmp_user_values']['max_rows'] != 'all') && ! ($is_count || $is_export || $is_func || $is_analyse) hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_1RC1-44-gf0fcf7e
by Marc Delisle 27 May '11

27 May '11

The branch, QA_3_4 has been updated via f0fcf7e11f0804ad2a951645aa05bf570f2bf884 (commit) from 72bc4b654339a3ad69416b33ce1e1e6d2696674a (commit) - Log ----------------------------------------------------------------- commit f0fcf7e11f0804ad2a951645aa05bf570f2bf884 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 27 16:13:48 2011 -0400 Revert "- add vim modeline" This reverts commit 4a4d312edba630029909a4cd194a768035b53380. Was not necessary for 3.4 and produces merge conflicts ----------------------------------------------------------------------- Summary of changes: js/config.js | 71 ++++++++++++++++++++++++++++----------------------------- 1 files changed, 35 insertions(+), 36 deletions(-) diff --git a/js/config.js b/js/config.js index 5b0abfc..7f55503 100644 --- a/js/config.js +++ b/js/config.js @@ -1,4 +1,3 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ /** * Functions used in configuration forms and on user preferences pages */ @@ -15,9 +14,9 @@ var PMA_messages = {}; * @param {Element} field */ function getFieldType(field) { - field = $(field); + field = $(field); var tagName = field.attr('tagName'); - if (tagName == 'INPUT') { + if (tagName == 'INPUT') { return field.attr('type'); } else if (tagName == 'SELECT') { return 'select'; @@ -41,7 +40,7 @@ function getFieldType(field) { * @param {String|Boolean} [value] */ function setFieldValue(field, field_type, value) { - field = $(field); + field = $(field); switch (field_type) { case 'text': field.attr('value', (value != undefined ? value : field.attr('defaultValue'))); @@ -51,14 +50,14 @@ function setFieldValue(field, field_type, value) { break; case 'select': var options = field.attr('options'); - var i, imax = options.length; + var i, imax = options.length; if (value == undefined) { for (i = 0; i < imax; i++) { - options[i].selected = options[i].defaultSelected; + options[i].selected = options[i].defaultSelected; } } else { for (i = 0; i < imax; i++) { - options[i].selected = (value.indexOf(options[i].value) != -1); + options[i].selected = (value.indexOf(options[i].value) != -1); } } break; @@ -79,14 +78,14 @@ function setFieldValue(field, field_type, value) { * @type Boolean|String|String[] */ function getFieldValue(field, field_type) { - field = $(field); + field = $(field); switch (field_type) { case 'text': return field.attr('value'); case 'checkbox': return field.attr('checked'); case 'select': - var options = field.attr('options'); + var options = field.attr('options'); var i, imax = options.length, items = []; for (i = 0; i < imax; i++) { if (options[i].selected) { @@ -355,7 +354,7 @@ function displayErrors(error_list) { * @param {Object} errors */ function validate_fieldset(fieldset, isKeyUp, errors) { - fieldset = $(fieldset); + fieldset = $(fieldset); if (fieldset.length && typeof validators._fieldset[fieldset.attr('id')] != 'undefined') { var fieldset_errors = validators._fieldset[fieldset.attr('id')].apply(fieldset[0], [isKeyUp]); for (var field_id in fieldset_errors) { @@ -378,8 +377,8 @@ function validate_fieldset(fieldset, isKeyUp, errors) { * @param {Object} errors */ function validate_field(field, isKeyUp, errors) { - field = $(field); - var field_id = field.attr('id'); + field = $(field); + var field_id = field.attr('id'); errors[field_id] = []; var functions = getFieldValidators(field_id, isKeyUp); for (var i = 0; i < functions.length; i++) { @@ -390,7 +389,7 @@ function validate_field(field, isKeyUp, errors) { var result = functions[i][0].apply(field[0], args); if (result !== true) { if (typeof result == 'string') { - result = [result]; + result = [result]; } $.merge(errors[field_id], result); } @@ -404,7 +403,7 @@ function validate_field(field, isKeyUp, errors) { * @param {boolean} isKeyUp */ function validate_field_and_fieldset(field, isKeyUp) { - field = $(field); + field = $(field); var errors = {}; validate_field(field, isKeyUp, errors); validate_fieldset(field.closest('fieldset'), isKeyUp, errors); @@ -417,7 +416,7 @@ function validate_field_and_fieldset(field, isKeyUp) { * @param {Element} field */ function markField(field) { - field = $(field); + field = $(field); var type = getFieldType(field); var isDefault = checkFieldDefault(field, type); @@ -440,7 +439,7 @@ function setRestoreDefaultBtn(field, display) { $(function() { // register validators and mark custom values - var elements = $('input[id], select[id], textarea[id]'); + var elements = $('input[id], select[id], textarea[id]'); $('input[id], select[id], textarea[id]').each(function(){ markField(this); var el = $(this); @@ -451,35 +450,35 @@ $(function() { var tagName = el.attr('tagName'); // text fields can be validated after each change if (tagName == 'INPUT' && el.attr('type') == 'text') { - el.keyup(function() { + el.keyup(function() { validate_field_and_fieldset(el, true); markField(el); }); } // disable textarea spellcheck if (tagName == 'TEXTAREA') { - el.attr('spellcheck', false); + el.attr('spellcheck', false); } }); - // check whether we've refreshed a page and browser remembered modified - // form values - var check_page_refresh = $('#check_page_refresh'); - if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { - // run all field validators - var errors = {}; - for (var i = 0; i < elements.length; i++) { - validate_field(elements[i], false, errors); - } - // run all fieldset validators - $('fieldset').each(function(){ - validate_fieldset(this, false, errors); - }); - - displayErrors(errors); - } else if (check_page_refresh) { - check_page_refresh.val('1'); - } + // check whether we've refreshed a page and browser remembered modified + // form values + var check_page_refresh = $('#check_page_refresh'); + if (check_page_refresh.length == 0 || check_page_refresh.val() == '1') { + // run all field validators + var errors = {}; + for (var i = 0; i < elements.length; i++) { + validate_field(elements[i], false, errors); + } + // run all fieldset validators + $('fieldset').each(function(){ + validate_fieldset(this, false, errors); + }); + + displayErrors(errors); + } else if (check_page_refresh) { + check_page_refresh.val('1'); + } }); // hooks/post-receive -- phpMyAdmin

1 0

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_1RC1-2045-gecc81cc
by Marc Delisle 27 May '11

27 May '11

The branch, master has been updated via ecc81cc23884fd2797bc19a2a1f36beea772ff68 (commit) from 0b5f4410cd653b2ce132e5f7537e03949cef59f9 (commit) - Log ----------------------------------------------------------------- commit ecc81cc23884fd2797bc19a2a1f36beea772ff68 Author: Marc Delisle <marc(a)infomarc.info> Date: Fri May 27 16:00:40 2011 -0400 bug #3308476 [interface] "Show all" not persistent after a sort ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3935ec6..7457914 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ - [auth] Fixed error handling for signon auth method. - bug #3276001 [core] Avoid caching of index.php. - bug #3306958 [interface] Unnecessary Details slider +- bug #3308476 [interface] "Show all" not persistent after a sort 3.4.1.0 (2011-05-20) - bug #3301108 [interface] Synchronize and already configured host diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 036536c..3fc2f77 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -445,6 +445,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ global $sql_query, $num_rows; global $vertical_display, $highlight_columns; + // required to generate sort links that will remember whether the + // "Show all" button has been clicked + $sql_md5 = md5($GLOBALS['sql_query']); + $session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows']; + if ($analyzed_sql == '') { $analyzed_sql = array(); } @@ -820,9 +825,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ $sorted_sql_query = $unsorted_sql_query . $sort_order; } $_url_params = array( - 'db' => $db, - 'table' => $table, - 'sql_query' => $sorted_sql_query, + 'db' => $db, + 'table' => $table, + 'sql_query' => $sorted_sql_query, + 'session_max_rows' => $session_max_rows ); $order_url = 'sql.php' . PMA_generate_common_url($_url_params); hooks/post-receive -- phpMyAdmin

1 0