Update Chinese simplified translation

1 files changed, 71 insertions, 166 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index aa603853..a9a86533 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,159 +1,82 @@
-# Simplified Chinese translation to gnome-desktop
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Chinese simplified translation for gnome-desktop.
+# Copyright (C) 2009-2013 Freesoftware Fundation, Inc.
 # This file is distributed under the same license as the gnome-desktop package.
-#
-# Dillion Chen <dillon.chen@turbolinux.com.cn>
-#   Updated and QA by Wang Jian <lark@linux.net.cn>
-#   Updated and QA by Jiang Xiong <jxiong@gwu.edu>
-#   Updated and QA by Zipeco <zipeco@btamail.net.cn>
-#   Updated and QA by He Qiangqiang <carton@linux.net.cn>
-#   Updated and QA by Funda Wang <fundawang@linux.net.cn>, 2003.
-# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2009.
-# Aron Xu <aronxu@gnome.org>, 2009.
-# lainme <lainme993@gmail.com>, 2010.
-# vicwjb <vicwjb@gmail.com>, 2010.
+# Dillion Chen <dillon.chen@turbolinux.com.cn>			
+#   Updated and QA by Wang Jian <lark@linux.net.cn>			
+#   Updated and QA by Jiang Xiong <jxiong@gwu.edu>			
+#   Updated and QA by Zipeco <zipeco@btamail.net.cn>			
+#   Updated and QA by He Qiangqiang <carton@linux.net.cn>			
+#   Updated and QA by Funda Wang <fundawang@linux.net.cn>, 2003.			
+# 甘露(Gan Lu) <rhythm.gan@gmail.com>, 2009.			
+# Aron Xu <aronxu@gnome.org>, 2009.			
+# lainme <lainme993@gmail.com>, 2010.			
+# vicwjb <vicwjb@gmail.com>, 2010.			
 # YunQiang Su <wzssyqa@gmail.com>, 2012.
+# Sphinx Jiang <yishanj13@gmail.com>, 2013.
 #
+
 msgid ""
 msgstr ""
-"Project-Id-Version: gnome-desktop master\n"
+"Project-Id-Version: gnome-desktop 3.10\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
 "desktop&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-27 17:54+0000\n"
-"PO-Revision-Date: 2013-03-31 12:13+0800\n"
-"Last-Translator: tuhaihe <1132321739qq@gmail.com>\n"
+"POT-Creation-Date: 2013-10-22 09:19+0000\n"
+"PO-Revision-Date: 2013-11-17 19:29+0800\n"
+"Last-Translator: Sphinx Jiang <yishanj13@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
-
-#. Translators: "Unknown" here is used to identify a monitor for which
-#. * we don't know the vendor. When a vendor is known, the name of the
-#. * vendor is used.
-#: ../libgnome-desktop/display-name.c:107
-msgctxt "Monitor vendor"
-msgid "Unknown"
-msgstr "未知"
 
-#: ../libgnome-desktop/gnome-languages.c:804
+#: ../libgnome-desktop/gnome-languages.c:718
 msgid "Unspecified"
 msgstr "未指定"
 
-#. Translators: a CRTC is a CRT Controller (this is X terminology).
-#: ../libgnome-desktop/gnome-rr.c:452
-#, c-format
-msgid "could not get the screen resources (CRTCs, outputs, modes)"
-msgstr "无法得到屏幕来源(CRTC，输出，模式)"
-
-#: ../libgnome-desktop/gnome-rr.c:472
-#, c-format
-msgid "unhandled X error while getting the range of screen sizes"
-msgstr "试图得到屏幕大小范围时出现无法处理的 X 错误"
-
-#: ../libgnome-desktop/gnome-rr.c:478
-#, c-format
-msgid "could not get the range of screen sizes"
-msgstr "无法得到屏幕大小范围"
-
-#: ../libgnome-desktop/gnome-rr.c:769
-#, c-format
-msgid "RANDR extension is not present"
-msgstr "没有 RANDR 扩展"
-
-#: ../libgnome-desktop/gnome-rr.c:1580
-#, c-format
-msgid "could not get information about output %d"
-msgstr "无法得到输出 %d 的有关信息"
-
-#: ../libgnome-desktop/gnome-rr.c:1764
-msgid "Built-in Display"
-msgstr "内置显示器"
-
-#. Translators: %s is the size of the monitor in inches
-#: ../libgnome-desktop/gnome-rr.c:1782
-#, c-format
-msgid "%s Display"
-msgstr "%s 显示器"
-
-#: ../libgnome-desktop/gnome-rr.c:1789
-msgid "Unknown Display"
-msgstr "未知显示器"
-
-#. Translators: the "position", "size", and "maximum"
-#. * words here are not keywords; please translate them
-#. * as usual.  A CRTC is a CRT Controller (this is X terminology)
-#: ../libgnome-desktop/gnome-rr.c:2234
-#, c-format
-msgid ""
-"requested position/size for CRTC %d is outside the allowed limit: position="
-"(%d, %d), size=(%d, %d), maximum=(%d, %d)"
-msgstr ""
-"CRTC %d 需要的位置/大小在限制允许之外：位置=(%d, %d)，大小=(%d, %d)，最大="
-"(%d, %d)"
-
-#: ../libgnome-desktop/gnome-rr.c:2270
-#, c-format
-msgid "could not set the configuration for CRTC %d"
-msgstr "无法为 CRTC %d 设定配置"
-
-#: ../libgnome-desktop/gnome-rr.c:2421
-#, c-format
-msgid "could not get information about CRTC %d"
-msgstr "无法获得CRTC %d的相关信息。"
-
-#: ../libgnome-desktop/gnome-rr-config.c:708
-#, c-format
-msgid ""
-"none of the saved display configurations matched the active configuration"
-msgstr "已保存的设置中没有匹配活动设置的"
-
-#: ../libgnome-desktop/gnome-rr-config.c:1464
+#: ../libgnome-desktop/gnome-rr-config.c:743
 #, c-format
 msgid "CRTC %d cannot drive output %s"
 msgstr "CRTC %d 不能驱动输出 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1471
+#: ../libgnome-desktop/gnome-rr-config.c:750
 #, c-format
 msgid "output %s does not support mode %dx%d@%dHz"
-msgstr "输出 %s 不支持模式 %dx%d@%dHz"
+msgstr "输出 %s 不支持 %dx%d@%dHz 模式"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1482
+#: ../libgnome-desktop/gnome-rr-config.c:761
 #, c-format
-msgid "CRTC %d does not support rotation=%s"
-msgstr "CRTC %d 不支持旋转 =%s"
+msgid "CRTC %d does not support rotation=%d"
+msgstr "CRTC %d 不支持旋转=%d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1496
+#: ../libgnome-desktop/gnome-rr-config.c:774
 #, c-format
 msgid ""
 "output %s does not have the same parameters as another cloned output:\n"
 "existing mode = %d, new mode = %d\n"
 "existing coordinates = (%d, %d), new coordinates = (%d, %d)\n"
-"existing rotation = %s, new rotation = %s"
+"existing rotation = %d, new rotation = %d"
 msgstr ""
-"输出 %s 和另一个克隆的输出没有相同参数：\n"
-"当前模式 = %d，新模式 = %d\n"
-"当前坐标 = (%d，%d)，新坐标 = (%d，%d)\n"
-"当前旋转 = %s，新旋转 = %s"
+"输出 %s 和另一个克隆输出的参数不相同:\n"
+"当前模式= %d，新模式= %d\n"
+"当前坐标= (%d, %d)，新坐标= (%d, %d)当前旋转= %d，新旋转= %d"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1511
+#: ../libgnome-desktop/gnome-rr-config.c:789
 #, c-format
 msgid "cannot clone to output %s"
-msgstr "无法克隆到输出 %s"
+msgstr "不能克隆到输出 %s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1680
+#: ../libgnome-desktop/gnome-rr-config.c:915
 #, c-format
 msgid "Trying modes for CRTC %d\n"
-msgstr "为 CRTC %d 尝试模式\n"
+msgstr "正在尝试 CRTC %d 的各种模式\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1704
+#: ../libgnome-desktop/gnome-rr-config.c:939
 #, c-format
 msgid "CRTC %d: trying mode %dx%d@%dHz with output at %dx%d@%dHz (pass %d)\n"
-msgstr "CRTC %d：尝试 %dx%d@%dHz 模式输出在 %dx%d@%dHz (通过 %d)\n"
+msgstr "CRTC %d: 正在尝试 %dx%d@%dHz 模式，使用 %dx%d@%dHz 输出(第 %d 回)\n"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1751
+#: ../libgnome-desktop/gnome-rr-config.c:986
 #, c-format
 msgid ""
 "could not assign CRTCs to outputs:\n"
@@ -162,7 +85,7 @@ msgstr ""
 "无法指定 CRTC 到输出：\n"
 "%s"
 
-#: ../libgnome-desktop/gnome-rr-config.c:1755
+#: ../libgnome-desktop/gnome-rr-config.c:990
 #, c-format
 msgid ""
 "none of the selected modes were compatible with the possible modes:\n"
@@ -174,42 +97,39 @@ msgstr ""
 #. Translators: the "requested", "minimum", and
 #. * "maximum" words here are not keywords; please
 #. * translate them as usual.
-#: ../libgnome-desktop/gnome-rr-config.c:1833
+#: ../libgnome-desktop/gnome-rr-config.c:1071
 #, c-format
 msgid ""
 "required virtual size does not fit available size: requested=(%d, %d), "
 "minimum=(%d, %d), maximum=(%d, %d)"
 msgstr ""
-"需要的虚拟大小大于可用大小：需求=(%d, %d)，最小=(%d, %d)，最大=(%d, %d)"
+"要求的虚拟尺寸不符合可用尺寸： 要求=(%d, %d)， 最小=(%d, %d)，最大=(%d, %d)"
 
 #. Translators: This is the time format with full date used
 #. in 24-hour mode.
-#. The character between %R and %S is U+2236 RATIO
-#: ../libgnome-desktop/gnome-wall-clock.c:268
-msgid "%a %b %e, %R∶%S"
-msgstr "%m月%d日%A，%R∶%S"
+#: ../libgnome-desktop/gnome-wall-clock.c:270
+msgid "%a %b %e, %R:%S"
+msgstr "%b %e %a, %R:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:269
+#: ../libgnome-desktop/gnome-wall-clock.c:271
 msgid "%a %b %e, %R"
-msgstr "%m月%d日%A，%R"
+msgstr "%b %e %a, %R"
 
 #. Translators: This is the time format with day used
 #. in 24-hour mode.
-#. The character between %R and %S is U+2236 RATIO
-#: ../libgnome-desktop/gnome-wall-clock.c:274
-msgid "%a %R∶%S"
-msgstr "%A %R:%S"
-
 #: ../libgnome-desktop/gnome-wall-clock.c:275
+msgid "%a %R:%S"
+msgstr "%a %R:%S"
+
+#: ../libgnome-desktop/gnome-wall-clock.c:276
 msgid "%a %R"
-msgstr "%A %R"
+msgstr "%a %R"
 
 #. Translators: This is the time format without date used
 #. in 24-hour mode.
-#. The character between %R and %S is U+2236 RATIO
 #: ../libgnome-desktop/gnome-wall-clock.c:280
-msgid "%R∶%S"
-msgstr "%R∶%S"
+msgid "%R:%S"
+msgstr "%R:%S"
 
 #: ../libgnome-desktop/gnome-wall-clock.c:280
 msgid "%R"
@@ -217,45 +137,30 @@ msgstr "%R"
 
 #. Translators: This is a time format with full date used
 #. for AM/PM.
-#. The Unicode characters are U+2236 RATIO and
-#. U+2009 THIN SPACE
-#: ../libgnome-desktop/gnome-wall-clock.c:288
-msgid "%a %b %e, %l∶%M∶%S %p"
-msgstr "%m月%d日%A，%p %I:%M:%S"
+#: ../libgnome-desktop/gnome-wall-clock.c:286
+msgid "%a %b %e, %l:%M:%S %p"
+msgstr "%b %e %a, %p %l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:289
-msgid "%a %b %e, %l∶%M %p"
-msgstr "%m月%d日%A，%p %I:%M"
+#: ../libgnome-desktop/gnome-wall-clock.c:287
+msgid "%a %b %e, %l:%M %p"
+msgstr "%b %e %a, %p %l:%M"
 
 #. Translators: This is a time format with day used
 #. for AM/PM.
-#. The Unicode characters are U+2236 RATIO and
-#. U+2009 THIN SPACE
-#: ../libgnome-desktop/gnome-wall-clock.c:295
-msgid "%a %l∶%M∶%S %p"
-msgstr "%A %p %I:%M:%S"
+#: ../libgnome-desktop/gnome-wall-clock.c:291
+msgid "%a %l:%M:%S %p"
+msgstr "%a %p %l:%M:%S"
 
-#: ../libgnome-desktop/gnome-wall-clock.c:296
-msgid "%a %l∶%M %p"
-msgstr "%A %p %I:%M"
+#: ../libgnome-desktop/gnome-wall-clock.c:292
+msgid "%a %l:%M %p"
+msgstr "%a %p %l:%M"
 
 #. Translators: This is a time format without date used
 #. for AM/PM.
-#. The Unicode characters are U+2236 RATIO and
-#. U+2009 THIN SPACE
-#: ../libgnome-desktop/gnome-wall-clock.c:302
-msgid "%l∶%M∶%S %p"
-msgstr "%p %l∶%M∶%S"
-
-#: ../libgnome-desktop/gnome-wall-clock.c:303
-msgid "%l∶%M %p"
-msgstr "%p %l∶%M"
-
-#~ msgid "Cannot find a terminal, using xterm, even if it may not work"
-#~ msgstr "无法找到正在使用xterm的终端程序，可能他无法工作"
-
-#~ msgid "Laptop"
-#~ msgstr "笔记本电脑"
+#: ../libgnome-desktop/gnome-wall-clock.c:296
+msgid "%l:%M:%S %p"
+msgstr "%p %l:%M:%S"
 
-#~ msgid "Mirrored Displays"
-#~ msgstr "镜像显示"
+#: ../libgnome-desktop/gnome-wall-clock.c:297
+msgid "%l:%M %p"
+msgstr "%p %l:%M"