Update Simplified Chinese translation.

1 files changed, 24 insertions, 16 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31fb52f7..a6165e37 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,26 +1,26 @@
-# Translation of gconf.po to zh_CN
-# Copyright (C) 2001-2009 Free Software Foundation, Inc.
+# Chinese (China) translation of gconf
+# Copyright (C) 2001-2009, 2011 Free Software Foundation, Inc.
 # Wang Jian <lark@linux.net.cn>, 2001.
 # Xiong Jiang <jxiong@offtopic.org>, 2003.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 # LoneStar <lone@auvtech.com>, 2004.
 # Yang Zhang <zyangmath@gmail.com>, 2009.
 # Ray Wang <wanglei1123@gmail.com>, 2009.
-#
+# Wei Li <lw124124@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gconf HEAD\n"
+"Project-Id-Version: gconf master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gconf&component=general\n"
-"POT-Creation-Date: 2010-12-23 17:43+0000\n"
-"PO-Revision-Date: 2010-12-26 00:36+0800\n"
-"Last-Translator: Hinker <hinkerliu@gmail.com>\n"
-"Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
-"Language: \n"
+"POT-Creation-Date: 2011-03-06 07:57+0000\n"
+"PO-Revision-Date: 2011-03-09 18:49+0800\n"
+"Last-Translator: 李炜 <lw124124@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh\n"
 
 #: ../backends/evoldap-backend.c:162
 #, c-format
@@ -654,8 +654,8 @@ msgstr "同步一个或多个源失败：%s"
 #: ../gconf/gconf-database.c:1047
 #, c-format
 msgid ""
-"Error obtaining new value for `%s' after change notification from backend `"
-"%s': %s"
+"Error obtaining new value for `%s' after change notification from backend `%"
+"s': %s"
 msgstr "在后端“%2$s”发送的更改通知后获取“%1$s”的新值出错：%3$s"
 
 #: ../gconf/gconf-database.c:1120
@@ -1004,8 +1004,8 @@ msgid ""
 "or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/"
 "gconf/ for information. (Details - %s)"
 msgstr ""
-"联系配置服务器失败，可能的原因是没有或不当配置的 D-Bus 会话总线守护进程。"
-"请访问 http://projects.gnome.org/gconf/ 了解详细信息。(详细信息 - %s)"
+"联系配置服务器失败，可能的原因是没有或不当配置的 D-Bus 会话总线守护进程。请访"
+"问 http://projects.gnome.org/gconf/ 了解详细信息。(详细信息 - %s)"
 
 #: ../gconf/gconf-internals.c:2878
 msgid "none"
@@ -1420,8 +1420,8 @@ msgstr "获取 ConfigServer 的对象引用失败"
 #: ../gconf/gconfd.c:919
 #, c-format
 msgid ""
-"Failed to write byte to pipe file descriptor %d so client program may hang: "
-"%s"
+"Failed to write byte to pipe file descriptor %d so client program may hang: %"
+"s"
 msgstr "将字节写入管道文件描述符 %d 失败，所以客户端程序可能挂起：%s"
 
 #: ../gconf/gconfd.c:965
@@ -2355,7 +2355,7 @@ msgstr "警告：解析 schema (%s) 的默认值“%s”失败\n"
 #: ../gconf/gconftool.c:3347
 #, c-format
 msgid "WARNING: invalid or missing car_type or cdr_type for schema (%s)\n"
-msgstr "警告：schema (%s) car_type 或 cdr_type 无效或缺少 \n"
+msgstr "警告：schema (%s) car_type 或 cdr_type 无效或缺少\n"
 
 #: ../gconf/gconftool.c:3372
 #, c-format
@@ -2548,6 +2548,14 @@ msgstr ""
 "正在试图通过为目录中的键设置不正确的值来破坏您的应用程序：\n"
 "  %s\n"
 
+#: ../gsettings/gsettings-data-convert.desktop.in.h:1
+msgid "GSettings Data Conversion"
+msgstr "GSettings 数据转换"
+
+#: ../gsettings/gsettings-data-convert.desktop.in.h:2
+msgid "Migrates user settings from GConf to dconf"
+msgstr "由 GConf 迁移用户设置到 dconf "
+
 #~ msgid "Could not send message to GConf daemon: %s"
 #~ msgstr "无法发送消息到 GConf 守护进程：%s"