2.17.2GLIB_2_17_2

svn path=/trunk/; revision=7032

1 files changed, 78 insertions, 80 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08213bbdc..7e7625bfe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-27 16:12-0400\n"
+"POT-Creation-Date: 2008-06-12 13:04-0400\n"
 "PO-Revision-Date: 2008-03-13 10:20+0800\n"
 "Last-Translator: Deng Xiyue <manphiz@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -234,12 +234,6 @@ msgstr "模板“%s”无效，不应该包含“%s”"
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "模板“%s”的不包含 XXXXXX"
 
-#: glib/gfileutils.c:1826
-#, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] "%u 字节"
-
 #: glib/gfileutils.c:1834
 #, c-format
 msgid "%.1f KB"
@@ -527,7 +521,7 @@ msgstr "达到回溯上限"
 msgid "the pattern contains items not supported for partial matching"
 msgstr "表达式包含不被部分匹配支持的项"
 
-#: glib/gregex.c:154 gio/glocalfile.c:1971
+#: glib/gregex.c:154 gio/glocalfile.c:1975
 msgid "internal error"
 msgstr "内部错误"
 
@@ -833,17 +827,17 @@ msgstr "空文本(或仅含空白字符)"
 msgid "Failed to read data from child process"
 msgstr "从子进程中读取数据失败"
 
-#: glib/gspawn-win32.c:294 glib/gspawn.c:1455
+#: glib/gspawn-win32.c:294 glib/gspawn.c:1467
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "创建与子进程通讯的管道失败(%s)"
 
-#: glib/gspawn-win32.c:332 glib/gspawn-win32.c:340 glib/gspawn.c:1119
+#: glib/gspawn-win32.c:332 glib/gspawn-win32.c:340 glib/gspawn.c:1131
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "从子管道中读取失败(%s)"
 
-#: glib/gspawn-win32.c:363 glib/gspawn.c:1324
+#: glib/gspawn-win32.c:363 glib/gspawn.c:1336
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "更改到目录“%s”失败(%s)"
@@ -885,47 +879,47 @@ msgid ""
 "process"
 msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
 
-#: glib/gspawn.c:180
+#: glib/gspawn.c:188
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "从子进程中读取数据失败(%s)"
 
-#: glib/gspawn.c:317
+#: glib/gspawn.c:325
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "select() 在从子进程中读取数据时出现异常错误 (%s)"
 
-#: glib/gspawn.c:400
+#: glib/gspawn.c:408
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "waitpid() 出现异常错误 (%s)"
 
-#: glib/gspawn.c:1184
+#: glib/gspawn.c:1196
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "fork 失败(%s)"
 
-#: glib/gspawn.c:1334
+#: glib/gspawn.c:1346
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "执行子进程“%s”失败(%s)"
 
-#: glib/gspawn.c:1344
+#: glib/gspawn.c:1356
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "重定向子进程(%s)的输入或输出失败"
 
-#: glib/gspawn.c:1353
+#: glib/gspawn.c:1365
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "fork 子进程失败 (%s)"
 
-#: glib/gspawn.c:1361
+#: glib/gspawn.c:1373
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "执行子进程“%s”时出现未知错误"
 
-#: glib/gspawn.c:1383
+#: glib/gspawn.c:1395
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "从子进程管道中读取足够的数据失败(%s)"
@@ -1046,66 +1040,66 @@ msgstr "无效的键名：%s"
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "键文件包含不支持的编码“%s”"
 
-#: glib/gkeyfile.c:1109 glib/gkeyfile.c:1269 glib/gkeyfile.c:2487
-#: glib/gkeyfile.c:2555 glib/gkeyfile.c:2690 glib/gkeyfile.c:2825
-#: glib/gkeyfile.c:2978 glib/gkeyfile.c:3165 glib/gkeyfile.c:3226
+#: glib/gkeyfile.c:1112 glib/gkeyfile.c:1272 glib/gkeyfile.c:2490
+#: glib/gkeyfile.c:2558 glib/gkeyfile.c:2693 glib/gkeyfile.c:2828
+#: glib/gkeyfile.c:2981 glib/gkeyfile.c:3168 glib/gkeyfile.c:3229
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "键文件没有组“%s”"
 
-#: glib/gkeyfile.c:1281
+#: glib/gkeyfile.c:1284
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "键文件没有键“%s”"
 
-#: glib/gkeyfile.c:1383 glib/gkeyfile.c:1496
+#: glib/gkeyfile.c:1386 glib/gkeyfile.c:1499
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr "键文件包含“%s”，其值“%s”不是 UTF-8"
 
-#: glib/gkeyfile.c:1403 glib/gkeyfile.c:1516 glib/gkeyfile.c:1891
+#: glib/gkeyfile.c:1406 glib/gkeyfile.c:1519 glib/gkeyfile.c:1894
 #, c-format
 msgid "Key file contains key '%s' which has value that cannot be interpreted."
 msgstr "键文件包含键“%s”，其值无法解释。"
 
-#: glib/gkeyfile.c:2106 glib/gkeyfile.c:2318
+#: glib/gkeyfile.c:2109 glib/gkeyfile.c:2321
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
 "interpreted."
 msgstr "键文件在“%2$s”中包含“%1$s”，其值无法解释。"
 
-#: glib/gkeyfile.c:2502 glib/gkeyfile.c:2705 glib/gkeyfile.c:3237
+#: glib/gkeyfile.c:2505 glib/gkeyfile.c:2708 glib/gkeyfile.c:3240
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "键文件的组“%2$s”中不包含键“%1$s”"
 
-#: glib/gkeyfile.c:3471
+#: glib/gkeyfile.c:3474
 #, c-format
 msgid "Key file contains escape character at end of line"
 msgstr "键文件在行尾含有转义字符"
 
-#: glib/gkeyfile.c:3493
+#: glib/gkeyfile.c:3496
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "键文件中包含无效的转义序列“%s”"
 
-#: glib/gkeyfile.c:3635
+#: glib/gkeyfile.c:3638
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "无法将值“%s”解释为数值。"
 
-#: glib/gkeyfile.c:3649
+#: glib/gkeyfile.c:3652
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "整数值“%s”超出范围"
 
-#: glib/gkeyfile.c:3682
+#: glib/gkeyfile.c:3685
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "无法将值“%s”解释为浮点数。"
 
-#: glib/gkeyfile.c:3706
+#: glib/gkeyfile.c:3709
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "无法将值“%s”解释为布尔值。"
@@ -1123,7 +1117,7 @@ msgstr "传递给 %s 的计数值太大了"
 msgid "Stream is already closed"
 msgstr "流已经关闭"
 
-#: gio/gcancellable.c:296 gio/glocalfile.c:1964 gio/gsimpleasyncresult.c:611
+#: gio/gcancellable.c:296 gio/glocalfile.c:1968 gio/gsimpleasyncresult.c:611
 #, c-format
 msgid "Operation was cancelled"
 msgstr "操作被取消"
@@ -1137,7 +1131,7 @@ msgstr "未知类型"
 msgid "%s filetype"
 msgstr "%s 文件类型"
 
-#: gio/gcontenttype.c:591
+#: gio/gcontenttype.c:606
 #, c-format
 msgid "%s type"
 msgstr "%s 类型"
@@ -1191,8 +1185,8 @@ msgstr "驱动未实现媒体轮询"
 
 #: gio/gfile.c:811 gio/gfile.c:1039 gio/gfile.c:1172 gio/gfile.c:1403
 #: gio/gfile.c:1456 gio/gfile.c:1512 gio/gfile.c:1594 gio/gfile.c:2651
-#: gio/gfile.c:2696 gio/gfile.c:2746 gio/gfile.c:2786 gio/gfile.c:3110
-#: gio/gfile.c:3512 gio/gfile.c:3595 gio/gfile.c:3678 gio/gfile.c:3758
+#: gio/gfile.c:2702 gio/gfile.c:2830 gio/gfile.c:2870 gio/gfile.c:3194
+#: gio/gfile.c:3596 gio/gfile.c:3679 gio/gfile.c:3762 gio/gfile.c:3842
 #, c-format
 msgid "Operation not supported"
 msgstr "不支持该操作"
@@ -1205,13 +1199,13 @@ msgstr "不支持该操作"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: gio/gfile.c:1291 gio/glocalfile.c:1054 gio/glocalfile.c:1065
-#: gio/glocalfile.c:1078
+#: gio/gfile.c:1291 gio/glocalfile.c:1058 gio/glocalfile.c:1069
+#: gio/glocalfile.c:1082
 #, c-format
 msgid "Containing mount does not exist"
 msgstr "包含的挂载不存在"
 
-#: gio/gfile.c:1933 gio/glocalfile.c:2114
+#: gio/gfile.c:1933 gio/glocalfile.c:2118
 #, c-format
 msgid "Can't copy over directory"
 msgstr "无法复制目录"
@@ -1221,7 +1215,7 @@ msgstr "无法复制目录"
 msgid "Can't copy directory over directory"
 msgstr "无法将目录复制到目录"
 
-#: gio/gfile.c:2001 gio/glocalfile.c:2123
+#: gio/gfile.c:2001 gio/glocalfile.c:2127
 #, c-format
 msgid "Target file exists"
 msgstr "目标文件已存在"
@@ -1231,26 +1225,26 @@ msgstr "目标文件已存在"
 msgid "Can't recursively copy directory"
 msgstr "无法递归复制目录"
 
-#: gio/gfile.c:2736
+#: gio/gfile.c:2820
 #, c-format
 msgid "Invalid symlink value given"
 msgstr "给出的符号链接值无效"
 
-#: gio/gfile.c:2829
+#: gio/gfile.c:2913
 #, c-format
 msgid "Trash not supported"
 msgstr "不支持垃圾箱"
 
-#: gio/gfile.c:2876
+#: gio/gfile.c:2960
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "文件名不能包含“%c”"
 
-#: gio/gfile.c:4812 gio/gvolume.c:357
+#: gio/gfile.c:4896 gio/gvolume.c:357
 msgid "volume doesn't implement mount"
 msgstr "卷未实现挂载"
 
-#: gio/gfile.c:4920
+#: gio/gfile.c:5004
 #, c-format
 msgid "No application is registered as handling this file"
 msgstr "没有注册为处理此文件的应用程序"
@@ -1317,111 +1311,111 @@ msgstr "无法找默认的本地目录监视器类型"
 msgid "Invalid filename %s"
 msgstr "无效的文件名名：%s"
 
-#: gio/glocalfile.c:962
+#: gio/glocalfile.c:966
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "读取文件系统信息出错：%s"
 
-#: gio/glocalfile.c:1098
+#: gio/glocalfile.c:1102
 #, c-format
 msgid "Can't rename root directory"
 msgstr "无法重命名根目录"
 
-#: gio/glocalfile.c:1116
+#: gio/glocalfile.c:1120
 #, c-format
 msgid "Can't rename file, filename already exist"
 msgstr "无法重命名文件，该文件名已存在"
 
-#: gio/glocalfile.c:1129 gio/glocalfile.c:1993 gio/glocalfile.c:2022
-#: gio/glocalfile.c:2176 gio/glocalfileoutputstream.c:472
+#: gio/glocalfile.c:1133 gio/glocalfile.c:1997 gio/glocalfile.c:2026
+#: gio/glocalfile.c:2180 gio/glocalfileoutputstream.c:472
 #: gio/glocalfileoutputstream.c:517 gio/glocalfileoutputstream.c:925
 #, c-format
 msgid "Invalid filename"
 msgstr "无效的文件名"
 
-#: gio/glocalfile.c:1133
+#: gio/glocalfile.c:1137
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "重命名文件出错：%s"
 
-#: gio/glocalfile.c:1252
+#: gio/glocalfile.c:1256
 #, c-format
 msgid "Error opening file: %s"
 msgstr "打开文件出错：%s"
 
-#: gio/glocalfile.c:1262
+#: gio/glocalfile.c:1266
 #, c-format
 msgid "Can't open directory"
 msgstr "无法打开目录"
 
-#: gio/glocalfile.c:1322
+#: gio/glocalfile.c:1326
 #, c-format
 msgid "Error removing file: %s"
 msgstr "移除文件出错：%s"
 
-#: gio/glocalfile.c:1686
+#: gio/glocalfile.c:1690
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "将文件放到垃圾箱出错：%s"
 
-#: gio/glocalfile.c:1709
+#: gio/glocalfile.c:1713
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "创建垃圾箱目录 %s 失败：%s"
 
-#: gio/glocalfile.c:1730
+#: gio/glocalfile.c:1734
 #, c-format
 msgid "Unable to find toplevel directory for trash"
 msgstr "无法找到垃圾箱的顶级目录"
 
-#: gio/glocalfile.c:1809 gio/glocalfile.c:1829
+#: gio/glocalfile.c:1813 gio/glocalfile.c:1833
 #, c-format
 msgid "Unable to find or create trash directory"
 msgstr "无法找到或创建垃圾箱目录"
 
-#: gio/glocalfile.c:1863
+#: gio/glocalfile.c:1867
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "创建垃圾信息文件失败：%s"
 
-#: gio/glocalfile.c:1888 gio/glocalfile.c:1963 gio/glocalfile.c:1970
+#: gio/glocalfile.c:1892 gio/glocalfile.c:1967 gio/glocalfile.c:1974
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "创建垃圾文件失败：%s"
 
-#: gio/glocalfile.c:1997
+#: gio/glocalfile.c:2001
 #, fuzzy, c-format
 msgid "Error creating directory: %s"
 msgstr "打开目录“%s”时发生错误：%s"
 
-#: gio/glocalfile.c:2026
+#: gio/glocalfile.c:2030
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "创建符号链接出错：%s"
 
-#: gio/glocalfile.c:2086 gio/glocalfile.c:2180
+#: gio/glocalfile.c:2090 gio/glocalfile.c:2184
 #, c-format
 msgid "Error moving file: %s"
 msgstr "移动文件出错：%s"
 
-#: gio/glocalfile.c:2109
+#: gio/glocalfile.c:2113
 #, c-format
 msgid "Can't move directory over directory"
 msgstr "无法将目录移动到目录"
 
-#: gio/glocalfile.c:2136 gio/glocalfileoutputstream.c:777
+#: gio/glocalfile.c:2140 gio/glocalfileoutputstream.c:777
 #: gio/glocalfileoutputstream.c:791 gio/glocalfileoutputstream.c:806
 #: gio/glocalfileoutputstream.c:822 gio/glocalfileoutputstream.c:836
 #, c-format
 msgid "Backup file creation failed"
 msgstr "备份文件创建失败"
 
-#: gio/glocalfile.c:2155
+#: gio/glocalfile.c:2159
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目标文件出错：%s"
 
-#: gio/glocalfile.c:2169
+#: gio/glocalfile.c:2173
 #, c-format
 msgid "Move between mounts not supported"
 msgstr "不支持在挂载之间移动"
@@ -1455,53 +1449,53 @@ msgstr "获取文件“%s”状态出错：%s"
 msgid " (invalid encoding)"
 msgstr " (无效的编码)"
 
-#: gio/glocalfileinfo.c:1693
+#: gio/glocalfileinfo.c:1698
 #, c-format
 msgid "Error stating file descriptor: %s"
 msgstr "获取文件描述符状态时出错：%s"
 
-#: gio/glocalfileinfo.c:1738
+#: gio/glocalfileinfo.c:1743
 #, c-format
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "无效的属性类型(应为 uint32)"
 
-#: gio/glocalfileinfo.c:1756
+#: gio/glocalfileinfo.c:1761
 #, c-format
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "无效的属性类型(应为 uint64)"
 
-#: gio/glocalfileinfo.c:1775
+#: gio/glocalfileinfo.c:1780
 #, c-format
 msgid "Invalid attribute type (byte string expected)"
 msgstr "无效的属性类型(应为 byte string)"
 
-#: gio/glocalfileinfo.c:1801
+#: gio/glocalfileinfo.c:1806
 #, c-format
 msgid "Error setting permissions: %s"
 msgstr "设置访问权限出错：%s"
 
-#: gio/glocalfileinfo.c:1852 gio/glocalfileinfo.c:2020
+#: gio/glocalfileinfo.c:1857 gio/glocalfileinfo.c:2025
 #, c-format
 msgid "Error setting owner: %s"
 msgstr "设置所有者出错：%s"
 
-#: gio/glocalfileinfo.c:1875
+#: gio/glocalfileinfo.c:1880
 #, c-format
 msgid "symlink must be non-NULL"
 msgstr "符号链接必须是非空"
 
-#: gio/glocalfileinfo.c:1885 gio/glocalfileinfo.c:1904
-#: gio/glocalfileinfo.c:1915
+#: gio/glocalfileinfo.c:1890 gio/glocalfileinfo.c:1909
+#: gio/glocalfileinfo.c:1920
 #, c-format
 msgid "Error setting symlink: %s"
 msgstr "设置符号链接出错：%s"
 
-#: gio/glocalfileinfo.c:1894
+#: gio/glocalfileinfo.c:1899
 #, c-format
 msgid "Error setting symlink: file is not a symlink"
 msgstr "设定符号链接出错：文件不是符号链接"
 
-#: gio/glocalfileinfo.c:2075
+#: gio/glocalfileinfo.c:2080
 #, c-format
 msgid "Setting attribute %s not supported"
 msgstr "不支持设置属性 %s"
@@ -1725,6 +1719,10 @@ msgstr "使用长列表格式"
 msgid "[FILE...]"
 msgstr "[文件...]"
 
+#~ msgid "%u byte"
+#~ msgid_plural "%u bytes"
+#~ msgstr[0] "%u 字节"
+
 #~ msgid "Error creating backup link: %s"
 #~ msgstr "创建备份链接：%s"