[gconf] Update Simplified Chinese translation.

[Aron Xu <aronxu src gnome org>]

commit f91f3383b146025c9d58c767d1ccb5e3be062f29
Author: Aron Xu <aronxu gnome org>
Date:   Wed Mar 9 18:52:20 2011 +0800

    Update Simplified Chinese translation.

 po/zh_CN.po |   40 ++++++++++++++++++++++++----------------
 1 files changed, 24 insertions(+), 16 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 31fb52f..a6165e3 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"