=== Released 2.3.6 ===GTK_2_3_6

Tue Mar  9 09:57:25 2004  Owen Taylor  <otaylor@redhat.com>

        * === Released 2.3.6 ===

        * configure.in: Version 2.3.6, interface age 0.

        * NEWS: Updates

1 files changed, 74 insertions, 59 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dc0e09116..b83f2f4ea 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: 2004-03-07 04:12+0100\n"
+"POT-Creation-Date: 2004-03-09 11:16-0500\n"
 "PO-Revision-Date: 2004-03-07 15:00+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:147 gdk-pixbuf/gdk-pixbuf-io.c:736
-#: gdk-pixbuf/gdk-pixbuf-io.c:869 tests/testfilechooser.c:195
+#: gdk-pixbuf/gdk-pixbuf-io.c:869 tests/testfilechooser.c:192
 #, 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:198 gdk-pixbuf/gdk-pixbuf-io.c:780
-#: gdk-pixbuf/gdk-pixbuf-io.c:906 tests/testfilechooser.c:234
+#: gdk-pixbuf/gdk-pixbuf-io.c:906 tests/testfilechooser.c:237
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -895,28 +895,34 @@ msgstr "插入 Unicode 控制字符(_I)"
 msgid "Invalid filename: %s"
 msgstr "无效的文件名：%s"
 
-#: gtk/gtkfilechooserdefault.c:636
+#: gtk/gtkfilechooserdefault.c:624
 #, c-format
 msgid ""
 "Could not retrieve information about %s:\n"
 "%s"
-msgstr "无法获取关于 %s 的信息：\n%s"
+msgstr ""
+"无法获取关于 %s 的信息：\n"
+"%s"
 
-#: gtk/gtkfilechooserdefault.c:647
+#: gtk/gtkfilechooserdefault.c:635
 #, c-format
 msgid ""
 "Could not add a bookmark for %s:\n"
 "%s"
-msgstr "无法为 %s 添加书签：\n%s"
+msgstr ""
+"无法为 %s 添加书签：\n"
+"%s"
 
-#: gtk/gtkfilechooserdefault.c:660 gtk/gtkfilechooserdefault.c:4277
+#: gtk/gtkfilechooserdefault.c:650 gtk/gtkfilechooserdefault.c:4116
 #, c-format
 msgid ""
 "Could not build file name from '%s' and '%s':\n"
 "%s"
-msgstr "无法根据“%s”和“%s”生成文件名：\n%s"
+msgstr ""
+"无法根据“%s”和“%s”生成文件名：\n"
+"%s"
 
-#: gtk/gtkfilechooserdefault.c:676
+#: gtk/gtkfilechooserdefault.c:666
 #, c-format
 msgid ""
 "Could not change the current folder to %s:\n"
@@ -925,15 +931,15 @@ msgstr ""
 "无法将当前文件夹更改为 %s：\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:872
+#: gtk/gtkfilechooserdefault.c:859 gtk/gtkpathbar.c:652
 msgid "Home"
 msgstr "主目录"
 
-#: gtk/gtkfilechooserdefault.c:890
+#: gtk/gtkfilechooserdefault.c:877
 msgid "Desktop"
 msgstr "桌面"
 
-#: gtk/gtkfilechooserdefault.c:1295
+#: gtk/gtkfilechooserdefault.c:1283
 #, c-format
 msgid ""
 "Could not create folder %s:\n"
@@ -942,121 +948,128 @@ msgstr ""
 "创建文件夹 %s 出错：\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:1397 gtk/gtkfilechooserdefault.c:1967
-msgid "Name"
-msgstr "名称"
-
-#: gtk/gtkfilechooserdefault.c:1488
+#: gtk/gtkfilechooserdefault.c:1436
 #, c-format
 msgid "Could not add bookmark for %s because it is not a folder."
 msgstr "无法为 %s 添加书签，因为它不是文件夹。"
 
-#: gtk/gtkfilechooserdefault.c:1589
+#: gtk/gtkfilechooserdefault.c:1515
 #, c-format
 msgid ""
 "Could not remove bookmark for %s:\n"
 "%s"
-msgstr "无法删除 %s 的书签：\n%s"
+msgstr ""
+"无法删除 %s 的书签：\n"
+"%s"
 
-#: gtk/gtkfilechooserdefault.c:1790
+#: gtk/gtkfilechooserdefault.c:1717
 #, c-format
 msgid "Could not add a bookmark for %s because it is an invalid path name."
 msgstr "无法为 %s 添加文件夹，因为其路径名称无效。"
 
-#: gtk/gtkfilechooserdefault.c:1861
+#: gtk/gtkfilechooserdefault.c:1788
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME these need accelerators when appropriate, and
 #. * need the mnemonics to be rationalized
 #.
-#: gtk/gtkfilechooserdefault.c:1908 gtk/gtkstock.c:276
+#: gtk/gtkfilechooserdefault.c:1835 gtk/gtkstock.c:276
 msgid "_Add"
 msgstr "添加(_A)"
 
-#: gtk/gtkfilechooserdefault.c:1918 gtk/gtkstock.c:324
+#: gtk/gtkfilechooserdefault.c:1845 gtk/gtkstock.c:324
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: gtk/gtkfilechooserdefault.c:1989
+#: gtk/gtkfilechooserdefault.c:1931
+msgid "Name"
+msgstr "名称"
+
+#: gtk/gtkfilechooserdefault.c:1953
 msgid "Size"
 msgstr "大小"
 
-#: gtk/gtkfilechooserdefault.c:2001
+#: gtk/gtkfilechooserdefault.c:1965
 msgid "Modified"
 msgstr "修改日期"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:2051
+#: gtk/gtkfilechooserdefault.c:2027
 msgid "Create _Folder"
 msgstr "创建文件夹(_F)"
 
 #. Name entry
-#: gtk/gtkfilechooserdefault.c:2163
+#: gtk/gtkfilechooserdefault.c:2134
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#. Folder combo
-#: gtk/gtkfilechooserdefault.c:2182
-msgid "Save in _Folder:"
-msgstr "保存于文件夹(_F)："
-
-#: gtk/gtkfilechooserdefault.c:2205
+#: gtk/gtkfilechooserdefault.c:2176
 msgid "_Browse for other folders"
 msgstr "浏览其它文件夹(_B)"
 
-#: gtk/gtkfilechooserdefault.c:3410
+#: gtk/gtkfilechooserdefault.c:2381
+#, fuzzy
+msgid "Save in _folder:"
+msgstr "保存于文件夹(_F)："
+
+#: gtk/gtkfilechooserdefault.c:2383
+#, fuzzy
+msgid "Create in _folder:"
+msgstr "创建文件夹(_F)"
+
+#: gtk/gtkfilechooserdefault.c:3322
 #, c-format
 msgid "shortcut %s does not exist"
 msgstr "快捷方式 %s 不存在"
 
-#: gtk/gtkfilechooserdefault.c:4101
+#: gtk/gtkfilechooserdefault.c:3938
 msgid "Type name of new folder"
 msgstr "输入新建文件夹的类型"
 
-#: gtk/gtkfilechooserdefault.c:4130
+#: gtk/gtkfilechooserdefault.c:3967
 #, c-format
 msgid "%d byte"
 msgid_plural "%d bytes"
 msgstr[0] "%d 字节"
 
-#: gtk/gtkfilechooserdefault.c:4132
+#: gtk/gtkfilechooserdefault.c:3969
 #, c-format
 msgid "%.1f K"
 msgstr "%.1f K"
 
-#: gtk/gtkfilechooserdefault.c:4134
+#: gtk/gtkfilechooserdefault.c:3971
 #, c-format
 msgid "%.1f M"
 msgstr "%.1f M"
 
-#: gtk/gtkfilechooserdefault.c:4136
+#: gtk/gtkfilechooserdefault.c:3973
 #, c-format
 msgid "%.1f G"
 msgstr "%.1f G"
 
-#: gtk/gtkfilechooserdefault.c:4181
+#: gtk/gtkfilechooserdefault.c:4018
 msgid "Today"
 msgstr "今天"
 
-#: gtk/gtkfilechooserdefault.c:4183
+#: gtk/gtkfilechooserdefault.c:4020
 msgid "Yesterday"
 msgstr "昨天"
 
 #. FIXME: Get the right format for the locale
-#: gtk/gtkfilechooserdefault.c:4192
+#: gtk/gtkfilechooserdefault.c:4029
 msgid "%d/%b/%Y"
 msgstr "%Y-%m-%d"
 
-#: gtk/gtkfilechooserdefault.c:4195
+#: gtk/gtkfilechooserdefault.c:4032
 msgid "Unknown"
 msgstr "未知"
 
-#: gtk/gtkfilechooserdefault.c:4240
+#: gtk/gtkfilechooserdefault.c:4077
 msgid "Cannot change to the folder you specified as it is an invalid path."
 msgstr "无法更改为您指定的文件夹，因为该文件夹的路径无效。"
 
-#: gtk/gtkfilechooserdefault.c:4315
+#: gtk/gtkfilechooserdefault.c:4148
 #, c-format
 msgid ""
 "Could not select %s:\n"
@@ -1065,20 +1078,22 @@ msgstr ""
 "无法选择 %s：\n"
 "%s"
 
-#: gtk/gtkfilechooserdefault.c:4341
+#: gtk/gtkfilechooserdefault.c:4184
 msgid "Open Location"
 msgstr "打开位置"
 
-#: gtk/gtkfilechooserdefault.c:4356
+#: gtk/gtkfilechooserdefault.c:4199
 msgid "_Location:"
 msgstr "位置(_L)："
 
-#: gtk/gtkfilechooserdefault.c:4390
+#: gtk/gtkfilechooserdefault.c:4252
 #, c-format
 msgid ""
 "Could not go to the parent folder of %s:\n"
 "%s"
-msgstr "无法转到 %s 的父文件夹：\n%s"
+msgstr ""
+"无法转到 %s 的父文件夹：\n"
+"%s"
 
 #: gtk/gtkfilesel.c:730
 msgid "Folders"
@@ -1255,30 +1270,30 @@ msgstr "名称太长"
 msgid "Couldn't convert filename"
 msgstr "无法转换文件名"
 
-#: gtk/gtkfilesystemmodel.c:1206
+#: gtk/gtkfilesystemmodel.c:1205
 msgid "(Empty)"
 msgstr "(空)"
 
-#: gtk/gtkfilesystemunix.c:385 gtk/gtkfilesystemwin32.c:376
+#: gtk/gtkfilesystemunix.c:386 gtk/gtkfilesystemwin32.c:376
 #, c-format
 msgid "error creating directory '%s': %s"
 msgstr "创建目录“%s”时出错：%s"
 
-#: gtk/gtkfilesystemunix.c:446 gtk/gtkfilesystemwin32.c:417
+#: gtk/gtkfilesystemunix.c:447 gtk/gtkfilesystemwin32.c:417
 msgid "This file system does not support mounting"
 msgstr "文件系统不支持挂载"
 
-#: gtk/gtkfilesystemunix.c:454
+#: gtk/gtkfilesystemunix.c:455
 msgid "Filesystem"
 msgstr "文件系统"
 
-#: gtk/gtkfilesystemunix.c:473 gtk/gtkfilesystemunix.c:1377
+#: gtk/gtkfilesystemunix.c:476 gtk/gtkfilesystemunix.c:1401
 #: gtk/gtkfilesystemwin32.c:1176
 #, c-format
 msgid "error getting information for '%s': %s"
 msgstr "获取“%s”的信息时出错：%s"
 
-#: gtk/gtkfilesystemunix.c:1059 gtk/gtkfilesystemwin32.c:794
+#: gtk/gtkfilesystemunix.c:1082 gtk/gtkfilesystemwin32.c:794
 #, c-format
 msgid "Bookmark saving failed (%s)"
 msgstr "书签保存失败(%s)"
@@ -1352,7 +1367,8 @@ msgid ""
 "\t%s"
 msgstr ""
 "找不到图标“%s”。“%s”主题也没有找到，可能您需要先安装它。\n"
-"您可以从下面的位置获得一个副本：\n\t%s"
+"您可以从下面的位置获得一个副本：\n"
+"\t%s"
 
 #: gtk/gtkicontheme.c:1251
 #, c-format
@@ -1882,8 +1898,7 @@ msgstr "越南语(VIQR)"
 msgid "X Input Method"
 msgstr "X 输入法"
 
-#: tests/testfilechooser.c:182
+#: tests/testfilechooser.c:179
 #, c-format
 msgid "Could not get information for file '%s': %s"
 msgstr "无法获得文件“%s”的信息：%s"
-