From 99abee8ac4534a1c759dba8c849117035911ea6d Mon Sep 17 00:00:00 2001 From: Yungu Kim Date: Thu, 2 May 2013 10:29:10 +0200 Subject: [PATCH 1/4] Translated using Weblate (Korean) Currently translated at 62.8% (1636 of 2605) --- po/ko.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/po/ko.po b/po/ko.po index 524010b6f1..14e62cacbc 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-rc1\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-04-03 10:24+0200\n" -"PO-Revision-Date: 2013-04-29 07:36+0200\n" +"PO-Revision-Date: 2013-05-02 10:29+0200\n" "Last-Translator: Yungu Kim \n" "Language-Team: Korean \n" "Language: ko\n" @@ -3905,7 +3905,7 @@ msgstr "양수가 아닙니다." #: libraries/config/FormDisplay.class.php:89 #: libraries/config/validate.lib.php:548 msgid "Not a non-negative number" -msgstr "음수가 아닙니다." +msgstr "음수가 아닙니다" #: libraries/config/FormDisplay.class.php:90 #: libraries/config/validate.lib.php:504 @@ -7543,7 +7543,7 @@ msgstr "열(컬럼) 구분자:" #: libraries/plugins/import/ImportCsv.class.php:88 #| msgid "Fields enclosed by" msgid "Columns enclosed with:" -msgstr "열(컬럼) 감싸기" +msgstr "열(컬럼) 감싸기:" #: libraries/plugins/export/ExportCsv.class.php:101 #: libraries/plugins/import/ImportCsv.class.php:94 @@ -10209,7 +10209,8 @@ msgid "" "should see a message informing you, that this server is configured as " "master" msgstr "" -"MySQL 서버를 재시작했으면 실행(Go) 버튼을 클릭하세요. 그 후, 서버가 마스터로 설정되었다는 안내 메시지를 볼 수 있을겁니다" +"MySQL 서버를 재시작했으면 실행(Go) 버튼을 클릭하세요. 그 후, 서버가 마스터로 설정되었다는 안내 메시지를 볼 수 " +"있을겁니다" #: server_replication.php:281 msgid "Slave SQL Thread not running!" From 1efb9b303e9d38be5d9f6dd991d09ae65e894728 Mon Sep 17 00:00:00 2001 From: Abhishek Kandoi Date: Thu, 2 May 2013 12:21:39 +0530 Subject: [PATCH 2/4] Fixed creation of global variables where_clause and transform_key --- tbl_get_field.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tbl_get_field.php b/tbl_get_field.php index a537a82d41..ada209f46e 100644 --- a/tbl_get_field.php +++ b/tbl_get_field.php @@ -12,6 +12,20 @@ require_once 'libraries/common.inc.php'; require_once 'libraries/mime.lib.php'; +/** + * Sets globals from $_GET + */ +$get_params = array( + 'where_clause', + 'transform_key' +); + +foreach ($get_params as $one_get_param) { + if (isset($_GET[$one_get_param])) { + $GLOBALS[$one_get_param] = $_GET[$one_get_param]; + } +} + /* Check parameters */ PMA_Util::checkParameters( array('db', 'table', 'where_clause', 'transform_key') From 66f3af63dd2365b53efec887393b95fff917fa6b Mon Sep 17 00:00:00 2001 From: Abhishek Kandoi Date: Thu, 2 May 2013 12:48:45 +0530 Subject: [PATCH 3/4] Added disableAjax class for Blob content --- libraries/DisplayResults.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 6a399c56f1..039bd13183 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -5415,7 +5415,7 @@ class PMA_DisplayResults /* Create link to download */ if (count($url_params) > 0) { $result = '' + . PMA_generate_common_url($url_params) . '" class="disableAjax">' . $result . ''; } } From 458888808ed092ebb311bbe23fb7d7e9139abc24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 2 May 2013 10:58:38 +0200 Subject: [PATCH 4/4] Changelog entry --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 855c0735b8..49dd373f07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #3899 Git commit links to Github missing - bug #3900 CSP WARN in Firefox console - bug #3901 Setup script warning for config auth (stored login data) shows link BBcode +- bug #3895 [browse] Fixed getting BLOB data 4.0.0.0 (not yet released) + Patch #3481047 for rfe #3480477 Insert as new row enhancement