Rebake after Mac bundle change.

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index f2662805cb18d89522790240b02d5c07ba671d09..f6a3b69d77622a586a98dcaf583f6cdb90b4a1f7 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,646 +1,1081 @@
+# Simplified Chinese Messages for wxWidgets
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the wxWidgets package.
+# mrfx <mrfx@fm365.com>
+# Liu Xiao Xi <liouxiao@hotmail.com>, 2005
+#
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:424
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:429
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWidgets-2.5.2\n"
-"POT-Creation-Date: 2005-04-10 21:39+0200\n"
-"PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
-"Last-Translator: Liu XiaoXi <liouxiao@hotmail.com>\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-04-24 09:31+0200\n"
+"PO-Revision-Date: 2005-12-21 10:38+0800\n"
+"Last-Translator: Liu Xiao Xi <liouxiao@hotmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"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/common/debugrpt.cpp:550
+#: ../src/common/debugrpt.cpp:578
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
+"\n"
+"请将报告发送给程序维护人员, 谢谢!\n"
 
-#: ../src/palmos/utils.cpp:205
+#: ../src/richtext/richtextstyledlg.cpp:202
+#: ../src/richtext/richtextstyledlg.cpp:214 ../src/palmos/utils.cpp:265
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:298
+#: ../src/generic/dbgrptg.cpp:322
 msgid "              Thank you and we're sorry for the inconvenience!\n"
-msgstr ""
+msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:411
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 
-#: ../src/common/docview.cpp:1432
+#: ../src/common/docview.cpp:1464
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:570
+#: ../src/richtext/richtextprint.cpp:549 ../src/html/htmprint.cpp:579
 msgid " Preview"
 msgstr " 预览"
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/fontcmn.cpp:620
+#, fuzzy
+msgid " bold"
+msgstr "粗体"
+
+#: ../src/common/fontcmn.cpp:636
+#, fuzzy
+msgid " italic"
+msgstr "斜体"
+
+#: ../src/common/fontcmn.cpp:616
+#, fuzzy
+msgid " light"
+msgstr "细"
+
+#: ../src/common/paper.cpp:119
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:120
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:121
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "#12 信封, 4 3/4 x 11 英寸"
 
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:122
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "#14 信封, 5 x 11 1/2 英寸"
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:118
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
 
-#: ../contrib/src/deprecated/resource.cpp:1808
-#: ../contrib/src/deprecated/resource.cpp:1938
-#: ../contrib/src/deprecated/resource.cpp:3026
+#: ../src/common/filename.cpp:2368
+#, c-format
+msgid "%.*f GB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2366
+#, c-format
+msgid "%.*f MB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2370
+#, c-format
+msgid "%.*f TB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2364
 #, c-format
-msgid "#define %s must be an integer."
-msgstr "#所定义的 %s 必须是整数."
+msgid "%.*f kB"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpwnd.cpp:1047 ../src/html/helpwnd.cpp:1049
+#: ../src/html/helpwnd.cpp:1681 ../src/html/helpwnd.cpp:1719
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 
-#: ../src/generic/filedlgg.cpp:295
+#: ../src/generic/filectrlg.cpp:314
+#, fuzzy, c-format
+msgid "%ld byte"
+msgid_plural "%ld bytes"
+msgstr[0] "%ld 字节"
+msgstr[1] "%ld 字节"
+
+#: ../src/gtk/print.cpp:677
 #, c-format
-msgid "%ld bytes"
-msgstr "%ld 字节"
+msgid "%s"
+msgstr ""
 
-#: ../src/common/cmdline.cpp:851
+#: ../src/common/cmdline.cpp:922
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:266
+#: ../src/common/filename.cpp:2362
+#, c-format
+msgid "%s B"
+msgstr ""
+
+#: ../src/generic/logg.cpp:285
 #, c-format
 msgid "%s Error"
 msgstr "%s 错误"
 
-#: ../src/generic/logg.cpp:274
+#: ../src/generic/logg.cpp:293
 #, c-format
 msgid "%s Information"
 msgstr "%s 信息"
 
-#: ../src/generic/logg.cpp:270
+#: ../src/generic/logg.cpp:289
 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"
 
-#: ../src/common/fldlgcmn.cpp:81
+#: ../src/common/tarstrm.cpp:1311
+#, c-format
+msgid "%s did not fit the tar header for entry '%s'"
+msgstr ""
+
+#: ../src/common/fldlgcmn.cpp:96
 #, c-format
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 
-#: ../src/common/msgout.cpp:189
+#: ../src/common/msgout.cpp:209
 #, c-format
 msgid "%s message"
 msgstr "%s 消息"
 
-#: ../contrib/src/deprecated/resource.cpp:2390
-#, c-format
-msgid "%s not a bitmap resource specification."
-msgstr "%s 不是位图资源."
-
-#: ../contrib/src/deprecated/resource.cpp:2544
-#, c-format
-msgid "%s not an icon resource specification."
-msgstr "%s 不是图标资源."
-
-#: ../contrib/src/deprecated/resource.cpp:1901
-#: ../contrib/src/deprecated/resource.cpp:2030
-#: ../contrib/src/deprecated/resource.cpp:3123
-#, c-format
-msgid "%s: ill-formed resource file syntax."
-msgstr "%s: 不良资源文件语法."
-
-#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+#: ../src/common/stockitem.cpp:110 ../src/html/helpfrm.cpp:130
+#: ../src/html/helpfrm.cpp:132
 msgid "&About..."
-msgstr "关于[&A]"
+msgstr "关于(&A)"
 
-#: ../src/common/stockitem.cpp:153
+#: ../src/common/stockitem.cpp:160
 msgid "&Actual Size"
-msgstr "实际大小[&A]"
+msgstr "实际大小(&A)"
+
+#: ../src/richtext/richtextindentspage.cpp:296
+msgid "&After a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:138
+#, fuzzy
+msgid "&Alignment"
+msgstr "左对齐"
 
-#: ../src/common/stockitem.cpp:108
+#: ../src/common/stockitem.cpp:112
 msgid "&Apply"
-msgstr "应用[&A]"
+msgstr "应用(&A)"
+
+#: ../src/richtext/richtextstyledlg.cpp:237
+#, fuzzy
+msgid "&Apply Style"
+msgstr "应用(&A)"
 
-#: ../src/msw/mdi.cpp:190
+#: ../src/msw/mdi.cpp:171
 msgid "&Arrange Icons"
-msgstr "重排图标[&A]"
+msgstr "重排图标(&A)"
 
-#: ../src/common/stockitem.cpp:118
+#: ../src/common/stockitem.cpp:124
 msgid "&Back"
-msgstr "返回[&B]"
+msgstr "返回(&B)"
+
+#: ../src/richtext/richtextstylepage.cpp:112
+msgid "&Based on:"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:284
+msgid "&Before a paragraph:"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:109
+#: ../src/common/stockitem.cpp:113
 msgid "&Bold"
-msgstr "粗体[&B]"
+msgstr "粗体(&B)"
+
+#: ../src/richtext/richtextliststylepage.cpp:209
+#: ../src/richtext/richtextbulletspage.cpp:157
+msgid "&Bullet style:"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:418
+#: ../src/common/stockitem.cpp:114 ../src/generic/fontdlgg.cpp:472
+#: ../src/generic/fontdlgg.cpp:491 ../src/generic/wizard.cpp:458
+#: ../src/mac/carbon/fontdlg.cpp:564
 msgid "&Cancel"
-msgstr "取消[&C]"
+msgstr "取消(&C)"
 
-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:167
 msgid "&Cascade"
-msgstr "层叠[&C]"
+msgstr "层叠(&C)"
 
-#: ../src/common/stockitem.cpp:111
+#: ../src/richtext/richtextsymboldlg.cpp:432
+msgid "&Character code:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:115
 msgid "&Clear"
-msgstr "清除[&C]"
+msgstr "清除(&C)"
 
-#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354
+#: ../src/common/prntbase.cpp:1115 ../src/common/stockitem.cpp:116
+#: ../src/html/helpfrm.cpp:127 ../src/generic/logg.cpp:539
 msgid "&Close"
-msgstr "关闭[&C]"
+msgstr "关闭(&C)"
 
-#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065
+#: ../src/richtext/richtextfontpage.cpp:213
+#, fuzzy
+msgid "&Colour:"
+msgstr "颜色(&o):"
+
+#: ../src/common/stockitem.cpp:117 ../src/richtext/richtextctrl.cpp:2596
+#: ../src/msw/textctrl.cpp:2152 ../src/mac/carbon/textctrl.cpp:1065
 msgid "&Copy"
-msgstr "复制[&C]"
+msgstr "复制(&C)"
 
-#: ../src/generic/dbgrptg.cpp:306
+#: ../src/generic/hyperlinkg.cpp:150
+#, fuzzy
+msgid "&Copy URL"
+msgstr "复制(&C)"
+
+#: ../src/generic/dbgrptg.cpp:330
 msgid "&Debug report preview:"
-msgstr ""
+msgstr "调试报告预览(&D): "
 
-#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067
+#: ../src/common/stockitem.cpp:119 ../src/richtext/richtextctrl.cpp:2598
+#: ../src/richtext/richtexttabspage.cpp:142 ../src/msw/textctrl.cpp:2154
+#: ../src/mac/carbon/textctrl.cpp:1067
 msgid "&Delete"
-msgstr "删除[&D]"
+msgstr "删除(&D)"
 
-#: ../src/generic/logg.cpp:718
+#: ../src/richtext/richtextstyledlg.cpp:255
+#, fuzzy
+msgid "&Delete Style..."
+msgstr "删除项"
+
+#: ../src/generic/logg.cpp:750
 msgid "&Details"
-msgstr "细节[&D]"
+msgstr "细节(&D)"
 
-#: ../src/common/stockitem.cpp:119
+#: ../src/common/stockitem.cpp:125
 msgid "&Down"
-msgstr "向下[&D]"
+msgstr "向下(&D)"
+
+#: ../src/common/stockitem.cpp:120
+msgid "&Edit"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:361
+#: ../src/richtext/richtextstyledlg.cpp:249
+#, fuzzy
+msgid "&Edit Style..."
+msgstr "编辑项"
+
+#: ../src/common/stockitem.cpp:122 ../src/html/helpfrm.cpp:134
 msgid "&File"
-msgstr "文件[&F]"
+msgstr "文件(&F)"
 
-#: ../src/common/stockitem.cpp:116
+#: ../src/common/stockitem.cpp:121
 msgid "&Find"
-msgstr "查找[&F]"
+msgstr "查找(&F)"
 
-#: ../src/generic/wizard.cpp:606
+#: ../src/generic/wizard.cpp:660
 msgid "&Finish"
-msgstr "完成[&F]"
+msgstr "完成(&F)"
 
-#: ../src/generic/fontdlgg.cpp:273
+#: ../src/generic/fontdlgg.cpp:373
 msgid "&Font family:"
-msgstr "字体[&F]:"
+msgstr "字体(&F):"
 
-#: ../src/common/stockitem.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:193
+msgid "&Font for Level..."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:393
+#: ../src/richtext/richtextfontpage.cpp:134
+#, fuzzy
+msgid "&Font:"
+msgstr "字体(&F):"
+
+#: ../src/common/stockitem.cpp:126
 msgid "&Forward"
-msgstr "向前[&F]"
+msgstr "向前(&F)"
 
-#: ../src/common/prntbase.cpp:863
+#: ../src/richtext/richtextsymboldlg.cpp:444
+#, fuzzy
+msgid "&From:"
+msgstr "从:"
+
+#: ../src/common/prntbase.cpp:1161
 msgid "&Goto..."
-msgstr "跳转[&G]..."
+msgstr "跳转(&G)..."
 
-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
-#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:128 ../src/html/helpfrm.cpp:135
+#: ../src/generic/wizard.cpp:454 ../src/generic/wizard.cpp:461
+#: ../src/mac/carbon/menu.cpp:772
 msgid "&Help"
-msgstr "帮助[&H]"
+msgstr "帮助(&H)"
 
-#: ../src/common/stockitem.cpp:123
-#, fuzzy
+#: ../src/common/stockitem.cpp:129
 msgid "&Home"
-msgstr "Home[&H]"
+msgstr "Home(&H)"
 
-#: ../src/common/stockitem.cpp:125
+#: ../src/richtext/richtextliststylepage.cpp:371
+#: ../src/richtext/richtextindentspage.cpp:194
+msgid "&Indentation (tenths of a mm)"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:355
+#: ../src/richtext/richtextindentspage.cpp:177
+#, fuzzy
+msgid "&Indeterminate"
+msgstr "下划线(&U)"
+
+#: ../src/common/stockitem.cpp:131
 msgid "&Index"
-msgstr "索引[&I]"
+msgstr "索引(&I)"
 
-#: ../src/common/stockitem.cpp:126
+#: ../src/common/stockitem.cpp:132
 msgid "&Italic"
-msgstr "斜体[&I]"
+msgstr "斜体(&I)"
+
+#: ../src/richtext/richtextliststylepage.cpp:341
+#: ../src/richtext/richtextindentspage.cpp:163
+#, fuzzy
+msgid "&Justified"
+msgstr "分散对齐"
+
+#: ../src/richtext/richtextliststylepage.cpp:327
+#: ../src/richtext/richtextindentspage.cpp:149
+msgid "&Left"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:380
+#: ../src/richtext/richtextindentspage.cpp:205
+msgid "&Left:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:182
+msgid "&List level:"
+msgstr ""
 
-#: ../src/generic/logg.cpp:513
+#: ../src/generic/logg.cpp:540
 msgid "&Log"
-msgstr "日志[&L]"
+msgstr "日志(&L)"
 
-#: ../src/univ/themes/win32.cpp:4817
+#: ../src/univ/themes/win32.cpp:3734
 msgid "&Move"
-msgstr "移动[&M]"
+msgstr "移动(&M)"
 
-#: ../src/common/stockitem.cpp:131
+#: ../src/common/stockitem.cpp:137 ../src/richtext/richtexttabspage.cpp:136
 msgid "&New"
-msgstr "新建[&N]"
+msgstr "新建(&N)"
 
-#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:118
+#: ../src/msw/mdi.cpp:172
 msgid "&Next"
-msgstr "下一个[&N]"
+msgstr "下一个(&N)"
 
-#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
+#: ../src/generic/wizard.cpp:457 ../src/generic/wizard.cpp:658
 msgid "&Next >"
-msgstr "下一个[&N] >"
+msgstr "下一个(&N) >"
 
-#: ../src/generic/tipdlg.cpp:243
+#: ../src/generic/tipdlg.cpp:274
 msgid "&Next Tip"
-msgstr "下一技巧[&N]"
+msgstr "下一技巧(&N)"
 
-#: ../src/common/stockitem.cpp:132
+#: ../src/richtext/richtextstylepage.cpp:122
+#, fuzzy
+msgid "&Next style:"
+msgstr "下一个(&N) >"
+
+#: ../src/common/stockitem.cpp:138
 msgid "&No"
-msgstr "否[&N]"
+msgstr "否(&N)"
 
-#: ../src/generic/dbgrptg.cpp:328
-#, fuzzy
+#: ../src/generic/dbgrptg.cpp:352
 msgid "&Notes:"
-msgstr "否[&N]"
+msgstr "注意(&N):"
 
-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-#: ../src/generic/fontdlgg.cpp:375
-msgid "&OK"
-msgstr "确认[&O]"
+#: ../src/richtext/richtextbulletspage.cpp:262
+msgid "&Number:"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:134
-msgid "&Open"
-msgstr "打开[&O]"
+#: ../src/common/stockitem.cpp:139 ../src/generic/fontdlgg.cpp:477
+#: ../src/generic/fontdlgg.cpp:484 ../src/mac/carbon/fontdlg.cpp:570
+msgid "&OK"
+msgstr "确认(&O)"
 
-#: ../src/html/helpfrm.cpp:352
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:125
 msgid "&Open..."
-msgstr "打开[&O]..."
+msgstr "打开(&O)..."
+
+#: ../src/richtext/richtextindentspage.cpp:241
+msgid "&Outline level:"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066
+#: ../src/common/stockitem.cpp:141 ../src/richtext/richtextctrl.cpp:2597
+#: ../src/msw/textctrl.cpp:2153 ../src/mac/carbon/textctrl.cpp:1066
 msgid "&Paste"
-msgstr "粘贴[&P]"
+msgstr "粘贴(&P)"
 
-#: ../src/generic/fontdlgg.cpp:324
+#: ../src/generic/fontdlgg.cpp:424
 msgid "&Point size:"
-msgstr "字体大小(Point size)[&P]:"
+msgstr "字体大小(Point size)(&P):"
 
-#: ../src/common/stockitem.cpp:136
+#: ../src/richtext/richtexttabspage.cpp:113
+msgid "&Position (tenths of a mm):"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:142
 msgid "&Preferences"
-msgstr "偏好设置"
+msgstr "偏好设置(&P)"
 
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
+#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:119
+#: ../src/msw/mdi.cpp:173
 msgid "&Previous"
-msgstr "前页[&P]"
+msgstr "前页(&P)"
 
-#: ../src/common/stockitem.cpp:137
-msgid "&Print"
-msgstr "打印[&P]"
-
-#: ../src/common/prntbase.cpp:833
+#: ../src/common/prntbase.cpp:1120 ../src/common/stockitem.cpp:143
 msgid "&Print..."
-msgstr "打印[&P]..."
+msgstr "打印(&P)..."
 
-#: ../src/common/stockitem.cpp:139
+#: ../src/common/stockitem.cpp:145
 msgid "&Properties"
-msgstr "属性[&P]"
+msgstr "属性(&P)"
 
-#: ../src/common/stockitem.cpp:140
+#: ../src/common/stockitem.cpp:146
 msgid "&Quit"
-msgstr "退出[&Q]"
+msgstr "退出(&Q)"
 
-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062
+#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:295
+#: ../src/common/stockitem.cpp:147 ../src/richtext/richtextctrl.cpp:2593
+#: ../src/msw/textctrl.cpp:2149 ../src/mac/carbon/textctrl.cpp:1062
 msgid "&Redo"
-msgstr "重复[&R]"
+msgstr "重复(&R)"
 
-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
+#: ../src/common/cmdproc.cpp:284 ../src/common/cmdproc.cpp:304
 msgid "&Redo "
-msgstr "重复[&R] "
+msgstr "重复(&R) "
+
+#: ../src/richtext/richtextstyledlg.cpp:243
+msgid "&Rename Style..."
+msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:185
+#: ../src/generic/fdrepdlg.cpp:180
 msgid "&Replace"
-msgstr "替换[&R]"
+msgstr "替换(&R)"
 
-#: ../src/univ/themes/win32.cpp:4816
+#: ../src/richtext/richtextstyledlg.cpp:273
+msgid "&Restart numbering"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3733
 msgid "&Restore"
-msgstr "复原[&R]"
+msgstr "复原(&R)"
 
-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextliststylepage.cpp:334
+#: ../src/richtext/richtextindentspage.cpp:156
+#, fuzzy
+msgid "&Right"
+msgstr "细"
+
+#: ../src/richtext/richtextliststylepage.cpp:402
+#: ../src/richtext/richtextindentspage.cpp:229
+#, fuzzy
+msgid "&Right:"
+msgstr "字体粗细(&W):"
+
+#: ../src/common/stockitem.cpp:151
 msgid "&Save"
-msgstr "保存[&S]"
+msgstr "保存(&S)"
 
-#: ../src/generic/logg.cpp:508
+#: ../src/generic/logg.cpp:535
 msgid "&Save..."
-msgstr "保存[&S]..."
+msgstr "保存(&S)..."
 
-#: ../src/generic/tipdlg.cpp:238
+#: ../src/generic/tipdlg.cpp:268
 msgid "&Show tips at startup"
-msgstr "启动时显示技巧[&S]"
+msgstr "启动时显示技巧(&S)"
 
-#: ../src/univ/themes/win32.cpp:4819
+#: ../src/univ/themes/win32.cpp:3736
 msgid "&Size"
-msgstr "大小[&S]"
+msgstr "大小(&S)"
+
+#: ../src/richtext/richtextfontpage.cpp:152
+#, fuzzy
+msgid "&Size:"
+msgstr "大小(&S)"
 
-#: ../src/common/stockitem.cpp:147
+#: ../src/generic/progdlgg.cpp:246
+#, fuzzy
+msgid "&Skip"
+msgstr "跳过"
+
+#: ../src/richtext/richtextliststylepage.cpp:422
+#: ../src/richtext/richtextindentspage.cpp:272
+msgid "&Spacing (tenths of a mm)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:154
 msgid "&Stop"
-msgstr "停止[&S]"
+msgstr "停止(&S)"
+
+#: ../src/richtext/richtextfontpage.cpp:225
+msgid "&Strikethrough"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:284
+#: ../src/richtext/richtextstylepage.cpp:103 ../src/generic/fontdlgg.cpp:384
 msgid "&Style:"
-msgstr "字体[S]:"
+msgstr "字体(&S):"
+
+#: ../src/richtext/richtextstyledlg.cpp:190
+#, fuzzy
+msgid "&Styles:"
+msgstr "字体(&S):"
+
+#: ../src/richtext/richtextsymboldlg.cpp:406
+msgid "&Subset:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:267
+#: ../src/richtext/richtextbulletspage.cpp:217
+#, fuzzy
+msgid "&Symbol:"
+msgstr "字体(&S):"
 
-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/common/stockitem.cpp:156 ../src/generic/fontdlgg.cpp:446
 msgid "&Underline"
-msgstr "下划线[&U]"
+msgstr "下划线(&U)"
+
+#: ../src/richtext/richtextfontpage.cpp:200
+#, fuzzy
+msgid "&Underlining:"
+msgstr "下划线(&U)"
 
-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/msw/textctrl.cpp:2061
+#: ../src/common/cmdproc.cpp:266 ../src/common/stockitem.cpp:157
+#: ../src/richtext/richtextctrl.cpp:2592 ../src/msw/textctrl.cpp:2148
+#: ../src/mac/carbon/textctrl.cpp:1061
 msgid "&Undo"
-msgstr "恢复[&U]"
+msgstr "恢复(&U)"
 
-#: ../src/common/cmdproc.cpp:264
+#: ../src/common/cmdproc.cpp:260
 msgid "&Undo "
-msgstr "恢复[&U] "
+msgstr "恢复(&U) "
 
-#: ../src/common/stockitem.cpp:151
+#: ../src/common/stockitem.cpp:158
 msgid "&Unindent"
-msgstr "取消缩进[&U]"
+msgstr "取消缩进(&U)"
 
-#: ../src/common/stockitem.cpp:121
+#: ../src/common/stockitem.cpp:127
 msgid "&Up"
-msgstr "向上[&U]"
+msgstr "向上(&U)"
 
-#: ../src/generic/fontdlgg.cpp:295
+#: ../src/generic/fontdlgg.cpp:395
 msgid "&Weight:"
-msgstr "字体粗细[&W]:"
+msgstr "字体粗细(&W):"
 
-#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
-#: ../src/msw/mdi.cpp:1424
+#: ../src/aui/tabmdi.cpp:301 ../src/aui/tabmdi.cpp:317
+#: ../src/aui/tabmdi.cpp:319 ../src/generic/mdig.cpp:298
+#: ../src/generic/mdig.cpp:314 ../src/generic/mdig.cpp:318
+#: ../src/msw/mdi.cpp:1429 ../src/msw/mdi.cpp:1437 ../src/msw/mdi.cpp:1467
 msgid "&Window"
-msgstr "窗口[&W]"
+msgstr "窗口(&W)"
 
-#: ../src/common/stockitem.cpp:152
+#: ../src/common/stockitem.cpp:159
 msgid "&Yes"
-msgstr "是[&Y]"
+msgstr "是(&Y)"
 
-#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
+#: ../src/common/config.cpp:482 ../src/msw/regconf.cpp:259
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有额外的 '..', 忽略之."
 
-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-#: ../src/common/valtext.cpp:168
+#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
+#: ../src/common/valtext.cpp:183
 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' 是无效的"
 
-#: ../src/common/cmdline.cpp:769
+#: ../src/common/cmdline.cpp:820 ../src/common/cmdline.cpp:838
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 
-#: ../src/common/intl.cpp:1146
+#: ../src/common/intl.cpp:1283
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 
-#: ../src/common/textbuf.cpp:246
+#: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或许是一个二进制文件."
 
-#: ../src/common/valtext.cpp:157
+#: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' should be numeric."
 msgstr "'%s' 应该是一个数值."
 
-#: ../src/common/valtext.cpp:139
+#: ../src/common/valtext.cpp:154
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr "'%s' 应该仅包含ASCII字符."
 
-#: ../src/common/valtext.cpp:145
+#: ../src/common/valtext.cpp:160
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr "'%s' 应仅包含字母字符."
 
-#: ../src/common/valtext.cpp:151
+#: ../src/common/valtext.cpp:166
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 应仅包含字母或数字字符."
 
-#: ../src/html/helpfrm.cpp:976
+#: ../src/richtext/richtextliststylepage.cpp:228
+#: ../src/richtext/richtextbulletspage.cpp:177
+msgid "(*)"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:638 ../src/html/helpwnd.cpp:982
 msgid "(Help)"
 msgstr "(帮助)"
 
-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-#: ../src/html/helpfrm.cpp:1764
+#: ../src/richtext/richtextliststylepage.cpp:483
+#: ../src/richtext/richtextbulletspage.cpp:281
+msgid "(None)"
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:493
+#, fuzzy
+msgid "(Normal text)"
+msgstr "正常字体:"
+
+#: ../src/html/helpwnd.cpp:412 ../src/html/helpwnd.cpp:1118
+#: ../src/html/helpwnd.cpp:1746
 msgid "(bookmarks)"
 msgstr "(书签)"
 
-#: ../src/common/debugrpt.cpp:537
-msgid "*** A debug report has been generated\n"
+#: ../src/richtext/richtextformatdlg.cpp:630
+#, fuzzy
+msgid "(none)"
+msgstr "未名"
+
+#: ../src/richtext/richtextliststylepage.cpp:494
+#: ../src/richtext/richtextbulletspage.cpp:292
+msgid "*"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:540
-msgid "*** And includes the following files:\n"
+#: ../src/richtext/richtextliststylepage.cpp:235
+#: ../src/richtext/richtextbulletspage.cpp:184
+msgid "*)"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:538
-#, c-format
-msgid "*** It can be found in \"%s\"\n"
+#: ../src/richtext/richtextliststylepage.cpp:497
+#: ../src/richtext/richtextbulletspage.cpp:295
+msgid "+"
 msgstr ""
 
-#: ../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."
+#: ../src/richtext/richtextliststylepage.cpp:495
+#: ../src/richtext/richtextbulletspage.cpp:293
+msgid "-"
 msgstr ""
-", 期望 static, #include 或 #define\n"
-"同时对资源进行语法分析."
 
-#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747
-msgid "."
-msgstr "."
+#: ../src/richtext/richtextindentspage.cpp:246
+msgid "1"
+msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748
-msgid ".."
-msgstr ".."
+#: ../src/richtext/richtextliststylepage.cpp:460
+#: ../src/richtext/richtextindentspage.cpp:315
+msgid "1.5"
+msgstr ""
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:142
+msgid "10 x 11 in"
+msgstr "10 x 11 英寸"
+
+#: ../src/common/paper.cpp:115
 msgid "10 x 14 in"
 msgstr "10 x 14 英寸"
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:116
 msgid "11 x 17 in"
 msgstr "11 x 17 英寸"
 
-#: ../src/common/paper.cpp:146
+#: ../src/common/paper.cpp:186
+msgid "12 x 11 in"
+msgstr "12 x 11 英寸"
+
+#: ../src/common/paper.cpp:143
+msgid "15 x 11 in"
+msgstr "15 x 11 英寸"
+
+#: ../src/richtext/richtextliststylepage.cpp:461
+#: ../src/richtext/richtextindentspage.cpp:247
+#: ../src/richtext/richtextindentspage.cpp:316
+msgid "2"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:248
+msgid "3"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:249
+msgid "4"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:250
+msgid "5"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:251
+msgid "6"
+msgstr ""
+
+#: ../src/common/paper.cpp:134
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
 
-#: ../src/html/htmprint.cpp:309
+#: ../src/richtext/richtextindentspage.cpp:252
+msgid "7"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:253
+msgid "8"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:254
+msgid "9"
+msgstr ""
+
+#: ../src/common/paper.cpp:141
+msgid "9 x 11 in"
+msgstr "9 x 11 英寸"
+
+#: ../src/html/htmprint.cpp:303
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 
-#: ../src/common/fontmap.cpp:200
+#: ../src/common/fontmap.cpp:197
 msgid ": unknown charset"
 msgstr ": 未知字符集"
 
-#: ../src/common/fontmap.cpp:414
+#: ../src/common/fontmap.cpp:411
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
-#: ../src/generic/wizard.cpp:423
+#: ../src/generic/wizard.cpp:463
 msgid "< &Back"
-msgstr "< 返回[&B]"
+msgstr "< 返回(&B)"
 
-#: ../src/common/prntbase.cpp:845
+#: ../src/common/prntbase.cpp:1143
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289
+#: ../src/mac/carbon/fontdlg.cpp:584 ../src/mac/carbon/fontdlg.cpp:791
+#: ../src/mac/carbon/fontdlg.cpp:811
+#, fuzzy
+msgid "<Any Decorative>"
+msgstr "修饰"
+
+#: ../src/mac/carbon/fontdlg.cpp:585 ../src/mac/carbon/fontdlg.cpp:793
+#: ../src/mac/carbon/fontdlg.cpp:813
+#, fuzzy
+msgid "<Any Modern>"
+msgstr "现代"
+
+#: ../src/mac/carbon/fontdlg.cpp:583 ../src/mac/carbon/fontdlg.cpp:789
+#: ../src/mac/carbon/fontdlg.cpp:809
+#, fuzzy
+msgid "<Any Roman>"
+msgstr "罗马"
+
+#: ../src/mac/carbon/fontdlg.cpp:586 ../src/mac/carbon/fontdlg.cpp:795
+#: ../src/mac/carbon/fontdlg.cpp:815
+#, fuzzy
+msgid "<Any Script>"
+msgstr "Script"
+
+#: ../src/mac/carbon/fontdlg.cpp:587 ../src/mac/carbon/fontdlg.cpp:800
+#: ../src/mac/carbon/fontdlg.cpp:819
+#, fuzzy
+msgid "<Any Swiss>"
+msgstr "瑞士"
+
+#: ../src/mac/carbon/fontdlg.cpp:588 ../src/mac/carbon/fontdlg.cpp:797
+#: ../src/mac/carbon/fontdlg.cpp:817
+#, fuzzy
+msgid "<Any Teletype>"
+msgstr "电传打字机"
+
+#: ../src/mac/carbon/fontdlg.cpp:582
+msgid "<Any>"
+msgstr ""
+
+#: ../src/generic/filectrlg.cpp:285 ../src/generic/filectrlg.cpp:308
 msgid "<DIR>"
 msgstr "<目录>"
 
-#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293
+#: ../src/generic/filectrlg.cpp:289 ../src/generic/filectrlg.cpp:312
 msgid "<DRIVE>"
 msgstr "<盘符>"
 
-#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291
+#: ../src/generic/filectrlg.cpp:287 ../src/generic/filectrlg.cpp:310
 msgid "<LINK>"
 msgstr "<连接>"
 
-#: ../src/html/helpfrm.cpp:1276
+#: ../src/html/helpwnd.cpp:1274
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜体.</i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1280
+#: ../src/html/helpwnd.cpp:1278
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1275
+#: ../src/html/helpwnd.cpp:1273
 msgid "<b>Bold face.</b> "
 msgstr "<b>粗体.</b> "
 
-#: ../src/html/helpfrm.cpp:1274
+#: ../src/html/helpwnd.cpp:1272
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 
-#: ../src/common/prntbase.cpp:851
+#: ../src/richtext/richtextliststylepage.cpp:496
+#: ../src/richtext/richtextbulletspage.cpp:294
+#, fuzzy
+msgid ">"
+msgstr ">>"
+
+#: ../src/common/prntbase.cpp:1149
 msgid ">>"
 msgstr ">>"
 
-#: ../src/common/prntbase.cpp:857
+#: ../src/common/prntbase.cpp:1155
 msgid ">>|"
 msgstr ">>|"
 
-#: ../src/generic/dbgrptg.cpp:285
+#: ../src/generic/dbgrptg.cpp:314
 msgid "A debug report has been generated in the directory\n"
-msgstr ""
+msgstr "产生了一份调试报告, 位于目录\n"
+
+#: ../src/common/debugrpt.cpp:565
+#, fuzzy
+msgid "A debug report has been generated. It can be found in"
+msgstr "产生了一份调试报告, 位于目录\n"
 
-#: ../src/common/xtixml.cpp:409
+#: ../src/common/xtixml.cpp:406
+#, fuzzy
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 
-#: ../src/common/paper.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:303
+#: ../src/richtext/richtextliststylepage.cpp:305
+#: ../src/richtext/richtextbulletspage.cpp:255
+#: ../src/richtext/richtextbulletspage.cpp:257
+msgid "A standard bullet name."
+msgstr ""
+
+#: ../src/common/paper.cpp:161
+msgid "A2 420 x 594 mm"
+msgstr "A2 纸张, 420 x 594 毫米"
+
+#: ../src/common/paper.cpp:158
+msgid "A3 Extra 322 x 445 mm"
+msgstr "特大 A3 纸张, 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:163
+msgid "A3 Extra Transverse 322 x 445 mm"
+msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:172
+msgid "A3 Rotated 420 x 297 mm"
+msgstr "横向 A3 纸张, 420 x 297 毫米"
+
+#: ../src/common/paper.cpp:162
+msgid "A3 Transverse 297 x 420 mm"
+msgstr "A3 纸张(横排), 297 x 420 毫米"
+
+#: ../src/common/paper.cpp:108
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 纸张, 297 x 420 毫米"
 
-#: ../src/common/paper.cpp:111
+#: ../src/common/paper.cpp:148
+msgid "A4 Extra 9.27 x 12.69 in"
+msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:155
+msgid "A4 Plus 210 x 330 mm"
+msgstr "加大 A4 纸张, 210 x 330 毫米"
+
+#: ../src/common/paper.cpp:173
+msgid "A4 Rotated 297 x 210 mm"
+msgstr "横向 A4 纸张, 297 x 210 毫米"
+
+#: ../src/common/paper.cpp:150
+msgid "A4 Transverse 210 x 297 mm"
+msgstr "A4 纸张(横排), 210 x 297 毫米"
+
+#: ../src/common/paper.cpp:99
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:109
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 小纸张, 210 x 297 毫米"
+msgstr "小 A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:159
+msgid "A5 Extra 174 x 235 mm"
+msgstr "特大 A5 纸张, 174 x 235 毫米"
+
+#: ../src/common/paper.cpp:174
+msgid "A5 Rotated 210 x 148 mm"
+msgstr "横向 A5 纸张, 210 x 148 毫米"
+
+#: ../src/common/paper.cpp:156
+msgid "A5 Transverse 148 x 210 mm"
+msgstr "A5 纸张(横排), 148 x 210 毫米"
+
+#: ../src/common/paper.cpp:110
 msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5 纸张, 148 x 210 毫米"
 
-#: ../src/generic/fontdlgg.cpp:87
+#: ../src/common/paper.cpp:166
+msgid "A6 105 x 148 mm"
+msgstr "A6 纸张, 105 x 148 毫米"
+
+#: ../src/common/paper.cpp:179
+msgid "A6 Rotated 148 x 105 mm"
+msgstr "横向 A5 纸张, 148 x 105 毫米"
+
+#: ../src/richtext/richtextformatdlg.cpp:426 ../src/generic/fontdlgg.cpp:85
+#: ../src/mac/carbon/fontdlg.cpp:315
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/accelcmn.cpp:75
+msgid "ADD"
+msgstr ""
+
+#: ../src/common/ftp.cpp:382 ../src/richtext/richtextsymboldlg.cpp:451
+#: ../src/richtext/richtextsymboldlg.cpp:453
+#: ../src/richtext/richtextsymboldlg.cpp:454
 msgid "ASCII"
 msgstr "ASCII"
 
-#: ../src/common/stockitem.cpp:107
+#: ../src/generic/aboutdlgg.cpp:106
+#, fuzzy
+msgid "About "
+msgstr "关于(&A)"
+
+#: ../src/msw/aboutdlg.cpp:65
+#, fuzzy, c-format
+msgid "About %s"
+msgstr "关于(&A)"
+
+#: ../src/common/stockitem.cpp:111
 msgid "Add"
 msgstr "加入"
 
-#: ../src/html/helpfrm.cpp:444
+#: ../src/html/helpwnd.cpp:425
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
-#: ../src/generic/colrdlgg.cpp:297
+#: ../src/generic/colrdlgg.cpp:289
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 
-#: ../include/wx/xti.h:902
-msgid "AddToPropertyCollection called on a generic accessor"
-msgstr "在一个通用处理器上调用AddToPropertyCollection"
-
-#: ../include/wx/xti.h:849
-msgid "AddToPropertyCollection called w/o valid adder"
-msgstr "调用AddToPropertyCollection时未带有效的adder"
+#: ../src/mac/carbon/dataview.cpp:220
+msgid "Added item is invalid."
+msgstr ""
 
-#: ../src/html/helpctrl.cpp:106
+#: ../src/html/helpctrl.cpp:139
 #, c-format
 msgid "Adding book %s"
 msgstr "正在添加卷 %s"
 
-#: ../src/common/stockitem.cpp:129
+#: ../src/richtext/richtextliststylepage.cpp:442
+msgid "After a paragraph:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:135
 msgid "Align Left"
 msgstr "左对齐"
 
-#: ../src/common/stockitem.cpp:130
+#: ../src/common/stockitem.cpp:136
 msgid "Align Right"
 msgstr "右对齐"
 
-#: ../src/generic/prntdlgg.cpp:209
+#: ../src/generic/prntdlgg.cpp:221
 msgid "All"
 msgstr "所有"
 
-#: ../src/common/fldlgcmn.cpp:64
+#: ../src/common/fldlgcmn.cpp:79 ../src/generic/filectrlg.cpp:1198
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
-#: ../include/wx/defs.h:2229
+#: ../include/wx/defs.h:2582
 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 
-#: ../src/html/helpfrm.cpp:1578
+#: ../src/html/helpwnd.cpp:1556
 msgid "All files (*.*)|*"
 msgstr "所有文件 (*)|*"
 
-#: ../include/wx/defs.h:2226
+#: ../include/wx/defs.h:2579
 msgid "All files (*.*)|*.*"
 msgstr "所有文件 (*)|*"
 
-#: ../src/common/xtistrm.cpp:385
+#: ../src/richtext/richtextstyles.cpp:838
+msgid "All styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:381
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
 
-#: ../src/unix/dialup.cpp:362
+#: ../src/unix/dialup.cpp:356
 msgid "Already dialling ISP."
 msgstr "已经拨接ISP."
 
-#: ../src/generic/logg.cpp:1164
+#: ../src/common/accelcmn.cpp:294
+msgid "Alt-"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:568
+#, fuzzy
+msgid "And includes the following files:\n"
+msgstr "*** 且包含以下文件:\n"
+
+#: ../src/generic/animateg.cpp:164
+#, fuzzy, c-format
+msgid "Animation file is not of type %ld."
+msgstr "图像文件的类型不是 %d."
+
+#: ../src/generic/logg.cpp:1087
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
 
-#: ../src/common/fmapbase.cpp:108
+#: ../src/richtext/richtextliststylepage.cpp:484
+#: ../src/richtext/richtextbulletspage.cpp:282
+msgid "Arabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:113
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯语 (ISO-8859-6)"
 
@@ -648,811 +1083,1395 @@ msgstr "阿拉伯语 (ISO-8859-6)"
 msgid "Archive doesnt contain #SYSTEM file"
 msgstr "存档里没有包含 #SYSTEM 文件"
 
-#: ../src/generic/filedlgg.cpp:447
+#: ../src/generic/aboutdlgg.cpp:150
+msgid "Artists"
+msgstr ""
+
+#: ../src/generic/filectrlg.cpp:467
 msgid "Attributes"
 msgstr "属性(Attributes)"
 
-#: ../src/common/paper.cpp:141
+#: ../src/richtext/richtextliststylepage.cpp:293
+#: ../src/richtext/richtextbulletspage.cpp:243
+#: ../src/richtext/richtextbulletspage.cpp:245
+msgid "Available fonts."
+msgstr ""
+
+#: ../src/common/paper.cpp:139
+msgid "B4 (ISO) 250 x 353 mm"
+msgstr "B4 纸张(ISO), 250 x 353 毫米"
+
+#: ../src/common/paper.cpp:175
+msgid "B4 (JIS) Rotated 364 x 257 mm"
+msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
+
+#: ../src/common/paper.cpp:129
 msgid "B4 Envelope, 250 x 353 mm"
 msgstr "B4 信封, 250 x 353 毫米"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:111
 msgid "B4 sheet, 250 x 354 mm"
 msgstr "B4 纸张, 250 x 354 毫米"
 
-#: ../src/common/paper.cpp:142
+#: ../src/common/paper.cpp:160
+msgid "B5 (ISO) Extra 201 x 276 mm"
+msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
+
+#: ../src/common/paper.cpp:176
+msgid "B5 (JIS) Rotated 257 x 182 mm"
+msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
+
+#: ../src/common/paper.cpp:157
+msgid "B5 (JIS) Transverse 182 x 257 mm"
+msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
+
+#: ../src/common/paper.cpp:130
 msgid "B5 Envelope, 176 x 250 mm"
 msgstr "B5 信封, 176 x 250 毫米"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:112
 msgid "B5 sheet, 182 x 257 millimeter"
 msgstr "B5 纸张, 182 x 257 毫米"
 
-#: ../src/common/paper.cpp:143
+#: ../src/common/paper.cpp:184
+msgid "B6 (JIS) 128 x 182 mm"
+msgstr "B6 纸张(JIS), 128 x 182 毫米"
+
+#: ../src/common/paper.cpp:185
+msgid "B6 (JIS) Rotated 182 x 128 mm"
+msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
+
+#: ../src/common/paper.cpp:131
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 
-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/accelcmn.cpp:48
+msgid "BACK"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:154
+msgid "BIG5"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:499 ../src/common/imagbmp.cpp:515
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 不能分配内存."
 
-#: ../src/common/imagbmp.cpp:94
+#: ../src/common/imagbmp.cpp:86
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: 不能保存无效图像."
 
-#: ../src/common/imagbmp.cpp:298
+#: ../src/common/imagbmp.cpp:320
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 不能写RGB色彩表."
 
-#: ../src/common/imagbmp.cpp:431
+#: ../src/common/imagbmp.cpp:453
 msgid "BMP: Couldn't write data."
 msgstr "BMP: 不能写数据."
 
-#: ../src/common/imagbmp.cpp:203
+#: ../src/common/imagbmp.cpp:225
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: 不能写文件头(Bitmap)."
 
-#: ../src/common/imagbmp.cpp:224
+#: ../src/common/imagbmp.cpp:246
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: 不能写文件头(BitmapInfo)."
 
-#: ../src/common/imagbmp.cpp:128
+#: ../src/common/imagbmp.cpp:120
 msgid "BMP: wxImage doesn't have own wxPalette."
-msgstr "BMP: wxImage没有我们的wxPalette."
+msgstr "BMP: wxImage没有自己的wxPalette."
 
-#: ../src/common/fmapbase.cpp:115
+#: ../src/mac/carbon/fontdlg.cpp:382
+msgid "Background colour"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:120
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的海语 (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:111
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "波罗的海语 (旧的) (ISO-8859-4)"
 
-#: ../contrib/src/deprecated/resource.cpp:2524
-#, c-format
-msgid "Bitmap resource specification %s not found."
-msgstr "找不到位图规格 %s."
+#: ../src/richtext/richtextliststylepage.cpp:431
+msgid "Before a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:491
+#: ../src/richtext/richtextbulletspage.cpp:289
+msgid "Bitmap"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:575
+msgid "Bitmap renderer cannot render value; value type: "
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:237
+#: ../src/richtext/richtextfontpage.cpp:269
+#: ../src/richtext/richtextfontpage.cpp:331
+#: ../src/richtext/richtextfontpage.cpp:577 ../src/generic/fontdlgg.cpp:335
+#: ../src/mac/carbon/fontdlg.cpp:516
 msgid "Bold"
 msgstr "粗体"
 
-#: ../src/generic/prntdlgg.cpp:892
+#: ../src/generic/prntdlgg.cpp:898
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
-#: ../src/common/paper.cpp:112
+#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45
+msgid "Browse"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:244
+#: ../src/richtext/richtextbulletspage.cpp:193
+msgid "Bullet &Alignment:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:308
+msgid "Bullet style"
+msgstr ""
+
+#: ../src/richtext/richtextformatdlg.cpp:293
+msgid "Bullets"
+msgstr ""
+
+#: ../src/common/paper.cpp:100
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
-#: ../src/generic/logg.cpp:510
+#: ../src/generic/logg.cpp:537
 msgid "C&lear"
-msgstr "清除[&L]"
+msgstr "清除(&L)"
 
-#: ../src/generic/fontdlgg.cpp:308
+#: ../src/generic/fontdlgg.cpp:408
 msgid "C&olour:"
-msgstr "颜色[&o]:"
+msgstr "颜色(&o):"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:125
 msgid "C3 Envelope, 324 x 458 mm"
 msgstr "C3 信封, 324 x 458 毫米"
 
-#: ../src/common/paper.cpp:138
+#: ../src/common/paper.cpp:126
 msgid "C4 Envelope, 229 x 324 mm"
 msgstr "C4 信封, 229 x 324 毫米"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:124
 msgid "C5 Envelope, 162 x 229 mm"
 msgstr "C5 信封, 162 x 229 毫米"
 
-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:127
 msgid "C6 Envelope, 114 x 162 mm"
 msgstr "C6 信封, 114 x 162 毫米"
 
-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:128
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 
-#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
+#: ../src/common/accelcmn.cpp:65
+msgid "CANCEL"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:69
+msgid "CAPITAL"
+msgstr ""
+
+#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:854
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 
-#: ../src/os2/thread.cpp:121
-#, fuzzy
+#: ../src/common/accelcmn.cpp:66
+msgid "CLEAR"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:110
+msgid "COMMAND"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:232
+msgid "Ca&pitals"
+msgstr ""
+
+#: ../src/os2/thread.cpp:117
 msgid "Can not create mutex."
 msgstr "不能创建互斥对象."
 
-#: ../src/common/filefn.cpp:1290
+#: ../src/common/filefn.cpp:1421
 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "不能枚举文件 '%s'"
 
-#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
+#: ../src/unix/dir.cpp:228 ../src/msw/dir.cpp:204
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "不能枚举目录 '%s'中的文件"
 
-#: ../src/os2/thread.cpp:523
+#: ../src/os2/thread.cpp:526
 #, c-format
 msgid "Can not resume thread %lu"
 msgstr "不能恢复线程 %lu"
 
-#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:824
+#: ../src/msw/thread.cpp:873
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "不能恢复线程 %x"
 
-#: ../src/msw/thread.cpp:498
+#: ../src/msw/thread.cpp:526
 msgid "Can not start thread: error writing TLS."
 msgstr "不能启动线程: 写TLS出错."
 
-#: ../src/os2/thread.cpp:510
+#: ../src/os2/thread.cpp:512
 #, c-format
 msgid "Can not suspend thread %lu"
 msgstr "不能挂起线程 %lu"
 
-#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:809
+#: ../src/msw/thread.cpp:858
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "不能挂起线程 %x"
 
-#: ../src/msw/thread.cpp:722
+#: ../src/msw/thread.cpp:781
 msgid "Can not wait for thread termination"
 msgstr "不能等候线程终止"
 
-#: ../src/common/cmdproc.cpp:266
+#: ../src/common/cmdproc.cpp:262
 msgid "Can't &Undo "
-msgstr "不能恢复[&U]"
+msgstr "不能恢复(&U)"
 
-#: ../src/common/image.cpp:1763
+#: ../src/common/image.cpp:2648
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "不能检查文件格式 '%s': 文件不存在."
 
-#: ../src/msw/registry.cpp:434
+#: ../src/msw/registry.cpp:451
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr "不能关闭注册键 '%s'"
 
-#: ../src/msw/registry.cpp:510
+#: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr "不能复制不支持的类型 %d 的值."
 
-#: ../src/msw/registry.cpp:415
+#: ../src/msw/registry.cpp:432
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "不能创建注册键 '%s'"
 
-#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-#: ../src/os2/thread.cpp:491
+#: ../src/os2/thread.cpp:493 ../src/msw/thread.cpp:652
+#: ../src/mac/carbon/mpthread.cpp:906
 msgid "Can't create thread"
 msgstr "不能创建进程"
 
-#: ../src/msw/window.cpp:3077
+#: ../src/msw/window.cpp:3717
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "不能创建类 '%s' 的窗口"
 
-#: ../src/msw/registry.cpp:686
+#: ../src/msw/registry.cpp:705
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr "不能删除键 '%s'"
 
-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
+#: ../src/os2/iniconf.cpp:466 ../src/msw/iniconf.cpp:453
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "不能删除 INI 文件 '%s'"
 
-#: ../src/msw/registry.cpp:713
+#: ../src/msw/registry.cpp:733
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "不能删除键值 '%s'/ '%s'"
 
-#: ../src/msw/registry.cpp:1061
+#: ../src/msw/registry.cpp:1090
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr "不能枚举键 '%s'的子键"
 
-#: ../src/msw/registry.cpp:1016
+#: ../src/msw/registry.cpp:1045
 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr "不能枚举键 '%s'的值"
 
-#: ../src/msw/registry.cpp:1267
-#, fuzzy, c-format
+#: ../src/msw/registry.cpp:1308
+#, c-format
 msgid "Can't export value of unsupported type %d."
 msgstr "不能导出不支持的类型 %d 的值."
 
-#: ../src/common/ffile.cpp:238
+#: ../src/common/ffile.cpp:247
 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr "不能在文件'%s'中找到当前位置"
 
-#: ../src/msw/registry.cpp:351
+#: ../src/msw/registry.cpp:360
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "不能获得注册键 '%s'的信息"
 
-#: ../src/common/zstream.cpp:237
+#: ../src/common/zstream.cpp:318
 msgid "Can't initialize zlib deflate stream."
 msgstr "不能初始化zlib deflate(压缩)流."
 
-#: ../src/common/zstream.cpp:99
+#: ../src/common/zstream.cpp:169
 msgid "Can't initialize zlib inflate stream."
 msgstr "不能初始化zlib inflate(解压)流."
 
-#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364
+#: ../src/common/image.cpp:2029 ../src/common/image.cpp:2051
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "不能从文件 '%s'中装入图像: 文件不存在."
 
-#: ../src/msw/registry.cpp:381
+#: ../src/msw/registry.cpp:396
 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr "不能打开注册键 '%s'"
 
-#: ../src/common/zstream.cpp:166
+#: ../src/common/zstream.cpp:234
 #, c-format
 msgid "Can't read from inflate stream: %s"
 msgstr "不能从解压流 %s 中读"
 
-#: ../src/common/zstream.cpp:159
+#: ../src/common/zstream.cpp:227
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr "不能读解压流: 流内有异常的EOF."
 
-#: ../src/msw/registry.cpp:950
+#: ../src/msw/registry.cpp:977
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "不能读 '%s'的值"
 
-#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
-#: ../src/msw/registry.cpp:876
+#: ../src/msw/registry.cpp:806 ../src/msw/registry.cpp:838
+#: ../src/msw/registry.cpp:900
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "不能读键 '%s'的值"
 
-#: ../src/common/image.cpp:1386
+#: ../src/common/image.cpp:2072
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
 
-#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021
+#: ../src/generic/logg.cpp:599 ../src/generic/logg.cpp:1049
 msgid "Can't save log contents to file."
 msgstr "不能把日志内容保存到文件."
 
-#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:473
+#: ../src/os2/thread.cpp:476 ../src/msw/thread.cpp:608
 msgid "Can't set thread priority"
 msgstr "不能设置线程优先级"
 
-#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
-#: ../src/msw/registry.cpp:965
+#: ../src/msw/registry.cpp:824 ../src/msw/registry.cpp:868
+#: ../src/msw/registry.cpp:994
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "不能设置 '%s'的值"
 
-#: ../src/common/zstream.cpp:316
+#: ../src/common/zstream.cpp:402
 #, c-format
 msgid "Can't write to deflate stream: %s"
 msgstr "不能写到压缩流: %s"
 
-#: ../contrib/src/deprecated/proplist.cpp:518 ../src/generic/choicdgg.cpp:291
-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/numdlgg.cpp:136
-#: ../src/generic/textdlgg.cpp:120 ../src/gtk/fontdlg.cpp:155
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/richtext/richtextstyledlg.cpp:289 ../src/gtk1/fontdlg.cpp:145
+#: ../src/html/htmlhelp.cpp:434 ../src/generic/dirdlgg.cpp:108
+#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:38
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175
+#: ../src/xrc/xmlres.cpp:1297 ../src/xrc/xmlres.cpp:1345
 msgid "Cannot convert dialog units: dialog unknown."
-msgstr "不能转换对话单元: 未知的对话."
+msgstr "不能转换对话框单元: 未知的对话框."
 
-#: ../src/common/strconv.cpp:2665
+#: ../src/common/strconv.cpp:2975
 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "不能从字符集 '%s' 转换!"
 
-#: ../src/msw/dialup.cpp:509
+#: ../src/mac/carbon/dataview.cpp:1056 ../src/mac/carbon/dataview.cpp:1176
+msgid "Cannot create new column's ID. Probably max. number of columns reached."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:545
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到活动的拨号连接: %s"
 
-#: ../src/xrc/xmlres.cpp:269
+#: ../src/xrc/xmlres.cpp:371
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到可以对应于未知控件 '%s' 的容器."
 
-#: ../src/xrc/xmlres.cpp:1210
+#: ../src/xrc/xmlres.cpp:1380
 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr "找不到字体节点 '%s'."
 
-#: ../src/msw/dialup.cpp:814
+#: ../src/msw/dialup.cpp:856
 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 
-#: ../src/unix/threadpsx.cpp:1100
+#: ../src/unix/threadpsx.cpp:1192
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "不能获得调度策略 %d 的优先级范围."
 
-#: ../src/unix/utilsunx.cpp:758
+#: ../src/unix/utilsunx.cpp:842
 msgid "Cannot get the hostname"
 msgstr "不能获得主机名"
 
-#: ../src/unix/utilsunx.cpp:794
+#: ../src/unix/utilsunx.cpp:878
 msgid "Cannot get the official hostname"
 msgstr "不能获得正式的主机名"
 
-#: ../src/msw/dialup.cpp:908
+#: ../src/msw/dialup.cpp:953
 msgid "Cannot hang up - no active dialup connection."
-msgstr "不能挂起 - 没有活动的拨号连接."
+msgstr "不能挂断 - 没有活动的拨号连接."
 
-#: ../include/wx/msw/ole/oleutils.h:47
+#: ../include/wx/msw/ole/oleutils.h:46
 msgid "Cannot initialize OLE"
 msgstr "不能初始化 OLE"
 
-#: ../src/mgl/app.cpp:292
+#: ../src/mgl/app.cpp:279
 msgid "Cannot initialize SciTech MGL!"
 msgstr "不能初始化 SciTech MGL!"
 
-#: ../src/mgl/window.cpp:546
+#: ../src/mgl/window.cpp:547
 msgid "Cannot initialize display."
 msgstr "不能初始化显示."
 
-#: ../src/msw/volume.cpp:601
+#: ../src/msw/volume.cpp:614
 #, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "不能从 '%s'中读取图标."
 
-#: ../src/xrc/xmlres.cpp:392
+#: ../src/xrc/xmlres.cpp:504
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "不能从文件 '%s'中读取资源."
 
-#: ../src/html/htmlfilt.cpp:164
+#: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "不能打开 HTML 文档: %s"
 
-#: ../src/html/helpdata.cpp:672
+#: ../src/html/helpdata.cpp:658
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "不能打开 HTML 帮助: %s"
 
-#: ../src/generic/helpext.cpp:123
-#, c-format
-msgid "Cannot open URL '%s'"
-msgstr "不能打开 URL '%s'"
-
-#: ../src/html/helpdata.cpp:312
+#: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "不能打开目录文件: %s"
 
-#: ../src/xrc/xmlres.cpp:360
+#: ../src/xrc/xmlres.cpp:469
 #, c-format
 msgid "Cannot open file '%s'."
 msgstr "不能打开文件 '%s'."
 
-#: ../src/generic/dcpsg.cpp:1568
+#: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
 msgstr "不能打开文件进行PostScript打印!"
 
-#: ../src/html/helpdata.cpp:326
+#: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "不能打开索引文件: %s"
 
-#: ../src/common/intl.cpp:1202
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1337
+#, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "不能粘贴复数: '%s'"
+msgstr "不能解析多表格: '%s'"
 
-#: ../src/xrc/xmlres.cpp:1111
+#: ../src/xrc/xmlres.cpp:1281
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "不能从 '%s'中粘贴坐标."
 
-#: ../src/xrc/xmlres.cpp:1159
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:1329
+#, c-format
 msgid "Cannot parse dimension from '%s'."
-msgstr "不能从 '%s'中粘贴维数."
+msgstr "不能从 '%s'中解析尺寸."
 
-#: ../src/html/helpfrm.cpp:1562
+#: ../src/html/helpwnd.cpp:1540
 msgid "Cannot print empty page."
 msgstr "不能打印空页面."
 
-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:504
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "不能从 '%s'中读取类型名称."
 
-#: ../src/unix/threadpsx.cpp:1081
+#: ../src/unix/threadpsx.cpp:1173
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "不能找回线程调度策略."
 
-#: ../src/unix/threadpsx.cpp:729
+#: ../src/common/intl.cpp:1907
+#, c-format
+msgid "Cannot set locale to language \"%s\"."
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:797
 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 
-#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:972
 msgid "Cannot wait for thread termination."
-msgstr "不能等候线程终止"
+msgstr "不能等候线程终止."
 
-#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
+#: ../src/mac/carbon/mpthread.cpp:888
 msgid "Cant create the thread event queue"
 msgstr "不能创建线程事件队列"
 
-#: ../src/html/helpfrm.cpp:534
+#: ../src/html/helpwnd.cpp:532
 msgid "Case sensitive"
 msgstr "大小写敏感"
 
-#: ../src/common/fmapbase.cpp:116
+#: ../src/common/fmapbase.cpp:121
 msgid "Celtic (ISO-8859-14)"
 msgstr "凯尔特语 (ISO-8859-14)"
 
-#: ../src/common/stockitem.cpp:127
+#: ../src/richtext/richtextliststylepage.cpp:348
+#: ../src/richtext/richtextindentspage.cpp:170
+#, fuzzy
+msgid "Cen&tred"
+msgstr "居中"
+
+#: ../src/common/stockitem.cpp:133
 msgid "Centered"
 msgstr "居中"
 
-#: ../src/common/fmapbase.cpp:104
+#: ../src/common/fmapbase.cpp:109
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:749
+#: ../src/richtext/richtextliststylepage.cpp:249
+#: ../src/richtext/richtextbulletspage.cpp:198
+#, fuzzy
+msgid "Centre"
+msgstr "居中"
+
+#: ../src/richtext/richtextliststylepage.cpp:350
+#: ../src/richtext/richtextliststylepage.cpp:352
+#: ../src/richtext/richtextindentspage.cpp:172
+#: ../src/richtext/richtextindentspage.cpp:174
+#, fuzzy
+msgid "Centre text."
+msgstr "不能创建互斥对象."
+
+#: ../src/richtext/richtextliststylepage.cpp:279
+#: ../src/richtext/richtextbulletspage.cpp:230
+#, fuzzy
+msgid "Ch&oose..."
+msgstr "跳转(&G)..."
+
+#: ../src/richtext/richtextbuffer.cpp:2685
+msgid "Change List Style"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:1721
+msgid "Change Style"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:251
+msgid "Changed item is invalid."
+msgstr ""
+
+#: ../src/common/fileconf.cpp:378
+#, c-format
+msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:840
+msgid "Character styles"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:225
+#: ../src/richtext/richtextbulletspage.cpp:172
+#: ../src/richtext/richtextbulletspage.cpp:174
+msgid "Check to add a period after the bullet."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:239
+#: ../src/richtext/richtextbulletspage.cpp:186
+#: ../src/richtext/richtextbulletspage.cpp:188
+msgid "Check to add a right parenthesis."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextliststylepage.cpp:232
+#: ../src/richtext/richtextbulletspage.cpp:179
+#: ../src/richtext/richtextbulletspage.cpp:181
+msgid "Check to enclose the bullet in parentheses."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:518 ../src/mac/carbon/fontdlg.cpp:520
+#, fuzzy
+msgid "Check to make the font bold."
+msgstr "点击取消字体选择."
+
+#: ../src/mac/carbon/fontdlg.cpp:525 ../src/mac/carbon/fontdlg.cpp:527
+#, fuzzy
+msgid "Check to make the font italic."
+msgstr "点击取消字体选择."
+
+#: ../src/mac/carbon/fontdlg.cpp:534 ../src/mac/carbon/fontdlg.cpp:536
+#, fuzzy
+msgid "Check to make the font underlined."
+msgstr "字体是否为下划线."
+
+#: ../src/richtext/richtextstyledlg.cpp:275
+#: ../src/richtext/richtextstyledlg.cpp:277
+msgid "Check to restart numbering."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:227
+#: ../src/richtext/richtextfontpage.cpp:229
+#, fuzzy
+msgid "Check to show a line through the text."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextfontpage.cpp:234
+#: ../src/richtext/richtextfontpage.cpp:236
+#, fuzzy
+msgid "Check to show the text in capitals."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextfontpage.cpp:248
+#: ../src/richtext/richtextfontpage.cpp:250
+#, fuzzy
+msgid "Check to show the text in subscript."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextfontpage.cpp:241
+#: ../src/richtext/richtextfontpage.cpp:243
+#, fuzzy
+msgid "Check to show the text in superscript."
+msgstr "点击取消字体选择."
+
+#: ../src/msw/dialup.cpp:791
 msgid "Choose ISP to dial"
 msgstr "选择ISP进行拨号"
 
-#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-#: ../src/palmos/colordlg.cpp:76
+#: ../src/gtk/colordlg.cpp:52 ../src/generic/colrdlgg.cpp:144
+#: ../src/palmos/colordlg.cpp:74
 msgid "Choose colour"
 msgstr "选择颜色"
 
-#: ../src/gtk/fontdlg.cpp:133
+#: ../src/gtk/fontdlg.cpp:99 ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "选择字体"
 
-#: ../src/generic/mdig.cpp:114
+#: ../src/common/module.cpp:75
+#, c-format
+msgid "Circular dependency involving module \"%s\" detected."
+msgstr ""
+
+#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:115
 msgid "Cl&ose"
-msgstr "关闭[&o]"
+msgstr "关闭(&o)"
 
-#: ../src/generic/logg.cpp:510
+#: ../src/generic/logg.cpp:537
 msgid "Clear the log contents"
 msgstr "清除日志内容"
 
-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-msgid "Click to cancel the font selection."
-msgstr "点击取消字体选择."
+#: ../src/richtext/richtextstyledlg.cpp:238
+#: ../src/richtext/richtextstyledlg.cpp:240
+#, fuzzy
+msgid "Click to apply the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextliststylepage.cpp:280
+#: ../src/richtext/richtextliststylepage.cpp:282
+#: ../src/richtext/richtextbulletspage.cpp:231
+#: ../src/richtext/richtextbulletspage.cpp:233
+msgid "Click to browse for a symbol."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:565 ../src/mac/carbon/fontdlg.cpp:567
+#, fuzzy
+msgid "Click to cancel changes to the font."
+msgstr "点击取消字体选择."
+
+#: ../src/generic/fontdlgg.cpp:474 ../src/generic/fontdlgg.cpp:493
+msgid "Click to cancel the font selection."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:290
+#: ../src/richtext/richtextstyledlg.cpp:292
+#, fuzzy
+msgid "Click to cancel this window."
+msgstr "关闭此窗口"
+
+#: ../src/mac/carbon/fontdlg.cpp:546 ../src/mac/carbon/fontdlg.cpp:548
+#, fuzzy
+msgid "Click to change the font colour."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextfontpage.cpp:217
+#: ../src/richtext/richtextfontpage.cpp:219
+#, fuzzy
+msgid "Click to change the text colour."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextliststylepage.cpp:194
+#: ../src/richtext/richtextliststylepage.cpp:196
+#, fuzzy
+msgid "Click to choose the font for this level."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:265
+#: ../src/richtext/richtextstyledlg.cpp:267
+#, fuzzy
+msgid "Click to close this window."
+msgstr "关闭此窗口"
+
+#: ../src/mac/carbon/fontdlg.cpp:572 ../src/mac/carbon/fontdlg.cpp:574
+#, fuzzy
+msgid "Click to confirm changes to the font."
+msgstr "点击确认字体选择."
+
+#: ../src/generic/fontdlgg.cpp:479 ../src/generic/fontdlgg.cpp:481
+#: ../src/generic/fontdlgg.cpp:486 ../src/generic/fontdlgg.cpp:488
+msgid "Click to confirm the font selection."
+msgstr "点击确认字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:284
+#: ../src/richtext/richtextstyledlg.cpp:286
+#, fuzzy
+msgid "Click to confirm your selection."
+msgstr "点击确认字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:220
+msgid "Click to create a new character style."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:230
+#: ../src/richtext/richtextstyledlg.cpp:232
+#, fuzzy
+msgid "Click to create a new list style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:224
+#: ../src/richtext/richtextstyledlg.cpp:226
+msgid "Click to create a new paragraph style."
+msgstr ""
+
+#: ../src/richtext/richtexttabspage.cpp:137
+#: ../src/richtext/richtexttabspage.cpp:139
+#, fuzzy
+msgid "Click to create a new tab position."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtexttabspage.cpp:149
+#: ../src/richtext/richtexttabspage.cpp:151
+#, fuzzy
+msgid "Click to delete all tab positions."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:256
+#: ../src/richtext/richtextstyledlg.cpp:258
+#, fuzzy
+msgid "Click to delete the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtexttabspage.cpp:145
+#, fuzzy
+msgid "Click to delete the selected tab position."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:250
+#: ../src/richtext/richtextstyledlg.cpp:252
+#, fuzzy
+msgid "Click to edit the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:244
+#: ../src/richtext/richtextstyledlg.cpp:246
+#, fuzzy
+msgid "Click to rename the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:263
+#: ../src/richtext/richtextsymboldlg.cpp:474 ../src/html/helpdlg.cpp:91
+#: ../src/generic/dbgrptg.cpp:93 ../src/generic/progdlgg.cpp:642
+#: ../src/generic/progdlgg.cpp:647
+msgid "Close"
+msgstr "关闭"
+
+#: ../src/univ/themes/win32.cpp:3742
+msgid "Close\tAlt-F4"
+msgstr "关闭\tAlt-F4"
+
+#: ../src/aui/tabmdi.cpp:106 ../src/generic/mdig.cpp:116
+msgid "Close All"
+msgstr "全部关闭"
+
+#: ../src/common/stockitem.cpp:211
+msgid "Close current document"
+msgstr ""
+
+#: ../src/generic/logg.cpp:539
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ../src/richtext/richtextformatdlg.cpp:524
+#, fuzzy
+msgid "Colour"
+msgstr "颜色(&o):"
+
+#: ../src/msw/colordlg.cpp:155
+#, fuzzy, c-format
+msgid "Colour selection dialog failed with error %0lx."
+msgstr "命令 '%s'执行失败, 错误信息: %ul"
+
+#: ../src/mac/carbon/fontdlg.cpp:542
+#, fuzzy
+msgid "Colour:"
+msgstr "颜色(&o):"
+
+#: ../src/mac/carbon/dataview.cpp:1064 ../src/mac/carbon/dataview.cpp:1184
+#, fuzzy
+msgid "Column could not be added."
+msgstr "文件不能被装载."
+
+#: ../src/mac/carbon/dataview.cpp:1063 ../src/mac/carbon/dataview.cpp:1183
+msgid "Column description could not be initialized."
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:1050 ../src/mac/carbon/dataview.cpp:1170
+msgid "Column does not have a renderer."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:883 ../src/mac/carbon/databrow.cpp:904
+#, fuzzy
+msgid "Column index not found."
+msgstr "找不到域 '%s'的目录文件."
 
-#: ../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 "点击确认字体选择."
+#: ../src/mac/carbon/dataview.cpp:1049 ../src/mac/carbon/dataview.cpp:1169
+msgid "Column pointer must not be NULL."
+msgstr ""
 
-#: ../contrib/src/deprecated/proplist.cpp:513 ../src/generic/dbgrptg.cpp:88
-#: ../src/generic/progdlgg.cpp:629 ../src/generic/progdlgg.cpp:634
-msgid "Close"
-msgstr "关闭"
+#: ../src/mac/carbon/databrow.cpp:959
+msgid "Column width could not be determined"
+msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4825
-msgid "Close\tAlt-F4"
-msgstr "关闭\tAlt-F4"
+#: ../src/mac/carbon/dataview.cpp:1067 ../src/mac/carbon/dataview.cpp:1187
+msgid "Column width could not be set."
+msgstr ""
 
-#: ../src/generic/mdig.cpp:115
-msgid "Close All"
-msgstr "全部关闭"
+#: ../src/mac/carbon/dataview.cpp:1053 ../src/mac/carbon/dataview.cpp:1173
+msgid "Column's model column has no equivalent in the associated model."
+msgstr ""
 
-#: ../src/generic/logg.cpp:512
-msgid "Close this window"
-msgstr "关闭此窗口"
+#: ../src/common/init.cpp:189
+#, c-format
+msgid ""
+"Command line argument %d couldn't be converted to Unicode and will be "
+"ignored."
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:1576
+#: ../src/html/helpwnd.cpp:1554
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:582
+#: ../src/generic/dirctrlg.cpp:591
 msgid "Computer"
 msgstr "计算机"
 
-#: ../src/common/fileconf.cpp:938
+#: ../src/common/fileconf.cpp:959
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "配置条目名不能以 '%c'开头."
 
-#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64
+#: ../src/gtk/filedlg.cpp:55
 msgid "Confirm"
 msgstr "确认"
 
-#: ../src/msw/mimetype.cpp:677
+#: ../src/msw/mimetype.cpp:706
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 
-#: ../src/html/htmlwin.cpp:386
+#: ../src/html/htmlwin.cpp:517
 msgid "Connecting..."
 msgstr "连接..."
 
-#: ../src/html/helpfrm.cpp:476
+#: ../src/html/htmlhelp.cpp:565 ../src/html/helpwnd.cpp:468
 msgid "Contents"
 msgstr "目录"
 
-#: ../src/common/strconv.cpp:1428
+#: ../src/mac/carbon/dataview.cpp:377
+msgid "Control is wrongly initialized."
+msgstr ""
+
+#: ../src/common/strconv.cpp:2003
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "不能进行到字符集 '%s'的变换."
 
-#: ../src/html/htmlwin.cpp:824
+#: ../src/html/htmlwin.cpp:941
 #, c-format
 msgid "Copied to clipboard:\"%s\""
 msgstr "已复制到剪贴板:\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:242
+#: ../src/generic/prntdlgg.cpp:254
 msgid "Copies:"
 msgstr "份数:"
 
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:426
+#, fuzzy
+msgid "Copy"
+msgstr "复制(&C)"
+
+#: ../src/common/stockitem.cpp:203
+#, fuzzy
+msgid "Copy selection"
+msgstr "选段"
+
+#: ../src/mac/carbon/dataview.cpp:1061 ../src/mac/carbon/dataview.cpp:1181
+msgid "Could not add column to internal structures."
+msgstr ""
+
 #: ../src/html/chm.cpp:703
 #, c-format
 msgid "Could not create temporary file '%s'"
 msgstr "不能创建临时文件 '%s'"
 
+#: ../src/mac/carbon/databrow.cpp:628 ../src/mac/carbon/databrow.cpp:1011
+#, fuzzy
+msgid "Could not determine column index."
+msgstr "不能启动文档预览."
+
+#: ../src/mac/carbon/dataview.cpp:1145
+msgid "Could not determine column's position"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:1253
+#, fuzzy
+msgid "Could not determine number of items"
+msgstr "找不到资源包含文件 %s."
+
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
 msgstr "不能将 %s解开至 %s: %s"
 
-#: ../contrib/src/deprecated/resource.cpp:1830
-#: ../contrib/src/deprecated/resource.cpp:1960
-#, c-format
-msgid "Could not find resource include file %s."
-msgstr "找不到资源包含文件 %s."
-
-#: ../src/generic/tabg.cpp:1048
+#: ../src/generic/tabg.cpp:1051
 msgid "Could not find tab for id"
 msgstr "找不到id的标签"
 
+#: ../src/mac/carbon/dataview.cpp:739 ../src/mac/carbon/dataview.cpp:776
+#: ../src/mac/carbon/dataview.cpp:814 ../src/mac/carbon/dataview.cpp:837
+#: ../src/mac/carbon/dataview.cpp:948
+#, fuzzy
+msgid "Could not get header description."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:1335 ../src/mac/carbon/dataview.cpp:1395
+#, fuzzy
+msgid "Could not get items."
+msgstr "找不到文件 '%s'"
+
+#: ../src/mac/carbon/dataview.cpp:861 ../src/mac/carbon/dataview.cpp:891
+#, fuzzy
+msgid "Could not get property flags."
+msgstr "不能创建临时文件 '%s'"
+
+#: ../src/mac/carbon/databrow.cpp:504
+#, fuzzy
+msgid "Could not get selected items."
+msgstr "找不到文件 '%s'"
+
 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."
 msgstr "找不到文件 '%s'"
 
-#: ../contrib/src/deprecated/resource.cpp:829
-#, c-format
-msgid ""
-"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
-" or provide #define (see manual for caveats)"
-msgstr ""
-"不能解析控件类或者id '%s'. 用(非零)整数代替\n"
-"或 提供 #define (详细信息见手册)"
+#: ../src/mac/carbon/dataview.cpp:1090
+#, fuzzy
+msgid "Could not remove column."
+msgstr "不能创建游标"
 
-#: ../contrib/src/deprecated/resource.cpp:1278
-#, c-format
-msgid ""
-"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-"or provide #define (see manual for caveats)"
-msgstr ""
-"不能解析菜单id '%s'. 用(非零)整数代替\n"
-"或 提供 #define (详细信息见手册)"
+#: ../src/mac/carbon/databrow.cpp:425
+#, fuzzy
+msgid "Could not retrieve number of items"
+msgstr "不能创建临时文件 '%s'"
 
-#: ../src/common/prntbase.cpp:1225
+#: ../src/mac/carbon/dataview.cpp:755
+#, fuzzy
+msgid "Could not set alignment."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:969
+#, fuzzy
+msgid "Could not set column width."
+msgstr "不能启动文档预览."
+
+#: ../src/mac/carbon/dataview.cpp:950
+#, fuzzy
+msgid "Could not set header description."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:785
+#, fuzzy
+msgid "Could not set icon."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:816
+#, fuzzy
+msgid "Could not set maximum width."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:839
+#, fuzzy
+msgid "Could not set minimum width."
+msgstr "不能启动打印."
+
+#: ../src/mac/carbon/dataview.cpp:866 ../src/mac/carbon/dataview.cpp:896
+#, fuzzy
+msgid "Could not set property flags."
+msgstr "不能启动打印."
+
+#: ../src/common/prntbase.cpp:1547
 msgid "Could not start document preview."
 msgstr "不能启动文档预览."
 
-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
-#: ../src/msw/printwin.cpp:235
+#: ../src/gtk/gnome/gprint.cpp:925 ../src/gtk/print.cpp:1042
+#: ../src/generic/printps.cpp:181 ../src/msw/printwin.cpp:233
 msgid "Could not start printing."
 msgstr "不能启动打印."
 
-#: ../src/common/wincmn.cpp:1488
+#: ../src/common/wincmn.cpp:1621
 msgid "Could not transfer data to window"
 msgstr "不能把数据转到窗口"
 
-#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
-#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:222 ../src/mac/carbon/mpthread.cpp:301
 msgid "Could not unlock mutex"
 msgstr "不能释放互斥体"
 
-#: ../src/os2/thread.cpp:154
+#: ../src/os2/thread.cpp:159
 msgid "Couldn't acquire a mutex lock"
 msgstr "不能得到互斥锁"
 
-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-#: ../src/msw/imaglist.cpp:188
+#: ../src/msw/dragimag.cpp:156 ../src/msw/dragimag.cpp:195
+#: ../src/msw/imaglist.cpp:149 ../src/msw/imaglist.cpp:167
+#: ../src/msw/imaglist.cpp:179
 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 
-#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
+#: ../src/os2/timer.cpp:114 ../src/msw/timer.cpp:83
 msgid "Couldn't create a timer"
 msgstr "不能创建计时器"
 
-#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+#: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:163
 msgid "Couldn't create cursor."
 msgstr "不能创建游标"
 
-#: ../src/common/dynlib.cpp:199
+#: ../src/mac/carbon/overlay.cpp:125
+#, fuzzy
+msgid "Couldn't create the overlay window"
+msgstr "不能创建计时器"
+
+#: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 
-#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:850
+#: ../src/gtk/print.cpp:2055
+msgid "Couldn't get hatch style from wxBrush."
+msgstr ""
+
+#: ../src/msw/thread.cpp:899
 msgid "Couldn't get the current thread pointer"
 msgstr "不能获得当前线程指针"
 
-#: ../src/common/imagpng.cpp:596
+#: ../src/mac/carbon/overlay.cpp:132
+#, fuzzy
+msgid "Couldn't init the context on the overlay window"
+msgstr "不能获得当前线程指针"
+
+#: ../src/common/imagpng.cpp:615
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "不能装入PNG图像 - 文件被破坏 或 没有足够内存."
 
-#: ../src/unix/sound.cpp:472
+#: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
 msgstr "不能从 '%s'中的读取声音数据."
 
-#: ../src/unix/sound_sdl.cpp:230
+#: ../src/unix/sound_sdl.cpp:228
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "不能打开音频: %s"
 
-#: ../src/msw/ole/dataobj.cpp:147
+#: ../src/msw/ole/dataobj.cpp:145
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr "不能注册剪贴板格式 '%s'."
 
-#: ../src/os2/thread.cpp:171
+#: ../src/os2/thread.cpp:176
 msgid "Couldn't release a mutex"
 msgstr "不能释放互斥体"
 
-#: ../src/msw/listctrl.cpp:735
+#: ../src/msw/listctrl.cpp:802
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "不能获得列表控件的项 %d信息."
 
-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-#: ../src/common/imagpng.cpp:659
+#: ../src/common/imagpng.cpp:664 ../src/common/imagpng.cpp:673
+#: ../src/common/imagpng.cpp:681
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 
-#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
+#: ../src/msw/thread.cpp:669
 msgid "Couldn't terminate thread"
 msgstr "不能终止线程"
 
-#: ../src/common/xtistrm.cpp:161
+#: ../src/common/xtistrm.cpp:157
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr "在声明的RTTI参数里找不到创建参数"
 
-#: ../src/generic/dirdlgg.cpp:309
+#: ../src/generic/dirdlgg.cpp:318
 msgid "Create directory"
 msgstr "创建目录"
 
-#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:1007
+#: ../src/generic/dirdlgg.cpp:132 ../src/generic/filedlgg.cpp:230
 msgid "Create new directory"
 msgstr "创建新目录"
 
-#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064
+#: ../src/common/accelcmn.cpp:296
+#, fuzzy
+msgid "Ctrl-"
+msgstr "ctrl"
+
+#: ../src/common/stockitem.cpp:118 ../src/richtext/richtextctrl.cpp:2595
+#: ../src/msw/textctrl.cpp:2151 ../src/mac/carbon/textctrl.cpp:1064
 msgid "Cu&t"
-msgstr "剪切[&t]"
+msgstr "剪切(&t)"
 
-#: ../src/generic/filedlgg.cpp:1018
+#: ../src/generic/filectrlg.cpp:951
 msgid "Current directory:"
 msgstr "当前目录:"
 
-#: ../src/common/fmapbase.cpp:107
+#: ../src/gtk/print.cpp:756
+#, fuzzy
+msgid "Custom size"
+msgstr "字体大小"
+
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:425
+#, fuzzy
+msgid "Cut"
+msgstr "剪切(&t)"
+
+#: ../src/common/stockitem.cpp:204
+#, fuzzy
+msgid "Cut selection"
+msgstr "选段"
+
+#: ../src/common/fmapbase.cpp:112
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 
-#: ../src/common/paper.cpp:113
+#: ../src/common/paper.cpp:101
 msgid "D sheet, 22 x 34 in"
 msgstr "D 纸张, 22 x 34 英寸"
 
-#: ../src/msw/dde.cpp:633
+#: ../src/msw/dde.cpp:706
 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
-#: ../src/common/imagbmp.cpp:921
+#: ../src/common/accelcmn.cpp:78
+msgid "DECIMAL"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:46
+msgid "DEL"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:47
+msgid "DELETE"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:944
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "DIB头: 编码不能匹配颜色位数."
 
-#: ../src/common/imagbmp.cpp:883
+#: ../src/common/imagbmp.cpp:905
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB头: 对于文件，图像高度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:877
+#: ../src/common/imagbmp.cpp:899
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB头: 对于文件，图像宽度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:897
+#: ../src/common/imagbmp.cpp:919
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "DIB头: 文件中颜色位数未知."
 
-#: ../src/common/imagbmp.cpp:907
+#: ../src/common/imagbmp.cpp:929
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知."
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/accelcmn.cpp:79
+#, fuzzy
+msgid "DIVIDE"
+msgstr "<盘符>"
+
+#: ../src/common/paper.cpp:123
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 
-#: ../src/generic/dbgrptg.cpp:276
+#: ../src/common/accelcmn.cpp:58
+msgid "DOWN"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:345
+msgid "Data view control is not correctly initialized"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:694
+msgid "Date renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:296
 #, c-format
 msgid "Debug report \"%s\""
-msgstr ""
+msgstr "调试报告 \"%s\""
 
-#: ../src/common/debugrpt.cpp:203
-#, fuzzy
+#: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."
-msgstr "目录'%s'不能被创建"
+msgstr "无法创建调试报告."
 
-#: ../src/common/debugrpt.cpp:517
+#: ../src/common/debugrpt.cpp:545
 msgid "Debug report generation has failed."
-msgstr ""
+msgstr "无法生成调试报告."
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:325
 msgid "Decorative"
 msgstr "修饰"
 
-#: ../src/common/fmapbase.cpp:674
+#: ../src/common/fmapbase.cpp:661
 msgid "Default encoding"
 msgstr "缺省编码"
 
-#: ../src/generic/prntdlgg.cpp:506
+#: ../src/dfb/fontmgr.cpp:184
+#, fuzzy
+msgid "Default font"
+msgstr "缺省的打印机"
+
+#: ../src/generic/prntdlgg.cpp:515
 msgid "Default printer"
 msgstr "缺省的打印机"
 
-#: ../contrib/src/gizmos/editlbox.cpp:160
+#: ../src/richtext/richtextbuffer.cpp:5343
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:428
+#, fuzzy
+msgid "Delete"
+msgstr "删除(&D)"
+
+#: ../src/richtext/richtexttabspage.cpp:148
+#, fuzzy
+msgid "Delete A&ll"
+msgstr "全部选择(&A)"
+
+#: ../src/richtext/richtextstyledlg.cpp:734
+#, fuzzy
+msgid "Delete Style"
+msgstr "删除项"
+
+#: ../src/richtext/richtextctrl.cpp:639 ../src/richtext/richtextctrl.cpp:687
+#, fuzzy
+msgid "Delete Text"
+msgstr "删除项"
+
+#: ../src/generic/editlbox.cpp:274
 msgid "Delete item"
 msgstr "删除项"
 
-#: ../src/unix/snglinst.cpp:300
+#: ../src/common/stockitem.cpp:205
+#, fuzzy
+msgid "Delete selection"
+msgstr "选段"
+
+#: ../src/richtext/richtextstyledlg.cpp:734
+#, fuzzy, c-format
+msgid "Delete style %s?"
+msgstr "删除项"
+
+#: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "已删除过期的锁文件 '%s'."
 
-#: ../src/generic/dirctrlg.cpp:648
+#: ../src/common/module.cpp:125
+#, c-format
+msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:660
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../src/msw/dialup.cpp:358
+#: ../src/generic/aboutdlgg.cpp:71
+msgid "Developed by "
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:142
+msgid "Developers"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:396
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
 
-#: ../src/generic/tipdlg.cpp:246
+#: ../src/generic/tipdlg.cpp:228
 msgid "Did you know..."
 msgstr "你知道吗..."
 
-#: ../src/common/filefn.cpp:1172
+#: ../src/dfb/wrapdfb.cpp:64
+#, c-format
+msgid "DirectFB error %d occured."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:219
+msgid "Directories"
+msgstr "目录"
+
+#: ../src/common/filefn.cpp:1290
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目录'%s'不能被创建"
 
-#: ../src/mgl/dirmgl.cpp:217
+#: ../src/mgl/dirmgl.cpp:211
 #, c-format
 msgid "Directory '%s' doesn't exist!"
 msgstr "目录 '%s'不存在!"
 
-#: ../src/generic/dirdlgg.cpp:228
+#: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr "目录不存在"
 
-#: ../src/generic/filedlgg.cpp:1300
+#: ../src/generic/filectrlg.cpp:1405
 msgid "Directory doesn't exist."
 msgstr "目录不存在."
 
-#: ../src/html/helpfrm.cpp:503
+#: ../src/html/helpwnd.cpp:498
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
-#: ../src/html/helpfrm.cpp:685
+#: ../src/html/helpwnd.cpp:695
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
-#: ../src/msw/mimetype.cpp:670
-#, c-format
+#: ../src/html/helpwnd.cpp:325
+msgid "Displays help as you browse the books on the left."
+msgstr ""
+
+#: ../src/msw/mimetype.cpp:699
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -1467,155 +2486,196 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
-#: ../src/common/docview.cpp:464
+#: ../src/common/docview.cpp:481
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "你想保存对文档%s的修改?"
 
-#: ../src/common/sizer.cpp:1842
+#: ../src/generic/aboutdlgg.cpp:74
+msgid "Documentation by "
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:146
+msgid "Documentation writers"
+msgstr ""
+
+#: ../src/common/sizer.cpp:2428
 msgid "Don't Save"
 msgstr "不保存"
 
-#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
+#: ../src/html/htmlwin.cpp:583 ../src/msw/frame.cpp:195
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:433
+#: ../src/generic/progdlgg.cpp:408
 msgid "Done."
 msgstr "完成."
 
-#: ../src/common/xtixml.cpp:271
+#: ../src/common/paper.cpp:178
+msgid "Double Japanese Postcard Rotated 148 x 200 mm"
+msgstr "横向日本双明信片, 148 x 200 毫米"
+
+#: ../src/common/xtixml.cpp:268
 #, c-format
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:153
 msgid "Down"
 msgstr "向下"
 
-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 msgstr "E 纸张, 34 x 44 英寸"
 
-#: ../contrib/src/gizmos/editlbox.cpp:158
+#: ../src/common/accelcmn.cpp:60
+msgid "END"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:51
+msgid "ENTER"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:63
+msgid "ESC"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:64
+msgid "ESCAPE"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:72
+msgid "EXECUTE"
+msgstr ""
+
+#: ../src/generic/editlbox.cpp:272
 msgid "Edit item"
 msgstr "编辑项"
 
-#: ../src/generic/progdlgg.cpp:194
-msgid "Elapsed time : "
-msgstr "用时："
+#: ../src/generic/progdlgg.cpp:198
+#, fuzzy
+msgid "Elapsed time:"
+msgstr "用时: "
+
+#: ../src/richtext/richtextstyledlg.cpp:568
+msgid "Enter a character style name"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:770
+msgid "Enter a list style name"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:843
+#, fuzzy
+msgid "Enter a new style name"
+msgstr "字体风格."
 
-#: ../src/common/prntbase.cpp:799
+#: ../src/common/prntbase.cpp:1086
 #, c-format
 msgid "Enter a page number between %d and %d:"
 msgstr "输入页码范围(%d 至 %d):"
 
-#: ../src/generic/dbgrptg.cpp:158
-#, fuzzy, c-format
+#: ../src/richtext/richtextstyledlg.cpp:616
+msgid "Enter a paragraph style name"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:170
+#, c-format
 msgid "Enter command to open file \"%s\":"
-msgstr "不能打开文件 '%s'"
+msgstr "输入命令以打开文件 \"%s\":"
 
-#: ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:465
 msgid "Entries found"
 msgstr "找到的条目"
 
-#: ../src/common/config.cpp:383
-#, fuzzy, c-format
+#: ../src/common/paper.cpp:144
+msgid "Envelope Invite 220 x 220 mm"
+msgstr "邀请信, 220 x 220 毫米"
+
+#: ../src/common/config.cpp:433
+#, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %d / '%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
+msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
+
+#: ../src/gtk/filedlg.cpp:67 ../src/gtk1/fontdlg.cpp:75
+#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:790
+#: ../src/generic/filectrlg.cpp:804 ../src/generic/filectrlg.cpp:820
+#: ../src/generic/filectrlg.cpp:1374 ../src/generic/filectrlg.cpp:1405
+#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:703
+#: ../src/generic/dirctrlg.cpp:721 ../src/generic/dirctrlg.cpp:732
 msgid "Error"
 msgstr "错误"
 
-#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
-msgid "Error "
-msgstr "错误 "
+#: ../src/unix/epolldispatcher.cpp:101
+#, fuzzy
+msgid "Error closing epoll descriptor"
+msgstr "创建目录错误"
 
-#: ../src/generic/dirdlgg.cpp:243
+#: ../src/generic/dirdlgg.cpp:252
 msgid "Error creating directory"
 msgstr "创建目录错误"
 
-#: ../src/common/imagbmp.cpp:930
-msgid "Error in reading image DIB ."
+#: ../src/common/imagbmp.cpp:953
+#, fuzzy
+msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 
-#: ../src/common/fileconf.cpp:504
+#: ../src/common/fileconf.cpp:459
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 
-#: ../src/common/fileconf.cpp:1026
+#: ../src/common/fileconf.cpp:1058
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
-#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+#: ../src/gtk/print.cpp:677
+#, fuzzy
+msgid "Error while printing: "
+msgstr "等待信号量时出错"
+
+#: ../src/mac/carbon/mpthread.cpp:477
 msgid "Error while waiting on semaphore"
 msgstr "等待信号量时出错"
 
-#: ../src/common/log.cpp:476
+#: ../src/common/log.cpp:709
 msgid "Error: "
 msgstr "错误: "
 
-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:110
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:202
-msgid "Estimated time : "
-msgstr "预期时间："
+#: ../src/generic/progdlgg.cpp:206
+#, fuzzy
+msgid "Estimated time:"
+msgstr "预期时间: "
 
-#: ../src/generic/dbgrptg.cpp:211
+#: ../src/generic/dbgrptg.cpp:230
 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
-msgstr ""
+msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 
-#: ../src/msw/utilsexc.cpp:753
+#: ../src/msw/utilsexc.cpp:838
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "命令 '%s'执行失败"
 
-#: ../src/os2/utilsexc.cpp:169
+#: ../src/os2/utilsexc.cpp:163
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
-
-#: ../contrib/src/deprecated/resource.cpp:1869
-#: ../contrib/src/deprecated/resource.cpp:1999
-#: ../contrib/src/deprecated/resource.cpp:3091
-#, fuzzy
-msgid "Expected '*' while parsing resource."
-msgstr "解析资源时期待出现 '*' ."
+msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
-#: ../contrib/src/deprecated/resource.cpp:1886
-#: ../contrib/src/deprecated/resource.cpp:2015
-#: ../contrib/src/deprecated/resource.cpp:3108
-#, fuzzy
-msgid "Expected '=' while parsing resource."
-msgstr "解析资源时期待 '='."
-
-#: ../contrib/src/deprecated/resource.cpp:1855
-#: ../contrib/src/deprecated/resource.cpp:1985
-#: ../contrib/src/deprecated/resource.cpp:3077
-#, fuzzy
-msgid "Expected 'char' while parsing resource."
-msgstr "解析资源时期待 'char' ."
-
-#: ../src/msw/registry.cpp:1125
+#: ../src/msw/registry.cpp:1159
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
-#: ../src/common/fmapbase.cpp:141
+#: ../src/common/fmapbase.cpp:152
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 
@@ -1624,115 +2684,129 @@ msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s'解压至 '%s'失败."
 
-#: ../src/msw/dialup.cpp:843
-#, c-format
-msgid "Failed to %s dialup connection: %s"
-msgstr "到 %s 的拨号连接失败: %s"
+#: ../src/common/accelcmn.cpp:231 ../src/common/accelcmn.cpp:303
+msgid "F"
+msgstr ""
 
-#: ../src/unix/snglinst.cpp:274
+#: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
 msgstr "访问锁文件失败."
 
-#: ../src/msw/dib.cpp:543
+#: ../src/unix/epolldispatcher.cpp:114
+#, fuzzy, c-format
+msgid "Failed to add descriptor %d to epoll descriptor %d"
+msgstr "不能写到文件描述子 %d"
+
+#: ../src/common/glcmn.cpp:82
+#, fuzzy
+msgid "Failed to allocate colour for OpenGL"
+msgstr "创建游标失败."
+
+#: ../src/msw/dib.cpp:567
 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."
 
-#: ../src/unix/displayx11.cpp:224
+#: ../src/unix/displayx11.cpp:234
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败."
 
-#: ../src/common/debugrpt.cpp:237
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:243
+#, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "创建目录 %s/.gnome 失败."
+msgstr "无法清除调试报告目录 \"%s\""
 
-#: ../src/common/filename.cpp:191
+#: ../src/common/filename.cpp:196
 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败."
 
-#: ../src/unix/snglinst.cpp:339
+#: ../src/unix/snglinst.cpp:335
 #, c-format
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
-#: ../src/msw/clipbrd.cpp:119
+#: ../src/msw/clipbrd.cpp:113
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 
-#: ../src/msw/dialup.cpp:783
+#: ../src/x11/utils.cpp:207
+#, fuzzy, c-format
+msgid "Failed to close the display \"%s\""
+msgstr "关闭剪贴板失败."
+
+#: ../src/gtk/utilsgtk.cpp:293
+#, fuzzy, c-format
+msgid "Failed to connect to session manager: %s"
+msgstr "到 %s 的拨号连接失败: %s"
+
+#: ../src/msw/dialup.cpp:825
 msgid "Failed to connect: missing username/password."
 msgstr "连接失败: 缺少用户名/口令."
 
-#: ../src/msw/dialup.cpp:729
+#: ../src/msw/dialup.cpp:771
 msgid "Failed to connect: no ISP to dial."
 msgstr "连接失败: 没有要拨号的ISP."
 
-#: ../src/msw/registry.cpp:618
+#: ../src/common/textfile.cpp:177
+#, fuzzy, c-format
+msgid "Failed to convert file \"%s\" to Unicode."
+msgstr "关闭文件句柄失败."
+
+#: ../src/msw/registry.cpp:637
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "复制注册键值失败 '%s'"
 
-#: ../src/msw/registry.cpp:627
+#: ../src/msw/registry.cpp:646
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 
-#: ../src/common/filefn.cpp:1008
+#: ../src/common/filefn.cpp:1095
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "复制文件 '%s'至 '%s'失败"
 
-#: ../src/msw/registry.cpp:605
+#: ../src/msw/registry.cpp:624
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 msgstr "复制注册表子键 '%s'至 '%s'失败."
 
-#: ../src/msw/dde.cpp:988
+#: ../src/msw/dde.cpp:1071
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 
-#: ../src/msw/mdi.cpp:459
+#: ../src/msw/mdi.cpp:470
 msgid "Failed to create MDI parent frame."
 msgstr "创建 MDI 父框架失败."
 
-#: ../src/msw/statbr95.cpp:112
+#: ../src/msw/statusbar.cpp:115
 msgid "Failed to create a status bar."
-msgstr "创建状态条失败。"
+msgstr "创建状态条失败."
 
-#: ../src/common/filename.cpp:766
+#: ../src/common/filename.cpp:859
 msgid "Failed to create a temporary file name"
 msgstr "创建临时文件名失败"
 
-#: ../src/msw/utilsexc.cpp:227
+#: ../src/msw/utilsexc.cpp:272
 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 
-#: ../src/msw/dde.cpp:450
+#: ../src/msw/dde.cpp:444
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 
-#: ../src/msw/cursor.cpp:216
+#: ../src/msw/cursor.cpp:214
 msgid "Failed to create cursor."
 msgstr "创建游标失败."
 
-#: ../src/common/debugrpt.cpp:202
-#, fuzzy, c-format
-msgid "Failed to create directory \"%s\""
-msgstr "创建目录 %s/.gnome 失败."
-
-#: ../src/unix/mimetype.cpp:370
+#: ../src/common/debugrpt.cpp:208
 #, c-format
-msgid "Failed to create directory %s/.gnome."
-msgstr "创建目录 %s/.gnome 失败."
-
-#: ../src/unix/mimetype.cpp:379
-#, c-format
-msgid "Failed to create directory %s/mime-info."
-msgstr "创建目录 %s/.mime-info 失败."
+msgid "Failed to create directory \"%s\""
+msgstr "无法创建目录 \"%s\""
 
-#: ../src/generic/dirdlgg.cpp:241
+#: ../src/generic/dirdlgg.cpp:250
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
@@ -1741,175 +2815,168 @@ msgstr ""
 "创建目录 '%s'失败\n"
 "(您是否有所需的权限?)"
 
-#: ../src/msw/mimetype.cpp:193
+#: ../src/unix/epolldispatcher.cpp:82
+#, fuzzy
+msgid "Failed to create epoll descriptor"
+msgstr "创建游标失败."
+
+#: ../src/msw/mimetype.cpp:190
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 msgstr "为 '%s'文件创建注册条目失败."
 
-#: ../src/msw/fdrepdlg.cpp:474
+#: ../src/msw/fdrepdlg.cpp:443
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 
-#: ../src/html/winpars.cpp:549
+#: ../src/unix/evtloopunix.cpp:52
+#, fuzzy
+msgid "Failed to create wake up pipe used by event loop."
+msgstr "创建状态条失败."
+
+#: ../src/html/winpars.cpp:704
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 
-#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:131
+#: ../src/msw/clipbrd.cpp:125
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 
-#: ../src/unix/displayx11.cpp:201
+#: ../src/unix/displayx11.cpp:211
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
-#: ../src/msw/dde.cpp:652
+#: ../src/msw/dde.cpp:725
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 
-#: ../src/msw/dialup.cpp:621
+#: ../src/msw/dialup.cpp:657 ../src/msw/dialup.cpp:889
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "建立拨号连接: %s失败"
 
-#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
+#: ../src/unix/utilsunx.cpp:549 ../src/unix/utilsunx.cpp:563
 #, c-format
 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 ""
-
-#: ../contrib/src/deprecated/resource.cpp:2489
-#, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-"查找XBM资源 %s失败.\n"
-"没有使用wxResourceLoadBitmapData?"
-
-#: ../contrib/src/deprecated/resource.cpp:2643
-#, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadIconData?"
-msgstr ""
-"查找XBM资源%s失败.\n"
-"没有使用wxResourceLoadIconData?"
+msgstr "执行 '%s'失败\n"
 
-#: ../contrib/src/deprecated/resource.cpp:2504
-#, c-format
-msgid ""
-"Failed to find XPM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-"查找XPM资源 %s失败.\n"
-"没有使用wxResourceLoadBitmapData?"
+#: ../src/common/debugrpt.cpp:672
+msgid "Failed to execute curl, please install it in PATH."
+msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+
+#: ../src/common/regex.cpp:433 ../src/common/regex.cpp:481
+#, fuzzy, c-format
+msgid "Failed to find match for regular expression: %s"
+msgstr "不能匹配 '%s' 于正则表达式: %s"
 
-#: ../src/msw/dialup.cpp:681
+#: ../src/msw/dialup.cpp:723
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "获取ISP名: %s失败"
 
-#: ../src/mac/carbon/clipbrd.cpp:138 ../src/mac/classic/clipbrd.cpp:134
-msgid "Failed to get clipboard data."
-msgstr "获取剪贴板数据失败."
-
-#: ../src/msw/clipbrd.cpp:723
+#: ../src/msw/clipbrd.cpp:743
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
-#: ../src/msw/stackwalk.cpp:221
-#, c-format
-msgid ""
-"Failed to get stack backtrace:\n"
-"%s"
-msgstr ""
-"不能获取堆栈的回溯路径:\n"
-" %s"
-
-#: ../src/common/stopwatch.cpp:223
+#: ../src/common/stopwatch.cpp:219
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
-#: ../src/common/filefn.cpp:1423
+#: ../src/common/filefn.cpp:1544
 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
-#: ../src/univ/theme.cpp:122
+#: ../src/univ/theme.cpp:114
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr "不能初始化GUI: 找不到内嵌的主题(theme)."
 
-#: ../src/msw/helpchm.cpp:69
+#: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."
 msgstr "初始化MS HTML帮助失败."
 
-#: ../src/msw/glcanvas.cpp:808
+#: ../src/msw/glcanvas.cpp:662
 msgid "Failed to initialize OpenGL"
 msgstr "不能初始化OpenGL"
 
-#: ../src/unix/snglinst.cpp:246
+#: ../src/msw/dialup.cpp:886
+#, fuzzy, c-format
+msgid "Failed to initiate dialup connection: %s"
+msgstr "终止拨号连接: %s失败"
+
+#: ../src/gtk/textctrl.cpp:1027
+#, fuzzy
+msgid "Failed to insert text in the control."
+msgstr "获取工作目录失败"
+
+#: ../src/unix/snglinst.cpp:242
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
 msgstr "检查锁文件 '%s'失败"
 
-#: ../src/unix/threadpsx.cpp:897
+#: ../src/unix/appunix.cpp:89
+#, fuzzy
+msgid "Failed to install signal handler"
+msgstr "关闭文件句柄失败."
+
+#: ../src/unix/threadpsx.cpp:979
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 
-#: ../src/msw/utils.cpp:702
+#: ../src/msw/utils.cpp:735
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 
-#: ../src/common/iconbndl.cpp:72
+#: ../src/common/iconbndl.cpp:127
 #, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 
-#: ../src/msw/enhmeta.cpp:84
+#: ../src/msw/enhmeta.cpp:97
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 
-#: ../src/msw/volume.cpp:312
+#: ../src/msw/volume.cpp:324
 msgid "Failed to load mpr.dll."
 msgstr "装载mpr.dll失败."
 
-#: ../src/common/dynlib.cpp:133
+#: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "不能装载共享库 '%s'"
 
-#: ../src/common/dynlib.cpp:115
-#, c-format
-msgid "Failed to load shared library '%s' Error '%s'"
-msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
-
-#: ../src/unix/snglinst.cpp:203
+#: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr "锁定锁文件 '%s'失败"
 
-#: ../src/common/regex.cpp:300
+#: ../src/unix/epolldispatcher.cpp:134
 #, c-format
-msgid "Failed to match '%s' in regular expression: %s"
-msgstr "不能匹配 '%s' 于正则表达式: %s"
+msgid "Failed to modify descriptor %d in epoll descriptor %d"
+msgstr ""
 
-#: ../src/common/filename.cpp:1917
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:2206
+#, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "修改文件时间(为 '%s') 失败"
 
-#: ../src/common/filename.cpp:179
-#, c-format
-msgid "Failed to open '%s' for %s"
+#: ../src/common/selectdispatcher.cpp:234
+msgid "Failed to monitor I/O channels"
+msgstr ""
+
+#: ../src/common/filename.cpp:182
+#, fuzzy, c-format
+msgid "Failed to open '%s' for reading"
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/common/filename.cpp:185
+#, fuzzy, c-format
+msgid "Failed to open '%s' for writing"
 msgstr "打开 '%s'(为 %s) 失败"
 
 #: ../src/html/chm.cpp:142
@@ -1917,83 +2984,110 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s'失败."
 
-#: ../src/common/filename.cpp:788
+#: ../src/common/utilscmn.cpp:1150
+#, fuzzy, c-format
+msgid "Failed to open URL \"%s\" in default browser."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/x11/utils.cpp:226
+#, fuzzy, c-format
+msgid "Failed to open display \"%s\"."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/common/filename.cpp:894
 msgid "Failed to open temporary file."
 msgstr "打开临时文件失败."
 
-#: ../src/msw/clipbrd.cpp:99
+#: ../src/msw/clipbrd.cpp:93
 msgid "Failed to open the clipboard."
-msgstr "打开剪贴板失败。"
+msgstr "打开剪贴板失败."
 
-#: ../src/msw/clipbrd.cpp:626
+#: ../src/msw/clipbrd.cpp:643
 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 
-#: ../src/unix/snglinst.cpp:283
+#: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
 msgstr "从锁文件读取PID失败."
 
-#: ../src/unix/utilsunx.cpp:581
+#: ../src/common/fileconf.cpp:470
+#, fuzzy
+msgid "Failed to read config options."
+msgstr "读配置选项错误."
+
+#: ../src/unix/evtloopunix.cpp:104
+#, fuzzy
+msgid "Failed to read from wake-up pipe"
+msgstr "从锁文件读取PID失败."
+
+#: ../src/unix/utilsunx.cpp:635
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
-#: ../src/msw/utilsexc.cpp:653
+#: ../src/msw/utilsexc.cpp:724
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
-#: ../src/msw/dde.cpp:300
+#: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "注册DDE服务器 '%s'失败"
 
-#: ../src/msw/glcanvas.cpp:368
+#: ../src/msw/glcanvas.cpp:270
 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 
-#: ../src/common/fontmap.cpp:246
+#: ../src/common/fontmap.cpp:243
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s'编码失败."
 
-#: ../src/common/debugrpt.cpp:220
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:226
+#, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "不能删除锁文件 '%s'"
+msgstr "不能删除调试报告文件 \"%s\""
 
-#: ../src/unix/snglinst.cpp:327
+#: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "不能删除锁文件 '%s'"
 
-#: ../src/unix/snglinst.cpp:293
+#: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr "删除过期的锁文件 '%s'失败."
 
-#: ../src/msw/registry.cpp:456
+#: ../src/msw/registry.cpp:474
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "将注册值 '%s'改名到'%s'失败."
 
-#: ../src/msw/registry.cpp:560
+#: ../src/common/filefn.cpp:1208
+#, c-format
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."
+msgstr ""
+
+#: ../src/msw/registry.cpp:579
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s'改名到'%s'失败."
 
-#: ../src/msw/clipbrd.cpp:503
+#: ../src/msw/clipbrd.cpp:497
 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败."
 
-#: ../src/common/filename.cpp:2007
+#: ../src/common/filename.cpp:2300
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "检取文件时间(为 '%s')失败"
 
-#: ../src/msw/dialup.cpp:454
+#: ../src/msw/dialup.cpp:490
 msgid "Failed to retrieve text of RAS error message"
 msgstr "检取RAS错误消息正文失败"
 
-#: ../src/msw/clipbrd.cpp:760
+#: ../src/msw/clipbrd.cpp:780
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "检取支持的剪贴板格式失败"
 
@@ -2002,99 +3096,112 @@ msgstr "检取支持的剪贴板格式失败"
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 
-#: ../src/msw/dde.cpp:697
+#: ../src/msw/dde.cpp:766
 msgid "Failed to send DDE advise notification"
 msgstr "发送DDE advise 通知失败"
 
-#: ../src/common/ftp.cpp:384
+#: ../src/common/ftp.cpp:381
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置FTP传输模式为 %s 时失败."
 
-#: ../src/msw/clipbrd.cpp:379
+#: ../src/msw/clipbrd.cpp:373
 msgid "Failed to set clipboard data."
 msgstr "设置剪贴板数据失败"
 
-#: ../src/unix/snglinst.cpp:186
+#: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s'上设置许可权限时失败"
 
-#: ../src/common/file.cpp:523
+#: ../src/common/file.cpp:509
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/gtk/textctrl.cpp:969
+#, fuzzy
+msgid "Failed to set text in the text control."
+msgstr "获取工作目录失败"
+
+#: ../src/unix/threadpsx.cpp:1317 ../src/unix/threadpsx.cpp:1327
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "设置线程优先级 %d失败."
 
-#: ../src/common/fs_mem.cpp:231
+#: ../src/common/fs_mem.cpp:256
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "将图像'%s'存到内存VFS失败!"
 
-#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-#: ../src/unix/threadpsx.cpp:1429
+#: ../src/unix/evtloopunix.cpp:61
+msgid "Failed to switch wake up pipe to non-blocking mode"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:1500 ../src/mac/carbon/mpthread.cpp:1268
 msgid "Failed to terminate a thread."
 msgstr "终止线程失败"
 
-#: ../src/msw/dde.cpp:671
+#: ../src/msw/dde.cpp:744
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "终止与DDE服务器的advise循环失败"
 
-#: ../src/msw/dialup.cpp:916
+#: ../src/msw/dialup.cpp:963
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 
-#: ../src/common/filename.cpp:1932
+#: ../src/common/filename.cpp:2221
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s'进行touch操作失败"
 
-#: ../src/unix/snglinst.cpp:333
+#: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr "对锁文件 '%s'解锁失败"
 
-#: ../src/msw/dde.cpp:321
+#: ../src/msw/dde.cpp:315
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "撤消DDE服务器 '%s'注册失败"
 
-#: ../src/common/fileconf.cpp:999
+#: ../src/unix/epolldispatcher.cpp:153
+#, fuzzy, c-format
+msgid "Failed to unregister descriptor %d from epoll descriptor %d"
+msgstr "从剪贴板检取数据失败."
+
+#: ../src/common/fileconf.cpp:1031
 msgid "Failed to update user configuration file."
 msgstr "不能更新用户配置文件."
 
-#: ../src/common/debugrpt.cpp:665
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:685
+#, c-format
 msgid "Failed to upload the debug report (error code %d)."
-msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
+msgstr "上传调试报告失败 (错误号 %d)."
 
-#: ../src/unix/snglinst.cpp:173
+#: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 
-#: ../src/generic/logg.cpp:399
+#: ../src/generic/logg.cpp:424
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../src/common/log.cpp:465
+#: ../src/common/log.cpp:698
 msgid "Fatal error: "
 msgstr "致命错误: "
 
-#: ../src/msw/wince/filedlgwce.cpp:120
+#: ../src/msw/wince/filedlgwce.cpp:119
 msgid "File"
 msgstr "文件"
 
-#: ../src/mgl/bitmap.cpp:544
+#: ../src/mgl/bitmap.cpp:409
 #, c-format
 msgid "File %s does not exist."
 msgstr "文件 %s不存在."
 
-#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61
+#: ../src/gtk/filedlg.cpp:52
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在, 确实需要复写它?"
@@ -2108,591 +3215,980 @@ msgstr ""
 "文件 '%s' 已存在.\n"
 "真的需要替换它?"
 
-#: ../src/common/textcmn.cpp:215
+#: ../src/common/textcmn.cpp:724 ../src/richtext/richtextctrl.cpp:1901
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 
-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
-#: ../src/common/docview.cpp:1609
+#: ../src/common/docview.cpp:587 ../src/common/docview.cpp:1641
 msgid "File error"
 msgstr "文件错误"
 
-#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765
+#: ../src/generic/filectrlg.cpp:804 ../src/generic/dirctrlg.cpp:721
 msgid "File name exists already."
 msgstr "文件名已存在"
 
-#: ../src/common/filefn.cpp:1739
+#: ../src/motif/filedlg.cpp:220
+msgid "Files"
+msgstr "文件"
+
+#: ../src/common/filefn.cpp:1835
 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
 
-#: ../src/html/helpfrm.cpp:491
+#: ../src/motif/filedlg.cpp:218
+msgid "Filter"
+msgstr "过滤器"
+
+#: ../src/html/helpwnd.cpp:486
 msgid "Find"
 msgstr "查找"
 
-#: ../src/html/helpfrm.cpp:1219
+#: ../src/html/helpwnd.cpp:1217
 msgid "Fixed font:"
 msgstr "固定字体:"
 
-#: ../src/html/helpfrm.cpp:1279
+#: ../src/html/helpwnd.cpp:1277
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
-#: ../src/html/helpfrm.cpp:1220
+#: ../src/richtext/richtextformatdlg.cpp:275 ../src/mac/carbon/fontdlg.cpp:449
+msgid "Font"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:187
+#, fuzzy
+msgid "Font &weight:"
+msgstr "字体粗细."
+
+#: ../src/html/helpwnd.cpp:1218
 msgid "Font size:"
 msgstr "字体大小:"
 
-#: ../src/unix/utilsunx.cpp:528
+#: ../src/richtext/richtextfontpage.cpp:174
+#, fuzzy
+msgid "Font st&yle:"
+msgstr "字体大小:"
+
+#: ../src/mac/carbon/fontdlg.cpp:491
+#, fuzzy
+msgid "Font:"
+msgstr "字体大小:"
+
+#: ../src/dfb/fontmgr.cpp:202
+#, c-format
+msgid "Fonts index file %s disappeared while loading fonts."
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:582
 msgid "Fork failed"
 msgstr "Fork 失败"
 
-#: ../src/common/xtixml.cpp:235
+#: ../src/common/xtixml.cpp:232
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 
-#: ../contrib/src/deprecated/resource.cpp:1838
-#: ../contrib/src/deprecated/resource.cpp:1968
-#: ../contrib/src/deprecated/resource.cpp:3060
-msgid "Found "
-msgstr "找到 "
-
-#: ../src/html/helpfrm.cpp:886
+#: ../src/html/htmlhelp.cpp:460 ../src/html/helpwnd.cpp:893
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 
-#: ../src/generic/prntdlgg.cpp:233
+#: ../src/generic/prntdlgg.cpp:245
 msgid "From:"
 msgstr "从:"
 
-#: ../src/common/imaggif.cpp:100
+#: ../src/common/fmapbase.cpp:156
+msgid "GB-2312"
+msgstr ""
+
+#: ../src/common/imaggif.cpp:80
 msgid "GIF: Invalid gif index."
 msgstr "GIF: 无效的gif图像索引."
 
-#: ../src/common/imaggif.cpp:75
+#: ../src/common/imaggif.cpp:70
 msgid "GIF: data stream seems to be truncated."
 msgstr "GIF: 数据流似乎已被截断."
 
-#: ../src/common/imaggif.cpp:59
+#: ../src/common/imaggif.cpp:54
 msgid "GIF: error in GIF image format."
 msgstr "GIF: GIF文件格式错误."
 
-#: ../src/common/imaggif.cpp:62
+#: ../src/common/imaggif.cpp:57
 msgid "GIF: not enough memory."
 msgstr "GIF: 没有足够内存."
 
-#: ../src/common/imaggif.cpp:65
+#: ../src/common/imaggif.cpp:60
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 
-#: ../src/univ/themes/gtk.cpp:634
+#: ../src/univ/themes/gtk.cpp:528
 msgid "GTK+ theme"
-msgstr "GTK+主题(theme)"
+msgstr "GTK+ 主题"
 
-#: ../src/common/prntbase.cpp:228
+#: ../src/common/prntbase.cpp:242
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 
-#: ../src/common/paper.cpp:149
+#: ../src/common/paper.cpp:137
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 
-#: ../src/common/paper.cpp:148
+#: ../src/common/paper.cpp:136
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
-#: ../include/wx/xti.h:845
-msgid "GetProperty called w/o valid getter"
-msgstr "调用GetProperty时未带有效的getter"
-
-#: ../include/wx/xti.h:906
-msgid "GetPropertyCollection called on a generic accessor"
-msgstr "在一个通用处理器上调用GetPropertyCollection"
-
-#: ../include/wx/xti.h:853
-msgid "GetPropertyCollection called w/o valid collection getter"
-msgstr "调用GetPropertyCollection时未带有效的collection getter"
-
-#: ../src/html/helpfrm.cpp:651
+#: ../src/html/helpwnd.cpp:661
 msgid "Go back"
 msgstr "回退"
 
-#: ../src/html/helpfrm.cpp:654
+#: ../src/html/htmlhelp.cpp:541
+msgid "Go back to the previous HTML page"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:664
 msgid "Go forward"
 msgstr "向前"
 
-#: ../src/html/helpfrm.cpp:659
+#: ../src/html/htmlhelp.cpp:543
+msgid "Go forward to the next HTML page"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:669
 msgid "Go one level up in document hierarchy"
-msgstr "å\9c¨æ\96\87æ¡£å±\82次中ä¸\8aå\8d\87ä¸\80级"
+msgstr "å\88°ä¸\8aä¸\80级æ\96\87æ¡£ç\9b®å½\95"
 
-#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:997
+#: ../src/generic/dirdlgg.cpp:137 ../src/generic/filedlgg.cpp:225
 msgid "Go to home directory"
 msgstr "进入home目录"
 
-#: ../src/generic/filedlgg.cpp:989
+#: ../src/generic/filedlgg.cpp:221
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
-#: ../src/common/prntbase.cpp:804
+#: ../src/common/prntbase.cpp:1091
 msgid "Goto Page"
 msgstr "跳转页面"
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/generic/aboutdlgg.cpp:77
+msgid "Graphics art by "
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:114
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/common/zstream.cpp:142 ../src/common/zstream.cpp:290
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 
-#: ../src/html/helpfrm.cpp:1574
+#: ../src/common/accelcmn.cpp:74
+msgid "HELP"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:59
+msgid "HOME"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1552
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:498
+#: ../src/html/htmlwin.cpp:630
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 锚 %s 不存在."
 
-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpwnd.cpp:1550
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/common/fmapbase.cpp:110
+#: ../src/html/htmprint.cpp:379
+msgid ""
+"HTML pagination algorithm generated more than the allowed maximum number of "
+"pages and it can't continue any longer!"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:115
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
-#: ../contrib/src/deprecated/proplist.cpp:523 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:337 ../src/msw/mdi.cpp:1383
+#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:104
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/html/helpfrm.cpp:1213
+#: ../src/html/htmlhelp.cpp:87
+#, fuzzy, c-format
+msgid "Help : %s"
+msgstr "帮助: %s"
+
+#: ../src/html/helpwnd.cpp:1211
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
-#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:460 ../src/generic/helpext.cpp:461
 msgid "Help Index"
 msgstr "帮助索引"
 
-#: ../src/html/helpfrm.cpp:1560
+#: ../src/html/helpwnd.cpp:1538
 msgid "Help Printing"
 msgstr "帮助打印"
 
-#: ../src/html/helpfrm.cpp:814
+#: ../src/html/helpwnd.cpp:820
 msgid "Help Topics"
 msgstr "帮助主题"
 
-#: ../src/html/helpfrm.cpp:1573
+#: ../src/html/helpwnd.cpp:1551
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
-#: ../src/html/helpctrl.cpp:55
+#: ../src/generic/helpext.cpp:273
+#, c-format
+msgid "Help directory \"%s\" not found."
+msgstr ""
+
+#: ../src/generic/helpext.cpp:281
+#, fuzzy, c-format
+msgid "Help file \"%s\" not found."
+msgstr "找不到域 '%s'的目录文件."
+
+#: ../src/html/helpctrl.cpp:51
 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 
-#: ../src/generic/dirdlgg.cpp:107
+#: ../src/generic/dirdlgg.cpp:99
 msgid "Home"
 msgstr "Home"
 
-#: ../src/generic/dirctrlg.cpp:646
+#: ../src/generic/dirctrlg.cpp:658
 msgid "Home directory"
 msgstr "Home目录"
 
-#: ../include/wx/filefn.h:142
+#: ../include/wx/filefn.h:146
 msgid "I64"
 msgstr "I64"
 
-#: ../src/common/imagbmp.cpp:943
+#: ../src/common/imagbmp.cpp:966
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误."
 
-#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
-#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
-#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-#: ../src/common/imagbmp.cpp:1190
+#: ../src/common/imagbmp.cpp:1076 ../src/common/imagbmp.cpp:1135
+#: ../src/common/imagbmp.cpp:1144 ../src/common/imagbmp.cpp:1155
+#: ../src/common/imagbmp.cpp:1199 ../src/common/imagbmp.cpp:1209
+#: ../src/common/imagbmp.cpp:1218
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误."
 
-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1044
 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 图像高度超出范围, 不适合做图标."
 
-#: ../src/common/imagbmp.cpp:1022
+#: ../src/common/imagbmp.cpp:1050
 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 图像宽度超出范围, 不适合做图标."
 
-#: ../src/common/imagbmp.cpp:1255
+#: ../src/common/imagbmp.cpp:1283
 msgid "ICO: Invalid icon index."
 msgstr "ICO: 无效的图标索引."
 
-#: ../src/common/imagiff.cpp:771
+#: ../src/common/imagiff.cpp:758
 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 数据流似乎已被截断."
 
-#: ../src/common/imagiff.cpp:755
+#: ../src/common/imagiff.cpp:742
 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF文件格式错误."
 
-#: ../src/common/imagiff.cpp:758
+#: ../src/common/imagiff.cpp:745
 msgid "IFF: not enough memory."
 msgstr "IFF: 没有足够内存."
 
-#: ../src/common/imagiff.cpp:761
+#: ../src/common/imagiff.cpp:748
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误!!!"
 
-#: ../contrib/src/deprecated/resource.cpp:2673
-#: ../contrib/src/deprecated/resource.cpp:2684
-#, c-format
-msgid "Icon resource specification %s not found."
-msgstr "没有找到图标资源规范 %s ."
+#: ../src/common/accelcmn.cpp:49
+msgid "INS"
+msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:330
-msgid "If you have any additional information pertaining to this bug\n"
+#: ../src/common/accelcmn.cpp:50
+msgid "INSERT"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:157
+msgid "ISO-2022-JP"
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:293
-msgid "If you wish to suppress this debug report completely, please "
+#: ../src/mac/carbon/dataview.cpp:609
+msgid "Icon & text renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/msw/registry.cpp:1281
+#: ../src/generic/dbgrptg.cpp:354
+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:320
+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:1324
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 msgstr "忽略值 \"%s\" (键 \"%s\")."
 
-#: ../contrib/src/deprecated/resource.cpp:271
-msgid "Ill-formed resource file syntax."
-msgstr "不良的资源文件语法."
-
-#: ../src/common/xtistrm.cpp:260
+#: ../src/common/xtistrm.cpp:256
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
 
-#: ../include/wx/xti.h:1650
-msgid "Illegal Parameter Count for ConstructObject Method"
-msgstr "非法的针对ConstructObject方法的参数计数"
-
-#: ../include/wx/xti.h:1723
-msgid "Illegal Parameter Count for Create Method"
-msgstr "非法的针对Create方法的参数计数"
-
-#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751
+#: ../src/generic/filectrlg.cpp:790 ../src/generic/dirctrlg.cpp:703
 msgid "Illegal directory name."
 msgstr "不合法的目录名."
 
-#: ../src/generic/filedlgg.cpp:1275
+#: ../src/generic/filectrlg.cpp:1373
 msgid "Illegal file specification."
 msgstr "不合规范的文件描述."
 
-#: ../src/common/image.cpp:1169
+#: ../src/common/image.cpp:1841
 msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致."
 
-#: ../src/common/image.cpp:1500
-#, c-format
-msgid "Image file is not of type %d."
+#: ../src/common/image.cpp:2195 ../src/common/image.cpp:2240
+#, fuzzy, c-format
+msgid "Image file is not of type %ld."
+msgstr "图像文件的类型不是 %d."
+
+#: ../src/common/image.cpp:2264
+#, fuzzy, c-format
+msgid "Image file is not of type %s."
 msgstr "图像文件的类型不是 %d."
 
-#: ../src/msw/textctrl.cpp:361
+#: ../src/msw/textctrl.cpp:464
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:411
+#: ../src/unix/utilsunx.cpp:314
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
-#: ../src/common/filefn.cpp:1027
+#: ../src/common/filefn.cpp:1114
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "不可能获得文件 '%s'的许可权限"
 
-#: ../src/common/filefn.cpp:1041
+#: ../src/common/filefn.cpp:1128
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 
-#: ../src/common/filefn.cpp:1085
+#: ../src/common/filefn.cpp:1182
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "不可能设置文件 '%s'的许可权限"
 
-#: ../src/common/stockitem.cpp:124
-msgid "Indent"
-msgstr "缩进"
+#: ../src/common/stockitem.cpp:130
+msgid "Indent"
+msgstr "缩进"
+
+#: ../src/richtext/richtextformatdlg.cpp:281
+msgid "Indents && Spacing"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:578 ../src/html/helpwnd.cpp:511
+msgid "Index"
+msgstr "索引"
+
+#: ../src/common/fmapbase.cpp:119
+#, fuzzy
+msgid "Indian (ISO-8859-12)"
+msgstr "印地安语 (ISO-8859-12)"
+
+#: ../src/common/init.cpp:248
+msgid "Initialization failed in post init, aborting."
+msgstr "在后初始化阶段出错, 退出..."
+
+#: ../src/richtext/richtextsymboldlg.cpp:470
+#, fuzzy
+msgid "Insert"
+msgstr "缩进"
+
+#: ../src/richtext/richtextbuffer.cpp:5244
+#: ../src/richtext/richtextbuffer.cpp:6024
+msgid "Insert Image"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:5105
+#: ../src/richtext/richtextbuffer.cpp:5139
+#: ../src/richtext/richtextbuffer.cpp:5177
+#: ../src/richtext/richtextctrl.cpp:600 ../src/richtext/richtextctrl.cpp:867
+msgid "Insert Text"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:700
+msgid "Internal error, illegal wxCustomTypeInfo"
+msgstr "整数错误, 非法的wxCustomTypeInfo"
+
+#: ../src/gtk/app.cpp:484
+#, c-format
+msgid "Invalid GTK+ command line option, use \"%s --help\""
+msgstr ""
+
+#: ../src/common/imagtiff.cpp:280
+msgid "Invalid TIFF image index."
+msgstr "无效TIFF图像索引."
+
+#: ../src/xrc/xmlres.cpp:511
+#, c-format
+msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
+msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
+
+#: ../src/mac/carbon/databrow.cpp:1112
+msgid "Invalid data view item"
+msgstr ""
+
+#: ../src/common/appcmn.cpp:254
+#, c-format
+msgid "Invalid display mode specification '%s'."
+msgstr "无效的显示模式 '%s'."
+
+#: ../src/x11/app.cpp:124
+#, c-format
+msgid "Invalid geometry specification '%s'"
+msgstr "无效的几何规格 '%s'"
+
+#: ../src/unix/snglinst.cpp:307
+#, c-format
+msgid "Invalid lock file '%s'."
+msgstr "无效的锁文件 '%s'."
+
+#: ../src/common/xtistrm.cpp:361 ../src/common/xtistrm.cpp:376
+msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
+msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
+
+#: ../src/common/xtistrm.cpp:391
+msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
+msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
+
+#: ../src/common/regex.cpp:312
+#, c-format
+msgid "Invalid regular expression '%s': %s"
+msgstr "无效的正则表达式 '%s': %s"
+
+#: ../src/richtext/richtextfontpage.cpp:266
+#: ../src/richtext/richtextfontpage.cpp:318
+#: ../src/richtext/richtextfontpage.cpp:566 ../src/generic/fontdlgg.cpp:331
+#: ../src/mac/carbon/fontdlg.cpp:523
+msgid "Italic"
+msgstr "斜体"
+
+#: ../src/common/paper.cpp:132
+msgid "Italy Envelope, 110 x 230 mm"
+msgstr "意大利信封, 110 x 230 毫米"
+
+#: ../src/common/imagjpeg.cpp:251
+msgid "JPEG: Couldn't load - file is probably corrupted."
+msgstr "JPEG: 不能装入 - 文件也许已被破坏."
+
+#: ../src/common/imagjpeg.cpp:410
+msgid "JPEG: Couldn't save image."
+msgstr "JPEG: 不能保存图像."
+
+#: ../src/common/paper.cpp:165
+msgid "Japanese Double Postcard 200 x 148 mm"
+msgstr "日本双明信片, 200 x 148 毫米"
+
+#: ../src/common/paper.cpp:169
+msgid "Japanese Envelope Chou #3"
+msgstr "日本 Chou 3 信封"
+
+#: ../src/common/paper.cpp:182
+msgid "Japanese Envelope Chou #3 Rotated"
+msgstr "日本 Chou 3 信封(横向)"
+
+#: ../src/common/paper.cpp:170
+msgid "Japanese Envelope Chou #4"
+msgstr "日本 Chou 4 信封"
+
+#: ../src/common/paper.cpp:183
+msgid "Japanese Envelope Chou #4 Rotated"
+msgstr "日本 Chou 4 信封(横向)"
+
+#: ../src/common/paper.cpp:167
+msgid "Japanese Envelope Kaku #2"
+msgstr "日本 Kaku 2 信封"
+
+#: ../src/common/paper.cpp:180
+msgid "Japanese Envelope Kaku #2 Rotated"
+msgstr "日本 Kaku 2 信封(横向)"
+
+#: ../src/common/paper.cpp:168
+msgid "Japanese Envelope Kaku #3"
+msgstr "日本 Kaku 3 信封"
+
+#: ../src/common/paper.cpp:181
+msgid "Japanese Envelope Kaku #3 Rotated"
+msgstr "日本 Kaku 3 信封(横向)"
+
+#: ../src/common/paper.cpp:187
+msgid "Japanese Envelope You #4"
+msgstr "日本 You 4 信封"
+
+#: ../src/common/paper.cpp:188
+msgid "Japanese Envelope You #4 Rotated"
+msgstr "日本 You 4 信封(横向)"
+
+#: ../src/common/paper.cpp:140
+msgid "Japanese Postcard 100 x 148 mm"
+msgstr "日本明信片, 100 x 148 毫米"
+
+#: ../src/common/paper.cpp:177
+msgid "Japanese Postcard Rotated 148 x 100 mm"
+msgstr "横向日本明信片, 148 x 100 毫米"
+
+#: ../src/common/stockitem.cpp:134
+msgid "Justified"
+msgstr "分散对齐"
+
+#: ../src/richtext/richtextliststylepage.cpp:343
+#: ../src/richtext/richtextliststylepage.cpp:345
+#: ../src/richtext/richtextindentspage.cpp:165
+#: ../src/richtext/richtextindentspage.cpp:167
+msgid "Justify text left and right."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:123
+msgid "KOI8-R"
+msgstr "KOI8-R"
+
+#: ../src/common/fmapbase.cpp:124
+msgid "KOI8-U"
+msgstr "KOI8-U"
+
+#: ../src/common/accelcmn.cpp:247 ../src/common/accelcmn.cpp:305
+msgid "KP_"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:102
+msgid "KP_ADD"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:97
+msgid "KP_BEGIN"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:105
+msgid "KP_DECIMAL"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:99
+msgid "KP_DELETE"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:106
+msgid "KP_DIVIDE"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:91
+msgid "KP_DOWN"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:96
+msgid "KP_END"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:516
-msgid "Index"
-msgstr "索引"
+#: ../src/common/accelcmn.cpp:86
+msgid "KP_ENTER"
+msgstr ""
 
-#: ../src/common/fmapbase.cpp:114
-#, fuzzy
-msgid "Indian (ISO-8859-12)"
-msgstr "印地安语 (ISO-8859-12)"
+#: ../src/common/accelcmn.cpp:100
+msgid "KP_EQUAL"
+msgstr ""
 
-#: ../src/common/xtistrm.cpp:704
-msgid "Internal error, illegal wxCustomTypeInfo"
-msgstr "整数错误, 非法的wxCustomTypeInfo"
+#: ../src/common/accelcmn.cpp:87
+msgid "KP_HOME"
+msgstr ""
 
-#: ../src/common/imagtiff.cpp:211
-msgid "Invalid TIFF image index."
-msgstr "无效TIFF图像索引."
+#: ../src/common/accelcmn.cpp:98
+msgid "KP_INSERT"
+msgstr ""
 
-#: ../src/xrc/xmlres.cpp:399
-#, c-format
-msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
+#: ../src/common/accelcmn.cpp:88
+msgid "KP_LEFT"
+msgstr ""
 
-#: ../src/common/appcmn.cpp:249
-#, c-format
-msgid "Invalid display mode specification '%s'."
-msgstr "无效的显示模式 '%s'."
+#: ../src/common/accelcmn.cpp:101
+msgid "KP_MULTIPLY"
+msgstr ""
 
-#: ../src/x11/app.cpp:128
-#, c-format
-msgid "Invalid geometry specification '%s'"
-msgstr "无效的几何规格 '%s'"
+#: ../src/common/accelcmn.cpp:94
+msgid "KP_NEXT"
+msgstr ""
 
-#: ../src/unix/snglinst.cpp:311
-#, c-format
-msgid "Invalid lock file '%s'."
-msgstr "无效的锁文件 '%s'."
+#: ../src/common/accelcmn.cpp:95
+msgid "KP_PAGEDOWN"
+msgstr ""
 
-#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
-msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
-msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
+#: ../src/common/accelcmn.cpp:93
+msgid "KP_PAGEUP"
+msgstr ""
 
-#: ../src/common/xtistrm.cpp:395
-msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
-msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
+#: ../src/common/accelcmn.cpp:92
+msgid "KP_PRIOR"
+msgstr ""
 
-#: ../src/common/regex.cpp:210
-#, c-format
-msgid "Invalid regular expression '%s': %s"
-msgstr "无效的正则表达式 '%s': %s"
+#: ../src/common/accelcmn.cpp:90
+msgid "KP_RIGHT"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:233
-msgid "Italic"
-msgstr "斜体"
+#: ../src/common/accelcmn.cpp:103
+msgid "KP_SEPARATOR"
+msgstr ""
 
-#: ../src/common/paper.cpp:144
-msgid "Italy Envelope, 110 x 230 mm"
-msgstr "意大利信封, 110 x 230 毫米"
+#: ../src/common/accelcmn.cpp:84
+msgid "KP_SPACE"
+msgstr ""
 
-#: ../src/common/imagjpeg.cpp:225
-msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: 不能装入 - 文件也许已被破坏."
+#: ../src/common/accelcmn.cpp:104
+msgid "KP_SUBTRACT"
+msgstr ""
 
-#: ../src/common/imagjpeg.cpp:339
-msgid "JPEG: Couldn't save image."
-msgstr "JPEG: 不能保存图像."
+#: ../src/common/accelcmn.cpp:85
+msgid "KP_TAB"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:128
-msgid "Justified"
-msgstr "分散对齐"
+#: ../src/common/accelcmn.cpp:89
+msgid "KP_UP"
+msgstr ""
 
-#: ../src/common/fmapbase.cpp:118
-msgid "KOI8-R"
-msgstr "KOI8-R"
+#: ../src/richtext/richtextindentspage.cpp:307
+msgid "L&ine spacing:"
+msgstr ""
 
-#: ../src/common/fmapbase.cpp:119
-msgid "KOI8-U"
-msgstr "KOI8-U"
+#: ../src/common/accelcmn.cpp:55
+msgid "LEFT"
+msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
 msgid "Landscape"
 msgstr "横向"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 
-#: ../src/generic/prntdlgg.cpp:879
+#: ../src/richtext/richtextliststylepage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:251
+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextbulletspage.cpp:197
+#: ../src/richtext/richtextbulletspage.cpp:200
+#: ../src/richtext/richtextbulletspage.cpp:201
+msgid "Left"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:391
+#: ../src/richtext/richtextindentspage.cpp:217
+msgid "Left (&first line):"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:885
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
-#: ../src/common/paper.cpp:110
+#: ../src/richtext/richtextliststylepage.cpp:329
+#: ../src/richtext/richtextliststylepage.cpp:331
+#: ../src/richtext/richtextindentspage.cpp:151
+#: ../src/richtext/richtextindentspage.cpp:153
+msgid "Left-align text."
+msgstr ""
+
+#: ../src/common/paper.cpp:146
+msgid "Legal Extra 9 1/2 x 15 in"
+msgstr "特大法律纸张, 9 1/2 x 15 英寸"
+
+#: ../src/common/paper.cpp:98
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:145
+msgid "Letter Extra 9 1/2 x 12 in"
+msgstr "特大信纸, 9 1/2 x 12 英寸"
+
+#: ../src/common/paper.cpp:151
+msgid "Letter Extra Transverse 9.275 x 12 in"
+msgstr "特大信纸(横排), 9.275 x 12 英寸"
+
+#: ../src/common/paper.cpp:154
+msgid "Letter Plus 8 1/2 x 12.69 in"
+msgstr "加大信纸, 8 1/2 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:171
+msgid "Letter Rotated 11 x 8 1/2 in"
+msgstr "横向信纸, 11 x 8 1/2 英寸"
+
+#: ../src/common/paper.cpp:103
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 
-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:149
+msgid "Letter Transverse 8 1/2 x 11 in"
+msgstr "信纸(横排), 8 1/2 x 11 英寸"
+
+#: ../src/common/paper.cpp:97
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 
-#: ../src/generic/fontdlgg.cpp:236
+#: ../src/generic/aboutdlgg.cpp:139
+msgid "License"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:334
 msgid "Light"
 msgstr "细"
 
+#: ../src/generic/helpext.cpp:300
+#, c-format
+msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:453
+msgid "Line spacing:"
+msgstr ""
+
 #: ../src/html/chm.cpp:820
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//', 转换为绝对链接."
 
-#: ../src/common/fldlgcmn.cpp:257
+#: ../src/richtext/richtextformatdlg.cpp:300
+msgid "List Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:841
+msgid "List styles"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:163
+#: ../src/richtext/richtextfontpage.cpp:165
+msgid "Lists font sizes in points."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:144
+#: ../src/richtext/richtextfontpage.cpp:146
+#, fuzzy
+msgid "Lists the available fonts."
+msgstr "对不起, 没有所需技巧!"
+
+#: ../src/common/fldlgcmn.cpp:282
 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 
-#: ../src/html/htmlwin.cpp:416
+#: ../src/html/htmlwin.cpp:548
 msgid "Loading : "
 msgstr "装载: "
 
-#: ../src/common/imagpnm.cpp:72
-msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "装入灰度 Ascii PNM图像功能还没有实现."
-
-#: ../src/common/imagpnm.cpp:75
-msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "装入灰度 Raw PNM图像功能还没有实现."
-
-#: ../src/unix/snglinst.cpp:251
+#: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 msgstr "锁文件 '%s' 没有正确的所有者."
 
-#: ../src/unix/snglinst.cpp:256
+#: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限."
 
-#: ../src/generic/logg.cpp:575
+#: ../src/generic/logg.cpp:602
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'."
 
-#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-msgid "Long Conversions not supported"
-msgstr "不支持长转换"
+#: ../src/richtext/richtextliststylepage.cpp:486
+#: ../src/richtext/richtextbulletspage.cpp:284
+msgid "Lower case letters"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:488
+#: ../src/richtext/richtextbulletspage.cpp:286
+msgid "Lower case roman numerals"
+msgstr ""
 
-#: ../src/gtk/mdi.cpp:465
+#: ../src/gtk/mdi.cpp:413 ../src/gtk1/mdi.cpp:462
 msgid "MDI child"
 msgstr "MDI子窗口"
 
-#: ../src/mac/carbon/thread.cpp:1635
-msgid "MP Thread Support is not available on this System"
-msgstr "此系统不提供MP线程支持."
+#: ../src/common/accelcmn.cpp:67
+msgid "MENU"
+msgstr ""
 
-#: ../src/msw/helpchm.cpp:60
+#: ../src/msw/helpchm.cpp:57
 msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
 "not installed on this machine. Please install it."
 msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮助库. 请安装它."
 
-#: ../src/univ/themes/win32.cpp:4823
+#: ../src/univ/themes/win32.cpp:3740
 msgid "Ma&ximize"
-msgstr "最大化[&x]"
-
-#: ../src/unix/mimetype.cpp:2671
-#, c-format
-msgid "Mailcap file %s, line %d: incomplete entry ignored."
-msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
+msgstr "最大化(&x)"
 
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
-msgstr "大å°\8få\86\99å\8c¹é\85\8d"
+msgstr "å\8cºå\88\86大å°\8få\86\99"
 
-#: ../src/common/fs_mem.cpp:176
+#: ../src/common/fs_mem.cpp:168
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 
-#: ../src/msw/frame.cpp:374
+#: ../src/msw/frame.cpp:415
 msgid "Menu"
 msgstr "菜单"
 
-#: ../src/univ/themes/metal.cpp:174
+#: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
-msgstr "金属主题(theme)"
+msgstr "金属主题"
 
-#: ../src/univ/themes/win32.cpp:4821
+#: ../src/univ/themes/win32.cpp:3738
 msgid "Mi&nimize"
-msgstr "最小化[&n]"
+msgstr "最小化(&n)"
 
-#: ../src/unix/mimetype.cpp:2292
-#, c-format
-msgid "Mime.types file %s, line %d: unterminated quoted string."
-msgstr "Mime.类型文件 %s, 行 %d: 没有结束符号的引用字符串."
-
-#: ../src/mgl/app.cpp:165
+#: ../src/mgl/app.cpp:163
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr "显示模式 %ix%i-%i位色 不支持."
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/mac/carbon/dataview.cpp:1412
+#, fuzzy
+msgid "Model pointer not initialized."
+msgstr "不能初始化显示."
+
+#: ../src/generic/fontdlgg.cpp:326
 msgid "Modern"
 msgstr "现代"
 
-#: ../src/generic/filedlgg.cpp:441
+#: ../src/generic/filectrlg.cpp:461
 msgid "Modified"
-msgstr "修正ç\9a\84"
+msgstr "ä¿®æ\94¹æ\97¥æ\9c\9f"
 
-#: ../src/common/paper.cpp:145
+#: ../src/common/module.cpp:134
+#, c-format
+msgid "Module \"%s\" initialization failed"
+msgstr "模块 \"%s\" 初始化失败"
+
+#: ../src/common/paper.cpp:133
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
 
-#: ../contrib/src/gizmos/editlbox.cpp:162
+#: ../src/generic/editlbox.cpp:276
 msgid "Move down"
 msgstr "下移"
 
-#: ../contrib/src/gizmos/editlbox.cpp:161
+#: ../src/generic/editlbox.cpp:275
 msgid "Move up"
 msgstr "上移"
 
-#: ../src/generic/filedlgg.cpp:438
+#: ../src/common/accelcmn.cpp:80
+msgid "NUM_LOCK"
+msgstr ""
+
+#: ../src/generic/filectrlg.cpp:458
 msgid "Name"
 msgstr "名称"
 
-#: ../src/generic/dirdlgg.cpp:111
+#: ../src/richtext/richtextstyledlg.cpp:217
+msgid "New &Character Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:229
+msgid "New &List Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:223
+msgid "New &Paragraph Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:568
+#: ../src/richtext/richtextstyledlg.cpp:573
+#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:621
+#: ../src/richtext/richtextstyledlg.cpp:770
+#: ../src/richtext/richtextstyledlg.cpp:775
+#: ../src/richtext/richtextstyledlg.cpp:843
+#: ../src/richtext/richtextstyledlg.cpp:851
+#, fuzzy
+msgid "New Style"
+msgstr "新项目"
+
+#: ../src/generic/dirdlgg.cpp:103
 msgid "New directory"
 msgstr "新目录"
 
-#: ../contrib/src/gizmos/editlbox.cpp:159
+#: ../src/generic/editlbox.cpp:273
 msgid "New item"
 msgstr "新项目"
 
-#: ../src/generic/dirdlgg.cpp:318 ../src/generic/dirdlgg.cpp:328
-#: ../src/generic/filedlgg.cpp:615 ../src/generic/filedlgg.cpp:624
+#: ../src/generic/filectrlg.cpp:652 ../src/generic/filectrlg.cpp:661
+#: ../src/generic/dirdlgg.cpp:327 ../src/generic/dirdlgg.cpp:337
 msgid "NewName"
-msgstr "新名"
+msgstr "新名称"
 
-#: ../src/generic/tipdlg.cpp:305
+#: ../src/generic/tipdlg.cpp:303
 msgid "Next"
 msgstr "下一个"
 
-#: ../src/html/helpfrm.cpp:665
+#: ../src/html/helpwnd.cpp:675
 msgid "Next page"
 msgstr "下一页"
 
-#: ../src/mac/carbon/msgdlg.cpp:60 ../src/mac/carbon/msgdlg.cpp:145
-#: ../src/mac/classic/msgdlg.cpp:58 ../src/mac/classic/msgdlg.cpp:142
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:36
 msgid "No"
 msgstr "否"
 
-#: ../contrib/src/deprecated/resource.cpp:2495
-#: ../contrib/src/deprecated/resource.cpp:2649
-msgid "No XBM facility available!"
-msgstr "没有可用XBM工具!"
+#: ../src/generic/animateg.cpp:152
+#, fuzzy, c-format
+msgid "No animation handler for type %ld defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/dfb/bitmap.cpp:540 ../src/dfb/bitmap.cpp:574
+#, fuzzy, c-format
+msgid "No bitmap handler for type %d defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/mac/carbon/databrow.cpp:1116
+msgid "No column existing."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:1013
+msgid "No column for the specified column index existing."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:768
+msgid "No column for the specified column position existing."
+msgstr ""
 
-#: ../contrib/src/deprecated/resource.cpp:2667
-msgid "No XPM icon facility available!"
-msgstr "没有可用的XPM图标设备!"
+#: ../src/common/utilscmn.cpp:1146
+msgid "No default application configured for HTML files."
+msgstr ""
 
-#: ../src/generic/helpext.cpp:437
+#: ../src/generic/helpext.cpp:451
 msgid "No entries found."
 msgstr "没找到条目"
 
-#: ../src/common/fontmap.cpp:422
+#: ../src/common/fontmap.cpp:419
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -2700,208 +4196,417 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
-"在编码 '%s' 中未找到显示文本所用的字体,\n"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"
 "但发现另一替代编码 '%s'.\n"
 "是否使用该编码(否则您必须选择另外的编码)?"
 
-#: ../src/common/fontmap.cpp:427
+#: ../src/common/fontmap.cpp:424
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
-"在编码 '%s' 中未找到显示文本所用的字体.\n"
-"选择用于该编码的字体\n"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"
+"请选择用于该编码的字体\n"
 "(否则该编码的文本将不能正确显示)?"
 
-#: ../src/xrc/xmlres.cpp:616
+#: ../src/xrc/xmlres.cpp:739
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 
-#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525
+#: ../src/generic/animateg.cpp:144
+#, fuzzy
+msgid "No handler found for animation type."
+msgstr "没有找到图像类型处理器."
+
+#: ../src/common/image.cpp:2177 ../src/common/image.cpp:2224
 msgid "No handler found for image type."
 msgstr "没有找到图像类型处理器."
 
-#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
-#: ../src/common/image.cpp:1566
+#: ../src/common/image.cpp:2278
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器."
 
-#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581
+#: ../src/common/image.cpp:2185 ../src/common/image.cpp:2233
+#, fuzzy, c-format
+msgid "No image handler for type %ld defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/common/image.cpp:2257 ../src/common/image.cpp:2293
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "没有类型 %s的图像处理器."
 
-#: ../src/html/helpfrm.cpp:869
+#: ../src/html/htmlhelp.cpp:436 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:876
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
-#: ../src/unix/sound.cpp:89
+#: ../src/mac/carbon/dataview.cpp:1051 ../src/mac/carbon/dataview.cpp:1171
+msgid "No model associated with control."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:1015 ../src/mac/carbon/databrow.cpp:1118
+msgid "No renderer or invalid renderer type specified for custom data column."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:769
+msgid "No renderer specified for column."
+msgstr ""
+
+#: ../src/unix/sound.cpp:82
 msgid "No sound"
 msgstr "没有声音"
 
-#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216
+#: ../src/common/image.cpp:1849 ../src/common/image.cpp:1890
 msgid "No unused colour in image being masked."
 msgstr "图像中没有被掩码的未用颜色."
 
-#: ../src/common/image.cpp:1821
+#: ../src/common/image.cpp:2742
 msgid "No unused colour in image."
 msgstr "图像中没有未用的颜色."
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/generic/helpext.cpp:308
+#, c-format
+msgid "No valid mappings found in the file \"%s\"."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:117
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
+#: ../src/richtext/richtextindentspage.cpp:245
+#: ../src/richtext/richtextindentspage.cpp:255
+#: ../src/richtext/richtextindentspage.cpp:256 ../src/generic/fontdlgg.cpp:330
+#: ../src/generic/fontdlgg.cpp:333
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:1273
+#: ../src/html/helpwnd.cpp:1271
 msgid "Normal face<br>and <u>underlined</u>. "
 msgstr "正常字体<br> 且 <u>带下划线</u>."
 
-#: ../src/html/helpfrm.cpp:1218
+#: ../src/html/helpwnd.cpp:1216
 msgid "Normal font:"
 msgstr "正常字体:"
 
-#: ../src/common/paper.cpp:129
+#: ../src/richtext/richtextfontpage.cpp:271
+#, fuzzy
+msgid "Not underlined"
+msgstr "下划线"
+
+#: ../src/common/paper.cpp:117
 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
-#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
-#: ../src/msw/dialog.cpp:193
+#: ../src/generic/notifmsgg.cpp:101
+#, fuzzy
+msgid "Notice"
+msgstr "注意(&N):"
+
+#: ../src/richtext/richtextliststylepage.cpp:489
+#: ../src/richtext/richtextbulletspage.cpp:287
+msgid "Numbered outline"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:282 ../src/gtk1/fontdlg.cpp:139
+#: ../src/msw/dialog.cpp:180 ../src/mac/carbon/msgdlg.cpp:37
 msgid "OK"
 msgstr "确认"
 
-#: ../src/common/xtixml.cpp:263
+#: ../src/common/xtixml.cpp:260
 msgid "Objects must have an id attribute"
-msgstr "对象必须有一个id属性(attribute)"
+msgstr "对象必须有一个id属性"
 
-#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632
+#: ../src/common/docview.cpp:1298 ../src/common/docview.cpp:1624
+#: ../src/common/docview.cpp:1664
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpwnd.cpp:683 ../src/html/helpwnd.cpp:1557
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
-#: ../src/generic/dbgrptg.cpp:147
-#, fuzzy, c-format
+#: ../src/generic/dbgrptg.cpp:159
+#, c-format
 msgid "Open file \"%s\""
-msgstr "打开文件"
+msgstr "打开文件 \"%s\""
+
+#: ../src/mac/carbon/glcanvas.cpp:48
+#, c-format
+msgid "OpenGL function \"%s\" failed: %s (error %d)"
+msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
-#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:779
+#: ../src/generic/filectrlg.cpp:676 ../src/generic/filectrlg.cpp:820
+#: ../src/generic/dirdlgg.cpp:353 ../src/generic/dirctrlg.cpp:732
 msgid "Operation not permitted."
 msgstr "不允许的操作."
 
-#: ../src/common/cmdline.cpp:702
-#, c-format
-msgid "Option '%s' requires a value, '=' expected."
-msgstr "选项 '%s' 要求一个值, 期望 '='."
-
-#: ../src/common/cmdline.cpp:722
+#: ../src/common/cmdline.cpp:771
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "选项 '%s' 需要值."
 
-#: ../src/common/cmdline.cpp:784
+#: ../src/common/cmdline.cpp:854
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 不能转成日期."
 
-#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/prntdlgg.cpp:623 ../src/generic/dirdlgg.cpp:188
 msgid "Options"
 msgstr "选项"
 
-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:620 ../src/generic/prntdlgg.cpp:874
 msgid "Orientation"
 msgstr "方向"
 
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/windowid.cpp:215
+msgid "Out of window IDs.  Recommend shutting down application."
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:376
+#, fuzzy
+msgid "Owner not initialized."
+msgstr "不能初始化显示."
+
+#: ../src/common/accelcmn.cpp:83
+msgid "PAGEDOWN"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:82
+msgid "PAGEUP"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:68
+msgid "PAUSE"
+msgstr ""
+
+#: ../src/common/imagpcx.cpp:456 ../src/common/imagpcx.cpp:479
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 不能分配内存"
 
-#: ../src/common/imagpcx.cpp:461
+#: ../src/common/imagpcx.cpp:455
 msgid "PCX: image format unsupported"
 msgstr "PCX: 图像格式不支持"
 
-#: ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:478
 msgid "PCX: invalid image"
 msgstr "PCX: 无效图像"
 
-#: ../src/common/imagpcx.cpp:448
+#: ../src/common/imagpcx.cpp:442
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是PCX文件."
 
-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:480
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 
-#: ../src/common/imagpcx.cpp:463
+#: ../src/common/imagpcx.cpp:457
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
-#: ../src/common/imagpnm.cpp:96
+#: ../src/common/accelcmn.cpp:54
+msgid "PGDN"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:53
+msgid "PGUP"
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:88
 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 不能分配内存."
 
-#: ../src/common/imagpnm.cpp:80
+#: ../src/common/imagpnm.cpp:72
 msgid "PNM: File format is not recognized."
 msgstr "PNM: 不能识别的文件格式."
 
-#: ../src/common/imagpnm.cpp:112
+#: ../src/common/imagpnm.cpp:106 ../src/common/imagpnm.cpp:125
+#: ../src/common/imagpnm.cpp:144
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 
-#: ../src/common/prntbase.cpp:1247
+#: ../src/common/paper.cpp:189
+msgid "PRC 16K 146 x 215 mm"
+msgstr "中国 16开 纸, 146 x 215 毫米"
+
+#: ../src/common/paper.cpp:202
+msgid "PRC 16K Rotated"
+msgstr "中国 16开 纸张(横向)"
+
+#: ../src/common/paper.cpp:190
+msgid "PRC 32K 97 x 151 mm"
+msgstr "中国 32开 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:203
+msgid "PRC 32K Rotated"
+msgstr "中国 32开 纸张(横向)"
+
+#: ../src/common/paper.cpp:191
+msgid "PRC 32K(Big) 97 x 151 mm"
+msgstr "中国 32开(大) 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:204
+msgid "PRC 32K(Big) Rotated"
+msgstr "中国 32开(大) 纸张(横向)"
+
+#: ../src/common/paper.cpp:192
+msgid "PRC Envelope #1 102 x 165 mm"
+msgstr "中国标准信封1#, 102 x 165 毫米"
+
+#: ../src/common/paper.cpp:205
+msgid "PRC Envelope #1 Rotated 165 x 102 mm"
+msgstr "中国标准信封1#(横向), 165 x 102 毫米"
+
+#: ../src/common/paper.cpp:201
+msgid "PRC Envelope #10 324 x 458 mm"
+msgstr "中国标准信封10#, 324 x 458 毫米"
+
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中国标准信封10#(横向), 458 x 324 毫米"
+
+#: ../src/common/paper.cpp:193
+msgid "PRC Envelope #2 102 x 176 mm"
+msgstr "中国标准信封2#, 102 x 176 毫米"
+
+#: ../src/common/paper.cpp:206
+msgid "PRC Envelope #2 Rotated 176 x 102 mm"
+msgstr "中国标准信封2#(横向), 176 x 102 毫米"
+
+#: ../src/common/paper.cpp:194
+msgid "PRC Envelope #3 125 x 176 mm"
+msgstr "中国标准信封3#, 125 x 176 毫米"
+
+#: ../src/common/paper.cpp:207
+msgid "PRC Envelope #3 Rotated 176 x 125 mm"
+msgstr "中国标准信封3#(横向), 176 x 125 毫米"
+
+#: ../src/common/paper.cpp:195
+msgid "PRC Envelope #4 110 x 208 mm"
+msgstr "中国标准信封4#, 110 x 208 毫米"
+
+#: ../src/common/paper.cpp:208
+msgid "PRC Envelope #4 Rotated 208 x 110 mm"
+msgstr "中国标准信封4#(横向), 208 x 110 毫米"
+
+#: ../src/common/paper.cpp:196
+msgid "PRC Envelope #5 110 x 220 mm"
+msgstr "中国标准信封5#, 110 x 220 毫米"
+
+#: ../src/common/paper.cpp:209
+msgid "PRC Envelope #5 Rotated 220 x 110 mm"
+msgstr "中国标准信封5#(横向), 220 x 110 毫米"
+
+#: ../src/common/paper.cpp:197
+msgid "PRC Envelope #6 120 x 230 mm"
+msgstr "中国标准信封6#, 120 x 230 毫米"
+
+#: ../src/common/paper.cpp:210
+msgid "PRC Envelope #6 Rotated 230 x 120 mm"
+msgstr "中国标准信封6#(横向), 230 x 120 毫米"
+
+#: ../src/common/paper.cpp:198
+msgid "PRC Envelope #7 160 x 230 mm"
+msgstr "中国标准信封7#, 160 x 230 毫米"
+
+#: ../src/common/paper.cpp:211
+msgid "PRC Envelope #7 Rotated 230 x 160 mm"
+msgstr "中国标准信封7#(横向), 230 x 160 毫米"
+
+#: ../src/common/paper.cpp:199
+msgid "PRC Envelope #8 120 x 309 mm"
+msgstr "中国标准信封8#, 120 x 309 毫米"
+
+#: ../src/common/paper.cpp:212
+msgid "PRC Envelope #8 Rotated 309 x 120 mm"
+msgstr "中国标准信封8#(横向), 309 x 120 毫米"
+
+#: ../src/common/paper.cpp:200
+msgid "PRC Envelope #9 229 x 324 mm"
+msgstr "中国标准信封9#, 229 x 324 毫米"
+
+#: ../src/common/paper.cpp:213
+msgid "PRC Envelope #9 Rotated 324 x 229 mm"
+msgstr "中国标准信封9#(横向), 324 x 229 毫米"
+
+#: ../src/common/accelcmn.cpp:71
+msgid "PRINT"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1569
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
-#: ../src/common/prntbase.cpp:1245
+#: ../src/common/prntbase.cpp:1567
 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:827
+#: ../src/generic/prntdlgg.cpp:833
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533
+#: ../src/common/prntbase.cpp:465 ../src/gtk/gnome/gprint.cpp:706
 msgid "Page setup"
 msgstr "页面设置"
 
-#: ../src/generic/prntdlgg.cpp:210
+#: ../src/generic/prntdlgg.cpp:222
 msgid "Pages"
 msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-#: ../src/generic/prntdlgg.cpp:1056
+#: ../src/generic/prntdlgg.cpp:806 ../src/generic/prntdlgg.cpp:860
+#: ../src/generic/prntdlgg.cpp:1062
 msgid "Paper Size"
 msgstr "纸张大小"
 
-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-#: ../src/generic/prntdlgg.cpp:1051
+#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:847
+#: ../src/generic/prntdlgg.cpp:1057
 msgid "Paper size"
 msgstr "纸张大小"
 
-#: ../src/common/xtistrm.cpp:425
+#: ../src/richtext/richtextstyles.cpp:839
+msgid "Paragraph styles"
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:375
+#, fuzzy
+msgid "Passed item is invalid."
+msgstr "'%s' 是无效的"
+
+#: ../src/common/xtistrm.cpp:421
 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
-#: ../src/common/xtistrm.cpp:643
+#: ../src/common/xtistrm.cpp:639
 msgid "Passing a already registered object to SetObjectName"
 msgstr "传递一个已注册的对象给SetObjectName"
 
-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+#: ../src/common/xtistrm.cpp:432 ../src/common/xtistrm.cpp:652
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
-#: ../src/generic/filedlgg.cpp:444
+#: ../src/richtext/richtextctrl.cpp:2234
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:427
+#, fuzzy
+msgid "Paste"
+msgstr "粘贴(&P)"
+
+#: ../src/common/stockitem.cpp:207
+#, fuzzy
+msgid "Paste selection"
+msgstr "选段"
+
+#: ../src/richtext/richtextliststylepage.cpp:221
+#: ../src/richtext/richtextbulletspage.cpp:170
+msgid "Peri&od"
+msgstr ""
+
+#: ../src/generic/filectrlg.cpp:464
 msgid "Permissions"
 msgstr "允许"
 
@@ -2909,19 +4614,19 @@ msgstr "允许"
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 
-#: ../src/gtk/fontdlg.cpp:81
+#: ../src/gtk1/fontdlg.cpp:75
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 
-#: ../src/generic/filedlgg.cpp:1330
+#: ../src/gtk/filedlg.cpp:66
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
-#: ../src/html/helpfrm.cpp:813
+#: ../src/html/helpwnd.cpp:819
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 
-#: ../src/msw/dialup.cpp:750
+#: ../src/msw/dialup.cpp:792
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
@@ -2932,385 +4637,607 @@ msgid ""
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
-"请安装一个新版本的comctl32.dll\n"
+"请安装较新版本的comctl32.dll\n"
 "(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
 "否则此程序无法正确运行."
 
-#: ../src/common/prntbase.cpp:313
+#: ../src/common/prntbase.cpp:327
 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 
-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/mac/carbon/databrow.cpp:621 ../src/mac/carbon/databrow.cpp:671
+#: ../src/mac/carbon/databrow.cpp:765 ../src/mac/carbon/databrow.cpp:788
+#: ../src/mac/carbon/databrow.cpp:805 ../src/mac/carbon/databrow.cpp:822
+#: ../src/mac/carbon/databrow.cpp:1009 ../src/mac/carbon/databrow.cpp:1114
+msgid "Pointer to data view control not set correctly."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:622 ../src/mac/carbon/databrow.cpp:680
+#: ../src/mac/carbon/databrow.cpp:766 ../src/mac/carbon/databrow.cpp:823
+#: ../src/mac/carbon/databrow.cpp:1010
+msgid "Pointer to model not set correctly."
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:617 ../src/generic/prntdlgg.cpp:872
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../src/generic/prntdlgg.cpp:296
+#: ../src/generic/prntdlgg.cpp:305
 msgid "PostScript file"
 msgstr "PostScript文件"
 
-#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
+#: ../src/html/htmlhelp.cpp:509
+msgid "Preparing help window..."
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1233 ../src/generic/fontdlgg.cpp:457
+#: ../src/mac/carbon/fontdlg.cpp:552
 msgid "Preview:"
 msgstr "预览:"
 
-#: ../src/html/helpfrm.cpp:662
+#: ../src/html/helpwnd.cpp:672
 msgid "Previous page"
 msgstr "前页"
 
-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
-#: ../src/gtk/gnome/gprint.cpp:400
+#: ../src/common/prntbase.cpp:407 ../src/gtk/gnome/gprint.cpp:537
+#: ../src/gtk/gnome/gprint.cpp:549 ../src/gtk/print.cpp:598
+#: ../src/gtk/print.cpp:611 ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:163
 msgid "Print"
 msgstr "打印"
 
-#: ../src/common/docview.cpp:1045
+#: ../src/common/docview.cpp:1061
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225
+#: ../src/common/prntbase.cpp:1521 ../src/common/prntbase.cpp:1547
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
-#: ../src/generic/prntdlgg.cpp:218
+#: ../src/generic/prntdlgg.cpp:230
 msgid "Print Range"
 msgstr "打印范围"
 
-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:454
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: ../src/generic/prntdlgg.cpp:617
+#: ../src/generic/prntdlgg.cpp:626
 msgid "Print in colour"
 msgstr "彩色打印"
 
-#: ../src/common/stockitem.cpp:138
+#: ../src/common/stockitem.cpp:144
 msgid "Print previe&w"
-msgstr "打印预览[&w]"
+msgstr "打印预览(&w)"
 
-#: ../src/gtk/gnome/gprint.cpp:778
+#: ../src/gtk/gnome/gprint.cpp:947
 msgid "Print preview"
 msgstr "打印预览"
 
-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:635
 msgid "Print spooling"
 msgstr "打印假脱机"
 
-#: ../src/html/helpfrm.cpp:679
+#: ../src/html/helpwnd.cpp:689
 msgid "Print this page"
 msgstr "打印本页"
 
-#: ../src/generic/prntdlgg.cpp:179
+#: ../src/generic/prntdlgg.cpp:191
 msgid "Print to File"
 msgstr "打印到文件"
 
-#: ../src/generic/prntdlgg.cpp:489
+#: ../src/generic/prntdlgg.cpp:498
 msgid "Printer"
 msgstr "打印机"
 
-#: ../src/generic/prntdlgg.cpp:629
+#: ../src/generic/prntdlgg.cpp:638
 msgid "Printer command:"
 msgstr "打印机命令:"
 
-#: ../src/generic/prntdlgg.cpp:174
+#: ../src/generic/prntdlgg.cpp:186
 msgid "Printer options"
 msgstr "打印机选项"
 
-#: ../src/generic/prntdlgg.cpp:641
+#: ../src/generic/prntdlgg.cpp:650
 msgid "Printer options:"
 msgstr "打印机选项:"
 
-#: ../src/generic/prntdlgg.cpp:915
+#: ../src/generic/prntdlgg.cpp:921
 msgid "Printer..."
 msgstr "打印机..."
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:202
 msgid "Printer:"
 msgstr "打印机:"
 
-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../src/common/prntbase.cpp:324 ../src/common/prntbase.cpp:545
 msgid "Printing "
 msgstr "正在打印 "
 
-#: ../src/common/prntbase.cpp:327
+#: ../src/common/prntbase.cpp:341
 msgid "Printing Error"
 msgstr "打印出错"
 
-#: ../src/generic/printps.cpp:208
+#: ../src/generic/printps.cpp:204
 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 
-#: ../src/generic/printps.cpp:168
+#: ../src/generic/printps.cpp:164
 msgid "Printing..."
 msgstr "打印..."
 
-#: ../src/common/debugrpt.cpp:524
+#: ../src/common/debugrpt.cpp:552
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
-msgstr ""
+msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
-#: ../src/common/log.cpp:466
+#: ../src/common/log.cpp:699
 msgid "Program aborted."
 msgstr "程序终止."
 
-#: ../src/common/paper.cpp:126
+#: ../src/mac/carbon/dataview.cpp:670
+msgid "Progress renderer cannot render value type; value type: "
+msgstr ""
+
+#: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
-#: ../src/generic/logg.cpp:1166
-msgid "Question"
-msgstr "问题"
+#: ../src/generic/logg.cpp:1089
+msgid "Question"
+msgstr "问题"
+
+#: ../src/common/stockitem.cpp:208
+#, fuzzy
+msgid "Quit this program"
+msgstr "打印本页"
+
+#: ../src/common/accelcmn.cpp:52
+msgid "RETURN"
+msgstr ""
 
-#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
+#: ../src/common/accelcmn.cpp:56
+msgid "RIGHT"
+msgstr ""
+
+#: ../src/common/ffile.cpp:126 ../src/common/ffile.cpp:145
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 
-#: ../src/common/prntbase.cpp:242
+#: ../src/common/prntbase.cpp:256
 msgid "Ready"
 msgstr "就绪"
 
-#: ../src/xrc/xmlres.cpp:582
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:423
+#, fuzzy
+msgid "Redo"
+msgstr "重复(&R)"
+
+#: ../src/common/stockitem.cpp:209
+msgid "Redo last action"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:710
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "ref=\"%s\"的引用对象节点不存在!"
 
-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:148
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/msw/registry.cpp:552
+#: ../src/msw/registry.cpp:571
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:540
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在, 不能改名."
 
-#: ../src/msw/registry.cpp:653
+#: ../src/msw/registry.cpp:672
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 "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"
 "操作终止."
 
-#: ../src/msw/registry.cpp:448
+#: ../src/msw/registry.cpp:466
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
-#: ../src/generic/helpext.cpp:442
+#: ../src/richtext/richtextfontpage.cpp:265
+#: ../src/richtext/richtextfontpage.cpp:268
+msgid "Regular"
+msgstr ""
+
+#: ../src/generic/helpext.cpp:464
 msgid "Relevant entries:"
 msgstr "相关条目:"
 
-#: ../src/generic/progdlgg.cpp:210
-msgid "Remaining time : "
+#: ../src/generic/progdlgg.cpp:214
+#, fuzzy
+msgid "Remaining time:"
 msgstr "剩余时间 : "
 
-#: ../src/common/stockitem.cpp:143
+#: ../src/common/stockitem.cpp:149
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/html/helpfrm.cpp:445
+#: ../src/html/helpwnd.cpp:426
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
-#: ../src/common/rendcmn.cpp:193
+#: ../src/common/rendcmn.cpp:195
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
-#: ../src/common/stockitem.cpp:117
+#: ../src/mac/carbon/databrow.cpp:775
+#, fuzzy
+msgid "Rendering failed."
+msgstr "计时器创建失败"
+
+#: ../src/richtext/richtextbuffer.cpp:2847
+msgid "Renumber List"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:123
 msgid "Rep&lace"
-msgstr "替换[&l]"
+msgstr "替换(&l)"
+
+#: ../src/richtext/richtextctrl.cpp:2375
+#, fuzzy
+msgid "Replace"
+msgstr "替换(&R)"
 
-#: ../src/generic/fdrepdlg.cpp:188
+#: ../src/generic/fdrepdlg.cpp:183
 msgid "Replace &all"
-msgstr "全部替换[&a]"
+msgstr "全部替换(&a)"
 
-#: ../src/generic/fdrepdlg.cpp:130
+#: ../src/common/stockitem.cpp:206
+#, fuzzy
+msgid "Replace selection"
+msgstr "全部替换(&a)"
+
+#: ../src/generic/fdrepdlg.cpp:125
 msgid "Replace with:"
 msgstr "替换为:"
 
-#: ../src/xrc/xmlres.cpp:418
+#: ../src/xrc/xmlres.cpp:530
 msgid "Resource files must have same version number!"
 msgstr "资源文件必须有相同的版本号!"
 
-#: ../src/common/stockitem.cpp:144
+#: ../src/common/stockitem.cpp:150
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
-#: ../src/generic/prntdlgg.cpp:891
+#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextbulletspage.cpp:199
+#, fuzzy
+msgid "Right"
+msgstr "细"
+
+#: ../src/generic/prntdlgg.cpp:897
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:336
+#: ../src/richtext/richtextliststylepage.cpp:338
+#: ../src/richtext/richtextindentspage.cpp:158
+#: ../src/richtext/richtextindentspage.cpp:160
+msgid "Right-align text."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:324
 msgid "Roman"
 msgstr "罗马"
 
-#: ../src/common/sizer.cpp:1841
+#: ../src/richtext/richtextliststylepage.cpp:298
+#: ../src/richtext/richtextbulletspage.cpp:250
+msgid "S&tandard bullet name:"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:81
+msgid "SCROLL_LOCK"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:70
+msgid "SELECT"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:76
+msgid "SEPARATOR"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:155
+msgid "SHIFT-JIS"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:73
+msgid "SNAPSHOT"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:61
+msgid "SPACE"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:250 ../src/common/accelcmn.cpp:307
+msgid "SPECIAL"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:77
+msgid "SUBTRACT"
+msgstr ""
+
+#: ../src/common/sizer.cpp:2426
 msgid "Save"
 msgstr "保存"
 
-#: ../src/common/fldlgcmn.cpp:259
+#: ../src/common/fldlgcmn.cpp:284
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
-#: ../src/common/stockitem.cpp:146
+#: ../src/common/stockitem.cpp:152
 msgid "Save &As..."
-msgstr "另存为[&A]..."
+msgstr "另存为(&A)..."
 
 #: ../src/common/docview.cpp:305
-msgid "Save as"
+msgid "Save As"
 msgstr "另存为"
 
-#: ../src/generic/logg.cpp:508
+#: ../src/common/stockitem.cpp:212
+#, fuzzy
+msgid "Save current document"
+msgstr "选择文档视图"
+
+#: ../src/common/stockitem.cpp:213
+msgid "Save current document with a different filename"
+msgstr ""
+
+#: ../src/generic/logg.cpp:535
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:327
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/html/htmlhelp.cpp:610 ../src/html/helpwnd.cpp:534
+#: ../src/html/helpwnd.cpp:549 ../src/generic/srchctlg.cpp:362
 msgid "Search"
 msgstr "搜索"
 
-#: ../src/html/helpfrm.cpp:538
+#: ../src/html/helpwnd.cpp:536
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
-#: ../src/generic/fdrepdlg.cpp:166
+#: ../src/generic/fdrepdlg.cpp:161
 msgid "Search direction"
-msgstr "搜索目录"
+msgstr "搜索方向"
 
-#: ../src/generic/fdrepdlg.cpp:118
+#: ../src/generic/fdrepdlg.cpp:113
 msgid "Search for:"
 msgstr "搜索:"
 
-#: ../src/html/helpfrm.cpp:1060
+#: ../src/html/helpwnd.cpp:1065
 msgid "Search in all books"
-msgstr "在索引书中搜索"
+msgstr "搜索所有的书籍"
+
+#: ../src/html/htmlhelp.cpp:593
+#, fuzzy
+msgid "Search!"
+msgstr "搜索"
 
-#: ../src/html/helpfrm.cpp:868
+#: ../src/html/htmlhelp.cpp:383 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:875
 msgid "Searching..."
-msgstr "搜索..."
+msgstr "搜索中..."
 
-#: ../src/generic/dirctrlg.cpp:584
+#: ../src/generic/dirctrlg.cpp:593
 msgid "Sections"
 msgstr "段"
 
-#: ../src/common/ffile.cpp:222
+#: ../src/common/ffile.cpp:231
 #, c-format
 msgid "Seek error on file '%s'"
 msgstr "文件 '%s'定位错误"
 
-#: ../src/common/ffile.cpp:212
+#: ../src/common/ffile.cpp:221
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 
-#: ../src/msw/textctrl.cpp:2069
+#: ../src/common/stockitem.cpp:153 ../src/richtext/richtextctrl.cpp:2600
+#: ../src/msw/textctrl.cpp:2156 ../src/mac/carbon/textctrl.cpp:1069
 msgid "Select &All"
-msgstr "选择所有[&A]"
+msgstr "全部选择(&A)"
+
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:430
+#, fuzzy
+msgid "Select All"
+msgstr "全部选择(&A)"
 
-#: ../src/common/docview.cpp:1712
+#: ../src/common/docview.cpp:1744
 msgid "Select a document template"
 msgstr "选择文档模板"
 
-#: ../src/common/docview.cpp:1789
+#: ../src/common/docview.cpp:1821
 msgid "Select a document view"
 msgstr "选择文档视图"
 
-#: ../src/common/docview.cpp:1592
-msgid "Select a file"
-msgstr "选择文件"
+#: ../src/richtext/richtextfontpage.cpp:192
+#: ../src/richtext/richtextfontpage.cpp:194
+msgid "Select regular or bold."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:179
+#: ../src/richtext/richtextfontpage.cpp:181
+msgid "Select regular or italic style."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:205
+#: ../src/richtext/richtextfontpage.cpp:207
+msgid "Select underlining or no underlining."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:220
+msgid "Selection"
+msgstr "选段"
+
+#: ../src/richtext/richtextliststylepage.cpp:186
+#: ../src/richtext/richtextliststylepage.cpp:188
+msgid "Selects the list level to edit."
+msgstr ""
 
-#: ../src/common/cmdline.cpp:739
+#: ../src/common/cmdline.cpp:790
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s'后存在分隔符."
 
-#: ../include/wx/xti.h:841
-msgid "SetProperty called w/o valid setter"
-msgstr "调用SetProperty时未带有效的setter"
-
-#: ../src/generic/prntdlgg.cpp:182
+#: ../src/generic/prntdlgg.cpp:194
 msgid "Setup..."
 msgstr "设置..."
 
-#: ../src/msw/dialup.cpp:530
+#: ../src/msw/dialup.cpp:566
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
-#: ../src/html/helpfrm.cpp:493
+#: ../src/common/accelcmn.cpp:298
+#, fuzzy
+msgid "Shift-"
+msgstr "shift"
+
+#: ../src/generic/dirdlgg.cpp:171
+#, fuzzy
+msgid "Show &hidden directories"
+msgstr "显示隐藏目录"
+
+#: ../src/generic/filectrlg.cpp:998
+#, fuzzy
+msgid "Show &hidden files"
+msgstr "显示隐藏文件"
+
+#: ../src/common/stockitem.cpp:202
+msgid "Show about dialog"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:488
 msgid "Show all"
-msgstr "显示所有"
+msgstr "全部显示"
 
-#: ../src/html/helpfrm.cpp:504
+#: ../src/html/helpwnd.cpp:499
 msgid "Show all items in index"
-msgstr "把所有项目显示为索引"
+msgstr "以索引方式显示所有项目"
 
-#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
+#: ../src/generic/dirdlgg.cpp:106
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
-#: ../src/generic/filedlgg.cpp:1064
-msgid "Show hidden files"
-msgstr "显示隐藏文件"
-
-#: ../src/html/helpfrm.cpp:646
+#: ../src/html/htmlhelp.cpp:538 ../src/html/helpwnd.cpp:656
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/richtext/richtextsymboldlg.cpp:414
+#: ../src/richtext/richtextsymboldlg.cpp:416
+msgid "Shows a Unicode subset."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:474
+#: ../src/richtext/richtextliststylepage.cpp:476
+#: ../src/richtext/richtextbulletspage.cpp:274
+#: ../src/richtext/richtextbulletspage.cpp:276
+msgid "Shows a preview of the bullet settings."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:256
+#: ../src/richtext/richtextfontpage.cpp:258
+msgid "Shows a preview of the font settings."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:556 ../src/mac/carbon/fontdlg.cpp:558
+msgid "Shows a preview of the font."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:327
+#: ../src/richtext/richtextindentspage.cpp:329
+msgid "Shows a preview of the paragraph settings."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:462 ../src/generic/fontdlgg.cpp:464
 msgid "Shows the font preview."
 msgstr "显示字体预览."
 
-#: ../src/generic/filedlgg.cpp:439
+#: ../src/univ/themes/mono.cpp:509
+msgid "Simple monochrome theme"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:459
+#: ../src/richtext/richtextliststylepage.cpp:462
+#: ../src/richtext/richtextliststylepage.cpp:463
+#: ../src/richtext/richtextindentspage.cpp:314
+#: ../src/richtext/richtextindentspage.cpp:317
+#: ../src/richtext/richtextindentspage.cpp:318
+msgid "Single"
+msgstr ""
+
+#: ../src/generic/filectrlg.cpp:459
 msgid "Size"
 msgstr "大小"
 
-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-#: ../src/generic/progdlgg.cpp:598
+#: ../src/mac/carbon/fontdlg.cpp:501
+#, fuzzy
+msgid "Size:"
+msgstr "大小"
+
+#: ../src/generic/progdlgg.cpp:226 ../src/generic/progdlgg.cpp:611
 msgid "Skip"
 msgstr "跳过"
 
-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:332
 msgid "Slant"
 msgstr "倾斜"
 
-#: ../src/common/docview.cpp:581
+#: ../src/common/docview.cpp:597
 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 
-#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
-#: ../src/common/docview.cpp:1611
+#: ../src/common/docview.cpp:633 ../src/common/docview.cpp:1643
 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 
-#: ../src/common/docview.cpp:588
+#: ../src/common/docview.cpp:604
 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 
-#: ../src/common/prntbase.cpp:1199
+#: ../src/common/prntbase.cpp:1521
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 
-#: ../src/common/docview.cpp:1041
+#: ../src/common/docview.cpp:1057
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "对不起, 需要先安装打印机才能创建打印预览."
 
-#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631
+#: ../src/richtext/richtextstyledlg.cpp:573
+#: ../src/richtext/richtextstyledlg.cpp:621
+#: ../src/richtext/richtextstyledlg.cpp:775
+#: ../src/richtext/richtextstyledlg.cpp:851
+msgid "Sorry, that name is taken. Please choose another."
+msgstr ""
+
+#: ../src/common/docview.cpp:1297 ../src/common/docview.cpp:1663
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 
@@ -3323,87 +5250,192 @@ msgstr "声音数据为不支持的格式."
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s'为不支持的格式."
 
-#: ../src/common/paper.cpp:118
+#: ../src/richtext/richtextliststylepage.cpp:469
+#, fuzzy
+msgid "Spacing"
+msgstr "搜索中..."
+
+#: ../src/richtext/richtextliststylepage.cpp:492
+#: ../src/richtext/richtextbulletspage.cpp:290
+msgid "Standard"
+msgstr ""
+
+#: ../src/common/paper.cpp:106
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 
-#: ../src/generic/prntdlgg.cpp:198
+#: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"
 
-#: ../src/generic/logg.cpp:625
+#: ../src/generic/logg.cpp:652
 msgid "Status: "
 msgstr "状态: "
 
-#: ../src/common/xtistrm.cpp:253
-#, fuzzy
+#: ../src/common/xtistrm.cpp:249
 msgid "Streaming delegates for not already streamed objects not yet supported"
 msgstr "不支持针对尚未形成流的对象的流委派"
 
-#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#: ../src/msw/colour.cpp:35
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-msgid "String conversions not supported"
-msgstr "不支持字符串装换"
+#: ../src/richtext/richtextformatdlg.cpp:269
+#, fuzzy
+msgid "Style"
+msgstr "字体(&S):"
+
+#: ../include/wx/richtext/richtextstyledlg.h:45
+msgid "Style Organiser"
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:510
+#, fuzzy
+msgid "Style:"
+msgstr "字体(&S):"
 
-#: ../src/xrc/xmlres.cpp:689
+#: ../src/xrc/xmlres.cpp:813
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/richtext/richtextfontpage.cpp:246
+#, fuzzy
+msgid "Subscrip&t"
+msgstr "Script"
+
+#: ../src/richtext/richtextfontpage.cpp:239
+#, fuzzy
+msgid "Supe&rscript"
+msgstr "Script"
+
+#: ../src/common/paper.cpp:152
+msgid "SuperA/SuperA/A4 227 x 356 mm"
+msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"
+
+#: ../src/common/paper.cpp:153
+msgid "SuperB/SuperB/A3 305 x 487 mm"
+msgstr "SuperB/SuperB/A3 纸张, 305 x 487 毫米"
+
+#: ../src/generic/fontdlgg.cpp:328
 msgid "Swiss"
 msgstr "瑞士"
 
-#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
-#: ../src/common/imagtiff.cpp:383
+#: ../src/richtext/richtextliststylepage.cpp:490
+#: ../src/richtext/richtextbulletspage.cpp:288
+msgid "Symbol"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:287
+#: ../src/richtext/richtextbulletspage.cpp:238
+#, fuzzy
+msgid "Symbol &font:"
+msgstr "正常字体:"
+
+#: ../include/wx/richtext/richtextsymboldlg.h:46
+msgid "Symbols"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:62
+msgid "TAB"
+msgstr ""
+
+#: ../src/common/imagtiff.cpp:93
+msgid "TIFF library error."
+msgstr "TIFF库错误."
+
+#: ../src/common/imagtiff.cpp:77
+msgid "TIFF library warning."
+msgstr "TIFF库警告."
+
+#: ../src/common/imagtiff.cpp:309 ../src/common/imagtiff.cpp:320
+#: ../src/common/imagtiff.cpp:519
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 不能分配内存."
 
-#: ../src/common/imagtiff.cpp:203
+#: ../src/common/imagtiff.cpp:272
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误."
 
-#: ../src/common/imagtiff.cpp:254
+#: ../src/common/imagtiff.cpp:334
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误."
 
-#: ../src/common/imagtiff.cpp:331
+#: ../src/common/imagtiff.cpp:439
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 
-#: ../src/common/imagtiff.cpp:434
+#: ../src/common/imagtiff.cpp:565
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:147
+msgid "Tabloid Extra 11.69 x 18 in"
+msgstr "小报(特大), 11.69 x 18 英寸"
+
+#: ../src/common/paper.cpp:104
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/richtext/richtextformatdlg.cpp:287
+msgid "Tabs"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:329
 msgid "Teletype"
 msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1713
+#: ../src/common/docview.cpp:1745
 msgid "Templates"
 msgstr "模板"
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/mac/carbon/dataview.cpp:531
+msgid "Text renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:118
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:708
+#: ../src/common/ftp.cpp:706
 msgid "The FTP server doesn't support passive mode."
 msgstr "FTP服务器不支持passive模式."
 
-#: ../src/common/ftp.cpp:696
+#: ../src/common/ftp.cpp:694
 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持PORT命令."
 
-#: ../src/common/fontmap.cpp:204
+#: ../src/richtext/richtextliststylepage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:216
+#: ../src/richtext/richtextbulletspage.cpp:162
+#: ../src/richtext/richtextbulletspage.cpp:164
+msgid "The available bullet styles."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:194
+#: ../src/richtext/richtextstyledlg.cpp:196
+#, fuzzy
+msgid "The available styles."
+msgstr "字体风格."
+
+#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextliststylepage.cpp:255
+#: ../src/richtext/richtextliststylepage.cpp:274
+#: ../src/richtext/richtextliststylepage.cpp:276
+#: ../src/richtext/richtextbulletspage.cpp:202
+#: ../src/richtext/richtextbulletspage.cpp:204
+#: ../src/richtext/richtextbulletspage.cpp:225
+#: ../src/richtext/richtextbulletspage.cpp:227
+msgid "The bullet character."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:436
+#: ../src/richtext/richtextsymboldlg.cpp:438
+msgid "The character code."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:201
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -3411,15 +5443,20 @@ msgid ""
 "[Cancel] if it cannot be replaced"
 msgstr ""
 "未知字符集'%s'. 选择其它字符集\n"
-"代替它，或，如果不能\n"
+"代替它; 如果不能\n"
 "被替代则选择[取消] "
 
-#: ../src/msw/ole/dataobj.cpp:164
+#: ../src/msw/ole/dataobj.cpp:162
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在."
 
-#: ../src/generic/dirdlgg.cpp:226
+#: ../src/richtext/richtextstylepage.cpp:127
+#: ../src/richtext/richtextstylepage.cpp:129
+msgid "The default style for the next paragraph."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:232
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
@@ -3428,7 +5465,7 @@ msgstr ""
 "目录 '%s'不存在\n"
 "现在创建?"
 
-#: ../src/common/docview.cpp:1962
+#: ../src/common/docview.cpp:2012
 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"
@@ -3437,7 +5474,7 @@ msgstr ""
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/common/docview.cpp:1972
+#: ../src/common/docview.cpp:2022
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
@@ -3446,517 +5483,768 @@ msgstr ""
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+#: ../src/richtext/richtextliststylepage.cpp:397
+#: ../src/richtext/richtextliststylepage.cpp:399
+#: ../src/richtext/richtextindentspage.cpp:224
+#: ../src/richtext/richtextindentspage.cpp:226
+#, fuzzy
+msgid "The first line indent."
+msgstr "字体大小(磅值)."
+
+#: ../src/gtk/utilsgtk.cpp:508
+msgid "The following standard GTK+ options are also supported:\n"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:416 ../src/generic/fontdlgg.cpp:418
 msgid "The font colour."
 msgstr "字体颜色."
 
-#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
 msgid "The font family."
 msgstr "字体."
 
-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+#: ../src/richtext/richtextsymboldlg.cpp:398
+#: ../src/richtext/richtextsymboldlg.cpp:400
+msgid "The font from which to take the symbol."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:429 ../src/generic/fontdlgg.cpp:431
+#: ../src/generic/fontdlgg.cpp:436 ../src/generic/fontdlgg.cpp:438
 msgid "The font point size."
 msgstr "字体大小(磅值)."
 
-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+#: ../src/mac/carbon/fontdlg.cpp:505 ../src/mac/carbon/fontdlg.cpp:507
+#, fuzzy
+msgid "The font size in points."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:388 ../src/generic/fontdlgg.cpp:390
 msgid "The font style."
 msgstr "字体风格."
 
-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+#: ../src/generic/fontdlgg.cpp:399 ../src/generic/fontdlgg.cpp:401
 msgid "The font weight."
 msgstr "字体粗细."
 
-#: ../src/common/filename.cpp:966
+#: ../src/richtext/richtextliststylepage.cpp:386
+#: ../src/richtext/richtextliststylepage.cpp:388
+#: ../src/richtext/richtextindentspage.cpp:212
+#: ../src/richtext/richtextindentspage.cpp:214
+#, fuzzy
+msgid "The left indent."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextliststylepage.cpp:464
+#: ../src/richtext/richtextliststylepage.cpp:466
+#: ../src/richtext/richtextindentspage.cpp:319
+#: ../src/richtext/richtextindentspage.cpp:321
+msgid "The line spacing."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:266
+#: ../src/richtext/richtextbulletspage.cpp:268
+msgid "The list item number."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:257
+#: ../src/richtext/richtextindentspage.cpp:259
+#, fuzzy
+msgid "The outline level."
+msgstr "显示字体预览."
+
+#: ../src/common/filename.cpp:1254
 #, 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 "
+#: ../src/common/log.cpp:501
+#, c-format
+msgid "The previous message repeated once."
+msgid_plural "The previous message repeated %lu times."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/gtk/print.cpp:891 ../src/gtk/print.cpp:1079
+msgid "The print dialog returned an error."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:455
+#: ../src/richtext/richtextsymboldlg.cpp:457
+msgid "The range to show."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:883
+#: ../src/generic/dbgrptg.cpp:318
+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:955
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必须的参数 '%s' 没有指定."
 
-#: ../src/common/textcmn.cpp:246
+#: ../src/richtext/richtextliststylepage.cpp:408
+#: ../src/richtext/richtextliststylepage.cpp:410
+#: ../src/richtext/richtextindentspage.cpp:236
+#: ../src/richtext/richtextindentspage.cpp:238
+msgid "The right indent."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:448
+#: ../src/richtext/richtextliststylepage.cpp:450
+#: ../src/richtext/richtextindentspage.cpp:304
+msgid "The spacing after the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:437
+#: ../src/richtext/richtextliststylepage.cpp:439
+#: ../src/richtext/richtextindentspage.cpp:291
+#: ../src/richtext/richtextindentspage.cpp:293
+msgid "The spacing before the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextstylepage.cpp:107
+#: ../src/richtext/richtextstylepage.cpp:109
+#, fuzzy
+msgid "The style name."
+msgstr "字体风格."
+
+#: ../src/richtext/richtextstylepage.cpp:117
+#: ../src/richtext/richtextstylepage.cpp:119
+msgid "The style on which this style is based."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:206
+#: ../src/richtext/richtextstyledlg.cpp:208
+#, fuzzy
+msgid "The style preview."
+msgstr "显示字体预览."
+
+#: ../src/richtext/richtexttabspage.cpp:117
+#: ../src/richtext/richtexttabspage.cpp:119
+#, fuzzy
+msgid "The tab position."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtexttabspage.cpp:123
+#, fuzzy
+msgid "The tab positions."
+msgstr "字体大小(磅值)."
+
+#: ../src/common/textcmn.cpp:760 ../src/richtext/richtextctrl.cpp:1918
 msgid "The text couldn't be saved."
 msgstr "文本不能被保存."
 
-#: ../src/common/cmdline.cpp:862
+#: ../src/common/cmdline.cpp:933
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s'的值必须被指定."
 
-#: ../src/msw/dialup.cpp:418
-#, c-format
+#: ../src/msw/dialup.cpp:455
+#, fuzzy, c-format
 msgid ""
-"The version of remote access service (RAS) installed on this machine is "
-"tooold, please upgrade (the following required function is missing: %s)."
+"The version of remote access service (RAS) installed on this machine is too "
+"old, please upgrade (the following required function is missing: %s)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 
-#: ../src/html/htmprint.cpp:601
+#: ../src/gtk/print.cpp:921
+msgid "The wxGtkPrinterDC cannot be used."
+msgstr ""
+
+#: ../src/mac/carbon/databrow.cpp:682
+msgid "There is no column or renderer for the specified column index."
+msgstr ""
+
+#: ../src/richtext/richtextprint.cpp:575 ../src/html/htmprint.cpp:610
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
-msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机."
 
-#: ../src/msw/datectrl.cpp:109
+#: ../src/msw/datecontrols.cpp:60
+#, fuzzy
 msgid ""
-"This system doesn't support date picker control, please upgrade your version "
-"of comctl32.dll"
+"This system doesn't support date controls, please upgrade your version of "
+"comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
-#: ../src/msw/thread.cpp:1204
+#: ../src/msw/thread.cpp:1247
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
-#: ../src/unix/threadpsx.cpp:1603
+#: ../src/unix/threadpsx.cpp:1686
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
-#: ../src/msw/thread.cpp:1192
+#: ../src/msw/thread.cpp:1235
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
-#: ../src/unix/threadpsx.cpp:1108
+#: ../src/unix/threadpsx.cpp:1200
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:168
 msgid "Tile &Horizontally"
-msgstr "水平排布[&H]"
+msgstr "水平排布(&H)"
 
-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:169
 msgid "Tile &Vertically"
-msgstr "垂直排布[&V]"
+msgstr "垂直排布(&V)"
 
-#: ../src/common/ftp.cpp:635
+#: ../src/common/ftp.cpp:633
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 
-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/os2/timer.cpp:100 ../src/msw/timer.cpp:93
 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:218
 msgid "Tip of the Day"
 msgstr "每日技巧"
 
-#: ../src/generic/tipdlg.cpp:157
+#: ../src/generic/tipdlg.cpp:153
 msgid "Tips not available, sorry!"
-msgstr "对不起，没有所需技巧!"
+msgstr "对不起, 没有所需技巧!"
 
-#: ../src/generic/prntdlgg.cpp:237
+#: ../src/generic/prntdlgg.cpp:249
 msgid "To:"
 msgstr "到:"
 
-#: ../src/common/imagpng.cpp:292
+#: ../src/mac/carbon/dataview.cpp:648
+msgid "Toggle renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:5473
+msgid "Too many EndStyle calls!"
+msgstr ""
+
+#: ../src/common/imagpng.cpp:288
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 
-#: ../src/generic/prntdlgg.cpp:880
+#: ../src/generic/prntdlgg.cpp:886
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
-#: ../src/common/fs_mem.cpp:205
+#: ../src/generic/aboutdlgg.cpp:80
+msgid "Translations by "
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:154
+msgid "Translators"
+msgstr ""
+
+#: ../src/common/fs_mem.cpp:220
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 
-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
+#: ../src/common/sckaddr.cpp:144 ../src/common/sckaddr.cpp:252
 msgid "Trying to solve a NULL hostname: giving up"
-msgstr "试图解决 NULL 主机名: 放弃"
+msgstr "试图解析 NULL 主机名: 放弃"
 
-#: ../src/common/fmapbase.cpp:111
+#: ../src/common/fmapbase.cpp:116
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:440
+#: ../src/generic/filectrlg.cpp:460
 msgid "Type"
 msgstr "类型"
 
-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-#: ../src/common/xtixml.cpp:498
+#: ../src/richtext/richtextfontpage.cpp:138
+#: ../src/richtext/richtextfontpage.cpp:140
+#, fuzzy
+msgid "Type a font name."
+msgstr "字体."
+
+#: ../src/richtext/richtextfontpage.cpp:156
+#: ../src/richtext/richtextfontpage.cpp:158
+msgid "Type a size in points."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:348 ../src/common/xtixml.cpp:495
+#: ../src/common/xtistrm.cpp:277
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
-#: ../src/common/paper.cpp:147
+#: ../src/common/accelcmn.cpp:57
+msgid "UP"
+msgstr ""
+
+#: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿, 14 7/8 x 11 英寸"
+
+#: ../src/common/fmapbase.cpp:153
+#, fuzzy
+msgid "US-ASCII"
+msgstr "ASCII"
 
-#: ../src/html/htmlwin.cpp:403
+#: ../src/gtk/app.cpp:494
+msgid "Unable to initialize GTK+, is DISPLAY set properly?"
+msgstr ""
+
+#: ../src/gtk/app.cpp:330
+#, fuzzy
+msgid "Unable to initialize Hildon program"
+msgstr "不能初始化OpenGL"
+
+#: ../src/html/htmlwin.cpp:534
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "不能打开HTML文档: %s"
 
-#: ../src/unix/sound.cpp:376
+#: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."
 msgstr "不能异步地播放声音."
 
-#: ../src/common/stockitem.cpp:148
+#: ../src/common/stockitem.cpp:155
 msgid "Undelete"
 msgstr "取消删除"
 
-#: ../contrib/src/deprecated/resource.cpp:1848
-#: ../contrib/src/deprecated/resource.cpp:1862
-#: ../contrib/src/deprecated/resource.cpp:1879
-#: ../contrib/src/deprecated/resource.cpp:1893
-#: ../contrib/src/deprecated/resource.cpp:1978
-#: ../contrib/src/deprecated/resource.cpp:1992
-#: ../contrib/src/deprecated/resource.cpp:2008
-#: ../contrib/src/deprecated/resource.cpp:2022
-#: ../contrib/src/deprecated/resource.cpp:3070
-#: ../contrib/src/deprecated/resource.cpp:3084
-#: ../contrib/src/deprecated/resource.cpp:3101
-#: ../contrib/src/deprecated/resource.cpp:3115
-#, fuzzy
-msgid "Unexpected end of file while parsing resource."
-msgstr "在解析资源时意外到达文件结尾."
+#: ../src/richtext/richtextfontpage.cpp:272
+#: ../src/richtext/richtextfontpage.cpp:344
+#: ../src/richtext/richtextfontpage.cpp:588 ../src/mac/carbon/fontdlg.cpp:532
+#, fuzzy
+msgid "Underlined"
+msgstr "下划线(&U)"
+
+#: ../src/stc/scintilla/src/ScintillaBase.cxx:422
+#, fuzzy
+msgid "Undo"
+msgstr "恢复(&U)"
+
+#: ../src/common/stockitem.cpp:210
+msgid "Undo last action"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:738
+#, fuzzy, c-format
+msgid "Unexpected characters following option '%s'."
+msgstr "意外参数 '%s'"
 
-#: ../src/common/cmdline.cpp:826
+#: ../src/common/cmdline.cpp:896
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
-#: ../src/common/fmapbase.cpp:135
+#: ../src/richtext/richtextsymboldlg.cpp:452
+#, fuzzy
+msgid "Unicode"
+msgstr "取消缩进(&U)"
+
+#: ../src/common/fmapbase.cpp:142 ../src/common/fmapbase.cpp:148
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的Unicode编码 (UTF-16)"
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:147
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:143
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:144 ../src/common/fmapbase.cpp:150
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的Unicode编码 (UTF-32)"
 
-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:149
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 
-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:145
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:139
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的Unicode编码 (UTF-7)"
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:140
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的Unicode编码 (UTF-8)"
 
-#: ../src/msw/dde.cpp:1092
+#: ../src/generic/progdlgg.cpp:597
+#, fuzzy
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/msw/dde.cpp:1175
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 
-#: ../src/common/xtistrm.cpp:370
+#: ../src/common/xtistrm.cpp:366
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象被传递给GetObjectClassInfo"
 
-#: ../src/unix/dlunix.cpp:275
+#: ../src/common/xtixml.cpp:321
+#, fuzzy, c-format
+msgid "Unknown Property %s"
+msgstr "未知属性 %s"
+
+#: ../src/common/imagtiff.cpp:379
+#, c-format
+msgid "Unknown TIFF resolution unit %d ignored"
+msgstr ""
+
+#: ../src/unix/dlunix.cpp:335
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
-#: ../src/common/fmapbase.cpp:688
+#: ../src/common/fmapbase.cpp:675
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
-#: ../src/unix/mimetype.cpp:2344
+#: ../src/common/cmdline.cpp:643
 #, c-format
-msgid "Unknown field in file %s, line %d: '%s'."
-msgstr "在文件 %s, 行 %d是未知字段: '%s'."
-
-#: ../src/common/cmdline.cpp:599
-#, fuzzy, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/common/cmdline.cpp:653 ../src/common/cmdline.cpp:675
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
-#: ../src/xrc/xmlres.cpp:762
+#: ../src/xrc/xmlres.cpp:890
 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 
-#: ../src/common/xtixml.cpp:324
-#, fuzzy, c-format
-msgid "Unkown Property %s"
-msgstr "未知属性 %s"
-
-#: ../src/common/mimecmn.cpp:161
+#: ../src/common/mimecmn.cpp:225
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 
-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-#: ../src/common/cmdproc.cpp:307
+#: ../src/common/cmdproc.cpp:257 ../src/common/cmdproc.cpp:283
+#: ../src/common/cmdproc.cpp:303
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
-#: ../contrib/src/deprecated/resource.cpp:2367
-#, fuzzy, c-format
-msgid "Unrecognized style %s while parsing resource."
-msgstr "解析资源时遇到无法识别的风格 %s."
-
-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/msw/clipbrd.cpp:267 ../src/msw/clipbrd.cpp:439
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 
-#: ../src/common/appcmn.cpp:232
+#: ../src/common/appcmn.cpp:237
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "不支持的主题(theme) '%s'."
+msgstr "不支持的主题 '%s'."
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:153
 msgid "Up"
 msgstr "向上"
 
-#: ../src/common/cmdline.cpp:953
+#: ../src/richtext/richtextliststylepage.cpp:485
+#: ../src/richtext/richtextbulletspage.cpp:283
+msgid "Upper case letters"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:487
+#: ../src/richtext/richtextbulletspage.cpp:285
+msgid "Upper case roman numerals"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1027
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
-#: ../src/common/valtext.cpp:181
+#: ../src/richtext/richtextliststylepage.cpp:357
+#: ../src/richtext/richtextliststylepage.cpp:359
+#: ../src/richtext/richtextindentspage.cpp:179
+#: ../src/richtext/richtextindentspage.cpp:181
+msgid "Use the current alignment setting."
+msgstr ""
+
+#: ../src/mac/carbon/dataview.cpp:860 ../src/mac/carbon/dataview.cpp:890
+msgid "Valid pointer to native data view control does not exist"
+msgstr ""
+
+#: ../src/common/valtext.cpp:196
 msgid "Validation conflict"
 msgstr "验证冲突"
 
-#: ../contrib/src/mmedia/vidbase.cpp:65
-msgid "Video Output"
-msgstr "视频输出"
+#: ../src/msw/aboutdlg.cpp:54 ../src/mac/carbon/aboutdlg.cpp:74
+#, fuzzy, c-format
+msgid "Version %s"
+msgstr "允许"
 
-#: ../src/generic/filedlgg.cpp:980
+#: ../src/generic/filedlgg.cpp:218
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
-#: ../src/generic/filedlgg.cpp:973
+#: ../src/generic/filedlgg.cpp:216
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1790
+#: ../src/common/docview.cpp:1822
 msgid "Views"
 msgstr "视图"
 
-#: ../src/unix/baseunix.cpp:78
-msgid "Waiting for subprocess termination failed"
+#: ../src/common/accelcmn.cpp:107
+msgid "WINDOWS_LEFT"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:109
+msgid "WINDOWS_MENU"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:108
+msgid "WINDOWS_RIGHT"
+msgstr ""
+
+#: ../src/unix/epolldispatcher.cpp:177
+#, fuzzy, c-format
+msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待子过程终止失败"
 
-#: ../src/common/docview.cpp:461
+#: ../src/common/docview.cpp:478 ../src/html/htmprint.cpp:380
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/common/log.cpp:480
+#: ../src/common/log.cpp:713
 msgid "Warning: "
 msgstr "警告: "
 
-#: ../src/html/htmlpars.cpp:395
-msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "警告: 试图从空栈中移去HTML标签处理器."
-
-#: ../src/common/fmapbase.cpp:103
+#: ../src/common/fmapbase.cpp:108
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: ../src/common/fmapbase.cpp:117
+#: ../src/common/fmapbase.cpp:122
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧(带欧元符号) (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:448 ../src/generic/fontdlgg.cpp:450
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 
-#: ../src/generic/fdrepdlg.cpp:150
+#: ../src/generic/fdrepdlg.cpp:145
 msgid "Whole word"
 msgstr "整字"
 
-#: ../src/html/helpfrm.cpp:535
+#: ../src/html/helpwnd.cpp:533
 msgid "Whole words only"
 msgstr "仅为整字"
 
-#: ../src/univ/themes/win32.cpp:1235
+#: ../src/univ/themes/win32.cpp:1059
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 
-#: ../src/msw/utils.cpp:1096
+#: ../src/msw/utils.cpp:1090
 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1上的Win32s"
 
-#: ../src/msw/utils.cpp:1145
+#: ../src/msw/utils.cpp:1139
 #, c-format
 msgid "Windows 2000 (build %lu"
 msgstr "Windows 2000 (build %lu"
 
-#: ../src/msw/utils.cpp:1110
+#: ../src/msw/utils.cpp:1104
 msgid "Windows 95"
 msgstr "Windows 95"
 
-#: ../src/msw/utils.cpp:1106
+#: ../src/msw/utils.cpp:1100
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
-#: ../src/msw/utils.cpp:1121
+#: ../src/msw/utils.cpp:1115
 msgid "Windows 98"
 msgstr "Windows 98"
 
-#: ../src/msw/utils.cpp:1117
+#: ../src/msw/utils.cpp:1111
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
-#: ../src/msw/utils.cpp:1128
+#: ../src/msw/utils.cpp:1122
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:136
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:137
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:124
+#: ../src/msw/utils.cpp:1084
+#, fuzzy, c-format
+msgid "Windows CE (%d.%d)"
+msgstr "Windows 9x (%d.%d)"
+
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
-#: ../src/common/fmapbase.cpp:121
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "Windows 简体中文 (CP 936)"
 
-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows 繁体中文 (CP 950)"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:133
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:135
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:120
+#: ../src/common/fmapbase.cpp:126
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows 日语 (CP 932)"
 
-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:128
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
-#: ../src/msw/utils.cpp:1125
+#: ../src/msw/utils.cpp:1119
 msgid "Windows ME"
 msgstr "Windows ME"
 
-#: ../src/msw/utils.cpp:1160
+#: ../src/msw/utils.cpp:1154
 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 
-#: ../src/msw/utils.cpp:1153
+#: ../src/msw/utils.cpp:1147
 #, c-format
 msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (build %lu"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:125
+msgid "Windows Thai (CP 874)"
+msgstr "Windows 泰国语 (CP 874)"
+
+#: ../src/common/fmapbase.cpp:134
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:126
+#: ../src/common/fmapbase.cpp:132
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
-#: ../src/msw/utils.cpp:1149
+#: ../src/msw/utils.cpp:1143
 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:138
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
-#: ../src/common/ffile.cpp:158
+#: ../src/common/ffile.cpp:159
 #, c-format
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s'错误"
 
-#: ../src/xml/xml.cpp:562
+#: ../src/xml/xml.cpp:733
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 
-#: ../src/common/xpmdecod.cpp:774
+#: ../src/common/xpmdecod.cpp:798
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-#, c-format
-msgid "XPM: malformed colour definition '%s'!"
+#: ../src/common/xpmdecod.cpp:707
+#, fuzzy, c-format
+msgid "XPM: incorrect colour description in line %d"
+msgstr "XPM: 错误的颜色定义 '%s'!"
+
+#: ../src/common/xpmdecod.cpp:682
+msgid "XPM: incorrect header format!"
+msgstr ""
+
+#: ../src/common/xpmdecod.cpp:718 ../src/common/xpmdecod.cpp:727
+#, fuzzy, c-format
+msgid "XPM: malformed colour definition '%s' at line %d!"
 msgstr "XPM: 错误的颜色定义 '%s'!"
 
-#: ../src/xrc/xmlres.cpp:518
+#: ../src/common/xpmdecod.cpp:757
+msgid "XPM: no colors left to use for mask!"
+msgstr ""
+
+#: ../src/common/xpmdecod.cpp:784
+#, c-format
+msgid "XPM: truncated image data at line %d!"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:634
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 
-#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031
+#: ../src/xrc/xmlres.cpp:1181 ../src/xrc/xmlres.cpp:1193
+#, fuzzy, c-format
+msgid "XRC resource: Cannot create animation from '%s'."
+msgstr "XRC资源: 不能从 '%s'创建位图."
+
+#: ../src/xrc/xmlres.cpp:1149 ../src/xrc/xmlres.cpp:1161
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC资源: 不能从 '%s'创建位图."
 
-#: ../src/xrc/xmlres.cpp:975
-#, c-format
-msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
+#: ../src/xrc/xmlres.cpp:1107
+#, fuzzy, c-format
+msgid "XRC resource: Incorrect colour specification '%s' for attribute '%s'."
 msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 
-#: ../src/mac/carbon/msgdlg.cpp:61 ../src/mac/carbon/msgdlg.cpp:144
-#: ../src/mac/classic/msgdlg.cpp:59 ../src/mac/classic/msgdlg.cpp:141
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/motif/msgdlg.cpp:194 ../src/mac/carbon/msgdlg.cpp:35
 msgid "Yes"
 msgstr "是"
 
-#: ../src/generic/dirdlgg.cpp:308
+#: ../src/mac/carbon/overlay.cpp:158
+#, fuzzy
+msgid "You cannot Clear an overlay that is not inited"
+msgstr "你不能向该项中加入新的目录."
+
+#: ../src/dfb/overlay.cpp:62 ../src/mac/carbon/overlay.cpp:110
+msgid "You cannot Init an overlay twice"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:317
 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 
-#: ../src/common/stockitem.cpp:155
+#: ../src/common/stockitem.cpp:162
 msgid "Zoom &In"
-msgstr "放大[&I]"
+msgstr "放大(&I)"
 
-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:163
 msgid "Zoom &Out"
-msgstr "缩小[&O]"
+msgstr "缩小(&O)"
 
-#: ../src/common/stockitem.cpp:154
+#: ../src/common/stockitem.cpp:161
 msgid "Zoom to &Fit"
-msgstr "缩放以适应窗口[&F]"
+msgstr "缩放以适应窗口(&F)"
 
-#: ../src/common/docview.cpp:2146
+#: ../src/common/docview.cpp:2174
 msgid "[EMPTY]"
 msgstr "[空]"
 
-#: ../src/msw/dde.cpp:1059
+#: ../src/msw/dde.cpp:1142
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML应用程序已创建延时race条件."
 
-#: ../src/msw/dde.cpp:1047
+#: ../src/msw/dde.cpp:1130
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -3967,39 +6255,39 @@ msgstr ""
 "或传给DDEML函数的是\n"
 "无效的实例标识."
 
-#: ../src/msw/dde.cpp:1065
+#: ../src/msw/dde.cpp:1148
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败."
 
-#: ../src/msw/dde.cpp:1062
+#: ../src/msw/dde.cpp:1145
 msgid "a memory allocation failed."
 msgstr "内存分配失败."
 
-#: ../src/msw/dde.cpp:1056
+#: ../src/msw/dde.cpp:1139
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML参数验证失败."
 
-#: ../src/msw/dde.cpp:1038
+#: ../src/msw/dde.cpp:1121
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步advise事务请求已超时."
 
-#: ../src/msw/dde.cpp:1044
+#: ../src/msw/dde.cpp:1127
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步data事务请求已超时."
 
-#: ../src/msw/dde.cpp:1053
+#: ../src/msw/dde.cpp:1136
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步execute事务请求已超时."
 
-#: ../src/msw/dde.cpp:1071
+#: ../src/msw/dde.cpp:1154
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步poke事务请求已超时."
 
-#: ../src/msw/dde.cpp:1086
+#: ../src/msw/dde.cpp:1169
 msgid "a request to end an advise transaction has timed out."
 msgstr "终止advise事务的请求已超时."
 
-#: ../src/msw/dde.cpp:1080
+#: ../src/msw/dde.cpp:1163
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
@@ -4009,15 +6297,15 @@ msgstr ""
 "已被客户端终止的会话, 或服务器\n"
 "在完成事务前终止."
 
-#: ../src/msw/dde.cpp:1068
+#: ../src/msw/dde.cpp:1151
 msgid "a transaction failed."
 msgstr "事务失败."
 
-#: ../src/common/menucmn.cpp:114
+#: ../src/common/accelcmn.cpp:179
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1133
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -4029,15 +6317,15 @@ msgstr ""
 "或初始化为APPCMD_CLIENTONLY的应用程序\n"
 "视图执行服务器事务."
 
-#: ../src/msw/dde.cpp:1074
+#: ../src/msw/dde.cpp:1157
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用PostMessage失败. "
 
-#: ../src/msw/dde.cpp:1083
+#: ../src/msw/dde.cpp:1166
 msgid "an internal error has occurred in the DDEML."
 msgstr "在DDEML中发生内部错误."
 
-#: ../src/msw/dde.cpp:1089
+#: ../src/msw/dde.cpp:1172
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
@@ -4047,16 +6335,12 @@ msgstr ""
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 
-#: ../src/common/zipstrm.cpp:1331
+#: ../src/common/zipstrm.cpp:1272
 #, fuzzy
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是分段的zip文件"
 
-#: ../src/generic/dbgrptg.cpp:296
-msgid "at all possible please do continue with the report generation.\n"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:1819
+#: ../src/common/fileconf.cpp:1871
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."
@@ -4069,150 +6353,147 @@ msgstr "库函数参数错误"
 msgid "bad signature"
 msgstr "错误的签名"
 
-#: ../src/common/zipstrm.cpp:1581
+#: ../src/common/zipstrm.cpp:1714
 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/ftp.cpp:382
 msgid "binary"
 msgstr "二进制"
 
-#: ../src/common/fontcmn.cpp:645
+#: ../src/common/fontcmn.cpp:697
 msgid "bold"
 msgstr "粗体"
 
-#: ../src/common/fontcmn.cpp:569
-msgid "bold "
-msgstr "粗体 "
-
-#: ../src/generic/dbgrptg.cpp:295
-msgid "but be warned that it may hinder improving the program, so if\n"
-msgstr ""
+#: ../src/os2/iniconf.cpp:458
+#, fuzzy
+msgid "buffer is too small for Windows directory."
+msgstr "Windows目录的缓存太小."
 
-#: ../src/common/ffile.cpp:91
+#: ../src/common/ffile.cpp:92
 #, c-format
 msgid "can't close file '%s'"
 msgstr "不能关闭文件 '%s'"
 
-#: ../src/common/file.cpp:286
+#: ../src/common/file.cpp:261
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "不能关闭文件描述子 %d"
 
-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:537
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "不能把修改提交给文件 '%s'"
 
-#: ../src/common/file.cpp:217
+#: ../src/common/file.cpp:195
 #, c-format
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 
-#: ../src/common/fileconf.cpp:1134
+#: ../src/common/fileconf.cpp:1170
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 
-#: ../src/common/file.cpp:457
+#: ../src/common/file.cpp:443
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 
-#: ../src/common/zipstrm.cpp:1358
-#, fuzzy
+#: ../src/msdos/utilsdos.cpp:310 ../src/msdos/utilsdos.cpp:469
+#, c-format
+msgid "can't execute '%s'"
+msgstr "执行 '%s'失败"
+
+#: ../src/common/zipstrm.cpp:1489
 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 
-#: ../src/common/file.cpp:427
+#: ../src/common/file.cpp:413
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 
-#: ../src/msw/utils.cpp:376
+#: ../src/msw/utils.cpp:393
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 
-#: ../src/common/file.cpp:341
+#: ../src/common/file.cpp:329
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 
-#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
+#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:199
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "不能获得文件描述子 %d的指针位置"
 
-#: ../src/common/fontmap.cpp:326
+#: ../src/common/fontmap.cpp:323
 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 
-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/file.cpp:247 ../src/common/ffile.cpp:76
 #, c-format
 msgid "can't open file '%s'"
 msgstr "不能打开文件 '%s'"
 
-#: ../src/common/fileconf.cpp:404
+#: ../src/common/fileconf.cpp:357
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "不能打开全局配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:419
+#: ../src/common/fileconf.cpp:373
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:1011
 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 
-#: ../src/common/dynlib.cpp:253
-msgid "can't query for GUI plugins name in console applications"
-msgstr "无法在控制台程序里查询GUI插件"
-
-#: ../src/common/zipstrm.cpp:436
+#: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"
 msgstr "不能重新初始化zlib deflate(压缩)流."
 
-#: ../src/common/zipstrm.cpp:461
+#: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
 msgstr "不能重新初始化zlib inflate(解压)流."
 
-#: ../src/common/file.cpp:310
+#: ../src/common/file.cpp:285
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "不能从文件描述子 %d中读"
 
-#: ../src/common/file.cpp:546
+#: ../src/common/file.cpp:532
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "不能删除文件 '%s'"
 
-#: ../src/common/file.cpp:562
+#: ../src/common/file.cpp:548
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 
-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:371 ../src/msw/wince/filefnwce.cpp:185
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "不能定位文件描述子 %d"
 
-#: ../src/common/textfile.cpp:196
+#: ../src/common/textfile.cpp:275
 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "不能把文件 '%s'写到磁盘."
 
-#: ../src/common/file.cpp:326
+#: ../src/common/file.cpp:301
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "不能写到文件描述子 %d"
 
-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:1025
 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 
-#: ../src/common/intl.cpp:1109
+#: ../src/common/intl.cpp:1226
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."
@@ -4221,23 +6502,23 @@ msgstr "找不到域 '%s'的目录文件."
 msgid "checksum error"
 msgstr "校验和错误"
 
-#: ../src/generic/dbgrptg.cpp:294
-msgid "choose the \"Cancel\" button,\n"
+#: ../src/common/tarstrm.cpp:819
+msgid "checksum failure reading tar header block"
 msgstr ""
 
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 
-#: ../src/common/regex.cpp:141
+#: ../src/common/regex.cpp:240
 msgid "conversion to 8-bit encoding failed"
 msgstr "不能转换为8-bit编码"
 
-#: ../src/common/menucmn.cpp:112
+#: ../src/common/accelcmn.cpp:177
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1093
+#: ../src/common/cmdline.cpp:1182
 msgid "date"
 msgstr "日期"
 
@@ -4245,36 +6526,40 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
-#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730
+#: ../src/common/fmapbase.cpp:685
 msgid "default"
 msgstr "缺省值"
 
-#: ../src/common/xtistrm.cpp:843
+#: ../src/common/xtistrm.cpp:839
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 
-#: ../src/common/debugrpt.cpp:502
-msgid "dump of the process state (binary)"
+#: ../src/common/cmdline.cpp:1178
+msgid "double"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3779
+#: ../src/common/debugrpt.cpp:530
+msgid "dump of the process state (binary)"
+msgstr "转储(dump)进程状态（二进制码）"
+
+#: ../src/common/datetime.cpp:4009
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3769
+#: ../src/common/datetime.cpp:3999
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetime.cpp:3772
+#: ../src/common/datetime.cpp:4002
 msgid "eleventh"
 msgstr "第十一"
 
-#: ../src/common/strconv.cpp:2671
-#, c-format
-msgid "encoding %s"
+#: ../src/common/strconv.cpp:2981
+#, fuzzy, c-format
+msgid "encoding %i"
 msgstr "编码 %s"
 
-#: ../src/common/fileconf.cpp:1805
+#: ../src/common/fileconf.cpp:1857
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
@@ -4283,147 +6568,157 @@ msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 msgid "error in data format"
 msgstr "文件格式错误"
 
+#: ../src/msdos/utilsdos.cpp:410
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
+
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 
-#: ../src/common/zipstrm.cpp:1443
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1575
 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 
-#: ../src/common/zipstrm.cpp:1521
+#: ../src/common/zipstrm.cpp:1666
 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 
-#: ../src/common/zipstrm.cpp:2237
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:2389
+#, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 
-#: ../src/msw/dialup.cpp:844
-msgid "establish"
-msgstr "建立"
-
-#: ../src/common/ffile.cpp:172
+#: ../src/common/ffile.cpp:181
 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 
-#: ../src/common/datetime.cpp:3776
+#: ../src/common/datetime.cpp:4006
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3766
+#: ../src/common/datetime.cpp:3996
 msgid "fifth"
 msgstr "第五"
 
-#: ../src/common/fileconf.cpp:664
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:613
+#, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
+msgstr "文件 '%s', 行 %d: 组头之后的 '%s' 被忽略."
 
-#: ../src/common/fileconf.cpp:693
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:642
+#, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "文件 '%s', 行 %d: 期望 '='."
+msgstr "文件 '%s', 行 %d: 期待出现 '='."
 
-#: ../src/common/fileconf.cpp:716
+#: ../src/common/fileconf.cpp:665
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 
-#: ../src/common/fileconf.cpp:706
+#: ../src/common/fileconf.cpp:655
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 
-#: ../src/common/fileconf.cpp:628
+#: ../src/common/fileconf.cpp:577
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 
-#: ../src/generic/dbgrptg.cpp:290
-msgid "files contain private information,\n"
-msgstr ""
+#: ../src/richtext/richtextbuffer.cpp:5847
+#, fuzzy
+msgid "files"
+msgstr "文件"
 
-#: ../src/common/datetime.cpp:3762
+#: ../src/common/datetime.cpp:3992
 msgid "first"
 msgstr "第一"
 
-#: ../src/html/helpfrm.cpp:1262
+#: ../src/html/helpwnd.cpp:1260
 msgid "font size"
 msgstr "字体大小"
 
-#: ../src/common/datetime.cpp:3775
+#: ../src/common/datetime.cpp:4005
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3765
+#: ../src/common/datetime.cpp:3995
 msgid "fourth"
 msgstr "第四"
 
-#: ../src/common/appbase.cpp:361
+#: ../src/common/appbase.cpp:491
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
-#: ../src/common/xtixml.cpp:479
+#: ../src/richtext/richtextbuffer.cpp:7194
+#: ../src/richtext/richtextbuffer.cpp:7234
+#: ../src/richtext/richtextbuffer.cpp:7305
+msgid "image"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:796
+msgid "incomplete header block in tar"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:476
 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串, 缺少点号('.')"
 
-#: ../src/msw/dialup.cpp:844
-msgid "initiate"
-msgstr "初始化"
+#: ../src/common/tarstrm.cpp:1373
+msgid "incorrect size given for tar entry"
+msgstr ""
 
-#: ../src/common/file.cpp:459
-msgid "invalid eof() return value."
-msgstr "无效的eof()返回值."
+#: ../src/common/tarstrm.cpp:992
+msgid "invalid data in extended tar header"
+msgstr ""
 
-#: ../src/generic/logg.cpp:1180
+#: ../src/generic/logg.cpp:1103
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
-#: ../src/common/zipstrm.cpp:1307
+#: ../src/common/zipstrm.cpp:1444
 msgid "invalid zip file"
 msgstr "无效的zip文件"
 
-#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
+#: ../src/common/fontcmn.cpp:702
 msgid "italic"
 msgstr "斜体"
 
-#: ../src/common/fontcmn.cpp:641
+#: ../src/common/fontcmn.cpp:692
 #, fuzzy
 msgid "light"
 msgstr "细"
 
-#: ../src/common/fontcmn.cpp:565
-#, fuzzy
-msgid "light "
-msgstr "细 "
-
-#: ../src/common/intl.cpp:1455
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1645
+#, c-format
 msgid "locale '%s' can not be set."
-msgstr "不能设置现场(locale) '%s'."
+msgstr "不能设置语言(locale) '%s'."
 
-#: ../src/common/intl.cpp:1102
+#: ../src/common/intl.cpp:1210
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "查找目录 '%s' 在路径 '%s'下."
 
-#: ../src/common/datetime.cpp:3926
+#: ../src/mac/carbon/dataview.cpp:1048 ../src/mac/carbon/dataview.cpp:1168
+msgid "m_peer is not or incorrectly initialized"
+msgstr ""
+
+#: ../src/common/datetime.cpp:4164
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/datetime.cpp:3780
+#: ../src/common/datetime.cpp:4010
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3770
+#: ../src/common/datetime.cpp:4000
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:1034
+#: ../src/msw/dde.cpp:1117
 msgid "no DDE error."
 msgstr "没有DDE错误."
 
@@ -4431,19 +6726,28 @@ msgstr "没有DDE错误."
 msgid "no error"
 msgstr "没有错误"
 
-#: ../src/html/helpdata.cpp:662
+#: ../src/dfb/fontmgr.cpp:178
+#, c-format
+msgid "no fonts found in %s, using builtin font"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:201 ../src/html/helpdata.cpp:648
 msgid "noname"
 msgstr "未名"
 
-#: ../src/common/datetime.cpp:3925
+#: ../src/common/datetime.cpp:4163
 msgid "noon"
 msgstr "中午"
 
-#: ../src/common/cmdline.cpp:1089
+#: ../src/gtk/print.cpp:1165 ../src/gtk/print.cpp:1269
+msgid "not implemented"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1174
 msgid "num"
 msgstr "num"
 
-#: ../src/common/xtixml.cpp:258
+#: ../src/common/xtixml.cpp:255
 msgid "objects cannot have XML Text Nodes"
 msgstr "对象不能有XML 文本节点"
 
@@ -4451,41 +6755,29 @@ msgstr "对象不能有XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
-#: ../src/generic/dbgrptg.cpp:291
-msgid "please uncheck them and they will be removed from the report.\n"
-msgstr ""
-
-#: ../src/common/debugrpt.cpp:478
+#: ../src/common/debugrpt.cpp:506
 msgid "process context description"
-msgstr ""
+msgstr "进程上下文描述"
 
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
 
-#: ../src/common/filename.cpp:181
-msgid "reading"
-msgstr "正在读入"
-
-#: ../src/common/zipstrm.cpp:1744
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1878
+#, c-format
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 
-#: ../src/common/zipstrm.cpp:1741
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1875
+#, c-format
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 
-#: ../src/msw/dde.cpp:1077
+#: ../src/msw/dde.cpp:1160
 msgid "reentrancy problem."
 msgstr "重入问题."
 
-#: ../src/generic/dbgrptg.cpp:331
-msgid "report, please enter it here and it will be joined to it:"
-msgstr ""
-
-#: ../src/common/datetime.cpp:3763
+#: ../src/common/datetime.cpp:3993
 msgid "second"
 msgstr "第二"
 
@@ -4493,145 +6785,153 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
-#: ../src/common/datetime.cpp:3778
+#: ../src/common/datetime.cpp:4008
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3768
+#: ../src/common/datetime.cpp:3998
 msgid "seventh"
 msgstr "第七"
 
-#: ../src/common/menucmn.cpp:116
+#: ../src/common/accelcmn.cpp:181
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appbase.cpp:351
+#: ../src/common/appbase.cpp:481
 msgid "show this help message"
 msgstr "显示帮助信息"
 
-#: ../src/common/datetime.cpp:3777
+#: ../src/common/datetime.cpp:4007
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3767
+#: ../src/common/datetime.cpp:3997
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:203
+#: ../src/common/appcmn.cpp:215
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
-#: ../src/common/appcmn.cpp:189
+#: ../src/common/appcmn.cpp:201
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 
-#: ../src/common/zipstrm.cpp:1647
+#: ../src/common/zipstrm.cpp:1781
 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 
-#: ../src/common/cmdline.cpp:1085
+#: ../src/common/cmdline.cpp:1170
 msgid "str"
 msgstr "str"
 
-#: ../src/common/datetime.cpp:3771
+#: ../src/common/tarstrm.cpp:1002 ../src/common/tarstrm.cpp:1024
+#: ../src/common/tarstrm.cpp:1499 ../src/common/tarstrm.cpp:1521
+msgid "tar entry not open"
+msgstr ""
+
+#: ../src/common/datetime.cpp:4001
 msgid "tenth"
 msgstr "第十"
 
-#: ../src/msw/dde.cpp:1041
+#: ../src/msw/dde.cpp:1124
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致DDE_FBUSY位被设置."
 
-#: ../src/common/datetime.cpp:3764
+#: ../src/common/datetime.cpp:3994
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetime.cpp:3774
+#: ../src/common/datetime.cpp:4004
 msgid "thirteenth"
 msgstr "第十三"
 
-#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:73 ../src/common/imagtiff.cpp:89
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 
-#: ../src/common/datetime.cpp:3591
+#: ../src/common/datetime.cpp:3813
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetime.cpp:3593
+#: ../src/common/datetime.cpp:3815
 msgid "tomorrow"
 msgstr "明天"
 
-#: ../src/common/datetime.cpp:3773
+#: ../src/common/fileconf.cpp:1968
+#, c-format
+msgid "trailing backslash ignored in '%s'"
+msgstr ""
+
+#: ../src/gtk/aboutdlg.cpp:190
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/common/datetime.cpp:4003
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3781
+#: ../src/common/datetime.cpp:4011
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:637
+#: ../src/common/fontcmn.cpp:603 ../src/common/fontcmn.cpp:688
 msgid "underlined"
 msgstr "下划线"
 
-#: ../src/common/fontcmn.cpp:552
-msgid "underlined "
-msgstr "下划线 "
-
-#: ../src/common/fileconf.cpp:1932
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:2003
+#, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
-#: ../src/generic/progdlgg.cpp:307
+#: ../src/common/tarstrm.cpp:1043
+#, fuzzy
+msgid "unexpected end of file"
+msgstr "在解析资源时意外到达文件结尾."
+
+#: ../src/common/tarstrm.cpp:372 ../src/common/tarstrm.cpp:395
+#: ../src/common/tarstrm.cpp:426 ../src/generic/progdlgg.cpp:294
 msgid "unknown"
 msgstr "未知"
 
-#: ../src/common/xtixml.cpp:252
+#: ../src/common/xtixml.cpp:249
 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../src/msw/dialup.cpp:457
+#: ../src/msw/dialup.cpp:493
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误(错误号 %08x)."
 
-#: ../src/common/textbuf.cpp:230
-msgid "unknown line terminator"
-msgstr "未知行终止符"
-
-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
-#: ../src/common/fmapbase.cpp:712
+#: ../src/common/fmapbase.cpp:699
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:430
+#: ../src/common/docview.cpp:450
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1414
+#: ../src/common/docview.cpp:1446
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
-#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031
+#: ../src/common/zipstrm.cpp:1795 ../src/common/zipstrm.cpp:2177
 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 
-#: ../src/common/zipstrm.cpp:1142
-msgid "unsupported zip archive"
-msgstr "不支持的zip存档"
-
-#: ../src/common/intl.cpp:1114
+#: ../src/common/intl.cpp:1232
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."
@@ -4640,55 +6940,302 @@ msgstr "使用目录 '%s' 从 '%s'."
 msgid "write error"
 msgstr "写错误"
 
-#: ../src/common/filename.cpp:181
-msgid "writing"
-msgstr "正在写入"
-
-#: ../src/common/stopwatch.cpp:281
+#: ../src/common/stopwatch.cpp:277
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 
-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
+#: ../src/gtk/print.cpp:952
+msgid "wxPrintout::GetPageInfo gives a null maxPage."
+msgstr ""
+
+#: ../include/wx/richtext/richtextfontpage.h:38
+msgid "wxRichTextFontPage"
+msgstr ""
+
+#: ../src/html/search.cpp:49
+msgid "wxSearchEngine::LookFor must be called before scanning!"
+msgstr ""
+
+#: ../src/common/socket.cpp:432 ../src/common/socket.cpp:486
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 
-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
+#: ../src/common/socket.cpp:1013
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知事件!."
 
-#: ../src/motif/app.cpp:210
+#: ../src/mac/carbon/databrow.cpp:646
+msgid "wxWidget control pointer is not a data view pointer"
+msgstr ""
+
+#: ../src/motif/app.cpp:248
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 
-#: ../src/x11/app.cpp:176
+#: ../src/x11/app.cpp:167
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 不能打开显示设备: 已经存在."
 
-#: ../src/common/datetime.cpp:3592
+#: ../src/richtext/richtextsymboldlg.cpp:427
+msgid "xxxx"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3814
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:233 ../src/common/zstream.cpp:401
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 
-#: ../src/common/prntbase.cpp:839
+#: ../src/common/prntbase.cpp:1137
 msgid "|<<"
 msgstr "|<<"
 
+#: ../src/richtext/richtextliststylepage.cpp:498
+#: ../src/richtext/richtextbulletspage.cpp:296
+msgid "~"
+msgstr ""
+
+#~ msgid "\t%s: %s\n"
+#~ msgstr "\t%s: %s\n"
+
+#, fuzzy
+#~ msgid " Couldn't create the UnicodeConverter"
+#~ msgstr "不能创建计时器"
+
+#~ msgid "#define %s must be an integer."
+#~ msgstr "#所定义的 %s 必须是整数."
+
+#~ msgid "%s not a bitmap resource specification."
+#~ msgstr "%s 不是位图资源."
+
+#~ msgid "%s not an icon resource specification."
+#~ msgstr "%s 不是图标资源."
+
+#~ msgid "%s: ill-formed resource file syntax."
+#~ msgstr "%s: 不良资源文件语法."
+
+#, fuzzy
+#~ msgid "&About"
+#~ msgstr "关于(&A)"
+
+#~ msgid "&Open"
+#~ msgstr "打开(&O)"
+
+#~ msgid "&Print"
+#~ msgstr "打印(&P)"
+
+#~ msgid "*** A debug report has been generated\n"
+#~ msgstr "*** 生成了一份调试报告\n"
+
+#~ msgid "*** It can be found in \"%s\"\n"
+#~ msgstr "*** 可在此找到: \"%s\"\n"
+
+#~ msgid ""
+#~ ", expected static, #include or #define\n"
+#~ "while parsing resource."
+#~ msgstr ""
+#~ ", 在对资源进行语法分析时\n"
+#~ ", 期望如下关键字 static, #include 或 #define ."
+
+#~ msgid "AddToPropertyCollection called on a generic accessor"
+#~ msgstr "在一个通用处理器上调用AddToPropertyCollection"
+
+#~ msgid "AddToPropertyCollection called w/o valid adder"
+#~ msgstr "调用AddToPropertyCollection时未带有效的adder"
+
+#~ msgid "Bitmap resource specification %s not found."
+#~ msgstr "找不到位图规格 %s."
+
+#~ msgid ""
+#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
+#~ "instead\n"
+#~ " or provide #define (see manual for caveats)"
+#~ msgstr ""
+#~ "不能解析控件类或者id '%s'. 用(非零)整数代替\n"
+#~ "或 提供 #define (详细信息见手册)"
+
+#~ msgid ""
+#~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
+#~ "or provide #define (see manual for caveats)"
+#~ msgstr ""
+#~ "不能解析菜单id '%s'. 用(非零)整数代替\n"
+#~ "或 提供 #define (详细信息见手册)"
+
+#, fuzzy
+#~ msgid "Couldn't end the context on the overlay window"
+#~ msgstr "不能获得当前线程指针"
+
+#~ msgid "Expected '*' while parsing resource."
+#~ msgstr "解析资源时期待出现 '*' ."
+
+#~ msgid "Expected '=' while parsing resource."
+#~ msgstr "解析资源时期待出现 '='."
+
+#~ msgid "Expected 'char' while parsing resource."
+#~ msgstr "解析资源时期待遇到 'char' ."
+
+#~ msgid ""
+#~ "Failed to find XBM resource %s.\n"
+#~ "Forgot to use wxResourceLoadBitmapData?"
+#~ msgstr ""
+#~ "查找XBM资源 %s失败.\n"
+#~ "没有使用wxResourceLoadBitmapData?"
+
+#~ msgid ""
+#~ "Failed to find XBM resource %s.\n"
+#~ "Forgot to use wxResourceLoadIconData?"
+#~ msgstr ""
+#~ "查找XBM资源%s失败.\n"
+#~ "没有使用wxResourceLoadIconData?"
+
+#~ msgid ""
+#~ "Failed to find XPM resource %s.\n"
+#~ "Forgot to use wxResourceLoadBitmapData?"
+#~ msgstr ""
+#~ "查找XPM资源 %s失败.\n"
+#~ "没有使用wxResourceLoadBitmapData?"
+
+#~ msgid "Failed to get clipboard data."
+#~ msgstr "获取剪贴板数据失败."
+
+#~ msgid "Failed to load shared library '%s' Error '%s'"
+#~ msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
+
+#~ msgid "Found "
+#~ msgstr "找到 "
+
+#~ msgid "GetProperty called w/o valid getter"
+#~ msgstr "调用GetProperty时未带有效的getter"
+
+#~ msgid "GetPropertyCollection called on a generic accessor"
+#~ msgstr "在一个通用处理器上调用GetPropertyCollection"
+
+#~ msgid "GetPropertyCollection called w/o valid collection getter"
+#~ msgstr "调用GetPropertyCollection时未带有效的collection getter"
+
+#~ msgid "Icon resource specification %s not found."
+#~ msgstr "没有找到图标资源规范 %s ."
+
+#~ msgid "Ill-formed resource file syntax."
+#~ msgstr "不良的资源文件语法."
+
+#~ msgid "Illegal Parameter Count for ConstructObject Method"
+#~ msgstr "非法的针对ConstructObject方法的参数计数"
+
+#~ msgid "Illegal Parameter Count for Create Method"
+#~ msgstr "非法的针对Create方法的参数计数"
+
+#~ msgid "Long Conversions not supported"
+#~ msgstr "不支持长转换"
+
+#~ msgid "No XBM facility available!"
+#~ msgstr "没有可用的XBM工具!"
+
+#~ msgid "No XPM icon facility available!"
+#~ msgstr "没有可用的XPM图标设备!"
+
+#~ msgid "Option '%s' requires a value, '=' expected."
+#~ msgstr "选项 '%s' 要求一个值, 期望 '='."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "全部选择(&A)"
+
+#~ msgid "SetProperty called w/o valid setter"
+#~ msgstr "调用SetProperty时未带有效的setter"
+
+#~ msgid "String conversions not supported"
+#~ msgstr "不支持字符串装换"
+
+#~ msgid "Unexpected end of file while parsing resource."
+#~ msgstr "在解析资源时意外到达文件结尾."
+
+#~ msgid "Unrecognized style %s while parsing resource."
+#~ msgstr "解析资源时遇到无法识别的风格 %s."
+
+#~ msgid "Video Output"
+#~ msgstr "视频输出"
+
+#~ msgid "Warning: attempt to remove HTML tag handler from empty stack."
+#~ msgstr "警告: 试图从空栈中移去HTML标签处理器."
+
+#~ msgid "establish"
+#~ msgstr "建立"
+
+#~ msgid "initiate"
+#~ msgstr "初始化"
+
+#~ msgid "invalid eof() return value."
+#~ msgstr "无效的eof()返回值."
+
+#~ msgid "reading"
+#~ msgstr "正在读入"
+
+#~ msgid "unknown line terminator"
+#~ msgstr "未知行终止符"
+
+#~ msgid "writing"
+#~ msgstr "正在写入"
+
+#~ msgid "."
+#~ msgstr "."
+
+#~ msgid ".."
+#~ msgstr ".."
+
+#~ msgid "Cannot open URL '%s'"
+#~ msgstr "不能打开 URL '%s'"
+
+#~ msgid "Error "
+#~ msgstr "错误 "
+
+#~ msgid "Failed to create directory %s/.gnome."
+#~ msgstr "创建目录 %s/.gnome 失败."
+
+#~ msgid "Failed to create directory %s/mime-info."
+#~ msgstr "创建目录 %s/.mime-info 失败."
+
+#~ msgid "MP Thread Support is not available on this System"
+#~ msgstr "此系统不提供MP线程支持."
+
+#~ msgid "Mailcap file %s, line %d: incomplete entry ignored."
+#~ msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
+
+#~ msgid "Mime.types file %s, line %d: unterminated quoted string."
+#~ msgstr "Mime.类型文件 %s, 行 %d: 没有结束符号的引用字符串."
+
+#~ msgid "Unknown field in file %s, line %d: '%s'."
+#~ msgstr "在文件 %s, 行 %d是未知字段: '%s'."
+
+#~ msgid "bold "
+#~ msgstr "粗体 "
+
+#~ msgid "can't query for GUI plugins name in console applications"
+#~ msgstr "无法在控制台程序里查询GUI插件"
+
 #, fuzzy
-#~ msgid "Cannot wait on thread to exit."
-#~ msgstr "不能等候线程终止."
+#~ msgid "light "
+#~ msgstr "细 "
 
-#~ msgid "Could not load Rich Edit DLL '%s'"
-#~ msgstr "ä¸\8dè\83½è£\85è½½ Rich Edit DLL '%s'"
+#~ msgid "underlined "
+#~ msgstr "ä¸\8bå\88\92线 "
 
-#~ msgid "ZIP handler currently supports only local files!"
-#~ msgstr "ZIP处理程序目前只支持本地文件!"
+#~ msgid "unsupported zip archive"
+#~ msgstr "不支持的zip存档"
 
 #~ msgid ""
-#~ "can't seek on file descriptor %d, large files support is not enabled."
-#~ msgstr "不能定位文件描述子 %d, 没有开启\"大文件支持\""
+#~ "Failed to get stack backtrace:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能获取堆栈的回溯路径:\n"
+#~ " %s"
+
+#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
+#~ msgstr "装入灰度 Ascii PNM图像功能还没有实现."
+
+#~ msgid "Loading Grey Raw PNM image is not yet implemented."
+#~ msgstr "装入灰度 Raw PNM图像功能还没有实现."