Invalidate wxGrid best size when its associated table changes.

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 3ab87fa779fcdf6a5bb0bc5537bfba1a922ae68f..00455edb5f3688d10e826fedf4d5db2303849257 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,493 +1,978 @@
+# 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
+# Jiawei Huang <hjiawei@gmail.com>, 2011
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWidgets-2.5.2\n"
-"POT-Creation-Date: 2005-04-11 22:24+0200\n"
-"PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
-"Last-Translator: Liu XiaoXi <liouxiao@hotmail.com>\n"
+"Project-Id-Version: wxWidgets 2.8.10\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-27 11:51+0200\n"
+"PO-Revision-Date: 2012-08-26 22:18-0800\n"
+"Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
-"Previous-Translator: mrfx <mrfx@fm365.com>\n"
-
-#: ../src/common/debugrpt.cpp:547
-#, c-format
-msgid "\t%s: %s\n"
-msgstr ""
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/common/debugrpt.cpp:550
+#: ../src/common/debugrpt.cpp:582
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"
-"请将报告发送给程序维护人员, 谢谢!\n"
+"请将报告发送给程序维护人员，谢谢！\n"
 
-#: ../src/palmos/utils.cpp:205
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:230
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:293
+#: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"
-msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
+msgstr "              谢谢，我们对您遇到的不便表示抱歉！\n"
+
+#: ../src/common/prntbase.cpp:547
+#, fuzzy, c-format
+msgid " (copy %d of %d)"
+msgstr "页 %d / %d"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:428
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 
-#: ../src/common/docview.cpp:1432
+#: ../src/common/imagtiff.cpp:76
+#, c-format
+msgid " (in module \"%s\")"
+msgstr " (于模块: \"%s\")"
+
+#: ../src/common/docview.cpp:1615
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:570
+#: ../src/richtext/richtextprint.cpp:585 ../src/html/htmprint.cpp:705
 msgid " Preview"
 msgstr " 预览"
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/fontcmn.cpp:812
+msgid " bold"
+msgstr " 粗体"
+
+#: ../src/common/fontcmn.cpp:828
+msgid " italic"
+msgstr " 斜体"
+
+#: ../src/common/fontcmn.cpp:808
+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 英寸"
+msgstr "#10 信封，4 1/8 x 9 1/2 英寸"
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:120
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
-msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
+msgstr "#11 信封，4 1/2 x 10 3/8 英寸"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:121
 msgid "#12 Envelope, 4 3/4 x 11 in"
-msgstr "#12 信封, 4 3/4 x 11 英寸"
+msgstr "#12 信封，4 3/4 x 11 英寸"
 
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:122
 msgid "#14 Envelope, 5 x 11 1/2 in"
-msgstr "#14 信封, 5 x 11 1/2 英寸"
+msgstr "#14 信封，5 x 11 1/2 英寸"
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:118
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
-msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
+msgstr "#9 信封，3 7/8 x 8 7/8 英寸"
 
-#: ../contrib/src/deprecated/resource.cpp:1808
-#: ../contrib/src/deprecated/resource.cpp:1938
-#: ../contrib/src/deprecated/resource.cpp:3026
+#: ../src/html/helpwnd.cpp:1045
 #, c-format
-msgid "#define %s must be an integer."
-msgstr "#所定义的 %s 必须是整数."
+msgid "%d of %lu"
+msgstr "%d / %lu"
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpwnd.cpp:1682 ../src/html/helpwnd.cpp:1720
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 
-#: ../src/generic/filedlgg.cpp:295
+#: ../src/generic/filectrlg.cpp:309
 #, c-format
-msgid "%ld bytes"
-msgstr "%ld 字节"
+msgid "%ld byte"
+msgid_plural "%ld bytes"
+msgstr[0] "%ld 字节"
 
-#: ../src/common/cmdline.cpp:851
+#: ../src/html/helpwnd.cpp:1047
+#, c-format
+msgid "%lu of %lu"
+msgstr "%lu / %lu"
+
+#: ../src/common/cmdline.cpp:1043
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:266
+#: ../src/generic/logg.cpp:231
 #, c-format
 msgid "%s Error"
 msgstr "%s 错误"
 
-#: ../src/generic/logg.cpp:274
+#: ../src/generic/logg.cpp:243
 #, c-format
 msgid "%s Information"
 msgstr "%s 信息"
 
-#: ../src/generic/logg.cpp:270
+#: ../src/generic/logg.cpp:235
 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"
 
-#: ../src/common/fldlgcmn.cpp:81
-#, c-format
-msgid "%s files (%s)|%s"
-msgstr "%s 文件 (%s)|%s"
-
-#: ../src/common/msgout.cpp:189
-#, c-format
-msgid "%s message"
-msgstr "%s 消息"
-
-#: ../contrib/src/deprecated/resource.cpp:2390
+#: ../src/common/tarstrm.cpp:1320
 #, c-format
-msgid "%s not a bitmap resource specification."
-msgstr "%s 不是位图资源."
-
-#: ../contrib/src/deprecated/resource.cpp:2544
-#, c-format
-msgid "%s not an icon resource specification."
-msgstr "%s 不是图标资源."
+msgid "%s did not fit the tar header for entry '%s'"
+msgstr ""
 
-#: ../contrib/src/deprecated/resource.cpp:1901
-#: ../contrib/src/deprecated/resource.cpp:2030
-#: ../contrib/src/deprecated/resource.cpp:3123
+#: ../src/common/fldlgcmn.cpp:107
 #, c-format
-msgid "%s: ill-formed resource file syntax."
-msgstr "%s: 不良资源文件语法."
+msgid "%s files (%s)|%s"
+msgstr "%s 文件 (%s)|%s"
 
-#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
-msgid "&About..."
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143
+#: ../src/html/helpfrm.cpp:145
+msgid "&About"
 msgstr "关于(&A)"
 
-#: ../src/common/stockitem.cpp:153
+#: ../src/common/stockitem.cpp:208
 msgid "&Actual Size"
 msgstr "实际大小(&A)"
 
-#: ../src/common/stockitem.cpp:108
+#: ../src/richtext/richtextindentspage.cpp:287
+msgid "&After a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:141
+#: ../src/richtext/richtextliststylepage.cpp:320
+msgid "&Alignment"
+msgstr "对齐(&A)"
+
+#: ../src/common/stockitem.cpp:142
 msgid "&Apply"
 msgstr "应用(&A)"
 
-#: ../src/msw/mdi.cpp:190
+#: ../src/richtext/richtextstyledlg.cpp:259
+msgid "&Apply Style"
+msgstr "应用样式(&A)"
+
+#: ../src/msw/mdi.cpp:168
 msgid "&Arrange Icons"
 msgstr "重排图标(&A)"
 
-#: ../src/common/stockitem.cpp:118
+#: ../src/common/stockitem.cpp:196
+msgid "&Ascending"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:143
 msgid "&Back"
 msgstr "返回(&B)"
 
-#: ../src/common/stockitem.cpp:109
+#: ../src/richtext/richtextstylepage.cpp:114
+msgid "&Based on:"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:278
+msgid "&Before a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:269
+msgid "&Bg colour:"
+msgstr "背景颜色(&B):"
+
+#: ../src/common/stockitem.cpp:144
 msgid "&Bold"
 msgstr "粗体(&B)"
 
-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:418
+#: ../src/common/stockitem.cpp:145
+msgid "&Bottom"
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:359
+#: ../src/richtext/richtextborderspage.cpp:503
+#: ../src/richtext/richtextmarginspage.cpp:260
+#: ../src/richtext/richtextmarginspage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:575
+msgid "&Bottom:"
+msgstr ""
+
+#: ../include/wx/richtext/richtextbuffer.h:3464
+#, fuzzy
+msgid "&Box"
+msgstr "粗体(&B)"
+
+#: ../src/richtext/richtextliststylepage.cpp:211
+#: ../src/richtext/richtextbulletspage.cpp:160
+msgid "&Bullet style:"
+msgstr "项目符号样式(&B):"
+
+#: ../src/common/stockitem.cpp:147
+msgid "&CD-Rom"
+msgstr "CD 光驱(&C)"
+
+#: ../src/generic/wizard.cpp:433 ../src/generic/fontdlgg.cpp:471
+#: ../src/generic/fontdlgg.cpp:490 ../src/osx/carbon/fontdlg.cpp:586
+#: ../src/common/stockitem.cpp:146
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:164
 msgid "&Cascade"
 msgstr "层叠(&C)"
 
-#: ../src/common/stockitem.cpp:111
+#: ../include/wx/richtext/richtextbuffer.h:5476
+#, fuzzy
+msgid "&Cell"
+msgstr "取消(&C)"
+
+#: ../src/richtext/richtextsymboldlg.cpp:440
+msgid "&Character code:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:148
 msgid "&Clear"
 msgstr "清除(&C)"
 
-#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354
+#: ../src/generic/logg.cpp:520 ../src/common/stockitem.cpp:149
+#: ../src/common/prntbase.cpp:1571 ../src/univ/themes/win32.cpp:3757
+#: ../src/html/helpfrm.cpp:140
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065
+#: ../src/common/stockitem.cpp:194
+msgid "&Color"
+msgstr "颜色(&C)"
+
+#: ../src/richtext/richtextfontpage.cpp:256
+msgid "&Colour:"
+msgstr "颜色(&C):"
+
+#: ../src/common/stockitem.cpp:150
+msgid "&Convert"
+msgstr "转换(&C)"
+
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223
 msgid "&Copy"
 msgstr "复制(&C)"
 
-#: ../src/generic/dbgrptg.cpp:301
+#: ../src/generic/hyperlinkg.cpp:157
+msgid "&Copy URL"
+msgstr "复制 URL(&C)"
+
+#: ../src/common/headerctrlcmn.cpp:329
+msgid "&Customize..."
+msgstr "自定义(&C)..."
+
+#: ../src/generic/dbgrptg.cpp:331
 msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 
-#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:586
+#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: ../src/generic/logg.cpp:718
+#: ../src/richtext/richtextstyledlg.cpp:277
+msgid "&Delete Style..."
+msgstr "删除样式(&D)..."
+
+#: ../src/common/stockitem.cpp:197
+msgid "&Descending"
+msgstr ""
+
+#: ../src/generic/logg.cpp:692
 msgid "&Details"
 msgstr "细节(&D)"
 
-#: ../src/common/stockitem.cpp:119
+#: ../src/common/stockitem.cpp:154
 msgid "&Down"
 msgstr "向下(&D)"
 
-#: ../src/html/helpfrm.cpp:361
+#: ../src/common/stockitem.cpp:155
+msgid "&Edit"
+msgstr "编辑(&E)"
+
+#: ../src/richtext/richtextstyledlg.cpp:271
+msgid "&Edit Style..."
+msgstr "编辑样式(&E)..."
+
+#: ../src/common/stockitem.cpp:156
+msgid "&Execute"
+msgstr "执行(&E)"
+
+#: ../src/common/stockitem.cpp:158 ../src/html/helpfrm.cpp:147
 msgid "&File"
 msgstr "文件(&F)"
 
-#: ../src/common/stockitem.cpp:116
+#: ../src/common/stockitem.cpp:159
 msgid "&Find"
 msgstr "查找(&F)"
 
-#: ../src/generic/wizard.cpp:606
+#: ../src/generic/wizard.cpp:627
 msgid "&Finish"
 msgstr "完成(&F)"
 
-#: ../src/generic/fontdlgg.cpp:273
+#: ../src/common/stockitem.cpp:160
+msgid "&First"
+msgstr "最前(&F)"
+
+#: ../src/richtext/richtextsizepage.cpp:222
+msgid "&Floating mode:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161
+msgid "&Floppy"
+msgstr "软盘(&F)"
+
+#: ../src/common/stockitem.cpp:195
+msgid "&Font"
+msgstr "字体(&F)"
+
+#: ../src/generic/fontdlgg.cpp:372
 msgid "&Font family:"
 msgstr "字体(&F):"
 
-#: ../src/common/stockitem.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:195
+msgid "&Font for Level..."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:154
+#: ../src/richtext/richtextsymboldlg.cpp:401
+msgid "&Font:"
+msgstr "字体(&F):"
+
+#: ../src/common/stockitem.cpp:162
 msgid "&Forward"
-msgstr "å\90\91å\89\8d(&F)"
+msgstr "å\89\8dè¿\9b(&F)"
 
-#: ../src/common/prntbase.cpp:863
-msgid "&Goto..."
-msgstr "跳转(&G)..."
+#: ../src/richtext/richtextsymboldlg.cpp:452
+msgid "&From:"
+msgstr "从(&F):"
 
-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
-#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:163
+msgid "&Harddisk"
+msgstr "硬盘(&H)"
+
+#: ../src/richtext/richtextsizepage.cpp:317
+msgid "&Height:"
+msgstr "高度(&H):"
+
+#: ../src/generic/wizard.cpp:436 ../src/richtext/richtextstyledlg.cpp:311
+#: ../src/richtext/richtextsymboldlg.cpp:480 ../src/osx/menu_osx.cpp:685
+#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: ../src/common/stockitem.cpp:123
-#, fuzzy
+#: ../include/wx/richmsgdlg.h:31
+msgid "&Hide details"
+msgstr "隐藏细节(&H)"
+
+#: ../src/common/stockitem.cpp:165
 msgid "&Home"
 msgstr "Home(&H)"
 
-#: ../src/common/stockitem.cpp:125
+#: ../src/richtext/richtextindentspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:373
+msgid "&Indentation (tenths of a mm)"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:180
+#: ../src/richtext/richtextliststylepage.cpp:357
+#, fuzzy
+msgid "&Indeterminate"
+msgstr "下划线(&U)"
+
+#: ../src/common/stockitem.cpp:167
 msgid "&Index"
 msgstr "索引(&I)"
 
-#: ../src/common/stockitem.cpp:126
+#: ../src/common/stockitem.cpp:168
+msgid "&Info"
+msgstr "信息(&I)"
+
+#: ../src/common/stockitem.cpp:169
 msgid "&Italic"
 msgstr "斜体(&I)"
 
-#: ../src/generic/logg.cpp:513
+#: ../src/common/stockitem.cpp:170
+msgid "&Jump to"
+msgstr "跳转到(&J)"
+
+#: ../src/richtext/richtextindentspage.cpp:166
+#: ../src/richtext/richtextliststylepage.cpp:343
+#, fuzzy
+msgid "&Justified"
+msgstr "分散对齐"
+
+#: ../src/common/stockitem.cpp:175
+msgid "&Last"
+msgstr "最后(&L)"
+
+#: ../src/richtext/richtextindentspage.cpp:152
+#: ../src/richtext/richtextliststylepage.cpp:329
+msgid "&Left"
+msgstr "左(&L)"
+
+#: ../src/richtext/richtextindentspage.cpp:208
+#: ../src/richtext/richtextborderspage.cpp:269
+#: ../src/richtext/richtextborderspage.cpp:413
+#: ../src/richtext/richtextliststylepage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:187
+#: ../src/richtext/richtextmarginspage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:491
+msgid "&Left:"
+msgstr "左(&L):"
+
+#: ../src/richtext/richtextliststylepage.cpp:184
+msgid "&List level:"
+msgstr ""
+
+#: ../src/generic/logg.cpp:521
 msgid "&Log"
 msgstr "日志(&L)"
 
-#: ../src/univ/themes/win32.cpp:4817
+#: ../src/univ/themes/win32.cpp:3749
 msgid "&Move"
 msgstr "移动(&M)"
 
-#: ../src/common/stockitem.cpp:131
+#: ../src/richtext/richtextsizepage.cpp:606
+msgid "&Move the object to:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:176
+msgid "&Network"
+msgstr "网络(&N)"
+
+#: ../src/richtext/richtexttabspage.cpp:137 ../src/common/stockitem.cpp:177
 msgid "&New"
 msgstr "新建(&N)"
 
-#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
+#: ../src/aui/tabmdi.cpp:110 ../src/generic/mdig.cpp:101
+#: ../src/msw/mdi.cpp:169
 msgid "&Next"
 msgstr "下一个(&N)"
 
-#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
+#: ../src/generic/wizard.cpp:432 ../src/generic/wizard.cpp:627
 msgid "&Next >"
 msgstr "下一个(&N) >"
 
-#: ../src/generic/tipdlg.cpp:243
+#: ../src/richtext/richtextsizepage.cpp:615
+msgid "&Next Paragraph"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:277
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
-#: ../src/common/stockitem.cpp:132
+#: ../src/richtext/richtextstylepage.cpp:124
+msgid "&Next style:"
+msgstr "下一个样式(&N):"
+
+#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:476
 msgid "&No"
 msgstr "否(&N)"
 
-#: ../src/generic/dbgrptg.cpp:323
+#: ../src/generic/dbgrptg.cpp:353
 msgid "&Notes:"
 msgstr "注意(&N):"
 
-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-#: ../src/generic/fontdlgg.cpp:375
+#: ../src/richtext/richtextbulletspage.cpp:265
+msgid "&Number:"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:476 ../src/generic/fontdlgg.cpp:483
+#: ../src/osx/carbon/fontdlg.cpp:592 ../src/common/stockitem.cpp:179
 msgid "&OK"
 msgstr "确认(&O)"
 
-#: ../src/common/stockitem.cpp:134
-msgid "&Open"
-msgstr "打开(&O)"
-
-#: ../src/html/helpfrm.cpp:352
+#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180
+#: ../src/html/helpfrm.cpp:138
 msgid "&Open..."
 msgstr "打开(&O)..."
 
-#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066
+#: ../src/richtext/richtextindentspage.cpp:235
+msgid "&Outline level:"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:318
+msgid "&Page Break"
+msgstr ""
+
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
-#: ../src/generic/fontdlgg.cpp:324
+#: ../include/wx/richtext/richtextbuffer.h:4580
+msgid "&Picture"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:423
 msgid "&Point size:"
-msgstr "字体大小(Point size)(&P):"
+msgstr "字体大小(&P):"
+
+#: ../src/richtext/richtexttabspage.cpp:115
+msgid "&Position (tenths of a mm):"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:136
+#: ../src/richtext/richtextsizepage.cpp:476
+#, fuzzy
+msgid "&Position mode:"
+msgstr "位置"
+
+#: ../src/common/stockitem.cpp:182
 msgid "&Preferences"
-msgstr "偏好设置"
+msgstr "偏好设置(&P)"
 
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
+#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:102
+#: ../src/msw/mdi.cpp:170
 msgid "&Previous"
 msgstr "前页(&P)"
 
-#: ../src/common/stockitem.cpp:137
-msgid "&Print"
-msgstr "打印(&P)"
+#: ../src/richtext/richtextsizepage.cpp:609
+#, fuzzy
+msgid "&Previous Paragraph"
+msgstr "前页"
 
-#: ../src/common/prntbase.cpp:833
+#: ../src/common/stockitem.cpp:184
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-#: ../src/common/stockitem.cpp:139
+#: ../src/richtext/richtextctrl.cpp:331 ../src/richtext/richtextctrl.cpp:4888
+#: ../src/common/stockitem.cpp:185
 msgid "&Properties"
 msgstr "属性(&P)"
 
-#: ../src/common/stockitem.cpp:140
+#: ../src/common/stockitem.cpp:157
 msgid "&Quit"
 msgstr "退出(&Q)"
 
-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:581
+#: ../src/common/stockitem.cpp:186 ../src/common/cmdproc.cpp:294
+#: ../src/common/cmdproc.cpp:301 ../src/msw/textctrl.cpp:2220
 msgid "&Redo"
-msgstr "重复(&R)"
+msgstr "恢复(&R)"
 
-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
+#: ../src/common/cmdproc.cpp:290 ../src/common/cmdproc.cpp:310
 msgid "&Redo "
-msgstr "重复(&R) "
+msgstr "恢复(&R) "
+
+#: ../src/richtext/richtextstyledlg.cpp:265
+msgid "&Rename Style..."
+msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:185
+#: ../src/generic/fdrepdlg.cpp:180
 msgid "&Replace"
 msgstr "替换(&R)"
 
-#: ../src/univ/themes/win32.cpp:4816
+#: ../src/richtext/richtextstyledlg.cpp:295
+msgid "&Restart numbering"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3748
 msgid "&Restore"
 msgstr "复原(&R)"
 
-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextindentspage.cpp:159
+#: ../src/richtext/richtextliststylepage.cpp:336
+msgid "&Right"
+msgstr "右(&R)"
+
+#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextborderspage.cpp:299
+#: ../src/richtext/richtextborderspage.cpp:443
+#: ../src/richtext/richtextliststylepage.cpp:400
+#: ../src/richtext/richtextmarginspage.cpp:212
+#: ../src/richtext/richtextmarginspage.cpp:326
+#: ../src/richtext/richtextsizepage.cpp:547
+msgid "&Right:"
+msgstr "右(&R):"
+
+#: ../src/common/stockitem.cpp:191
 msgid "&Save"
 msgstr "保存(&S)"
 
-#: ../src/generic/logg.cpp:508
-msgid "&Save..."
-msgstr "保存(&S)..."
+#: ../src/common/stockitem.cpp:192
+msgid "&Save as"
+msgstr "另存为(&S)"
 
-#: ../src/generic/tipdlg.cpp:238
+#: ../include/wx/richmsgdlg.h:30
+msgid "&See details"
+msgstr "查看细节(&S)"
+
+#: ../src/generic/tipdlg.cpp:271
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
-#: ../src/univ/themes/win32.cpp:4819
+#: ../src/univ/themes/win32.cpp:3751
 msgid "&Size"
 msgstr "大小(&S)"
 
-#: ../src/common/stockitem.cpp:147
+#: ../src/richtext/richtextfontpage.cpp:166
+msgid "&Size:"
+msgstr "大小(&S):"
+
+#: ../src/generic/progdlgg.cpp:283
+msgid "&Skip"
+msgstr "跳过(&S)"
+
+#: ../src/richtext/richtextindentspage.cpp:267
+#: ../src/richtext/richtextliststylepage.cpp:418
+msgid "&Spacing (tenths of a mm)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:198
+msgid "&Spell Check"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:199
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: ../src/generic/fontdlgg.cpp:284
+#: ../src/richtext/richtextfontpage.cpp:282 ../src/common/stockitem.cpp:200
+msgid "&Strikethrough"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:383 ../src/richtext/richtextstylepage.cpp:105
 msgid "&Style:"
 msgstr "字体(&S):"
 
-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/richtext/richtextstyledlg.cpp:206
+msgid "&Styles:"
+msgstr "样式(&S):"
+
+#: ../src/richtext/richtextsymboldlg.cpp:414
+msgid "&Subset:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:223
+msgid "&Symbol:"
+msgstr "符号(&S):"
+
+#: ../include/wx/richtext/richtextbuffer.h:5558
+msgid "&Table"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:201
+msgid "&Top"
+msgstr "顶端(&T)"
+
+#: ../src/richtext/richtextborderspage.cpp:329
+#: ../src/richtext/richtextborderspage.cpp:473
+#: ../src/richtext/richtextmarginspage.cpp:235
+#: ../src/richtext/richtextmarginspage.cpp:349
+#: ../src/richtext/richtextsizepage.cpp:519
+msgid "&Top:"
+msgstr "顶端(&T):"
+
+#: ../src/generic/fontdlgg.cpp:445 ../src/common/stockitem.cpp:203
 msgid "&Underline"
 msgstr "下划线(&U)"
 
-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/msw/textctrl.cpp:2061
+#: ../src/richtext/richtextfontpage.cpp:241
+msgid "&Underlining:"
+msgstr "下划线(&U)"
+
+#: ../src/richtext/richtextctrl.cpp:321 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
+#: ../src/msw/textctrl.cpp:2219
 msgid "&Undo"
-msgstr "æ\81¢å¤\8d(&U)"
+msgstr "æ\92¤é\94\80(&U)"
 
-#: ../src/common/cmdproc.cpp:264
+#: ../src/common/cmdproc.cpp:266
 msgid "&Undo "
-msgstr "æ\81¢å¤\8d(&U) "
+msgstr "æ\92¤é\94\80(&U) "
 
-#: ../src/common/stockitem.cpp:151
+#: ../src/common/stockitem.cpp:205
 msgid "&Unindent"
 msgstr "取消缩进(&U)"
 
-#: ../src/common/stockitem.cpp:121
+#: ../src/common/stockitem.cpp:206
 msgid "&Up"
 msgstr "向上(&U)"
 
-#: ../src/generic/fontdlgg.cpp:295
+#: ../src/richtext/richtextsizepage.cpp:254
+msgid "&Vertical alignment:"
+msgstr "垂直对齐(&V)"
+
+#: ../src/generic/dbgrptg.cpp:337
+msgid "&View..."
+msgstr "查看(&V)..."
+
+#: ../src/generic/fontdlgg.cpp:394
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
-#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
-#: ../src/msw/mdi.cpp:1424
+#: ../src/richtext/richtextsizepage.cpp:290
+msgid "&Width:"
+msgstr "宽度(&W):"
+
+#: ../src/aui/tabmdi.cpp:303 ../src/aui/tabmdi.cpp:319
+#: ../src/aui/tabmdi.cpp:321 ../src/generic/mdig.cpp:295
+#: ../src/generic/mdig.cpp:311 ../src/generic/mdig.cpp:315
+#: ../src/msw/mdi.cpp:70
 msgid "&Window"
 msgstr "窗口(&W)"
 
-#: ../src/common/stockitem.cpp:152
+#: ../src/common/stockitem.cpp:207 ../src/msw/msgdlg.cpp:476
 msgid "&Yes"
 msgstr "是(&Y)"
 
-#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
+#: ../src/common/fontcmn.cpp:845
+msgid "'"
+msgstr "'"
+
+#: ../src/common/config.cpp:524 ../src/msw/regconf.cpp:259
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "'%s' 有额外的 '..', 忽略之."
+msgstr "'%s' 有额外的 '..'，忽略之。"
 
-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-#: ../src/common/valtext.cpp:168
+#: ../src/common/valtext.cpp:250 ../src/common/valtext.cpp:252
+#: ../src/common/valtext.cpp:254 ../src/common/valtext.cpp:256
 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' 是无效的"
 
-#: ../src/common/cmdline.cpp:769
+#: ../src/common/cmdline.cpp:941 ../src/common/cmdline.cpp:959
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
+msgstr "'%s' 不是匹配选项 '%s'的正确数字值。"
 
-#: ../src/common/intl.cpp:1146
+#: ../src/common/translation.cpp:930
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' 不是有效的消息目录."
+msgstr "'%s' 不是有效的消息目录。"
 
-#: ../src/common/textbuf.cpp:246
+#: ../src/common/textbuf.cpp:240
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' 或许是一个二进制文件."
+msgstr "'%s' 或许是一个二进制文件。"
 
-#: ../src/common/valtext.cpp:157
+#: ../src/common/valtext.cpp:248
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' 应该是一个数值."
+msgstr "'%s' 应该是一个数值。"
 
-#: ../src/common/valtext.cpp:139
+#: ../src/common/valtext.cpp:240
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' 应该仅包含ASCII字符."
+msgstr "'%s' 应该仅包含ASCII字符。"
 
-#: ../src/common/valtext.cpp:145
+#: ../src/common/valtext.cpp:242
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' 应仅包含字母字符."
+msgstr "'%s' 应仅包含字母字符。"
 
-#: ../src/common/valtext.cpp:151
+#: ../src/common/valtext.cpp:244
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' 应仅包含字母或数字字符."
+msgstr "'%s' 应仅包含字母或数字字符。"
 
-#: ../src/html/helpfrm.cpp:976
-msgid "(Help)"
-msgstr "(帮助)"
+#: ../src/common/valtext.cpp:246
+#, c-format
+msgid "'%s' should only contain digits."
+msgstr "'%s' 应该仅包含数字。"
 
-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-#: ../src/html/helpfrm.cpp:1764
-msgid "(bookmarks)"
-msgstr "(书签)"
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextbulletspage.cpp:180
+msgid "(*)"
+msgstr "(*)"
 
-#: ../src/common/debugrpt.cpp:537
-msgid "*** A debug report has been generated\n"
-msgstr "*** 生成了一份调试报告\n"
+#: ../src/html/helpwnd.cpp:977
+msgid "(Help)"
+msgstr "(帮助)"
 
-#: ../src/common/debugrpt.cpp:540
-msgid "*** And includes the following files:\n"
-msgstr "*** 且包含以下文件:\n"
+#: ../src/richtext/richtextliststylepage.cpp:482
+#: ../src/richtext/richtextbulletspage.cpp:287
+msgid "(None)"
+msgstr "(无)"
 
-#: ../src/common/debugrpt.cpp:538
-#, c-format
-msgid "*** It can be found in \"%s\"\n"
-msgstr "*** 可在此找到: \"%s\"\n"
+#: ../src/richtext/richtextsymboldlg.cpp:505
+msgid "(Normal text)"
+msgstr "(正常字体)"
 
-#: ../contrib/src/deprecated/resource.cpp:1840
-#: ../contrib/src/deprecated/resource.cpp:1970
-#: ../contrib/src/deprecated/resource.cpp:3062
-msgid ""
-", expected static, #include or #define\n"
-"while parsing resource."
-msgstr ""
-", 在对资源进行语法分析时\n"
-", 期望如下关键字 static, #include 或 #define ."
+#: ../src/html/helpwnd.cpp:427 ../src/html/helpwnd.cpp:1120
+#: ../src/html/helpwnd.cpp:1746
+msgid "(bookmarks)"
+msgstr "(书签)"
 
-#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747
-msgid "."
-msgstr "."
+#: ../src/richtext/richtextindentspage.cpp:239
+#: ../src/richtext/richtextindentspage.cpp:250
+#: ../src/richtext/richtextindentspage.cpp:251
+#: ../src/richtext/richtextindentspage.cpp:299
+#: ../src/richtext/richtextindentspage.cpp:311
+#: ../src/richtext/richtextindentspage.cpp:312
+#: ../src/richtext/richtextformatdlg.cpp:828
+#: ../src/richtext/richtextfontpage.cpp:322
+#: ../src/richtext/richtextfontpage.cpp:326
+#: ../src/richtext/richtextfontpage.cpp:330
+#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextliststylepage.cpp:461
+#: ../src/richtext/richtextliststylepage.cpp:462
+msgid "(none)"
+msgstr "(无)"
+
+#: ../src/richtext/richtextliststylepage.cpp:493
+#: ../src/richtext/richtextbulletspage.cpp:298
+msgid "*"
+msgstr "*"
+
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextbulletspage.cpp:187
+msgid "*)"
+msgstr "*)"
+
+#: ../src/richtext/richtextliststylepage.cpp:496
+#: ../src/richtext/richtextbulletspage.cpp:301
+msgid "+"
+msgstr "+"
+
+#: ../src/msw/utils.cpp:1324
+msgid ", 64-bit edition"
+msgstr "，64位版"
+
+#: ../src/richtext/richtextliststylepage.cpp:494
+#: ../src/richtext/richtextbulletspage.cpp:299
+msgid "-"
+msgstr "-"
+
+#: ../src/generic/filepickerg.cpp:67
+msgid "..."
+msgstr "..."
+
+#: ../src/richtext/richtextindentspage.cpp:240
+msgid "1"
+msgstr "1"
+
+#: ../src/richtext/richtextindentspage.cpp:301
+#: ../src/richtext/richtextliststylepage.cpp:451
+msgid "1.1"
+msgstr "1.1"
+
+#: ../src/richtext/richtextindentspage.cpp:302
+#: ../src/richtext/richtextliststylepage.cpp:452
+msgid "1.2"
+msgstr "1.2"
+
+#: ../src/richtext/richtextindentspage.cpp:303
+#: ../src/richtext/richtextliststylepage.cpp:453
+msgid "1.3"
+msgstr "1.3"
+
+#: ../src/richtext/richtextindentspage.cpp:304
+#: ../src/richtext/richtextliststylepage.cpp:454
+msgid "1.4"
+msgstr "1.4"
+
+#: ../src/richtext/richtextindentspage.cpp:305
+#: ../src/richtext/richtextliststylepage.cpp:455
+msgid "1.5"
+msgstr "1.5"
+
+#: ../src/richtext/richtextindentspage.cpp:306
+#: ../src/richtext/richtextliststylepage.cpp:456
+msgid "1.6"
+msgstr "1.6"
+
+#: ../src/richtext/richtextindentspage.cpp:307
+#: ../src/richtext/richtextliststylepage.cpp:457
+msgid "1.7"
+msgstr "1.7"
+
+#: ../src/richtext/richtextindentspage.cpp:308
+#: ../src/richtext/richtextliststylepage.cpp:458
+msgid "1.8"
+msgstr "1.8"
+
+#: ../src/richtext/richtextindentspage.cpp:309
+#: ../src/richtext/richtextliststylepage.cpp:459
+msgid "1.9"
+msgstr "1.9"
+
+#: ../src/richtext/richtextindentspage.cpp:249
+msgid "10"
+msgstr "10"
 
-#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748
-msgid ".."
-msgstr ".."
+#: ../src/common/paper.cpp:142
+msgid "10 x 11 in"
+msgstr "10 x 11 英寸"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:115
 msgid "10 x 14 in"
 msgstr "10 x 14 英寸"
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:116
 msgid "11 x 17 in"
 msgstr "11 x 17 英寸"
 
-#: ../src/common/paper.cpp:146
+#: ../src/common/paper.cpp:186
+msgid "12 x 11 in"
+msgstr "12 x 11 英寸"
+
+#: ../src/common/paper.cpp:143
+msgid "15 x 11 in"
+msgstr "15 x 11 英寸"
+
+#: ../src/richtext/richtextindentspage.cpp:241
+#: ../src/richtext/richtextindentspage.cpp:310
+#: ../src/richtext/richtextliststylepage.cpp:460
+msgid "2"
+msgstr "2"
+
+#: ../src/richtext/richtextindentspage.cpp:242
+msgid "3"
+msgstr "3"
+
+#: ../src/richtext/richtextindentspage.cpp:243
+msgid "4"
+msgstr "4"
+
+#: ../src/richtext/richtextindentspage.cpp:244
+msgid "5"
+msgstr "5"
+
+#: ../src/richtext/richtextindentspage.cpp:245
+msgid "6"
+msgstr "6"
+
+#: ../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 英寸"
+msgstr "6 3/4 信封, 3 5/8 x 6 1/2 英寸"
+
+#: ../src/richtext/richtextindentspage.cpp:246
+msgid "7"
+msgstr "7"
 
-#: ../src/html/htmprint.cpp:309
+#: ../src/richtext/richtextindentspage.cpp:247
+msgid "8"
+msgstr "8"
+
+#: ../src/richtext/richtextindentspage.cpp:248
+msgid "9"
+msgstr "9"
+
+#: ../src/common/paper.cpp:141
+msgid "9 x 11 in"
+msgstr "9 x 11 英寸"
+
+#: ../src/html/htmprint.cpp:432
 msgid ": file does not exist!"
-msgstr ": 文件不存在!"
+msgstr ": 文件不存在！"
 
 #: ../src/common/fontmap.cpp:200
 msgid ": unknown charset"
@@ -497,960 +982,1727 @@ msgstr ": 未知字符集"
 msgid ": unknown encoding"
 msgstr ": 未知编码"
 
-#: ../src/generic/wizard.cpp:423
+#: ../src/generic/wizard.cpp:438
 msgid "< &Back"
 msgstr "< 返回(&B)"
 
-#: ../src/common/prntbase.cpp:845
-msgid "<<"
-msgstr ""
-
-#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289
+#: ../src/osx/carbon/fontdlg.cpp:606 ../src/osx/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:833
+msgid "<Any Decorative>"
+msgstr "<任意 Decorative>"
+
+#: ../src/osx/carbon/fontdlg.cpp:607 ../src/osx/carbon/fontdlg.cpp:815
+#: ../src/osx/carbon/fontdlg.cpp:835
+msgid "<Any Modern>"
+msgstr "<任意 Modern>"
+
+#: ../src/osx/carbon/fontdlg.cpp:605 ../src/osx/carbon/fontdlg.cpp:811
+#: ../src/osx/carbon/fontdlg.cpp:831
+msgid "<Any Roman>"
+msgstr "<任意 Roman>"
+
+#: ../src/osx/carbon/fontdlg.cpp:608 ../src/osx/carbon/fontdlg.cpp:817
+#: ../src/osx/carbon/fontdlg.cpp:837
+msgid "<Any Script>"
+msgstr "<任意 Script>"
+
+#: ../src/osx/carbon/fontdlg.cpp:609 ../src/osx/carbon/fontdlg.cpp:822
+#: ../src/osx/carbon/fontdlg.cpp:841
+msgid "<Any Swiss>"
+msgstr "<任意 Swiss>"
+
+#: ../src/osx/carbon/fontdlg.cpp:610 ../src/osx/carbon/fontdlg.cpp:819
+#: ../src/osx/carbon/fontdlg.cpp:839
+msgid "<Any Teletype>"
+msgstr "<任意 Teletype>"
+
+#: ../src/osx/carbon/fontdlg.cpp:604
+msgid "<Any>"
+msgstr "<任意>"
+
+#: ../src/generic/filectrlg.cpp:280 ../src/generic/filectrlg.cpp:303
 msgid "<DIR>"
 msgstr "<目录>"
 
-#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293
+#: ../src/generic/filectrlg.cpp:284 ../src/generic/filectrlg.cpp:307
 msgid "<DRIVE>"
 msgstr "<盘符>"
 
-#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291
+#: ../src/generic/filectrlg.cpp:282 ../src/generic/filectrlg.cpp:305
 msgid "<LINK>"
 msgstr "<连接>"
 
-#: ../src/html/helpfrm.cpp:1276
+#: ../src/html/helpwnd.cpp:1280
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜体.</i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1280
+#: ../src/html/helpwnd.cpp:1284
 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:1279
 msgid "<b>Bold face.</b> "
 msgstr "<b>粗体.</b> "
 
-#: ../src/html/helpfrm.cpp:1274
+#: ../src/html/helpwnd.cpp:1278
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 
-#: ../src/common/prntbase.cpp:851
-msgid ">>"
-msgstr ""
-
-#: ../src/common/prntbase.cpp:857
-msgid ">>|"
-msgstr ""
+#: ../src/richtext/richtextliststylepage.cpp:495
+#: ../src/richtext/richtextbulletspage.cpp:300
+msgid ">"
+msgstr ">"
 
-#: ../src/generic/dbgrptg.cpp:285
+#: ../src/generic/dbgrptg.cpp:315
 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
-#: ../src/common/xtixml.cpp:409
+#: ../src/common/debugrpt.cpp:569
+msgid "A debug report has been generated. It can be found in"
+msgstr "产生了一份调试报告, 位于"
+
+#: ../src/common/xtixml.cpp:419
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr "非空集合必须包含元素('element')节点"
+msgstr "非空集合必须包含 'element' 节点"
 
-#: ../src/common/paper.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:305
+#: ../src/richtext/richtextliststylepage.cpp:307
+#: ../src/richtext/richtextbulletspage.cpp:258
+#: ../src/richtext/richtextbulletspage.cpp:260
+msgid "A standard bullet name."
+msgstr ""
+
+#: ../src/common/paper.cpp:219
+msgid "A0 sheet, 841 x 1189 mm"
+msgstr "A0 纸张, 841 x 1189 毫米"
+
+#: ../src/common/paper.cpp:220
+msgid "A1 sheet, 594 x 841 mm"
+msgstr "A1 纸张, 594 x 841 毫米"
+
+#: ../src/common/paper.cpp:161
+msgid "A2 420 x 594 mm"
+msgstr "A2 纸张, 420 x 594 毫米"
+
+#: ../src/common/paper.cpp:158
+msgid "A3 Extra 322 x 445 mm"
+msgstr "特大 A3 纸张, 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:163
+msgid "A3 Extra Transverse 322 x 445 mm"
+msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:172
+msgid "A3 Rotated 420 x 297 mm"
+msgstr "横向 A3 纸张, 420 x 297 毫米"
+
+#: ../src/common/paper.cpp:162
+msgid "A3 Transverse 297 x 420 mm"
+msgstr "A3 纸张(横排), 297 x 420 毫米"
+
+#: ../src/common/paper.cpp:108
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 纸张, 297 x 420 毫米"
 
-#: ../src/common/paper.cpp:111
+#: ../src/common/paper.cpp:148
+msgid "A4 Extra 9.27 x 12.69 in"
+msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:155
+msgid "A4 Plus 210 x 330 mm"
+msgstr "加大 A4 纸张, 210 x 330 毫米"
+
+#: ../src/common/paper.cpp:173
+msgid "A4 Rotated 297 x 210 mm"
+msgstr "横向 A4 纸张, 297 x 210 毫米"
+
+#: ../src/common/paper.cpp:150
+msgid "A4 Transverse 210 x 297 mm"
+msgstr "A4 纸张(横排), 210 x 297 毫米"
+
+#: ../src/common/paper.cpp:99
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:109
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 小纸张, 210 x 297 毫米"
+msgstr "小 A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:159
+msgid "A5 Extra 174 x 235 mm"
+msgstr "特大 A5 纸张, 174 x 235 毫米"
+
+#: ../src/common/paper.cpp:174
+msgid "A5 Rotated 210 x 148 mm"
+msgstr "横向 A5 纸张, 210 x 148 毫米"
+
+#: ../src/common/paper.cpp:156
+msgid "A5 Transverse 148 x 210 mm"
+msgstr "A5 纸张(横排), 148 x 210 毫米"
+
+#: ../src/common/paper.cpp:110
 msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5 纸张, 148 x 210 毫米"
 
-#: ../src/generic/fontdlgg.cpp:87
+#: ../src/common/paper.cpp:166
+msgid "A6 105 x 148 mm"
+msgstr "A6 纸张, 105 x 148 毫米"
+
+#: ../src/common/paper.cpp:179
+msgid "A6 Rotated 148 x 105 mm"
+msgstr "横向 A5 纸张, 148 x 105 毫米"
+
+#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:525
+#: ../src/osx/carbon/fontdlg.cpp:337
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/accelcmn.cpp:77
+msgid "ADD"
+msgstr "ADD"
+
+#: ../src/richtext/richtextsymboldlg.cpp:459 ../src/common/ftp.cpp:406
 msgid "ASCII"
 msgstr "ASCII"
 
-#: ../src/common/stockitem.cpp:107
+#: ../src/osx/menu_osx.cpp:537 ../src/common/stockitem.cpp:140
+msgid "About"
+msgstr "关于"
+
+#: ../src/generic/aboutdlgg.cpp:141 ../src/msw/aboutdlg.cpp:65
+#, c-format
+msgid "About %s"
+msgstr "关于 %s"
+
+#: ../src/richtext/richtextsizepage.cpp:482
+msgid "Absolute"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:208
+msgid "Actual Size"
+msgstr "实际大小"
+
+#: ../src/common/stockitem.cpp:141
 msgid "Add"
 msgstr "加入"
 
-#: ../src/html/helpfrm.cpp:444
+#: ../src/html/helpwnd.cpp:440
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
-#: ../src/generic/colrdlgg.cpp:297
+#: ../src/generic/colrdlgg.cpp:284
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 
-#: ../include/wx/xti.h:902
+#: ../include/wx/xtiprop.h:260
 msgid "AddToPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用AddToPropertyCollection"
 
-#: ../include/wx/xti.h:849
+#: ../include/wx/xtiprop.h:198
 msgid "AddToPropertyCollection called w/o valid adder"
 msgstr "调用AddToPropertyCollection时未带有效的adder"
 
-#: ../src/html/helpctrl.cpp:106
+#: ../src/html/helpctrl.cpp:160
 #, c-format
 msgid "Adding book %s"
 msgstr "正在添加卷 %s"
 
-#: ../src/common/stockitem.cpp:129
+#: ../src/osx/carbon/dataview.cpp:1934
+msgid "Adding flavor TEXT failed"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1955
+msgid "Adding flavor utxt failed"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:436
+msgid "After a paragraph:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:173
 msgid "Align Left"
 msgstr "左对齐"
 
-#: ../src/common/stockitem.cpp:130
+#: ../src/common/stockitem.cpp:174
 msgid "Align Right"
 msgstr "右对齐"
 
-#: ../src/generic/prntdlgg.cpp:209
+#: ../src/richtext/richtextsizepage.cpp:242
+msgid "Alignment"
+msgstr "对齐"
+
+#: ../src/generic/prntdlgg.cpp:221
 msgid "All"
 msgstr "所有"
 
-#: ../src/common/fldlgcmn.cpp:64
+#: ../src/generic/filectrlg.cpp:1199 ../src/common/fldlgcmn.cpp:90
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
-#: ../include/wx/defs.h:2229
+#: ../include/wx/defs.h:2774
 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 
-#: ../src/html/helpfrm.cpp:1578
-msgid "All files (*.*)|*"
-msgstr "所有文件 (*)|*"
-
-#: ../include/wx/defs.h:2226
+#: ../include/wx/defs.h:2771
 msgid "All files (*.*)|*.*"
-msgstr "所有文件 (*)|*"
+msgstr "所有文件 (*.*)|*.*"
+
+#: ../src/richtext/richtextstyles.cpp:1041
+msgid "All styles"
+msgstr ""
+
+#: ../src/propgrid/manager.cpp:1495
+msgid "Alphabetic Mode"
+msgstr ""
 
-#: ../src/common/xtistrm.cpp:385
+#: ../src/common/xtistrm.cpp:430
 msgid "Already Registered Object passed to SetObjectClassInfo"
-msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
+msgstr "传递已注册对象给 SetObjectClassInfo"
 
-#: ../src/unix/dialup.cpp:362
+#: ../src/unix/dialup.cpp:355
 msgid "Already dialling ISP."
-msgstr "已经拨接ISP."
+msgstr "已经拨接 ISP 。"
 
-#: ../src/generic/logg.cpp:1164
+#: ../src/common/accelcmn.cpp:321 ../src/univ/themes/win32.cpp:3757
+msgid "Alt+"
+msgstr "Alt+"
+
+#: ../src/common/debugrpt.cpp:572
+msgid "And includes the following files:\n"
+msgstr "并且包含以下文件:\n"
+
+#: ../src/generic/animateg.cpp:163
+#, c-format
+msgid "Animation file is not of type %ld."
+msgstr "动画文件的类型不是 %ld。"
+
+#: ../src/generic/logg.cpp:1038
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
+msgstr "把日志添加到文件 '%s' (选择 [否] 将覆盖该文件)?"
 
-#: ../src/common/fmapbase.cpp:108
-msgid "Arabic (ISO-8859-6)"
-msgstr "阿拉伯语 (ISO-8859-6)"
+#: ../src/osx/menu_osx.cpp:556 ../src/osx/menu_osx.cpp:564
+#, fuzzy
+msgid "Application"
+msgstr "选区"
 
-#: ../src/html/chm.cpp:564
-msgid "Archive doesnt contain #SYSTEM file"
-msgstr "å­\98æ¡£é\87\8c没æ\9c\89å\8c\85å\90« #SYSTEM æ\96\87件"
+#: ../src/common/stockitem.cpp:142
+msgid "Apply"
+msgstr "åº\94ç\94¨"
 
-#: ../src/generic/filedlgg.cpp:447
+#: ../src/richtext/richtextliststylepage.cpp:483
+#: ../src/richtext/richtextbulletspage.cpp:288
+msgid "Arabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:154
+msgid "Arabic (ISO-8859-6)"
+msgstr "阿拉伯语 (ISO-8859-6)"
+
+#: ../src/msw/ole/automtn.cpp:656
+#, c-format
+msgid "Argument %u not found."
+msgstr "找不到参数 %u。"
+
+#: ../src/generic/aboutdlgg.cpp:185
+msgid "Artists"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:196
+msgid "Ascending"
+msgstr "升序"
+
+#: ../src/generic/filectrlg.cpp:462
 msgid "Attributes"
 msgstr "属性(Attributes)"
 
-#: ../src/common/paper.cpp:141
+#: ../src/richtext/richtextliststylepage.cpp:295
+#: ../src/richtext/richtextbulletspage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:248
+msgid "Available fonts."
+msgstr ""
+
+#: ../src/common/paper.cpp:139
+msgid "B4 (ISO) 250 x 353 mm"
+msgstr "B4 纸张(ISO), 250 x 353 毫米"
+
+#: ../src/common/paper.cpp:175
+msgid "B4 (JIS) Rotated 364 x 257 mm"
+msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
+
+#: ../src/common/paper.cpp:129
 msgid "B4 Envelope, 250 x 353 mm"
 msgstr "B4 信封, 250 x 353 毫米"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:111
 msgid "B4 sheet, 250 x 354 mm"
 msgstr "B4 纸张, 250 x 354 毫米"
 
-#: ../src/common/paper.cpp:142
+#: ../src/common/paper.cpp:160
+msgid "B5 (ISO) Extra 201 x 276 mm"
+msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
+
+#: ../src/common/paper.cpp:176
+msgid "B5 (JIS) Rotated 257 x 182 mm"
+msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
+
+#: ../src/common/paper.cpp:157
+msgid "B5 (JIS) Transverse 182 x 257 mm"
+msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
+
+#: ../src/common/paper.cpp:130
 msgid "B5 Envelope, 176 x 250 mm"
 msgstr "B5 信封, 176 x 250 毫米"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:112
 msgid "B5 sheet, 182 x 257 millimeter"
 msgstr "B5 纸张, 182 x 257 毫米"
 
-#: ../src/common/paper.cpp:143
+#: ../src/common/paper.cpp:184
+msgid "B6 (JIS) 128 x 182 mm"
+msgstr "B6 纸张(JIS), 128 x 182 毫米"
+
+#: ../src/common/paper.cpp:185
+msgid "B6 (JIS) Rotated 182 x 128 mm"
+msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
+
+#: ../src/common/paper.cpp:131
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 
-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/accelcmn.cpp:50
+msgid "BACK"
+msgstr "BACK"
+
+#: ../src/common/imagbmp.cpp:524 ../src/common/imagbmp.cpp:554
+#: ../src/common/imagbmp.cpp:569
 msgid "BMP: Couldn't allocate memory."
-msgstr "BMP: 不能分配内存."
+msgstr "BMP: 无法分配内存。"
 
-#: ../src/common/imagbmp.cpp:94
+#: ../src/common/imagbmp.cpp:98
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: 不能保存无效图像."
+msgstr "BMP: 无法保存无效图像。"
 
-#: ../src/common/imagbmp.cpp:298
+#: ../src/common/imagbmp.cpp:339
 msgid "BMP: Couldn't write RGB color map."
-msgstr "BMP: 不能写RGB色彩表."
+msgstr "BMP: 无法写 RGB 色彩表。"
 
-#: ../src/common/imagbmp.cpp:431
+#: ../src/common/imagbmp.cpp:474
 msgid "BMP: Couldn't write data."
-msgstr "BMP: 不能写数据."
+msgstr "BMP: 无法写数据。"
 
-#: ../src/common/imagbmp.cpp:203
+#: ../src/common/imagbmp.cpp:240
 msgid "BMP: Couldn't write the file (Bitmap) header."
-msgstr "BMP: 不能写文件头(Bitmap)."
+msgstr "BMP: 无法写文件头 (Bitmap)。"
 
-#: ../src/common/imagbmp.cpp:224
+#: ../src/common/imagbmp.cpp:263
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
-msgstr "BMP: 不能写文件头(BitmapInfo)."
+msgstr "BMP: 无法写文件头 (BitmapInfo)。"
 
-#: ../src/common/imagbmp.cpp:128
+#: ../src/common/imagbmp.cpp:134
 msgid "BMP: wxImage doesn't have own wxPalette."
-msgstr "BMP: wxImage没有我们的wxPalette."
+msgstr "BMP: wxImage 没有自己的 wxPalette。"
+
+#: ../src/common/stockitem.cpp:143
+msgid "Back"
+msgstr "返回"
+
+#: ../src/richtext/richtextbackgroundpage.cpp:119
+#: ../src/richtext/richtextformatdlg.cpp:373
+msgid "Background"
+msgstr "背景"
+
+#: ../src/richtext/richtextbackgroundpage.cpp:131
+msgid "Background &colour:"
+msgstr "背景颜色(&c):"
+
+#: ../src/osx/carbon/fontdlg.cpp:404
+msgid "Background colour"
+msgstr "背景颜色"
 
-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:161
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的海语 (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:152
 msgid "Baltic (old) (ISO-8859-4)"
-msgstr "波罗的海语 (旧的) (ISO-8859-4)"
+msgstr "波罗的海语 (旧式) (ISO-8859-4)"
 
-#: ../contrib/src/deprecated/resource.cpp:2524
-#, c-format
-msgid "Bitmap resource specification %s not found."
-msgstr "找不到位图规格 %s."
+#: ../src/richtext/richtextliststylepage.cpp:427
+msgid "Before a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:490
+#: ../src/richtext/richtextbulletspage.cpp:295
+msgid "Bitmap"
+msgstr "位图"
+
+#: ../src/osx/carbon/dataview.cpp:2397
+msgid "Bitmap renderer cannot render value; value type: "
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:237
+#: ../src/generic/fontdlgg.cpp:334 ../src/richtext/richtextfontpage.cpp:328
+#: ../src/osx/carbon/fontdlg.cpp:538 ../src/common/stockitem.cpp:144
 msgid "Bold"
 msgstr "粗体"
 
-#: ../src/generic/prntdlgg.cpp:892
+#: ../src/richtext/richtextborderspage.cpp:256
+#: ../src/richtext/richtextborderspage.cpp:389
+msgid "Border"
+msgstr "边框"
+
+#: ../src/richtext/richtextformatdlg.cpp:367
+msgid "Borders"
+msgstr "边框"
+
+#: ../src/richtext/richtextsizepage.cpp:264 ../src/common/stockitem.cpp:145
+msgid "Bottom"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:899
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
-#: ../src/common/paper.cpp:112
+#: ../src/richtext/richtextbuffer.cpp:8431
+#, fuzzy
+msgid "Box Properties"
+msgstr "属性(&P)"
+
+#: ../src/richtext/richtextstyles.cpp:1045
+#, fuzzy
+msgid "Box styles"
+msgstr "下一个样式(&N):"
+
+#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45
+msgid "Browse"
+msgstr "浏览"
+
+#: ../src/richtext/richtextliststylepage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:196
+msgid "Bullet &Alignment:"
+msgstr "项目符号对齐(&A):"
+
+#: ../src/richtext/richtextliststylepage.cpp:310
+msgid "Bullet style"
+msgstr "项目符号样式"
+
+#: ../src/richtext/richtextformatdlg.cpp:341
+msgid "Bullets"
+msgstr "项目符号"
+
+#: ../src/common/paper.cpp:100
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
-#: ../src/generic/logg.cpp:510
+#: ../src/generic/logg.cpp:518
 msgid "C&lear"
 msgstr "清除(&L)"
 
-#: ../src/generic/fontdlgg.cpp:308
+#: ../src/generic/fontdlgg.cpp:407
 msgid "C&olour:"
 msgstr "颜色(&o):"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:125
 msgid "C3 Envelope, 324 x 458 mm"
 msgstr "C3 信封, 324 x 458 毫米"
 
-#: ../src/common/paper.cpp:138
+#: ../src/common/paper.cpp:126
 msgid "C4 Envelope, 229 x 324 mm"
 msgstr "C4 信封, 229 x 324 毫米"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:124
 msgid "C5 Envelope, 162 x 229 mm"
 msgstr "C5 信封, 162 x 229 毫米"
 
-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:127
 msgid "C6 Envelope, 114 x 162 mm"
 msgstr "C6 信封, 114 x 162 毫米"
 
-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:128
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 
-#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
-msgid "CHM handler currently supports only local files!"
-msgstr "CHM处理程序目前只支持本地文件!"
-
-#: ../src/os2/thread.cpp:121
-#, fuzzy
-msgid "Can not create mutex."
-msgstr "不能创建互斥对象."
-
-#: ../src/common/filefn.cpp:1290
-#, c-format
-msgid "Can not enumerate files '%s'"
-msgstr "不能枚举文件 '%s'"
-
-#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
-#, c-format
-msgid "Can not enumerate files in directory '%s'"
-msgstr "不能枚举目录 '%s'中的文件"
+#: ../src/common/accelcmn.cpp:67
+msgid "CANCEL"
+msgstr "CANCEL"
 
-#: ../src/os2/thread.cpp:523
-#, c-format
-msgid "Can not resume thread %lu"
-msgstr "不能恢复线程 %lu"
+#: ../src/common/accelcmn.cpp:71
+msgid "CAPITAL"
+msgstr "CAPITAL"
 
-#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:824
-#, c-format
-msgid "Can not resume thread %x"
-msgstr "不能恢复线程 %x"
+#: ../src/common/stockitem.cpp:147
+msgid "CD-Rom"
+msgstr "CD 光驱"
 
-#: ../src/msw/thread.cpp:498
-msgid "Can not start thread: error writing TLS."
-msgstr "不能启动线程: 写TLS出错."
+#: ../src/html/chm.cpp:818 ../src/html/chm.cpp:877
+msgid "CHM handler currently supports only local files!"
+msgstr "CHM处理程序目前只支持本地文件！"
 
-#: ../src/os2/thread.cpp:510
-#, c-format
-msgid "Can not suspend thread %lu"
-msgstr "不能挂起线程 %lu"
+#: ../src/common/accelcmn.cpp:68
+msgid "CLEAR"
+msgstr "CLEAR"
 
-#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:809
-#, c-format
-msgid "Can not suspend thread %x"
-msgstr "不能挂起线程 %x"
+#: ../src/common/accelcmn.cpp:112
+msgid "COMMAND"
+msgstr "COMMAND"
 
-#: ../src/msw/thread.cpp:722
-msgid "Can not wait for thread termination"
-msgstr "不能等候线程终止"
+#: ../src/richtext/richtextfontpage.cpp:289
+msgid "Ca&pitals"
+msgstr ""
 
-#: ../src/common/cmdproc.cpp:266
+#: ../src/common/cmdproc.cpp:268
 msgid "Can't &Undo "
-msgstr "不能恢复(&U)"
+msgstr "无法撤销(&U)"
 
-#: ../src/common/image.cpp:1763
-#, c-format
-msgid "Can't check image format of file '%s': file does not exist."
-msgstr "不能检查文件格式 '%s': 文件不存在."
+#: ../src/common/image.cpp:2579
+msgid "Can't automatically determine the image format for non-seekable input."
+msgstr ""
 
-#: ../src/msw/registry.cpp:434
+#: ../src/msw/registry.cpp:506
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "不能关闭注册键 '%s'"
+msgstr "无法关闭注册键 '%s'"
 
-#: ../src/msw/registry.cpp:510
+#: ../src/msw/registry.cpp:584
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "不能复制不支持的类型 %d 的值."
+msgstr "无法复制不支持的类型 %d 的值."
 
-#: ../src/msw/registry.cpp:415
+#: ../src/msw/registry.cpp:487
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "不能创建注册键 '%s'"
+msgstr "无法创建注册键 '%s'"
 
-#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-#: ../src/os2/thread.cpp:491
+#: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:495
 msgid "Can't create thread"
-msgstr "不能创建进程"
+msgstr "无法创建进程"
 
-#: ../src/msw/window.cpp:3077
+#: ../src/msw/window.cpp:3780
 #, c-format
 msgid "Can't create window of class %s"
-msgstr "不能创建类 '%s' 的窗口"
+msgstr "无法创建窗口类 %s"
 
-#: ../src/msw/registry.cpp:686
+#: ../src/msw/registry.cpp:777
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "不能删除键 '%s'"
+msgstr "无法删除键 '%s'"
 
-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:459 ../src/os2/iniconf.cpp:472
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "不能删除 INI 文件 '%s'"
+msgstr "无法删除 INI 文件 '%s'"
 
-#: ../src/msw/registry.cpp:713
+#: ../src/msw/registry.cpp:805
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "不能删除键值 '%s'/ '%s'"
+msgstr "无法删除值 '%s' 位于键 '%s'"
 
-#: ../src/msw/registry.cpp:1061
+#: ../src/msw/registry.cpp:1162
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "不能枚举键 '%s'的子键"
+msgstr "无法枚举键 '%s' 的子键"
 
-#: ../src/msw/registry.cpp:1016
+#: ../src/msw/registry.cpp:1117
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "不能枚举键 '%s'的值"
+msgstr "无法枚举键 '%s' 的值"
 
-#: ../src/msw/registry.cpp:1267
-#, fuzzy, c-format
+#: ../src/msw/registry.cpp:1380
+#, c-format
 msgid "Can't export value of unsupported type %d."
-msgstr "不能导出不支持的类型 %d 的值."
+msgstr "无法导出不支持的类型 %d 的值."
 
-#: ../src/common/ffile.cpp:238
+#: ../src/common/ffile.cpp:235
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "不能在文件'%s'中找到当前位置"
+msgstr "无法在文件 '%s' 中找到当前位置"
 
-#: ../src/msw/registry.cpp:351
+#: ../src/msw/registry.cpp:417
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "不能获得注册键 '%s'的信息"
+msgstr "无法获得注册键 '%s' 的信息"
 
-#: ../src/common/zstream.cpp:237
+#: ../src/common/zstream.cpp:347
 msgid "Can't initialize zlib deflate stream."
-msgstr "不能初始化zlib deflate(压缩)流."
+msgstr "无法初始化 zlib 压缩流。"
 
-#: ../src/common/zstream.cpp:99
+#: ../src/common/zstream.cpp:186
 msgid "Can't initialize zlib inflate stream."
-msgstr "不能初始化zlib inflate(解压)流."
+msgstr "无法初始化 zlib 解压流。"
 
-#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364
+#: ../src/msw/fswatcher.cpp:429
 #, c-format
-msgid "Can't load image from file '%s': file does not exist."
-msgstr "不能从文件 '%s'中装入图像: 文件不存在."
+msgid "Can't monitor non-existent directory \"%s\" for changes."
+msgstr "无法监视不存在目录 \"%s\" 的更新。"
 
-#: ../src/msw/registry.cpp:381
+#: ../src/common/fswatchercmn.cpp:93
+#, c-format
+msgid "Can't monitor non-existent path \"%s\" for changes."
+msgstr ""
+
+#: ../src/msw/registry.cpp:453
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "不能打开注册键 '%s'"
+msgstr "无法打开注册键 '%s'"
 
-#: ../src/common/zstream.cpp:166
+#: ../src/common/zstream.cpp:253
 #, c-format
 msgid "Can't read from inflate stream: %s"
-msgstr "不能从解压流 %s 中读"
+msgstr "无法从解压流 %s 中读取"
 
-#: ../src/common/zstream.cpp:159
+#: ../src/common/zstream.cpp:245
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "不能读解压流: 流内有异常的EOF."
+msgstr "无法读解压流: 流内有异常的 EOF。"
 
-#: ../src/msw/registry.cpp:950
+#: ../src/msw/registry.cpp:1049
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "不能读 '%s'的值"
+msgstr "无法读 '%s' 的值"
 
-#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
-#: ../src/msw/registry.cpp:876
+#: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910
+#: ../src/msw/registry.cpp:972
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "不能读键 '%s'的值"
+msgstr "无法读键 '%s' 的值"
 
-#: ../src/common/image.cpp:1386
+#: ../src/common/image.cpp:2376
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
+msgstr "无法从将图像保存至文件 '%s' 中: 无法识别的扩展名。"
 
-#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021
+#: ../src/generic/logg.cpp:579 ../src/generic/logg.cpp:1000
 msgid "Can't save log contents to file."
-msgstr "不能把日志内容保存到文件."
+msgstr "无法把日志内容保存到文件。"
 
-#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:652 ../src/os2/thread.cpp:478
 msgid "Can't set thread priority"
-msgstr "不能设置线程优先级"
+msgstr "无法设置线程优先级"
 
-#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
-#: ../src/msw/registry.cpp:965
+#: ../src/msw/registry.cpp:896 ../src/msw/registry.cpp:940
+#: ../src/msw/registry.cpp:1066
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "不能设置 '%s'的值"
+msgstr "无法设置 '%s' 的值"
+
+#: ../src/unix/utilsunx.cpp:352
+msgid "Can't write to child process's stdin"
+msgstr "无法写入子进程的标准输入"
 
-#: ../src/common/zstream.cpp:316
+#: ../src/common/zstream.cpp:428
 #, c-format
 msgid "Can't write to deflate stream: %s"
-msgstr "不能写到压缩流: %s"
+msgstr "无法写到压缩流: %s"
 
-#: ../contrib/src/deprecated/proplist.cpp:518 ../src/generic/choicdgg.cpp:291
-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/numdlgg.cpp:136
-#: ../src/generic/textdlgg.cpp:120 ../src/gtk/fontdlg.cpp:155
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:308
+#: ../src/common/stockitem.cpp:146 ../src/msw/msgdlg.cpp:489
+#: ../src/msw/progdlg.cpp:674 ../src/gtk1/fontdlg.cpp:145
+#: ../src/motif/msgdlg.cpp:194
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175
-msgid "Cannot convert dialog units: dialog unknown."
-msgstr "不能转换对话单元: 未知的对话."
+#: ../src/os2/thread.cpp:117
+msgid "Cannot create mutex."
+msgstr "无法创建互斥子。"
 
-#: ../src/common/strconv.cpp:2665
-#, c-format
-msgid "Cannot convert from the charset '%s'!"
-msgstr "不能从字符集 '%s' 转换!"
+#: ../src/osx/carbon/dataview.cpp:896
+msgid "Cannot create new column's ID. Probably max. number of columns reached."
+msgstr "无法建立新的列 ID。可能已达到列数量的上限。"
 
-#: ../src/msw/dialup.cpp:509
+#: ../src/common/filefn.cpp:1330
 #, c-format
-msgid "Cannot find active dialup connection: %s"
-msgstr "æ\89¾ä¸\8då\88°æ´»å\8a¨ç\9a\84æ\8b¨å\8f·è¿\9eæ\8e¥: %s"
+msgid "Cannot enumerate files '%s'"
+msgstr "æ\97 æ³\95æ\9e\9a举æ\96\87件 '%s'"
 
-#: ../src/xrc/xmlres.cpp:269
+#: ../src/msw/dir.cpp:211
 #, c-format
-msgid "Cannot find container for unknown control '%s'."
-msgstr "æ\89¾ä¸\8då\88°å\8f¯ä»¥å¯¹åº\94äº\8eæ\9cªç\9f¥æ\8e§ä»¶ '%s' ç\9a\84容å\99¨."
+msgid "Cannot enumerate files in directory '%s'"
+msgstr "æ\97 æ³\95æ\9e\9a举ç\9b®å½\95 '%s' 中ç\9a\84æ\96\87件"
 
-#: ../src/xrc/xmlres.cpp:1210
+#: ../src/msw/dialup.cpp:543
 #, c-format
-msgid "Cannot find font node '%s'."
-msgstr "找不到字体节点 '%s'."
+msgid "Cannot find active dialup connection: %s"
+msgstr "找不到活动的拨号连接: %s"
 
-#: ../src/msw/dialup.cpp:814
+#: ../src/msw/dialup.cpp:849
 msgid "Cannot find the location of address book file"
 msgstr "找不到地址簿文件的位置"
 
-#: ../src/unix/threadpsx.cpp:1100
+#: ../src/msw/ole/automtn.cpp:557
+#, fuzzy, c-format
+msgid "Cannot get an active instance of \"%s\""
+msgstr "找不到活动的拨号连接: %s"
+
+#: ../src/unix/threadpsx.cpp:1213
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "不能获得调度策略 %d 的优先级范围."
+msgstr "无法获得调度策略 %d 的优先级范围。"
 
-#: ../src/unix/utilsunx.cpp:758
+#: ../src/unix/utilsunx.cpp:878
 msgid "Cannot get the hostname"
-msgstr "不能获得主机名"
+msgstr "无法获得主机名"
 
-#: ../src/unix/utilsunx.cpp:794
+#: ../src/unix/utilsunx.cpp:914
 msgid "Cannot get the official hostname"
-msgstr "不能获得正式的主机名"
+msgstr "无法获得正式的主机名"
 
-#: ../src/msw/dialup.cpp:908
+#: ../src/msw/dialup.cpp:950
 msgid "Cannot hang up - no active dialup connection."
-msgstr "不能挂起 - 没有活动的拨号连接."
+msgstr "无法挂断 - 没有活动的拨号连接。"
 
-#: ../include/wx/msw/ole/oleutils.h:47
+#: ../include/wx/msw/ole/oleutils.h:53
 msgid "Cannot initialize OLE"
-msgstr "不能初始化 OLE"
+msgstr "无法初始化 OLE"
 
-#: ../src/mgl/app.cpp:292
-msgid "Cannot initialize SciTech MGL!"
-msgstr "不能初始化 SciTech MGL!"
+#: ../src/common/socket.cpp:844
+msgid "Cannot initialize sockets"
+msgstr "无法初始化 sockets"
 
-#: ../src/mgl/window.cpp:546
-msgid "Cannot initialize display."
-msgstr "不能初始化显示."
-
-#: ../src/msw/volume.cpp:601
+#: ../src/msw/volume.cpp:620
 #, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "不能从 '%s'中读取图标."
+msgstr "无法从 '%s' 中读取图标。"
+
+#: ../src/xrc/xmlres.cpp:362
+#, c-format
+msgid "Cannot load resources from '%s'."
+msgstr "无法从文件 '%s' 中载入资源。"
 
-#: ../src/xrc/xmlres.cpp:392
+#: ../src/xrc/xmlres.cpp:745
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "不能从文件 '%s'中读取资源."
+msgstr "无法从文件 '%s' 中载入资源。"
 
-#: ../src/html/htmlfilt.cpp:164
+#: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"
-msgstr "不能打开 HTML 文档: %s"
+msgstr "无法打开 HTML 文档: %s"
 
-#: ../src/html/helpdata.cpp:672
+#: ../src/html/helpdata.cpp:651
 #, 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'"
+msgstr "无法打开 HTML 帮助: %s"
 
-#: ../src/html/helpdata.cpp:312
+#: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "不能打开目录文件: %s"
-
-#: ../src/xrc/xmlres.cpp:360
-#, c-format
-msgid "Cannot open file '%s'."
-msgstr "不能打开文件 '%s'."
+msgstr "无法打开目录文件: %s"
 
-#: ../src/generic/dcpsg.cpp:1568
+#: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
-msgstr "不能打开文件进行PostScript打印!"
+msgstr "无法打开文件进行 PostScript 打印！"
 
-#: ../src/html/helpdata.cpp:326
+#: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open index file: %s"
-msgstr "不能打开索引文件: %s"
-
-#: ../src/common/intl.cpp:1202
-#, fuzzy, c-format
-msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "不能粘贴复数: '%s'"
+msgstr "无法打开索引文件: %s"
 
-#: ../src/xrc/xmlres.cpp:1111
+#: ../src/xrc/xmlres.cpp:727
 #, c-format
-msgid "Cannot parse coordinates from '%s'."
-msgstr "不能从 '%s'中粘贴坐标."
-
-#: ../src/xrc/xmlres.cpp:1159
-#, fuzzy, c-format
-msgid "Cannot parse dimension from '%s'."
-msgstr "不能从 '%s'中粘贴维数."
+msgid "Cannot open resources file '%s'."
+msgstr "无法打开资源文件 '%s'。"
 
-#: ../src/html/helpfrm.cpp:1562
+#: ../src/html/helpwnd.cpp:1538
 msgid "Cannot print empty page."
-msgstr "不能打印空页面."
+msgstr "无法打印空白页面。"
 
-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:508
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "不能从 '%s'中读取类型名称."
+msgstr "无法从 '%s' 中读取类型名称！"
+
+#: ../src/os2/thread.cpp:528
+#, c-format
+msgid "Cannot resume thread %lu"
+msgstr "无法恢复线程 %lu"
+
+#: ../src/msw/thread.cpp:922
+#, c-format
+msgid "Cannot resume thread %x"
+msgstr "无法恢复线程 %x"
 
-#: ../src/unix/threadpsx.cpp:1081
+#: ../src/unix/threadpsx.cpp:1194
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "不能找回线程调度策略."
+msgstr "无法找回线程调度策略。"
+
+#: ../src/common/intl.cpp:545
+#, c-format
+msgid "Cannot set locale to language \"%s\"."
+msgstr "无法设定为语言 \"%s\"。"
+
+#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570
+msgid "Cannot start thread: error writing TLS."
+msgstr "无法启动线程: 写 TLS 出错。"
 
-#: ../src/unix/threadpsx.cpp:729
-msgid "Cannot start thread: error writing TLS"
-msgstr "不能启动线程: 写TLS错误"
+#: ../src/os2/thread.cpp:514
+#, c-format
+msgid "Cannot suspend thread %lu"
+msgstr "无法挂起线程 %lu"
 
-#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-msgid "Cannot wait for thread termination."
-msgstr "不能等候线程终止."
+#: ../src/msw/thread.cpp:907
+#, c-format
+msgid "Cannot suspend thread %x"
+msgstr "无法挂起线程 %x"
 
-#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
-msgid "Cant create the thread event queue"
-msgstr "不能创建线程事件队列"
+#: ../src/msw/thread.cpp:830
+msgid "Cannot wait for thread termination"
+msgstr "无法等候线程终止"
 
-#: ../src/html/helpfrm.cpp:534
+#: ../src/html/helpwnd.cpp:547
 msgid "Case sensitive"
 msgstr "大小写敏感"
 
-#: ../src/common/fmapbase.cpp:116
+#: ../src/propgrid/manager.cpp:1494
+msgid "Categorized Mode"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8843
+msgid "Cell Properties"
+msgstr "单元格属性"
+
+#: ../src/common/fmapbase.cpp:162
 msgid "Celtic (ISO-8859-14)"
 msgstr "凯尔特语 (ISO-8859-14)"
 
-#: ../src/common/stockitem.cpp:127
+#: ../src/richtext/richtextindentspage.cpp:173
+#: ../src/richtext/richtextliststylepage.cpp:350
+msgid "Cen&tred"
+msgstr "居中(&t)"
+
+#: ../src/common/stockitem.cpp:171
 msgid "Centered"
 msgstr "居中"
 
-#: ../src/common/fmapbase.cpp:104
+#: ../src/common/fmapbase.cpp:150
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:749
+#: ../src/richtext/richtextliststylepage.cpp:251
+#: ../src/richtext/richtextbulletspage.cpp:201
+msgid "Centre"
+msgstr "居中"
+
+#: ../src/richtext/richtextindentspage.cpp:175
+#: ../src/richtext/richtextindentspage.cpp:177
+#: ../src/richtext/richtextliststylepage.cpp:352
+#: ../src/richtext/richtextliststylepage.cpp:354
+msgid "Centre text."
+msgstr "文字居中。"
+
+#: ../src/richtext/richtextsizepage.cpp:263
+msgid "Centred"
+msgstr "居中"
+
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextbulletspage.cpp:233
+msgid "Ch&oose..."
+msgstr "选择(&o)..."
+
+#: ../src/richtext/richtextbuffer.cpp:3936
+msgid "Change List Style"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:3300
+msgid "Change Object Style"
+msgstr "更改对象样式"
+
+#: ../src/richtext/richtextbuffer.cpp:3566
+msgid "Change Properties"
+msgstr "修改属性"
+
+#: ../src/richtext/richtextbuffer.cpp:3127
+msgid "Change Style"
+msgstr "更改样式"
+
+#: ../src/common/fileconf.cpp:373
+#, c-format
+msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:1043
+msgid "Character styles"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:225
+#: ../src/richtext/richtextliststylepage.cpp:227
+#: ../src/richtext/richtextbulletspage.cpp:175
+#: ../src/richtext/richtextbulletspage.cpp:177
+msgid "Check to add a period after the bullet."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:239
+#: ../src/richtext/richtextliststylepage.cpp:241
+#: ../src/richtext/richtextbulletspage.cpp:189
+#: ../src/richtext/richtextbulletspage.cpp:191
+msgid "Check to add a right parenthesis."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:182
+#: ../src/richtext/richtextbulletspage.cpp:184
+msgid "Check to enclose the bullet in parentheses."
+msgstr ""
+
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542
+msgid "Check to make the font bold."
+msgstr "勾选设定为粗体。"
+
+#: ../src/osx/carbon/fontdlg.cpp:547 ../src/osx/carbon/fontdlg.cpp:549
+msgid "Check to make the font italic."
+msgstr "勾选设定为斜体。"
+
+#: ../src/osx/carbon/fontdlg.cpp:556 ../src/osx/carbon/fontdlg.cpp:558
+msgid "Check to make the font underlined."
+msgstr "勾选加下划线。"
+
+#: ../src/richtext/richtextstyledlg.cpp:297
+#: ../src/richtext/richtextstyledlg.cpp:299
+msgid "Check to restart numbering."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:284
+#: ../src/richtext/richtextfontpage.cpp:286
+msgid "Check to show a line through the text."
+msgstr "勾选加删除线。"
+
+#: ../src/richtext/richtextfontpage.cpp:291
+#: ../src/richtext/richtextfontpage.cpp:293
+msgid "Check to show the text in capitals."
+msgstr "勾选显示为大写。"
+
+#: ../src/richtext/richtextfontpage.cpp:305
+#: ../src/richtext/richtextfontpage.cpp:307
+msgid "Check to show the text in subscript."
+msgstr "勾选显示为下标。"
+
+#: ../src/richtext/richtextfontpage.cpp:298
+#: ../src/richtext/richtextfontpage.cpp:300
+msgid "Check to show the text in superscript."
+msgstr "勾选显示为上标。"
+
+#: ../src/msw/dialup.cpp:785
 msgid "Choose ISP to dial"
 msgstr "选择ISP进行拨号"
 
-#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-#: ../src/palmos/colordlg.cpp:76
+#: ../src/propgrid/props.cpp:1644
+msgid "Choose a directory:"
+msgstr "选择目录:"
+
+#: ../src/propgrid/props.cpp:1703
+msgid "Choose a file"
+msgstr "选择文件"
+
+#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:62
 msgid "Choose colour"
 msgstr "选择颜色"
 
-#: ../src/gtk/fontdlg.cpp:133
+#: ../src/generic/fontpickerg.cpp:51 ../src/gtk/fontdlg.cpp:99
+#: ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "选择字体"
 
-#: ../src/generic/mdig.cpp:114
+#: ../src/common/module.cpp:75
+#, c-format
+msgid "Circular dependency involving module \"%s\" detected."
+msgstr ""
+
+#: ../src/aui/tabmdi.cpp:107 ../src/generic/mdig.cpp:98
 msgid "Cl&ose"
 msgstr "关闭(&o)"
 
-#: ../src/generic/logg.cpp:510
+#: ../src/msw/ole/automtn.cpp:668
+msgid "Class not registered."
+msgstr "类未注册。"
+
+#: ../src/common/stockitem.cpp:148
+msgid "Clear"
+msgstr "清除"
+
+#: ../src/generic/logg.cpp:518
 msgid "Clear the log contents"
 msgstr "清除日志内容"
 
-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-msgid "Click to cancel the font selection."
-msgstr "点击取消字体选择."
+#: ../src/richtext/richtextstyledlg.cpp:260
+#: ../src/richtext/richtextstyledlg.cpp:262
+msgid "Click to apply the selected style."
+msgstr "点击应用所选样式。"
+
+#: ../src/richtext/richtextliststylepage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:284
+#: ../src/richtext/richtextbulletspage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:236
+msgid "Click to browse for a symbol."
+msgstr ""
+
+#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589
+msgid "Click to cancel changes to the font."
+msgstr "点击取消字体变更。"
 
-#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/generic/fontdlgg.cpp:473 ../src/generic/fontdlgg.cpp:492
+msgid "Click to cancel the font selection."
+msgstr "点击取消字体选择。"
+
+#: ../src/osx/carbon/fontdlg.cpp:568 ../src/osx/carbon/fontdlg.cpp:570
+msgid "Click to change the font colour."
+msgstr "点击更改字体颜色。"
+
+#: ../src/richtext/richtextfontpage.cpp:274
+#: ../src/richtext/richtextfontpage.cpp:276
+msgid "Click to change the text background colour."
+msgstr "点击修改字体背景颜色。"
+
+#: ../src/richtext/richtextfontpage.cpp:261
+#: ../src/richtext/richtextfontpage.cpp:263
+msgid "Click to change the text colour."
+msgstr "点击修改字体颜色。"
+
+#: ../src/richtext/richtextliststylepage.cpp:196
+#: ../src/richtext/richtextliststylepage.cpp:198
+msgid "Click to choose the font for this level."
+msgstr "点击选择此层级字体。"
+
+#: ../src/richtext/richtextstyledlg.cpp:287
+#: ../src/richtext/richtextstyledlg.cpp:289
+msgid "Click to close this window."
+msgstr "点击关闭此窗口。"
+
+#: ../src/osx/carbon/fontdlg.cpp:594 ../src/osx/carbon/fontdlg.cpp:596
+msgid "Click to confirm changes to the font."
+msgstr "点击确认字体更改。"
+
+#: ../src/generic/fontdlgg.cpp:478 ../src/generic/fontdlgg.cpp:480
+#: ../src/generic/fontdlgg.cpp:485 ../src/generic/fontdlgg.cpp:487
 msgid "Click to confirm the font selection."
-msgstr "点击确认字体选择."
+msgstr "点击确认字体选择。"
+
+#: ../src/richtext/richtextstyledlg.cpp:252
+#: ../src/richtext/richtextstyledlg.cpp:254
+#, fuzzy
+msgid "Click to create a new box style."
+msgstr "点击新增列表样式。"
+
+#: ../src/richtext/richtextstyledlg.cpp:234
+#: ../src/richtext/richtextstyledlg.cpp:236
+msgid "Click to create a new character style."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:246
+#: ../src/richtext/richtextstyledlg.cpp:248
+msgid "Click to create a new list style."
+msgstr "点击新增列表样式。"
 
-#: ../contrib/src/deprecated/proplist.cpp:513 ../src/generic/dbgrptg.cpp:88
-#: ../src/generic/progdlgg.cpp:629 ../src/generic/progdlgg.cpp:634
+#: ../src/richtext/richtextstyledlg.cpp:240
+#: ../src/richtext/richtextstyledlg.cpp:242
+msgid "Click to create a new paragraph style."
+msgstr ""
+
+#: ../src/richtext/richtexttabspage.cpp:138
+#: ../src/richtext/richtexttabspage.cpp:140
+msgid "Click to create a new tab position."
+msgstr "点击建立新的标签位置。"
+
+#: ../src/richtext/richtexttabspage.cpp:150
+#: ../src/richtext/richtexttabspage.cpp:152
+msgid "Click to delete all tab positions."
+msgstr "点击删除所有标签位置。"
+
+#: ../src/richtext/richtextstyledlg.cpp:278
+#: ../src/richtext/richtextstyledlg.cpp:280
+msgid "Click to delete the selected style."
+msgstr "点击删除所选样式。"
+
+#: ../src/richtext/richtexttabspage.cpp:144
+#: ../src/richtext/richtexttabspage.cpp:146
+msgid "Click to delete the selected tab position."
+msgstr "点击删除所选标签位置。"
+
+#: ../src/richtext/richtextstyledlg.cpp:272
+#: ../src/richtext/richtextstyledlg.cpp:274
+msgid "Click to edit the selected style."
+msgstr "点击编辑所选样式。"
+
+#: ../src/richtext/richtextstyledlg.cpp:266
+#: ../src/richtext/richtextstyledlg.cpp:268
+msgid "Click to rename the selected style."
+msgstr "点击重命名所选样式。"
+
+#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
+#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:285
+#: ../src/richtext/richtextsymboldlg.cpp:477 ../src/common/stockitem.cpp:149
+#: ../src/msw/progdlg.cpp:171 ../src/msw/progdlg.cpp:680
+#: ../src/html/helpdlg.cpp:91
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/univ/themes/win32.cpp:4825
-msgid "Close\tAlt-F4"
-msgstr "关闭\tAlt-F4"
-
-#: ../src/generic/mdig.cpp:115
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:99
 msgid "Close All"
 msgstr "全部关闭"
 
-#: ../src/generic/logg.cpp:512
+#: ../src/common/stockitem.cpp:267
+msgid "Close current document"
+msgstr ""
+
+#: ../src/generic/logg.cpp:520
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../src/html/helpfrm.cpp:1576
+#: ../src/common/stockitem.cpp:194
+msgid "Color"
+msgstr "颜色"
+
+#: ../src/richtext/richtextformatdlg.cpp:722
+msgid "Colour"
+msgstr "颜色"
+
+#: ../src/msw/colordlg.cpp:154
+#, c-format
+msgid "Colour selection dialog failed with error %0lx."
+msgstr "颜色选择对话框错误，错误码 %0lx。"
+
+#: ../src/osx/carbon/fontdlg.cpp:564
+msgid "Colour:"
+msgstr "颜色:"
+
+#: ../src/osx/carbon/dataview.cpp:901
+msgid "Column could not be added."
+msgstr "无法增加列。"
+
+#: ../src/osx/carbon/dataview.cpp:900
+msgid "Column description could not be initialized."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560
+msgid "Column index not found."
+msgstr "找不到列索引。"
+
+#: ../src/osx/carbon/dataview.cpp:1615
+msgid "Column width could not be determined"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:902
+msgid "Column width could not be set."
+msgstr ""
+
+#: ../src/common/init.cpp:185
+#, c-format
+msgid ""
+"Command line argument %d couldn't be converted to Unicode and will be "
+"ignored."
+msgstr ""
+
+#: ../src/msw/fontdlg.cpp:117
+#, c-format
+msgid "Common dialog failed with error code %0lx."
+msgstr "公共对话框错误，错误码 %0lx。"
+
+#: ../src/gtk/window.cpp:4228
+msgid ""
+"Compositing not supported by this system, please enable it in your Window "
+"Manager."
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1555
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:582
+#: ../src/generic/dirctrlg.cpp:536
 msgid "Computer"
 msgstr "计算机"
 
-#: ../src/common/fileconf.cpp:938
+#: ../src/common/fileconf.cpp:966
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "配置条目名不能以 '%c'开头."
+msgstr "配置条目名不能以 '%c' 开头。"
 
-#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64
+#: ../src/gtk/filedlg.cpp:59
 msgid "Confirm"
 msgstr "确认"
 
-#: ../src/msw/mimetype.cpp:677
+#: ../src/msw/mimetype.cpp:715
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 
-#: ../src/html/htmlwin.cpp:386
+#: ../src/html/htmlwin.cpp:540
 msgid "Connecting..."
-msgstr "连接..."
+msgstr "正在连接..."
 
-#: ../src/html/helpfrm.cpp:476
+#: ../src/html/helpwnd.cpp:483
 msgid "Contents"
 msgstr "目录"
 
-#: ../src/common/strconv.cpp:1428
+#: ../src/common/strconv.cpp:2263
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "不能进行到字符集 '%s'的变换."
+msgstr "无法进行到字符集 '%s' 的转换。"
+
+#: ../src/common/stockitem.cpp:150
+msgid "Convert"
+msgstr "转换"
 
-#: ../src/html/htmlwin.cpp:824
+#: ../src/html/htmlwin.cpp:1053
 #, c-format
 msgid "Copied to clipboard:\"%s\""
 msgstr "已复制到剪贴板:\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:242
+#: ../src/generic/prntdlgg.cpp:253
 msgid "Copies:"
 msgstr "份数:"
 
-#: ../src/html/chm.cpp:703
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19
+msgid "Copy"
+msgstr "复制"
+
+#: ../src/common/stockitem.cpp:259
+msgid "Copy selection"
+msgstr "复制选区"
+
+#: ../src/html/chm.cpp:721
 #, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "不能创建临时文件 '%s'"
+msgstr "无法创建临时文件 '%s'"
+
+#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673
+msgid "Could not determine column index."
+msgstr "无法确定列索引。"
+
+#: ../src/osx/carbon/dataview.cpp:877
+msgid "Could not determine column's position"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:844
+msgid "Could not determine number of columns."
+msgstr "无法确定列数量。"
+
+#: ../src/osx/carbon/dataview.cpp:976
+msgid "Could not determine number of items"
+msgstr "无法确定项目数量"
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
-msgstr "不能将 %s解开至 %s: %s"
-
-#: ../contrib/src/deprecated/resource.cpp:1830
-#: ../contrib/src/deprecated/resource.cpp:1960
-#, c-format
-msgid "Could not find resource include file %s."
-msgstr "找不到资源包含文件 %s."
+msgstr "无法将 %s 解开至 %s: %s"
 
-#: ../src/generic/tabg.cpp:1048
+#: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
-msgstr "找不到id的标签"
+msgstr "找不到 id 的标签"
+
+#: ../src/osx/carbon/dataview.cpp:2557 ../src/osx/carbon/dataview.cpp:2592
+#: ../src/osx/carbon/dataview.cpp:2616 ../src/osx/carbon/dataview.cpp:2637
+#: ../src/osx/carbon/dataview.cpp:2774
+msgid "Could not get header description."
+msgstr "无法获取表头描述。"
+
+#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196
+msgid "Could not get items."
+msgstr "无法获取项目。"
+
+#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725
+msgid "Could not get property flags."
+msgstr "无法获取属性标志。"
+
+#: ../src/osx/carbon/dataview.cpp:727
+msgid "Could not get selected items."
+msgstr "无法获取所选项目。"
 
 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."
-msgstr "找不到文件 '%s'"
+msgstr "找不到文件 '%s'。"
 
-#: ../contrib/src/deprecated/resource.cpp:829
-#, c-format
-msgid ""
-"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
-" or provide #define (see manual for caveats)"
-msgstr ""
-"不能解析控件类或者id '%s'. 用(非零)整数代替\n"
-"或 提供 #define (详细信息见手册)"
+#: ../src/osx/carbon/dataview.cpp:846
+msgid "Could not remove column."
+msgstr "无法删除列。"
 
-#: ../contrib/src/deprecated/resource.cpp:1278
-#, c-format
-msgid ""
-"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-"or provide #define (see manual for caveats)"
-msgstr ""
-"不能解析菜单id '%s'. 用(非零)整数代替\n"
-"或 提供 #define (详细信息见手册)"
+#: ../src/osx/carbon/dataview.cpp:643
+msgid "Could not retrieve number of items"
+msgstr "无法获取项目数量"
+
+#: ../src/osx/carbon/dataview.cpp:2573
+msgid "Could not set alignment."
+msgstr "无法设定对齐。"
+
+#: ../src/osx/carbon/dataview.cpp:2804
+msgid "Could not set column width."
+msgstr "无法启动文档预览。"
+
+#: ../src/common/filefn.cpp:1565
+msgid "Could not set current working directory"
+msgstr "无法设置当前工作目录"
+
+#: ../src/osx/carbon/dataview.cpp:2776
+msgid "Could not set header description."
+msgstr "无法启动打印。"
+
+#: ../src/osx/carbon/dataview.cpp:2597
+msgid "Could not set icon."
+msgstr "无法启动打印。"
 
-#: ../src/common/prntbase.cpp:1225
+#: ../src/osx/carbon/dataview.cpp:2618
+msgid "Could not set maximum width."
+msgstr "无法设定最大宽度。"
+
+#: ../src/osx/carbon/dataview.cpp:2639
+msgid "Could not set minimum width."
+msgstr "无法设定最小宽度。"
+
+#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730
+msgid "Could not set property flags."
+msgstr "无法设定属性标志。"
+
+#: ../src/common/prntbase.cpp:1986
 msgid "Could not start document preview."
-msgstr "不能启动文档预览."
+msgstr "无法启动文档预览。"
 
-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
-#: ../src/msw/printwin.cpp:235
+#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:204
+#: ../src/gtk/print.cpp:1079 ../src/gtk/gnome/gprint.cpp:918
 msgid "Could not start printing."
-msgstr "不能启动打印."
+msgstr "无法启动打印。"
 
-#: ../src/common/wincmn.cpp:1488
+#: ../src/common/wincmn.cpp:2024
 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
-msgid "Could not unlock mutex"
-msgstr "不能释放互斥体"
+msgstr "无法把数据转到窗口"
 
-#: ../src/os2/thread.cpp:154
+#: ../src/os2/thread.cpp:161
 msgid "Couldn't acquire a mutex lock"
-msgstr "不能得到互斥锁"
+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/imaglist.cpp:167 ../src/msw/imaglist.cpp:198
+#: ../src/msw/imaglist.cpp:210 ../src/msw/dragimag.cpp:194
+#: ../src/msw/dragimag.cpp:233
 msgid "Couldn't add an image to the image list."
-msgstr "不能把图像加到图象列表."
+msgstr "无法把图像加到图象列表。"
 
-#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
+#: ../src/msw/timer.cpp:135 ../src/os2/timer.cpp:114
 msgid "Couldn't create a timer"
-msgstr "不能创建计时器"
+msgstr "无法创建计时器"
+
+#: ../src/osx/carbon/overlay.cpp:123
+#, fuzzy
+msgid "Couldn't create the overlay window"
+msgstr "无法创建计时器"
 
-#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
-msgid "Couldn't create cursor."
-msgstr "不能创建游标"
+#: ../src/common/translation.cpp:1853
+#, fuzzy
+msgid "Couldn't enumerate translations"
+msgstr "无法终止线程"
 
-#: ../src/common/dynlib.cpp:199
+#: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "在动态连接库中找不到符号'%s'"
+msgstr "在动态连接库中找不到符号 '%s'"
 
-#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:850
+#: ../src/gtk/print.cpp:2027
+msgid "Couldn't get hatch style from wxBrush."
+msgstr ""
+
+#: ../src/msw/thread.cpp:948
 msgid "Couldn't get the current thread pointer"
-msgstr "不能获得当前线程指针"
+msgstr "无法获得当前线程指针"
+
+#: ../src/osx/carbon/overlay.cpp:130
+#, fuzzy
+msgid "Couldn't init the context on the overlay window"
+msgstr "无法获得当前线程指针"
 
-#: ../src/common/imagpng.cpp:596
+#: ../src/common/imaggif.cpp:264
+#, fuzzy
+msgid "Couldn't initialize GIF hash table."
+msgstr "无法初始化 zlib 压缩流."
+
+#: ../src/common/imagpng.cpp:658
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "不能装入PNG图像 - 文件被破坏 或 没有足够内存."
+msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 
-#: ../src/unix/sound.cpp:472
+#: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "不能从 '%s'中的读取声音数据."
+msgstr "无法从 '%s' 中的读取声音数据。"
+
+#: ../src/msw/dirdlg.cpp:439
+#, fuzzy
+msgid "Couldn't obtain folder name"
+msgstr "无法创建计时器"
 
-#: ../src/unix/sound_sdl.cpp:230
+#: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
-msgstr "不能打开音频: %s"
+msgstr "无法打开音频: %s"
 
-#: ../src/msw/ole/dataobj.cpp:147
+#: ../src/msw/ole/dataobj.cpp:160
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "不能注册剪贴板格式 '%s'."
+msgstr "无法注册剪贴板格式 '%s'。"
 
-#: ../src/os2/thread.cpp:171
+#: ../src/os2/thread.cpp:178
 msgid "Couldn't release a mutex"
-msgstr "不能释放互斥体"
+msgstr "无法释放互斥子"
 
-#: ../src/msw/listctrl.cpp:735
+#: ../src/msw/listctrl.cpp:757
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
-msgstr "不能获得列表控件的项 %d信息."
+msgstr "无法获得列表控件的项 %d 信息。"
 
-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-#: ../src/common/imagpng.cpp:659
+#: ../src/common/imagpng.cpp:747 ../src/common/imagpng.cpp:758
+#: ../src/common/imagpng.cpp:768
 msgid "Couldn't save PNG image."
-msgstr "不能保存PNG图像."
+msgstr "无法保存 PNG 图像。"
 
-#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
+#: ../src/msw/thread.cpp:715
 msgid "Couldn't terminate thread"
-msgstr "不能终止线程"
+msgstr "无法终止线程"
 
-#: ../src/common/xtistrm.cpp:161
-msgid "Create Parameter not found in declared RTTI Parameters"
+#: ../src/common/xtistrm.cpp:171
+#, fuzzy, c-format
+msgid "Create Parameter %s not found in declared RTTI Parameters"
 msgstr "在声明的RTTI参数里找不到创建参数"
 
-#: ../src/generic/dirdlgg.cpp:309
+#: ../src/generic/dirdlgg.cpp:318
 msgid "Create directory"
 msgstr "创建目录"
 
-#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:1007
+#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:132
 msgid "Create new directory"
 msgstr "创建新目录"
 
-#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064
+#: ../src/common/accelcmn.cpp:323
+msgid "Ctrl+"
+msgstr "Ctrl+"
+
+#: ../src/richtext/richtextctrl.cpp:324 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222
 msgid "Cu&t"
 msgstr "剪切(&t)"
 
-#: ../src/generic/filedlgg.cpp:1018
+#: ../src/generic/filectrlg.cpp:950
 msgid "Current directory:"
 msgstr "当前目录:"
 
-#: ../src/common/fmapbase.cpp:107
+#: ../src/gtk/print.cpp:764
+msgid "Custom size"
+msgstr "自定义大小"
+
+#: ../src/common/headerctrlcmn.cpp:61
+msgid "Customize Columns"
+msgstr "自定义列"
+
+#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18
+msgid "Cut"
+msgstr "剪切"
+
+#: ../src/common/stockitem.cpp:260
+msgid "Cut selection"
+msgstr "剪切选区"
+
+#: ../src/common/fmapbase.cpp:153
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "西里尔语 (ISO-8859-5)"
 
-#: ../src/common/paper.cpp:113
+#: ../src/common/paper.cpp:101
 msgid "D sheet, 22 x 34 in"
 msgstr "D 纸张, 22 x 34 英寸"
 
-#: ../src/msw/dde.cpp:633
+#: ../src/msw/dde.cpp:709
 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
-#: ../src/common/imagbmp.cpp:921
+#: ../src/common/accelcmn.cpp:80
+msgid "DECIMAL"
+msgstr "DECIMAL"
+
+#: ../src/common/accelcmn.cpp:48
+msgid "DEL"
+msgstr "DEL"
+
+#: ../src/common/accelcmn.cpp:49
+msgid "DELETE"
+msgstr "DELETE"
+
+#: ../src/common/imagbmp.cpp:1045
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "DIB头: 编码不能匹配颜色位数."
+msgstr "DIB头: 编码不匹配颜色位数。"
 
-#: ../src/common/imagbmp.cpp:883
+#: ../src/common/imagbmp.cpp:1000
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素。"
 
-#: ../src/common/imagbmp.cpp:877
+#: ../src/common/imagbmp.cpp:992
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素。"
 
-#: ../src/common/imagbmp.cpp:897
+#: ../src/common/imagbmp.cpp:1016
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "DIB头: 文件中颜色位数未知."
+msgstr "DIB头: 文件中颜色位数未知。"
 
-#: ../src/common/imagbmp.cpp:907
+#: ../src/common/imagbmp.cpp:1028
 msgid "DIB Header: Unknown encoding in file."
-msgstr "DIB头: 文件编码未知."
+msgstr "DIB头: 文件编码未知。"
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/accelcmn.cpp:81
+msgid "DIVIDE"
+msgstr "DIVIDE"
+
+#: ../src/common/paper.cpp:123
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 
-#: ../src/generic/dbgrptg.cpp:276
-#, c-format
-msgid "Debug report \"%s\""
+#: ../src/common/accelcmn.cpp:60
+msgid "DOWN"
+msgstr "DOWN"
+
+#: ../src/richtext/richtextborderspage.cpp:545
+msgid "Dashed"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1922
+msgid "Data object has invalid data format"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:2492
+msgid "Date renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:297
+#, 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 "无法创建调试报告."
+msgstr "无法创建调试报告。"
 
-#: ../src/common/debugrpt.cpp:517
+#: ../src/common/debugrpt.cpp:549
 msgid "Debug report generation has failed."
-msgstr "无法生成调试报告."
+msgstr "无法生成调试报告。"
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:324
 msgid "Decorative"
 msgstr "修饰"
 
-#: ../src/common/fmapbase.cpp:674
+#: ../src/common/fmapbase.cpp:797
 msgid "Default encoding"
 msgstr "缺省编码"
 
-#: ../src/generic/prntdlgg.cpp:506
+#: ../src/dfb/fontmgr.cpp:181
+msgid "Default font"
+msgstr "缺省字体"
+
+#: ../src/generic/prntdlgg.cpp:516
 msgid "Default printer"
 msgstr "缺省的打印机"
 
-#: ../contrib/src/gizmos/editlbox.cpp:160
+#: ../src/richtext/richtextbuffer.cpp:7367 ../src/common/stockitem.cpp:153
+#: ../src/stc/stc_i18n.cpp:21
+msgid "Delete"
+msgstr "删除"
+
+#: ../src/richtext/richtexttabspage.cpp:149
+msgid "Delete A&ll"
+msgstr "删除全部(&l)"
+
+#: ../src/richtext/richtextstyledlg.cpp:787
+msgid "Delete Style"
+msgstr "删除样式"
+
+#: ../src/richtext/richtextctrl.cpp:1221 ../src/richtext/richtextctrl.cpp:1442
+msgid "Delete Text"
+msgstr "删除文字"
+
+#: ../src/generic/editlbox.cpp:275
 msgid "Delete item"
 msgstr "删除项"
 
-#: ../src/unix/snglinst.cpp:300
+#: ../src/common/stockitem.cpp:261
+msgid "Delete selection"
+msgstr "删除选区"
+
+#: ../src/richtext/richtextstyledlg.cpp:787
+#, c-format
+msgid "Delete style %s?"
+msgstr "删除样式 %s?"
+
+#: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "已删除过期的锁文件 '%s'."
+msgstr "已删除过期的锁文件 '%s'。"
+
+#: ../src/common/module.cpp:125
+#, c-format
+msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:197
+msgid "Descending"
+msgstr "降序"
 
-#: ../src/generic/dirctrlg.cpp:648
+#: ../src/generic/dirctrlg.cpp:618
 msgid "Desktop"
 msgstr "桌面"
 
-#: ../src/msw/dialup.cpp:358
+#: ../src/generic/aboutdlgg.cpp:71
+msgid "Developed by "
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:177
+msgid "Developers"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:394
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
-msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
+msgstr "由于远程访问服务(RAS)没有安装在本机，拨号功能无法使用。请安装它。"
 
-#: ../src/generic/tipdlg.cpp:246
+#: ../src/generic/tipdlg.cpp:231
 msgid "Did you know..."
 msgstr "你知道吗..."
 
-#: ../src/common/filefn.cpp:1172
+#: ../src/dfb/wrapdfb.cpp:64
 #, c-format
-msgid "Directory '%s' couldn't be created"
-msgstr "目录'%s'不能被创建"
+msgid "DirectFB error %d occurred."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:217
+msgid "Directories"
+msgstr "目录"
 
-#: ../src/mgl/dirmgl.cpp:217
+#: ../src/common/filefn.cpp:1245
 #, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr "目录 '%s'不存在!"
+msgid "Directory '%s' couldn't be created"
+msgstr "无法创建目录 '%s'"
 
-#: ../src/generic/dirdlgg.cpp:228
+#: ../src/common/filefn.cpp:1265
+#, fuzzy, c-format
+msgid "Directory '%s' couldn't be deleted"
+msgstr "目录'%s'无法被创建"
+
+#: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr "目录不存在"
 
-#: ../src/generic/filedlgg.cpp:1300
+#: ../src/generic/filectrlg.cpp:1406
 msgid "Directory doesn't exist."
-msgstr "目录不存在."
+msgstr "目录不存在。"
+
+#: ../src/common/docview.cpp:458
+msgid "Discard changes and reload the last saved version?"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:503
+#: ../src/html/helpwnd.cpp:513
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
-#: ../src/html/helpfrm.cpp:685
+#: ../src/html/helpwnd.cpp:693
 msgid "Display options dialog"
 msgstr "显示选项对话框"
 
-#: ../src/msw/mimetype.cpp:670
-#, c-format
+#: ../src/html/helpwnd.cpp:327
+msgid "Displays help as you browse the books on the left."
+msgstr ""
+
+#: ../src/msw/mimetype.cpp:708
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -1465,1242 +2717,2208 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
-#: ../src/common/docview.cpp:464
-#, c-format
-msgid "Do you want to save changes to document %s?"
+#: ../src/common/docview.cpp:534
+#, fuzzy, c-format
+msgid "Do you want to save changes to %s?"
 msgstr "你想保存对文档%s的修改?"
 
-#: ../src/common/sizer.cpp:1842
+#: ../src/common/prntbase.cpp:526
+msgid "Document:"
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:74
+msgid "Documentation by "
+msgstr ""
+
+#: ../src/generic/aboutdlgg.cpp:181
+msgid "Documentation writers"
+msgstr ""
+
+#: ../src/common/sizer.cpp:2657
 msgid "Don't Save"
 msgstr "不保存"
 
-#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
+#: ../src/msw/frame.cpp:129 ../src/html/htmlwin.cpp:607
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:433
+#: ../src/generic/progdlgg.cpp:482 ../src/msw/progdlg.cpp:408
 msgid "Done."
 msgstr "完成."
 
-#: ../src/common/xtixml.cpp:271
+#: ../src/richtext/richtextborderspage.cpp:544
+#, fuzzy
+msgid "Dotted"
+msgstr "完成"
+
+#: ../src/richtext/richtextborderspage.cpp:546
+#, fuzzy
+msgid "Double"
+msgstr "完成"
+
+#: ../src/common/paper.cpp:178
+msgid "Double Japanese Postcard Rotated 148 x 200 mm"
+msgstr "横向日本双明信片, 148 x 200 毫米"
+
+#: ../src/common/xtixml.cpp:274
 #, c-format
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:154
 msgid "Down"
 msgstr "向下"
 
-#: ../src/common/paper.cpp:114
+#: ../src/richtext/richtextctrl.cpp:804
+msgid "Drag"
+msgstr ""
+
+#: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
-msgstr "E 纸张, 34 x 44 英寸"
+msgstr "E 纸张，34 x 44 英寸"
+
+#: ../src/common/accelcmn.cpp:62
+msgid "END"
+msgstr "END"
+
+#: ../src/common/accelcmn.cpp:53
+msgid "ENTER"
+msgstr "ENTER"
+
+#: ../src/unix/fswatcher_inotify.cpp:358
+msgid "EOF while reading from inotify descriptor"
+msgstr "读取 inotify 描述符时遇到 EOF"
+
+#: ../src/common/accelcmn.cpp:65
+msgid "ESC"
+msgstr "ESC"
+
+#: ../src/common/accelcmn.cpp:66
+msgid "ESCAPE"
+msgstr "ESCAPE"
+
+#: ../src/common/accelcmn.cpp:74
+msgid "EXECUTE"
+msgstr "EXECUTE"
+
+#: ../src/common/stockitem.cpp:155
+msgid "Edit"
+msgstr "编辑"
 
-#: ../contrib/src/gizmos/editlbox.cpp:158
+#: ../src/generic/editlbox.cpp:273
 msgid "Edit item"
 msgstr "编辑项"
 
-#: ../src/generic/progdlgg.cpp:194
-msgid "Elapsed time : "
-msgstr "用时: "
+#: ../src/richtext/richtextsizepage.cpp:319
+#: ../src/richtext/richtextsizepage.cpp:321
+#: ../src/richtext/richtextsizepage.cpp:427
+#: ../src/richtext/richtextsizepage.cpp:429
+msgid "Enable the height value."
+msgstr ""
 
-#: ../src/common/prntbase.cpp:799
-#, c-format
-msgid "Enter a page number between %d and %d:"
-msgstr "输入页码范围(%d 至 %d):"
+#: ../src/richtext/richtextsizepage.cpp:400
+#: ../src/richtext/richtextsizepage.cpp:402
+#, fuzzy
+msgid "Enable the maximum width value."
+msgstr "无法设定最大宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:373
+#: ../src/richtext/richtextsizepage.cpp:375
+msgid "Enable the minimum height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:346
+#: ../src/richtext/richtextsizepage.cpp:348
+#, fuzzy
+msgid "Enable the minimum width value."
+msgstr "无法设定最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:292
+#: ../src/richtext/richtextsizepage.cpp:294
+msgid "Enable the width value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:256
+#: ../src/richtext/richtextsizepage.cpp:258
+msgid "Enable vertical alignment."
+msgstr "启用垂直对齐。"
+
+#: ../src/richtext/richtextbackgroundpage.cpp:133
+#: ../src/richtext/richtextbackgroundpage.cpp:135
+msgid "Enables a background colour."
+msgstr "启用背景颜色。"
+
+#: ../src/richtext/richtextstyledlg.cpp:939
+#, fuzzy
+msgid "Enter a box style name"
+msgstr "输入新样式名"
+
+#: ../src/richtext/richtextstyledlg.cpp:611
+msgid "Enter a character style name"
+msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:158
+#: ../src/richtext/richtextstyledlg.cpp:825
+msgid "Enter a list style name"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:898
+msgid "Enter a new style name"
+msgstr "输入新样式名"
+
+#: ../src/richtext/richtextstyledlg.cpp:659
+msgid "Enter a paragraph style name"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:171
 #, c-format
 msgid "Enter command to open file \"%s\":"
 msgstr "输入命令以打开文件 \"%s\":"
 
-#: ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:464
 msgid "Entries found"
 msgstr "找到的条目"
 
-#: ../src/common/config.cpp:383
+#: ../src/common/paper.cpp:144
+msgid "Envelope Invite 220 x 220 mm"
+msgstr "邀请信, 220 x 220 毫米"
+
+#: ../src/common/config.cpp:474
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
-
-#: ../src/generic/dirctrlg.cpp:681 ../src/generic/dirctrlg.cpp:699
-#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
-#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:751
-#: ../src/generic/filedlgg.cpp:765 ../src/generic/filedlgg.cpp:779
-#: ../src/generic/filedlgg.cpp:1275 ../src/generic/filedlgg.cpp:1300
-#: ../src/generic/filedlgg.cpp:1330 ../src/gtk/fontdlg.cpp:81
+msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'。"
+
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/dirctrlg.cpp:680
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:785
+#: ../src/generic/filectrlg.cpp:799 ../src/generic/filectrlg.cpp:815
+#: ../src/generic/filectrlg.cpp:1375 ../src/generic/filectrlg.cpp:1406
+#: ../src/gtk/filedlg.cpp:73 ../src/gtk1/fontdlg.cpp:75
 msgid "Error"
 msgstr "错误"
 
-#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
-msgid "Error "
-msgstr "错误 "
+#: ../src/unix/epolldispatcher.cpp:104
+msgid "Error closing epoll descriptor"
+msgstr "关闭 epoll 描述符时发生错误"
+
+#: ../src/unix/fswatcher_kqueue.cpp:115
+#, fuzzy
+msgid "Error closing kqueue instance"
+msgstr "创建目录错误"
 
-#: ../src/generic/dirdlgg.cpp:243
+#: ../src/generic/dirdlgg.cpp:252
 msgid "Error creating directory"
 msgstr "创建目录错误"
 
-#: ../src/common/imagbmp.cpp:930
-msgid "Error in reading image DIB ."
+#: ../src/common/imagbmp.cpp:1056
+#, fuzzy
+msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 
-#: ../src/common/fileconf.cpp:504
+#: ../src/propgrid/propgrid.cpp:6565
+#, c-format
+msgid "Error in resource: %s"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:454
 msgid "Error reading config options."
-msgstr "读配置选项错误."
+msgstr "读配置选项错误。"
 
-#: ../src/common/fileconf.cpp:1026
+#: ../src/common/fileconf.cpp:1065
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
-#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
-msgid "Error while waiting on semaphore"
-msgstr "等待信号量时出错"
+#: ../src/gtk/print.cpp:678
+msgid "Error while printing: "
+msgstr "打印时出错: "
 
-#: ../src/common/log.cpp:476
+#: ../src/common/log.cpp:226
 msgid "Error: "
 msgstr "错误: "
 
-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:151
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:202
-msgid "Estimated time : "
-msgstr "预期时间: "
+#: ../src/unix/fswatcher_inotify.cpp:441
+msgid "Event queue overflowed"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:231
+msgid "Executable files (*.exe)|*.exe|"
+msgstr "可执行文件 (*.exe)|*.exe|"
 
-#: ../src/generic/dbgrptg.cpp:211
-msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
-msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
+#: ../src/common/stockitem.cpp:156
+msgid "Execute"
+msgstr ""
 
-#: ../src/msw/utilsexc.cpp:753
+#: ../src/msw/utilsexc.cpp:899
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "命令 '%s'执行失败"
+msgstr "命令 '%s' 执行失败"
 
-#: ../src/os2/utilsexc.cpp:169
+#: ../src/os2/utilsexc.cpp:164
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
-msgstr "命令 '%s'执行失败, 错误信息: %ul"
+msgstr "命令 '%s' 执行失败, 错误信息: %ul"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
-
-#: ../contrib/src/deprecated/resource.cpp:1869
-#: ../contrib/src/deprecated/resource.cpp:1999
-#: ../contrib/src/deprecated/resource.cpp:3091
-#, fuzzy
-msgid "Expected '*' while parsing resource."
-msgstr "解析资源时期待出现 '*' ."
-
-#: ../contrib/src/deprecated/resource.cpp:1886
-#: ../contrib/src/deprecated/resource.cpp:2015
-#: ../contrib/src/deprecated/resource.cpp:3108
-#, fuzzy
-msgid "Expected '=' while parsing resource."
-msgstr "解析资源时期待 '='."
-
-#: ../contrib/src/deprecated/resource.cpp:1855
-#: ../contrib/src/deprecated/resource.cpp:1985
-#: ../contrib/src/deprecated/resource.cpp:3077
-#, fuzzy
-msgid "Expected 'char' while parsing resource."
-msgstr "解析资源时期待 'char' ."
+msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
-#: ../src/msw/registry.cpp:1125
+#: ../src/msw/registry.cpp:1231
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
-#: ../src/common/fmapbase.cpp:141
+#: ../src/common/fmapbase.cpp:196
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 
-#: ../src/html/chm.cpp:710
+#: ../src/html/chm.cpp:728
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "将 '%s'解压至 '%s'失败."
+msgstr "将 '%s' 解压至 '%s' 失败。"
 
-#: ../src/msw/dialup.cpp:843
-#, c-format
-msgid "Failed to %s dialup connection: %s"
-msgstr "到 %s 的拨号连接失败: %s"
+#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:334
+msgid "F"
+msgstr "F"
 
-#: ../src/unix/snglinst.cpp:274
+#: ../src/propgrid/advprops.cpp:641
+#, fuzzy
+msgid "Face Name"
+msgstr "新名称"
+
+#: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
-msgstr "访问锁文件失败."
+msgstr "访问锁文件失败。"
+
+#: ../src/unix/epolldispatcher.cpp:117
+#, c-format
+msgid "Failed to add descriptor %d to epoll descriptor %d"
+msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 
-#: ../src/msw/dib.cpp:543
+#: ../src/msw/dib.cpp:549
 #, c-format
-msgid "Failed to allocated %luKb of memory for bitmap data."
-msgstr "为位图数据分配 %luKb 内存失败."
+msgid "Failed to allocate %luKb of memory for bitmap data."
+msgstr "为位图数据分配 %luKb 内存失败。"
 
-#: ../src/unix/displayx11.cpp:224
+#: ../src/common/glcmn.cpp:88
+msgid "Failed to allocate colour for OpenGL"
+msgstr "无法为 OpenGL 分配颜色"
+
+#: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
-msgstr "改变视频模式失败."
+msgstr "改变视频模式失败。"
+
+#: ../src/common/image.cpp:3036
+#, c-format
+msgid "Failed to check format of image file \"%s\"."
+msgstr "无法确认图像文件 \"%s\" 的格式。"
 
-#: ../src/common/debugrpt.cpp:237
+#: ../src/common/debugrpt.cpp:243
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 
-#: ../src/common/filename.cpp:191
+#: ../src/common/filename.cpp:209
 msgid "Failed to close file handle"
-msgstr "关闭文件句柄失败."
+msgstr "关闭文件句柄失败"
 
-#: ../src/unix/snglinst.cpp:339
+#: ../src/unix/snglinst.cpp:335
 #, c-format
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
-#: ../src/msw/clipbrd.cpp:119
+#: ../src/msw/clipbrd.cpp:116
 msgid "Failed to close the clipboard."
+msgstr "关闭剪贴板失败。"
+
+#: ../src/x11/utils.cpp:204
+#, fuzzy, c-format
+msgid "Failed to close the display \"%s\""
 msgstr "关闭剪贴板失败."
 
-#: ../src/msw/dialup.cpp:783
+#: ../src/msw/dialup.cpp:819
 msgid "Failed to connect: missing username/password."
-msgstr "连接失败: 缺少用户名/口令."
+msgstr "连接失败: 缺少用户名/口令。"
 
-#: ../src/msw/dialup.cpp:729
+#: ../src/msw/dialup.cpp:765
 msgid "Failed to connect: no ISP to dial."
-msgstr "连接失败: 没有要拨号的ISP."
+msgstr "连接失败: 没有要拨号的 ISP。"
+
+#: ../src/common/textfile.cpp:201
+#, c-format
+msgid "Failed to convert file \"%s\" to Unicode."
+msgstr "无法转换文件 \"%s\" 为 Unicode。"
 
-#: ../src/msw/registry.cpp:618
+#: ../src/generic/logg.cpp:980
+msgid "Failed to copy dialog contents to the clipboard."
+msgstr "无法将对话框内容复制到剪贴板。"
+
+#: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "复制注册键值失败 '%s'"
 
-#: ../src/msw/registry.cpp:627
+#: ../src/msw/registry.cpp:701
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
+msgstr "把注册键内容从 '%s' 复制到 '%s' 失败。"
 
-#: ../src/common/filefn.cpp:1008
+#: ../src/common/filefn.cpp:1053
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "复制文件 '%s'至 '%s'失败"
+msgstr "复制文件 '%s' 至 '%s' 失败"
 
-#: ../src/msw/registry.cpp:605
+#: ../src/msw/registry.cpp:679
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "复制注册表子键 '%s'至 '%s'失败."
+msgstr "复制注册表子键 '%s' 至 '%s' 失败。"
 
-#: ../src/msw/dde.cpp:988
+#: ../src/msw/dde.cpp:1074
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 
-#: ../src/msw/mdi.cpp:459
+#: ../src/msw/mdi.cpp:579
 msgid "Failed to create MDI parent frame."
-msgstr "创建 MDI 父框架失败."
-
-#: ../src/msw/statbr95.cpp:112
-msgid "Failed to create a status bar."
-msgstr "创建状态条失败."
+msgstr "创建 MDI 父框架失败。"
 
-#: ../src/common/filename.cpp:766
+#: ../src/common/filename.cpp:1019
 msgid "Failed to create a temporary file name"
 msgstr "创建临时文件名失败"
 
-#: ../src/msw/utilsexc.cpp:227
+#: ../src/msw/utilsexc.cpp:269
 msgid "Failed to create an anonymous pipe"
 msgstr "创建匿名管道失败"
 
-#: ../src/msw/dde.cpp:450
+#: ../src/msw/ole/automtn.cpp:517
+#, c-format
+msgid "Failed to create an instance of \"%s\""
+msgstr "无法创建实例 \"%s\""
+
+#: ../src/msw/dde.cpp:443
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
+msgstr "创建到服务器 '%s' 的关于主题 '%s' 的连接失败"
 
-#: ../src/msw/cursor.cpp:216
+#: ../src/msw/cursor.cpp:213
 msgid "Failed to create cursor."
-msgstr "创建游标失败."
+msgstr "创建游标失败。"
 
-#: ../src/common/debugrpt.cpp:202
+#: ../src/common/debugrpt.cpp:208
 #, 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:241
+#: ../src/generic/dirdlgg.cpp:250
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"创建目录 '%s'失败\n"
+"创建目录 '%s' 失败\n"
 "(您是否有所需的权限?)"
 
-#: ../src/msw/mimetype.cpp:193
+#: ../src/unix/epolldispatcher.cpp:85
+msgid "Failed to create epoll descriptor"
+msgstr "无法创建 epoll 描述符"
+
+#: ../src/msw/mimetype.cpp:199
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "为 '%s'文件创建注册条目失败."
+msgstr "为 '%s' 文件创建注册条目失败。"
 
-#: ../src/msw/fdrepdlg.cpp:474
+#: ../src/msw/fdrepdlg.cpp:443
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 
-#: ../src/html/winpars.cpp:549
+#: ../src/unix/evtloopunix.cpp:96
+#, fuzzy
+msgid "Failed to create wake up pipe used by event loop."
+msgstr "创建状态条失败."
+
+#: ../src/html/winpars.cpp:737
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 
-#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:131
+#: ../src/msw/clipbrd.cpp:128
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 
-#: ../src/unix/displayx11.cpp:201
+#: ../src/unix/displayx11.cpp:266
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
-#: ../src/msw/dde.cpp:652
+#: ../src/msw/dde.cpp:728
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 
-#: ../src/msw/dialup.cpp:621
+#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:885
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "建立拨号连接: %s失败"
+msgstr "建立拨号连接失败: %s"
 
-#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
+#: ../src/unix/utilsunx.cpp:528 ../src/unix/utilsunx.cpp:542
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "执行 '%s'失败\n"
+msgstr "执行 '%s' 失败\n"
 
-#: ../src/common/debugrpt.cpp:652
+#: ../src/common/debugrpt.cpp:700
 msgid "Failed to execute curl, please install it in PATH."
-msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+msgstr "无法执行curl，请在PATH变量所指的目录中安装curl。"
 
-#: ../contrib/src/deprecated/resource.cpp:2489
+#: ../src/msw/ole/automtn.cpp:500
 #, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-"查找XBM资源 %s失败.\n"
-"没有使用wxResourceLoadBitmapData?"
-
-#: ../contrib/src/deprecated/resource.cpp:2643
-#, c-format
-msgid ""
-"Failed to find XBM resource %s.\n"
-"Forgot to use wxResourceLoadIconData?"
-msgstr ""
-"查找XBM资源%s失败.\n"
-"没有使用wxResourceLoadIconData?"
+msgid "Failed to find CLSID of \"%s\""
+msgstr "无法找到 \"%s\" 的 CLSID"
 
-#: ../contrib/src/deprecated/resource.cpp:2504
+#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483
 #, c-format
-msgid ""
-"Failed to find XPM resource %s.\n"
-"Forgot to use wxResourceLoadBitmapData?"
-msgstr ""
-"查找XPM资源 %s失败.\n"
-"没有使用wxResourceLoadBitmapData?"
+msgid "Failed to find match for regular expression: %s"
+msgstr "无法找到匹配的正则表达式: %s"
 
-#: ../src/msw/dialup.cpp:681
+#: ../src/msw/dialup.cpp:717
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "获取ISP名: %s失败"
+msgstr "获取 ISP 名失败: %s"
 
-#: ../src/mac/carbon/clipbrd.cpp:138 ../src/mac/classic/clipbrd.cpp:134
-msgid "Failed to get clipboard data."
-msgstr "获取剪贴板数据失败."
+#: ../src/msw/ole/automtn.cpp:569
+#, fuzzy, c-format
+msgid "Failed to get OLE automation interface for \"%s\""
+msgstr "无法创建目录 \"%s\""
 
-#: ../src/msw/clipbrd.cpp:723
+#: ../src/msw/clipbrd.cpp:748
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
-#: ../src/msw/stackwalk.cpp:221
-#, c-format
-msgid ""
-"Failed to get stack backtrace:\n"
-"%s"
-msgstr ""
-"不能获取堆栈的回溯路径:\n"
-" %s"
-
-#: ../src/common/stopwatch.cpp:223
+#: ../src/common/time.cpp:250
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
-#: ../src/common/filefn.cpp:1423
+#: ../src/common/filefn.cpp:1449
 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)."
+msgstr "无法初始化 GUI: 找不到内嵌的主题。"
 
-#: ../src/msw/helpchm.cpp:69
+#: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."
-msgstr "初始化MS HTML帮助失败."
+msgstr "初始化MS HTML 帮助失败。"
 
-#: ../src/msw/glcanvas.cpp:808
+#: ../src/msw/glcanvas.cpp:893
 msgid "Failed to initialize OpenGL"
-msgstr "不能初始化OpenGL"
+msgstr "无法初始化 OpenGL"
+
+#: ../src/msw/dialup.cpp:880
+#, c-format
+msgid "Failed to initiate dialup connection: %s"
+msgstr "无法初始化拨号连接: %s"
 
-#: ../src/unix/snglinst.cpp:246
+#: ../src/gtk/textctrl.cpp:1059
+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'失败"
+msgstr "检查锁文件 '%s' 失败"
+
+#: ../src/unix/appunix.cpp:90
+#, fuzzy
+msgid "Failed to install signal handler"
+msgstr "关闭文件句柄失败."
 
-#: ../src/unix/threadpsx.cpp:897
+#: ../src/unix/threadpsx.cpp:1010
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
-msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
+msgstr "合并线程失败，检测到潜在地内存丢失 - 请重新启动系统"
 
-#: ../src/msw/utils.cpp:702
+#: ../src/msw/utils.cpp:745
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 
-#: ../src/common/iconbndl.cpp:72
+#: ../src/common/image.cpp:2261
+#, fuzzy, c-format
+msgid "Failed to load bitmap \"%s\" from resources."
+msgstr "无法从数据流中载入图像 %d。"
+
+#: ../src/common/image.cpp:2270
+#, fuzzy, c-format
+msgid "Failed to load icon \"%s\" from resources."
+msgstr "无法从数据流中载入图像 %d。"
+
+#: ../src/common/iconbndl.cpp:183
 #, c-format
-msgid "Failed to load image %d from file '%s'."
-msgstr "读取图像 %d (从文件 '%s'中)失败."
+msgid "Failed to load image %%d from file '%s'."
+msgstr "无法从文件 '%s' 中读取图像 %%d。"
 
-#: ../src/msw/enhmeta.cpp:84
+#: ../src/common/iconbndl.cpp:191
 #, c-format
-msgid "Failed to load metafile from file \"%s\"."
+msgid "Failed to load image %d from stream."
+msgstr "无法从数据流中载入图像 %d。"
+
+#: ../src/common/image.cpp:2343 ../src/common/image.cpp:2362
+#, fuzzy, c-format
+msgid "Failed to load image from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 
-#: ../src/msw/volume.cpp:312
+#: ../src/msw/enhmeta.cpp:98
+#, c-format
+msgid "Failed to load metafile from file \"%s\"."
+msgstr "从文件 \"%s\" 读取元文件失败。"
+
+#: ../src/msw/volume.cpp:328
 msgid "Failed to load mpr.dll."
-msgstr "装载mpr.dll失败."
+msgstr "装载 mpr.dll 失败。"
+
+#: ../src/msw/utils.cpp:1120
+#, fuzzy, c-format
+msgid "Failed to load resource \"%s\"."
+msgstr "从文件 \"%s\"读取元文件失败."
 
-#: ../src/common/dynlib.cpp:133
+#: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "不能装载共享库 '%s'"
+msgstr "无法装载共享库 '%s'"
 
-#: ../src/common/dynlib.cpp:115
-#, c-format
-msgid "Failed to load shared library '%s' Error '%s'"
-msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
+#: ../src/msw/utils.cpp:1127
+#, fuzzy, c-format
+msgid "Failed to lock resource \"%s\"."
+msgstr "锁定锁文件 '%s'失败"
 
-#: ../src/unix/snglinst.cpp:203
+#: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "锁定锁文件 '%s'失败"
+msgstr "锁定锁文件 '%s' 失败"
 
-#: ../src/common/regex.cpp:300
+#: ../src/unix/epolldispatcher.cpp:137
 #, c-format
-msgid "Failed to match '%s' in regular expression: %s"
-msgstr "不能匹配 '%s' 于正则表达式: %s"
+msgid "Failed to modify descriptor %d in epoll descriptor %d"
+msgstr ""
 
-#: ../src/common/filename.cpp:1917
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:2573
+#, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "ä¿®æ\94¹æ\96\87件æ\97¶é\97´(为 '%s') 失败"
+msgstr "为 '%s' ä¿®æ\94¹æ\96\87件æ\97¶é\97´失败"
 
-#: ../src/common/filename.cpp:179
-#, c-format
-msgid "Failed to open '%s' for %s"
+#: ../src/common/selectdispatcher.cpp:253
+msgid "Failed to monitor I/O channels"
+msgstr ""
+
+#: ../src/common/filename.cpp:192
+#, fuzzy, c-format
+msgid "Failed to open '%s' for reading"
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/common/filename.cpp:197
+#, fuzzy, c-format
+msgid "Failed to open '%s' for writing"
 msgstr "打开 '%s'(为 %s) 失败"
 
 #: ../src/html/chm.cpp:142
 #, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "打开CHM存档 '%s'失败."
+msgstr "打开CHM存档 '%s' 失败。"
+
+#: ../src/common/utilscmn.cpp:1137
+#, fuzzy, c-format
+msgid "Failed to open URL \"%s\" in default browser."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../include/wx/msw/private/fswatcher.h:93
+#, fuzzy, c-format
+msgid "Failed to open directory \"%s\" for monitoring."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/x11/utils.cpp:223
+#, fuzzy, c-format
+msgid "Failed to open display \"%s\"."
+msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/common/filename.cpp:788
+#: ../src/common/filename.cpp:1054
 msgid "Failed to open temporary file."
-msgstr "打开临时文件失败."
+msgstr "打开临时文件失败。"
 
-#: ../src/msw/clipbrd.cpp:99
+#: ../src/msw/clipbrd.cpp:95
 msgid "Failed to open the clipboard."
-msgstr "打开剪贴板失败."
+msgstr "打开剪贴板失败。"
 
-#: ../src/msw/clipbrd.cpp:626
+#: ../src/common/translation.cpp:1014
+#, c-format
+msgid "Failed to parse Plural-Forms: '%s'"
+msgstr "无法解析复数形式: '%s'"
+
+#: ../src/unix/mediactrl.cpp:1269
+#, fuzzy, c-format
+msgid "Failed to prepare playing \"%s\"."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/msw/clipbrd.cpp:648
 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 
-#: ../src/unix/snglinst.cpp:283
+#: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
+msgstr "从锁文件读取 PID 失败。"
+
+#: ../src/common/fileconf.cpp:465
+#, fuzzy
+msgid "Failed to read config options."
+msgstr "读配置选项错误."
+
+#: ../src/common/docview.cpp:681
+#, fuzzy, c-format
+msgid "Failed to read document from the file \"%s\"."
+msgstr "从文件 \"%s\"读取元文件失败."
+
+#: ../src/dfb/evtloop.cpp:99
+#, fuzzy
+msgid "Failed to read event from DirectFB pipe"
+msgstr "从锁文件读取PID失败."
+
+#: ../src/unix/evtloopunix.cpp:170
+#, fuzzy
+msgid "Failed to read from wake-up pipe"
 msgstr "从锁文件读取PID失败."
 
-#: ../src/unix/utilsunx.cpp:581
+#: ../src/unix/utilsunx.cpp:588
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
-#: ../src/msw/utilsexc.cpp:653
+#: ../src/msw/utilsexc.cpp:731
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
-#: ../src/msw/dde.cpp:300
+#: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "注册DDE服务器 '%s'失败"
-
-#: ../src/msw/glcanvas.cpp:368
-msgid "Failed to register OpenGL window class."
-msgstr "不能注册 OpenGL窗口类."
+msgstr "注册DDE服务器 '%s' 失败"
 
 #: ../src/common/fontmap.cpp:246
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "回忆字符集 '%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\""
+msgstr "无法删除调试报告文件 \"%s\""
 
-#: ../src/unix/snglinst.cpp:327
+#: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "不能删除锁文件 '%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'失败."
+msgstr "删除过期的锁文件 '%s' 失败。"
 
-#: ../src/msw/registry.cpp:456
+#: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "将注册值 '%s'改名到'%s'失败."
+msgstr "将注册值 '%s' 重命名为 '%s' 失败。"
+
+#: ../src/common/filefn.cpp:1163
+#, c-format
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."
+msgstr ""
 
-#: ../src/msw/registry.cpp:560
+#: ../src/msw/registry.cpp:634
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "将注册键 '%s'改名到'%s'失败."
+msgstr "将注册键 '%s' 重命名为 '%s' 失败。"
 
-#: ../src/msw/clipbrd.cpp:503
+#: ../src/msw/clipbrd.cpp:498
 msgid "Failed to retrieve data from the clipboard."
-msgstr "从剪贴板检取数据失败."
+msgstr "从剪贴板检取数据失败。"
 
-#: ../src/common/filename.cpp:2007
+#: ../src/common/filename.cpp:2669
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "æ£\80å\8f\96æ\96\87件æ\97¶é\97´(为 '%s')失败"
+msgstr "æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´失败"
 
-#: ../src/msw/dialup.cpp:454
+#: ../src/msw/dialup.cpp:488
 msgid "Failed to retrieve text of RAS error message"
-msgstr "æ£\80å\8f\96RAS错误消息正文失败"
+msgstr "æ\8f\90å\8f\96 RAS 错误消息正文失败"
 
-#: ../src/msw/clipbrd.cpp:760
+#: ../src/msw/clipbrd.cpp:785
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "检取支持的剪贴板格式失败"
+msgstr "提取支持的剪贴板格式失败"
+
+#: ../src/common/docview.cpp:652
+#, fuzzy, c-format
+msgid "Failed to save document to the file \"%s\"."
+msgstr "将位图图像保存至文件 \"%s\"失败."
 
-#: ../src/msw/dib.cpp:345
+#: ../src/msw/dib.cpp:327
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "将位图图像保存至文件 \"%s\"失败."
+msgstr "将位图图像保存至文件 \"%s\" 失败。"
 
-#: ../src/msw/dde.cpp:697
+#: ../src/msw/dde.cpp:769
 msgid "Failed to send DDE advise notification"
-msgstr "发送DDE advise 通知失败"
+msgstr "发送 DDE advise 通知失败"
 
-#: ../src/common/ftp.cpp:384
+#: ../src/common/ftp.cpp:405
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "设置FTP传输模式为 %s 时失败."
+msgstr "设置 FTP 传输模式为 %s 时失败。"
 
-#: ../src/msw/clipbrd.cpp:379
+#: ../src/msw/clipbrd.cpp:374
 msgid "Failed to set clipboard data."
-msgstr "设置剪贴板数据失败"
+msgstr "设置剪贴板数据失败。"
 
-#: ../src/unix/snglinst.cpp:186
+#: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "在锁文件 '%s'上设置许可权限时失败"
+msgstr "在锁文件 '%s' 上设置许可权限时失败"
 
-#: ../src/common/file.cpp:523
+#: ../src/common/file.cpp:549
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/gtk/textctrl.cpp:1000
+#, fuzzy
+msgid "Failed to set text in the text control."
+msgstr "获取工作目录失败"
+
+#: ../src/unix/threadpsx.cpp:1141
+#, fuzzy, c-format
+msgid "Failed to set thread concurrency level to %lu"
+msgstr "设置线程优先级 %d 失败。"
+
+#: ../src/unix/threadpsx.cpp:1338 ../src/unix/threadpsx.cpp:1348
 #, c-format
 msgid "Failed to set thread priority %d."
-msgstr "设置线程优先级 %d失败."
+msgstr "设置线程优先级 %d 失败。"
+
+#: ../src/unix/utilsunx.cpp:709
+msgid "Failed to set up non-blocking pipe, the program might hang."
+msgstr ""
 
-#: ../src/common/fs_mem.cpp:231
+#: ../src/common/fs_mem.cpp:262
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "将图像'%s'存到内存VFS失败!"
+msgstr "将图像 '%s' 存到内存 VFS 失败！"
+
+#: ../src/dfb/evtloop.cpp:171
+msgid "Failed to switch DirectFB pipe to non-blocking mode"
+msgstr ""
+
+#: ../src/unix/evtloopunix.cpp:103
+msgid "Failed to switch wake up pipe to non-blocking mode"
+msgstr ""
 
-#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-#: ../src/unix/threadpsx.cpp:1429
+#: ../src/unix/threadpsx.cpp:1530
 msgid "Failed to terminate a thread."
-msgstr "终止线程失败"
+msgstr "终止线程失败。"
 
-#: ../src/msw/dde.cpp:671
+#: ../src/msw/dde.cpp:747
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "终止与DDE服务器的advise循环失败"
+msgstr "终止与 DDE 服务器的 advise 循环失败"
 
-#: ../src/msw/dialup.cpp:916
+#: ../src/msw/dialup.cpp:960
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "终止拨号连接: %s失败"
+msgstr "终止拨号连接失败: %s"
 
-#: ../src/common/filename.cpp:1932
+#: ../src/common/filename.cpp:2588
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "对文件 '%s'进行touch操作失败"
+msgstr "对文件 '%s' 进行 touch 操作时失败"
 
-#: ../src/unix/snglinst.cpp:333
+#: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "对锁文件 '%s'解锁失败"
+msgstr "对已锁文件 '%s' 解锁失败"
 
-#: ../src/msw/dde.cpp:321
+#: ../src/msw/dde.cpp:315
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "撤消DDE服务器 '%s'注册失败"
+msgstr "撤消 DDE 服务器 '%s' 注册失败"
+
+#: ../src/unix/epolldispatcher.cpp:156
+#, fuzzy, c-format
+msgid "Failed to unregister descriptor %d from epoll descriptor %d"
+msgstr "从剪贴板检取数据失败."
 
-#: ../src/common/fileconf.cpp:999
+#: ../src/common/fileconf.cpp:1038
 msgid "Failed to update user configuration file."
-msgstr "不能更新用户配置文件."
+msgstr "无法更新用户配置文件。"
 
-#: ../src/common/debugrpt.cpp:665
+#: ../src/common/debugrpt.cpp:713
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
-msgstr "上传调试报告失败 (错误号 %d)."
+msgstr "上传调试报告失败 (错误号 %d)。"
 
-#: ../src/unix/snglinst.cpp:173
+#: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "写锁文件 '%s'失败"
+msgstr "写锁文件 '%s' 失败"
 
-#: ../src/generic/logg.cpp:399
-msgid "Fatal error"
-msgstr "致命错误"
+#: ../src/propgrid/propgrid.cpp:173
+msgid "False"
+msgstr "False"
 
-#: ../src/common/log.cpp:465
-msgid "Fatal error: "
-msgstr "致命错误: "
+#: ../src/propgrid/advprops.cpp:659
+#, fuzzy
+msgid "Family"
+msgstr "字体(&F):"
 
-#: ../src/msw/wince/filedlgwce.cpp:120
+#: ../src/common/stockitem.cpp:158 ../src/msw/wince/filedlgwce.cpp:119
 msgid "File"
 msgstr "文件"
 
-#: ../src/mgl/bitmap.cpp:544
-#, c-format
-msgid "File %s does not exist."
-msgstr "文件 %s不存在."
+#: ../src/common/docview.cpp:669
+#, fuzzy, c-format
+msgid "File \"%s\" could not be opened for reading."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/common/docview.cpp:646
+#, fuzzy, c-format
+msgid "File \"%s\" could not be opened for writing."
+msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61
+#: ../src/gtk/filedlg.cpp:56
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "文件 '%s' 已存在, 确实需要复写它?"
+msgstr "文件 '%s' 已存在，确实需要复写它?"
 
-#: ../src/os2/filedlg.cpp:307
+#: ../src/os2/filedlg.cpp:308
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr ""
-"文件 '%s' 已存在.\n"
+"文件 '%s' 已存在。\n"
 "真的需要替换它?"
 
-#: ../src/common/textcmn.cpp:215
-msgid "File couldn't be loaded."
+#: ../src/common/filefn.cpp:1201
+#, fuzzy, c-format
+msgid "File '%s' couldn't be removed"
+msgstr "文件不能被装载."
+
+#: ../src/common/filefn.cpp:1182
+#, fuzzy, c-format
+msgid "File '%s' couldn't be renamed '%s'"
 msgstr "文件不能被装载."
 
-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
-#: ../src/common/docview.cpp:1609
+#: ../src/richtext/richtextctrl.cpp:2664 ../src/common/textcmn.cpp:920
+msgid "File couldn't be loaded."
+msgstr "文件无法装载。"
+
+#: ../src/msw/filedlg.cpp:429
+#, fuzzy, c-format
+msgid "File dialog failed with error code %0lx."
+msgstr "命令 '%s'执行失败, 错误信息: %ul"
+
+#: ../src/common/docview.cpp:1762
 msgid "File error"
 msgstr "文件错误"
 
-#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765
+#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799
 msgid "File name exists already."
-msgstr "文件名已存在"
+msgstr "文件名已存在。"
+
+#: ../src/unix/fswatcher_inotify.cpp:439
+msgid "File system containing watched object was unmounted"
+msgstr ""
 
-#: ../src/common/filefn.cpp:1739
+#: ../src/motif/filedlg.cpp:218
+msgid "Files"
+msgstr "文件"
+
+#: ../src/common/filefn.cpp:1753
 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
 
-#: ../src/html/helpfrm.cpp:491
+#: ../src/motif/filedlg.cpp:216
+msgid "Filter"
+msgstr "过滤器"
+
+#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:501
 msgid "Find"
 msgstr "查找"
 
-#: ../src/html/helpfrm.cpp:1219
-msgid "Fixed font:"
+#: ../src/common/stockitem.cpp:160
+msgid "First"
+msgstr "最前"
+
+#: ../src/common/prntbase.cpp:1519
+msgid "First page"
+msgstr "第一页"
+
+#: ../src/richtext/richtextsizepage.cpp:483
+#, fuzzy
+msgid "Fixed"
+msgstr "固定字体:"
+
+#: ../src/html/helpwnd.cpp:1220
+msgid "Fixed font:"
 msgstr "固定字体:"
 
-#: ../src/html/helpfrm.cpp:1279
+#: ../src/html/helpwnd.cpp:1283
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
-#: ../src/common/paper.cpp:125
+#: ../src/richtext/richtextsizepage.cpp:207
+msgid "Floating"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161
+msgid "Floppy"
+msgstr "软盘"
+
+#: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
-#: ../src/html/helpfrm.cpp:1220
+#: ../src/richtext/richtextformatdlg.cpp:323 ../src/osx/carbon/fontdlg.cpp:471
+#: ../src/common/stockitem.cpp:195
+msgid "Font"
+msgstr "字体"
+
+#: ../src/richtext/richtextfontpage.cpp:228
+msgid "Font &weight:"
+msgstr "字体粗细(&w):"
+
+#: ../src/html/helpwnd.cpp:1221
 msgid "Font size:"
 msgstr "字体大小:"
 
-#: ../src/unix/utilsunx.cpp:528
+#: ../src/richtext/richtextfontpage.cpp:215
+msgid "Font st&yle:"
+msgstr "字体样式(&y):"
+
+#: ../src/osx/carbon/fontdlg.cpp:513
+msgid "Font:"
+msgstr "字体:"
+
+#: ../src/dfb/fontmgr.cpp:199
+#, c-format
+msgid "Fonts index file %s disappeared while loading fonts."
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:561
 msgid "Fork failed"
 msgstr "Fork 失败"
 
-#: ../src/common/xtixml.cpp:235
+#: ../src/common/stockitem.cpp:162
+msgid "Forward"
+msgstr "前进"
+
+#: ../src/common/xtixml.cpp:236
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 
-#: ../contrib/src/deprecated/resource.cpp:1838
-#: ../contrib/src/deprecated/resource.cpp:1968
-#: ../contrib/src/deprecated/resource.cpp:3060
-msgid "Found "
-msgstr "找到 "
-
-#: ../src/html/helpfrm.cpp:886
+#: ../src/html/helpwnd.cpp:889
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 
-#: ../src/generic/prntdlgg.cpp:233
+#: ../src/generic/prntdlgg.cpp:244
 msgid "From:"
 msgstr "从:"
 
-#: ../src/common/imaggif.cpp:100
+#: ../src/common/imaggif.cpp:161
 msgid "GIF: Invalid gif index."
-msgstr "GIF: 无效的gif图像索引."
+msgstr "GIF: 无效的 gif 图像索引。"
 
-#: ../src/common/imaggif.cpp:75
+#: ../src/common/imaggif.cpp:151
 msgid "GIF: data stream seems to be truncated."
-msgstr "GIF: 数据流似乎已被截断."
+msgstr "GIF: 数据流似乎已被截断。"
 
-#: ../src/common/imaggif.cpp:59
+#: ../src/common/imaggif.cpp:135
 msgid "GIF: error in GIF image format."
-msgstr "GIF: GIF文件格式错误."
+msgstr "GIF: GIF文件格式错误。"
 
-#: ../src/common/imaggif.cpp:62
+#: ../src/common/imaggif.cpp:138
 msgid "GIF: not enough memory."
-msgstr "GIF: 没有足够内存."
+msgstr "GIF: 没有足够内存。"
 
-#: ../src/common/imaggif.cpp:65
+#: ../src/common/imaggif.cpp:141
 msgid "GIF: unknown error!!!"
-msgstr "GIF: 位置错误!!!"
+msgstr "GIF: 位置错误！！！"
+
+#: ../src/gtk/window.cpp:4210
+msgid ""
+"GTK+ installed on this machine is too old to support screen compositing, "
+"please install GTK+ 2.12 or later."
+msgstr ""
 
-#: ../src/univ/themes/gtk.cpp:634
+#: ../src/univ/themes/gtk.cpp:526
 msgid "GTK+ theme"
-msgstr "GTK+主题(theme)"
+msgstr "GTK+ 主题"
 
-#: ../src/common/prntbase.cpp:228
+#: ../src/common/prntbase.cpp:244
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 
-#: ../src/common/paper.cpp:149
+#: ../src/common/paper.cpp:137
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 
-#: ../src/common/paper.cpp:148
+#: ../src/common/paper.cpp:136
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
-#: ../include/wx/xti.h:845
+#: ../include/wx/xtiprop.h:189
 msgid "GetProperty called w/o valid getter"
 msgstr "调用GetProperty时未带有效的getter"
 
-#: ../include/wx/xti.h:906
+#: ../include/wx/xtiprop.h:267
 msgid "GetPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用GetPropertyCollection"
 
-#: ../include/wx/xti.h:853
+#: ../include/wx/xtiprop.h:207
 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 
-#: ../src/html/helpfrm.cpp:651
+#: ../src/html/helpwnd.cpp:674
 msgid "Go back"
-msgstr "回退"
+msgstr "返回"
 
-#: ../src/html/helpfrm.cpp:654
+#: ../src/html/helpwnd.cpp:675
 msgid "Go forward"
-msgstr "å\90\91å\89\8d"
+msgstr "å\89\8dè¿\9b"
 
-#: ../src/html/helpfrm.cpp:659
+#: ../src/html/helpwnd.cpp:677
 msgid "Go one level up in document hierarchy"
-msgstr "å\9c¨æ\96\87æ¡£å±\82次中ä¸\8aå\8d\87ä¸\80级"
+msgstr "å\88°ä¸\8aä¸\80级æ\96\87æ¡£ç\9b®å½\95"
 
-#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:997
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137
 msgid "Go to home directory"
-msgstr "进入home目录"
+msgstr "进入 home 目录"
 
-#: ../src/generic/filedlgg.cpp:989
+#: ../src/generic/filedlgg.cpp:219
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
-#: ../src/common/prntbase.cpp:804
-msgid "Goto Page"
-msgstr "跳转页面"
+#: ../src/generic/aboutdlgg.cpp:77
+msgid "Graphics art by "
+msgstr "图形艺术设计由 "
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/common/fmapbase.cpp:155
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/richtext/richtextborderspage.cpp:547
+msgid "Groove"
+msgstr ""
+
+#: ../src/common/zstream.cpp:159 ../src/common/zstream.cpp:319
 msgid "Gzip not supported by this version of zlib"
-msgstr "此版本的zlib不支持Gzip"
+msgstr "此版本的 zlib 不支持 Gzip"
 
-#: ../src/html/helpfrm.cpp:1574
+#: ../src/common/accelcmn.cpp:76
+msgid "HELP"
+msgstr "HELP"
+
+#: ../src/common/accelcmn.cpp:61
+msgid "HOME"
+msgstr "HOME"
+
+#: ../src/html/helpwnd.cpp:1553
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:498
+#: ../src/html/htmlwin.cpp:655
 #, c-format
 msgid "HTML anchor %s does not exist."
-msgstr "HTML 锚 %s 不存在."
+msgstr "HTML 锚 %s 不存在。"
 
-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpwnd.cpp:1551
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/common/fmapbase.cpp:110
+#: ../src/common/stockitem.cpp:163
+msgid "Harddisk"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:156
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
-#: ../contrib/src/deprecated/proplist.cpp:523 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:337 ../src/msw/mdi.cpp:1383
+#: ../src/osx/button_osx.cpp:40 ../src/common/stockitem.cpp:164
+#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:117
 msgid "Help"
 msgstr "帮助"
 
-#: ../src/html/helpfrm.cpp:1213
+#: ../src/html/helpwnd.cpp:1214
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
-#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:459 ../src/generic/helpext.cpp:460
 msgid "Help Index"
 msgstr "帮助索引"
 
-#: ../src/html/helpfrm.cpp:1560
+#: ../src/html/helpwnd.cpp:1535
 msgid "Help Printing"
 msgstr "帮助打印"
 
-#: ../src/html/helpfrm.cpp:814
+#: ../src/html/helpwnd.cpp:815
 msgid "Help Topics"
 msgstr "帮助主题"
 
-#: ../src/html/helpfrm.cpp:1573
+#: ../src/html/helpwnd.cpp:1552
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
-#: ../src/html/helpctrl.cpp:55
+#: ../src/generic/helpext.cpp:272
+#, c-format
+msgid "Help directory \"%s\" not found."
+msgstr "找不到帮助目录 \"%s\"。"
+
+#: ../src/generic/helpext.cpp:280
+#, fuzzy, c-format
+msgid "Help file \"%s\" not found."
+msgstr "找不到域 '%s'的目录文件."
+
+#: ../src/html/helpctrl.cpp:64
 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 
-#: ../src/generic/dirdlgg.cpp:107
+#: ../src/osx/menu_osx.cpp:556
+#, c-format
+msgid "Hide %s"
+msgstr "隐藏 %s"
+
+#: ../src/osx/menu_osx.cpp:558
+msgid "Hide Others"
+msgstr ""
+
+#: ../src/generic/infobar.cpp:139
+msgid "Hide this notification message."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:99 ../src/common/stockitem.cpp:165
 msgid "Home"
 msgstr "Home"
 
-#: ../src/generic/dirctrlg.cpp:646
+#: ../src/generic/dirctrlg.cpp:616
 msgid "Home directory"
-msgstr "Home目录"
+msgstr "Home 目录"
 
-#: ../include/wx/filefn.h:142
-msgid "I64"
-msgstr "I64"
+#: ../src/richtext/richtextsizepage.cpp:231
+#: ../src/richtext/richtextsizepage.cpp:233
+msgid "How the object will float relative to the text."
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:943
+#: ../src/common/imagbmp.cpp:1071
 msgid "ICO: Error in reading mask DIB."
-msgstr "ICO: 读掩码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:1187 ../src/common/imagbmp.cpp:1248
+#: ../src/common/imagbmp.cpp:1259 ../src/common/imagbmp.cpp:1272
+#: ../src/common/imagbmp.cpp:1318 ../src/common/imagbmp.cpp:1330
+#: ../src/common/imagbmp.cpp:1341
 msgid "ICO: Error writing the image file!"
-msgstr "ICO: 写图像文件错误."
+msgstr "ICO: 写图像文件错误！"
 
-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1151
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: 图像高度超出范围, 不适合做图标."
+msgstr "ICO: 图像高度超出范围，不适合做图标。"
 
-#: ../src/common/imagbmp.cpp:1022
+#: ../src/common/imagbmp.cpp:1159
 msgid "ICO: Image too wide for an icon."
-msgstr "ICO: 图像宽度超出范围, 不适合做图标."
+msgstr "ICO: 图像宽度超出范围，不适合做图标。"
 
-#: ../src/common/imagbmp.cpp:1255
+#: ../src/common/imagbmp.cpp:1416
 msgid "ICO: Invalid icon index."
-msgstr "ICO: 无效的图标索引."
+msgstr "ICO: 无效的图标索引。"
 
-#: ../src/common/imagiff.cpp:771
+#: ../src/common/imagiff.cpp:760
 msgid "IFF: data stream seems to be truncated."
-msgstr "IFF: 数据流似乎已被截断."
+msgstr "IFF: 数据流似乎已被截断。"
 
-#: ../src/common/imagiff.cpp:755
+#: ../src/common/imagiff.cpp:744
 msgid "IFF: error in IFF image format."
-msgstr "IFF: IFF文件格式错误."
+msgstr "IFF: IFF文件格式错误。"
 
-#: ../src/common/imagiff.cpp:758
+#: ../src/common/imagiff.cpp:747
 msgid "IFF: not enough memory."
-msgstr "IFF: 没有足够内存."
+msgstr "IFF: 没有足够内存。"
 
-#: ../src/common/imagiff.cpp:761
+#: ../src/common/imagiff.cpp:750
 msgid "IFF: unknown error!!!"
-msgstr "IFF: 位置错误!!!"
+msgstr "IFF: 位置错误！！！"
 
-#: ../contrib/src/deprecated/resource.cpp:2673
-#: ../contrib/src/deprecated/resource.cpp:2684
-#, c-format
-msgid "Icon resource specification %s not found."
-msgstr "没有找到图标资源规范 %s ."
+#: ../src/common/accelcmn.cpp:51
+msgid "INS"
+msgstr "INS"
+
+#: ../src/common/accelcmn.cpp:52
+msgid "INSERT"
+msgstr "INSERT"
+
+#: ../src/common/fmapbase.cpp:198
+msgid "ISO-2022-JP"
+msgstr "ISO-2022-JP"
+
+#: ../src/osx/carbon/dataview.cpp:2421
+msgid "Icon & text renderer cannot render value; value type: "
+msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:325
+#: ../src/html/htmprint.cpp:283
+msgid ""
+"If possible, try changing the layout parameters to make the printout more "
+"narrow."
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:355
 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"
 msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"
-"请在此输入, 它将会被加到错误报告中:"
+"请在此输入，它将会被加到错误报告中:"
 
-#: ../src/generic/dbgrptg.cpp:291
+#: ../src/generic/dbgrptg.cpp:321
 msgid ""
 "If you wish to suppress this debug report completely, please choose the "
 "\"Cancel\" button,\n"
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
-"如果您想完全禁用调试报告, 请按"
-"\"取消\"按钮, \n"
-"但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
-"在可能的情况下, 请尽量选择让程序生成调试报告.\n"
+"如果您想完全禁用调试报告，请按\"取消\"按钮，\n"
+"但我们不建议这样做，因为调试报告有助于改进本程序。\n"
+"在可能的情况下，请尽量选择让程序生成调试报告。\n"
 
-#: ../src/msw/registry.cpp:1281
+#: ../src/msw/registry.cpp:1396
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr "忽略值 \"%s\" (键 \"%s\")."
+msgstr "忽略值 \"%s\" (键 \"%s\")。"
 
-#: ../contrib/src/deprecated/resource.cpp:271
-msgid "Ill-formed resource file syntax."
-msgstr "不良的资源文件语法."
-
-#: ../src/common/xtistrm.cpp:260
+#: ../src/common/xtistrm.cpp:300
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
-msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
+msgstr "非法的对象类 (非-wxEvtHandler) 作为事件源"
 
-#: ../include/wx/xti.h:1650
+#: ../src/common/xti.cpp:514
 msgid "Illegal Parameter Count for ConstructObject Method"
-msgstr "非法的针对ConstructObject方法的参数计数"
+msgstr "非法的针对 ConstructObject 方法的参数计数"
 
-#: ../include/wx/xti.h:1723
+#: ../src/common/xti.cpp:502
 msgid "Illegal Parameter Count for Create Method"
-msgstr "非法的针对Create方法的参数计数"
+msgstr "非法的针对 Create 方法的参数计数"
 
-#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/filectrlg.cpp:785
 msgid "Illegal directory name."
-msgstr "不合法的目录名."
+msgstr "不合法的目录名。"
 
-#: ../src/generic/filedlgg.cpp:1275
+#: ../src/generic/filectrlg.cpp:1374
 msgid "Illegal file specification."
-msgstr "不合规范的文件描述."
+msgstr "不合规范的文件描述。"
 
-#: ../src/common/image.cpp:1169
+#: ../src/common/image.cpp:2054
 msgid "Image and mask have different sizes."
-msgstr "图像和掩码的大小不一致."
+msgstr "图像和掩码的大小不一致。"
 
-#: ../src/common/image.cpp:1500
-#, c-format
+#: ../src/common/image.cpp:2502
+#, fuzzy, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
-#: ../src/msw/textctrl.cpp:361
+#: ../src/common/image.cpp:2632
+#, fuzzy, c-format
+msgid "Image is not of type %s."
+msgstr "图像文件的类型不是 %d."
+
+#: ../src/msw/textctrl.cpp:399
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
-msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
+msgstr ""
+"无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:411
+#: ../src/unix/utilsunx.cpp:302
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
-#: ../src/common/filefn.cpp:1027
+#: ../src/common/filefn.cpp:1069
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "不可能获得文件 '%s'的许可权限"
+msgstr "不可能获得文件 '%s' 的许可权限"
 
-#: ../src/common/filefn.cpp:1041
+#: ../src/common/filefn.cpp:1083
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 
-#: ../src/common/filefn.cpp:1085
+#: ../src/common/filefn.cpp:1137
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "不可能设置文件 '%s'的许可权限"
+msgstr "不可能设置文件 '%s' 的许可权限"
 
-#: ../src/common/stockitem.cpp:124
+#: ../src/common/gifdecod.cpp:819
+#, c-format
+msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:619
+msgid "Incorrect number of arguments."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:166
 msgid "Indent"
 msgstr "缩进"
 
-#: ../src/html/helpfrm.cpp:516
+#: ../src/richtext/richtextformatdlg.cpp:329
+msgid "Indents && Spacing"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:526
 msgid "Index"
 msgstr "索引"
 
-#: ../src/common/fmapbase.cpp:114
-#, fuzzy
+#: ../src/common/fmapbase.cpp:160
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
-#: ../src/common/xtistrm.cpp:704
-msgid "Internal error, illegal wxCustomTypeInfo"
-msgstr "整数错误, 非法的wxCustomTypeInfo"
+#: ../src/common/stockitem.cpp:168
+msgid "Info"
+msgstr "信息"
 
-#: ../src/common/imagtiff.cpp:211
-msgid "Invalid TIFF image index."
-msgstr "无效TIFF图像索引."
+#: ../src/common/init.cpp:273
+msgid "Initialization failed in post init, aborting."
+msgstr "在后初始化阶段出错，退出..."
+
+#: ../src/richtext/richtextsymboldlg.cpp:473
+msgid "Insert"
+msgstr "插入"
+
+#: ../src/richtext/richtextbuffer.cpp:7246
+#, fuzzy
+msgid "Insert Field"
+msgstr "插入"
+
+#: ../src/richtext/richtextbuffer.cpp:7157
+#: ../src/richtext/richtextbuffer.cpp:8063
+msgid "Insert Image"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:7204
+msgid "Insert Object"
+msgstr "插入对象"
+
+#: ../src/richtext/richtextctrl.cpp:1162 ../src/richtext/richtextctrl.cpp:1352
+#: ../src/richtext/richtextbuffer.cpp:7002
+#: ../src/richtext/richtextbuffer.cpp:7029
+#: ../src/richtext/richtextbuffer.cpp:7073
+msgid "Insert Text"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:320
+#: ../src/richtext/richtextindentspage.cpp:322
+msgid "Inserts a page break before the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:549
+#, fuzzy
+msgid "Inset"
+msgstr "缩进"
 
-#: ../src/xrc/xmlres.cpp:399
+#: ../src/gtk/app.cpp:432
 #, c-format
-msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
+msgid "Invalid GTK+ command line option, use \"%s --help\""
+msgstr ""
 
-#: ../src/common/appcmn.cpp:249
+#: ../src/common/imagtiff.cpp:315
+msgid "Invalid TIFF image index."
+msgstr "无效TIFF图像索引。"
+
+#: ../src/osx/carbon/dataview.cpp:1783 ../src/osx/carbon/dataview.cpp:1878
+msgid "Invalid data view item"
+msgstr ""
+
+#: ../src/common/appcmn.cpp:246
 #, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "无效的显示模式 '%s'."
+msgstr "无效的显示模式 '%s'。"
 
-#: ../src/x11/app.cpp:128
+#: ../src/x11/app.cpp:122
 #, 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'."
+msgstr "无效的锁文件 '%s'。"
+
+#: ../src/common/translation.cpp:955
+#, fuzzy
+msgid "Invalid message catalog."
+msgstr "'%s' 不是有效的消息目录."
 
-#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+#: ../src/common/xtistrm.cpp:410 ../src/common/xtistrm.cpp:425
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
-msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
+msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"
 
-#: ../src/common/xtistrm.cpp:395
+#: ../src/common/xtistrm.cpp:440
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
-msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
+msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"
 
-#: ../src/common/regex.cpp:210
+#: ../src/common/regex.cpp:314
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
-#: ../src/generic/fontdlgg.cpp:233
+#: ../src/common/config.cpp:227
+#, c-format
+msgid "Invalid value %ld for a boolean key \"%s\" in config file."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:324
+#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169
 msgid "Italic"
 msgstr "斜体"
 
-#: ../src/common/paper.cpp:144
+#: ../src/common/paper.cpp:132
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封, 110 x 230 毫米"
 
-#: ../src/common/imagjpeg.cpp:225
+#: ../src/common/imagjpeg.cpp:256
 msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: 不能装入 - 文件也许已被破坏."
+msgstr "JPEG: 无法装入 - 文件也许已被破坏。"
 
-#: ../src/common/imagjpeg.cpp:339
+#: ../src/common/imagjpeg.cpp:435
 msgid "JPEG: Couldn't save image."
-msgstr "JPEG: 不能保存图像."
+msgstr "JPEG: 无法保存图像。"
+
+#: ../src/common/paper.cpp:165
+msgid "Japanese Double Postcard 200 x 148 mm"
+msgstr "日本双明信片, 200 x 148 毫米"
+
+#: ../src/common/paper.cpp:169
+msgid "Japanese Envelope Chou #3"
+msgstr "日本 Chou 3 信封"
+
+#: ../src/common/paper.cpp:182
+msgid "Japanese Envelope Chou #3 Rotated"
+msgstr "日本 Chou 3 信封(横向)"
+
+#: ../src/common/paper.cpp:170
+msgid "Japanese Envelope Chou #4"
+msgstr "日本 Chou 4 信封"
+
+#: ../src/common/paper.cpp:183
+msgid "Japanese Envelope Chou #4 Rotated"
+msgstr "日本 Chou 4 信封(横向)"
+
+#: ../src/common/paper.cpp:167
+msgid "Japanese Envelope Kaku #2"
+msgstr "日本 Kaku 2 信封"
 
-#: ../src/common/stockitem.cpp:128
+#: ../src/common/paper.cpp:180
+msgid "Japanese Envelope Kaku #2 Rotated"
+msgstr "日本 Kaku 2 信封(横向)"
+
+#: ../src/common/paper.cpp:168
+msgid "Japanese Envelope Kaku #3"
+msgstr "日本 Kaku 3 信封"
+
+#: ../src/common/paper.cpp:181
+msgid "Japanese Envelope Kaku #3 Rotated"
+msgstr "日本 Kaku 3 信封(横向)"
+
+#: ../src/common/paper.cpp:187
+msgid "Japanese Envelope You #4"
+msgstr "日本 You 4 信封"
+
+#: ../src/common/paper.cpp:188
+msgid "Japanese Envelope You #4 Rotated"
+msgstr "日本 You 4 信封(横向)"
+
+#: ../src/common/paper.cpp:140
+msgid "Japanese Postcard 100 x 148 mm"
+msgstr "日本明信片, 100 x 148 毫米"
+
+#: ../src/common/paper.cpp:177
+msgid "Japanese Postcard Rotated 148 x 100 mm"
+msgstr "横向日本明信片, 148 x 100 毫米"
+
+#: ../src/common/stockitem.cpp:170
+msgid "Jump to"
+msgstr "跳转至"
+
+#: ../src/common/stockitem.cpp:172
 msgid "Justified"
 msgstr "分散对齐"
 
-#: ../src/common/fmapbase.cpp:118
+#: ../src/richtext/richtextindentspage.cpp:168
+#: ../src/richtext/richtextindentspage.cpp:170
+#: ../src/richtext/richtextliststylepage.cpp:345
+#: ../src/richtext/richtextliststylepage.cpp:347
+msgid "Justify text left and right."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:164
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/common/fmapbase.cpp:119
+#: ../src/common/fmapbase.cpp:165
 msgid "KOI8-U"
 msgstr "KOI8-U"
 
-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:337
+msgid "KP_"
+msgstr "KP_"
+
+#: ../src/common/accelcmn.cpp:104
+msgid "KP_ADD"
+msgstr "KP_ADD"
+
+#: ../src/common/accelcmn.cpp:99
+msgid "KP_BEGIN"
+msgstr "KP_BEGIN"
+
+#: ../src/common/accelcmn.cpp:107
+msgid "KP_DECIMAL"
+msgstr "KP_DECIMAL"
+
+#: ../src/common/accelcmn.cpp:101
+msgid "KP_DELETE"
+msgstr "KP_DELETE"
+
+#: ../src/common/accelcmn.cpp:108
+msgid "KP_DIVIDE"
+msgstr "KP_DIVIDE"
+
+#: ../src/common/accelcmn.cpp:93
+msgid "KP_DOWN"
+msgstr "KP_DOWN"
+
+#: ../src/common/accelcmn.cpp:98
+msgid "KP_END"
+msgstr "KP_END"
+
+#: ../src/common/accelcmn.cpp:88
+msgid "KP_ENTER"
+msgstr "KP_ENTER"
+
+#: ../src/common/accelcmn.cpp:102
+msgid "KP_EQUAL"
+msgstr "KP_EQUAL"
+
+#: ../src/common/accelcmn.cpp:89
+msgid "KP_HOME"
+msgstr "KP_HOME"
+
+#: ../src/common/accelcmn.cpp:100
+msgid "KP_INSERT"
+msgstr "KP_INSERT"
+
+#: ../src/common/accelcmn.cpp:90
+msgid "KP_LEFT"
+msgstr "KP_LEFT"
+
+#: ../src/common/accelcmn.cpp:103
+msgid "KP_MULTIPLY"
+msgstr "KP_MULTIPLY"
+
+#: ../src/common/accelcmn.cpp:96
+msgid "KP_NEXT"
+msgstr "KP_NEXT"
+
+#: ../src/common/accelcmn.cpp:97
+msgid "KP_PAGEDOWN"
+msgstr "KP_PAGEDOWN"
+
+#: ../src/common/accelcmn.cpp:95
+msgid "KP_PAGEUP"
+msgstr "KP_PAGEUP"
+
+#: ../src/common/accelcmn.cpp:94
+msgid "KP_PRIOR"
+msgstr "KP_PRIOR"
+
+#: ../src/common/accelcmn.cpp:92
+msgid "KP_RIGHT"
+msgstr "KP_RIGHT"
+
+#: ../src/common/accelcmn.cpp:105
+msgid "KP_SEPARATOR"
+msgstr "KP_SEPARATOR"
+
+#: ../src/common/accelcmn.cpp:86
+msgid "KP_SPACE"
+msgstr "KP_SPACE"
+
+#: ../src/common/accelcmn.cpp:106
+msgid "KP_SUBTRACT"
+msgstr "KP_SUBTRACT"
+
+#: ../src/common/accelcmn.cpp:87
+msgid "KP_TAB"
+msgstr "KP_TAB"
+
+#: ../src/common/accelcmn.cpp:91
+msgid "KP_UP"
+msgstr "KP_UP"
+
+#: ../src/richtext/richtextindentspage.cpp:295
+msgid "L&ine spacing:"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:57
+msgid "LEFT"
+msgstr "LEFT"
+
+#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874
 msgid "Landscape"
 msgstr "横向"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/stockitem.cpp:175
+msgid "Last"
+msgstr "最后"
+
+#: ../src/common/prntbase.cpp:1543
+msgid "Last page"
+msgstr "最后一页"
+
+#: ../src/common/log.cpp:312
+#, c-format
+msgid "Last repeated message (\"%s\", %lu time) wasn't output"
+msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
+msgstr[0] ""
+
+#: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 
-#: ../src/generic/prntdlgg.cpp:879
+#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextliststylepage.cpp:254
+#: ../src/richtext/richtextbulletspage.cpp:200
+#: ../src/richtext/richtextbulletspage.cpp:203
+#: ../src/richtext/richtextbulletspage.cpp:204
+#: ../src/richtext/richtextsizepage.cpp:227
+msgid "Left"
+msgstr "左"
+
+#: ../src/richtext/richtextindentspage.cpp:217
+#: ../src/richtext/richtextliststylepage.cpp:391
+msgid "Left (&first line):"
+msgstr "左(第一行)(&F):"
+
+#: ../src/generic/prntdlgg.cpp:886
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
-#: ../src/common/paper.cpp:110
+#: ../src/richtext/richtextindentspage.cpp:154
+#: ../src/richtext/richtextindentspage.cpp:156
+#: ../src/richtext/richtextliststylepage.cpp:331
+#: ../src/richtext/richtextliststylepage.cpp:333
+msgid "Left-align text."
+msgstr "文字左对齐。"
+
+#: ../src/common/paper.cpp:146
+msgid "Legal Extra 9 1/2 x 15 in"
+msgstr "特大法律纸张, 9 1/2 x 15 英寸"
+
+#: ../src/common/paper.cpp:98
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:145
+msgid "Letter Extra 9 1/2 x 12 in"
+msgstr "特大信纸, 9 1/2 x 12 英寸"
+
+#: ../src/common/paper.cpp:151
+msgid "Letter Extra Transverse 9.275 x 12 in"
+msgstr "特大信纸(横排), 9.275 x 12 英寸"
+
+#: ../src/common/paper.cpp:154
+msgid "Letter Plus 8 1/2 x 12.69 in"
+msgstr "加大信纸, 8 1/2 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:171
+msgid "Letter Rotated 11 x 8 1/2 in"
+msgstr "横向信纸, 11 x 8 1/2 英寸"
+
+#: ../src/common/paper.cpp:103
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 
-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:149
+msgid "Letter Transverse 8 1/2 x 11 in"
+msgstr "信纸(横排), 8 1/2 x 11 英寸"
+
+#: ../src/common/paper.cpp:97
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 
-#: ../src/generic/fontdlgg.cpp:236
+#: ../src/generic/aboutdlgg.cpp:174
+msgid "License"
+msgstr "授权"
+
+#: ../src/generic/fontdlgg.cpp:333
 msgid "Light"
 msgstr "细"
 
-#: ../src/html/chm.cpp:820
+#: ../src/generic/helpext.cpp:299
+#, c-format
+msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:445
+msgid "Line spacing:"
+msgstr ""
+
+#: ../src/html/chm.cpp:841
 msgid "Link contained '//', converted to absolute link."
-msgstr "链接包含 '//', 转换为绝对链接."
+msgstr "链接包含 '//'，转换为绝对链接."
+
+#: ../src/richtext/richtextformatdlg.cpp:348
+msgid "List Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:1044
+msgid "List styles"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:204
+#: ../src/richtext/richtextfontpage.cpp:206
+msgid "Lists font sizes in points."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:197
+#: ../src/richtext/richtextfontpage.cpp:199
+msgid "Lists the available fonts."
+msgstr "列出可用字体。"
 
-#: ../src/common/fldlgcmn.cpp:257
+#: ../src/common/fldlgcmn.cpp:326
 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 
-#: ../src/html/htmlwin.cpp:416
+#: ../src/html/htmlwin.cpp:571
 msgid "Loading : "
 msgstr "装载: "
 
-#: ../src/common/imagpnm.cpp:72
-msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "装入灰度 Ascii PNM图像功能还没有实现."
-
-#: ../src/common/imagpnm.cpp:75
-msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "装入灰度 Raw PNM图像功能还没有实现."
-
-#: ../src/unix/snglinst.cpp:251
+#: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "锁文件 '%s' 没有正确的所有者."
+msgstr "锁文件 '%s' 没有正确的所有者。"
 
-#: ../src/unix/snglinst.cpp:256
+#: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr "锁文件 '%s' 没有正确的权限."
+msgstr "锁文件 '%s' 没有正确的权限。"
 
-#: ../src/generic/logg.cpp:575
+#: ../src/generic/logg.cpp:582
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "日志保存到文件 '%s'."
+msgstr "日志保存到文件 '%s'。"
 
-#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
-msgid "Long Conversions not supported"
-msgstr "不支持长转换"
+#: ../src/richtext/richtextliststylepage.cpp:485
+#: ../src/richtext/richtextbulletspage.cpp:290
+msgid "Lower case letters"
+msgstr ""
 
-#: ../src/gtk/mdi.cpp:465
+#: ../src/richtext/richtextliststylepage.cpp:487
+#: ../src/richtext/richtextbulletspage.cpp:292
+msgid "Lower case roman numerals"
+msgstr ""
+
+#: ../src/gtk/mdi.cpp:423 ../src/gtk1/mdi.cpp:432
 msgid "MDI child"
-msgstr "MDI子窗口"
+msgstr "MDI 子窗口"
 
-#: ../src/mac/carbon/thread.cpp:1635
-msgid "MP Thread Support is not available on this System"
-msgstr "此系统不提供MP线程支持."
+#: ../src/common/accelcmn.cpp:69
+msgid "MENU"
+msgstr "MENU"
 
-#: ../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帮助库. 请安装它."
+msgstr "MS HTML帮助功能不存在，因为此机器上没有安装 MS HTML 帮助库。请安装它。"
 
-#: ../src/univ/themes/win32.cpp:4823
+#: ../src/univ/themes/win32.cpp:3755
 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/common/fmapbase.cpp:204
+msgid "MacArabic"
+msgstr "MacArabic"
+
+#: ../src/common/fmapbase.cpp:223
+msgid "MacArmenian"
+msgstr "MacArmenian"
+
+#: ../src/common/fmapbase.cpp:212
+msgid "MacBengali"
+msgstr "MacBengali"
+
+#: ../src/common/fmapbase.cpp:218
+msgid "MacBurmese"
+msgstr "MacBurmese"
 
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/common/fmapbase.cpp:237
+msgid "MacCeltic"
+msgstr "MacCeltic"
+
+#: ../src/common/fmapbase.cpp:228
+msgid "MacCentralEurRoman"
+msgstr "MacCentralEurRoman"
+
+#: ../src/common/fmapbase.cpp:224
+msgid "MacChineseSimp"
+msgstr "MacChineseSimp"
+
+#: ../src/common/fmapbase.cpp:202
+msgid "MacChineseTrad"
+msgstr "MacChineseTrad"
+
+#: ../src/common/fmapbase.cpp:234
+msgid "MacCroatian"
+msgstr "MacCroatian"
+
+#: ../src/common/fmapbase.cpp:207
+msgid "MacCyrillic"
+msgstr "MacCyrillic"
+
+#: ../src/common/fmapbase.cpp:208
+msgid "MacDevanagari"
+msgstr "MacDevanagari"
+
+#: ../src/common/fmapbase.cpp:232
+msgid "MacDingbats"
+msgstr "MacDingbats"
+
+#: ../src/common/fmapbase.cpp:227
+msgid "MacEthiopic"
+msgstr "MacEthiopic"
+
+#: ../src/common/fmapbase.cpp:230
+msgid "MacExtArabic"
+msgstr "MacExtArabic"
+
+#: ../src/common/fmapbase.cpp:238
+msgid "MacGaelic"
+msgstr "MacGaelic"
+
+#: ../src/common/fmapbase.cpp:222
+msgid "MacGeorgian"
+msgstr "MacGeorgian"
+
+#: ../src/common/fmapbase.cpp:206
+msgid "MacGreek"
+msgstr "MacGreek"
+
+#: ../src/common/fmapbase.cpp:210
+msgid "MacGujarati"
+msgstr "MacGujarati"
+
+#: ../src/common/fmapbase.cpp:209
+msgid "MacGurmukhi"
+msgstr "MacGurmukhi"
+
+#: ../src/common/fmapbase.cpp:205
+msgid "MacHebrew"
+msgstr "MacHebrew"
+
+#: ../src/common/fmapbase.cpp:235
+msgid "MacIcelandic"
+msgstr "MacIcelandic"
+
+#: ../src/common/fmapbase.cpp:201
+msgid "MacJapanese"
+msgstr "MacJapanese"
+
+#: ../src/common/fmapbase.cpp:215
+msgid "MacKannada"
+msgstr "MacKannada"
+
+#: ../src/common/fmapbase.cpp:239
+msgid "MacKeyboardGlyphs"
+msgstr "MacKeyboardGlyphs"
+
+#: ../src/common/fmapbase.cpp:219
+msgid "MacKhmer"
+msgstr "MacKhmer"
+
+#: ../src/common/fmapbase.cpp:203
+msgid "MacKorean"
+msgstr "MacKorean"
+
+#: ../src/common/fmapbase.cpp:221
+msgid "MacLaotian"
+msgstr "MacLaotian"
+
+#: ../src/common/fmapbase.cpp:216
+msgid "MacMalayalam"
+msgstr "MacMalayalam"
+
+#: ../src/common/fmapbase.cpp:226
+msgid "MacMongolian"
+msgstr "MacMongolian"
+
+#: ../src/common/fmapbase.cpp:211
+msgid "MacOriya"
+msgstr "MacOriya"
+
+#: ../src/common/fmapbase.cpp:200
+msgid "MacRoman"
+msgstr "MacRoman"
+
+#: ../src/common/fmapbase.cpp:236
+msgid "MacRomanian"
+msgstr "MacRomanian"
+
+#: ../src/common/fmapbase.cpp:217
+msgid "MacSinhalese"
+msgstr "MacSinhalese"
+
+#: ../src/common/fmapbase.cpp:231
+msgid "MacSymbol"
+msgstr "MacSymbol"
+
+#: ../src/common/fmapbase.cpp:213
+msgid "MacTamil"
+msgstr "MacTamil"
+
+#: ../src/common/fmapbase.cpp:214
+msgid "MacTelugu"
+msgstr "MacTelugu"
+
+#: ../src/common/fmapbase.cpp:220
+msgid "MacThai"
+msgstr "MacThai"
+
+#: ../src/common/fmapbase.cpp:225
+msgid "MacTibetan"
+msgstr "MacTibetan"
+
+#: ../src/common/fmapbase.cpp:233
+msgid "MacTurkish"
+msgstr "MacTurkish"
+
+#: ../src/common/fmapbase.cpp:229
+msgid "MacVietnamese"
+msgstr "MacVietnamese"
+
+#: ../src/propgrid/advprops.cpp:2025
+#, fuzzy
+msgid "Make a selection:"
+msgstr "选段"
+
+#: ../src/richtext/richtextformatdlg.cpp:361
+#: ../src/richtext/richtextmarginspage.cpp:172
+msgid "Margins"
+msgstr "边距"
+
+#: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
-msgstr "大小写匹配"
+msgstr "区分大小写"
+
+#: ../src/richtext/richtextsizepage.cpp:425
+msgid "Max height:"
+msgstr "最达高度:"
+
+#: ../src/richtext/richtextsizepage.cpp:398
+msgid "Max width:"
+msgstr "最大宽度:"
+
+#: ../src/unix/mediactrl.cpp:1007
+#, c-format
+msgid "Media playback error: %s"
+msgstr ""
 
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "内存 VFS 已包含文件 '%s'!"
+msgstr "内存 VFS 已包含文件 '%s'！"
 
-#: ../src/msw/frame.cpp:374
+#: ../src/msw/frame.cpp:354
 msgid "Menu"
 msgstr "菜单"
 
-#: ../src/univ/themes/metal.cpp:174
+#: ../src/common/msgout.cpp:125
+msgid "Message"
+msgstr "消息"
+
+#: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
-msgstr "金属主题(theme)"
+msgstr "金属主题"
 
-#: ../src/univ/themes/win32.cpp:4821
+#: ../src/msw/ole/automtn.cpp:636
+msgid "Method or property not found."
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3753
 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/richtext/richtextsizepage.cpp:371
+msgid "Min height:"
+msgstr "最小高度:"
 
-#: ../src/mgl/app.cpp:165
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr "显示模式 %ix%i-%i位色 不支持."
+#: ../src/richtext/richtextsizepage.cpp:344
+msgid "Min width:"
+msgstr "最小宽度: "
+
+#: ../src/msw/ole/automtn.cpp:652
+msgid "Missing a required parameter."
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr "现代"
 
-#: ../src/generic/filedlgg.cpp:441
+#: ../src/generic/filectrlg.cpp:456
 msgid "Modified"
-msgstr "修正ç\9a\84"
+msgstr "ä¿®æ\94¹æ\97¥æ\9c\9f"
 
-#: ../src/common/paper.cpp:145
+#: ../src/common/module.cpp:134
+#, c-format
+msgid "Module \"%s\" initialization failed"
+msgstr "模块 \"%s\" 初始化失败"
+
+#: ../src/common/paper.cpp:133
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
-msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
+msgstr "7.75信封，3 7/8 x 7 1/2 英寸"
+
+#: ../src/msw/fswatcher.cpp:144
+msgid "Monitoring individual files for changes is not supported currently."
+msgstr ""
 
-#: ../contrib/src/gizmos/editlbox.cpp:162
+#: ../src/generic/editlbox.cpp:277
 msgid "Move down"
 msgstr "下移"
 
-#: ../contrib/src/gizmos/editlbox.cpp:161
+#: ../src/generic/editlbox.cpp:276
 msgid "Move up"
 msgstr "上移"
 
-#: ../src/generic/filedlgg.cpp:438
+#: ../src/richtext/richtextsizepage.cpp:616
+#: ../src/richtext/richtextsizepage.cpp:618
+msgid "Moves the object to the next paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:610
+#: ../src/richtext/richtextsizepage.cpp:612
+msgid "Moves the object to the previous paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8841
+msgid "Multiple Cell Properties"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:82
+msgid "NUM_LOCK"
+msgstr "NUM_LOCK"
+
+#: ../src/generic/filectrlg.cpp:453
 msgid "Name"
 msgstr "名称"
 
-#: ../src/generic/dirdlgg.cpp:111
+#: ../src/common/stockitem.cpp:176
+msgid "Network"
+msgstr "网络"
+
+#: ../src/common/stockitem.cpp:177
+msgid "New"
+msgstr "新建"
+
+#: ../src/richtext/richtextstyledlg.cpp:251
+#, fuzzy
+msgid "New &Box Style..."
+msgstr "新增样式"
+
+#: ../src/richtext/richtextstyledlg.cpp:233
+msgid "New &Character Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:245
+msgid "New &List Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:239
+msgid "New &Paragraph Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:611
+#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:659
+#: ../src/richtext/richtextstyledlg.cpp:664
+#: ../src/richtext/richtextstyledlg.cpp:825
+#: ../src/richtext/richtextstyledlg.cpp:830
+#: ../src/richtext/richtextstyledlg.cpp:898
+#: ../src/richtext/richtextstyledlg.cpp:906
+#: ../src/richtext/richtextstyledlg.cpp:939
+#: ../src/richtext/richtextstyledlg.cpp:944
+msgid "New Style"
+msgstr "新增样式"
+
+#: ../src/generic/dirdlgg.cpp:103
 msgid "New directory"
 msgstr "新目录"
 
-#: ../contrib/src/gizmos/editlbox.cpp:159
+#: ../src/generic/editlbox.cpp:274
 msgid "New item"
 msgstr "新项目"
 
-#: ../src/generic/dirdlgg.cpp:318 ../src/generic/dirdlgg.cpp:328
-#: ../src/generic/filedlgg.cpp:615 ../src/generic/filedlgg.cpp:624
+#: ../src/generic/dirdlgg.cpp:327 ../src/generic/dirdlgg.cpp:337
+#: ../src/generic/filectrlg.cpp:647 ../src/generic/filectrlg.cpp:656
 msgid "NewName"
-msgstr "新名"
+msgstr "新名称"
 
-#: ../src/generic/tipdlg.cpp:305
+#: ../src/generic/tipdlg.cpp:306
 msgid "Next"
 msgstr "下一个"
 
-#: ../src/html/helpfrm.cpp:665
+#: ../src/common/prntbase.cpp:1538 ../src/html/helpwnd.cpp:679
 msgid "Next page"
 msgstr "下一页"
 
-#: ../src/mac/carbon/msgdlg.cpp:60 ../src/mac/carbon/msgdlg.cpp:145
-#: ../src/mac/classic/msgdlg.cpp:58 ../src/mac/classic/msgdlg.cpp:142
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194
 msgid "No"
 msgstr "否"
 
-#: ../contrib/src/deprecated/resource.cpp:2495
-#: ../contrib/src/deprecated/resource.cpp:2649
-msgid "No XBM facility available!"
-msgstr "没有可用XBM工具!"
+#: ../src/generic/animateg.cpp:151
+#, fuzzy, c-format
+msgid "No animation handler for type %ld defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/dfb/bitmap.cpp:643 ../src/dfb/bitmap.cpp:677
+#, fuzzy, c-format
+msgid "No bitmap handler for type %d defined."
+msgstr "没有类型 %d 的图像处理器."
+
+#: ../src/osx/carbon/dataview.cpp:1785
+msgid "No column existing."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1675
+msgid "No column for the specified column existing."
+msgstr ""
 
-#: ../contrib/src/deprecated/resource.cpp:2667
-msgid "No XPM icon facility available!"
-msgstr "没有可用的XPM图标设备!"
+#: ../src/osx/carbon/dataview.cpp:1424
+msgid "No column for the specified column position existing."
+msgstr ""
 
-#: ../src/generic/helpext.cpp:437
+#: ../src/common/utilscmn.cpp:1051
+msgid "No default application configured for HTML files."
+msgstr ""
+
+#: ../src/generic/helpext.cpp:450
 msgid "No entries found."
-msgstr "没找到条目"
+msgstr "没找到条目。"
 
 #: ../src/common/fontmap.cpp:422
 #, c-format
@@ -2710,9 +4928,9 @@ msgid ""
 "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
 #, c-format
@@ -2721,386 +4939,745 @@ msgid ""
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
-"在编码 '%s' 中未找到显示文本所用的字体.\n"
-"选择用于该编码的字体\n"
-"(否则该编码的文本将不能正确显示)?"
+"编码 '%s' 的字体未找到，无法显示文本。\n"
+"请选择用于该编码的字体\n"
+"(否则该编码的文本将无法正确显示)?"
 
-#: ../src/xrc/xmlres.cpp:616
-#, c-format
-msgid "No handler found for XML node '%s', class '%s'!"
-msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
+#: ../src/generic/animateg.cpp:143
+#, fuzzy
+msgid "No handler found for animation type."
+msgstr "没有找到图像类型处理器."
 
-#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525
+#: ../src/common/image.cpp:2484
 msgid "No handler found for image type."
-msgstr "没有找到图像类型处理器."
+msgstr "没有找到图像类型处理器。"
 
-#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
-#: ../src/common/image.cpp:1566
+#: ../src/common/image.cpp:2492 ../src/common/image.cpp:2603
+#: ../src/common/image.cpp:2656
 #, c-format
 msgid "No image handler for type %d defined."
-msgstr "没有类型 %d 的图像处理器."
+msgstr "没有类型 %d 的图像处理器。"
 
-#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581
+#: ../src/common/image.cpp:2626 ../src/common/image.cpp:2670
 #, c-format
 msgid "No image handler for type %s defined."
-msgstr "没有类型 %s的图像处理器."
+msgstr "没有类型 %s的图像处理器。"
 
-#: ../src/html/helpfrm.cpp:869
+#: ../src/html/helpwnd.cpp:872
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
-#: ../src/unix/sound.cpp:89
+#: ../src/osx/carbon/dataview.cpp:1677 ../src/osx/carbon/dataview.cpp:1787
+msgid "No renderer or invalid renderer type specified for custom data column."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1425
+msgid "No renderer specified for column."
+msgstr ""
+
+#: ../src/unix/sound.cpp:82
 msgid "No sound"
 msgstr "没有声音"
 
-#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216
+#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103
 msgid "No unused colour in image being masked."
-msgstr "图像中没有被掩码的未用颜色."
+msgstr "图像中没有被掩码的未用颜色。"
 
-#: ../src/common/image.cpp:1821
+#: ../src/common/image.cpp:3133
 msgid "No unused colour in image."
-msgstr "图像中没有未用的颜色."
+msgstr "图像中没有未用的颜色。"
+
+#: ../src/generic/helpext.cpp:307
+#, c-format
+msgid "No valid mappings found in the file \"%s\"."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:542
+#: ../src/richtext/richtextsizepage.cpp:226
+#: ../src/richtext/richtextsizepage.cpp:229
+#: ../src/richtext/richtextsizepage.cpp:230
+msgid "None"
+msgstr "无"
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/fmapbase.cpp:158
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
+#: ../src/generic/fontdlgg.cpp:329 ../src/generic/fontdlgg.cpp:332
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:1273
+#: ../src/html/helpwnd.cpp:1277
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr "正常字体<br> 且 <u>带下划线</u>."
+msgstr "正常字体<br> 且 <u>带下划线</u>。"
 
-#: ../src/html/helpfrm.cpp:1218
+#: ../src/html/helpwnd.cpp:1219
 msgid "Normal font:"
 msgstr "正常字体:"
 
-#: ../src/common/paper.cpp:129
+#: ../src/propgrid/props.cpp:888
+#, fuzzy, c-format
+msgid "Not %s"
+msgstr "关于(&A)"
+
+#: ../include/wx/filename.h:558 ../include/wx/filename.h:563
+#, fuzzy
+msgid "Not available"
+msgstr "没有可用的XBM工具!"
+
+#: ../src/richtext/richtextfontpage.cpp:331
+#, fuzzy
+msgid "Not underlined"
+msgstr "下划线"
+
+#: ../src/common/paper.cpp:117
 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
-#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
-#: ../src/msw/dialog.cpp:193
+#: ../src/generic/notifmsgg.cpp:105
+msgid "Notice"
+msgstr "注意"
+
+#: ../src/osx/carbon/dataview.cpp:903
+msgid "Number of columns could not be determined."
+msgstr "无法确定列数量。"
+
+#: ../src/richtext/richtextliststylepage.cpp:488
+#: ../src/richtext/richtextbulletspage.cpp:293
+msgid "Numbered outline"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:305 ../src/common/stockitem.cpp:179
+#: ../src/msw/msgdlg.cpp:489 ../src/msw/msgdlg.cpp:777
+#: ../src/msw/dialog.cpp:120 ../src/gtk1/fontdlg.cpp:139
 msgid "OK"
 msgstr "确认"
 
-#: ../src/common/xtixml.cpp:263
+#: ../src/msw/ole/automtn.cpp:676
+#, c-format
+msgid "OLE Automation error in %s: %s"
+msgstr ""
+
+#: ../include/wx/richtext/richtextimagedlg.h:39
+#, fuzzy
+msgid "Object Properties"
+msgstr "属性(&P)"
+
+#: ../src/msw/ole/automtn.cpp:644
+msgid "Object implementation does not support named arguments."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:265
 msgid "Objects must have an id attribute"
-msgstr "对象必须有一个id属性(attribute)"
+msgstr "对象必须有一个id属性"
 
-#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632
+#: ../src/common/docview.cpp:1746 ../src/common/docview.cpp:1788
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpwnd.cpp:685 ../src/html/helpwnd.cpp:1558
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
-#: ../src/generic/dbgrptg.cpp:147
+#: ../src/generic/dbgrptg.cpp:160
 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 
-#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
-#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:779
-msgid "Operation not permitted."
-msgstr "不允许的操作."
+#: ../src/common/stockitem.cpp:180
+msgid "Open..."
+msgstr "打开..."
 
-#: ../src/common/cmdline.cpp:702
+#: ../src/osx/carbon/glcanvas.cpp:49
 #, c-format
-msgid "Option '%s' requires a value, '=' expected."
-msgstr "选项 '%s' 要求一个值, 期望 '='."
+msgid "OpenGL function \"%s\" failed: %s (error %d)"
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:815
+msgid "Operation not permitted."
+msgstr "不允许的操作。"
+
+#: ../src/common/cmdline.cpp:728
+#, fuzzy, c-format
+msgid "Option '%s' can't be negated"
+msgstr "目录'%s'不能被创建"
 
-#: ../src/common/cmdline.cpp:722
+#: ../src/common/cmdline.cpp:892
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "选项 '%s' 需要值."
+msgstr "选项 '%s' 需要值。"
 
-#: ../src/common/cmdline.cpp:784
+#: ../src/common/cmdline.cpp:975
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "选项 '%s': '%s' 不能转成日期."
+msgstr "选项 '%s': '%s' 无法转成日期。"
 
-#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/dirdlgg.cpp:188 ../src/generic/prntdlgg.cpp:624
 msgid "Options"
 msgstr "选项"
 
-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:621 ../src/generic/prntdlgg.cpp:875
 msgid "Orientation"
 msgstr "方向"
 
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/windowid.cpp:260
+msgid "Out of window IDs.  Recommend shutting down application."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:400
+#: ../src/richtext/richtextborderspage.cpp:533
+msgid "Outline"
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:550
+msgid "Outset"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:640
+msgid "Overflow while coercing argument values."
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:85
+msgid "PAGEDOWN"
+msgstr "PAGEDOWN"
+
+#: ../src/common/accelcmn.cpp:84
+msgid "PAGEUP"
+msgstr "PAGEUP"
+
+#: ../src/common/accelcmn.cpp:70
+msgid "PAUSE"
+msgstr "PAUSE"
+
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481
 msgid "PCX: couldn't allocate memory"
-msgstr "PCX: 不能分配内存"
+msgstr "PCX: 无法分配内存"
 
-#: ../src/common/imagpcx.cpp:461
+#: ../src/common/imagpcx.cpp:457
 msgid "PCX: image format unsupported"
 msgstr "PCX: 图像格式不支持"
 
-#: ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:480
 msgid "PCX: invalid image"
 msgstr "PCX: 无效图像"
 
-#: ../src/common/imagpcx.cpp:448
+#: ../src/common/imagpcx.cpp:443
 msgid "PCX: this is not a PCX file."
-msgstr "PCX: 不是PCX文件."
+msgstr "PCX: 不是PCX文件。"
 
-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:482
 msgid "PCX: unknown error !!!"
-msgstr "PCX: 未知错误 !!!"
+msgstr "PCX: 未知错误！！！"
 
-#: ../src/common/imagpcx.cpp:463
+#: ../src/common/imagpcx.cpp:459
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
-#: ../src/common/imagpnm.cpp:96
+#: ../src/common/accelcmn.cpp:56
+msgid "PGDN"
+msgstr "PGDN"
+
+#: ../src/common/accelcmn.cpp:55
+msgid "PGUP"
+msgstr "PGUP"
+
+#: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
-msgstr "PNM: 不能分配内存."
+msgstr "PNM: 无法分配内存。"
 
-#: ../src/common/imagpnm.cpp:80
+#: ../src/common/imagpnm.cpp:74
 msgid "PNM: File format is not recognized."
-msgstr "PNM: 不能识别的文件格式."
+msgstr "PNM: 无法识别的文件格式。"
 
-#: ../src/common/imagpnm.cpp:112
+#: ../src/common/imagpnm.cpp:113 ../src/common/imagpnm.cpp:135
+#: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."
-msgstr "PNM: 文件似乎已被截断."
+msgstr "PNM: 文件似乎已被截断。"
+
+#: ../src/common/paper.cpp:189
+msgid "PRC 16K 146 x 215 mm"
+msgstr "中国 16开 纸, 146 x 215 毫米"
+
+#: ../src/common/paper.cpp:202
+msgid "PRC 16K Rotated"
+msgstr "中国 16开 纸张(横向)"
+
+#: ../src/common/paper.cpp:190
+msgid "PRC 32K 97 x 151 mm"
+msgstr "中国 32开 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:203
+msgid "PRC 32K Rotated"
+msgstr "中国 32开 纸张(横向)"
+
+#: ../src/common/paper.cpp:191
+msgid "PRC 32K(Big) 97 x 151 mm"
+msgstr "中国 32开(大) 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:204
+msgid "PRC 32K(Big) Rotated"
+msgstr "中国 32开(大) 纸张(横向)"
+
+#: ../src/common/paper.cpp:192
+msgid "PRC Envelope #1 102 x 165 mm"
+msgstr "中国标准信封1#, 102 x 165 毫米"
+
+#: ../src/common/paper.cpp:205
+msgid "PRC Envelope #1 Rotated 165 x 102 mm"
+msgstr "中国标准信封1#(横向), 165 x 102 毫米"
+
+#: ../src/common/paper.cpp:201
+msgid "PRC Envelope #10 324 x 458 mm"
+msgstr "中国标准信封10#, 324 x 458 毫米"
+
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中国标准信封10#(横向), 458 x 324 毫米"
+
+#: ../src/common/paper.cpp:193
+msgid "PRC Envelope #2 102 x 176 mm"
+msgstr "中国标准信封2#, 102 x 176 毫米"
+
+#: ../src/common/paper.cpp:206
+msgid "PRC Envelope #2 Rotated 176 x 102 mm"
+msgstr "中国标准信封2#(横向), 176 x 102 毫米"
+
+#: ../src/common/paper.cpp:194
+msgid "PRC Envelope #3 125 x 176 mm"
+msgstr "中国标准信封3#, 125 x 176 毫米"
+
+#: ../src/common/paper.cpp:207
+msgid "PRC Envelope #3 Rotated 176 x 125 mm"
+msgstr "中国标准信封3#(横向), 176 x 125 毫米"
+
+#: ../src/common/paper.cpp:195
+msgid "PRC Envelope #4 110 x 208 mm"
+msgstr "中国标准信封4#, 110 x 208 毫米"
+
+#: ../src/common/paper.cpp:208
+msgid "PRC Envelope #4 Rotated 208 x 110 mm"
+msgstr "中国标准信封4#(横向), 208 x 110 毫米"
 
-#: ../src/common/prntbase.cpp:1247
+#: ../src/common/paper.cpp:196
+msgid "PRC Envelope #5 110 x 220 mm"
+msgstr "中国标准信封5#, 110 x 220 毫米"
+
+#: ../src/common/paper.cpp:209
+msgid "PRC Envelope #5 Rotated 220 x 110 mm"
+msgstr "中国标准信封5#(横向), 220 x 110 毫米"
+
+#: ../src/common/paper.cpp:197
+msgid "PRC Envelope #6 120 x 230 mm"
+msgstr "中国标准信封6#, 120 x 230 毫米"
+
+#: ../src/common/paper.cpp:210
+msgid "PRC Envelope #6 Rotated 230 x 120 mm"
+msgstr "中国标准信封6#(横向), 230 x 120 毫米"
+
+#: ../src/common/paper.cpp:198
+msgid "PRC Envelope #7 160 x 230 mm"
+msgstr "中国标准信封7#, 160 x 230 毫米"
+
+#: ../src/common/paper.cpp:211
+msgid "PRC Envelope #7 Rotated 230 x 160 mm"
+msgstr "中国标准信封7#(横向), 230 x 160 毫米"
+
+#: ../src/common/paper.cpp:199
+msgid "PRC Envelope #8 120 x 309 mm"
+msgstr "中国标准信封8#, 120 x 309 毫米"
+
+#: ../src/common/paper.cpp:212
+msgid "PRC Envelope #8 Rotated 309 x 120 mm"
+msgstr "中国标准信封8#(横向), 309 x 120 毫米"
+
+#: ../src/common/paper.cpp:200
+msgid "PRC Envelope #9 229 x 324 mm"
+msgstr "中国标准信封9#, 229 x 324 毫米"
+
+#: ../src/common/paper.cpp:213
+msgid "PRC Envelope #9 Rotated 324 x 229 mm"
+msgstr "中国标准信封9#(横向), 324 x 229 毫米"
+
+#: ../src/common/accelcmn.cpp:73
+msgid "PRINT"
+msgstr "PRINT"
+
+#: ../src/richtext/richtextmarginspage.cpp:286
+#, fuzzy
+msgid "Padding"
+msgstr "正在读入"
+
+#: ../src/common/prntbase.cpp:2045
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
-#: ../src/common/prntbase.cpp:1245
+#: ../src/common/prntbase.cpp:2043
 #, c-format
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:827
+#: ../src/gtk/print.cpp:779
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533
+#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:468
+#: ../src/gtk/gnome/gprint.cpp:708
 msgid "Page setup"
 msgstr "页面设置"
 
-#: ../src/generic/prntdlgg.cpp:210
+#: ../src/generic/prntdlgg.cpp:222
 msgid "Pages"
 msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-#: ../src/generic/prntdlgg.cpp:1056
-msgid "Paper Size"
-msgstr "纸张大小"
-
-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-#: ../src/generic/prntdlgg.cpp:1051
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:807
+#: ../src/generic/prntdlgg.cpp:848 ../src/generic/prntdlgg.cpp:861
+#: ../src/generic/prntdlgg.cpp:1058 ../src/generic/prntdlgg.cpp:1063
 msgid "Paper size"
 msgstr "纸张大小"
 
-#: ../src/common/xtistrm.cpp:425
+#: ../src/richtext/richtextstyles.cpp:1042
+msgid "Paragraph styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:470
 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
-#: ../src/common/xtistrm.cpp:643
-msgid "Passing a already registered object to SetObjectName"
-msgstr "传递一个已注册的对象给SetObjectName"
+#: ../src/common/xtistrm.cpp:481
+#, fuzzy
+msgid "Passing an unknown object to GetObject"
+msgstr "传递一个未知对象给GetObject"
+
+#: ../src/richtext/richtextctrl.cpp:3082 ../src/common/stockitem.cpp:181
+#: ../src/stc/stc_i18n.cpp:20
+msgid "Paste"
+msgstr "粘贴"
 
-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
-msgid "Passing an unkown object to GetObject"
-msgstr "传递一个未知对象给GetObject"
+#: ../src/common/stockitem.cpp:263
+msgid "Paste selection"
+msgstr "粘贴选区"
+
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextbulletspage.cpp:173
+msgid "Peri&od"
+msgstr ""
 
-#: ../src/generic/filedlgg.cpp:444
+#: ../src/generic/filectrlg.cpp:459
 msgid "Permissions"
 msgstr "允许"
 
+#: ../src/richtext/richtextbuffer.cpp:10953
+msgid "Picture Properties"
+msgstr "图片属性"
+
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 
-#: ../src/gtk/fontdlg.cpp:81
+#: ../src/gtk1/fontdlg.cpp:75
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 
-#: ../src/generic/filedlgg.cpp:1330
+#: ../src/gtk/filedlg.cpp:72
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
-#: ../src/html/helpfrm.cpp:813
+#: ../src/html/helpwnd.cpp:814
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 
-#: ../src/msw/dialup.cpp:750
+#: ../src/msw/dialup.cpp:786
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
-#: ../src/msw/listctrl.cpp:434
+#: ../src/msw/listctrl.cpp:373
 #, 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"
-"(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
-"否则此程序无法正确运行."
+"请安装较新版本的 comctl32.dll\n"
+"(至少需要4.70版，您现有的版本是 %d.%02d)，\n"
+"否则此程序无法正确运行。"
 
-#: ../src/common/prntbase.cpp:313
-msgid "Please wait while printing\n"
+#: ../src/common/headerctrlcmn.cpp:60
+msgid "Please select the columns to show and define their order:"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:522
+#, fuzzy
+msgid "Please wait while printing..."
 msgstr "在打印时请等待\n"
 
-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/propgrid/advprops.cpp:632
+#, fuzzy
+msgid "Point Size"
+msgstr "字体大小(Point size)(&P):"
+
+#: ../src/osx/carbon/dataview.cpp:1279 ../src/osx/carbon/dataview.cpp:1330
+#: ../src/osx/carbon/dataview.cpp:1421 ../src/osx/carbon/dataview.cpp:1444
+#: ../src/osx/carbon/dataview.cpp:1461 ../src/osx/carbon/dataview.cpp:1478
+#: ../src/osx/carbon/dataview.cpp:1671 ../src/osx/carbon/dataview.cpp:1780
+#: ../src/osx/carbon/dataview.cpp:1822 ../src/osx/carbon/dataview.cpp:1875
+#: ../src/osx/carbon/dataview.cpp:1998
+msgid "Pointer to data view control not set correctly."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1280 ../src/osx/carbon/dataview.cpp:1339
+#: ../src/osx/carbon/dataview.cpp:1422 ../src/osx/carbon/dataview.cpp:1479
+#: ../src/osx/carbon/dataview.cpp:1672 ../src/osx/carbon/dataview.cpp:1781
+#: ../src/osx/carbon/dataview.cpp:1823 ../src/osx/carbon/dataview.cpp:1876
+#: ../src/osx/carbon/dataview.cpp:1999
+msgid "Pointer to model not set correctly."
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../src/generic/prntdlgg.cpp:296
+#: ../src/richtext/richtextsizepage.cpp:458
+msgid "Position"
+msgstr "位置"
+
+#: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"
 msgstr "PostScript文件"
 
-#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
+#: ../src/common/stockitem.cpp:182
+msgid "Preferences"
+msgstr "偏好设置"
+
+#: ../src/osx/menu_osx.cpp:550
+msgid "Preferences..."
+msgstr "偏好设置..."
+
+#: ../src/common/prntbase.cpp:530
+msgid "Preparing"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
+#: ../src/html/helpwnd.cpp:1236
 msgid "Preview:"
 msgstr "预览:"
 
-#: ../src/html/helpfrm.cpp:662
+#: ../src/common/prntbase.cpp:1524 ../src/html/helpwnd.cpp:678
 msgid "Previous page"
 msgstr "前页"
 
-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
-#: ../src/gtk/gnome/gprint.cpp:400
+#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:410 ../src/common/prntbase.cpp:1512
+#: ../src/gtk/print.cpp:593 ../src/gtk/print.cpp:606
+#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549
 msgid "Print"
 msgstr "打印"
 
-#: ../src/common/docview.cpp:1045
+#: ../include/wx/prntbase.h:396 ../src/common/docview.cpp:1247
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225
+#: ../src/common/prntbase.cpp:1986 ../src/common/prntbase.cpp:2028
+#: ../src/common/prntbase.cpp:2036
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
-#: ../src/generic/prntdlgg.cpp:218
+#: ../src/generic/prntdlgg.cpp:230
 msgid "Print Range"
 msgstr "打印范围"
 
-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:455
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: ../src/generic/prntdlgg.cpp:617
+#: ../src/generic/prntdlgg.cpp:627
 msgid "Print in colour"
 msgstr "彩色打印"
 
-#: ../src/common/stockitem.cpp:138
-msgid "Print previe&w"
+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "Print previe&w..."
 msgstr "打印预览(&w)"
 
-#: ../src/gtk/gnome/gprint.cpp:778
+#: ../src/gtk/gnome/gprint.cpp:940
 msgid "Print preview"
 msgstr "打印预览"
 
-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/common/docview.cpp:1241
+#, fuzzy
+msgid "Print preview creation failed."
+msgstr "管道创建失败"
+
+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "Print preview..."
+msgstr "打印预览"
+
+#: ../src/generic/prntdlgg.cpp:636
 msgid "Print spooling"
 msgstr "打印假脱机"
 
-#: ../src/html/helpfrm.cpp:679
+#: ../src/html/helpwnd.cpp:689
 msgid "Print this page"
 msgstr "打印本页"
 
-#: ../src/generic/prntdlgg.cpp:179
+#: ../src/generic/prntdlgg.cpp:191
 msgid "Print to File"
 msgstr "打印到文件"
 
-#: ../src/generic/prntdlgg.cpp:489
+#: ../src/common/stockitem.cpp:184
+msgid "Print..."
+msgstr "打印..."
+
+#: ../src/generic/prntdlgg.cpp:499
 msgid "Printer"
 msgstr "打印机"
 
-#: ../src/generic/prntdlgg.cpp:629
+#: ../src/generic/prntdlgg.cpp:639
 msgid "Printer command:"
 msgstr "打印机命令:"
 
-#: ../src/generic/prntdlgg.cpp:174
+#: ../src/generic/prntdlgg.cpp:186
 msgid "Printer options"
 msgstr "打印机选项"
 
-#: ../src/generic/prntdlgg.cpp:641
+#: ../src/generic/prntdlgg.cpp:651
 msgid "Printer options:"
 msgstr "打印机选项:"
 
-#: ../src/generic/prntdlgg.cpp:915
+#: ../src/generic/prntdlgg.cpp:922
 msgid "Printer..."
 msgstr "打印机..."
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:202
 msgid "Printer:"
 msgstr "打印机:"
 
-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../include/wx/richtext/richtextprint.h:164 ../src/common/prntbase.cpp:519
+#: ../src/html/htmprint.cpp:278
+msgid "Printing"
+msgstr "正在打印 "
+
+#: ../src/common/prntbase.cpp:587
 msgid "Printing "
 msgstr "正在打印 "
 
-#: ../src/common/prntbase.cpp:327
+#: ../src/common/prntbase.cpp:331
 msgid "Printing Error"
 msgstr "打印出错"
 
-#: ../src/generic/printps.cpp:208
+#: ../src/common/prntbase.cpp:545
+#, fuzzy, c-format
+msgid "Printing page %d of %d"
+msgstr "正在打印页 %d..."
+
+#: ../src/generic/printps.cpp:202
 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 
-#: ../src/generic/printps.cpp:168
+#: ../src/generic/printps.cpp:162
 msgid "Printing..."
 msgstr "打印..."
 
-#: ../src/common/debugrpt.cpp:524
+#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:264
+#: ../src/common/docview.cpp:2057
+msgid "Printout"
+msgstr "打印"
+
+#: ../src/common/debugrpt.cpp:556
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
+
+#: ../src/osx/carbon/dataview.cpp:2473
+msgid "Progress renderer cannot render value type; value type: "
+msgstr ""
+
+#: ../src/common/prntbase.cpp:529
+msgid "Progress:"
 msgstr ""
-"处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
-#: ../src/common/log.cpp:466
-msgid "Program aborted."
-msgstr "程序终止."
+#: ../src/common/stockitem.cpp:185
+msgid "Properties"
+msgstr "属性"
 
-#: ../src/common/paper.cpp:126
+#: ../src/propgrid/manager.cpp:238
+msgid "Property"
+msgstr "属性"
+
+#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277
+msgid "Property Error"
+msgstr "属性错误"
+
+#: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
-#: ../src/generic/logg.cpp:1166
+#: ../src/generic/logg.cpp:1040
 msgid "Question"
 msgstr "问题"
 
-#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
+#: ../src/common/stockitem.cpp:157
+msgid "Quit"
+msgstr "退出"
+
+#: ../src/osx/menu_osx.cpp:564
+#, c-format
+msgid "Quit %s"
+msgstr "退出 %s"
+
+#: ../src/common/stockitem.cpp:264
+msgid "Quit this program"
+msgstr "推出此程序"
+
+#: ../src/common/accelcmn.cpp:54
+msgid "RETURN"
+msgstr "RETURN"
+
+#: ../src/common/accelcmn.cpp:58
+msgid "RIGHT"
+msgstr "RIGHT"
+
+#: ../src/common/accelcmn.cpp:328
+#, fuzzy
+msgid "RawCtrl+"
+msgstr "Ctrl+"
+
+#: ../src/common/ffile.cpp:114 ../src/common/ffile.cpp:133
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 
-#: ../src/common/prntbase.cpp:242
+#: ../src/common/prntbase.cpp:258
 msgid "Ready"
 msgstr "就绪"
 
-#: ../src/xrc/xmlres.cpp:582
-#, c-format
-msgid "Referenced object node with ref=\"%s\" not found!"
-msgstr "ref=\"%s\"的引用对象节点不存在!"
+#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17
+msgid "Redo"
+msgstr "恢复"
 
-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:265
+msgid "Redo last action"
+msgstr "恢复上一次操作"
+
+#: ../src/common/stockitem.cpp:187
 msgid "Refresh"
 msgstr "刷新"
 
-#: ../src/msw/registry.cpp:552
+#: ../src/msw/registry.cpp:626
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:595
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "注册键 '%s' 不存在, 不能改名."
+msgstr "注册键 '%s' 不存在，无法改名。"
 
-#: ../src/msw/registry.cpp:653
+#: ../src/msw/registry.cpp:727
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -3111,308 +5688,630 @@ msgstr ""
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
-#: ../src/msw/registry.cpp:448
+#: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
-#: ../src/generic/helpext.cpp:442
+#: ../src/richtext/richtextfontpage.cpp:323
+#: ../src/richtext/richtextfontpage.cpp:327
+msgid "Regular"
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:481
+#, fuzzy
+msgid "Relative"
+msgstr "修饰"
+
+#: ../src/generic/helpext.cpp:463
 msgid "Relevant entries:"
 msgstr "相关条目:"
 
-#: ../src/generic/progdlgg.cpp:210
-msgid "Remaining time : "
-msgstr "剩余时间 : "
-
-#: ../src/common/stockitem.cpp:143
+#: ../src/common/stockitem.cpp:188
 msgid "Remove"
 msgstr "移除"
 
-#: ../src/html/helpfrm.cpp:445
+#: ../src/richtext/richtextctrl.cpp:1420
+#, fuzzy
+msgid "Remove Bullet"
+msgstr "移除"
+
+#: ../src/html/helpwnd.cpp:441
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
-#: ../src/common/rendcmn.cpp:193
+#: ../src/common/rendcmn.cpp:195
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
-#: ../src/common/stockitem.cpp:117
+#: ../src/osx/carbon/dataview.cpp:1431
+#, fuzzy
+msgid "Rendering failed."
+msgstr "计时器创建失败"
+
+#: ../src/richtext/richtextbuffer.cpp:4109
+msgid "Renumber List"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:189
 msgid "Rep&lace"
 msgstr "替换(&l)"
 
-#: ../src/generic/fdrepdlg.cpp:188
+#: ../src/richtext/richtextctrl.cpp:3242 ../src/common/stockitem.cpp:189
+msgid "Replace"
+msgstr "替换"
+
+#: ../src/generic/fdrepdlg.cpp:183
 msgid "Replace &all"
 msgstr "全部替换(&a)"
 
-#: ../src/generic/fdrepdlg.cpp:130
+#: ../src/common/stockitem.cpp:262
+#, fuzzy
+msgid "Replace selection"
+msgstr "全部替换(&a)"
+
+#: ../src/generic/fdrepdlg.cpp:125
 msgid "Replace with:"
 msgstr "替换为:"
 
-#: ../src/xrc/xmlres.cpp:418
-msgid "Resource files must have same version number!"
-msgstr "资源文件必须有相同的版本号!"
+#: ../src/common/valtext.cpp:162
+msgid "Required information entry is empty."
+msgstr ""
+
+#: ../src/common/translation.cpp:1804
+#, fuzzy, c-format
+msgid "Resource '%s' is not a valid message catalog."
+msgstr "'%s' 不是有效的消息目录."
 
-#: ../src/common/stockitem.cpp:144
+#: ../src/common/stockitem.cpp:190
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
-#: ../src/generic/prntdlgg.cpp:891
+#: ../src/richtext/richtextborderspage.cpp:548
+#, fuzzy
+msgid "Ridge"
+msgstr "细"
+
+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextbulletspage.cpp:202
+#: ../src/richtext/richtextsizepage.cpp:228
+msgid "Right"
+msgstr "右"
+
+#: ../src/generic/prntdlgg.cpp:898
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/richtext/richtextindentspage.cpp:161
+#: ../src/richtext/richtextindentspage.cpp:163
+#: ../src/richtext/richtextliststylepage.cpp:338
+#: ../src/richtext/richtextliststylepage.cpp:340
+msgid "Right-align text."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:323
 msgid "Roman"
 msgstr "罗马"
 
-#: ../src/common/sizer.cpp:1841
+#: ../src/richtext/richtextliststylepage.cpp:300
+#: ../src/richtext/richtextbulletspage.cpp:253
+msgid "S&tandard bullet name:"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:83
+msgid "SCROLL_LOCK"
+msgstr "SCROLL_LOCK"
+
+#: ../src/common/accelcmn.cpp:72
+msgid "SELECT"
+msgstr "SELECT"
+
+#: ../src/common/accelcmn.cpp:78
+msgid "SEPARATOR"
+msgstr "SEPARATOR"
+
+#: ../src/common/accelcmn.cpp:75
+msgid "SNAPSHOT"
+msgstr "SNAPSHOT"
+
+#: ../src/common/accelcmn.cpp:63
+msgid "SPACE"
+msgstr "SPACE"
+
+#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:340
+msgid "SPECIAL"
+msgstr "SPECIAL"
+
+#: ../src/common/accelcmn.cpp:79
+msgid "SUBTRACT"
+msgstr "SUBTRACT"
+
+#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2655
 msgid "Save"
 msgstr "保存"
 
-#: ../src/common/fldlgcmn.cpp:259
+#: ../src/common/fldlgcmn.cpp:328
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
-#: ../src/common/stockitem.cpp:146
+#: ../src/generic/logg.cpp:516
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
-#: ../src/common/docview.cpp:305
+#: ../src/common/docview.cpp:363
+msgid "Save As"
+msgstr "另存为"
+
+#: ../src/common/stockitem.cpp:192
 msgid "Save as"
 msgstr "另存为"
 
-#: ../src/generic/logg.cpp:508
+#: ../src/common/stockitem.cpp:268
+#, fuzzy
+msgid "Save current document"
+msgstr "选择文档视图"
+
+#: ../src/common/stockitem.cpp:269
+msgid "Save current document with a different filename"
+msgstr ""
+
+#: ../src/generic/logg.cpp:516
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:326
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:549
+#: ../src/html/helpwnd.cpp:564
 msgid "Search"
 msgstr "搜索"
 
-#: ../src/html/helpfrm.cpp:538
+#: ../src/html/helpwnd.cpp:551
+#, fuzzy
 msgid ""
-"Search contents of help book(s) for all occurences of the text you typed "
+"Search contents of help book(s) for all occurrences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
-#: ../src/generic/fdrepdlg.cpp:166
+#: ../src/generic/fdrepdlg.cpp:161
 msgid "Search direction"
-msgstr "搜索目录"
+msgstr "搜索方向"
 
-#: ../src/generic/fdrepdlg.cpp:118
+#: ../src/generic/fdrepdlg.cpp:113
 msgid "Search for:"
 msgstr "搜索:"
 
-#: ../src/html/helpfrm.cpp:1060
+#: ../src/html/helpwnd.cpp:1066
 msgid "Search in all books"
-msgstr "在索引书中搜索"
+msgstr "搜索所有的书籍"
 
-#: ../src/html/helpfrm.cpp:868
+#: ../src/html/helpwnd.cpp:871
 msgid "Searching..."
-msgstr "搜索..."
+msgstr "搜索中..."
 
-#: ../src/generic/dirctrlg.cpp:584
+#: ../src/generic/dirctrlg.cpp:538
 msgid "Sections"
 msgstr "段"
 
-#: ../src/common/ffile.cpp:222
+#: ../src/common/ffile.cpp:219
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "文件 '%s'定位错误"
+msgstr "文件 '%s' 定位错误"
 
-#: ../src/common/ffile.cpp:212
+#: ../src/common/ffile.cpp:209
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
-msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
+msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"
 
-#: ../src/msw/textctrl.cpp:2069
+#: ../src/richtext/richtextctrl.cpp:329 ../src/osx/textctrl_osx.cpp:588
+#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227
 msgid "Select &All"
-msgstr "选择所有(&A)"
+msgstr "全部选择(&A)"
 
-#: ../src/common/docview.cpp:1712
+#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22
+msgid "Select All"
+msgstr "全部选择"
+
+#: ../src/common/docview.cpp:1868
 msgid "Select a document template"
 msgstr "选择文档模板"
 
-#: ../src/common/docview.cpp:1789
+#: ../src/common/docview.cpp:1942
 msgid "Select a document view"
 msgstr "选择文档视图"
 
-#: ../src/common/docview.cpp:1592
-msgid "Select a file"
-msgstr "选择文件"
+#: ../src/richtext/richtextfontpage.cpp:233
+#: ../src/richtext/richtextfontpage.cpp:235
+msgid "Select regular or bold."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:220
+#: ../src/richtext/richtextfontpage.cpp:222
+msgid "Select regular or italic style."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:246
+#: ../src/richtext/richtextfontpage.cpp:248
+msgid "Select underlining or no underlining."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:218
+msgid "Selection"
+msgstr "选区"
 
-#: ../src/common/cmdline.cpp:739
+#: ../src/richtext/richtextliststylepage.cpp:188
+#: ../src/richtext/richtextliststylepage.cpp:190
+msgid "Selects the list level to edit."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:911
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "期望在选项 '%s'后存在分隔符."
+msgstr "期望在选项 '%s' 后存在分隔符。"
+
+#: ../src/richtext/richtextbuffer.cpp:9797
+#, fuzzy
+msgid "Set Cell Style"
+msgstr "删除项"
 
-#: ../include/wx/xti.h:841
+#: ../include/wx/xtiprop.h:180
 msgid "SetProperty called w/o valid setter"
-msgstr "调用SetProperty时未带有效的setter"
+msgstr "调用 SetProperty 时未带有效的 setter"
+
+#: ../src/common/filename.cpp:2524
+msgid "Setting directory access times is not supported under this OS version"
+msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:182
+#: ../src/generic/prntdlgg.cpp:194
 msgid "Setup..."
 msgstr "设置..."
 
-#: ../src/msw/dialup.cpp:530
+#: ../src/msw/dialup.cpp:564
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
-#: ../src/html/helpfrm.cpp:493
+#: ../src/common/accelcmn.cpp:325
+msgid "Shift+"
+msgstr "Shift+"
+
+#: ../src/generic/dirdlgg.cpp:171
+#, fuzzy
+msgid "Show &hidden directories"
+msgstr "显示隐藏目录"
+
+#: ../src/generic/filectrlg.cpp:997
+#, fuzzy
+msgid "Show &hidden files"
+msgstr "显示隐藏文件"
+
+#: ../src/osx/menu_osx.cpp:559
+msgid "Show All"
+msgstr "显示全部"
+
+#: ../src/common/stockitem.cpp:258
+msgid "Show about dialog"
+msgstr "显示关于对话框"
+
+#: ../src/html/helpwnd.cpp:503
 msgid "Show all"
-msgstr "显示所有"
+msgstr "显示全部"
 
-#: ../src/html/helpfrm.cpp:504
+#: ../src/html/helpwnd.cpp:514
 msgid "Show all items in index"
-msgstr "把所有项目显示为索引"
+msgstr "以索引方式显示所有项目"
 
-#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
+#: ../src/generic/dirdlgg.cpp:106
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
-#: ../src/generic/filedlgg.cpp:1064
-msgid "Show hidden files"
-msgstr "显示隐藏文件"
-
-#: ../src/html/helpfrm.cpp:646
+#: ../src/html/helpwnd.cpp:672
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/richtext/richtextsymboldlg.cpp:422
+#: ../src/richtext/richtextsymboldlg.cpp:424
+msgid "Shows a Unicode subset."
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:473
+#: ../src/richtext/richtextliststylepage.cpp:475
+#: ../src/richtext/richtextbulletspage.cpp:277
+#: ../src/richtext/richtextbulletspage.cpp:279
+msgid "Shows a preview of the bullet settings."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:313
+#: ../src/richtext/richtextfontpage.cpp:315
+msgid "Shows a preview of the font settings."
+msgstr ""
+
+#: ../src/osx/carbon/fontdlg.cpp:578 ../src/osx/carbon/fontdlg.cpp:580
+msgid "Shows a preview of the font."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:328
+#: ../src/richtext/richtextindentspage.cpp:330
+msgid "Shows a preview of the paragraph settings."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:461 ../src/generic/fontdlgg.cpp:463
 msgid "Shows the font preview."
-msgstr "显示字体预览."
+msgstr "显示字体预览。"
+
+#: ../src/univ/themes/mono.cpp:517
+msgid "Simple monochrome theme"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:300
+#: ../src/richtext/richtextliststylepage.cpp:450
+msgid "Single"
+msgstr ""
 
-#: ../src/generic/filedlgg.cpp:439
+#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:275
 msgid "Size"
 msgstr "大小"
 
-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-#: ../src/generic/progdlgg.cpp:598
+#: ../src/osx/carbon/fontdlg.cpp:523
+msgid "Size:"
+msgstr "大小:"
+
+#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
+#: ../src/msw/progdlg.cpp:802
 msgid "Skip"
 msgstr "跳过"
 
-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:331
 msgid "Slant"
 msgstr "倾斜"
 
-#: ../src/common/docview.cpp:581
-msgid "Sorry, could not open this file for saving."
-msgstr "对不起, 不能打开文件供保存."
+#: ../src/richtext/richtextborderspage.cpp:543
+#, fuzzy
+msgid "Solid"
+msgstr "粗体"
 
-#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
-#: ../src/common/docview.cpp:1611
+#: ../src/common/docview.cpp:1764
 msgid "Sorry, could not open this file."
-msgstr "对不起, 不能打开文件."
+msgstr "对不起，无法打开文件。"
 
-#: ../src/common/docview.cpp:588
-msgid "Sorry, could not save this file."
-msgstr "对不起, 不能保存文件."
-
-#: ../src/common/prntbase.cpp:1199
+#: ../src/common/prntbase.cpp:2028 ../src/common/prntbase.cpp:2036
 msgid "Sorry, not enough memory to create a preview."
-msgstr "对不起, 没有足够内存创建预览."
+msgstr "对不起，没有足够内存创建预览。"
 
-#: ../src/common/docview.cpp:1041
-msgid "Sorry, print preview needs a printer to be installed."
-msgstr "对不起, 需要先安装打印机才能创建打印预览."
+#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:664
+#: ../src/richtext/richtextstyledlg.cpp:830
+#: ../src/richtext/richtextstyledlg.cpp:906
+#: ../src/richtext/richtextstyledlg.cpp:944
+msgid "Sorry, that name is taken. Please choose another."
+msgstr "抱歉，名字已被使用。请选择其他名字。"
 
-#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631
+#: ../src/common/docview.cpp:1787
 msgid "Sorry, the format for this file is unknown."
-msgstr "对不起, 此文件的格式未知."
+msgstr "对不起，此文件的格式未知。"
 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
-msgstr "声音数据为不支持的格式."
+msgstr "声音数据为不支持的格式。"
 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr "声音文件 '%s'为不支持的格式."
+msgstr "声音文件 '%s' 为不支持的格式。"
 
-#: ../src/common/paper.cpp:118
+#: ../src/richtext/richtextliststylepage.cpp:468
+#, fuzzy
+msgid "Spacing"
+msgstr "搜索中..."
+
+#: ../src/common/stockitem.cpp:198
+msgid "Spell Check"
+msgstr "拼写检查"
+
+#: ../src/richtext/richtextliststylepage.cpp:491
+#: ../src/richtext/richtextbulletspage.cpp:296
+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 英寸"
+msgstr "报表用纸，5 1/2 x 8 1/2 英寸"
+
+#: ../src/richtext/richtextsizepage.cpp:480
+#: ../src/richtext/richtextsizepage.cpp:484
+#: ../src/richtext/richtextsizepage.cpp:485
+#, fuzzy
+msgid "Static"
+msgstr "状态:"
 
-#: ../src/generic/prntdlgg.cpp:198
+#: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"
 
-#: ../src/generic/logg.cpp:625
-msgid "Status: "
-msgstr "状态: "
+#: ../src/common/stockitem.cpp:199
+msgid "Stop"
+msgstr "停止"
 
-#: ../src/common/xtistrm.cpp:253
-#, fuzzy
-msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "不支持针对尚未形成流的对象的流委派"
+#: ../src/common/stockitem.cpp:200
+msgid "Strikethrough"
+msgstr "删除线"
 
-#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#: ../src/common/colourcmn.cpp:46
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
-msgid "String conversions not supported"
-msgstr "不支持字符串装换"
+#: ../src/richtext/richtextformatdlg.cpp:317 ../src/propgrid/advprops.cpp:648
+msgid "Style"
+msgstr "样式"
 
-#: ../src/xrc/xmlres.cpp:689
-#, c-format
-msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
+#: ../include/wx/richtext/richtextstyledlg.h:48
+msgid "Style Organiser"
+msgstr ""
+
+#: ../src/osx/carbon/fontdlg.cpp:532
+msgid "Style:"
+msgstr "样式:"
+
+#: ../src/richtext/richtextfontpage.cpp:303
+msgid "Subscrip&t"
+msgstr "下标(&T)"
+
+#: ../src/richtext/richtextfontpage.cpp:296
+msgid "Supe&rscript"
+msgstr "上标(&R)"
 
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/common/paper.cpp:152
+msgid "SuperA/SuperA/A4 227 x 356 mm"
+msgstr "SuperA/SuperA/A4 纸张，227 x 356 毫米"
+
+#: ../src/common/paper.cpp:153
+msgid "SuperB/SuperB/A3 305 x 487 mm"
+msgstr "SuperB/SuperB/A3 纸张，305 x 487 毫米"
+
+#: ../src/generic/fontdlgg.cpp:327
 msgid "Swiss"
 msgstr "瑞士"
 
-#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
-#: ../src/common/imagtiff.cpp:383
+#: ../src/richtext/richtextliststylepage.cpp:489
+#: ../src/richtext/richtextbulletspage.cpp:294
+msgid "Symbol"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:289
+#: ../src/richtext/richtextbulletspage.cpp:241
+#, fuzzy
+msgid "Symbol &font:"
+msgstr "正常字体:"
+
+#: ../src/common/accelcmn.cpp:64
+msgid "TAB"
+msgstr "TAB"
+
+#: ../src/common/imagtiff.cpp:373 ../src/common/imagtiff.cpp:386
+#: ../src/common/imagtiff.cpp:745
 msgid "TIFF: Couldn't allocate memory."
-msgstr "TIFF: 不能分配内存."
+msgstr "TIFF: 无法分配内存。"
 
-#: ../src/common/imagtiff.cpp:203
+#: ../src/common/imagtiff.cpp:305
 msgid "TIFF: Error loading image."
-msgstr "TIFF: 装载图像错误."
+msgstr "TIFF: 装载图像错误。"
 
-#: ../src/common/imagtiff.cpp:254
+#: ../src/common/imagtiff.cpp:472
 msgid "TIFF: Error reading image."
-msgstr "TIFF: 读图像错误."
+msgstr "TIFF: 读图像错误。"
 
-#: ../src/common/imagtiff.cpp:331
+#: ../src/common/imagtiff.cpp:612
 msgid "TIFF: Error saving image."
-msgstr "TIFF: 保存图像错误."
+msgstr "TIFF: 保存图像错误。"
 
-#: ../src/common/imagtiff.cpp:434
+#: ../src/common/imagtiff.cpp:850
 msgid "TIFF: Error writing image."
-msgstr "TIFF: 写图像错误."
+msgstr "TIFF: 写图像错误。"
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/imagtiff.cpp:359
+msgid "TIFF: Image size is abnormally big."
+msgstr "TIFF: 图像大小过大。"
+
+#: ../src/richtext/richtextbuffer.cpp:9938
+#, fuzzy
+msgid "Table Properties"
+msgstr "属性(&P)"
+
+#: ../src/common/paper.cpp:147
+msgid "Tabloid Extra 11.69 x 18 in"
+msgstr "小报(特大)，11.69 x 18 英寸"
+
+#: ../src/common/paper.cpp:104
 msgid "Tabloid, 11 x 17 in"
-msgstr "小报, 11 x 17 英寸"
+msgstr "小报，11 x 17 英寸"
+
+#: ../src/richtext/richtextformatdlg.cpp:335
+msgid "Tabs"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/fontdlgg.cpp:328
 msgid "Teletype"
 msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1713
+#: ../src/common/docview.cpp:1869
 msgid "Templates"
 msgstr "模板"
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/osx/carbon/dataview.cpp:2374
+msgid "Text renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:159
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:708
+#: ../src/common/ftp.cpp:621
 msgid "The FTP server doesn't support passive mode."
-msgstr "FTP服务器不支持passive模式."
+msgstr "FTP服务器不支持 passive 模式。"
 
-#: ../src/common/ftp.cpp:696
+#: ../src/common/ftp.cpp:607
 msgid "The FTP server doesn't support the PORT command."
-msgstr "FTP服务器不支持PORT命令."
+msgstr "FTP服务器不支持 PORT 命令。"
+
+#: ../src/richtext/richtextliststylepage.cpp:216
+#: ../src/richtext/richtextliststylepage.cpp:218
+#: ../src/richtext/richtextbulletspage.cpp:165
+#: ../src/richtext/richtextbulletspage.cpp:167
+msgid "The available bullet styles."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:210
+#: ../src/richtext/richtextstyledlg.cpp:212
+#, fuzzy
+msgid "The available styles."
+msgstr "字体风格."
+
+#: ../src/richtext/richtextbackgroundpage.cpp:139
+#: ../src/richtext/richtextbackgroundpage.cpp:141
+#, fuzzy
+msgid "The background colour."
+msgstr "字体颜色."
+
+#: ../src/richtext/richtextmarginspage.cpp:268
+#: ../src/richtext/richtextmarginspage.cpp:270
+#, fuzzy
+msgid "The bottom margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:384
+#, fuzzy
+msgid "The bottom padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextsizepage.cpp:577
+#: ../src/richtext/richtextsizepage.cpp:579
+#: ../src/richtext/richtextsizepage.cpp:587
+#: ../src/richtext/richtextsizepage.cpp:589
+#, fuzzy
+msgid "The bottom position."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextliststylepage.cpp:255
+#: ../src/richtext/richtextliststylepage.cpp:257
+#: ../src/richtext/richtextliststylepage.cpp:276
+#: ../src/richtext/richtextliststylepage.cpp:278
+#: ../src/richtext/richtextbulletspage.cpp:205
+#: ../src/richtext/richtextbulletspage.cpp:207
+#: ../src/richtext/richtextbulletspage.cpp:228
+#: ../src/richtext/richtextbulletspage.cpp:230
+msgid "The bullet character."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:444
+#: ../src/richtext/richtextsymboldlg.cpp:446
+msgid "The character code."
+msgstr ""
 
 #: ../src/common/fontmap.cpp:204
 #, c-format
@@ -3421,658 +6320,1353 @@ msgid ""
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
-"未知字符集'%s'. 选择其它字符集\n"
-"代替它; 如果不能\n"
-"被替代则选择[取消] "
+"未知字符集 '%s'。选择其它字符集\n"
+"代替它，如果无法替代请选择 [取消] "
 
-#: ../src/msw/ole/dataobj.cpp:164
+#: ../src/msw/ole/dataobj.cpp:177
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "剪贴板格式 '%d' 不存在."
+msgstr "剪贴板格式 '%d' 不存在。"
 
-#: ../src/generic/dirdlgg.cpp:226
+#: ../src/richtext/richtextstylepage.cpp:129
+#: ../src/richtext/richtextstylepage.cpp:131
+msgid "The default style for the next paragraph."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:232
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"目录 '%s'不存在\n"
-"现在创建?"
+"目录 '%s' 不存在\n"
+"是否现在创建?"
+
+#: ../src/html/htmprint.cpp:272
+#, c-format
+msgid ""
+"The document \"%s\" doesn't fit on the page horizontally and will be "
+"truncated if printed.\n"
+"\n"
+"Would you like to proceed with printing it nevertheless?"
+msgstr ""
+
+#: ../src/common/docview.cpp:1181
+#, c-format
+msgid ""
+"The file '%s' doesn't exist and couldn't be opened.\n"
+"It has been removed from the most recently used files list."
+msgstr ""
+"文件 '%s' 不存在所以无法打开。\n"
+"已从最近使用的文件列表中移去。"
+
+#: ../src/richtext/richtextindentspage.cpp:221
+#: ../src/richtext/richtextindentspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:395
+#: ../src/richtext/richtextliststylepage.cpp:397
+#, fuzzy
+msgid "The first line indent."
+msgstr "字体大小(磅值)."
+
+#: ../src/gtk/utilsgtk.cpp:478
+msgid "The following standard GTK+ options are also supported:\n"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417
+msgid "The font colour."
+msgstr "字体颜色。"
+
+#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378
+msgid "The font family."
+msgstr "字体。"
+
+#: ../src/richtext/richtextsymboldlg.cpp:406
+#: ../src/richtext/richtextsymboldlg.cpp:408
+msgid "The font from which to take the symbol."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:428 ../src/generic/fontdlgg.cpp:430
+#: ../src/generic/fontdlgg.cpp:435 ../src/generic/fontdlgg.cpp:437
+msgid "The font point size."
+msgstr "字体大小 (磅值)。"
+
+#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529
+#, fuzzy
+msgid "The font size in points."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextfontpage.cpp:188
+#: ../src/richtext/richtextfontpage.cpp:190
+#, fuzzy
+msgid "The font size units, points or pixels."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389
+msgid "The font style."
+msgstr "字体风格。"
+
+#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400
+msgid "The font weight."
+msgstr "字体粗细。"
+
+#: ../src/common/docview.cpp:1449
+#, c-format
+msgid "The format of file '%s' couldn't be determined."
+msgstr "无法确定文件 '%s' 格式。"
+
+#: ../src/richtext/richtextindentspage.cpp:212
+#: ../src/richtext/richtextindentspage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:386
+#: ../src/richtext/richtextliststylepage.cpp:388
+#, fuzzy
+msgid "The left indent."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextmarginspage.cpp:195
+#: ../src/richtext/richtextmarginspage.cpp:197
+#, fuzzy
+msgid "The left margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:309
+#: ../src/richtext/richtextmarginspage.cpp:311
+#, fuzzy
+msgid "The left padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextsizepage.cpp:493
+#: ../src/richtext/richtextsizepage.cpp:495
+#: ../src/richtext/richtextsizepage.cpp:503
+#: ../src/richtext/richtextsizepage.cpp:505
+#, fuzzy
+msgid "The left position."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextindentspage.cpp:313
+#: ../src/richtext/richtextindentspage.cpp:315
+#: ../src/richtext/richtextliststylepage.cpp:463
+#: ../src/richtext/richtextliststylepage.cpp:465
+msgid "The line spacing."
+msgstr ""
 
-#: ../src/common/docview.cpp:1962
-#, c-format
-msgid ""
-"The file '%s' couldn't be opened.\n"
-"It has been removed from the most recently used files list."
+#: ../src/richtext/richtextbulletspage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:271
+msgid "The list item number."
 msgstr ""
-"文件 '%s' 不能打开.\n"
-"已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/common/docview.cpp:1972
-#, c-format
-msgid ""
-"The file '%s' doesn't exist and couldn't be opened.\n"
-"It has been removed from the most recently used files list."
+#: ../src/msw/ole/automtn.cpp:648
+msgid "The locale ID is unknown."
 msgstr ""
-"文件 '%s' 不存在,不能被打开.\n"
-"已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
-msgid "The font colour."
-msgstr "字体颜色."
+#: ../src/richtext/richtextsizepage.cpp:328
+#: ../src/richtext/richtextsizepage.cpp:330
+msgid "The object height."
+msgstr "对象高度。"
 
-#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
-msgid "The font family."
-msgstr "字体."
+#: ../src/richtext/richtextsizepage.cpp:436
+#: ../src/richtext/richtextsizepage.cpp:438
+msgid "The object maximum height."
+msgstr "对象最大高度。"
 
-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
-msgid "The font point size."
-msgstr "字体大小(磅值)."
+#: ../src/richtext/richtextsizepage.cpp:409
+#: ../src/richtext/richtextsizepage.cpp:411
+msgid "The object maximum width."
+msgstr "对象最大宽度。"
 
-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-msgid "The font style."
-msgstr "字体风格."
+#: ../src/richtext/richtextsizepage.cpp:382
+#: ../src/richtext/richtextsizepage.cpp:384
+#, fuzzy
+msgid "The object minimum height."
+msgstr "对象最小高度。"
 
-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-msgid "The font weight."
-msgstr "字体粗细."
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:357
+msgid "The object minimum width."
+msgstr "对象最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:303
+msgid "The object width."
+msgstr "对象宽度。"
+
+#: ../src/richtext/richtextindentspage.cpp:252
+#: ../src/richtext/richtextindentspage.cpp:254
+#, fuzzy
+msgid "The outline level."
+msgstr "显示字体预览."
 
-#: ../src/common/filename.cpp:966
+#: ../src/common/log.cpp:284
 #, c-format
-msgid "The path '%s' contains too many \"..\"!"
-msgstr "路径 '%s' 包含了过多的\"..\"!"
+msgid "The previous message repeated %lu time."
+msgid_plural "The previous message repeated %lu times."
+msgstr[0] ""
+
+#: ../src/common/log.cpp:277
+msgid "The previous message repeated once."
+msgstr ""
+
+#: ../src/gtk/print.cpp:933 ../src/gtk/print.cpp:1116
+msgid "The print dialog returned an error."
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:463
+#: ../src/richtext/richtextsymboldlg.cpp:465
+msgid "The range to show."
+msgstr "显示的范围。"
 
-#: ../src/generic/dbgrptg.cpp:289
+#: ../src/generic/dbgrptg.cpp:319
 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
-"报告包含了以下文件. 如果这些文件含有"
-"私人信息, \n"
-"请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
+"报告包含了以下文件。如果这些文件含有私人信息，\n"
+"请去掉选中相应的文件，未选中的文件就会从报告中删除。\n"
 
-#: ../src/common/cmdline.cpp:883
+#: ../src/common/cmdline.cpp:1076
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "必须的参数 '%s' 没有指定."
+msgstr "必须的参数 '%s' 没有指定。"
+
+#: ../src/richtext/richtextindentspage.cpp:230
+#: ../src/richtext/richtextindentspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:404
+#: ../src/richtext/richtextliststylepage.cpp:406
+msgid "The right indent."
+msgstr "右侧缩进。"
+
+#: ../src/richtext/richtextmarginspage.cpp:220
+#: ../src/richtext/richtextmarginspage.cpp:222
+msgid "The right margin size."
+msgstr "右边距大小。"
+
+#: ../src/richtext/richtextmarginspage.cpp:334
+#: ../src/richtext/richtextmarginspage.cpp:336
+#, fuzzy
+msgid "The right padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextsizepage.cpp:549
+#: ../src/richtext/richtextsizepage.cpp:551
+#: ../src/richtext/richtextsizepage.cpp:559
+#: ../src/richtext/richtextsizepage.cpp:561
+#, fuzzy
+msgid "The right position."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextindentspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:440
+#: ../src/richtext/richtextliststylepage.cpp:442
+msgid "The spacing after the paragraph."
+msgstr "段落之后的间距。"
+
+#: ../src/richtext/richtextindentspage.cpp:282
+#: ../src/richtext/richtextindentspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:431
+#: ../src/richtext/richtextliststylepage.cpp:433
+msgid "The spacing before the paragraph."
+msgstr "段落之前的间距。"
+
+#: ../src/richtext/richtextstylepage.cpp:109
+#: ../src/richtext/richtextstylepage.cpp:111
+#, fuzzy
+msgid "The style name."
+msgstr "字体风格."
+
+#: ../src/richtext/richtextstylepage.cpp:119
+#: ../src/richtext/richtextstylepage.cpp:121
+msgid "The style on which this style is based."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:222
+#: ../src/richtext/richtextstyledlg.cpp:224
+msgid "The style preview."
+msgstr "样式预览。"
+
+#: ../src/msw/ole/automtn.cpp:664
+msgid "The system cannot find the file specified."
+msgstr "系统无法找到指定的文件。"
+
+#: ../src/richtext/richtexttabspage.cpp:119
+#: ../src/richtext/richtexttabspage.cpp:121
+#, fuzzy
+msgid "The tab position."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtexttabspage.cpp:125
+#, fuzzy
+msgid "The tab positions."
+msgstr "字体大小(磅值)."
 
-#: ../src/common/textcmn.cpp:246
+#: ../src/richtext/richtextctrl.cpp:2681
 msgid "The text couldn't be saved."
-msgstr "文本不能被保存."
+msgstr "文本无法保存。"
+
+#: ../src/richtext/richtextmarginspage.cpp:243
+#: ../src/richtext/richtextmarginspage.cpp:245
+msgid "The top margin size."
+msgstr "上边距大小。"
+
+#: ../src/richtext/richtextmarginspage.cpp:357
+#: ../src/richtext/richtextmarginspage.cpp:359
+#, fuzzy
+msgid "The top padding size."
+msgstr "字体大小(磅值)."
 
-#: ../src/common/cmdline.cpp:862
+#: ../src/richtext/richtextsizepage.cpp:521
+#: ../src/richtext/richtextsizepage.cpp:523
+#: ../src/richtext/richtextsizepage.cpp:531
+#: ../src/richtext/richtextsizepage.cpp:533
+#, fuzzy
+msgid "The top position."
+msgstr "字体大小(磅值)."
+
+#: ../src/common/cmdline.cpp:1054
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "选项 '%s'的值必须被指定."
+msgstr "选项 '%s' 的值必须被指定。"
 
-#: ../src/msw/dialup.cpp:418
+#: ../src/msw/dialup.cpp:453
 #, 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)."
+"The version of remote access service (RAS) installed on this machine is too "
+"old, please upgrade (the following required function is missing: %s)."
+msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (缺少下列必要的函数: %s)."
+
+#: ../src/gtk/print.cpp:961
+msgid "The wxGtkPrinterDC cannot be used."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1341
+msgid "There is no column or renderer for the specified column index."
+msgstr ""
 
-#: ../src/html/htmprint.cpp:601
+#: ../src/richtext/richtextprint.cpp:611 ../src/html/htmprint.cpp:736
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
-msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
+
+#: ../src/html/htmprint.cpp:256
+msgid ""
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."
+msgstr ""
+
+#: ../src/common/image.cpp:2609
+#, c-format
+msgid "This is not a %s."
+msgstr "这不是 %s。"
+
+#: ../src/common/wincmn.cpp:1633
+msgid "This platform does not support background transparency."
+msgstr ""
+
+#: ../src/gtk/window.cpp:4239
+msgid ""
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."
+msgstr ""
 
-#: ../src/msw/datectrl.cpp:109
+#: ../src/msw/datecontrols.cpp:60
+#, fuzzy
 msgid ""
-"This system doesn't support date picker control, please upgrade your version "
-"of comctl32.dll"
+"This system doesn't support date controls, please upgrade your version of "
+"comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
-#: ../src/msw/thread.cpp:1204
+#: ../src/msw/thread.cpp:1290
 msgid ""
-"Thread module initialization failed: can not store value in thread local "
+"Thread module initialization failed: cannot store value in thread local "
 "storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 
-#: ../src/unix/threadpsx.cpp:1603
+#: ../src/unix/threadpsx.cpp:1719
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
-#: ../src/msw/thread.cpp:1192
+#: ../src/msw/thread.cpp:1278
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 
-#: ../src/unix/threadpsx.cpp:1108
+#: ../src/unix/threadpsx.cpp:1221
 msgid "Thread priority setting is ignored."
-msgstr "线程优先级设置被忽略."
+msgstr "线程优先级设置被忽略。"
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:165
 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 
-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:166
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
-#: ../src/common/ftp.cpp:635
+#: ../src/common/ftp.cpp:203
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
-msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
+msgstr "等待FTP服务器连接时超时，请尝试用 passive 模式。"
 
-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/os2/timer.cpp:100
 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:221
 msgid "Tip of the Day"
 msgstr "每日技巧"
 
-#: ../src/generic/tipdlg.cpp:157
+#: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"
-msgstr "对不起, 没有所需技巧!"
+msgstr "对不起，没有所需的提示！"
 
-#: ../src/generic/prntdlgg.cpp:237
+#: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 
-#: ../src/common/imagpng.cpp:292
+#: ../src/osx/carbon/dataview.cpp:2452
+msgid "Toggle renderer cannot render value; value type: "
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:7499
+msgid "Too many EndStyle calls!"
+msgstr ""
+
+#: ../src/common/imagpng.cpp:287
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
+msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 
-#: ../src/generic/prntdlgg.cpp:880
+#: ../src/richtext/richtextsizepage.cpp:262
+#: ../src/richtext/richtextsizepage.cpp:265
+#: ../src/richtext/richtextsizepage.cpp:266 ../src/common/stockitem.cpp:201
+msgid "Top"
+msgstr "顶端"
+
+#: ../src/generic/prntdlgg.cpp:887
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
-#: ../src/common/fs_mem.cpp:205
+#: ../src/generic/aboutdlgg.cpp:80
+msgid "Translations by "
+msgstr "翻译由"
+
+#: ../src/generic/aboutdlgg.cpp:189
+msgid "Translators"
+msgstr "翻译者"
+
+#: ../src/propgrid/propgrid.cpp:174
+msgid "True"
+msgstr "True"
+
+#: ../src/common/fs_mem.cpp:228
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
+msgstr "试图从内存 VFS 中移去文件 '%s'，但它并没有被装入内存！"
 
-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
-msgid "Trying to solve a NULL hostname: giving up"
-msgstr "试图解决 NULL 主机名: 放弃"
-
-#: ../src/common/fmapbase.cpp:111
+#: ../src/common/fmapbase.cpp:157
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:440
+#: ../src/generic/filectrlg.cpp:455
 msgid "Type"
 msgstr "类型"
 
-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-#: ../src/common/xtixml.cpp:498
+#: ../src/richtext/richtextfontpage.cpp:158
+#: ../src/richtext/richtextfontpage.cpp:160
+msgid "Type a font name."
+msgstr "输入字体名称。"
+
+#: ../src/richtext/richtextfontpage.cpp:173
+#: ../src/richtext/richtextfontpage.cpp:175
+msgid "Type a size in points."
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:660
+#, c-format
+msgid "Type mismatch in argument %u."
+msgstr "参数 %u 的类型不匹配。"
+
+#: ../src/common/xtixml.cpp:357 ../src/common/xtixml.cpp:510
+#: ../src/common/xtistrm.cpp:323
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
-#: ../src/common/paper.cpp:147
+#: ../src/propgrid/propgridiface.cpp:383
+#, c-format
+msgid ""
+"Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
+"\"%s\"."
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:59
+msgid "UP"
+msgstr "UP"
+
+#: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US 标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿，14 7/8 x 11 英寸"
+
+#: ../src/common/fmapbase.cpp:197
+msgid "US-ASCII"
+msgstr "US-ASCII"
+
+#: ../src/unix/fswatcher_inotify.cpp:110
+msgid "Unable to add inotify watch"
+msgstr "无法添加 inotify watch"
+
+#: ../src/unix/fswatcher_kqueue.cpp:137
+msgid "Unable to add kqueue watch"
+msgstr "无法添加 kqueue watch"
+
+#: ../include/wx/msw/private/fswatcher.h:143
+msgid "Unable to associate handle with I/O completion port"
+msgstr ""
+
+#: ../include/wx/msw/private/fswatcher.h:126
+#, fuzzy
+msgid "Unable to close I/O completion port handle"
+msgstr "关闭文件句柄失败."
+
+#: ../src/unix/fswatcher_inotify.cpp:98
+msgid "Unable to close inotify instance"
+msgstr "无法关闭 inotify 实例"
 
-#: ../src/html/htmlwin.cpp:403
+#: ../include/wx/unix/private/fswatcher_kqueue.h:75
+#, c-format
+msgid "Unable to close path '%s'"
+msgstr "无法关闭路径 '%s'"
+
+#: ../include/wx/msw/private/fswatcher.h:49
+#, c-format
+msgid "Unable to close the handle for '%s'"
+msgstr "无法关闭 '%s' 的句柄。"
+
+#: ../include/wx/msw/private/fswatcher.h:241
+#, fuzzy
+msgid "Unable to create I/O completion port"
+msgstr "创建游标失败."
+
+#: ../src/msw/fswatcher.cpp:85
+#, fuzzy
+msgid "Unable to create IOCP worker thread"
+msgstr "创建 MDI 父框架失败."
+
+#: ../src/unix/fswatcher_inotify.cpp:75
+msgid "Unable to create inotify instance"
+msgstr "无法创建 inotify 实例"
+
+#: ../src/unix/fswatcher_kqueue.cpp:98
+msgid "Unable to create kqueue instance"
+msgstr "无法创建 kqueue 实例"
+
+#: ../include/wx/msw/private/fswatcher.h:230
+msgid "Unable to dequeue completion packet"
+msgstr ""
+
+#: ../src/unix/fswatcher_kqueue.cpp:187
+msgid "Unable to get events from kqueue"
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:1904
+msgid "Unable to handle native drag&drop data"
+msgstr ""
+
+#: ../src/gtk/app.cpp:442
+msgid "Unable to initialize GTK+, is DISPLAY set properly?"
+msgstr "无法初始化 GTK+，DISPLAY 是否已正确设置？"
+
+#: ../src/gtk/app.cpp:275
+msgid "Unable to initialize Hildon program"
+msgstr "无法初始化 Hildon 程序"
+
+#: ../include/wx/unix/private/fswatcher_kqueue.h:58
+#, c-format
+msgid "Unable to open path '%s'"
+msgstr "无法打开路径 '%s'"
+
+#: ../src/html/htmlwin.cpp:557
 #, c-format
 msgid "Unable to open requested HTML document: %s"
-msgstr "不能打开HTML文档: %s"
+msgstr "无法打开 HTML 文档: %s"
 
-#: ../src/unix/sound.cpp:376
+#: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."
-msgstr "不能异步地播放声音."
+msgstr "无法异步地播放声音。"
 
-#: ../src/common/stockitem.cpp:148
+#: ../include/wx/msw/private/fswatcher.h:208
+msgid "Unable to post completion status"
+msgstr ""
+
+#: ../src/unix/fswatcher_inotify.cpp:353
+msgid "Unable to read from inotify descriptor"
+msgstr "无法读取 inotify 描述符"
+
+#: ../src/unix/fswatcher_inotify.cpp:133
+msgid "Unable to remove inotify watch"
+msgstr "无法删除 inotify watch"
+
+#: ../src/unix/fswatcher_kqueue.cpp:155
+msgid "Unable to remove kqueue watch"
+msgstr "无法删除 kqueue watch"
+
+#: ../src/msw/fswatcher.cpp:169
+#, c-format
+msgid "Unable to set up watch for '%s'"
+msgstr "无法为 '%s' 设定 watch"
+
+#: ../src/msw/fswatcher.cpp:92
+msgid "Unable to start IOCP worker thread"
+msgstr "无法开始 IOCP 工作线程"
+
+#: ../src/common/stockitem.cpp:202
 msgid "Undelete"
 msgstr "取消删除"
 
-#: ../contrib/src/deprecated/resource.cpp:1848
-#: ../contrib/src/deprecated/resource.cpp:1862
-#: ../contrib/src/deprecated/resource.cpp:1879
-#: ../contrib/src/deprecated/resource.cpp:1893
-#: ../contrib/src/deprecated/resource.cpp:1978
-#: ../contrib/src/deprecated/resource.cpp:1992
-#: ../contrib/src/deprecated/resource.cpp:2008
-#: ../contrib/src/deprecated/resource.cpp:2022
-#: ../contrib/src/deprecated/resource.cpp:3070
-#: ../contrib/src/deprecated/resource.cpp:3084
-#: ../contrib/src/deprecated/resource.cpp:3101
-#: ../contrib/src/deprecated/resource.cpp:3115
-#, fuzzy
-msgid "Unexpected end of file while parsing resource."
-msgstr "在解析资源时意外到达文件结尾."
+#: ../src/common/stockitem.cpp:203
+msgid "Underline"
+msgstr "下划线"
+
+#: ../src/richtext/richtextfontpage.cpp:332 ../src/osx/carbon/fontdlg.cpp:554
+#: ../src/propgrid/advprops.cpp:656
+msgid "Underlined"
+msgstr "下划线"
+
+#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16
+msgid "Undo"
+msgstr "撤销"
 
-#: ../src/common/cmdline.cpp:826
+#: ../src/common/stockitem.cpp:266
+msgid "Undo last action"
+msgstr "撤销上一次操作"
+
+#: ../src/common/cmdline.cpp:857
+#, c-format
+msgid "Unexpected characters following option '%s'."
+msgstr "选项 '%s' 后有意外字符。"
+
+#: ../src/common/cmdline.cpp:1017
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
-#: ../src/common/fmapbase.cpp:135
+#: ../include/wx/msw/private/fswatcher.h:149
+msgid "Unexpectedly new I/O completion port was created"
+msgstr ""
+
+#: ../src/msw/fswatcher.cpp:71
+#, fuzzy
+msgid "Ungraceful worker thread termination"
+msgstr "不能等候线程终止"
+
+#: ../src/richtext/richtextsymboldlg.cpp:460
+#: ../src/richtext/richtextsymboldlg.cpp:461
+#: ../src/richtext/richtextsymboldlg.cpp:462
+msgid "Unicode"
+msgstr "Unicode 编码"
+
+#: ../src/common/fmapbase.cpp:186 ../src/common/fmapbase.cpp:192
 msgid "Unicode 16 bit (UTF-16)"
-msgstr "16位的Unicode编码 (UTF-16)"
+msgstr "16位的 Unicode 编码 (UTF-16)"
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:191
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
-msgstr "16位大字节序Unicode编码 (UTF-16BE)"
+msgstr "16位大字节序 Unicode 编码 (UTF-16BE)"
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:187
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
-msgstr "16位小字节序Unicode编码 (UTF-16LE)"
+msgstr "16位小字节序 Unicode 编码 (UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:188 ../src/common/fmapbase.cpp:194
 msgid "Unicode 32 bit (UTF-32)"
-msgstr "32位的Unicode编码 (UTF-32)"
+msgstr "32位的 Unicode 编码 (UTF-32)"
 
-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:193
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
-msgstr "32位大字节序Unicode编码 (UTF-32BE)"
+msgstr "32位大字节序 Unicode 编码 (UTF-32BE)"
 
-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:189
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
-msgstr "32位小字节序Unicode编码 (UTF-32LE)"
+msgstr "32位小字节序 Unicode 编码 (UTF-32LE)"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:183
 msgid "Unicode 7 bit (UTF-7)"
-msgstr "7位的Unicode编码 (UTF-7)"
+msgstr "7位的 Unicode 编码 (UTF-7)"
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:184
 msgid "Unicode 8 bit (UTF-8)"
-msgstr "8位的Unicode编码 (UTF-8)"
+msgstr "8位的 Unicode 编码 (UTF-8)"
+
+#: ../src/common/stockitem.cpp:205
+msgid "Unindent"
+msgstr "取消缩进"
+
+#: ../src/richtext/richtextborderspage.cpp:373
+#: ../src/richtext/richtextborderspage.cpp:375
+msgid "Units for the bottom border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:278
+#: ../src/richtext/richtextmarginspage.cpp:280
+msgid "Units for the bottom margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:517
+#: ../src/richtext/richtextborderspage.cpp:519
+msgid "Units for the bottom outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:392
+#: ../src/richtext/richtextmarginspage.cpp:394
+msgid "Units for the bottom padding."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:598
+#: ../src/richtext/richtextsizepage.cpp:600
+#, fuzzy
+msgid "Units for the bottom position."
+msgstr "上边距单位"
+
+#: ../src/richtext/richtextborderspage.cpp:283
+#: ../src/richtext/richtextborderspage.cpp:285
+msgid "Units for the left border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:205
+#: ../src/richtext/richtextmarginspage.cpp:207
+msgid "Units for the left margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:427
+#: ../src/richtext/richtextborderspage.cpp:429
+msgid "Units for the left outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:319
+#: ../src/richtext/richtextmarginspage.cpp:321
+msgid "Units for the left padding."
+msgstr ""
 
-#: ../src/msw/dde.cpp:1092
+#: ../src/richtext/richtextsizepage.cpp:514
+#: ../src/richtext/richtextsizepage.cpp:516
+#, fuzzy
+msgid "Units for the left position."
+msgstr "上边距单位"
+
+#: ../src/richtext/richtextsizepage.cpp:447
+#: ../src/richtext/richtextsizepage.cpp:449
+msgid "Units for the maximum object height."
+msgstr "最大对象高度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:420
+#: ../src/richtext/richtextsizepage.cpp:422
+msgid "Units for the maximum object width."
+msgstr "最大对象宽度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:393
+#: ../src/richtext/richtextsizepage.cpp:395
+msgid "Units for the minimum object height."
+msgstr "最小对象高度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:366
+#: ../src/richtext/richtextsizepage.cpp:368
+msgid "Units for the minimum object width."
+msgstr "最小对象宽度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:339
+#: ../src/richtext/richtextsizepage.cpp:341
+msgid "Units for the object height."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:312
+#: ../src/richtext/richtextsizepage.cpp:314
+msgid "Units for the object width."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:313
+#: ../src/richtext/richtextborderspage.cpp:315
+msgid "Units for the right border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:230
+#: ../src/richtext/richtextmarginspage.cpp:232
+msgid "Units for the right margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:457
+#: ../src/richtext/richtextborderspage.cpp:459
+msgid "Units for the right outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:344
+#: ../src/richtext/richtextmarginspage.cpp:346
+msgid "Units for the right padding."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:570
+#: ../src/richtext/richtextsizepage.cpp:572
+#, fuzzy
+msgid "Units for the right position."
+msgstr "上边距单位"
+
+#: ../src/richtext/richtextborderspage.cpp:343
+#: ../src/richtext/richtextborderspage.cpp:345
+msgid "Units for the top border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:253
+#: ../src/richtext/richtextmarginspage.cpp:255
+msgid "Units for the top margin."
+msgstr "上边距单位"
+
+#: ../src/richtext/richtextborderspage.cpp:487
+#: ../src/richtext/richtextborderspage.cpp:489
+msgid "Units for the top outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:367
+#: ../src/richtext/richtextmarginspage.cpp:369
+msgid "Units for the top padding."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:542
+#: ../src/richtext/richtextsizepage.cpp:544
+#, fuzzy
+msgid "Units for the top position."
+msgstr "上边距单位"
+
+#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656
+msgid "Unknown"
+msgstr "未知"
+
+#: ../src/msw/dde.cpp:1178
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 
-#: ../src/common/xtistrm.cpp:370
+#: ../src/common/xtistrm.cpp:415
 msgid "Unknown Object passed to GetObjectClassInfo"
-msgstr "未知的对象被传递给GetObjectClassInfo"
+msgstr "未知的对象传递给 GetObjectClassInfo"
+
+#: ../src/common/imagpng.cpp:615
+#, c-format
+msgid "Unknown PNG resolution unit %d"
+msgstr "未知 PNG 解析度单位 %d"
+
+#: ../src/common/xtixml.cpp:328
+#, c-format
+msgid "Unknown Property %s"
+msgstr "未知属性 %s"
+
+#: ../src/common/imagtiff.cpp:533
+#, c-format
+msgid "Unknown TIFF resolution unit %d ignored"
+msgstr ""
 
-#: ../src/unix/dlunix.cpp:275
+#: ../src/osx/carbon/dataview.cpp:1979
+msgid "Unknown data format"
+msgstr "未知数据格式"
+
+#: ../src/unix/dlunix.cpp:335
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
-#: ../src/common/fmapbase.cpp:688
+#: ../src/common/fmapbase.cpp:811
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
-#: ../src/unix/mimetype.cpp:2344
+#: ../src/msw/ole/automtn.cpp:672
 #, c-format
-msgid "Unknown field in file %s, line %d: '%s'."
-msgstr "在文件 %s, 行 %d是未知字段: '%s'."
+msgid "Unknown error %08x"
+msgstr "未知错误 %08x"
 
-#: ../src/common/cmdline.cpp:599
-#, fuzzy, c-format
+#: ../src/msw/ole/automtn.cpp:631
+msgid "Unknown exception"
+msgstr "未知异常"
+
+#: ../src/common/image.cpp:2594
+msgid "Unknown image data format."
+msgstr "未知图像数据格式"
+
+#: ../src/common/cmdline.cpp:742
+#, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/msw/ole/automtn.cpp:615
+msgid "Unknown name or named argument."
+msgstr "未知名称或者命名参数"
+
+#: ../src/common/cmdline.cpp:757 ../src/common/cmdline.cpp:779
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
-#: ../src/xrc/xmlres.cpp:762
-msgid "Unknown style flag "
-msgstr "未知的风格标志 "
-
-#: ../src/common/xtixml.cpp:324
-#, fuzzy, c-format
-msgid "Unkown Property %s"
-msgstr "未知属性 %s"
-
-#: ../src/common/mimecmn.cpp:161
+#: ../src/common/mimecmn.cpp:231
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "类型 %s中有不配套的'{'."
+msgstr "类型 %s 中有不配套的 '{'。"
 
-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-#: ../src/common/cmdproc.cpp:307
+#: ../src/common/cmdproc.cpp:263 ../src/common/cmdproc.cpp:289
+#: ../src/common/cmdproc.cpp:309
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
-#: ../contrib/src/deprecated/resource.cpp:2367
-#, fuzzy, c-format
-msgid "Unrecognized style %s while parsing resource."
-msgstr "解析资源时遇到无法识别的风格 %s."
+#: ../src/propgrid/propgrid.cpp:399
+msgid "Unspecified"
+msgstr "未指定"
 
-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/msw/clipbrd.cpp:272 ../src/msw/clipbrd.cpp:440
 msgid "Unsupported clipboard format."
-msgstr "不支持的剪贴板格式."
+msgstr "不支持的剪贴板格式。"
 
-#: ../src/common/appcmn.cpp:232
+#: ../src/common/appcmn.cpp:229
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "不支持的主题(theme) '%s'."
+msgstr "不支持的主题 '%s'。"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206
 msgid "Up"
 msgstr "向上"
 
-#: ../src/common/cmdline.cpp:953
+#: ../src/richtext/richtextliststylepage.cpp:484
+#: ../src/richtext/richtextbulletspage.cpp:289
+msgid "Upper case letters"
+msgstr "大写字母"
+
+#: ../src/richtext/richtextliststylepage.cpp:486
+#: ../src/richtext/richtextbulletspage.cpp:291
+msgid "Upper case roman numerals"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1148
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
-#: ../src/common/valtext.cpp:181
+#: ../src/richtext/richtextindentspage.cpp:182
+#: ../src/richtext/richtextindentspage.cpp:184
+#: ../src/richtext/richtextliststylepage.cpp:359
+#: ../src/richtext/richtextliststylepage.cpp:361
+msgid "Use the current alignment setting."
+msgstr ""
+
+#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724
+msgid "Valid pointer to native data view control does not exist"
+msgstr ""
+
+#: ../src/common/valtext.cpp:175
 msgid "Validation conflict"
 msgstr "验证冲突"
 
-#: ../contrib/src/mmedia/vidbase.cpp:65
-msgid "Video Output"
-msgstr "视频输出"
+#: ../src/propgrid/manager.cpp:239
+msgid "Value"
+msgstr "值"
+
+#: ../src/propgrid/props.cpp:385
+#, c-format
+msgid "Value must be %s or higher."
+msgstr "数值必须大于或等于 %s。"
+
+#: ../src/propgrid/props.cpp:412
+#, c-format
+msgid "Value must be %s or less."
+msgstr "数值必须小于或等于 %s。"
+
+#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416
+#, c-format
+msgid "Value must be between %s and %s."
+msgstr "数值必须在 %s 和 %s 之间。"
+
+#: ../src/generic/aboutdlgg.cpp:129
+msgid "Version "
+msgstr "版本"
+
+#: ../src/richtext/richtextsizepage.cpp:267
+#: ../src/richtext/richtextsizepage.cpp:269
+msgid "Vertical alignment."
+msgstr "垂直对齐。"
 
-#: ../src/generic/filedlgg.cpp:980
+#: ../src/generic/filedlgg.cpp:216
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
-#: ../src/generic/filedlgg.cpp:973
+#: ../src/generic/filedlgg.cpp:214
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1790
+#: ../src/common/docview.cpp:1943
 msgid "Views"
 msgstr "视图"
 
-#: ../src/unix/baseunix.cpp:78
-msgid "Waiting for subprocess termination failed"
-msgstr "等待子过程终止失败"
+#: ../src/common/accelcmn.cpp:109
+msgid "WINDOWS_LEFT"
+msgstr "WINDOWS_LEFT"
 
-#: ../src/common/docview.cpp:461
-msgid "Warning"
-msgstr "警告"
+#: ../src/common/accelcmn.cpp:111
+msgid "WINDOWS_MENU"
+msgstr "WINDOWS_MENU"
 
-#: ../src/common/log.cpp:480
+#: ../src/common/accelcmn.cpp:110
+msgid "WINDOWS_RIGHT"
+msgstr "WINDOWS_RIGHT"
+
+#: ../src/unix/epolldispatcher.cpp:214
+#, c-format
+msgid "Waiting for IO on epoll descriptor %d failed"
+msgstr "等待 epoll 描述符 %d 的 IO 时失败"
+
+#: ../src/common/log.cpp:230
 msgid "Warning: "
 msgstr "警告: "
 
-#: ../src/html/htmlpars.cpp:395
-msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "警告: 试图从空栈中移去HTML标签处理器."
+#: ../src/propgrid/advprops.cpp:652
+msgid "Weight"
+msgstr "字体粗细"
 
-#: ../src/common/fmapbase.cpp:103
+#: ../src/common/fmapbase.cpp:149
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: ../src/common/fmapbase.cpp:117
+#: ../src/common/fmapbase.cpp:163
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "西欧(带欧元符号) (ISO-8859-15)"
+msgstr "西欧带欧元符号 (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:447 ../src/generic/fontdlgg.cpp:449
 msgid "Whether the font is underlined."
-msgstr "字体是否为下划线."
+msgstr "字体是否为下划线。"
 
-#: ../src/generic/fdrepdlg.cpp:150
+#: ../src/generic/fdrepdlg.cpp:145
 msgid "Whole word"
 msgstr "整字"
 
-#: ../src/html/helpfrm.cpp:535
+#: ../src/html/helpwnd.cpp:548
 msgid "Whole words only"
 msgstr "仅为整字"
 
-#: ../src/univ/themes/win32.cpp:1235
+#: ../src/univ/themes/win32.cpp:1103
 msgid "Win32 theme"
-msgstr "Win32主题(theme)"
+msgstr "Win32 主题"
 
-#: ../src/msw/utils.cpp:1096
+#: ../src/msw/utils.cpp:1220
 msgid "Win32s on Windows 3.1"
-msgstr "Windows 3.1上的Win32s"
+msgstr "Windows 3.1 上的 Win32s"
 
-#: ../src/msw/utils.cpp:1145
-#, c-format
-msgid "Windows 2000 (build %lu"
-msgstr "Windows 2000 (build %lu"
+#: ../src/msw/utils.cpp:1270
+msgid "Windows 2000"
+msgstr "Windows 2000"
 
-#: ../src/msw/utils.cpp:1110
+#: ../src/msw/utils.cpp:1302
+msgid "Windows 7"
+msgstr "Windows 7"
+
+#: ../src/msw/utils.cpp:1234
 msgid "Windows 95"
 msgstr "Windows 95"
 
-#: ../src/msw/utils.cpp:1106
+#: ../src/msw/utils.cpp:1230
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
-#: ../src/msw/utils.cpp:1121
+#: ../src/msw/utils.cpp:1245
 msgid "Windows 98"
 msgstr "Windows 98"
 
-#: ../src/msw/utils.cpp:1117
+#: ../src/msw/utils.cpp:1241
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
-#: ../src/msw/utils.cpp:1128
+#: ../src/msw/utils.cpp:1252
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:178
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:179
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:124
+#: ../src/msw/utils.cpp:1214
+#, c-format
+msgid "Windows CE (%d.%d)"
+msgstr "Windows CE (%d.%d)"
+
+#: ../src/common/fmapbase.cpp:172
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
-#: ../src/common/fmapbase.cpp:121
-msgid "Windows Chinese Simplified (CP 936)"
-msgstr "Windows 简体中文 (CP 936)"
+#: ../src/common/fmapbase.cpp:169
+msgid "Windows Chinese Simplified (CP 936) or GB-2312"
+msgstr "Windows 简体中文 (CP 936) 或 GB-2312"
 
-#: ../src/common/fmapbase.cpp:123
-msgid "Windows Chinese Traditional (CP 950)"
-msgstr "Windows 繁体中文 (CP 950)"
+#: ../src/common/fmapbase.cpp:171
+msgid "Windows Chinese Traditional (CP 950) or Big-5"
+msgstr "Windows 繁体中文 (CP 950) 或 Big-5"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:173
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:175
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:177
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:120
-msgid "Windows Japanese (CP 932)"
-msgstr "Windows 日语 (CP 932)"
+#: ../src/common/fmapbase.cpp:168
+msgid "Windows Japanese (CP 932) or Shift-JIS"
+msgstr "Windows 日语 (CP 932) 或 Shift-JIS"
+
+#: ../src/common/fmapbase.cpp:181
+#, fuzzy
+msgid "Windows Johab (CP 1361)"
+msgstr "Windows 阿拉伯语 (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:170
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
-#: ../src/msw/utils.cpp:1125
+#: ../src/msw/utils.cpp:1249
 msgid "Windows ME"
 msgstr "Windows ME"
 
-#: ../src/msw/utils.cpp:1160
+#: ../src/msw/utils.cpp:1310
 #, c-format
-msgid "Windows NT %lu.%lu (build %lu"
-msgstr "Windows NT %lu.%lu (build %lu"
+msgid "Windows NT %lu.%lu"
+msgstr "Windows NT %lu.%lu"
 
-#: ../src/msw/utils.cpp:1153
-#, c-format
-msgid "Windows Server 2003 (build %lu"
-msgstr "Windows Server 2003 (build %lu"
+#: ../src/msw/utils.cpp:1279
+msgid "Windows Server 2003"
+msgstr "Windows Server 2003"
+
+#: ../src/msw/utils.cpp:1295
+msgid "Windows Server 2008"
+msgstr "Windows Server 2008"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/msw/utils.cpp:1301
+msgid "Windows Server 2008 R2"
+msgstr "Windows Server 2008 R2"
+
+#: ../src/common/fmapbase.cpp:167
+msgid "Windows Thai (CP 874)"
+msgstr "Windows 泰国语 (CP 874)"
+
+#: ../src/common/fmapbase.cpp:176
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:126
+#: ../src/common/fmapbase.cpp:180
+#, fuzzy
+msgid "Windows Vietnamese (CP 1258)"
+msgstr "Windows 希腊语 (CP 1253)"
+
+#: ../src/msw/utils.cpp:1296
+msgid "Windows Vista"
+msgstr "Windows Vista"
+
+#: ../src/common/fmapbase.cpp:174
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
-#: ../src/msw/utils.cpp:1149
-#, c-format
-msgid "Windows XP (build %lu"
-msgstr "Windows XP (build %lu"
+#: ../src/msw/utils.cpp:1285
+msgid "Windows XP"
+msgstr "Windows XP"
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:182
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
-#: ../src/common/ffile.cpp:158
+#: ../src/common/fmapbase.cpp:166
+msgid "Windows/DOS OEM Cyrillic (CP 866)"
+msgstr "Windows/DOS OEM 西里尔语 (CP 866)"
+
+#: ../src/common/ffile.cpp:147
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "写文件 '%s'错误"
+msgstr "写文件 '%s' 错误"
 
-#: ../src/xml/xml.cpp:562
+#: ../src/xml/xml.cpp:837
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 
-#: ../src/common/xpmdecod.cpp:774
+#: ../src/common/xpmdecod.cpp:797
 msgid "XPM: Malformed pixel data!"
-msgstr "XPM: 错误的象素数据!"
+msgstr "XPM: 错误的象素数据！"
 
-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
+#: ../src/common/xpmdecod.cpp:706
 #, c-format
-msgid "XPM: malformed colour definition '%s'!"
-msgstr "XPM: 错误的颜色定义 '%s'!"
+msgid "XPM: incorrect colour description in line %d"
+msgstr "XPM: 在第 %d 行有错误的颜色描述"
 
-#: ../src/xrc/xmlres.cpp:518
-#, c-format
-msgid "XRC resource '%s' (class '%s') not found!"
-msgstr "没有找到XRC资源 '%s' （类 '%s')!"
+#: ../src/common/xpmdecod.cpp:681
+msgid "XPM: incorrect header format!"
+msgstr "XPM: 不正确的头格式！"
 
-#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031
+#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726
 #, c-format
-msgid "XRC resource: Cannot create bitmap from '%s'."
-msgstr "XRC资源: 不能从 '%s'创建位图."
+msgid "XPM: malformed colour definition '%s' at line %d!"
+msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d！"
+
+#: ../src/common/xpmdecod.cpp:756
+msgid "XPM: no colors left to use for mask!"
+msgstr ""
 
-#: ../src/xrc/xmlres.cpp:975
+#: ../src/common/xpmdecod.cpp:783
 #, c-format
-msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
-msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
+msgid "XPM: truncated image data at line %d!"
+msgstr ""
 
-#: ../src/mac/carbon/msgdlg.cpp:61 ../src/mac/carbon/msgdlg.cpp:144
-#: ../src/mac/classic/msgdlg.cpp:59 ../src/mac/classic/msgdlg.cpp:141
-#: ../src/motif/msgdlg.cpp:187
+#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194
 msgid "Yes"
 msgstr "是"
 
-#: ../src/generic/dirdlgg.cpp:308
+#: ../src/osx/carbon/overlay.cpp:156
+msgid "You cannot Clear an overlay that is not inited"
+msgstr "你无法清除未初始化的 overlay。"
+
+#: ../src/osx/carbon/overlay.cpp:108 ../src/dfb/overlay.cpp:62
+msgid "You cannot Init an overlay twice"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:317
 msgid "You cannot add a new directory to this section."
-msgstr "你不能向该项中加入新的目录."
+msgstr "你无法向该项中加入新的目录。"
 
-#: ../src/common/stockitem.cpp:155
+#: ../src/propgrid/propgrid.cpp:3259
+msgid "You have entered invalid value. Press ESC to cancel editing."
+msgstr "你输入了无效值。按 ESC 取消编辑。"
+
+#: ../src/common/stockitem.cpp:210
 msgid "Zoom &In"
 msgstr "放大(&I)"
 
-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:211
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
-#: ../src/common/stockitem.cpp:154
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1565
+msgid "Zoom In"
+msgstr "放大"
+
+#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1551
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: ../src/common/stockitem.cpp:209
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 
-#: ../src/common/docview.cpp:2146
-msgid "[EMPTY]"
-msgstr "[空]"
+#: ../src/common/stockitem.cpp:209
+msgid "Zoom to Fit"
+msgstr "缩放以适应窗口"
 
-#: ../src/msw/dde.cpp:1059
+#: ../src/msw/dde.cpp:1145
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "DDEML应用程序已创建延时race条件."
+msgstr "DDEML 应用程序已创建延时 race 条件."
 
-#: ../src/msw/dde.cpp:1047
+#: ../src/msw/dde.cpp:1133
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"没有调用DdeInitialize初始化函数就调用DDEML其它函数,\n"
+"没有调用 DdeInitialize 初始化函数就调用DDEML其它函数，\n"
 "或传给DDEML函数的是\n"
-"无效的实例标识."
+"无效的实例标识。"
 
-#: ../src/msw/dde.cpp:1065
+#: ../src/msw/dde.cpp:1151
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "客户试图建立的会话已失败."
+msgstr "客户试图建立的会话已失败。"
 
-#: ../src/msw/dde.cpp:1062
+#: ../src/msw/dde.cpp:1148
 msgid "a memory allocation failed."
-msgstr "内存分配失败."
+msgstr "内存分配失败。"
 
-#: ../src/msw/dde.cpp:1056
+#: ../src/msw/dde.cpp:1142
 msgid "a parameter failed to be validated by the DDEML."
-msgstr "DDEML参数验证失败."
+msgstr "DDEML 参数验证失败。"
 
-#: ../src/msw/dde.cpp:1038
+#: ../src/msw/dde.cpp:1124
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "同步advise事务请求已超时."
+msgstr "同步 advise 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1044
+#: ../src/msw/dde.cpp:1130
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "同步data事务请求已超时."
+msgstr "同步 data 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1053
+#: ../src/msw/dde.cpp:1139
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "同步execute事务请求已超时."
+msgstr "同步 execute 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1071
+#: ../src/msw/dde.cpp:1157
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "同步poke事务请求已超时."
+msgstr "同步 poke 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1086
+#: ../src/msw/dde.cpp:1172
 msgid "a request to end an advise transaction has timed out."
-msgstr "终止advise事务的请求已超时."
+msgstr "终止 advise 事务的请求超时。"
 
-#: ../src/msw/dde.cpp:1080
+#: ../src/msw/dde.cpp:1166
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
 "服务器端事务试图处理\n"
-"已被客户端终止的会话, 或服务器\n"
-"在完成事务前终止."
+"已被客户端终止的会话，或服务器\n"
+"在完成事务前终止。"
 
-#: ../src/msw/dde.cpp:1068
+#: ../src/msw/dde.cpp:1154
 msgid "a transaction failed."
-msgstr "事务失败."
+msgstr "事务失败。"
 
-#: ../src/common/menucmn.cpp:114
+#: ../src/common/accelcmn.cpp:185
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1136
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""
-"初始化为APPCLASS_MONITOR的应用程序\n"
-"试图执行DDE事务,\n"
-"或初始化为APPCMD_CLIENTONLY的应用程序\n"
-"视图执行服务器事务."
+"初始化为 APPCLASS_MONITOR 的应用程序\n"
+"试图执行 DDE 事务，\n"
+"或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
+"视图执行服务器事务。"
 
-#: ../src/msw/dde.cpp:1074
+#: ../src/msw/dde.cpp:1160
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "内部调用PostMessage失败. "
+msgstr "内部调用 PostMessage 失败。"
 
-#: ../src/msw/dde.cpp:1083
+#: ../src/msw/dde.cpp:1169
 msgid "an internal error has occurred in the DDEML."
-msgstr "在DDEML中发生内部错误."
+msgstr "在 DDEML 中发生内部错误。"
 
-#: ../src/msw/dde.cpp:1089
+#: ../src/msw/dde.cpp:1175
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
-"传给DDEML函数的是无效的事务标识符.\n"
-"一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
-"回调函数事务标识符就不再有效."
+"传给 DDEML 函数的是无效的事务标识符。\n"
+"一旦应用程序从 XTYP_XACT_COMPLETE 回调函数返回，\n"
+"回调函数事务标识符就不再有效。"
 
-#: ../src/common/zipstrm.cpp:1331
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1273
 msgid "assuming this is a multi-part zip concatenated"
-msgstr "假定这是å\88\86段ç\9a\84zipæ\96\87件"
+msgstr "假定这是ä¸\80个å\88\86段 zip æ\96\87件ç\9a\84å\90\88并"
 
-#: ../src/common/fileconf.cpp:1819
+#: ../src/common/fileconf.cpp:1883
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
-msgstr "忽略对只读键 '%s'的修改."
+msgstr "忽略对只读键 '%s' 的修改。"
 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"
@@ -4082,167 +7676,200 @@ msgstr "库函数参数错误"
 msgid "bad signature"
 msgstr "错误的签名"
 
-#: ../src/common/zipstrm.cpp:1581
+#: ../src/common/zipstrm.cpp:1716
 msgid "bad zipfile offset to entry"
-msgstr "zip文件中到条目的偏移值错误"
+msgstr "zip 文件中到条目的偏移值错误"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/ftp.cpp:406
 msgid "binary"
 msgstr "二进制"
 
-#: ../src/common/fontcmn.cpp:645
+#: ../src/common/fontcmn.cpp:979
 msgid "bold"
 msgstr "粗体"
 
-#: ../src/common/fontcmn.cpp:569
-msgid "bold "
-msgstr "粗体 "
+#: ../src/os2/iniconf.cpp:464
+msgid "buffer is too small for Windows directory."
+msgstr "Windows 目录的缓存太小。"
+
+#: ../src/msw/utils.cpp:1316
+#, c-format
+msgid "build %lu"
+msgstr "build %lu"
 
-#: ../src/common/ffile.cpp:91
+#: ../src/common/ffile.cpp:80
 #, c-format
 msgid "can't close file '%s'"
-msgstr "不能关闭文件 '%s'"
+msgstr "无法关闭文件 '%s'"
 
-#: ../src/common/file.cpp:286
+#: ../src/common/file.cpp:279
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "不能关闭文件描述子 %d"
+msgstr "无法关闭文件描述符 %d"
 
-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:577
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "不能把修改提交给文件 '%s'"
+msgstr "无法把修改提交给文件 '%s'"
 
-#: ../src/common/file.cpp:217
+#: ../src/common/file.cpp:213
 #, c-format
 msgid "can't create file '%s'"
-msgstr "不能创建文件 '%s'"
+msgstr "无法创建文件 '%s'"
 
-#: ../src/common/fileconf.cpp:1134
+#: ../src/common/fileconf.cpp:1177
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "不能删除用户配置文件 '%s'"
+msgstr "无法删除用户配置文件 '%s'"
 
-#: ../src/common/file.cpp:457
+#: ../src/common/file.cpp:480
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr "不能确定是否已达文件 %d 的尾部"
+msgstr "无法确定是否已达描述符 %d 的尾部"
 
-#: ../src/common/zipstrm.cpp:1358
-#, fuzzy
+#: ../src/msdos/utilsdos.cpp:311 ../src/msdos/utilsdos.cpp:476
+#, c-format
+msgid "can't execute '%s'"
+msgstr "执行 '%s'失败"
+
+#: ../src/common/zipstrm.cpp:1491
 msgid "can't find central directory in zip"
-msgstr "不能在zip文件中找到中央目录"
+msgstr "无法在 zip 文件中找到中央目录"
 
-#: ../src/common/file.cpp:427
+#: ../src/common/file.cpp:450
 #, c-format
 msgid "can't find length of file on file descriptor %d"
-msgstr "不能获得文件描述子 %d的文件的长度"
+msgstr "无法获得文件描述符 %d 的文件长度"
 
-#: ../src/msw/utils.cpp:376
+#: ../src/msw/utils.cpp:374
 msgid "can't find user's HOME, using current directory."
-msgstr "找不到用户的HOME目录, 使用当前目录."
+msgstr "找不到用户的 HOME 目录，使用当前目录。"
 
-#: ../src/common/file.cpp:341
+#: ../src/common/file.cpp:351
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "不能刷新文件描述子 %d"
+msgstr "无法刷新文件描述符 %d"
 
-#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
+#: ../src/common/file.cpp:407 ../src/msw/wince/filefnwce.cpp:199
 #, c-format
 msgid "can't get seek position on file descriptor %d"
-msgstr "不能获得文件描述子 %d的指针位置"
+msgstr "无法获得文件描述符 %d 的指针位置"
 
 #: ../src/common/fontmap.cpp:326
 msgid "can't load any font, aborting"
-msgstr "不能装载任何字体, 正在中止"
+msgstr "无法装载任何字体，正在中止"
 
-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/file.cpp:265 ../src/common/ffile.cpp:64
 #, c-format
 msgid "can't open file '%s'"
-msgstr "不能打开文件 '%s'"
+msgstr "无法打开文件 '%s'"
 
-#: ../src/common/fileconf.cpp:404
+#: ../src/common/fileconf.cpp:352
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "不能打开全局配置文件 '%s'."
+msgstr "无法打开全局配置文件 '%s'。"
 
-#: ../src/common/fileconf.cpp:419
+#: ../src/common/fileconf.cpp:368
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "不能打开用户配置文件 '%s'."
+msgstr "无法打开用户配置文件 '%s'。"
 
-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:1018
 msgid "can't open user configuration file."
-msgstr "不能打开用户配置文件."
+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(压缩)流."
+msgstr "无法重新初始化 zlib 压缩流。"
 
-#: ../src/common/zipstrm.cpp:461
+#: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
-msgstr "不能重新初始化zlib inflate(解压)流."
+msgstr "无法重新初始化 zlib 解压流。"
 
-#: ../src/common/file.cpp:310
+#: ../src/common/file.cpp:303
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "不能从文件描述子 %d中读"
+msgstr "无法读取文件描述符 %d"
 
-#: ../src/common/file.cpp:546
+#: ../src/common/file.cpp:572
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "不能删除文件 '%s'"
+msgstr "无法删除文件 '%s'"
 
-#: ../src/common/file.cpp:562
+#: ../src/common/file.cpp:589
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "不能删除临时文件 '%s'"
+msgstr "无法删除临时文件 '%s'"
 
-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:393 ../src/msw/wince/filefnwce.cpp:185
 #, c-format
 msgid "can't seek on file descriptor %d"
-msgstr "不能定位文件描述子 %d"
+msgstr "无法定位文件描述符 %d"
 
-#: ../src/common/textfile.cpp:196
+#: ../src/common/textfile.cpp:300
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "不能把文件 '%s'写到磁盘."
+msgstr "无法把缓存区 '%s' 写到磁盘。"
 
-#: ../src/common/file.cpp:326
+#: ../src/common/file.cpp:319
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "不能写到文件描述子 %d"
+msgstr "无法写文件描述符 %d"
 
-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:1032
 msgid "can't write user configuration file."
-msgstr "不能写用户配置文件."
-
-#: ../src/common/intl.cpp:1109
-#, c-format
-msgid "catalog file for domain '%s' not found."
-msgstr "找不到域 '%s'的目录文件."
+msgstr "无法写用户配置文件。"
 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
 msgstr "校验和错误"
 
+#: ../src/common/tarstrm.cpp:821
+msgid "checksum failure reading tar header block"
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:280
+#: ../src/richtext/richtextborderspage.cpp:310
+#: ../src/richtext/richtextborderspage.cpp:340
+#: ../src/richtext/richtextborderspage.cpp:370
+#: ../src/richtext/richtextborderspage.cpp:424
+#: ../src/richtext/richtextborderspage.cpp:454
+#: ../src/richtext/richtextborderspage.cpp:484
+#: ../src/richtext/richtextborderspage.cpp:514
+#: ../src/richtext/richtextmarginspage.cpp:202
+#: ../src/richtext/richtextmarginspage.cpp:227
+#: ../src/richtext/richtextmarginspage.cpp:250
+#: ../src/richtext/richtextmarginspage.cpp:275
+#: ../src/richtext/richtextmarginspage.cpp:316
+#: ../src/richtext/richtextmarginspage.cpp:341
+#: ../src/richtext/richtextmarginspage.cpp:364
+#: ../src/richtext/richtextmarginspage.cpp:389
+#: ../src/richtext/richtextsizepage.cpp:308
+#: ../src/richtext/richtextsizepage.cpp:335
+#: ../src/richtext/richtextsizepage.cpp:362
+#: ../src/richtext/richtextsizepage.cpp:389
+#: ../src/richtext/richtextsizepage.cpp:416
+#: ../src/richtext/richtextsizepage.cpp:443
+#: ../src/richtext/richtextsizepage.cpp:510
+#: ../src/richtext/richtextsizepage.cpp:538
+#: ../src/richtext/richtextsizepage.cpp:566
+#: ../src/richtext/richtextsizepage.cpp:594
+msgid "cm"
+msgstr "厘米"
+
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 
-#: ../src/common/regex.cpp:141
+#: ../src/common/regex.cpp:240
 msgid "conversion to 8-bit encoding failed"
-msgstr "不能转换为8-bit编码"
+msgstr "无法转换为 8 位编码"
 
-#: ../src/common/menucmn.cpp:112
+#: ../src/common/accelcmn.cpp:183
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1093
+#: ../src/common/cmdline.cpp:1316
 msgid "date"
 msgstr "日期"
 
@@ -4250,235 +7877,346 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
-#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730
+#: ../src/richtext/richtextstyles.cpp:768 ../src/common/fmapbase.cpp:821
 msgid "default"
 msgstr "缺省值"
 
-#: ../src/common/xtistrm.cpp:843
-msgid "delegate has no type info"
-msgstr "委派没有类型信息"
+#: ../src/common/cmdline.cpp:1312
+msgid "double"
+msgstr ""
 
-#: ../src/common/debugrpt.cpp:502
+#: ../src/common/debugrpt.cpp:534
 msgid "dump of the process state (binary)"
-msgstr "转储(dump)进程状态（二进制码）"
+msgstr "转储进程状态（二进制码）"
 
-#: ../src/common/datetime.cpp:3779
+#: ../src/common/datetimefmt.cpp:1925
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3769
+#: ../src/common/datetimefmt.cpp:1915
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetime.cpp:3772
+#: ../src/common/datetimefmt.cpp:1918
 msgid "eleventh"
 msgstr "第十一"
 
-#: ../src/common/strconv.cpp:2671
-#, c-format
-msgid "encoding %s"
-msgstr "编码 %s"
-
-#: ../src/common/fileconf.cpp:1805
+#: ../src/common/fileconf.cpp:1869
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
+msgstr "条目 '%s' 在组 '%s' 中已出现一次以上"
 
 #: ../src/html/chm.cpp:344
 msgid "error in data format"
 msgstr "文件格式错误"
 
+#: ../src/msdos/utilsdos.cpp:414
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
+
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "打开文件出错"
 
-#: ../src/common/zipstrm.cpp:1443
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1577
 msgid "error reading zip central directory"
-msgstr "读zip中央目录时出错"
+msgstr "读 zip 中央目录时出错"
 
-#: ../src/common/zipstrm.cpp:1521
+#: ../src/common/zipstrm.cpp:1668
 msgid "error reading zip local header"
-msgstr "读zip本地头时出错"
+msgstr "读 zip 本地头时出错"
 
-#: ../src/common/zipstrm.cpp:2237
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:2397
+#, c-format
 msgid "error writing zip entry '%s': bad crc or length"
-msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
-
-#: ../src/msw/dialup.cpp:844
-msgid "establish"
-msgstr "建立"
+msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"
 
-#: ../src/common/ffile.cpp:172
+#: ../src/common/ffile.cpp:169
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "刷新文件 '%s'失败"
+msgstr "刷新文件 '%s' 失败"
 
-#: ../src/common/datetime.cpp:3776
+#: ../src/common/datetimefmt.cpp:1922
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3766
+#: ../src/common/datetimefmt.cpp:1912
 msgid "fifth"
 msgstr "第五"
 
-#: ../src/common/fileconf.cpp:664
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:611
+#, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "文件 '%s', 行 %d: '%s' 组头后被忽略."
+msgstr "文件 '%s'，行 %d: 组头之后的 '%s' 被忽略。"
 
-#: ../src/common/fileconf.cpp:693
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:640
+#, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "文件 '%s', 行 %d: 期望 '='."
+msgstr "文件 '%s'，行 %d: 期待出现 '='。"
 
-#: ../src/common/fileconf.cpp:716
+#: ../src/common/fileconf.cpp:663
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
+msgstr "文件 '%s'，行 %d: 键 '%s' 第一次出现在行 %d。"
 
-#: ../src/common/fileconf.cpp:706
+#: ../src/common/fileconf.cpp:653
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
+msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"
 
-#: ../src/common/fileconf.cpp:628
+#: ../src/common/fileconf.cpp:575
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
+msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 
-#: ../src/common/datetime.cpp:3762
+#: ../src/richtext/richtextbuffer.cpp:7874
+msgid "files"
+msgstr "文件"
+
+#: ../src/common/datetimefmt.cpp:1908
 msgid "first"
 msgstr "第一"
 
-#: ../src/html/helpfrm.cpp:1262
+#: ../src/html/helpwnd.cpp:1266
 msgid "font size"
 msgstr "字体大小"
 
-#: ../src/common/datetime.cpp:3775
+#: ../src/common/datetimefmt.cpp:1921
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3765
+#: ../src/common/datetimefmt.cpp:1911
 msgid "fourth"
 msgstr "第四"
 
-#: ../src/common/appbase.cpp:361
+#: ../src/common/appbase.cpp:679
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
-#: ../src/common/xtixml.cpp:479
+#: ../src/richtext/richtextbuffer.cpp:11223
+#: ../src/richtext/richtextbuffer.cpp:11333
+msgid "image"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:797
+msgid "incomplete header block in tar"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:490
 msgid "incorrect event handler string, missing dot"
-msgstr "错误的时间句柄字符串, 缺少点号('.')"
+msgstr "错误的时间句柄字符串，缺少点号('.')"
 
-#: ../src/msw/dialup.cpp:844
-msgid "initiate"
-msgstr "初始化"
+#: ../src/common/tarstrm.cpp:1382
+msgid "incorrect size given for tar entry"
+msgstr ""
 
-#: ../src/common/file.cpp:459
-msgid "invalid eof() return value."
-msgstr "无效的eof()返回值."
+#: ../src/common/tarstrm.cpp:994
+msgid "invalid data in extended tar header"
+msgstr ""
 
-#: ../src/generic/logg.cpp:1180
+#: ../src/generic/logg.cpp:1054
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
-#: ../src/common/zipstrm.cpp:1307
+#: ../src/common/zipstrm.cpp:1446
 msgid "invalid zip file"
-msgstr "无效的zip文件"
+msgstr "无效的 zip 文件"
 
-#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
+#: ../src/common/fontcmn.cpp:984
 msgid "italic"
 msgstr "斜体"
 
-#: ../src/common/fontcmn.cpp:641
-#, fuzzy
+#: ../src/common/fontcmn.cpp:974
 msgid "light"
-msgstr "细"
-
-#: ../src/common/fontcmn.cpp:565
-#, fuzzy
-msgid "light "
-msgstr "细 "
+msgstr "细体"
 
-#: ../src/common/intl.cpp:1455
-#, fuzzy, c-format
-msgid "locale '%s' can not be set."
-msgstr "不能设置现场(locale) '%s'."
-
-#: ../src/common/intl.cpp:1102
+#: ../src/common/intl.cpp:296
 #, c-format
-msgid "looking for catalog '%s' in path '%s'."
-msgstr "æ\9f¥æ\89¾ç\9b®å½\95 '%s' å\9c¨è·¯å¾\84 '%s'ä¸\8b."
+msgid "locale '%s' cannot be set."
+msgstr "æ\97 æ³\95设置å\9c°å\8cºä¸º '%s'ã\80\82"
 
-#: ../src/common/datetime.cpp:3926
+#: ../src/common/datetimefmt.cpp:2081
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/datetime.cpp:3780
+#: ../src/common/datetimefmt.cpp:1926
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3770
+#: ../src/common/datetimefmt.cpp:1916
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:1034
+#: ../src/msw/dde.cpp:1120
 msgid "no DDE error."
-msgstr "没有DDE错误."
+msgstr "没有 DDE 错误。"
 
 #: ../src/html/chm.cpp:328
 msgid "no error"
 msgstr "没有错误"
 
-#: ../src/html/helpdata.cpp:662
+#: ../src/dfb/fontmgr.cpp:175
+#, c-format
+msgid "no fonts found in %s, using builtin font"
+msgstr ""
+
+#: ../src/html/helpdata.cpp:641
 msgid "noname"
 msgstr "未名"
 
-#: ../src/common/datetime.cpp:3925
+#: ../src/common/datetimefmt.cpp:2080
 msgid "noon"
 msgstr "中午"
 
-#: ../src/common/cmdline.cpp:1089
+#: ../src/richtext/richtextstyles.cpp:767
+msgid "normal"
+msgstr "正常"
+
+#: ../src/gtk/print.cpp:1231 ../src/gtk/print.cpp:1336
+msgid "not implemented"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1308
 msgid "num"
 msgstr "num"
 
-#: ../src/common/xtixml.cpp:258
+#: ../src/common/xtixml.cpp:260
 msgid "objects cannot have XML Text Nodes"
-msgstr "对象不能有XML 文本节点"
+msgstr "对象不能有 XML 文本节点"
 
 #: ../src/html/chm.cpp:340
 msgid "out of memory"
 msgstr "内存耗尽"
 
-#: ../src/common/debugrpt.cpp:478
+#: ../src/richtext/richtextsizepage.cpp:309
+#: ../src/richtext/richtextsizepage.cpp:336
+#: ../src/richtext/richtextsizepage.cpp:363
+#: ../src/richtext/richtextsizepage.cpp:390
+#: ../src/richtext/richtextsizepage.cpp:417
+#: ../src/richtext/richtextsizepage.cpp:444
+#: ../src/richtext/richtextsizepage.cpp:511
+#: ../src/richtext/richtextsizepage.cpp:539
+#: ../src/richtext/richtextsizepage.cpp:567
+#: ../src/richtext/richtextsizepage.cpp:595
+msgid "percent"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:510
 msgid "process context description"
 msgstr "进程上下文描述"
 
+#: ../src/richtext/richtextfontpage.cpp:184
+#: ../src/richtext/richtextfontpage.cpp:187
+msgid "pt"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:185
+#: ../src/richtext/richtextborderspage.cpp:279
+#: ../src/richtext/richtextborderspage.cpp:281
+#: ../src/richtext/richtextborderspage.cpp:282
+#: ../src/richtext/richtextborderspage.cpp:309
+#: ../src/richtext/richtextborderspage.cpp:311
+#: ../src/richtext/richtextborderspage.cpp:312
+#: ../src/richtext/richtextborderspage.cpp:339
+#: ../src/richtext/richtextborderspage.cpp:341
+#: ../src/richtext/richtextborderspage.cpp:342
+#: ../src/richtext/richtextborderspage.cpp:369
+#: ../src/richtext/richtextborderspage.cpp:371
+#: ../src/richtext/richtextborderspage.cpp:372
+#: ../src/richtext/richtextborderspage.cpp:423
+#: ../src/richtext/richtextborderspage.cpp:425
+#: ../src/richtext/richtextborderspage.cpp:426
+#: ../src/richtext/richtextborderspage.cpp:453
+#: ../src/richtext/richtextborderspage.cpp:455
+#: ../src/richtext/richtextborderspage.cpp:456
+#: ../src/richtext/richtextborderspage.cpp:483
+#: ../src/richtext/richtextborderspage.cpp:485
+#: ../src/richtext/richtextborderspage.cpp:486
+#: ../src/richtext/richtextborderspage.cpp:513
+#: ../src/richtext/richtextborderspage.cpp:515
+#: ../src/richtext/richtextborderspage.cpp:516
+#: ../src/richtext/richtextmarginspage.cpp:201
+#: ../src/richtext/richtextmarginspage.cpp:203
+#: ../src/richtext/richtextmarginspage.cpp:204
+#: ../src/richtext/richtextmarginspage.cpp:226
+#: ../src/richtext/richtextmarginspage.cpp:228
+#: ../src/richtext/richtextmarginspage.cpp:229
+#: ../src/richtext/richtextmarginspage.cpp:249
+#: ../src/richtext/richtextmarginspage.cpp:251
+#: ../src/richtext/richtextmarginspage.cpp:252
+#: ../src/richtext/richtextmarginspage.cpp:274
+#: ../src/richtext/richtextmarginspage.cpp:276
+#: ../src/richtext/richtextmarginspage.cpp:277
+#: ../src/richtext/richtextmarginspage.cpp:315
+#: ../src/richtext/richtextmarginspage.cpp:317
+#: ../src/richtext/richtextmarginspage.cpp:318
+#: ../src/richtext/richtextmarginspage.cpp:340
+#: ../src/richtext/richtextmarginspage.cpp:342
+#: ../src/richtext/richtextmarginspage.cpp:343
+#: ../src/richtext/richtextmarginspage.cpp:363
+#: ../src/richtext/richtextmarginspage.cpp:365
+#: ../src/richtext/richtextmarginspage.cpp:366
+#: ../src/richtext/richtextmarginspage.cpp:388
+#: ../src/richtext/richtextmarginspage.cpp:390
+#: ../src/richtext/richtextmarginspage.cpp:391
+#: ../src/richtext/richtextsizepage.cpp:307
+#: ../src/richtext/richtextsizepage.cpp:310
+#: ../src/richtext/richtextsizepage.cpp:311
+#: ../src/richtext/richtextsizepage.cpp:334
+#: ../src/richtext/richtextsizepage.cpp:337
+#: ../src/richtext/richtextsizepage.cpp:338
+#: ../src/richtext/richtextsizepage.cpp:361
+#: ../src/richtext/richtextsizepage.cpp:364
+#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:388
+#: ../src/richtext/richtextsizepage.cpp:391
+#: ../src/richtext/richtextsizepage.cpp:392
+#: ../src/richtext/richtextsizepage.cpp:415
+#: ../src/richtext/richtextsizepage.cpp:418
+#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:442
+#: ../src/richtext/richtextsizepage.cpp:445
+#: ../src/richtext/richtextsizepage.cpp:446
+#: ../src/richtext/richtextsizepage.cpp:509
+#: ../src/richtext/richtextsizepage.cpp:512
+#: ../src/richtext/richtextsizepage.cpp:513
+#: ../src/richtext/richtextsizepage.cpp:537
+#: ../src/richtext/richtextsizepage.cpp:540
+#: ../src/richtext/richtextsizepage.cpp:541
+#: ../src/richtext/richtextsizepage.cpp:565
+#: ../src/richtext/richtextsizepage.cpp:568
+#: ../src/richtext/richtextsizepage.cpp:569
+#: ../src/richtext/richtextsizepage.cpp:593
+#: ../src/richtext/richtextsizepage.cpp:596
+#: ../src/richtext/richtextsizepage.cpp:597
+msgid "px"
+msgstr "像素"
+
+#: ../src/common/accelcmn.cpp:189
+#, fuzzy
+msgid "rawctrl"
+msgstr "ctrl"
+
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
 
-#: ../src/common/filename.cpp:181
-msgid "reading"
-msgstr "正在读入"
-
-#: ../src/common/zipstrm.cpp:1744
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1883
+#, c-format
 msgid "reading zip stream (entry %s): bad crc"
-msgstr "读入zip流 (条目 %s): crc校验错误"
+msgstr "读入 zip 流 (条目 %s): crc校验错误"
 
-#: ../src/common/zipstrm.cpp:1741
-#, fuzzy, c-format
+#: ../src/common/zipstrm.cpp:1878
+#, c-format
 msgid "reading zip stream (entry %s): bad length"
-msgstr "读入zip流 (条目 %s): 长度错误"
+msgstr "读入 zip 流 (条目 %s): 长度错误"
 
-#: ../src/msw/dde.cpp:1077
+#: ../src/msw/dde.cpp:1163
 msgid "reentrancy problem."
-msgstr "重入问题."
+msgstr "重入问题。"
 
-#: ../src/common/datetime.cpp:3763
+#: ../src/common/datetimefmt.cpp:1909
 msgid "second"
 msgstr "第二"
 
@@ -4486,189 +8224,705 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
-#: ../src/common/datetime.cpp:3778
+#: ../src/common/datetimefmt.cpp:1924
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3768
+#: ../src/common/datetimefmt.cpp:1914
 msgid "seventh"
 msgstr "第七"
 
-#: ../src/common/menucmn.cpp:116
+#: ../src/common/accelcmn.cpp:187
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appbase.cpp:351
+#: ../src/common/appbase.cpp:669
 msgid "show this help message"
 msgstr "显示帮助信息"
 
-#: ../src/common/datetime.cpp:3777
+#: ../src/common/datetimefmt.cpp:1923
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3767
+#: ../src/common/datetimefmt.cpp:1913
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:203
+#: ../src/common/appcmn.cpp:207
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
-#: ../src/common/appcmn.cpp:189
+#: ../src/common/appcmn.cpp:193
 msgid "specify the theme to use"
-msgstr "指定使用的主题(theme)"
+msgstr "指定使用的主题"
+
+#: ../src/richtext/richtextbuffer.cpp:8388
+msgid "standard/circle"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8389
+msgid "standard/circle-outline"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8391
+msgid "standard/diamond"
+msgstr ""
 
-#: ../src/common/zipstrm.cpp:1647
+#: ../src/richtext/richtextbuffer.cpp:8390
+msgid "standard/square"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8392
+msgid "standard/triangle"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1783
 msgid "stored file length not in Zip header"
-msgstr "Zip头没有已存文件的长度信息"
+msgstr "Zip 头没有已存文件的长度信息"
 
-#: ../src/common/cmdline.cpp:1085
+#: ../src/common/cmdline.cpp:1304
 msgid "str"
 msgstr "str"
 
-#: ../src/common/datetime.cpp:3771
+#: ../src/common/fontcmn.cpp:795 ../src/common/fontcmn.cpp:970
+msgid "strikethrough"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:1004 ../src/common/tarstrm.cpp:1026
+#: ../src/common/tarstrm.cpp:1508 ../src/common/tarstrm.cpp:1530
+msgid "tar entry not open"
+msgstr ""
+
+#: ../src/common/datetimefmt.cpp:1917
 msgid "tenth"
 msgstr "第十"
 
-#: ../src/msw/dde.cpp:1041
+#: ../src/msw/dde.cpp:1127
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "对事件的响应导致DDE_FBUSY位被设置."
+msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"
 
-#: ../src/common/datetime.cpp:3764
+#: ../src/common/datetimefmt.cpp:1910
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetime.cpp:3774
+#: ../src/common/datetimefmt.cpp:1920
 msgid "thirteenth"
 msgstr "第十三"
 
-#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
-#, c-format
-msgid "tiff module: %s"
-msgstr "tiff 模块: %s"
-
-#: ../src/common/datetime.cpp:3591
+#: ../src/common/datetimefmt.cpp:1714
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetime.cpp:3593
+#: ../src/common/datetimefmt.cpp:1716
 msgid "tomorrow"
 msgstr "明天"
 
-#: ../src/common/datetime.cpp:3773
+#: ../src/common/fileconf.cpp:1980
+#, c-format
+msgid "trailing backslash ignored in '%s'"
+msgstr ""
+
+#: ../src/gtk/aboutdlg.cpp:219
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/common/datetimefmt.cpp:1919
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3781
+#: ../src/common/datetimefmt.cpp:1927
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:637
+#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966
 msgid "underlined"
 msgstr "下划线"
 
-#: ../src/common/fontcmn.cpp:552
-msgid "underlined "
-msgstr "下划线 "
-
-#: ../src/common/fileconf.cpp:1932
-#, fuzzy, c-format
+#: ../src/common/fileconf.cpp:2015
+#, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
-#: ../src/generic/progdlgg.cpp:307
+#: ../src/common/tarstrm.cpp:1046
+msgid "unexpected end of file"
+msgstr "意外到达文件结尾"
+
+#: ../src/generic/progdlgg.cpp:400 ../src/common/tarstrm.cpp:372
+#: ../src/common/tarstrm.cpp:395 ../src/common/tarstrm.cpp:426
 msgid "unknown"
 msgstr "未知"
 
-#: ../src/common/xtixml.cpp:252
+#: ../src/common/xtixml.cpp:254
 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../src/msw/dialup.cpp:457
+#: ../src/msw/dialup.cpp:491
 #, c-format
 msgid "unknown error (error code %08x)."
-msgstr "未知错误(错误号 %08x)."
-
-#: ../src/common/textbuf.cpp:230
-msgid "unknown line terminator"
-msgstr "未知行终止符"
+msgstr "未知错误 (错误号 %08x)。"
 
-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
-#: ../src/common/fmapbase.cpp:712
+#: ../src/common/fmapbase.cpp:835
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:430
+#: ../src/common/docview.cpp:510
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1414
+#: ../src/common/docview.cpp:1597
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
-#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031
+#: ../src/common/zipstrm.cpp:1797 ../src/common/zipstrm.cpp:2185
 msgid "unsupported Zip compression method"
-msgstr "不支持的Zip压缩方法"
+msgstr "不支持的 Zip 压缩方法"
 
-#: ../src/common/zipstrm.cpp:1142
-msgid "unsupported zip archive"
-msgstr "不支持的zip存档"
-
-#: ../src/common/intl.cpp:1114
+#: ../src/common/translation.cpp:1724
 #, c-format
 msgid "using catalog '%s' from '%s'."
-msgstr "使用目录 '%s' 从 '%s'."
+msgstr "使用目录 '%s' 从 '%s'。"
 
 #: ../src/html/chm.cpp:336
 msgid "write error"
 msgstr "写错误"
 
-#: ../src/common/filename.cpp:181
-msgid "writing"
-msgstr "正在写入"
-
-#: ../src/common/stopwatch.cpp:281
+#: ../src/common/time.cpp:319
 msgid "wxGetTimeOfDay failed."
-msgstr "wxGetTimeOfDay 失败."
+msgstr "wxGetTimeOfDay 失败。"
+
+#: ../src/gtk/print.cpp:989
+msgid "wxPrintout::GetPageInfo gives a null maxPage."
+msgstr ""
 
-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
-msgid "wxSocket: invalid signature in ReadMsg."
-msgstr "wxSocket: ReadMsg中无效的签名."
+#: ../src/osx/carbon/dataview.cpp:1304
+msgid "wxWidget control pointer is not a data view pointer"
+msgstr ""
 
-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
-msgid "wxSocket: unknown event!."
-msgstr "wxSocket: 未知事件!."
+#: ../src/osx/carbon/dataview.cpp:908
+msgid "wxWidget's control not initialized."
+msgstr "wxWidgets 的控件未初始化。"
 
-#: ../src/motif/app.cpp:210
+#: ../src/motif/app.cpp:246
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
-msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
+msgstr "wxWidgets 无法为 '%s' 打开显示设备: 退出。"
 
-#: ../src/x11/app.cpp:176
+#: ../src/x11/app.cpp:165
 msgid "wxWidgets could not open display. Exiting."
-msgstr "wxWidgets 不能打开显示设备: 已经存在."
+msgstr "wxWidgets 无法打开显示设备。退出。"
+
+#: ../src/richtext/richtextsymboldlg.cpp:435
+msgid "xxxx"
+msgstr "xxxx"
 
-#: ../src/common/datetime.cpp:3592
+#: ../src/common/datetimefmt.cpp:1715
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:252 ../src/common/zstream.cpp:427
 #, c-format
 msgid "zlib error %d"
-msgstr "zlib错误 %d"
+msgstr "zlib 错误 %d"
 
-#: ../src/common/prntbase.cpp:839
-msgid "|<<"
-msgstr ""
+#: ../src/richtext/richtextliststylepage.cpp:497
+#: ../src/richtext/richtextbulletspage.cpp:302
+msgid "~"
+msgstr "~"
+
+#~ msgid "&Preview..."
+#~ msgstr "预览(&P)..."
+
+#~ msgid "Passing an unkown object to GetObject"
+#~ msgstr "传递一个未知对象给GetObject"
+
+#~ msgid "Preview..."
+#~ msgstr "预览..."
+
+#~ msgid "&Save..."
+#~ msgstr "保存(&S)..."
+
+#~ msgid "About "
+#~ msgstr "关于"
+
+#~ msgid "All files (*.*)|*"
+#~ msgstr "所有文件 (*.*)|*"
+
+#~ msgid "Cannot initialize SciTech MGL!"
+#~ msgstr "无法初始化 SciTech MGL!"
+
+#~ msgid "Cannot initialize display."
+#~ msgstr "无法初始化显示。"
+
+#~ msgid "Cannot start thread: error writing TLS"
+#~ msgstr "无法启动线程: 写 TLS 错误"
+
+#~ msgid "Close\tAlt-F4"
+#~ msgstr "关闭\tAlt-F4"
+
+#~ msgid "Couldn't create cursor."
+#~ msgstr "无法创建光标。"
+
+#~ msgid "Directory '%s' doesn't exist!"
+#~ msgstr "目录 '%s'不存在!"
+
+#~ msgid "File %s does not exist."
+#~ msgstr "文件 %s 不存在。"
+
+#~ msgid "Mode %ix%i-%i not available."
+#~ msgstr "显示模式 %ix%i-%i位色 不支持。"
+
+#~ msgid "Paper Size"
+#~ msgstr "纸张大小"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "&Goto..."
+#~ msgstr "跳转(&G)..."
+
+#~ msgid "<<"
+#~ msgstr "<<"
+
+#~ msgid ">>"
+#~ msgstr ">>"
+
+#~ msgid ">>|"
+#~ msgstr ">>|"
+
+#~ msgid "Can't check image format of file '%s': file does not exist."
+#~ msgstr "不能检查文件格式 '%s': 文件不存在."
+
+#~ msgid "Can't load image from file '%s': file does not exist."
+#~ msgstr "不能从文件 '%s'中装入图像: 文件不存在."
+
+#~ msgid "Cannot open file '%s'."
+#~ msgstr "不能打开文件 '%s'."
+
+#, fuzzy
+#~ msgid "Click to cancel this window."
+#~ msgstr "关闭此窗口"
+
+#, fuzzy
+#~ msgid "Click to confirm your selection."
+#~ msgstr "点击确认字体选择."
+
+#, fuzzy
+#~ msgid "Column could not be added to native control."
+#~ msgstr "文件不能被装载."
+
+#, fuzzy
+#~ msgid "Elapsed time:"
+#~ msgstr "用时: "
+
+#, fuzzy
+#~ msgid "Estimated time:"
+#~ msgstr "预期时间: "
+
+#~ msgid "Failed to create a status bar."
+#~ msgstr "创建状态条失败."
+
+#~ msgid "Goto Page"
+#~ msgstr "跳转页面"
+
+#~ msgid "I64"
+#~ msgstr "I64"
+
+#~ msgid "Internal error, illegal wxCustomTypeInfo"
+#~ msgstr "整数错误, 非法的wxCustomTypeInfo"
+
+#, fuzzy
+#~ msgid "Model pointer not initialized."
+#~ msgstr "不能初始化显示."
+
+#, fuzzy
+#~ msgid "No image handler for type %ld defined."
+#~ msgstr "没有类型 %d 的图像处理器."
+
+#, fuzzy
+#~ msgid "Owner not initialized."
+#~ msgstr "不能初始化显示."
+
+#, fuzzy
+#~ msgid "Passed item is invalid."
+#~ msgstr "'%s' 是无效的"
+
+#~ msgid "Passing a already registered object to SetObjectName"
+#~ msgstr "传递一个已注册的对象给SetObjectName"
+
+#, fuzzy
+#~ msgid "Remaining time:"
+#~ msgstr "剩余时间 : "
+
+#~ msgid ""
+#~ "Streaming delegates for not already streamed objects not yet supported"
+#~ msgstr "不支持针对尚未形成流的对象的流委派"
+
+#, fuzzy
+#~ msgid "The file '%s' doesn't exist and couldn't be opened."
+#~ msgstr ""
+#~ "文件 '%s' 不存在,不能被打开.\n"
+#~ "已从最近使用的文件列表(MRU)中移去."
+
+#~ msgid "The path '%s' contains too many \"..\"!"
+#~ msgstr "路径 '%s' 包含了过多的\"..\"!"
+
+#, fuzzy
+#~ msgid "To be deleted item is invalid."
+#~ msgstr "'%s' 是无效的"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#~ msgid "Windows 2000 (build %lu"
+#~ msgstr "Windows 2000 (build %lu"
+
+#~ msgid "delegate has no type info"
+#~ msgstr "委派没有类型信息"
+
+#~ msgid "|<<"
+#~ msgstr "|<<"
+
+#~ msgid "Archive doesnt contain #SYSTEM file"
+#~ msgstr "存档里没有包含 #SYSTEM 文件"
+
+#~ msgid "Cannot convert dialog units: dialog unknown."
+#~ msgstr "不能转换对话框单元: 未知的对话框."
+
+#~ msgid "Cannot convert from the charset '%s'!"
+#~ msgstr "不能从字符集 '%s' 转换!"
+
+#~ msgid "Cannot find container for unknown control '%s'."
+#~ msgstr "找不到可以对应于未知控件 '%s' 的容器."
+
+#~ msgid "Cannot find font node '%s'."
+#~ msgstr "找不到字体节点 '%s'."
+
+#~ msgid "Cannot parse coordinates from '%s'."
+#~ msgstr "不能从 '%s'中粘贴坐标."
+
+#~ msgid "Cannot parse dimension from '%s'."
+#~ msgstr "不能从 '%s'中解析尺寸."
+
+#~ msgid "Cant create the thread event queue"
+#~ msgstr "不能创建线程事件队列"
+
+#~ msgid "Could not unlock mutex"
+#~ msgstr "不能释放互斥体"
+
+#~ msgid "Error while waiting on semaphore"
+#~ msgstr "等待信号量时出错"
+
+#, fuzzy
+#~ msgid "Failed to connect to session manager: %s"
+#~ msgstr "到 %s 的拨号连接失败: %s"
+
+#~ msgid "Failed to register OpenGL window class."
+#~ msgstr "不能注册 OpenGL窗口类."
+
+#~ msgid "Fatal error"
+#~ msgstr "致命错误"
+
+#~ msgid "Fatal error: "
+#~ msgstr "致命错误: "
+
+#, fuzzy
+#~ msgid "Help : %s"
+#~ msgstr "帮助: %s"
+
+#~ msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
+#~ msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
+
+#~ msgid "No handler found for XML node '%s', class '%s'!"
+#~ msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
+
+#~ msgid "Program aborted."
+#~ msgstr "程序终止."
+
+#~ msgid "Referenced object node with ref=\"%s\" not found!"
+#~ msgstr "ref=\"%s\"的引用对象节点不存在!"
+
+#~ msgid "Resource files must have same version number!"
+#~ msgstr "资源文件必须有相同的版本号!"
+
+#, fuzzy
+#~ msgid "Search!"
+#~ msgstr "搜索"
+
+#~ msgid "Sorry, could not open this file for saving."
+#~ msgstr "对不起, 不能打开文件供保存."
+
+#~ msgid "Sorry, could not save this file."
+#~ msgstr "对不起, 不能保存文件."
+
+#~ msgid "Sorry, print preview needs a printer to be installed."
+#~ msgstr "对不起, 需要先安装打印机才能创建打印预览."
+
+#~ msgid "Status: "
+#~ msgstr "状态: "
+
+#~ msgid "Subclass '%s' not found for resource '%s', not subclassing!"
+#~ msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
+
+#~ msgid "TIFF library error."
+#~ msgstr "TIFF库错误."
+
+#~ msgid "TIFF library warning."
+#~ msgstr "TIFF库警告."
+
+#~ msgid "Trying to solve a NULL hostname: giving up"
+#~ msgstr "试图解析 NULL 主机名: 放弃"
+
+#~ msgid "Unknown style flag "
+#~ msgstr "未知的风格标志 "
+
+#~ msgid "XRC resource '%s' (class '%s') not found!"
+#~ msgstr "没有找到XRC资源 '%s' （类 '%s')!"
+
+#, fuzzy
+#~ msgid "XRC resource: Cannot create animation from '%s'."
+#~ msgstr "XRC资源: 不能从 '%s'创建位图."
+
+#~ msgid "XRC resource: Cannot create bitmap from '%s'."
+#~ msgstr "XRC资源: 不能从 '%s'创建位图."
+
+#, fuzzy
+#~ msgid ""
+#~ "XRC resource: Incorrect colour specification '%s' for attribute '%s'."
+#~ msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
+
+#~ msgid "[EMPTY]"
+#~ msgstr "[空]"
+
+#~ msgid "catalog file for domain '%s' not found."
+#~ msgstr "找不到域 '%s'的目录文件."
+
+#, fuzzy
+#~ msgid "encoding %i"
+#~ msgstr "编码 %s"
+
+#~ msgid "looking for catalog '%s' in path '%s'."
+#~ msgstr "查找目录 '%s' 在路径 '%s'下."
+
+#~ msgid "wxSocket: invalid signature in ReadMsg."
+#~ msgstr "wxSocket: ReadMsg中无效的签名."
+
+#~ msgid "wxSocket: unknown event!."
+#~ msgstr "wxSocket: 未知事件!."
+
+#~ msgid "\t%s: %s\n"
+#~ msgstr "\t%s: %s\n"
+
+#, fuzzy
+#~ msgid " Couldn't create the UnicodeConverter"
+#~ msgstr "不能创建计时器"
+
+#~ msgid "#define %s must be an integer."
+#~ msgstr "#所定义的 %s 必须是整数."
+
+#~ msgid "%s not a bitmap resource specification."
+#~ msgstr "%s 不是位图资源."
+
+#~ msgid "%s not an icon resource specification."
+#~ msgstr "%s 不是图标资源."
+
+#~ msgid "%s: ill-formed resource file syntax."
+#~ msgstr "%s: 不良资源文件语法."
+
+#~ msgid "&Open"
+#~ msgstr "打开(&O)"
+
+#~ msgid "&Print"
+#~ msgstr "打印(&P)"
+
+#~ msgid "*** A debug report has been generated\n"
+#~ msgstr "*** 生成了一份调试报告\n"
+
+#~ msgid "*** It can be found in \"%s\"\n"
+#~ msgstr "*** 可在此找到: \"%s\"\n"
+
+#~ msgid ""
+#~ ", expected static, #include or #define\n"
+#~ "while parsing resource."
+#~ msgstr ""
+#~ ", 在对资源进行语法分析时\n"
+#~ ", 期望如下关键字 static, #include 或 #define ."
+
+#~ msgid "Bitmap resource specification %s not found."
+#~ msgstr "找不到位图规格 %s."
+
+#~ msgid ""
+#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
+#~ "instead\n"
+#~ " or provide #define (see manual for caveats)"
+#~ msgstr ""
+#~ "不能解析控件类或者id '%s'. 用(非零)整数代替\n"
+#~ "或 提供 #define (详细信息见手册)"
+
+#~ msgid ""
+#~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
+#~ "or provide #define (see manual for caveats)"
+#~ msgstr ""
+#~ "不能解析菜单id '%s'. 用(非零)整数代替\n"
+#~ "或 提供 #define (详细信息见手册)"
+
+#, fuzzy
+#~ msgid "Couldn't end the context on the overlay window"
+#~ msgstr "不能获得当前线程指针"
+
+#~ msgid "Expected '*' while parsing resource."
+#~ msgstr "解析资源时期待出现 '*' ."
+
+#~ msgid "Expected '=' while parsing resource."
+#~ msgstr "解析资源时期待出现 '='."
+
+#~ msgid "Expected 'char' while parsing resource."
+#~ msgstr "解析资源时期待遇到 'char' ."
+
+#~ msgid ""
+#~ "Failed to find XBM resource %s.\n"
+#~ "Forgot to use wxResourceLoadBitmapData?"
+#~ msgstr ""
+#~ "查找XBM资源 %s失败.\n"
+#~ "没有使用wxResourceLoadBitmapData?"
+
+#~ msgid ""
+#~ "Failed to find XBM resource %s.\n"
+#~ "Forgot to use wxResourceLoadIconData?"
+#~ msgstr ""
+#~ "查找XBM资源%s失败.\n"
+#~ "没有使用wxResourceLoadIconData?"
+
+#~ msgid ""
+#~ "Failed to find XPM resource %s.\n"
+#~ "Forgot to use wxResourceLoadBitmapData?"
+#~ msgstr ""
+#~ "查找XPM资源 %s失败.\n"
+#~ "没有使用wxResourceLoadBitmapData?"
+
+#~ msgid "Failed to get clipboard data."
+#~ msgstr "获取剪贴板数据失败."
+
+#~ msgid "Failed to load shared library '%s' Error '%s'"
+#~ msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
+
+#~ msgid "Found "
+#~ msgstr "找到 "
+
+#~ msgid "Icon resource specification %s not found."
+#~ msgstr "没有找到图标资源规范 %s ."
+
+#~ msgid "Ill-formed resource file syntax."
+#~ msgstr "不良的资源文件语法."
+
+#~ msgid "Long Conversions not supported"
+#~ msgstr "不支持长转换"
+
+#~ msgid "No XPM icon facility available!"
+#~ msgstr "没有可用的XPM图标设备!"
+
+#~ msgid "Option '%s' requires a value, '=' expected."
+#~ msgstr "选项 '%s' 要求一个值, 期望 '='."
+
+#, fuzzy
+#~ msgid "Select all"
+#~ msgstr "全部选择(&A)"
+
+#~ msgid "String conversions not supported"
+#~ msgstr "不支持字符串装换"
+
+#~ msgid "Unexpected end of file while parsing resource."
+#~ msgstr "在解析资源时意外到达文件结尾."
+
+#~ msgid "Unrecognized style %s while parsing resource."
+#~ msgstr "解析资源时遇到无法识别的风格 %s."
+
+#~ msgid "Video Output"
+#~ msgstr "视频输出"
+
+#~ msgid "Warning: attempt to remove HTML tag handler from empty stack."
+#~ msgstr "警告: 试图从空栈中移去HTML标签处理器."
+
+#~ msgid "establish"
+#~ msgstr "建立"
+
+#~ msgid "initiate"
+#~ msgstr "初始化"
+
+#~ msgid "invalid eof() return value."
+#~ msgstr "无效的eof()返回值."
+
+#~ msgid "unknown line terminator"
+#~ msgstr "未知行终止符"
+
+#~ msgid "writing"
+#~ 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"
+#~ msgstr ""
+#~ "不能获取堆栈的回溯路径:\n"
+#~ " %s"
+
+#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
+#~ msgstr "装入灰度 Ascii PNM图像功能还没有实现."
 
+#~ msgid "Loading Grey Raw PNM image is not yet implemented."
+#~ msgstr "装入灰度 Raw PNM图像功能还没有实现."