diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3a0c173355..65cb27834b 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-25 12:52+0200\n"
+"PO-Revision-Date: 2013-08-25 17:21+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: Simplified Chinese "
 "<http://l10n.cihar.com/projects/phpmyadmin/master/zh_CN/>\n"
@@ -3190,8 +3190,7 @@ msgid ""
 "Cannot save UI property \"%s\". The changes made will not be persistent "
 "after you refresh this page. Please check if the table structure has been "
 "changed."
-msgstr ""
-"无法保存用户界面属性 \"%s\"。修改将在刷新本页后丢失。请检查表结构是否已修改。"
+msgstr "无法保存用户界面属性“%s”。修改将在刷新本页后丢失。请检查表结构是否已修改。"
 
 #: libraries/TableSearch.class.php:181 libraries/insert_edit.lib.php:211
 #: libraries/insert_edit.lib.php:217 libraries/rte/rte_routines.lib.php:1582
@@ -3218,7 +3217,7 @@ msgstr "普通搜索"
 
 #: libraries/TableSearch.class.php:217 libraries/TableSearch.class.php:1170
 msgid "Find and Replace"
-msgstr ""
+msgstr "查找并替换"
 
 #: libraries/TableSearch.class.php:239 libraries/insert_edit.lib.php:1357
 msgid "Edit/Insert"
@@ -3226,7 +3225,7 @@ msgstr "编辑/插入"
 
 #: libraries/TableSearch.class.php:771
 msgid "Select columns (at least one):"
-msgstr "选择字段 (至少一个)："
+msgstr "选择字段（至少一个）："
 
 #: libraries/TableSearch.class.php:790 libraries/display_indexes.lib.php:197
 #: libraries/insert_edit.lib.php:1191 libraries/server_privileges.lib.php:382
@@ -3235,7 +3234,7 @@ msgstr "或"
 
 #: libraries/TableSearch.class.php:791
 msgid "Add search conditions (body of the \"where\" clause):"
-msgstr "添加搜索条件 (“where”语句的主体)："
+msgstr "添加搜索条件（“where”从句的主体）："
 
 #: libraries/TableSearch.class.php:801
 msgid "Number of rows per page"
@@ -3251,10 +3250,11 @@ msgstr "使用该字段标记每个点"
 
 #: libraries/TableSearch.class.php:868
 msgid "Maximum rows to plot"
-msgstr "显示的最多行数"
+msgstr "图表中的最大行数"
 
 #: libraries/TableSearch.class.php:897 libraries/TableSearch.class.php:1201
 #: libraries/sql.lib.php:371 tbl_change.php:146
+#, fuzzy
 msgid "Browse foreign values"
 msgstr "浏览不相关的值"
 
@@ -3264,11 +3264,11 @@ msgstr "附加搜索条件"
 
 #: libraries/TableSearch.class.php:1149
 msgid "Do a \"query by example\" (wildcard: \"%\") for two different columns"
-msgstr "在两个不同的字段中执行 “依例查询” (通配符：“%”)"
+msgstr "在两个不同的字段中执行“依例查询”（通配符：“%”）"
 
 #: libraries/TableSearch.class.php:1159
 msgid "Do a \"query by example\" (wildcard: \"%\")"
-msgstr "执行“依例查询”(通配符：“%”)"
+msgstr "执行“依例查询”（通配符：“%”）"
 
 #: libraries/TableSearch.class.php:1210
 msgid "Browse/Edit the points"
@@ -3283,43 +3283,38 @@ msgid "Reset zoom"
 msgstr "重置缩放"
 
 #: libraries/TableSearch.class.php:1279
-#, fuzzy
 #| msgid "Replace NULL with:"
 msgid "Replace with:"
-msgstr "将 NULL 替换为："
+msgstr "替换为："
 
 #: libraries/TableSearch.class.php:1339
 msgid "Find and replace - preview"
-msgstr ""
+msgstr "查找并替换 - 预览"
 
 #: libraries/TableSearch.class.php:1343
-#, fuzzy
 #| msgid "Column"
 msgid "Count"
-msgstr "字段"
+msgstr "数量"
 
 #: libraries/TableSearch.class.php:1344
-#, fuzzy
 #| msgid "Original position"
 msgid "Original string"
-msgstr "初始位置"
+msgstr "替换前"
 
 #: libraries/TableSearch.class.php:1345
-#, fuzzy
 #| msgid "Related Links"
 msgid "Replaced string"
-msgstr "相关链接"
+msgstr "替换后"
 
 #: libraries/TableSearch.class.php:1369
-#, fuzzy
 #| msgid "Replicated"
 msgid "Replace"
-msgstr "已复制"
+msgstr "替换"
 
 #: libraries/Theme.class.php:170
 #, php-format
 msgid "No valid image path for theme %s found!"
-msgstr "找不到主题 %s 对应的图片路径！"
+msgstr "找不到主题 %s 的有效图片路径！"
 
 #: libraries/Theme.class.php:402
 msgid "No preview available."
@@ -3332,12 +3327,12 @@ msgstr "确定"
 #: libraries/Theme_Manager.class.php:139
 #, php-format
 msgid "Default theme %s not found!"
-msgstr "未找到默认主题 %s ！"
+msgstr "未找到默认主题 %s！"
 
 #: libraries/Theme_Manager.class.php:196
 #, php-format
 msgid "Theme %s not found!"
-msgstr "未找到主题 %s ！"
+msgstr "未找到主题 %s！"
 
 #: libraries/Theme_Manager.class.php:276
 #, php-format
@@ -3351,54 +3346,47 @@ msgstr "主题："
 #: libraries/Types.class.php:297
 msgid ""
 "A 1-byte integer, signed range is -128 to 127, unsigned range is 0 to 255"
-msgstr "1比特的整数，有符号的表示范围是-128到127,无符号的表示范围是0到255"
+msgstr "1 字节整数，有符号范围从 -128 到 127，无符号范围从 0 到 255"
 
 #: libraries/Types.class.php:299
 msgid ""
 "A 2-byte integer, signed range is -32,768 to 32,767, unsigned range is 0 to "
 "65,535"
-msgstr ""
-"2比特的整数，有符号的表示范围是-32768到32767,无符号的表示范围是0到65535"
+msgstr "2 字节整数，有符号范围从 -32768 到 32767，无符号范围从 0 到 65535"
 
 #: libraries/Types.class.php:301
 msgid ""
 "A 3-byte integer, signed range is -8,388,608 to 8,388,607, unsigned range is "
 "0 to 16,777,215"
-msgstr ""
-"3比特的整数，有符号的表示范围是-8388608到8388607,无符号的表示范围是0到"
-"16777215"
+msgstr "3 字节整数，有符号范围从 -8388608 到 8388607，无符号范围从 0 到 16777215"
 
 #: libraries/Types.class.php:303
 msgid ""
 "A 4-byte integer, signed range is -2,147,483,648 to 2,147,483,647, unsigned "
 "range is 0 to 4,294,967,295"
-msgstr ""
-"4比特的整数，有符号的表示范围是-2147483648到2147483647,无符号的表示范围是0到"
-"4294967295。"
+msgstr "4 字节整数，有符号范围从 -2147483648 到 2147483647，无符号范围从 0 到 4294967295"
 
 #: libraries/Types.class.php:305
 msgid ""
 "An 8-byte integer, signed range is -9,223,372,036,854,775,808 to "
 "9,223,372,036,854,775,807, unsigned range is 0 to 18,446,744,073,709,551,615"
 msgstr ""
-"8比特的整数，有符号的表示范围是-9223372036854775808到9223372036854775807,无符"
-"号的表示范围是0到18446744073709551615"
+"8 字节整数，有符号范围从 -9223372036854775808 到 9223372036854775807，无符号范围从 0 到 "
+"18446744073709551615"
 
 #: libraries/Types.class.php:307 libraries/Types.class.php:714
 msgid ""
 "A fixed-point number (M, D) - the maximum number of digits (M) is 65 "
 "(default 10), the maximum number of decimals (D) is 30 (default 0)"
-msgstr ""
-"一个定点数值 (M, D)-数字(M)的最大值是65（默认值是10），十进制数字(D)的最大值"
-"是30（默认值是0）"
+msgstr "定点数（M，D）- 整数部分（M）最大为 65（默认 10），小数部分（D）最大为 30（默认 0）"
 
 #: libraries/Types.class.php:309
 msgid ""
 "A small floating-point number, allowable values are -3.402823466E+38 to "
 "-1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38"
 msgstr ""
-"小型浮点数，允许值可以是在-3.402823466E+38和-1.175494351E-38之间，或者是 0，"
-"或者在 1.175494351E-38 到 3.402823466E+38之间"
+"单精度浮点数，取值范围从 -3.402823466E+38 到 -1.175494351E-38、0 以及从 1.175494351E-38 到 "
+"3.402823466E+38"
 
 #: libraries/Types.class.php:311
 msgid ""
@@ -3406,41 +3394,40 @@ msgid ""
 "-1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and "
 "2.2250738585072014E-308 to 1.7976931348623157E+308"
 msgstr ""
-"双精度浮点数，允许的值为-1.7976931348623157E+308 到 "
-"-2.2250738585072014E-308, 0, 以及 2.2250738585072014E-308 到 "
-"1.7976931348623157E+308"
+"双精度浮点数，取值范围从 -1.7976931348623157E+308 到 -2.2250738585072014E-308、0 以及从 "
+"2.2250738585072014E-308 到 1.7976931348623157E+308"
 
 #: libraries/Types.class.php:313
 msgid ""
 "Synonym for DOUBLE (exception: in REAL_AS_FLOAT SQL mode it is a synonym for "
 "FLOAT)"
-msgstr "DOUBLE 的别名（除了在 REAL_AS_FLOAT SQL 模式下它是 FLOAT类型的别名）"
+msgstr "DOUBLE 的别名（例外：REAL_AS_FLOAT SQL 模式时它是 FLOAT 的别名）"
 
 #: libraries/Types.class.php:315
 msgid ""
 "A bit-field type (M), storing M of bits per value (default is 1, maximum is "
 "64)"
-msgstr "一个位域类型（M），每个值保存M位（默认是1，最大为64）"
+msgstr "位类型（M），每个值存储 M 位（默认为 1，最大为 64）"
 
 #: libraries/Types.class.php:317
 msgid ""
 "A synonym for TINYINT(1), a value of zero is considered false, nonzero "
 "values are considered true"
-msgstr "TINYINT(1) 的一个别名，值为0时表示 false，不为零是表示 true"
+msgstr "TINYINT(1) 的别名，零值表示假，非零值表示真"
 
 #: libraries/Types.class.php:319
 msgid "An alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE"
-msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE 的别称"
+msgstr "BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE 的别名"
 
 #: libraries/Types.class.php:321 libraries/Types.class.php:724
 #, php-format
 msgid "A date, supported range is %1$s to %2$s"
-msgstr "从 %1$s 到 %2$s 之间的一个日期"
+msgstr "日期，支持的范围从 %1$s 到 %2$s"
 
 #: libraries/Types.class.php:323 libraries/Types.class.php:726
 #, php-format
 msgid "A date and time combination, supported range is %1$s to %2$s"
-msgstr "日期与时间的结合，支持的范围是从 %1$s 到 %2$s"
+msgstr "日期与时间，支持的范围从 %1$s 到 %2$s"
 
 #: libraries/Types.class.php:325
 msgid ""