merged Chinese Simplified translation from royclarck

diff --git a/NEWS b/NEWS
index 1dec4be..259f163 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 ** psensor: support of appindicator < 0.2.9
 ** psensor: closing the window hides psensor instead of quitting when
    application indicator support is enabled. 
+** psensor: added chinese simplified translation from royclarck
 
 * v0.6.1.9
 

diff --git a/po/zh_CN.po b/po/zh_CN.po
index c6a1998..505b528 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,19 +2,21 @@
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the psensor package.
 # wpitchoune <wpitchoune@gmail.com>, 2011.
-# Chinese translation from 大宝 <linux.dabao@gmail.com>
+# Chinese translation from 大宝 <linux.dabao@gmail.com>, royclarck
 msgid ""
 msgstr ""
 "Project-Id-Version: psensor 0.6.0.10\n"
 "Report-Msgid-Bugs-To: wpitchoune@gmail.com\n"
 "POT-Creation-Date: 2011-05-09 09:32+0200\n"
-"PO-Revision-Date: 2011-02-07 22:21+0100\n"
-"Last-Translator: 大宝 <linux.dabao@gmail.com>\n"
+"PO-Revision-Date: 2011-06-06 08:59+0000\n"
+"Last-Translator: royclark <Unknown>\n"
 "Language-Team: Chinese (simplified)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-06-06 09:00+0000\n"
+"X-Generator: Launchpad (build 13144)\n"
 
 #: src/main.c:69 src/server/server.c:74
 #, c-format
@@ -29,25 +31,27 @@ msgstr ""
 #: src/main.c:79 src/server/server.c:84
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
-msgstr ""
+msgstr "用法：%s [选项]...\n"
 
 #: src/main.c:81
 msgid ""
 "psensor is a GTK application for monitoring hardware sensors, including "
 "temperatures and fan speeds."
-msgstr ""
+msgstr "psensor 是一个 GTK 程序，用来监视硬件传感器，包括温度和风扇转速。"
 
 #: src/main.c:86 src/server/server.c:91
 msgid ""
 "  -h, --help          display this help and exit\n"
 "  -v, --version       display version information and exit"
 msgstr ""
+"  -h, --help 显示这个帮助并退出\n"
+"  -v, --version 显示版本信息并退出"
 
 #: src/main.c:92
 msgid ""
 "  -u, --url=URL       the URL of the psensor-server, example: http://"
 "hostname:3131"
-msgstr ""
+msgstr "  -u, --url=URL psensor服务器的 URL ，比如：http://hostname:3131"
 
 #: src/main.c:98 src/server/server.c:103
 #, c-format
@@ -84,7 +88,7 @@ msgstr "选项"
 
 #: src/ui_sensorlist.c:291
 msgid "Select foreground color"
-msgstr ""
+msgstr "选择前景色"
 
 #: src/ui_sensorlist.c:374 src/ui_pref.c:249
 msgid "Sensor"
@@ -129,7 +133,7 @@ msgstr ""
 
 #: src/ui_notify.c:65 src/ui_notify.c:69
 msgid "Temperature alert"
-msgstr ""
+msgstr "温度报警"
 
 #: src/ui_pref.c:200
 msgid "Graph Colors"
@@ -161,11 +165,11 @@ msgstr "图表"
 
 #: src/ui_pref.c:236
 msgid "Graph update interval:"
-msgstr ""
+msgstr "图表更新间隔："
 
 #: src/ui_pref.c:241
 msgid "Graph monitoring duration:"
-msgstr ""
+msgstr "图表监视持续时间："
 
 #: src/ui_pref.c:251
 msgid "Measure update interval:"
@@ -204,9 +208,8 @@ msgid "Keep window below"
 msgstr "保持在最底层"
 
 #: src/ui_pref.c:307
-#, fuzzy
 msgid "Edit Preferences"
-msgstr "监视设备选项"
+msgstr ""
 
 #: src/ui_sensorpref.c:67
 msgid "Sensor Information"
@@ -229,9 +232,8 @@ msgid "Draw sensor curve"
 msgstr "绘制监视曲线"
 
 #: src/ui_sensorpref.c:86
-#, fuzzy
 msgid "Color:"
-msgstr "颜色:"
+msgstr ""
 
 #: src/ui_sensorpref.c:89
 msgid "Alarm"
@@ -293,13 +295,15 @@ msgstr ""
 #: src/server/server.c:86
 msgid ""
 "psensor-server is an HTTP server for monitoring hardware sensors remotely."
-msgstr ""
+msgstr "psensor 服务器是用来远程监视硬件的 HTTP 服务器。"
 
 #: src/server/server.c:97
 msgid ""
 "  -p,--port=PORT webserver port\n"
 "  -w,--wdir=DIR  directory containing webserver pages"
 msgstr ""
+"  -p,--port=PORT 服务器端口\n"
+"  -w,--wdir=DIR 包含服务器页面的目录"
 
 #: src/server/server.c:198
 msgid "ERROR: Lua support not enabled\n"