diff --git a/po/zh_CN.po b/po/zh_CN.po
index 02a3e11080..45937b4b7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-08-18 06:16-0400\n"
-"PO-Revision-Date: 2013-08-26 17:34+0200\n"
+"PO-Revision-Date: 2013-08-28 09:03+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: Simplified Chinese "
 "<http://l10n.cihar.com/projects/phpmyadmin/master/zh_CN/>\n"
@@ -4152,9 +4152,7 @@ msgid ""
 "Enabling this allows a page located on a different domain to call phpMyAdmin "
 "inside a frame, and is a potential [strong]security hole[/strong] allowing "
 "cross-frame scripting attacks"
-msgstr ""
-"开启这个功能将允许其它域的页面通过框架调用 phpMyAdmin，这将允许潜在的跨框架脚"
-"本攻击[strong]安全漏洞[/strong]"
+msgstr "启用该功能将允许其它域的页面通过框架调用 phpMyAdmin，将可能成为潜在的跨框架脚本攻击的[strong]安全漏洞[/strong]"
 
 #: libraries/config/messages.inc.php:20
 msgid "Allow third party framing"
@@ -4194,9 +4192,7 @@ msgstr "高亮指针"
 msgid ""
 "Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for "
 "import and export operations"
-msgstr ""
-"允许在导入和导出时使用 [a@http://en.wikipedia.org/wiki/Bzip2]bzip2 (外链，英"
-"文)[/a] 压缩"
+msgstr "允许在导入和导出时使用 [a@http://zh.wikipedia.org/wiki/Bzip2]bzip2[/a] 压缩"
 
 #: libraries/config/messages.inc.php:29
 msgid "Bzip2"
@@ -4208,8 +4204,8 @@ msgid ""
 "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
 "kbd] - allows newlines in columns"
 msgstr ""
-"定义编辑 CHAR 和 VARCHAR 类型字段时应使用何种控件，[kbd]输入框 (input)[/kbd] "
-"- 可以限制输入长度，[kbd]文本框 (textarea)[/kbd] - 可以输入多行数据"
+"当编辑 CHAR 和 VARCHAR 类型字段时所使用的控件；[kbd]输入框（input）[/kbd] - "
+"可以限制输入长度，[kbd]文本框（textarea）[/kbd] - 可以输入多行数据"
 
 #: libraries/config/messages.inc.php:31
 msgid "CHAR columns editing"
@@ -4220,8 +4216,7 @@ msgid ""
 "Use user-friendly editor for editing SQL queries ([a@http://codemirror.net/]"
 "CodeMirror[/a]) with syntax highlighting and line numbers"
 msgstr ""
-"使用包含语法凸显与行号的用户友好的编辑器编辑SQL语句  ([a@http://codemirror."
-"net/]CodeMirror[/a])"
+"使用带有语法高亮及行号显示的人性化编辑器来编辑 SQL 语句（[a@http://codemirror.net/]CodeMirror[/a]）"
 
 #: libraries/config/messages.inc.php:33
 msgid "Enable CodeMirror"
@@ -4231,7 +4226,7 @@ msgstr "启用 CodeMirror"
 msgid ""
 "Defines the minimum size for input fields generated for CHAR and VARCHAR "
 "columns"
-msgstr "定义编辑 CHAR 和 VARCHAR 字段时所使用输入框的最小大小"
+msgstr "当编辑 CHAR 和 VARCHAR 字段时所使用输入框的最小大小"
 
 #: libraries/config/messages.inc.php:35
 msgid "Minimum size for input field"
@@ -4241,7 +4236,7 @@ msgstr "输入框最小大小"
 msgid ""
 "Defines the maximum size for input fields generated for CHAR and VARCHAR "
 "columns"
-msgstr "定义编辑 CHAR 和 VARCHAR 字段时所使用输入框的最大大小"
+msgstr "当编辑 CHAR 和 VARCHAR 字段时所使用输入框的最大大小"
 
 #: libraries/config/messages.inc.php:37
 msgid "Maximum size for input field"
@@ -4271,9 +4266,7 @@ msgstr "检查配置文件权限"
 msgid ""
 "Compress gzip/bzip2 exports on the fly without the need for much memory; if "
 "you encounter problems with created gzip/bzip2 files disable this feature"
-msgstr ""
-"使用较少的内存进行 gzip/bzip2 实时压缩。如果创建压缩文档时发生错误，请禁用该"
-"选项"
+msgstr "在导出时使用较少的内存对 gzip/bzip2 进行实时压缩；如果您在创建 gzip/bzip2 压缩文件时遇到问题，请禁用该功能"
 
 #: libraries/config/messages.inc.php:44
 msgid "Compress on the fly"
@@ -4288,11 +4281,11 @@ msgstr "配置文件"
 msgid ""
 "Whether a warning (&quot;Are your really sure…&quot;) should be displayed "
 "when you're about to lose data"
-msgstr "当查询可能丢失数据时是否显示警告 (&quot;您真的要…&quot;)"
+msgstr "当查询可能丢失数据时是否显示警告（&quot;您真的要…&quot;）"
 
 #: libraries/config/messages.inc.php:47
 msgid "Confirm DROP queries"
-msgstr "确认删除 (DROP) 查询"
+msgstr "删除语句确认"
 
 #: libraries/config/messages.inc.php:48
 msgid "Debug SQL"
@@ -4304,31 +4297,31 @@ msgstr "默认显示模式"
 
 #: libraries/config/messages.inc.php:50
 msgid "Tab that is displayed when entering a database"
-msgstr "在进入数据库标签时默认显示的页面"
+msgstr "当进入数据库时默认显示的选项卡"
 
 #: libraries/config/messages.inc.php:51
 msgid "Default database tab"
-msgstr "默认数据库标签"
+msgstr "数据库默认选项卡"
 
 #: libraries/config/messages.inc.php:52
 msgid "Tab that is displayed when entering a server"
-msgstr "在进入服务器标签时默认显示的页面"
+msgstr "当进入服务器时默认显示的选项卡"
 
 #: libraries/config/messages.inc.php:53
 msgid "Default server tab"
-msgstr "默认服务器标签"
+msgstr "服务器默认选项卡"
 
 #: libraries/config/messages.inc.php:54
 msgid "Tab that is displayed when entering a table"
-msgstr "在进入数据表标签时默认显示的页面"
+msgstr "当进入表时默认显示的选项卡"
 
 #: libraries/config/messages.inc.php:55
 msgid "Default table tab"
-msgstr "默认数据表标签"
+msgstr "表默认选项卡"
 
 #: libraries/config/messages.inc.php:56
 msgid "Whether the table structure actions should be hidden"
-msgstr "是否隐藏表结构"
+msgstr "是否隐藏对表结构的相关操作"
 
 #: libraries/config/messages.inc.php:57
 msgid "Hide table structure actions"
@@ -4344,13 +4337,13 @@ msgstr "直接显示服务器列表而不使用下拉框"
 
 #: libraries/config/messages.inc.php:61
 msgid "Display servers as a list"
-msgstr "显示服务器为列表"
+msgstr "列表显示服务器"
 
 #: libraries/config/messages.inc.php:62
 msgid ""
 "Disable the table maintenance mass operations, like optimizing or repairing "
 "the selected tables of a database."
-msgstr "禁止大量表维护操作，例如优化或修复一个数据库中的选中表。"
+msgstr "禁止批量表维护操作，例如优化或修复数据库中选中的表。"
 
 #: libraries/config/messages.inc.php:63
 msgid "Disable multi table maintenance"
@@ -4358,7 +4351,7 @@ msgstr "禁止多表维护"
 
 #: libraries/config/messages.inc.php:64
 msgid "Edit SQL queries in popup window"
-msgstr "在新窗口中编辑 SQL 查询"
+msgstr "在弹出窗口中编辑 SQL 语句"
 
 #: libraries/config/messages.inc.php:65
 msgid "Edit in window"
@@ -4376,7 +4369,7 @@ msgstr "收集错误"
 msgid ""
 "Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no "
 "limit)"
-msgstr "设置脚本最大运行时间 (单位：秒，[kbd]0[/kbd] 为不限制)"
+msgstr "设置脚本运行最长时间（[kbd]0[/kbd] 为无限制）"
 
 #: libraries/config/messages.inc.php:69
 msgid "Maximum execution time"
@@ -4384,7 +4377,7 @@ msgstr "最长执行时间"
 
 #: libraries/config/messages.inc.php:70 prefs_manage.php:305
 msgid "Save as file"
-msgstr "另存为文件"
+msgstr "保存为文件"
 
 #: libraries/config/messages.inc.php:71 libraries/config/messages.inc.php:244
 msgid "Character set of the file"
@@ -4417,47 +4410,42 @@ msgstr "首行保存字段名"
 #: libraries/config/messages.inc.php:75 libraries/config/messages.inc.php:246
 #: libraries/config/messages.inc.php:253
 #: libraries/plugins/import/ImportCsv.class.php:150
-#, fuzzy
 #| msgid "Columns enclosed with:"
 msgid "Columns enclosed with"
-msgstr "内容分隔符："
+msgstr "内容分隔符"
 
 #: libraries/config/messages.inc.php:76 libraries/config/messages.inc.php:247
 #: libraries/config/messages.inc.php:254
 #: libraries/plugins/import/ImportCsv.class.php:157
-#, fuzzy
 #| msgid "Columns escaped with:"
 msgid "Columns escaped with"
-msgstr "内容转义符："
+msgstr "内容转义符"
 
 #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83
 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99
 #: libraries/config/messages.inc.php:107 libraries/config/messages.inc.php:111
 #: libraries/config/messages.inc.php:143 libraries/config/messages.inc.php:146
 #: libraries/config/messages.inc.php:148
-#, fuzzy
 #| msgid "Replace NULL with:"
 msgid "Replace NULL with"
-msgstr "将 NULL 替换为："
+msgstr "将 NULL 替换为"
 
 #: libraries/config/messages.inc.php:78 libraries/config/messages.inc.php:84
 msgid "Remove CRLF characters within columns"
-msgstr "删除字段中的回车换行符"
+msgstr "删除内容中的回车换行符"
 
 #: libraries/config/messages.inc.php:79 libraries/config/messages.inc.php:250
 #: libraries/config/messages.inc.php:258
 #: libraries/plugins/import/ImportCsv.class.php:135
-#, fuzzy
 #| msgid "Columns terminated by"
 msgid "Columns terminated with"
 msgstr "字段分隔符"
 
 #: libraries/config/messages.inc.php:80 libraries/config/messages.inc.php:245
 #: libraries/plugins/import/ImportCsv.class.php:164
-#, fuzzy
 #| msgid "Lines terminated with:"
 msgid "Lines terminated with"
-msgstr "换行符："
+msgstr "换行符"
 
 #: libraries/config/messages.inc.php:82
 msgid "Excel edition"
@@ -4465,15 +4453,15 @@ msgstr "Excel 版本"
 
 #: libraries/config/messages.inc.php:85
 msgid "Database name template"
-msgstr "数据库名模板"
+msgstr "数据库名称模板"
 
 #: libraries/config/messages.inc.php:86
 msgid "Server name template"
-msgstr "服务器名模板"
+msgstr "服务器名称模板"
 
 #: libraries/config/messages.inc.php:87
 msgid "Table name template"
-msgstr "数据表名模板"
+msgstr "表名称模板"
 
 #: libraries/config/messages.inc.php:91 libraries/config/messages.inc.php:104
 #: libraries/config/messages.inc.php:113 libraries/config/messages.inc.php:138
@@ -4484,24 +4472,24 @@ msgstr "数据表名模板"
 #: libraries/plugins/export/ExportOdt.class.php:77
 #: libraries/plugins/export/ExportTexytext.class.php:62
 msgid "Dump table"
-msgstr "转储数据表"
+msgstr "转储表"
 
 #: libraries/config/messages.inc.php:92
 #: libraries/plugins/export/ExportLatex.class.php:89
 msgid "Include table caption"
-msgstr "包含表的标题"
+msgstr "包含表说明"
 
 #: libraries/config/messages.inc.php:95 libraries/config/messages.inc.php:101
 msgid "Table caption"
-msgstr "表的标题"
+msgstr "表说明"
 
 #: libraries/config/messages.inc.php:96 libraries/config/messages.inc.php:102
 msgid "Continued table caption"
-msgstr "延续的表的标题"
+msgstr "表说明续"
 
 #: libraries/config/messages.inc.php:97 libraries/config/messages.inc.php:103
 msgid "Label key"
-msgstr "关键标签"
+msgstr "标签"
 
 #: libraries/config/messages.inc.php:98 libraries/config/messages.inc.php:110
 #: libraries/config/messages.inc.php:135
@@ -4526,7 +4514,7 @@ msgstr "保存在服务器上"
 #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117
 #: libraries/display_export.lib.php:387 libraries/display_export.lib.php:422
 msgid "Overwrite existing file(s)"
-msgstr "覆盖已有文件"
+msgstr "覆盖现有文件"
 
 #: libraries/config/messages.inc.php:118
 msgid "Remember file name template"
@@ -4535,11 +4523,11 @@ msgstr "记住文件名模板"
 #: libraries/config/messages.inc.php:119 libraries/operations.lib.php:195
 #: libraries/operations.lib.php:698 libraries/operations.lib.php:1039
 msgid "Add AUTO_INCREMENT value"
-msgstr "添加自增 (AUTO_INCREMENT) 值"
+msgstr "添加自增值"
 
 #: libraries/config/messages.inc.php:120
 msgid "Enclose table and column names with backquotes"
-msgstr "给数据表名及字段名加上反引号"
+msgstr "给表名及字段名加上反引号"
 
 #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:265
 #: libraries/display_export.lib.php:291
@@ -4562,14 +4550,13 @@ msgstr "使用延迟插入"
 #: libraries/config/messages.inc.php:125
 #: libraries/plugins/export/ExportSql.class.php:141
 msgid "Disable foreign key checks"
-msgstr "禁止选定不相关的主键"
+msgstr "禁止外键约束"
 
 #: libraries/config/messages.inc.php:126
 #: libraries/plugins/export/ExportSql.class.php:154
-#, fuzzy
 #| msgid "Exporting rows from \"%s\" table"
 msgid "Export views as tables"
-msgstr "正在导出数据表“%s”中的记录"
+msgstr "将视图作为表导出"
 
 #: libraries/config/messages.inc.php:127 libraries/config/messages.inc.php:128
 #: libraries/config/messages.inc.php:130 libraries/config/messages.inc.php:136
@@ -4580,7 +4567,7 @@ msgstr "添加 %s"
 
 #: libraries/config/messages.inc.php:129
 msgid "Use hexadecimal for BLOB"
-msgstr "为 BLOB 字段使用16进制 (HEX)"
+msgstr "使用十六进制表示 BLOB 数据"
 
 #: libraries/config/messages.inc.php:131
 msgid "Use ignore inserts"
@@ -4593,7 +4580,7 @@ msgstr "在插入数据时使用的语法"
 #: libraries/config/messages.inc.php:134
 #: libraries/plugins/export/ExportSql.class.php:397
 msgid "Maximal length of created query"
-msgstr "创建查询的最大长度"
+msgstr "查询语句的最大长度"
 
 #: libraries/config/messages.inc.php:139
 msgid "Export type"
@@ -4602,11 +4589,11 @@ msgstr "导出类型"
 #: libraries/config/messages.inc.php:140
 #: libraries/plugins/export/ExportSql.class.php:128
 msgid "Enclose export in a transaction"
-msgstr "处理事务中封装输出"
+msgstr "使用事务执行导出"
 
 #: libraries/config/messages.inc.php:141
 msgid "Export time in UTC"
-msgstr "以协调世界时 (UTC) 导出时间"
+msgstr "导出时间为协调世界时"
 
 #: libraries/config/messages.inc.php:149
 msgid "Force secured connection while using phpMyAdmin"
@@ -4680,7 +4667,7 @@ msgstr "导出选项"
 
 #: libraries/config/messages.inc.php:167
 msgid "Customize default export options"
-msgstr "自定义导出选项的默认值"
+msgstr "自定义默认导出选项"
 
 #: libraries/config/messages.inc.php:168 libraries/config/messages.inc.php:210
 #: setup/frames/menu.inc.php:17
@@ -4701,7 +4688,7 @@ msgstr "导入选项"
 
 #: libraries/config/messages.inc.php:173
 msgid "Customize default common import options"
-msgstr "自定义导入选项的默认值"
+msgstr "自定义默认导入选项"
 
 #: libraries/config/messages.inc.php:174
 msgid "Import / export"
@@ -4738,7 +4725,7 @@ msgstr "服务器显示选项"
 
 #: libraries/config/messages.inc.php:185
 msgid "Tables display options"
-msgstr "数据表显示选项"
+msgstr "表显示选项"
 
 #: libraries/config/messages.inc.php:186 setup/frames/menu.inc.php:23
 msgid "Main panel"
@@ -4750,11 +4737,11 @@ msgstr "微软 Office"
 
 #: libraries/config/messages.inc.php:191
 msgid "Other core settings"
-msgstr "其他核心设置"
+msgstr "其它核心设置"
 
 #: libraries/config/messages.inc.php:192
 msgid "Settings that didn't fit anywhere else"
-msgstr "其他设置"
+msgstr "暂时没有明确分类的设置"
 
 #: libraries/config/messages.inc.php:193
 msgid "Page titles"
@@ -4785,7 +4772,7 @@ msgstr "安全"
 msgid ""
 "Please note that phpMyAdmin is just a user interface and its features do not "
 "limit MySQL"
-msgstr "注意：phpMyAdmin 只是一个用户接口，其功能不会对 MySQL 有限制"
+msgstr "请注意 phpMyAdmin 只是提供了一个用户界面，其功能不会对 MySQL 造成限制"
 
 #: libraries/config/messages.inc.php:199
 msgid "Basic settings"
@@ -4807,11 +4794,11 @@ msgstr "服务器设置"
 msgid ""
 "Advanced server configuration, do not change these options unless you know "
 "what they are for"
-msgstr "高级服务器设置，如果你不知道这些是什么，请不要修改"
+msgstr "高级服务器设置，如果您不知道这些选项是什么意思，请不要修改"
 
 #: libraries/config/messages.inc.php:204
 msgid "Enter server connection parameters"
-msgstr "服务器连接参数"
+msgstr "请输入服务器连接参数"
 
 #: libraries/config/messages.inc.php:205
 msgid "Configuration storage"