merged translations from LP

[psensor.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8ed854d..4c58b7f 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-05-02 19:16+0000\n"
-"X-Generator: Launchpad (build 15185)\n"
+"X-Launchpad-Export-Date: 2012-05-13 09:32+0000\n"
+"X-Generator: Launchpad (build 15225)\n"
 
 #: src/glade/psensor-pref.glade:7
 msgid "Edit Preferences"
@@ -123,7 +123,7 @@ msgstr "监视设备选项"
 #: src/lib/psensor.c:234 src/lib/psensor.c:482 src/ui_sensorlist.c:378
 #: src/ui_sensorlist.c:379 src/ui_sensorlist.c:380 src/ui_notify.c:81
 msgid "N/A"
-msgstr ""
+msgstr "N/A"
 
 #: src/glade/sensor-edit.glade:119
 msgid "Name:"
@@ -562,26 +562,3 @@ msgstr ""
 #: src/ui_sensorpref.c:478
 msgid "Sensor Name"
 msgstr "传感器名称"
-
-#, fuzzy
-#~ msgid ""
-#~ "  -d, --debug=LEVEL     set the debug level, integer between\n"
-#~ "                        0 and 3"
-#~ msgstr "  -d，--debug=LEVEL 设置调试等级，等级为 0 到 3 之间的整数"
-
-#~ msgid "_Sensor Preferences"
-#~ msgstr "传感器首选项(_S)"
-
-#, fuzzy
-#~ msgid "hddtemp: wrong string: %s"
-#~ msgstr "错误：不正确的硬盘字符串：%s"
-
-#, fuzzy
-#~ msgid "hddtemp: wrong hdd string: %s."
-#~ msgstr "错误：不正确的硬盘字符串：%s"
-
-#~ msgid "ERROR: wrong hdd string: %s\n"
-#~ msgstr "错误：不正确的硬盘字符串：%s\n"
-
-#~ msgid "ERROR: create_sensor, wrong feature type\n"
-#~ msgstr "错误：创建传感器时，不正确的特征类型\n"