Merge branch 'QA_4_2' of https://github.com/phpmyadmin/phpmyadmin into QA_4_2

po/zh_CN.po

@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.2.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-07-08 07:11-0400\n"
-"PO-Revision-Date: 2014-07-02 17:02+0200\n"
-"Last-Translator: Edward Cheng <c4150221@gmail.com>\n"
-"Language-Team: Simplified Chinese <https://l10n.cihar.com/projects/"
-"phpmyadmin/4-2/zh_CN/>\n"
+"PO-Revision-Date: 2014-07-11 10:37+0200\n"
+"Last-Translator: Huang Zhiyi <hzy980512@126.com>\n"
+"Language-Team: Simplified Chinese "
+"<https://l10n.cihar.com/projects/phpmyadmin/4-2/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1453,7 +1453,7 @@ msgstr "请选择您要导入的文件。"
 
 #: js/messages.php:206
 msgid "No files available on server for import!"
-msgstr ""
+msgstr "服务器上没有可用文件来导入！"
 
 #: js/messages.php:208
 msgid "Analyse Query"
@@ -1746,14 +1746,13 @@ msgid "Shift + Click on function name to apply to all rows."
 msgstr "按住 Shift 并点击列名称来应用到所有行"
 
 #: js/messages.php:323
-#, fuzzy
 #| msgid "Do you want to import remaining settings?"
 msgid "Do you want to copy encryption key?"
-msgstr "是否导入其余的设置？"
+msgstr "是否要复制加密密匙？"
 
 #: js/messages.php:324
 msgid "Encryption key"
-msgstr ""
+msgstr "加密密匙"
 
 #: js/messages.php:327
 msgid "Select referenced key"
@@ -1803,7 +1802,7 @@ msgstr "拖拽以调整顺序。"
 
 #: js/messages.php:344
 msgid "Click to sort results by this column."
-msgstr ""
+msgstr "点此排序此列的结果。"
 
 #: js/messages.php:345
 msgid ""