2.17.32.17.3

1 files changed, 117 insertions, 103 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d5bbe2ea4c..9793dbb6bb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gtk+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-15 20:52-0400\n"
+"POT-Creation-Date: 2009-07-07 00:15-0400\n"
 "PO-Revision-Date: 2009-04-12 01:44+0800\n"
 "Last-Translator: Deng Xiyue <manphiz@gmail.com>\n"
 "Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -1127,7 +1127,7 @@ msgid "COLORS"
 msgstr "颜色"
 
 #. Description of --sync in --help output
-#: gdk/x11/gdkmain-x11.c:92
+#: gdk/x11/gdkmain-x11.c:93
 msgid "Make X calls synchronous"
 msgstr "同步调用 X"
 
@@ -1668,128 +1668,128 @@ msgstr "无法选择文件"
 msgid "_Add to Bookmarks"
 msgstr "添加到书签(_A)"
 
-#: gtk/gtkfilechooserdefault.c:4326
+#: gtk/gtkfilechooserdefault.c:4325
 msgid "Show _Hidden Files"
 msgstr "显示隐藏文件(_H)"
 
-#: gtk/gtkfilechooserdefault.c:4333
+#: gtk/gtkfilechooserdefault.c:4332
 msgid "Show _Size Column"
 msgstr "显示大小列(_S)"
 
-#: gtk/gtkfilechooserdefault.c:4623 gtk/gtkfilesel.c:730
+#: gtk/gtkfilechooserdefault.c:4624 gtk/gtkfilesel.c:730
 msgid "Files"
 msgstr "文件"
 
-#: gtk/gtkfilechooserdefault.c:4672
+#: gtk/gtkfilechooserdefault.c:4673
 msgid "Name"
 msgstr "名称"
 
-#: gtk/gtkfilechooserdefault.c:4696
+#: gtk/gtkfilechooserdefault.c:4698
 msgid "Size"
 msgstr "大小"
 
-#: gtk/gtkfilechooserdefault.c:4709
+#: gtk/gtkfilechooserdefault.c:4714
 msgid "Modified"
 msgstr "修改日期"
 
 #. Label
-#: gtk/gtkfilechooserdefault.c:4930 gtk/gtkprinteroptionwidget.c:796
+#: gtk/gtkfilechooserdefault.c:4935 gtk/gtkprinteroptionwidget.c:796
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: gtk/gtkfilechooserdefault.c:4973
+#: gtk/gtkfilechooserdefault.c:4978
 msgid "_Browse for other folders"
 msgstr "浏览其它文件夹(_B)"
 
-#: gtk/gtkfilechooserdefault.c:5245
+#: gtk/gtkfilechooserdefault.c:5250
 msgid "Type a file name"
 msgstr "输入文件名"
 
 #. Create Folder
-#: gtk/gtkfilechooserdefault.c:5286
+#: gtk/gtkfilechooserdefault.c:5291
 msgid "Create Fo_lder"
 msgstr "创建文件夹(_L)"
 
-#: gtk/gtkfilechooserdefault.c:5296
+#: gtk/gtkfilechooserdefault.c:5301
 msgid "_Location:"
 msgstr "位置(_L)："
 
-#: gtk/gtkfilechooserdefault.c:5500
+#: gtk/gtkfilechooserdefault.c:5505
 msgid "Save in _folder:"
 msgstr "保存于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:5502
+#: gtk/gtkfilechooserdefault.c:5507
 msgid "Create in _folder:"
 msgstr "创建于文件夹(_F)："
 
-#: gtk/gtkfilechooserdefault.c:7243
+#: gtk/gtkfilechooserdefault.c:7249
 msgid "Cannot change to folder because it is not local"
 msgstr "无法更改为文件夹，因为该文件夹并非本地"
 
-#: gtk/gtkfilechooserdefault.c:7868 gtk/gtkfilechooserdefault.c:7889
+#: gtk/gtkfilechooserdefault.c:7874 gtk/gtkfilechooserdefault.c:7895
 #, c-format
 msgid "Shortcut %s already exists"
 msgstr "快捷方式 %s 已经存在"
 
-#: gtk/gtkfilechooserdefault.c:7979
+#: gtk/gtkfilechooserdefault.c:7985
 #, c-format
 msgid "Shortcut %s does not exist"
 msgstr "快捷方式 %s 不存在"
 
-#: gtk/gtkfilechooserdefault.c:8241 gtk/gtkprintunixdialog.c:403
+#: gtk/gtkfilechooserdefault.c:8247 gtk/gtkprintunixdialog.c:402
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "已经存在名为“%s”的文件。您是否想要替换？"
 
-#: gtk/gtkfilechooserdefault.c:8244 gtk/gtkprintunixdialog.c:407
+#: gtk/gtkfilechooserdefault.c:8250 gtk/gtkprintunixdialog.c:406
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr "文件已经在“%s”中存在了。替换该文件将覆盖其中的内容。"
 
-#: gtk/gtkfilechooserdefault.c:8249 gtk/gtkprintunixdialog.c:414
+#: gtk/gtkfilechooserdefault.c:8255 gtk/gtkprintunixdialog.c:413
 msgid "_Replace"
 msgstr "替换(_R)"
 
-#: gtk/gtkfilechooserdefault.c:9011
+#: gtk/gtkfilechooserdefault.c:9017
 msgid "Could not start the search process"
 msgstr "无法开启搜索进程"
 
-#: gtk/gtkfilechooserdefault.c:9012
+#: gtk/gtkfilechooserdefault.c:9018
 msgid ""
 "The program was not able to create a connection to the indexer daemon.  "
 "Please make sure it is running."
 msgstr "程序无法连接到索引守护进程。请确保它在运行。"
 
-#: gtk/gtkfilechooserdefault.c:9026
+#: gtk/gtkfilechooserdefault.c:9032
 msgid "Could not send the search request"
 msgstr "无法发送搜索请求"
 
-#: gtk/gtkfilechooserdefault.c:9499
+#: gtk/gtkfilechooserdefault.c:9509
 #, fuzzy
 msgid "<b>_Search:</b>"
 msgstr "搜索(_S)："
 
-#: gtk/gtkfilechooserdefault.c:10232
+#: gtk/gtkfilechooserdefault.c:10245
 #, fuzzy
 msgid "<b>Recently Used</b>"
 msgstr "最近使用的"
 
-#: gtk/gtkfilechooserdefault.c:10470
+#: gtk/gtkfilechooserdefault.c:10483
 #, c-format
 msgid "Could not mount %s"
 msgstr "无法挂载 %s"
 
-#: gtk/gtkfilechooserdefault.c:11323 gtk/gtkfilechooserdefault.c:11345
-#: gtk/gtkfilechooserdefault.c:11416
+#: gtk/gtkfilechooserdefault.c:11335 gtk/gtkfilechooserdefault.c:11357
+#: gtk/gtkfilechooserdefault.c:11428
 msgid "Unknown"
 msgstr "未知"
 
-#: gtk/gtkfilechooserdefault.c:11363
+#: gtk/gtkfilechooserdefault.c:11375
 msgid "%H:%M"
 msgstr "%H:%M"
 
-#: gtk/gtkfilechooserdefault.c:11365
+#: gtk/gtkfilechooserdefault.c:11377
 msgid "Yesterday at %H:%M"
 msgstr "昨天于 %H:%M"
 
@@ -2238,43 +2238,57 @@ msgstr "GTK+ 选项"
 msgid "Show GTK+ Options"
 msgstr "显示 GTK+ 选项"
 
-#: gtk/gtkmountoperation.c:468
+#: gtk/gtkmountoperation.c:489
 msgid "Co_nnect"
 msgstr "连接(_N)"
 
-#: gtk/gtkmountoperation.c:535
+#: gtk/gtkmountoperation.c:556
 msgid "Connect _anonymously"
 msgstr "匿名连接(_A)"
 
-#: gtk/gtkmountoperation.c:544
+#: gtk/gtkmountoperation.c:565
 msgid "Connect as u_ser:"
 msgstr "连接为用户(_S)："
 
-#: gtk/gtkmountoperation.c:582
+#: gtk/gtkmountoperation.c:603
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: gtk/gtkmountoperation.c:587
+#: gtk/gtkmountoperation.c:608
 msgid "_Domain:"
 msgstr "域(_D)："
 
-#: gtk/gtkmountoperation.c:593
+#: gtk/gtkmountoperation.c:614
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: gtk/gtkmountoperation.c:611
+#: gtk/gtkmountoperation.c:632
 msgid "Forget password _immediately"
 msgstr "立即忘记密码(_I)"
 
-#: gtk/gtkmountoperation.c:621
+#: gtk/gtkmountoperation.c:642
 msgid "Remember password until you _logout"
 msgstr "记到注销之前(_L)"
 
-#: gtk/gtkmountoperation.c:631
+#: gtk/gtkmountoperation.c:652
 msgid "Remember _forever"
 msgstr "永远记住(_F)"
 
-#: gtk/gtknotebook.c:4427 gtk/gtknotebook.c:6949
+#: gtk/gtkmountoperation.c:881
+#, c-format
+msgid "Unknown Application (pid %d)"
+msgstr ""
+
+#: gtk/gtkmountoperation.c:1063
+#, c-format
+msgid "Unable to end process"
+msgstr ""
+
+#: gtk/gtkmountoperation.c:1100
+msgid "_End Process"
+msgstr ""
+
+#: gtk/gtknotebook.c:4430 gtk/gtknotebook.c:6952
 #, c-format
 msgid "Page %u"
 msgstr "第 %u 页"
@@ -2340,7 +2354,7 @@ msgstr "纸张大小(_P)："
 msgid "_Orientation:"
 msgstr "方向(_O)："
 
-#: gtk/gtkpagesetupunixdialog.c:1129 gtk/gtkprintunixdialog.c:2809
+#: gtk/gtkpagesetupunixdialog.c:1129 gtk/gtkprintunixdialog.c:2793
 msgid "Page Setup"
 msgstr "页面设置"
 
@@ -2572,42 +2586,42 @@ msgstr "PrintDlgEx 的句柄无效"
 msgid "Unspecified error"
 msgstr "未指定错误"
 
-#: gtk/gtkprintunixdialog.c:1817
+#: gtk/gtkprintunixdialog.c:1804
 msgid "Printer"
 msgstr "打印机"
 
 #. Translators: this is the header for the location column in the print dialog
-#: gtk/gtkprintunixdialog.c:1827
+#: gtk/gtkprintunixdialog.c:1814
 msgid "Location"
 msgstr "位置"
 
 #. Translators: this is the header for the printer status column in the print dialog
-#: gtk/gtkprintunixdialog.c:1838
+#: gtk/gtkprintunixdialog.c:1825
 msgid "Status"
 msgstr "状态"
 
-#: gtk/gtkprintunixdialog.c:1864
+#: gtk/gtkprintunixdialog.c:1851
 msgid "Range"
 msgstr "范围"
 
-#: gtk/gtkprintunixdialog.c:1868
+#: gtk/gtkprintunixdialog.c:1855
 msgid "_All Pages"
 msgstr "所有页面(_A)"
 
-#: gtk/gtkprintunixdialog.c:1875
+#: gtk/gtkprintunixdialog.c:1862
 msgid "C_urrent Page"
 msgstr "当前页(_U)"
 
-#: gtk/gtkprintunixdialog.c:1886
+#: gtk/gtkprintunixdialog.c:1872
 #, fuzzy
 msgid "Se_lection"
 msgstr "选择(_S)："
 
-#: gtk/gtkprintunixdialog.c:1895
+#: gtk/gtkprintunixdialog.c:1881
 msgid "Pag_es:"
 msgstr "页面(_E)："
 
-#: gtk/gtkprintunixdialog.c:1896
+#: gtk/gtkprintunixdialog.c:1882
 msgid ""
 "Specify one or more page ranges,\n"
 " e.g. 1-3,7,11"
@@ -2615,28 +2629,28 @@ msgstr ""
 "指定一个或多个页面范围，\n"
 "如：1-3,7,11"
 
-#: gtk/gtkprintunixdialog.c:1906
+#: gtk/gtkprintunixdialog.c:1892
 msgid "Pages"
 msgstr "页面"
 
-#: gtk/gtkprintunixdialog.c:1919
+#: gtk/gtkprintunixdialog.c:1905
 msgid "Copies"
 msgstr "副本"
 
 #. FIXME chpe: too much space between Copies and spinbutton, put those 2 in a hbox and make it span 2 columns
-#: gtk/gtkprintunixdialog.c:1924
+#: gtk/gtkprintunixdialog.c:1910
 msgid "Copie_s:"
 msgstr "副本数(_S)："
 
-#: gtk/gtkprintunixdialog.c:1942
+#: gtk/gtkprintunixdialog.c:1928
 msgid "C_ollate"
 msgstr "逐份(_O)"
 
-#: gtk/gtkprintunixdialog.c:1950
+#: gtk/gtkprintunixdialog.c:1936
 msgid "_Reverse"
 msgstr "逆序(_R)"
 
-#: gtk/gtkprintunixdialog.c:1970
+#: gtk/gtkprintunixdialog.c:1956
 msgid "General"
 msgstr "常规"
 
@@ -2646,42 +2660,42 @@ msgstr "常规"
 #. Translators: These strings name the possible arrangements of
 #. * multiple pages on a sheet when printing
 #.
-#: gtk/gtkprintunixdialog.c:2518
+#: gtk/gtkprintunixdialog.c:2503
 #: modules/printbackends/cups/gtkprintbackendcups.c:3130
 msgid "Left to right, top to bottom"
 msgstr "从左到右，从上到下"
 
-#: gtk/gtkprintunixdialog.c:2518
+#: gtk/gtkprintunixdialog.c:2503
 #: modules/printbackends/cups/gtkprintbackendcups.c:3130
 msgid "Left to right, bottom to top"
 msgstr "从左到右，从下到上"
 
-#: gtk/gtkprintunixdialog.c:2519
+#: gtk/gtkprintunixdialog.c:2504
 #: modules/printbackends/cups/gtkprintbackendcups.c:3131
 msgid "Right to left, top to bottom"
 msgstr "从右到左，从上到下"
 
-#: gtk/gtkprintunixdialog.c:2519
+#: gtk/gtkprintunixdialog.c:2504
 #: modules/printbackends/cups/gtkprintbackendcups.c:3131
 msgid "Right to left, bottom to top"
 msgstr "从右到左，从下到上"
 
-#: gtk/gtkprintunixdialog.c:2520
+#: gtk/gtkprintunixdialog.c:2505
 #: modules/printbackends/cups/gtkprintbackendcups.c:3132
 msgid "Top to bottom, left to right"
 msgstr "从上到下，从左到右"
 
-#: gtk/gtkprintunixdialog.c:2520
+#: gtk/gtkprintunixdialog.c:2505
 #: modules/printbackends/cups/gtkprintbackendcups.c:3132
 msgid "Top to bottom, right to left"
 msgstr "从上到下，从右到左"
 
-#: gtk/gtkprintunixdialog.c:2521
+#: gtk/gtkprintunixdialog.c:2506
 #: modules/printbackends/cups/gtkprintbackendcups.c:3133
 msgid "Bottom to top, left to right"
 msgstr "从下到上，从左到右"
 
-#: gtk/gtkprintunixdialog.c:2521
+#: gtk/gtkprintunixdialog.c:2506
 #: modules/printbackends/cups/gtkprintbackendcups.c:3133
 msgid "Bottom to top, right to left"
 msgstr "从下到上，从右到左"
@@ -2689,106 +2703,106 @@ msgstr "从下到上，从右到左"
 #. Translators, this string is used to label the option in the print
 #. * dialog that controls in what order multiple pages are arranged
 #.
-#: gtk/gtkprintunixdialog.c:2525 gtk/gtkprintunixdialog.c:2538
+#: gtk/gtkprintunixdialog.c:2510 gtk/gtkprintunixdialog.c:2523
 #: modules/printbackends/cups/gtkprintbackendcups.c:3164
 msgid "Page Ordering"
 msgstr "页面顺序"
 
-#: gtk/gtkprintunixdialog.c:2554
+#: gtk/gtkprintunixdialog.c:2539
 msgid "Left to right"
 msgstr "从左至右"
 
-#: gtk/gtkprintunixdialog.c:2555
+#: gtk/gtkprintunixdialog.c:2540
 msgid "Right to left"
 msgstr "从右至左"
 
-#: gtk/gtkprintunixdialog.c:2567
+#: gtk/gtkprintunixdialog.c:2552
 #, fuzzy
 msgid "Top to bottom"
 msgstr "从上到下，从左到右"
 
-#: gtk/gtkprintunixdialog.c:2568
+#: gtk/gtkprintunixdialog.c:2553
 #, fuzzy
 msgid "Bottom to top"
 msgstr "从下到上，从左到右"
 
-#: gtk/gtkprintunixdialog.c:2646
+#: gtk/gtkprintunixdialog.c:2631
 msgid "Layout"
 msgstr "布局"
 
-#: gtk/gtkprintunixdialog.c:2650
+#: gtk/gtkprintunixdialog.c:2635
 msgid "T_wo-sided:"
 msgstr "双面(_W)："
 
-#: gtk/gtkprintunixdialog.c:2665
+#: gtk/gtkprintunixdialog.c:2650
 msgid "Pages per _side:"
 msgstr "每面页数(_S)："
 
-#: gtk/gtkprintunixdialog.c:2683
+#: gtk/gtkprintunixdialog.c:2667
 msgid "Page or_dering:"
 msgstr "页面顺序(_D)："
 
-#: gtk/gtkprintunixdialog.c:2699
+#: gtk/gtkprintunixdialog.c:2683
 msgid "_Only print:"
 msgstr "打印(_O)："
 
 #. In enum order
-#: gtk/gtkprintunixdialog.c:2714
+#: gtk/gtkprintunixdialog.c:2698
 msgid "All sheets"
 msgstr "全面页面"
 
-#: gtk/gtkprintunixdialog.c:2715
+#: gtk/gtkprintunixdialog.c:2699
 msgid "Even sheets"
 msgstr "奇数页"
 
-#: gtk/gtkprintunixdialog.c:2716
+#: gtk/gtkprintunixdialog.c:2700
 msgid "Odd sheets"
 msgstr "偶数页"
 
-#: gtk/gtkprintunixdialog.c:2719
+#: gtk/gtkprintunixdialog.c:2703
 msgid "Sc_ale:"
 msgstr "缩放(_A)："
 
-#: gtk/gtkprintunixdialog.c:2746
+#: gtk/gtkprintunixdialog.c:2730
 msgid "Paper"
 msgstr "纸张"
 
-#: gtk/gtkprintunixdialog.c:2750
+#: gtk/gtkprintunixdialog.c:2734
 msgid "Paper _type:"
 msgstr "纸张类型(_T)："
 
-#: gtk/gtkprintunixdialog.c:2765
+#: gtk/gtkprintunixdialog.c:2749
 msgid "Paper _source:"
 msgstr "纸张来源(_S)："
 
-#: gtk/gtkprintunixdialog.c:2780
+#: gtk/gtkprintunixdialog.c:2764
 msgid "Output t_ray:"
 msgstr "出纸器(_R)："
 
-#: gtk/gtkprintunixdialog.c:2834
+#: gtk/gtkprintunixdialog.c:2818
 msgid "Job Details"
 msgstr "任务细节"
 
-#: gtk/gtkprintunixdialog.c:2840
+#: gtk/gtkprintunixdialog.c:2824
 msgid "Pri_ority:"
 msgstr "优先级(_O)："
 
-#: gtk/gtkprintunixdialog.c:2855
+#: gtk/gtkprintunixdialog.c:2839
 msgid "_Billing info:"
 msgstr "计费信息(_B)："
 
-#: gtk/gtkprintunixdialog.c:2873
+#: gtk/gtkprintunixdialog.c:2857
 msgid "Print Document"
 msgstr "打印文档"
 
 #. Translators: this is one of the choices for the print at option
 #. * in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:2882
+#: gtk/gtkprintunixdialog.c:2866
 msgid "_Now"
 msgstr "立即(_N)"
 
-#: gtk/gtkprintunixdialog.c:2893
+#: gtk/gtkprintunixdialog.c:2877
 msgid "A_t:"
 msgstr "于(_T)："
 
@@ -2796,7 +2810,7 @@ msgstr "于(_T)："
 #. * You can remove the am/pm values below for your locale if they are not
 #. * supported.
 #.
-#: gtk/gtkprintunixdialog.c:2899
+#: gtk/gtkprintunixdialog.c:2883
 msgid ""
 "Specify the time of print,\n"
 " e.g. 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
@@ -2804,64 +2818,64 @@ msgstr ""
 "指定打印时间，\n"
 "例如 15:30, 2:35 pm, 14:15:20, 11:46:30 am, 4 pm"
 
-#: gtk/gtkprintunixdialog.c:2909
+#: gtk/gtkprintunixdialog.c:2893
 msgid "Time of print"
 msgstr "打印时间"
 
-#: gtk/gtkprintunixdialog.c:2925
+#: gtk/gtkprintunixdialog.c:2909
 msgid "On _hold"
 msgstr "等待(_H)"
 
-#: gtk/gtkprintunixdialog.c:2926
+#: gtk/gtkprintunixdialog.c:2910
 msgid "Hold the job until it is explicitly released"
 msgstr "保持任务直到其被显式释放"
 
-#: gtk/gtkprintunixdialog.c:2946
+#: gtk/gtkprintunixdialog.c:2930
 msgid "Add Cover Page"
 msgstr "添加封面页"
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the front cover page.
 #.
-#: gtk/gtkprintunixdialog.c:2955
+#: gtk/gtkprintunixdialog.c:2939
 msgid "Be_fore:"
 msgstr "封面(_F)："
 
 #. Translators, this is the label used for the option in the print
 #. * dialog that controls the back cover page.
 #.
-#: gtk/gtkprintunixdialog.c:2973
+#: gtk/gtkprintunixdialog.c:2957
 msgid "_After:"
 msgstr "封底(_A)："
 
 #. Translators: this is the tab label for the notebook tab containing
 #. * job-specific options in the print dialog
 #.
-#: gtk/gtkprintunixdialog.c:2991
+#: gtk/gtkprintunixdialog.c:2975
 msgid "Job"
 msgstr "任务"
 
-#: gtk/gtkprintunixdialog.c:3057
+#: gtk/gtkprintunixdialog.c:3041
 msgid "Advanced"
 msgstr "高级"
 
-#: gtk/gtkprintunixdialog.c:3092
+#: gtk/gtkprintunixdialog.c:3075
 msgid "Image Quality"
 msgstr "图像质量"
 
-#: gtk/gtkprintunixdialog.c:3095
+#: gtk/gtkprintunixdialog.c:3078
 msgid "Color"
 msgstr "颜色"
 
-#: gtk/gtkprintunixdialog.c:3098
+#: gtk/gtkprintunixdialog.c:3081
 msgid "Finishing"
 msgstr "完成"
 
-#: gtk/gtkprintunixdialog.c:3108
+#: gtk/gtkprintunixdialog.c:3091
 msgid "Some of the settings in the dialog conflict"
 msgstr "对话框中的某些设置冲突"
 
-#: gtk/gtkprintunixdialog.c:3131
+#: gtk/gtkprintunixdialog.c:3114
 msgid "Print"
 msgstr "打印"