Version 1.3.11GLIB_1_3_11

Thu Nov 22 13:56:55 2001  Owen Taylor  <otaylor@redhat.com>

        * Version 1.3.11

1 files changed, 28 insertions, 46 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45a303784..94b8af62b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
-"POT-Creation-Date: 2001-11-02 10:09+0800\n"
+"POT-Creation-Date: 2001-11-22 14:08-0500\n"
 "PO-Revision-Date: 2001-11-03 22:42+0800\n"
 "Last-Translator: He Qiangqiang <carton@263.net>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -24,13 +24,13 @@ msgid "Could not open converter from '%s' to '%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/giochannel.c:1324 glib/giochannel.c:2163 glib/gutf8.c:875
 #: glib/gutf8.c:1321
 msgid "Invalid byte sequence in conversion input"
 msgstr "转换输入中出现无效字符序列"
 
 #: glib/gconvert.c:361 glib/gconvert.c:572 glib/giochannel.c:1289
-#: glib/giochannel.c:2176
+#: glib/giochannel.c:2175
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "转换过程中出错：%s"
@@ -41,8 +41,7 @@ msgid "Partial character sequence at end of input"
 msgstr "输入末尾出现未尽字符序列"
 
 #: glib/gconvert.c:547
-#, c-format
-#, fuzzy
+#, fuzzy, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "无法转换 fallback “%s”到字符集“%s”"
 
@@ -130,19 +129,19 @@ msgstr "不支持从字符集“%s”到“%s”的转换"
 msgid "Could not open converter from `%s' to `%s': %s"
 msgstr "无法打开从“%s”到“%s”的转换器：%s"
 
-#: glib/giochannel.c:1461
+#: glib/giochannel.c:1460
 msgid "Can't do a raw read in 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
+#: glib/giochannel.c:1507 glib/giochannel.c:1761 glib/giochannel.c:1847
 msgid "Leftover unconverted data in read buffer"
 msgstr "在读缓冲里留有未转换数据"
 
-#: glib/giochannel.c:1588 glib/giochannel.c:1662
+#: glib/giochannel.c:1587 glib/giochannel.c:1661
 msgid "Channel terminates in a partial character"
 msgstr "通道终止于未尽字符"
 
-#: glib/giochannel.c:1648
+#: glib/giochannel.c:1647
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
 
@@ -171,8 +170,7 @@ 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;"
+msgstr "发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
 
 #: glib/gmarkup.c:389
 #, c-format
@@ -181,9 +179,8 @@ 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
@@ -200,17 +197,15 @@ 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
 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;)－可能该数字太大了"
+msgstr "无法解析“%s”。它应该是字符引用中的数字(如&#234;)－可能该数字太大了"
 
 #: glib/gmarkup.c:550
 #, fuzzy, c-format
@@ -227,8 +222,8 @@ 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"
@@ -243,23 +238,20 @@ msgstr "文档必须以一个元素开始(例如 <book>)"
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
-msgstr ""
-"“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
+msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
 
 #: glib/gmarkup.c:1023
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the start tag of element "
 "'%s'"
-msgstr ""
-"字符“%s”无效，应该以字符“>”来结束元素“%s”的起始标记"
+msgstr "字符“%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”)的后应该是字符“=”"
+msgstr "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
 
 #: glib/gmarkup.c:1151
 #, c-format
@@ -268,24 +260,22 @@ 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
 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”)赋值时，在等号后应该是引号"
+msgstr "字符“%s”无效，在给属性“%s”(元素“%s”)赋值时，在等号后应该是引号"
 
 #: glib/gmarkup.c:1351
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
-msgstr ""
-"“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
+msgstr "“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
 
 #: glib/gmarkup.c:1388
 #, c-format
@@ -302,8 +292,7 @@ msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
-msgstr ""
-"“%s”出现在结束的元素名无效；允许的字符是“>”"
+msgstr "“%s”出现在结束的元素名无效；允许的字符是“>”"
 
 #: glib/gmarkup.c:1541
 msgid "Document was empty or contained only whitespace"
@@ -318,17 +307,14 @@ msgstr "文档在一个打开的尖括号“<”后意外结束"
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
-msgstr ""
-"文档在还存在未结束元素时意外结束－最后的未结束元素"
-"是“%s”"
+msgstr "文档在还存在未结束元素时意外结束－最后的未结束元素是“%s”"
 
 #: glib/gmarkup.c:1571
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
-msgstr ""
-"文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
+msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
 
 #: glib/gmarkup.c:1577
 msgid "Document ended unexpectedly inside an element name"
@@ -346,9 +332,7 @@ msgstr "文档在元素起始标记中意外结束"
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
-msgstr ""
-"文档在跟在属性名后的等号后意外结束；"
-"没有属性值"
+msgstr "文档在跟在属性名后的等号后意外结束；没有属性值"
 
 #: glib/gmarkup.c:1599
 msgid "Document ended unexpectedly while inside an attribute value"
@@ -393,9 +377,7 @@ msgstr "无法从子进程中读取数据"
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
-msgstr ""
-"g_io_channel_win32_poll() 从子进程中读取数据时出现"
-"异常错误"
+msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
 
 #: glib/gspawn-win32.c:837 glib/gspawn.c:907
 #, c-format