From 21271bd727879ec71ab04f3b5be40c07a4b3df0b Mon Sep 17 00:00:00 2001 From: a1a1a1 a1a1a1a Date: Mon, 23 Dec 2013 17:06:50 +0100 Subject: [PATCH 1/3] Translated using Weblate (English (United Kingdom)) Currently translated at 98.4% (2707 of 2749) --- po/en_GB.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 2f82793e86..3a3570dbd4 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-19 06:30-0500\n" -"PO-Revision-Date: 2013-12-03 20:33+0200\n" -"Last-Translator: Gabriela Solis \n" -"Language-Team: English (United Kingdom) \n" +"PO-Revision-Date: 2013-12-23 17:06+0200\n" +"Last-Translator: a1a1a1 a1a1a1a \n" +"Language-Team: English (United Kingdom) " +"\n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8528,7 +8528,7 @@ msgid "" "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" "both of the above
      Example: INSERT INTO " -"tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" +"tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:387 msgid "" From 0dea19e3e18efab4a8d1b5d695600377fa9c0b5d Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Wed, 25 Dec 2013 09:32:43 +0100 Subject: [PATCH 2/3] Translated using Weblate (Traditional Chinese) Currently translated at 100.0% (2749 of 2749) --- po/zh_TW.po | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index d9856f5385..e340d88afd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.2-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-19 06:30-0500\n" -"PO-Revision-Date: 2013-11-29 15:23+0200\n" +"PO-Revision-Date: 2013-12-25 09:32+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" @@ -1982,7 +1982,7 @@ msgstr "顯示報告詳細資訊" #: js/messages.php:417 msgid "" "Your export is incomplete, due to a low execution time limit at the PHP level" -msgstr "" +msgstr "因 PHP 執行期時間限制太短，您的資料未完成匯出" #. l10n: Display text for calendar close link #: js/messages.php:438 @@ -8921,50 +8921,43 @@ msgid "Generate Password:" msgstr "產生密碼：" #: libraries/replication_gui.lib.php:908 -#, fuzzy #| msgid "Replication status" msgid "Replication started successfully." -msgstr "備援狀態" +msgstr "備援啟動成功。" #: libraries/replication_gui.lib.php:909 -#, fuzzy #| msgid "Master replication" msgid "Error starting replication." -msgstr "主要(Master)備援伺服器" +msgstr "啟動備援錯誤。" #: libraries/replication_gui.lib.php:913 -#, fuzzy #| msgid "Chart generated successfully." msgid "Replication stopped successfully." -msgstr "圖表產生成功" +msgstr "備援停止成功。" #: libraries/replication_gui.lib.php:914 -#, fuzzy #| msgid "Master replication" msgid "Error stopping replication." -msgstr "主要(Master)備援伺服器" +msgstr "備援停止錯誤。" #: libraries/replication_gui.lib.php:918 -#, fuzzy #| msgid "Replication status" msgid "Replication resetting successfully." -msgstr "備援狀態" +msgstr "備援重設成功。" #: libraries/replication_gui.lib.php:919 -#, fuzzy #| msgid "Master replication" msgid "Error resetting replication." -msgstr "主要(Master)備援伺服器" +msgstr "重設備援錯誤。" #: libraries/replication_gui.lib.php:923 msgid "Success." -msgstr "" +msgstr "成功。" #: libraries/replication_gui.lib.php:924 -#, fuzzy #| msgid "Error" msgid "Error." -msgstr "錯誤" +msgstr "錯誤。" #: libraries/replication_gui.lib.php:966 msgid "Unknown error" From e3791244b5b46e2ed972feecdef06c68e1647b67 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 25 Dec 2013 18:44:13 +0530 Subject: [PATCH 3/3] bug #4198 Hovering over pie chart gives fatal JS error Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + js/chart.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e36d50557e..80a8031b64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog 4.1.3.0 (not yet released) - bug #3938 PDFDefaultPageSize doc and easy configurability +- bug #4198 Hovering over pie chart gives fatal JS error 4.1.2.0 (2013-12-23) - bug #4178 Quick edit for BIT type does not work diff --git a/js/chart.js b/js/chart.js index dcd08cc2ae..fb0d9af584 100644 --- a/js/chart.js +++ b/js/chart.js @@ -520,7 +520,12 @@ JQPlotPieChart.prototype = new JQPlotChart(); JQPlotPieChart.prototype.constructor = JQPlotPieChart; JQPlotPieChart.prototype.populateOptions = function (dataTable, options) { - var optional = {}; + var optional = { + highlighter: { + formatString:'%s, %d', + useAxesFormatters: false + } + }; var compulsory = { seriesDefaults : { renderer : $.jqplot.PieRenderer