From 50153dec8b9123fba6b7df8508c5b4c902ee2c80 Mon Sep 17 00:00:00 2001 From: Yizhou Qiang Date: Thu, 24 Sep 2015 08:55:50 +0200 Subject: [PATCH 1/2] Translated using Weblate (Chinese (China)) Currently translated at 76.9% (2470 of 3209 strings) [CI skip] --- po/zh_CN.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index df86efa3ba..387f03d8fa 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-beta2\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-09-06 07:29-0400\n" -"PO-Revision-Date: 2015-09-03 04:02+0200\n" -"Last-Translator: Vincent Lau <3092849@qq.com>\n" -"Language-Team: Chinese (China) \n" +"PO-Revision-Date: 2015-09-24 08:55+0200\n" +"Last-Translator: Yizhou Qiang \n" +"Language-Team: Chinese (China) " +"\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.4-dev\n" +"X-Generator: Weblate 2.5\n" #: changelog.php:37 license.php:30 #, php-format @@ -2453,17 +2453,16 @@ msgstr "忽略全部" #: js/messages.php:590 msgid "" "As per your settings, they are being submitted currently, please be patient." -msgstr "" +msgstr "正在提交您的设置，请耐心等待。" #: js/messages.php:598 msgid "Execute this query again?" msgstr "再次执行该查询？" #: js/messages.php:599 -#, fuzzy #| msgid "Do you really want to delete the search \"%s\"?" msgid "Do you really want to delete this bookmark?" -msgstr "您真的要删除搜索“%s”吗？" +msgstr "您真的要删除该书签吗？" #: js/messages.php:600 msgid "Some error occurred while getting SQL debug info." From 5bad4dab82e2a6246999400ab6ac8d064e9acf38 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 24 Sep 2015 09:27:17 -0400 Subject: [PATCH 2/2] Fixes #11495 'PMA_Microhistory' is undefined Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/functions.js | 2 +- js/server_databases.js | 2 +- js/sql.js | 6 +++--- libraries/Footer.class.php | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index a751a9d6a7..4d1fc02112 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #11486 Server variable edition in ANSI_QUOTES sql_mode: losing current value - issue #11491 Propose table structure broken - issue #11464 phpMyAdmin suggests upgrading to newer version not usable on that system +- issue #11495 'PMA_Microhistory' is undefined 4.5.0.1 (2015-09-24) - issue #11492 AUTO_INCREMENT statements are partly missing from exports diff --git a/js/functions.js b/js/functions.js index 4a95ee9fbc..462c3e6e6e 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2837,7 +2837,7 @@ AJAX.registerOnload('functions.js', function () { // Redirect to table structure page on creation of new table var params_12 = 'ajax_request=true&ajax_page_request=true'; if (! (history && history.pushState)) { - params_12 += PMA_Microhistory.menus.getRequestParam(); + params_12 += PMA_MicroHistory.menus.getRequestParam(); } tblStruct_url = 'tbl_structure.php?server=' + data._params.server + '&db='+ data._params.db + '&token=' + data._params.token + diff --git a/js/server_databases.js b/js/server_databases.js index 42cb7868b6..50506a5724 100644 --- a/js/server_databases.js +++ b/js/server_databases.js @@ -128,7 +128,7 @@ AJAX.registerOnload('server_databases.js', function () { dbStruct_url = dbStruct_url.replace(/amp;/ig, ''); var params = 'ajax_request=true&ajax_page_request=true'; if (! (history && history.pushState)) { - params += PMA_Microhistory.menus.getRequestParam(); + params += PMA_MicroHistory.menus.getRequestParam(); } $.get(dbStruct_url, params, AJAX.responseHandler); } else { diff --git a/js/sql.js b/js/sql.js index 6815f7ed69..13edb43943 100644 --- a/js/sql.js +++ b/js/sql.js @@ -396,12 +396,12 @@ AJAX.registerOnload('sql.js', function () { ); AJAX.handleMenu.replace(data._menu); } else { - PMA_Microhistory.menus.replace(data._menu); - PMA_Microhistory.menus.add(data._menuHash, data._menu); + PMA_MicroHistory.menus.replace(data._menu); + PMA_MicroHistory.menus.add(data._menuHash, data._menu); } } else if (data._menuHash) { if (! (history && history.pushState)) { - PMA_Microhistory.menus.replace(PMA_Microhistory.menus.get(data._menuHash)); + PMA_MicroHistory.menus.replace(PMA_MicroHistory.menus.get(data._menuHash)); } } diff --git a/libraries/Footer.class.php b/libraries/Footer.class.php index ddedcb4dba..3bcc06d73b 100644 --- a/libraries/Footer.class.php +++ b/libraries/Footer.class.php @@ -323,7 +323,7 @@ class PMA_Footer $this->_scripts->addCode( sprintf( 'if (! (history && history.pushState)) ' - . 'PMA_Microhistory.primer = {' + . 'PMA_MicroHistory.primer = {' . ' url: "%s",' . ' scripts: %s,' . ' menuHash: "%s"'