Release 2.21.0

1 files changed, 142 insertions, 154 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 07e234da9..ccbf6e2eb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 18:27-0400\n"
+"POT-Creation-Date: 2009-05-03 17:49-0400\n"
 "PO-Revision-Date: 2009-03-27 14:56+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
@@ -301,66 +301,39 @@ msgstr "打开文件“%s”失败：open() 失败：%s"
 msgid "Failed to map file '%s': mmap() failed: %s"
 msgstr "映射文件“%s”失败：mmap() 失败：%s"
 
-#: glib/gmarkup.c:255 glib/gmarkup.c:295
+#: glib/gmarkup.c:303 glib/gmarkup.c:343
 #, c-format
 msgid "Error on line %d char %d: "
 msgstr "第%d行第%d个字符出错："
 
-#: glib/gmarkup.c:389
-#, c-format
-msgid "Error on line %d: %s"
-msgstr "第%d行出错：%s"
-
-#: glib/gmarkup.c:493
-msgid ""
-"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
-msgstr "发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
+#: glib/gmarkup.c:363 glib/gmarkup.c:441
+#, fuzzy, c-format
+msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
+msgstr "无效的 UTF-8 编码文本 - “%s”无效"
 
-#: glib/gmarkup.c:503
+#: glib/gmarkup.c:374
 #, c-format
-msgid ""
-"Character '%s' is not valid at the start of an entity name; the & character "
-"begins an entity; if this ampersand isn't supposed to be an entity, escape "
-"it as &amp;"
+msgid "'%s' is not a valid name "
 msgstr ""
-"字符“%s”出现在实体名的开头无效。实体都以 & 字符 开头，如果这个 & 不是一个实体"
-"的开头，把它变为 &amp;"
 
-#: glib/gmarkup.c:537
+#: glib/gmarkup.c:390
 #, c-format
-msgid "Character '%s' is not valid inside an entity name"
-msgstr "字符“%s”在实体名中无效"
+msgid "'%s' is not a valid name: '%c' "
+msgstr ""
 
-#: glib/gmarkup.c:574
+#: glib/gmarkup.c:494
 #, c-format
-msgid "Entity name '%s' is not known"
-msgstr "未知的实体名“%s”"
-
-#: glib/gmarkup.c:585
-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;"
+msgid "Error on line %d: %s"
+msgstr "第%d行出错：%s"
 
-#: glib/gmarkup.c:638
+#: glib/gmarkup.c:578
 #, 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;) - 可能该数字太大了"
 
-#: glib/gmarkup.c:660
-#, c-format
-msgid "Character reference '%-.*s' does not encode a permitted character"
-msgstr "字符引用“%-.*s”不是编码一个被允许的字符"
-
-#: glib/gmarkup.c:675
-msgid "Empty character reference; should include a digit such as &#454;"
-msgstr "空的字符引用；应该包括数字，如 &#454;"
-
-#: glib/gmarkup.c:685
+#: glib/gmarkup.c:590
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
@@ -369,52 +342,54 @@ msgstr ""
 "字符引用没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变"
 "为 &amp;"
 
-#: glib/gmarkup.c:771
-msgid "Unfinished entity reference"
-msgstr "未完成的实体引用"
-
-#: glib/gmarkup.c:777
-msgid "Unfinished character reference"
-msgstr "未完成的字符引用"
+#: glib/gmarkup.c:616
+#, c-format
+msgid "Character reference '%-.*s' does not encode a permitted character"
+msgstr "字符引用“%-.*s”不是编码一个被允许的字符"
 
-#: glib/gmarkup.c:1063
-msgid "Invalid UTF-8 encoded text - overlong sequence"
-msgstr "无效的 UTF-8 编码文本 - 序列过长"
+#: glib/gmarkup.c:654
+msgid ""
+"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
+msgstr "发现空的实体“&;”。有效的实体为：&amp; &quot; &lt; &gt; &apos;"
 
-#: glib/gmarkup.c:1091
-msgid "Invalid UTF-8 encoded text - not a start char"
-msgstr "无效的 UTF-8 编码文本 - 非开始字符"
+#: glib/gmarkup.c:662
+#, fuzzy, c-format
+msgid "Entity name '%-.*s' is not known"
+msgstr "未知的实体名“%s”"
 
-#: glib/gmarkup.c:1130
-#, c-format
-msgid "Invalid UTF-8 encoded text - not valid '%s'"
-msgstr "无效的 UTF-8 编码文本 - “%s”无效"
+#: glib/gmarkup.c:667
+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;"
 
-#: glib/gmarkup.c:1168
+#: glib/gmarkup.c:973
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "文档必须以一个元素开始(例如 <book>)"
 
-#: glib/gmarkup.c:1208
+#: glib/gmarkup.c:1013
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
 "element name"
 msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
 
-#: glib/gmarkup.c:1276
+#: glib/gmarkup.c:1081
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag '%"
 "s'"
 msgstr "字符“%s”无效，应该以字符“>”来结束空元素标记“%s”"
 
-#: glib/gmarkup.c:1365
+#: glib/gmarkup.c:1165
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
 msgstr "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
 
-#: glib/gmarkup.c:1407
+#: glib/gmarkup.c:1206
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -424,87 +399,87 @@ msgstr ""
 "字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能"
 "您在属性名中使用了无效字符"
 
-#: glib/gmarkup.c:1493
+#: glib/gmarkup.c:1283
 #, 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”)赋值时，在等号后应该是引号"
 
-#: glib/gmarkup.c:1635
+#: glib/gmarkup.c:1417
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
 "begin an element name"
 msgstr "“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
 
-#: glib/gmarkup.c:1675
+#: glib/gmarkup.c:1453
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
 "allowed character is '>'"
 msgstr "“%s”出现在结束的元素名“%s”后无效；允许的字符是“>”"
 
-#: glib/gmarkup.c:1686
+#: glib/gmarkup.c:1464
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "元素“%s”已经结束，没有未结束的元素"
 
-#: glib/gmarkup.c:1695
+#: glib/gmarkup.c:1473
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
 
-#: glib/gmarkup.c:1858
+#: glib/gmarkup.c:1640
 msgid "Document was empty or contained only whitespace"
 msgstr "文档为空或仅含空白字符"
 
-#: glib/gmarkup.c:1872
+#: glib/gmarkup.c:1654
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "文档在一个打开的尖括号“<”后意外结束"
 
-#: glib/gmarkup.c:1880 glib/gmarkup.c:1925
+#: glib/gmarkup.c:1662 glib/gmarkup.c:1707
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
 "element opened"
 msgstr "文档在还存在未结束元素时意外结束 - 最后的未结束元素是“%s”"
 
-#: glib/gmarkup.c:1888
+#: glib/gmarkup.c:1670
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
 "the tag <%s/>"
 msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
 
-#: glib/gmarkup.c:1894
+#: glib/gmarkup.c:1676
 msgid "Document ended unexpectedly inside an element name"
 msgstr "文档在元素名中意外结束"
 
-#: glib/gmarkup.c:1900
+#: glib/gmarkup.c:1682
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "文档在属性名中意外结束"
 
-#: glib/gmarkup.c:1905
+#: glib/gmarkup.c:1687
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "文档在元素起始标记中意外结束"
 
-#: glib/gmarkup.c:1911
+#: glib/gmarkup.c:1693
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
 msgstr "文档在跟在属性名后的等号后意外结束；没有属性值"
 
-#: glib/gmarkup.c:1918
+#: glib/gmarkup.c:1700
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "文档在属性值中意外结束"
 
-#: glib/gmarkup.c:1934
+#: glib/gmarkup.c:1716
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "文档在元素“%s”结束标记中意外结束"
 
-#: glib/gmarkup.c:1940
+#: glib/gmarkup.c:1722
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "文档在注释或处理指令中意外结束"
 
@@ -939,61 +914,61 @@ msgstr "转换输入中出现无效序列"
 msgid "Character out of range for UTF-16"
 msgstr "字符超出 UTF-16 范围"
 
-#: glib/goption.c:615
+#: glib/goption.c:724
 msgid "Usage:"
 msgstr "用法："
 
-#: glib/goption.c:615
+#: glib/goption.c:724
 msgid "[OPTION...]"
 msgstr "[选项...]"
 
-#: glib/goption.c:719
+#: glib/goption.c:828
 msgid "Help Options:"
 msgstr "帮助选项："
 
-#: glib/goption.c:720
+#: glib/goption.c:829
 msgid "Show help options"
 msgstr "显示帮助选项"
 
-#: glib/goption.c:726
+#: glib/goption.c:835
 msgid "Show all help options"
 msgstr "显示全部帮助选项"
 
-#: glib/goption.c:788
+#: glib/goption.c:897
 msgid "Application Options:"
 msgstr "应用程序选项："
 
-#: glib/goption.c:850 glib/goption.c:920
+#: glib/goption.c:959 glib/goption.c:1029
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "无法处理 %2$s 所用的整数值“%1$s”"
 
-#: glib/goption.c:860 glib/goption.c:928
+#: glib/goption.c:969 glib/goption.c:1037
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "%2$s 所用的整数值“%1$s”超出范围"
 
-#: glib/goption.c:885
+#: glib/goption.c:994
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "无法处理 %2$s 所用的双精度值“%1$s”"
 
-#: glib/goption.c:893
+#: glib/goption.c:1002
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "%2$s 所用的双精度值“%1$s”超出范围"
 
-#: glib/goption.c:1156 glib/goption.c:1235
+#: glib/goption.c:1265 glib/goption.c:1344
 #, c-format
 msgid "Error parsing option %s"
 msgstr "分析选项出错：%s"
 
-#: glib/goption.c:1266 glib/goption.c:1380
+#: glib/goption.c:1375 glib/goption.c:1489
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺少 %s 的参数"
 
-#: glib/goption.c:1773
+#: glib/goption.c:1882
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知选项 %s"
@@ -1110,8 +1085,8 @@ msgstr "传递给 %s 的计数值太大了"
 msgid "Stream is already closed"
 msgstr "流已经关闭"
 
-#: gio/gcancellable.c:366 gio/glocalfile.c:2012 gio/gsimpleasyncresult.c:627
-#: gio/gsimpleasyncresult.c:654
+#: gio/gcancellable.c:377 gio/glocalfile.c:2012 gio/gsimpleasyncresult.c:638
+#: gio/gsimpleasyncresult.c:665
 msgid "Operation was cancelled"
 msgstr "操作被取消"
 
@@ -1251,7 +1226,7 @@ msgstr "不支持垃圾箱"
 msgid "File names cannot contain '%c'"
 msgstr "文件名不能包含“%c”"
 
-#: gio/gfile.c:5011 gio/gvolume.c:370
+#: gio/gfile.c:5011 gio/gvolume.c:376
 msgid "volume doesn't implement mount"
 msgstr "卷未实现挂载"
 
@@ -1272,14 +1247,6 @@ msgstr "文件枚举器有异常操作"
 msgid "File enumerator is already closed"
 msgstr "文件枚举器已关闭"
 
-#: gio/gfileicon.c:145
-msgid "file"
-msgstr "文件"
-
-#: gio/gfileicon.c:146
-msgid "The file containing the icon"
-msgstr "包含该图标的文件"
-
 #: gio/gfileicon.c:237
 #, c-format
 msgid "Can't handle version %d of GFileIcon encoding"
@@ -1688,55 +1655,11 @@ msgstr "输出流未实现写入"
 msgid "Source stream is already closed"
 msgstr "来源流已经关闭"
 
-#: gio/gthemedicon.c:211
-msgid "name"
-msgstr "名称"
-
-#: gio/gthemedicon.c:212
-msgid "The name of the icon"
-msgstr "图标的名称"
-
-#: gio/gthemedicon.c:223
-msgid "names"
-msgstr "名称"
-
-#: gio/gthemedicon.c:224
-msgid "An array containing the icon names"
-msgstr "包含图标名称的数组"
-
-#: gio/gthemedicon.c:249
-msgid "use default fallbacks"
-msgstr "使用默认预案"
-
-#: gio/gthemedicon.c:250
-msgid ""
-"Whether to use default fallbacks found by shortening the name at '-' "
-"characters. Ignores names after the first if multiple names are given."
-msgstr ""
-"是否使用通过缩短在“-”字符的名称找到的默认预案。如果给出了多个名字则忽略除第一"
-"个之外的名字。"
-
 #: gio/gthemedicon.c:499
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr "无法处理 GThemedIcon 编码的版本 %d"
 
-#: gio/gunixinputstream.c:161 gio/gunixoutputstream.c:147
-msgid "File descriptor"
-msgstr "文件描述符"
-
-#: gio/gunixinputstream.c:162
-msgid "The file descriptor to read from"
-msgstr "要读取的文件描述符"
-
-#: gio/gunixinputstream.c:176 gio/gunixoutputstream.c:162
-msgid "Close file descriptor"
-msgstr "关闭文件描述符"
-
-#: gio/gunixinputstream.c:177 gio/gunixoutputstream.c:163
-msgid "Whether to close the file descriptor when the stream is closed"
-msgstr "当流关闭时是否关闭文件描述符"
-
 #: gio/gunixinputstream.c:358 gio/gunixinputstream.c:378
 #: gio/gunixinputstream.c:456 gio/gunixoutputstream.c:443
 #, c-format
@@ -1753,16 +1676,12 @@ msgstr "关闭 unix 出错：%s"
 msgid "Filesystem root"
 msgstr "文件系统根目录"
 
-#: gio/gunixoutputstream.c:148
-msgid "The file descriptor to write to"
-msgstr "要写入的文件描述符"
-
 #: gio/gunixoutputstream.c:344 gio/gunixoutputstream.c:365
 #, c-format
 msgid "Error writing to unix: %s"
 msgstr "写入 unix 出错：%s"
 
-#: gio/gvolume.c:444
+#: gio/gvolume.c:450
 msgid "volume doesn't implement eject"
 msgstr "卷未实现弹出"
 
@@ -1799,6 +1718,75 @@ msgstr "使用长列表格式"
 msgid "[FILE...]"
 msgstr "[文件...]"
 
+#~ msgid ""
+#~ "Character '%s' is not valid at the start of an entity name; the & "
+#~ "character begins an entity; if this ampersand isn't supposed to be an "
+#~ "entity, escape it as &amp;"
+#~ msgstr ""
+#~ "字符“%s”出现在实体名的开头无效。实体都以 & 字符 开头，如果这个 & 不是一个"
+#~ "实体的开头，把它变为 &amp;"
+
+#~ msgid "Character '%s' is not valid inside an entity name"
+#~ msgstr "字符“%s”在实体名中无效"
+
+#~ msgid "Empty character reference; should include a digit such as &#454;"
+#~ msgstr "空的字符引用；应该包括数字，如 &#454;"
+
+#~ msgid "Unfinished entity reference"
+#~ msgstr "未完成的实体引用"
+
+#~ msgid "Unfinished character reference"
+#~ msgstr "未完成的字符引用"
+
+#~ msgid "Invalid UTF-8 encoded text - overlong sequence"
+#~ msgstr "无效的 UTF-8 编码文本 - 序列过长"
+
+#~ msgid "Invalid UTF-8 encoded text - not a start char"
+#~ msgstr "无效的 UTF-8 编码文本 - 非开始字符"
+
+#~ msgid "file"
+#~ msgstr "文件"
+
+#~ msgid "The file containing the icon"
+#~ msgstr "包含该图标的文件"
+
+#~ msgid "name"
+#~ msgstr "名称"
+
+#~ msgid "The name of the icon"
+#~ msgstr "图标的名称"
+
+#~ msgid "names"
+#~ msgstr "名称"
+
+#~ msgid "An array containing the icon names"
+#~ msgstr "包含图标名称的数组"
+
+#~ msgid "use default fallbacks"
+#~ msgstr "使用默认预案"
+
+#~ msgid ""
+#~ "Whether to use default fallbacks found by shortening the name at '-' "
+#~ "characters. Ignores names after the first if multiple names are given."
+#~ msgstr ""
+#~ "是否使用通过缩短在“-”字符的名称找到的默认预案。如果给出了多个名字则忽略除"
+#~ "第一个之外的名字。"
+
+#~ msgid "File descriptor"
+#~ msgstr "文件描述符"
+
+#~ msgid "The file descriptor to read from"
+#~ msgstr "要读取的文件描述符"
+
+#~ msgid "Close file descriptor"
+#~ msgstr "关闭文件描述符"
+
+#~ msgid "Whether to close the file descriptor when the stream is closed"
+#~ msgstr "当流关闭时是否关闭文件描述符"
+
+#~ msgid "The file descriptor to write to"
+#~ msgstr "要写入的文件描述符"
+
 #~ msgid "%u byte"
 #~ msgid_plural "%u bytes"
 #~ msgstr[0] "%u 字节"