2.16.0

svn path=/trunk/; revision=6661

1 files changed, 78 insertions, 49 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9bed9dfd1..f23b12fc1 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-02-25 13:59-0500\n"
+"POT-Creation-Date: 2008-03-10 13:55-0400\n"
 "PO-Revision-Date: 2008-02-04 20:35+0800\n"
 "Last-Translator: Deng Xiyue <manphiz@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -527,7 +527,7 @@ msgstr "达到回溯上限"
 msgid "the pattern contains items not supported for partial matching"
 msgstr "表达式包含不被部分匹配支持的项"
 
-#: glib/gregex.c:154 gio/glocalfile.c:1869
+#: glib/gregex.c:154 gio/glocalfile.c:1883
 msgid "internal error"
 msgstr "内部错误"
 
@@ -838,47 +838,47 @@ msgstr "从子进程中读取数据失败"
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "创建与子进程通讯的管道失败(%s)"
 
-#: glib/gspawn-win32.c:332 glib/gspawn.c:1119
+#: glib/gspawn-win32.c:332 glib/gspawn-win32.c:340 glib/gspawn.c:1119
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "从子管道中读取失败(%s)"
 
-#: glib/gspawn-win32.c:358 glib/gspawn.c:1324
+#: glib/gspawn-win32.c:363 glib/gspawn.c:1324
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "更改到目录“%s”失败(%s)"
 
-#: glib/gspawn-win32.c:364 glib/gspawn-win32.c:488
+#: glib/gspawn-win32.c:369 glib/gspawn-win32.c:493
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "执行子进程失败(%s)"
 
-#: glib/gspawn-win32.c:435
+#: glib/gspawn-win32.c:440
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "无效的程序名：%s"
 
-#: glib/gspawn-win32.c:445 glib/gspawn-win32.c:718 glib/gspawn-win32.c:1276
+#: glib/gspawn-win32.c:450 glib/gspawn-win32.c:723 glib/gspawn-win32.c:1282
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "%d 处的参数中有无效的字符串：%s"
 
-#: glib/gspawn-win32.c:456 glib/gspawn-win32.c:732 glib/gspawn-win32.c:1309
+#: glib/gspawn-win32.c:461 glib/gspawn-win32.c:738 glib/gspawn-win32.c:1315
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "环境中有无效的字符串：%s"
 
-#: glib/gspawn-win32.c:714 glib/gspawn-win32.c:1257
+#: glib/gspawn-win32.c:719 glib/gspawn-win32.c:1263
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "无效的工作目录：%s"
 
-#: glib/gspawn-win32.c:782
+#: glib/gspawn-win32.c:787
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "执行助手程序(%s)失败"
 
-#: glib/gspawn-win32.c:996
+#: glib/gspawn-win32.c:1002
 #, c-format
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
@@ -1123,7 +1123,7 @@ msgstr "传递给 %s 的计数值太大了"
 msgid "Stream is already closed"
 msgstr "流已经关闭"
 
-#: gio/gcancellable.c:296 gio/glocalfile.c:1862 gio/gsimpleasyncresult.c:611
+#: gio/gcancellable.c:296 gio/glocalfile.c:1876 gio/gsimpleasyncresult.c:611
 #, c-format
 msgid "Operation was cancelled"
 msgstr "操作被取消"
@@ -1189,10 +1189,10 @@ msgstr "驱动未实现探出"
 msgid "drive doesn't implement polling for media"
 msgstr "驱动未实现媒体轮询"
 
-#: gio/gfile.c:822 gio/gfile.c:1010 gio/gfile.c:1143 gio/gfile.c:1374
-#: gio/gfile.c:1427 gio/gfile.c:1483 gio/gfile.c:1564 gio/gfile.c:2602
-#: gio/gfile.c:2647 gio/gfile.c:2697 gio/gfile.c:2736 gio/gfile.c:3060
-#: gio/gfile.c:3462 gio/gfile.c:3545 gio/gfile.c:3628 gio/gfile.c:3708
+#: gio/gfile.c:812 gio/gfile.c:1002 gio/gfile.c:1135 gio/gfile.c:1366
+#: gio/gfile.c:1419 gio/gfile.c:1475 gio/gfile.c:1556 gio/gfile.c:2594
+#: gio/gfile.c:2639 gio/gfile.c:2689 gio/gfile.c:2729 gio/gfile.c:3053
+#: gio/gfile.c:3455 gio/gfile.c:3538 gio/gfile.c:3621 gio/gfile.c:3701
 #, c-format
 msgid "Operation not supported"
 msgstr "不支持该操作"
@@ -1205,52 +1205,52 @@ 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:1262 gio/glocalfile.c:1038 gio/glocalfile.c:1049
-#: gio/glocalfile.c:1062
+#: gio/gfile.c:1254 gio/glocalfile.c:1046 gio/glocalfile.c:1057
+#: gio/glocalfile.c:1070
 #, c-format
 msgid "Containing mount does not exist"
 msgstr "包含的挂载不存在"
 
-#: gio/gfile.c:1903
+#: gio/gfile.c:1895
 #, c-format
 msgid "Can't copy over directory"
 msgstr "无法复制目录"
 
-#: gio/gfile.c:1963
+#: gio/gfile.c:1955
 #, c-format
 msgid "Can't copy directory over directory"
 msgstr "无法将目录复制到目录"
 
-#: gio/gfile.c:1971 gio/glocalfile.c:2016
+#: gio/gfile.c:1963 gio/glocalfile.c:2030
 #, c-format
 msgid "Target file exists"
 msgstr "目标文件已存在"
 
-#: gio/gfile.c:1989
+#: gio/gfile.c:1981
 #, c-format
 msgid "Can't recursively copy directory"
 msgstr "无法递归复制目录"
 
-#: gio/gfile.c:2687
+#: gio/gfile.c:2679
 #, c-format
 msgid "Invalid symlink value given"
 msgstr "给出的符号链接值无效"
 
-#: gio/gfile.c:2779
+#: gio/gfile.c:2772
 #, c-format
 msgid "Trash not supported"
 msgstr "不支持垃圾箱"
 
-#: gio/gfile.c:2826
+#: gio/gfile.c:2819
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "文件名不能包含“%c”"
 
-#: gio/gfile.c:4759 gio/gvolume.c:357
+#: gio/gfile.c:4752 gio/gvolume.c:357
 msgid "volume doesn't implement mount"
 msgstr "卷未实现挂载"
 
-#: gio/gfile.c:4867
+#: gio/gfile.c:4860
 #, c-format
 msgid "No application is registered as handling this file"
 msgstr "没有注册为处理此文件的应用程序"
@@ -1312,111 +1312,111 @@ msgstr "流有异常操作"
 msgid "Unable to find default local directory monitor type"
 msgstr "无法找默认的本地目录监视器类型"
 
-#: gio/glocalfile.c:595
+#: gio/glocalfile.c:599
 #, c-format
 msgid "Invalid filename %s"
 msgstr "无效的文件名名：%s"
 
-#: gio/glocalfile.c:958
+#: gio/glocalfile.c:962
 #, c-format
 msgid "Error getting filesystem info: %s"
 msgstr "读取文件系统信息出错：%s"
 
-#: gio/glocalfile.c:1082
+#: gio/glocalfile.c:1090
 #, c-format
 msgid "Can't rename root directory"
 msgstr "无法重命名根目录"
 
-#: gio/glocalfile.c:1100
+#: gio/glocalfile.c:1108
 #, c-format
 msgid "Can't rename file, filename already exist"
 msgstr "无法重命名文件，该文件名已存在"
 
-#: gio/glocalfile.c:1113 gio/glocalfile.c:1891 gio/glocalfile.c:1920
-#: gio/glocalfile.c:2069 gio/glocalfileoutputstream.c:472
+#: gio/glocalfile.c:1121 gio/glocalfile.c:1905 gio/glocalfile.c:1934
+#: gio/glocalfile.c:2083 gio/glocalfileoutputstream.c:472
 #: gio/glocalfileoutputstream.c:517 gio/glocalfileoutputstream.c:925
 #, c-format
 msgid "Invalid filename"
 msgstr "无效的文件名"
 
-#: gio/glocalfile.c:1117
+#: gio/glocalfile.c:1125
 #, c-format
 msgid "Error renaming file: %s"
 msgstr "重命名文件出错：%s"
 
-#: gio/glocalfile.c:1236
+#: gio/glocalfile.c:1244
 #, c-format
 msgid "Error opening file: %s"
 msgstr "打开文件出错：%s"
 
-#: gio/glocalfile.c:1246
+#: gio/glocalfile.c:1254
 #, c-format
 msgid "Can't open directory"
 msgstr "无法打开目录"
 
-#: gio/glocalfile.c:1300 gio/glocalfile.c:1895
+#: gio/glocalfile.c:1314 gio/glocalfile.c:1909
 #, c-format
 msgid "Error removing file: %s"
 msgstr "移除文件出错：%s"
 
-#: gio/glocalfile.c:1590
+#: gio/glocalfile.c:1604
 #, c-format
 msgid "Error trashing file: %s"
 msgstr "将文件放到垃圾箱出错：%s"
 
-#: gio/glocalfile.c:1613
+#: gio/glocalfile.c:1627
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "创建垃圾箱目录 %s 失败：%s"
 
-#: gio/glocalfile.c:1634
+#: gio/glocalfile.c:1648
 #, c-format
 msgid "Unable to find toplevel directory for trash"
 msgstr "无法找到垃圾箱的顶级目录"
 
-#: gio/glocalfile.c:1713 gio/glocalfile.c:1733
+#: gio/glocalfile.c:1727 gio/glocalfile.c:1747
 #, c-format
 msgid "Unable to find or create trash directory"
 msgstr "无法找到或创建垃圾箱目录"
 
-#: gio/glocalfile.c:1767
+#: gio/glocalfile.c:1781
 #, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "创建垃圾信息文件失败：%s"
 
-#: gio/glocalfile.c:1792 gio/glocalfile.c:1861 gio/glocalfile.c:1868
+#: gio/glocalfile.c:1806 gio/glocalfile.c:1875 gio/glocalfile.c:1882
 #, c-format
 msgid "Unable to trash file: %s"
 msgstr "创建垃圾文件失败：%s"
 
-#: gio/glocalfile.c:1924
+#: gio/glocalfile.c:1938
 #, c-format
 msgid "Error making symbolic link: %s"
 msgstr "创建符号链接出错：%s"
 
-#: gio/glocalfile.c:1984 gio/glocalfile.c:2073
+#: gio/glocalfile.c:1998 gio/glocalfile.c:2087
 #, c-format
 msgid "Error moving file: %s"
 msgstr "移动文件出错：%s"
 
-#: gio/glocalfile.c:2007
+#: gio/glocalfile.c:2021
 #, c-format
 msgid "Can't move directory over directory"
 msgstr "无法将目录移动到目录"
 
-#: gio/glocalfile.c:2029 gio/glocalfileoutputstream.c:777
+#: gio/glocalfile.c:2043 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:2048
+#: gio/glocalfile.c:2062
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目标文件出错：%s"
 
-#: gio/glocalfile.c:2062
+#: gio/glocalfile.c:2076
 #, c-format
 msgid "Move between mounts not supported"
 msgstr "不支持在挂载之间移动"
@@ -1630,6 +1630,35 @@ msgstr "输出流未实现写入"
 msgid "Source stream is already closed"
 msgstr "来源流已经关闭"
 
+#: gio/gthemedicon.c:192
+#, fuzzy
+msgid "name"
+msgstr "未命名"
+
+#: gio/gthemedicon.c:193
+#, fuzzy
+msgid "The name of the icon"
+msgstr "URI中的主机名“%s”无效"
+
+#: gio/gthemedicon.c:204
+#, fuzzy
+msgid "names"
+msgstr "未命名"
+
+#: gio/gthemedicon.c:205
+msgid "An array containing the icon names"
+msgstr ""
+
+#: gio/gthemedicon.c:230
+msgid "use default fallbacks"
+msgstr ""
+
+#: gio/gthemedicon.c:231
+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/gunixinputstream.c:202 gio/gunixinputstream.c:222
 #: gio/gunixinputstream.c:300 gio/gunixoutputstream.c:289
 #, c-format