OSX two-level header fixes

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index ad0ce6d40d4700acb4dfa6b825f8704425935d3c..3ab87fa779fcdf6a5bb0bc5537bfba1a922ae68f 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,26 +1,43 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets-2.5.2\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets-2.5.2\n"

-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-15 01:23+0100\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"

 "PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
 "PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"

-"Previous-Translator: mrfx <mrfx@fm365.com>\n"

 "Last-Translator: Liu XiaoXi <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"
 "Last-Translator: Liu XiaoXi <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"

+"Report-Msgid-Bugs-To: \n"
+"Previous-Translator: mrfx <mrfx@fm365.com>\n"
+
+#: ../src/common/debugrpt.cpp:547
+#, c-format
+msgid "\t%s: %s\n"
+msgstr ""

 
 

-#: ../src/palmos/utils.cpp:210
+#: ../src/common/debugrpt.cpp:550
+msgid ""
+"\n"
+"Please send this report to the program maintainer, thank you!\n"
+msgstr ""
+"\n"
+"请将报告发送给程序维护人员, 谢谢!\n"
+
+#: ../src/palmos/utils.cpp:205

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

-#: ../src/common/log.cpp:322
+#: ../src/generic/dbgrptg.cpp:293
+msgid "              Thank you and we're sorry for the inconvenience!\n"
+msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
+
+#: ../src/common/log.cpp:321

 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 

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

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


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

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

 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:135
+#: ../src/common/paper.cpp:132

 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:136
+#: ../src/common/paper.cpp:133

 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:137
+#: ../src/common/paper.cpp:134

 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:133
+#: ../src/common/paper.cpp:130

 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 英寸"
 


@@ -55,13 +72,13 @@ 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:1019 ../src/html/helpfrm.cpp:1021
-#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
+#: ../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:287
+#: ../src/generic/filedlgg.cpp:295

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


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

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

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

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

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

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

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

-#: ../src/common/fldlgcmn.cpp:74
+#: ../src/common/fldlgcmn.cpp:81

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


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

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

 msgid "&About..."
 msgid "&About..."

-msgstr "关于[&A]"
+msgstr "关于(&A)"

 
 #: ../src/common/stockitem.cpp:153
 msgid "&Actual Size"
 
 #: ../src/common/stockitem.cpp:153
 msgid "&Actual Size"

-msgstr "实际大小[&A]"
+msgstr "实际大小(&A)"

 
 #: ../src/common/stockitem.cpp:108
 msgid "&Apply"
 
 #: ../src/common/stockitem.cpp:108
 msgid "&Apply"

-msgstr "应用[&A]"
+msgstr "应用(&A)"

 
 #: ../src/msw/mdi.cpp:190
 msgid "&Arrange Icons"
 
 #: ../src/msw/mdi.cpp:190
 msgid "&Arrange Icons"

-msgstr "重排图标[&A]"
+msgstr "重排图标(&A)"

 
 #: ../src/common/stockitem.cpp:118
 msgid "&Back"
 
 #: ../src/common/stockitem.cpp:118
 msgid "&Back"

-msgstr "返回[&B]"
+msgstr "返回(&B)"

 
 #: ../src/common/stockitem.cpp:109
 msgid "&Bold"
 
 #: ../src/common/stockitem.cpp:109
 msgid "&Bold"

-msgstr "粗体[&B]"
+msgstr "粗体(&B)"

 
 

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

 msgid "&Cancel"
 msgid "&Cancel"

-msgstr "取消[&C]"
+msgstr "取消(&C)"

 
 #: ../src/msw/mdi.cpp:186
 msgid "&Cascade"
 
 #: ../src/msw/mdi.cpp:186
 msgid "&Cascade"

-msgstr "层叠[&C]"
+msgstr "层叠(&C)"

 
 #: ../src/common/stockitem.cpp:111
 msgid "&Clear"
 
 #: ../src/common/stockitem.cpp:111
 msgid "&Clear"

-msgstr "清除[&C]"
+msgstr "清除(&C)"

 
 

-#: ../src/common/prntbase.cpp:829 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:508 ../src/html/helpfrm.cpp:338
+#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354

 msgid "&Close"
 msgid "&Close"

-msgstr "关闭[&C]"
+msgstr "关闭(&C)"

 
 

-#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2058
+#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065

 msgid "&Copy"
 msgid "&Copy"

-msgstr "复制[&C]"
+msgstr "复制(&C)"

 
 

-#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2060
+#: ../src/generic/dbgrptg.cpp:301
+msgid "&Debug report preview:"
+msgstr "调试报告预览(&D): "
+
+#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067

 msgid "&Delete"
 msgid "&Delete"

-msgstr "删除[&D]"
+msgstr "删除(&D)"

 
 

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

 msgid "&Details"
 msgid "&Details"

-msgstr "细节[&D]"
+msgstr "细节(&D)"

 
 #: ../src/common/stockitem.cpp:119
 msgid "&Down"
 
 #: ../src/common/stockitem.cpp:119
 msgid "&Down"

-msgstr "向下[&D]"
+msgstr "向下(&D)"

 
 

-#: ../src/html/helpfrm.cpp:345
+#: ../src/html/helpfrm.cpp:361

 msgid "&File"
 msgid "&File"

-msgstr "文件[&F]"
+msgstr "文件(&F)"

 
 #: ../src/common/stockitem.cpp:116
 msgid "&Find"
 
 #: ../src/common/stockitem.cpp:116
 msgid "&Find"

-msgstr "查找[&F]"
+msgstr "查找(&F)"

 
 #: ../src/generic/wizard.cpp:606
 msgid "&Finish"
 
 #: ../src/generic/wizard.cpp:606
 msgid "&Finish"

-msgstr "完成[&F]"
+msgstr "完成(&F)"

 
 

-#: ../src/generic/fontdlgg.cpp:271
+#: ../src/generic/fontdlgg.cpp:273

 msgid "&Font family:"
 msgid "&Font family:"

-msgstr "字体[&F]:"
+msgstr "字体(&F):"

 
 #: ../src/common/stockitem.cpp:120
 msgid "&Forward"
 
 #: ../src/common/stockitem.cpp:120
 msgid "&Forward"

-msgstr "向前[&F]"
+msgstr "向前(&F)"

 
 

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

 msgid "&Goto..."
 msgid "&Goto..."

-msgstr "跳转[&G]..."
+msgstr "跳转(&G)..."

 
 #: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
 
 #: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414

-#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:346
+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362

 msgid "&Help"
 msgid "&Help"

-msgstr "帮助[&H]"
+msgstr "帮助(&H)"

 
 #: ../src/common/stockitem.cpp:123
 #, fuzzy
 msgid "&Home"
 
 #: ../src/common/stockitem.cpp:123
 #, fuzzy
 msgid "&Home"

-msgstr "Home[&H]"
+msgstr "Home(&H)"

 
 #: ../src/common/stockitem.cpp:125
 msgid "&Index"
 
 #: ../src/common/stockitem.cpp:125
 msgid "&Index"

-msgstr "索引[&I]"
+msgstr "索引(&I)"

 
 #: ../src/common/stockitem.cpp:126
 msgid "&Italic"
 
 #: ../src/common/stockitem.cpp:126
 msgid "&Italic"

-msgstr "斜体[&I]"
+msgstr "斜体(&I)"

 
 

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

 msgid "&Log"
 msgid "&Log"

-msgstr "日志[&L]"
+msgstr "日志(&L)"

 
 #: ../src/univ/themes/win32.cpp:4817
 msgid "&Move"
 
 #: ../src/univ/themes/win32.cpp:4817
 msgid "&Move"

-msgstr "移动[&M]"
+msgstr "移动(&M)"

 
 #: ../src/common/stockitem.cpp:131
 msgid "&New"
 
 #: ../src/common/stockitem.cpp:131
 msgid "&New"

-msgstr "新建[&N]"
+msgstr "新建(&N)"

 
 #: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
 msgid "&Next"
 
 #: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
 msgid "&Next"

-msgstr "下一个[&N]"
+msgstr "下一个(&N)"

 
 #: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
 msgid "&Next >"
 
 #: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
 msgid "&Next >"

-msgstr "下一个[&N] >"
+msgstr "下一个(&N) >"

 
 

-#: ../src/generic/tipdlg.cpp:238
+#: ../src/generic/tipdlg.cpp:243

 msgid "&Next Tip"
 msgid "&Next Tip"

-msgstr "下一技巧[&N]"
+msgstr "下一技巧(&N)"

 
 #: ../src/common/stockitem.cpp:132
 msgid "&No"
 
 #: ../src/common/stockitem.cpp:132
 msgid "&No"

-msgstr "否[&N]"
+msgstr "否(&N)"
+
+#: ../src/generic/dbgrptg.cpp:323
+msgid "&Notes:"
+msgstr "注意(&N):"

 
 

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

 msgid "&OK"
 msgid "&OK"

-msgstr "确认[&O]"
+msgstr "确认(&O)"

 
 #: ../src/common/stockitem.cpp:134
 msgid "&Open"
 
 #: ../src/common/stockitem.cpp:134
 msgid "&Open"

-msgstr "打开[&O]"
+msgstr "打开(&O)"

 
 

-#: ../src/html/helpfrm.cpp:336
+#: ../src/html/helpfrm.cpp:352

 msgid "&Open..."
 msgid "&Open..."

-msgstr "打开[&O]..."
+msgstr "打开(&O)..."

 
 

-#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2059
+#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066

 msgid "&Paste"
 msgid "&Paste"

-msgstr "粘贴[&P]"
+msgstr "粘贴(&P)"

 
 

-#: ../src/generic/fontdlgg.cpp:318
+#: ../src/generic/fontdlgg.cpp:324

 msgid "&Point size:"
 msgid "&Point size:"

-msgstr "字体大小(Point size)[&P]:"
+msgstr "字体大小(Point size)(&P):"

 
 #: ../src/common/stockitem.cpp:136
 msgid "&Preferences"
 
 #: ../src/common/stockitem.cpp:136
 msgid "&Preferences"


@@ -268,99 +293,99 @@ msgstr "偏好设置"
 
 #: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
 msgid "&Previous"
 
 #: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
 msgid "&Previous"

-msgstr "前页[&P]"
+msgstr "前页(&P)"

 
 #: ../src/common/stockitem.cpp:137
 msgid "&Print"
 
 #: ../src/common/stockitem.cpp:137
 msgid "&Print"

-msgstr "打印[&P]"
+msgstr "打印(&P)"

 
 

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

 msgid "&Print..."
 msgid "&Print..."

-msgstr "打印[&P]..."
+msgstr "打印(&P)..."

 
 #: ../src/common/stockitem.cpp:139
 msgid "&Properties"
 
 #: ../src/common/stockitem.cpp:139
 msgid "&Properties"

-msgstr "属性[&P]"
+msgstr "属性(&P)"

 
 #: ../src/common/stockitem.cpp:140
 msgid "&Quit"
 
 #: ../src/common/stockitem.cpp:140
 msgid "&Quit"

-msgstr "退出[&Q]"
+msgstr "退出(&Q)"

 
 

-#: ../src/common/cmdproc.cpp:283 ../src/common/cmdproc.cpp:290
-#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2055
+#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062

 msgid "&Redo"
 msgid "&Redo"

-msgstr "重复[&R]"
+msgstr "重复(&R)"

 
 

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

 msgid "&Redo "
 msgid "&Redo "

-msgstr "重复[&R] "
+msgstr "重复(&R) "

 
 

-#: ../src/generic/fdrepdlg.cpp:168
+#: ../src/generic/fdrepdlg.cpp:185

 msgid "&Replace"
 msgid "&Replace"

-msgstr "替换[&R]"
+msgstr "替换(&R)"

 
 #: ../src/univ/themes/win32.cpp:4816
 msgid "&Restore"
 
 #: ../src/univ/themes/win32.cpp:4816
 msgid "&Restore"

-msgstr "复原[&R]"
+msgstr "复原(&R)"

 
 #: ../src/common/stockitem.cpp:145
 msgid "&Save"
 
 #: ../src/common/stockitem.cpp:145
 msgid "&Save"

-msgstr "保存[&S]"
+msgstr "保存(&S)"

 
 

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

 msgid "&Save..."
 msgid "&Save..."

-msgstr "保存[&S]..."
+msgstr "保存(&S)..."

 
 

-#: ../src/generic/tipdlg.cpp:233
+#: ../src/generic/tipdlg.cpp:238

 msgid "&Show tips at startup"
 msgid "&Show tips at startup"

-msgstr "启动时显示技巧[&S]"
+msgstr "启动时显示技巧(&S)"

 
 #: ../src/univ/themes/win32.cpp:4819
 msgid "&Size"
 
 #: ../src/univ/themes/win32.cpp:4819
 msgid "&Size"

-msgstr "大小[&S]"
+msgstr "大小(&S)"

 
 #: ../src/common/stockitem.cpp:147
 msgid "&Stop"
 
 #: ../src/common/stockitem.cpp:147
 msgid "&Stop"

-msgstr "停止[&S]"
+msgstr "停止(&S)"

 
 

-#: ../src/generic/fontdlgg.cpp:282
+#: ../src/generic/fontdlgg.cpp:284

 msgid "&Style:"
 msgid "&Style:"

-msgstr "字体[S]:"
+msgstr "字体(&S):"

 
 

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

 msgid "&Underline"
 msgid "&Underline"

-msgstr "下划线[&U]"
+msgstr "下划线(&U)"

 
 

-#: ../src/common/cmdproc.cpp:261 ../src/common/stockitem.cpp:150
-#: ../src/msw/textctrl.cpp:2054
+#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
+#: ../src/msw/textctrl.cpp:2061

 msgid "&Undo"
 msgid "&Undo"

-msgstr "恢复[&U]"
+msgstr "恢复(&U)"

 
 

-#: ../src/common/cmdproc.cpp:255
+#: ../src/common/cmdproc.cpp:264

 msgid "&Undo "
 msgid "&Undo "

-msgstr "恢复[&U] "
+msgstr "恢复(&U) "

 
 #: ../src/common/stockitem.cpp:151
 msgid "&Unindent"
 
 #: ../src/common/stockitem.cpp:151
 msgid "&Unindent"

-msgstr "取消缩进[&U]"
+msgstr "取消缩进(&U)"

 
 #: ../src/common/stockitem.cpp:121
 msgid "&Up"
 
 #: ../src/common/stockitem.cpp:121
 msgid "&Up"

-msgstr "向上[&U]"
+msgstr "向上(&U)"

 
 

-#: ../src/generic/fontdlgg.cpp:293
+#: ../src/generic/fontdlgg.cpp:295

 msgid "&Weight:"
 msgid "&Weight:"

-msgstr "字体粗细[&W]:"
+msgstr "字体粗细(&W):"

 
 #: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
 
 #: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313

-#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1384 ../src/msw/mdi.cpp:1391
-#: ../src/msw/mdi.cpp:1421
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
+#: ../src/msw/mdi.cpp:1424

 msgid "&Window"
 msgid "&Window"

-msgstr "窗口[&W]"
+msgstr "窗口(&W)"

 
 #: ../src/common/stockitem.cpp:152
 msgid "&Yes"
 
 #: ../src/common/stockitem.cpp:152
 msgid "&Yes"

-msgstr "是[&Y]"
+msgstr "是(&Y)"

 
 #: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
 #, c-format
 
 #: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
 #, c-format


@@ -378,7 +403,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:1152
+#: ../src/common/intl.cpp:1146

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


@@ -408,43 +433,55 @@ msgstr "'%s' 应仅包含字母字符."
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 应仅包含字母或数字字符."
 
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 应仅包含字母或数字字符."
 

-#: ../src/html/helpfrm.cpp:953
+#: ../src/html/helpfrm.cpp:976

 msgid "(Help)"
 msgstr "(帮助)"
 
 msgid "(Help)"
 msgstr "(帮助)"
 

-#: ../src/html/helpfrm.cpp:415 ../src/html/helpfrm.cpp:1091
-#: ../src/html/helpfrm.cpp:1750
+#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:1764

 msgid "(bookmarks)"
 msgstr "(书签)"
 
 msgid "(bookmarks)"
 msgstr "(书签)"
 

+#: ../src/common/debugrpt.cpp:537
+msgid "*** A debug report has been generated\n"
+msgstr "*** 生成了一份调试报告\n"
+
+#: ../src/common/debugrpt.cpp:540
+msgid "*** And includes the following files:\n"
+msgstr "*** 且包含以下文件:\n"
+
+#: ../src/common/debugrpt.cpp:538
+#, c-format
+msgid "*** It can be found in \"%s\"\n"
+msgstr "*** 可在此找到: \"%s\"\n"
+

 #: ../contrib/src/deprecated/resource.cpp:1840
 #: ../contrib/src/deprecated/resource.cpp:1970
 #: ../contrib/src/deprecated/resource.cpp:3062
 #: ../contrib/src/deprecated/resource.cpp:1840
 #: ../contrib/src/deprecated/resource.cpp:1970
 #: ../contrib/src/deprecated/resource.cpp:3062

-#, fuzzy

 msgid ""
 ", expected static, #include or #define\n"
 "while parsing resource."
 msgstr ""
 msgid ""
 ", expected static, #include or #define\n"
 "while parsing resource."
 msgstr ""

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

 
 

-#: ../src/generic/dirctrlg.cpp:655 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747

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

-#: ../src/generic/dirctrlg.cpp:656 ../src/generic/filedlgg.cpp:740
+#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748

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

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

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

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

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

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

 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 英寸"
 


@@ -452,79 +489,83 @@ msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 

-#: ../src/common/fontmap.cpp:186
+#: ../src/common/fontmap.cpp:200

 msgid ": unknown charset"
 msgstr ": 未知字符集"
 
 msgid ": unknown charset"
 msgstr ": 未知字符集"
 

-#: ../src/common/fontmap.cpp:400
+#: ../src/common/fontmap.cpp:414

 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
 #: ../src/generic/wizard.cpp:423
 msgid "< &Back"
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
 #: ../src/generic/wizard.cpp:423
 msgid "< &Back"

-msgstr "< 返回[&B]"
+msgstr "< 返回(&B)"

 
 

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

 msgid "<<"
 msgid "<<"

-msgstr "<<"
+msgstr ""

 
 

-#: ../src/generic/filedlgg.cpp:258 ../src/generic/filedlgg.cpp:281
+#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289

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

-#: ../src/generic/filedlgg.cpp:262 ../src/generic/filedlgg.cpp:285
+#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293

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

-#: ../src/generic/filedlgg.cpp:260 ../src/generic/filedlgg.cpp:283
+#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291

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

-#: ../src/html/helpfrm.cpp:1253
+#: ../src/html/helpfrm.cpp:1276

 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜体.</i></b><br>"
 
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜体.</i></b><br>"
 

-#: ../src/html/helpfrm.cpp:1257
+#: ../src/html/helpfrm.cpp:1280

 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
 
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
 

-#: ../src/html/helpfrm.cpp:1252
+#: ../src/html/helpfrm.cpp:1275

 msgid "<b>Bold face.</b> "
 msgstr "<b>粗体.</b> "
 
 msgid "<b>Bold face.</b> "
 msgstr "<b>粗体.</b> "
 

-#: ../src/html/helpfrm.cpp:1251
+#: ../src/html/helpfrm.cpp:1274

 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 

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

 msgid ">>"
 msgid ">>"

-msgstr ">>"
+msgstr ""

 
 

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

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

-msgstr ">>|"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:285
+msgid "A debug report has been generated in the directory\n"
+msgstr "产生了一份调试报告, 位于目录\n"

 
 #: ../src/common/xtixml.cpp:409
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 
 
 #: ../src/common/xtixml.cpp:409
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 

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

 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:114
+#: ../src/common/paper.cpp:111

 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:124
+#: ../src/common/paper.cpp:121

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

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

 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/generic/fontdlgg.cpp:85
+#: ../src/generic/fontdlgg.cpp:87

 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 


@@ -536,7 +577,7 @@ msgstr "ASCII"
 msgid "Add"
 msgstr "加入"
 
 msgid "Add"
 msgstr "加入"
 

-#: ../src/html/helpfrm.cpp:428
+#: ../src/html/helpfrm.cpp:444

 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 


@@ -544,11 +585,11 @@ msgstr "把当前页加到书签中"
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 

-#: ../include/wx/xti.h:900
+#: ../include/wx/xti.h:902

 msgid "AddToPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用AddToPropertyCollection"
 
 msgid "AddToPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用AddToPropertyCollection"
 

-#: ../include/wx/xti.h:847
+#: ../include/wx/xti.h:849

 msgid "AddToPropertyCollection called w/o valid adder"
 msgstr "调用AddToPropertyCollection时未带有效的adder"
 
 msgid "AddToPropertyCollection called w/o valid adder"
 msgstr "调用AddToPropertyCollection时未带有效的adder"
 


@@ -569,20 +610,20 @@ msgstr "右对齐"
 msgid "All"
 msgstr "所有"
 
 msgid "All"
 msgstr "所有"
 

-#: ../src/common/fldlgcmn.cpp:57
+#: ../src/common/fldlgcmn.cpp:64

 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 

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

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

-#: ../src/html/helpfrm.cpp:1564
+#: ../src/html/helpfrm.cpp:1578

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

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

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


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

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

 #, 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' (选择 [否] 将覆写该文件)?"


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

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

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

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

 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:126
+#: ../src/common/paper.cpp:123

 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:145
+#: ../src/common/paper.cpp:142

 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:127
+#: ../src/common/paper.cpp:124

 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:146
+#: ../src/common/paper.cpp:143

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


@@ -672,43 +713,43 @@ msgstr "波罗的海语 (旧的) (ISO-8859-4)"
 msgid "Bitmap resource specification %s not found."
 msgstr "找不到位图规格 %s."
 
 msgid "Bitmap resource specification %s not found."
 msgstr "找不到位图规格 %s."
 

-#: ../src/generic/fontdlgg.cpp:235
+#: ../src/generic/fontdlgg.cpp:237

 msgid "Bold"
 msgstr "粗体"
 
 msgid "Bold"
 msgstr "粗体"
 

-#: ../src/generic/prntdlgg.cpp:888
+#: ../src/generic/prntdlgg.cpp:892

 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 

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

 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:506
+#: ../src/generic/logg.cpp:510

 msgid "C&lear"
 msgid "C&lear"

-msgstr "清除[&L]"
+msgstr "清除(&L)"

 
 

-#: ../src/generic/fontdlgg.cpp:306
+#: ../src/generic/fontdlgg.cpp:308

 msgid "C&olour:"
 msgid "C&olour:"

-msgstr "颜色[&o]:"
+msgstr "颜色(&o):"

 
 

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

 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:141
+#: ../src/common/paper.cpp:138

 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:139
+#: ../src/common/paper.cpp:136

 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:142
+#: ../src/common/paper.cpp:139

 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:143
+#: ../src/common/paper.cpp:140

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


@@ -721,7 +762,7 @@ msgstr "CHM处理程序目前只支持本地文件!"
 msgid "Can not create mutex."
 msgstr "不能创建互斥对象."
 
 msgid "Can not create mutex."
 msgstr "不能创建互斥对象."
 

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

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


@@ -736,7 +777,7 @@ msgstr "不能枚举目录 '%s'中的文件"
 msgid "Can not resume thread %lu"
 msgstr "不能恢复线程 %lu"
 
 msgid "Can not resume thread %lu"
 msgstr "不能恢复线程 %lu"
 

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

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


@@ -750,20 +791,20 @@ msgstr "不能启动线程: 写TLS出错."
 msgid "Can not suspend thread %lu"
 msgstr "不能挂起线程 %lu"
 
 msgid "Can not suspend thread %lu"
 msgstr "不能挂起线程 %lu"
 

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

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

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

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

-#: ../src/common/cmdproc.cpp:257
+#: ../src/common/cmdproc.cpp:266

 msgid "Can't &Undo "
 msgid "Can't &Undo "

-msgstr "不能恢复[&U]"
+msgstr "不能恢复(&U)"

 
 

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

 #, 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': 文件不存在."


@@ -784,12 +825,12 @@ msgid "Can't create registry key '%s'"
 msgstr "不能创建注册键 '%s'"
 
 #: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
 msgstr "不能创建注册键 '%s'"
 
 #: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100

-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:593
+#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594

 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "不能创建进程"
 
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr "不能创建进程"
 

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

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


@@ -824,7 +865,7 @@ msgstr "不能枚举键 '%s'的值"
 msgid "Can't export value of unsupported type %d."
 msgstr "不能导出不支持的类型 %d 的值."
 
 msgid "Can't export value of unsupported type %d."
 msgstr "不能导出不支持的类型 %d 的值."
 

-#: ../src/common/ffile.cpp:241
+#: ../src/common/ffile.cpp:238

 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr "不能在文件'%s'中找到当前位置"
 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr "不能在文件'%s'中找到当前位置"


@@ -842,7 +883,7 @@ 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:1137 ../src/common/image.cpp:1157
+#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364

 #, 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'中装入图像: 文件不存在."


@@ -872,16 +913,16 @@ msgstr "不能读 '%s'的值"
 msgid "Can't read value of key '%s'"
 msgstr "不能读键 '%s'的值"
 
 msgid "Can't read value of key '%s'"
 msgstr "不能读键 '%s'的值"
 

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

 #, 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:568 ../src/generic/logg.cpp:976
+#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021

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

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

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


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

-#: ../src/generic/choicdgg.cpp:285 ../src/generic/dirdlgg.cpp:116
-#: ../src/generic/numdlgg.cpp:131 ../src/generic/textdlgg.cpp:118
-#: ../src/gtk/fontdlg.cpp:149 ../src/motif/msgdlg.cpp:185
-#: ../contrib/src/deprecated/proplist.cpp:518
+#: ../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

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

-#: ../src/xrc/xmlres.cpp:1118 ../src/xrc/xmlres.cpp:1158
+#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175

 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "不能转换对话单元: 未知的对话."
 
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "不能转换对话单元: 未知的对话."
 

-#: ../src/common/strconv.cpp:2481
+#: ../src/common/strconv.cpp:2665

 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "不能从字符集 '%s' 转换!"
 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "不能从字符集 '%s' 转换!"


@@ -922,7 +963,7 @@ msgstr "找不到活动的拨号连接: %s"
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到可以对应于未知控件 '%s' 的容器."
 
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到可以对应于未知控件 '%s' 的容器."
 

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

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


@@ -931,7 +972,7 @@ msgstr "找不到字体节点 '%s'."
 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 
 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 

-#: ../src/unix/threadpsx.cpp:1099
+#: ../src/unix/threadpsx.cpp:1100

 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "不能获得调度策略 %d 的优先级范围."
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "不能获得调度策略 %d 的优先级范围."


@@ -948,7 +989,7 @@ msgstr "不能获得正式的主机名"
 msgid "Cannot hang up - no active dialup connection."
 msgstr "不能挂起 - 没有活动的拨号连接."
 
 msgid "Cannot hang up - no active dialup connection."
 msgstr "不能挂起 - 没有活动的拨号连接."
 

-#: ../src/msw/app.cpp:308 ../src/msw/app.cpp:311
+#: ../include/wx/msw/ole/oleutils.h:47

 msgid "Cannot initialize OLE"
 msgstr "不能初始化 OLE"
 
 msgid "Cannot initialize OLE"
 msgstr "不能初始化 OLE"
 


@@ -980,7 +1021,7 @@ msgstr "不能打开 HTML 文档: %s"
 msgid "Cannot open HTML help book: %s"
 msgstr "不能打开 HTML 帮助: %s"
 
 msgid "Cannot open HTML help book: %s"
 msgstr "不能打开 HTML 帮助: %s"
 

-#: ../src/generic/helpext.cpp:122
+#: ../src/generic/helpext.cpp:123

 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr "不能打开 URL '%s'"
 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr "不能打开 URL '%s'"


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

-#: ../src/common/intl.cpp:1208
+#: ../src/common/intl.cpp:1202

 #, fuzzy, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
 msgstr "不能粘贴复数: '%s'"
 
 #, fuzzy, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
 msgstr "不能粘贴复数: '%s'"
 

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

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

-#: ../src/xrc/xmlres.cpp:1148
+#: ../src/xrc/xmlres.cpp:1159

 #, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "不能从 '%s'中粘贴维数."
 
 #, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "不能从 '%s'中粘贴维数."
 

-#: ../src/html/helpfrm.cpp:1548
+#: ../src/html/helpfrm.cpp:1562

 msgid "Cannot print empty page."
 msgstr "不能打印空页面."
 
 msgid "Cannot print empty page."
 msgstr "不能打印空页面."
 


@@ -1028,24 +1069,23 @@ msgstr "不能打印空页面."
 msgid "Cannot read typename from '%s'!"
 msgstr "不能从 '%s'中读取类型名称."
 
 msgid "Cannot read typename from '%s'!"
 msgstr "不能从 '%s'中读取类型名称."
 

-#: ../src/unix/threadpsx.cpp:1080
+#: ../src/unix/threadpsx.cpp:1081

 msgid "Cannot retrieve thread scheduling policy."
 msgstr "不能找回线程调度策略."
 
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "不能找回线程调度策略."
 

-#: ../src/unix/threadpsx.cpp:728
+#: ../src/unix/threadpsx.cpp:729

 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 
 #: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 
 #: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174

-#, fuzzy
-msgid "Cannot wait on thread to exit."
+msgid "Cannot wait for thread termination."

 msgstr "不能等候线程终止."
 
 #: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
 msgid "Cant create the thread event queue"
 msgstr "不能创建线程事件队列"
 
 msgstr "不能等候线程终止."
 
 #: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
 msgid "Cant create the thread event queue"
 msgstr "不能创建线程事件队列"
 

-#: ../src/html/helpfrm.cpp:511
+#: ../src/html/helpfrm.cpp:534

 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 msgid "Case sensitive"
 msgstr "大小写敏感"
 


@@ -1070,29 +1110,29 @@ msgstr "选择ISP进行拨号"
 msgid "Choose colour"
 msgstr "选择颜色"
 
 msgid "Choose colour"
 msgstr "选择颜色"
 

-#: ../src/gtk/fontdlg.cpp:127
+#: ../src/gtk/fontdlg.cpp:133

 msgid "Choose font"
 msgstr "选择字体"
 
 #: ../src/generic/mdig.cpp:114
 msgid "Cl&ose"
 msgid "Choose font"
 msgstr "选择字体"
 
 #: ../src/generic/mdig.cpp:114
 msgid "Cl&ose"

-msgstr "关闭[&o]"
+msgstr "关闭(&o)"

 
 

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

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

-#: ../src/generic/fontdlgg.cpp:358 ../src/generic/fontdlgg.cpp:377
+#: ../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:363 ../src/generic/fontdlgg.cpp:365

 #: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
 #: ../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 "点击确认字体选择."
 

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

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


@@ -1104,24 +1144,24 @@ msgstr "关闭\tAlt-F4"
 msgid "Close All"
 msgstr "全部关闭"
 
 msgid "Close All"
 msgstr "全部关闭"
 

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

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

-#: ../src/html/helpfrm.cpp:1562
+#: ../src/html/helpfrm.cpp:1576

 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:548
+#: ../src/generic/dirctrlg.cpp:582

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

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

 #, 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:1287 ../src/gtk/filedlg.cpp:56
+#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64

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


@@ -1129,20 +1169,20 @@ msgstr "确认"
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 

-#: ../src/html/htmlwin.cpp:381
+#: ../src/html/htmlwin.cpp:386

 msgid "Connecting..."
 msgstr "连接..."
 
 msgid "Connecting..."
 msgstr "连接..."
 

-#: ../src/html/helpfrm.cpp:453
+#: ../src/html/helpfrm.cpp:476

 msgid "Contents"
 msgstr "目录"
 
 msgid "Contents"
 msgstr "目录"
 

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

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

-#: ../src/html/htmlwin.cpp:819
+#: ../src/html/htmlwin.cpp:824

 #, c-format
 msgid "Copied to clipboard:\"%s\""
 msgstr "已复制到剪贴板:\"%s\""
 #, c-format
 msgid "Copied to clipboard:\"%s\""
 msgstr "已复制到剪贴板:\"%s\""


@@ -1167,15 +1207,10 @@ msgstr "不能将 %s解开至 %s: %s"
 msgid "Could not find resource include file %s."
 msgstr "找不到资源包含文件 %s."
 
 msgid "Could not find resource include file %s."
 msgstr "找不到资源包含文件 %s."
 

-#: ../src/generic/tabg.cpp:1049
+#: ../src/generic/tabg.cpp:1048

 msgid "Could not find tab for id"
 msgstr "找不到id的标签"
 
 msgid "Could not find tab for id"
 msgstr "找不到id的标签"
 

-#: ../src/msw/textctrl.cpp:2677
-#, c-format
-msgid "Could not load Rich Edit DLL '%s'"
-msgstr "不能装载 Rich Edit DLL '%s'"
-

 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."
 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."


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

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

 msgid "Could not start document preview."
 msgstr "不能启动文档预览."
 
 #: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
 msgid "Could not start document preview."
 msgstr "不能启动文档预览."
 
 #: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756

-#: ../src/msw/printwin.cpp:237
+#: ../src/msw/printwin.cpp:235

 msgid "Could not start printing."
 msgstr "不能启动打印."
 
 msgid "Could not start printing."
 msgstr "不能启动打印."
 

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

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


@@ -1223,8 +1258,8 @@ msgid "Couldn't acquire a mutex lock"
 msgstr "不能得到互斥锁"
 
 #: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
 msgstr "不能得到互斥锁"
 
 #: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206

-#: ../src/msw/imaglist.cpp:157 ../src/msw/imaglist.cpp:175
-#: ../src/msw/imaglist.cpp:187
+#: ../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 "不能把图像加到图象列表."
 
 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 


@@ -1236,12 +1271,12 @@ msgstr "不能创建计时器"
 msgid "Couldn't create cursor."
 msgstr "不能创建游标"
 
 msgid "Couldn't create cursor."
 msgstr "不能创建游标"
 

-#: ../src/common/dynlib.cpp:198
+#: ../src/common/dynlib.cpp:199

 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 

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

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


@@ -1268,7 +1303,7 @@ msgstr "不能注册剪贴板格式 '%s'."
 msgid "Couldn't release a mutex"
 msgstr "不能释放互斥体"
 
 msgid "Couldn't release a mutex"
 msgstr "不能释放互斥体"
 

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

 #, 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信息."


@@ -1278,7 +1313,7 @@ msgstr "不能获得列表控件的项 %d信息."
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 

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

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


@@ -1286,19 +1321,19 @@ 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:307
+#: ../src/generic/dirdlgg.cpp:309

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

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

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

-#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2057
+#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064

 msgid "Cu&t"
 msgid "Cu&t"

-msgstr "剪切[&t]"
+msgstr "剪切(&t)"

 
 

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

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


@@ -1306,7 +1341,7 @@ msgstr "当前目录:"
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 

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

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


@@ -1320,11 +1355,11 @@ msgstr "DIB头: 编码不能匹配颜色位数."
 
 #: ../src/common/imagbmp.cpp:883
 msgid "DIB Header: Image height > 32767 pixels for file."
 
 #: ../src/common/imagbmp.cpp:883
 msgid "DIB Header: Image height > 32767 pixels for file."

-msgstr "DIB头: 对于文件，图像高度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."

 
 #: ../src/common/imagbmp.cpp:877
 msgid "DIB Header: Image width > 32767 pixels for file."
 
 #: ../src/common/imagbmp.cpp:877
 msgid "DIB Header: Image width > 32767 pixels for file."

-msgstr "DIB头: 对于文件，图像宽度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."

 
 #: ../src/common/imagbmp.cpp:897
 msgid "DIB Header: Unknown bitdepth in file."
 
 #: ../src/common/imagbmp.cpp:897
 msgid "DIB Header: Unknown bitdepth in file."


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

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

 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/fontdlgg.cpp:225
+#: ../src/generic/dbgrptg.cpp:276
+#, c-format
+msgid "Debug report \"%s\""
+msgstr "调试报告 \"%s\""
+
+#: ../src/common/debugrpt.cpp:203
+msgid "Debug report couldn't be created."
+msgstr "无法创建调试报告."
+
+#: ../src/common/debugrpt.cpp:517
+msgid "Debug report generation has failed."
+msgstr "无法生成调试报告."
+
+#: ../src/generic/fontdlgg.cpp:227

 msgid "Decorative"
 msgstr "修饰"
 
 msgid "Decorative"
 msgstr "修饰"
 

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

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


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

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

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


@@ -1369,11 +1417,11 @@ msgid ""
 "not installed on this machine. Please install it."
 msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
 
 "not installed on this machine. Please install it."
 msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
 

-#: ../src/generic/tipdlg.cpp:241
+#: ../src/generic/tipdlg.cpp:246

 msgid "Did you know..."
 msgstr "你知道吗..."
 
 msgid "Did you know..."
 msgstr "你知道吗..."
 

-#: ../src/common/filefn.cpp:1152
+#: ../src/common/filefn.cpp:1172

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


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

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

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

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

 msgid "Directory doesn't exist."
 msgstr "目录不存在."
 
 msgid "Directory doesn't exist."
 msgstr "目录不存在."
 

-#: ../src/html/helpfrm.cpp:480
+#: ../src/html/helpfrm.cpp:503

 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 

-#: ../src/html/helpfrm.cpp:662
+#: ../src/html/helpfrm.cpp:685

 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
 #: ../src/msw/mimetype.cpp:670
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
 #: ../src/msw/mimetype.cpp:670

+#, c-format

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


@@ -1416,20 +1465,20 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
 "新的值为 \n"
 "%s %1"
 

-#: ../src/common/docview.cpp:444
+#: ../src/common/docview.cpp:464

 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "你想保存对文档%s的修改?"
 
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "你想保存对文档%s的修改?"
 

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

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

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

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

-#: ../src/generic/progdlgg.cpp:428
+#: ../src/generic/progdlgg.cpp:433

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


@@ -1438,11 +1487,11 @@ msgstr "完成."
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 

-#: ../src/generic/fdrepdlg.cpp:151
+#: ../src/generic/fdrepdlg.cpp:158

 msgid "Down"
 msgstr "向下"
 
 msgid "Down"
 msgstr "向下"
 

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

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


@@ -1450,32 +1499,36 @@ msgstr "E 纸张, 34 x 44 英寸"
 msgid "Edit item"
 msgstr "编辑项"
 
 msgid "Edit item"
 msgstr "编辑项"
 

-#: ../src/generic/progdlgg.cpp:192
+#: ../src/generic/progdlgg.cpp:194

 msgid "Elapsed time : "
 msgid "Elapsed time : "

-msgstr "用时："
+msgstr "用时: "

 
 

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

 #, 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/helpext.cpp:442
+#: ../src/generic/dbgrptg.cpp:158
+#, c-format
+msgid "Enter command to open file \"%s\":"
+msgstr "输入命令以打开文件 \"%s\":"
+
+#: ../src/generic/helpext.cpp:443

 msgid "Entries found"
 msgstr "找到的条目"
 
 #: ../src/common/config.cpp:383
 #, c-format
 msgid ""
 msgid "Entries found"
 msgstr "找到的条目"
 
 #: ../src/common/config.cpp:383
 #, c-format
 msgid ""

-"Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %d / '%s'."
-
-#: ../src/generic/dirctrlg.cpp:661 ../src/generic/dirctrlg.cpp:679
-#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:743
-#: ../src/generic/filedlgg.cpp:757 ../src/generic/filedlgg.cpp:771
-#: ../src/generic/filedlgg.cpp:1239 ../src/generic/filedlgg.cpp:1264
-#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:68
-#: ../src/gtk/fontdlg.cpp:78
+"Environment variables expansion failed: missing '%c' at position %u in '%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

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


@@ -1483,7 +1536,7 @@ msgstr "错误"
 msgid "Error "
 msgstr "错误 "
 
 msgid "Error "
 msgstr "错误 "
 

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

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


@@ -1491,11 +1544,11 @@ msgstr "创建目录错误"
 msgid "Error in reading image DIB ."
 msgstr "读图像DIB错误."
 
 msgid "Error in reading image DIB ."
 msgstr "读图像DIB错误."
 

-#: ../src/common/fileconf.cpp:501
+#: ../src/common/fileconf.cpp:504

 msgid "Error reading config options."
 msgstr "读配置选项错误."
 
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 

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

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


@@ -1503,7 +1556,7 @@ msgstr "保存用户配置数据错误."
 msgid "Error while waiting on semaphore"
 msgstr "等待信号量时出错"
 
 msgid "Error while waiting on semaphore"
 msgstr "等待信号量时出错"
 

-#: ../src/common/log.cpp:477
+#: ../src/common/log.cpp:476

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


@@ -1511,9 +1564,13 @@ msgstr "错误: "
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 

-#: ../src/generic/progdlgg.cpp:200
+#: ../src/generic/progdlgg.cpp:202

 msgid "Estimated time : "
 msgid "Estimated time : "

-msgstr "预期时间："
+msgstr "预期时间: "
+
+#: ../src/generic/dbgrptg.cpp:211
+msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
+msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"

 
 #: ../src/msw/utilsexc.cpp:753
 #, c-format
 
 #: ../src/msw/utilsexc.cpp:753
 #, c-format


@@ -1525,7 +1582,7 @@ msgstr "命令 '%s'执行失败"
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 

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

 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
 
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
 


@@ -1583,6 +1640,11 @@ msgstr "为位图数据分配 %luKb 内存失败."
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败."
 
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败."
 

+#: ../src/common/debugrpt.cpp:237
+#, c-format
+msgid "Failed to clean up debug report directory \"%s\""
+msgstr "无法清除调试报告目录 \"%s\""
+

 #: ../src/common/filename.cpp:191
 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败."
 #: ../src/common/filename.cpp:191
 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败."


@@ -1592,7 +1654,7 @@ msgstr "关闭文件句柄失败."
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 

-#: ../src/msw/clipbrd.cpp:122
+#: ../src/msw/clipbrd.cpp:119

 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 


@@ -1614,7 +1676,7 @@ msgstr "复制注册键值失败 '%s'"
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 

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

 #, 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'失败"


@@ -1628,15 +1690,15 @@ msgstr "复制注册表子键 '%s'至 '%s'失败."
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 

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

 msgid "Failed to create MDI parent frame."
 msgstr "创建 MDI 父框架失败."
 
 #: ../src/msw/statbr95.cpp:112
 msgid "Failed to create a status bar."
 msgid "Failed to create MDI parent frame."
 msgstr "创建 MDI 父框架失败."
 
 #: ../src/msw/statbr95.cpp:112
 msgid "Failed to create a status bar."

-msgstr "创建状态条失败。"
+msgstr "创建状态条失败."

 
 

-#: ../src/common/filename.cpp:754
+#: ../src/common/filename.cpp:766

 msgid "Failed to create a temporary file name"
 msgstr "创建临时文件名失败"
 
 msgid "Failed to create a temporary file name"
 msgstr "创建临时文件名失败"
 


@@ -1649,10 +1711,15 @@ msgstr "创建匿名管道失败"
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 

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

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

+#: ../src/common/debugrpt.cpp:202
+#, c-format
+msgid "Failed to create directory \"%s\""
+msgstr "无法创建目录 \"%s\""
+

 #: ../src/unix/mimetype.cpp:370
 #, c-format
 msgid "Failed to create directory %s/.gnome."
 #: ../src/unix/mimetype.cpp:370
 #, c-format
 msgid "Failed to create directory %s/.gnome."


@@ -1663,7 +1730,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:239
+#: ../src/generic/dirdlgg.cpp:241

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


@@ -1677,7 +1744,7 @@ msgstr ""
 msgid "Failed to create registry entry for '%s' files."
 msgstr "为 '%s'文件创建注册条目失败."
 
 msgid "Failed to create registry entry for '%s' files."
 msgstr "为 '%s'文件创建注册条目失败."
 

-#: ../src/msw/fdrepdlg.cpp:479
+#: ../src/msw/fdrepdlg.cpp:474

 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"


@@ -1687,8 +1754,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:187 ../src/mac/classic/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/msw/clipbrd.cpp:131

 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 


@@ -1710,6 +1777,10 @@ msgstr "建立拨号连接: %s失败"
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 

+#: ../src/common/debugrpt.cpp:652
+msgid "Failed to execute curl, please install it in PATH."
+msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+

 #: ../contrib/src/deprecated/resource.cpp:2489
 #, c-format
 msgid ""
 #: ../contrib/src/deprecated/resource.cpp:2489
 #, c-format
 msgid ""


@@ -1742,11 +1813,11 @@ msgstr ""
 msgid "Failed to get ISP names: %s"
 msgstr "获取ISP名: %s失败"
 
 msgid "Failed to get ISP names: %s"
 msgstr "获取ISP名: %s失败"
 

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

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

-#: ../src/msw/clipbrd.cpp:716
+#: ../src/msw/clipbrd.cpp:723

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


@@ -1755,13 +1826,15 @@ msgstr "从剪贴板获取数据失败"
 msgid ""
 "Failed to get stack backtrace:\n"
 "%s"
 msgid ""
 "Failed to get stack backtrace:\n"
 "%s"

-msgstr "不能获取堆栈的回溯路径:\n %s"
+msgstr ""
+"不能获取堆栈的回溯路径:\n"
+" %s"

 
 

-#: ../src/common/stopwatch.cpp:189
+#: ../src/common/stopwatch.cpp:223

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

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

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


@@ -1782,13 +1855,13 @@ msgstr "不能初始化OpenGL"
 msgid "Failed to inspect the lock file '%s'"
 msgstr "检查锁文件 '%s'失败"
 
 msgid "Failed to inspect the lock file '%s'"
 msgstr "检查锁文件 '%s'失败"
 

-#: ../src/unix/threadpsx.cpp:896
+#: ../src/unix/threadpsx.cpp:897

 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 

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

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


@@ -1807,12 +1880,12 @@ msgstr "从文件 \"%s\"读取元文件失败."
 msgid "Failed to load mpr.dll."
 msgstr "装载mpr.dll失败."
 
 msgid "Failed to load mpr.dll."
 msgstr "装载mpr.dll失败."
 

-#: ../src/common/dynlib.cpp:132
+#: ../src/common/dynlib.cpp:133

 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "不能装载共享库 '%s'"
 
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "不能装载共享库 '%s'"
 

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

 #, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
 #, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "不能装载共享库 '%s'. 错误信息: '%s'"


@@ -1827,7 +1900,7 @@ 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:1894
+#: ../src/common/filename.cpp:1917

 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "修改文件时间(为 '%s') 失败"
 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "修改文件时间(为 '%s') 失败"


@@ -1842,15 +1915,15 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s'失败."
 
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s'失败."
 

-#: ../src/common/filename.cpp:776
+#: ../src/common/filename.cpp:788

 msgid "Failed to open temporary file."
 msgstr "打开临时文件失败."
 
 msgid "Failed to open temporary file."
 msgstr "打开临时文件失败."
 

-#: ../src/msw/clipbrd.cpp:102
+#: ../src/msw/clipbrd.cpp:99

 msgid "Failed to open the clipboard."
 msgid "Failed to open the clipboard."

-msgstr "打开剪贴板失败。"
+msgstr "打开剪贴板失败."

 
 

-#: ../src/msw/clipbrd.cpp:619
+#: ../src/msw/clipbrd.cpp:626

 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 
 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 


@@ -1875,11 +1948,16 @@ msgstr "注册DDE服务器 '%s'失败"
 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 
 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 

-#: ../src/common/fontmap.cpp:232
+#: ../src/common/fontmap.cpp:246

 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s'编码失败."
 
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s'编码失败."
 

+#: ../src/common/debugrpt.cpp:220
+#, c-format
+msgid "Failed to remove debug report file \"%s\""
+msgstr "不能删除调试报告文件 \"%s\""
+

 #: ../src/unix/snglinst.cpp:327
 #, c-format
 msgid "Failed to remove lock file '%s'"
 #: ../src/unix/snglinst.cpp:327
 #, c-format
 msgid "Failed to remove lock file '%s'"


@@ -1900,11 +1978,11 @@ msgstr "将注册值 '%s'改名到'%s'失败."
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s'改名到'%s'失败."
 
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s'改名到'%s'失败."
 

-#: ../src/msw/clipbrd.cpp:506
+#: ../src/msw/clipbrd.cpp:503

 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败."
 
 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败."
 

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

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


@@ -1913,7 +1991,7 @@ msgstr "检取文件时间(为 '%s')失败"
 msgid "Failed to retrieve text of RAS error message"
 msgstr "检取RAS错误消息正文失败"
 
 msgid "Failed to retrieve text of RAS error message"
 msgstr "检取RAS错误消息正文失败"
 

-#: ../src/msw/clipbrd.cpp:753
+#: ../src/msw/clipbrd.cpp:760

 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "检取支持的剪贴板格式失败"
 
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "检取支持的剪贴板格式失败"
 


@@ -1931,7 +2009,7 @@ msgstr "发送DDE advise 通知失败"
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置FTP传输模式为 %s 时失败."
 
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置FTP传输模式为 %s 时失败."
 

-#: ../src/msw/clipbrd.cpp:382
+#: ../src/msw/clipbrd.cpp:379

 msgid "Failed to set clipboard data."
 msgstr "设置剪贴板数据失败"
 
 msgid "Failed to set clipboard data."
 msgstr "设置剪贴板数据失败"
 


@@ -1940,11 +2018,11 @@ msgstr "设置剪贴板数据失败"
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s'上设置许可权限时失败"
 
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s'上设置许可权限时失败"
 

-#: ../src/common/file.cpp:525
+#: ../src/common/file.cpp:523

 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 

-#: ../src/unix/threadpsx.cpp:1244 ../src/unix/threadpsx.cpp:1255
+#: ../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失败."


@@ -1955,7 +2033,7 @@ msgid "Failed to store image '%s' to memory VFS!"
 msgstr "将图像'%s'存到内存VFS失败!"
 
 #: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
 msgstr "将图像'%s'存到内存VFS失败!"
 
 #: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465

-#: ../src/unix/threadpsx.cpp:1428
+#: ../src/unix/threadpsx.cpp:1429

 msgid "Failed to terminate a thread."
 msgstr "终止线程失败"
 
 msgid "Failed to terminate a thread."
 msgstr "终止线程失败"
 


@@ -1968,7 +2046,7 @@ msgstr "终止与DDE服务器的advise循环失败"
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 

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

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


@@ -1983,20 +2061,25 @@ msgstr "对锁文件 '%s'解锁失败"
 msgid "Failed to unregister DDE server '%s'"
 msgstr "撤消DDE服务器 '%s'注册失败"
 
 msgid "Failed to unregister DDE server '%s'"
 msgstr "撤消DDE服务器 '%s'注册失败"
 

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

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

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

 #: ../src/unix/snglinst.cpp:173
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 
 #: ../src/unix/snglinst.cpp:173
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 

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

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

-#: ../src/common/log.cpp:466
+#: ../src/common/log.cpp:465

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


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

-#: ../src/generic/filedlgg.cpp:1285 ../src/gtk/filedlg.cpp:53
+#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61

 #, 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' 已存在, 确实需要复写它?"


@@ -2019,43 +2102,45 @@ msgstr "文件 '%s' 已存在, 确实需要复写它?"
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"

-msgstr "文件 '%s' 已存在.\n真的需要替换它?"
+msgstr ""
+"文件 '%s' 已存在.\n"
+"真的需要替换它?"

 
 #: ../src/common/textcmn.cpp:215
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 
 
 #: ../src/common/textcmn.cpp:215
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 

-#: ../src/common/docview.cpp:551 ../src/common/docview.cpp:583
-#: ../src/common/docview.cpp:1557
+#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
+#: ../src/common/docview.cpp:1609

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

-#: ../src/generic/dirctrlg.cpp:679 ../src/generic/filedlgg.cpp:757
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765

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

-#: ../src/common/filefn.cpp:1702
+#: ../src/common/filefn.cpp:1739

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

-#: ../src/html/helpfrm.cpp:468
+#: ../src/html/helpfrm.cpp:491

 msgid "Find"
 msgstr "查找"
 
 msgid "Find"
 msgstr "查找"
 

-#: ../src/html/helpfrm.cpp:1196
+#: ../src/html/helpfrm.cpp:1219

 msgid "Fixed font:"
 msgstr "固定字体:"
 
 msgid "Fixed font:"
 msgstr "固定字体:"
 

-#: ../src/html/helpfrm.cpp:1256
+#: ../src/html/helpfrm.cpp:1279

 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:128
+#: ../src/common/paper.cpp:125

 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 英寸"
 

-#: ../src/html/helpfrm.cpp:1197
+#: ../src/html/helpfrm.cpp:1220

 msgid "Font size:"
 msgstr "字体大小:"
 
 msgid "Font size:"
 msgstr "字体大小:"
 


@@ -2073,7 +2158,7 @@ msgstr "不支持传递hrefs"
 msgid "Found "
 msgstr "找到 "
 
 msgid "Found "
 msgstr "找到 "
 

-#: ../src/html/helpfrm.cpp:863
+#: ../src/html/helpfrm.cpp:886

 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"


@@ -2106,51 +2191,51 @@ msgstr "GIF: 位置错误!!!"
 msgid "GTK+ theme"
 msgstr "GTK+主题(theme)"
 
 msgid "GTK+ theme"
 msgstr "GTK+主题(theme)"
 

-#: ../src/common/prntbase.cpp:229
+#: ../src/common/prntbase.cpp:228

 msgid "Generic PostScript"
 msgstr "普通PostScript"
 
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 

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

 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:151
+#: ../src/common/paper.cpp:148

 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 英寸"
 

-#: ../include/wx/xti.h:843
+#: ../include/wx/xti.h:845

 msgid "GetProperty called w/o valid getter"
 msgstr "调用GetProperty时未带有效的getter"
 
 msgid "GetProperty called w/o valid getter"
 msgstr "调用GetProperty时未带有效的getter"
 

-#: ../include/wx/xti.h:904
+#: ../include/wx/xti.h:906

 msgid "GetPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用GetPropertyCollection"
 
 msgid "GetPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用GetPropertyCollection"
 

-#: ../include/wx/xti.h:851
+#: ../include/wx/xti.h:853

 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 
 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 

-#: ../src/html/helpfrm.cpp:628
+#: ../src/html/helpfrm.cpp:651

 msgid "Go back"
 msgstr "回退"
 
 msgid "Go back"
 msgstr "回退"
 

-#: ../src/html/helpfrm.cpp:631
+#: ../src/html/helpfrm.cpp:654

 msgid "Go forward"
 msgstr "向前"
 
 msgid "Go forward"
 msgstr "向前"
 

-#: ../src/html/helpfrm.cpp:636
+#: ../src/html/helpfrm.cpp:659

 msgid "Go one level up in document hierarchy"
 msgstr "在文档层次中上升一级"
 
 msgid "Go one level up in document hierarchy"
 msgstr "在文档层次中上升一级"
 

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

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

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

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

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

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


@@ -2162,16 +2247,16 @@ msgstr "希腊语 (ISO-8859-7)"
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 

-#: ../src/html/helpfrm.cpp:1560
+#: ../src/html/helpfrm.cpp:1574

 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 

-#: ../src/html/htmlwin.cpp:493
+#: ../src/html/htmlwin.cpp:498

 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 锚 %s 不存在."
 
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 锚 %s 不存在."
 

-#: ../src/html/helpfrm.cpp:1558
+#: ../src/html/helpfrm.cpp:1572

 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|"
 


@@ -2179,28 +2264,28 @@ msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 

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

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

-#: ../src/html/helpfrm.cpp:1190
+#: ../src/html/helpfrm.cpp:1213

 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 

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

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

-#: ../src/html/helpfrm.cpp:1546
+#: ../src/html/helpfrm.cpp:1560

 msgid "Help Printing"
 msgstr "帮助打印"
 
 msgid "Help Printing"
 msgstr "帮助打印"
 

-#: ../src/html/helpfrm.cpp:791
+#: ../src/html/helpfrm.cpp:814

 msgid "Help Topics"
 msgstr "帮助主题"
 
 msgid "Help Topics"
 msgstr "帮助主题"
 

-#: ../src/html/helpfrm.cpp:1559
+#: ../src/html/helpfrm.cpp:1573

 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 


@@ -2213,7 +2298,7 @@ msgstr "帮助: %s"
 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 

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

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


@@ -2266,6 +2351,26 @@ 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
+msgid ""
+"If you have any additional information pertaining to this bug\n"
+"report, please enter it here and it will be joined to it:"
+msgstr ""
+"如果您有任何与此错误报告有关的信息, \n"
+"请在此输入, 它将会被加到错误报告中:"
+
+#: ../src/generic/dbgrptg.cpp:291
+msgid ""
+"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 ""
+"如果您想完全禁用调试报告, 请按"
+"\"取消\"按钮, \n"
+"但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
+"在可能的情况下, 请尽量选择让程序生成调试报告.\n"
+

 #: ../src/msw/registry.cpp:1281
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 #: ../src/msw/registry.cpp:1281
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."


@@ -2279,32 +2384,32 @@ msgstr "不良的资源文件语法."
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
 
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
 

-#: ../include/wx/xti.h:1648
+#: ../include/wx/xti.h:1650

 msgid "Illegal Parameter Count for ConstructObject Method"
 msgstr "非法的针对ConstructObject方法的参数计数"
 
 msgid "Illegal Parameter Count for ConstructObject Method"
 msgstr "非法的针对ConstructObject方法的参数计数"
 

-#: ../include/wx/xti.h:1721
+#: ../include/wx/xti.h:1723

 msgid "Illegal Parameter Count for Create Method"
 msgstr "非法的针对Create方法的参数计数"
 
 msgid "Illegal Parameter Count for Create Method"
 msgstr "非法的针对Create方法的参数计数"
 

-#: ../src/generic/dirctrlg.cpp:661 ../src/generic/filedlgg.cpp:743
+#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751

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

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

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

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

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

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

 #, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
 #, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 

-#: ../src/msw/textctrl.cpp:330
+#: ../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"


@@ -2314,17 +2419,17 @@ msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装r
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 

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

 #, 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:1026
+#: ../src/common/filefn.cpp:1041

 #, 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:1070
+#: ../src/common/filefn.cpp:1085

 #, 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'的许可权限"


@@ -2333,7 +2438,7 @@ msgstr "不可能设置文件 '%s'的许可权限"
 msgid "Indent"
 msgstr "缩进"
 
 msgid "Indent"
 msgstr "缩进"
 

-#: ../src/html/helpfrm.cpp:493
+#: ../src/html/helpfrm.cpp:516

 msgid "Index"
 msgstr "索引"
 
 msgid "Index"
 msgstr "索引"
 


@@ -2383,11 +2488,11 @@ msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 

-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/fontdlgg.cpp:233

 msgid "Italic"
 msgstr "斜体"
 
 msgid "Italic"
 msgstr "斜体"
 

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

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


@@ -2411,31 +2516,31 @@ msgstr "KOI8-R"
 msgid "KOI8-U"
 msgstr "KOI8-U"
 
 msgid "KOI8-U"
 msgstr "KOI8-U"
 

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

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

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

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

-#: ../src/generic/prntdlgg.cpp:875
+#: ../src/generic/prntdlgg.cpp:879

 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 

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

 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:118
+#: ../src/common/paper.cpp:115

 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:112
+#: ../src/common/paper.cpp:109

 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 英寸"
 

-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:236

 msgid "Light"
 msgstr "细"
 
 msgid "Light"
 msgstr "细"
 


@@ -2443,12 +2548,12 @@ msgstr "细"
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//', 转换为绝对链接."
 
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//', 转换为绝对链接."
 

-#: ../src/common/fldlgcmn.cpp:248
+#: ../src/common/fldlgcmn.cpp:257

 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 
 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 

-#: ../src/html/htmlwin.cpp:411
+#: ../src/html/htmlwin.cpp:416

 msgid "Loading : "
 msgstr "装载: "
 
 msgid "Loading : "
 msgstr "装载: "
 


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

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

 #, 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:500 ../include/wx/xti.h:504
+#: ../include/wx/xti.h:501 ../include/wx/xti.h:505

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

-#: ../src/gtk/mdi.cpp:461
+#: ../src/gtk/mdi.cpp:465

 msgid "MDI child"
 msgstr "MDI子窗口"
 
 msgid "MDI child"
 msgstr "MDI子窗口"
 


@@ -2495,14 +2600,14 @@ msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮
 
 #: ../src/univ/themes/win32.cpp:4823
 msgid "Ma&ximize"
 
 #: ../src/univ/themes/win32.cpp:4823
 msgid "Ma&ximize"

-msgstr "最大化[&x]"
+msgstr "最大化(&x)"

 
 #: ../src/unix/mimetype.cpp:2671
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
 
 
 #: ../src/unix/mimetype.cpp:2671
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
 

-#: ../src/generic/fdrepdlg.cpp:146
+#: ../src/generic/fdrepdlg.cpp:153

 msgid "Match case"
 msgstr "大小写匹配"
 
 msgid "Match case"
 msgstr "大小写匹配"
 


@@ -2511,7 +2616,7 @@ msgstr "大小写匹配"
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 

-#: ../src/msw/frame.cpp:345
+#: ../src/msw/frame.cpp:374

 msgid "Menu"
 msgstr "菜单"
 
 msgid "Menu"
 msgstr "菜单"
 


@@ -2521,7 +2626,7 @@ msgstr "金属主题(theme)"
 
 #: ../src/univ/themes/win32.cpp:4821
 msgid "Mi&nimize"
 
 #: ../src/univ/themes/win32.cpp:4821
 msgid "Mi&nimize"

-msgstr "最小化[&n]"
+msgstr "最小化(&n)"

 
 #: ../src/unix/mimetype.cpp:2292
 #, c-format
 
 #: ../src/unix/mimetype.cpp:2292
 #, c-format


@@ -2533,15 +2638,15 @@ msgstr "Mime.类型文件 %s, 行 %d: 没有结束符号的引用字符串."
 msgid "Mode %ix%i-%i not available."
 msgstr "显示模式 %ix%i-%i位色 不支持."
 
 msgid "Mode %ix%i-%i not available."
 msgstr "显示模式 %ix%i-%i位色 不支持."
 

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

 msgid "Modern"
 msgstr "现代"
 
 msgid "Modern"
 msgstr "现代"
 

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

 msgid "Modified"
 msgstr "修正的"
 
 msgid "Modified"
 msgstr "修正的"
 

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

 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 英寸"
 


@@ -2553,7 +2658,7 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

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

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


@@ -2565,22 +2670,22 @@ msgstr "新目录"
 msgid "New item"
 msgstr "新项目"
 
 msgid "New item"
 msgstr "新项目"
 

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

 msgid "NewName"
 msgstr "新名"
 
 msgid "NewName"
 msgstr "新名"
 

-#: ../src/generic/tipdlg.cpp:295
+#: ../src/generic/tipdlg.cpp:305

 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: ../src/html/helpfrm.cpp:642
+#: ../src/html/helpfrm.cpp:665

 msgid "Next page"
 msgstr "下一页"
 
 msgid "Next page"
 msgstr "下一页"
 

-#: ../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:185
+#: ../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

 msgid "No"
 msgstr "否"
 
 msgid "No"
 msgstr "否"
 


@@ -2593,11 +2698,11 @@ msgstr "没有可用XBM工具!"
 msgid "No XPM icon facility available!"
 msgstr "没有可用的XPM图标设备!"
 
 msgid "No XPM icon facility available!"
 msgstr "没有可用的XPM图标设备!"
 

-#: ../src/generic/helpext.cpp:436
+#: ../src/generic/helpext.cpp:437

 msgid "No entries found."
 msgstr "没找到条目"
 
 msgid "No entries found."
 msgstr "没找到条目"
 

-#: ../src/common/fontmap.cpp:408
+#: ../src/common/fontmap.cpp:422

 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"


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

-#: ../src/common/fontmap.cpp:413
+#: ../src/common/fontmap.cpp:427

 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"


@@ -2625,22 +2730,22 @@ msgstr ""
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 

-#: ../src/common/image.cpp:1271 ../src/common/image.cpp:1314
+#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525

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

-#: ../src/common/image.cpp:1279 ../src/common/image.cpp:1322
-#: ../src/common/image.cpp:1356
+#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
+#: ../src/common/image.cpp:1566

 #, 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:1340 ../src/common/image.cpp:1372
+#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581

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

-#: ../src/html/helpfrm.cpp:846
+#: ../src/html/helpfrm.cpp:869

 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 


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

-#: ../src/common/image.cpp:977 ../src/common/image.cpp:1016
+#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216

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

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

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


@@ -2660,24 +2765,24 @@ msgstr "图像中没有未用的颜色."
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 

-#: ../src/generic/fontdlgg.cpp:230 ../src/generic/fontdlgg.cpp:233
+#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235

 msgid "Normal"
 msgstr "正常"
 
 msgid "Normal"
 msgstr "正常"
 

-#: ../src/html/helpfrm.cpp:1250
+#: ../src/html/helpfrm.cpp:1273

 msgid "Normal face<br>and <u>underlined</u>. "
 msgstr "正常字体<br> 且 <u>带下划线</u>."
 
 msgid "Normal face<br>and <u>underlined</u>. "
 msgstr "正常字体<br> 且 <u>带下划线</u>."
 

-#: ../src/html/helpfrm.cpp:1195
+#: ../src/html/helpfrm.cpp:1218

 msgid "Normal font:"
 msgstr "正常字体:"
 
 msgid "Normal font:"
 msgstr "正常字体:"
 

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

 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 英寸"
 

-#: ../src/gtk/fontdlg.cpp:141 ../src/msw/dialog.cpp:188
-#: ../contrib/src/deprecated/proplist.cpp:506
+#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:193

 msgid "OK"
 msgstr "确认"
 
 msgid "OK"
 msgstr "确认"
 


@@ -2685,16 +2790,21 @@ msgstr "确认"
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性(attribute)"
 
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性(attribute)"
 

-#: ../src/common/docview.cpp:1252 ../src/common/docview.cpp:1580
+#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632

 msgid "Open File"
 msgstr "打开文件"
 
 msgid "Open File"
 msgstr "打开文件"
 

-#: ../src/html/helpfrm.cpp:650 ../src/html/helpfrm.cpp:1565
+#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579

 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 

-#: ../src/generic/dirctrlg.cpp:690 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:631 ../src/generic/filedlgg.cpp:771
+#: ../src/generic/dbgrptg.cpp:147
+#, 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

 msgid "Operation not permitted."
 msgstr "不允许的操作."
 
 msgid "Operation not permitted."
 msgstr "不允许的操作."
 


@@ -2713,11 +2823,11 @@ 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:610
+#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614

 msgid "Options"
 msgstr "选项"
 
 msgid "Options"
 msgstr "选项"
 

-#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:864
+#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868

 msgid "Orientation"
 msgstr "方向"
 
 msgid "Orientation"
 msgstr "方向"
 


@@ -2757,21 +2867,21 @@ msgstr "PNM: 不能识别的文件格式."
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 

-#: ../src/common/prntbase.cpp:1248
+#: ../src/common/prntbase.cpp:1247

 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 

-#: ../src/common/prntbase.cpp:1246
+#: ../src/common/prntbase.cpp:1245

 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 
 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 

-#: ../src/generic/prntdlgg.cpp:823
+#: ../src/generic/prntdlgg.cpp:827

 msgid "Page Setup"
 msgstr "页面设置"
 
 msgid "Page Setup"
 msgstr "页面设置"
 

-#: ../src/common/prntbase.cpp:452 ../src/gtk/gnome/gprint.cpp:533
+#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533

 msgid "Page setup"
 msgstr "页面设置"
 
 msgid "Page setup"
 msgstr "页面设置"
 


@@ -2779,13 +2889,13 @@ msgstr "页面设置"
 msgid "Pages"
 msgstr "页"
 
 msgid "Pages"
 msgstr "页"
 

-#: ../src/generic/prntdlgg.cpp:796 ../src/generic/prntdlgg.cpp:850
-#: ../src/generic/prntdlgg.cpp:1052
+#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:1056

 msgid "Paper Size"
 msgstr "纸张大小"
 
 msgid "Paper Size"
 msgstr "纸张大小"
 

-#: ../src/generic/prntdlgg.cpp:594 ../src/generic/prntdlgg.cpp:837
-#: ../src/generic/prntdlgg.cpp:1047
+#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
+#: ../src/generic/prntdlgg.cpp:1051

 msgid "Paper size"
 msgstr "纸张大小"
 
 msgid "Paper size"
 msgstr "纸张大小"
 


@@ -2801,7 +2911,7 @@ msgstr "传递一个已注册的对象给SetObjectName"
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/generic/filedlgg.cpp:436
+#: ../src/generic/filedlgg.cpp:444

 msgid "Permissions"
 msgstr "允许"
 
 msgid "Permissions"
 msgstr "允许"
 


@@ -2809,15 +2919,15 @@ msgstr "允许"
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 

-#: ../src/gtk/fontdlg.cpp:78
+#: ../src/gtk/fontdlg.cpp:81

 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 

-#: ../src/generic/filedlgg.cpp:1294 ../src/gtk/filedlg.cpp:67
+#: ../src/generic/filedlgg.cpp:1330

 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 

-#: ../src/html/helpfrm.cpp:790
+#: ../src/html/helpfrm.cpp:813

 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 


@@ -2836,11 +2946,11 @@ msgstr ""
 "(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
 "否则此程序无法正确运行."
 
 "(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
 "否则此程序无法正确运行."
 

-#: ../src/common/prntbase.cpp:314
+#: ../src/common/prntbase.cpp:313

 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 
 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 

-#: ../src/generic/prntdlgg.cpp:604 ../src/generic/prntdlgg.cpp:862
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866

 msgid "Portrait"
 msgstr "纵向"
 
 msgid "Portrait"
 msgstr "纵向"
 


@@ -2848,25 +2958,25 @@ msgstr "纵向"
 msgid "PostScript file"
 msgstr "PostScript文件"
 
 msgid "PostScript file"
 msgstr "PostScript文件"
 

-#: ../src/generic/fontdlgg.cpp:341 ../src/html/helpfrm.cpp:1212
+#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235

 msgid "Preview:"
 msgstr "预览:"
 
 msgid "Preview:"
 msgstr "预览:"
 

-#: ../src/html/helpfrm.cpp:639
+#: ../src/html/helpfrm.cpp:662

 msgid "Previous page"
 msgstr "前页"
 
 msgid "Previous page"
 msgstr "前页"
 

-#: ../src/common/prntbase.cpp:394 ../src/generic/prntdlgg.cpp:138
+#: ../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
 msgid "Print"
 msgstr "打印"
 
 #: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
 #: ../src/gtk/gnome/gprint.cpp:400
 msgid "Print"
 msgstr "打印"
 

-#: ../src/common/docview.cpp:1025
+#: ../src/common/docview.cpp:1045

 msgid "Print Preview"
 msgstr "打印预览"
 
 msgid "Print Preview"
 msgstr "打印预览"
 

-#: ../src/common/prntbase.cpp:1200 ../src/common/prntbase.cpp:1226
+#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 


@@ -2878,23 +2988,23 @@ msgstr "打印范围"
 msgid "Print Setup"
 msgstr "打印设置"
 
 msgid "Print Setup"
 msgstr "打印设置"
 

-#: ../src/generic/prntdlgg.cpp:613
+#: ../src/generic/prntdlgg.cpp:617

 msgid "Print in colour"
 msgstr "彩色打印"
 
 #: ../src/common/stockitem.cpp:138
 msgid "Print previe&w"
 msgid "Print in colour"
 msgstr "彩色打印"
 
 #: ../src/common/stockitem.cpp:138
 msgid "Print previe&w"

-msgstr "打印预览[&w]"
+msgstr "打印预览(&w)"

 
 #: ../src/gtk/gnome/gprint.cpp:778
 msgid "Print preview"
 msgstr "打印预览"
 
 
 #: ../src/gtk/gnome/gprint.cpp:778
 msgid "Print preview"
 msgstr "打印预览"
 

-#: ../src/generic/prntdlgg.cpp:622
+#: ../src/generic/prntdlgg.cpp:626

 msgid "Print spooling"
 msgstr "打印假脱机"
 
 msgid "Print spooling"
 msgstr "打印假脱机"
 

-#: ../src/html/helpfrm.cpp:656
+#: ../src/html/helpfrm.cpp:679

 msgid "Print this page"
 msgstr "打印本页"
 
 msgid "Print this page"
 msgstr "打印本页"
 


@@ -2906,7 +3016,7 @@ msgstr "打印到文件"
 msgid "Printer"
 msgstr "打印机"
 
 msgid "Printer"
 msgstr "打印机"
 

-#: ../src/generic/prntdlgg.cpp:625
+#: ../src/generic/prntdlgg.cpp:629

 msgid "Printer command:"
 msgstr "打印机命令:"
 
 msgid "Printer command:"
 msgstr "打印机命令:"
 


@@ -2914,11 +3024,11 @@ msgstr "打印机命令:"
 msgid "Printer options"
 msgstr "打印机选项"
 
 msgid "Printer options"
 msgstr "打印机选项"
 

-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:641

 msgid "Printer options:"
 msgstr "打印机选项:"
 
 msgid "Printer options:"
 msgstr "打印机选项:"
 

-#: ../src/generic/prntdlgg.cpp:911
+#: ../src/generic/prntdlgg.cpp:915

 msgid "Printer..."
 msgstr "打印机..."
 
 msgid "Printer..."
 msgstr "打印机..."
 


@@ -2926,11 +3036,11 @@ msgstr "打印机..."
 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../src/common/prntbase.cpp:311 ../src/common/prntbase.cpp:532
+#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:328
+#: ../src/common/prntbase.cpp:327

 msgid "Printing Error"
 msgstr "打印出错"
 
 msgid "Printing Error"
 msgstr "打印出错"
 


@@ -2943,24 +3053,31 @@ msgstr "正在打印页 %d..."
 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../src/common/log.cpp:467
+#: ../src/common/debugrpt.cpp:524
+#, c-format
+msgid ""
+"Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr ""
+"处理调试报告失败, 文件被保存在目录 \"%s\" 中."
+
+#: ../src/common/log.cpp:466

 msgid "Program aborted."
 msgstr "程序终止."
 
 msgid "Program aborted."
 msgstr "程序终止."
 

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

 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

-#: ../src/generic/logg.cpp:1102
+#: ../src/generic/logg.cpp:1166

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

-#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:147
+#: ../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'出错"
 

-#: ../src/common/prntbase.cpp:243
+#: ../src/common/prntbase.cpp:242

 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 


@@ -2990,7 +3107,7 @@ msgid ""
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""

-"正è§\84ç³»ç»\9fæ\93\8dä½\9cé\9c\80è¦\81注å\86\8cé\94® '%s',\n"
+"正常ç\9a\84ç³»ç»\9fæ\93\8dä½\9cé\9c\80è¦\81注å\86\8cé\94® '%s',\n"

 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 


@@ -2999,11 +3116,11 @@ msgstr ""
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 

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

 msgid "Relevant entries:"
 msgstr "相关条目:"
 
 msgid "Relevant entries:"
 msgstr "相关条目:"
 

-#: ../src/generic/progdlgg.cpp:208
+#: ../src/generic/progdlgg.cpp:210

 msgid "Remaining time : "
 msgstr "剩余时间 : "
 
 msgid "Remaining time : "
 msgstr "剩余时间 : "
 


@@ -3011,7 +3128,7 @@ msgstr "剩余时间 : "
 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../src/html/helpfrm.cpp:429
+#: ../src/html/helpfrm.cpp:445

 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 


@@ -3022,13 +3139,13 @@ msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
 #: ../src/common/stockitem.cpp:117
 msgid "Rep&lace"
 
 #: ../src/common/stockitem.cpp:117
 msgid "Rep&lace"

-msgstr "替换[&l]"
+msgstr "替换(&l)"

 
 

-#: ../src/generic/fdrepdlg.cpp:171
+#: ../src/generic/fdrepdlg.cpp:188

 msgid "Replace &all"
 msgid "Replace &all"

-msgstr "全部替换[&a]"
+msgstr "全部替换(&a)"

 
 

-#: ../src/generic/fdrepdlg.cpp:123
+#: ../src/generic/fdrepdlg.cpp:130

 msgid "Replace with:"
 msgstr "替换为:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 


@@ -3040,92 +3157,92 @@ msgstr "资源文件必须有相同的版本号!"
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 

-#: ../src/generic/prntdlgg.cpp:887
+#: ../src/generic/prntdlgg.cpp:891

 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 

-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/generic/fontdlgg.cpp:226

 msgid "Roman"
 msgstr "罗马"
 
 msgid "Roman"
 msgstr "罗马"
 

-#: ../src/common/sizer.cpp:1757
+#: ../src/common/sizer.cpp:1841

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: ../src/common/fldlgcmn.cpp:250
+#: ../src/common/fldlgcmn.cpp:259

 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 #: ../src/common/stockitem.cpp:146
 msgid "Save &As..."
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 #: ../src/common/stockitem.cpp:146
 msgid "Save &As..."

-msgstr "另存为[&A]..."
+msgstr "另存为(&A)..."

 
 

-#: ../src/common/docview.cpp:285
+#: ../src/common/docview.cpp:305

 msgid "Save as"
 msgstr "另存为"
 
 msgid "Save as"
 msgstr "另存为"
 

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

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 

-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:229

 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/html/helpfrm.cpp:513 ../src/html/helpfrm.cpp:528
+#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../src/html/helpfrm.cpp:515
+#: ../src/html/helpfrm.cpp:538

 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 

-#: ../src/generic/fdrepdlg.cpp:152
+#: ../src/generic/fdrepdlg.cpp:166

 msgid "Search direction"
 msgstr "搜索目录"
 
 msgid "Search direction"
 msgstr "搜索目录"
 

-#: ../src/generic/fdrepdlg.cpp:111
+#: ../src/generic/fdrepdlg.cpp:118

 msgid "Search for:"
 msgstr "搜索:"
 
 msgid "Search for:"
 msgstr "搜索:"
 

-#: ../src/html/helpfrm.cpp:1037
+#: ../src/html/helpfrm.cpp:1060

 msgid "Search in all books"
 msgstr "在索引书中搜索"
 
 msgid "Search in all books"
 msgstr "在索引书中搜索"
 

-#: ../src/html/helpfrm.cpp:845
+#: ../src/html/helpfrm.cpp:868

 msgid "Searching..."
 msgstr "搜索..."
 
 msgid "Searching..."
 msgstr "搜索..."
 

-#: ../src/generic/dirctrlg.cpp:550
+#: ../src/generic/dirctrlg.cpp:584

 msgid "Sections"
 msgstr "段"
 
 msgid "Sections"
 msgstr "段"
 

-#: ../src/common/ffile.cpp:225
+#: ../src/common/ffile.cpp:222

 #, c-format
 msgid "Seek error on file '%s'"
 msgstr "文件 '%s'定位错误"
 
 #, c-format
 msgid "Seek error on file '%s'"
 msgstr "文件 '%s'定位错误"
 

-#: ../src/common/ffile.cpp:215
+#: ../src/common/ffile.cpp:212

 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 

-#: ../src/msw/textctrl.cpp:2062
+#: ../src/msw/textctrl.cpp:2069

 msgid "Select &All"
 msgid "Select &All"

-msgstr "选择所有[&A]"
+msgstr "选择所有(&A)"

 
 

-#: ../src/common/docview.cpp:1660
+#: ../src/common/docview.cpp:1712

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1737
+#: ../src/common/docview.cpp:1789

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/common/docview.cpp:1540
+#: ../src/common/docview.cpp:1592

 msgid "Select a file"
 msgstr "选择文件"
 
 msgid "Select a file"
 msgstr "选择文件"
 


@@ -3134,7 +3251,7 @@ msgstr "选择文件"
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s'后存在分隔符."
 
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s'后存在分隔符."
 

-#: ../include/wx/xti.h:839
+#: ../include/wx/xti.h:841

 msgid "SetProperty called w/o valid setter"
 msgstr "调用SetProperty时未带有效的setter"
 
 msgid "SetProperty called w/o valid setter"
 msgstr "调用SetProperty时未带有效的setter"
 


@@ -3146,11 +3263,11 @@ msgstr "设置..."
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 

-#: ../src/html/helpfrm.cpp:470
+#: ../src/html/helpfrm.cpp:493

 msgid "Show all"
 msgstr "显示所有"
 
 msgid "Show all"
 msgstr "显示所有"
 

-#: ../src/html/helpfrm.cpp:481
+#: ../src/html/helpfrm.cpp:504

 msgid "Show all items in index"
 msgstr "把所有项目显示为索引"
 
 msgid "Show all items in index"
 msgstr "把所有项目显示为索引"
 


@@ -3158,53 +3275,53 @@ msgstr "把所有项目显示为索引"
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/generic/filedlgg.cpp:1034
+#: ../src/generic/filedlgg.cpp:1064

 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 
 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 

-#: ../src/html/helpfrm.cpp:623
+#: ../src/html/helpfrm.cpp:646

 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/generic/fontdlgg.cpp:346 ../src/generic/fontdlgg.cpp:348
+#: ../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:431
+#: ../src/generic/filedlgg.cpp:439

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: ../src/generic/progdlgg.cpp:220 ../src/generic/progdlgg.cpp:238
-#: ../src/generic/progdlgg.cpp:593
+#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
+#: ../src/generic/progdlgg.cpp:598

 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 

-#: ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:234

 msgid "Slant"
 msgstr "倾斜"
 
 msgid "Slant"
 msgstr "倾斜"
 

-#: ../src/common/docview.cpp:561
+#: ../src/common/docview.cpp:581

 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 
 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 

-#: ../src/common/docview.cpp:593 ../src/common/docview.cpp:606
-#: ../src/common/docview.cpp:1559
+#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
+#: ../src/common/docview.cpp:1611

 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 
 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 

-#: ../src/common/docview.cpp:568
+#: ../src/common/docview.cpp:588

 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 
 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 

-#: ../src/common/prntbase.cpp:1200
+#: ../src/common/prntbase.cpp:1199

 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 

-#: ../src/common/docview.cpp:1021
+#: ../src/common/docview.cpp:1041

 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:1251 ../src/common/docview.cpp:1579
+#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631

 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 


@@ -3217,7 +3334,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:121
+#: ../src/common/paper.cpp:118

 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 英寸"
 


@@ -3225,7 +3342,7 @@ msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 msgid "Status:"
 msgstr "状态:"
 
 msgid "Status:"
 msgstr "状态:"
 

-#: ../src/generic/logg.cpp:621
+#: ../src/generic/logg.cpp:625

 msgid "Status: "
 msgstr "状态: "
 
 msgid "Status: "
 msgstr "状态: "
 


@@ -3239,7 +3356,7 @@ msgstr "不支持针对尚未形成流的对象的流委派"
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../include/wx/xti.h:427 ../include/wx/xti.h:431
+#: ../include/wx/xti.h:428 ../include/wx/xti.h:432

 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 
 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 


@@ -3248,12 +3365,12 @@ msgstr "不支持字符串装换"
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 

-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:230

 msgid "Swiss"
 msgstr "瑞士"
 
 #: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 msgid "Swiss"
 msgstr "瑞士"
 
 #: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243

-#: ../src/common/imagtiff.cpp:354
+#: ../src/common/imagtiff.cpp:383

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


@@ -3269,19 +3386,19 @@ msgstr "TIFF: 读图像错误."
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 

-#: ../src/common/imagtiff.cpp:378
+#: ../src/common/imagtiff.cpp:434

 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 

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

 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 

-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:231

 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1661
+#: ../src/common/docview.cpp:1713

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 


@@ -3297,7 +3414,7 @@ msgstr "FTP服务器不支持passive模式."
 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持PORT命令."
 
 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持PORT命令."
 

-#: ../src/common/fontmap.cpp:190
+#: ../src/common/fontmap.cpp:204

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"


@@ -3305,7 +3422,7 @@ msgid ""
 "[Cancel] if it cannot be replaced"
 msgstr ""
 "未知字符集'%s'. 选择其它字符集\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
 "未知字符集'%s'. 选择其它字符集\n"

-"代替它，或，如果不能\n"
+"代替它; 如果不能\n"

 "被替代则选择[取消] "
 
 #: ../src/msw/ole/dataobj.cpp:164
 "被替代则选择[取消] "
 
 #: ../src/msw/ole/dataobj.cpp:164


@@ -3313,7 +3430,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:224
+#: ../src/generic/dirdlgg.cpp:226

 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"


@@ -3322,7 +3439,7 @@ msgstr ""
 "目录 '%s'不存在\n"
 "现在创建?"
 
 "目录 '%s'不存在\n"
 "现在创建?"
 

-#: ../src/common/docview.cpp:1910
+#: ../src/common/docview.cpp:1962

 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"


@@ -3331,7 +3448,7 @@ msgstr ""
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/common/docview.cpp:1920
+#: ../src/common/docview.cpp:1972

 #, 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"


@@ -3340,31 +3457,41 @@ msgstr ""
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/generic/fontdlgg.cpp:310 ../src/generic/fontdlgg.cpp:312
+#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318

 msgid "The font colour."
 msgstr "字体颜色."
 
 msgid "The font colour."
 msgstr "字体颜色."
 

-#: ../src/generic/fontdlgg.cpp:275 ../src/generic/fontdlgg.cpp:277
+#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279

 msgid "The font family."
 msgstr "字体."
 
 msgid "The font family."
 msgstr "字体."
 

-#: ../src/generic/fontdlgg.cpp:322 ../src/generic/fontdlgg.cpp:324
+#: ../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:286 ../src/generic/fontdlgg.cpp:288
+#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290

 msgid "The font style."
 msgstr "字体风格."
 
 msgid "The font style."
 msgstr "字体风格."
 

-#: ../src/generic/fontdlgg.cpp:297 ../src/generic/fontdlgg.cpp:299
+#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301

 msgid "The font weight."
 msgstr "字体粗细."
 
 msgid "The font weight."
 msgstr "字体粗细."
 

-#: ../src/common/filename.cpp:952
+#: ../src/common/filename.cpp:966

 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 

+#: ../src/generic/dbgrptg.cpp:289
+msgid ""
+"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 ""
+"报告包含了以下文件. 如果这些文件含有"
+"私人信息, \n"
+"请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
+

 #: ../src/common/cmdline.cpp:883
 #, c-format
 msgid "The required parameter '%s' was not specified."
 #: ../src/common/cmdline.cpp:883
 #, c-format
 msgid "The required parameter '%s' was not specified."


@@ -3391,39 +3518,39 @@ msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
 
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
 

-#: ../src/msw/datectrl.cpp:116
+#: ../src/msw/datectrl.cpp:109

 msgid ""
 "This system doesn't support date picker control, please upgrade your version "
 "of comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
 msgid ""
 "This system doesn't support date picker control, please upgrade your version "
 "of comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1210
+#: ../src/msw/thread.cpp:1204

 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 

-#: ../src/unix/threadpsx.cpp:1602
+#: ../src/unix/threadpsx.cpp:1603

 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 

-#: ../src/msw/thread.cpp:1198
+#: ../src/msw/thread.cpp:1192

 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 

-#: ../src/unix/threadpsx.cpp:1107
+#: ../src/unix/threadpsx.cpp:1108

 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 
 #: ../src/msw/mdi.cpp:187
 msgid "Tile &Horizontally"
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 
 #: ../src/msw/mdi.cpp:187
 msgid "Tile &Horizontally"

-msgstr "水平排布[&H]"
+msgstr "水平排布(&H)"

 
 #: ../src/msw/mdi.cpp:188
 msgid "Tile &Vertically"
 
 #: ../src/msw/mdi.cpp:188
 msgid "Tile &Vertically"

-msgstr "垂直排布[&V]"
+msgstr "垂直排布(&V)"

 
 #: ../src/common/ftp.cpp:635
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 
 #: ../src/common/ftp.cpp:635
 msgid "Timeout while waiting for FTP server to connect, try passive mode."


@@ -3439,7 +3566,7 @@ msgstr "每日技巧"
 
 #: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"
 
 #: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"

-msgstr "对不起，没有所需技巧!"
+msgstr "对不起, 没有所需技巧!"

 
 #: ../src/generic/prntdlgg.cpp:237
 msgid "To:"
 
 #: ../src/generic/prntdlgg.cpp:237
 msgid "To:"


@@ -3449,7 +3576,7 @@ msgstr "到:"
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 

-#: ../src/generic/prntdlgg.cpp:876
+#: ../src/generic/prntdlgg.cpp:880

 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 


@@ -3466,7 +3593,7 @@ msgstr "试图解决 NULL 主机名: 放弃"
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 

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

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 


@@ -3475,11 +3602,11 @@ msgstr "类型"
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 

-#: ../src/common/paper.cpp:150
+#: ../src/common/paper.cpp:147

 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
 
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
 

-#: ../src/html/htmlwin.cpp:398
+#: ../src/html/htmlwin.cpp:403

 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "不能打开HTML文档: %s"
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "不能打开HTML文档: %s"


@@ -3554,11 +3681,11 @@ msgstr "未知 DDE 错误 %08x"
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象被传递给GetObjectClassInfo"
 
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象被传递给GetObjectClassInfo"
 

-#: ../src/unix/dlunix.cpp:282
+#: ../src/unix/dlunix.cpp:275

 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

-#: ../src/common/fmapbase.cpp:685
+#: ../src/common/fmapbase.cpp:688

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"


@@ -3578,7 +3705,7 @@ msgstr "未知的长选项 '%s'"
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 

-#: ../src/xrc/xmlres.cpp:760
+#: ../src/xrc/xmlres.cpp:762

 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 
 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 


@@ -3592,8 +3719,8 @@ msgstr "未知属性 %s"
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 

-#: ../src/common/cmdproc.cpp:252 ../src/common/cmdproc.cpp:278
-#: ../src/common/cmdproc.cpp:298
+#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:307

 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 msgid "Unnamed command"
 msgstr "未命名的命令"
 


@@ -3602,8 +3729,8 @@ msgstr "未命名的命令"
 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 
 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 

-#: ../src/mac/carbon/clipbrd.cpp:66 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:276 ../src/msw/clipbrd.cpp:448
+#: ../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 "不支持的剪贴板格式."
 
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 


@@ -3612,7 +3739,7 @@ msgstr "不支持的剪贴板格式."
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题(theme) '%s'."
 
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题(theme) '%s'."
 

-#: ../src/generic/fdrepdlg.cpp:151
+#: ../src/generic/fdrepdlg.cpp:158

 msgid "Up"
 msgstr "向上"
 
 msgid "Up"
 msgstr "向上"
 


@@ -3629,15 +3756,15 @@ msgstr "验证冲突"
 msgid "Video Output"
 msgstr "视频输出"
 
 msgid "Video Output"
 msgstr "视频输出"
 

-#: ../src/generic/filedlgg.cpp:950
+#: ../src/generic/filedlgg.cpp:980

 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 

-#: ../src/generic/filedlgg.cpp:943
+#: ../src/generic/filedlgg.cpp:973

 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 

-#: ../src/common/docview.cpp:1738
+#: ../src/common/docview.cpp:1790

 msgid "Views"
 msgstr "视图"
 
 msgid "Views"
 msgstr "视图"
 


@@ -3645,11 +3772,11 @@ msgstr "视图"
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子过程终止失败"
 
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子过程终止失败"
 

-#: ../src/common/docview.cpp:441
+#: ../src/common/docview.cpp:461

 msgid "Warning"
 msgstr "警告"
 
 msgid "Warning"
 msgstr "警告"
 

-#: ../src/common/log.cpp:481
+#: ../src/common/log.cpp:480

 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 


@@ -3665,15 +3792,15 @@ msgstr "西欧 (ISO-8859-1)"
 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:333 ../src/generic/fontdlgg.cpp:335
+#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341

 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 

-#: ../src/generic/fdrepdlg.cpp:143
+#: ../src/generic/fdrepdlg.cpp:150

 msgid "Whole word"
 msgstr "整字"
 
 msgid "Whole word"
 msgstr "整字"
 

-#: ../src/html/helpfrm.cpp:512
+#: ../src/html/helpfrm.cpp:535

 msgid "Whole words only"
 msgstr "仅为整字"
 
 msgid "Whole words only"
 msgstr "仅为整字"
 


@@ -3681,32 +3808,32 @@ msgstr "仅为整字"
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 

-#: ../src/msw/utils.cpp:1085
+#: ../src/msw/utils.cpp:1096

 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:1134
+#: ../src/msw/utils.cpp:1145

 #, 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:1099
+#: ../src/msw/utils.cpp:1110

 msgid "Windows 95"
 msgstr "Windows 95"
 
 msgid "Windows 95"
 msgstr "Windows 95"
 

-#: ../src/msw/utils.cpp:1095
+#: ../src/msw/utils.cpp:1106

 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 

-#: ../src/msw/utils.cpp:1110
+#: ../src/msw/utils.cpp:1121

 msgid "Windows 98"
 msgstr "Windows 98"
 
 msgid "Windows 98"
 msgstr "Windows 98"
 

-#: ../src/msw/utils.cpp:1106
+#: ../src/msw/utils.cpp:1117

 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 

-#: ../src/msw/utils.cpp:1117
+#: ../src/msw/utils.cpp:1128

 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"


@@ -3751,16 +3878,16 @@ msgstr "Windows 日语 (CP 932)"
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 

-#: ../src/msw/utils.cpp:1114
+#: ../src/msw/utils.cpp:1125

 msgid "Windows ME"
 msgstr "Windows ME"
 
 msgid "Windows ME"
 msgstr "Windows ME"
 

-#: ../src/msw/utils.cpp:1149
+#: ../src/msw/utils.cpp:1160

 #, 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:1142
+#: ../src/msw/utils.cpp:1153

 #, 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"


@@ -3773,7 +3900,7 @@ msgstr "Windows 土耳其语 (CP 1254)"
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 

-#: ../src/msw/utils.cpp:1138
+#: ../src/msw/utils.cpp:1149

 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"


@@ -3782,21 +3909,21 @@ msgstr "Windows XP (build %lu"
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 

-#: ../src/common/ffile.cpp:161
+#: ../src/common/ffile.cpp:158

 #, c-format
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s'错误"
 
 #, c-format
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s'错误"
 

-#: ../src/xml/xml.cpp:550
+#: ../src/xml/xml.cpp:562

 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 

-#: ../src/common/xpmdecod.cpp:776
+#: ../src/common/xpmdecod.cpp:774

 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 

-#: ../src/common/xpmdecod.cpp:711 ../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'!"


@@ -3806,43 +3933,39 @@ msgstr "XPM: 错误的颜色定义 '%s'!"
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 

-#: ../src/xrc/xmlres.cpp:1017 ../src/xrc/xmlres.cpp:1029
+#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031

 #, 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:973
+#: ../src/xrc/xmlres.cpp:975

 #, 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:59 ../src/mac/carbon/msgdlg.cpp:142
-#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:185
+#: ../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

 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 

-#: ../src/generic/dirdlgg.cpp:306
+#: ../src/generic/dirdlgg.cpp:308

 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 
 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 

-#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
-msgid "ZIP handler currently supports only local files!"
-msgstr "ZIP处理程序目前只支持本地文件!"
-

 #: ../src/common/stockitem.cpp:155
 msgid "Zoom &In"
 #: ../src/common/stockitem.cpp:155
 msgid "Zoom &In"

-msgstr "放大[&I]"
+msgstr "放大(&I)"

 
 #: ../src/common/stockitem.cpp:156
 msgid "Zoom &Out"
 
 #: ../src/common/stockitem.cpp:156
 msgid "Zoom &Out"

-msgstr "缩小[&O]"
+msgstr "缩小(&O)"

 
 #: ../src/common/stockitem.cpp:154
 msgid "Zoom to &Fit"
 
 #: ../src/common/stockitem.cpp:154
 msgid "Zoom to &Fit"

-msgstr "缩放以适应窗口[&F]"
+msgstr "缩放以适应窗口(&F)"

 
 

-#: ../src/common/docview.cpp:2094
+#: ../src/common/docview.cpp:2146

 msgid "[EMPTY]"
 msgstr "[空]"
 
 msgid "[EMPTY]"
 msgstr "[空]"
 


@@ -3941,12 +4064,12 @@ msgstr ""
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 

-#: ../src/common/zipstrm.cpp:1317
+#: ../src/common/zipstrm.cpp:1331

 #, 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:1804
+#: ../src/common/fileconf.cpp:1819

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."


@@ -3959,7 +4082,7 @@ msgstr "库函数参数错误"
 msgid "bad signature"
 msgstr "错误的签名"
 
 msgid "bad signature"
 msgstr "错误的签名"
 

-#: ../src/common/zipstrm.cpp:1567
+#: ../src/common/zipstrm.cpp:1581

 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 
 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 


@@ -3985,7 +4108,7 @@ msgstr "不能关闭文件 '%s'"
 msgid "can't close file descriptor %d"
 msgstr "不能关闭文件描述子 %d"
 
 msgid "can't close file descriptor %d"
 msgstr "不能关闭文件描述子 %d"
 

-#: ../src/common/file.cpp:553
+#: ../src/common/file.cpp:551

 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "不能把修改提交给文件 '%s'"
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "不能把修改提交给文件 '%s'"


@@ -3995,27 +4118,27 @@ msgstr "不能把修改提交给文件 '%s'"
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 

-#: ../src/common/fileconf.cpp:1123
+#: ../src/common/fileconf.cpp:1134

 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 

-#: ../src/common/file.cpp:459
+#: ../src/common/file.cpp:457

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 

-#: ../src/common/zipstrm.cpp:1344
+#: ../src/common/zipstrm.cpp:1358

 #, fuzzy
 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 
 #, fuzzy
 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 

-#: ../src/common/file.cpp:429
+#: ../src/common/file.cpp:427

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 

-#: ../src/msw/utils.cpp:367
+#: ../src/msw/utils.cpp:376

 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 


@@ -4024,12 +4147,12 @@ msgstr "找不到用户的HOME目录, 使用当前目录."
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 

-#: ../src/common/file.cpp:401 ../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的指针位置"
 

-#: ../src/common/fontmap.cpp:312
+#: ../src/common/fontmap.cpp:326

 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 
 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 


@@ -4038,29 +4161,29 @@ msgstr "不能装载任何字体, 正在中止"
 msgid "can't open file '%s'"
 msgstr "不能打开文件 '%s'"
 
 msgid "can't open file '%s'"
 msgstr "不能打开文件 '%s'"
 

-#: ../src/common/fileconf.cpp:401
+#: ../src/common/fileconf.cpp:404

 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "不能打开全局配置文件 '%s'."
 
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "不能打开全局配置文件 '%s'."
 

-#: ../src/common/fileconf.cpp:416
+#: ../src/common/fileconf.cpp:419

 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 

-#: ../src/common/fileconf.cpp:972
+#: ../src/common/fileconf.cpp:981

 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 
 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 

-#: ../src/common/dynlib.cpp:252
+#: ../src/common/dynlib.cpp:253

 msgid "can't query for GUI plugins name in console applications"
 msgstr "无法在控制台程序里查询GUI插件"
 
 msgid "can't query for GUI plugins name in console applications"
 msgstr "无法在控制台程序里查询GUI插件"
 

-#: ../src/common/zipstrm.cpp:432
+#: ../src/common/zipstrm.cpp:436

 msgid "can't re-initialize zlib deflate stream"
 msgstr "不能重新初始化zlib deflate(压缩)流."
 
 msgid "can't re-initialize zlib deflate stream"
 msgstr "不能重新初始化zlib deflate(压缩)流."
 

-#: ../src/common/zipstrm.cpp:457
+#: ../src/common/zipstrm.cpp:461

 msgid "can't re-initialize zlib inflate stream"
 msgstr "不能重新初始化zlib inflate(解压)流."
 
 msgid "can't re-initialize zlib inflate stream"
 msgstr "不能重新初始化zlib inflate(解压)流."
 


@@ -4069,26 +4192,21 @@ msgstr "不能重新初始化zlib inflate(解压)流."
 msgid "can't read from file descriptor %d"
 msgstr "不能从文件描述子 %d中读"
 
 msgid "can't read from file descriptor %d"
 msgstr "不能从文件描述子 %d中读"
 

-#: ../src/common/file.cpp:548
+#: ../src/common/file.cpp:546

 #, c-format
 msgid "can't remove file '%s'"
 msgstr "不能删除文件 '%s'"
 
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "不能删除文件 '%s'"
 

-#: ../src/common/file.cpp:564
+#: ../src/common/file.cpp:562

 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 

-#: ../src/common/file.cpp:387 ../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"
 

-#: ../src/common/file.cpp:381
-#, c-format
-msgid "can't seek on file descriptor %d, large files support is not enabled."
-msgstr "不能定位文件描述子 %d, 没有开启\"大文件支持\""
-

 #: ../src/common/textfile.cpp:196
 #, c-format
 msgid "can't write buffer '%s' to disk."
 #: ../src/common/textfile.cpp:196
 #, c-format
 msgid "can't write buffer '%s' to disk."


@@ -4099,11 +4217,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:983
+#: ../src/common/fileconf.cpp:992

 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 
 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 

-#: ../src/common/intl.cpp:1114
+#: ../src/common/intl.cpp:1109

 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."


@@ -4132,7 +4250,7 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/common/fmapbase.cpp:695 ../src/common/fmapbase.cpp:727
+#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 


@@ -4140,24 +4258,28 @@ msgstr "缺省值"
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 

-#: ../src/common/datetime.cpp:3674
+#: ../src/common/debugrpt.cpp:502
+msgid "dump of the process state (binary)"
+msgstr "转储(dump)进程状态（二进制码）"
+
+#: ../src/common/datetime.cpp:3779

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetime.cpp:3664
+#: ../src/common/datetime.cpp:3769

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetime.cpp:3667
+#: ../src/common/datetime.cpp:3772

 msgid "eleventh"
 msgstr "第十一"
 
 msgid "eleventh"
 msgstr "第十一"
 

-#: ../src/common/strconv.cpp:2487
+#: ../src/common/strconv.cpp:2671

 #, c-format
 msgid "encoding %s"
 msgstr "编码 %s"
 
 #, c-format
 msgid "encoding %s"
 msgstr "编码 %s"
 

-#: ../src/common/fileconf.cpp:1790
+#: ../src/common/fileconf.cpp:1805

 #, 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'中已出现一次以上"


@@ -4170,16 +4292,16 @@ msgstr "文件格式错误"
 msgid "error opening file"
 msgstr "打开文件出错"
 
 msgid "error opening file"
 msgstr "打开文件出错"
 

-#: ../src/common/zipstrm.cpp:1429
+#: ../src/common/zipstrm.cpp:1443

 #, fuzzy
 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 
 #, fuzzy
 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 

-#: ../src/common/zipstrm.cpp:1507
+#: ../src/common/zipstrm.cpp:1521

 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 
 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 

-#: ../src/common/zipstrm.cpp:2208
+#: ../src/common/zipstrm.cpp:2237

 #, fuzzy, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 #, fuzzy, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"


@@ -4188,61 +4310,61 @@ msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 msgid "establish"
 msgstr "建立"
 
 msgid "establish"
 msgstr "建立"
 

-#: ../src/common/ffile.cpp:175
+#: ../src/common/ffile.cpp:172

 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 
 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 

-#: ../src/common/datetime.cpp:3671
+#: ../src/common/datetime.cpp:3776

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetime.cpp:3661
+#: ../src/common/datetime.cpp:3766

 msgid "fifth"
 msgstr "第五"
 
 msgid "fifth"
 msgstr "第五"
 

-#: ../src/common/fileconf.cpp:655
+#: ../src/common/fileconf.cpp:664

 #, fuzzy, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
 
 #, fuzzy, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
 

-#: ../src/common/fileconf.cpp:684
+#: ../src/common/fileconf.cpp:693

 #, fuzzy, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "文件 '%s', 行 %d: 期望 '='."
 
 #, fuzzy, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "文件 '%s', 行 %d: 期望 '='."
 

-#: ../src/common/fileconf.cpp:707
+#: ../src/common/fileconf.cpp:716

 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 

-#: ../src/common/fileconf.cpp:697
+#: ../src/common/fileconf.cpp:706

 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 

-#: ../src/common/fileconf.cpp:619
+#: ../src/common/fileconf.cpp:628

 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 

-#: ../src/common/datetime.cpp:3657
+#: ../src/common/datetime.cpp:3762

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 

-#: ../src/html/helpfrm.cpp:1239
+#: ../src/html/helpfrm.cpp:1262

 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetime.cpp:3670
+#: ../src/common/datetime.cpp:3775

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetime.cpp:3660
+#: ../src/common/datetime.cpp:3765

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 

-#: ../src/common/appbase.cpp:350
+#: ../src/common/appbase.cpp:361

 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 


@@ -4254,15 +4376,15 @@ msgstr "错误的时间句柄字符串, 缺少点号('.')"
 msgid "initiate"
 msgstr "初始化"
 
 msgid "initiate"
 msgstr "初始化"
 

-#: ../src/common/file.cpp:461
+#: ../src/common/file.cpp:459

 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 
 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 

-#: ../src/generic/logg.cpp:1116
+#: ../src/generic/logg.cpp:1180

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 

-#: ../src/common/zipstrm.cpp:1293
+#: ../src/common/zipstrm.cpp:1307

 msgid "invalid zip file"
 msgstr "无效的zip文件"
 
 msgid "invalid zip file"
 msgstr "无效的zip文件"
 


@@ -4280,25 +4402,25 @@ msgstr "细"
 msgid "light "
 msgstr "细 "
 
 msgid "light "
 msgstr "细 "
 

-#: ../src/common/intl.cpp:1461
+#: ../src/common/intl.cpp:1455

 #, fuzzy, c-format
 msgid "locale '%s' can not be set."
 msgstr "不能设置现场(locale) '%s'."
 
 #, fuzzy, c-format
 msgid "locale '%s' can not be set."
 msgstr "不能设置现场(locale) '%s'."
 

-#: ../src/common/intl.cpp:1109
+#: ../src/common/intl.cpp:1102

 #, 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:3821
+#: ../src/common/datetime.cpp:3926

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetime.cpp:3675
+#: ../src/common/datetime.cpp:3780

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetime.cpp:3665
+#: ../src/common/datetime.cpp:3770

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 


@@ -4314,7 +4436,7 @@ msgstr "没有错误"
 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetime.cpp:3820
+#: ../src/common/datetime.cpp:3925

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 


@@ -4330,6 +4452,10 @@ msgstr "对象不能有XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
 msgid "out of memory"
 msgstr "内存耗尽"
 

+#: ../src/common/debugrpt.cpp:478
+msgid "process context description"
+msgstr "进程上下文描述"
+

 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"


@@ -4338,12 +4464,12 @@ msgstr "读取错误"
 msgid "reading"
 msgstr "正在读入"
 
 msgid "reading"
 msgstr "正在读入"
 

-#: ../src/common/zipstrm.cpp:1730
+#: ../src/common/zipstrm.cpp:1744

 #, fuzzy, c-format
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 
 #, fuzzy, c-format
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 

-#: ../src/common/zipstrm.cpp:1727
+#: ../src/common/zipstrm.cpp:1741

 #, fuzzy, c-format
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 #, fuzzy, c-format
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"


@@ -4352,7 +4478,7 @@ msgstr "读入zip流 (条目 %s): 长度错误"
 msgid "reentrancy problem."
 msgstr "重入问题."
 
 msgid "reentrancy problem."
 msgstr "重入问题."
 

-#: ../src/common/datetime.cpp:3658
+#: ../src/common/datetime.cpp:3763

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 


@@ -4360,11 +4486,11 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetime.cpp:3673
+#: ../src/common/datetime.cpp:3778

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetime.cpp:3663
+#: ../src/common/datetime.cpp:3768

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 


@@ -4372,15 +4498,15 @@ msgstr "第七"
 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appbase.cpp:340
+#: ../src/common/appbase.cpp:351

 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetime.cpp:3672
+#: ../src/common/datetime.cpp:3777

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetime.cpp:3662
+#: ../src/common/datetime.cpp:3767

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 


@@ -4392,7 +4518,7 @@ msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 

-#: ../src/common/zipstrm.cpp:1633
+#: ../src/common/zipstrm.cpp:1647

 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 
 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 


@@ -4400,7 +4526,7 @@ msgstr "Zip头没有已存文件的长度信息"
 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/datetime.cpp:3666
+#: ../src/common/datetime.cpp:3771

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 


@@ -4408,11 +4534,11 @@ msgstr "第十"
 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:3659
+#: ../src/common/datetime.cpp:3764

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetime.cpp:3669
+#: ../src/common/datetime.cpp:3774

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 


@@ -4421,19 +4547,19 @@ msgstr "第十三"
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 

-#: ../src/common/datetime.cpp:3486
+#: ../src/common/datetime.cpp:3591

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetime.cpp:3488
+#: ../src/common/datetime.cpp:3593

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 

-#: ../src/common/datetime.cpp:3668
+#: ../src/common/datetime.cpp:3773

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetime.cpp:3676
+#: ../src/common/datetime.cpp:3781

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 


@@ -4445,12 +4571,12 @@ msgstr "下划线"
 msgid "underlined "
 msgstr "下划线 "
 
 msgid "underlined "
 msgstr "下划线 "
 

-#: ../src/common/fileconf.cpp:1926
+#: ../src/common/fileconf.cpp:1932

 #, fuzzy, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 #, fuzzy, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 

-#: ../src/generic/progdlgg.cpp:302
+#: ../src/generic/progdlgg.cpp:307

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 


@@ -4472,33 +4598,33 @@ msgstr "未知错误(错误号 %08x)."
 msgid "unknown line terminator"
 msgstr "未知行终止符"
 
 msgid "unknown line terminator"
 msgstr "未知行终止符"
 

-#: ../src/common/file.cpp:364 ../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:709
+#: ../src/common/fmapbase.cpp:712

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 

-#: ../src/common/docview.cpp:410
+#: ../src/common/docview.cpp:430

 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1362
+#: ../src/common/docview.cpp:1414

 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 

-#: ../src/common/zipstrm.cpp:1647 ../src/common/zipstrm.cpp:2002
+#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031

 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 
 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 

-#: ../src/common/zipstrm.cpp:1137
+#: ../src/common/zipstrm.cpp:1142

 msgid "unsupported zip archive"
 msgstr "不支持的zip存档"
 
 msgid "unsupported zip archive"
 msgstr "不支持的zip存档"
 

-#: ../src/common/intl.cpp:1119
+#: ../src/common/intl.cpp:1114

 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."


@@ -4511,16 +4637,16 @@ msgstr "写错误"
 msgid "writing"
 msgstr "正在写入"
 
 msgid "writing"
 msgstr "正在写入"
 

-#: ../src/common/stopwatch.cpp:235
+#: ../src/common/stopwatch.cpp:281

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 

-#: ../src/common/socket.cpp:414 ../src/common/socket.cpp:468
+#: ../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中无效的签名."
 
 #: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 

-#: ../src/common/socket.cpp:965 ../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: 未知事件!."
 


@@ -4533,7 +4659,7 @@ 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:3487
+#: ../src/common/datetime.cpp:3592

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 


@@ -4542,6 +4668,7 @@ msgstr "昨天"
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 

-#: ../src/common/prntbase.cpp:840
+#: ../src/common/prntbase.cpp:839

 msgid "|<<"
 msgid "|<<"

-msgstr "|<<"
+msgstr ""
+