From 4d4d31774dd13bd3d07d28184143d0d11ae2ed5d Mon Sep 17 00:00:00 2001
From: SDSkyKlouD <koongchi135@gmail.com>
Date: Tue, 18 Oct 2016 08:50:59 +0000
Subject: [PATCH 1/2] Translated using Weblate (Korean)

Currently translated at 79.8% (2561 of 3206 strings)

[CI skip]
---
 po/ko.po | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/po/ko.po b/po/ko.po
index 3ad8ed8eed..7f6876d985 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-17 12:10+0000\n"
+"PO-Revision-Date: 2016-10-18 08:50+0000\n"
 "Last-Translator: SDSkyKlouD <koongchi135@gmail.com>\n"
 "Language-Team: Korean "
 "<https://hosted.weblate.org/projects/phpmyadmin/4-6/ko/>\n"
@@ -4531,9 +4531,8 @@ msgid "Max: %s%s"
 msgstr "최대: %s%s"
 
 #: libraries/Util.php:688
-#, fuzzy
 msgid "Static analysis:"
-msgstr "정적 분석:"
+msgstr "정적 분석 :"
 
 #: libraries/Util.php:691
 #, php-format
@@ -4879,7 +4878,6 @@ msgid "Disabled"
 msgstr "사용불가"
 
 #: libraries/config.values.php:98
-#, fuzzy
 msgid "key"
 msgstr "키"
 
@@ -6661,10 +6659,8 @@ msgid "Grid editing: trigger action"
 msgstr "격자판 수정: 트리거 동작"
 
 #: libraries/config/messages.inc.php:616
-#, fuzzy
-#| msgid "Relational display column"
 msgid "Relational display"
-msgstr "연관된 행 표시"
+msgstr "연관 보기"
 
 #: libraries/config/messages.inc.php:617
 #, fuzzy

From 0c213a2a34d5c720fa32b05687ec1e220884a9da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 18 Oct 2016 12:16:26 +0200
Subject: [PATCH 2/2] Fix test expectations for php.net URLs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 test/libraries/common/PMA_showPHPDocu_test.php | 2 +-
 test/libraries/core/PMA_getLinks_test.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 6f7e3a6472..3115d452de 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -43,7 +43,7 @@ class PMA_ShowPHPDocu_Test extends PHPUnit_Framework_TestCase
     {
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
-        $expected = '<a href="./url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
+        $expected = '<a href="./url.php?url=https%3A%2F%2Fsecure.php.net%2Fmanual%2F' . $lang
             . '%2F' . $target . '" target="documentation">'
             . '<img src="themes/dot.gif" title="' . __('Documentation') . '" alt="'
             . __('Documentation') . '" class="icon ic_b_help" /></a>';
diff --git a/test/libraries/core/PMA_getLinks_test.php b/test/libraries/core/PMA_getLinks_test.php
index 3c38ec6423..4ae0959b2e 100644
--- a/test/libraries/core/PMA_getLinks_test.php
+++ b/test/libraries/core/PMA_getLinks_test.php
@@ -33,7 +33,7 @@ class PMA_GetLinks_Test extends PHPUnit_Framework_TestCase
         $lang = _pgettext('PHP documentation language', 'en');
         $this->assertEquals(
             PMA_getPHPDocLink('function'),
-            './url.php?url=https%3A%2F%2Fphp.net%2Fmanual%2F'
+            './url.php?url=https%3A%2F%2Fsecure.php.net%2Fmanual%2F'
             . $lang . '%2Ffunction'
         );
     }