update from Adiel Mittmann

[wxWidgets.git] / locale / zh_CN.po

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

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

-"Project-Id-Version: wxWidgets-2.5.2\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-"PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
-"Last-Translator: Liu XiaoXi <liouxiao@hotmail.com>\n"
+"POT-Creation-Date: 2006-10-29 14:59+0100\n"
+"PO-Revision-Date: 2005-12-21 10:38+0800\n"
+"Last-Translator: Liu Xiao Xi <liouxiao@hotmail.com>\n"

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

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

 
 

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

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

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

 
 

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

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


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

-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:216 ../src/richtext/richtextstyledlg.cpp:203
+#: ../src/richtext/richtextstyledlg.cpp:215

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

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

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

-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:245

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

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

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

-#: ../src/html/htmprint.cpp:570
+#: ../src/common/strconv.cpp:3063 ../src/common/strconv.cpp:3071
+#, fuzzy
+msgid " Couldn't create the UnicodeConverter"
+msgstr "不能创建计时器"
+
+#: ../src/html/htmprint.cpp:579 ../src/richtext/richtextprint.cpp:535

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

-#: ../src/common/paper.cpp:124
+#: ../src/msw/aboutdlg.cpp:52
+msgid " Version "
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:619
+#, fuzzy
+msgid " bold"
+msgstr "粗体"
+
+#: ../src/common/fontcmn.cpp:635
+#, fuzzy
+msgid " italic"
+msgstr "斜体"
+
+#: ../src/common/fontcmn.cpp:615
+#, 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 英寸"
 
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 

-#: ../src/common/paper.cpp:125
+#: ../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 英寸"
 
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
 

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

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

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

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

-#: ../src/common/paper.cpp:123
+#: ../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
 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
+#: ../contrib/src/deprecated/resource.cpp:3036

 #, c-format
 msgid "#define %s must be an integer."
 msgstr "#所定义的 %s 必须是整数."
 
 #, c-format
 msgid "#define %s must be an integer."
 msgstr "#所定义的 %s 必须是整数."
 

-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/common/filename.cpp:2345
+#, c-format
+msgid "%.*f GB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2343
+#, c-format
+msgid "%.*f MB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2347
+#, c-format
+msgid "%.*f TB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2341
+#, c-format
+msgid "%.*f kB"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1021 ../src/html/helpwnd.cpp:1023
+#: ../src/html/helpwnd.cpp:1655 ../src/html/helpwnd.cpp:1693

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

-#: ../src/generic/filedlgg.cpp:288
-#, c-format
-msgid "%ld bytes"
-msgstr "%ld 字节"
+#: ../src/generic/filedlgg.cpp:360
+#, fuzzy, c-format
+msgid "%ld byte"
+msgid_plural "%ld bytes"
+msgstr[0] "%ld 字节"
+msgstr[1] "%ld 字节"

 
 

-#: ../src/common/cmdline.cpp:851
+#: ../src/common/cmdline.cpp:870

 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 

-#: ../src/generic/logg.cpp:261
+#: ../src/common/filename.cpp:2339
+#, c-format
+msgid "%s B"
+msgstr ""
+
+#: ../src/generic/logg.cpp:260

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

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

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

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

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

-#: ../src/common/fldlgcmn.cpp:81
+#: ../src/common/tarstrm.cpp:1235
+#, c-format
+msgid "%s did not fit the tar header for entry '%s'"
+msgstr ""
+
+#: ../src/common/fldlgcmn.cpp:93

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

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

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

-#: ../contrib/src/deprecated/resource.cpp:2390
+#: ../contrib/src/deprecated/resource.cpp:2400

 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr "%s 不是位图资源."
 
 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr "%s 不是位图资源."
 

-#: ../contrib/src/deprecated/resource.cpp:2544
+#: ../contrib/src/deprecated/resource.cpp:2554

 #, c-format
 msgid "%s not an icon resource specification."
 msgstr "%s 不是图标资源."
 
 #: ../contrib/src/deprecated/resource.cpp:1901
 #: ../contrib/src/deprecated/resource.cpp:2030
 #, 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
+#: ../contrib/src/deprecated/resource.cpp:3133

 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: 不良资源文件语法."
 
 #, 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
+#, fuzzy
+msgid "&About"
+msgstr "关于(&A)"
+
+#: ../src/html/helpfrm.cpp:122 ../src/html/helpfrm.cpp:124

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

-#: ../src/common/stockitem.cpp:153
+#: ../src/common/stockitem.cpp:160

 msgid "&Actual Size"
 msgstr "实际大小(&A)"
 
 msgid "&Actual Size"
 msgstr "实际大小(&A)"
 

-#: ../src/common/stockitem.cpp:108
+#: ../src/richtext/richtextindentspage.cpp:135
+#: ../src/richtext/richtextliststylepage.cpp:319
+#, fuzzy
+msgid "&Alignment"
+msgstr "左对齐"
+
+#: ../src/common/stockitem.cpp:112

 msgid "&Apply"
 msgstr "应用(&A)"
 
 msgid "&Apply"
 msgstr "应用(&A)"
 

-#: ../src/msw/mdi.cpp:187
+#: ../src/richtext/richtextstyledlg.cpp:238
+#, fuzzy
+msgid "&Apply Style"
+msgstr "应用(&A)"
+
+#: ../src/msw/mdi.cpp:175

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

-#: ../src/common/stockitem.cpp:118
+#: ../src/common/stockitem.cpp:124

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

-#: ../src/common/stockitem.cpp:109
+#: ../src/richtext/richtextstylepage.cpp:112
+msgid "&Based on:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:113

 msgid "&Bold"
 msgstr "粗体(&B)"
 
 msgid "&Bold"
 msgstr "粗体(&B)"
 

-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
+#: ../src/richtext/richtextbulletspage.cpp:155
+#: ../src/richtext/richtextliststylepage.cpp:209
+msgid "&Bullet style:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:114 ../src/generic/fontdlgg.cpp:377
+#: ../src/generic/fontdlgg.cpp:396 ../src/generic/wizard.cpp:451
+#: ../src/mac/carbon/fontdlg.cpp:525

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

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

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

-#: ../src/common/stockitem.cpp:111
+#: ../src/richtext/richtextsymboldlg.cpp:438
+msgid "&Character code:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:115

 msgid "&Clear"
 msgstr "清除(&C)"
 
 msgid "&Clear"
 msgstr "清除(&C)"
 

-#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
+#: ../src/common/prntbase.cpp:1101 ../src/common/stockitem.cpp:116
+#: ../src/generic/logg.cpp:510 ../src/html/helpfrm.cpp:119
+#: ../src/html/helpdlg.cpp:91

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

-#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
-#: ../src/msw/textctrl.cpp:2064
+#: ../src/richtext/richtextfontpage.cpp:201
+#, fuzzy
+msgid "&Colour:"
+msgstr "颜色(&o):"
+
+#: ../src/common/stockitem.cpp:117 ../src/mac/carbon/textctrl.cpp:1118
+#: ../src/msw/textctrl.cpp:2210 ../src/richtext/richtextctrl.cpp:2424

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

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

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

-#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
-#: ../src/msw/textctrl.cpp:2066
+#: ../src/common/stockitem.cpp:119 ../src/mac/carbon/textctrl.cpp:1120
+#: ../src/msw/textctrl.cpp:2212 ../src/richtext/richtextctrl.cpp:2426
+#: ../src/richtext/richtexttabspage.cpp:142

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

-#: ../src/generic/logg.cpp:717
+#: ../src/richtext/richtextstyledlg.cpp:256
+#, fuzzy
+msgid "&Delete Style..."
+msgstr "删除项"
+
+#: ../src/generic/logg.cpp:718

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

-#: ../src/common/stockitem.cpp:119
+#: ../src/common/stockitem.cpp:125

 msgid "&Down"
 msgstr "向下(&D)"
 
 msgid "&Down"
 msgstr "向下(&D)"
 

-#: ../src/html/helpfrm.cpp:361
+#: ../src/common/stockitem.cpp:120
+msgid "&Edit"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:250
+#, fuzzy
+msgid "&Edit Style..."
+msgstr "编辑项"
+
+#: ../src/common/stockitem.cpp:122 ../src/html/helpfrm.cpp:126

 msgid "&File"
 msgstr "文件(&F)"
 
 msgid "&File"
 msgstr "文件(&F)"
 

-#: ../src/common/stockitem.cpp:116
+#: ../src/common/stockitem.cpp:121

 msgid "&Find"
 msgstr "查找(&F)"
 
 msgid "&Find"
 msgstr "查找(&F)"
 

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

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

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

 msgid "&Font family:"
 msgstr "字体(&F):"
 
 msgid "&Font family:"
 msgstr "字体(&F):"
 

-#: ../src/common/stockitem.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:193
+msgid "&Font for Level..."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:122
+#: ../src/richtext/richtextsymboldlg.cpp:399
+#, fuzzy
+msgid "&Font:"
+msgstr "字体(&F):"
+
+#: ../src/common/stockitem.cpp:126

 msgid "&Forward"
 msgstr "向前(&F)"
 
 msgid "&Forward"
 msgstr "向前(&F)"
 

-#: ../src/common/prntbase.cpp:910
+#: ../src/richtext/richtextsymboldlg.cpp:450
+#, fuzzy
+msgid "&From:"
+msgstr "从:"
+
+#: ../src/common/prntbase.cpp:1147

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

-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
-#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:128 ../src/generic/wizard.cpp:447
+#: ../src/generic/wizard.cpp:454 ../src/html/helpfrm.cpp:127

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

-#: ../src/common/stockitem.cpp:123
-#, fuzzy
+#: ../src/common/stockitem.cpp:129

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

-#: ../src/common/stockitem.cpp:125
+#: ../src/richtext/richtextindentspage.cpp:191
+#: ../src/richtext/richtextliststylepage.cpp:372
+msgid "&Indentation (tenths of a mm)"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:174
+#: ../src/richtext/richtextliststylepage.cpp:356
+#, fuzzy
+msgid "&Indeterminate"
+msgstr "下划线(&U)"
+
+#: ../src/common/stockitem.cpp:131

 msgid "&Index"
 msgstr "索引(&I)"
 
 msgid "&Index"
 msgstr "索引(&I)"
 

-#: ../src/common/stockitem.cpp:126
+#: ../src/common/stockitem.cpp:132

 msgid "&Italic"
 msgstr "斜体(&I)"
 
 msgid "&Italic"
 msgstr "斜体(&I)"
 

-#: ../src/generic/logg.cpp:510
+#: ../src/richtext/richtextindentspage.cpp:160
+#: ../src/richtext/richtextliststylepage.cpp:342
+#, fuzzy
+msgid "&Justified"
+msgstr "分散对齐"
+
+#: ../src/richtext/richtextindentspage.cpp:146
+#: ../src/richtext/richtextliststylepage.cpp:328
+msgid "&Left"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:202
+#: ../src/richtext/richtextliststylepage.cpp:381
+msgid "&Left:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:182
+msgid "&List level:"
+msgstr ""
+
+#: ../src/generic/logg.cpp:511

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

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

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

-#: ../src/common/stockitem.cpp:131
+#: ../src/common/stockitem.cpp:137 ../src/richtext/richtexttabspage.cpp:136

 msgid "&New"
 msgstr "新建(&N)"
 
 msgid "&New"
 msgstr "新建(&N)"
 

-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
+#: ../src/generic/mdig.cpp:118 ../src/aui/tabmdi.cpp:107
+#: ../src/msw/mdi.cpp:176

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

-#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
+#: ../src/generic/wizard.cpp:450 ../src/generic/wizard.cpp:646

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

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

 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
 msgid "&Next Tip"
 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)"
 
 msgid "&No"
 msgstr "否(&N)"
 

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

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

-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-#: ../src/generic/fontdlgg.cpp:375
+#: ../src/richtext/richtextbulletspage.cpp:261
+msgid "&Number:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:139 ../src/generic/fontdlgg.cpp:382
+#: ../src/generic/fontdlgg.cpp:389 ../src/mac/carbon/fontdlg.cpp:531

 msgid "&OK"
 msgstr "确认(&O)"
 
 msgid "&OK"
 msgstr "确认(&O)"
 

-#: ../src/common/stockitem.cpp:134
+#: ../src/common/stockitem.cpp:140

 msgid "&Open"
 msgstr "打开(&O)"
 
 msgid "&Open"
 msgstr "打开(&O)"
 

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

 msgid "&Open..."
 msgstr "打开(&O)..."
 
 msgid "&Open..."
 msgstr "打开(&O)..."
 

-#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
-#: ../src/msw/textctrl.cpp:2065
+#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1119
+#: ../src/msw/textctrl.cpp:2211 ../src/richtext/richtextctrl.cpp:2425

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

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

 msgid "&Point size:"
 msgstr "字体大小(Point size)(&P):"
 
 msgid "&Point size:"
 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"
 msgid "&Preferences"

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

 
 

-#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
+#: ../src/generic/mdig.cpp:119 ../src/aui/tabmdi.cpp:108
+#: ../src/msw/mdi.cpp:177

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

-#: ../src/common/stockitem.cpp:137
+#: ../src/common/stockitem.cpp:143

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

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

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

-#: ../src/common/stockitem.cpp:139
+#: ../src/common/stockitem.cpp:145

 msgid "&Properties"
 msgstr "属性(&P)"
 
 msgid "&Properties"
 msgstr "属性(&P)"
 

-#: ../src/common/stockitem.cpp:140
+#: ../src/common/stockitem.cpp:146

 msgid "&Quit"
 msgstr "退出(&Q)"
 
 msgid "&Quit"
 msgstr "退出(&Q)"
 

-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
-#: ../src/msw/textctrl.cpp:2061
+#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:295
+#: ../src/common/stockitem.cpp:147 ../src/mac/carbon/textctrl.cpp:1115
+#: ../src/msw/textctrl.cpp:2207 ../src/richtext/richtextctrl.cpp:2421

 msgid "&Redo"
 msgstr "重复(&R)"
 
 msgid "&Redo"
 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) "
 
 msgid "&Redo "
 msgstr "重复(&R) "
 

-#: ../src/generic/fdrepdlg.cpp:185
+#: ../src/richtext/richtextstyledlg.cpp:244
+msgid "&Rename Style..."
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:178

 msgid "&Replace"
 msgstr "替换(&R)"
 
 msgid "&Replace"
 msgstr "替换(&R)"
 

-#: ../src/univ/themes/win32.cpp:4922
+#: ../src/richtext/richtextstyledlg.cpp:274
+msgid "&Restart numbering"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3733

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

-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextindentspage.cpp:153
+#: ../src/richtext/richtextliststylepage.cpp:335
+#, fuzzy
+msgid "&Right"
+msgstr "细"
+
+#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:403
+#, fuzzy
+msgid "&Right:"
+msgstr "字体粗细(&W):"
+
+#: ../src/common/stockitem.cpp:151

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

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

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

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

 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 

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

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

-#: ../src/common/stockitem.cpp:147
+#: ../src/richtext/richtextfontpage.cpp:140
+#, fuzzy
+msgid "&Size:"
+msgstr "大小(&S)"
+
+#: ../src/richtext/richtextindentspage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:423
+msgid "&Spacing (tenths of a mm)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:154

 msgid "&Stop"
 msgstr "停止(&S)"
 
 msgid "&Stop"
 msgstr "停止(&S)"
 

-#: ../src/generic/fontdlgg.cpp:284
+#: ../src/generic/fontdlgg.cpp:289 ../src/richtext/richtextstylepage.cpp:103

 msgid "&Style:"
 msgstr "字体(&S):"
 
 msgid "&Style:"
 msgstr "字体(&S):"
 

-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/richtext/richtextstyledlg.cpp:191
+#, fuzzy
+msgid "&Styles:"
+msgstr "字体(&S):"
+
+#: ../src/richtext/richtextsymboldlg.cpp:412
+msgid "&Subset:"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:216
+#: ../src/richtext/richtextliststylepage.cpp:268
+#, fuzzy
+msgid "&Symbol:"
+msgstr "字体(&S):"
+
+#: ../src/common/stockitem.cpp:156 ../src/generic/fontdlgg.cpp:351

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

-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
+#: ../src/richtext/richtextfontpage.cpp:188
+#, fuzzy
+msgid "&Underlining:"
+msgstr "下划线(&U)"
+
+#: ../src/common/cmdproc.cpp:266 ../src/common/stockitem.cpp:157
+#: ../src/mac/carbon/textctrl.cpp:1114 ../src/msw/textctrl.cpp:2206
+#: ../src/richtext/richtextctrl.cpp:2420

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

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

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

-#: ../src/common/stockitem.cpp:151
+#: ../src/common/stockitem.cpp:158

 msgid "&Unindent"
 msgstr "取消缩进(&U)"
 
 msgid "&Unindent"
 msgstr "取消缩进(&U)"
 

-#: ../src/common/stockitem.cpp:121
+#: ../src/common/stockitem.cpp:127

 msgid "&Up"
 msgstr "向上(&U)"
 
 msgid "&Up"
 msgstr "向上(&U)"
 

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

 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
 #: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
 #: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314

-#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
-#: ../src/msw/mdi.cpp:1447
+#: ../src/generic/mdig.cpp:318 ../src/aui/tabmdi.cpp:272
+#: ../src/aui/tabmdi.cpp:288 ../src/aui/tabmdi.cpp:290 ../src/msw/mdi.cpp:1417
+#: ../src/msw/mdi.cpp:1424 ../src/msw/mdi.cpp:1454

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

-#: ../src/common/stockitem.cpp:152
+#: ../src/common/stockitem.cpp:159

 msgid "&Yes"
 msgstr "是(&Y)"
 
 msgid "&Yes"
 msgstr "是(&Y)"
 

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

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

-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-#: ../src/common/valtext.cpp:168
+#: ../src/common/valtext.cpp:128 ../src/common/valtext.cpp:158
+#: ../src/common/valtext.cpp:164

 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' 是无效的"
 
 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' 是无效的"
 

-#: ../src/common/cmdline.cpp:769
+#: ../src/common/cmdline.cpp:786

 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 

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

 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 
 #, 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' 或许是一个二进制文件."
 
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或许是一个二进制文件."
 

-#: ../src/common/valtext.cpp:157
+#: ../src/common/valtext.cpp:153

 #, c-format
 msgid "'%s' should be numeric."
 msgstr "'%s' 应该是一个数值."
 
 #, c-format
 msgid "'%s' should be numeric."
 msgstr "'%s' 应该是一个数值."
 

-#: ../src/common/valtext.cpp:139
+#: ../src/common/valtext.cpp:135

 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr "'%s' 应该仅包含ASCII字符."
 
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr "'%s' 应该仅包含ASCII字符."
 

-#: ../src/common/valtext.cpp:145
+#: ../src/common/valtext.cpp:141

 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr "'%s' 应仅包含字母字符."
 
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr "'%s' 应仅包含字母字符."
 

-#: ../src/common/valtext.cpp:151
+#: ../src/common/valtext.cpp:147

 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 应仅包含字母或数字字符."
 
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 应仅包含字母或数字字符."
 

-#: ../src/html/helpfrm.cpp:976
+#: ../src/richtext/richtextbulletspage.cpp:175
+#: ../src/richtext/richtextliststylepage.cpp:228
+msgid "(*)"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:638 ../src/html/helpwnd.cpp:956

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

-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-#: ../src/html/helpfrm.cpp:1764
+#: ../src/richtext/richtextbulletspage.cpp:280
+#: ../src/richtext/richtextliststylepage.cpp:485
+msgid "(None)"
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:525
+#, fuzzy
+msgid "(Normal text)"
+msgstr "正常字体:"
+
+#: ../src/html/helpwnd.cpp:408 ../src/html/helpwnd.cpp:1092
+#: ../src/html/helpwnd.cpp:1720

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

-#: ../src/common/debugrpt.cpp:559
+#: ../src/richtext/richtextformatdlg.cpp:584
+#, fuzzy
+msgid "(none)"
+msgstr "未名"
+
+#: ../src/richtext/richtextbulletspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:496
+msgid "*"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:182
+#: ../src/richtext/richtextliststylepage.cpp:235
+msgid "*)"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:565

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

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

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

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

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

+#: ../src/richtext/richtextbulletspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:499
+msgid "+"
+msgstr ""
+

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

-#: ../contrib/src/deprecated/resource.cpp:3062
+#: ../contrib/src/deprecated/resource.cpp:3072

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


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

-#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-msgid "."
-msgstr "."
+#: ../src/richtext/richtextbulletspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:497
+msgid "-"
+msgstr ""

 
 

-#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-msgid ".."
-msgstr ".."
+#: ../src/richtext/richtextindentspage.cpp:290
+#: ../src/richtext/richtextliststylepage.cpp:461
+msgid "1.5"
+msgstr ""

 
 

-#: ../src/common/paper.cpp:147
-#, fuzzy
+#: ../src/common/paper.cpp:142

 msgid "10 x 11 in"
 msgid "10 x 11 in"

-msgstr "10 x 14 英寸"
+msgstr "10 x 11 英寸"

 
 

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

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

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

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

-#: ../src/common/paper.cpp:191
-#, fuzzy
+#: ../src/common/paper.cpp:186

 msgid "12 x 11 in"
 msgid "12 x 11 in"

-msgstr "10 x 14 英寸"
+msgstr "12 x 11 英寸"

 
 

-#: ../src/common/paper.cpp:148
-#, fuzzy
+#: ../src/common/paper.cpp:143

 msgid "15 x 11 in"
 msgid "15 x 11 in"

-msgstr "10 x 14 英寸"
+msgstr "15 x 11 英寸"

 
 

-#: ../src/common/paper.cpp:139
+#: ../src/richtext/richtextindentspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:462
+msgid "2"
+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 英寸"
 
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
 

-#: ../src/common/paper.cpp:146
-#, fuzzy
+#: ../src/common/paper.cpp:141

 msgid "9 x 11 in"
 msgid "9 x 11 in"

-msgstr "11 x 17 英寸"
+msgstr "9 x 11 英寸"

 
 

-#: ../src/html/htmprint.cpp:309
+#: ../src/html/htmprint.cpp:303

 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 
 msgid ": file does not exist!"
 msgstr ": 文件不存在!"
 

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

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

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

 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 

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

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

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

 msgid "<<"
 msgid "<<"

+msgstr "<<"
+
+#: ../src/mac/carbon/fontdlg.cpp:545 ../src/mac/carbon/fontdlg.cpp:752
+#: ../src/mac/carbon/fontdlg.cpp:772
+#, fuzzy
+msgid "<Any Decorative>"
+msgstr "修饰"
+
+#: ../src/mac/carbon/fontdlg.cpp:546 ../src/mac/carbon/fontdlg.cpp:754
+#: ../src/mac/carbon/fontdlg.cpp:774
+#, fuzzy
+msgid "<Any Modern>"
+msgstr "现代"
+
+#: ../src/mac/carbon/fontdlg.cpp:544 ../src/mac/carbon/fontdlg.cpp:750
+#: ../src/mac/carbon/fontdlg.cpp:770
+#, fuzzy
+msgid "<Any Roman>"
+msgstr "罗马"
+
+#: ../src/mac/carbon/fontdlg.cpp:547 ../src/mac/carbon/fontdlg.cpp:756
+#: ../src/mac/carbon/fontdlg.cpp:776
+#, fuzzy
+msgid "<Any Script>"
+msgstr "Script"
+
+#: ../src/mac/carbon/fontdlg.cpp:548 ../src/mac/carbon/fontdlg.cpp:761
+#: ../src/mac/carbon/fontdlg.cpp:780
+#, fuzzy
+msgid "<Any Swiss>"
+msgstr "瑞士"
+
+#: ../src/mac/carbon/fontdlg.cpp:549 ../src/mac/carbon/fontdlg.cpp:758
+#: ../src/mac/carbon/fontdlg.cpp:778
+#, fuzzy
+msgid "<Any Teletype>"
+msgstr "电传打字机"
+
+#: ../src/mac/carbon/fontdlg.cpp:543
+msgid "<Any>"

 msgstr ""
 
 msgstr ""
 

-#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
+#: ../src/generic/filedlgg.cpp:331 ../src/generic/filedlgg.cpp:354

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

-#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
+#: ../src/generic/filedlgg.cpp:335 ../src/generic/filedlgg.cpp:358

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

-#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:333 ../src/generic/filedlgg.cpp:356

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

-#: ../src/html/helpfrm.cpp:1276
+#: ../src/html/helpwnd.cpp:1248

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

-#: ../src/html/helpfrm.cpp:1280
+#: ../src/html/helpwnd.cpp:1252

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

-#: ../src/html/helpfrm.cpp:1275
+#: ../src/html/helpwnd.cpp:1247

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

-#: ../src/html/helpfrm.cpp:1274
+#: ../src/html/helpwnd.cpp:1246

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

-#: ../src/common/prntbase.cpp:898
+#: ../src/richtext/richtextbulletspage.cpp:293
+#: ../src/richtext/richtextliststylepage.cpp:498
+#, fuzzy
+msgid ">"
+msgstr ">>"
+
+#: ../src/common/prntbase.cpp:1135

 msgid ">>"
 msgid ">>"

-msgstr ""
+msgstr ">>"

 
 

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

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

-msgstr ""
+msgstr ">>|"

 
 

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

 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
 msgid "A debug report has been generated in the directory\n"
 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')节点"
 
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含元素('element')节点"
 

-#: ../src/common/paper.cpp:166
-msgid "A2 420 x 594 mm"
+#: ../src/richtext/richtextbulletspage.cpp:254
+#: ../src/richtext/richtextbulletspage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:304
+#: ../src/richtext/richtextliststylepage.cpp:306
+msgid "A standard bullet name."

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/paper.cpp:163
-#, fuzzy
+#: ../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"
 msgid "A3 Extra 322 x 445 mm"

-msgstr "C3 信封, 324 x 458 毫米"
+msgstr "特大 A3 纸张, 322 x 445 毫米"

 
 

-#: ../src/common/paper.cpp:168
-#, fuzzy
+#: ../src/common/paper.cpp:163

 msgid "A3 Extra Transverse 322 x 445 mm"
 msgid "A3 Extra Transverse 322 x 445 mm"

-msgstr "C3 信封, 324 x 458 毫米"
+msgstr "特大 A3 纸张(横排), 322 x 445 毫米"

 
 

-#: ../src/common/paper.cpp:177
-#, fuzzy
+#: ../src/common/paper.cpp:172

 msgid "A3 Rotated 420 x 297 mm"
 msgid "A3 Rotated 420 x 297 mm"

-msgstr "A4 纸张, 210 x 297 毫米"
+msgstr "横向 A3 纸张, 420 x 297 毫米"

 
 

-#: ../src/common/paper.cpp:167
-#, fuzzy
+#: ../src/common/paper.cpp:162

 msgid "A3 Transverse 297 x 420 mm"
 msgid "A3 Transverse 297 x 420 mm"

-msgstr "A3 纸张, 297 x 420 毫米"
+msgstr "A3 纸张(横排), 297 x 420 毫米"

 
 

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

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

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

 msgid "A4 Extra 9.27 x 12.69 in"
 msgid "A4 Extra 9.27 x 12.69 in"

-msgstr ""
+msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"

 
 

-#: ../src/common/paper.cpp:160
-#, fuzzy
+#: ../src/common/paper.cpp:155

 msgid "A4 Plus 210 x 330 mm"
 msgid "A4 Plus 210 x 330 mm"

-msgstr "A4 纸张, 210 x 297 毫米"
+msgstr "加大 A4 纸张, 210 x 330 毫米"

 
 

-#: ../src/common/paper.cpp:178
-#, fuzzy
+#: ../src/common/paper.cpp:173

 msgid "A4 Rotated 297 x 210 mm"
 msgid "A4 Rotated 297 x 210 mm"

-msgstr "A3 纸张, 297 x 420 毫米"
+msgstr "横向 A4 纸张, 297 x 210 毫米"

 
 

-#: ../src/common/paper.cpp:155
-#, fuzzy
+#: ../src/common/paper.cpp:150

 msgid "A4 Transverse 210 x 297 mm"
 msgid "A4 Transverse 210 x 297 mm"

-msgstr "A4 纸张, 210 x 297 毫米"
+msgstr "A4 纸张(横排), 210 x 297 毫米"

 
 

-#: ../src/common/paper.cpp:104
+#: ../src/common/paper.cpp:99

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

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

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

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

 
 

-#: ../src/common/paper.cpp:164
-#, fuzzy
+#: ../src/common/paper.cpp:159

 msgid "A5 Extra 174 x 235 mm"
 msgid "A5 Extra 174 x 235 mm"

-msgstr "A5 纸张, 148 x 210 毫米"
+msgstr "特大 A5 纸张, 174 x 235 毫米"

 
 

-#: ../src/common/paper.cpp:179
+#: ../src/common/paper.cpp:174

 msgid "A5 Rotated 210 x 148 mm"
 msgid "A5 Rotated 210 x 148 mm"

-msgstr ""
+msgstr "横向 A5 纸张, 210 x 148 毫米"

 
 

-#: ../src/common/paper.cpp:161
-#, fuzzy
+#: ../src/common/paper.cpp:156

 msgid "A5 Transverse 148 x 210 mm"
 msgid "A5 Transverse 148 x 210 mm"

-msgstr "A5 纸张, 148 x 210 毫米"
+msgstr "A5 纸张(横排), 148 x 210 毫米"

 
 

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

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

-#: ../src/common/paper.cpp:171
-#, fuzzy
+#: ../src/common/paper.cpp:166

 msgid "A6 105 x 148 mm"
 msgid "A6 105 x 148 mm"

-msgstr "10 x 14 英寸"
+msgstr "A6 纸张, 105 x 148 毫米"

 
 

-#: ../src/common/paper.cpp:184
-#, fuzzy
+#: ../src/common/paper.cpp:179

 msgid "A6 Rotated 148 x 105 mm"
 msgid "A6 Rotated 148 x 105 mm"

-msgstr "A5 纸张, 148 x 210 毫米"
+msgstr "横向 A5 纸张, 148 x 105 毫米"

 
 

-#: ../src/generic/fontdlgg.cpp:87
+#: ../src/generic/fontdlgg.cpp:87 ../src/mac/carbon/fontdlg.cpp:276
+#: ../src/richtext/richtextformatdlg.cpp:401

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

-#: ../src/common/ftp.cpp:385
+#: ../src/common/menucmn.cpp:94
+msgid "ADD"
+msgstr ""
+
+#: ../src/common/ftp.cpp:381 ../src/richtext/richtextsymboldlg.cpp:457
+#: ../src/richtext/richtextsymboldlg.cpp:460
+#: ../src/richtext/richtextsymboldlg.cpp:461

 msgid "ASCII"
 msgstr "ASCII"
 
 msgid "ASCII"
 msgstr "ASCII"
 

-#: ../src/common/stockitem.cpp:107
+#: ../src/generic/aboutdlgg.cpp:105
+#, fuzzy
+msgid "About "
+msgstr "关于(&A)"
+
+#: ../src/common/stockitem.cpp:111

 msgid "Add"
 msgstr "加入"
 
 msgid "Add"
 msgstr "加入"
 

-#: ../src/html/helpfrm.cpp:444
+#: ../src/html/helpwnd.cpp:421

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

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

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

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

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

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

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

-#: ../src/html/helpctrl.cpp:106
+#: ../src/html/helpctrl.cpp:138

 #, c-format
 msgid "Adding book %s"
 msgstr "正在添加卷 %s"
 
 #, c-format
 msgid "Adding book %s"
 msgstr "正在添加卷 %s"
 

-#: ../src/common/stockitem.cpp:129
+#: ../src/richtext/richtextindentspage.cpp:271
+#: ../src/richtext/richtextliststylepage.cpp:443
+msgid "After a paragraph:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:135

 msgid "Align Left"
 msgstr "左对齐"
 
 msgid "Align Left"
 msgstr "左对齐"
 

-#: ../src/common/stockitem.cpp:130
+#: ../src/common/stockitem.cpp:136

 msgid "Align Right"
 msgstr "右对齐"
 
 msgid "Align Right"
 msgstr "右对齐"
 

-#: ../src/generic/prntdlgg.cpp:209
+#: ../src/generic/prntdlgg.cpp:210

 msgid "All"
 msgstr "所有"
 
 msgid "All"
 msgstr "所有"
 

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

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

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

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

-#: ../src/html/helpfrm.cpp:1578
+#: ../src/html/helpwnd.cpp:1530

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

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

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

-#: ../src/common/xtistrm.cpp:385
+#: ../src/richtext/richtextstyles.cpp:751
+msgid "All styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:381

 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
 
 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."
 
 msgid "Already dialling ISP."
 msgstr "已经拨接ISP."
 

-#: ../src/generic/logg.cpp:1163
+#: ../src/common/menucmn.cpp:314
+msgid "Alt-"
+msgstr ""
+
+#: ../src/generic/animateg.cpp:163
+#, fuzzy, c-format
+msgid "Animation file is not of type %ld."
+msgstr "图像文件的类型不是 %d."
+
+#: ../src/generic/logg.cpp:1164

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

-#: ../src/common/fmapbase.cpp:109
+#: ../src/richtext/richtextbulletspage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:486
+msgid "Arabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:111

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


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

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

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

-#: ../src/common/paper.cpp:144
-#, fuzzy
+#: ../src/richtext/richtextbulletspage.cpp:242
+#: ../src/richtext/richtextbulletspage.cpp:244
+#: ../src/richtext/richtextliststylepage.cpp:294
+msgid "Available fonts."
+msgstr ""
+
+#: ../src/common/paper.cpp:139

 msgid "B4 (ISO) 250 x 353 mm"
 msgid "B4 (ISO) 250 x 353 mm"

-msgstr "B4 纸张, 250 x 354 毫米"
+msgstr "B4 纸张(ISO), 250 x 353 毫米"

 
 

-#: ../src/common/paper.cpp:180
+#: ../src/common/paper.cpp:175

 msgid "B4 (JIS) Rotated 364 x 257 mm"
 msgid "B4 (JIS) Rotated 364 x 257 mm"

-msgstr ""
+msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"

 
 

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

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

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

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

-#: ../src/common/paper.cpp:165
+#: ../src/common/paper.cpp:160

 msgid "B5 (ISO) Extra 201 x 276 mm"
 msgid "B5 (ISO) Extra 201 x 276 mm"

-msgstr ""
+msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"

 
 

-#: ../src/common/paper.cpp:181
+#: ../src/common/paper.cpp:176

 msgid "B5 (JIS) Rotated 257 x 182 mm"
 msgid "B5 (JIS) Rotated 257 x 182 mm"

-msgstr ""
+msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"

 
 

-#: ../src/common/paper.cpp:162
-#, fuzzy
+#: ../src/common/paper.cpp:157

 msgid "B5 (JIS) Transverse 182 x 257 mm"
 msgid "B5 (JIS) Transverse 182 x 257 mm"

-msgstr "B5 纸张, 182 x 257 毫米"
+msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"

 
 

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

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

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

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

-#: ../src/common/paper.cpp:189
+#: ../src/common/paper.cpp:184

 msgid "B6 (JIS) 128 x 182 mm"
 msgid "B6 (JIS) 128 x 182 mm"

-msgstr ""
+msgstr "B6 纸张(JIS), 128 x 182 毫米"

 
 

-#: ../src/common/paper.cpp:190
+#: ../src/common/paper.cpp:185

 msgid "B6 (JIS) Rotated 182 x 128 mm"
 msgid "B6 (JIS) Rotated 182 x 128 mm"

-msgstr ""
+msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"

 
 

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

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

-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/menucmn.cpp:67
+msgid "BACK"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:152
+msgid "BIG5"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:474 ../src/common/imagbmp.cpp:490

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

-#: ../src/common/imagbmp.cpp:94
+#: ../src/common/imagbmp.cpp:91

 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: 不能保存无效图像."
 
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: 不能保存无效图像."
 

-#: ../src/common/imagbmp.cpp:298
+#: ../src/common/imagbmp.cpp:295

 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 不能写RGB色彩表."
 
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 不能写RGB色彩表."
 

-#: ../src/common/imagbmp.cpp:431
+#: ../src/common/imagbmp.cpp:428

 msgid "BMP: Couldn't write data."
 msgstr "BMP: 不能写数据."
 
 msgid "BMP: Couldn't write data."
 msgstr "BMP: 不能写数据."
 

-#: ../src/common/imagbmp.cpp:203
+#: ../src/common/imagbmp.cpp:200

 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: 不能写文件头(Bitmap)."
 
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: 不能写文件头(Bitmap)."
 

-#: ../src/common/imagbmp.cpp:224
+#: ../src/common/imagbmp.cpp:221

 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: 不能写文件头(BitmapInfo)."
 
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: 不能写文件头(BitmapInfo)."
 

-#: ../src/common/imagbmp.cpp:128
+#: ../src/common/imagbmp.cpp:125

 msgid "BMP: wxImage doesn't have own wxPalette."
 msgid "BMP: wxImage doesn't have own wxPalette."

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

 
 

-#: ../src/common/fmapbase.cpp:116
+#: ../src/mac/carbon/fontdlg.cpp:343 ../src/richtext/richtextformatdlg.cpp:481
+msgid "Background colour"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:118

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

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

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

-#: ../contrib/src/deprecated/resource.cpp:2524
+#: ../src/richtext/richtextindentspage.cpp:259
+#: ../src/richtext/richtextliststylepage.cpp:432
+msgid "Before a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:288
+#: ../src/richtext/richtextliststylepage.cpp:493
+msgid "Bitmap"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2534

 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr "找不到位图规格 %s."
 
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr "找不到位图规格 %s."
 

-#: ../src/generic/fontdlgg.cpp:237
+#: ../src/generic/fontdlgg.cpp:240 ../src/mac/carbon/fontdlg.cpp:477
+#: ../src/richtext/richtextfontpage.cpp:226
+#: ../src/richtext/richtextfontpage.cpp:297
+#: ../src/richtext/richtextfontpage.cpp:457

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

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

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

-#: ../src/common/paper.cpp:105
+#: ../src/richtext/richtextbulletspage.cpp:191
+#: ../src/richtext/richtextliststylepage.cpp:244
+msgid "Bullet &Alignment:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:309
+msgid "Bullet style"
+msgstr ""
+
+#: ../src/richtext/richtextformatdlg.cpp:290
+msgid "Bullets"
+msgstr ""
+
+#: ../src/common/paper.cpp:100

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

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

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

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

 msgid "C&olour:"
 msgstr "颜色(&o):"
 
 msgid "C&olour:"
 msgstr "颜色(&o):"
 

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

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

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

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

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

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

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

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

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

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

+#: ../src/common/menucmn.cpp:84
+msgid "CANCEL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:88
+msgid "CAPITAL"
+msgstr ""
+

 #: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 
 #: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 

-#: ../src/os2/thread.cpp:117
-#, fuzzy
+#: ../src/common/menucmn.cpp:85
+msgid "CLEAR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:129
+msgid "COMMAND"
+msgstr ""
+
+#: ../src/os2/thread.cpp:116

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

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

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

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

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

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

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

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

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

-#: ../src/msw/thread.cpp:498
+#: ../src/msw/thread.cpp:515

 msgid "Can not start thread: error writing TLS."
 msgstr "不能启动线程: 写TLS出错."
 
 msgid "Can not start thread: error writing TLS."
 msgstr "不能启动线程: 写TLS出错."
 

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

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

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

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

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

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

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

 msgid "Can't &Undo "
 msgstr "不能恢复(&U)"
 
 msgid "Can't &Undo "
 msgstr "不能恢复(&U)"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -991,327 +1388,540 @@ msgstr "不能导出不支持的类型 %d 的值."
 msgid "Can't find current position in file '%s'"
 msgstr "不能在文件'%s'中找到当前位置"
 
 msgid "Can't find current position in file '%s'"
 msgstr "不能在文件'%s'中找到当前位置"
 

-#: ../src/msw/registry.cpp:351
+#: ../src/msw/registry.cpp:346

 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "不能获得注册键 '%s'的信息"
 
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "不能获得注册键 '%s'的信息"
 

-#: ../src/common/zstream.cpp:237
+#: ../src/common/zstream.cpp:330

 msgid "Can't initialize zlib deflate stream."
 msgstr "不能初始化zlib deflate(压缩)流."
 
 msgid "Can't initialize zlib deflate stream."
 msgstr "不能初始化zlib deflate(压缩)流."
 

-#: ../src/common/zstream.cpp:99
+#: ../src/common/zstream.cpp:176

 msgid "Can't initialize zlib inflate stream."
 msgstr "不能初始化zlib inflate(解压)流."
 
 msgid "Can't initialize zlib inflate stream."
 msgstr "不能初始化zlib inflate(解压)流."
 

-#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
+#: ../src/common/image.cpp:2015 ../src/common/image.cpp:2037

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

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

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

-#: ../src/common/zstream.cpp:166
+#: ../src/common/zstream.cpp:246

 #, c-format
 msgid "Can't read from inflate stream: %s"
 msgstr "不能从解压流 %s 中读"
 
 #, c-format
 msgid "Can't read from inflate stream: %s"
 msgstr "不能从解压流 %s 中读"
 

-#: ../src/common/zstream.cpp:159
+#: ../src/common/zstream.cpp:239

 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr "不能读解压流: 流内有异常的EOF."
 
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr "不能读解压流: 流内有异常的EOF."
 

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

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

-#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
-#: ../src/msw/registry.cpp:885
+#: ../src/msw/registry.cpp:790 ../src/msw/registry.cpp:820
+#: ../src/msw/registry.cpp:880

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

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

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

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

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

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

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

-#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
-#: ../src/msw/registry.cpp:975
+#: ../src/msw/registry.cpp:807 ../src/msw/registry.cpp:849
+#: ../src/msw/registry.cpp:970

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

-#: ../src/common/zstream.cpp:316
+#: ../src/common/zstream.cpp:414

 #, c-format
 msgid "Can't write to deflate stream: %s"
 msgstr "不能写到压缩流: %s"
 
 #, c-format
 msgid "Can't write to deflate stream: %s"
 msgstr "不能写到压缩流: %s"
 

-#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
-#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
-#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-#: ../contrib/src/deprecated/proplist.cpp:518
+#: ../src/generic/dirdlgg.cpp:105 ../src/html/htmlhelp.cpp:434
+#: ../src/mac/carbon/msgdlg.cpp:66 ../src/motif/msgdlg.cpp:204
+#: ../src/richtext/richtextstyledlg.cpp:290 ../src/gtk1/fontdlg.cpp:145
+#: ../contrib/src/deprecated/proplist.cpp:514

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

-#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
+#: ../src/xrc/xmlres.cpp:1270 ../src/xrc/xmlres.cpp:1318

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

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

 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 
 

-#: ../include/wx/msw/ole/oleutils.h:47
+#: ../include/wx/msw/ole/oleutils.h:46

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

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

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

-#: ../src/mgl/window.cpp:546
+#: ../src/mgl/window.cpp:547

 msgid "Cannot initialize display."
 msgstr "不能初始化显示."
 
 msgid "Cannot initialize display."
 msgstr "不能初始化显示."
 

-#: ../src/msw/volume.cpp:601
+#: ../src/msw/volume.cpp:600

 #, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "不能从 '%s'中读取图标."
 
 #, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "不能从 '%s'中读取图标."
 

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

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

-#: ../src/html/htmlfilt.cpp:164
+#: ../src/html/htmlfilt.cpp:158

 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "不能打开 HTML 文档: %s"
 
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "不能打开 HTML 文档: %s"
 

-#: ../src/html/helpdata.cpp:672
+#: ../src/html/helpdata.cpp:665

 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "不能打开 HTML 帮助: %s"
 
 #, 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:305

 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "不能打开目录文件: %s"
 
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "不能打开目录文件: %s"
 

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

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

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

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

-#: ../src/html/helpdata.cpp:326
+#: ../src/html/helpdata.cpp:319

 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "不能打开索引文件: %s"
 
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "不能打开索引文件: %s"
 

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

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

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

 
 

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

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

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

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

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

 
 

-#: ../src/html/helpfrm.cpp:1562
+#: ../src/html/helpwnd.cpp:1514

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

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

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

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

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

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

 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 
 msgid "Cannot start thread: error writing TLS"
 msgstr "不能启动线程: 写TLS错误"
 

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

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

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

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

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

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

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

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

-#: ../src/common/stockitem.cpp:127
+#: ../src/richtext/richtextindentspage.cpp:167
+#: ../src/richtext/richtextliststylepage.cpp:349
+#, fuzzy
+msgid "Cen&tred"
+msgstr "居中"
+
+#: ../src/common/stockitem.cpp:133

 msgid "Centered"
 msgstr "居中"
 
 msgid "Centered"
 msgstr "居中"
 

-#: ../src/common/fmapbase.cpp:105
-msgid "Central European (ISO-8859-2)"
-msgstr "中欧语系 (ISO-8859-2)"
+#: ../src/common/fmapbase.cpp:107
+msgid "Central European (ISO-8859-2)"
+msgstr "中欧语系 (ISO-8859-2)"
+
+#: ../src/richtext/richtextbulletspage.cpp:196
+#: ../src/richtext/richtextliststylepage.cpp:249
+#, fuzzy
+msgid "Centre"
+msgstr "居中"
+
+#: ../src/richtext/richtextindentspage.cpp:169
+#: ../src/richtext/richtextindentspage.cpp:171
+#: ../src/richtext/richtextliststylepage.cpp:351
+#: ../src/richtext/richtextliststylepage.cpp:353
+#, fuzzy
+msgid "Centre text."
+msgstr "不能创建互斥对象."
+
+#: ../src/richtext/richtextbulletspage.cpp:229
+#: ../src/richtext/richtextliststylepage.cpp:280
+#, fuzzy
+msgid "Ch&oose..."
+msgstr "跳转(&G)..."
+
+#: ../src/richtext/richtextbuffer.cpp:2573
+msgid "Change List Style"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:1608
+msgid "Change Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:753
+msgid "Character styles"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:170
+#: ../src/richtext/richtextbulletspage.cpp:172
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:225
+msgid "Check to add a period after the bullet."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:184
+#: ../src/richtext/richtextbulletspage.cpp:186
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:239
+msgid "Check to add a right parenthesis."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:177
+#: ../src/richtext/richtextbulletspage.cpp:179
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextliststylepage.cpp:232
+msgid "Check to enclose the bullet in parentheses."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:479 ../src/mac/carbon/fontdlg.cpp:481
+#, fuzzy
+msgid "Check to make the font bold."
+msgstr "点击取消字体选择."
+
+#: ../src/mac/carbon/fontdlg.cpp:486 ../src/mac/carbon/fontdlg.cpp:488
+#, fuzzy
+msgid "Check to make the font italic."
+msgstr "点击取消字体选择."
+
+#: ../src/mac/carbon/fontdlg.cpp:495 ../src/mac/carbon/fontdlg.cpp:497
+#, fuzzy
+msgid "Check to make the font underlined."
+msgstr "字体是否为下划线."
+
+#: ../src/richtext/richtextstyledlg.cpp:276
+#: ../src/richtext/richtextstyledlg.cpp:278
+msgid "Check to restart numbering."
+msgstr ""

 
 

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

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

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

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

-#: ../src/gtk/fontdlg.cpp:133
+#: ../src/gtk/fontdlg.cpp:107 ../src/gtk1/fontdlg.cpp:126

 msgid "Choose font"
 msgstr "选择字体"
 
 msgid "Choose font"
 msgstr "选择字体"
 

-#: ../src/generic/mdig.cpp:115
+#: ../src/common/module.cpp:78
+#, c-format
+msgid "Circular dependency involving module \"%s\" detected."
+msgstr ""
+
+#: ../src/generic/mdig.cpp:115 ../src/aui/tabmdi.cpp:104

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

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

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

-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
+#: ../src/richtext/richtextstyledlg.cpp:239
+#: ../src/richtext/richtextstyledlg.cpp:241
+#, fuzzy
+msgid "Click to apply the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextbulletspage.cpp:230
+#: ../src/richtext/richtextbulletspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:283
+msgid "Click to browse for a symbol."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:526 ../src/mac/carbon/fontdlg.cpp:528
+#, fuzzy
+msgid "Click to cancel changes to the font."
+msgstr "点击取消字体选择."
+
+#: ../src/generic/fontdlgg.cpp:379 ../src/generic/fontdlgg.cpp:398

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

-#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/richtext/richtextstyledlg.cpp:291
+#: ../src/richtext/richtextstyledlg.cpp:293
+#, fuzzy
+msgid "Click to cancel this window."
+msgstr "关闭此窗口"
+
+#: ../src/mac/carbon/fontdlg.cpp:507 ../src/mac/carbon/fontdlg.cpp:509
+#, fuzzy
+msgid "Click to change the font colour."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextfontpage.cpp:205
+#: ../src/richtext/richtextfontpage.cpp:207
+#, 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:266
+#: ../src/richtext/richtextstyledlg.cpp:268
+#, fuzzy
+msgid "Click to close this window."
+msgstr "关闭此窗口"
+
+#: ../src/mac/carbon/fontdlg.cpp:533 ../src/mac/carbon/fontdlg.cpp:535
+#, fuzzy
+msgid "Click to confirm changes to the font."
+msgstr "点击确认字体选择."
+
+#: ../src/generic/fontdlgg.cpp:384 ../src/generic/fontdlgg.cpp:386
+#: ../src/generic/fontdlgg.cpp:391 ../src/generic/fontdlgg.cpp:393

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

-#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
-#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
+#: ../src/richtext/richtextstyledlg.cpp:285
+#: ../src/richtext/richtextstyledlg.cpp:287
+#, fuzzy
+msgid "Click to confirm your selection."
+msgstr "点击确认字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:219
+#: ../src/richtext/richtextstyledlg.cpp:221
+msgid "Click to create a new character style."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:231
+#: ../src/richtext/richtextstyledlg.cpp:233
+#, fuzzy
+msgid "Click to create a new list style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:225
+#: ../src/richtext/richtextstyledlg.cpp:227
+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:257
+#: ../src/richtext/richtextstyledlg.cpp:259
+#, 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:251
+#: ../src/richtext/richtextstyledlg.cpp:253
+#, fuzzy
+msgid "Click to edit the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/richtext/richtextstyledlg.cpp:245
+#: ../src/richtext/richtextstyledlg.cpp:247
+#, fuzzy
+msgid "Click to rename the selected style."
+msgstr "点击取消字体选择."
+
+#: ../src/generic/dbgrptg.cpp:93 ../src/generic/progdlgg.cpp:658
+#: ../src/generic/progdlgg.cpp:663 ../src/richtext/richtextsymboldlg.cpp:482
+#: ../src/richtext/richtextsymboldlg.cpp:496
+#: ../src/richtext/richtextstyledlg.cpp:264
+#: ../contrib/src/deprecated/proplist.cpp:509

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

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

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

-#: ../src/generic/mdig.cpp:116
+#: ../src/generic/mdig.cpp:116 ../src/aui/tabmdi.cpp:105

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

-#: ../src/generic/logg.cpp:509
+#: ../src/common/stockitem.cpp:211
+msgid "Close current document"
+msgstr ""
+
+#: ../src/generic/logg.cpp:510

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

-#: ../src/html/helpfrm.cpp:1576
+#: ../src/richtext/richtextsymboldlg.cpp:483
+#: ../src/richtext/richtextsymboldlg.cpp:485
+#: ../src/richtext/richtextsymboldlg.cpp:497
+#: ../src/richtext/richtextsymboldlg.cpp:499
+msgid "Closes the dialog without inserting a symbol."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:503
+#, fuzzy
+msgid "Colour:"
+msgstr "颜色(&o):"
+
+#: ../src/html/helpwnd.cpp:1528

 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 

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

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

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

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

-#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
+#: ../src/generic/filedlgg.cpp:1466 ../src/gtk/filedlg.cpp:61

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/generic/prntdlgg.cpp:242
+#: ../src/generic/prntdlgg.cpp:243

 msgid "Copies:"
 msgstr "份数:"
 
 msgid "Copies:"
 msgstr "份数:"
 

+#: ../src/common/stockitem.cpp:203
+#, fuzzy
+msgid "Copy selection"
+msgstr "选段"
+

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


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

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

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


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

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

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

-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
-#: ../src/msw/printwin.cpp:235
+#: ../src/generic/printps.cpp:181 ../src/gtk/gnome/gprint.cpp:773
+#: ../src/msw/printwin.cpp:230

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

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

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

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

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

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

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

-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-#: ../src/msw/imaglist.cpp:188
+#: ../src/msw/dragimag.cpp:156 ../src/msw/dragimag.cpp:196
+#: ../src/msw/imaglist.cpp:147 ../src/msw/imaglist.cpp:165
+#: ../src/msw/imaglist.cpp:177

 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 
 msgid "Couldn't add an image to the image list."
 msgstr "不能把图像加到图象列表."
 

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

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

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

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

+#: ../src/mac/carbon/overlay.cpp:113
+#, fuzzy
+msgid "Couldn't create the overlay window"
+msgstr "不能创建计时器"
+
+#: ../src/mac/carbon/overlay.cpp:157
+#, fuzzy
+msgid "Couldn't end the context on the overlay window"
+msgstr "不能获得当前线程指针"
+

 #: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 
 #: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号'%s'"
 

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

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

-#: ../src/common/imagpng.cpp:596
+#: ../src/mac/carbon/overlay.cpp:119
+#, fuzzy
+msgid "Couldn't init the context on the overlay window"
+msgstr "不能获得当前线程指针"
+
+#: ../src/common/imagpng.cpp:621

 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "不能装入PNG图像 - 文件被破坏 或 没有足够内存."
 
 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'中的读取声音数据."
 
 #, 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"
 
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "不能打开音频: %s"
 

-#: ../src/msw/ole/dataobj.cpp:147
+#: ../src/msw/ole/dataobj.cpp:143

 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr "不能注册剪贴板格式 '%s'."
 
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr "不能注册剪贴板格式 '%s'."
 

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

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

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

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

-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-#: ../src/common/imagpng.cpp:659
+#: ../src/common/imagpng.cpp:670 ../src/common/imagpng.cpp:679
+#: ../src/common/imagpng.cpp:687

 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 
 msgid "Couldn't save PNG image."
 msgstr "不能保存PNG图像."
 

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

 msgid "Couldn't terminate thread"
 msgstr "不能终止线程"
 
 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参数里找不到创建参数"
 
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr "在声明的RTTI参数里找不到创建参数"
 

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

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

-#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
+#: ../src/generic/dirdlgg.cpp:129 ../src/generic/filedlgg.cpp:1088

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

-#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
-#: ../src/msw/textctrl.cpp:2063
+#: ../src/common/menucmn.cpp:316
+#, fuzzy
+msgid "Ctrl-"
+msgstr "ctrl"
+
+#: ../src/common/stockitem.cpp:118 ../src/mac/carbon/textctrl.cpp:1117
+#: ../src/msw/textctrl.cpp:2209 ../src/richtext/richtextctrl.cpp:2423

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

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

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

-#: ../src/common/fmapbase.cpp:108
+#: ../src/common/stockitem.cpp:204
+#, fuzzy
+msgid "Cut selection"
+msgstr "选段"
+
+#: ../src/common/fmapbase.cpp:110

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

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

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

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

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

-#: ../src/common/imagbmp.cpp:921
+#: ../src/common/menucmn.cpp:97
+msgid "DECIMAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:65
+msgid "DEL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:66
+msgid "DELETE"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:918

 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "DIB头: 编码不能匹配颜色位数."
 
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "DIB头: 编码不能匹配颜色位数."
 

-#: ../src/common/imagbmp.cpp:883
+#: ../src/common/imagbmp.cpp:880

 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
 
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
 

-#: ../src/common/imagbmp.cpp:877
+#: ../src/common/imagbmp.cpp:874

 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
 
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
 

-#: ../src/common/imagbmp.cpp:897
+#: ../src/common/imagbmp.cpp:894

 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "DIB头: 文件中颜色位数未知."
 
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "DIB头: 文件中颜色位数未知."
 

-#: ../src/common/imagbmp.cpp:907
+#: ../src/common/imagbmp.cpp:904

 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知."
 
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知."
 

-#: ../src/common/paper.cpp:128
+#: ../src/common/menucmn.cpp:98
+#, fuzzy
+msgid "DIVIDE"
+msgstr "<盘符>"
+
+#: ../src/common/paper.cpp:123

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

-#: ../src/generic/dbgrptg.cpp:295
+#: ../src/common/menucmn.cpp:77
+msgid "DOWN"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:296

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

-#: ../src/common/debugrpt.cpp:203
+#: ../src/common/debugrpt.cpp:209

 msgid "Debug report couldn't be created."
 msgstr "无法创建调试报告."
 
 msgid "Debug report couldn't be created."
 msgstr "无法创建调试报告."
 

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

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

-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:230

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

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

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

-#: ../src/generic/prntdlgg.cpp:506
+#: ../src/generic/prntdlgg.cpp:504

 msgid "Default printer"
 msgstr "缺省的打印机"
 
 msgid "Default printer"
 msgstr "缺省的打印机"
 

-#: ../contrib/src/gizmos/editlbox.cpp:160
+#: ../src/richtext/richtextbuffer.cpp:4827
+#, fuzzy
+msgid "Delete"
+msgstr "删除(&D)"
+
+#: ../src/richtext/richtexttabspage.cpp:148
+#, fuzzy
+msgid "Delete A&ll"
+msgstr "全部选择(&A)"
+
+#: ../src/richtext/richtextstyledlg.cpp:736
+#, fuzzy
+msgid "Delete Style"
+msgstr "删除项"
+
+#: ../src/richtext/richtextctrl.cpp:560 ../src/richtext/richtextctrl.cpp:589
+#, fuzzy
+msgid "Delete Text"
+msgstr "删除项"
+
+#: ../contrib/src/gizmos/editlbox.cpp:156

 msgid "Delete item"
 msgstr "删除项"
 
 msgid "Delete item"
 msgstr "删除项"
 

-#: ../src/unix/snglinst.cpp:300
+#: ../src/common/stockitem.cpp:205
+#, fuzzy
+msgid "Delete selection"
+msgstr "选段"
+
+#: ../src/richtext/richtextstyledlg.cpp:736
+#, fuzzy, c-format
+msgid "Delete style %s?"
+msgstr "删除项"
+
+#: ../src/unix/snglinst.cpp:296

 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "已删除过期的锁文件 '%s'."
 
 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "已删除过期的锁文件 '%s'."
 

-#: ../src/generic/dirctrlg.cpp:656
+#: ../src/common/module.cpp:124
+#, c-format
+msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:672

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

-#: ../src/msw/dialup.cpp:395
+#: ../src/generic/aboutdlgg.cpp:70
+msgid "Developed by "
+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)没有安装在本机, 拨号功能不能使用. 请安装它."
 
 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:242

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

-#: ../src/motif/filedlg.cpp:225
-#, fuzzy
+#: ../src/dfb/wrapdfb.cpp:59
+#, c-format
+msgid "DirectFB error %d occured."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:222

 msgid "Directories"
 msgid "Directories"

-msgstr "修饰"
+msgstr "目录"

 
 

-#: ../src/common/filefn.cpp:1177
+#: ../src/common/filefn.cpp:1219

 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目录'%s'不能被创建"
 
 #, 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'不存在!"
 
 #, c-format
 msgid "Directory '%s' doesn't exist!"
 msgstr "目录 '%s'不存在!"
 

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

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

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

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

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

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

-#: ../src/html/helpfrm.cpp:685
+#: ../src/html/helpwnd.cpp:671

 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 

-#: ../src/msw/mimetype.cpp:671
+#: ../src/html/helpwnd.cpp:335
+msgid "Displays help as you browse the books on the left."
+msgstr ""
+
+#: ../src/msw/mimetype.cpp:667

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


@@ -1591,165 +2292,193 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
 "新的值为 \n"
 "%s %1"
 

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

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

-#: ../src/common/sizer.cpp:1839
+#: ../src/generic/aboutdlgg.cpp:73
+msgid "Documentation by "
+msgstr ""
+
+#: ../src/common/sizer.cpp:2019

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

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

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

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

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

-#: ../src/common/paper.cpp:183
+#: ../src/common/paper.cpp:178

 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"

-msgstr ""
+msgstr "横向日本双明信片, 148 x 200 毫米"

 
 

-#: ../src/common/xtixml.cpp:271
+#: ../src/common/xtixml.cpp:268

 #, c-format
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
 #, c-format
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 

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

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

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

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

-#: ../contrib/src/gizmos/editlbox.cpp:158
+#: ../src/common/menucmn.cpp:79
+msgid "END"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:70
+msgid "ENTER"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:82
+msgid "ESC"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:83
+msgid "ESCAPE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:91
+msgid "EXECUTE"
+msgstr ""
+
+#: ../contrib/src/gizmos/editlbox.cpp:154

 msgid "Edit item"
 msgstr "编辑项"
 
 msgid "Edit item"
 msgstr "编辑项"
 

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

 msgid "Elapsed time : "
 msgstr "用时: "
 
 msgid "Elapsed time : "
 msgstr "用时: "
 

-#: ../src/common/prntbase.cpp:846
+#: ../src/richtext/richtextstyledlg.cpp:570
+msgid "Enter a character style name"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:772
+msgid "Enter a list style name"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1072

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

-#: ../src/generic/dbgrptg.cpp:169
+#: ../src/richtext/richtextstyledlg.cpp:618
+msgid "Enter a paragraph style name"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:170

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

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

 msgid "Entries found"
 msgstr "找到的条目"
 
 msgid "Entries found"
 msgstr "找到的条目"
 

-#: ../src/common/paper.cpp:149
-#, fuzzy
+#: ../src/common/paper.cpp:144

 msgid "Envelope Invite 220 x 220 mm"
 msgid "Envelope Invite 220 x 220 mm"

-msgstr "DL 信封, 110 x 220 毫米"
+msgstr "邀请信, 220 x 220 毫米"

 
 

-#: ../src/common/config.cpp:384
+#: ../src/common/config.cpp:402

 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
 
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
 

-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
-#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
-#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
-#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
+#: ../src/generic/dirctrlg.cpp:708 ../src/generic/dirctrlg.cpp:726
+#: ../src/generic/dirctrlg.cpp:737 ../src/generic/dirdlgg.cpp:350
+#: ../src/generic/filedlgg.cpp:712 ../src/generic/filedlgg.cpp:830
+#: ../src/generic/filedlgg.cpp:844 ../src/generic/filedlgg.cpp:862
+#: ../src/generic/filedlgg.cpp:1416 ../src/generic/filedlgg.cpp:1444
+#: ../src/generic/filedlgg.cpp:1472 ../src/gtk1/fontdlg.cpp:75

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

-#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
-#: ../src/unix/utilsunx.cpp:1098
-msgid "Error "
-msgstr "错误 "
-
-#: ../src/generic/dirdlgg.cpp:241
+#: ../src/generic/dirdlgg.cpp:249

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

-#: ../src/common/imagbmp.cpp:930
-msgid "Error in reading image DIB ."
+#: ../src/common/imagbmp.cpp:927
+#, fuzzy
+msgid "Error in reading image DIB."

 msgstr "读图像DIB错误."
 
 #: ../src/common/fileconf.cpp:504
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 
 msgstr "读图像DIB错误."
 
 #: ../src/common/fileconf.cpp:504
 msgid "Error reading config options."
 msgstr "读配置选项错误."
 

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

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

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

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

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

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

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

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

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

 msgid "Estimated time : "
 msgstr "预期时间: "
 
 msgid "Estimated time : "
 msgstr "预期时间: "
 

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

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

-#: ../src/msw/utilsexc.cpp:753
+#: ../src/msw/utilsexc.cpp:765

 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "命令 '%s'执行失败"
 
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "命令 '%s'执行失败"
 

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

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

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

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

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

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

-#: ../contrib/src/deprecated/resource.cpp:3091
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3101

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

-#: ../contrib/src/deprecated/resource.cpp:3108
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3118

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

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

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

-#: ../contrib/src/deprecated/resource.cpp:3077
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3087

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

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

 
 

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

 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 

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

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


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

-#: ../src/msw/dialup.cpp:880
+#: ../src/common/menucmn.cpp:251 ../src/common/menucmn.cpp:325
+msgid "F"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:881

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

-#: ../src/unix/snglinst.cpp:274
+#: ../src/unix/snglinst.cpp:270

 msgid "Failed to access lock file."
 msgstr "访问锁文件失败."
 
 msgid "Failed to access lock file."
 msgstr "访问锁文件失败."
 


@@ -1772,101 +2505,101 @@ msgstr "访问锁文件失败."
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."
 
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."
 

-#: ../src/unix/displayx11.cpp:224
+#: ../src/unix/displayx11.cpp:226

 msgid "Failed to change video mode"
 msgstr "改变视频模式失败."
 
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败."
 

-#: ../src/common/debugrpt.cpp:237
+#: ../src/common/debugrpt.cpp:243

 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 

-#: ../src/common/filename.cpp:191
+#: ../src/common/filename.cpp:190

 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败."
 
 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'失败"
 
 #, 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 "关闭剪贴板失败."
 
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败."
 

-#: ../src/msw/dialup.cpp:820
+#: ../src/x11/utils.cpp:264
+#, fuzzy, c-format
+msgid "Failed to close the display \"%s\""
+msgstr "关闭剪贴板失败."
+
+#: ../src/msw/dialup.cpp:821

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

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

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

-#: ../src/msw/registry.cpp:626
+#: ../src/common/textfile.cpp:135
+#, fuzzy
+msgid "Failed to convert file contents to Unicode."
+msgstr "关闭文件句柄失败."
+
+#: ../src/msw/registry.cpp:621

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/msw/statbr95.cpp:112
+#: ../src/msw/statbr95.cpp:108

 msgid "Failed to create a status bar."
 msgstr "创建状态条失败."
 
 msgid "Failed to create a status bar."
 msgstr "创建状态条失败."
 

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

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

-#: ../src/msw/utilsexc.cpp:227
+#: ../src/msw/utilsexc.cpp:225

 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 
 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 

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

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

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

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

-#: ../src/common/debugrpt.cpp:202
+#: ../src/common/debugrpt.cpp:208

 #, c-format
 msgid "Failed to create directory \"%s\""
 msgstr "无法创建目录 \"%s\""
 
 #, c-format
 msgid "Failed to create directory \"%s\""
 msgstr "无法创建目录 \"%s\""
 

-#: ../src/unix/mimetype.cpp:370
-#, 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 失败."
-
-#: ../src/generic/dirdlgg.cpp:239
+#: ../src/generic/dirdlgg.cpp:247

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


@@ -1875,35 +2608,34 @@ msgstr ""
 "创建目录 '%s'失败\n"
 "(您是否有所需的权限?)"
 
 "创建目录 '%s'失败\n"
 "(您是否有所需的权限?)"
 

-#: ../src/msw/mimetype.cpp:193
+#: ../src/msw/mimetype.cpp:189

 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 msgstr "为 '%s'文件创建注册条目失败."
 
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 msgstr "为 '%s'文件创建注册条目失败."
 

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

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

-#: ../src/html/winpars.cpp:549
+#: ../src/html/winpars.cpp:587

 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 

-#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:131
+#: ../src/mac/classic/clipbrd.cpp:187 ../src/msw/clipbrd.cpp:125

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

-#: ../src/unix/displayx11.cpp:201
+#: ../src/unix/displayx11.cpp:203

 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 

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

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

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

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


@@ -1913,11 +2645,11 @@ msgstr "建立拨号连接: %s失败"
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s'失败\n"
 

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

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

-#: ../contrib/src/deprecated/resource.cpp:2489
+#: ../contrib/src/deprecated/resource.cpp:2499

 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"


@@ -1926,7 +2658,7 @@ msgstr ""
 "查找XBM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 
 "查找XBM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 

-#: ../contrib/src/deprecated/resource.cpp:2643
+#: ../contrib/src/deprecated/resource.cpp:2653

 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"


@@ -1935,7 +2667,7 @@ msgstr ""
 "查找XBM资源%s失败.\n"
 "没有使用wxResourceLoadIconData?"
 
 "查找XBM资源%s失败.\n"
 "没有使用wxResourceLoadIconData?"
 

-#: ../contrib/src/deprecated/resource.cpp:2504
+#: ../contrib/src/deprecated/resource.cpp:2514

 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"


@@ -1944,66 +2676,76 @@ msgstr ""
 "查找XPM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 
 "查找XPM资源 %s失败.\n"
 "没有使用wxResourceLoadBitmapData?"
 

-#: ../src/msw/dialup.cpp:718
+#: ../src/common/regex.cpp:425 ../src/common/regex.cpp:473
+#, fuzzy, c-format
+msgid "Failed to find match for regular expression: %s"
+msgstr "不能匹配 '%s' 于正则表达式: %s"
+
+#: ../src/msw/dialup.cpp:719

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

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

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

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

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

-#: ../src/common/stopwatch.cpp:233
+#: ../src/common/stopwatch.cpp:231

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

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

 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 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)."
 
 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帮助失败."
 
 msgid "Failed to initialize MS HTML Help."
 msgstr "初始化MS HTML帮助失败."
 

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

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

-#: ../src/unix/snglinst.cpp:246
+#: ../src/gtk/textctrl.cpp:1006
+#, 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'失败"
 
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
 msgstr "检查锁文件 '%s'失败"
 

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

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

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

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

-#: ../src/common/iconbndl.cpp:72
+#: ../src/common/iconbndl.cpp:66

 #, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 
 #, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 

-#: ../src/msw/enhmeta.cpp:84
+#: ../src/msw/enhmeta.cpp:80

 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 

-#: ../src/msw/volume.cpp:312
+#: ../src/msw/volume.cpp:310

 msgid "Failed to load mpr.dll."
 msgstr "装载mpr.dll失败."
 
 msgid "Failed to load mpr.dll."
 msgstr "装载mpr.dll失败."
 


@@ -2017,22 +2759,17 @@ msgstr "不能装载共享库 '%s'"
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
 
 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'失败"
 
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr "锁定锁文件 '%s'失败"
 

-#: ../src/common/regex.cpp:300
+#: ../src/common/filename.cpp:2183

 #, c-format
 #, c-format

-msgid "Failed to match '%s' in regular expression: %s"
-msgstr "不能匹配 '%s' 于正则表达式: %s"
-
-#: ../src/common/filename.cpp:1918
-#, fuzzy, c-format

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

-#: ../src/common/filename.cpp:179
+#: ../src/common/filename.cpp:178

 #, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "打开 '%s'(为 %s) 失败"
 #, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "打开 '%s'(为 %s) 失败"


@@ -2042,19 +2779,24 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s'失败."
 
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s'失败."
 

-#: ../src/common/filename.cpp:788
+#: ../src/x11/utils.cpp:280
+#, fuzzy, c-format
+msgid "Failed to open display \"%s\"."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/common/filename.cpp:857

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

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

 msgid "Failed to open the clipboard."
 msgstr "打开剪贴板失败."
 
 msgid "Failed to open the clipboard."
 msgstr "打开剪贴板失败."
 

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

 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 
 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失败."
 
 msgid "Failed to read PID from lock file."
 msgstr "从锁文件读取PID失败."
 


@@ -2062,63 +2804,70 @@ msgstr "从锁文件读取PID失败."
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 

-#: ../src/msw/utilsexc.cpp:653
+#: ../src/msw/utilsexc.cpp:651

 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 

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

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

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

 msgid "Failed to register OpenGL window class."
 msgstr "不能注册 OpenGL窗口类."
 
 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'编码失败."
 
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s'编码失败."
 

-#: ../src/common/debugrpt.cpp:220
+#: ../src/common/debugrpt.cpp:226

 #, c-format
 msgid "Failed to remove debug report file \"%s\""
 msgstr "不能删除调试报告文件 \"%s\""
 
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
 msgstr "不能删除调试报告文件 \"%s\""
 

-#: ../src/unix/snglinst.cpp:327
+#: ../src/unix/snglinst.cpp:323

 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "不能删除锁文件 '%s'"
 
 #, 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'失败."
 
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr "删除过期的锁文件 '%s'失败."
 

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

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

-#: ../src/msw/registry.cpp:568
+#: ../src/common/filefn.cpp:1137
+#, c-format
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."
+msgstr ""
+
+#: ../src/msw/registry.cpp:563

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

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

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

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

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

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

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

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

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


@@ -2127,104 +2876,108 @@ msgstr "检取支持的剪贴板格式失败"
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 

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

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

-#: ../src/common/ftp.cpp:384
+#: ../src/common/ftp.cpp:380

 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置FTP传输模式为 %s 时失败."
 
 #, 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 "设置剪贴板数据失败"
 
 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'上设置许可权限时失败"
 
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s'上设置许可权限时失败"
 

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

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

-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/gtk/textctrl.cpp:948
+#, fuzzy
+msgid "Failed to set text in the text control."
+msgstr "获取工作目录失败"
+
+#: ../src/unix/threadpsx.cpp:1253 ../src/unix/threadpsx.cpp:1263

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

-#: ../src/common/fs_mem.cpp:231
+#: ../src/common/fs_mem.cpp:219

 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "将图像'%s'存到内存VFS失败!"
 
 #, 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/mac/carbon/mpthread.cpp:1268 ../src/unix/threadpsx.cpp:1436

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

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

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

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

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

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

 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s'进行touch操作失败"
 
 #, 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'解锁失败"
 
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr "对锁文件 '%s'解锁失败"
 

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

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

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

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

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

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

-#: ../src/unix/snglinst.cpp:173
+#: ../src/unix/snglinst.cpp:169

 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "写锁文件 '%s'失败"
 

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

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

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

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

-#: ../src/msw/wince/filedlgwce.cpp:120
+#: ../src/msw/wince/filedlgwce.cpp:119

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 

-#: ../src/mgl/bitmap.cpp:544
+#: ../src/mgl/bitmap.cpp:422

 #, c-format
 msgid "File %s does not exist."
 msgstr "文件 %s不存在."
 
 #, c-format
 msgid "File %s does not exist."
 msgstr "文件 %s不存在."
 

-#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
+#: ../src/generic/filedlgg.cpp:1464 ../src/gtk/filedlg.cpp:58

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

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

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


@@ -2233,260 +2986,336 @@ msgstr ""
 "文件 '%s' 已存在.\n"
 "真的需要替换它?"
 
 "文件 '%s' 已存在.\n"
 "真的需要替换它?"
 

-#: ../src/common/textcmn.cpp:215
+#: ../src/common/textcmn.cpp:218 ../src/richtext/richtextctrl.cpp:1764

 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 
 msgid "File couldn't be loaded."
 msgstr "文件不能被装载."
 

-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
+#: ../src/common/docview.cpp:566 ../src/common/docview.cpp:1606

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

-#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
+#: ../src/generic/dirctrlg.cpp:726 ../src/generic/filedlgg.cpp:844

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

-#: ../src/motif/filedlg.cpp:226
-#, fuzzy
+#: ../src/motif/filedlg.cpp:223

 msgid "Files"
 msgstr "文件"
 
 msgid "Files"
 msgstr "文件"
 

-#: ../src/common/filefn.cpp:1746
+#: ../src/common/filefn.cpp:1775

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

-#: ../src/motif/filedlg.cpp:224
-#, fuzzy
+#: ../src/motif/filedlg.cpp:221

 msgid "Filter"
 msgid "Filter"

-msgstr "文件"
+msgstr "过滤器"

 
 

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

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

-#: ../src/html/helpfrm.cpp:1219
+#: ../src/html/helpwnd.cpp:1191

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

-#: ../src/html/helpfrm.cpp:1279
+#: ../src/html/helpwnd.cpp:1251

 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 

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

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

-#: ../src/html/helpfrm.cpp:1220
+#: ../src/mac/carbon/fontdlg.cpp:410 ../src/richtext/richtextformatdlg.cpp:272
+msgid "Font"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:175
+#, fuzzy
+msgid "Font &weight:"
+msgstr "字体粗细."
+
+#: ../src/html/helpwnd.cpp:1192

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

+#: ../src/richtext/richtextfontpage.cpp:162
+#, fuzzy
+msgid "Font st&yle:"
+msgstr "字体大小:"
+
+#: ../src/mac/carbon/fontdlg.cpp:452
+#, fuzzy
+msgid "Font:"
+msgstr "字体大小:"
+

 #: ../src/unix/utilsunx.cpp:545
 msgid "Fork failed"
 msgstr "Fork 失败"
 
 #: ../src/unix/utilsunx.cpp:545
 msgid "Fork failed"
 msgstr "Fork 失败"
 

-#: ../src/common/xtixml.cpp:235
+#: ../include/wx/richtext/richtextformatdlg.h:121
+#: ../include/wx/richtext/richtextformatdlg.h:133
+msgid "Formatting"
+msgstr ""
+
+#: ../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
 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
+#: ../contrib/src/deprecated/resource.cpp:3070

 msgid "Found "
 msgstr "找到 "
 
 msgid "Found "
 msgstr "找到 "
 

-#: ../src/html/helpfrm.cpp:886
+#: ../src/html/htmlhelp.cpp:460 ../src/html/helpwnd.cpp:867

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

-#: ../src/generic/prntdlgg.cpp:233
+#: ../src/generic/prntdlgg.cpp:234

 msgid "From:"
 msgstr "从:"
 
 msgid "From:"
 msgstr "从:"
 

-#: ../src/common/imaggif.cpp:100
+#: ../src/common/fmapbase.cpp:154
+msgid "GB-2312"
+msgstr ""
+
+#: ../src/common/imaggif.cpp:80

 msgid "GIF: Invalid gif index."
 msgstr "GIF: 无效的gif图像索引."
 
 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: 数据流似乎已被截断."
 
 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文件格式错误."
 
 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: 没有足够内存."
 
 msgid "GIF: not enough memory."
 msgstr "GIF: 没有足够内存."
 

-#: ../src/common/imaggif.cpp:65
+#: ../src/common/imaggif.cpp:60

 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 

-#: ../src/univ/themes/gtk.cpp:634
+#: ../src/univ/themes/gtk.cpp:530

 msgid "GTK+ theme"
 msgid "GTK+ theme"

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

 
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/html/helpfrm.cpp:651
+#: ../src/html/helpwnd.cpp:637

 msgid "Go back"
 msgstr "回退"
 
 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:640

 msgid "Go forward"
 msgstr "向前"
 
 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:645

 msgid "Go one level up in document hierarchy"
 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:145 ../src/generic/filedlgg.cpp:989
+#: ../src/generic/dirdlgg.cpp:134 ../src/generic/filedlgg.cpp:1078

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

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

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

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

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

-#: ../src/common/fmapbase.cpp:110
+#: ../src/generic/aboutdlgg.cpp:76
+msgid "Graphics art by "
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:112

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

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

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

-#: ../src/html/helpfrm.cpp:1574
+#: ../src/common/menucmn.cpp:93
+msgid "HELP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:78
+msgid "HOME"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1526

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

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

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

-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpwnd.cpp:1524

 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 

-#: ../src/common/fmapbase.cpp:111
+#: ../src/html/htmprint.cpp:379
+msgid ""
+"HTML pagination algorithm generated more than the allowed maximum number of "
+"pages and it can continue any longer!"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:113

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

-#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
+#: ../src/html/helpfrm.cpp:96 ../src/html/helpdlg.cpp:67
+#: ../contrib/src/deprecated/proplist.cpp:519

 msgid "Help"
 msgstr "帮助"
 
 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:1185

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

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

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

-#: ../src/html/helpfrm.cpp:1560
+#: ../src/html/helpwnd.cpp:1512

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

-#: ../src/html/helpfrm.cpp:814
+#: ../src/html/helpwnd.cpp:796

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

-#: ../src/html/helpfrm.cpp:1573
+#: ../src/html/helpwnd.cpp:1525

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

-#: ../src/html/helpctrl.cpp:55
+#: ../src/generic/helpext.cpp:274
+#, c-format
+msgid "Help directory \"%s\" not found."
+msgstr ""
+
+#: ../src/generic/helpext.cpp:282
+#, fuzzy, c-format
+msgid "Help file \"%s\" not found."
+msgstr "找不到域 '%s'的目录文件."
+
+#: ../src/html/helpctrl.cpp:51

 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 
 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 

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

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

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

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

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

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

-#: ../src/common/imagbmp.cpp:943
+#: ../src/common/imagbmp.cpp:940

 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误."
 
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误."
 

-#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
-#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
-#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-#: ../src/common/imagbmp.cpp:1190
+#: ../src/common/imagbmp.cpp:1045 ../src/common/imagbmp.cpp:1104
+#: ../src/common/imagbmp.cpp:1113 ../src/common/imagbmp.cpp:1124
+#: ../src/common/imagbmp.cpp:1168 ../src/common/imagbmp.cpp:1178
+#: ../src/common/imagbmp.cpp:1187

 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误."
 
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误."
 

-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1013

 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 图像高度超出范围, 不适合做图标."
 
 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 图像高度超出范围, 不适合做图标."
 

-#: ../src/common/imagbmp.cpp:1022
+#: ../src/common/imagbmp.cpp:1019

 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 图像宽度超出范围, 不适合做图标."
 
 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 图像宽度超出范围, 不适合做图标."
 

-#: ../src/common/imagbmp.cpp:1255
+#: ../src/common/imagbmp.cpp:1252

 msgid "ICO: Invalid icon index."
 msgstr "ICO: 无效的图标索引."
 
 msgid "ICO: Invalid icon index."
 msgstr "ICO: 无效的图标索引."
 

-#: ../src/common/imagiff.cpp:771
+#: ../src/common/imagiff.cpp:766

 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 数据流似乎已被截断."
 
 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 数据流似乎已被截断."
 

-#: ../src/common/imagiff.cpp:755
+#: ../src/common/imagiff.cpp:750

 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF文件格式错误."
 
 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF文件格式错误."
 

-#: ../src/common/imagiff.cpp:758
+#: ../src/common/imagiff.cpp:753

 msgid "IFF: not enough memory."
 msgstr "IFF: 没有足够内存."
 
 msgid "IFF: not enough memory."
 msgstr "IFF: 没有足够内存."
 

-#: ../src/common/imagiff.cpp:761
+#: ../src/common/imagiff.cpp:756

 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误!!!"
 
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误!!!"
 

-#: ../contrib/src/deprecated/resource.cpp:2673
-#: ../contrib/src/deprecated/resource.cpp:2684
+#: ../src/common/menucmn.cpp:68
+msgid "INS"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:69
+msgid "INSERT"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2683
+#: ../contrib/src/deprecated/resource.cpp:2694

 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr "没有找到图标资源规范 %s ."
 
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr "没有找到图标资源规范 %s ."
 

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

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


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

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

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


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

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

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

-#: ../contrib/src/deprecated/resource.cpp:271
+#: ../contrib/src/deprecated/resource.cpp:266

 msgid "Ill-formed resource file syntax."
 msgstr "不良的资源文件语法."
 
 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)作为事件源"
 
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
 

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

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

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

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

-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
+#: ../src/generic/dirctrlg.cpp:708 ../src/generic/filedlgg.cpp:830

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

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

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

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

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

-#: ../src/common/image.cpp:1523
-#, c-format
-msgid "Image file is not of type %d."
+#: ../src/common/image.cpp:2176 ../src/common/image.cpp:2216
+#, fuzzy, c-format
+msgid "Image file is not of type %ld."

 msgstr "图像文件的类型不是 %d."
 
 msgstr "图像文件的类型不是 %d."
 

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

 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
 
 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:428
+#: ../src/unix/utilsunx.cpp:434

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

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

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

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

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

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

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

-#: ../src/common/stockitem.cpp:124
+#: ../src/common/stockitem.cpp:130

 msgid "Indent"
 msgstr "缩进"
 
 msgid "Indent"
 msgstr "缩进"
 

-#: ../src/html/helpfrm.cpp:516
+#: ../src/richtext/richtextformatdlg.cpp:278
+msgid "Indents && Spacing"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:578 ../src/html/helpwnd.cpp:493

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

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

 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 #: ../src/common/init.cpp:232
 msgid "Initialization failed in post init, aborting."
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 #: ../src/common/init.cpp:232
 msgid "Initialization failed in post init, aborting."

+msgstr "在后初始化阶段出错, 退出..."
+
+#: ../src/richtext/richtextsymboldlg.cpp:475
+#: ../src/richtext/richtextsymboldlg.cpp:502
+#, fuzzy
+msgid "Insert"
+msgstr "缩进"
+
+#: ../src/richtext/richtextbuffer.cpp:4724
+#: ../src/richtext/richtextbuffer.cpp:5503
+msgid "Insert Image"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:4600
+#: ../src/richtext/richtextbuffer.cpp:4644
+#: ../src/richtext/richtextbuffer.cpp:4686
+#: ../src/richtext/richtextctrl.cpp:532 ../src/richtext/richtextctrl.cpp:748
+msgid "Insert Text"
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:477
+#: ../src/richtext/richtextsymboldlg.cpp:479
+#: ../src/richtext/richtextsymboldlg.cpp:504
+#: ../src/richtext/richtextsymboldlg.cpp:506
+msgid "Inserts the chosen symbol."

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/xtistrm.cpp:704
+#: ../src/common/xtistrm.cpp:700

 msgid "Internal error, illegal wxCustomTypeInfo"
 msgstr "整数错误, 非法的wxCustomTypeInfo"
 
 msgid "Internal error, illegal wxCustomTypeInfo"
 msgstr "整数错误, 非法的wxCustomTypeInfo"
 

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

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

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

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

-#: ../src/common/appcmn.cpp:249
+#: ../src/common/appcmn.cpp:277

 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "无效的显示模式 '%s'."
 
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "无效的显示模式 '%s'."
 

-#: ../src/x11/app.cpp:128
+#: ../src/x11/app.cpp:127

 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "无效的几何规格 '%s'"
 
 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "无效的几何规格 '%s'"
 

-#: ../src/unix/snglinst.cpp:311
+#: ../src/unix/snglinst.cpp:307

 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'."
 
 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'."
 

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

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

-#: ../src/common/xtistrm.cpp:395
+#: ../src/common/xtistrm.cpp:391

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

-#: ../src/common/regex.cpp:210
+#: ../src/common/regex.cpp:304

 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 

-#: ../src/generic/fontdlgg.cpp:233
+#: ../src/generic/fontdlgg.cpp:236 ../src/mac/carbon/fontdlg.cpp:484
+#: ../src/richtext/richtextfontpage.cpp:223
+#: ../src/richtext/richtextfontpage.cpp:281
+#: ../src/richtext/richtextfontpage.cpp:446

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

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

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

-#: ../src/common/imagjpeg.cpp:225
+#: ../src/common/imagjpeg.cpp:245

 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: 不能装入 - 文件也许已被破坏."
 
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: 不能装入 - 文件也许已被破坏."
 

-#: ../src/common/imagjpeg.cpp:339
+#: ../src/common/imagjpeg.cpp:388

 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 不能保存图像."
 
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 不能保存图像."
 

-#: ../src/common/paper.cpp:170
+#: ../src/common/paper.cpp:165

 msgid "Japanese Double Postcard 200 x 148 mm"
 msgid "Japanese Double Postcard 200 x 148 mm"

-msgstr ""
+msgstr "日本双明信片, 200 x 148 毫米"

 
 

-#: ../src/common/paper.cpp:174
+#: ../src/common/paper.cpp:169

 msgid "Japanese Envelope Chou #3"
 msgid "Japanese Envelope Chou #3"

-msgstr ""
+msgstr "日本 Chou 3 信封"

 
 

-#: ../src/common/paper.cpp:187
+#: ../src/common/paper.cpp:182

 msgid "Japanese Envelope Chou #3 Rotated"
 msgid "Japanese Envelope Chou #3 Rotated"

-msgstr ""
+msgstr "日本 Chou 3 信封(横向)"

 
 

-#: ../src/common/paper.cpp:175
+#: ../src/common/paper.cpp:170

 msgid "Japanese Envelope Chou #4"
 msgid "Japanese Envelope Chou #4"

-msgstr ""
+msgstr "日本 Chou 4 信封"

 
 

-#: ../src/common/paper.cpp:188
+#: ../src/common/paper.cpp:183

 msgid "Japanese Envelope Chou #4 Rotated"
 msgid "Japanese Envelope Chou #4 Rotated"

-msgstr ""
+msgstr "日本 Chou 4 信封(横向)"

 
 

-#: ../src/common/paper.cpp:172
+#: ../src/common/paper.cpp:167

 msgid "Japanese Envelope Kaku #2"
 msgid "Japanese Envelope Kaku #2"

-msgstr ""
+msgstr "日本 Kaku 2 信封"

 
 

-#: ../src/common/paper.cpp:185
+#: ../src/common/paper.cpp:180

 msgid "Japanese Envelope Kaku #2 Rotated"
 msgid "Japanese Envelope Kaku #2 Rotated"

-msgstr ""
+msgstr "日本 Kaku 2 信封(横向)"

 
 

-#: ../src/common/paper.cpp:173
+#: ../src/common/paper.cpp:168

 msgid "Japanese Envelope Kaku #3"
 msgid "Japanese Envelope Kaku #3"

-msgstr ""
+msgstr "日本 Kaku 3 信封"

 
 

-#: ../src/common/paper.cpp:186
+#: ../src/common/paper.cpp:181

 msgid "Japanese Envelope Kaku #3 Rotated"
 msgid "Japanese Envelope Kaku #3 Rotated"

-msgstr ""
+msgstr "日本 Kaku 3 信封(横向)"

 
 

-#: ../src/common/paper.cpp:192
+#: ../src/common/paper.cpp:187

 msgid "Japanese Envelope You #4"
 msgid "Japanese Envelope You #4"

-msgstr ""
+msgstr "日本 You 4 信封"

 
 

-#: ../src/common/paper.cpp:193
+#: ../src/common/paper.cpp:188

 msgid "Japanese Envelope You #4 Rotated"
 msgid "Japanese Envelope You #4 Rotated"

-msgstr ""
+msgstr "日本 You 4 信封(横向)"

 
 

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

 msgid "Japanese Postcard 100 x 148 mm"
 msgid "Japanese Postcard 100 x 148 mm"

-msgstr ""
+msgstr "日本明信片, 100 x 148 毫米"

 
 

-#: ../src/common/paper.cpp:182
+#: ../src/common/paper.cpp:177

 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgid "Japanese Postcard Rotated 148 x 100 mm"

-msgstr ""
+msgstr "横向日本明信片, 148 x 100 毫米"

 
 

-#: ../src/common/stockitem.cpp:128
+#: ../src/common/stockitem.cpp:134

 msgid "Justified"
 msgstr "分散对齐"
 
 msgid "Justified"
 msgstr "分散对齐"
 

-#: ../src/common/fmapbase.cpp:119
+#: ../src/richtext/richtextindentspage.cpp:162
+#: ../src/richtext/richtextindentspage.cpp:164
+#: ../src/richtext/richtextliststylepage.cpp:344
+#: ../src/richtext/richtextliststylepage.cpp:346
+msgid "Justify text left and right."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:121

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

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

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

-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/common/menucmn.cpp:267 ../src/common/menucmn.cpp:327
+msgid "KP_"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:121
+msgid "KP_ADD"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:116
+msgid "KP_BEGIN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:124
+msgid "KP_DECIMAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:118
+msgid "KP_DELETE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:125
+msgid "KP_DIVIDE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:110
+msgid "KP_DOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:115
+msgid "KP_END"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:105
+msgid "KP_ENTER"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:119
+msgid "KP_EQUAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:106
+msgid "KP_HOME"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:117
+msgid "KP_INSERT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:107
+msgid "KP_LEFT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:120
+msgid "KP_MULTIPLY"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:113
+msgid "KP_NEXT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:114
+msgid "KP_PAGEDOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:112
+msgid "KP_PAGEUP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:111
+msgid "KP_PRIOR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:109
+msgid "KP_RIGHT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:122
+msgid "KP_SEPARATOR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:103
+msgid "KP_SPACE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:123
+msgid "KP_SUBTRACT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:104
+msgid "KP_TAB"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:108
+msgid "KP_UP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:74
+msgid "LEFT"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:862

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

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

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

-#: ../src/generic/prntdlgg.cpp:879
+#: ../src/richtext/richtextbulletspage.cpp:195
+#: ../src/richtext/richtextbulletspage.cpp:199
+#: ../src/richtext/richtextbulletspage.cpp:200
+#: ../src/richtext/richtextliststylepage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextliststylepage.cpp:253
+msgid "Left"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:392
+msgid "Left (&first line):"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:874

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

-#: ../src/common/paper.cpp:151
-#, fuzzy
+#: ../src/richtext/richtextindentspage.cpp:148
+#: ../src/richtext/richtextindentspage.cpp:150
+#: ../src/richtext/richtextliststylepage.cpp:330
+#: ../src/richtext/richtextliststylepage.cpp:332
+msgid "Left-align text."
+msgstr ""
+
+#: ../src/common/paper.cpp:146

 msgid "Legal Extra 9 1/2 x 15 in"
 msgid "Legal Extra 9 1/2 x 15 in"

-msgstr "标准法律纸张, 8 1/2 x 14 英寸"
+msgstr "特大法律纸张, 9 1/2 x 15 英寸"

 
 

-#: ../src/common/paper.cpp:103
+#: ../src/common/paper.cpp:98

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

-#: ../src/common/paper.cpp:150
-#, fuzzy
+#: ../src/common/paper.cpp:145

 msgid "Letter Extra 9 1/2 x 12 in"
 msgid "Letter Extra 9 1/2 x 12 in"

-msgstr "信纸, 8 1/2 x 11 英寸"
+msgstr "特大信纸, 9 1/2 x 12 英寸"

 
 

-#: ../src/common/paper.cpp:156
+#: ../src/common/paper.cpp:151

 msgid "Letter Extra Transverse 9.275 x 12 in"
 msgid "Letter Extra Transverse 9.275 x 12 in"

-msgstr ""
+msgstr "特大信纸(横排), 9.275 x 12 英寸"

 
 

-#: ../src/common/paper.cpp:159
-#, fuzzy
+#: ../src/common/paper.cpp:154

 msgid "Letter Plus 8 1/2 x 12.69 in"
 msgid "Letter Plus 8 1/2 x 12.69 in"

-msgstr "信纸, 8 1/2 x 11 英寸"
+msgstr "加大信纸, 8 1/2 x 12.69 英寸"

 
 

-#: ../src/common/paper.cpp:176
-#, fuzzy
+#: ../src/common/paper.cpp:171

 msgid "Letter Rotated 11 x 8 1/2 in"
 msgid "Letter Rotated 11 x 8 1/2 in"

-msgstr "信纸, 8 1/2 x 11 英寸"
+msgstr "横向信纸, 11 x 8 1/2 英寸"

 
 

-#: ../src/common/paper.cpp:108
+#: ../src/common/paper.cpp:103

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

-#: ../src/common/paper.cpp:154
-#, fuzzy
+#: ../src/common/paper.cpp:149

 msgid "Letter Transverse 8 1/2 x 11 in"
 msgid "Letter Transverse 8 1/2 x 11 in"

-msgstr "信纸, 8 1/2 x 11 英寸"
+msgstr "信纸(横排), 8 1/2 x 11 英寸"

 
 

-#: ../src/common/paper.cpp:102
+#: ../src/common/paper.cpp:97

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

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

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

+#: ../src/generic/helpext.cpp:301
+#, c-format
+msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:454
+msgid "Line spacing:"
+msgstr ""
+

 #: ../src/html/chm.cpp:820
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//', 转换为绝对链接."
 
 #: ../src/html/chm.cpp:820
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//', 转换为绝对链接."
 

-#: ../src/common/fldlgcmn.cpp:257
+#: ../src/richtext/richtextformatdlg.cpp:296
+msgid "List Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:754
+msgid "List styles"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:151
+#: ../src/richtext/richtextfontpage.cpp:153
+msgid "Lists font sizes in points."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:132
+#: ../src/richtext/richtextfontpage.cpp:134
+#, fuzzy
+msgid "Lists the available fonts."
+msgstr "对不起, 没有所需技巧!"
+
+#: ../src/common/fldlgcmn.cpp:269

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

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

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

-#: ../src/unix/snglinst.cpp:251
+#: ../src/unix/snglinst.cpp:247

 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 msgstr "锁文件 '%s' 没有正确的所有者."
 
 #, 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' 没有正确的权限."
 
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限."
 

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

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

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

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

-#: ../src/gtk/mdi.cpp:465
+#: ../src/richtext/richtextbulletspage.cpp:283
+#: ../src/richtext/richtextliststylepage.cpp:488
+msgid "Lower case letters"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:285
+#: ../src/richtext/richtextliststylepage.cpp:490
+msgid "Lower case roman numerals"
+msgstr ""
+
+#: ../src/gtk/mdi.cpp:466 ../src/gtk1/mdi.cpp:462

 msgid "MDI child"
 msgstr "MDI子窗口"
 
 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/menucmn.cpp:86
+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帮助库. 请安装它."
 
 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:4929
+#: ../src/univ/themes/win32.cpp:3740

 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
 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: 不完整条目被忽略."
-
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/generic/fdrepdlg.cpp:146

 msgid "Match case"
 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:164

 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 

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

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

-#: ../src/univ/themes/metal.cpp:174
+#: ../src/univ/themes/metal.cpp:169

 msgid "Metal theme"
 msgid "Metal theme"

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

 
 

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

 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
 msgid "Mi&nimize"
 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:161

 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr "显示模式 %ix%i-%i位色 不支持."
 
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr "显示模式 %ix%i-%i位色 不支持."
 

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

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

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

 msgid "Modified"
 msgid "Modified"

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

 
 

-#: ../src/common/module.cpp:77
+#: ../src/common/module.cpp:133

 #, c-format
 msgid "Module \"%s\" initialization failed"
 #, c-format
 msgid "Module \"%s\" initialization failed"

-msgstr ""
+msgstr "模块 \"%s\" 初始化失败"

 
 

-#: ../src/common/paper.cpp:138
+#: ../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 英寸"
 
 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
+#: ../contrib/src/gizmos/editlbox.cpp:158

 msgid "Move down"
 msgstr "下移"
 
 msgid "Move down"
 msgstr "下移"
 

-#: ../contrib/src/gizmos/editlbox.cpp:161
+#: ../contrib/src/gizmos/editlbox.cpp:157

 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

-#: ../src/generic/filedlgg.cpp:431
+#: ../src/common/menucmn.cpp:99
+msgid "NUM_LOCK"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:506

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

-#: ../src/generic/dirdlgg.cpp:109
+#: ../src/richtext/richtextstyledlg.cpp:218
+msgid "New &Character Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:230
+msgid "New &List Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:224
+msgid "New &Paragraph Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:570
+#: ../src/richtext/richtextstyledlg.cpp:575
+#: ../src/richtext/richtextstyledlg.cpp:618
+#: ../src/richtext/richtextstyledlg.cpp:623
+#: ../src/richtext/richtextstyledlg.cpp:772
+#: ../src/richtext/richtextstyledlg.cpp:777
+#, fuzzy
+msgid "New Style"
+msgstr "新项目"
+
+#: ../src/generic/dirdlgg.cpp:100

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

-#: ../contrib/src/gizmos/editlbox.cpp:159
+#: ../contrib/src/gizmos/editlbox.cpp:155

 msgid "New item"
 msgstr "新项目"
 
 msgid "New item"
 msgstr "新项目"
 

-#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
-#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
+#: ../src/generic/dirdlgg.cpp:324 ../src/generic/dirdlgg.cpp:334
+#: ../src/generic/filedlgg.cpp:688 ../src/generic/filedlgg.cpp:697

 msgid "NewName"
 msgid "NewName"

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

 
 

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

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

-#: ../src/html/helpfrm.cpp:665
+#: ../src/html/helpwnd.cpp:651

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

-#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
-#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:204
+#: ../src/mac/carbon/msgdlg.cpp:63 ../src/mac/carbon/msgdlg.cpp:119
+#: ../src/mac/carbon/msgdlg.cpp:203 ../src/mac/classic/msgdlg.cpp:59
+#: ../src/mac/classic/msgdlg.cpp:143 ../src/motif/msgdlg.cpp:204

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

-#: ../contrib/src/deprecated/resource.cpp:2495
-#: ../contrib/src/deprecated/resource.cpp:2649
+#: ../contrib/src/deprecated/resource.cpp:2505
+#: ../contrib/src/deprecated/resource.cpp:2659

 msgid "No XBM facility available!"
 msgid "No XBM facility available!"

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

 
 

-#: ../contrib/src/deprecated/resource.cpp:2667
+#: ../contrib/src/deprecated/resource.cpp:2677

 msgid "No XPM icon facility available!"
 msgstr "没有可用的XPM图标设备!"
 
 msgid "No XPM icon facility available!"
 msgstr "没有可用的XPM图标设备!"
 

-#: ../src/generic/helpext.cpp:437
+#: ../src/generic/animateg.cpp:156
+#, fuzzy, c-format
+msgid "No animation handler for type %ld defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/generic/helpext.cpp:452

 msgid "No entries found."
 msgstr "没找到条目"
 
 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"
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"


@@ -2926,333 +3975,382 @@ msgid ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""
 "Do you want to use this encoding (otherwise you will have to choose another "
 "one)?"
 msgstr ""

-"在编码 '%s' 中未找到显示文本所用的字体,\n"
+"编码 '%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 ""
 #, 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:677
+#: ../src/xrc/xmlres.cpp:715

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

-#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
+#: ../src/generic/animateg.cpp:144
+#, fuzzy
+msgid "No handler found for animation type."
+msgstr "没有找到图像类型处理器."
+
+#: ../src/common/image.cpp:2158 ../src/common/image.cpp:2201

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

-#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
-#: ../src/common/image.cpp:1589
+#: ../src/common/image.cpp:2254

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

-#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
+#: ../src/common/image.cpp:2166 ../src/common/image.cpp:2209
+#, fuzzy, c-format
+msgid "No image handler for type %ld defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/common/image.cpp:2233 ../src/common/image.cpp:2269

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

-#: ../src/html/helpfrm.cpp:869
+#: ../src/html/htmlhelp.cpp:436 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:850

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

-#: ../src/unix/sound.cpp:89
+#: ../src/unix/sound.cpp:82

 msgid "No sound"
 msgstr "没有声音"
 
 msgid "No sound"
 msgstr "没有声音"
 

-#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
+#: ../src/common/image.cpp:1838 ../src/common/image.cpp:1879

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

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

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

-#: ../src/common/fmapbase.cpp:113
+#: ../src/generic/helpext.cpp:309
+#, c-format
+msgid "No valid mappings found in the file \"%s\"."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:115

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

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

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

-#: ../src/html/helpfrm.cpp:1273
+#: ../src/html/helpwnd.cpp:1245

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

-#: ../src/html/helpfrm.cpp:1218
+#: ../src/html/helpwnd.cpp:1190

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

-#: ../src/common/paper.cpp:122
+#: ../src/richtext/richtextfontpage.cpp:228
+#, fuzzy
+msgid "Not underlined"
+msgstr "下划线"
+
+#: ../src/common/paper.cpp:117

 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 

-#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-#: ../contrib/src/deprecated/proplist.cpp:506
+#: ../src/richtext/richtextbulletspage.cpp:286
+#: ../src/richtext/richtextliststylepage.cpp:491
+msgid "Numbered outline"
+msgstr ""
+
+#: ../src/mac/carbon/msgdlg.cpp:65 ../src/msw/dialog.cpp:180
+#: ../src/richtext/richtextstyledlg.cpp:283 ../src/gtk1/fontdlg.cpp:139
+#: ../contrib/src/deprecated/proplist.cpp:502

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

-#: ../src/common/xtixml.cpp:263
+#: ../src/common/xtixml.cpp:260

 msgid "Objects must have an id attribute"
 msgid "Objects must have an id attribute"

-msgstr "对象必须有一个id属性(attribute)"
+msgstr "对象必须有一个id属性"

 
 

-#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
+#: ../src/common/docview.cpp:1279 ../src/common/docview.cpp:1629

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

-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpwnd.cpp:659 ../src/html/helpwnd.cpp:1531

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

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

 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 
 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 

-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
+#: ../src/generic/dirctrlg.cpp:737 ../src/generic/dirdlgg.cpp:350
+#: ../src/generic/filedlgg.cpp:712 ../src/generic/filedlgg.cpp:862

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

-#: ../src/common/cmdline.cpp:702
+#: ../src/common/cmdline.cpp:716

 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "选项 '%s' 要求一个值, 期望 '='."
 
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "选项 '%s' 要求一个值, 期望 '='."
 

-#: ../src/common/cmdline.cpp:722
+#: ../src/common/cmdline.cpp:737

 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "选项 '%s' 需要值."
 
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "选项 '%s' 需要值."
 

-#: ../src/common/cmdline.cpp:784
+#: ../src/common/cmdline.cpp:802

 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 不能转成日期."
 
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 不能转成日期."
 

-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/dirdlgg.cpp:185 ../src/generic/prntdlgg.cpp:612

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

-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:863

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

-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/menucmn.cpp:102
+msgid "PAGEDOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:101
+msgid "PAGEUP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:87
+msgid "PAUSE"
+msgstr ""
+
+#: ../src/common/imagpcx.cpp:456 ../src/common/imagpcx.cpp:479

 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 不能分配内存"
 
 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: 图像格式不支持"
 
 msgid "PCX: image format unsupported"
 msgstr "PCX: 图像格式不支持"
 

-#: ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:478

 msgid "PCX: invalid image"
 msgstr "PCX: 无效图像"
 
 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文件."
 
 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: 未知错误 !!!"
 
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 

-#: ../src/common/imagpcx.cpp:463
+#: ../src/common/imagpcx.cpp:457

 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 

-#: ../src/common/imagpnm.cpp:92
+#: ../src/common/menucmn.cpp:73
+msgid "PGDN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:72
+msgid "PGUP"
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:88

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

-#: ../src/common/imagpnm.cpp:76
+#: ../src/common/imagpnm.cpp:72

 msgid "PNM: File format is not recognized."
 msgstr "PNM: 不能识别的文件格式."
 
 msgid "PNM: File format is not recognized."
 msgstr "PNM: 不能识别的文件格式."
 

-#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
-#: ../src/common/imagpnm.cpp:142
+#: ../src/common/imagpnm.cpp:104 ../src/common/imagpnm.cpp:121
+#: ../src/common/imagpnm.cpp:138

 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断."
 

-#: ../src/common/paper.cpp:194
+#: ../src/common/paper.cpp:189

 msgid "PRC 16K 146 x 215 mm"
 msgid "PRC 16K 146 x 215 mm"

-msgstr ""
+msgstr "中国 16开 纸, 146 x 215 毫米"

 
 

-#: ../src/common/paper.cpp:207
+#: ../src/common/paper.cpp:202

 msgid "PRC 16K Rotated"
 msgid "PRC 16K Rotated"

-msgstr ""
+msgstr "中国 16开 纸张(横向)"

 
 

-#: ../src/common/paper.cpp:195
+#: ../src/common/paper.cpp:190

 msgid "PRC 32K 97 x 151 mm"
 msgid "PRC 32K 97 x 151 mm"

-msgstr ""
+msgstr "中国 32开 纸, 97 x 151 毫米"

 
 

-#: ../src/common/paper.cpp:208
+#: ../src/common/paper.cpp:203

 msgid "PRC 32K Rotated"
 msgid "PRC 32K Rotated"

-msgstr ""
+msgstr "中国 32开 纸张(横向)"

 
 

-#: ../src/common/paper.cpp:196
+#: ../src/common/paper.cpp:191

 msgid "PRC 32K(Big) 97 x 151 mm"
 msgid "PRC 32K(Big) 97 x 151 mm"

-msgstr ""
+msgstr "中国 32开(大) 纸, 97 x 151 毫米"

 
 

-#: ../src/common/paper.cpp:209
+#: ../src/common/paper.cpp:204

 msgid "PRC 32K(Big) Rotated"
 msgid "PRC 32K(Big) Rotated"

-msgstr ""
+msgstr "中国 32开(大) 纸张(横向)"

 
 

-#: ../src/common/paper.cpp:197
-#, fuzzy
+#: ../src/common/paper.cpp:192

 msgid "PRC Envelope #1 102 x 165 mm"
 msgid "PRC Envelope #1 102 x 165 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封1#, 102 x 165 毫米"

 
 

-#: ../src/common/paper.cpp:210
-#, fuzzy
+#: ../src/common/paper.cpp:205

 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
 msgid "PRC Envelope #1 Rotated 165 x 102 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封1#(横向), 165 x 102 毫米"

 
 

-#: ../src/common/paper.cpp:206
-#, fuzzy
+#: ../src/common/paper.cpp:201

 msgid "PRC Envelope #10 324 x 458 mm"
 msgid "PRC Envelope #10 324 x 458 mm"

-msgstr "C3 信封, 324 x 458 毫米"
+msgstr "中国标准信封10#, 324 x 458 毫米"

 
 

-#: ../src/common/paper.cpp:219
-#, fuzzy
-msgid "PRC Envelope #10 Rotated 458 x 324 m"
-msgstr "C4 信封, 229 x 324 毫米"
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中国标准信封10#(横向), 458 x 324 毫米"

 
 

-#: ../src/common/paper.cpp:198
-#, fuzzy
+#: ../src/common/paper.cpp:193

 msgid "PRC Envelope #2 102 x 176 mm"
 msgid "PRC Envelope #2 102 x 176 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封2#, 102 x 176 毫米"

 
 

-#: ../src/common/paper.cpp:211
-#, fuzzy
+#: ../src/common/paper.cpp:206

 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
 msgid "PRC Envelope #2 Rotated 176 x 102 mm"

-msgstr "B6 信封, 176 x 125 毫米"
+msgstr "中国标准信封2#(横向), 176 x 102 毫米"

 
 

-#: ../src/common/paper.cpp:199
-#, fuzzy
+#: ../src/common/paper.cpp:194

 msgid "PRC Envelope #3 125 x 176 mm"
 msgid "PRC Envelope #3 125 x 176 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封3#, 125 x 176 毫米"

 
 

-#: ../src/common/paper.cpp:212
-#, fuzzy
+#: ../src/common/paper.cpp:207

 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
 msgid "PRC Envelope #3 Rotated 176 x 125 mm"

-msgstr "B6 信封, 176 x 125 毫米"
+msgstr "中国标准信封3#(横向), 176 x 125 毫米"

 
 

-#: ../src/common/paper.cpp:200
-#, fuzzy
+#: ../src/common/paper.cpp:195

 msgid "PRC Envelope #4 110 x 208 mm"
 msgid "PRC Envelope #4 110 x 208 mm"

-msgstr "DL 信封, 110 x 220 毫米"
+msgstr "中国标准信封4#, 110 x 208 毫米"

 
 

-#: ../src/common/paper.cpp:213
-#, fuzzy
+#: ../src/common/paper.cpp:208

 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
 msgid "PRC Envelope #4 Rotated 208 x 110 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封4#(横向), 208 x 110 毫米"

 
 

-#: ../src/common/paper.cpp:201
-#, fuzzy
+#: ../src/common/paper.cpp:196

 msgid "PRC Envelope #5 110 x 220 mm"
 msgid "PRC Envelope #5 110 x 220 mm"

-msgstr "DL 信封, 110 x 220 毫米"
+msgstr "中国标准信封5#, 110 x 220 毫米"

 
 

-#: ../src/common/paper.cpp:214
-#, fuzzy
+#: ../src/common/paper.cpp:209

 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
 msgid "PRC Envelope #5 Rotated 220 x 110 mm"

-msgstr "C4 信封, 229 x 324 毫米"
+msgstr "中国标准信封5#(横向), 220 x 110 毫米"

 
 

-#: ../src/common/paper.cpp:202
-#, fuzzy
+#: ../src/common/paper.cpp:197

 msgid "PRC Envelope #6 120 x 230 mm"
 msgid "PRC Envelope #6 120 x 230 mm"

-msgstr "C5 信封, 162 x 229 毫米"
+msgstr "中国标准信封6#, 120 x 230 毫米"

 
 

-#: ../src/common/paper.cpp:215
-#, fuzzy
+#: ../src/common/paper.cpp:210

 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
 msgid "PRC Envelope #6 Rotated 230 x 120 mm"

-msgstr "C5 信封, 162 x 229 毫米"
+msgstr "中国标准信封6#(横向), 230 x 120 毫米"

 
 

-#: ../src/common/paper.cpp:203
-#, fuzzy
+#: ../src/common/paper.cpp:198

 msgid "PRC Envelope #7 160 x 230 mm"
 msgid "PRC Envelope #7 160 x 230 mm"

-msgstr "B5 信封, 176 x 250 毫米"
+msgstr "中国标准信封7#, 160 x 230 毫米"

 
 

-#: ../src/common/paper.cpp:216
-#, fuzzy
+#: ../src/common/paper.cpp:211

 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
 msgid "PRC Envelope #7 Rotated 230 x 160 mm"

-msgstr "C6 信封, 114 x 162 毫米"
+msgstr "中国标准信封7#(横向), 230 x 160 毫米"

 
 

-#: ../src/common/paper.cpp:204
-#, fuzzy
+#: ../src/common/paper.cpp:199

 msgid "PRC Envelope #8 120 x 309 mm"
 msgid "PRC Envelope #8 120 x 309 mm"

-msgstr "C5 信封, 162 x 229 毫米"
+msgstr "中国标准信封8#, 120 x 309 毫米"

 
 

-#: ../src/common/paper.cpp:217
-#, fuzzy
+#: ../src/common/paper.cpp:212

 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
 msgid "PRC Envelope #8 Rotated 309 x 120 mm"

-msgstr "C4 信封, 229 x 324 毫米"
+msgstr "中国标准信封8#(横向), 309 x 120 毫米"

 
 

-#: ../src/common/paper.cpp:205
-#, fuzzy
+#: ../src/common/paper.cpp:200

 msgid "PRC Envelope #9 229 x 324 mm"
 msgid "PRC Envelope #9 229 x 324 mm"

-msgstr "C4 信封, 229 x 324 毫米"
+msgstr "中国标准信封9#, 229 x 324 毫米"

 
 

-#: ../src/common/paper.cpp:218
-#, fuzzy
+#: ../src/common/paper.cpp:213

 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"

-msgstr "C5 信封, 162 x 229 毫米"
+msgstr "中国标准信封9#(横向), 324 x 229 毫米"
+
+#: ../src/common/menucmn.cpp:90
+msgid "PRINT"
+msgstr ""

 
 

-#: ../src/common/prntbase.cpp:1294
+#: ../src/common/prntbase.cpp:1542

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

-#: ../src/common/prntbase.cpp:1292
+#: ../src/common/prntbase.cpp:1540

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

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

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

-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
+#: ../src/common/prntbase.cpp:460 ../src/gtk/gnome/gprint.cpp:548

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

-#: ../src/generic/prntdlgg.cpp:210
+#: ../src/generic/prntdlgg.cpp:211

 msgid "Pages"
 msgstr "页"
 
 msgid "Pages"
 msgstr "页"
 

-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-#: ../src/generic/prntdlgg.cpp:1056
+#: ../src/generic/prntdlgg.cpp:795 ../src/generic/prntdlgg.cpp:849
+#: ../src/generic/prntdlgg.cpp:1051

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

-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-#: ../src/generic/prntdlgg.cpp:1051
+#: ../src/generic/prntdlgg.cpp:596 ../src/generic/prntdlgg.cpp:836
+#: ../src/generic/prntdlgg.cpp:1046

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

-#: ../src/common/xtistrm.cpp:425
+#: ../src/richtext/richtextstyles.cpp:752
+msgid "Paragraph styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:421

 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
 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"
 
 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"
 
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/generic/filedlgg.cpp:437
+#: ../src/richtext/richtextctrl.cpp:2077
+#, fuzzy
+msgid "Paste"
+msgstr "粘贴(&P)"
+
+#: ../src/common/stockitem.cpp:207
+#, fuzzy
+msgid "Paste selection"
+msgstr "选段"
+
+#: ../src/richtext/richtextbulletspage.cpp:168
+#: ../src/richtext/richtextliststylepage.cpp:221
+msgid "Peri&od"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:512

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


@@ -3260,187 +4358,209 @@ msgstr "允许"
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 

-#: ../src/gtk/fontdlg.cpp:81
+#: ../src/gtk1/fontdlg.cpp:75

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

-#: ../src/generic/filedlgg.cpp:1325
+#: ../src/generic/filedlgg.cpp:1472

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

-#: ../src/html/helpfrm.cpp:813
+#: ../src/html/helpwnd.cpp:795

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

-#: ../src/msw/dialup.cpp:787
+#: ../src/msw/dialup.cpp:788

 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 

-#: ../src/msw/listctrl.cpp:444
+#: ../src/msw/listctrl.cpp:415

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""

-"请安装一个新版本的comctl32.dll\n"
+"请安装较新版本的comctl32.dll\n"

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

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

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

-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/generic/prntdlgg.cpp:606 ../src/generic/prntdlgg.cpp:861

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

-#: ../src/generic/prntdlgg.cpp:296
+#: ../src/generic/prntdlgg.cpp:294

 msgid "PostScript file"
 msgstr "PostScript文件"
 
 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/generic/fontdlgg.cpp:362 ../src/html/helpwnd.cpp:1207
+#: ../src/mac/carbon/fontdlg.cpp:513

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

-#: ../src/html/helpfrm.cpp:662
+#: ../src/html/helpwnd.cpp:648

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

-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
-#: ../src/gtk/gnome/gprint.cpp:407
+#: ../src/common/prntbase.cpp:402 ../src/generic/prntdlgg.cpp:139
+#: ../src/generic/prntdlgg.cpp:152 ../src/gtk/gnome/gprint.cpp:403
+#: ../src/gtk/gnome/gprint.cpp:415

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: ../src/common/docview.cpp:1032
+#: ../src/common/docview.cpp:1042

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

-#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
+#: ../src/common/prntbase.cpp:1494 ../src/common/prntbase.cpp:1520

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 

-#: ../src/generic/prntdlgg.cpp:218
+#: ../src/generic/prntdlgg.cpp:219

 msgid "Print Range"
 msgstr "打印范围"
 
 msgid "Print Range"
 msgstr "打印范围"
 

-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:443

 msgid "Print Setup"
 msgstr "打印设置"
 
 msgid "Print Setup"
 msgstr "打印设置"
 

-#: ../src/generic/prntdlgg.cpp:617
+#: ../src/generic/prntdlgg.cpp:615

 msgid "Print in colour"
 msgstr "彩色打印"
 
 msgid "Print in colour"
 msgstr "彩色打印"
 

-#: ../src/common/stockitem.cpp:138
+#: ../src/common/stockitem.cpp:144

 msgid "Print previe&w"
 msgstr "打印预览(&w)"
 
 msgid "Print previe&w"
 msgstr "打印预览(&w)"
 

-#: ../src/gtk/gnome/gprint.cpp:785
+#: ../src/gtk/gnome/gprint.cpp:795

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

-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:624

 msgid "Print spooling"
 msgstr "打印假脱机"
 
 msgid "Print spooling"
 msgstr "打印假脱机"
 

-#: ../src/html/helpfrm.cpp:679
+#: ../src/html/helpwnd.cpp:665

 msgid "Print this page"
 msgstr "打印本页"
 
 msgid "Print this page"
 msgstr "打印本页"
 

-#: ../src/generic/prntdlgg.cpp:179
+#: ../src/generic/prntdlgg.cpp:180

 msgid "Print to File"
 msgstr "打印到文件"
 
 msgid "Print to File"
 msgstr "打印到文件"
 

-#: ../src/generic/prntdlgg.cpp:489
+#: ../src/generic/prntdlgg.cpp:487

 msgid "Printer"
 msgstr "打印机"
 
 msgid "Printer"
 msgstr "打印机"
 

-#: ../src/generic/prntdlgg.cpp:629
+#: ../src/generic/prntdlgg.cpp:627

 msgid "Printer command:"
 msgstr "打印机命令:"
 
 msgid "Printer command:"
 msgstr "打印机命令:"
 

-#: ../src/generic/prntdlgg.cpp:174
+#: ../src/generic/prntdlgg.cpp:175

 msgid "Printer options"
 msgstr "打印机选项"
 
 msgid "Printer options"
 msgstr "打印机选项"
 

-#: ../src/generic/prntdlgg.cpp:641
+#: ../src/generic/prntdlgg.cpp:639

 msgid "Printer options:"
 msgstr "打印机选项:"
 
 msgid "Printer options:"
 msgstr "打印机选项:"
 

-#: ../src/generic/prntdlgg.cpp:915
+#: ../src/generic/prntdlgg.cpp:910

 msgid "Printer..."
 msgstr "打印机..."
 
 msgid "Printer..."
 msgstr "打印机..."
 

-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:191

 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../src/common/prntbase.cpp:319 ../src/common/prntbase.cpp:540

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:327
+#: ../src/common/prntbase.cpp:336

 msgid "Printing Error"
 msgstr "打印出错"
 
 msgid "Printing Error"
 msgstr "打印出错"
 

-#: ../src/generic/printps.cpp:208
+#: ../src/generic/printps.cpp:204

 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 
 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 

-#: ../src/generic/printps.cpp:168
+#: ../src/generic/printps.cpp:164

 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../src/common/debugrpt.cpp:546
+#: ../src/common/debugrpt.cpp:552

 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 

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

 msgid "Program aborted."
 msgstr "程序终止."
 
 msgid "Program aborted."
 msgstr "程序终止."
 

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

 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

-#: ../src/generic/logg.cpp:1165
+#: ../src/generic/logg.cpp:1166

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

+#: ../src/common/stockitem.cpp:208
+#, fuzzy
+msgid "Quit this program"
+msgstr "打印本页"
+
+#: ../src/common/menucmn.cpp:71
+msgid "RETURN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:75
+msgid "RIGHT"
+msgstr ""
+

 #: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 
 #: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 

-#: ../src/common/prntbase.cpp:242
+#: ../src/common/prntbase.cpp:251

 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../src/xrc/xmlres.cpp:643
+#: ../src/common/stockitem.cpp:209
+msgid "Redo last action"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:681

 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "ref=\"%s\"的引用对象节点不存在!"
 
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "ref=\"%s\"的引用对象节点不存在!"
 

-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:148

 msgid "Refresh"
 msgstr "刷新"
 
 msgid "Refresh"
 msgstr "刷新"
 

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

 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 

-#: ../src/msw/registry.cpp:529
+#: ../src/msw/registry.cpp:524

 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在, 不能改名."
 
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在, 不能改名."
 

-#: ../src/msw/registry.cpp:661
+#: ../src/msw/registry.cpp:656

 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"


@@ -3451,24 +4571,29 @@ msgstr ""
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 

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

 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 

-#: ../src/generic/helpext.cpp:442
+#: ../src/richtext/richtextfontpage.cpp:222
+#: ../src/richtext/richtextfontpage.cpp:225
+msgid "Regular"
+msgstr ""
+
+#: ../src/generic/helpext.cpp:461

 msgid "Relevant entries:"
 msgstr "相关条目:"
 
 msgid "Relevant entries:"
 msgstr "相关条目:"
 

-#: ../src/generic/progdlgg.cpp:210
+#: ../src/generic/progdlgg.cpp:206

 msgid "Remaining time : "
 msgstr "剩余时间 : "
 
 msgid "Remaining time : "
 msgstr "剩余时间 : "
 

-#: ../src/common/stockitem.cpp:143
+#: ../src/common/stockitem.cpp:149

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../src/html/helpfrm.cpp:445
+#: ../src/html/helpwnd.cpp:422

 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 


@@ -3477,86 +4602,166 @@ msgstr "从书签中移去当前页"
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 

-#: ../src/common/stockitem.cpp:117
+#: ../src/richtext/richtextbuffer.cpp:2732
+msgid "Renumber List"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:123

 msgid "Rep&lace"
 msgstr "替换(&l)"
 
 msgid "Rep&lace"
 msgstr "替换(&l)"
 

-#: ../src/generic/fdrepdlg.cpp:188
+#: ../src/richtext/richtextctrl.cpp:2206
+#, fuzzy
+msgid "Replace"
+msgstr "替换(&R)"
+
+#: ../src/generic/fdrepdlg.cpp:181

 msgid "Replace &all"
 msgstr "全部替换(&a)"
 
 msgid "Replace &all"
 msgstr "全部替换(&a)"
 

-#: ../src/generic/fdrepdlg.cpp:130
+#: ../src/common/stockitem.cpp:206
+#, fuzzy
+msgid "Replace selection"
+msgstr "全部替换(&a)"
+
+#: ../src/generic/fdrepdlg.cpp:123

 msgid "Replace with:"
 msgstr "替换为:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 

-#: ../src/xrc/xmlres.cpp:479
+#: ../src/xrc/xmlres.cpp:504

 msgid "Resource files must have same version number!"
 msgstr "资源文件必须有相同的版本号!"
 
 msgid "Resource files must have same version number!"
 msgstr "资源文件必须有相同的版本号!"
 

-#: ../src/common/stockitem.cpp:144
+#: ../src/common/stockitem.cpp:150

 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 

-#: ../src/generic/prntdlgg.cpp:891
+#: ../src/richtext/richtextbulletspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:250
+#, fuzzy
+msgid "Right"
+msgstr "细"
+
+#: ../src/generic/prntdlgg.cpp:886

 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 

-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/richtext/richtextindentspage.cpp:155
+#: ../src/richtext/richtextindentspage.cpp:157
+#: ../src/richtext/richtextliststylepage.cpp:337
+#: ../src/richtext/richtextliststylepage.cpp:339
+msgid "Right-align text."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:229

 msgid "Roman"
 msgstr "罗马"
 
 msgid "Roman"
 msgstr "罗马"
 

-#: ../src/common/sizer.cpp:1838
+#: ../src/richtext/richtextbulletspage.cpp:249
+#: ../src/richtext/richtextliststylepage.cpp:299
+msgid "S&tandard bullet name:"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:100
+msgid "SCROLL_LOCK"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:89
+msgid "SELECT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:95
+msgid "SEPARATOR"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:153
+msgid "SHIFT-JIS"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:92
+msgid "SNAPSHOT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:80
+msgid "SPACE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:270 ../src/common/menucmn.cpp:329
+msgid "SPECIAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:96
+msgid "SUBTRACT"
+msgstr ""
+
+#: ../src/common/sizer.cpp:2018

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: ../src/common/fldlgcmn.cpp:259
+#: ../src/common/fldlgcmn.cpp:271

 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 

-#: ../src/common/stockitem.cpp:146
+#: ../src/common/stockitem.cpp:152

 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 

-#: ../src/common/docview.cpp:305
+#: ../src/common/docview.cpp:300

 msgid "Save as"
 msgstr "另存为"
 
 msgid "Save as"
 msgstr "另存为"
 

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

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 

-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:232

 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/html/htmlhelp.cpp:610 ../src/html/helpwnd.cpp:513
+#: ../src/html/helpwnd.cpp:528

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../src/html/helpfrm.cpp:538
+#: ../src/html/helpwnd.cpp:515

 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 

-#: ../src/generic/fdrepdlg.cpp:166
+#: ../src/generic/fdrepdlg.cpp:159

 msgid "Search direction"
 msgid "Search direction"

-msgstr "搜索目录"
+msgstr "搜索方向"

 
 

-#: ../src/generic/fdrepdlg.cpp:118
+#: ../src/generic/fdrepdlg.cpp:111

 msgid "Search for:"
 msgstr "搜索:"
 
 msgid "Search for:"
 msgstr "搜索:"
 

-#: ../src/html/helpfrm.cpp:1060
+#: ../src/html/helpwnd.cpp:1039

 msgid "Search in all books"
 msgid "Search in all books"

-msgstr "在索引书中搜索"
+msgstr "搜索所有的书籍"

 
 

-#: ../src/html/helpfrm.cpp:868
+#: ../src/html/htmlhelp.cpp:593
+#, fuzzy
+msgid "Search!"
+msgstr "搜索"
+
+#: ../src/html/htmlhelp.cpp:383 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:849

 msgid "Searching..."
 msgid "Searching..."

-msgstr "搜索..."
+msgstr "搜索中..."

 
 

-#: ../src/generic/dirctrlg.cpp:592
+#: ../src/generic/dirctrlg.cpp:608

 msgid "Sections"
 msgstr "段"
 
 msgid "Sections"
 msgstr "段"
 


@@ -3570,102 +4775,197 @@ msgstr "文件 '%s'定位错误"
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
 

-#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
+#: ../src/mac/carbon/textctrl.cpp:1122 ../src/msw/textctrl.cpp:2214
+#: ../src/richtext/richtextctrl.cpp:2428

 msgid "Select &All"
 msgid "Select &All"

-msgstr "选择所有(&A)"
+msgstr "全部选择(&A)"

 
 

-#: ../src/common/docview.cpp:1699
+#: ../src/common/docview.cpp:1709

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1776
+#: ../src/common/docview.cpp:1786

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/common/docview.cpp:1579
+#: ../src/common/docview.cpp:1589

 msgid "Select a file"
 msgstr "选择文件"
 
 msgid "Select a file"
 msgstr "选择文件"
 

-#: ../src/motif/filedlg.cpp:226
+#: ../src/common/stockitem.cpp:153

 #, fuzzy
 #, fuzzy

+msgid "Select all"
+msgstr "全部选择(&A)"
+
+#: ../src/richtext/richtextfontpage.cpp:180
+#: ../src/richtext/richtextfontpage.cpp:182
+msgid "Select regular or bold."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:167
+#: ../src/richtext/richtextfontpage.cpp:169
+msgid "Select regular or italic style."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:193
+#: ../src/richtext/richtextfontpage.cpp:195
+msgid "Select underlining or no underlining."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:223

 msgid "Selection"
 msgid "Selection"

-msgstr "段"
+msgstr "选段"

 
 

-#: ../src/common/cmdline.cpp:739
+#: ../src/richtext/richtextliststylepage.cpp:186
+#: ../src/richtext/richtextliststylepage.cpp:188
+msgid "Selects the list level to edit."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:755

 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s'后存在分隔符."
 
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s'后存在分隔符."
 

-#: ../include/wx/xti.h:841
+#: ../include/wx/xti.h:837

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

-#: ../src/generic/prntdlgg.cpp:182
+#: ../src/generic/prntdlgg.cpp:183

 msgid "Setup..."
 msgstr "设置..."
 
 msgid "Setup..."
 msgstr "设置..."
 

-#: ../src/msw/dialup.cpp:567
+#: ../src/msw/dialup.cpp:568

 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 

-#: ../src/html/helpfrm.cpp:493
+#: ../src/common/menucmn.cpp:318
+#, fuzzy
+msgid "Shift-"
+msgstr "shift"
+
+#: ../src/generic/dirdlgg.cpp:168
+#, fuzzy
+msgid "Show &hidden directories"
+msgstr "显示隐藏目录"
+
+#: ../src/generic/filedlgg.cpp:1157
+#, fuzzy
+msgid "Show &hidden files"
+msgstr "显示隐藏文件"
+
+#: ../src/common/stockitem.cpp:202
+msgid "Show about dialog"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:470

 msgid "Show all"
 msgid "Show all"

-msgstr "显示所有"
+msgstr "全部显示"

 
 

-#: ../src/html/helpfrm.cpp:504
+#: ../src/html/helpwnd.cpp:481

 msgid "Show all items in index"
 msgid "Show all items in index"

-msgstr "把所有项目显示为索引"
+msgstr "以索引方式显示所有项目"

 
 

-#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
+#: ../src/generic/dirdlgg.cpp:103

 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/generic/filedlgg.cpp:1056
-msgid "Show hidden files"
-msgstr "显示隐藏文件"
-
-#: ../src/html/helpfrm.cpp:646
+#: ../src/html/htmlhelp.cpp:538 ../src/html/helpwnd.cpp:632

 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/richtext/richtextsymboldlg.cpp:420
+#: ../src/richtext/richtextsymboldlg.cpp:422
+msgid "Shows a Unicode subset."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:273
+#: ../src/richtext/richtextbulletspage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:476
+#: ../src/richtext/richtextliststylepage.cpp:478
+msgid "Shows a preview of the bullet settings."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:213
+#: ../src/richtext/richtextfontpage.cpp:215
+msgid "Shows a preview of the font settings."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:517 ../src/mac/carbon/fontdlg.cpp:519
+msgid "Shows a preview of the font."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:303
+#: ../src/richtext/richtextindentspage.cpp:305
+msgid "Shows a preview of the paragraph settings."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:367 ../src/generic/fontdlgg.cpp:369

 msgid "Shows the font preview."
 msgstr "显示字体预览."
 
 msgid "Shows the font preview."
 msgstr "显示字体预览."
 

-#: ../src/generic/filedlgg.cpp:432
+#: ../src/univ/themes/mono.cpp:509
+msgid "Simple monochrome theme"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:289
+#: ../src/richtext/richtextindentspage.cpp:293
+#: ../src/richtext/richtextindentspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:460
+#: ../src/richtext/richtextliststylepage.cpp:464
+#: ../src/richtext/richtextliststylepage.cpp:465
+msgid "Single"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:507

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-#: ../src/generic/progdlgg.cpp:598
+#: ../src/mac/carbon/fontdlg.cpp:462
+#, fuzzy
+msgid "Size:"
+msgstr "大小"
+
+#: ../src/generic/progdlgg.cpp:218 ../src/generic/progdlgg.cpp:236
+#: ../src/generic/progdlgg.cpp:627

 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 

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

 msgid "Slant"
 msgstr "倾斜"
 
 msgid "Slant"
 msgstr "倾斜"
 

-#: ../src/common/docview.cpp:581
+#: ../src/common/docview.cpp:576

 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 
 msgid "Sorry, could not open this file for saving."
 msgstr "对不起, 不能打开文件供保存."
 

-#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
+#: ../src/common/docview.cpp:612 ../src/common/docview.cpp:1608

 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 
 msgid "Sorry, could not open this file."
 msgstr "对不起, 不能打开文件."
 

-#: ../src/common/docview.cpp:588
+#: ../src/common/docview.cpp:583

 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 
 msgid "Sorry, could not save this file."
 msgstr "对不起, 不能保存文件."
 

-#: ../src/common/prntbase.cpp:1246
+#: ../contrib/src/fl/controlbar.cpp:384
+msgid ""
+"Sorry, docking is not supported for ports other than wxMSW, wxMac and wxGTK"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1494

 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起, 没有足够内存创建预览."
 

-#: ../src/common/docview.cpp:1028
+#: ../src/common/docview.cpp:1038

 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "对不起, 需要先安装打印机才能创建打印预览."
 
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr "对不起, 需要先安装打印机才能创建打印预览."
 

-#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
+#: ../src/richtext/richtextstyledlg.cpp:575
+#: ../src/richtext/richtextstyledlg.cpp:623
+#: ../src/richtext/richtextstyledlg.cpp:777
+msgid "Sorry, that name is taken. Please choose another."
+msgstr ""
+
+#: ../src/common/docview.cpp:1278 ../src/common/docview.cpp:1628

 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起, 此文件的格式未知."
 


@@ -3678,108 +4978,182 @@ msgstr "声音数据为不支持的格式."
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s'为不支持的格式."
 
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s'为不支持的格式."
 

-#: ../src/common/paper.cpp:111
+#: ../src/richtext/richtextliststylepage.cpp:471
+#, fuzzy
+msgid "Spacing"
+msgstr "搜索中..."
+
+#: ../src/richtext/richtextbulletspage.cpp:289
+#: ../src/richtext/richtextliststylepage.cpp:494
+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 英寸"
 
 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:199

 msgid "Status:"
 msgstr "状态:"
 
 msgid "Status:"
 msgstr "状态:"
 

-#: ../src/generic/logg.cpp:622
+#: ../src/generic/logg.cpp:623

 msgid "Status: "
 msgstr "状态: "
 
 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 "不支持针对尚未形成流的对象的流委派"
 
 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"
 
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+#: ../include/wx/xti.h:424 ../include/wx/xti.h:428

 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 
 msgid "String conversions not supported"
 msgstr "不支持字符串装换"
 

-#: ../src/xrc/xmlres.cpp:750
+#: ../src/richtext/richtextformatdlg.cpp:266
+#, fuzzy
+msgid "Style"
+msgstr "字体(&S):"
+
+#: ../include/wx/richtext/richtextstyledlg.h:42
+msgid "Style Organiser"
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:471
+#, fuzzy
+msgid "Style:"
+msgstr "字体(&S):"
+
+#: ../src/xrc/xmlres.cpp:788

 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 

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

 msgid "SuperA/SuperA/A4 227 x 356 mm"
 msgid "SuperA/SuperA/A4 227 x 356 mm"

-msgstr ""
+msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"

 
 

-#: ../src/common/paper.cpp:158
+#: ../src/common/paper.cpp:153

 msgid "SuperB/SuperB/A3 305 x 487 mm"
 msgid "SuperB/SuperB/A3 305 x 487 mm"

-msgstr ""
+msgstr "SuperB/SuperB/A3 纸张, 305 x 487 毫米"

 
 

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

 msgid "Swiss"
 msgstr "瑞士"
 
 msgid "Swiss"
 msgstr "瑞士"
 

-#: ../src/common/imagtiff.cpp:165
-msgid "TIFF library error."
+#: ../src/richtext/richtextbulletspage.cpp:287
+#: ../src/richtext/richtextliststylepage.cpp:492
+msgid "Symbol"

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/imagtiff.cpp:149
-msgid "TIFF library warning."
+#: ../src/richtext/richtextbulletspage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:288
+#, fuzzy
+msgid "Symbol &font:"
+msgstr "正常字体:"
+
+#: ../include/wx/richtext/richtextsymboldlg.h:44
+msgid "Symbols"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:81
+msgid "TAB"

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
-#: ../src/common/imagtiff.cpp:399
+#: ../src/common/imagtiff.cpp:194
+msgid "TIFF library error."
+msgstr "TIFF库错误."
+
+#: ../src/common/imagtiff.cpp:178
+msgid "TIFF library warning."
+msgstr "TIFF库警告."
+
+#: ../src/common/imagtiff.cpp:277 ../src/common/imagtiff.cpp:288
+#: ../src/common/imagtiff.cpp:434

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

-#: ../src/common/imagtiff.cpp:219
+#: ../src/common/imagtiff.cpp:248

 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误."
 
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误."
 

-#: ../src/common/imagtiff.cpp:270
+#: ../src/common/imagtiff.cpp:299

 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误."
 
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误."
 

-#: ../src/common/imagtiff.cpp:347
+#: ../src/common/imagtiff.cpp:376

 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误."
 

-#: ../src/common/imagtiff.cpp:445
+#: ../src/common/imagtiff.cpp:480

 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误."
 

-#: ../src/common/paper.cpp:152
-#, fuzzy
+#: ../src/common/paper.cpp:147

 msgid "Tabloid Extra 11.69 x 18 in"
 msgid "Tabloid Extra 11.69 x 18 in"

-msgstr "小报, 11 x 17 英寸"
+msgstr "小报(特大), 11.69 x 18 英寸"

 
 

-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:104

 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报, 11 x 17 英寸"
 

-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/richtext/richtextformatdlg.cpp:284
+msgid "Tabs"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:234

 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1700
+#: ../src/common/docview.cpp:1710

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 

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

 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 

-#: ../src/common/ftp.cpp:708
+#: ../src/common/ftp.cpp:704

 msgid "The FTP server doesn't support passive mode."
 msgstr "FTP服务器不支持passive模式."
 
 msgid "The FTP server doesn't support passive mode."
 msgstr "FTP服务器不支持passive模式."
 

-#: ../src/common/ftp.cpp:696
+#: ../src/common/ftp.cpp:692

 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持PORT命令."
 
 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持PORT命令."
 

-#: ../src/common/fontmap.cpp:204
+#: ../src/richtext/richtextbulletspage.cpp:160
+#: ../src/richtext/richtextbulletspage.cpp:162
+#: ../src/richtext/richtextliststylepage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:216
+msgid "The available bullet styles."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:195
+#: ../src/richtext/richtextstyledlg.cpp:197
+#, fuzzy
+msgid "The available styles."
+msgstr "字体风格."
+
+#: ../src/richtext/richtextbulletspage.cpp:201
+#: ../src/richtext/richtextbulletspage.cpp:203
+#: ../src/richtext/richtextbulletspage.cpp:224
+#: ../src/richtext/richtextbulletspage.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:254
+#: ../src/richtext/richtextliststylepage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:277
+msgid "The bullet character."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:442
+#: ../src/richtext/richtextsymboldlg.cpp:444
+msgid "The character code."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:201

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"


@@ -3790,12 +5164,17 @@ msgstr ""
 "代替它; 如果不能\n"
 "被替代则选择[取消] "
 
 "代替它; 如果不能\n"
 "被替代则选择[取消] "
 

-#: ../src/msw/ole/dataobj.cpp:164
+#: ../src/msw/ole/dataobj.cpp:160

 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在."
 
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在."
 

-#: ../src/generic/dirdlgg.cpp:224
+#: ../src/richtext/richtextstylepage.cpp:127
+#: ../src/richtext/richtextstylepage.cpp:129
+msgid "The default style for the next paragraph."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:229

 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"


@@ -3804,7 +5183,7 @@ msgstr ""
 "目录 '%s'不存在\n"
 "现在创建?"
 
 "目录 '%s'不存在\n"
 "现在创建?"
 

-#: ../src/common/docview.cpp:1949
+#: ../src/common/docview.cpp:1977

 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"


@@ -3813,7 +5192,7 @@ msgstr ""
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不能打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/common/docview.cpp:1959
+#: ../src/common/docview.cpp:1987

 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"


@@ -3822,32 +5201,83 @@ msgstr ""
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 
 "文件 '%s' 不存在,不能被打开.\n"
 "已从最近使用的文件列表(MRU)中移去."
 

-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:221
+#: ../src/richtext/richtextindentspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:398
+#: ../src/richtext/richtextliststylepage.cpp:400
+#, fuzzy
+msgid "The first line indent."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:321 ../src/generic/fontdlgg.cpp:323

 msgid "The font colour."
 msgstr "字体颜色."
 
 msgid "The font colour."
 msgstr "字体颜色."
 

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

 msgid "The font family."
 msgstr "字体."
 
 msgid "The font family."
 msgstr "字体."
 

-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+#: ../src/richtext/richtextsymboldlg.cpp:404
+#: ../src/richtext/richtextsymboldlg.cpp:406
+msgid "The font from which to take the symbol."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:334 ../src/generic/fontdlgg.cpp:336
+#: ../src/generic/fontdlgg.cpp:341 ../src/generic/fontdlgg.cpp:343

 msgid "The font point size."
 msgstr "字体大小(磅值)."
 
 msgid "The font point size."
 msgstr "字体大小(磅值)."
 

-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+#: ../src/mac/carbon/fontdlg.cpp:466 ../src/mac/carbon/fontdlg.cpp:468
+#, fuzzy
+msgid "The font size in points."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:293 ../src/generic/fontdlgg.cpp:295

 msgid "The font style."
 msgstr "字体风格."
 
 msgid "The font style."
 msgstr "字体风格."
 

-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+#: ../src/generic/fontdlgg.cpp:304 ../src/generic/fontdlgg.cpp:306

 msgid "The font weight."
 msgstr "字体粗细."
 
 msgid "The font weight."
 msgstr "字体粗细."
 

-#: ../src/common/filename.cpp:966
+#: ../src/richtext/richtextindentspage.cpp:209
+#: ../src/richtext/richtextindentspage.cpp:211
+#: ../src/richtext/richtextliststylepage.cpp:387
+#: ../src/richtext/richtextliststylepage.cpp:389
+#, fuzzy
+msgid "The left indent."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextindentspage.cpp:295
+#: ../src/richtext/richtextindentspage.cpp:297
+#: ../src/richtext/richtextliststylepage.cpp:466
+#: ../src/richtext/richtextliststylepage.cpp:468
+msgid "The line spacing."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:265
+#: ../src/richtext/richtextbulletspage.cpp:267
+msgid "The list item number."
+msgstr ""
+
+#: ../src/common/filename.cpp:1224

 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路径 '%s' 包含了过多的\"..\"!"
 

-#: ../src/generic/dbgrptg.cpp:308
+#: ../src/common/log.cpp:291
+#, c-format
+msgid "The previous message repeated once."
+msgid_plural "The previous message repeated %lu times."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:462
+#: ../src/richtext/richtextsymboldlg.cpp:464
+msgid "The range to show."
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:309

 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"
 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"


@@ -3856,133 +5286,229 @@ msgstr ""
 "报告包含了以下文件. 如果这些文件含有私人信息, \n"
 "请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
 
 "报告包含了以下文件. 如果这些文件含有私人信息, \n"
 "请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
 

-#: ../src/common/cmdline.cpp:883
+#: ../src/common/cmdline.cpp:903

 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必须的参数 '%s' 没有指定."
 
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必须的参数 '%s' 没有指定."
 

-#: ../src/common/textcmn.cpp:246
+#: ../src/richtext/richtextindentspage.cpp:233
+#: ../src/richtext/richtextindentspage.cpp:235
+#: ../src/richtext/richtextliststylepage.cpp:409
+#: ../src/richtext/richtextliststylepage.cpp:411
+msgid "The right indent."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:279
+#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextliststylepage.cpp:451
+msgid "The spacing after the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:266
+#: ../src/richtext/richtextindentspage.cpp:268
+#: ../src/richtext/richtextliststylepage.cpp:438
+#: ../src/richtext/richtextliststylepage.cpp:440
+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:207
+#: ../src/richtext/richtextstyledlg.cpp:209
+#, 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:254 ../src/richtext/richtextctrl.cpp:1781

 msgid "The text couldn't be saved."
 msgstr "文本不能被保存."
 
 msgid "The text couldn't be saved."
 msgstr "文本不能被保存."
 

-#: ../src/common/cmdline.cpp:862
+#: ../src/common/cmdline.cpp:881

 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s'的值必须被指定."
 
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s'的值必须被指定."
 

-#: ../src/msw/dialup.cpp:455
+#: ../src/msw/dialup.cpp:456

 #, 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)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 
 #, 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)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 

-#: ../src/html/htmprint.cpp:601
+#: ../src/html/htmprint.cpp:610 ../src/richtext/richtextprint.cpp:561

 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 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/datectrl.cpp:110

 msgid ""
 "This system doesn't support date picker control, please upgrade your version "
 "of comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
 msgid ""
 "This system doesn't support date picker control, please upgrade your version "
 "of comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1206
+#: ../src/msw/thread.cpp:1247

 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 

-#: ../src/unix/threadpsx.cpp:1603
+#: ../src/unix/threadpsx.cpp:1618

 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 

-#: ../src/msw/thread.cpp:1194
+#: ../src/msw/thread.cpp:1235

 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 

-#: ../src/unix/threadpsx.cpp:1108
+#: ../src/unix/threadpsx.cpp:1136

 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略."
 

-#: ../src/msw/mdi.cpp:184
+#: ../src/msw/mdi.cpp:172

 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 
 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 

-#: ../src/msw/mdi.cpp:185
+#: ../src/msw/mdi.cpp:173

 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 

-#: ../src/common/ftp.cpp:635
+#: ../src/common/ftp.cpp:631

 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 

-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/msw/timer.cpp:111 ../src/os2/timer.cpp:130

 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 
 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 

-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:218

 msgid "Tip of the Day"
 msgstr "每日技巧"
 
 msgid "Tip of the Day"
 msgstr "每日技巧"
 

-#: ../src/generic/tipdlg.cpp:157
+#: ../src/generic/tipdlg.cpp:153

 msgid "Tips not available, sorry!"
 msgstr "对不起, 没有所需技巧!"
 
 msgid "Tips not available, sorry!"
 msgstr "对不起, 没有所需技巧!"
 

-#: ../src/generic/prntdlgg.cpp:237
+#: ../src/generic/prntdlgg.cpp:238

 msgid "To:"
 msgstr "到:"
 
 msgid "To:"
 msgstr "到:"
 

-#: ../src/common/imagpng.cpp:292
+#: ../src/richtext/richtextbuffer.cpp:4953
+msgid "Too many EndStyle calls!"
+msgstr ""
+
+#: ../src/common/imagpng.cpp:294

 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 

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

 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 

-#: ../src/common/fs_mem.cpp:205
+#: ../src/generic/aboutdlgg.cpp:79
+msgid "Translations by "
+msgstr ""
+
+#: ../src/common/fs_mem.cpp:193

 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 
 #, 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:247

 msgid "Trying to solve a NULL hostname: giving up"
 msgid "Trying to solve a NULL hostname: giving up"

-msgstr "试图解决 NULL 主机名: 放弃"
+msgstr "试图解析 NULL 主机名: 放弃"

 
 

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

 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 

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

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-#: ../src/common/xtixml.cpp:498
+#: ../src/richtext/richtextfontpage.cpp:126
+#: ../src/richtext/richtextfontpage.cpp:128
+#, fuzzy
+msgid "Type a font name."
+msgstr "字体."
+
+#: ../src/richtext/richtextfontpage.cpp:144
+#: ../src/richtext/richtextfontpage.cpp:146
+msgid "Type a size in points."
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:277 ../src/common/xtixml.cpp:348
+#: ../src/common/xtixml.cpp:495

 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 

-#: ../src/common/paper.cpp:140
+#: ../src/common/menucmn.cpp:76
+msgid "UP"
+msgstr ""
+
+#: ../src/common/paper.cpp:135

 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgid "US Std Fanfold, 14 7/8 x 11 in"

-msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿, 14 7/8 x 11 英寸"

 
 

-#: ../src/html/htmlwin.cpp:403
+#: ../src/common/fmapbase.cpp:151
+#, fuzzy
+msgid "US-ASCII"
+msgstr "ASCII"
+
+#: ../src/common/strconv.cpp:2771 ../src/common/strconv.cpp:2775
+msgid "Unable to create TextEncodingConverter"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:508

 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "不能打开HTML文档: %s"
 
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "不能打开HTML文档: %s"
 

-#: ../src/unix/sound.cpp:376
+#: ../src/unix/sound.cpp:369

 msgid "Unable to play sound asynchronously."
 msgstr "不能异步地播放声音."
 
 msgid "Unable to play sound asynchronously."
 msgstr "不能异步地播放声音."
 

-#: ../src/common/stockitem.cpp:148
+#: ../src/common/stockitem.cpp:155

 msgid "Undelete"
 msgstr "取消删除"
 
 msgid "Undelete"
 msgstr "取消删除"
 

+#: ../src/mac/carbon/fontdlg.cpp:493 ../src/richtext/richtextfontpage.cpp:229
+#: ../src/richtext/richtextfontpage.cpp:313
+#: ../src/richtext/richtextfontpage.cpp:468
+#, fuzzy
+msgid "Underlined"
+msgstr "下划线(&U)"
+
+#: ../src/common/stockitem.cpp:210
+msgid "Undo last action"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:691
+#, fuzzy, c-format
+msgid "Unexpected characters following option '%s'."
+msgstr "意外参数 '%s'"
+

 #: ../contrib/src/deprecated/resource.cpp:1848
 #: ../contrib/src/deprecated/resource.cpp:1862
 #: ../contrib/src/deprecated/resource.cpp:1879
 #: ../contrib/src/deprecated/resource.cpp:1848
 #: ../contrib/src/deprecated/resource.cpp:1862
 #: ../contrib/src/deprecated/resource.cpp:1879


@@ -3991,290 +5517,327 @@ msgstr "取消删除"
 #: ../contrib/src/deprecated/resource.cpp:1992
 #: ../contrib/src/deprecated/resource.cpp:2008
 #: ../contrib/src/deprecated/resource.cpp:2022
 #: ../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
+#: ../contrib/src/deprecated/resource.cpp:3080
+#: ../contrib/src/deprecated/resource.cpp:3094
+#: ../contrib/src/deprecated/resource.cpp:3111
+#: ../contrib/src/deprecated/resource.cpp:3125

 msgid "Unexpected end of file while parsing resource."
 msgstr "在解析资源时意外到达文件结尾."
 
 msgid "Unexpected end of file while parsing resource."
 msgstr "在解析资源时意外到达文件结尾."
 

-#: ../src/common/cmdline.cpp:826
+#: ../src/common/cmdline.cpp:844

 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 

-#: ../src/common/fmapbase.cpp:137
+#: ../src/richtext/richtextsymboldlg.cpp:458
+#, fuzzy
+msgid "Unicode"
+msgstr "取消缩进(&U)"
+
+#: ../src/common/fmapbase.cpp:140 ../src/common/fmapbase.cpp:146

 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的Unicode编码 (UTF-16)"
 
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的Unicode编码 (UTF-16)"
 

-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:145

 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 

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

 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 

-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:142 ../src/common/fmapbase.cpp:148

 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的Unicode编码 (UTF-32)"
 
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的Unicode编码 (UTF-32)"
 

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

 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 

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

 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 

-#: ../src/common/fmapbase.cpp:135
+#: ../src/common/fmapbase.cpp:137

 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的Unicode编码 (UTF-7)"
 
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的Unicode编码 (UTF-7)"
 

-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:138

 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的Unicode编码 (UTF-8)"
 
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的Unicode编码 (UTF-8)"
 

-#: ../src/msw/dde.cpp:1093
+#: ../src/generic/progdlgg.cpp:613
+#, fuzzy
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/msw/dde.cpp:1088

 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 
 #, 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"
 
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象被传递给GetObjectClassInfo"
 

-#: ../src/unix/dlunix.cpp:275
+#: ../src/unix/dlunix.cpp:281

 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

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

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 

-#: ../src/unix/mimetype.cpp:2344
+#: ../src/common/cmdline.cpp:598

 #, c-format
 #, 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'"
 
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 

-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:630

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 

-#: ../src/xrc/xmlres.cpp:823
+#: ../src/xrc/xmlres.cpp:865

 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 
 msgid "Unknown style flag "
 msgstr "未知的风格标志 "
 

-#: ../src/common/xtixml.cpp:324
-#, fuzzy, c-format
+#: ../src/common/xtixml.cpp:321
+#, c-format

 msgid "Unkown Property %s"
 msgstr "未知属性 %s"
 
 msgid "Unkown Property %s"
 msgstr "未知属性 %s"
 

-#: ../src/common/mimecmn.cpp:163
+#: ../src/common/mimecmn.cpp:169

 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s中有不配套的'{'."
 

-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-#: ../src/common/cmdproc.cpp:307
+#: ../src/common/cmdproc.cpp:257 ../src/common/cmdproc.cpp:283
+#: ../src/common/cmdproc.cpp:303

 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 msgid "Unnamed command"
 msgstr "未命名的命令"
 

-#: ../contrib/src/deprecated/resource.cpp:2367
-#, fuzzy, c-format
+#: ../contrib/src/deprecated/resource.cpp:2377
+#, c-format

 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 
 msgid "Unrecognized style %s while parsing resource."
 msgstr "解析资源时遇到无法识别的风格 %s."
 

-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/mac/classic/clipbrd.cpp:66 ../src/msw/clipbrd.cpp:267
+#: ../src/msw/clipbrd.cpp:439

 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式."
 

-#: ../src/common/appcmn.cpp:232
+#: ../src/common/appcmn.cpp:260

 #, c-format
 msgid "Unsupported theme '%s'."
 #, c-format
 msgid "Unsupported theme '%s'."

-msgstr "不支持的主题(theme) '%s'."
+msgstr "不支持的主题 '%s'."

 
 

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

 msgid "Up"
 msgstr "向上"
 
 msgid "Up"
 msgstr "向上"
 

-#: ../src/common/cmdline.cpp:954
+#: ../src/richtext/richtextbulletspage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:487
+msgid "Upper case letters"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:489
+msgid "Upper case roman numerals"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:975

 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 

-#: ../src/common/valtext.cpp:181
+#: ../src/richtext/richtextindentspage.cpp:176
+#: ../src/richtext/richtextindentspage.cpp:178
+#: ../src/richtext/richtextliststylepage.cpp:358
+#: ../src/richtext/richtextliststylepage.cpp:360
+msgid "Use the current alignment setting."
+msgstr ""
+
+#: ../src/common/valtext.cpp:177

 msgid "Validation conflict"
 msgstr "验证冲突"
 
 msgid "Validation conflict"
 msgstr "验证冲突"
 

-#: ../contrib/src/mmedia/vidbase.cpp:65
+#: ../contrib/src/mmedia/vidbase.cpp:62

 msgid "Video Output"
 msgstr "视频输出"
 
 msgid "Video Output"
 msgstr "视频输出"
 

-#: ../src/generic/filedlgg.cpp:972
+#: ../src/generic/filedlgg.cpp:1061

 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 

-#: ../src/generic/filedlgg.cpp:965
+#: ../src/generic/filedlgg.cpp:1054

 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 

-#: ../src/common/docview.cpp:1777
+#: ../src/common/docview.cpp:1787

 msgid "Views"
 msgstr "视图"
 
 msgid "Views"
 msgstr "视图"
 

+#: ../src/common/menucmn.cpp:126
+msgid "WINDOWS_LEFT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:128
+msgid "WINDOWS_MENU"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:127
+msgid "WINDOWS_RIGHT"
+msgstr ""
+

 #: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子过程终止失败"
 
 #: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子过程终止失败"
 

-#: ../src/common/docview.cpp:461
+#: ../src/common/docview.cpp:456 ../src/html/htmprint.cpp:380

 msgid "Warning"
 msgstr "警告"
 
 msgid "Warning"
 msgstr "警告"
 

-#: ../src/common/log.cpp:480
+#: ../src/common/log.cpp:445

 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 

-#: ../src/html/htmlpars.cpp:391
+#: ../src/html/htmlpars.cpp:385

 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告: 试图从空栈中移去HTML标签处理器."
 
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告: 试图从空栈中移去HTML标签处理器."
 

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

 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 

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

 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧(带欧元符号) (ISO-8859-15)"
 
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧(带欧元符号) (ISO-8859-15)"
 

-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355

 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线."
 

-#: ../src/generic/fdrepdlg.cpp:150
+#: ../src/generic/fdrepdlg.cpp:143

 msgid "Whole word"
 msgstr "整字"
 
 msgid "Whole word"
 msgstr "整字"
 

-#: ../src/html/helpfrm.cpp:535
+#: ../src/html/helpwnd.cpp:512

 msgid "Whole words only"
 msgstr "仅为整字"
 
 msgid "Whole words only"
 msgstr "仅为整字"
 

-#: ../src/univ/themes/win32.cpp:1235
+#: ../src/univ/themes/win32.cpp:1058

 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 
 msgid "Win32 theme"
 msgstr "Win32主题(theme)"
 

-#: ../src/msw/utils.cpp:1063
+#: ../src/msw/utils.cpp:1080

 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1上的Win32s"
 
 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1上的Win32s"
 

-#: ../src/msw/utils.cpp:1112
+#: ../src/msw/utils.cpp:1129

 #, c-format
 msgid "Windows 2000 (build %lu"
 msgstr "Windows 2000 (build %lu"
 
 #, c-format
 msgid "Windows 2000 (build %lu"
 msgstr "Windows 2000 (build %lu"
 

-#: ../src/msw/utils.cpp:1077
+#: ../src/msw/utils.cpp:1094

 msgid "Windows 95"
 msgstr "Windows 95"
 
 msgid "Windows 95"
 msgstr "Windows 95"
 

-#: ../src/msw/utils.cpp:1073
+#: ../src/msw/utils.cpp:1090

 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 

-#: ../src/msw/utils.cpp:1088
+#: ../src/msw/utils.cpp:1105

 msgid "Windows 98"
 msgstr "Windows 98"
 
 msgid "Windows 98"
 msgstr "Windows 98"
 

-#: ../src/msw/utils.cpp:1084
+#: ../src/msw/utils.cpp:1101

 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 

-#: ../src/msw/utils.cpp:1095
+#: ../src/msw/utils.cpp:1112

 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:134

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 

-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:135

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 

-#: ../src/common/fmapbase.cpp:126
+#: ../src/msw/utils.cpp:1074
+#, fuzzy, c-format
+msgid "Windows CE (%d.%d)"
+msgstr "Windows 9x (%d.%d)"
+
+#: ../src/common/fmapbase.cpp:128

 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 

-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:125

 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "Windows 简体中文 (CP 936)"
 
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "Windows 简体中文 (CP 936)"
 

-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:127

 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows 繁体中文 (CP 950)"
 
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows 繁体中文 (CP 950)"
 

-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:129

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 

-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:131

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 

-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:133

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 

-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:124

 msgid "Windows Japanese (CP 932)"
 msgstr "Windows 日语 (CP 932)"
 
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows 日语 (CP 932)"
 

-#: ../src/common/fmapbase.cpp:124
+#: ../src/common/fmapbase.cpp:126

 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 

-#: ../src/msw/utils.cpp:1092
+#: ../src/msw/utils.cpp:1109

 msgid "Windows ME"
 msgstr "Windows ME"
 
 msgid "Windows ME"
 msgstr "Windows ME"
 

-#: ../src/msw/utils.cpp:1127
+#: ../src/msw/utils.cpp:1144

 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 
 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
 msgstr "Windows NT %lu.%lu (build %lu"
 

-#: ../src/msw/utils.cpp:1120
+#: ../src/msw/utils.cpp:1137

 #, c-format
 msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (build %lu"
 
 #, c-format
 msgid "Windows Server 2003 (build %lu"
 msgstr "Windows Server 2003 (build %lu"
 

-#: ../src/common/fmapbase.cpp:121
-#, fuzzy
+#: ../src/common/fmapbase.cpp:123

 msgid "Windows Thai (CP 874)"
 msgid "Windows Thai (CP 874)"

-msgstr "Windows æ³¢ç½\97ç\9a\84海语 (CP 1257)"
+msgstr "Windows æ³°å\9b½è¯­ (CP 874)"

 
 

-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:132

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 

-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:130

 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 

-#: ../src/msw/utils.cpp:1116
+#: ../src/msw/utils.cpp:1133

 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 
 #, c-format
 msgid "Windows XP (build %lu"
 msgstr "Windows XP (build %lu"
 

-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:136

 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 


@@ -4283,66 +5846,94 @@ msgstr "Windows/DOS OEM (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s'错误"
 
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s'错误"
 

-#: ../src/xml/xml.cpp:562
+#: ../src/xml/xml.cpp:658

 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 

-#: ../src/common/xpmdecod.cpp:774
+#: ../src/common/xpmdecod.cpp:794

 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
 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:709
+#, 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:720 ../src/common/xpmdecod.cpp:729
+#, fuzzy, c-format
+msgid "XPM: malformed colour definition '%s' at line %d!"

 msgstr "XPM: 错误的颜色定义 '%s'!"
 
 msgstr "XPM: 错误的颜色定义 '%s'!"
 

-#: ../src/xrc/xmlres.cpp:579
+#: ../src/common/xpmdecod.cpp:781
+#, c-format
+msgid "XPM: truncated image data at line %d!"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:606

 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 

-#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
+#: ../src/xrc/xmlres.cpp:1154 ../src/xrc/xmlres.cpp:1166
+#, fuzzy, c-format
+msgid "XRC resource: Cannot create animation from '%s'."
+msgstr "XRC资源: 不能从 '%s'创建位图."
+
+#: ../src/xrc/xmlres.cpp:1122 ../src/xrc/xmlres.cpp:1134

 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC资源: 不能从 '%s'创建位图."
 
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC资源: 不能从 '%s'创建位图."
 

-#: ../src/xrc/xmlres.cpp:1036
+#: ../src/xrc/xmlres.cpp:1080

 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 

-#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
-#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:204
+#: ../src/mac/carbon/msgdlg.cpp:64 ../src/mac/carbon/msgdlg.cpp:120
+#: ../src/mac/carbon/msgdlg.cpp:202 ../src/mac/classic/msgdlg.cpp:60
+#: ../src/mac/classic/msgdlg.cpp:142 ../src/motif/msgdlg.cpp:204

 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 

-#: ../src/generic/dirdlgg.cpp:306
+#: ../src/mac/carbon/overlay.cpp:146
+#, fuzzy
+msgid "You cannot Clear an overlay that is not inited"
+msgstr "你不能向该项中加入新的目录."
+
+#: ../src/mac/carbon/overlay.cpp:104 ../src/dfb/overlay.cpp:55
+msgid "You cannot Init an overlay twice"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:314

 msgid "You cannot add a new directory to this section."
 msgstr "你不能向该项中加入新的目录."
 
 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)"
 
 msgid "Zoom &In"
 msgstr "放大(&I)"
 

-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:163

 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 

-#: ../src/common/stockitem.cpp:154
+#: ../src/common/stockitem.cpp:161

 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 

-#: ../src/common/docview.cpp:2133
+#: ../src/common/docview.cpp:2161

 msgid "[EMPTY]"
 msgstr "[空]"
 
 msgid "[EMPTY]"
 msgstr "[空]"
 

-#: ../src/msw/dde.cpp:1060
+#: ../src/msw/dde.cpp:1055

 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML应用程序已创建延时race条件."
 
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML应用程序已创建延时race条件."
 

-#: ../src/msw/dde.cpp:1048
+#: ../src/msw/dde.cpp:1043

 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"


@@ -4353,39 +5944,39 @@ msgstr ""
 "或传给DDEML函数的是\n"
 "无效的实例标识."
 
 "或传给DDEML函数的是\n"
 "无效的实例标识."
 

-#: ../src/msw/dde.cpp:1066
+#: ../src/msw/dde.cpp:1061

 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败."
 
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败."
 

-#: ../src/msw/dde.cpp:1063
+#: ../src/msw/dde.cpp:1058

 msgid "a memory allocation failed."
 msgstr "内存分配失败."
 
 msgid "a memory allocation failed."
 msgstr "内存分配失败."
 

-#: ../src/msw/dde.cpp:1057
+#: ../src/msw/dde.cpp:1052

 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML参数验证失败."
 
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML参数验证失败."
 

-#: ../src/msw/dde.cpp:1039
+#: ../src/msw/dde.cpp:1034

 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步advise事务请求已超时."
 
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步advise事务请求已超时."
 

-#: ../src/msw/dde.cpp:1045
+#: ../src/msw/dde.cpp:1040

 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步data事务请求已超时."
 
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步data事务请求已超时."
 

-#: ../src/msw/dde.cpp:1054
+#: ../src/msw/dde.cpp:1049

 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步execute事务请求已超时."
 
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步execute事务请求已超时."
 

-#: ../src/msw/dde.cpp:1072
+#: ../src/msw/dde.cpp:1067

 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步poke事务请求已超时."
 
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步poke事务请求已超时."
 

-#: ../src/msw/dde.cpp:1087
+#: ../src/msw/dde.cpp:1082

 msgid "a request to end an advise transaction has timed out."
 msgstr "终止advise事务的请求已超时."
 
 msgid "a request to end an advise transaction has timed out."
 msgstr "终止advise事务的请求已超时."
 

-#: ../src/msw/dde.cpp:1081
+#: ../src/msw/dde.cpp:1076

 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"


@@ -4395,15 +5986,15 @@ msgstr ""
 "已被客户端终止的会话, 或服务器\n"
 "在完成事务前终止."
 
 "已被客户端终止的会话, 或服务器\n"
 "在完成事务前终止."
 

-#: ../src/msw/dde.cpp:1069
+#: ../src/msw/dde.cpp:1064

 msgid "a transaction failed."
 msgstr "事务失败."
 
 msgid "a transaction failed."
 msgstr "事务失败."
 

-#: ../src/common/menucmn.cpp:114
+#: ../src/common/menucmn.cpp:199

 msgid "alt"
 msgstr "alt"
 
 msgid "alt"
 msgstr "alt"
 

-#: ../src/msw/dde.cpp:1051
+#: ../src/msw/dde.cpp:1046

 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"


@@ -4415,15 +6006,15 @@ msgstr ""
 "或初始化为APPCMD_CLIENTONLY的应用程序\n"
 "视图执行服务器事务."
 
 "或初始化为APPCMD_CLIENTONLY的应用程序\n"
 "视图执行服务器事务."
 

-#: ../src/msw/dde.cpp:1075
+#: ../src/msw/dde.cpp:1070

 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用PostMessage失败. "
 
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用PostMessage失败. "
 

-#: ../src/msw/dde.cpp:1084
+#: ../src/msw/dde.cpp:1079

 msgid "an internal error has occurred in the DDEML."
 msgstr "在DDEML中发生内部错误."
 
 msgid "an internal error has occurred in the DDEML."
 msgstr "在DDEML中发生内部错误."
 

-#: ../src/msw/dde.cpp:1090
+#: ../src/msw/dde.cpp:1085

 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"


@@ -4433,12 +6024,12 @@ msgstr ""
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 
 "一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
 "回调函数事务标识符就不再有效."
 

-#: ../src/common/zipstrm.cpp:1330
+#: ../src/common/zipstrm.cpp:1272

 #, fuzzy
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是分段的zip文件"
 
 #, fuzzy
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是分段的zip文件"
 

-#: ../src/common/fileconf.cpp:1847
+#: ../src/common/fileconf.cpp:1880

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s'的修改."


@@ -4451,155 +6042,147 @@ msgstr "库函数参数错误"
 msgid "bad signature"
 msgstr "错误的签名"
 
 msgid "bad signature"
 msgstr "错误的签名"
 

-#: ../src/common/zipstrm.cpp:1580
+#: ../src/common/zipstrm.cpp:1712

 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 
 msgid "bad zipfile offset to entry"
 msgstr "zip文件中到条目的偏移值错误"
 

-#: ../src/common/ftp.cpp:385
+#: ../src/common/ftp.cpp:381

 msgid "binary"
 msgstr "二进制"
 
 msgid "binary"
 msgstr "二进制"
 

-#: ../src/common/fontcmn.cpp:646
+#: ../src/common/fontcmn.cpp:696

 msgid "bold"
 msgstr "粗体"
 
 msgid "bold"
 msgstr "粗体"
 

-#: ../src/common/fontcmn.cpp:570
-msgid "bold "
-msgstr "粗体 "
-
-#: ../src/os2/iniconf.cpp:451
+#: ../src/os2/iniconf.cpp:458
+#, fuzzy

 msgid "buffer is too small for Windows directory."
 msgid "buffer is too small for Windows directory."

-msgstr ""
+msgstr "Windows目录的缓存太小."

 
 #: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
 msgstr "不能关闭文件 '%s'"
 
 
 #: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
 msgstr "不能关闭文件 '%s'"
 

-#: ../src/common/file.cpp:286
+#: ../src/common/file.cpp:279

 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "不能关闭文件描述子 %d"
 
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "不能关闭文件描述子 %d"
 

-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:545

 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "不能把修改提交给文件 '%s'"
 
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "不能把修改提交给文件 '%s'"
 

-#: ../src/common/file.cpp:217
+#: ../src/common/file.cpp:213

 #, c-format
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 
 #, c-format
 msgid "can't create file '%s'"
 msgstr "不能创建文件 '%s'"
 

-#: ../src/common/fileconf.cpp:1159
+#: ../src/common/fileconf.cpp:1195

 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "不能删除用户配置文件 '%s'"
 

-#: ../src/common/file.cpp:457
+#: ../src/common/file.cpp:451

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "不能确定是否已达文件 %d 的尾部"
 

-#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-#, fuzzy, c-format
+#: ../src/msdos/utilsdos.cpp:299 ../src/msdos/utilsdos.cpp:458
+#, c-format

 msgid "can't execute '%s'"
 msgid "can't execute '%s'"

-msgstr "执行 '%s'失败\n"
+msgstr "执行 '%s'失败"

 
 

-#: ../src/common/zipstrm.cpp:1357
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1487

 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 
 msgid "can't find central directory in zip"
 msgstr "不能在zip文件中找到中央目录"
 

-#: ../src/common/file.cpp:427
+#: ../src/common/file.cpp:421

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "不能获得文件描述子 %d的文件的长度"
 

-#: ../src/msw/utils.cpp:380
+#: ../src/msw/utils.cpp:394

 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的HOME目录, 使用当前目录."
 

-#: ../src/common/file.cpp:341
+#: ../src/common/file.cpp:337

 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "不能刷新文件描述子 %d"
 
 #, 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:393 ../src/msw/wince/filefnwce.cpp:198

 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "不能获得文件描述子 %d的指针位置"
 
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "不能获得文件描述子 %d的指针位置"
 

-#: ../src/common/fontmap.cpp:326
+#: ../src/common/fontmap.cpp:323

 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 
 msgid "can't load any font, aborting"
 msgstr "不能装载任何字体, 正在中止"
 

-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:265

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

-#: ../src/common/fileconf.cpp:404
+#: ../src/common/fileconf.cpp:403

 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "不能打开全局配置文件 '%s'."
 
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "不能打开全局配置文件 '%s'."
 

-#: ../src/common/fileconf.cpp:419
+#: ../src/common/fileconf.cpp:418

 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "不能打开用户配置文件 '%s'."
 

-#: ../src/common/fileconf.cpp:1005
+#: ../src/common/fileconf.cpp:1039

 msgid "can't open user configuration file."
 msgstr "不能打开用户配置文件."
 
 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(压缩)流."
 
 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(解压)流."
 
 msgid "can't re-initialize zlib inflate stream"
 msgstr "不能重新初始化zlib inflate(解压)流."
 

-#: ../src/common/file.cpp:310
+#: ../src/common/file.cpp:303

 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "不能从文件描述子 %d中读"
 
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "不能从文件描述子 %d中读"
 

-#: ../src/common/file.cpp:546
+#: ../src/common/file.cpp:540

 #, c-format
 msgid "can't remove file '%s'"
 msgstr "不能删除文件 '%s'"
 
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "不能删除文件 '%s'"
 

-#: ../src/common/file.cpp:562
+#: ../src/common/file.cpp:556

 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "不能删除临时文件 '%s'"
 

-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:379 ../src/msw/wince/filefnwce.cpp:185

 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "不能定位文件描述子 %d"
 
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "不能定位文件描述子 %d"
 

-#: ../src/common/textfile.cpp:196
+#: ../src/common/textfile.cpp:233

 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "不能把文件 '%s'写到磁盘."
 
 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "不能把文件 '%s'写到磁盘."
 

-#: ../src/common/file.cpp:326
+#: ../src/common/file.cpp:319

 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "不能写到文件描述子 %d"
 
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "不能写到文件描述子 %d"
 

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

 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 
 msgid "can't write user configuration file."
 msgstr "不能写用户配置文件."
 

-#: ../src/common/intl.cpp:1110
+#: ../src/common/intl.cpp:1152

 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到域 '%s'的目录文件."


@@ -4608,19 +6191,23 @@ msgstr "找不到域 '%s'的目录文件."
 msgid "checksum error"
 msgstr "校验和错误"
 
 msgid "checksum error"
 msgstr "校验和错误"
 

+#: ../src/common/tarstrm.cpp:744
+msgid "checksum failure reading tar header block"
+msgstr ""
+

 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 

-#: ../src/common/regex.cpp:141
+#: ../src/common/regex.cpp:235

 msgid "conversion to 8-bit encoding failed"
 msgstr "不能转换为8-bit编码"
 
 msgid "conversion to 8-bit encoding failed"
 msgstr "不能转换为8-bit编码"
 

-#: ../src/common/menucmn.cpp:112
+#: ../src/common/menucmn.cpp:197

 msgid "ctrl"
 msgstr "ctrl"
 
 msgid "ctrl"
 msgstr "ctrl"
 

-#: ../src/common/cmdline.cpp:1094
+#: ../src/common/cmdline.cpp:1115

 msgid "date"
 msgstr "日期"
 
 msgid "date"
 msgstr "日期"
 


@@ -4628,36 +6215,36 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
+#: ../src/common/fmapbase.cpp:681

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 

-#: ../src/common/xtistrm.cpp:843
+#: ../src/common/xtistrm.cpp:839

 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 
 msgid "delegate has no type info"
 msgstr "委派没有类型信息"
 

-#: ../src/common/debugrpt.cpp:524
+#: ../src/common/debugrpt.cpp:530

 msgid "dump of the process state (binary)"
 msgstr "转储(dump)进程状态（二进制码）"
 
 msgid "dump of the process state (binary)"
 msgstr "转储(dump)进程状态（二进制码）"
 

-#: ../src/common/datetime.cpp:3882
+#: ../src/common/datetime.cpp:3936

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetime.cpp:3872
+#: ../src/common/datetime.cpp:3926

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetime.cpp:3875
+#: ../src/common/datetime.cpp:3929

 msgid "eleventh"
 msgstr "第十一"
 
 msgid "eleventh"
 msgstr "第十一"
 

-#: ../src/common/strconv.cpp:2671
-#, c-format
-msgid "encoding %s"
+#: ../src/common/strconv.cpp:3488
+#, fuzzy, c-format
+msgid "encoding %i"

 msgstr "编码 %s"
 
 msgstr "编码 %s"
 

-#: ../src/common/fileconf.cpp:1833
+#: ../src/common/fileconf.cpp:1866

 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s'中已出现一次以上"


@@ -4666,30 +6253,29 @@ msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 msgid "error in data format"
 msgstr "文件格式错误"
 
 msgid "error in data format"
 msgstr "文件格式错误"
 

-#: ../src/msdos/utilsdos.cpp:407
-#, fuzzy, c-format
+#: ../src/msdos/utilsdos.cpp:399
+#, c-format

 msgid "error opening '%s'"
 msgid "error opening '%s'"

-msgstr "打开文件出错"
+msgstr "打开 '%s' 出错"

 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 
 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 

-#: ../src/common/zipstrm.cpp:1442
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1573

 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 
 msgid "error reading zip central directory"
 msgstr "读zip中央目录时出错"
 

-#: ../src/common/zipstrm.cpp:1520
+#: ../src/common/zipstrm.cpp:1664

 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 
 msgid "error reading zip local header"
 msgstr "读zip本地头时出错"
 

-#: ../src/common/zipstrm.cpp:2236
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:2383
+#, c-format

 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 

-#: ../src/msw/dialup.cpp:881
+#: ../src/msw/dialup.cpp:882

 msgid "establish"
 msgstr "建立"
 
 msgid "establish"
 msgstr "建立"
 


@@ -4698,116 +6284,134 @@ msgstr "建立"
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s'失败"
 

-#: ../src/common/datetime.cpp:3879
+#: ../src/common/datetime.cpp:3933

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetime.cpp:3869
+#: ../src/common/datetime.cpp:3923

 msgid "fifth"
 msgstr "第五"
 
 msgid "fifth"
 msgstr "第五"
 

-#: ../src/common/fileconf.cpp:664
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:666
+#, c-format

 msgid "file '%s', line %d: '%s' ignored after group header."
 msgid "file '%s', line %d: '%s' ignored after group header."

-msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
+msgstr "文件 '%s', 行 %d: 组头之后的 '%s' 被忽略."

 
 

-#: ../src/common/fileconf.cpp:693
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:695
+#, c-format

 msgid "file '%s', line %d: '=' expected."
 msgid "file '%s', line %d: '=' expected."

-msgstr "文件 '%s', 行 %d: 期望 '='."
+msgstr "文件 '%s', 行 %d: 期待出现 '='."

 
 

-#: ../src/common/fileconf.cpp:716
+#: ../src/common/fileconf.cpp:718

 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 

-#: ../src/common/fileconf.cpp:706
+#: ../src/common/fileconf.cpp:708

 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 

-#: ../src/common/fileconf.cpp:628
+#: ../src/common/fileconf.cpp:630

 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 

-#: ../src/common/datetime.cpp:3865
+#: ../src/richtext/richtextbuffer.cpp:5342
+#, fuzzy
+msgid "files"
+msgstr "文件"
+
+#: ../src/common/datetime.cpp:3919

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 

-#: ../src/html/helpfrm.cpp:1262
+#: ../src/html/helpwnd.cpp:1234

 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetime.cpp:3878
+#: ../src/common/datetime.cpp:3932

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetime.cpp:3868
+#: ../src/common/datetime.cpp:3922

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 

-#: ../src/common/appbase.cpp:367
+#: ../src/common/appbase.cpp:369

 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 

-#: ../src/common/xtixml.cpp:479
+#: ../src/richtext/richtextbuffer.cpp:7480
+#: ../src/richtext/richtextbuffer.cpp:7520
+#: ../src/richtext/richtextbuffer.cpp:7591
+msgid "image"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:721
+msgid "incomplete header block in tar"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:476

 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串, 缺少点号('.')"
 
 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串, 缺少点号('.')"
 

-#: ../src/msw/dialup.cpp:881
+#: ../src/common/tarstrm.cpp:1297
+msgid "incorrect size given for tar entry"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:882

 msgid "initiate"
 msgstr "初始化"
 
 msgid "initiate"
 msgstr "初始化"
 

-#: ../src/common/file.cpp:459
+#: ../src/common/tarstrm.cpp:917
+msgid "invalid data in extended tar header"
+msgstr ""
+
+#: ../src/common/file.cpp:453

 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 
 msgid "invalid eof() return value."
 msgstr "无效的eof()返回值."
 

-#: ../src/generic/logg.cpp:1179
+#: ../src/generic/logg.cpp:1180

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 

-#: ../src/common/zipstrm.cpp:1306
+#: ../src/common/zipstrm.cpp:1444

 msgid "invalid zip file"
 msgstr "无效的zip文件"
 
 msgid "invalid zip file"
 msgstr "无效的zip文件"
 

-#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
+#: ../src/common/fontcmn.cpp:701

 msgid "italic"
 msgstr "斜体"
 
 msgid "italic"
 msgstr "斜体"
 

-#: ../src/common/fontcmn.cpp:642
+#: ../src/common/fontcmn.cpp:691

 #, fuzzy
 msgid "light"
 msgstr "细"
 
 #, fuzzy
 msgid "light"
 msgstr "细"
 

-#: ../src/common/fontcmn.cpp:566
-#, fuzzy
-msgid "light "
-msgstr "细 "
-
-#: ../src/common/intl.cpp:1456
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1568
+#, c-format

 msgid "locale '%s' can not be set."
 msgid "locale '%s' can not be set."

-msgstr "不能设置现场(locale) '%s'."
+msgstr "不能设置语言(locale) '%s'."

 
 

-#: ../src/common/intl.cpp:1103
+#: ../src/common/intl.cpp:1143

 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "查找目录 '%s' 在路径 '%s'下."
 
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "查找目录 '%s' 在路径 '%s'下."
 

-#: ../src/common/datetime.cpp:4029
+#: ../src/common/datetime.cpp:4088

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetime.cpp:3883
+#: ../src/common/datetime.cpp:3937

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetime.cpp:3873
+#: ../src/common/datetime.cpp:3927

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 

-#: ../src/msw/dde.cpp:1035
+#: ../src/msw/dde.cpp:1030

 msgid "no DDE error."
 msgstr "没有DDE错误."
 
 msgid "no DDE error."
 msgstr "没有DDE错误."
 


@@ -4815,19 +6419,19 @@ msgstr "没有DDE错误."
 msgid "no error"
 msgstr "没有错误"
 
 msgid "no error"
 msgstr "没有错误"
 

-#: ../src/html/helpdata.cpp:662
+#: ../src/html/helpdata.cpp:655 ../src/html/htmlhelp.cpp:201

 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetime.cpp:4028
+#: ../src/common/datetime.cpp:4087

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 

-#: ../src/common/cmdline.cpp:1090
+#: ../src/common/cmdline.cpp:1111

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 

-#: ../src/common/xtixml.cpp:258
+#: ../src/common/xtixml.cpp:255

 msgid "objects cannot have XML Text Nodes"
 msgstr "对象不能有XML 文本节点"
 
 msgid "objects cannot have XML Text Nodes"
 msgstr "对象不能有XML 文本节点"
 


@@ -4835,7 +6439,7 @@ msgstr "对象不能有XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
 msgid "out of memory"
 msgstr "内存耗尽"
 

-#: ../src/common/debugrpt.cpp:500
+#: ../src/common/debugrpt.cpp:506

 msgid "process context description"
 msgstr "进程上下文描述"
 
 msgid "process context description"
 msgstr "进程上下文描述"
 


@@ -4843,25 +6447,25 @@ msgstr "进程上下文描述"
 msgid "read error"
 msgstr "读取错误"
 
 msgid "read error"
 msgstr "读取错误"
 

-#: ../src/common/filename.cpp:181
+#: ../src/common/filename.cpp:180

 msgid "reading"
 msgstr "正在读入"
 
 msgid "reading"
 msgstr "正在读入"
 

-#: ../src/common/zipstrm.cpp:1743
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1876
+#, c-format

 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入zip流 (条目 %s): crc校验错误"
 

-#: ../src/common/zipstrm.cpp:1740
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1873
+#, c-format

 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入zip流 (条目 %s): 长度错误"
 

-#: ../src/msw/dde.cpp:1078
+#: ../src/msw/dde.cpp:1073

 msgid "reentrancy problem."
 msgstr "重入问题."
 
 msgid "reentrancy problem."
 msgstr "重入问题."
 

-#: ../src/common/datetime.cpp:3866
+#: ../src/common/datetime.cpp:3920

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 


@@ -4869,145 +6473,151 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetime.cpp:3881
+#: ../src/common/datetime.cpp:3935

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetime.cpp:3871
+#: ../src/common/datetime.cpp:3925

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 

-#: ../src/common/menucmn.cpp:116
+#: ../src/common/menucmn.cpp:201

 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appbase.cpp:357
+#: ../src/common/appbase.cpp:359

 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetime.cpp:3880
+#: ../src/common/datetime.cpp:3934

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetime.cpp:3870
+#: ../src/common/datetime.cpp:3924

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 

-#: ../src/common/appcmn.cpp:203
+#: ../src/common/appcmn.cpp:231

 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 

-#: ../src/common/appcmn.cpp:189
+#: ../src/common/appcmn.cpp:217

 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 
 msgid "specify the theme to use"
 msgstr "指定使用的主题(theme)"
 

-#: ../src/common/zipstrm.cpp:1646
+#: ../src/common/zipstrm.cpp:1779

 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 
 msgid "stored file length not in Zip header"
 msgstr "Zip头没有已存文件的长度信息"
 

-#: ../src/common/cmdline.cpp:1086
+#: ../src/common/cmdline.cpp:1107

 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/datetime.cpp:3874
+#: ../src/common/tarstrm.cpp:927 ../src/common/tarstrm.cpp:949
+#: ../src/common/tarstrm.cpp:1417 ../src/common/tarstrm.cpp:1439
+msgid "tar entry not open"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3928

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 

-#: ../src/msw/dde.cpp:1042
+#: ../src/msw/dde.cpp:1037

 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致DDE_FBUSY位被设置."
 
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致DDE_FBUSY位被设置."
 

-#: ../src/common/datetime.cpp:3867
+#: ../src/common/datetime.cpp:3921

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetime.cpp:3877
+#: ../src/common/datetime.cpp:3931

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 

-#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
+#: ../src/common/imagtiff.cpp:174 ../src/common/imagtiff.cpp:190

 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模块: %s"
 

-#: ../src/common/datetime.cpp:3694
+#: ../src/common/datetime.cpp:3746

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetime.cpp:3696
+#: ../src/common/datetime.cpp:3748

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 

-#: ../src/common/datetime.cpp:3876
+#: ../src/gtk/aboutdlg.cpp:153
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3930

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetime.cpp:3884
+#: ../src/common/datetime.cpp:3938

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 

-#: ../src/common/fontcmn.cpp:638
+#: ../src/common/fontcmn.cpp:602 ../src/common/fontcmn.cpp:687

 msgid "underlined"
 msgstr "下划线"
 
 msgid "underlined"
 msgstr "下划线"
 

-#: ../src/common/fontcmn.cpp:553
-msgid "underlined "
-msgstr "下划线 "
-
-#: ../src/common/fileconf.cpp:1960
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:1993
+#, c-format

 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 

-#: ../src/generic/progdlgg.cpp:307
+#: ../src/common/tarstrm.cpp:968
+#, fuzzy
+msgid "unexpected end of file"
+msgstr "在解析资源时意外到达文件结尾."
+
+#: ../src/common/tarstrm.cpp:351 ../src/generic/progdlgg.cpp:303

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 

-#: ../src/common/xtixml.cpp:252
+#: ../src/common/xtixml.cpp:249

 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 

-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:257 ../src/html/chm.cpp:352

 msgid "unknown error"
 msgstr "未知错误"
 
 msgid "unknown error"
 msgstr "未知错误"
 

-#: ../src/msw/dialup.cpp:494
+#: ../src/msw/dialup.cpp:495

 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误(错误号 %08x)."
 
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误(错误号 %08x)."
 

-#: ../src/common/textbuf.cpp:230
+#: ../src/common/textbuf.cpp:229

 msgid "unknown line terminator"
 msgstr "未知行终止符"
 
 msgid "unknown line terminator"
 msgstr "未知行终止符"
 

-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/common/file.cpp:361 ../src/msw/wince/filefnwce.cpp:166

 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 

-#: ../src/common/fmapbase.cpp:719
+#: ../src/common/fmapbase.cpp:695

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 

-#: ../src/common/docview.cpp:430
+#: ../src/common/docview.cpp:425

 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1401
+#: ../src/common/docview.cpp:1411

 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 

-#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
+#: ../src/common/zipstrm.cpp:1793 ../src/common/zipstrm.cpp:2174

 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 
 msgid "unsupported Zip compression method"
 msgstr "不支持的Zip压缩方法"
 

-#: ../src/common/zipstrm.cpp:1142
-msgid "unsupported zip archive"
-msgstr "不支持的zip存档"
-
-#: ../src/common/intl.cpp:1115
+#: ../src/common/intl.cpp:1158

 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'."


@@ -5016,45 +6626,121 @@ msgstr "使用目录 '%s' 从 '%s'."
 msgid "write error"
 msgstr "写错误"
 
 msgid "write error"
 msgstr "写错误"
 

-#: ../src/common/filename.cpp:181
+#: ../src/common/filename.cpp:180

 msgid "writing"
 msgstr "正在写入"
 
 msgid "writing"
 msgstr "正在写入"
 

-#: ../src/common/stopwatch.cpp:291
+#: ../src/common/stopwatch.cpp:289

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败."
 

-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
+#: ../include/wx/richtext/richtextbulletspage.h:39
+msgid "wxRichTextBulletsPage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextfontpage.h:38
+#: ../include/wx/richtext/richtextindentspage.h:37
+#: ../include/wx/richtext/richtexttabspage.h:35
+msgid "wxRichTextFontPage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextliststylepage.h:31
+msgid "wxRichTextListStylePage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextstylepage.h:21
+msgid "wxRichTextStylePage"
+msgstr ""
+
+#: ../src/html/search.cpp:49
+msgid "wxSearchEngine::LookFor must be called before scanning!"
+msgstr ""
+
+#: ../src/common/socket.cpp:412 ../src/common/socket.cpp:466

 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg中无效的签名."
 

-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
+#: ../src/common/socket.cpp:993

 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知事件!."
 
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知事件!."
 

-#: ../src/motif/app.cpp:214
+#: ../src/motif/app.cpp:278

 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 

-#: ../src/x11/app.cpp:176
+#: ../src/x11/app.cpp:170

 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 不能打开显示设备: 已经存在."
 
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 不能打开显示设备: 已经存在."
 

-#: ../src/common/datetime.cpp:3695
+#: ../src/richtext/richtextsymboldlg.cpp:433
+msgid "xxxx"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3747

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 

-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:245 ../src/common/zstream.cpp:413

 #, c-format
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib错误 %d"
 

-#: ../src/common/prntbase.cpp:886
+#: ../src/common/prntbase.cpp:1123

 msgid "|<<"
 msgid "|<<"

+msgstr "|<<"
+
+#: ../src/richtext/richtextbulletspage.cpp:295
+#: ../src/richtext/richtextliststylepage.cpp:500
+msgid "~"

 msgstr ""
 
 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 "light "
+#~ msgstr "细 "
+
+#~ msgid "underlined "
+#~ msgstr "下划线 "
+
+#~ msgid "unsupported zip archive"
+#~ msgstr "不支持的zip存档"
+

 #~ msgid ""
 #~ "Failed to get stack backtrace:\n"
 #~ "%s"
 #~ msgid ""
 #~ "Failed to get stack backtrace:\n"
 #~ "%s"