From 07640ba5c740b863f2a972c97bd2837c1bbacc80 Mon Sep 17 00:00:00 2001 From: Zheng Dan Date: Thu, 24 Sep 2015 16:29:32 +0200 Subject: [PATCH 1/2] Translated using Weblate (Chinese (China)) Currently translated at 77.0% (2473 of 3209 strings) [CI skip] --- po/zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 5427dad403..1fd8d5365e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4,8 +4,8 @@ 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-24 10:56+0200\n" -"Last-Translator: Yizhou Qiang \n" +"PO-Revision-Date: 2015-09-24 16:29+0200\n" +"Last-Translator: Zheng Dan \n" "Language-Team: Chinese (China) " "\n" "Language: zh_CN\n" @@ -2477,7 +2477,7 @@ msgstr "%s条查询的执行时常：%s秒" #: js/messages.php:602 #, php-format msgid "%s argument(s) passed" -msgstr "" +msgstr "%s 个参数已传递" #: js/messages.php:603 #, fuzzy From 1ed1d638f869a25277dbb82d84a68abb0b626b2e Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 25 Sep 2015 09:57:23 -0400 Subject: [PATCH 2/2] Fix failing tests Signed-off-by: Marc Delisle --- libraries/dbi/DBIDummy.class.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libraries/dbi/DBIDummy.class.php b/libraries/dbi/DBIDummy.class.php index a24e2f1809..fd2b5f9a2c 100644 --- a/libraries/dbi/DBIDummy.class.php +++ b/libraries/dbi/DBIDummy.class.php @@ -638,7 +638,7 @@ $GLOBALS['dummy_queries'] = array( . "`CREATE_OPTIONS` AS `Create_options`, " . "`TABLE_COMMENT` AS `Comment` " . "FROM `information_schema`.`TABLES` t " - . "WHERE BINARY `TABLE_SCHEMA` IN ('db') " + . "WHERE `TABLE_SCHEMA` IN ('db') " . "AND t.`TABLE_NAME` = 'table' ORDER BY Name ASC", 'result' => array() ), @@ -649,6 +649,10 @@ $GLOBALS['dummy_queries'] = array( array( 'query' => "SELECT @@have_partitioning;", 'result' => array() + ), + array( + 'query' => "SELECT @@lower_case_table_names", + 'result' => array() ) ); /**