From: Wang Jian <lark@src.gnome.org>
Date: Thu, 8 Nov 2001 13:49:31 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=01103fab04698ecc395754432876244b495a50af;p=dana%2Fcg-glib.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index b5cc0fca..0ffd518e 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,7 @@
+2001-11-08  Wang Jian  <lark@linux.net.cn>
+
+	* configure.in(ALL_LINGUAS): Added zh_CN for Simplified Chinese.
+
 2001-11-08  Tor Lillqvist  <tml@iki.fi>
 
 	* glib/gwin32.c: Don't define LANG_AZERI etc in case those aren't
diff --git a/configure.in b/configure.in
index e28a1287..fa7d2b9c 100644
--- a/configure.in
+++ b/configure.in
@@ -266,7 +266,7 @@ dnl
 dnl gettext support
 dnl
 
-ALL_LINGUAS="az ca de es eu fr nn no ro ru sk sl sv ta tr uk zh_TW"
+ALL_LINGUAS="az ca de es eu fr nn no ro ru sk sl sv ta tr uk zh_CN zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 if test "$gt_cv_func_dgettext_libc" = "yes" || test "$gt_cv_func_dgettext_libintl" = "yes"; then
diff --git a/po/ChangeLog b/po/ChangeLog
index 6d8dbe7b..8620568f 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2001-11-06  Wang Jian  <lark@linux.net.cn>
+
+	* zh_CN.po: Added Simplified Chinese translation by
+	He Qiangqiang <carton@263.net>.
+
 2001-11-01  Marius Andreiana  <mandreiana@yahoo.com>
 
 	* ro.po: added
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0e781f58..c5244e94 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,169 +10,169 @@ msgstr ""
 "Last-Translator: He Qiangqiang <carton@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=gb2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: glib/gconvert.c:202
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
-msgstr "²»Ö§³Ö´Ó×Ö·û¼¯¡°%s¡±µ½¡°%s¡±µÄת»»"
+msgstr "不支持从字符集“%s”到“%s”的转换"
 
 #: glib/gconvert.c:206
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
-msgstr "ÎÞ·¨´ò¿ª´Ó¡°%s¡±µ½¡°%s¡±µÄת»»Æ÷£º%s"
+msgstr "无法打开从“%s”到“%s”的转换器：%s"
 
 #: glib/gconvert.c:356 glib/gconvert.c:639 glib/giochannel.c:1282
 #: glib/giochannel.c:1324 glib/giochannel.c:2164 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
-msgstr "ת»»ÊäÈëÖгöÏÖÎÞЧ×Ö·ûÐòÁÐ"
+msgstr "转换输入中出现无效字符序列"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
 #: glib/giochannel.c:2176
 #, c-format
 msgid "Error during conversion: %s"
-msgstr "ת»»¹ý³ÌÖгö´í£º%s"
+msgstr "转换过程中出错：%s"
 
 #: glib/gconvert.c:379 glib/gutf8.c:871 glib/gutf8.c:1071 glib/gutf8.c:1212
 #: glib/gutf8.c:1317
 msgid "Partial character sequence at end of input"
-msgstr "ÊäÈëĩβ³öÏÖδ¾¡×Ö·ûÐòÁÐ"
+msgstr "输入末尾出现未尽字符序列"
 
 #: glib/gconvert.c:547
 #, c-format
 #, fuzzy
 msgid "Cannot convert fallback '%s' to codeset '%s'"
-msgstr "ÎÞ·¨×ª»» fallback ¡°%s¡±µ½×Ö·û¼¯¡°%s¡±"
+msgstr "无法转换 fallback “%s”到字符集“%s”"
 
 #: glib/gconvert.c:1261
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the file scheme"
-msgstr "URI¡°%s¡±²»ÊÇÎļþ¸ñʽµÄ¾ø¶Ô URI"
+msgstr "URI“%s”不是文件格式的绝对 URI"
 
 #: glib/gconvert.c:1271
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
-msgstr "±¾µØÎļþ URI¡°%s¡±²»ÄÜ°üº¬¡°#¡±"
+msgstr "本地文件 URI“%s”不能包含“#”"
 
 #: glib/gconvert.c:1288
 #, c-format
 msgid "The URI '%s' is invalid"
-msgstr "URI¡°%s¡±ÎÞЧ"
+msgstr "URI“%s”无效"
 
 #: glib/gconvert.c:1297
 #, c-format
 msgid "The hostname of the URI '%s' contains invalidly escaped characters"
-msgstr "URI ÖеÄÖ÷»úÃû¡°%s¡±²»ÄÜ°üº¬·Ç·¨×ªÒå×Ö·û"
+msgstr "URI 中的主机名“%s”不能包含非法转义字符"
 
 #: glib/gconvert.c:1313
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
-msgstr "URI¡°%s¡±Öаüº¬·Ç·¨×ªÒå×Ö·û"
+msgstr "URI“%s”中包含非法转义字符"
 
 #: glib/gconvert.c:1356
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
-msgstr "·¾¶Ãû¡°%s¡±²»ÊǾø¶Ô·¾¶"
+msgstr "路径名“%s”不是绝对路径"
 
 #: glib/gconvert.c:1370
 msgid "Invalid byte sequence in hostname"
-msgstr "Ö÷»úÃûÖаüº¬ÎÞЧ×Ö·ûÐòÁÐ"
+msgstr "主机名中包含无效字符序列"
 
 #: glib/gfileutils.c:309
 #, c-format
 msgid "Error reading file '%s': %s"
-msgstr "¶ÁÈ¡Îļþ¡°%s¡±³ö´í£º%s"
+msgstr "读取文件“%s”出错：%s"
 
 #: glib/gfileutils.c:367
 #, c-format
 msgid "Failed to read from file '%s': %s"
-msgstr "ÎÞ·¨¶ÁÈ¡Îļþ¡°%s¡±£º%s"
+msgstr "无法读取文件“%s”：%s"
 
 #: glib/gfileutils.c:406 glib/gfileutils.c:474
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "ÎÞ·¨´ò¿ªÎļþ¡°%s¡±£º%s"
+msgstr "无法打开文件“%s”：%s"
 
 #: glib/gfileutils.c:420
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
-msgstr "ÎÞ·¨»ñµÃÎļþ¡°%s¡±ÊôÐÔ£ºfstat() ʧ°Ü£º%s"
+msgstr "无法获得文件“%s”属性：fstat() 失败：%s"
 
 #: glib/gfileutils.c:446
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
-msgstr "ÎÞ·¨´ò¿ªÎļþ¡°%s¡±£ºfdopen() ʧ°Ü£º%s"
+msgstr "无法打开文件“%s”：fdopen() 失败：%s"
 
 #: glib/gfileutils.c:655
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
-msgstr "Ä£°å¡°%s¡±ÎÞЧ£¬²»Ó¦¸Ã°üº¬¡°%s¡±"
+msgstr "模板“%s”无效，不应该包含“%s”"
 
 #: glib/gfileutils.c:667
 #, c-format
 msgid "Template '%s' doesn't end with XXXXXX"
-msgstr "Ä£°å¡°%s¡±µÄ½áβ²»ÊÇ XXXXXX"
+msgstr "模板“%s”的结尾不是 XXXXXX"
 
 #: glib/gfileutils.c:688
 #, c-format
 msgid "Failed to create file '%s': %s"
-msgstr "ÎÞ·¨´´½¨Îļþ¡°%s¡±£º%s"
+msgstr "无法创建文件“%s”：%s"
 
 #: glib/giochannel.c:1110
 #, c-format
 msgid "Conversion from character set `%s' to `%s' is not supported"
-msgstr "²»Ö§³Ö´Ó×Ö·û¼¯¡°%s¡±×ª»»"
+msgstr "不支持从字符集“%s”转换"
 
 #: glib/giochannel.c:1114
 #, c-format
 msgid "Could not open converter from `%s' to `%s': %s"
-msgstr "ÎÞ·¨´ò¿ª´Ó¡°%s¡±µ½¡°%s¡±µÄת»»Æ÷£º%s"
+msgstr "无法打开从“%s”到“%s”的转换器：%s"
 
 #: glib/giochannel.c:1461
 msgid "Can't do a raw read in g_io_channel_read_line_string"
-msgstr "g_io_channel_read_line_string º¯ÊýÎÞ·¨½øÐÐԭʼ¶ÁÈ¡"
+msgstr "g_io_channel_read_line_string 函数无法进行原始读取"
 
 #: glib/giochannel.c:1508 glib/giochannel.c:1762 glib/giochannel.c:1848
 msgid "Leftover unconverted data in read buffer"
-msgstr "ÔÚ¶Á»º³åÀïÁôÓÐδת»»Êý¾Ý"
+msgstr "在读缓冲里留有未转换数据"
 
 #: glib/giochannel.c:1588 glib/giochannel.c:1662
 msgid "Channel terminates in a partial character"
-msgstr "ͨµÀÖÕÖ¹ÓÚδ¾¡×Ö·û"
+msgstr "通道终止于未尽字符"
 
 #: glib/giochannel.c:1648
 msgid "Can't do a raw read in g_io_channel_read_to_end"
-msgstr "g_io_channel_read_to_end º¯ÊýÎÞ·¨½øÐÐԭʼ¶ÁÈ¡"
+msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
 
 #: glib/giowin32.c:701 glib/giowin32.c:730
 msgid "Incorrect message size"
-msgstr "²»ÕýÈ·µÄÏûÏ¢´óС"
+msgstr "不正确的消息大小"
 
 #: glib/giowin32.c:1024 glib/giowin32.c:1077
 msgid "Socket error"
-msgstr "Ì×½Ó¿Ú´íÎó"
+msgstr "套接口错误"
 
 #: glib/giowin32.c:1277
 msgid "Channel set flags unsupported"
-msgstr "²»Ö§³ÖͨµÀÉèÖñêÖ¾"
+msgstr "不支持通道设置标志"
 
 #: glib/gmarkup.c:216
 #, c-format
 msgid "Error on line %d char %d: %s"
-msgstr "µÚ%dÐеÚ%d¸ö×Ö·û³ö´í£º%s"
+msgstr "第%d行第%d个字符出错：%s"
 
 #: glib/gmarkup.c:300
 #, c-format
 msgid "Error on line %d: %s"
-msgstr "µÚ%dÐгö´í£º%s"
+msgstr "第%d行出错：%s"
 
 #: glib/gmarkup.c:379
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
-"·¢ÏÖ¿ÕµÄʵÌå¡°&;¡±¡£ÓÐЧµÄʵÌåΪ£º&amp; &quot; &lt; &gt; &apos;"
+"发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
 
 #: glib/gmarkup.c:389
 #, c-format
@@ -181,27 +181,27 @@ msgid ""
 "begins an entity; if this ampersand isn't supposed to be an entity, escape "
 "it as &amp;"
 msgstr ""
-"×Ö·û¡°%s¡±³öÏÖÔÚʵÌåÃûµÄ¿ªÍ·ÎÞЧ¡£ÊµÌ嶼ÒÔ & ×Ö·û "
-"¿ªÍ·£¬Èç¹ûÕâ¸ö & ²»ÊÇÒ»¸öʵÌåµÄ¿ªÍ·£¬°ÑËü"
-"±äΪ &amp;"
+"字符“%s”出现在实体名的开头无效。实体都以 & 字符 "
+"开头，如果这个 & 不是一个实体的开头，把它"
+"变为 &amp;"
 
 #: glib/gmarkup.c:425
 #, c-format
 msgid "Character '%s' is not valid inside an entity name"
-msgstr "×Ö·û¡°%s¡±ÔÚʵÌåÃûÖÐÎÞЧ"
+msgstr "字符“%s”在实体名中无效"
 
 #: glib/gmarkup.c:469
 #, c-format
 msgid "Entity name '%s' is not known"
-msgstr "δ֪µÄʵÌåÃû¡°%s¡±"
+msgstr "未知的实体名“%s”"
 
 #: glib/gmarkup.c:479
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
 msgstr ""
-"ʵÌåûÓÐÒԷֺŽáÊø¡£ºÜ¿ÉÄÜÄúʹÓÃÁË & "
-"×Ö·û¶øÓÖ²»ÊÇÒ»¸öʵÌ塪¡ª½«Õâ¸ö & ±äΪ &amp;"
+"实体没有以分号结束。很可能您使用了 & "
+"字符而又不是一个实体――将这个 & 变为 &amp;"
 
 #: glib/gmarkup.c:525
 #, c-format
@@ -209,17 +209,17 @@ msgid ""
 "Failed to parse '%s', which should have been a digit inside a character "
 "reference (&#234; for example) - perhaps the digit is too large"
 msgstr ""
-"ÎÞ·¨½âÎö¡°%s¡±¡£ËüÓ¦¸ÃÊÇ×Ö·ûÒýÓÃÖеÄÊý×Ö"
-"£¨Èç&#234;£©¡ª¡ª¿ÉÄܸÃÊý×ÖÌ«´óÁË"
+"无法解析“%s”。它应该是字符引用中的数字"
+"（如&#234;）――可能该数字太大了"
 
 #: glib/gmarkup.c:550
 #, c-format
 msgid "Character reference '%s' does not encode a permitted character"
-msgstr "×Ö·ûÒýÓá°%s¡±¶ÔÒ»¸öÒÑÔÊÐíµÄ×Ö·û±àÂë"
+msgstr "字符引用“%s”对一个已允许的字符编码"
 
 #: glib/gmarkup.c:567
 msgid "Empty character reference; should include a digit such as &#454;"
-msgstr "¿ÕµÄ×Ö·ûÒýÓá£Ó¦¸Ã°üÀ¨Êý×Ö£¬Èç &#454;"
+msgstr "空的字符引用。应该包括数字，如 &#454;"
 
 #: glib/gmarkup.c:577
 msgid ""
@@ -227,16 +227,16 @@ msgid ""
 "ampersand character without intending to start an entity - escape ampersand "
 "as &amp;"
 msgstr ""
-"×Ö·ûÒýÓÃûÓÐÒԷֺŽáÊø¡£ºÜ¿ÉÄÜÄúʹÓÃÁË & "
-"×Ö·û¶øÓÖ²»ÊÇÒ»¸öʵÌ塪¡ª½«Õâ¸ö & ±äΪ &amp;"
+"字符引用没有以分号结束。很可能您使用了 & "
+"字符而又不是一个实体――将这个 & 变为 &amp;"
 
 #: glib/gmarkup.c:827 glib/gmarkup.c:855 glib/gmarkup.c:886
 msgid "Invalid UTF-8 encoded text"
-msgstr "ÎÞЧµÄ UTF-8 ±àÂëÎı¾"
+msgstr "无效的 UTF-8 编码文本"
 
 #: glib/gmarkup.c:922
 msgid "Document must begin with an element (e.g. <book>)"
-msgstr "Îĵµ±ØÐëÒÔÒ»¸öÔªËØ¿ªÊ¼£¨ÀýÈç <book>£©"
+msgstr "文档必须以一个元素开始（例如 <book>）"
 
 #: glib/gmarkup.c:960
 #, c-format
@@ -244,8 +244,8 @@ msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
 msgstr ""
-"¡°%s¡±³öÏÖÔÚ×Ö·û¡°<¡±ºóÊÇÎÞЧ×Ö·û£¬Ëü²»ÄÜ×÷Ϊ"
-"ÔªËØÃûµÄ¿ªÍ·"
+"“%s”出现在字符“<”后是无效字符，它不能作为"
+"元素名的开头"
 
 #: glib/gmarkup.c:1023
 #, c-format
@@ -253,15 +253,15 @@ msgid ""
 "Odd character '%s', expected a '>' character to end the start tag of element "
 "'%s'"
 msgstr ""
-"×Ö·û¡°%s¡±ÎÞЧ£¬ÔªËØ¡°%s¡±Æðʼ±ê¼ÇµÄ½áβ"
-"Ô¤ÆÚ³öÏÖ×Ö·û¡°>¡±"
+"字符“%s”无效，元素“%s”起始标记的结尾"
+"预期出现字符“>”"
 
 #: glib/gmarkup.c:1110
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr ""
-"×Ö·û¡°%s¡±ÎÞЧ£¬ÔªËØ¡°%s¡±µÄÊôÐÔÃû¡°%s¡±ºóÔ¤ÆÚ³öÏÖ×Ö·û¡°=¡±"
+"字符“%s”无效，元素“%s”的属性名“%s”后预期出现字符“=”"
 
 #: glib/gmarkup.c:1151
 #, c-format
@@ -270,9 +270,9 @@ msgid ""
 "element '%s', or optionally an attribute; perhaps you used an invalid "
 "character in an attribute name"
 msgstr ""
-"×Ö·û¡°%s¡±ÎÞЧ£¬ÔÚÔªËØ¡°%s¡±Æðʼ±ê¼ÇµÄ½áβԤÆÚ³öÏÖ×Ö·û¡°>¡±»ò¡°/¡±£¬"
-"Ò²¿ÉÒÔÊǸÃÔªËصÄÊôÐÔ¡£¿ÉÄÜÄúÔÚÊôÐÔÃûÖÐʹÓÃÁË"
-"ÎÞЧ×Ö·û"
+"字符“%s”无效，在元素“%s”起始标记的结尾预期出现字符“>”或“/”，"
+"也可以是该元素的属性。可能您在属性名中使用了"
+"无效字符"
 
 #: glib/gmarkup.c:1224
 #, c-format
@@ -280,8 +280,8 @@ msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
 "giving value for attribute '%s' of element '%s'"
 msgstr ""
-"×Ö·û¡°%s¡±ÎÞЧ£¬ÔÚ¸øÔªËØ¡°%s¡±µÄÊôÐÔ¡°%s¡±¸³ÖµÊ±£¬Ô¤ÆÚÔÚ"
-"µÈºÅºó³öÏÖÒýºÅ"
+"字符“%s”无效，在给元素“%s”的属性“%s”赋值时，预期在"
+"等号后出现引号"
 
 #: glib/gmarkup.c:1351
 #, c-format
@@ -289,18 +289,18 @@ msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr ""
-"¡°%s¡±³öÏÖÔÚ×Ö·û¡°</¡±ºóÎÞЧ¡£¡°%s¡±²»ÄÜ×÷Ϊ"
-"ÔªËØÃûµÄ¿ªÍ·"
+"“%s”出现在字符“</”后无效。“%s”不能作为"
+"元素名的开头"
 
 #: glib/gmarkup.c:1388
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
-msgstr "ÔªËØ¡°%s¡±ÒѾ­½áÊø£¬Ã»ÓÐδ½áÊøµÄÔªËØ"
+msgstr "元素“%s”已经结束，没有未结束的元素"
 
 #: glib/gmarkup.c:1397
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
-msgstr "ÔªËØ¡°%s¡±ÒѾ­½áÊø£¬µ±Ç°Î´½áÊøµÄÔªËØÊÇ¡°%s¡±"
+msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
 
 #: glib/gmarkup.c:1408
 #, c-format
@@ -308,17 +308,17 @@ msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
 msgstr ""
-"¡°%s¡±³öÏÖÔÚ½áÊøµÄÔªËØÃûÎÞЧ¡£"
-"ÔÊÐíµÄ×Ö·ûÊÇ¡°>¡±"
+"“%s”出现在结束的元素名无效。"
+"允许的字符是“>”"
 
 #: glib/gmarkup.c:1541
 #, fuzzy
 msgid "Document was empty or contained only whitespace"
-msgstr "ÎĵµÎª¿Õ»ò½öº¬¿Õ°××Ö·û"
+msgstr "文档为空或仅含空白字符"
 
 #: glib/gmarkup.c:1555
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
-msgstr "ÎĵµÔÚÒ»¸ö´ò¿ªµÄ¼âÀ¨ºÅ¡°<¡±ºóÒâÍâ½áÊø"
+msgstr "文档在一个打开的尖括号“<”后意外结束"
 
 #: glib/gmarkup.c:1563 glib/gmarkup.c:1606
 #, c-format
@@ -326,8 +326,8 @@ msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr ""
-"ÎĵµÔÚ»¹´æÔÚδ½áÊøÔªËØʱÒâÍâ½áÊø¡ª¡ª×îºóµÄδ½áÊøÔªËØ"
-"ÊÇ¡°%s¡±"
+"文档在还存在未结束元素时意外结束――最后的未结束元素"
+"是“%s”"
 
 #: glib/gmarkup.c:1571
 #, c-format
@@ -335,144 +335,144 @@ msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
 msgstr ""
-"ÎĵµÒâÍâ½áÊø£¬Ô¤ÆÚÒÔÓÒ¼âÀ¨ºÅ¡°>¡±À´½áÊø"
-"񈬀 <%s/>"
+"文档意外结束，预期以右尖括号“>”来结束"
+"标记 <%s/>"
 
 #: glib/gmarkup.c:1577
 msgid "Document ended unexpectedly inside an element name"
-msgstr "ÎĵµÔÚÔªËØÃûÖÐÒâÍâ½áÊø"
+msgstr "文档在元素名中意外结束"
 
 #: glib/gmarkup.c:1582
 msgid "Document ended unexpectedly inside an attribute name"
-msgstr "ÎĵµÔÚÊôÐÔÃûÖÐÒâÍâ½áÊø"
+msgstr "文档在属性名中意外结束"
 
 #: glib/gmarkup.c:1587
 msgid "Document ended unexpectedly inside an element-opening tag."
-msgstr "ÎĵµÔÚÔªËØÆðʼ±ê¼ÇÖÐÒâÍâ½áÊø"
+msgstr "文档在元素起始标记中意外结束"
 
 #: glib/gmarkup.c:1593
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr ""
-"ÎĵµÔÚ¸úÔÚÊôÐÔÃûºóµÄµÈºÅºóÒâÍâ½áÊø¡£"
-"ûÓÐÊôÐÔÖµ"
+"文档在跟在属性名后的等号后意外结束。"
+"没有属性值"
 
 #: glib/gmarkup.c:1599
 msgid "Document ended unexpectedly while inside an attribute value"
-msgstr "ÎĵµÔÚÊôÐÔÖµÖÐÒâÍâ½áÊø"
+msgstr "文档在属性值中意外结束"
 
 #: glib/gmarkup.c:1614
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
-msgstr "ÎĵµÔÚÔªËØ¡°%s¡±½áÊø±ê¼ÇÖÐÒâÍâ½áÊø"
+msgstr "文档在元素“%s”结束标记中意外结束"
 
 #: glib/gmarkup.c:1620
 msgid "Document ended unexpectedly inside a comment or processing instruction"
-msgstr "ÎĵµÔÚ×¢ÊÍ»ò´¦ÀíÖ¸ÁîÖÐÒâÍâ½áÊø"
+msgstr "文档在注释或处理指令中意外结束"
 
 #: glib/gshell.c:69
 msgid "Quoted text doesn't begin with a quotation mark"
-msgstr "ÒýÓõÄÎı¾Ã»ÓÐÒÔÒýºÅ¿ªÍ·"
+msgstr "引用的文本没有以引号开头"
 
 #: glib/gshell.c:159
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
-msgstr "ÃüÁîÐлòÆäËûshellÒýÓÃÎı¾ÖгöÏÖ²»Æ¥ÅäµÄÒýºÅ"
+msgstr "命令行或其他shell引用文本中出现不匹配的引号"
 
 #: glib/gshell.c:526
 #, c-format
 msgid "Text ended just after a '' character. (The text was '%s')"
-msgstr "Îı¾ÔÚÒ»¸ö '' ×Ö·ûºó½áÊø¡££¨Îı¾Îª¡°%s¡±£©"
+msgstr "文本在一个 '' 字符后结束。（文本为“%s”）"
 
 #: glib/gshell.c:533
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
-msgstr "Îı¾ÔÚÕÒµ½Óë %c Æ¥ÅäµÄÒýºÅ֮ǰ½áÊø¡££¨Îı¾Îª¡°%s¡±£©"
+msgstr "文本在找到与 %c 匹配的引号之前结束。（文本为“%s”）"
 
 #: glib/gshell.c:545
 msgid "Text was empty (or contained only whitespace)"
-msgstr "¿ÕÎı¾£¨»ò½öº¬¿Õ°××Ö·û£©"
+msgstr "空文本（或仅含空白字符）"
 
 #: glib/gspawn-win32.c:212
 msgid "Failed to read data from child process"
-msgstr "ÎÞ·¨´Ó×Ó½ø³ÌÖжÁÈ¡Êý¾Ý"
+msgstr "无法从子进程中读取数据"
 
 #: glib/gspawn-win32.c:361
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
 msgstr ""
-"g_io_channel_win32_poll() ´Ó×Ó½ø³ÌÖжÁÈ¡Êý¾Ýʱ³öÏÖ"
-"Òì³£´íÎó"
+"g_io_channel_win32_poll() 从子进程中读取数据时出现"
+"异常错误"
 
 #: glib/gspawn-win32.c:837 glib/gspawn.c:907
 #, c-format
 msgid "Failed to read from child pipe (%s)"
-msgstr "ÎÞ·¨´Ó×ӹܵÀÖжÁÈ¡£¨%s£©"
+msgstr "无法从子管道中读取（%s）"
 
 #: glib/gspawn-win32.c:925 glib/gspawn.c:1112
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
-msgstr "ÎÞ·¨Çл»µ½Ä¿Â¼¡°%s¡±£¨%s£©"
+msgstr "无法切换到目录“%s”（%s）"
 
 #: glib/gspawn-win32.c:934 glib/gspawn.c:1122
 #, c-format
 msgid "Failed to execute child process (%s)"
-msgstr "ÎÞ·¨Ö´ÐÐ×Ó½ø³Ì£¨%s£©"
+msgstr "无法执行子进程（%s）"
 
 #: glib/gspawn-win32.c:975 glib/gspawn.c:1219
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
-msgstr "ÎÞ·¨´´½¨Óë×Ó½ø³ÌͨѶµÄ¹ÜµÀ£¨%s£©"
+msgstr "无法创建与子进程通讯的管道（%s）"
 
 #: glib/gspawn.c:159
 #, c-format
 msgid "Failed to read data from child process (%s)"
-msgstr "ÎÞ·¨´Ó×Ó½ø³ÌÖжÁÈ¡Êý¾Ý£¨%s£©"
+msgstr "无法从子进程中读取数据（%s）"
 
 #: glib/gspawn.c:290
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
-msgstr "select() ÔÚ´Ó×Ó½ø³ÌÖжÁÈ¡Êý¾Ýʱ³öÏÖÒì³£´íÎó£¨%s£©"
+msgstr "select() 在从子进程中读取数据时出现异常错误（%s）"
 
 #: glib/gspawn.c:373
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
-msgstr "waitpid() ³öÏÖÒì³£´íÎó£¨%s£©"
+msgstr "waitpid() 出现异常错误（%s）"
 
 #: glib/gspawn.c:972
 #, c-format
 msgid "Failed to fork (%s)"
-msgstr "ÎÞ·¨ fork£¨%s£©"
+msgstr "无法 fork（%s）"
 
 #: glib/gspawn.c:1131
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
-msgstr "ÎÞ·¨Öض¨Ïò×Ó½ø³ÌµÄÊäÈë»òÊä³ö£¨%s£©"
+msgstr "无法重定向子进程的输入或输出（%s）"
 
 #: glib/gspawn.c:1140
 #, c-format
 msgid "Failed to fork child process (%s)"
-msgstr "ÎÞ·¨ fork ×Ó½ø³Ì£¨%s£©"
+msgstr "无法 fork 子进程（%s）"
 
 #: glib/gspawn.c:1148
 msgid "Unknown error executing child process"
-msgstr "Ö´ÐÐ×Ó½ø³Ìʱ³öÏÖδ֪´íÎó "
+msgstr "执行子进程时出现未知错误 "
 
 #: glib/gspawn.c:1169
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
-msgstr "ÎÞ·¨´Ó×Ó½ø³Ì¹ÜµÀÖжÁÈ¡×ã¹»µÄÊý¾Ý£¨%s£©"
+msgstr "无法从子进程管道中读取足够的数据（%s）"
 
 #: glib/gutf8.c:950
 msgid "Character out of range for UTF-8"
-msgstr "×Ö·û³¬³ö UTF-8 ·¶Î§"
+msgstr "字符超出 UTF-8 范围"
 
 #: glib/gutf8.c:1039 glib/gutf8.c:1048 glib/gutf8.c:1180 glib/gutf8.c:1189
 #: glib/gutf8.c:1331 glib/gutf8.c:1427
 msgid "Invalid sequence in conversion input"
-msgstr "ת»»ÊäÈëÖгöÏÖÎÞЧÐòÁÐ"
+msgstr "转换输入中出现无效序列"
 
 #: glib/gutf8.c:1342 glib/gutf8.c:1438
 msgid "Character out of range for UTF-16"
-msgstr "×Ö·û³¬³ö UTF-16 ·¶Î§"
+msgstr "字符超出 UTF-16 范围"