Merge remote-tracking branch 'pootle/master'

po/zh_CN.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-08-08 16:05+0200\n"
-"PO-Revision-Date: 2011-08-08 08:33+0200\n"
+"PO-Revision-Date: 2011-08-09 08:37+0200\n"
 "Last-Translator: shanyan baishui <Siramizu@gmail.com>\n"
 "Language-Team: chinese_simplified <zh_CN@li.org>\n"
 "Language: zh_CN\n"
@@ -983,10 +983,9 @@ msgstr "这不是一个数字！"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:51
-#, fuzzy
 #| msgid "Log file count"
 msgid "Total count"
-msgstr "日志文件总数"
+msgstr "总计"
 
 #: js/messages.php:54
 msgid "The host name is empty!"
@@ -1031,24 +1030,22 @@ msgid "Edit"
 msgstr "编辑"
 
 #: js/messages.php:66 server_status.php:667
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "选择服务器"
+msgstr "实时流量图"
 
 #: js/messages.php:67 server_status.php:670
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "实时连接/进程图"
 
 #: js/messages.php:68 server_status.php:688
-#, fuzzy
 #| msgid "Show query chart"
 msgid "Live query chart"
-msgstr "显示查询图表"
+msgstr "实时查询图"
 
 #: js/messages.php:70
 msgid "Static data"
-msgstr ""
+msgstr "静态数据"
 
 #. l10n: Total number of queries
 #: js/messages.php:72 libraries/build_html_for_db.lib.php:46
@@ -1061,7 +1058,7 @@ msgstr "总计"
 #. l10n: Other, small valued, queries
 #: js/messages.php:74 server_status.php:873
 msgid "Other"
-msgstr ""
+msgstr "其它"
 
 #. l10n: Thousands separator
 #: js/messages.php:76 libraries/common.lib.php:1356
@@ -1075,31 +1072,29 @@ msgstr "."
 
 #: js/messages.php:80
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "自上次刷新起发送的数据 [单位: KB]"
 
 #: js/messages.php:81
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "自上次刷新起接收的数据 [单位: KB]"
 
 #: js/messages.php:82
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "选择服务器"
+msgstr "服务器流量 (单位: KB)"
 
 #: js/messages.php:83
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "自上次刷新起的连接数"
 
 #: js/messages.php:84 js/messages.php:115 server_status.php:1068
 msgid "Processes"
 msgstr "进程"
 
 #: js/messages.php:85
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "连接"
+msgstr "连接 / 进程"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
@@ -1117,15 +1112,15 @@ msgstr "查询统计"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "系统 CPU 使用"
 
 #: js/messages.php:95
 msgid "System memory"
-msgstr ""
+msgstr "系统内存"
 
 #: js/messages.php:96
 msgid "System swap"
-msgstr ""
+msgstr "系统交换空间"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:97 libraries/common.lib.php:1306 server_status.php:1512
@@ -1139,7 +1134,7 @@ msgstr "KB"
 
 #: js/messages.php:100
 msgid "Average load"
-msgstr ""
+msgstr "平均负载"
 
 #: js/messages.php:101
 #, fuzzy
@@ -1244,27 +1239,27 @@ msgstr "无"
 
 #: js/messages.php:127
 msgid "Resume monitor"
-msgstr ""
+msgstr "继续监控"
 
 #: js/messages.php:128
 msgid "Pause monitor"
-msgstr ""
+msgstr "暂停监控"
 
 #: js/messages.php:130
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log 和 slow_query_log 已启用。"
 
 #: js/messages.php:131
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log 已启用。"
 
 #: js/messages.php:132
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log 已启用。"
 
 #: js/messages.php:133
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log 和 general_log 已禁用。"
 
 #: js/messages.php:134
 msgid "log_output is not set to TABLE."