2.7.3GTK_2_7_3

1 files changed, 96 insertions, 79 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91c3aff5f2..a8cfe1881d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 14:01-0400\n"
+"POT-Creation-Date: 2005-07-15 14:36-0400\n"
 "PO-Revision-Date: 2005-06-12 01:59+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:153 gdk-pixbuf/gdk-pixbuf-io.c:838
-#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:199
+#: gdk-pixbuf/gdk-pixbuf-io.c:1089 tests/testfilechooser.c:218
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "无法打开文件“%s”：%s"
@@ -32,7 +32,7 @@ msgid "Image file '%s' contains no data"
 msgstr "图像文件“%s”没有内容"
 
 #: gdk-pixbuf/gdk-pixbuf-animation.c:208 gdk-pixbuf/gdk-pixbuf-io.c:887
-#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:244
+#: gdk-pixbuf/gdk-pixbuf-io.c:1130 tests/testfilechooser.c:263
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -1225,20 +1225,20 @@ msgstr "着色轮"
 msgid "Color Selection"
 msgstr "颜色选择"
 
-#: gtk/gtkentry.c:4508 gtk/gtktextview.c:7066
+#: gtk/gtkentry.c:4560 gtk/gtktextview.c:7125
 msgid "Select _All"
 msgstr "全选(_A)"
 
-#: gtk/gtkentry.c:4518 gtk/gtktextview.c:7076
+#: gtk/gtkentry.c:4570 gtk/gtktextview.c:7135
 msgid "Input _Methods"
 msgstr "输入法(_M)"
 
-#: gtk/gtkentry.c:4529 gtk/gtktextview.c:7087
+#: gtk/gtkentry.c:4581 gtk/gtktextview.c:7146
 msgid "_Insert Unicode Control Character"
 msgstr "插入 Unicode 控制字符(_I)"
 
-#: gtk/gtkfilechooser.c:1588 gtk/gtkfilechooser.c:1632
-#: gtk/gtkfilechooser.c:1707 gtk/gtkfilechooser.c:1751
+#: gtk/gtkfilechooser.c:1623 gtk/gtkfilechooser.c:1667
+#: gtk/gtkfilechooser.c:1742 gtk/gtkfilechooser.c:1786
 #, c-format
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
@@ -1247,12 +1247,12 @@ msgstr "无效的文件名：%s"
 msgid "Select A File"
 msgstr "选择文件"
 
-#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1316
+#: gtk/gtkfilechooserbutton.c:68 gtk/gtkfilechooserdefault.c:1317
 #: gtk/gtkpathbar.c:1020
 msgid "Home"
 msgstr "主文件夹"
 
-#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1343
+#: gtk/gtkfilechooserbutton.c:69 gtk/gtkfilechooserdefault.c:1344
 #: gtk/gtkpathbar.c:1022
 msgid "Desktop"
 msgstr "桌面"
@@ -1265,23 +1265,23 @@ msgstr "(无)"
 msgid "Other..."
 msgstr "其它..."
 
-#: gtk/gtkfilechooserdefault.c:931
+#: gtk/gtkfilechooserdefault.c:932
 msgid "Could not retrieve information about the file"
 msgstr "无法获取关于文件的信息"
 
-#: gtk/gtkfilechooserdefault.c:942
+#: gtk/gtkfilechooserdefault.c:943
 msgid "Could not add a bookmark"
 msgstr "无法添加书签"
 
-#: gtk/gtkfilechooserdefault.c:953
+#: gtk/gtkfilechooserdefault.c:954
 msgid "Could not remove bookmark"
 msgstr "无法删除书签"
 
-#: gtk/gtkfilechooserdefault.c:964
+#: gtk/gtkfilechooserdefault.c:965
 msgid "The folder could not be created"
 msgstr "无法创建文件夹"
 
-#: gtk/gtkfilechooserdefault.c:977
+#: gtk/gtkfilechooserdefault.c:978
 msgid ""
 "The folder could not be created, as a file with the same name already "
 "exists.  Try using a different name for the folder, or rename the file first."
@@ -1289,215 +1289,231 @@ msgstr ""
 "无法创建文件夹，因为已经存在同名文件。请试着为文件夹使用不同的名称，或者先重"
 "命名文件。"
 
-#: gtk/gtkfilechooserdefault.c:990
+#: gtk/gtkfilechooserdefault.c:991
 msgid "Invalid file name"
 msgstr "无效的文件名"
 
-#: gtk/gtkfilechooserdefault.c:1000
+#: gtk/gtkfilechooserdefault.c:1001
 msgid "The folder contents could not be displayed"
 msgstr "无法显示文件夹内容"
 
-#: gtk/gtkfilechooserdefault.c:1206
+#: gtk/gtkfilechooserdefault.c:1207
 #, c-format
 msgid "Could not get information about '%s': %s"
 msgstr "无法获得文件“%s”的信息：%s"
 
-#: gtk/gtkfilechooserdefault.c:2222
+#: gtk/gtkfilechooserdefault.c:2223
 #, c-format
 msgid "Add the folder '%s' to the bookmarks"
 msgstr "将文件夹“%s”添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2263
+#: gtk/gtkfilechooserdefault.c:2264
 msgid "Add the current folder to the bookmarks"
 msgstr "将当前文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2265
+#: gtk/gtkfilechooserdefault.c:2266
 msgid "Add the selected folders to the bookmarks"
 msgstr "将选中文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:2305
+#: gtk/gtkfilechooserdefault.c:2306
 #, c-format
 msgid "Remove the bookmark '%s'"
 msgstr "删除书签“%s”"
 
-#: gtk/gtkfilechooserdefault.c:2736
+#: gtk/gtkfilechooserdefault.c:2737
 #, c-format
 msgid "Could not add a bookmark for '%s' because it is an invalid path name."
 msgstr "无法为“%s”添加书签，因为其路径名称无效。"
 
-#: gtk/gtkfilechooserdefault.c:2951
+#: gtk/gtkfilechooserdefault.c:2952
 msgid "Remove"
 msgstr "删除"
 
-#: gtk/gtkfilechooserdefault.c:2960
+#: gtk/gtkfilechooserdefault.c:2961
 msgid "Rename..."
 msgstr "重命名..."
 
-#: gtk/gtkfilechooserdefault.c:3083
+#: gtk/gtkfilechooserdefault.c:3084
 msgid "Shortcuts"
 msgstr "快捷方式"
 
-#: gtk/gtkfilechooserdefault.c:3137
+#: gtk/gtkfilechooserdefault.c:3138
 msgid "Folder"
 msgstr "文件夹"
 
-#: gtk/gtkfilechooserdefault.c:3193 gtk/gtkstock.c:317
+#: gtk/gtkfilechooserdefault.c:3194 gtk/gtkstock.c:317
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3200
+#: gtk/gtkfilechooserdefault.c:3201
 msgid "Add the selected folder to the Bookmarks"
 msgstr "将选中的文件夹添加到书签"
 
-#: gtk/gtkfilechooserdefault.c:3205 gtk/gtkstock.c:398
+#: gtk/gtkfilechooserdefault.c:3206 gtk/gtkstock.c:398
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:3212
+#: gtk/gtkfilechooserdefault.c:3213
 msgid "Remove the selected bookmark"
 msgstr "删除选中的书签"
 
-#: gtk/gtkfilechooserdefault.c:3312
+#: gtk/gtkfilechooserdefault.c:3313
 #, fuzzy
 msgid "Could not select file"
 msgstr "无法选择项目"
 
-#: gtk/gtkfilechooserdefault.c:3368
+#: gtk/gtkfilechooserdefault.c:3369
 #, fuzzy, c-format
 msgid "Could not select file '%s' because it is an invalid path name."
 msgstr "无法为“%s”添加书签，因为其路径名称无效。"
 
-#: gtk/gtkfilechooserdefault.c:3440
+#: gtk/gtkfilechooserdefault.c:3441
 msgid "_Add to Bookmarks"
 msgstr "添加到书签(_A)"
 
-#: gtk/gtkfilechooserdefault.c:3450
+#: gtk/gtkfilechooserdefault.c:3451
 msgid "Open _Location"
 msgstr "打开位置(_L)"
 
-#: gtk/gtkfilechooserdefault.c:3462
+#: gtk/gtkfilechooserdefault.c:3463
 msgid "Show _Hidden Files"
 msgstr "显示隐藏文件(_H)"
 
-#: gtk/gtkfilechooserdefault.c:3586 gtk/gtkfilesel.c:763
+#: gtk/gtkfilechooserdefault.c:3587 gtk/gtkfilesel.c:763
 msgid "Files"
 msgstr "文件"
 
-#: gtk/gtkfilechooserdefault.c:3631
+#: gtk/gtkfilechooserdefault.c:3632
 msgid "Name"
 msgstr "名称"
 
-#: gtk/gtkfilechooserdefault.c:3656
+#: gtk/gtkfilechooserdefault.c:3657
 msgid "Size"
 msgstr "大小"
 
-#: gtk/gtkfilechooserdefault.c:3669
+#: gtk/gtkfilechooserdefault.c:3670
 msgid "Modified"
 msgstr "修改日期"
 
-#: gtk/gtkfilechooserdefault.c:3701
+#: gtk/gtkfilechooserdefault.c:3702
 msgid "Select which types of files are shown"
 msgstr "选择要显示的文件类型"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:3737
+#: gtk/gtkfilechooserdefault.c:3738
 msgid "Create Fo_lder"
 msgstr "创建文件夹(_L)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:3858
+#: gtk/gtkfilechooserdefault.c:3859
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: gtk/gtkfilechooserdefault.c:3898
+#: gtk/gtkfilechooserdefault.c:3899
 msgid "_Browse for other folders"
 msgstr "浏览其它文件夹(_B)"
 
-#: gtk/gtkfilechooserdefault.c:4149
+#: gtk/gtkfilechooserdefault.c:4150
 msgid "Save in _folder:"
 msgstr "保存于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:4151
+#: gtk/gtkfilechooserdefault.c:4152
 msgid "Create in _folder:"
 msgstr "创建于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:5117
+#: gtk/gtkfilechooserdefault.c:5148
 msgid "Cannot change to folder because it is not local"
 msgstr "无法更改为文件夹，因为该文件夹并非本地"
 
-#: gtk/gtkfilechooserdefault.c:5671
+#: gtk/gtkfilechooserdefault.c:5702
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "快捷方式 %s 不存在"
 
-#: gtk/gtkfilechooserdefault.c:6215
+#: gtk/gtkfilechooserdefault.c:5957
+#, c-format
+msgid "A file named \"%s\" already exists.  Do you want to replace it?"
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5960
+#, c-format
+msgid ""
+"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgstr ""
+
+#: gtk/gtkfilechooserdefault.c:5965
+#, fuzzy
+msgid "_Replace"
+msgstr "重命名(_R)"
+
+#: gtk/gtkfilechooserdefault.c:6453
 #, c-format
 msgid "Could not mount %s"
 msgstr "无法挂载 %s"
 
-#: gtk/gtkfilechooserdefault.c:6510
+#: gtk/gtkfilechooserdefault.c:6741
 msgid "Type name of new folder"
 msgstr "输入新建文件夹的名称"
 
-#: gtk/gtkfilechooserdefault.c:6552
+#: gtk/gtkfilechooserdefault.c:6783
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d 字节"
 
-#: gtk/gtkfilechooserdefault.c:6554
+#: gtk/gtkfilechooserdefault.c:6785
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:6556
+#: gtk/gtkfilechooserdefault.c:6787
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:6558
+#: gtk/gtkfilechooserdefault.c:6789
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:6604 gtk/gtkfilechooserdefault.c:6628
+#: gtk/gtkfilechooserdefault.c:6835 gtk/gtkfilechooserdefault.c:6859
 msgid "Unknown"
 msgstr "未知"
 
-#: gtk/gtkfilechooserdefault.c:6615
+#: gtk/gtkfilechooserdefault.c:6846
 msgid "Today"
 msgstr "今天"
 
-#: gtk/gtkfilechooserdefault.c:6617
+#: gtk/gtkfilechooserdefault.c:6848
 msgid "Yesterday"
 msgstr "昨天"
 
-#: gtk/gtkfilechooserdefault.c:6699
+#: gtk/gtkfilechooserdefault.c:6930
 msgid "Cannot change folder"
 msgstr "无法更改文件夹"
 
-#: gtk/gtkfilechooserdefault.c:6700
+#: gtk/gtkfilechooserdefault.c:6931
 msgid "The folder you specified is an invalid path."
 msgstr "您所指定的文件夹路径无效。"
 
-#: gtk/gtkfilechooserdefault.c:6739
+#: gtk/gtkfilechooserdefault.c:6970
 #, c-format
 msgid "Could not build file name from '%s' and '%s'"
 msgstr "无法根据“%s”和“%s”生成文件名"
 
-#: gtk/gtkfilechooserdefault.c:6775
+#: gtk/gtkfilechooserdefault.c:7006
 msgid "Could not select item"
 msgstr "无法选择项目"
 
-#: gtk/gtkfilechooserdefault.c:6815
+#: gtk/gtkfilechooserdefault.c:7046
 msgid "Open Location"
 msgstr "打开位置"
 
-#: gtk/gtkfilechooserdefault.c:6822
+#: gtk/gtkfilechooserdefault.c:7053
 msgid "Save in Location"
 msgstr "保存于位置"
 
-#: gtk/gtkfilechooserdefault.c:6846
+#: gtk/gtkfilechooserdefault.c:7077
 msgid "_Location:"
 msgstr "位置(_L)："
 
@@ -1694,7 +1710,8 @@ msgid "This file system does not support mounting"
 msgstr "文件系统不支持挂载"
 
 #: gtk/gtkfilesystemunix.c:639
-msgid "Filesystem"
+#, fuzzy
+msgid "File System"
 msgstr "文件系统"
 
 #: gtk/gtkfilesystemunix.c:796
@@ -1795,7 +1812,7 @@ msgstr "Gamma 值(_G)"
 msgid "Error loading icon: %s"
 msgstr "载入图标时出错：%s"
 
-#: gtk/gtkicontheme.c:1250
+#: gtk/gtkicontheme.c:1239
 #, c-format
 msgid ""
 "Could not find the icon '%s'. The '%s' theme\n"
@@ -1807,7 +1824,7 @@ msgstr ""
 "您可以从下面的位置获得一个副本：\n"
 "\t%s"
 
-#: gtk/gtkicontheme.c:1315
+#: gtk/gtkicontheme.c:1304
 #, c-format
 msgid "Icon '%s' not present in theme"
 msgstr "图标“%s”未出现在主题中"
@@ -1895,7 +1912,7 @@ msgstr "(未知)"
 msgid "clear"
 msgstr "清除"
 
-#: gtk/gtklabel.c:3934
+#: gtk/gtklabel.c:3985
 msgid "Select All"
 msgstr "全选"
 
@@ -2322,43 +2339,43 @@ msgstr "放大(_I)"
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
-#: gtk/gtktextutil.c:48
+#: gtk/gtktextutil.c:53
 msgid "LRM _Left-to-right mark"
 msgstr "LRM 从左至右记号(_L)"
 
-#: gtk/gtktextutil.c:49
+#: gtk/gtktextutil.c:54
 msgid "RLM _Right-to-left mark"
 msgstr "RLM 从右至左记号(_R)"
 
-#: gtk/gtktextutil.c:50
+#: gtk/gtktextutil.c:55
 msgid "LRE Left-to-right _embedding"
 msgstr "LRE 从左至右嵌入(_E)"
 
-#: gtk/gtktextutil.c:51
+#: gtk/gtktextutil.c:56
 msgid "RLE Right-to-left e_mbedding"
 msgstr "RLE 从右至左嵌入(_M)"
 
-#: gtk/gtktextutil.c:52
+#: gtk/gtktextutil.c:57
 msgid "LRO Left-to-right _override"
 msgstr "LRO 从左至右覆盖(_O)"
 
-#: gtk/gtktextutil.c:53
+#: gtk/gtktextutil.c:58
 msgid "RLO Right-to-left o_verride"
 msgstr "RLO 从右至左覆盖(_V)"
 
-#: gtk/gtktextutil.c:54
+#: gtk/gtktextutil.c:59
 msgid "PDF _Pop directional formatting"
 msgstr "PDF 弹出方向格式化(_P)"
 
-#: gtk/gtktextutil.c:55
+#: gtk/gtktextutil.c:60
 msgid "ZWS _Zero width space"
 msgstr "ZWS 零宽度空格(_Z)"
 
-#: gtk/gtktextutil.c:56
+#: gtk/gtktextutil.c:61
 msgid "ZWJ Zero width _joiner"
 msgstr "ZWJ 零宽度接合(_J)"
 
-#: gtk/gtktextutil.c:57
+#: gtk/gtktextutil.c:62
 msgid "ZWNJ Zero width _non-joiner"
 msgstr "ZWNJ 零宽度非接合(_N)"
 
@@ -2440,7 +2457,7 @@ msgstr "越南语(VIQR)"
 msgid "X Input Method"
 msgstr "X 输入法"
 
-#: tests/testfilechooser.c:186
+#: tests/testfilechooser.c:205
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "无法获得文件“%s”的信息：%s"