From e0a340f107993920d9c83949ff3c99fd1608f437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kriszti=C3=A1n=20Patai?= Date: Thu, 31 Mar 2016 11:24:33 +0200 Subject: [PATCH 1/3] Translated using Weblate (Hungarian) Currently translated at 95.1% (3056 of 3212 strings) [CI skip] --- po/hu.po | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/po/hu.po b/po/hu.po index 8aab9a977e..2b90d78a88 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2015-10-15 11:09+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2016-03-31 11:24+0000\n" +"Last-Translator: Krisztián Patai \n" +"Language-Team: Hungarian " +"\n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.5-dev\n" +"X-Generator: Weblate 2.6-dev\n" #: changelog.php:37 license.php:33 #, php-format @@ -776,6 +776,9 @@ msgid "" "The curl extension was not found and allow_url_fopen is disabled. Due to " "this some features such as error reporting or version check are disabled." msgstr "" +"A curl kiterjesztés nem található és az allow_url_fopen le van tiltva. " +"Emiatt néhány funkció - mint például a hibajelentés, vagy verzió ellenőrzés -" +" le lett tiltva." #: index.php:499 msgid "" @@ -3689,7 +3692,7 @@ msgstr "Mind kijelölése" #: libraries/DisplayResults.php:5006 msgid "Copy to clipboard" -msgstr "" +msgstr "Másolás vágólapra" #: libraries/DisplayResults.php:5062 msgid "Query results operations" From 863d2fb4c397b80f345f127bf68b656cc0205c1e Mon Sep 17 00:00:00 2001 From: Eshin Kunishima Date: Wed, 30 Mar 2016 03:00:13 +0200 Subject: [PATCH 2/3] Translated using Weblate (Japanese) Currently translated at 67.6% (2173 of 3211 strings) [CI skip] --- po/ja.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/po/ja.po b/po/ja.po index 001160ef17..b9230fd3d9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-03-22 01:22+0000\n" +"PO-Revision-Date: 2016-03-30 03:00+0000\n" "Last-Translator: Eshin Kunishima \n" "Language-Team: Japanese " "\n" @@ -1845,7 +1845,7 @@ msgstr "新しいカラムに対しての値" #: js/messages.php:398 msgid "Enter each value in a separate field." -msgstr "個々の入力欄にそれぞれ値を入力してください" +msgstr "個々の入力欄にそれぞれ値を入力してください。" #: js/messages.php:399 #, php-format @@ -1941,7 +1941,7 @@ msgstr "もっと見る" #: js/messages.php:425 msgid "Are you sure?" -msgstr "" +msgstr "本当ですか?" #: js/messages.php:427 msgid "" @@ -1982,7 +1982,7 @@ msgstr "改行コード" #: js/messages.php:439 msgid "Second step of normalization (2NF)" -msgstr "" +msgstr "第2正規化 (2NF)" #. l10n: Display text for calendar close link #: js/messages.php:440 js/messages.php:739 libraries/normalization.lib.php:285 @@ -2202,7 +2202,7 @@ msgstr "暗号化キーをコピーしますか？" #: js/messages.php:521 msgid "Encryption key" -msgstr "" +msgstr "暗号化鍵" #: js/messages.php:525 msgid "" @@ -2290,7 +2290,7 @@ msgstr "" #: js/messages.php:549 msgid "Successfully deleted the page" -msgstr "" +msgstr "ページの削除に成功しました" #: js/messages.php:550 msgid "Export relational schema" @@ -2406,7 +2406,7 @@ msgstr "中断" #: js/messages.php:593 msgid "Success" -msgstr "" +msgstr "成功" #: js/messages.php:594 #, fuzzy @@ -2910,7 +2910,7 @@ msgstr "秒" #: js/messages.php:884 msgid "This field is required" -msgstr "" +msgstr "このフィールドは必須です" #: js/messages.php:885 #, fuzzy @@ -3084,7 +3084,7 @@ msgstr "" #: libraries/Console.php:86 libraries/Console.php:197 libraries/Console.php:299 msgid "Expand" -msgstr "" +msgstr "展開" #: libraries/Console.php:87 libraries/Console.php:198 #, fuzzy @@ -3162,7 +3162,7 @@ msgstr "SQL クエリボックス" #: libraries/Console.php:216 msgid "Console" -msgstr "" +msgstr "コンソール" #: libraries/Console.php:219 libraries/sql_query_form.lib.php:244 #: setup/frames/index.inc.php:300 @@ -5220,11 +5220,11 @@ msgstr "右" #: libraries/config.values.php:93 msgid "Click" -msgstr "" +msgstr "クリック" #: libraries/config.values.php:94 msgid "Double click" -msgstr "" +msgstr "ダブルクリック" #: libraries/config.values.php:95 libraries/config.values.php:125 #: libraries/config/FormDisplay.tpl.php:234 libraries/relation.lib.php:98 From a65a4213d7ab94172d0b2d23d0b1c43295ad1d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 5 Apr 2016 09:24:15 +0200 Subject: [PATCH 3/3] Load gettext before autoloader MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes possible PHP error in SQL parser as it tries to define __() if it's not existing. Later loading of gettext just breaks this. Fixes #12154 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/common.inc.php | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index b24157720a..f22c9260ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #12135 Fix offering JSON datatype in incompatible MySQL versions - issue #12132 Can not open table with JSON field - issue #12125 Cannot highlight a column if I scroll down from the top of the table +- issue #12154 Fixed possible PHP error in SQL parser 4.6.0.0 (2016-03-22) + issue #11456 Disabled storage engines diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 57be432b4d..09c7de5060 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -71,6 +71,11 @@ define('PHPMYADMIN', true); */ require_once './libraries/vendor_config.php'; +/** + * Load gettext functions. + */ +require_once GETTEXT_INC; + /** * Activate autoloader */ @@ -471,11 +476,6 @@ if (PMA_isValid($_REQUEST['sql_query'])) { /******************************************************************************/ /* loading language file LABEL_loading_language_file */ -/** - * Load gettext functions. - */ -require_once GETTEXT_INC; - /** * lang detection is done here */