From 96b40611db914f2e4f09fa1b94059ee49fb245fc Mon Sep 17 00:00:00 2001 From: SDSkyKlouD Date: Sat, 15 Oct 2016 07:34:00 +0000 Subject: [PATCH 1/4] Translated using Weblate (Korean) Currently translated at 78.9% (2530 of 3206 strings) [CI skip] --- po/ko.po | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/po/ko.po b/po/ko.po index c77422dfa7..03e7cf4bd4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-10-14 13:28+0000\n" +"PO-Revision-Date: 2016-10-15 07:33+0000\n" "Last-Translator: SDSkyKlouD \n" "Language-Team: Korean " "\n" @@ -1637,15 +1637,12 @@ msgid "Test" msgstr "테스트" #: js/messages.php:345 -#, fuzzy msgid "Formatting SQL…" -msgstr "SQL을 정렬하고 있습니다." +msgstr "SQL을 정렬하고 있습니다…" #: js/messages.php:346 -#, fuzzy -#| msgid "Bad parameters!" msgid "No parameters found!" -msgstr "잘못된 인자!" +msgstr "파라미터를 찾을 수 없습니다!" #: js/messages.php:350 #: templates/database/designer/aggregate_query_panel.phtml:63 @@ -2510,16 +2507,12 @@ msgid "Copy tables to" msgstr "테이블을 복사합니다" #: js/messages.php:712 -#, fuzzy -#| msgid "Add table prefix:" msgid "Add table prefix" -msgstr "테이블 접두사 추가:" +msgstr "테이블 접두사 추가" #: js/messages.php:713 -#, fuzzy -#| msgid "Replace table prefix" msgid "Replace table with prefix" -msgstr "테이블의 접두사를 교체" +msgstr "접두사로 테이블 교체" #: js/messages.php:714 templates/database/structure/check_all_tables.phtml:29 msgid "Copy table with prefix" @@ -3150,10 +3143,8 @@ msgid "Switch to dark theme" msgstr "어두운 테마로 변경" #: libraries/DatabaseInterface.php:1528 -#, fuzzy -#| msgid "Failed to read configuration file!" msgid "Failed to set configured collation connection!" -msgstr "설정 파일을 읽는데 실패했습니다!" +msgstr "정렬 방식 연결을 구성하는데 실패했습니다!" #: libraries/DatabaseInterface.php:2139 msgid "" @@ -3444,10 +3435,8 @@ msgid "Relational key" msgstr "관계키" #: libraries/DisplayResults.php:1742 -#, fuzzy -#| msgid "Displaying Column Comments" msgid "Display column for relations" -msgstr "열(칼럼) 설명(코멘트) 출력하기" +msgstr "관계에 대해 칼럼 표시" #: libraries/DisplayResults.php:1755 msgid "Show binary contents" @@ -3769,9 +3758,9 @@ msgid "" msgstr "" #: libraries/Linter.php:165 -#, fuzzy, php-format +#, php-format msgid "%1$s (near %2$s)" -msgstr "%1$s (%2$s 근처에)" +msgstr "%1$s (%2$s 근처)" #: libraries/Menu.php:201 libraries/ServerStatusData.php:424 #: libraries/config/messages.inc.php:923 @@ -16328,10 +16317,9 @@ msgid "Opened files rate: %s, this value should be less than 5 per hour" msgstr "열린 파일 비율: %s, 이 값은 시간당 5 미만이어야 합니다" #: libraries/advisory_rules.txt:330 -#, fuzzy, php-format -#| msgid "Create table on database %s" +#, php-format msgid "Immediate table locks %%" -msgstr "데이터베이스 %s에 새로운 테이블을 만듭니다." +msgstr "즉시 잠겨진 테이블 비율 %%" #: libraries/advisory_rules.txt:333 libraries/advisory_rules.txt:340 msgid "Too many table locks were not granted immediately." From 61ec405c16c41d17c9b62bd4d9921ce9fd196562 Mon Sep 17 00:00:00 2001 From: Zulfikar Date: Sun, 16 Oct 2016 11:23:28 +0000 Subject: [PATCH 2/4] Translated using Weblate (Indonesian) Currently translated at 69.6% (2232 of 3206 strings) [CI skip] --- po/id.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/id.po b/po/id.po index 4bd7143235..f92333db8a 100644 --- a/po/id.po +++ b/po/id.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.5-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-08-17 11:29+0200\n" -"PO-Revision-Date: 2016-10-10 04:59+0000\n" -"Last-Translator: Arie Kurniawan \n" +"PO-Revision-Date: 2016-10-16 11:23+0000\n" +"Last-Translator: Zulfikar \n" "Language-Team: Indonesian " "\n" "Language: id\n" @@ -1825,7 +1825,7 @@ msgstr "Definisi fungsi disimpan harus mengandung pernyataan RETURN!" #: setup/frames/menu.inc.php:27 #: templates/database/structure/check_all_tables.phtml:12 msgid "Export" -msgstr "" +msgstr "Ekspor" #: js/messages.php:395 libraries/rte/rte_routines.lib.php:740 msgid "ENUM/SET editor" From 334910216e62ac32bc6ccbead9a2a6c7966506a2 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 17 Oct 2016 13:36:09 +0530 Subject: [PATCH 3/4] Check if the function actually has arguments or not Fix #12639 Signed-off-by: Deven Bansod --- js/console.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/console.js b/js/console.js index 79aedb448e..ad5893bd4e 100644 --- a/js/console.js +++ b/js/console.js @@ -1235,7 +1235,7 @@ PMA_consoleDebug = { functionName += dbgStep.type; } functionName += dbgStep.function; - if (dbgStep.args.length) { + if (dbgStep.args && dbgStep.args.length) { functionName += '(...)'; } else { functionName += '()'; @@ -1303,7 +1303,7 @@ PMA_consoleDebug = { .append( $('').text(this._formatFileName(step)) ); - if (step.args.length) { + if (step.args && step.args.length) { $stepElem .append( $('').html(this._formatFunctionArgs(step)) From f9ed7a5054ba25532911d05ad8b75ef0846a29da Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Mon, 17 Oct 2016 13:39:11 +0530 Subject: [PATCH 4/4] ChangeLog for #12639 Signed-off-by: Deven Bansod --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index aaca045d65..fcc84a598d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,7 @@ phpMyAdmin - ChangeLog - issue #12625 Broken Edit links in query results of JOIN query - issue #12634 Drop DB error in import if DB doesn't exist - issue #12338 Designer reverts to first saved ER after EACH relation create or delete +- issue #12639 'Show trace' in Console generates JS error for functions in query's trace called without any arguments 4.6.4 (2016-08-16) - issue [security] Weaknesses with cookie encryption, see PMASA-2016-29