From 35a3880eaba5871b0be0a4470c32b0c5bfc2bf15 Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Sat, 28 Dec 2013 06:04:05 +0100 Subject: [PATCH 1/4] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 158 +++++++++++++++++++++++++--------------------------- 1 file changed, 76 insertions(+), 82 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index 7e7305a0d2..723feda867 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-12-27 10:54+0200\n" +"PO-Revision-Date: 2013-12-28 06:04+0200\n" "Last-Translator: Chien Wei Lin \n" -"Language-Team: Traditional Chinese \n" +"Language-Team: Traditional Chinese " +"\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,13 +29,13 @@ msgstr "建立資料庫 %1$s 成功。" #: db_datadict.php:52 libraries/operations.lib.php:32 msgid "Database comment: " -msgstr "資料庫說明: " +msgstr "資料庫備註: " #: db_datadict.php:159 libraries/schema/Pdf_Relation_Schema.class.php:1348 #: libraries/tbl_columns_definition_form.lib.php:70 #: libraries/tbl_printview.lib.php:579 msgid "Table comments:" -msgstr "表註釋：" +msgstr "資料表備註:" #: db_datadict.php:168 libraries/Index.class.php:567 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1282 @@ -218,7 +218,7 @@ msgstr "請填寫資料庫名稱！" #: db_operations.php:130 #, php-format msgid "Database %1$s has been renamed to %2$s" -msgstr "資料庫 %1$s 已變更名稱為 %2$s" +msgstr "資料庫 %1$s 已重新命名為 %2$s" #: db_operations.php:136 #, php-format @@ -265,17 +265,17 @@ msgstr "使用中" #: db_printview.php:117 libraries/plugins/export/ExportSql.class.php:1042 #: libraries/schema/Pdf_Relation_Schema.class.php:1353 msgid "Creation:" -msgstr "建立時間：" +msgstr "建立時間:" #: db_printview.php:126 libraries/plugins/export/ExportSql.class.php:1055 #: libraries/schema/Pdf_Relation_Schema.class.php:1358 msgid "Last update:" -msgstr "最後更新：" +msgstr "最後更新:" #: db_printview.php:135 libraries/plugins/export/ExportSql.class.php:1068 #: libraries/schema/Pdf_Relation_Schema.class.php:1363 msgid "Last check:" -msgstr "最後檢查：" +msgstr "最後檢查:" #: db_printview.php:149 libraries/structure.lib.php:176 #, php-format @@ -677,7 +677,7 @@ msgstr "返回" #: index.php:115 libraries/Footer.class.php:70 msgid "phpMyAdmin Demo Server" -msgstr "phpMyAdmin 展示主機" +msgstr "phpMyAdmin 展示伺服器" #: index.php:119 #, php-format @@ -685,9 +685,7 @@ msgid "" "You are using the demo server. You can do anything here, but please do not " "change root, debian-sys-maint and pma users. More information is available " "at %s." -msgstr "" -"您正在使用展示主機。您可以在此做任何事情，但請勿更改 root、debian-sys-maint " -"及 pma 使用者。這兒有更多的資訊 %s。" +msgstr "您正在使用展示主機，您可以在此做任何事情，但請勿更改 root、debian-sys-maint 及 pma 使用者。這兒有更多的資訊 %s。" #: index.php:129 msgid "General Settings" @@ -726,19 +724,19 @@ msgstr "伺服器類別:" #: libraries/plugins/export/ExportSql.class.php:631 #: libraries/plugins/export/ExportXml.class.php:198 msgid "Server version:" -msgstr "伺服器版本：" +msgstr "伺服器版本:" #: index.php:264 msgid "Protocol version:" -msgstr "協定版本：" +msgstr "協定版本:" #: index.php:268 msgid "User:" -msgstr "使用者：" +msgstr "使用者:" #: index.php:273 msgid "Server charset:" -msgstr "伺服器字元集：" +msgstr "伺服器字元集:" #: index.php:287 msgid "Web server" @@ -746,11 +744,11 @@ msgstr "網頁伺服器" #: index.php:303 msgid "Database client version:" -msgstr "資料庫用戶端版本：" +msgstr "資料庫用戶端版本:" #: index.php:307 msgid "PHP extension:" -msgstr "PHP 套件：" +msgstr "PHP 套件:" #: index.php:321 msgid "Show PHP information" @@ -758,7 +756,7 @@ msgstr "顯示 PHP 資訊" #: index.php:344 msgid "Version information:" -msgstr "版本資訊：" +msgstr "版本資訊:" #: index.php:353 libraries/Util.class.php:429 libraries/Util.class.php:496 #: libraries/config/FormDisplay.tpl.php:148 @@ -1289,7 +1287,7 @@ msgstr "差異" #: js/messages.php:156 #, php-format msgid "Divided by %s" -msgstr "使用 %s 切割" +msgstr "使用 %s 區分" #: js/messages.php:157 msgid "Unit" @@ -1436,9 +1434,7 @@ msgid "" "While requesting new chart data the server returned an invalid response. " "This is most likely because your session expired. Reloading the page and " "reentering your credentials should help." -msgstr "" -"在向伺服器取得新的圖表資料時取得無效的回應，可能是您的 SESSION 已經過期。 請" -"重新整理頁面並重新輸入帳號密碼解決此問題。" +msgstr "在向伺服器取得新的圖表資料時取得無效的回應，可能是您的連線階段已經過期。 請重新整理頁面並重新輸入帳號密碼解決此問題。" #: js/messages.php:198 msgid "Reload page" @@ -1695,7 +1691,7 @@ msgstr "查詢執行時間" #: libraries/DisplayResults.class.php:769 #, php-format msgid "%d is not valid row number." -msgstr "%d 不是有效的資料列編號。" +msgstr "%d 不是有效的資料列號。" #: js/messages.php:289 libraries/insert_edit.lib.php:1514 #: libraries/schema/User_Schema.class.php:390 @@ -2353,7 +2349,7 @@ msgstr "條件：" #: libraries/DBQbe.class.php:578 msgid "Add/Delete criteria rows" -msgstr "新增/刪除基準行" +msgstr "新增/刪除基準列" #: libraries/DBQbe.class.php:578 msgid "Add/Delete columns" @@ -2666,7 +2662,7 @@ msgstr "查詢中" msgid "" "This view has at least this number of rows. Please refer to %sdocumentation" "%s." -msgstr "這個檢視至少需包含這個數目的資料，請參考%sdocumentation%s。" +msgstr "這個檢視表至少需有此數量的資料列，請參考%sdocumentation%s。" #: libraries/DisplayResults.class.php:4926 #, php-format @@ -3049,19 +3045,19 @@ msgstr "錯誤" #, php-format msgid "%1$d row affected." msgid_plural "%1$d rows affected." -msgstr[0] "影響了 %1$d 行。" +msgstr[0] "影響了 %1$d 列。" #: libraries/Message.class.php:273 #, php-format msgid "%1$d row deleted." msgid_plural "%1$d rows deleted." -msgstr[0] "刪除了 %1$d 行。" +msgstr[0] "刪除了 %1$d 列。" #: libraries/Message.class.php:292 #, php-format msgid "%1$d row inserted." msgid_plural "%1$d rows inserted." -msgstr[0] "新增了 %1$d 行。" +msgstr[0] "新增了 %1$d 列。" #: libraries/PDF.class.php:70 libraries/Util.class.php:2475 #: libraries/browse_foreigners.lib.php:393 @@ -3244,7 +3240,7 @@ msgstr "將表 %1$s 改名爲 %2$s 時發生錯誤" #: libraries/Table.class.php:1325 #, php-format msgid "Table %1$s has been renamed to %2$s." -msgstr "已將資料表 %1$s 改名爲 %2$s。" +msgstr "資料表 %1$s 已重新命名為 %2$s。" #: libraries/Table.class.php:1471 msgid "Could not save table UI preferences" @@ -4241,7 +4237,7 @@ msgstr "使用 config 認證方式時 config 認證方式的帳號不能爲空" #: libraries/config/Validator.class.php:301 msgid "Empty signon session name while using signon authentication method" -msgstr "使用 singon 認證方式時 Signon 連線名不能爲空" +msgstr "選擇使用 Signon 認證方式時 Signon 連線階段名稱必須填寫" #: libraries/config/Validator.class.php:310 msgid "Empty signon URL while using signon authentication method" @@ -5131,7 +5127,7 @@ msgstr "第一行資料為欄位名稱" #: libraries/config/messages.inc.php:263 #: libraries/plugins/import/ImportOds.class.php:83 msgid "Do not import empty rows" -msgstr "不匯入空行" +msgstr "不匯入空資料列" #: libraries/config/messages.inc.php:264 msgid "Import currencies ($5.00 to 5.00)" @@ -6032,7 +6028,7 @@ msgstr "伺服器名稱" #: libraries/config/messages.inc.php:465 msgid "Whether a user should be displayed a "show all (rows)" button" -msgstr "是否顯示 顯示全部資料列 的按鈕" +msgstr "是否顯示 "顯示全部資料列" 的按鈕" #: libraries/config/messages.inc.php:466 msgid "Allow to display all the rows" @@ -6587,7 +6583,7 @@ msgstr "轉換編碼:" #: libraries/display_export.lib.php:311 libraries/sql.lib.php:437 msgid "Rows:" -msgstr "記錄:" +msgstr "資料列數:" #: libraries/display_export.lib.php:319 msgid "Dump some row(s)" @@ -6748,15 +6744,14 @@ msgid "" "to the PHP timeout limit. (This might be a good way to import large " "files, however it can break transactions.)" msgstr "" -"允許中斷匯入的動作，當偵測到執行時間已接近 PHP 執行時間的限制時。(若要匯入" -"大型檔案這是很好的方法之一，不過使用這種方法會破壞指令中的交易(Trnsaction)動" -"作。)" +"允許中斷匯入的動作，當偵測到執行時間已接近 PHP " +"執行時間的限制時。(若要匯入大型檔案這是很好的方法之一，不過使用這種方法會破壞指令中的交易(Transaction)動作。)" #: libraries/display_import.lib.php:303 msgid "" "Skip this number of queries (for SQL) or lines (for other formats), starting " "from the first one:" -msgstr "" +msgstr "跳過此數量的查詢(SQL)或者行數(其他格式)，由第一行開始:" #: libraries/display_import.lib.php:342 msgid "Format-Specific Options:" @@ -7149,7 +7144,7 @@ msgstr "下次自動回傳錯誤報告" #: libraries/rte/rte_routines.lib.php:1466 libraries/sql.lib.php:1641 #: tbl_get_field.php:43 msgid "MySQL returned an empty result set (i.e. zero rows)." -msgstr "MySQL 回傳的查詢結果為空 (即零行)。" +msgstr "MySQL 回傳空的查詢結果 (即零資料列)。" #: libraries/import.lib.php:1197 msgid "" @@ -7676,7 +7671,7 @@ msgstr "新增" #: libraries/operations.lib.php:75 msgid "Rename database to:" -msgstr "將資料庫改名為：" +msgstr "重新命名資料庫為：" #: libraries/operations.lib.php:107 #, php-format @@ -9245,7 +9240,7 @@ msgstr "執行預存程序 %s 的結果" #, php-format msgid "%d row affected by the last statement inside the procedure" msgid_plural "%d rows affected by the last statement inside the procedure" -msgstr[0] "程序中最後一個語句影響了 %d 行" +msgstr[0] "程序中最後指令影響了 %d 列" #: libraries/rte/rte_routines.lib.php:1528 #: libraries/rte/rte_routines.lib.php:1536 @@ -11566,7 +11561,7 @@ msgstr "長條圖" #: libraries/tbl_chart.lib.php:41 msgctxt "Chart type" msgid "Column" -msgstr "欄位" +msgstr "直行圖" #: libraries/tbl_chart.lib.php:45 msgctxt "Chart type" @@ -11619,7 +11614,7 @@ msgstr "Y 軸標籤:" #: libraries/tbl_chart.lib.php:206 msgid "Start row:" -msgstr "開始列：" +msgstr "起始列號:" #: libraries/tbl_chart.lib.php:272 msgid "Chart title" @@ -11627,15 +11622,15 @@ msgstr "圖表標題" #: libraries/tbl_columns_definition_form.lib.php:72 msgid "Storage Engine:" -msgstr "儲存引擎：" +msgstr "儲存引擎:" #: libraries/tbl_columns_definition_form.lib.php:76 msgid "Collation:" -msgstr "排序規則：" +msgstr "編碼與排序:" #: libraries/tbl_columns_definition_form.lib.php:110 msgid "PARTITION definition:" -msgstr "分區定義：" +msgstr "PARTITION 定義:" #: libraries/tbl_columns_definition_form.lib.php:160 msgid "Table name" @@ -11648,15 +11643,14 @@ msgid "" "single quote (\"'\") amongst those values, precede it with a backslash (for " "example '\\\\xyz' or 'a\\'b')." msgstr "" -"如果欄位類型為 \"enum\" 或 \"set\"，請使用以下格式輸入值: 'a','b','c'…
" -"如果您需要輸入反斜線(\"\\\")或單引號(\"'\")，請在前面加上反斜線(如 '\\\\xyz' " -"or 'a\\'b')。" +"如果欄位類型為 \"enum\" 或 \"set\"，請使用以下格式輸入值: 'a','b','c'…
如果您需要輸入反斜線(\"\\\")或單引號(\"'\")，請在前面加上反斜線(如 '\\\\xyz' 或 'a\\'b')。" #: libraries/tbl_columns_definition_form.lib.php:291 msgid "" "For default values, please enter just a single value, without backslash " "escaping or quotes, using this format: a" -msgstr "欄位預設值，請輸入一個值，不可加反斜線或引號，如: a" +msgstr "欄位預設值，請輸入單一值，不可加反斜線或引號，如: a" #: libraries/tbl_columns_definition_form.lib.php:310 msgid "Move column" @@ -11725,7 +11719,7 @@ msgstr "-- 無 --" #: libraries/tbl_gis_visualization.lib.php:269 msgid "Display GIS Visualization" -msgstr "顯示可視化地理訊息" +msgstr "顯示視覺化地理資訊(GIS)" #: libraries/tbl_gis_visualization.lib.php:287 msgid "Redraw" @@ -11742,11 +11736,11 @@ msgstr "下載" #: libraries/tbl_indexes.lib.php:114 msgid "The name of the primary key must be \"PRIMARY\"!" -msgstr "主鍵的名稱必須稱爲 \"PRIMARY\"！" +msgstr "主鍵的名稱必須稱爲 \"PRIMARY\"!" #: libraries/tbl_indexes.lib.php:124 msgid "Can't rename index to PRIMARY!" -msgstr "無法將索引改爲主鍵 (PRIMARY) ！" +msgstr "無法將索引更改爲主鍵(PRIMARY)!" #: libraries/tbl_indexes.lib.php:140 msgid "No index parts defined!" @@ -11771,19 +11765,19 @@ msgstr "索引類型:" #: libraries/tbl_printview.lib.php:30 msgid "Showing tables:" -msgstr "顯示資料表：" +msgstr "顯示資料表:" #: libraries/tbl_printview.lib.php:174 msgid "Row Statistics:" -msgstr "行統計：" +msgstr "列數統計:" #: libraries/tbl_printview.lib.php:301 msgid "Space usage:" -msgstr "已用空間：" +msgstr "空間用量:" #: libraries/tbl_relation.lib.php:386 msgid "Choose column to display:" -msgstr "選擇要顯示的欄位：" +msgstr "選擇要顯示的欄位:" #: libraries/tbl_relation.lib.php:419 msgid "Internal relation" @@ -11793,29 +11787,29 @@ msgstr "內部關聯" msgid "" "An internal relation is not necessary when a corresponding FOREIGN KEY " "relation exists." -msgstr "當對應的 FOREIGN KEY 存在時，則不需要內部的關聯。" +msgstr "當外鍵(FOREIGN KEY)關連存在時就不需要使用內部關聯。" #: libraries/tbl_relation.lib.php:433 msgid "Foreign key constraint" -msgstr "外鍵與限制(Constraint)" +msgstr "外鍵限制式" #: libraries/tbl_relation.lib.php:553 msgid "Constraint name" -msgstr "限制名稱" +msgstr "限制式名稱" #: libraries/tbl_relation.lib.php:584 msgid "No index defined! Create one below" -msgstr "尚未定義索引，請於下方建立一個索引" +msgstr "尚未定義索引，請於下方建立" #: libraries/tbl_relation.lib.php:998 #, php-format msgid "Error creating foreign key on %1$s (check data types)" -msgstr "在 %1$s 建立外鍵時發生錯誤 (檢查資料類型)" +msgstr "建立外鍵 %1$s 時發生錯誤 (檢查資料類型)" #: libraries/tbl_tracking.lib.php:60 #, php-format msgid "Create version %1$s of %2$s" -msgstr "爲 %2$s 建立版本 %1$s" +msgstr "建立 %2$s 的追蹤版本 %1$s" #: libraries/tbl_tracking.lib.php:67 msgid "Track these data definition statements:" @@ -11858,7 +11852,7 @@ msgstr "追蹤指令" #: libraries/tbl_tracking.lib.php:389 libraries/tbl_tracking.lib.php:439 #, php-format msgid "Show %1$s with dates from %2$s to %3$s by user %4$s %5$s" -msgstr "顯示自 %2$s 起至 %3$s 使用者 %4$s 執行的 %1$s %5$s" +msgstr "顯示自 %2$s 起至 %3$s 由使用者 %4$s 執行的 %1$s %5$s" #: libraries/tbl_tracking.lib.php:397 msgid "Delete tracking data row from report" @@ -11904,7 +11898,7 @@ msgstr "資料定義指令" #: libraries/tbl_tracking.lib.php:698 #, php-format msgid "Version %s snapshot (SQL code)" -msgstr "版本 %s 的快照 (SQL 程式碼)" +msgstr "版本 %s 的結構快照 (SQL 程式碼)" #: libraries/tbl_tracking.lib.php:917 msgid "Tracking data definition successfully deleted" @@ -11927,26 +11921,26 @@ msgstr "如果您不需要，請註解以下兩行。" #: libraries/tbl_tracking.lib.php:981 msgid "SQL statements exported. Please copy the dump or execute it." -msgstr "SQL 指令已匯出，您可以複製或者執行。" +msgstr "已匯出 SQL 指令，您可以複製內容或者直接執行。" #: libraries/tbl_tracking.lib.php:1009 msgid "SQL statements executed." -msgstr "SQL 指令已執行。" +msgstr "已執行 SQL 指令。" #: libraries/tbl_tracking.lib.php:1027 #, php-format msgid "Tracking report for table `%s`" -msgstr "`%s` 的追蹤報告" +msgstr "資料表 `%s` 的追蹤報告" #: libraries/tbl_tracking.lib.php:1055 #, php-format msgid "Tracking for %1$s was activated at version %2$s." -msgstr "在版本 %2$s 已啟用 %1$s 的追。" +msgstr "已啟用 %1$s 版本 %2$s 的追蹤。" #: libraries/tbl_tracking.lib.php:1077 #, php-format msgid "Tracking for %1$s was deactivated at version %2$s." -msgstr "在版本 %2$s 已停用 %1$s 的追蹤。" +msgstr "已停用 %1$s 版本 %2$s 的追蹤。" #: libraries/tbl_tracking.lib.php:1149 #, php-format @@ -11959,7 +11953,7 @@ msgstr "管理您的設定" #: libraries/user_preferences.inc.php:46 prefs_manage.php:298 msgid "Configuration has been saved" -msgstr "設定已儲存" +msgstr "已儲存設定" #: libraries/user_preferences.inc.php:66 #, php-format @@ -11977,20 +11971,20 @@ msgstr "無法儲存設定" msgid "" "Your browser has phpMyAdmin configuration for this domain. Would you like to " "import it for current session?" -msgstr "您的瀏覽器中有目前域的 phpMyAdmin 設定。是否匯入到目前連線中？" +msgstr "您的瀏覽器中有此網域的 phpMyAdmin 設定，是否匯入到目前的連線階段?" #: libraries/zip_extension.lib.php:29 msgid "No files found inside ZIP archive!" -msgstr "ZIP 包中未找到檔案！" +msgstr "ZIP 壓縮檔中查無任何檔案!" #: libraries/zip_extension.lib.php:59 libraries/zip_extension.lib.php:62 #: libraries/zip_extension.lib.php:82 msgid "Error in ZIP archive:" -msgstr "ZIP 包中有錯誤:" +msgstr "ZIP 壓縮檔錯誤:" #: navigation.php:20 msgid "Fatal error: The navigation can only be accessed via AJAX" -msgstr "錯誤: 只能經由 AJAX 使用導覽" +msgstr "嚴重錯誤: 導覽頁只能使用 AJAX 存取" #: pmd_display_field.php:60 pmd_save_pos.php:87 msgid "Modifications have been saved" @@ -12002,7 +11996,7 @@ msgstr "顯示/隱藏左側選單" #: pmd_general.php:72 msgid "View in fullscreen" -msgstr "在全螢幕檢視" +msgstr "全螢幕檢視" #: pmd_general.php:76 msgid "Exit fullscreen" @@ -12070,7 +12064,7 @@ msgstr "隱藏/顯示沒有關聯的表" #: pmd_general.php:204 msgid "Number of tables:" -msgstr "資料表數量：" +msgstr "資料表數:" #: pmd_general.php:453 msgid "Delete relation" @@ -12662,7 +12656,7 @@ msgstr "檢視表名稱" #: view_operations.php:96 msgid "Rename view to" -msgstr "將檢視表更名為" +msgstr "重新命名檢視表為" #: view_operations.php:133 msgid "Delete the view (DROP)" @@ -13150,11 +13144,11 @@ msgstr "平均臨時表: %s，此值應每小時小於 1。" #: libraries/advisory_rules.txt:225 msgid "Sort rows" -msgstr "排序筆數" +msgstr "資料列排序" #: libraries/advisory_rules.txt:228 msgid "There are lots of rows being sorted." -msgstr "有大量的資料被排序。" +msgstr "有大量的資料列被排序。" #: libraries/advisory_rules.txt:229 msgid "" @@ -13169,7 +13163,7 @@ msgstr "" #: libraries/advisory_rules.txt:230 #, php-format msgid "Sorted rows average: %s" -msgstr "平均排序筆數: %s" +msgstr "平均排序列數: %s" #: libraries/advisory_rules.txt:233 msgid "Rate of joins without indexes" From a70e700a6bbc81ca7c3a01da4879be58503ee85a Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 28 Dec 2013 23:22:41 +0530 Subject: [PATCH 2/4] Few safeguards if cache history not available/expired Signed-off-by: Atul Pratap Singh --- js/ajax.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/ajax.js b/js/ajax.js index 18f3edf70d..5ff0a6857f 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -544,7 +544,11 @@ AJAX.cache = { * @return void */ navigate: function (index) { - if (typeof this.pages[index] === 'undefined') { + if (typeof this.pages[index] === 'undefined' + || typeof this.pages[index].content === 'undefined' + || typeof this.pages[index].menu === 'undefined' + || ! AJAX.cache.menus.get(this.pages[index].menu) + ) { PMA_ajaxShowMessage( '
' + PMA_messages.strInvalidPage + '
', false @@ -557,7 +561,7 @@ AJAX.cache = { $('#selflink').html(record.selflink); AJAX.cache.menus.replace(AJAX.cache.menus.get(record.menu)); PMA_commonParams.setAll(record.params); - AJAX.scriptHandler.load(record.scripts, record.params.token); + AJAX.scriptHandler.load(record.scripts, record.params ? record.params.token : PMA_commonParams.get('token')); AJAX.cache.current = ++index; }); } From f370b425f4ee9cbb742f4055fd1dd68ed972d8ab Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 29 Dec 2013 00:45:17 +0530 Subject: [PATCH 3/4] Fix bug#4203 on refreshing designer, FullScreen is undefined Signed-off-by: Atul Pratap Singh --- js/pmd/iecanvas.js | 2 +- pmd_general.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/pmd/iecanvas.js b/js/pmd/iecanvas.js index e2b8e81d06..bc68ec659c 100644 --- a/js/pmd/iecanvas.js +++ b/js/pmd/iecanvas.js @@ -7,7 +7,7 @@ /** * */ -if (!window.all) { // if IE +if (document.all) { // if IE document.attachEvent( "onreadystatechange", // document load function () { diff --git a/pmd_general.php b/pmd_general.php index 29c24836e6..ad66cfc015 100644 --- a/pmd_general.php +++ b/pmd_general.php @@ -30,12 +30,12 @@ $response->getFooter()->setMinimal(); $header = $response->getHeader(); $header->setBodyId('pmd_body'); $scripts = $header->getScripts(); +$scripts->addFile('jquery/jquery.fullscreen.js'); $scripts->addFile('pmd/ajax.js'); $scripts->addFile('pmd/history.js'); $scripts->addFile('pmd/move.js'); $scripts->addFile('pmd/iecanvas.js', true); $scripts->addFile('pmd/init.js'); -$scripts->addFile('jquery/jquery.fullscreen.js'); require 'libraries/db_common.inc.php'; require 'libraries/db_info.inc.php'; From 7974d7d8942004bfe2fbb52132e60a07cf707307 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sun, 29 Dec 2013 00:47:31 +0530 Subject: [PATCH 4/4] Changelog for bug#4202 and #4203 Signed-off-by: Atul Pratap Singh --- ChangeLog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2c30631ce2..c6ab5e03e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ phpMyAdmin - ChangeLog - bug #4201 Exports are not compressed - bug #4131 Import: "number of rows to skip" is ambiguous - bug #4205 Add a user shows additional "edit user group" link +- bug #4202 Cannot read property 'token' of undefined +- bug #4203 On refreshing designer, $.FullScreen is undefined 4.1.2.0 (2013-12-23) - bug #4178 Quick edit for BIT type does not work