From 7a1c989b437695ed84e88bc7f80b6db6c872cdd0 Mon Sep 17 00:00:00 2001 From: Nisarg Jhaveri Date: Wed, 10 Dec 2014 16:36:21 +0530 Subject: [PATCH 1/4] Fix bug 4635 Signed-off-by: Nisarg Jhaveri --- libraries/relation.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php index 97b19c7d72..f4c5987e26 100644 --- a/libraries/relation.lib.php +++ b/libraries/relation.lib.php @@ -1905,7 +1905,7 @@ function PMA_getHtmlFixPMATables() { $retval = ''; - $url_query = PMA_URL_getCommon($GLOBALS['db']); + $url_query = PMA_URL_getCommon(array('db' => $GLOBALS['db'])); $url_query .= '&goto=db_operations.php&fix_pmadb=1'; $message = PMA_Message::notice( __( From ebc7e62d406cbac44b2f8f09857715c89b96f578 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 10 Dec 2014 08:00:58 -0500 Subject: [PATCH 2/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c777e7bbf8..cf2545e6ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - bug #4632 Notice in ./libraries/Util.class.php#1916 Undefined index: query - bug #4633 Wrong parameter in fetchValue - bug #4634 Error reporting creates an infinite loop +- bug #4635 Token mismatch while creating configuration storage 4.3.1.0 (2014-12-08) - bug #4609 'Show all' checkbox label is not clickable From 8260ae8b7507415e3dcac9d5ec2704150c79d8cb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 10 Dec 2014 12:34:41 -0500 Subject: [PATCH 3/4] Bug #4640 Incorrect reference to PHP 6 Signed-off-by: Marc Delisle --- ChangeLog | 1 + doc/setup.rst | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index cf2545e6ae..0f708b8626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #4633 Wrong parameter in fetchValue - bug #4634 Error reporting creates an infinite loop - bug #4635 Token mismatch while creating configuration storage +- bug #4640 Incorrect reference to PHP 6 4.3.1.0 (2014-12-08) - bug #4609 'Show all' checkbox label is not clickable diff --git a/doc/setup.rst b/doc/setup.rst index dc07ccf71a..652943dec9 100644 --- a/doc/setup.rst +++ b/doc/setup.rst @@ -302,7 +302,7 @@ Upgrading from an older version Simply copy :file:`config.inc.php` from your previous installation into the newly unpacked one. Configuration files from old versions may require some tweaking as some options have been changed or removed. -For compatibility with PHP 6, remove a +For compatibility with PHP 5.3 and later, remove a ``set_magic_quotes_runtime(0);`` statement that you might find near the end of your configuration file. From 3dc13b12729adb278dd768deee31d35d12940418 Mon Sep 17 00:00:00 2001 From: Kyeong Su Shin Date: Wed, 10 Dec 2014 19:51:57 +0100 Subject: [PATCH 4/4] Translated using Weblate (Korean) Currently translated at 82.6% (2461 of 2978 strings) [CI skip] --- po/ko.po | 50 ++++++++++++++++++-------------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/po/ko.po b/po/ko.po index e859154cf9..0b54825bf4 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-11-15 04:12+0200\n" -"Last-Translator: youngminz \n" +"PO-Revision-Date: 2014-12-10 19:51+0200\n" +"Last-Translator: Kyeong Su Shin \n" "Language-Team: Korean " "\n" "Language: ko\n" @@ -13,7 +13,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.1-dev\n" +"X-Generator: Weblate 2.2-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -6746,7 +6746,6 @@ msgid "Signon URL" msgstr "접속 URL" #: libraries/config/messages.inc.php:650 -#, fuzzy #| msgid "Port on which MySQL server is listening, leave empty for default" msgid "Socket on which MySQL server is listening, leave empty for default." msgstr "MySQL 서버가 listen하고 있는 소켓으로, 비워두면 기본값으로 설정됩니다." @@ -9707,7 +9706,6 @@ msgstr "" "예:INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:403 -#, fuzzy #| msgid "" #| "both of the above
      Example: INSERT INTO " #| "tbl_name (col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" @@ -9716,7 +9714,7 @@ msgid "" "tbl_name (col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" msgstr "" "위의 것 둘 다
      예: INSERT INTO tbl_name " -"(col_A,col_B) VALUES (1,2,3), (4,5,6), (7,8,9)" +"(col_A,col_B,col_C) VALUES (1,2,3), (4,5,6), (7,8,9)" #: libraries/plugins/export/ExportSql.class.php:408 msgid "" @@ -9808,10 +9806,9 @@ msgid "Object creation options (all are recommended)" msgstr "" #: libraries/plugins/export/ExportXml.class.php:141 -#, fuzzy #| msgid "Data point content" msgid "Export contents" -msgstr "데이터 포인트 내용" +msgstr "내용 내보내기" #: libraries/plugins/export/PMA_ExportPdf.class.php:117 msgid "Table:" @@ -10003,10 +10000,10 @@ msgid "PDF export page" msgstr "잘못된 내보내기 타입" #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:473 -#, fuzzy, php-format +#, php-format #| msgid "Schema of the %s database - Page %s" msgid "Schema of the %s database" -msgstr "데이터베이스 %s의 스키마 - 페이지 %s" +msgstr "데이터베이스 %s의 스키마" #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:496 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:916 @@ -10897,10 +10894,9 @@ msgid "Is deterministic" msgstr "" #: libraries/rte/rte_routines.lib.php:1068 -#, fuzzy #| msgid "Server type:" msgid "Security type" -msgstr "서버 타입:" +msgstr "보안 타입" #: libraries/rte/rte_routines.lib.php:1077 msgid "SQL data access" @@ -10987,10 +10983,9 @@ msgid "Time" msgstr "시간" #: libraries/rte/rte_triggers.lib.php:429 -#, fuzzy #| msgid "You must provide a routine name" msgid "You must provide a trigger name!" -msgstr "루틴 이름이 필요함" +msgstr "트리거 이름을 입력하세요!" #: libraries/rte/rte_triggers.lib.php:436 msgid "You must provide a valid timing for the trigger!" @@ -11324,9 +11319,8 @@ msgstr "현재 쓰레드에 대한 테이블 잠금(lock) 허용." #: libraries/server_privileges.lib.php:390 #: libraries/server_privileges.lib.php:1161 server_privileges.php:106 -#, fuzzy msgid "Allows creating and dropping triggers." -msgstr "인덱스 생성 및 삭제 허용." +msgstr "트리거 생성 및 삭제 허용." #: libraries/server_privileges.lib.php:401 #: libraries/server_privileges.lib.php:407 @@ -11966,15 +11960,13 @@ msgid "Reset to default" msgstr "기본값으로 초기화" #: libraries/server_status_processes.lib.php:24 -#, fuzzy #| msgid "" #| "Note: Enabling the database statistics here might cause heavy traffic " #| "between the web server and the MySQL server." msgid "" "Note: Enabling the auto refresh here might cause heavy traffic between the " "web server and the MySQL server." -msgstr "" -"주의: 데이터베이스 통계 보기는 웹서버와 MySQL 서버 사이에 큰 부하를 줍니다." +msgstr "주의: 자동 새로고침기능을 활성화하실 경우 웹서버와 MySQL 서버 사이에 큰 부하를 줄 수 있습니다." #: libraries/server_status_processes.lib.php:69 msgid "ID" @@ -12657,10 +12649,9 @@ msgid "Table level tabs" msgstr "테이블 설명" #: libraries/server_user_groups.lib.php:108 -#, fuzzy #| msgid "Views" msgid "View users" -msgstr "뷰" +msgstr "사용자 보기" #: libraries/server_user_groups.lib.php:145 #: libraries/server_user_groups.lib.php:206 @@ -12974,12 +12965,11 @@ msgid "Check tables having overhead" msgstr "오버헤드를 가진 테이블들을 체크" #: libraries/structure.lib.php:829 -#, fuzzy #| msgid "May be approximate. See [doc@faq3-11]FAQ 3.11[/doc]." msgid "" "May be approximate. Click on the number to get the exact count. See " "[doc@faq3-11]FAQ 3.11[/doc]." -msgstr "근사값입니다. [doc@faq3-11]FAQ 3.11[/doc]를 참조하세요." +msgstr "근사값입니다. 정확한 값을 보시려면 숫자를 클릭하세요. [doc@faq3-11]FAQ 3.11[/doc]를 참조하세요." #: libraries/structure.lib.php:851 libraries/structure.lib.php:2331 #: libraries/tbl_printview.lib.php:320 @@ -13249,10 +13239,9 @@ msgid "Start row:" msgstr "시작 행:" #: libraries/tbl_chart.lib.php:318 -#, fuzzy #| msgid "Save as file" msgid "Save chart as image" -msgstr "파일로 저장" +msgstr "차트를 이미지 파일로 저장" #: libraries/tbl_chart.lib.php:357 msgid "Chart title" @@ -13485,7 +13474,6 @@ msgstr "" "외래키 릴레이션이 있을 경우, 거기에 해당하는 내부 릴레이션은 필요 없습니다." #: libraries/tbl_relation.lib.php:371 -#, fuzzy #| msgid "Foreign key constraint" msgid "Foreign key constraints" msgstr "외래키 제약" @@ -13512,16 +13500,15 @@ msgid "Foreign key constraint" msgstr "외래키 제약" #: libraries/tbl_relation.lib.php:406 -#, fuzzy #| msgid "Add constraints" msgid "+ Add constraint" -msgstr "제약조건 추가" +msgstr "+ 제약조건 추가" #: libraries/tbl_relation.lib.php:443 -#, fuzzy, php-format +#, php-format #| msgid "Foreign key constraint" msgid "Foreign key constraint %s has been dropped" -msgstr "외래키 제약" +msgstr "외래키 제약 %s 가 제거되었습니다" #: libraries/tbl_relation.lib.php:465 msgid "Constraint name" @@ -13885,10 +13872,9 @@ msgid "Insecure connection" msgstr "보호되지 않은 연결" #: setup/frames/index.inc.php:119 -#, fuzzy #| msgid "Modifications have been saved" msgid "Configuration saved." -msgstr "수정된 내용이 저장되었습니다." +msgstr "설정이 저장되었습니다." #: setup/frames/index.inc.php:122 msgid ""