diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9ca14d6e6f..d7795dbcfe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.1-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-10-15 14:29-0400\n"
-"PO-Revision-Date: 2015-10-14 14:56+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Chinese (China) <https://hosted.weblate.org/projects/"
-"phpmyadmin/4-5/zh_CN/>\n"
+"PO-Revision-Date: 2015-10-23 11:36+0200\n"
+"Last-Translator: doocoo <doocoo@163.com>\n"
+"Language-Team: Chinese (China) "
+"<https://hosted.weblate.org/projects/phpmyadmin/4-5/zh_CN/>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -7182,6 +7182,8 @@ msgid ""
 "configurable menus feature; leaving either one of them blank will disable\n"
 "    this feature, suggested: [kbd]pma__users[/kbd]."
 msgstr ""
+"启用配置菜单功能需要此表与用户组(user groups)表；缺少其中任何一个表都会造成这一功能被关闭，建议： "
+"[kbd]pma__users[/kbd]。"
 
 #: libraries/config/messages.inc.php:816
 msgid "Users table"
@@ -7193,24 +7195,24 @@ msgid ""
 "menus feature; leaving either one of them blank will disable this feature, "
 "suggested: [kbd]pma__usergroups[/kbd]."
 msgstr ""
+"启用配置菜单功能需要此表与用户表（users）；缺少其中任何一个表都会使此功能被关闭，建议： [kbd]pma__usergroups[/kbd]。"
 
 #: libraries/config/messages.inc.php:822
 msgid "User groups table"
 msgstr "用户组表"
 
 #: libraries/config/messages.inc.php:824
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no user preferences storage in database, suggested: "
 #| "[kbd]pma__userconfig[/kbd]"
 msgid ""
 "Leave blank to disable the feature to hide and show navigation items, "
 "suggested: [kbd]pma__navigationhiding[/kbd]."
-msgstr "不在数据库中保存用户偏好请留空，推荐: [kbd]pma__userconfig[/kbd]"
+msgstr "不使用显示/隐藏导航功能请置空，推荐: [kbd]pma__navigationhiding[/kbd]。"
 
 #: libraries/config/messages.inc.php:827
 msgid "Hidden navigation items table"
-msgstr ""
+msgstr "隐藏的导航条目表"
 
 #: libraries/config/messages.inc.php:829
 msgid "User for config auth"
@@ -7260,68 +7262,59 @@ msgid "Show create database form"
 msgstr "显示创建数据库表单"
 
 #: libraries/config/messages.inc.php:847
-#, fuzzy
 #| msgid ""
 #| "Show or hide a column displaying the Creation timestamp for all tables"
 msgid "Show or hide a column displaying the comments for all tables."
-msgstr "显示或者隐藏在所有表格中，列显示创建时间戳"
+msgstr "显示或隐藏所有表的备注列。"
 
 #: libraries/config/messages.inc.php:849
-#, fuzzy
 #| msgid "Table comments"
 msgid "Show table comments"
-msgstr "表注释"
+msgstr "显示表备注"
 
 #: libraries/config/messages.inc.php:851
-#, fuzzy
 #| msgid ""
 #| "Show or hide a column displaying the Creation timestamp for all tables"
 msgid "Show or hide a column displaying the Creation timestamp for all tables."
-msgstr "显示或者隐藏在所有表格中，列显示创建时间戳"
+msgstr "显示或隐藏所有表的创建时间列。"
 
 #: libraries/config/messages.inc.php:853
-#, fuzzy
 #| msgid "Show Creation timestamp"
 msgid "Show creation timestamp"
-msgstr "显示创建时间戳"
+msgstr "显示创建时间"
 
 #: libraries/config/messages.inc.php:855
-#, fuzzy
 #| msgid ""
 #| "Show or hide a column displaying the Last update timestamp for all tables"
 msgid ""
 "Show or hide a column displaying the Last update timestamp for all tables."
-msgstr "显示或者隐藏在所有表格中列显示最后更新时间戳"
+msgstr "显示或隐藏所有表的最近更新时间列。"
 
 #: libraries/config/messages.inc.php:857
-#, fuzzy
 #| msgid "Show Last update timestamp"
 msgid "Show last update timestamp"
-msgstr "显示最后更新时间戳"
+msgstr "显示最后更新时间"
 
 #: libraries/config/messages.inc.php:859
-#, fuzzy
 #| msgid ""
 #| "Show or hide a column displaying the Last check timestamp for all tables"
 msgid ""
 "Show or hide a column displaying the Last check timestamp for all tables."
-msgstr "显示或者隐藏所有表格中，列显示最后检查时间戳"
+msgstr "显示或隐藏所有表的最近检查时间列。"
 
 #: libraries/config/messages.inc.php:861
-#, fuzzy
 #| msgid "Show Last check timestamp"
 msgid "Show last check timestamp"
-msgstr "查看最后检查时间戳"
+msgstr "显示最近检查时间"
 
 #: libraries/config/messages.inc.php:863
-#, fuzzy
 #| msgid ""
 #| "Defines whether or not type fields should be initially displayed in edit/"
 #| "insert mode"
 msgid ""
 "Defines whether or not type fields should be initially displayed in edit/"
 "insert mode."
-msgstr "定义在编辑/插入模式中是否显示字段类型一列"
+msgstr "定义在编辑/插入模式中是否默认显示字段类型一列。"
 
 #: libraries/config/messages.inc.php:866
 msgid "Show field types"
@@ -7338,25 +7331,22 @@ msgid "Show function fields"
 msgstr "显示函数列"
 
 #: libraries/config/messages.inc.php:871
-#, fuzzy
 #| msgid "Whether to show hint or not"
 msgid "Whether to show hint or not."
-msgstr "是否显示提示"
+msgstr "是否显示提示。"
 
 #: libraries/config/messages.inc.php:872
 msgid "Show hint"
 msgstr "显示提示"
 
 #: libraries/config/messages.inc.php:874
-#, fuzzy
 #| msgid ""
 #| "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
 #| "output"
 msgid ""
 "Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] "
 "output."
-msgstr ""
-"显示 [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] 输出的链接"
+msgstr "显示 [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] 的链接。"
 
 #: libraries/config/messages.inc.php:877
 msgid "Show phpinfo() link"
@@ -7367,12 +7357,11 @@ msgid "Show detailed MySQL server information"
 msgstr "显示 MySQL 服务器详细信息"
 
 #: libraries/config/messages.inc.php:880
-#, fuzzy
 #| msgid ""
 #| "Defines whether SQL queries generated by phpMyAdmin should be displayed"
 msgid ""
 "Defines whether SQL queries generated by phpMyAdmin should be displayed."
-msgstr "定义是否显示 phpMyAdmin 生成的 SQL 查询"
+msgstr "定义是否显示 phpMyAdmin 生成的 SQL 查询。"
 
 #: libraries/config/messages.inc.php:882
 msgid "Show SQL queries"
@@ -7413,12 +7402,11 @@ msgid "Skip locked tables"
 msgstr "跳过锁定的表"
 
 #: libraries/config/messages.inc.php:900
-#, fuzzy
 #| msgid "A warning is displayed on the main page if Suhosin is detected."
 msgid ""
 "Disable the default warning that is displayed on the main page if Suhosin is "
 "detected."
-msgstr "若检测到 Suhosin 将在首页中显示警告。"
+msgstr "检测到 Suhosin时，不在主页显示默认的警告。"
 
 #: libraries/config/messages.inc.php:903
 msgid "Suhosin warning"
@@ -7439,7 +7427,7 @@ msgstr "禁止在列名包含 MySQL 保留字时在数据库结构页中显示
 #, fuzzy
 #| msgid "Login cookie validity"
 msgid "Login cookie validity warning"
-msgstr "登录 cookie 有效期"
+msgstr "登录cookie 有效期警告"
 
 #: libraries/config/messages.inc.php:913
 #, fuzzy
@@ -7474,16 +7462,14 @@ msgid "Textarea rows"
 msgstr "文本框行"
 
 #: libraries/config/messages.inc.php:923
-#, fuzzy
 #| msgid "Title of browser window when a database is selected"
 msgid "Title of browser window when a database is selected."
-msgstr "选中一个数据库时浏览器窗口的标题"
+msgstr "选中一个数据库时浏览器窗口的标题。"
 
 #: libraries/config/messages.inc.php:927
-#, fuzzy
 #| msgid "Title of browser window when nothing is selected"
 msgid "Title of browser window when nothing is selected."
-msgstr "未选择时浏览器窗口的标题"
+msgstr "未选择任何项目时浏览器窗口的标题。"
 
 #: libraries/config/messages.inc.php:929
 msgid "Default title"