From 6f9b505b1ae59148447b077cb791668cb42cb492 Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Mon, 13 Feb 2017 13:58:56 +0000 Subject: [PATCH 1/2] Translated using Weblate (Korean) Currently translated at 80.9% (2588 of 3199 strings) [CI skip] --- po/ko.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/po/ko.po b/po/ko.po index 3c18869737..19b47ba273 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-01-25 10:08+0100\n" -"PO-Revision-Date: 2017-01-07 15:53+0000\n" -"Last-Translator: Kyeong Su Shin \n" -"Language-Team: Korean \n" +"PO-Revision-Date: 2017-02-13 13:58+0000\n" +"Last-Translator: Yungu Kim \n" +"Language-Team: Korean " +"\n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.11-dev\n" +"X-Generator: Weblate 2.12-dev\n" #: changelog.php:39 license.php:34 #, php-format @@ -2546,7 +2546,7 @@ msgstr "테이블에 접두사를 추가하여 복제" #: js/messages.php:732 msgid "Extremely weak" -msgstr "" +msgstr "매우 취약" #: js/messages.php:733 msgid "Very weak" @@ -2554,7 +2554,7 @@ msgstr "" #: js/messages.php:734 msgid "Weak" -msgstr "" +msgstr "취약" #: js/messages.php:735 msgid "Good" @@ -3879,7 +3879,7 @@ msgstr "언어" #: libraries/Linter.php:99 msgid "" "Linting is disabled for this query because it exceeds the maximum length." -msgstr "이 쿼리가 최대길이를 초과하여 Linting을 사용할 수 없습니다." +msgstr "쿼리 문자열의 길이가 최대치를 초과하여서 Linting을 사용할 수 없습니다." #: libraries/Linter.php:165 #, php-format From dda0d8b69d8d0316ddee81460802c3798e1861a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 15:06:13 +0100 Subject: [PATCH 2/2] Load server stats queries scripts in order MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can not load first script which uses later one. Fixes #12934 Signed-off-by: Michal Čihař --- ChangeLog | 1 + server_status_queries.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 73087d2f72..48edcb14a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ phpMyAdmin - ChangeLog - issue #12985 Fixed rendering of foreign key browsing - issue #12957 Fixed manipulation with GIS data having zero coordinates - issue #12804 Fixed various designer javascript errors +- issue #12934 Fixed possible javascript error on server status page 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/server_status_queries.php b/server_status_queries.php index 8e85be87c6..77014b05a0 100644 --- a/server_status_queries.php +++ b/server_status_queries.php @@ -22,7 +22,6 @@ $serverStatusData = new ServerStatusData(); $response = Response::getInstance(); $header = $response->getHeader(); $scripts = $header->getScripts(); -$scripts->addFile('server_status_queries.js'); // for charting $scripts->addFile('chart.js'); @@ -31,6 +30,7 @@ $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js'); $scripts->addFile('jqplot/plugins/jqplot.highlighter.js'); $scripts->addFile('jquery/jquery.tablesorter.js'); $scripts->addFile('server_status_sorter.js'); +$scripts->addFile('server_status_queries.js'); // Add the html content to the response $response->addHTML('
');