non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 3ab87fa779fcdf6a5bb0bc5537bfba1a922ae68f..ce66d1b74d174538c55671be9b929317e24327a3 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,22 +1,27 @@
+# Simplified Chinese Messages for wxWidgets
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the wxWidgets package.
+# mrfx <mrfx@fm365.com>
+# Liu Xiao Xi <liouxiao@hotmail.com>, 2005
+#

 msgid ""
 msgstr ""
 msgid ""
 msgstr ""

-"Project-Id-Version: wxWidgets-2.5.2\n"
-"POT-Creation-Date: 2005-04-11 22:24+0200\n"
-"PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
-"Last-Translator: Liu XiaoXi <liouxiao@hotmail.com>\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"PO-Revision-Date: 2005-12-21 10:38+0800\n"
+"Last-Translator: Liu Xiao Xi <liouxiao@hotmail.com>\n"

 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"Report-Msgid-Bugs-To: \n"
-"Previous-Translator: mrfx <mrfx@fm365.com>\n"

 
 

-#: ../src/common/debugrpt.cpp:547
+#: ../src/common/debugrpt.cpp:569

 #, c-format
 msgid "\t%s: %s\n"
 #, c-format
 msgid "\t%s: %s\n"

-msgstr ""
+msgstr "\t%s: %s\n"

 
 

-#: ../src/common/debugrpt.cpp:550
+#: ../src/common/debugrpt.cpp:572

 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"


@@ -24,11 +29,11 @@ msgstr ""
 "\n"
 "请将报告发送给程序维护人员, 谢谢!\n"
 
 "\n"
 "请将报告发送给程序维护人员, 谢谢!\n"
 

-#: ../src/palmos/utils.cpp:205
+#: ../src/palmos/utils.cpp:206

 msgid " "
 msgstr " "
 
 msgid " "
 msgstr " "
 

-#: ../src/generic/dbgrptg.cpp:293
+#: ../src/generic/dbgrptg.cpp:312

 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
 
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
 


@@ -37,7 +42,7 @@ msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 

-#: ../src/common/docview.cpp:1432
+#: ../src/common/docview.cpp:1419

 msgid " - "
 msgstr " - "
 
 msgid " - "
 msgstr " - "
 


@@ -45,23 +50,23 @@ msgstr " - "
 msgid " Preview"
 msgstr " 预览"
 
 msgid " Preview"
 msgstr " 预览"
 

-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:124

 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 

-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:125

 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
 
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
 

-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:126

 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "#12 信封, 4 3/4 x 11 英寸"
 
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "#12 信封, 4 3/4 x 11 英寸"
 

-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:127

 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "#14 信封, 5 x 11 1/2 英寸"
 
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "#14 信封, 5 x 11 1/2 英寸"
 

-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:123

 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
 
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
 


@@ -72,13 +77,15 @@ msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
 msgid "#define %s must be an integer."
 msgstr "#所定义的 %s 必须是整数."
 
 msgid "#define %s must be an integer."
 msgstr "#所定义的 %s 必须是整数."
 

-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1042
+#: ../src/html/helpfrm.cpp:1044
+#: ../src/html/helpfrm.cpp:1703
+#: ../src/html/helpfrm.cpp:1736

 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 

-#: ../src/generic/filedlgg.cpp:295
+#: ../src/generic/filedlgg.cpp:288

 #, c-format
 msgid "%ld bytes"
 msgstr "%ld 字节"
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld 字节"


@@ -88,17 +95,17 @@ msgstr "%ld 字节"
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 

-#: ../src/generic/logg.cpp:266
+#: ../src/generic/logg.cpp:261

 #, c-format
 msgid "%s Error"
 msgstr "%s 错误"
 
 #, c-format
 msgid "%s Error"
 msgstr "%s 错误"
 

-#: ../src/generic/logg.cpp:274
+#: ../src/generic/logg.cpp:269

 #, c-format
 msgid "%s Information"
 msgstr "%s 信息"
 
 #, c-format
 msgid "%s Information"
 msgstr "%s 信息"
 

-#: ../src/generic/logg.cpp:270
+#: ../src/generic/logg.cpp:265

 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"
 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"


@@ -108,7 +115,7 @@ msgstr "%s 警告"
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 

-#: ../src/common/msgout.cpp:189
+#: ../src/common/msgout.cpp:229

 #, c-format
 msgid "%s message"
 msgstr "%s 消息"
 #, c-format
 msgid "%s message"
 msgstr "%s 消息"


@@ -130,7 +137,8 @@ msgstr "%s 不是图标资源."
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: 不良资源文件语法."
 
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: 不良资源文件语法."
 

-#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+#: ../src/html/helpfrm.cpp:357
+#: ../src/html/helpfrm.cpp:359

 msgid "&About..."
 msgstr "关于(&A)"
 
 msgid "&About..."
 msgstr "关于(&A)"
 


@@ -142,7 +150,7 @@ msgstr "实际大小(&A)"
 msgid "&Apply"
 msgstr "应用(&A)"
 
 msgid "&Apply"
 msgstr "应用(&A)"
 

-#: ../src/msw/mdi.cpp:190
+#: ../src/msw/mdi.cpp:187

 msgid "&Arrange Icons"
 msgstr "重排图标(&A)"
 
 msgid "&Arrange Icons"
 msgstr "重排图标(&A)"
 


@@ -154,12 +162,14 @@ msgstr "返回(&B)"
 msgid "&Bold"
 msgstr "粗体(&B)"
 
 msgid "&Bold"
 msgstr "粗体(&B)"
 

-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:418
+#: ../src/common/stockitem.cpp:110
+#: ../src/generic/fontdlgg.cpp:363
+#: ../src/generic/fontdlgg.cpp:382
+#: ../src/generic/wizard.cpp:422

 msgid "&Cancel"
 msgstr "取消(&C)"
 
 msgid "&Cancel"
 msgstr "取消(&C)"
 

-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:183

 msgid "&Cascade"
 msgstr "层叠(&C)"
 
 msgid "&Cascade"
 msgstr "层叠(&C)"
 


@@ -167,24 +177,30 @@ msgstr "层叠(&C)"
 msgid "&Clear"
 msgstr "清除(&C)"
 
 msgid "&Clear"
 msgstr "清除(&C)"
 

-#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354
+#: ../src/common/prntbase.cpp:875
+#: ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:509
+#: ../src/html/helpfrm.cpp:354

 msgid "&Close"
 msgstr "关闭(&C)"
 
 msgid "&Close"
 msgstr "关闭(&C)"
 

-#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065
+#: ../src/common/stockitem.cpp:113
+#: ../src/mac/carbon/textctrl.cpp:1074
+#: ../src/msw/textctrl.cpp:2064

 msgid "&Copy"
 msgstr "复制(&C)"
 
 msgid "&Copy"
 msgstr "复制(&C)"
 

-#: ../src/generic/dbgrptg.cpp:301
+#: ../src/generic/dbgrptg.cpp:320

 msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 
 msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 

-#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067
+#: ../src/common/stockitem.cpp:115
+#: ../src/mac/carbon/textctrl.cpp:1076
+#: ../src/msw/textctrl.cpp:2066

 msgid "&Delete"
 msgstr "删除(&D)"
 
 msgid "&Delete"
 msgstr "删除(&D)"
 

-#: ../src/generic/logg.cpp:718
+#: ../src/generic/logg.cpp:717

 msgid "&Details"
 msgstr "细节(&D)"
 
 msgid "&Details"
 msgstr "细节(&D)"
 


@@ -200,7 +216,7 @@ msgstr "文件(&F)"
 msgid "&Find"
 msgstr "查找(&F)"
 
 msgid "&Find"
 msgstr "查找(&F)"
 

-#: ../src/generic/wizard.cpp:606
+#: ../src/generic/wizard.cpp:634

 msgid "&Finish"
 msgstr "完成(&F)"
 
 msgid "&Finish"
 msgstr "完成(&F)"
 


@@ -212,17 +228,18 @@ msgstr "字体(&F):"
 msgid "&Forward"
 msgstr "向前(&F)"
 
 msgid "&Forward"
 msgstr "向前(&F)"
 

-#: ../src/common/prntbase.cpp:863
+#: ../src/common/prntbase.cpp:910

 msgid "&Goto..."
 msgstr "跳转(&G)..."
 
 msgid "&Goto..."
 msgstr "跳转(&G)..."
 

-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
-#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:122
+#: ../src/generic/wizard.cpp:418
+#: ../src/generic/wizard.cpp:425
+#: ../src/html/helpfrm.cpp:362

 msgid "&Help"
 msgstr "帮助(&H)"
 
 #: ../src/common/stockitem.cpp:123
 msgid "&Help"
 msgstr "帮助(&H)"
 
 #: ../src/common/stockitem.cpp:123

-#, fuzzy

 msgid "&Home"
 msgstr "Home(&H)"
 
 msgid "&Home"
 msgstr "Home(&H)"
 


@@ -234,11 +251,11 @@ msgstr "索引(&I)"
 msgid "&Italic"
 msgstr "斜体(&I)"
 
 msgid "&Italic"
 msgstr "斜体(&I)"
 

-#: ../src/generic/logg.cpp:513
+#: ../src/generic/logg.cpp:510

 msgid "&Log"
 msgstr "日志(&L)"
 
 msgid "&Log"
 msgstr "日志(&L)"
 

-#: ../src/univ/themes/win32.cpp:4817
+#: ../src/univ/themes/win32.cpp:4923

 msgid "&Move"
 msgstr "移动(&M)"
 
 msgid "&Move"
 msgstr "移动(&M)"
 


@@ -246,11 +263,13 @@ msgstr "移动(&M)"
 msgid "&New"
 msgstr "新建(&N)"
 
 msgid "&New"
 msgstr "新建(&N)"
 

-#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
+#: ../src/generic/mdig.cpp:118
+#: ../src/msw/mdi.cpp:188

 msgid "&Next"
 msgstr "下一个(&N)"
 
 msgid "&Next"
 msgstr "下一个(&N)"
 

-#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
+#: ../src/generic/wizard.cpp:421
+#: ../src/generic/wizard.cpp:636

 msgid "&Next >"
 msgstr "下一个(&N) >"
 
 msgid "&Next >"
 msgstr "下一个(&N) >"
 


@@ -262,11 +281,12 @@ msgstr "下一技巧(&N)"
 msgid "&No"
 msgstr "否(&N)"
 
 msgid "&No"
 msgstr "否(&N)"
 

-#: ../src/generic/dbgrptg.cpp:323
+#: ../src/generic/dbgrptg.cpp:342

 msgid "&Notes:"
 msgstr "注意(&N):"
 
 msgid "&Notes:"
 msgstr "注意(&N):"
 

-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
+#: ../src/common/stockitem.cpp:133
+#: ../src/generic/fontdlgg.cpp:368

 #: ../src/generic/fontdlgg.cpp:375
 msgid "&OK"
 msgstr "确认(&O)"
 #: ../src/generic/fontdlgg.cpp:375
 msgid "&OK"
 msgstr "确认(&O)"


@@ -279,7 +299,9 @@ msgstr "打开(&O)"
 msgid "&Open..."
 msgstr "打开(&O)..."
 
 msgid "&Open..."
 msgstr "打开(&O)..."
 

-#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066
+#: ../src/common/stockitem.cpp:135
+#: ../src/mac/carbon/textctrl.cpp:1075
+#: ../src/msw/textctrl.cpp:2065

 msgid "&Paste"
 msgstr "粘贴(&P)"
 
 msgid "&Paste"
 msgstr "粘贴(&P)"
 


@@ -289,9 +311,10 @@ msgstr "字体大小(Point size)(&P):"
 
 #: ../src/common/stockitem.cpp:136
 msgid "&Preferences"
 
 #: ../src/common/stockitem.cpp:136
 msgid "&Preferences"

-msgstr "偏好设置"
+msgstr "偏好设置(&P)"

 
 

-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:119
+#: ../src/msw/mdi.cpp:189

 msgid "&Previous"
 msgstr "前页(&P)"
 
 msgid "&Previous"
 msgstr "前页(&P)"
 


@@ -299,7 +322,7 @@ msgstr "前页(&P)"
 msgid "&Print"
 msgstr "打印(&P)"
 
 msgid "&Print"
 msgstr "打印(&P)"
 

-#: ../src/common/prntbase.cpp:833
+#: ../src/common/prntbase.cpp:880

 msgid "&Print..."
 msgstr "打印(&P)..."
 
 msgid "&Print..."
 msgstr "打印(&P)..."
 


@@ -311,12 +334,16 @@ msgstr "属性(&P)"
 msgid "&Quit"
 msgstr "退出(&Q)"
 
 msgid "&Quit"
 msgstr "退出(&Q)"
 

-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062
+#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141
+#: ../src/mac/carbon/textctrl.cpp:1071
+#: ../src/msw/textctrl.cpp:2061

 msgid "&Redo"
 msgstr "重复(&R)"
 
 msgid "&Redo"
 msgstr "重复(&R)"
 

-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
+#: ../src/common/cmdproc.cpp:288
+#: ../src/common/cmdproc.cpp:308

 msgid "&Redo "
 msgstr "重复(&R) "
 
 msgid "&Redo "
 msgstr "重复(&R) "
 


@@ -324,7 +351,7 @@ msgstr "重复(&R) "
 msgid "&Replace"
 msgstr "替换(&R)"
 
 msgid "&Replace"
 msgstr "替换(&R)"
 

-#: ../src/univ/themes/win32.cpp:4816
+#: ../src/univ/themes/win32.cpp:4922

 msgid "&Restore"
 msgstr "复原(&R)"
 
 msgid "&Restore"
 msgstr "复原(&R)"
 


@@ -332,7 +359,7 @@ msgstr "复原(&R)"
 msgid "&Save"
 msgstr "保存(&S)"
 
 msgid "&Save"
 msgstr "保存(&S)"
 

-#: ../src/generic/logg.cpp:508
+#: ../src/generic/logg.cpp:505

 msgid "&Save..."
 msgstr "保存(&S)..."
 
 msgid "&Save..."
 msgstr "保存(&S)..."
 


@@ -340,7 +367,7 @@ msgstr "保存(&S)..."
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 

-#: ../src/univ/themes/win32.cpp:4819
+#: ../src/univ/themes/win32.cpp:4925

 msgid "&Size"
 msgstr "大小(&S)"
 
 msgid "&Size"
 msgstr "大小(&S)"
 


@@ -352,12 +379,15 @@ msgstr "停止(&S)"
 msgid "&Style:"
 msgstr "字体(&S):"
 
 msgid "&Style:"
 msgstr "字体(&S):"
 

-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/common/stockitem.cpp:149
+#: ../src/generic/fontdlgg.cpp:337

 msgid "&Underline"
 msgstr "下划线(&U)"
 
 msgid "&Underline"
 msgstr "下划线(&U)"
 

-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/msw/textctrl.cpp:2061
+#: ../src/common/cmdproc.cpp:270
+#: ../src/common/stockitem.cpp:150
+#: ../src/mac/carbon/textctrl.cpp:1070
+#: ../src/msw/textctrl.cpp:2060

 msgid "&Undo"
 msgstr "恢复(&U)"
 
 msgid "&Undo"
 msgstr "恢复(&U)"
 


@@ -377,9 +407,12 @@ msgstr "向上(&U)"
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 

-#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
-#: ../src/msw/mdi.cpp:1424
+#: ../src/generic/mdig.cpp:298
+#: ../src/generic/mdig.cpp:314
+#: ../src/generic/mdig.cpp:318
+#: ../src/msw/mdi.cpp:1410
+#: ../src/msw/mdi.cpp:1417
+#: ../src/msw/mdi.cpp:1447

 msgid "&Window"
 msgstr "窗口(&W)"
 
 msgid "&Window"
 msgstr "窗口(&W)"
 


@@ -387,12 +420,14 @@ msgstr "窗口(&W)"
 msgid "&Yes"
 msgstr "是(&Y)"
 
 msgid "&Yes"
 msgstr "是(&Y)"
 

-#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
+#: ../src/common/config.cpp:433
+#: ../src/msw/regconf.cpp:258

 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有额外的 '..', 忽略之."
 
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有额外的 '..', 忽略之."
 

-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
+#: ../src/common/valtext.cpp:132
+#: ../src/common/valtext.cpp:162

 #: ../src/common/valtext.cpp:168
 #, c-format
 msgid "'%s' is invalid"
 #: ../src/common/valtext.cpp:168
 #, c-format
 msgid "'%s' is invalid"


@@ -403,7 +438,7 @@ msgstr "'%s' 是无效的"
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 

-#: ../src/common/intl.cpp:1146
+#: ../src/common/intl.cpp:1147

 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录."


@@ -437,20 +472,21 @@ msgstr "'%s' 应仅包含字母或数字字符."
 msgid "(Help)"
 msgstr "(帮助)"
 
 msgid "(Help)"
 msgstr "(帮助)"
 

-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:431
+#: ../src/html/helpfrm.cpp:1114

 #: ../src/html/helpfrm.cpp:1764
 msgid "(bookmarks)"
 msgstr "(书签)"
 
 #: ../src/html/helpfrm.cpp:1764
 msgid "(bookmarks)"
 msgstr "(书签)"
 

-#: ../src/common/debugrpt.cpp:537
+#: ../src/common/debugrpt.cpp:559

 msgid "*** A debug report has been generated\n"
 msgstr "*** 生成了一份调试报告\n"
 
 msgid "*** A debug report has been generated\n"
 msgstr "*** 生成了一份调试报告\n"
 

-#: ../src/common/debugrpt.cpp:540
+#: ../src/common/debugrpt.cpp:562

 msgid "*** And includes the following files:\n"
 msgstr "*** 且包含以下文件:\n"
 
 msgid "*** And includes the following files:\n"
 msgstr "*** 且包含以下文件:\n"
 

-#: ../src/common/debugrpt.cpp:538
+#: ../src/common/debugrpt.cpp:560

 #, c-format
 msgid "*** It can be found in \"%s\"\n"
 msgstr "*** 可在此找到: \"%s\"\n"
 #, c-format
 msgid "*** It can be found in \"%s\"\n"
 msgstr "*** 可在此找到: \"%s\"\n"


@@ -465,26 +501,44 @@ msgstr ""
 ", 在对资源进行语法分析时\n"
 ", 期望如下关键字 static, #include 或 #define ."
 
 ", 在对资源进行语法分析时\n"
 ", 期望如下关键字 static, #include 或 #define ."
 

-#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747
+#: ../src/generic/dirctrlg.cpp:683
+#: ../src/generic/filedlgg.cpp:740

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748
+#: ../src/generic/dirctrlg.cpp:684
+#: ../src/generic/filedlgg.cpp:741

 msgid ".."
 msgstr ".."
 
 msgid ".."
 msgstr ".."
 

-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:147
+msgid "10 x 11 in"
+msgstr "10 x 11 英寸"
+
+#: ../src/common/paper.cpp:120

 msgid "10 x 14 in"
 msgstr "10 x 14 英寸"
 
 msgid "10 x 14 in"
 msgstr "10 x 14 英寸"
 

-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:121

 msgid "11 x 17 in"
 msgstr "11 x 17 英寸"
 
 msgid "11 x 17 in"
 msgstr "11 x 17 英寸"
 

-#: ../src/common/paper.cpp:146
+#: ../src/common/paper.cpp:191
+msgid "12 x 11 in"
+msgstr "12 x 11 英寸"
+
+#: ../src/common/paper.cpp:148
+msgid "15 x 11 in"
+msgstr "15 x 11 英寸"
+
+#: ../src/common/paper.cpp:139

 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
 
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
 

+#: ../src/common/paper.cpp:146
+msgid "9 x 11 in"
+msgstr "9 x 11 英寸"
+

 #: ../src/html/htmprint.cpp:309
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 #: ../src/html/htmprint.cpp:309
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"


@@ -497,23 +551,26 @@ msgstr ": 未知字符集"
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 

-#: ../src/generic/wizard.cpp:423
+#: ../src/generic/wizard.cpp:427

 msgid "< &Back"
 msgstr "< 返回(&B)"
 
 msgid "< &Back"
 msgstr "< 返回(&B)"
 

-#: ../src/common/prntbase.cpp:845
+#: ../src/common/prntbase.cpp:892

 msgid "<<"
 msgid "<<"

-msgstr ""
+msgstr "<<"

 
 

-#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289
+#: ../src/generic/filedlgg.cpp:259
+#: ../src/generic/filedlgg.cpp:282

 msgid "<DIR>"
 msgstr "<目录>"
 
 msgid "<DIR>"
 msgstr "<目录>"
 

-#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293
+#: ../src/generic/filedlgg.cpp:263
+#: ../src/generic/filedlgg.cpp:286

 msgid "<DRIVE>"
 msgstr "<盘符>"
 
 msgid "<DRIVE>"
 msgstr "<盘符>"
 

-#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291
+#: ../src/generic/filedlgg.cpp:261
+#: ../src/generic/filedlgg.cpp:284

 msgid "<LINK>"
 msgstr "<连接>"
 
 msgid "<LINK>"
 msgstr "<连接>"
 


@@ -533,38 +590,95 @@ msgstr "<b>粗体.</b> "
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 

-#: ../src/common/prntbase.cpp:851
+#: ../src/common/prntbase.cpp:898

 msgid ">>"
 msgid ">>"

-msgstr ""
+msgstr ">>"

 
 

-#: ../src/common/prntbase.cpp:857
+#: ../src/common/prntbase.cpp:904

 msgid ">>|"
 msgid ">>|"

-msgstr ""
+msgstr ">>|"

 
 

-#: ../src/generic/dbgrptg.cpp:285
+#: ../src/generic/dbgrptg.cpp:304

 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
 #: ../src/common/xtixml.cpp:409
 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
 #: ../src/common/xtixml.cpp:409

+#, fuzzy

 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 

-#: ../src/common/paper.cpp:120
+#: ../src/common/paper.cpp:166
+msgid "A2 420 x 594 mm"
+msgstr "A2 纸张, 420 x 594 毫米"
+
+#: ../src/common/paper.cpp:163
+msgid "A3 Extra 322 x 445 mm"
+msgstr "特大 A3 纸张, 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:168
+msgid "A3 Extra Transverse 322 x 445 mm"
+msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:177
+msgid "A3 Rotated 420 x 297 mm"
+msgstr "横向 A3 纸张, 420 x 297 毫米"
+
+#: ../src/common/paper.cpp:167
+msgid "A3 Transverse 297 x 420 mm"
+msgstr "A3 纸张(横排), 297 x 420 毫米"
+
+#: ../src/common/paper.cpp:113

 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 纸张, 297 x 420 毫米"
 
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 纸张, 297 x 420 毫米"
 

-#: ../src/common/paper.cpp:111
+#: ../src/common/paper.cpp:153
+msgid "A4 Extra 9.27 x 12.69 in"
+msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:160
+msgid "A4 Plus 210 x 330 mm"
+msgstr "加大 A4 纸张, 210 x 330 毫米"
+
+#: ../src/common/paper.cpp:178
+msgid "A4 Rotated 297 x 210 mm"
+msgstr "横向 A4 纸张, 297 x 210 毫米"
+
+#: ../src/common/paper.cpp:155
+msgid "A4 Transverse 210 x 297 mm"
+msgstr "A4 纸张(横排), 210 x 297 毫米"
+
+#: ../src/common/paper.cpp:104

 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 纸张, 210 x 297 毫米"
 
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 纸张, 210 x 297 毫米"
 

-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:114

 msgid "A4 small sheet, 210 x 297 mm"
 msgid "A4 small sheet, 210 x 297 mm"

-msgstr "A4 小纸张, 210 x 297 毫米"
+msgstr "小 A4 纸张, 210 x 297 毫米"

 
 

-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:164
+msgid "A5 Extra 174 x 235 mm"
+msgstr "特大 A5 纸张, 174 x 235 毫米"
+
+#: ../src/common/paper.cpp:179
+msgid "A5 Rotated 210 x 148 mm"
+msgstr "横向 A5 纸张, 210 x 148 毫米"
+
+#: ../src/common/paper.cpp:161
+msgid "A5 Transverse 148 x 210 mm"
+msgstr "A5 纸张(横排), 148 x 210 毫米"
+
+#: ../src/common/paper.cpp:115

 msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5 纸张, 148 x 210 毫米"
 
 msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5 纸张, 148 x 210 毫米"
 

+#: ../src/common/paper.cpp:171
+msgid "A6 105 x 148 mm"
+msgstr "A6 纸张, 105 x 148 毫米"
+
+#: ../src/common/paper.cpp:184
+msgid "A6 Rotated 148 x 105 mm"
+msgstr "横向 A5 纸张, 148 x 105 毫米"
+

 #: ../src/generic/fontdlgg.cpp:87
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 #: ../src/generic/fontdlgg.cpp:87
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"


@@ -581,7 +695,7 @@ msgstr "加入"
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 

-#: ../src/generic/colrdlgg.cpp:297
+#: ../src/generic/colrdlgg.cpp:299

 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 


@@ -615,7 +729,7 @@ msgstr "所有"
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 

-#: ../include/wx/defs.h:2229
+#: ../include/wx/defs.h:2302

 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 
 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 


@@ -623,7 +737,7 @@ msgstr "所有文件 (*)|*"
 msgid "All files (*.*)|*"
 msgstr "所有文件 (*)|*"
 
 msgid "All files (*.*)|*"
 msgstr "所有文件 (*)|*"
 

-#: ../include/wx/defs.h:2226
+#: ../include/wx/defs.h:2299

 msgid "All files (*.*)|*.*"
 msgstr "所有文件 (*)|*"
 
 msgid "All files (*.*)|*.*"
 msgstr "所有文件 (*)|*"
 


@@ -635,12 +749,12 @@ msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
 msgid "Already dialling ISP."
 msgstr "已经拨接ISP."
 
 msgid "Already dialling ISP."
 msgstr "已经拨接ISP."
 

-#: ../src/generic/logg.cpp:1164
+#: ../src/generic/logg.cpp:1163

 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
 
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
 

-#: ../src/common/fmapbase.cpp:108
+#: ../src/common/fmapbase.cpp:109

 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯语 (ISO-8859-6)"
 
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯语 (ISO-8859-6)"
 


@@ -648,31 +762,60 @@ msgstr "阿拉伯语 (ISO-8859-6)"
 msgid "Archive doesnt contain #SYSTEM file"
 msgstr "存档里没有包含 #SYSTEM 文件"
 
 msgid "Archive doesnt contain #SYSTEM file"
 msgstr "存档里没有包含 #SYSTEM 文件"
 

-#: ../src/generic/filedlgg.cpp:447
+#: ../src/generic/filedlgg.cpp:440

 msgid "Attributes"
 msgstr "属性(Attributes)"
 
 msgid "Attributes"
 msgstr "属性(Attributes)"
 

-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:144
+msgid "B4 (ISO) 250 x 353 mm"
+msgstr "B4 纸张(ISO), 250 x 353 毫米"
+
+#: ../src/common/paper.cpp:180
+msgid "B4 (JIS) Rotated 364 x 257 mm"
+msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
+
+#: ../src/common/paper.cpp:134

 msgid "B4 Envelope, 250 x 353 mm"
 msgstr "B4 信封, 250 x 353 毫米"
 
 msgid "B4 Envelope, 250 x 353 mm"
 msgstr "B4 信封, 250 x 353 毫米"
 

-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:116

 msgid "B4 sheet, 250 x 354 mm"
 msgstr "B4 纸张, 250 x 354 毫米"
 
 msgid "B4 sheet, 250 x 354 mm"
 msgstr "B4 纸张, 250 x 354 毫米"
 

-#: ../src/common/paper.cpp:142
+#: ../src/common/paper.cpp:165
+msgid "B5 (ISO) Extra 201 x 276 mm"
+msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
+
+#: ../src/common/paper.cpp:181
+msgid "B5 (JIS) Rotated 257 x 182 mm"
+msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
+
+#: ../src/common/paper.cpp:162
+msgid "B5 (JIS) Transverse 182 x 257 mm"
+msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
+
+#: ../src/common/paper.cpp:135

 msgid "B5 Envelope, 176 x 250 mm"
 msgstr "B5 信封, 176 x 250 毫米"
 
 msgid "B5 Envelope, 176 x 250 mm"
 msgstr "B5 信封, 176 x 250 毫米"
 

-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:117

 msgid "B5 sheet, 182 x 257 millimeter"
 msgstr "B5 纸张, 182 x 257 毫米"
 
 msgid "B5 sheet, 182 x 257 millimeter"
 msgstr "B5 纸张, 182 x 257 毫米"
 

-#: ../src/common/paper.cpp:143
+#: ../src/common/paper.cpp:189
+msgid "B6 (JIS) 128 x 182 mm"
+msgstr "B6 纸张(JIS), 128 x 182 毫米"
+
+#: ../src/common/paper.cpp:190
+msgid "B6 (JIS) Rotated 182 x 128 mm"
+msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
+
+#: ../src/common/paper.cpp:136

 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 

-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/imagbmp.cpp:477
+#: ../src/common/imagbmp.cpp:493

 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 不能分配内存."
 
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 不能分配内存."
 


@@ -698,13 +841,13 @@ msgstr "BMP: 不能写文件头(BitmapInfo)."
 
 #: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
 
 #: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."

-msgstr "BMP: wxImage没有我们的wxPalette."
+msgstr "BMP: wxImage没有自己的wxPalette."

 
 

-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:116

 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的海语 (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的海语 (ISO-8859-13)"
 

-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:107

 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "波罗的海语 (旧的) (ISO-8859-4)"
 
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "波罗的海语 (旧的) (ISO-8859-4)"
 


@@ -721,11 +864,11 @@ msgstr "粗体"
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 

-#: ../src/common/paper.cpp:112
+#: ../src/common/paper.cpp:105

 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 

-#: ../src/generic/logg.cpp:510
+#: ../src/generic/logg.cpp:507

 msgid "C&lear"
 msgstr "清除(&L)"
 
 msgid "C&lear"
 msgstr "清除(&L)"
 


@@ -733,51 +876,53 @@ msgstr "清除(&L)"
 msgid "C&olour:"
 msgstr "颜色(&o):"
 
 msgid "C&olour:"
 msgstr "颜色(&o):"
 

-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:130

 msgid "C3 Envelope, 324 x 458 mm"
 msgstr "C3 信封, 324 x 458 毫米"
 
 msgid "C3 Envelope, 324 x 458 mm"
 msgstr "C3 信封, 324 x 458 毫米"
 

-#: ../src/common/paper.cpp:138
+#: ../src/common/paper.cpp:131

 msgid "C4 Envelope, 229 x 324 mm"
 msgstr "C4 信封, 229 x 324 毫米"
 
 msgid "C4 Envelope, 229 x 324 mm"
 msgstr "C4 信封, 229 x 324 毫米"
 

-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:129

 msgid "C5 Envelope, 162 x 229 mm"
 msgstr "C5 信封, 162 x 229 毫米"
 
 msgid "C5 Envelope, 162 x 229 mm"
 msgstr "C5 信封, 162 x 229 毫米"
 

-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:132

 msgid "C6 Envelope, 114 x 162 mm"
 msgstr "C6 信封, 114 x 162 毫米"
 
 msgid "C6 Envelope, 114 x 162 mm"
 msgstr "C6 信封, 114 x 162 毫米"
 

-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:133

 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 

-#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
+#: ../src/html/chm.cpp:797
+#: ../src/html/chm.cpp:856

 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 

-#: ../src/os2/thread.cpp:121
-#, fuzzy
+#: ../src/os2/thread.cpp:117

 msgid "Can not create mutex."
 msgstr "不能创建互斥对象."
 
 msgid "Can not create mutex."
 msgstr "不能创建互斥对象."
 

-#: ../src/common/filefn.cpp:1290
+#: ../src/common/filefn.cpp:1297

 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "不能枚举文件 '%s'"
 
 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "不能枚举文件 '%s'"
 

-#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:205
+#: ../src/unix/dir.cpp:232

 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "不能枚举目录 '%s'中的文件"
 
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "不能枚举目录 '%s'中的文件"
 

-#: ../src/os2/thread.cpp:523
+#: ../src/os2/thread.cpp:519

 #, c-format
 msgid "Can not resume thread %lu"
 msgstr "不能恢复线程 %lu"
 
 #, c-format
 msgid "Can not resume thread %lu"
 msgstr "不能恢复线程 %lu"
 

-#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:824
+#: ../src/mac/classic/thread.cpp:491
+#: ../src/msw/thread.cpp:827

 #, c-format
 msgid "Can not resume thread %x"
 msgstr "不能恢复线程 %x"
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "不能恢复线程 %x"


@@ -786,17 +931,18 @@ msgstr "不能恢复线程 %x"
 msgid "Can not start thread: error writing TLS."
 msgstr "不能启动线程: 写TLS出错."
 
 msgid "Can not start thread: error writing TLS."
 msgstr "不能启动线程: 写TLS出错."
 

-#: ../src/os2/thread.cpp:510
+#: ../src/os2/thread.cpp:505

 #, c-format
 msgid "Can not suspend thread %lu"
 msgstr "不能挂起线程 %lu"
 
 #, c-format
 msgid "Can not suspend thread %lu"
 msgstr "不能挂起线程 %lu"
 

-#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:809
+#: ../src/mac/classic/thread.cpp:464
+#: ../src/msw/thread.cpp:812

 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "不能挂起线程 %x"
 
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "不能挂起线程 %x"
 

-#: ../src/msw/thread.cpp:722
+#: ../src/msw/thread.cpp:725

 msgid "Can not wait for thread termination"
 msgstr "不能等候线程终止"
 
 msgid "Can not wait for thread termination"
 msgstr "不能等候线程终止"
 


@@ -804,64 +950,67 @@ msgstr "不能等候线程终止"
 msgid "Can't &Undo "
 msgstr "不能恢复(&U)"
 
 msgid "Can't &Undo "
 msgstr "不能恢复(&U)"
 

-#: ../src/common/image.cpp:1763
+#: ../src/common/image.cpp:1939

 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "不能检查文件格式 '%s': 文件不存在."
 
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "不能检查文件格式 '%s': 文件不存在."
 

-#: ../src/msw/registry.cpp:434
+#: ../src/msw/registry.cpp:442

 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr "不能关闭注册键 '%s'"
 
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr "不能关闭注册键 '%s'"
 

-#: ../src/msw/registry.cpp:510
+#: ../src/msw/registry.cpp:518

 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr "不能复制不支持的类型 %d 的值."
 
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr "不能复制不支持的类型 %d 的值."
 

-#: ../src/msw/registry.cpp:415
+#: ../src/msw/registry.cpp:423

 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "不能创建注册键 '%s'"
 
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "不能创建注册键 '%s'"
 

-#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-#: ../src/os2/thread.cpp:491
+#: ../src/mac/carbon/mpthread.cpp:911
+#: ../src/mac/carbon/thread.cpp:1100
+#: ../src/mac/classic/thread.cpp:439
+#: ../src/msw/thread.cpp:594
+#: ../src/os2/thread.cpp:486

 msgid "Can't create thread"
 msgstr "不能创建进程"
 
 msgid "Can't create thread"
 msgstr "不能创建进程"
 

-#: ../src/msw/window.cpp:3077
+#: ../src/msw/window.cpp:3130

 #, c-format
 msgid "Can't create window of class %s"
 msgstr "不能创建类 '%s' 的窗口"
 
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "不能创建类 '%s' 的窗口"
 

-#: ../src/msw/registry.cpp:686
+#: ../src/msw/registry.cpp:694

 #, c-format
 msgid "Can't delete key '%s'"
 msgstr "不能删除键 '%s'"
 
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr "不能删除键 '%s'"
 

-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444
+#: ../src/os2/iniconf.cpp:458

 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "不能删除 INI 文件 '%s'"
 
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "不能删除 INI 文件 '%s'"
 

-#: ../src/msw/registry.cpp:713
+#: ../src/msw/registry.cpp:722

 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "不能删除键值 '%s'/ '%s'"
 
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "不能删除键值 '%s'/ '%s'"
 

-#: ../src/msw/registry.cpp:1061
+#: ../src/msw/registry.cpp:1071

 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr "不能枚举键 '%s'的子键"
 
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr "不能枚举键 '%s'的子键"
 

-#: ../src/msw/registry.cpp:1016
+#: ../src/msw/registry.cpp:1026

 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr "不能枚举键 '%s'的值"
 
 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr "不能枚举键 '%s'的值"
 

-#: ../src/msw/registry.cpp:1267
-#, fuzzy, c-format
+#: ../src/msw/registry.cpp:1288
+#, c-format

 msgid "Can't export value of unsupported type %d."
 msgstr "不能导出不支持的类型 %d 的值."
 
 msgid "Can't export value of unsupported type %d."
 msgstr "不能导出不支持的类型 %d 的值."
 


@@ -883,12 +1032,13 @@ msgstr "不能初始化zlib deflate(压缩)流."
 msgid "Can't initialize zlib inflate stream."
 msgstr "不能初始化zlib inflate(解压)流."
 
 msgid "Can't initialize zlib inflate stream."
 msgstr "不能初始化zlib inflate(解压)流."
 

-#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364
+#: ../src/common/image.cpp:1367
+#: ../src/common/image.cpp:1387

 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "不能从文件 '%s'中装入图像: 文件不存在."
 
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "不能从文件 '%s'中装入图像: 文件不存在."
 

-#: ../src/msw/registry.cpp:381
+#: ../src/msw/registry.cpp:387

 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr "不能打开注册键 '%s'"
 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr "不能打开注册键 '%s'"


@@ -902,32 +1052,36 @@ msgstr "不能从解压流 %s 中读"
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr "不能读解压流: 流内有异常的EOF."
 
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr "不能读解压流: 流内有异常的EOF."
 

-#: ../src/msw/registry.cpp:950
+#: ../src/msw/registry.cpp:960

 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "不能读 '%s'的值"
 
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "不能读 '%s'的值"
 

-#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
-#: ../src/msw/registry.cpp:876
+#: ../src/msw/registry.cpp:795
+#: ../src/msw/registry.cpp:825
+#: ../src/msw/registry.cpp:885

 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "不能读键 '%s'的值"
 
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "不能读键 '%s'的值"
 

-#: ../src/common/image.cpp:1386
+#: ../src/common/image.cpp:1409

 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
 
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
 

-#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021
+#: ../src/generic/logg.cpp:569
+#: ../src/generic/logg.cpp:1020

 msgid "Can't save log contents to file."
 msgstr "不能把日志内容保存到文件."
 
 msgid "Can't save log contents to file."
 msgstr "不能把日志内容保存到文件."
 

-#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:550
+#: ../src/os2/thread.cpp:469

 msgid "Can't set thread priority"
 msgstr "不能设置线程优先级"
 
 msgid "Can't set thread priority"
 msgstr "不能设置线程优先级"
 

-#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
-#: ../src/msw/registry.cpp:965
+#: ../src/msw/registry.cpp:812
+#: ../src/msw/registry.cpp:854
+#: ../src/msw/registry.cpp:975

 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "不能设置 '%s'的值"
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "不能设置 '%s'的值"


@@ -937,38 +1091,42 @@ msgstr "不能设置 '%s'的值"
 msgid "Can't write to deflate stream: %s"
 msgstr "不能写到压缩流: %s"
 
 msgid "Can't write to deflate stream: %s"
 msgstr "不能写到压缩流: %s"
 

-#: ../contrib/src/deprecated/proplist.cpp:518 ../src/generic/choicdgg.cpp:291
-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/numdlgg.cpp:136
-#: ../src/generic/textdlgg.cpp:120 ../src/gtk/fontdlg.cpp:155
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/generic/choicdgg.cpp:291
+#: ../src/generic/dirdlgg.cpp:114
+#: ../src/generic/numdlgg.cpp:136
+#: ../src/generic/textdlgg.cpp:120
+#: ../src/gtk/fontdlg.cpp:155
+#: ../src/motif/msgdlg.cpp:204
+#: ../contrib/src/deprecated/proplist.cpp:518

 msgid "Cancel"
 msgstr "取消"
 
 msgid "Cancel"
 msgstr "取消"
 

-#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175
+#: ../src/xrc/xmlres.cpp:1188
+#: ../src/xrc/xmlres.cpp:1236

 msgid "Cannot convert dialog units: dialog unknown."
 msgid "Cannot convert dialog units: dialog unknown."

-msgstr "不能转换对话单元: 未知的对话."
+msgstr "不能转换对话框单元: 未知的对话框."

 
 #: ../src/common/strconv.cpp:2665
 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "不能从字符集 '%s' 转换!"
 
 
 #: ../src/common/strconv.cpp:2665
 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "不能从字符集 '%s' 转换!"
 

-#: ../src/msw/dialup.cpp:509
+#: ../src/msw/dialup.cpp:546

 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到活动的拨号连接: %s"
 
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到活动的拨号连接: %s"
 

-#: ../src/xrc/xmlres.cpp:269
+#: ../src/xrc/xmlres.cpp:330

 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到可以对应于未知控件 '%s' 的容器."
 
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到可以对应于未知控件 '%s' 的容器."
 

-#: ../src/xrc/xmlres.cpp:1210
+#: ../src/xrc/xmlres.cpp:1271

 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr "找不到字体节点 '%s'."
 
 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr "找不到字体节点 '%s'."
 

-#: ../src/msw/dialup.cpp:814
+#: ../src/msw/dialup.cpp:851

 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 
 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 


@@ -977,23 +1135,23 @@ msgstr "找不到地址簿文件的位置"
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "不能获得调度策略 %d 的优先级范围."
 
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "不能获得调度策略 %d 的优先级范围."
 

-#: ../src/unix/utilsunx.cpp:758
+#: ../src/unix/utilsunx.cpp:775

 msgid "Cannot get the hostname"
 msgstr "不能获得主机名"
 
 msgid "Cannot get the hostname"
 msgstr "不能获得主机名"
 

-#: ../src/unix/utilsunx.cpp:794
+#: ../src/unix/utilsunx.cpp:811

 msgid "Cannot get the official hostname"
 msgstr "不能获得正式的主机名"
 
 msgid "Cannot get the official hostname"
 msgstr "不能获得正式的主机名"
 

-#: ../src/msw/dialup.cpp:908
+#: ../src/msw/dialup.cpp:945

 msgid "Cannot hang up - no active dialup connection."
 msgid "Cannot hang up - no active dialup connection."

-msgstr "不能挂起 - 没有活动的拨号连接."
+msgstr "不能挂断 - 没有活动的拨号连接."

 
 #: ../include/wx/msw/ole/oleutils.h:47
 msgid "Cannot initialize OLE"
 msgstr "不能初始化 OLE"
 
 
 #: ../include/wx/msw/ole/oleutils.h:47
 msgid "Cannot initialize OLE"
 msgstr "不能初始化 OLE"
 

-#: ../src/mgl/app.cpp:292
+#: ../src/mgl/app.cpp:286

 msgid "Cannot initialize SciTech MGL!"
 msgstr "不能初始化 SciTech MGL!"
 
 msgid "Cannot initialize SciTech MGL!"
 msgstr "不能初始化 SciTech MGL!"
 


@@ -1006,7 +1164,7 @@ msgstr "不能初始化显示."
 msgid "Cannot load icon from '%s'."
 msgstr "不能从 '%s'中读取图标."
 
 msgid "Cannot load icon from '%s'."
 msgstr "不能从 '%s'中读取图标."
 

-#: ../src/xrc/xmlres.cpp:392
+#: ../src/xrc/xmlres.cpp:453

 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "不能从文件 '%s'中读取资源."
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "不能从文件 '%s'中读取资源."


@@ -1031,12 +1189,12 @@ msgstr "不能打开 URL '%s'"
 msgid "Cannot open contents file: %s"
 msgstr "不能打开目录文件: %s"
 
 msgid "Cannot open contents file: %s"
 msgstr "不能打开目录文件: %s"
 

-#: ../src/xrc/xmlres.cpp:360
+#: ../src/xrc/xmlres.cpp:421

 #, c-format
 msgid "Cannot open file '%s'."
 msgstr "不能打开文件 '%s'."
 
 #, c-format
 msgid "Cannot open file '%s'."
 msgstr "不能打开文件 '%s'."
 

-#: ../src/generic/dcpsg.cpp:1568
+#: ../src/generic/dcpsg.cpp:1569

 msgid "Cannot open file for PostScript printing!"
 msgstr "不能打开文件进行PostScript打印!"
 
 msgid "Cannot open file for PostScript printing!"
 msgstr "不能打开文件进行PostScript打印!"
 


@@ -1045,26 +1203,27 @@ msgstr "不能打开文件进行PostScript打印!"
 msgid "Cannot open index file: %s"
 msgstr "不能打开索引文件: %s"
 
 msgid "Cannot open index file: %s"
 msgstr "不能打开索引文件: %s"
 

-#: ../src/common/intl.cpp:1202
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1203
+#, c-format

 msgid "Cannot parse Plural-Forms:'%s'"
 msgid "Cannot parse Plural-Forms:'%s'"

-msgstr "不能粘贴复数: '%s'"
+msgstr "不能解析多表格: '%s'"

 
 

-#: ../src/xrc/xmlres.cpp:1111
+#: ../src/xrc/xmlres.cpp:1172

 #, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "不能从 '%s'中粘贴坐标."
 
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "不能从 '%s'中粘贴坐标."
 

-#: ../src/xrc/xmlres.cpp:1159
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:1220
+#, c-format

 msgid "Cannot parse dimension from '%s'."
 msgid "Cannot parse dimension from '%s'."

-msgstr "不能从 '%s'中粘贴维数."
+msgstr "不能从 '%s'中解析尺寸."

 
 #: ../src/html/helpfrm.cpp:1562
 msgid "Cannot print empty page."
 msgstr "不能打印空页面."
 
 
 #: ../src/html/helpfrm.cpp:1562
 msgid "Cannot print empty page."
 msgstr "不能打印空页面."
 

-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:160
+#: ../src/msw/volume.cpp:491

 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "不能从 '%s'中读取类型名称."
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "不能从 '%s'中读取类型名称."


@@ -1077,11 +1236,13 @@ msgstr "不能找回线程调度策略."
 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 
 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 

-#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
+#: ../src/mac/carbon/mpthread.cpp:977
+#: ../src/mac/carbon/thread.cpp:1174

 msgid "Cannot wait for thread termination."
 msgstr "不能等候线程终止."
 
 msgid "Cannot wait for thread termination."
 msgstr "不能等候线程终止."
 

-#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
+#: ../src/mac/carbon/mpthread.cpp:893
+#: ../src/mac/carbon/thread.cpp:1082

 msgid "Cant create the thread event queue"
 msgstr "不能创建线程事件队列"
 
 msgid "Cant create the thread event queue"
 msgstr "不能创建线程事件队列"
 


@@ -1089,7 +1250,7 @@ msgstr "不能创建线程事件队列"
 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 msgid "Case sensitive"
 msgstr "大小写敏感"
 

-#: ../src/common/fmapbase.cpp:116
+#: ../src/common/fmapbase.cpp:117

 msgid "Celtic (ISO-8859-14)"
 msgstr "凯尔特语 (ISO-8859-14)"
 
 msgid "Celtic (ISO-8859-14)"
 msgstr "凯尔特语 (ISO-8859-14)"
 


@@ -1097,16 +1258,17 @@ msgstr "凯尔特语 (ISO-8859-14)"
 msgid "Centered"
 msgstr "居中"
 
 msgid "Centered"
 msgstr "居中"
 

-#: ../src/common/fmapbase.cpp:104
+#: ../src/common/fmapbase.cpp:105

 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 

-#: ../src/msw/dialup.cpp:749
+#: ../src/msw/dialup.cpp:786

 msgid "Choose ISP to dial"
 msgstr "选择ISP进行拨号"
 
 msgid "Choose ISP to dial"
 msgstr "选择ISP进行拨号"
 

-#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-#: ../src/palmos/colordlg.cpp:76
+#: ../src/generic/colrdlgg.cpp:151
+#: ../src/gtk/colordlg.cpp:45
+#: ../src/palmos/colordlg.cpp:79

 msgid "Choose colour"
 msgstr "选择颜色"
 
 msgid "Choose colour"
 msgstr "选择颜色"
 


@@ -1114,37 +1276,42 @@ msgstr "选择颜色"
 msgid "Choose font"
 msgstr "选择字体"
 
 msgid "Choose font"
 msgstr "选择字体"
 

-#: ../src/generic/mdig.cpp:114
+#: ../src/generic/mdig.cpp:115

 msgid "Cl&ose"
 msgstr "关闭(&o)"
 
 msgid "Cl&ose"
 msgstr "关闭(&o)"
 

-#: ../src/generic/logg.cpp:510
+#: ../src/generic/logg.cpp:507

 msgid "Clear the log contents"
 msgstr "清除日志内容"
 
 msgid "Clear the log contents"
 msgstr "清除日志内容"
 

-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
+#: ../src/generic/fontdlgg.cpp:365
+#: ../src/generic/fontdlgg.cpp:384

 msgid "Click to cancel the font selection."
 msgstr "点击取消字体选择."
 
 msgid "Click to cancel the font selection."
 msgstr "点击取消字体选择."
 

-#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/generic/fontdlgg.cpp:370
+#: ../src/generic/fontdlgg.cpp:372
+#: ../src/generic/fontdlgg.cpp:377
+#: ../src/generic/fontdlgg.cpp:379

 msgid "Click to confirm the font selection."
 msgstr "点击确认字体选择."
 
 msgid "Click to confirm the font selection."
 msgstr "点击确认字体选择."
 

-#: ../contrib/src/deprecated/proplist.cpp:513 ../src/generic/dbgrptg.cpp:88
-#: ../src/generic/progdlgg.cpp:629 ../src/generic/progdlgg.cpp:634
+#: ../src/generic/dbgrptg.cpp:92
+#: ../src/generic/progdlgg.cpp:629
+#: ../src/generic/progdlgg.cpp:634
+#: ../contrib/src/deprecated/proplist.cpp:513

 msgid "Close"
 msgstr "关闭"
 
 msgid "Close"
 msgstr "关闭"
 

-#: ../src/univ/themes/win32.cpp:4825
+#: ../src/univ/themes/win32.cpp:4931

 msgid "Close\tAlt-F4"
 msgstr "关闭\tAlt-F4"
 
 msgid "Close\tAlt-F4"
 msgstr "关闭\tAlt-F4"
 

-#: ../src/generic/mdig.cpp:115
+#: ../src/generic/mdig.cpp:116

 msgid "Close All"
 msgstr "全部关闭"
 
 msgid "Close All"
 msgstr "全部关闭"
 

-#: ../src/generic/logg.cpp:512
+#: ../src/generic/logg.cpp:509

 msgid "Close this window"
 msgstr "关闭此窗口"
 
 msgid "Close this window"
 msgstr "关闭此窗口"
 


@@ -1152,20 +1319,21 @@ msgstr "关闭此窗口"
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 

-#: ../src/generic/dirctrlg.cpp:582
+#: ../src/generic/dirctrlg.cpp:590

 msgid "Computer"
 msgstr "计算机"
 
 msgid "Computer"
 msgstr "计算机"
 

-#: ../src/common/fileconf.cpp:938
+#: ../src/common/fileconf.cpp:962

 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "配置条目名不能以 '%c'开头."
 
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "配置条目名不能以 '%c'开头."
 

-#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64
+#: ../src/generic/filedlgg.cpp:1318
+#: ../src/gtk/filedlg.cpp:67

 msgid "Confirm"
 msgstr "确认"
 
 msgid "Confirm"
 msgstr "确认"
 

-#: ../src/msw/mimetype.cpp:677
+#: ../src/msw/mimetype.cpp:678

 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 


@@ -1177,7 +1345,7 @@ msgstr "连接..."
 msgid "Contents"
 msgstr "目录"
 
 msgid "Contents"
 msgstr "目录"
 

-#: ../src/common/strconv.cpp:1428
+#: ../src/common/strconv.cpp:1416

 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "不能进行到字符集 '%s'的变换."
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "不能进行到字符集 '%s'的变换."


@@ -1234,40 +1402,46 @@ msgstr ""
 "不能解析菜单id '%s'. 用(非零)整数代替\n"
 "或 提供 #define (详细信息见手册)"
 
 "不能解析菜单id '%s'. 用(非零)整数代替\n"
 "或 提供 #define (详细信息见手册)"
 

-#: ../src/common/prntbase.cpp:1225
+#: ../src/common/prntbase.cpp:1272

 msgid "Could not start document preview."
 msgstr "不能启动文档预览."
 
 msgid "Could not start document preview."
 msgstr "不能启动文档预览."
 

-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
+#: ../src/generic/printps.cpp:185
+#: ../src/gtk/gnome/gprint.cpp:763

 #: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
 msgstr "不能启动打印."
 
 #: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
 msgstr "不能启动打印."
 

-#: ../src/common/wincmn.cpp:1488
+#: ../src/common/wincmn.cpp:1498

 msgid "Could not transfer data to window"
 msgstr "不能把数据转到窗口"
 
 msgid "Could not transfer data to window"
 msgstr "不能把数据转到窗口"
 

-#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
-#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:227
+#: ../src/mac/carbon/mpthread.cpp:306
+#: ../src/mac/carbon/thread.cpp:414
+#: ../src/mac/carbon/thread.cpp:495

 msgid "Could not unlock mutex"
 msgstr "不能释放互斥体"
 
 msgid "Could not unlock mutex"
 msgstr "不能释放互斥体"
 

-#: ../src/os2/thread.cpp:154
+#: ../src/os2/thread.cpp:150

 msgid "Couldn't acquire a mutex lock"
 msgstr "不能得到互斥锁"
 
 msgid "Couldn't acquire a mutex lock"
 msgstr "不能得到互斥锁"
 

-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
+#: ../src/msw/dragimag.cpp:166
+#: ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:158
+#: ../src/msw/imaglist.cpp:176

 #: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 
 #: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 

-#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
+#: ../src/msw/timer.cpp:106
+#: ../src/os2/timer.cpp:155

 msgid "Couldn't create a timer"
 msgstr "不能创建计时器"
 
 msgid "Couldn't create a timer"
 msgstr "不能创建计时器"
 

-#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+#: ../src/mgl/cursor.cpp:135
+#: ../src/mgl/cursor.cpp:166

 msgid "Couldn't create cursor."
 msgstr "不能创建游标"
 
 msgid "Couldn't create cursor."
 msgstr "不能创建游标"
 


@@ -1276,7 +1450,8 @@ msgstr "不能创建游标"
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 

-#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:850
+#: ../src/mac/classic/thread.cpp:521
+#: ../src/msw/thread.cpp:853

 msgid "Couldn't get the current thread pointer"
 msgstr "不能获得当前线程指针"
 
 msgid "Couldn't get the current thread pointer"
 msgstr "不能获得当前线程指针"
 


@@ -1299,21 +1474,23 @@ msgstr "不能打开音频: %s"
 msgid "Couldn't register clipboard format '%s'."
 msgstr "不能注册剪贴板格式 '%s'."
 
 msgid "Couldn't register clipboard format '%s'."
 msgstr "不能注册剪贴板格式 '%s'."
 

-#: ../src/os2/thread.cpp:171
+#: ../src/os2/thread.cpp:167

 msgid "Couldn't release a mutex"
 msgstr "不能释放互斥体"
 
 msgid "Couldn't release a mutex"
 msgstr "不能释放互斥体"
 

-#: ../src/msw/listctrl.cpp:735
+#: ../src/msw/listctrl.cpp:745

 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "不能获得列表控件的项 %d信息."
 
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "不能获得列表控件的项 %d信息."
 

-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
+#: ../src/common/imagpng.cpp:642
+#: ../src/common/imagpng.cpp:651

 #: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 
 #: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 

-#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
+#: ../src/mac/classic/thread.cpp:779
+#: ../src/msw/thread.cpp:611

 msgid "Couldn't terminate thread"
 msgstr "不能终止线程"
 
 msgid "Couldn't terminate thread"
 msgstr "不能终止线程"
 


@@ -1321,31 +1498,34 @@ msgstr "不能终止线程"
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr "在声明的RTTI参数里找不到创建参数"
 
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr "在声明的RTTI参数里找不到创建参数"
 

-#: ../src/generic/dirdlgg.cpp:309
+#: ../src/generic/dirdlgg.cpp:307

 msgid "Create directory"
 msgstr "创建目录"
 
 msgid "Create directory"
 msgstr "创建目录"
 

-#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:1007
+#: ../src/generic/dirdlgg.cpp:140
+#: ../src/generic/filedlgg.cpp:999

 msgid "Create new directory"
 msgstr "创建新目录"
 
 msgid "Create new directory"
 msgstr "创建新目录"
 

-#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064
+#: ../src/common/stockitem.cpp:114
+#: ../src/mac/carbon/textctrl.cpp:1073
+#: ../src/msw/textctrl.cpp:2063

 msgid "Cu&t"
 msgstr "剪切(&t)"
 
 msgid "Cu&t"
 msgstr "剪切(&t)"
 

-#: ../src/generic/filedlgg.cpp:1018
+#: ../src/generic/filedlgg.cpp:1010

 msgid "Current directory:"
 msgstr "当前目录:"
 
 msgid "Current directory:"
 msgstr "当前目录:"
 

-#: ../src/common/fmapbase.cpp:107
+#: ../src/common/fmapbase.cpp:108

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 

-#: ../src/common/paper.cpp:113
+#: ../src/common/paper.cpp:106

 msgid "D sheet, 22 x 34 in"
 msgstr "D 纸张, 22 x 34 英寸"
 
 msgid "D sheet, 22 x 34 in"
 msgstr "D 纸张, 22 x 34 英寸"
 

-#: ../src/msw/dde.cpp:633
+#: ../src/msw/dde.cpp:631

 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 


@@ -1369,11 +1549,11 @@ msgstr "DIB头: 文件中颜色位数未知."
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知."
 
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知."
 

-#: ../src/common/paper.cpp:135
+#: ../src/common/paper.cpp:128

 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 

-#: ../src/generic/dbgrptg.cpp:276
+#: ../src/generic/dbgrptg.cpp:295

 #, c-format
 msgid "Debug report \"%s\""
 msgstr "调试报告 \"%s\""
 #, c-format
 msgid "Debug report \"%s\""
 msgstr "调试报告 \"%s\""


@@ -1382,7 +1562,7 @@ msgstr "调试报告 \"%s\""
 msgid "Debug report couldn't be created."
 msgstr "无法创建调试报告."
 
 msgid "Debug report couldn't be created."
 msgstr "无法创建调试报告."
 

-#: ../src/common/debugrpt.cpp:517
+#: ../src/common/debugrpt.cpp:539

 msgid "Debug report generation has failed."
 msgstr "无法生成调试报告."
 
 msgid "Debug report generation has failed."
 msgstr "无法生成调试报告."
 


@@ -1390,7 +1570,7 @@ msgstr "无法生成调试报告."
 msgid "Decorative"
 msgstr "修饰"
 
 msgid "Decorative"
 msgstr "修饰"
 

-#: ../src/common/fmapbase.cpp:674
+#: ../src/common/fmapbase.cpp:681

 msgid "Default encoding"
 msgstr "缺省编码"
 
 msgid "Default encoding"
 msgstr "缺省编码"
 


@@ -1407,21 +1587,23 @@ msgstr "删除项"
 msgid "Deleted stale lock file '%s'."
 msgstr "已删除过期的锁文件 '%s'."
 
 msgid "Deleted stale lock file '%s'."
 msgstr "已删除过期的锁文件 '%s'."
 

-#: ../src/generic/dirctrlg.cpp:648
+#: ../src/generic/dirctrlg.cpp:656

 msgid "Desktop"
 msgstr "桌面"
 
 msgid "Desktop"
 msgstr "桌面"
 

-#: ../src/msw/dialup.cpp:358
-msgid ""
-"Dial up functions are unavailable because the remote access service (RAS) is "
-"not installed on this machine. Please install it."
+#: ../src/msw/dialup.cpp:395
+msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."

 msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
 
 #: ../src/generic/tipdlg.cpp:246
 msgid "Did you know..."
 msgstr "你知道吗..."
 
 msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
 
 #: ../src/generic/tipdlg.cpp:246
 msgid "Did you know..."
 msgstr "你知道吗..."
 

-#: ../src/common/filefn.cpp:1172
+#: ../src/motif/filedlg.cpp:225
+msgid "Directories"
+msgstr "目录"
+
+#: ../src/common/filefn.cpp:1177

 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目录'%s'不能被创建"
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目录'%s'不能被创建"


@@ -1431,29 +1613,25 @@ msgstr "目录'%s'不能被创建"
 msgid "Directory '%s' doesn't exist!"
 msgstr "目录 '%s'不存在!"
 
 msgid "Directory '%s' doesn't exist!"
 msgstr "目录 '%s'不存在!"
 

-#: ../src/generic/dirdlgg.cpp:228
+#: ../src/generic/dirdlgg.cpp:226

 msgid "Directory does not exist"
 msgstr "目录不存在"
 
 msgid "Directory does not exist"
 msgstr "目录不存在"
 

-#: ../src/generic/filedlgg.cpp:1300
+#: ../src/generic/filedlgg.cpp:1295

 msgid "Directory doesn't exist."
 msgstr "目录不存在."
 
 #: ../src/html/helpfrm.cpp:503
 msgid "Directory doesn't exist."
 msgstr "目录不存在."
 
 #: ../src/html/helpfrm.cpp:503

-msgid ""
-"Display all index items that contain given substring. Search is case "
-"insensitive."
+msgid "Display all index items that contain given substring. Search is case insensitive."

 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 #: ../src/html/helpfrm.cpp:685
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 #: ../src/html/helpfrm.cpp:685
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 

-#: ../src/msw/mimetype.cpp:670
-#, c-format
+#: ../src/msw/mimetype.cpp:671

 msgid ""
 msgid ""

-"Do you want to overwrite the command used to %s files with extension \"%s"
-"\" ?\n"
+"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"

 "Current value is \n"
 "%s, \n"
 "New value is \n"
 "Current value is \n"
 "%s, \n"
 "New value is \n"


@@ -1470,11 +1648,12 @@ msgstr ""
 msgid "Do you want to save changes to document %s?"
 msgstr "你想保存对文档%s的修改?"
 
 msgid "Do you want to save changes to document %s?"
 msgstr "你想保存对文档%s的修改?"
 

-#: ../src/common/sizer.cpp:1842
+#: ../src/common/sizer.cpp:1839

 msgid "Don't Save"
 msgstr "不保存"
 
 msgid "Don't Save"
 msgstr "不保存"
 

-#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
+#: ../src/html/htmlwin.cpp:451
+#: ../src/msw/frame.cpp:211

 msgid "Done"
 msgstr "完成"
 
 msgid "Done"
 msgstr "完成"
 


@@ -1482,6 +1661,10 @@ msgstr "完成"
 msgid "Done."
 msgstr "完成."
 
 msgid "Done."
 msgstr "完成."
 

+#: ../src/common/paper.cpp:183
+msgid "Double Japanese Postcard Rotated 148 x 200 mm"
+msgstr "横向日本双明信片, 148 x 200 毫米"
+

 #: ../src/common/xtixml.cpp:271
 #, c-format
 msgid "Doubly used id : %d"
 #: ../src/common/xtixml.cpp:271
 #, c-format
 msgid "Doubly used id : %d"


@@ -1491,7 +1674,7 @@ msgstr "重复使用的id : %d"
 msgid "Down"
 msgstr "向下"
 
 msgid "Down"
 msgstr "向下"
 

-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:107

 msgid "E sheet, 34 x 44 in"
 msgstr "E 纸张, 34 x 44 英寸"
 
 msgid "E sheet, 34 x 44 in"
 msgstr "E 纸张, 34 x 44 英寸"
 


@@ -1503,12 +1686,12 @@ msgstr "编辑项"
 msgid "Elapsed time : "
 msgstr "用时: "
 
 msgid "Elapsed time : "
 msgstr "用时: "
 

-#: ../src/common/prntbase.cpp:799
+#: ../src/common/prntbase.cpp:846

 #, c-format
 msgid "Enter a page number between %d and %d:"
 msgstr "输入页码范围(%d 至 %d):"
 
 #, c-format
 msgid "Enter a page number between %d and %d:"
 msgstr "输入页码范围(%d 至 %d):"
 

-#: ../src/generic/dbgrptg.cpp:158
+#: ../src/generic/dbgrptg.cpp:169

 #, c-format
 msgid "Enter command to open file \"%s\":"
 msgstr "输入命令以打开文件 \"%s\":"
 #, c-format
 msgid "Enter command to open file \"%s\":"
 msgstr "输入命令以打开文件 \"%s\":"


@@ -1517,26 +1700,37 @@ msgstr "输入命令以打开文件 \"%s\":"
 msgid "Entries found"
 msgstr "找到的条目"
 
 msgid "Entries found"
 msgstr "找到的条目"
 

-#: ../src/common/config.cpp:383
+#: ../src/common/paper.cpp:149
+msgid "Envelope Invite 220 x 220 mm"
+msgstr "邀请信, 220 x 220 毫米"
+
+#: ../src/common/config.cpp:384

 #, c-format
 #, c-format

-msgid ""
-"Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."

 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
 
 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
 

-#: ../src/generic/dirctrlg.cpp:681 ../src/generic/dirctrlg.cpp:699
-#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
-#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:751
-#: ../src/generic/filedlgg.cpp:765 ../src/generic/filedlgg.cpp:779
-#: ../src/generic/filedlgg.cpp:1275 ../src/generic/filedlgg.cpp:1300
-#: ../src/generic/filedlgg.cpp:1330 ../src/gtk/fontdlg.cpp:81
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:744
+#: ../src/generic/filedlgg.cpp:758
+#: ../src/generic/filedlgg.cpp:772
+#: ../src/generic/filedlgg.cpp:1269
+#: ../src/generic/filedlgg.cpp:1295
+#: ../src/generic/filedlgg.cpp:1325
+#: ../src/gtk/fontdlg.cpp:81

 msgid "Error"
 msgstr "错误"
 
 msgid "Error"
 msgstr "错误"
 

-#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
+#: ../src/msdos/utilsdos.cpp:213
+#: ../src/unix/utilsunx.cpp:1090
+#: ../src/unix/utilsunx.cpp:1098

 msgid "Error "
 msgstr "错误 "
 
 msgid "Error "
 msgstr "错误 "
 

-#: ../src/generic/dirdlgg.cpp:243
+#: ../src/generic/dirdlgg.cpp:241

 msgid "Error creating directory"
 msgstr "创建目录错误"
 
 msgid "Error creating directory"
 msgstr "创建目录错误"
 


@@ -1548,11 +1742,12 @@ msgstr "读图像DIB错误."
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 

-#: ../src/common/fileconf.cpp:1026
+#: ../src/common/fileconf.cpp:1050

 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 

-#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+#: ../src/mac/carbon/mpthread.cpp:482
+#: ../src/mac/carbon/thread.cpp:672

 msgid "Error while waiting on semaphore"
 msgstr "等待信号量时出错"
 
 msgid "Error while waiting on semaphore"
 msgstr "等待信号量时出错"
 


@@ -1560,7 +1755,7 @@ msgstr "等待信号量时出错"
 msgid "Error: "
 msgstr "错误: "
 
 msgid "Error: "
 msgstr "错误: "
 

-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:106

 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 


@@ -1568,7 +1763,7 @@ msgstr "世界语 (ISO-8859-3)"
 msgid "Estimated time : "
 msgstr "预期时间: "
 
 msgid "Estimated time : "
 msgstr "预期时间: "
 

-#: ../src/generic/dbgrptg.cpp:211
+#: ../src/generic/dbgrptg.cpp:229

 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
 msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 
 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
 msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 


@@ -1577,43 +1772,39 @@ msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 msgid "Execution of command '%s' failed"
 msgstr "命令 '%s'执行失败"
 
 msgid "Execution of command '%s' failed"
 msgstr "命令 '%s'执行失败"
 

-#: ../src/os2/utilsexc.cpp:169
+#: ../src/os2/utilsexc.cpp:165

 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 

-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:112

 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgid "Executive, 7 1/4 x 10 1/2 in"

-msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
+msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"

 
 #: ../contrib/src/deprecated/resource.cpp:1869
 #: ../contrib/src/deprecated/resource.cpp:1999
 #: ../contrib/src/deprecated/resource.cpp:3091
 
 #: ../contrib/src/deprecated/resource.cpp:1869
 #: ../contrib/src/deprecated/resource.cpp:1999
 #: ../contrib/src/deprecated/resource.cpp:3091

-#, fuzzy

 msgid "Expected '*' while parsing resource."
 msgstr "解析资源时期待出现 '*' ."
 
 #: ../contrib/src/deprecated/resource.cpp:1886
 #: ../contrib/src/deprecated/resource.cpp:2015
 #: ../contrib/src/deprecated/resource.cpp:3108
 msgid "Expected '*' while parsing resource."
 msgstr "解析资源时期待出现 '*' ."
 
 #: ../contrib/src/deprecated/resource.cpp:1886
 #: ../contrib/src/deprecated/resource.cpp:2015
 #: ../contrib/src/deprecated/resource.cpp:3108

-#, fuzzy

 msgid "Expected '=' while parsing resource."
 msgid "Expected '=' while parsing resource."

-msgstr "解析资源时期待 '='."
+msgstr "解析资源时期待出现 '='."

 
 #: ../contrib/src/deprecated/resource.cpp:1855
 #: ../contrib/src/deprecated/resource.cpp:1985
 #: ../contrib/src/deprecated/resource.cpp:3077
 
 #: ../contrib/src/deprecated/resource.cpp:1855
 #: ../contrib/src/deprecated/resource.cpp:1985
 #: ../contrib/src/deprecated/resource.cpp:3077

-#, fuzzy

 msgid "Expected 'char' while parsing resource."
 msgid "Expected 'char' while parsing resource."

-msgstr "解析资源时期待 'char' ."
+msgstr "解析资源时期待遇到 'char' ."

 
 

-#: ../src/msw/registry.cpp:1125
+#: ../src/msw/registry.cpp:1140

 #, c-format
 #, c-format

-msgid ""
-"Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."

 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 

-#: ../src/common/fmapbase.cpp:141
+#: ../src/common/fmapbase.cpp:143

 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 


@@ -1622,7 +1813,7 @@ msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s'解压至 '%s'失败."
 
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s'解压至 '%s'失败."
 

-#: ../src/msw/dialup.cpp:843
+#: ../src/msw/dialup.cpp:880

 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "到 %s 的拨号连接失败: %s"
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "到 %s 的拨号连接失败: %s"


@@ -1631,7 +1822,7 @@ msgstr "到 %s 的拨号连接失败: %s"
 msgid "Failed to access lock file."
 msgstr "访问锁文件失败."
 
 msgid "Failed to access lock file."
 msgstr "访问锁文件失败."
 

-#: ../src/msw/dib.cpp:543
+#: ../src/msw/dib.cpp:563

 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."
 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."


@@ -1658,39 +1849,39 @@ msgstr "关闭锁文件 '%s'失败"
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 

-#: ../src/msw/dialup.cpp:783
+#: ../src/msw/dialup.cpp:820

 msgid "Failed to connect: missing username/password."
 msgstr "连接失败: 缺少用户名/口令."
 
 msgid "Failed to connect: missing username/password."
 msgstr "连接失败: 缺少用户名/口令."
 

-#: ../src/msw/dialup.cpp:729
+#: ../src/msw/dialup.cpp:766

 msgid "Failed to connect: no ISP to dial."
 msgstr "连接失败: 没有要拨号的ISP."
 
 msgid "Failed to connect: no ISP to dial."
 msgstr "连接失败: 没有要拨号的ISP."
 

-#: ../src/msw/registry.cpp:618
+#: ../src/msw/registry.cpp:626

 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "复制注册键值失败 '%s'"
 
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "复制注册键值失败 '%s'"
 

-#: ../src/msw/registry.cpp:627
+#: ../src/msw/registry.cpp:635

 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 

-#: ../src/common/filefn.cpp:1008
+#: ../src/common/filefn.cpp:1003

 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "复制文件 '%s'至 '%s'失败"
 
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "复制文件 '%s'至 '%s'失败"
 

-#: ../src/msw/registry.cpp:605
+#: ../src/msw/registry.cpp:613

 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 msgstr "复制注册表子键 '%s'至 '%s'失败."
 
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 msgstr "复制注册表子键 '%s'至 '%s'失败."
 

-#: ../src/msw/dde.cpp:988
+#: ../src/msw/dde.cpp:989

 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 

-#: ../src/msw/mdi.cpp:459
+#: ../src/msw/mdi.cpp:473

 msgid "Failed to create MDI parent frame."
 msgstr "创建 MDI 父框架失败."
 
 msgid "Failed to create MDI parent frame."
 msgstr "创建 MDI 父框架失败."
 


@@ -1706,12 +1897,12 @@ msgstr "创建临时文件名失败"
 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 
 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 

-#: ../src/msw/dde.cpp:450
+#: ../src/msw/dde.cpp:447

 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 

-#: ../src/msw/cursor.cpp:216
+#: ../src/msw/cursor.cpp:218

 msgid "Failed to create cursor."
 msgstr "创建游标失败."
 
 msgid "Failed to create cursor."
 msgstr "创建游标失败."
 


@@ -1730,7 +1921,7 @@ msgstr "创建目录 %s/.gnome 失败."
 msgid "Failed to create directory %s/mime-info."
 msgstr "创建目录 %s/.mime-info 失败."
 
 msgid "Failed to create directory %s/mime-info."
 msgstr "创建目录 %s/.mime-info 失败."
 

-#: ../src/generic/dirdlgg.cpp:241
+#: ../src/generic/dirdlgg.cpp:239

 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"


@@ -1754,7 +1945,8 @@ msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 

-#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/mac/carbon/clipbrd.cpp:194
+#: ../src/mac/classic/clipbrd.cpp:185

 #: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 #: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"


@@ -1763,21 +1955,22 @@ msgstr "清空剪贴板失败"
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 

-#: ../src/msw/dde.cpp:652
+#: ../src/msw/dde.cpp:650

 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 

-#: ../src/msw/dialup.cpp:621
+#: ../src/msw/dialup.cpp:658

 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "建立拨号连接: %s失败"
 
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "建立拨号连接: %s失败"
 

-#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
+#: ../src/unix/utilsunx.cpp:508
+#: ../src/unix/utilsunx.cpp:524

 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 

-#: ../src/common/debugrpt.cpp:652
+#: ../src/common/debugrpt.cpp:666

 msgid "Failed to execute curl, please install it in PATH."
 msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
 
 msgid "Failed to execute curl, please install it in PATH."
 msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
 


@@ -1808,12 +2001,13 @@ msgstr ""
 "查找XPM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 
 "查找XPM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 

-#: ../src/msw/dialup.cpp:681
+#: ../src/msw/dialup.cpp:718

 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "获取ISP名: %s失败"
 
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "获取ISP名: %s失败"
 

-#: ../src/mac/carbon/clipbrd.cpp:138 ../src/mac/classic/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:143
+#: ../src/mac/classic/clipbrd.cpp:134

 msgid "Failed to get clipboard data."
 msgstr "获取剪贴板数据失败."
 
 msgid "Failed to get clipboard data."
 msgstr "获取剪贴板数据失败."
 


@@ -1821,20 +2015,11 @@ msgstr "获取剪贴板数据失败."
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 

-#: ../src/msw/stackwalk.cpp:221
-#, c-format
-msgid ""
-"Failed to get stack backtrace:\n"
-"%s"
-msgstr ""
-"不能获取堆栈的回溯路径:\n"
-" %s"
-
-#: ../src/common/stopwatch.cpp:223
+#: ../src/common/stopwatch.cpp:233

 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 

-#: ../src/common/filefn.cpp:1423
+#: ../src/common/filefn.cpp:1430

 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 


@@ -1846,7 +2031,7 @@ msgstr "不能初始化GUI: 找不到内嵌的主题(theme)."
 msgid "Failed to initialize MS HTML Help."
 msgstr "初始化MS HTML帮助失败."
 
 msgid "Failed to initialize MS HTML Help."
 msgstr "初始化MS HTML帮助失败."
 

-#: ../src/msw/glcanvas.cpp:808
+#: ../src/msw/glcanvas.cpp:809

 msgid "Failed to initialize OpenGL"
 msgstr "不能初始化OpenGL"
 
 msgid "Failed to initialize OpenGL"
 msgstr "不能初始化OpenGL"
 


@@ -1856,12 +2041,10 @@ msgid "Failed to inspect the lock file '%s'"
 msgstr "检查锁文件 '%s'失败"
 
 #: ../src/unix/threadpsx.cpp:897
 msgstr "检查锁文件 '%s'失败"
 
 #: ../src/unix/threadpsx.cpp:897

-msgid ""
-"Failed to join a thread, potential memory leak detected - please restart the "
-"program"
+msgid "Failed to join a thread, potential memory leak detected - please restart the program"

 msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 
 msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 

-#: ../src/msw/utils.cpp:702
+#: ../src/msw/utils.cpp:703

 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"


@@ -1900,8 +2083,8 @@ msgstr "锁定锁文件 '%s'失败"
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "不能匹配 '%s' 于正则表达式: %s"
 
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "不能匹配 '%s' 于正则表达式: %s"
 

-#: ../src/common/filename.cpp:1917
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:1918
+#, c-format

 msgid "Failed to modify file times for '%s'"
 msgstr "修改文件时间(为 '%s') 失败"
 
 msgid "Failed to modify file times for '%s'"
 msgstr "修改文件时间(为 '%s') 失败"
 


@@ -1931,7 +2114,7 @@ msgstr "把数据放到剪贴板失败"
 msgid "Failed to read PID from lock file."
 msgstr "从锁文件读取PID失败."
 
 msgid "Failed to read PID from lock file."
 msgstr "从锁文件读取PID失败."
 

-#: ../src/unix/utilsunx.cpp:581
+#: ../src/unix/utilsunx.cpp:598

 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 


@@ -1939,12 +2122,12 @@ msgstr "重定向子过程输入/输出失败"
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 

-#: ../src/msw/dde.cpp:300
+#: ../src/msw/dde.cpp:297

 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "注册DDE服务器 '%s'失败"
 
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "注册DDE服务器 '%s'失败"
 

-#: ../src/msw/glcanvas.cpp:368
+#: ../src/msw/glcanvas.cpp:363

 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 
 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 


@@ -1968,12 +2151,12 @@ msgstr "不能删除锁文件 '%s'"
 msgid "Failed to remove stale lock file '%s'."
 msgstr "删除过期的锁文件 '%s'失败."
 
 msgid "Failed to remove stale lock file '%s'."
 msgstr "删除过期的锁文件 '%s'失败."
 

-#: ../src/msw/registry.cpp:456
+#: ../src/msw/registry.cpp:464

 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "将注册值 '%s'改名到'%s'失败."
 
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "将注册值 '%s'改名到'%s'失败."
 

-#: ../src/msw/registry.cpp:560
+#: ../src/msw/registry.cpp:568

 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s'改名到'%s'失败."
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s'改名到'%s'失败."


@@ -1982,12 +2165,12 @@ msgstr "将注册键 '%s'改名到'%s'失败."
 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败."
 
 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败."
 

-#: ../src/common/filename.cpp:2007
+#: ../src/common/filename.cpp:2011

 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "检取文件时间(为 '%s')失败"
 
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "检取文件时间(为 '%s')失败"
 

-#: ../src/msw/dialup.cpp:454
+#: ../src/msw/dialup.cpp:491

 msgid "Failed to retrieve text of RAS error message"
 msgstr "检取RAS错误消息正文失败"
 
 msgid "Failed to retrieve text of RAS error message"
 msgstr "检取RAS错误消息正文失败"
 


@@ -1995,12 +2178,12 @@ msgstr "检取RAS错误消息正文失败"
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "检取支持的剪贴板格式失败"
 
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "检取支持的剪贴板格式失败"
 

-#: ../src/msw/dib.cpp:345
+#: ../src/msw/dib.cpp:341

 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 

-#: ../src/msw/dde.cpp:697
+#: ../src/msw/dde.cpp:695

 msgid "Failed to send DDE advise notification"
 msgstr "发送DDE advise 通知失败"
 
 msgid "Failed to send DDE advise notification"
 msgstr "发送DDE advise 通知失败"
 


@@ -2022,7 +2205,8 @@ msgstr "在锁文件 '%s'上设置许可权限时失败"
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 

-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/unix/threadpsx.cpp:1245
+#: ../src/unix/threadpsx.cpp:1256

 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "设置线程优先级 %d失败."
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "设置线程优先级 %d失败."


@@ -2032,21 +2216,22 @@ msgstr "设置线程优先级 %d失败."
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "将图像'%s'存到内存VFS失败!"
 
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "将图像'%s'存到内存VFS失败!"
 

-#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
+#: ../src/mac/carbon/mpthread.cpp:1273
+#: ../src/mac/carbon/thread.cpp:1465

 #: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
 msgstr "终止线程失败"
 
 #: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
 msgstr "终止线程失败"
 

-#: ../src/msw/dde.cpp:671
+#: ../src/msw/dde.cpp:669

 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "终止与DDE服务器的advise循环失败"
 
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "终止与DDE服务器的advise循环失败"
 

-#: ../src/msw/dialup.cpp:916
+#: ../src/msw/dialup.cpp:955

 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 

-#: ../src/common/filename.cpp:1932
+#: ../src/common/filename.cpp:1933

 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s'进行touch操作失败"
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s'进行touch操作失败"


@@ -2056,16 +2241,16 @@ msgstr "对文件 '%s'进行touch操作失败"
 msgid "Failed to unlock lock file '%s'"
 msgstr "对锁文件 '%s'解锁失败"
 
 msgid "Failed to unlock lock file '%s'"
 msgstr "对锁文件 '%s'解锁失败"
 

-#: ../src/msw/dde.cpp:321
+#: ../src/msw/dde.cpp:318

 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "撤消DDE服务器 '%s'注册失败"
 
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "撤消DDE服务器 '%s'注册失败"
 

-#: ../src/common/fileconf.cpp:999
+#: ../src/common/fileconf.cpp:1023

 msgid "Failed to update user configuration file."
 msgstr "不能更新用户配置文件."
 
 msgid "Failed to update user configuration file."
 msgstr "不能更新用户配置文件."
 

-#: ../src/common/debugrpt.cpp:665
+#: ../src/common/debugrpt.cpp:679

 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
 msgstr "上传调试报告失败 (错误号 %d)."
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
 msgstr "上传调试报告失败 (错误号 %d)."


@@ -2075,7 +2260,7 @@ msgstr "上传调试报告失败 (错误号 %d)."
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 

-#: ../src/generic/logg.cpp:399
+#: ../src/generic/logg.cpp:394

 msgid "Fatal error"
 msgstr "致命错误"
 
 msgid "Fatal error"
 msgstr "致命错误"
 


@@ -2092,12 +2277,13 @@ msgstr "文件"
 msgid "File %s does not exist."
 msgstr "文件 %s不存在."
 
 msgid "File %s does not exist."
 msgstr "文件 %s不存在."
 

-#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61
+#: ../src/generic/filedlgg.cpp:1316
+#: ../src/gtk/filedlg.cpp:64

 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在, 确实需要复写它?"
 
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在, 确实需要复写它?"
 

-#: ../src/os2/filedlg.cpp:307
+#: ../src/os2/filedlg.cpp:310

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -2110,20 +2296,29 @@ msgstr ""
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 

-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
-#: ../src/common/docview.cpp:1609
+#: ../src/common/docview.cpp:571
+#: ../src/common/docview.cpp:1596

 msgid "File error"
 msgstr "文件错误"
 
 msgid "File error"
 msgstr "文件错误"
 

-#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/filedlgg.cpp:758

 msgid "File name exists already."
 msgstr "文件名已存在"
 
 msgid "File name exists already."
 msgstr "文件名已存在"
 

-#: ../src/common/filefn.cpp:1739
+#: ../src/motif/filedlg.cpp:226
+msgid "Files"
+msgstr "文件"
+
+#: ../src/common/filefn.cpp:1746

 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
 
 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
 

+#: ../src/motif/filedlg.cpp:224
+msgid "Filter"
+msgstr "过滤器"
+

 #: ../src/html/helpfrm.cpp:491
 msgid "Find"
 msgstr "查找"
 #: ../src/html/helpfrm.cpp:491
 msgid "Find"
 msgstr "查找"


@@ -2136,7 +2331,7 @@ msgstr "固定字体:"
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 

-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:118

 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 


@@ -2144,7 +2339,7 @@ msgstr "对开纸, 8 1/2 x 13 英寸"
 msgid "Font size:"
 msgstr "字体大小:"
 
 msgid "Font size:"
 msgstr "字体大小:"
 

-#: ../src/unix/utilsunx.cpp:528
+#: ../src/unix/utilsunx.cpp:545

 msgid "Fork failed"
 msgstr "Fork 失败"
 
 msgid "Fork failed"
 msgstr "Fork 失败"
 


@@ -2189,17 +2384,17 @@ msgstr "GIF: 位置错误!!!"
 
 #: ../src/univ/themes/gtk.cpp:634
 msgid "GTK+ theme"
 
 #: ../src/univ/themes/gtk.cpp:634
 msgid "GTK+ theme"

-msgstr "GTK+主题(theme)"
+msgstr "GTK+ 主题"

 
 #: ../src/common/prntbase.cpp:228
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 
 
 #: ../src/common/prntbase.cpp:228
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 

-#: ../src/common/paper.cpp:149
+#: ../src/common/paper.cpp:142

 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 

-#: ../src/common/paper.cpp:148
+#: ../src/common/paper.cpp:141

 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 


@@ -2225,25 +2420,27 @@ msgstr "向前"
 
 #: ../src/html/helpfrm.cpp:659
 msgid "Go one level up in document hierarchy"
 
 #: ../src/html/helpfrm.cpp:659
 msgid "Go one level up in document hierarchy"

-msgstr "å\9c¨æ\96\87æ¡£å±\82次中ä¸\8aå\8d\87ä¸\80级"
+msgstr "å\88°ä¸\8aä¸\80级æ\96\87æ¡£ç\9b®å½\95"

 
 

-#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:997
+#: ../src/generic/dirdlgg.cpp:145
+#: ../src/generic/filedlgg.cpp:989

 msgid "Go to home directory"
 msgstr "进入home目录"
 
 msgid "Go to home directory"
 msgstr "进入home目录"
 

-#: ../src/generic/filedlgg.cpp:989
+#: ../src/generic/filedlgg.cpp:981

 msgid "Go to parent directory"
 msgstr "进入父目录"
 
 msgid "Go to parent directory"
 msgstr "进入父目录"
 

-#: ../src/common/prntbase.cpp:804
+#: ../src/common/prntbase.cpp:851

 msgid "Goto Page"
 msgstr "跳转页面"
 
 msgid "Goto Page"
 msgstr "跳转页面"
 

-#: ../src/common/fmapbase.cpp:109
+#: ../src/common/fmapbase.cpp:110

 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 

-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/common/zstream.cpp:72
+#: ../src/common/zstream.cpp:209

 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 


@@ -2260,12 +2457,12 @@ msgstr "HTML 锚 %s 不存在."
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 

-#: ../src/common/fmapbase.cpp:110
+#: ../src/common/fmapbase.cpp:111

 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 

-#: ../contrib/src/deprecated/proplist.cpp:523 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:337 ../src/msw/mdi.cpp:1383
+#: ../src/html/helpfrm.cpp:337
+#: ../contrib/src/deprecated/proplist.cpp:523

 msgid "Help"
 msgstr "帮助"
 
 msgid "Help"
 msgstr "帮助"
 


@@ -2273,7 +2470,8 @@ msgstr "帮助"
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 

-#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:443

 msgid "Help Index"
 msgstr "帮助索引"
 
 msgid "Help Index"
 msgstr "帮助索引"
 


@@ -2294,15 +2492,15 @@ msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 msgid "Help: %s"
 msgstr "帮助: %s"
 
 msgid "Help: %s"
 msgstr "帮助: %s"
 

-#: ../src/generic/dirdlgg.cpp:107
+#: ../src/generic/dirdlgg.cpp:105

 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 

-#: ../src/generic/dirctrlg.cpp:646
+#: ../src/generic/dirctrlg.cpp:654

 msgid "Home directory"
 msgstr "Home目录"
 
 msgid "Home directory"
 msgstr "Home目录"
 

-#: ../include/wx/filefn.h:142
+#: ../include/wx/filefn.h:145

 msgid "I64"
 msgstr "I64"
 
 msgid "I64"
 msgstr "I64"
 


@@ -2310,9 +2508,12 @@ msgstr "I64"
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误."
 
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误."
 

-#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
-#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
-#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
+#: ../src/common/imagbmp.cpp:1048
+#: ../src/common/imagbmp.cpp:1107
+#: ../src/common/imagbmp.cpp:1116
+#: ../src/common/imagbmp.cpp:1127
+#: ../src/common/imagbmp.cpp:1171
+#: ../src/common/imagbmp.cpp:1181

 #: ../src/common/imagbmp.cpp:1190
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误."
 #: ../src/common/imagbmp.cpp:1190
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误."


@@ -2351,7 +2552,7 @@ msgstr "IFF: 位置错误!!!"
 msgid "Icon resource specification %s not found."
 msgstr "没有找到图标资源规范 %s ."
 
 msgid "Icon resource specification %s not found."
 msgstr "没有找到图标资源规范 %s ."
 

-#: ../src/generic/dbgrptg.cpp:325
+#: ../src/generic/dbgrptg.cpp:344

 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"
 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"


@@ -2359,19 +2560,17 @@ msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"
 "请在此输入, 它将会被加到错误报告中:"
 
 "如果您有任何与此错误报告有关的信息, \n"
 "请在此输入, 它将会被加到错误报告中:"
 

-#: ../src/generic/dbgrptg.cpp:291
+#: ../src/generic/dbgrptg.cpp:310

 msgid ""
 msgid ""

-"If you wish to suppress this debug report completely, please choose the "
-"\"Cancel\" button,\n"
+"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"

 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""

-"如果您想完全禁用调试报告, 请按"
-"\"取消\"按钮, \n"
+"如果您想完全禁用调试报告, 请按\"取消\"按钮, \n"

 "但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
 "在可能的情况下, 请尽量选择让程序生成调试报告.\n"
 
 "但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
 "在可能的情况下, 请尽量选择让程序生成调试报告.\n"
 

-#: ../src/msw/registry.cpp:1281
+#: ../src/msw/registry.cpp:1304

 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 msgstr "忽略值 \"%s\" (键 \"%s\")."
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 msgstr "忽略值 \"%s\" (键 \"%s\")."


@@ -2392,44 +2591,43 @@ msgstr "非法的针对ConstructObject方法的参数计数"
 msgid "Illegal Parameter Count for Create Method"
 msgstr "非法的针对Create方法的参数计数"
 
 msgid "Illegal Parameter Count for Create Method"
 msgstr "非法的针对Create方法的参数计数"
 

-#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/filedlgg.cpp:744

 msgid "Illegal directory name."
 msgstr "不合法的目录名."
 
 msgid "Illegal directory name."
 msgstr "不合法的目录名."
 

-#: ../src/generic/filedlgg.cpp:1275
+#: ../src/generic/filedlgg.cpp:1269

 msgid "Illegal file specification."
 msgstr "不合规范的文件描述."
 
 msgid "Illegal file specification."
 msgstr "不合规范的文件描述."
 

-#: ../src/common/image.cpp:1169
+#: ../src/common/image.cpp:1192

 msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致."
 
 msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致."
 

-#: ../src/common/image.cpp:1500
+#: ../src/common/image.cpp:1523

 #, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
 #: ../src/msw/textctrl.cpp:361
 #, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
 #: ../src/msw/textctrl.cpp:361

-msgid ""
-"Impossible to create a rich edit control, using simple text control instead. "
-"Please reinstall riched32.dll"
+msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"

 msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
 
 msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
 

-#: ../src/unix/utilsunx.cpp:411
+#: ../src/unix/utilsunx.cpp:428

 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 

-#: ../src/common/filefn.cpp:1027
+#: ../src/common/filefn.cpp:1022

 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "不可能获得文件 '%s'的许可权限"
 
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "不可能获得文件 '%s'的许可权限"
 

-#: ../src/common/filefn.cpp:1041
+#: ../src/common/filefn.cpp:1036

 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 

-#: ../src/common/filefn.cpp:1085
+#: ../src/common/filefn.cpp:1080

 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "不可能设置文件 '%s'的许可权限"
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "不可能设置文件 '%s'的许可权限"


@@ -2442,20 +2640,24 @@ msgstr "缩进"
 msgid "Index"
 msgstr "索引"
 
 msgid "Index"
 msgstr "索引"
 

-#: ../src/common/fmapbase.cpp:114
+#: ../src/common/fmapbase.cpp:115

 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 

+#: ../src/common/init.cpp:232
+msgid "Initialization failed in post init, aborting."
+msgstr "在后初始化阶段出错, 退出..."
+

 #: ../src/common/xtistrm.cpp:704
 msgid "Internal error, illegal wxCustomTypeInfo"
 msgstr "整数错误, 非法的wxCustomTypeInfo"
 
 #: ../src/common/xtistrm.cpp:704
 msgid "Internal error, illegal wxCustomTypeInfo"
 msgstr "整数错误, 非法的wxCustomTypeInfo"
 

-#: ../src/common/imagtiff.cpp:211
+#: ../src/common/imagtiff.cpp:227

 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引."
 
 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引."
 

-#: ../src/xrc/xmlres.cpp:399
+#: ../src/xrc/xmlres.cpp:460

 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."


@@ -2475,7 +2677,8 @@ msgstr "无效的几何规格 '%s'"
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'."
 
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'."
 

-#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+#: ../src/common/xtistrm.cpp:365
+#: ../src/common/xtistrm.cpp:380

 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
 
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
 


@@ -2492,7 +2695,7 @@ msgstr "无效的正则表达式 '%s': %s"
 msgid "Italic"
 msgstr "斜体"
 
 msgid "Italic"
 msgstr "斜体"
 

-#: ../src/common/paper.cpp:144
+#: ../src/common/paper.cpp:137

 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封, 110 x 230 毫米"
 
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封, 110 x 230 毫米"
 


@@ -2504,23 +2707,76 @@ msgstr "JPEG: 不能装入 - 文件也许已被破坏."
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 不能保存图像."
 
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 不能保存图像."
 

+#: ../src/common/paper.cpp:170
+msgid "Japanese Double Postcard 200 x 148 mm"
+msgstr "日本双明信片, 200 x 148 毫米"
+
+#: ../src/common/paper.cpp:174
+msgid "Japanese Envelope Chou #3"
+msgstr "日本 Chou 3 信封"
+
+#: ../src/common/paper.cpp:187
+msgid "Japanese Envelope Chou #3 Rotated"
+msgstr "日本 Chou 3 信封(横向)"
+
+#: ../src/common/paper.cpp:175
+msgid "Japanese Envelope Chou #4"
+msgstr "日本 Chou 4 信封"
+
+#: ../src/common/paper.cpp:188
+msgid "Japanese Envelope Chou #4 Rotated"
+msgstr "日本 Chou 4 信封(横向)"
+
+#: ../src/common/paper.cpp:172
+msgid "Japanese Envelope Kaku #2"
+msgstr "日本 Kaku 2 信封"
+
+#: ../src/common/paper.cpp:185
+msgid "Japanese Envelope Kaku #2 Rotated"
+msgstr "日本 Kaku 2 信封(横向)"
+
+#: ../src/common/paper.cpp:173
+msgid "Japanese Envelope Kaku #3"
+msgstr "日本 Kaku 3 信封"
+
+#: ../src/common/paper.cpp:186
+msgid "Japanese Envelope Kaku #3 Rotated"
+msgstr "日本 Kaku 3 信封(横向)"
+
+#: ../src/common/paper.cpp:192
+msgid "Japanese Envelope You #4"
+msgstr "日本 You 4 信封"
+
+#: ../src/common/paper.cpp:193
+msgid "Japanese Envelope You #4 Rotated"
+msgstr "日本 You 4 信封(横向)"
+
+#: ../src/common/paper.cpp:145
+msgid "Japanese Postcard 100 x 148 mm"
+msgstr "日本明信片, 100 x 148 毫米"
+
+#: ../src/common/paper.cpp:182
+msgid "Japanese Postcard Rotated 148 x 100 mm"
+msgstr "横向日本明信片, 148 x 100 毫米"
+

 #: ../src/common/stockitem.cpp:128
 msgid "Justified"
 msgstr "分散对齐"
 
 #: ../src/common/stockitem.cpp:128
 msgid "Justified"
 msgstr "分散对齐"
 

-#: ../src/common/fmapbase.cpp:118
+#: ../src/common/fmapbase.cpp:119

 msgid "KOI8-R"
 msgstr "KOI8-R"
 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 

-#: ../src/common/fmapbase.cpp:119
+#: ../src/common/fmapbase.cpp:120

 msgid "KOI8-U"
 msgstr "KOI8-U"
 
 msgid "KOI8-U"
 msgstr "KOI8-U"
 

-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:867

 msgid "Landscape"
 msgstr "横向"
 
 msgid "Landscape"
 msgstr "横向"
 

-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:110

 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 
 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 


@@ -2528,15 +2784,39 @@ msgstr "帐簿, 17 x 11 英寸"
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 

-#: ../src/common/paper.cpp:110
+#: ../src/common/paper.cpp:151
+msgid "Legal Extra 9 1/2 x 15 in"
+msgstr "特大法律纸张, 9 1/2 x 15 英寸"
+
+#: ../src/common/paper.cpp:103

 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 

-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:150
+msgid "Letter Extra 9 1/2 x 12 in"
+msgstr "特大信纸, 9 1/2 x 12 英寸"
+
+#: ../src/common/paper.cpp:156
+msgid "Letter Extra Transverse 9.275 x 12 in"
+msgstr "特大信纸(横排), 9.275 x 12 英寸"
+
+#: ../src/common/paper.cpp:159
+msgid "Letter Plus 8 1/2 x 12.69 in"
+msgstr "加大信纸, 8 1/2 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:176
+msgid "Letter Rotated 11 x 8 1/2 in"
+msgstr "横向信纸, 11 x 8 1/2 英寸"
+
+#: ../src/common/paper.cpp:108

 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 

-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:154
+msgid "Letter Transverse 8 1/2 x 11 in"
+msgstr "信纸(横排), 8 1/2 x 11 英寸"
+
+#: ../src/common/paper.cpp:102

 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 


@@ -2557,14 +2837,6 @@ msgstr "装入文件 %s "
 msgid "Loading : "
 msgstr "装载: "
 
 msgid "Loading : "
 msgstr "装载: "
 

-#: ../src/common/imagpnm.cpp:72
-msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "装入灰度 Ascii PNM图像功能还没有实现."
-
-#: ../src/common/imagpnm.cpp:75
-msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "装入灰度 Raw PNM图像功能还没有实现."
-

 #: ../src/unix/snglinst.cpp:251
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 #: ../src/unix/snglinst.cpp:251
 #, c-format
 msgid "Lock file '%s' has incorrect owner."


@@ -2575,12 +2847,13 @@ msgstr "锁文件 '%s' 没有正确的所有者."
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限."
 
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限."
 

-#: ../src/generic/logg.cpp:575
+#: ../src/generic/logg.cpp:572

 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'."
 
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'."
 

-#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
+#: ../include/wx/xti.h:501
+#: ../include/wx/xti.h:505

 msgid "Long Conversions not supported"
 msgstr "不支持长转换"
 
 msgid "Long Conversions not supported"
 msgstr "不支持长转换"
 


@@ -2593,12 +2866,10 @@ msgid "MP Thread Support is not available on this System"
 msgstr "此系统不提供MP线程支持."
 
 #: ../src/msw/helpchm.cpp:60
 msgstr "此系统不提供MP线程支持."
 
 #: ../src/msw/helpchm.cpp:60

-msgid ""
-"MS HTML Help functions are unavailable because the MS HTML Help library is "
-"not installed on this machine. Please install it."
+msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."

 msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮助库. 请安装它."
 
 msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮助库. 请安装它."
 

-#: ../src/univ/themes/win32.cpp:4823
+#: ../src/univ/themes/win32.cpp:4929

 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 


@@ -2609,7 +2880,7 @@ msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
 
 #: ../src/generic/fdrepdlg.cpp:153
 msgid "Match case"
 
 #: ../src/generic/fdrepdlg.cpp:153
 msgid "Match case"

-msgstr "大å°\8få\86\99å\8c¹é\85\8d"
+msgstr "å\8cºå\88\86大å°\8få\86\99"

 
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 
 #: ../src/common/fs_mem.cpp:176
 #, c-format


@@ -2622,9 +2893,9 @@ msgstr "菜单"
 
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"
 
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"

-msgstr "金属主题(theme)"
+msgstr "金属主题"

 
 

-#: ../src/univ/themes/win32.cpp:4821
+#: ../src/univ/themes/win32.cpp:4927

 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 


@@ -2642,11 +2913,16 @@ msgstr "显示模式 %ix%i-%i位色 不支持."
 msgid "Modern"
 msgstr "现代"
 
 msgid "Modern"
 msgstr "现代"
 

-#: ../src/generic/filedlgg.cpp:441
+#: ../src/generic/filedlgg.cpp:434

 msgid "Modified"
 msgid "Modified"

-msgstr "修正ç\9a\84"
+msgstr "ä¿®æ\94¹æ\97¥æ\9c\9f"

 
 

-#: ../src/common/paper.cpp:145
+#: ../src/common/module.cpp:77
+#, c-format
+msgid "Module \"%s\" initialization failed"
+msgstr "模块 \"%s\" 初始化失败"
+
+#: ../src/common/paper.cpp:138

 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
 
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
 


@@ -2658,11 +2934,11 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

-#: ../src/generic/filedlgg.cpp:438
+#: ../src/generic/filedlgg.cpp:431

 msgid "Name"
 msgstr "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: ../src/generic/dirdlgg.cpp:111
+#: ../src/generic/dirdlgg.cpp:109

 msgid "New directory"
 msgstr "新目录"
 
 msgid "New directory"
 msgstr "新目录"
 


@@ -2670,10 +2946,12 @@ msgstr "新目录"
 msgid "New item"
 msgstr "新项目"
 
 msgid "New item"
 msgstr "新项目"
 

-#: ../src/generic/dirdlgg.cpp:318 ../src/generic/dirdlgg.cpp:328
-#: ../src/generic/filedlgg.cpp:615 ../src/generic/filedlgg.cpp:624
+#: ../src/generic/dirdlgg.cpp:316
+#: ../src/generic/dirdlgg.cpp:326
+#: ../src/generic/filedlgg.cpp:608
+#: ../src/generic/filedlgg.cpp:617

 msgid "NewName"
 msgid "NewName"

-msgstr "新名"
+msgstr "新名称"

 
 #: ../src/generic/tipdlg.cpp:305
 msgid "Next"
 
 #: ../src/generic/tipdlg.cpp:305
 msgid "Next"


@@ -2683,16 +2961,18 @@ msgstr "下一个"
 msgid "Next page"
 msgstr "下一页"
 
 msgid "Next page"
 msgstr "下一页"
 

-#: ../src/mac/carbon/msgdlg.cpp:60 ../src/mac/carbon/msgdlg.cpp:145
-#: ../src/mac/classic/msgdlg.cpp:58 ../src/mac/classic/msgdlg.cpp:142
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/mac/carbon/msgdlg.cpp:58
+#: ../src/mac/carbon/msgdlg.cpp:143
+#: ../src/mac/classic/msgdlg.cpp:56
+#: ../src/mac/classic/msgdlg.cpp:140
+#: ../src/motif/msgdlg.cpp:204

 msgid "No"
 msgstr "否"
 
 #: ../contrib/src/deprecated/resource.cpp:2495
 #: ../contrib/src/deprecated/resource.cpp:2649
 msgid "No XBM facility available!"
 msgid "No"
 msgstr "否"
 
 #: ../contrib/src/deprecated/resource.cpp:2495
 #: ../contrib/src/deprecated/resource.cpp:2649
 msgid "No XBM facility available!"

-msgstr "没有可用XBM工具!"
+msgstr "没有可用的XBM工具!"

 
 #: ../contrib/src/deprecated/resource.cpp:2667
 msgid "No XPM icon facility available!"
 
 #: ../contrib/src/deprecated/resource.cpp:2667
 msgid "No XPM icon facility available!"


@@ -2707,10 +2987,9 @@ msgstr "没找到条目"
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"

-"Do you want to use this encoding (otherwise you will have to choose another "
-"one)?"
+"Do you want to use this encoding (otherwise you will have to choose another one)?"

 msgstr ""
 msgstr ""

-"在编码 '%s' 中未找到显示文本所用的字体,\n"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"

 "但发现另一替代编码 '%s'.\n"
 "是否使用该编码(否则您必须选择另外的编码)?"
 
 "但发现另一替代编码 '%s'.\n"
 "是否使用该编码(否则您必须选择另外的编码)?"
 


@@ -2721,26 +3000,29 @@ msgid ""
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""

-"在编码 '%s' 中未找到显示文本所用的字体.\n"
-"选择用于该编码的字体\n"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"
+"请选择用于该编码的字体\n"

 "(否则该编码的文本将不能正确显示)?"
 
 "(否则该编码的文本将不能正确显示)?"
 

-#: ../src/xrc/xmlres.cpp:616
+#: ../src/xrc/xmlres.cpp:677

 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 

-#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525
+#: ../src/common/image.cpp:1505
+#: ../src/common/image.cpp:1548

 msgid "No handler found for image type."
 msgstr "没有找到图像类型处理器."
 
 msgid "No handler found for image type."
 msgstr "没有找到图像类型处理器."
 

-#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
-#: ../src/common/image.cpp:1566
+#: ../src/common/image.cpp:1513
+#: ../src/common/image.cpp:1556
+#: ../src/common/image.cpp:1589

 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器."
 
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器."
 

-#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581
+#: ../src/common/image.cpp:1574
+#: ../src/common/image.cpp:1604

 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "没有类型 %s的图像处理器."
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "没有类型 %s的图像处理器."


@@ -2753,19 +3035,21 @@ msgstr "还没有找到匹配页"
 msgid "No sound"
 msgstr "没有声音"
 
 msgid "No sound"
 msgstr "没有声音"
 

-#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216
+#: ../src/common/image.cpp:1200
+#: ../src/common/image.cpp:1239

 msgid "No unused colour in image being masked."
 msgstr "图像中没有被掩码的未用颜色."
 
 msgid "No unused colour in image being masked."
 msgstr "图像中没有被掩码的未用颜色."
 

-#: ../src/common/image.cpp:1821
+#: ../src/common/image.cpp:1997

 msgid "No unused colour in image."
 msgstr "图像中没有未用的颜色."
 
 msgid "No unused colour in image."
 msgstr "图像中没有未用的颜色."
 

-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/fmapbase.cpp:113

 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 

-#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
+#: ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:235

 msgid "Normal"
 msgstr "正常"
 
 msgid "Normal"
 msgstr "正常"
 


@@ -2777,34 +3061,39 @@ msgstr "正常字体<br> 且 <u>带下划线</u>."
 msgid "Normal font:"
 msgstr "正常字体:"
 
 msgid "Normal font:"
 msgstr "正常字体:"
 

-#: ../src/common/paper.cpp:129
+#: ../src/common/paper.cpp:122

 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 

-#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
-#: ../src/msw/dialog.cpp:193
+#: ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:194
+#: ../contrib/src/deprecated/proplist.cpp:506

 msgid "OK"
 msgstr "确认"
 
 #: ../src/common/xtixml.cpp:263
 msgid "Objects must have an id attribute"
 msgid "OK"
 msgstr "确认"
 
 #: ../src/common/xtixml.cpp:263
 msgid "Objects must have an id attribute"

-msgstr "对象必须有一个id属性(attribute)"
+msgstr "对象必须有一个id属性"

 
 

-#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632
+#: ../src/common/docview.cpp:1269
+#: ../src/common/docview.cpp:1619

 msgid "Open File"
 msgstr "打开文件"
 
 msgid "Open File"
 msgstr "打开文件"
 

-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpfrm.cpp:673
+#: ../src/html/helpfrm.cpp:1579

 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 

-#: ../src/generic/dbgrptg.cpp:147
+#: ../src/generic/dbgrptg.cpp:158

 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 
 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 

-#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
-#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:779
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:772

 msgid "Operation not permitted."
 msgstr "不允许的操作."
 
 msgid "Operation not permitted."
 msgstr "不允许的操作."
 


@@ -2823,15 +3112,18 @@ msgstr "选项 '%s' 需要值."
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 不能转成日期."
 
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 不能转成日期."
 

-#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/dirdlgg.cpp:116
+#: ../src/generic/prntdlgg.cpp:614

 msgid "Options"
 msgstr "选项"
 
 msgid "Options"
 msgstr "选项"
 

-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:611
+#: ../src/generic/prntdlgg.cpp:868

 msgid "Orientation"
 msgstr "方向"
 
 msgid "Orientation"
 msgstr "方向"
 

-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/imagpcx.cpp:462
+#: ../src/common/imagpcx.cpp:485

 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 不能分配内存"
 
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 不能分配内存"
 


@@ -2847,7 +3139,8 @@ msgstr "PCX: 无效图像"
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是PCX文件."
 
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是PCX文件."
 

-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:464
+#: ../src/common/imagpcx.cpp:486

 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 


@@ -2855,24 +3148,130 @@ msgstr "PCX: 未知错误 !!!"
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 

-#: ../src/common/imagpnm.cpp:96
+#: ../src/common/imagpnm.cpp:92

 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 不能分配内存."
 
 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 不能分配内存."
 

-#: ../src/common/imagpnm.cpp:80
+#: ../src/common/imagpnm.cpp:76

 msgid "PNM: File format is not recognized."
 msgstr "PNM: 不能识别的文件格式."
 
 msgid "PNM: File format is not recognized."
 msgstr "PNM: 不能识别的文件格式."
 

-#: ../src/common/imagpnm.cpp:112
+#: ../src/common/imagpnm.cpp:108
+#: ../src/common/imagpnm.cpp:125
+#: ../src/common/imagpnm.cpp:142

 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 

-#: ../src/common/prntbase.cpp:1247
+#: ../src/common/paper.cpp:194
+msgid "PRC 16K 146 x 215 mm"
+msgstr "中国 16开 纸, 146 x 215 毫米"
+
+#: ../src/common/paper.cpp:207
+msgid "PRC 16K Rotated"
+msgstr "中国 16开 纸张(横向)"
+
+#: ../src/common/paper.cpp:195
+msgid "PRC 32K 97 x 151 mm"
+msgstr "中国 32开 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:208
+msgid "PRC 32K Rotated"
+msgstr "中国 32开 纸张(横向)"
+
+#: ../src/common/paper.cpp:196
+msgid "PRC 32K(Big) 97 x 151 mm"
+msgstr "中国 32开(大) 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:209
+msgid "PRC 32K(Big) Rotated"
+msgstr "中国 32开(大) 纸张(横向)"
+
+#: ../src/common/paper.cpp:197
+msgid "PRC Envelope #1 102 x 165 mm"
+msgstr "中国标准信封1#, 102 x 165 毫米"
+
+#: ../src/common/paper.cpp:210
+msgid "PRC Envelope #1 Rotated 165 x 102 mm"
+msgstr "中国标准信封1#(横向), 165 x 102 毫米"
+
+#: ../src/common/paper.cpp:206
+msgid "PRC Envelope #10 324 x 458 mm"
+msgstr "中国标准信封10#, 324 x 458 毫米"
+
+#: ../src/common/paper.cpp:219
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中国标准信封10#(横向), 458 x 324 毫米"
+
+#: ../src/common/paper.cpp:198
+msgid "PRC Envelope #2 102 x 176 mm"
+msgstr "中国标准信封2#, 102 x 176 毫米"
+
+#: ../src/common/paper.cpp:211
+msgid "PRC Envelope #2 Rotated 176 x 102 mm"
+msgstr "中国标准信封2#(横向), 176 x 102 毫米"
+
+#: ../src/common/paper.cpp:199
+msgid "PRC Envelope #3 125 x 176 mm"
+msgstr "中国标准信封3#, 125 x 176 毫米"
+
+#: ../src/common/paper.cpp:212
+msgid "PRC Envelope #3 Rotated 176 x 125 mm"
+msgstr "中国标准信封3#(横向), 176 x 125 毫米"
+
+#: ../src/common/paper.cpp:200
+msgid "PRC Envelope #4 110 x 208 mm"
+msgstr "中国标准信封4#, 110 x 208 毫米"
+
+#: ../src/common/paper.cpp:213
+msgid "PRC Envelope #4 Rotated 208 x 110 mm"
+msgstr "中国标准信封4#(横向), 208 x 110 毫米"
+
+#: ../src/common/paper.cpp:201
+msgid "PRC Envelope #5 110 x 220 mm"
+msgstr "中国标准信封5#, 110 x 220 毫米"
+
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #5 Rotated 220 x 110 mm"
+msgstr "中国标准信封5#(横向), 220 x 110 毫米"
+
+#: ../src/common/paper.cpp:202
+msgid "PRC Envelope #6 120 x 230 mm"
+msgstr "中国标准信封6#, 120 x 230 毫米"
+
+#: ../src/common/paper.cpp:215
+msgid "PRC Envelope #6 Rotated 230 x 120 mm"
+msgstr "中国标准信封6#(横向), 230 x 120 毫米"
+
+#: ../src/common/paper.cpp:203
+msgid "PRC Envelope #7 160 x 230 mm"
+msgstr "中国标准信封7#, 160 x 230 毫米"
+
+#: ../src/common/paper.cpp:216
+msgid "PRC Envelope #7 Rotated 230 x 160 mm"
+msgstr "中国标准信封7#(横向), 230 x 160 毫米"
+
+#: ../src/common/paper.cpp:204
+msgid "PRC Envelope #8 120 x 309 mm"
+msgstr "中国标准信封8#, 120 x 309 毫米"
+
+#: ../src/common/paper.cpp:217
+msgid "PRC Envelope #8 Rotated 309 x 120 mm"
+msgstr "中国标准信封8#(横向), 309 x 120 毫米"
+
+#: ../src/common/paper.cpp:205
+msgid "PRC Envelope #9 229 x 324 mm"
+msgstr "中国标准信封9#, 229 x 324 毫米"
+
+#: ../src/common/paper.cpp:218
+msgid "PRC Envelope #9 Rotated 324 x 229 mm"
+msgstr "中国标准信封9#(横向), 324 x 229 毫米"
+
+#: ../src/common/prntbase.cpp:1294

 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 

-#: ../src/common/prntbase.cpp:1245
+#: ../src/common/prntbase.cpp:1292

 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"


@@ -2881,7 +3280,8 @@ msgstr "页 %d / %d"
 msgid "Page Setup"
 msgstr "页面设置"
 
 msgid "Page Setup"
 msgstr "页面设置"
 

-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533
+#: ../src/common/prntbase.cpp:451
+#: ../src/gtk/gnome/gprint.cpp:540

 msgid "Page setup"
 msgstr "页面设置"
 
 msgid "Page setup"
 msgstr "页面设置"
 


@@ -2889,12 +3289,14 @@ msgstr "页面设置"
 msgid "Pages"
 msgstr "页"
 
 msgid "Pages"
 msgstr "页"
 

-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:800
+#: ../src/generic/prntdlgg.cpp:854

 #: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
 msgstr "纸张大小"
 
 #: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
 msgstr "纸张大小"
 

-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
+#: ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:841

 #: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper size"
 msgstr "纸张大小"
 #: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper size"
 msgstr "纸张大小"


@@ -2907,11 +3309,12 @@ msgstr "传递一个已注册的对象给SetObject"
 msgid "Passing a already registered object to SetObjectName"
 msgstr "传递一个已注册的对象给SetObjectName"
 
 msgid "Passing a already registered object to SetObjectName"
 msgstr "传递一个已注册的对象给SetObjectName"
 

-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+#: ../src/common/xtistrm.cpp:436
+#: ../src/common/xtistrm.cpp:656

 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/generic/filedlgg.cpp:444
+#: ../src/generic/filedlgg.cpp:437

 msgid "Permissions"
 msgstr "允许"
 
 msgid "Permissions"
 msgstr "允许"
 


@@ -2923,7 +3326,7 @@ msgstr "管道创建失败"
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 

-#: ../src/generic/filedlgg.cpp:1330
+#: ../src/generic/filedlgg.cpp:1325

 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 


@@ -2931,18 +3334,18 @@ msgstr "请选择一个已存在的文件."
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 

-#: ../src/msw/dialup.cpp:750
+#: ../src/msw/dialup.cpp:787

 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 

-#: ../src/msw/listctrl.cpp:434
+#: ../src/msw/listctrl.cpp:444

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""

-"请安装一个新版本的comctl32.dll\n"
+"请安装较新版本的comctl32.dll\n"

 "(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
 "否则此程序无法正确运行."
 
 "(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
 "否则此程序无法正确运行."
 


@@ -2950,7 +3353,8 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 
 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 

-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/generic/prntdlgg.cpp:608
+#: ../src/generic/prntdlgg.cpp:866

 msgid "Portrait"
 msgstr "纵向"
 
 msgid "Portrait"
 msgstr "纵向"
 


@@ -2958,7 +3362,8 @@ msgstr "纵向"
 msgid "PostScript file"
 msgstr "PostScript文件"
 
 msgid "PostScript file"
 msgstr "PostScript文件"
 

-#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
+#: ../src/generic/fontdlgg.cpp:348
+#: ../src/html/helpfrm.cpp:1235

 msgid "Preview:"
 msgstr "预览:"
 
 msgid "Preview:"
 msgstr "预览:"
 


@@ -2966,17 +3371,20 @@ msgstr "预览:"
 msgid "Previous page"
 msgstr "前页"
 
 msgid "Previous page"
 msgstr "前页"
 

-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
-#: ../src/gtk/gnome/gprint.cpp:400
+#: ../src/common/prntbase.cpp:393
+#: ../src/generic/prntdlgg.cpp:138
+#: ../src/generic/prntdlgg.cpp:151
+#: ../src/gtk/gnome/gprint.cpp:395
+#: ../src/gtk/gnome/gprint.cpp:407

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: ../src/common/docview.cpp:1045
+#: ../src/common/docview.cpp:1032

 msgid "Print Preview"
 msgstr "打印预览"
 
 msgid "Print Preview"
 msgstr "打印预览"
 

-#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225
+#: ../src/common/prntbase.cpp:1246
+#: ../src/common/prntbase.cpp:1272

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 


@@ -2996,7 +3404,7 @@ msgstr "彩色打印"
 msgid "Print previe&w"
 msgstr "打印预览(&w)"
 
 msgid "Print previe&w"
 msgstr "打印预览(&w)"
 

-#: ../src/gtk/gnome/gprint.cpp:778
+#: ../src/gtk/gnome/gprint.cpp:785

 msgid "Print preview"
 msgstr "打印预览"
 
 msgid "Print preview"
 msgstr "打印预览"
 


@@ -3036,7 +3444,8 @@ msgstr "打印机..."
 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../src/common/prntbase.cpp:310
+#: ../src/common/prntbase.cpp:531

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 


@@ -3053,26 +3462,25 @@ msgstr "正在打印页 %d..."
 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../src/common/debugrpt.cpp:524
+#: ../src/common/debugrpt.cpp:546

 #, c-format
 #, c-format

-msgid ""
-"Processing debug report has failed, leaving the files in \"%s\" directory."
-msgstr ""
-"处理调试报告失败, 文件被保存在目录 \"%s\" 中."
+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."

 
 #: ../src/common/log.cpp:466
 msgid "Program aborted."
 msgstr "程序终止."
 
 
 #: ../src/common/log.cpp:466
 msgid "Program aborted."
 msgstr "程序终止."
 

-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:119

 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

-#: ../src/generic/logg.cpp:1166
+#: ../src/generic/logg.cpp:1165

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

-#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
+#: ../src/common/ffile.cpp:125
+#: ../src/common/ffile.cpp:144

 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"


@@ -3081,7 +3489,7 @@ msgstr "读文件 '%s'出错"
 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../src/xrc/xmlres.cpp:582
+#: ../src/xrc/xmlres.cpp:643

 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "ref=\"%s\"的引用对象节点不存在!"
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "ref=\"%s\"的引用对象节点不存在!"


@@ -3090,17 +3498,17 @@ msgstr "ref=\"%s\"的引用对象节点不存在!"
 msgid "Refresh"
 msgstr "刷新"
 
 msgid "Refresh"
 msgstr "刷新"
 

-#: ../src/msw/registry.cpp:552
+#: ../src/msw/registry.cpp:560

 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 

-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:529

 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在, 不能改名."
 
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在, 不能改名."
 

-#: ../src/msw/registry.cpp:653
+#: ../src/msw/registry.cpp:661

 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"


@@ -3111,7 +3519,7 @@ msgstr ""
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 

-#: ../src/msw/registry.cpp:448
+#: ../src/msw/registry.cpp:456

 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."


@@ -3132,7 +3540,7 @@ msgstr "移除"
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 

-#: ../src/common/rendcmn.cpp:193
+#: ../src/common/rendcmn.cpp:196

 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."


@@ -3149,7 +3557,7 @@ msgstr "全部替换(&a)"
 msgid "Replace with:"
 msgstr "替换为:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 

-#: ../src/xrc/xmlres.cpp:418
+#: ../src/xrc/xmlres.cpp:479

 msgid "Resource files must have same version number!"
 msgstr "资源文件必须有相同的版本号!"
 
 msgid "Resource files must have same version number!"
 msgstr "资源文件必须有相同的版本号!"
 


@@ -3165,7 +3573,7 @@ msgstr "右边距 (毫米):"
 msgid "Roman"
 msgstr "罗马"
 
 msgid "Roman"
 msgstr "罗马"
 

-#: ../src/common/sizer.cpp:1841
+#: ../src/common/sizer.cpp:1838

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 


@@ -3182,7 +3590,7 @@ msgstr "另存为(&A)..."
 msgid "Save as"
 msgstr "另存为"
 
 msgid "Save as"
 msgstr "另存为"
 

-#: ../src/generic/logg.cpp:508
+#: ../src/generic/logg.cpp:505

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 


@@ -3190,19 +3598,18 @@ msgstr "把日志内容保存到文件"
 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/html/helpfrm.cpp:536
+#: ../src/html/helpfrm.cpp:551

 msgid "Search"
 msgstr "搜索"
 
 #: ../src/html/helpfrm.cpp:538
 msgid "Search"
 msgstr "搜索"
 
 #: ../src/html/helpfrm.cpp:538

-msgid ""
-"Search contents of help book(s) for all occurences of the text you typed "
-"above"
+msgid "Search contents of help book(s) for all occurences of the text you typed above"

 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:166
 msgid "Search direction"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:166
 msgid "Search direction"

-msgstr "搜索目录"
+msgstr "搜索方向"

 
 #: ../src/generic/fdrepdlg.cpp:118
 msgid "Search for:"
 
 #: ../src/generic/fdrepdlg.cpp:118
 msgid "Search for:"


@@ -3210,13 +3617,13 @@ msgstr "搜索:"
 
 #: ../src/html/helpfrm.cpp:1060
 msgid "Search in all books"
 
 #: ../src/html/helpfrm.cpp:1060
 msgid "Search in all books"

-msgstr "在索引书中搜索"
+msgstr "搜索所有的书籍"

 
 #: ../src/html/helpfrm.cpp:868
 msgid "Searching..."
 
 #: ../src/html/helpfrm.cpp:868
 msgid "Searching..."

-msgstr "搜索..."
+msgstr "搜索中..."

 
 

-#: ../src/generic/dirctrlg.cpp:584
+#: ../src/generic/dirctrlg.cpp:592

 msgid "Sections"
 msgstr "段"
 
 msgid "Sections"
 msgstr "段"
 


@@ -3230,22 +3637,27 @@ msgstr "文件 '%s'定位错误"
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 

-#: ../src/msw/textctrl.cpp:2069
+#: ../src/mac/carbon/textctrl.cpp:1078
+#: ../src/msw/textctrl.cpp:2068

 msgid "Select &All"
 msgid "Select &All"

-msgstr "选择所有(&A)"
+msgstr "全部选择(&A)"

 
 

-#: ../src/common/docview.cpp:1712
+#: ../src/common/docview.cpp:1699

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1789
+#: ../src/common/docview.cpp:1776

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/common/docview.cpp:1592
+#: ../src/common/docview.cpp:1579

 msgid "Select a file"
 msgstr "选择文件"
 
 msgid "Select a file"
 msgstr "选择文件"
 

+#: ../src/motif/filedlg.cpp:226
+msgid "Selection"
+msgstr "选段"
+

 #: ../src/common/cmdline.cpp:739
 #, c-format
 msgid "Separator expected after the option '%s'."
 #: ../src/common/cmdline.cpp:739
 #, c-format
 msgid "Separator expected after the option '%s'."


@@ -3259,23 +3671,24 @@ msgstr "调用SetProperty时未带有效的setter"
 msgid "Setup..."
 msgstr "设置..."
 
 msgid "Setup..."
 msgstr "设置..."
 

-#: ../src/msw/dialup.cpp:530
+#: ../src/msw/dialup.cpp:567

 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 #: ../src/html/helpfrm.cpp:493
 msgid "Show all"
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 #: ../src/html/helpfrm.cpp:493
 msgid "Show all"

-msgstr "显示所有"
+msgstr "全部显示"

 
 #: ../src/html/helpfrm.cpp:504
 msgid "Show all items in index"
 
 #: ../src/html/helpfrm.cpp:504
 msgid "Show all items in index"

-msgstr "把所有项目显示为索引"
+msgstr "以索引方式显示所有项目"

 
 

-#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
+#: ../src/generic/dirdlgg.cpp:112
+#: ../src/generic/dirdlgg.cpp:175

 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/generic/filedlgg.cpp:1064
+#: ../src/generic/filedlgg.cpp:1056

 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 
 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 


@@ -3283,15 +3696,17 @@ msgstr "显示隐藏文件"
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/generic/fontdlgg.cpp:353
+#: ../src/generic/fontdlgg.cpp:355

 msgid "Shows the font preview."
 msgstr "显示字体预览."
 
 msgid "Shows the font preview."
 msgstr "显示字体预览."
 

-#: ../src/generic/filedlgg.cpp:439
+#: ../src/generic/filedlgg.cpp:432

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
+#: ../src/generic/progdlgg.cpp:222
+#: ../src/generic/progdlgg.cpp:240

 #: ../src/generic/progdlgg.cpp:598
 msgid "Skip"
 msgstr "跳过"
 #: ../src/generic/progdlgg.cpp:598
 msgid "Skip"
 msgstr "跳过"


@@ -3304,8 +3719,8 @@ msgstr "倾斜"
 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 
 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 

-#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
-#: ../src/common/docview.cpp:1611
+#: ../src/common/docview.cpp:617
+#: ../src/common/docview.cpp:1598

 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 
 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 


@@ -3313,15 +3728,16 @@ msgstr "对不起, 不能打开文件."
 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 
 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 

-#: ../src/common/prntbase.cpp:1199
+#: ../src/common/prntbase.cpp:1246

 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 

-#: ../src/common/docview.cpp:1041
+#: ../src/common/docview.cpp:1028

 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "对不起, 需要先安装打印机才能创建打印预览."
 
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "对不起, 需要先安装打印机才能创建打印预览."
 

-#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631
+#: ../src/common/docview.cpp:1268
+#: ../src/common/docview.cpp:1618

 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 


@@ -3334,7 +3750,7 @@ msgstr "声音数据为不支持的格式."
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s'为不支持的格式."
 
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s'为不支持的格式."
 

-#: ../src/common/paper.cpp:118
+#: ../src/common/paper.cpp:111

 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 


@@ -3342,55 +3758,77 @@ msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 msgid "Status:"
 msgstr "状态:"
 
 msgid "Status:"
 msgstr "状态:"
 

-#: ../src/generic/logg.cpp:625
+#: ../src/generic/logg.cpp:622

 msgid "Status: "
 msgstr "状态: "
 
 #: ../src/common/xtistrm.cpp:253
 msgid "Status: "
 msgstr "状态: "
 
 #: ../src/common/xtistrm.cpp:253

-#, fuzzy

 msgid "Streaming delegates for not already streamed objects not yet supported"
 msgstr "不支持针对尚未形成流的对象的流委派"
 
 msgid "Streaming delegates for not already streamed objects not yet supported"
 msgstr "不支持针对尚未形成流的对象的流委派"
 

-#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#: ../src/msw/colour.cpp:38
+#: ../src/palmos/colour.cpp:38

 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+#: ../include/wx/xti.h:428
+#: ../include/wx/xti.h:432

 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 
 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 

-#: ../src/xrc/xmlres.cpp:689
+#: ../src/xrc/xmlres.cpp:750

 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 

+#: ../src/common/paper.cpp:157
+msgid "SuperA/SuperA/A4 227 x 356 mm"
+msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"
+
+#: ../src/common/paper.cpp:158
+msgid "SuperB/SuperB/A3 305 x 487 mm"
+msgstr "SuperB/SuperB/A3 纸张, 305 x 487 毫米"
+

 #: ../src/generic/fontdlgg.cpp:230
 msgid "Swiss"
 msgstr "瑞士"
 
 #: ../src/generic/fontdlgg.cpp:230
 msgid "Swiss"
 msgstr "瑞士"
 

-#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
-#: ../src/common/imagtiff.cpp:383
+#: ../src/common/imagtiff.cpp:165
+msgid "TIFF library error."
+msgstr "TIFF库错误."
+
+#: ../src/common/imagtiff.cpp:149
+msgid "TIFF library warning."
+msgstr "TIFF库警告."
+
+#: ../src/common/imagtiff.cpp:248
+#: ../src/common/imagtiff.cpp:259
+#: ../src/common/imagtiff.cpp:399

 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 不能分配内存."
 
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 不能分配内存."
 

-#: ../src/common/imagtiff.cpp:203
+#: ../src/common/imagtiff.cpp:219

 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误."
 
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误."
 

-#: ../src/common/imagtiff.cpp:254
+#: ../src/common/imagtiff.cpp:270

 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误."
 
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误."
 

-#: ../src/common/imagtiff.cpp:331
+#: ../src/common/imagtiff.cpp:347

 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 

-#: ../src/common/imagtiff.cpp:434
+#: ../src/common/imagtiff.cpp:445

 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 

-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:152
+msgid "Tabloid Extra 11.69 x 18 in"
+msgstr "小报(特大), 11.69 x 18 英寸"
+
+#: ../src/common/paper.cpp:109

 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 


@@ -3398,11 +3836,11 @@ msgstr "小报, 11 x 17 英寸"
 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1713
+#: ../src/common/docview.cpp:1700

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 

-#: ../src/common/fmapbase.cpp:113
+#: ../src/common/fmapbase.cpp:114

 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 


@@ -3430,7 +3868,7 @@ msgstr ""
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在."
 
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在."
 

-#: ../src/generic/dirdlgg.cpp:226
+#: ../src/generic/dirdlgg.cpp:224

 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"


@@ -3439,7 +3877,7 @@ msgstr ""
 "目录 '%s'不存在\n"
 "现在创建?"
 
 "目录 '%s'不存在\n"
 "现在创建?"
 

-#: ../src/common/docview.cpp:1962
+#: ../src/common/docview.cpp:1949

 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"


@@ -3448,7 +3886,7 @@ msgstr ""
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/common/docview.cpp:1972
+#: ../src/common/docview.cpp:1959

 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"


@@ -3457,23 +3895,28 @@ msgstr ""
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+#: ../src/generic/fontdlgg.cpp:316
+#: ../src/generic/fontdlgg.cpp:318

 msgid "The font colour."
 msgstr "字体颜色."
 
 msgid "The font colour."
 msgstr "字体颜色."
 

-#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+#: ../src/generic/fontdlgg.cpp:277
+#: ../src/generic/fontdlgg.cpp:279

 msgid "The font family."
 msgstr "字体."
 
 msgid "The font family."
 msgstr "字体."
 

-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+#: ../src/generic/fontdlgg.cpp:328
+#: ../src/generic/fontdlgg.cpp:330

 msgid "The font point size."
 msgstr "字体大小(磅值)."
 
 msgid "The font point size."
 msgstr "字体大小(磅值)."
 

-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+#: ../src/generic/fontdlgg.cpp:288
+#: ../src/generic/fontdlgg.cpp:290

 msgid "The font style."
 msgstr "字体风格."
 
 msgid "The font style."
 msgstr "字体风格."
 

-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+#: ../src/generic/fontdlgg.cpp:299
+#: ../src/generic/fontdlgg.cpp:301

 msgid "The font weight."
 msgstr "字体粗细."
 
 msgid "The font weight."
 msgstr "字体粗细."
 


@@ -3482,14 +3925,12 @@ msgstr "字体粗细."
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 

-#: ../src/generic/dbgrptg.cpp:289
+#: ../src/generic/dbgrptg.cpp:308

 msgid ""
 msgid ""

-"The report contains the files listed below. If any of these files contain "
-"private information,\n"
+"The report contains the files listed below. If any of these files contain private information,\n"

 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""

-"报告包含了以下文件. 如果这些文件含有"
-"私人信息, \n"
+"报告包含了以下文件. 如果这些文件含有私人信息, \n"

 "请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
 
 #: ../src/common/cmdline.cpp:883
 "请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
 
 #: ../src/common/cmdline.cpp:883


@@ -3506,49 +3947,40 @@ msgstr "文本不能被保存."
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s'的值必须被指定."
 
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s'的值必须被指定."
 

-#: ../src/msw/dialup.cpp:418
+#: ../src/msw/dialup.cpp:455

 #, c-format
 #, c-format

-msgid ""
-"The version of remote access service (RAS) installed on this machine is "
-"tooold, please upgrade (the following required function is missing: %s)."
+msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."

 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 
 #: ../src/html/htmprint.cpp:601
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 
 #: ../src/html/htmprint.cpp:601

-msgid ""
-"There was a problem during page setup: you may need to set a default printer."
-msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
+msgid "There was a problem during page setup: you may need to set a default printer."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机."

 
 #: ../src/msw/datectrl.cpp:109
 
 #: ../src/msw/datectrl.cpp:109

-msgid ""
-"This system doesn't support date picker control, please upgrade your version "
-"of comctl32.dll"
+msgid "This system doesn't support date picker control, please upgrade your version of comctl32.dll"

 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1204
-msgid ""
-"Thread module initialization failed: can not store value in thread local "
-"storage"
+#: ../src/msw/thread.cpp:1206
+msgid "Thread module initialization failed: can not store value in thread local storage"

 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
 #: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
 #: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 

-#: ../src/msw/thread.cpp:1192
-msgid ""
-"Thread module initialization failed: impossible to allocate index in thread "
-"local storage"
+#: ../src/msw/thread.cpp:1194
+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"

 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
 #: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 

-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:184

 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 
 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 

-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:185

 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 


@@ -3556,7 +3988,8 @@ msgstr "垂直排布(&V)"
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 

-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/msw/timer.cpp:116
+#: ../src/os2/timer.cpp:141

 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 
 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 


@@ -3585,26 +4018,28 @@ msgstr "上页边距 (毫米):"
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 

-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
+#: ../src/common/sckaddr.cpp:146
+#: ../src/common/sckaddr.cpp:250

 msgid "Trying to solve a NULL hostname: giving up"
 msgid "Trying to solve a NULL hostname: giving up"

-msgstr "试图解决 NULL 主机名: 放弃"
+msgstr "试图解析 NULL 主机名: 放弃"

 
 

-#: ../src/common/fmapbase.cpp:111
+#: ../src/common/fmapbase.cpp:112

 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 

-#: ../src/generic/filedlgg.cpp:440
+#: ../src/generic/filedlgg.cpp:433

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:281
+#: ../src/common/xtixml.cpp:351

 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 

-#: ../src/common/paper.cpp:147
+#: ../src/common/paper.cpp:140

 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgid "US Std Fanfold, 14 7/8 x 11 in"

-msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿, 14 7/8 x 11 英寸"

 
 #: ../src/html/htmlwin.cpp:403
 #, c-format
 
 #: ../src/html/htmlwin.cpp:403
 #, c-format


@@ -3631,7 +4066,6 @@ msgstr "取消删除"
 #: ../contrib/src/deprecated/resource.cpp:3084
 #: ../contrib/src/deprecated/resource.cpp:3101
 #: ../contrib/src/deprecated/resource.cpp:3115
 #: ../contrib/src/deprecated/resource.cpp:3084
 #: ../contrib/src/deprecated/resource.cpp:3101
 #: ../contrib/src/deprecated/resource.cpp:3115

-#, fuzzy

 msgid "Unexpected end of file while parsing resource."
 msgstr "在解析资源时意外到达文件结尾."
 
 msgid "Unexpected end of file while parsing resource."
 msgstr "在解析资源时意外到达文件结尾."
 


@@ -3640,39 +4074,39 @@ msgstr "在解析资源时意外到达文件结尾."
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 

-#: ../src/common/fmapbase.cpp:135
+#: ../src/common/fmapbase.cpp:137

 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的Unicode编码 (UTF-16)"
 
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的Unicode编码 (UTF-16)"
 

-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:138

 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 

-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:139

 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 

-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:140

 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的Unicode编码 (UTF-32)"
 
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的Unicode编码 (UTF-32)"
 

-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:141

 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 

-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:142

 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 

-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:135

 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的Unicode编码 (UTF-7)"
 
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的Unicode编码 (UTF-7)"
 

-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:136

 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的Unicode编码 (UTF-8)"
 
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的Unicode编码 (UTF-8)"
 

-#: ../src/msw/dde.cpp:1092
+#: ../src/msw/dde.cpp:1093

 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"


@@ -3685,7 +4119,7 @@ msgstr "未知的对象被传递给GetObjectClassInfo"
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

-#: ../src/common/fmapbase.cpp:688
+#: ../src/common/fmapbase.cpp:695

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"


@@ -3696,54 +4130,58 @@ msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "在文件 %s, 行 %d是未知字段: '%s'."
 
 #: ../src/common/cmdline.cpp:599
 msgstr "在文件 %s, 行 %d是未知字段: '%s'."
 
 #: ../src/common/cmdline.cpp:599

-#, fuzzy, c-format
+#, c-format

 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 

-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/common/cmdline.cpp:608
+#: ../src/common/cmdline.cpp:629

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 

-#: ../src/xrc/xmlres.cpp:762
+#: ../src/xrc/xmlres.cpp:823

 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 
 #: ../src/common/xtixml.cpp:324
 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 
 #: ../src/common/xtixml.cpp:324

-#, fuzzy, c-format
+#, c-format

 msgid "Unkown Property %s"
 msgstr "未知属性 %s"
 
 msgid "Unkown Property %s"
 msgstr "未知属性 %s"
 

-#: ../src/common/mimecmn.cpp:161
+#: ../src/common/mimecmn.cpp:163

 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 

-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:261
+#: ../src/common/cmdproc.cpp:287

 #: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 #: ../contrib/src/deprecated/resource.cpp:2367
 #: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 #: ../contrib/src/deprecated/resource.cpp:2367

-#, fuzzy, c-format
+#, c-format

 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 
 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 

-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/mac/carbon/clipbrd.cpp:68
+#: ../src/mac/classic/clipbrd.cpp:64
+#: ../src/msw/clipbrd.cpp:273
+#: ../src/msw/clipbrd.cpp:445

 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 
 #: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 
 #: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."

-msgstr "不支持的主题(theme) '%s'."
+msgstr "不支持的主题 '%s'."

 
 #: ../src/generic/fdrepdlg.cpp:158
 msgid "Up"
 msgstr "向上"
 
 
 #: ../src/generic/fdrepdlg.cpp:158
 msgid "Up"
 msgstr "向上"
 

-#: ../src/common/cmdline.cpp:953
+#: ../src/common/cmdline.cpp:954

 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"


@@ -3756,15 +4194,15 @@ msgstr "验证冲突"
 msgid "Video Output"
 msgstr "视频输出"
 
 msgid "Video Output"
 msgstr "视频输出"
 

-#: ../src/generic/filedlgg.cpp:980
+#: ../src/generic/filedlgg.cpp:972

 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 

-#: ../src/generic/filedlgg.cpp:973
+#: ../src/generic/filedlgg.cpp:965

 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 

-#: ../src/common/docview.cpp:1790
+#: ../src/common/docview.cpp:1777

 msgid "Views"
 msgstr "视图"
 
 msgid "Views"
 msgstr "视图"
 


@@ -3780,19 +4218,20 @@ msgstr "警告"
 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 

-#: ../src/html/htmlpars.cpp:395
+#: ../src/html/htmlpars.cpp:391

 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告: 试图从空栈中移去HTML标签处理器."
 
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告: 试图从空栈中移去HTML标签处理器."
 

-#: ../src/common/fmapbase.cpp:103
+#: ../src/common/fmapbase.cpp:104

 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 

-#: ../src/common/fmapbase.cpp:117
+#: ../src/common/fmapbase.cpp:118

 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧(带欧元符号) (ISO-8859-15)"
 
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧(带欧元符号) (ISO-8859-15)"
 

-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:339
+#: ../src/generic/fontdlgg.cpp:341

 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 


@@ -3808,104 +4247,108 @@ msgstr "仅为整字"
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 

-#: ../src/msw/utils.cpp:1096
+#: ../src/msw/utils.cpp:1063

 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1上的Win32s"
 
 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1上的Win32s"
 

-#: ../src/msw/utils.cpp:1145
+#: ../src/msw/utils.cpp:1112

 #, c-format
 msgid "Windows 2000 (build %lu"
 msgstr "Windows 2000 (build %lu"
 
 #, c-format
 msgid "Windows 2000 (build %lu"
 msgstr "Windows 2000 (build %lu"
 

-#: ../src/msw/utils.cpp:1110
+#: ../src/msw/utils.cpp:1077

 msgid "Windows 95"
 msgstr "Windows 95"
 
 msgid "Windows 95"
 msgstr "Windows 95"
 

-#: ../src/msw/utils.cpp:1106
+#: ../src/msw/utils.cpp:1073

 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 

-#: ../src/msw/utils.cpp:1121
+#: ../src/msw/utils.cpp:1088

 msgid "Windows 98"
 msgstr "Windows 98"
 
 msgid "Windows 98"
 msgstr "Windows 98"
 

-#: ../src/msw/utils.cpp:1117
+#: ../src/msw/utils.cpp:1084

 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 

-#: ../src/msw/utils.cpp:1128
+#: ../src/msw/utils.cpp:1095

 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:132

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 

-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:133

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 

-#: ../src/common/fmapbase.cpp:124
+#: ../src/common/fmapbase.cpp:126

 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 

-#: ../src/common/fmapbase.cpp:121
+#: ../src/common/fmapbase.cpp:123

 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "Windows 简体中文 (CP 936)"
 
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "Windows 简体中文 (CP 936)"
 

-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:125

 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows 繁体中文 (CP 950)"
 
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows 繁体中文 (CP 950)"
 

-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:127

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 

-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:129

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 

-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:131

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 

-#: ../src/common/fmapbase.cpp:120
+#: ../src/common/fmapbase.cpp:122

 msgid "Windows Japanese (CP 932)"
 msgstr "Windows 日语 (CP 932)"
 
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows 日语 (CP 932)"
 

-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:124

 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 

-#: ../src/msw/utils.cpp:1125
+#: ../src/msw/utils.cpp:1092

 msgid "Windows ME"
 msgstr "Windows ME"
 
 msgid "Windows ME"
 msgstr "Windows ME"
 

-#: ../src/msw/utils.cpp:1160
+#: ../src/msw/utils.cpp:1127

 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 
 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 

-#: ../src/msw/utils.cpp:1153
+#: ../src/msw/utils.cpp:1120

 #, c-format
 msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (build %lu"
 
 #, c-format
 msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (build %lu"
 

-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:121
+msgid "Windows Thai (CP 874)"
+msgstr "Windows 泰国语 (CP 874)"
+
+#: ../src/common/fmapbase.cpp:130

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 

-#: ../src/common/fmapbase.cpp:126
+#: ../src/common/fmapbase.cpp:128

 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 

-#: ../src/msw/utils.cpp:1149
+#: ../src/msw/utils.cpp:1116

 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 
 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 

-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:134

 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 


@@ -3923,33 +4366,37 @@ msgstr "XML解析错误: '%s' 位于 行 %d"
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 

-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
+#: ../src/common/xpmdecod.cpp:712
+#: ../src/common/xpmdecod.cpp:721

 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: 错误的颜色定义 '%s'!"
 
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: 错误的颜色定义 '%s'!"
 

-#: ../src/xrc/xmlres.cpp:518
+#: ../src/xrc/xmlres.cpp:579

 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 

-#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031
+#: ../src/xrc/xmlres.cpp:1080
+#: ../src/xrc/xmlres.cpp:1092

 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC资源: 不能从 '%s'创建位图."
 
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC资源: 不能从 '%s'创建位图."
 

-#: ../src/xrc/xmlres.cpp:975
+#: ../src/xrc/xmlres.cpp:1036

 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 

-#: ../src/mac/carbon/msgdlg.cpp:61 ../src/mac/carbon/msgdlg.cpp:144
-#: ../src/mac/classic/msgdlg.cpp:59 ../src/mac/classic/msgdlg.cpp:141
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/mac/carbon/msgdlg.cpp:59
+#: ../src/mac/carbon/msgdlg.cpp:142
+#: ../src/mac/classic/msgdlg.cpp:57
+#: ../src/mac/classic/msgdlg.cpp:139
+#: ../src/motif/msgdlg.cpp:204

 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 

-#: ../src/generic/dirdlgg.cpp:308
+#: ../src/generic/dirdlgg.cpp:306

 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 
 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 


@@ -3965,18 +4412,17 @@ msgstr "缩小(&O)"
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 

-#: ../src/common/docview.cpp:2146
+#: ../src/common/docview.cpp:2133

 msgid "[EMPTY]"
 msgstr "[空]"
 
 msgid "[EMPTY]"
 msgstr "[空]"
 

-#: ../src/msw/dde.cpp:1059
+#: ../src/msw/dde.cpp:1060

 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML应用程序已创建延时race条件."
 
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML应用程序已创建延时race条件."
 

-#: ../src/msw/dde.cpp:1047
+#: ../src/msw/dde.cpp:1048

 msgid ""
 msgid ""

-"a DDEML function was called without first calling the DdeInitialize "
-"function,\n"
+"a DDEML function was called without first calling the DdeInitialize function,\n"

 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""


@@ -3984,39 +4430,39 @@ msgstr ""
 "或传给DDEML函数的是\n"
 "无效的实例标识."
 
 "或传给DDEML函数的是\n"
 "无效的实例标识."
 

-#: ../src/msw/dde.cpp:1065
+#: ../src/msw/dde.cpp:1066

 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败."
 
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败."
 

-#: ../src/msw/dde.cpp:1062
+#: ../src/msw/dde.cpp:1063

 msgid "a memory allocation failed."
 msgstr "内存分配失败."
 
 msgid "a memory allocation failed."
 msgstr "内存分配失败."
 

-#: ../src/msw/dde.cpp:1056
+#: ../src/msw/dde.cpp:1057

 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML参数验证失败."
 
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML参数验证失败."
 

-#: ../src/msw/dde.cpp:1038
+#: ../src/msw/dde.cpp:1039

 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步advise事务请求已超时."
 
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步advise事务请求已超时."
 

-#: ../src/msw/dde.cpp:1044
+#: ../src/msw/dde.cpp:1045

 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步data事务请求已超时."
 
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步data事务请求已超时."
 

-#: ../src/msw/dde.cpp:1053
+#: ../src/msw/dde.cpp:1054

 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步execute事务请求已超时."
 
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步execute事务请求已超时."
 

-#: ../src/msw/dde.cpp:1071
+#: ../src/msw/dde.cpp:1072

 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步poke事务请求已超时."
 
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步poke事务请求已超时."
 

-#: ../src/msw/dde.cpp:1086
+#: ../src/msw/dde.cpp:1087

 msgid "a request to end an advise transaction has timed out."
 msgstr "终止advise事务的请求已超时."
 
 msgid "a request to end an advise transaction has timed out."
 msgstr "终止advise事务的请求已超时."
 

-#: ../src/msw/dde.cpp:1080
+#: ../src/msw/dde.cpp:1081

 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"


@@ -4026,7 +4472,7 @@ msgstr ""
 "已被客户端终止的会话, 或服务器\n"
 "在完成事务前终止."
 
 "已被客户端终止的会话, 或服务器\n"
 "在完成事务前终止."
 

-#: ../src/msw/dde.cpp:1068
+#: ../src/msw/dde.cpp:1069

 msgid "a transaction failed."
 msgstr "事务失败."
 
 msgid "a transaction failed."
 msgstr "事务失败."
 


@@ -4034,7 +4480,7 @@ msgstr "事务失败."
 msgid "alt"
 msgstr "alt"
 
 msgid "alt"
 msgstr "alt"
 

-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1051

 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"


@@ -4046,15 +4492,15 @@ msgstr ""
 "或初始化为APPCMD_CLIENTONLY的应用程序\n"
 "视图执行服务器事务."
 
 "或初始化为APPCMD_CLIENTONLY的应用程序\n"
 "视图执行服务器事务."
 

-#: ../src/msw/dde.cpp:1074
+#: ../src/msw/dde.cpp:1075

 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用PostMessage失败. "
 
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用PostMessage失败. "
 

-#: ../src/msw/dde.cpp:1083
+#: ../src/msw/dde.cpp:1084

 msgid "an internal error has occurred in the DDEML."
 msgstr "在DDEML中发生内部错误."
 
 msgid "an internal error has occurred in the DDEML."
 msgstr "在DDEML中发生内部错误."
 

-#: ../src/msw/dde.cpp:1089
+#: ../src/msw/dde.cpp:1090

 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"


@@ -4064,12 +4510,12 @@ msgstr ""
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 

-#: ../src/common/zipstrm.cpp:1331
+#: ../src/common/zipstrm.cpp:1330

 #, fuzzy
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是分段的zip文件"
 
 #, fuzzy
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是分段的zip文件"
 

-#: ../src/common/fileconf.cpp:1819
+#: ../src/common/fileconf.cpp:1847

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."


@@ -4082,7 +4528,7 @@ msgstr "库函数参数错误"
 msgid "bad signature"
 msgstr "错误的签名"
 
 msgid "bad signature"
 msgstr "错误的签名"
 

-#: ../src/common/zipstrm.cpp:1581
+#: ../src/common/zipstrm.cpp:1580

 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 
 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 


@@ -4090,14 +4536,19 @@ msgstr "zip文件中到条目的偏移值错误"
 msgid "binary"
 msgstr "二进制"
 
 msgid "binary"
 msgstr "二进制"
 

-#: ../src/common/fontcmn.cpp:645
+#: ../src/common/fontcmn.cpp:646

 msgid "bold"
 msgstr "粗体"
 
 msgid "bold"
 msgstr "粗体"
 

-#: ../src/common/fontcmn.cpp:569
+#: ../src/common/fontcmn.cpp:570

 msgid "bold "
 msgstr "粗体 "
 
 msgid "bold "
 msgstr "粗体 "
 

+#: ../src/os2/iniconf.cpp:451
+#, fuzzy
+msgid "buffer is too small for Windows directory."
+msgstr "Windows目录的缓存太小."
+

 #: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
 #: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"


@@ -4118,7 +4569,7 @@ msgstr "不能把修改提交给文件 '%s'"
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 

-#: ../src/common/fileconf.cpp:1134
+#: ../src/common/fileconf.cpp:1159

 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"


@@ -4128,8 +4579,13 @@ msgstr "不能删除用户配置文件 '%s'"
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 

-#: ../src/common/zipstrm.cpp:1358
-#, fuzzy
+#: ../src/msdos/utilsdos.cpp:307
+#: ../src/msdos/utilsdos.cpp:466
+#, c-format
+msgid "can't execute '%s'"
+msgstr "执行 '%s'失败"
+
+#: ../src/common/zipstrm.cpp:1357

 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 
 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 


@@ -4138,7 +4594,7 @@ msgstr "不能在zip文件中找到中央目录"
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 

-#: ../src/msw/utils.cpp:376
+#: ../src/msw/utils.cpp:380

 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 


@@ -4147,7 +4603,8 @@ msgstr "找不到用户的HOME目录, 使用当前目录."
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 

-#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
+#: ../src/common/file.cpp:399
+#: ../src/msw/wince/filefnwce.cpp:202

 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "不能获得文件描述子 %d的指针位置"
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "不能获得文件描述子 %d的指针位置"


@@ -4156,7 +4613,8 @@ msgstr "不能获得文件描述子 %d的指针位置"
 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 
 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 

-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/ffile.cpp:75
+#: ../src/common/file.cpp:271

 #, c-format
 msgid "can't open file '%s'"
 msgstr "不能打开文件 '%s'"
 #, c-format
 msgid "can't open file '%s'"
 msgstr "不能打开文件 '%s'"


@@ -4171,7 +4629,7 @@ msgstr "不能打开全局配置文件 '%s'."
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 

-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:1005

 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 
 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 


@@ -4202,7 +4660,8 @@ msgstr "不能删除文件 '%s'"
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 

-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:385
+#: ../src/msw/wince/filefnwce.cpp:189

 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "不能定位文件描述子 %d"
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "不能定位文件描述子 %d"


@@ -4217,11 +4676,11 @@ msgstr "不能把文件 '%s'写到磁盘."
 msgid "can't write to file descriptor %d"
 msgstr "不能写到文件描述子 %d"
 
 msgid "can't write to file descriptor %d"
 msgstr "不能写到文件描述子 %d"
 

-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:1016

 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 
 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 

-#: ../src/common/intl.cpp:1109
+#: ../src/common/intl.cpp:1110

 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."


@@ -4242,7 +4701,7 @@ msgstr "不能转换为8-bit编码"
 msgid "ctrl"
 msgstr "ctrl"
 
 msgid "ctrl"
 msgstr "ctrl"
 

-#: ../src/common/cmdline.cpp:1093
+#: ../src/common/cmdline.cpp:1094

 msgid "date"
 msgstr "日期"
 
 msgid "date"
 msgstr "日期"
 


@@ -4250,7 +4709,8 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730
+#: ../src/common/fmapbase.cpp:705
+#: ../src/common/fmapbase.cpp:737

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 


@@ -4258,19 +4718,19 @@ msgstr "缺省值"
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 

-#: ../src/common/debugrpt.cpp:502
+#: ../src/common/debugrpt.cpp:524

 msgid "dump of the process state (binary)"
 msgstr "转储(dump)进程状态（二进制码）"
 
 msgid "dump of the process state (binary)"
 msgstr "转储(dump)进程状态（二进制码）"
 

-#: ../src/common/datetime.cpp:3779
+#: ../src/common/datetime.cpp:3882

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetime.cpp:3769
+#: ../src/common/datetime.cpp:3872

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetime.cpp:3772
+#: ../src/common/datetime.cpp:3875

 msgid "eleventh"
 msgstr "第十一"
 
 msgid "eleventh"
 msgstr "第十一"
 


@@ -4279,7 +4739,7 @@ msgstr "第十一"
 msgid "encoding %s"
 msgstr "编码 %s"
 
 msgid "encoding %s"
 msgstr "编码 %s"
 

-#: ../src/common/fileconf.cpp:1805
+#: ../src/common/fileconf.cpp:1833

 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s'中已出现一次以上"


@@ -4288,25 +4748,29 @@ msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 msgid "error in data format"
 msgstr "文件格式错误"
 
 msgid "error in data format"
 msgstr "文件格式错误"
 

+#: ../src/msdos/utilsdos.cpp:407
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
+

 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 

-#: ../src/common/zipstrm.cpp:1443
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1442

 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 
 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 

-#: ../src/common/zipstrm.cpp:1521
+#: ../src/common/zipstrm.cpp:1520

 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 
 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 

-#: ../src/common/zipstrm.cpp:2237
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:2236
+#, c-format

 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 

-#: ../src/msw/dialup.cpp:844
+#: ../src/msw/dialup.cpp:881

 msgid "establish"
 msgstr "建立"
 
 msgid "establish"
 msgstr "建立"
 


@@ -4315,23 +4779,23 @@ msgstr "建立"
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 

-#: ../src/common/datetime.cpp:3776
+#: ../src/common/datetime.cpp:3879

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetime.cpp:3766
+#: ../src/common/datetime.cpp:3869

 msgid "fifth"
 msgstr "第五"
 
 #: ../src/common/fileconf.cpp:664
 msgid "fifth"
 msgstr "第五"
 
 #: ../src/common/fileconf.cpp:664

-#, fuzzy, c-format
+#, c-format

 msgid "file '%s', line %d: '%s' ignored after group header."
 msgid "file '%s', line %d: '%s' ignored after group header."

-msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
+msgstr "文件 '%s', 行 %d: 组头之后的 '%s' 被忽略."

 
 #: ../src/common/fileconf.cpp:693
 
 #: ../src/common/fileconf.cpp:693

-#, fuzzy, c-format
+#, c-format

 msgid "file '%s', line %d: '=' expected."
 msgid "file '%s', line %d: '=' expected."

-msgstr "文件 '%s', 行 %d: 期望 '='."
+msgstr "文件 '%s', 行 %d: 期待出现 '='."

 
 #: ../src/common/fileconf.cpp:716
 #, c-format
 
 #: ../src/common/fileconf.cpp:716
 #, c-format


@@ -4348,7 +4812,7 @@ msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 

-#: ../src/common/datetime.cpp:3762
+#: ../src/common/datetime.cpp:3865

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 


@@ -4356,15 +4820,15 @@ msgstr "第一"
 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetime.cpp:3775
+#: ../src/common/datetime.cpp:3878

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetime.cpp:3765
+#: ../src/common/datetime.cpp:3868

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 

-#: ../src/common/appbase.cpp:361
+#: ../src/common/appbase.cpp:367

 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 


@@ -4372,7 +4836,7 @@ msgstr "生成详细的日志信息"
 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串, 缺少点号('.')"
 
 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串, 缺少点号('.')"
 

-#: ../src/msw/dialup.cpp:844
+#: ../src/msw/dialup.cpp:881

 msgid "initiate"
 msgstr "初始化"
 
 msgid "initiate"
 msgstr "初始化"
 


@@ -4380,51 +4844,52 @@ msgstr "初始化"
 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 
 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 

-#: ../src/generic/logg.cpp:1180
+#: ../src/generic/logg.cpp:1179

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 

-#: ../src/common/zipstrm.cpp:1307
+#: ../src/common/zipstrm.cpp:1306

 msgid "invalid zip file"
 msgstr "无效的zip文件"
 
 msgid "invalid zip file"
 msgstr "无效的zip文件"
 

-#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
+#: ../src/common/fontcmn.cpp:586
+#: ../src/common/fontcmn.cpp:650

 msgid "italic"
 msgstr "斜体"
 
 msgid "italic"
 msgstr "斜体"
 

-#: ../src/common/fontcmn.cpp:641
+#: ../src/common/fontcmn.cpp:642

 #, fuzzy
 msgid "light"
 msgstr "细"
 
 #, fuzzy
 msgid "light"
 msgstr "细"
 

-#: ../src/common/fontcmn.cpp:565
+#: ../src/common/fontcmn.cpp:566

 #, fuzzy
 msgid "light "
 msgstr "细 "
 
 #, fuzzy
 msgid "light "
 msgstr "细 "
 

-#: ../src/common/intl.cpp:1455
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1456
+#, c-format

 msgid "locale '%s' can not be set."
 msgid "locale '%s' can not be set."

-msgstr "不能设置现场(locale) '%s'."
+msgstr "不能设置语言(locale) '%s'."

 
 

-#: ../src/common/intl.cpp:1102
+#: ../src/common/intl.cpp:1103

 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "查找目录 '%s' 在路径 '%s'下."
 
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "查找目录 '%s' 在路径 '%s'下."
 

-#: ../src/common/datetime.cpp:3926
+#: ../src/common/datetime.cpp:4029

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetime.cpp:3780
+#: ../src/common/datetime.cpp:3883

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetime.cpp:3770
+#: ../src/common/datetime.cpp:3873

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 

-#: ../src/msw/dde.cpp:1034
+#: ../src/msw/dde.cpp:1035

 msgid "no DDE error."
 msgstr "没有DDE错误."
 
 msgid "no DDE error."
 msgstr "没有DDE错误."
 


@@ -4436,11 +4901,11 @@ msgstr "没有错误"
 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetime.cpp:3925
+#: ../src/common/datetime.cpp:4028

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 

-#: ../src/common/cmdline.cpp:1089
+#: ../src/common/cmdline.cpp:1090

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 


@@ -4452,7 +4917,7 @@ msgstr "对象不能有XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
 msgid "out of memory"
 msgstr "内存耗尽"
 

-#: ../src/common/debugrpt.cpp:478
+#: ../src/common/debugrpt.cpp:500

 msgid "process context description"
 msgstr "进程上下文描述"
 
 msgid "process context description"
 msgstr "进程上下文描述"
 


@@ -4464,21 +4929,21 @@ msgstr "读取错误"
 msgid "reading"
 msgstr "正在读入"
 
 msgid "reading"
 msgstr "正在读入"
 

-#: ../src/common/zipstrm.cpp:1744
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1743
+#, c-format

 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 

-#: ../src/common/zipstrm.cpp:1741
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1740
+#, c-format

 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 

-#: ../src/msw/dde.cpp:1077
+#: ../src/msw/dde.cpp:1078

 msgid "reentrancy problem."
 msgstr "重入问题."
 
 msgid "reentrancy problem."
 msgstr "重入问题."
 

-#: ../src/common/datetime.cpp:3763
+#: ../src/common/datetime.cpp:3866

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 


@@ -4486,11 +4951,11 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetime.cpp:3778
+#: ../src/common/datetime.cpp:3881

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetime.cpp:3768
+#: ../src/common/datetime.cpp:3871

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 


@@ -4498,15 +4963,15 @@ msgstr "第七"
 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appbase.cpp:351
+#: ../src/common/appbase.cpp:357

 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetime.cpp:3777
+#: ../src/common/datetime.cpp:3880

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetime.cpp:3767
+#: ../src/common/datetime.cpp:3870

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 


@@ -4518,61 +4983,62 @@ msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 

-#: ../src/common/zipstrm.cpp:1647
+#: ../src/common/zipstrm.cpp:1646

 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 
 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 

-#: ../src/common/cmdline.cpp:1085
+#: ../src/common/cmdline.cpp:1086

 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/datetime.cpp:3771
+#: ../src/common/datetime.cpp:3874

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 

-#: ../src/msw/dde.cpp:1041
+#: ../src/msw/dde.cpp:1042

 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致DDE_FBUSY位被设置."
 
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致DDE_FBUSY位被设置."
 

-#: ../src/common/datetime.cpp:3764
+#: ../src/common/datetime.cpp:3867

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetime.cpp:3774
+#: ../src/common/datetime.cpp:3877

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 

-#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:145
+#: ../src/common/imagtiff.cpp:161

 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 

-#: ../src/common/datetime.cpp:3591
+#: ../src/common/datetime.cpp:3694

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetime.cpp:3593
+#: ../src/common/datetime.cpp:3696

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 

-#: ../src/common/datetime.cpp:3773
+#: ../src/common/datetime.cpp:3876

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetime.cpp:3781
+#: ../src/common/datetime.cpp:3884

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 

-#: ../src/common/fontcmn.cpp:637
+#: ../src/common/fontcmn.cpp:638

 msgid "underlined"
 msgstr "下划线"
 
 msgid "underlined"
 msgstr "下划线"
 

-#: ../src/common/fontcmn.cpp:552
+#: ../src/common/fontcmn.cpp:553

 msgid "underlined "
 msgstr "下划线 "
 
 msgid "underlined "
 msgstr "下划线 "
 

-#: ../src/common/fileconf.cpp:1932
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:1960
+#, c-format

 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 


@@ -4585,11 +5051,12 @@ msgstr "未知"
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
 msgid "unknown class %s"
 msgstr "未知类 %s"
 

-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:163
+#: ../src/html/chm.cpp:352

 msgid "unknown error"
 msgstr "未知错误"
 
 msgid "unknown error"
 msgstr "未知错误"
 

-#: ../src/msw/dialup.cpp:457
+#: ../src/msw/dialup.cpp:494

 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误(错误号 %08x)."
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误(错误号 %08x)."


@@ -4598,11 +5065,12 @@ msgstr "未知错误(错误号 %08x)."
 msgid "unknown line terminator"
 msgstr "未知行终止符"
 
 msgid "unknown line terminator"
 msgstr "未知行终止符"
 

-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/common/file.cpp:367
+#: ../src/msw/wince/filefnwce.cpp:170

 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 

-#: ../src/common/fmapbase.cpp:712
+#: ../src/common/fmapbase.cpp:719

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"


@@ -4611,12 +5079,13 @@ msgstr "未知-%d"
 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1414
+#: ../src/common/docview.cpp:1401

 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 

-#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031
+#: ../src/common/zipstrm.cpp:1660
+#: ../src/common/zipstrm.cpp:2030

 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 
 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 


@@ -4624,7 +5093,7 @@ msgstr "不支持的Zip压缩方法"
 msgid "unsupported zip archive"
 msgstr "不支持的zip存档"
 
 msgid "unsupported zip archive"
 msgstr "不支持的zip存档"
 

-#: ../src/common/intl.cpp:1114
+#: ../src/common/intl.cpp:1115

 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."


@@ -4637,20 +5106,23 @@ msgstr "写错误"
 msgid "writing"
 msgstr "正在写入"
 
 msgid "writing"
 msgstr "正在写入"
 

-#: ../src/common/stopwatch.cpp:281
+#: ../src/common/stopwatch.cpp:291

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 

-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
+#: ../src/common/socket.cpp:415
+#: ../src/common/socket.cpp:469
+#: ../src/mac/carbon/cfsocket.cpp:452
+#: ../src/mac/carbon/cfsocket.cpp:506

 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 

-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
+#: ../src/common/socket.cpp:966
+#: ../src/mac/carbon/cfsocket.cpp:1006

 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知事件!."
 
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知事件!."
 

-#: ../src/motif/app.cpp:210
+#: ../src/motif/app.cpp:214

 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."


@@ -4659,16 +5131,28 @@ msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 不能打开显示设备: 已经存在."
 
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 不能打开显示设备: 已经存在."
 

-#: ../src/common/datetime.cpp:3592
+#: ../src/common/datetime.cpp:3695

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 

-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:165
+#: ../src/common/zstream.cpp:315

 #, c-format
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 

-#: ../src/common/prntbase.cpp:839
+#: ../src/common/prntbase.cpp:886

 msgid "|<<"
 msgid "|<<"

-msgstr ""
+msgstr "|<<"
+
+#~ msgid ""
+#~ "Failed to get stack backtrace:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能获取堆栈的回溯路径:\n"
+#~ " %s"
+#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
+#~ msgstr "装入灰度 Ascii PNM图像功能还没有实现."
+#~ msgid "Loading Grey Raw PNM image is not yet implemented."
+#~ msgstr "装入灰度 Raw PNM图像功能还没有实现."