X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e901c813367f28340f8f59c069d8005b093332b7..bc9d3d911cfb51f612a699d7fb00f57eb5b2097c:/locale/zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 8ffc68605d..fd2f400353 100644
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets 2.8.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-06 12:44+0100\n"
-"PO-Revision-Date: 2011-11-11 20:05-0800\n"
+"POT-Creation-Date: 2012-02-18 18:11+0100\n"
+"PO-Revision-Date: 2011-11-30 23:13-0800\n"
 "Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,76 +24,73 @@ msgid ""
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"
-"请将报告发送给程序维护人员, 谢谢!\n"
+"请将报告发送给程序维护人员，谢谢!\n"
 
-#: ../src/palmos/utils.cpp:265
-#: ../src/richtext/richtextstyledlg.cpp:205
-#: ../src/richtext/richtextstyledlg.cpp:217
+#: ../src/richtext/richtextstyledlg.cpp:214
+#: ../src/richtext/richtextstyledlg.cpp:226
 msgid " "
 msgstr " "
 
 #: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"
-msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
+msgstr "              谢谢，我们对您遇到的不便表示抱歉!\n"
 
-#: ../src/common/log.cpp:376
+#: ../src/common/log.cpp:428
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
 
-#: ../src/common/imagtiff.cpp:80
+#: ../src/common/imagtiff.cpp:76
 #, c-format
 msgid " (in module \"%s\")"
 msgstr " (于模块: \"%s\")"
 
-#: ../src/common/docview.cpp:1602
+#: ../src/common/docview.cpp:1605
 msgid " - "
 msgstr " - "
 
-#: ../src/richtext/richtextprint.cpp:580
-#: ../src/html/htmprint.cpp:705
+#: ../src/richtext/richtextprint.cpp:582 ../src/html/htmprint.cpp:705
 msgid " Preview"
 msgstr " 预览"
 
-#: ../src/common/fontcmn.cpp:788
+#: ../src/common/fontcmn.cpp:812
 msgid " bold"
 msgstr " 粗体"
 
-#: ../src/common/fontcmn.cpp:804
+#: ../src/common/fontcmn.cpp:828
 msgid " italic"
 msgstr " 斜体"
 
-#: ../src/common/fontcmn.cpp:784
+#: ../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: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: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: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: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 英寸"
 
-#: ../src/html/helpwnd.cpp:1042
+#: ../src/html/helpwnd.cpp:1044
 #, c-format
 msgid "%d of %lu"
 msgstr "%d / %lu"
 
-#: ../src/html/helpwnd.cpp:1685
-#: ../src/html/helpwnd.cpp:1723
+#: ../src/html/helpwnd.cpp:1687 ../src/html/helpwnd.cpp:1725
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
@@ -104,7 +101,7 @@ msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 
-#: ../src/html/helpwnd.cpp:1044
+#: ../src/html/helpwnd.cpp:1046
 #, c-format
 msgid "%lu of %lu"
 msgstr "%lu / %lu"
@@ -114,17 +111,17 @@ msgstr "%lu / %lu"
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:239
+#: ../src/generic/logg.cpp:235
 #, c-format
 msgid "%s Error"
 msgstr "%s 错误"
 
-#: ../src/generic/logg.cpp:251
+#: ../src/generic/logg.cpp:247
 #, c-format
 msgid "%s Information"
 msgstr "%s 信息"
 
-#: ../src/generic/logg.cpp:243
+#: ../src/generic/logg.cpp:239
 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"
@@ -139,10 +136,9 @@ msgstr ""
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 
-#: ../src/common/stockitem.cpp:140
-#: ../src/html/helpfrm.cpp:143
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143
 #: ../src/html/helpfrm.cpp:145
-msgid "&About..."
+msgid "&About"
 msgstr "关于(&A)"
 
 #: ../src/common/stockitem.cpp:208
@@ -162,7 +158,7 @@ msgstr "对齐(&A)"
 msgid "&Apply"
 msgstr "应用(&A)"
 
-#: ../src/richtext/richtextstyledlg.cpp:240
+#: ../src/richtext/richtextstyledlg.cpp:255
 msgid "&Apply Style"
 msgstr "应用样式(&A)"
 
@@ -205,7 +201,7 @@ msgstr ""
 msgid "&Bottom:"
 msgstr ""
 
-#: ../include/wx/richtext/richtextbuffer.h:3228
+#: ../include/wx/richtext/richtextbuffer.h:3408
 #, fuzzy
 msgid "&Box"
 msgstr "粗体(&B)"
@@ -219,10 +215,8 @@ msgstr ""
 msgid "&CD-Rom"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:432
-#: ../src/generic/fontdlgg.cpp:471
-#: ../src/generic/fontdlgg.cpp:490
-#: ../src/osx/carbon/fontdlg.cpp:576
+#: ../src/generic/wizard.cpp:432 ../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)"
@@ -231,7 +225,7 @@ msgstr "取消(&C)"
 msgid "&Cascade"
 msgstr "层叠(&C)"
 
-#: ../include/wx/richtext/richtextbuffer.h:4657
+#: ../include/wx/richtext/richtextbuffer.h:4870
 #, fuzzy
 msgid "&Cell"
 msgstr "取消(&C)"
@@ -244,9 +238,8 @@ msgstr ""
 msgid "&Clear"
 msgstr "清除(&C)"
 
-#: ../src/generic/logg.cpp:528
-#: ../src/common/stockitem.cpp:149
-#: ../src/common/prntbase.cpp:1545
+#: ../src/generic/logg.cpp:524 ../src/common/stockitem.cpp:149
+#: ../src/common/prntbase.cpp:1545 ../src/univ/themes/win32.cpp:3759
 #: ../src/html/helpfrm.cpp:140
 msgid "&Close"
 msgstr "关闭(&C)"
@@ -263,10 +256,8 @@ msgstr "颜色(&C):"
 msgid "&Convert"
 msgstr "转换(&C)"
 
-#: ../src/richtext/richtextctrl.cpp:311
-#: ../src/osx/textctrl_osx.cpp:586
-#: ../src/common/stockitem.cpp:151
-#: ../src/msw/textctrl.cpp:2211
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223
 msgid "&Copy"
 msgstr "复制(&C)"
 
@@ -274,7 +265,7 @@ msgstr "复制(&C)"
 msgid "&Copy URL"
 msgstr "复制 URL(&C)"
 
-#: ../src/common/headerctrlcmn.cpp:314
+#: ../src/common/headerctrlcmn.cpp:329
 msgid "&Customize..."
 msgstr "自定义(&C)..."
 
@@ -283,14 +274,12 @@ msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 
 #: ../src/richtext/richtexttabspage.cpp:143
-#: ../src/richtext/richtextctrl.cpp:313
-#: ../src/osx/textctrl_osx.cpp:588
-#: ../src/common/stockitem.cpp:153
-#: ../src/msw/textctrl.cpp:2213
+#: ../src/richtext/richtextctrl.cpp:328 ../src/osx/textctrl_osx.cpp:586
+#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: ../src/richtext/richtextstyledlg.cpp:258
+#: ../src/richtext/richtextstyledlg.cpp:273
 msgid "&Delete Style..."
 msgstr "删除样式(&D)..."
 
@@ -298,7 +287,7 @@ msgstr "删除样式(&D)..."
 msgid "&Descending"
 msgstr ""
 
-#: ../src/generic/logg.cpp:700
+#: ../src/generic/logg.cpp:696
 msgid "&Details"
 msgstr "细节(&D)"
 
@@ -310,7 +299,7 @@ msgstr "向下(&D)"
 msgid "&Edit"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:252
+#: ../src/richtext/richtextstyledlg.cpp:267
 msgid "&Edit Style..."
 msgstr "编辑样式(&E)..."
 
@@ -318,8 +307,7 @@ msgstr "编辑样式(&E)..."
 msgid "&Execute"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:158
-#: ../src/html/helpfrm.cpp:147
+#: ../src/common/stockitem.cpp:158 ../src/html/helpfrm.cpp:147
 msgid "&File"
 msgstr "文件(&F)"
 
@@ -335,7 +323,7 @@ msgstr "完成(&F)"
 msgid "&First"
 msgstr "最前(&F)"
 
-#: ../src/richtext/richtextsizepage.cpp:168
+#: ../src/richtext/richtextsizepage.cpp:196
 msgid "&Floating mode:"
 msgstr ""
 
@@ -372,16 +360,13 @@ msgstr "从(&F):"
 msgid "&Harddisk"
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:227
+#: ../src/richtext/richtextsizepage.cpp:255
 msgid "&Height:"
 msgstr "高度(&H):"
 
-#: ../src/generic/wizard.cpp:435
-#: ../src/richtext/richtextstyledlg.cpp:292
-#: ../src/richtext/richtextsymboldlg.cpp:476
-#: ../src/osx/menu_osx.cpp:669
-#: ../src/common/stockitem.cpp:164
-#: ../src/html/helpfrm.cpp:148
+#: ../src/generic/wizard.cpp:435 ../src/richtext/richtextstyledlg.cpp:307
+#: ../src/richtext/richtextsymboldlg.cpp:476 ../src/osx/menu_osx.cpp:685
+#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148
 msgid "&Help"
 msgstr "帮助(&H)"
 
@@ -448,15 +433,15 @@ msgstr ""
 msgid "&List level:"
 msgstr ""
 
-#: ../src/generic/logg.cpp:529
+#: ../src/generic/logg.cpp:525
 msgid "&Log"
 msgstr "日志(&L)"
 
-#: ../src/univ/themes/win32.cpp:3770
+#: ../src/univ/themes/win32.cpp:3751
 msgid "&Move"
 msgstr "移动(&M)"
 
-#: ../src/richtext/richtextsizepage.cpp:341
+#: ../src/richtext/richtextsizepage.cpp:477
 msgid "&Move the object to:"
 msgstr ""
 
@@ -464,23 +449,20 @@ msgstr ""
 msgid "&Network"
 msgstr "网络(&N)"
 
-#: ../src/richtext/richtexttabspage.cpp:137
-#: ../src/common/stockitem.cpp:177
+#: ../src/richtext/richtexttabspage.cpp:137 ../src/common/stockitem.cpp:177
 msgid "&New"
 msgstr "新建(&N)"
 
-#: ../src/aui/tabmdi.cpp:108
-#: ../src/generic/mdig.cpp:101
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:101
 #: ../src/msw/mdi.cpp:169
 msgid "&Next"
 msgstr "下一个(&N)"
 
-#: ../src/generic/wizard.cpp:431
-#: ../src/generic/wizard.cpp:626
+#: ../src/generic/wizard.cpp:431 ../src/generic/wizard.cpp:626
 msgid "&Next >"
 msgstr "下一个(&N) >"
 
-#: ../src/richtext/richtextsizepage.cpp:350
+#: ../src/richtext/richtextsizepage.cpp:486
 msgid "&Next Paragraph"
 msgstr ""
 
@@ -492,8 +474,7 @@ msgstr "下一技巧(&N)"
 msgid "&Next style:"
 msgstr "下一个样式(&N):"
 
-#: ../src/common/stockitem.cpp:178
-#: ../src/msw/msgdlg.cpp:470
+#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:476
 msgid "&No"
 msgstr "否(&N)"
 
@@ -505,15 +486,12 @@ msgstr "注意(&N):"
 msgid "&Number:"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:476
-#: ../src/generic/fontdlgg.cpp:483
-#: ../src/osx/carbon/fontdlg.cpp:582
-#: ../src/common/stockitem.cpp:179
+#: ../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/generic/dbgrptg.cpp:339
-#: ../src/common/stockitem.cpp:180
+#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180
 #: ../src/html/helpfrm.cpp:138
 msgid "&Open..."
 msgstr "打开(&O)..."
@@ -526,20 +504,18 @@ msgstr ""
 msgid "&Page Break"
 msgstr ""
 
-#: ../src/richtext/richtextctrl.cpp:312
-#: ../src/osx/textctrl_osx.cpp:587
-#: ../src/common/stockitem.cpp:181
-#: ../src/msw/textctrl.cpp:2212
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
-#: ../include/wx/richtext/richtextbuffer.h:3871
+#: ../include/wx/richtext/richtextbuffer.h:4051
 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):"
@@ -553,13 +529,12 @@ msgstr "偏好设置(&P)"
 msgid "&Preview..."
 msgstr "预览(&P)..."
 
-#: ../src/aui/tabmdi.cpp:109
-#: ../src/generic/mdig.cpp:102
+#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:102
 #: ../src/msw/mdi.cpp:170
 msgid "&Previous"
 msgstr "前页(&P)"
 
-#: ../src/richtext/richtextsizepage.cpp:344
+#: ../src/richtext/richtextsizepage.cpp:480
 #, fuzzy
 msgid "&Previous Paragraph"
 msgstr "前页"
@@ -568,8 +543,7 @@ msgstr "前页"
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-#: ../src/richtext/richtextctrl.cpp:317
-#: ../src/richtext/richtextctrl.cpp:4257
+#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4730
 #: ../src/common/stockitem.cpp:185
 msgid "&Properties"
 msgstr "属性(&P)"
@@ -578,21 +552,17 @@ msgstr "属性(&P)"
 msgid "&Quit"
 msgstr "退出(&Q)"
 
-#: ../src/richtext/richtextctrl.cpp:308
-#: ../src/osx/textctrl_osx.cpp:583
-#: ../src/common/stockitem.cpp:186
-#: ../src/common/cmdproc.cpp:294
-#: ../src/common/cmdproc.cpp:301
-#: ../src/msw/textctrl.cpp:2208
+#: ../src/richtext/richtextctrl.cpp:323 ../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)"
 
-#: ../src/common/cmdproc.cpp:290
-#: ../src/common/cmdproc.cpp:310
+#: ../src/common/cmdproc.cpp:290 ../src/common/cmdproc.cpp:310
 msgid "&Redo "
 msgstr "恢复(&R) "
 
-#: ../src/richtext/richtextstyledlg.cpp:246
+#: ../src/richtext/richtextstyledlg.cpp:261
 msgid "&Rename Style..."
 msgstr ""
 
@@ -600,11 +570,11 @@ msgstr ""
 msgid "&Replace"
 msgstr "替换(&R)"
 
-#: ../src/richtext/richtextstyledlg.cpp:276
+#: ../src/richtext/richtextstyledlg.cpp:291
 msgid "&Restart numbering"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:3769
+#: ../src/univ/themes/win32.cpp:3750
 msgid "&Restore"
 msgstr "复原(&R)"
 
@@ -630,10 +600,6 @@ msgstr "保存(&S)"
 msgid "&Save as"
 msgstr "另存为(&S)"
 
-#: ../src/generic/logg.cpp:524
-msgid "&Save..."
-msgstr "保存(&S)..."
-
 #: ../include/wx/richmsgdlg.h:30
 msgid "&See details"
 msgstr "查看细节(&S)"
@@ -642,7 +608,7 @@ msgstr "查看细节(&S)"
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
-#: ../src/univ/themes/win32.cpp:3772
+#: ../src/univ/themes/win32.cpp:3753
 msgid "&Size"
 msgstr "大小(&S)"
 
@@ -650,7 +616,7 @@ msgstr "大小(&S)"
 msgid "&Size:"
 msgstr "大小(&S):"
 
-#: ../src/generic/progdlgg.cpp:273
+#: ../src/generic/progdlgg.cpp:283
 msgid "&Skip"
 msgstr "跳过(&S)"
 
@@ -667,17 +633,15 @@ msgstr ""
 msgid "&Stop"
 msgstr "停止(&S)"
 
-#: ../src/richtext/richtextfontpage.cpp:251
-#: ../src/common/stockitem.cpp:200
+#: ../src/richtext/richtextfontpage.cpp:251 ../src/common/stockitem.cpp:200
 msgid "&Strikethrough"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:383
-#: ../src/richtext/richtextstylepage.cpp:105
+#: ../src/generic/fontdlgg.cpp:383 ../src/richtext/richtextstylepage.cpp:105
 msgid "&Style:"
 msgstr "字体(&S):"
 
-#: ../src/richtext/richtextstyledlg.cpp:193
+#: ../src/richtext/richtextstyledlg.cpp:202
 msgid "&Styles:"
 msgstr "样式(&S):"
 
@@ -690,7 +654,7 @@ msgstr ""
 msgid "&Symbol:"
 msgstr "符号(&S):"
 
-#: ../include/wx/richtext/richtextbuffer.h:4739
+#: ../include/wx/richtext/richtextbuffer.h:4952
 msgid "&Table"
 msgstr ""
 
@@ -705,8 +669,7 @@ msgstr "顶端(&T)"
 msgid "&Top:"
 msgstr "顶端(&T):"
 
-#: ../src/generic/fontdlgg.cpp:445
-#: ../src/common/stockitem.cpp:203
+#: ../src/generic/fontdlgg.cpp:445 ../src/common/stockitem.cpp:203
 msgid "&Underline"
 msgstr "下划线(&U)"
 
@@ -714,11 +677,9 @@ msgstr "下划线(&U)"
 msgid "&Underlining:"
 msgstr "下划线(&U)"
 
-#: ../src/richtext/richtextctrl.cpp:307
-#: ../src/osx/textctrl_osx.cpp:582
-#: ../src/common/stockitem.cpp:204
-#: ../src/common/cmdproc.cpp:272
-#: ../src/msw/textctrl.cpp:2207
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
+#: ../src/msw/textctrl.cpp:2219
 msgid "&Undo"
 msgstr "撤销(&U)"
 
@@ -734,7 +695,7 @@ msgstr "取消缩进(&U)"
 msgid "&Up"
 msgstr "向上(&U)"
 
-#: ../src/richtext/richtextsizepage.cpp:272
+#: ../src/richtext/richtextsizepage.cpp:408
 msgid "&Vertical alignment:"
 msgstr "垂直对齐(&V)"
 
@@ -746,78 +707,70 @@ msgstr "查看(&V)..."
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
-#: ../src/richtext/richtextsizepage.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:228
 msgid "&Width:"
 msgstr "宽度(&W):"
 
-#: ../src/aui/tabmdi.cpp:301
-#: ../src/aui/tabmdi.cpp:317
-#: ../src/aui/tabmdi.cpp:319
-#: ../src/generic/mdig.cpp:295
-#: ../src/generic/mdig.cpp:311
-#: ../src/generic/mdig.cpp:315
+#: ../src/aui/tabmdi.cpp:301 ../src/aui/tabmdi.cpp:317
+#: ../src/aui/tabmdi.cpp:319 ../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:207
-#: ../src/msw/msgdlg.cpp:470
+#: ../src/common/stockitem.cpp:207 ../src/msw/msgdlg.cpp:476
 msgid "&Yes"
 msgstr "是(&Y)"
 
-#: ../src/common/fontcmn.cpp:821
+#: ../src/common/fontcmn.cpp:845
 msgid "'"
 msgstr "'"
 
-#: ../src/common/config.cpp:526
-#: ../src/msw/regconf.cpp:259
+#: ../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:250
-#: ../src/common/valtext.cpp:252
-#: ../src/common/valtext.cpp:254
-#: ../src/common/valtext.cpp:256
+#: ../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:941
-#: ../src/common/cmdline.cpp:959
+#: ../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/translation.cpp:930
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' 不是有效的消息目录."
+msgstr "'%s' 不是有效的消息目录。"
 
 #: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' 或许是一个二进制文件."
+msgstr "'%s' 或许是一个二进制文件。"
 
 #: ../src/common/valtext.cpp:248
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' 应该是一个数值."
+msgstr "'%s' 应该是一个数值。"
 
 #: ../src/common/valtext.cpp:240
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' 应该仅包含ASCII字符."
+msgstr "'%s' 应该仅包含ASCII字符。"
 
 #: ../src/common/valtext.cpp:242
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' 应仅包含字母字符."
+msgstr "'%s' 应仅包含字母字符。"
 
 #: ../src/common/valtext.cpp:244
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' 应仅包含字母或数字字符."
+msgstr "'%s' 应仅包含字母或数字字符。"
 
 #: ../src/common/valtext.cpp:246
 #, c-format
@@ -829,7 +782,7 @@ msgstr "'%s' 应该仅包含数字。"
 msgid "(*)"
 msgstr "(*)"
 
-#: ../src/html/helpwnd.cpp:977
+#: ../src/html/helpwnd.cpp:979
 msgid "(Help)"
 msgstr "(帮助)"
 
@@ -842,9 +795,8 @@ msgstr ""
 msgid "(Normal text)"
 msgstr "(正常字体)"
 
-#: ../src/html/helpwnd.cpp:424
-#: ../src/html/helpwnd.cpp:1114
-#: ../src/html/helpwnd.cpp:1750
+#: ../src/html/helpwnd.cpp:424 ../src/html/helpwnd.cpp:1116
+#: ../src/html/helpwnd.cpp:1752
 msgid "(bookmarks)"
 msgstr "(书签)"
 
@@ -854,7 +806,7 @@ msgstr "(书签)"
 #: ../src/richtext/richtextindentspage.cpp:299
 #: ../src/richtext/richtextindentspage.cpp:311
 #: ../src/richtext/richtextindentspage.cpp:312
-#: ../src/richtext/richtextformatdlg.cpp:826
+#: ../src/richtext/richtextformatdlg.cpp:824
 #: ../src/richtext/richtextfontpage.cpp:291
 #: ../src/richtext/richtextfontpage.cpp:295
 #: ../src/richtext/richtextfontpage.cpp:299
@@ -888,7 +840,7 @@ msgstr ""
 msgid "-"
 msgstr "-"
 
-#: ../src/generic/filepickerg.cpp:64
+#: ../src/generic/filepickerg.cpp:67
 msgid "..."
 msgstr "..."
 
@@ -1009,7 +961,7 @@ msgstr "9 x 11 英寸"
 
 #: ../src/html/htmprint.cpp:432
 msgid ": file does not exist!"
-msgstr ": 文件不存在!"
+msgstr ": 文件不存在！"
 
 #: ../src/common/fontmap.cpp:198
 msgid ": unknown charset"
@@ -1023,74 +975,65 @@ msgstr ": 未知编码"
 msgid "< &Back"
 msgstr "< 返回(&B)"
 
-#: ../src/osx/carbon/fontdlg.cpp:596
-#: ../src/osx/carbon/fontdlg.cpp:803
-#: ../src/osx/carbon/fontdlg.cpp:823
+#: ../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:597
-#: ../src/osx/carbon/fontdlg.cpp:805
-#: ../src/osx/carbon/fontdlg.cpp:825
+#: ../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:595
-#: ../src/osx/carbon/fontdlg.cpp:801
-#: ../src/osx/carbon/fontdlg.cpp:821
+#: ../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:598
-#: ../src/osx/carbon/fontdlg.cpp:807
-#: ../src/osx/carbon/fontdlg.cpp:827
+#: ../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:599
-#: ../src/osx/carbon/fontdlg.cpp:812
-#: ../src/osx/carbon/fontdlg.cpp:831
+#: ../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:600
-#: ../src/osx/carbon/fontdlg.cpp:809
-#: ../src/osx/carbon/fontdlg.cpp:829
+#: ../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:594
+#: ../src/osx/carbon/fontdlg.cpp:604
 msgid "<Any>"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:280
-#: ../src/generic/filectrlg.cpp:303
+#: ../src/generic/filectrlg.cpp:280 ../src/generic/filectrlg.cpp:303
 msgid "<DIR>"
 msgstr "<目录>"
 
-#: ../src/generic/filectrlg.cpp:284
-#: ../src/generic/filectrlg.cpp:307
+#: ../src/generic/filectrlg.cpp:284 ../src/generic/filectrlg.cpp:307
 msgid "<DRIVE>"
 msgstr "<盘符>"
 
-#: ../src/generic/filectrlg.cpp:282
-#: ../src/generic/filectrlg.cpp:305
+#: ../src/generic/filectrlg.cpp:282 ../src/generic/filectrlg.cpp:305
 msgid "<LINK>"
 msgstr "<连接>"
 
-#: ../src/html/helpwnd.cpp:1274
+#: ../src/html/helpwnd.cpp:1276
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜体.</i></b><br>"
 
-#: ../src/html/helpwnd.cpp:1278
+#: ../src/html/helpwnd.cpp:1280
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
 
-#: ../src/html/helpwnd.cpp:1273
+#: ../src/html/helpwnd.cpp:1275
 msgid "<b>Bold face.</b> "
 msgstr "<b>粗体.</b> "
 
-#: ../src/html/helpwnd.cpp:1272
+#: ../src/html/helpwnd.cpp:1274
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜体.</i> "
 
@@ -1198,9 +1141,8 @@ msgstr "A6 纸张, 105 x 148 毫米"
 msgid "A6 Rotated 148 x 105 mm"
 msgstr "横向 A5 纸张, 148 x 105 毫米"
 
-#: ../src/generic/fontdlgg.cpp:84
-#: ../src/richtext/richtextformatdlg.cpp:523
-#: ../src/osx/carbon/fontdlg.cpp:327
+#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:521
+#: ../src/osx/carbon/fontdlg.cpp:337
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
@@ -1208,28 +1150,19 @@ msgstr "ABCDEFGabcdefg12345"
 msgid "ADD"
 msgstr ""
 
-#: ../src/richtext/richtextsymboldlg.cpp:455
-#: ../src/common/ftp.cpp:408
+#: ../src/richtext/richtextsymboldlg.cpp:455 ../src/common/ftp.cpp:408
 msgid "ASCII"
 msgstr "ASCII"
 
-#: ../src/osx/menu_osx.cpp:517
+#: ../src/osx/menu_osx.cpp:537 ../src/common/stockitem.cpp:140
 msgid "About"
 msgstr "关于"
 
-#: ../src/generic/aboutdlgg.cpp:141
-msgid "About "
-msgstr "关于"
-
-#: ../src/msw/aboutdlg.cpp:65
+#: ../src/generic/aboutdlgg.cpp:141 ../src/msw/aboutdlg.cpp:65
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: ../src/common/stockitem.cpp:140
-msgid "About..."
-msgstr "关于..."
-
 #: ../src/common/stockitem.cpp:208
 msgid "Actual Size"
 msgstr "实际大小"
@@ -1246,11 +1179,11 @@ msgstr "把当前页加到书签中"
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
 
-#: ../include/wx/xtiprop.h:258
+#: ../include/wx/xtiprop.h:260
 msgid "AddToPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用AddToPropertyCollection"
 
-#: ../include/wx/xtiprop.h:196
+#: ../include/wx/xtiprop.h:198
 msgid "AddToPropertyCollection called w/o valid adder"
 msgstr "调用AddToPropertyCollection时未带有效的adder"
 
@@ -1259,11 +1192,11 @@ msgstr "调用AddToPropertyCollection时未带有效的adder"
 msgid "Adding book %s"
 msgstr "正在添加卷 %s"
 
-#: ../src/osx/carbon/dataview.cpp:1928
+#: ../src/osx/carbon/dataview.cpp:1934
 msgid "Adding flavor TEXT failed"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1949
+#: ../src/osx/carbon/dataview.cpp:1955
 msgid "Adding flavor utxt failed"
 msgstr ""
 
@@ -1279,7 +1212,7 @@ msgstr "左对齐"
 msgid "Align Right"
 msgstr "右对齐"
 
-#: ../src/richtext/richtextsizepage.cpp:260
+#: ../src/richtext/richtextsizepage.cpp:396
 msgid "Alignment"
 msgstr "对齐"
 
@@ -1287,25 +1220,18 @@ msgstr "对齐"
 msgid "All"
 msgstr "所有"
 
-#: ../src/generic/filectrlg.cpp:1195
-#: ../src/common/fldlgcmn.cpp:90
+#: ../src/generic/filectrlg.cpp:1195 ../src/common/fldlgcmn.cpp:90
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
-#: ../include/wx/defs.h:2809
+#: ../include/wx/defs.h:2769
 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 
-#: ../src/html/helpwnd.cpp:1560
-msgid "All files (*.*)|*"
-msgstr "所有文件 (*)|*"
-
-#: ../include/wx/defs.h:2806
-#: ../src/propgrid/props.cpp:1706
-#: ../src/propgrid/props.cpp:1735
+#: ../include/wx/defs.h:2766
 msgid "All files (*.*)|*.*"
-msgstr "所有文件 (*)|*"
+msgstr "所有文件 (*.*)|*.*"
 
 #: ../src/richtext/richtextstyles.cpp:1032
 msgid "All styles"
@@ -1317,13 +1243,13 @@ msgstr ""
 
 #: ../src/common/xtistrm.cpp:430
 msgid "Already Registered Object passed to SetObjectClassInfo"
-msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
+msgstr "传递已注册对象给 SetObjectClassInfo"
 
 #: ../src/unix/dialup.cpp:355
 msgid "Already dialling ISP."
-msgstr "已经拨接ISP."
+msgstr "已经拨接 ISP 。"
 
-#: ../src/common/accelcmn.cpp:309
+#: ../src/common/accelcmn.cpp:311 ../src/univ/themes/win32.cpp:3759
 msgid "Alt+"
 msgstr ""
 
@@ -1334,12 +1260,17 @@ msgstr "并且包含以下文件:\n"
 #: ../src/generic/animateg.cpp:163
 #, c-format
 msgid "Animation file is not of type %ld."
-msgstr "动画文件的类型不是 %ld."
+msgstr "动画文件的类型不是 %ld。"
 
-#: ../src/generic/logg.cpp:1040
+#: ../src/generic/logg.cpp:1036
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
+msgstr "把日志添加到文件 '%s' (选择 [否] 将覆盖该文件)?"
+
+#: ../src/osx/menu_osx.cpp:556 ../src/osx/menu_osx.cpp:564
+#, fuzzy
+msgid "Application"
+msgstr "选区"
 
 #: ../src/common/stockitem.cpp:142
 msgid "Apply"
@@ -1357,7 +1288,7 @@ msgstr "阿拉伯语 (ISO-8859-6)"
 #: ../src/msw/ole/automtn.cpp:643
 #, c-format
 msgid "Argument %u not found."
-msgstr "找不到参数 %u."
+msgstr "找不到参数 %u。"
 
 #: ../src/generic/aboutdlgg.cpp:185
 msgid "Artists"
@@ -1429,42 +1360,41 @@ msgstr "B6 信封, 176 x 125 毫米"
 msgid "BACK"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:524
-#: ../src/common/imagbmp.cpp:554
+#: ../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:98
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: 不能保存无效图像."
+msgstr "BMP: 无法保存无效图像。"
 
 #: ../src/common/imagbmp.cpp:339
 msgid "BMP: Couldn't write RGB color map."
-msgstr "BMP: 不能写RGB色彩表."
+msgstr "BMP: 无法写 RGB 色彩表。"
 
 #: ../src/common/imagbmp.cpp:474
 msgid "BMP: Couldn't write data."
-msgstr "BMP: 不能写数据."
+msgstr "BMP: 无法写数据。"
 
 #: ../src/common/imagbmp.cpp:240
 msgid "BMP: Couldn't write the file (Bitmap) header."
-msgstr "BMP: 不能写文件头(Bitmap)."
+msgstr "BMP: 无法写文件头 (Bitmap)。"
 
 #: ../src/common/imagbmp.cpp:263
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
-msgstr "BMP: 不能写文件头(BitmapInfo)."
+msgstr "BMP: 无法写文件头 (BitmapInfo)。"
 
 #: ../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:371
+#: ../src/richtext/richtextformatdlg.cpp:369
 msgid "Background"
 msgstr ""
 
@@ -1472,7 +1402,7 @@ msgstr ""
 msgid "Background &colour:"
 msgstr "背景颜色(&c):"
 
-#: ../src/osx/carbon/fontdlg.cpp:394
+#: ../src/osx/carbon/fontdlg.cpp:404
 msgid "Background colour"
 msgstr ""
 
@@ -1482,7 +1412,7 @@ msgstr "波罗的海语 (ISO-8859-13)"
 
 #: ../src/common/fmapbase.cpp:150
 msgid "Baltic (old) (ISO-8859-4)"
-msgstr "波罗的海语 (旧的) (ISO-8859-4)"
+msgstr "波罗的海语 (旧式) (ISO-8859-4)"
 
 #: ../src/richtext/richtextliststylepage.cpp:427
 msgid "Before a paragraph:"
@@ -1493,14 +1423,12 @@ msgstr ""
 msgid "Bitmap"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:2391
+#: ../src/osx/carbon/dataview.cpp:2397
 msgid "Bitmap renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:334
-#: ../src/richtext/richtextfontpage.cpp:297
-#: ../src/osx/carbon/fontdlg.cpp:528
-#: ../src/common/stockitem.cpp:144
+#: ../src/generic/fontdlgg.cpp:334 ../src/richtext/richtextfontpage.cpp:297
+#: ../src/osx/carbon/fontdlg.cpp:538 ../src/common/stockitem.cpp:144
 msgid "Bold"
 msgstr "粗体"
 
@@ -1509,12 +1437,11 @@ msgstr "粗体"
 msgid "Border"
 msgstr "边框"
 
-#: ../src/richtext/richtextformatdlg.cpp:365
+#: ../src/richtext/richtextformatdlg.cpp:363
 msgid "Borders"
 msgstr "边框"
 
-#: ../src/richtext/richtextsizepage.cpp:282
-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextsizepage.cpp:418 ../src/common/stockitem.cpp:145
 msgid "Bottom"
 msgstr ""
 
@@ -1522,7 +1449,7 @@ msgstr ""
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
-#: ../src/richtext/richtextbuffer.cpp:7992
+#: ../src/richtext/richtextbuffer.cpp:8194
 #, fuzzy
 msgid "Box Properties"
 msgstr "属性(&P)"
@@ -1532,8 +1459,7 @@ msgstr "属性(&P)"
 msgid "Box styles"
 msgstr "下一个样式(&N):"
 
-#: ../src/common/filepickercmn.cpp:44
-#: ../src/common/filepickercmn.cpp:45
+#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45
 msgid "Browse"
 msgstr ""
 
@@ -1546,7 +1472,7 @@ msgstr ""
 msgid "Bullet style"
 msgstr ""
 
-#: ../src/richtext/richtextformatdlg.cpp:339
+#: ../src/richtext/richtextformatdlg.cpp:337
 msgid "Bullets"
 msgstr ""
 
@@ -1554,7 +1480,7 @@ msgstr ""
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
-#: ../src/generic/logg.cpp:526
+#: ../src/generic/logg.cpp:522
 msgid "C&lear"
 msgstr "清除(&L)"
 
@@ -1594,8 +1520,7 @@ msgstr ""
 msgid "CD-Rom"
 msgstr ""
 
-#: ../src/html/chm.cpp:818
-#: ../src/html/chm.cpp:877
+#: ../src/html/chm.cpp:818 ../src/html/chm.cpp:877
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件!"
 
@@ -1613,85 +1538,83 @@ msgstr ""
 
 #: ../src/common/cmdproc.cpp:268
 msgid "Can't &Undo "
-msgstr "不能撤销(&U)"
+msgstr "无法撤销(&U)"
 
-#: ../src/common/image.cpp:2476
+#: ../src/common/image.cpp:2487
 msgid "Can't automatically determine the image format for non-seekable input."
 msgstr ""
 
 #: ../src/msw/registry.cpp:506
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "不能关闭注册键 '%s'"
+msgstr "无法关闭注册键 '%s'"
 
 #: ../src/msw/registry.cpp:584
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "不能复制不支持的类型 %d 的值."
+msgstr "无法复制不支持的类型 %d 的值."
 
 #: ../src/msw/registry.cpp:487
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "不能创建注册键 '%s'"
+msgstr "无法创建注册键 '%s'"
 
-#: ../src/msw/thread.cpp:675
-#: ../src/os2/thread.cpp:495
+#: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:495
 msgid "Can't create thread"
-msgstr "不能创建进程"
+msgstr "无法创建进程"
 
-#: ../src/msw/window.cpp:3784
+#: ../src/msw/window.cpp:3772
 #, c-format
 msgid "Can't create window of class %s"
-msgstr "不能创建类 '%s' 的窗口"
+msgstr "无法创建窗口类 %s"
 
 #: ../src/msw/registry.cpp:777
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "不能删除键 '%s'"
+msgstr "无法删除键 '%s'"
 
-#: ../src/msw/iniconf.cpp:459
-#: ../src/os2/iniconf.cpp:472
+#: ../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:805
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "不能删除键值 '%s'/ '%s'"
+msgstr "无法删除值 '%s' 位于键 '%s'"
 
 #: ../src/msw/registry.cpp:1162
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "不能枚举键 '%s'的子键"
+msgstr "无法枚举键 '%s' 的子键"
 
 #: ../src/msw/registry.cpp:1117
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "不能枚举键 '%s'的值"
+msgstr "无法枚举键 '%s' 的值"
 
 #: ../src/msw/registry.cpp:1380
 #, c-format
 msgid "Can't export value of unsupported type %d."
-msgstr "不能导出不支持的类型 %d 的值."
+msgstr "无法导出不支持的类型 %d 的值."
 
 #: ../src/common/ffile.cpp:235
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "不能在文件'%s'中找到当前位置"
+msgstr "无法在文件 '%s' 中找到当前位置"
 
 #: ../src/msw/registry.cpp:417
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "不能获得注册键 '%s'的信息"
+msgstr "无法获得注册键 '%s' 的信息"
 
 #: ../src/common/zstream.cpp:339
 msgid "Can't initialize zlib deflate stream."
-msgstr "不能初始化zlib deflate(压缩)流."
+msgstr "无法初始化 zlib 压缩流。"
 
 #: ../src/common/zstream.cpp:178
 msgid "Can't initialize zlib inflate stream."
-msgstr "不能初始化zlib inflate(解压)流."
+msgstr "无法初始化 zlib 解压流。"
 
 #: ../src/msw/fswatcher.cpp:429
 #, fuzzy, c-format
@@ -1706,88 +1629,80 @@ msgstr ""
 #: ../src/msw/registry.cpp:453
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "不能打开注册键 '%s'"
+msgstr "无法打开注册键 '%s'"
 
 #: ../src/common/zstream.cpp:245
 #, c-format
 msgid "Can't read from inflate stream: %s"
-msgstr "不能从解压流 %s 中读"
+msgstr "无法从解压流 %s 中读取"
 
 #: ../src/common/zstream.cpp:237
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "不能读解压流: 流内有异常的EOF."
+msgstr "无法读解压流: 流内有异常的 EOF。"
 
 #: ../src/msw/registry.cpp:1049
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "不能读 '%s'的值"
+msgstr "无法读 '%s' 的值"
 
-#: ../src/msw/registry.cpp:878
-#: ../src/msw/registry.cpp:910
+#: ../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:2283
+#: ../src/common/image.cpp:2284
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
+msgstr "无法从将图像保存至文件 '%s' 中: 无法识别的扩展名。"
 
-#: ../src/generic/logg.cpp:587
-#: ../src/generic/logg.cpp:1002
+#: ../src/generic/logg.cpp:583 ../src/generic/logg.cpp:998
 msgid "Can't save log contents to file."
-msgstr "不能把日志内容保存到文件."
+msgstr "无法把日志内容保存到文件。"
 
-#: ../src/msw/thread.cpp:631
-#: ../src/os2/thread.cpp:478
+#: ../src/msw/thread.cpp:652 ../src/os2/thread.cpp:478
 msgid "Can't set thread priority"
-msgstr "不能设置线程优先级"
+msgstr "无法设置线程优先级"
 
-#: ../src/msw/registry.cpp:896
-#: ../src/msw/registry.cpp:940
+#: ../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:372
-#, fuzzy
 msgid "Can't write to child process's stdin"
-msgstr "终止进程 %d 失败"
+msgstr "无法写入子进程的标准输入"
 
 #: ../src/common/zstream.cpp:420
 #, c-format
 msgid "Can't write to deflate stream: %s"
-msgstr "不能写到压缩流: %s"
+msgstr "无法写到压缩流: %s"
 
-#: ../src/generic/dirdlgg.cpp:108
-#: ../src/richtext/richtextstyledlg.cpp:289
-#: ../src/common/stockitem.cpp:146
-#: ../src/msw/msgdlg.cpp:483
-#: ../src/msw/progdlg.cpp:672
-#: ../src/gtk1/fontdlg.cpp:145
+#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:304
+#: ../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/os2/thread.cpp:117
 msgid "Cannot create mutex."
-msgstr "不能创建互斥对象."
+msgstr "无法创建互斥子。"
 
 #: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr ""
 
-#: ../src/common/filefn.cpp:1348
+#: ../src/common/filefn.cpp:1333
 #, c-format
 msgid "Cannot enumerate files '%s'"
-msgstr "不能枚举文件 '%s'"
+msgstr "无法枚举文件 '%s'"
 
 #: ../src/msw/dir.cpp:211
 #, c-format
 msgid "Cannot enumerate files in directory '%s'"
-msgstr "不能枚举目录 '%s'中的文件"
+msgstr "无法枚举目录 '%s' 中的文件"
 
 #: ../src/msw/dialup.cpp:543
 #, c-format
@@ -1806,129 +1721,117 @@ msgstr "找不到活动的拨号连接: %s"
 #: ../src/unix/threadpsx.cpp:1208
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "不能获得调度策略 %d 的优先级范围."
+msgstr "无法获得调度策略 %d 的优先级范围。"
 
 #: ../src/unix/utilsunx.cpp:898
 msgid "Cannot get the hostname"
-msgstr "不能获得主机名"
+msgstr "无法获得主机名"
 
 #: ../src/unix/utilsunx.cpp:934
 msgid "Cannot get the official hostname"
-msgstr "不能获得正式的主机名"
+msgstr "无法获得正式的主机名"
 
 #: ../src/msw/dialup.cpp:951
 msgid "Cannot hang up - no active dialup connection."
-msgstr "不能挂断 - 没有活动的拨号连接."
+msgstr "无法挂断 - 没有活动的拨号连接。"
 
 #: ../include/wx/msw/ole/oleutils.h:53
 msgid "Cannot initialize OLE"
-msgstr "不能初始化 OLE"
-
-#: ../src/mgl/app.cpp:224
-msgid "Cannot initialize SciTech MGL!"
-msgstr "不能初始化 SciTech MGL!"
-
-#: ../src/mgl/window.cpp:547
-msgid "Cannot initialize display."
-msgstr "不能初始化显示."
+msgstr "无法初始化 OLE"
 
 #: ../src/common/socket.cpp:844
 msgid "Cannot initialize sockets"
-msgstr "不能初始化 sockets"
+msgstr "无法初始化 sockets"
 
 #: ../src/msw/volume.cpp:619
 #, 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' 中载入资源."
+msgstr "无法从文件 '%s' 中载入资源。"
 
 #: ../src/xrc/xmlres.cpp:745
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "不能从文件 '%s'中载入资源."
+msgstr "无法从文件 '%s' 中载入资源。"
 
 #: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"
-msgstr "不能打开 HTML 文档: %s"
+msgstr "无法打开 HTML 文档: %s"
 
 #: ../src/html/helpdata.cpp:651
 #, c-format
 msgid "Cannot open HTML help book: %s"
-msgstr "不能打开 HTML 帮助: %s"
+msgstr "无法打开 HTML 帮助: %s"
 
 #: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "不能打开目录文件: %s"
+msgstr "无法打开目录文件: %s"
 
 #: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
-msgstr "不能打开文件进行PostScript打印!"
+msgstr "无法打开文件进行PostScript打印!"
 
 #: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open index file: %s"
-msgstr "不能打开索引文件: %s"
+msgstr "无法打开索引文件: %s"
 
 #: ../src/xrc/xmlres.cpp:727
 #, c-format
 msgid "Cannot open resources file '%s'."
-msgstr "不能打开资源文件 '%s'."
+msgstr "无法打开资源文件 '%s'。"
 
-#: ../src/html/helpwnd.cpp:1541
+#: ../src/html/helpwnd.cpp:1543
 msgid "Cannot print empty page."
-msgstr "不能打印空页面."
+msgstr "无法打印空白页面。"
 
 #: ../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"
+msgstr "无法恢复线程 %lu"
 
-#: ../src/msw/thread.cpp:901
+#: ../src/msw/thread.cpp:922
 #, c-format
 msgid "Cannot resume thread %x"
-msgstr "不能恢复线程 %x"
+msgstr "无法恢复线程 %x"
 
 #: ../src/unix/threadpsx.cpp:1189
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "不能找回线程调度策略."
+msgstr "无法找回线程调度策略。"
 
 #: ../src/common/intl.cpp:545
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:818
-msgid "Cannot start thread: error writing TLS"
-msgstr "不能启动线程: 写TLS错误"
-
-#: ../src/msw/thread.cpp:549
+#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570
 msgid "Cannot start thread: error writing TLS."
-msgstr "不能启动线程: 写TLS出错."
+msgstr "无法启动线程: 写 TLS 出错。"
 
 #: ../src/os2/thread.cpp:514
 #, c-format
 msgid "Cannot suspend thread %lu"
-msgstr "不能挂起线程 %lu"
+msgstr "无法挂起线程 %lu"
 
-#: ../src/msw/thread.cpp:886
+#: ../src/msw/thread.cpp:907
 #, c-format
 msgid "Cannot suspend thread %x"
-msgstr "不能挂起线程 %x"
+msgstr "无法挂起线程 %x"
 
-#: ../src/msw/thread.cpp:809
+#: ../src/msw/thread.cpp:830
 msgid "Cannot wait for thread termination"
-msgstr "不能等候线程终止"
+msgstr "无法等候线程终止"
 
 #: ../src/html/helpwnd.cpp:544
 msgid "Case sensitive"
@@ -1938,7 +1841,7 @@ msgstr "大小写敏感"
 msgid "Categorized Mode"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:8065
+#: ../src/richtext/richtextbuffer.cpp:8267
 msgid "Cell Properties"
 msgstr "单元格属性"
 
@@ -1969,9 +1872,9 @@ msgstr "居中"
 #: ../src/richtext/richtextliststylepage.cpp:352
 #: ../src/richtext/richtextliststylepage.cpp:354
 msgid "Centre text."
-msgstr "文字居中."
+msgstr "文字居中。"
 
-#: ../src/richtext/richtextsizepage.cpp:281
+#: ../src/richtext/richtextsizepage.cpp:417
 msgid "Centred"
 msgstr "居中"
 
@@ -1980,15 +1883,20 @@ msgstr "居中"
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 
-#: ../src/richtext/richtextbuffer.cpp:3734
+#: ../src/richtext/richtextbuffer.cpp:3925
 msgid "Change List Style"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:3265
+#: ../src/richtext/richtextbuffer.cpp:3289
 msgid "Change Object Style"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:3092
+#: ../src/richtext/richtextbuffer.cpp:3555
+#, fuzzy
+msgid "Change Properties"
+msgstr "单元格属性"
+
+#: ../src/richtext/richtextbuffer.cpp:3116
 msgid "Change Style"
 msgstr ""
 
@@ -2022,45 +1930,42 @@ msgstr ""
 msgid "Check to enclose the bullet in parentheses."
 msgstr ""
 
-#: ../src/osx/carbon/fontdlg.cpp:530
-#: ../src/osx/carbon/fontdlg.cpp:532
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542
 msgid "Check to make the font bold."
-msgstr "勾选设定为粗体."
+msgstr "勾选设定为粗体。"
 
-#: ../src/osx/carbon/fontdlg.cpp:537
-#: ../src/osx/carbon/fontdlg.cpp:539
+#: ../src/osx/carbon/fontdlg.cpp:547 ../src/osx/carbon/fontdlg.cpp:549
 msgid "Check to make the font italic."
-msgstr "勾选设定为斜体."
+msgstr "勾选设定为斜体。"
 
-#: ../src/osx/carbon/fontdlg.cpp:546
-#: ../src/osx/carbon/fontdlg.cpp:548
+#: ../src/osx/carbon/fontdlg.cpp:556 ../src/osx/carbon/fontdlg.cpp:558
 msgid "Check to make the font underlined."
-msgstr "勾选加下划线."
+msgstr "勾选加下划线。"
 
-#: ../src/richtext/richtextstyledlg.cpp:278
-#: ../src/richtext/richtextstyledlg.cpp:280
+#: ../src/richtext/richtextstyledlg.cpp:293
+#: ../src/richtext/richtextstyledlg.cpp:295
 msgid "Check to restart numbering."
 msgstr ""
 
 #: ../src/richtext/richtextfontpage.cpp:253
 #: ../src/richtext/richtextfontpage.cpp:255
 msgid "Check to show a line through the text."
-msgstr "勾选加删除线."
+msgstr "勾选加删除线。"
 
 #: ../src/richtext/richtextfontpage.cpp:260
 #: ../src/richtext/richtextfontpage.cpp:262
 msgid "Check to show the text in capitals."
-msgstr "勾选显示为大写."
+msgstr "勾选显示为大写。"
 
 #: ../src/richtext/richtextfontpage.cpp:274
 #: ../src/richtext/richtextfontpage.cpp:276
 msgid "Check to show the text in subscript."
-msgstr "勾选显示为下标."
+msgstr "勾选显示为下标。"
 
 #: ../src/richtext/richtextfontpage.cpp:267
 #: ../src/richtext/richtextfontpage.cpp:269
 msgid "Check to show the text in superscript."
-msgstr "勾选显示为上标."
+msgstr "勾选显示为上标。"
 
 #: ../src/msw/dialup.cpp:785
 msgid "Choose ISP to dial"
@@ -2074,14 +1979,11 @@ msgstr "选择目录:"
 msgid "Choose a file"
 msgstr "选择文件"
 
-#: ../src/palmos/colordlg.cpp:73
-#: ../src/generic/colrdlgg.cpp:145
-#: ../src/gtk/colordlg.cpp:60
+#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:60
 msgid "Choose colour"
 msgstr "选择颜色"
 
-#: ../src/generic/fontpickerg.cpp:51
-#: ../src/gtk/fontdlg.cpp:99
+#: ../src/generic/fontpickerg.cpp:51 ../src/gtk/fontdlg.cpp:99
 #: ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "选择字体"
@@ -2091,27 +1993,26 @@ msgstr "选择字体"
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr ""
 
-#: ../src/aui/tabmdi.cpp:105
-#: ../src/generic/mdig.cpp:98
+#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:98
 msgid "Cl&ose"
 msgstr "关闭(&o)"
 
 #: ../src/msw/ole/automtn.cpp:655
 msgid "Class not registered."
-msgstr "类未注册."
+msgstr "类未注册。"
 
 #: ../src/common/stockitem.cpp:148
 msgid "Clear"
 msgstr "清除"
 
-#: ../src/generic/logg.cpp:526
+#: ../src/generic/logg.cpp:522
 msgid "Clear the log contents"
 msgstr "清除日志内容"
 
-#: ../src/richtext/richtextstyledlg.cpp:241
-#: ../src/richtext/richtextstyledlg.cpp:243
+#: ../src/richtext/richtextstyledlg.cpp:256
+#: ../src/richtext/richtextstyledlg.cpp:258
 msgid "Click to apply the selected style."
-msgstr "点击应用所选样式."
+msgstr "点击应用所选样式。"
 
 #: ../src/richtext/richtextliststylepage.cpp:282
 #: ../src/richtext/richtextliststylepage.cpp:284
@@ -2120,125 +2021,107 @@ msgstr "点击应用所选样式."
 msgid "Click to browse for a symbol."
 msgstr ""
 
-#: ../src/osx/carbon/fontdlg.cpp:577
-#: ../src/osx/carbon/fontdlg.cpp:579
+#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589
 msgid "Click to cancel changes to the font."
-msgstr "点击取消字体变更."
+msgstr "点击取消字体变更。"
 
-#: ../src/generic/fontdlgg.cpp:473
-#: ../src/generic/fontdlgg.cpp:492
+#: ../src/generic/fontdlgg.cpp:473 ../src/generic/fontdlgg.cpp:492
 msgid "Click to cancel the font selection."
-msgstr "点击取消字体选择."
+msgstr "点击取消字体选择。"
 
-#: ../src/osx/carbon/fontdlg.cpp:558
-#: ../src/osx/carbon/fontdlg.cpp:560
+#: ../src/osx/carbon/fontdlg.cpp:568 ../src/osx/carbon/fontdlg.cpp:570
 msgid "Click to change the font colour."
-msgstr "点击更改字体颜色."
+msgstr "点击更改字体颜色。"
 
 #: ../src/richtext/richtextfontpage.cpp:243
 #: ../src/richtext/richtextfontpage.cpp:245
 msgid "Click to change the text background colour."
-msgstr "点击修改字体背景颜色."
+msgstr "点击修改字体背景颜色。"
 
 #: ../src/richtext/richtextfontpage.cpp:230
 #: ../src/richtext/richtextfontpage.cpp:232
 msgid "Click to change the text colour."
-msgstr "点击修改字体颜色."
+msgstr "点击修改字体颜色。"
 
 #: ../src/richtext/richtextliststylepage.cpp:196
 #: ../src/richtext/richtextliststylepage.cpp:198
-#, fuzzy
 msgid "Click to choose the font for this level."
-msgstr "点击取消字体选择."
+msgstr "点击选择此层级字体。"
 
-#: ../src/richtext/richtextstyledlg.cpp:268
-#: ../src/richtext/richtextstyledlg.cpp:270
+#: ../src/richtext/richtextstyledlg.cpp:283
+#: ../src/richtext/richtextstyledlg.cpp:285
 msgid "Click to close this window."
-msgstr "点击关闭此窗口"
+msgstr "点击关闭此窗口。"
 
-#: ../src/osx/carbon/fontdlg.cpp:584
-#: ../src/osx/carbon/fontdlg.cpp:586
-#, fuzzy
+#: ../src/osx/carbon/fontdlg.cpp:594 ../src/osx/carbon/fontdlg.cpp:596
 msgid "Click to confirm changes to the font."
-msgstr "点击确认字体选择."
+msgstr "点击确认字体更改。"
 
-#: ../src/generic/fontdlgg.cpp:478
-#: ../src/generic/fontdlgg.cpp:480
-#: ../src/generic/fontdlgg.cpp:485
-#: ../src/generic/fontdlgg.cpp:487
+#: ../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:248
+#: ../src/richtext/richtextstyledlg.cpp:250
+#, fuzzy
+msgid "Click to create a new box style."
+msgstr "点击新增列表样式。"
 
-#: ../src/richtext/richtextstyledlg.cpp:221
-#: ../src/richtext/richtextstyledlg.cpp:223
+#: ../src/richtext/richtextstyledlg.cpp:230
+#: ../src/richtext/richtextstyledlg.cpp:232
 msgid "Click to create a new character style."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:233
-#: ../src/richtext/richtextstyledlg.cpp:235
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:242
+#: ../src/richtext/richtextstyledlg.cpp:244
 msgid "Click to create a new list style."
-msgstr "点击取消字体选择."
+msgstr "点击新增列表样式。"
 
-#: ../src/richtext/richtextstyledlg.cpp:227
-#: ../src/richtext/richtextstyledlg.cpp:229
+#: ../src/richtext/richtextstyledlg.cpp:236
+#: ../src/richtext/richtextstyledlg.cpp:238
 msgid "Click to create a new paragraph style."
 msgstr ""
 
 #: ../src/richtext/richtexttabspage.cpp:138
 #: ../src/richtext/richtexttabspage.cpp:140
-#, fuzzy
 msgid "Click to create a new tab position."
-msgstr "点击取消字体选择."
+msgstr "点击建立新的标签位置。"
 
 #: ../src/richtext/richtexttabspage.cpp:150
 #: ../src/richtext/richtexttabspage.cpp:152
-#, fuzzy
 msgid "Click to delete all tab positions."
-msgstr "点击取消字体选择."
+msgstr "点击删除所有标签位置。"
 
-#: ../src/richtext/richtextstyledlg.cpp:259
-#: ../src/richtext/richtextstyledlg.cpp:261
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:274
+#: ../src/richtext/richtextstyledlg.cpp:276
 msgid "Click to delete the selected style."
-msgstr "点击取消字体选择."
+msgstr "点击删除所选样式。"
 
 #: ../src/richtext/richtexttabspage.cpp:144
 #: ../src/richtext/richtexttabspage.cpp:146
-#, fuzzy
 msgid "Click to delete the selected tab position."
-msgstr "点击取消字体选择."
+msgstr "点击删除所选标签位置。"
 
-#: ../src/richtext/richtextstyledlg.cpp:253
-#: ../src/richtext/richtextstyledlg.cpp:255
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:268
+#: ../src/richtext/richtextstyledlg.cpp:270
 msgid "Click to edit the selected style."
-msgstr "点击取消字体选择."
+msgstr "点击编辑所选样式。"
 
-#: ../src/richtext/richtextstyledlg.cpp:247
-#: ../src/richtext/richtextstyledlg.cpp:249
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:262
+#: ../src/richtext/richtextstyledlg.cpp:264
 msgid "Click to rename the selected style."
-msgstr "点击取消字体选择."
-
-#: ../src/generic/dbgrptg.cpp:94
-#: ../src/generic/progdlgg.cpp:794
-#: ../src/generic/progdlgg.cpp:799
-#: ../src/richtext/richtextstyledlg.cpp:266
-#: ../src/richtext/richtextsymboldlg.cpp:473
-#: ../src/common/stockitem.cpp:149
-#: ../src/msw/progdlg.cpp:171
-#: ../src/msw/progdlg.cpp:678
+msgstr "点击重命名所选样式。"
+
+#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
+#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:281
+#: ../src/richtext/richtextsymboldlg.cpp:473 ../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:3778
-msgid "Close\tAlt-F4"
-msgstr "关闭\tAlt-F4"
-
-#: ../src/aui/tabmdi.cpp:106
-#: ../src/generic/mdig.cpp:99
+#: ../src/aui/tabmdi.cpp:106 ../src/generic/mdig.cpp:99
 msgid "Close All"
 msgstr "全部关闭"
 
@@ -2246,7 +2129,7 @@ msgstr "全部关闭"
 msgid "Close current document"
 msgstr ""
 
-#: ../src/generic/logg.cpp:528
+#: ../src/generic/logg.cpp:524
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -2254,33 +2137,32 @@ msgstr "关闭此窗口"
 msgid "Color"
 msgstr "颜色"
 
-#: ../src/richtext/richtextformatdlg.cpp:720
+#: ../src/richtext/richtextformatdlg.cpp:718
 msgid "Colour"
 msgstr "颜色"
 
 #: ../src/msw/colordlg.cpp:154
-#, fuzzy, c-format
+#, c-format
 msgid "Colour selection dialog failed with error %0lx."
-msgstr "命令 '%s'执行失败, 错误信息: %ul"
+msgstr "颜色选择对话框错误，错误码 %0lx。"
 
-#: ../src/osx/carbon/fontdlg.cpp:554
+#: ../src/osx/carbon/fontdlg.cpp:564
 msgid "Colour:"
 msgstr "颜色:"
 
 #: ../src/osx/carbon/dataview.cpp:901
 msgid "Column could not be added."
-msgstr "不能增加列."
+msgstr "无法增加列。"
 
 #: ../src/osx/carbon/dataview.cpp:900
 msgid "Column description could not be initialized."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1533
-#: ../src/osx/carbon/dataview.cpp:1554
+#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560
 msgid "Column index not found."
-msgstr "找不到列索引."
+msgstr "找不到列索引。"
 
-#: ../src/osx/carbon/dataview.cpp:1609
+#: ../src/osx/carbon/dataview.cpp:1615
 msgid "Column width could not be determined"
 msgstr ""
 
@@ -2290,15 +2172,23 @@ msgstr ""
 
 #: ../src/common/init.cpp:185
 #, c-format
-msgid "Command line argument %d couldn't be converted to Unicode and will be ignored."
+msgid ""
+"Command line argument %d couldn't be converted to Unicode and will be "
+"ignored."
 msgstr ""
 
 #: ../src/msw/fontdlg.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Common dialog failed with error code %0lx."
-msgstr "命令 '%s'执行失败, 错误信息: %ul"
+msgstr "公共对话框错误，错误码 %0lx。"
 
-#: ../src/html/helpwnd.cpp:1558
+#: ../src/gtk/window.cpp:4136
+msgid ""
+"Compositing not supported by this system, please enable it in your Window "
+"Manager."
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1560
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
@@ -2309,7 +2199,7 @@ msgstr "计算机"
 #: ../src/common/fileconf.cpp:966
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "配置条目名不能以 '%c'开头."
+msgstr "配置条目名不能以 '%c' 开头。"
 
 #: ../src/gtk/filedlg.cpp:56
 msgid "Confirm"
@@ -2321,16 +2211,16 @@ msgstr "确认更新注册表"
 
 #: ../src/html/htmlwin.cpp:540
 msgid "Connecting..."
-msgstr "连接..."
+msgstr "正在连接..."
 
 #: ../src/html/helpwnd.cpp:480
 msgid "Contents"
 msgstr "目录"
 
-#: ../src/common/strconv.cpp:2253
+#: ../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"
@@ -2345,8 +2235,7 @@ msgstr "已复制到剪贴板:\"%s\""
 msgid "Copies:"
 msgstr "份数:"
 
-#: ../src/common/stockitem.cpp:151
-#: ../src/stc/stc_i18n.cpp:19
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19
 msgid "Copy"
 msgstr "复制"
 
@@ -2357,220 +2246,193 @@ msgstr "复制选区"
 #: ../src/html/chm.cpp:721
 #, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "不能创建临时文件 '%s'"
+msgstr "无法创建临时文件 '%s'"
 
-#: ../src/osx/carbon/dataview.cpp:1280
-#: ../src/osx/carbon/dataview.cpp:1667
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673
 msgid "Could not determine column index."
-msgstr "不能启动文档预览."
+msgstr "无法确定列索引。"
 
 #: ../src/osx/carbon/dataview.cpp:877
 msgid "Could not determine column's position"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:844
-#, fuzzy
 msgid "Could not determine number of columns."
-msgstr "找不到资源包含文件 %s."
+msgstr "无法确定列数量。"
 
 #: ../src/osx/carbon/dataview.cpp:976
-#, fuzzy
 msgid "Could not determine number of items"
-msgstr "找不到资源包含文件 %s."
+msgstr "无法确定项目数量"
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
-msgstr "不能将 %s解开至 %s: %s"
+msgstr "无法将 %s 解开至 %s: %s"
 
 #: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
-msgstr "找不到id的标签"
+msgstr "找不到 id 的标签"
 
-#: ../src/osx/carbon/dataview.cpp:2551
-#: ../src/osx/carbon/dataview.cpp:2586
-#: ../src/osx/carbon/dataview.cpp:2610
-#: ../src/osx/carbon/dataview.cpp:2631
-#: ../src/osx/carbon/dataview.cpp:2768
-#, fuzzy
+#: ../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 "不能启动打印."
+msgstr "无法获取表头描述。"
 
-#: ../src/osx/carbon/dataview.cpp:1164
-#: ../src/osx/carbon/dataview.cpp:1190
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196
 msgid "Could not get items."
-msgstr "找不到文件 '%s'"
+msgstr "无法获取项目。"
 
-#: ../src/osx/carbon/dataview.cpp:2654
-#: ../src/osx/carbon/dataview.cpp:2719
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725
 msgid "Could not get property flags."
-msgstr "不能创建临时文件 '%s'"
+msgstr "无法获取属性标志。"
 
 #: ../src/osx/carbon/dataview.cpp:727
-#, fuzzy
 msgid "Could not get selected items."
-msgstr "找不到文件 '%s'"
+msgstr "无法获取所选项目。"
 
 #: ../src/html/chm.cpp:445
 #, c-format
 msgid "Could not locate file '%s'."
-msgstr "找不到文件 '%s'"
+msgstr "找不到文件 '%s'。"
 
 #: ../src/osx/carbon/dataview.cpp:846
 msgid "Could not remove column."
-msgstr "不能删除列."
+msgstr "无法删除列。"
 
 #: ../src/osx/carbon/dataview.cpp:643
-#, fuzzy
 msgid "Could not retrieve number of items"
-msgstr "不能创建临时文件 '%s'"
+msgstr "无法获取项目数量"
 
-#: ../src/osx/carbon/dataview.cpp:2567
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2573
 msgid "Could not set alignment."
-msgstr "不能启动打印."
+msgstr "无法设定对齐。"
 
-#: ../src/osx/carbon/dataview.cpp:2798
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2804
 msgid "Could not set column width."
-msgstr "不能启动文档预览."
+msgstr "无法启动文档预览。"
 
-#: ../src/osx/carbon/dataview.cpp:2770
+#: ../src/common/filefn.cpp:1568
 #, fuzzy
+msgid "Could not set current working directory"
+msgstr "获取工作目录失败"
+
+#: ../src/osx/carbon/dataview.cpp:2776
 msgid "Could not set header description."
-msgstr "不能启动打印."
+msgstr "无法启动打印。"
 
-#: ../src/osx/carbon/dataview.cpp:2591
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2597
 msgid "Could not set icon."
-msgstr "不能启动打印."
+msgstr "无法启动打印。"
 
-#: ../src/osx/carbon/dataview.cpp:2612
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2618
 msgid "Could not set maximum width."
-msgstr "不能启动打印."
+msgstr "无法设定最大宽度。"
 
-#: ../src/osx/carbon/dataview.cpp:2633
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2639
 msgid "Could not set minimum width."
-msgstr "不能启动打印."
+msgstr "无法设定最小宽度。"
 
-#: ../src/osx/carbon/dataview.cpp:2659
-#: ../src/osx/carbon/dataview.cpp:2724
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730
 msgid "Could not set property flags."
-msgstr "不能启动打印."
+msgstr "无法设定属性标志。"
 
 #: ../src/common/prntbase.cpp:1953
 msgid "Could not start document preview."
-msgstr "不能启动文档预览."
+msgstr "无法启动文档预览。"
 
-#: ../src/generic/printps.cpp:179
-#: ../src/msw/printwin.cpp:206
-#: ../src/gtk/print.cpp:1069
-#: ../src/gtk/gnome/gprint.cpp:916
+#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:206
+#: ../src/gtk/print.cpp:1068 ../src/gtk/gnome/gprint.cpp:916
 msgid "Could not start printing."
-msgstr "不能启动打印."
+msgstr "无法启动打印。"
 
-#: ../src/common/wincmn.cpp:1940
+#: ../src/common/wincmn.cpp:1973
 msgid "Could not transfer data to window"
-msgstr "不能把数据转到窗口"
+msgstr "无法把数据转到窗口"
 
 #: ../src/os2/thread.cpp:161
 msgid "Couldn't acquire a mutex lock"
-msgstr "不能得到互斥锁"
+msgstr "无法得到互斥锁"
 
-#: ../src/msw/imaglist.cpp:167
-#: ../src/msw/imaglist.cpp:198
-#: ../src/msw/imaglist.cpp:210
-#: ../src/msw/dragimag.cpp:156
-#: ../src/msw/dragimag.cpp:195
+#: ../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:135
-#: ../src/os2/timer.cpp:114
+#: ../src/msw/timer.cpp:135 ../src/os2/timer.cpp:114
 msgid "Couldn't create a timer"
-msgstr "不能创建计时器"
-
-#: ../src/mgl/cursor.cpp:132
-#: ../src/mgl/cursor.cpp:153
-msgid "Couldn't create cursor."
-msgstr "不能创建游标"
+msgstr "无法创建计时器"
 
 #: ../src/osx/carbon/overlay.cpp:123
 #, fuzzy
 msgid "Couldn't create the overlay window"
-msgstr "不能创建计时器"
+msgstr "无法创建计时器"
 
 #: ../src/common/translation.cpp:1853
 #, fuzzy
 msgid "Couldn't enumerate translations"
-msgstr "不能终止线程"
+msgstr "无法终止线程"
 
 #: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "在动态连接库中找不到符号'%s'"
+msgstr "在动态连接库中找不到符号 '%s'"
 
-#: ../src/gtk/print.cpp:2019
+#: ../src/gtk/print.cpp:2005
 msgid "Couldn't get hatch style from wxBrush."
 msgstr ""
 
-#: ../src/msw/thread.cpp:927
+#: ../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 "不能获得当前线程指针"
+msgstr "无法获得当前线程指针"
 
 #: ../src/common/imaggif.cpp:264
 #, fuzzy
 msgid "Couldn't initialize GIF hash table."
-msgstr "不能初始化zlib deflate(压缩)流."
+msgstr "无法初始化 zlib 压缩流."
 
-#: ../src/common/imagpng.cpp:660
+#: ../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:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "不能从 '%s'中的读取声音数据."
+msgstr "无法从 '%s' 中的读取声音数据。"
 
 #: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
-msgstr "不能打开音频: %s"
+msgstr "无法打开音频: %s"
 
 #: ../src/msw/ole/dataobj.cpp:145
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "不能注册剪贴板格式 '%s'."
+msgstr "无法注册剪贴板格式 '%s'。"
 
 #: ../src/os2/thread.cpp:178
 msgid "Couldn't release a mutex"
-msgstr "不能释放互斥体"
+msgstr "无法释放互斥子"
 
-#: ../src/msw/listctrl.cpp:756
+#: ../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:749
-#: ../src/common/imagpng.cpp:760
-#: ../src/common/imagpng.cpp:770
+#: ../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/msw/thread.cpp:694
+#: ../src/msw/thread.cpp:715
 msgid "Couldn't terminate thread"
-msgstr "不能终止线程"
+msgstr "无法终止线程"
 
 #: ../src/common/xtistrm.cpp:171
 #, fuzzy, c-format
@@ -2581,19 +2443,16 @@ msgstr "在声明的RTTI参数里找不到创建参数"
 msgid "Create directory"
 msgstr "创建目录"
 
-#: ../src/generic/filedlgg.cpp:230
-#: ../src/generic/dirdlgg.cpp:132
+#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:132
 msgid "Create new directory"
 msgstr "创建新目录"
 
-#: ../src/common/accelcmn.cpp:311
+#: ../src/common/accelcmn.cpp:313
 msgid "Ctrl+"
 msgstr "Ctrl+"
 
-#: ../src/richtext/richtextctrl.cpp:310
-#: ../src/osx/textctrl_osx.cpp:585
-#: ../src/common/stockitem.cpp:152
-#: ../src/msw/textctrl.cpp:2210
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222
 msgid "Cu&t"
 msgstr "剪切(&t)"
 
@@ -2601,16 +2460,15 @@ msgstr "剪切(&t)"
 msgid "Current directory:"
 msgstr "当前目录:"
 
-#: ../src/gtk/print.cpp:756
+#: ../src/gtk/print.cpp:755
 msgid "Custom size"
 msgstr "自定义大小"
 
-#: ../src/common/headerctrlcmn.cpp:60
+#: ../src/common/headerctrlcmn.cpp:61
 msgid "Customize Columns"
 msgstr "自定义列"
 
-#: ../src/common/stockitem.cpp:152
-#: ../src/stc/stc_i18n.cpp:18
+#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18
 msgid "Cut"
 msgstr "剪切"
 
@@ -2626,7 +2484,7 @@ msgstr "西里尔语 (ISO-8859-5)"
 msgid "D sheet, 22 x 34 in"
 msgstr "D 纸张, 22 x 34 英寸"
 
-#: ../src/msw/dde.cpp:705
+#: ../src/msw/dde.cpp:709
 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
@@ -2644,23 +2502,23 @@ msgstr ""
 
 #: ../src/common/imagbmp.cpp:1045
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "DIB头: 编码不能匹配颜色位数."
+msgstr "DIB头: 编码不匹配颜色位数。"
 
 #: ../src/common/imagbmp.cpp:1000
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素。"
 
 #: ../src/common/imagbmp.cpp:992
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素。"
 
 #: ../src/common/imagbmp.cpp:1016
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "DIB头: 文件中颜色位数未知."
+msgstr "DIB头: 文件中颜色位数未知。"
 
 #: ../src/common/imagbmp.cpp:1028
 msgid "DIB Header: Unknown encoding in file."
-msgstr "DIB头: 文件编码未知."
+msgstr "DIB头: 文件编码未知。"
 
 #: ../src/common/accelcmn.cpp:81
 #, fuzzy
@@ -2679,11 +2537,11 @@ msgstr ""
 msgid "Dashed"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1916
+#: ../src/osx/carbon/dataview.cpp:1922
 msgid "Data object has invalid data format"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:2486
+#: ../src/osx/carbon/dataview.cpp:2492
 msgid "Date renderer cannot render value; value type: "
 msgstr ""
 
@@ -2694,11 +2552,11 @@ msgstr "调试报告 \"%s\""
 
 #: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."
-msgstr "无法创建调试报告."
+msgstr "无法创建调试报告。"
 
 #: ../src/common/debugrpt.cpp:549
 msgid "Debug report generation has failed."
-msgstr "无法生成调试报告."
+msgstr "无法生成调试报告。"
 
 #: ../src/generic/fontdlgg.cpp:324
 msgid "Decorative"
@@ -2716,8 +2574,7 @@ msgstr "缺省字体"
 msgid "Default printer"
 msgstr "缺省的打印机"
 
-#: ../src/richtext/richtextbuffer.cpp:6946
-#: ../src/common/stockitem.cpp:153
+#: ../src/richtext/richtextbuffer.cpp:7145 ../src/common/stockitem.cpp:153
 #: ../src/stc/stc_i18n.cpp:21
 msgid "Delete"
 msgstr "删除"
@@ -2726,13 +2583,12 @@ msgstr "删除"
 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 
-#: ../src/richtext/richtextstyledlg.cpp:744
+#: ../src/richtext/richtextstyledlg.cpp:783
 msgid "Delete Style"
 msgstr "删除样式"
 
-#: ../src/richtext/richtextctrl.cpp:945
-#: ../src/richtext/richtextctrl.cpp:1051
-#: ../src/richtext/richtextctrl.cpp:1101
+#: ../src/richtext/richtextctrl.cpp:1126 ../src/richtext/richtextctrl.cpp:1266
+#: ../src/richtext/richtextctrl.cpp:1340
 msgid "Delete Text"
 msgstr "删除文字"
 
@@ -2744,7 +2600,7 @@ msgstr "删除项"
 msgid "Delete selection"
 msgstr "删除选区"
 
-#: ../src/richtext/richtextstyledlg.cpp:744
+#: ../src/richtext/richtextstyledlg.cpp:783
 #, c-format
 msgid "Delete style %s?"
 msgstr "删除样式 %s?"
@@ -2752,7 +2608,7 @@ 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
@@ -2776,8 +2632,10 @@ 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)没有安装在本机, 拨号功能不能使用. 请安装它."
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr "由于远程访问服务(RAS)没有安装在本机，拨号功能无法使用。请安装它。"
 
 #: ../src/generic/tipdlg.cpp:231
 msgid "Did you know..."
@@ -2792,20 +2650,15 @@ msgstr ""
 msgid "Directories"
 msgstr "目录"
 
-#: ../src/common/filefn.cpp:1254
+#: ../src/common/filefn.cpp:1248
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "目录'%s'不能被创建"
+msgstr "无法创建目录 '%s'"
 
-#: ../src/common/filefn.cpp:1278
+#: ../src/common/filefn.cpp:1268
 #, fuzzy, c-format
 msgid "Directory '%s' couldn't be deleted"
-msgstr "目录'%s'不能被创建"
-
-#: ../src/mgl/dirmgl.cpp:200
-#, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr "目录 '%s'不存在!"
+msgstr "目录'%s'无法被创建"
 
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
@@ -2813,14 +2666,16 @@ msgstr "目录不存在"
 
 #: ../src/generic/filectrlg.cpp:1402
 msgid "Directory doesn't exist."
-msgstr "目录不存在."
+msgstr "目录不存在。"
 
-#: ../src/common/docview.cpp:454
+#: ../src/common/docview.cpp:457
 msgid "Discard changes and reload the last saved version?"
 msgstr ""
 
 #: ../src/html/helpwnd.cpp:510
-msgid "Display all index items that contain given substring. Search is case insensitive."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 #: ../src/html/helpwnd.cpp:690
@@ -2833,7 +2688,8 @@ msgstr ""
 
 #: ../src/msw/mimetype.cpp:708
 msgid ""
-"Do you want to overwrite the command used to %s files with extension \"%s\" ?\n"
+"Do you want to overwrite the command used to %s files with extension \"%s"
+"\" ?\n"
 "Current value is \n"
 "%s, \n"
 "New value is \n"
@@ -2845,7 +2701,7 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
-#: ../src/common/docview.cpp:530
+#: ../src/common/docview.cpp:533
 #, fuzzy, c-format
 msgid "Do you want to save changes to %s?"
 msgstr "你想保存对文档%s的修改?"
@@ -2862,13 +2718,11 @@ msgstr ""
 msgid "Don't Save"
 msgstr "不保存"
 
-#: ../src/msw/frame.cpp:123
-#: ../src/html/htmlwin.cpp:607
+#: ../src/msw/frame.cpp:129 ../src/html/htmlwin.cpp:607
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:471
-#: ../src/msw/progdlg.cpp:406
+#: ../src/generic/progdlgg.cpp:482 ../src/msw/progdlg.cpp:408
 msgid "Done."
 msgstr "完成."
 
@@ -2891,14 +2745,17 @@ msgstr "横向日本双明信片, 148 x 200 毫米"
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
-#: ../src/generic/fdrepdlg.cpp:153
-#: ../src/common/stockitem.cpp:154
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:154
 msgid "Down"
 msgstr "向下"
 
+#: ../src/richtext/richtextctrl.cpp:787
+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"
@@ -2911,7 +2768,7 @@ msgstr ""
 #: ../src/unix/fswatcher_inotify.cpp:335
 #, fuzzy
 msgid "EOF while reading from inotify descriptor"
-msgstr "不能从文件描述子 %d中读"
+msgstr "无法从文件描述子 %d中读"
 
 #: ../src/common/accelcmn.cpp:65
 msgid "ESC"
@@ -2933,44 +2790,68 @@ msgstr "编辑"
 msgid "Edit item"
 msgstr "编辑项"
 
-#: ../src/richtext/richtextsizepage.cpp:229
-#: ../src/richtext/richtextsizepage.cpp:231
+#: ../src/richtext/richtextsizepage.cpp:257
+#: ../src/richtext/richtextsizepage.cpp:259
+#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:367
 msgid "Enable the height value."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:202
-#: ../src/richtext/richtextsizepage.cpp:204
+#: ../src/richtext/richtextsizepage.cpp:338
+#: ../src/richtext/richtextsizepage.cpp:340
+#, fuzzy
+msgid "Enable the maximum width value."
+msgstr "无法设定最大宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:311
+#: ../src/richtext/richtextsizepage.cpp:313
+msgid "Enable the minimum height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:284
+#: ../src/richtext/richtextsizepage.cpp:286
+#, fuzzy
+msgid "Enable the minimum width value."
+msgstr "无法设定最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:230
+#: ../src/richtext/richtextsizepage.cpp:232
 msgid "Enable the width value."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:274
-#: ../src/richtext/richtextsizepage.cpp:276
+#: ../src/richtext/richtextsizepage.cpp:410
+#: ../src/richtext/richtextsizepage.cpp:412
 msgid "Enable vertical alignment."
-msgstr "启用垂直对齐."
+msgstr "启用垂直对齐。"
 
-#: ../src/richtext/richtextsizepage.cpp:316
-#: ../src/richtext/richtextsizepage.cpp:318
+#: ../src/richtext/richtextsizepage.cpp:452
+#: ../src/richtext/richtextsizepage.cpp:454
 msgid "Enable vertical offset."
 msgstr ""
 
 #: ../src/richtext/richtextbackgroundpage.cpp:133
 #: ../src/richtext/richtextbackgroundpage.cpp:135
 msgid "Enables a background colour."
-msgstr "启用背景颜色."
+msgstr "启用背景颜色。"
+
+#: ../src/richtext/richtextstyledlg.cpp:935
+#, fuzzy
+msgid "Enter a box style name"
+msgstr "输入新样式名"
 
-#: ../src/richtext/richtextstyledlg.cpp:577
+#: ../src/richtext/richtextstyledlg.cpp:607
 msgid "Enter a character style name"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:780
+#: ../src/richtext/richtextstyledlg.cpp:821
 msgid "Enter a list style name"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:853
+#: ../src/richtext/richtextstyledlg.cpp:894
 msgid "Enter a new style name"
 msgstr "输入新样式名"
 
-#: ../src/richtext/richtextstyledlg.cpp:625
+#: ../src/richtext/richtextstyledlg.cpp:655
 msgid "Enter a paragraph style name"
 msgstr ""
 
@@ -2987,30 +2868,24 @@ msgstr "找到的条目"
 msgid "Envelope Invite 220 x 220 mm"
 msgstr "邀请信, 220 x 220 毫米"
 
-#: ../src/common/config.cpp:476
+#: ../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: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:1371
-#: ../src/generic/filectrlg.cpp:1402
-#: ../src/gtk/filedlg.cpp:69
-#: ../src/gtk1/fontdlg.cpp:75
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %u in '%s'."
+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:1371 ../src/generic/filectrlg.cpp:1402
+#: ../src/gtk/filedlg.cpp:69 ../src/gtk1/fontdlg.cpp:75
 msgid "Error"
 msgstr "错误"
 
 #: ../src/unix/epolldispatcher.cpp:104
-#, fuzzy
 msgid "Error closing epoll descriptor"
-msgstr "创建目录错误"
+msgstr "关闭 epoll 描述符时发生错误"
 
 #: ../src/unix/fswatcher_kqueue.cpp:115
 #, fuzzy
@@ -3026,24 +2901,24 @@ msgstr "创建目录错误"
 msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 
-#: ../src/propgrid/propgrid.cpp:6586
+#: ../src/propgrid/propgrid.cpp:6563
 #, c-format
 msgid "Error in resource: %s"
 msgstr ""
 
 #: ../src/common/fileconf.cpp:454
 msgid "Error reading config options."
-msgstr "读配置选项错误."
+msgstr "读配置选项错误。"
 
 #: ../src/common/fileconf.cpp:1065
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
-#: ../src/gtk/print.cpp:670
+#: ../src/gtk/print.cpp:669
 msgid "Error while printing: "
 msgstr "打印时出错: "
 
-#: ../src/common/log.cpp:425
+#: ../src/common/log.cpp:226
 msgid "Error: "
 msgstr "错误: "
 
@@ -3056,22 +2931,23 @@ msgid "Event queue overflowed"
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:231
-msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
+#, fuzzy
+msgid "Executable files (*.exe)|*.exe|"
 msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 
 #: ../src/common/stockitem.cpp:156
 msgid "Execute"
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:898
+#: ../src/msw/utilsexc.cpp:904
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "命令 '%s'执行失败"
+msgstr "命令 '%s' 执行失败"
 
 #: ../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:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
@@ -3079,7 +2955,8 @@ msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
 #: ../src/msw/registry.cpp:1231
 #, c-format
-msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgid ""
+"Exporting registry key: file \"%s\" already exists and won't be overwritten."
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
 #: ../src/common/fmapbase.cpp:192
@@ -3089,10 +2966,9 @@ msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 #: ../src/html/chm.cpp:728
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "将 '%s'解压至 '%s'失败."
+msgstr "将 '%s' 解压至 '%s' 失败。"
 
-#: ../src/common/accelcmn.cpp:237
-#: ../src/common/accelcmn.cpp:318
+#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:324
 msgid "F"
 msgstr ""
 
@@ -3103,12 +2979,12 @@ msgstr "新名称"
 
 #: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
-msgstr "访问锁文件失败."
+msgstr "访问锁文件失败。"
 
 #: ../src/unix/epolldispatcher.cpp:117
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to add descriptor %d to epoll descriptor %d"
-msgstr "不能写到文件描述子 %d"
+msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 
 #: ../src/msw/dib.cpp:551
 #, fuzzy, c-format
@@ -3122,9 +2998,9 @@ msgstr "创建游标失败."
 
 #: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
-msgstr "改变视频模式失败."
+msgstr "改变视频模式失败。"
 
-#: ../src/common/image.cpp:2932
+#: ../src/common/image.cpp:2943
 #, fuzzy, c-format
 msgid "Failed to check format of image file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
@@ -3134,9 +3010,9 @@ msgstr "将位图图像保存至文件 \"%s\"失败."
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 
-#: ../src/common/filename.cpp:216
+#: ../src/common/filename.cpp:222
 msgid "Failed to close file handle"
-msgstr "关闭文件句柄失败."
+msgstr "关闭文件句柄失败"
 
 #: ../src/unix/snglinst.cpp:335
 #, c-format
@@ -3145,7 +3021,7 @@ msgstr "关闭锁文件 '%s'失败"
 
 #: ../src/msw/clipbrd.cpp:115
 msgid "Failed to close the clipboard."
-msgstr "关闭剪贴板失败."
+msgstr "关闭剪贴板失败。"
 
 #: ../src/x11/utils.cpp:207
 #, fuzzy, c-format
@@ -3154,18 +3030,18 @@ msgstr "关闭剪贴板失败."
 
 #: ../src/msw/dialup.cpp:819
 msgid "Failed to connect: missing username/password."
-msgstr "连接失败: 缺少用户名/口令."
+msgstr "连接失败: 缺少用户名/口令。"
 
 #: ../src/msw/dialup.cpp:765
 msgid "Failed to connect: no ISP to dial."
-msgstr "连接失败: 没有要拨号的ISP."
+msgstr "连接失败: 没有要拨号的 ISP。"
 
 #: ../src/common/textfile.cpp:201
 #, fuzzy, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "关闭文件句柄失败."
 
-#: ../src/generic/logg.cpp:982
+#: ../src/generic/logg.cpp:978
 #, fuzzy
 msgid "Failed to copy dialog contents to the clipboard."
 msgstr "打开剪贴板失败."
@@ -3178,27 +3054,27 @@ msgstr "复制注册键值失败 '%s'"
 #: ../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:1056
+#: ../src/common/filefn.cpp:1055
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "复制文件 '%s'至 '%s'失败"
+msgstr "复制文件 '%s' 至 '%s' 失败"
 
 #: ../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:1070
+#: ../src/msw/dde.cpp:1074
 msgid "Failed to create DDE string"
 msgstr "创建 DDE 字符串失败"
 
 #: ../src/msw/mdi.cpp:569
 msgid "Failed to create MDI parent frame."
-msgstr "创建 MDI 父框架失败."
+msgstr "创建 MDI 父框架失败。"
 
-#: ../src/common/filename.cpp:981
+#: ../src/common/filename.cpp:1032
 msgid "Failed to create a temporary file name"
 msgstr "创建临时文件名失败"
 
@@ -3214,11 +3090,11 @@ 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:213
 msgid "Failed to create cursor."
-msgstr "创建游标失败."
+msgstr "创建游标失败。"
 
 #: ../src/common/debugrpt.cpp:208
 #, c-format
@@ -3231,7 +3107,7 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"创建目录 '%s'失败\n"
+"创建目录 '%s' 失败\n"
 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:85
@@ -3242,7 +3118,7 @@ msgstr "创建游标失败."
 #: ../src/msw/mimetype.cpp:199
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "为 '%s'文件创建注册条目失败."
+msgstr "为 '%s' 文件创建注册条目失败。"
 
 #: ../src/msw/fdrepdlg.cpp:443
 #, c-format
@@ -3267,41 +3143,38 @@ msgstr "清空剪贴板失败"
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
-#: ../src/msw/dde.cpp:724
+#: ../src/msw/dde.cpp:728
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 
-#: ../src/msw/dialup.cpp:651
-#: ../src/msw/dialup.cpp:886
+#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:886
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "建立拨号连接: %s失败"
+msgstr "建立拨号连接失败: %s"
 
-#: ../src/unix/utilsunx.cpp:548
-#: ../src/unix/utilsunx.cpp:562
+#: ../src/unix/utilsunx.cpp:548 ../src/unix/utilsunx.cpp:562
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "执行 '%s'失败\n"
+msgstr "执行 '%s' 失败\n"
 
 #: ../src/common/debugrpt.cpp:700
 msgid "Failed to execute curl, please install it in PATH."
-msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+msgstr "无法执行curl，请在PATH变量所指的目录中安装curl。"
 
 #: ../src/msw/ole/automtn.cpp:497
 #, fuzzy, c-format
 msgid "Failed to find CLSID of \"%s\""
 msgstr "从文件 \"%s\"读取元文件失败."
 
-#: ../src/common/regex.cpp:435
-#: ../src/common/regex.cpp:483
-#, fuzzy, c-format
+#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483
+#, c-format
 msgid "Failed to find match for regular expression: %s"
-msgstr "不能匹配 '%s' 于正则表达式: %s"
+msgstr "无法找到匹配的正则表达式: %s"
 
 #: ../src/msw/dialup.cpp:717
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "获取ISP名: %s失败"
+msgstr "获取 ISP 名失败: %s"
 
 #: ../src/msw/ole/automtn.cpp:566
 #, fuzzy, c-format
@@ -3312,32 +3185,32 @@ msgstr "无法创建目录 \"%s\""
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
-#: ../src/common/stopwatch.cpp:210
+#: ../src/common/time.cpp:263
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
-#: ../src/common/filefn.cpp:1471
+#: ../src/common/filefn.cpp:1452
 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 #: ../src/univ/theme.cpp:114
 msgid "Failed to initialize GUI: no built-in themes found."
-msgstr "不能初始化GUI: 找不到内嵌的主题(theme)."
+msgstr "无法初始化 GUI: 找不到内嵌的主题。"
 
 #: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."
-msgstr "初始化MS HTML帮助失败."
+msgstr "初始化MS HTML 帮助失败。"
 
 #: ../src/msw/glcanvas.cpp:893
 msgid "Failed to initialize OpenGL"
-msgstr "不能初始化OpenGL"
+msgstr "无法初始化 OpenGL"
 
 #: ../src/msw/dialup.cpp:881
 #, fuzzy, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 
-#: ../src/gtk/textctrl.cpp:1088
+#: ../src/gtk/textctrl.cpp:1100
 #, fuzzy
 msgid "Failed to insert text in the control."
 msgstr "获取工作目录失败"
@@ -3345,7 +3218,7 @@ 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
@@ -3353,8 +3226,10 @@ msgid "Failed to install signal handler"
 msgstr "关闭文件句柄失败."
 
 #: ../src/unix/threadpsx.cpp:1010
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr "合并线程失败，检测到潜在地内存丢失 - 请重新启动系统"
 
 #: ../src/msw/utils.cpp:747
 #, c-format
@@ -3371,8 +3246,7 @@ msgstr "读取图像 %d (从文件 '%s'中)失败."
 msgid "Failed to load image %d from stream."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 
-#: ../src/common/image.cpp:2250
-#: ../src/common/image.cpp:2269
+#: ../src/common/image.cpp:2251 ../src/common/image.cpp:2270
 #, fuzzy, c-format
 msgid "Failed to load image from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
@@ -3380,11 +3254,11 @@ msgstr "从文件 \"%s\"读取元文件失败."
 #: ../src/msw/enhmeta.cpp:98
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "从文件 \"%s\" 读取元文件失败。"
 
 #: ../src/msw/volume.cpp:328
 msgid "Failed to load mpr.dll."
-msgstr "装载mpr.dll失败."
+msgstr "装载 mpr.dll 失败。"
 
 #: ../src/msw/utils.cpp:1128
 #, fuzzy, c-format
@@ -3394,7 +3268,7 @@ msgstr "从文件 \"%s\"读取元文件失败."
 #: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "不能装载共享库 '%s'"
+msgstr "无法装载共享库 '%s'"
 
 #: ../src/msw/utils.cpp:1135
 #, fuzzy, c-format
@@ -3404,28 +3278,28 @@ msgstr "锁定锁文件 '%s'失败"
 #: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "锁定锁文件 '%s'失败"
+msgstr "锁定锁文件 '%s' 失败"
 
 #: ../src/unix/epolldispatcher.cpp:137
 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 
-#: ../src/common/filename.cpp:2531
+#: ../src/common/filename.cpp:2582
 #, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "修改文件时间(为 '%s') 失败"
+msgstr "为 '%s' 修改文件时间失败"
 
 #: ../src/common/selectdispatcher.cpp:253
 msgid "Failed to monitor I/O channels"
 msgstr ""
 
-#: ../src/common/filename.cpp:199
+#: ../src/common/filename.cpp:205
 #, fuzzy, c-format
 msgid "Failed to open '%s' for reading"
 msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/common/filename.cpp:204
+#: ../src/common/filename.cpp:210
 #, fuzzy, c-format
 msgid "Failed to open '%s' for writing"
 msgstr "打开 '%s'(为 %s) 失败"
@@ -3433,9 +3307,9 @@ 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:1131
+#: ../src/common/utilscmn.cpp:1132
 #, fuzzy, c-format
 msgid "Failed to open URL \"%s\" in default browser."
 msgstr "打开 '%s'(为 %s) 失败"
@@ -3450,18 +3324,18 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/common/filename.cpp:1016
+#: ../src/common/filename.cpp:1067
 msgid "Failed to open temporary file."
-msgstr "打开临时文件失败."
+msgstr "打开临时文件失败。"
 
 #: ../src/msw/clipbrd.cpp:94
 msgid "Failed to open the clipboard."
-msgstr "打开剪贴板失败."
+msgstr "打开剪贴板失败。"
 
 #: ../src/common/translation.cpp:1014
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to parse Plural-Forms: '%s'"
-msgstr "不能解析多表格: '%s'"
+msgstr "无法解析复数形式: '%s'"
 
 #: ../src/msw/clipbrd.cpp:645
 msgid "Failed to put data on the clipboard"
@@ -3469,14 +3343,14 @@ msgstr "把数据放到剪贴板失败"
 
 #: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
-msgstr "从锁文件读取PID失败."
+msgstr "从锁文件读取 PID 失败。"
 
 #: ../src/common/fileconf.cpp:465
 #, fuzzy
 msgid "Failed to read config options."
 msgstr "读配置选项错误."
 
-#: ../src/common/docview.cpp:677
+#: ../src/common/docview.cpp:680
 #, fuzzy, c-format
 msgid "Failed to read document from the file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
@@ -3502,61 +3376,63 @@ msgstr "重定向子过程IO失败"
 #: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "注册DDE服务器 '%s'失败"
+msgstr "注册DDE服务器 '%s' 失败"
 
 #: ../src/common/fontmap.cpp:244
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "回忆字符集 '%s'编码失败."
+msgstr "回忆字符集 '%s' 编码失败。"
 
 #: ../src/common/debugrpt.cpp:226
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "不能删除调试报告文件 \"%s\""
+msgstr "无法删除调试报告文件 \"%s\""
 
 #: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "不能删除锁文件 '%s'"
+msgstr "无法删除锁文件 '%s'"
 
 #: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "删除过期的锁文件 '%s'失败."
+msgstr "删除过期的锁文件 '%s' 失败。"
 
 #: ../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:1169
+#: ../src/common/filefn.cpp:1165
 #, c-format
-msgid "Failed to rename the file '%s' to '%s' because the destination file already exists."
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."
 msgstr ""
 
 #: ../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:499
 msgid "Failed to retrieve data from the clipboard."
-msgstr "从剪贴板检取数据失败."
+msgstr "从剪贴板检取数据失败。"
 
-#: ../src/common/filename.cpp:2625
+#: ../src/common/filename.cpp:2676
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "检取文件时间(为 '%s')失败"
+msgstr "提取 '%s' 文件时间失败"
 
 #: ../src/msw/dialup.cpp:488
 msgid "Failed to retrieve text of RAS error message"
-msgstr "检取RAS错误消息正文失败"
+msgstr "提取 RAS 错误消息正文失败"
 
 #: ../src/msw/clipbrd.cpp:782
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "检取支持的剪贴板格式失败"
+msgstr "提取支持的剪贴板格式失败"
 
-#: ../src/common/docview.cpp:648
+#: ../src/common/docview.cpp:651
 #, fuzzy, c-format
 msgid "Failed to save document to the file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
@@ -3564,49 +3440,48 @@ msgstr "将位图图像保存至文件 \"%s\"失败."
 #: ../src/msw/dib.cpp:329
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "将位图图像保存至文件 \"%s\"失败."
+msgstr "将位图图像保存至文件 \"%s\" 失败。"
 
-#: ../src/msw/dde.cpp:765
+#: ../src/msw/dde.cpp:769
 msgid "Failed to send DDE advise notification"
-msgstr "发送DDE advise 通知失败"
+msgstr "发送 DDE advise 通知失败"
 
 #: ../src/common/ftp.cpp:407
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "设置FTP传输模式为 %s 时失败."
+msgstr "设置 FTP 传输模式为 %s 时失败。"
 
 #: ../src/msw/clipbrd.cpp:375
 msgid "Failed to set clipboard data."
-msgstr "设置剪贴板数据失败"
+msgstr "设置剪贴板数据失败。"
 
 #: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "在锁文件 '%s'上设置许可权限时失败"
+msgstr "在锁文件 '%s' 上设置许可权限时失败"
 
-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:549
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
-#: ../src/gtk/textctrl.cpp:1029
+#: ../src/gtk/textctrl.cpp:1041
 #, fuzzy
 msgid "Failed to set text in the text control."
 msgstr "获取工作目录失败"
 
-#: ../src/unix/threadpsx.cpp:1333
-#: ../src/unix/threadpsx.cpp:1343
+#: ../src/unix/threadpsx.cpp:1333 ../src/unix/threadpsx.cpp:1343
 #, c-format
 msgid "Failed to set thread priority %d."
-msgstr "设置线程优先级 %d失败."
+msgstr "设置线程优先级 %d 失败。"
 
 #: ../src/unix/utilsunx.cpp:729
 msgid "Failed to set up non-blocking pipe, the program might hang."
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:266
+#: ../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"
@@ -3618,31 +3493,31 @@ msgstr ""
 
 #: ../src/unix/threadpsx.cpp:1525
 msgid "Failed to terminate a thread."
-msgstr "终止线程失败"
+msgstr "终止线程失败。"
 
-#: ../src/msw/dde.cpp:743
+#: ../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:961
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "终止拨号连接: %s失败"
+msgstr "终止拨号连接失败: %s"
 
-#: ../src/common/filename.cpp:2546
+#: ../src/common/filename.cpp:2597
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "对文件 '%s'进行touch操作失败"
+msgstr "对文件 '%s' 进行 touch 操作时失败"
 
 #: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "对锁文件 '%s'解锁失败"
+msgstr "对已锁文件 '%s' 解锁失败"
 
 #: ../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
@@ -3651,17 +3526,17 @@ msgstr "从剪贴板检取数据失败."
 
 #: ../src/common/fileconf.cpp:1038
 msgid "Failed to update user configuration file."
-msgstr "不能更新用户配置文件."
+msgstr "无法更新用户配置文件。"
 
 #: ../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:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "写锁文件 '%s'失败"
+msgstr "写锁文件 '%s' 失败"
 
 #: ../src/propgrid/propgrid.cpp:173
 msgid "False"
@@ -3672,30 +3547,24 @@ msgstr "False"
 msgid "Family"
 msgstr "字体(&F):"
 
-#: ../src/common/stockitem.cpp:158
-#: ../src/msw/wince/filedlgwce.cpp:119
+#: ../src/common/stockitem.cpp:158 ../src/msw/wince/filedlgwce.cpp:119
 msgid "File"
 msgstr "文件"
 
-#: ../src/common/docview.cpp:665
+#: ../src/common/docview.cpp:668
 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for reading."
 msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/common/docview.cpp:642
+#: ../src/common/docview.cpp:645
 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for writing."
 msgstr "打开 '%s'(为 %s) 失败"
 
-#: ../src/mgl/bitmap.cpp:439
-#, c-format
-msgid "File %s does not exist."
-msgstr "文件 %s不存在."
-
 #: ../src/gtk/filedlg.cpp:53
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "文件 '%s' 已存在, 确实需要复写它?"
+msgstr "文件 '%s' 已存在，确实需要复写它?"
 
 #: ../src/os2/filedlg.cpp:308
 #, c-format
@@ -3703,27 +3572,35 @@ msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr ""
-"文件 '%s' 已存在.\n"
+"文件 '%s' 已存在。\n"
 "真的需要替换它?"
 
-#: ../src/richtext/richtextctrl.cpp:2381
-#: ../src/common/textcmn.cpp:853
-msgid "File couldn't be loaded."
+#: ../src/common/filefn.cpp:1204
+#, fuzzy, c-format
+msgid "File '%s' couldn't be removed"
+msgstr "文件不能被装载."
+
+#: ../src/common/filefn.cpp:1184
+#, fuzzy, c-format
+msgid "File '%s' couldn't be renamed '%s'"
 msgstr "文件不能被装载."
 
-#: ../src/msw/filedlg.cpp:355
+#: ../src/richtext/richtextctrl.cpp:2665 ../src/common/textcmn.cpp:870
+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:1749
+#: ../src/common/docview.cpp:1752
 msgid "File error"
 msgstr "文件错误"
 
-#: ../src/generic/dirctrlg.cpp:680
-#: ../src/generic/filectrlg.cpp:799
+#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799
 msgid "File name exists already."
-msgstr "文件名已存在"
+msgstr "文件名已存在。"
 
 #: ../src/unix/fswatcher_inotify.cpp:413
 msgid "File system containing watched object was unmounted"
@@ -3733,7 +3610,7 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
-#: ../src/common/filefn.cpp:1772
+#: ../src/common/filefn.cpp:1756
 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
@@ -3742,8 +3619,7 @@ msgstr "文件 (%s)"
 msgid "Filter"
 msgstr "过滤器"
 
-#: ../src/common/stockitem.cpp:159
-#: ../src/html/helpwnd.cpp:498
+#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:498
 msgid "Find"
 msgstr "查找"
 
@@ -3755,15 +3631,15 @@ msgstr "最前"
 msgid "First page"
 msgstr "第一页"
 
-#: ../src/html/helpwnd.cpp:1214
+#: ../src/html/helpwnd.cpp:1216
 msgid "Fixed font:"
 msgstr "固定字体:"
 
-#: ../src/html/helpwnd.cpp:1277
+#: ../src/html/helpwnd.cpp:1279
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
-#: ../src/richtext/richtextsizepage.cpp:153
+#: ../src/richtext/richtextsizepage.cpp:181
 msgid "Floating"
 msgstr ""
 
@@ -3775,8 +3651,7 @@ msgstr "软盘"
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
-#: ../src/richtext/richtextformatdlg.cpp:321
-#: ../src/osx/carbon/fontdlg.cpp:461
+#: ../src/richtext/richtextformatdlg.cpp:319 ../src/osx/carbon/fontdlg.cpp:471
 #: ../src/common/stockitem.cpp:195
 msgid "Font"
 msgstr ""
@@ -3785,7 +3660,7 @@ msgstr ""
 msgid "Font &weight:"
 msgstr "字体粗细(&w):"
 
-#: ../src/html/helpwnd.cpp:1215
+#: ../src/html/helpwnd.cpp:1217
 msgid "Font size:"
 msgstr "字体大小:"
 
@@ -3793,7 +3668,7 @@ msgstr "字体大小:"
 msgid "Font st&yle:"
 msgstr "字体样式(&y):"
 
-#: ../src/osx/carbon/fontdlg.cpp:503
+#: ../src/osx/carbon/fontdlg.cpp:513
 msgid "Font:"
 msgstr "字体:"
 
@@ -3814,7 +3689,7 @@ msgstr "前进"
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 
-#: ../src/html/helpwnd.cpp:888
+#: ../src/html/helpwnd.cpp:890
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
@@ -3825,24 +3700,30 @@ msgstr "从:"
 
 #: ../src/common/imaggif.cpp:161
 msgid "GIF: Invalid gif index."
-msgstr "GIF: 无效的gif图像索引."
+msgstr "GIF: 无效的 gif 图像索引。"
 
 #: ../src/common/imaggif.cpp:151
 msgid "GIF: data stream seems to be truncated."
-msgstr "GIF: 数据流似乎已被截断."
+msgstr "GIF: 数据流似乎已被截断。"
 
 #: ../src/common/imaggif.cpp:135
 msgid "GIF: error in GIF image format."
-msgstr "GIF: GIF文件格式错误."
+msgstr "GIF: GIF文件格式错误。"
 
 #: ../src/common/imaggif.cpp:138
 msgid "GIF: not enough memory."
-msgstr "GIF: 没有足够内存."
+msgstr "GIF: 没有足够内存。"
 
 #: ../src/common/imaggif.cpp:141
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 
+#: ../src/gtk/window.cpp:4119
+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:528
 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
@@ -3859,15 +3740,15 @@ msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
-#: ../include/wx/xtiprop.h:187
+#: ../include/wx/xtiprop.h:189
 msgid "GetProperty called w/o valid getter"
 msgstr "调用GetProperty时未带有效的getter"
 
-#: ../include/wx/xtiprop.h:265
+#: ../include/wx/xtiprop.h:267
 msgid "GetPropertyCollection called on a generic accessor"
 msgstr "在一个通用处理器上调用GetPropertyCollection"
 
-#: ../include/wx/xtiprop.h:205
+#: ../include/wx/xtiprop.h:207
 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 
@@ -3883,12 +3764,11 @@ msgstr "前进"
 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 
-#: ../src/generic/filedlgg.cpp:225
-#: ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137
 msgid "Go to home directory"
 msgstr "进入home目录"
 
-#: ../src/generic/filedlgg.cpp:221
+#: ../src/generic/filedlgg.cpp:219
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
@@ -3904,8 +3784,7 @@ msgstr "希腊语 (ISO-8859-7)"
 msgid "Groove"
 msgstr ""
 
-#: ../src/common/zstream.cpp:151
-#: ../src/common/zstream.cpp:311
+#: ../src/common/zstream.cpp:151 ../src/common/zstream.cpp:311
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 
@@ -3917,16 +3796,16 @@ msgstr ""
 msgid "HOME"
 msgstr ""
 
-#: ../src/html/helpwnd.cpp:1556
+#: ../src/html/helpwnd.cpp:1558
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
 #: ../src/html/htmlwin.cpp:655
 #, c-format
 msgid "HTML anchor %s does not exist."
-msgstr "HTML 锚 %s 不存在."
+msgstr "HTML 锚 %s 不存在。"
 
-#: ../src/html/helpwnd.cpp:1554
+#: ../src/html/helpwnd.cpp:1556
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
@@ -3938,23 +3817,20 @@ msgstr ""
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
-#: ../src/osx/button_osx.cpp:40
-#: ../src/common/stockitem.cpp:164
-#: ../src/html/helpdlg.cpp:67
-#: ../src/html/helpfrm.cpp:117
+#: ../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/helpwnd.cpp:1208
+#: ../src/html/helpwnd.cpp:1210
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
-#: ../src/generic/helpext.cpp:459
-#: ../src/generic/helpext.cpp:460
+#: ../src/generic/helpext.cpp:459 ../src/generic/helpext.cpp:460
 msgid "Help Index"
 msgstr "帮助索引"
 
-#: ../src/html/helpwnd.cpp:1538
+#: ../src/html/helpwnd.cpp:1540
 msgid "Help Printing"
 msgstr "帮助打印"
 
@@ -3962,7 +3838,7 @@ msgstr "帮助打印"
 msgid "Help Topics"
 msgstr "帮助主题"
 
-#: ../src/html/helpwnd.cpp:1555
+#: ../src/html/helpwnd.cpp:1557
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
@@ -3981,11 +3857,12 @@ msgstr "找不到域 '%s'的目录文件."
 msgid "Help: %s"
 msgstr "帮助: %s"
 
-#: ../src/osx/menu_osx.cpp:535
-msgid "Hide"
-msgstr ""
+#: ../src/osx/menu_osx.cpp:556
+#, fuzzy, c-format
+msgid "Hide %s"
+msgstr "帮助: %s"
 
-#: ../src/osx/menu_osx.cpp:540
+#: ../src/osx/menu_osx.cpp:558
 msgid "Hide Others"
 msgstr ""
 
@@ -3993,57 +3870,53 @@ msgstr ""
 msgid "Hide this notification message."
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:99
-#: ../src/common/stockitem.cpp:165
+#: ../src/generic/dirdlgg.cpp:99 ../src/common/stockitem.cpp:165
 msgid "Home"
 msgstr "Home"
 
 #: ../src/generic/dirctrlg.cpp:616
 msgid "Home directory"
-msgstr "Home目录"
+msgstr "Home 目录"
 
-#: ../src/richtext/richtextsizepage.cpp:177
-#: ../src/richtext/richtextsizepage.cpp:179
+#: ../src/richtext/richtextsizepage.cpp:205
+#: ../src/richtext/richtextsizepage.cpp:207
 msgid "How the object will float relative to the text."
 msgstr ""
 
 #: ../src/common/imagbmp.cpp:1071
 msgid "ICO: Error in reading mask DIB."
-msgstr "ICO: 读掩码DIB错误."
-
-#: ../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
+msgstr "ICO: 读掩码DIB错误。"
+
+#: ../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:1151
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: 图像高度超出范围, 不适合做图标."
+msgstr "ICO: 图像高度超出范围，不适合做图标。"
 
 #: ../src/common/imagbmp.cpp:1159
 msgid "ICO: Image too wide for an icon."
-msgstr "ICO: 图像宽度超出范围, 不适合做图标."
+msgstr "ICO: 图像宽度超出范围，不适合做图标。"
 
 #: ../src/common/imagbmp.cpp:1416
 msgid "ICO: Invalid icon index."
-msgstr "ICO: 无效的图标索引."
+msgstr "ICO: 无效的图标索引。"
 
 #: ../src/common/imagiff.cpp:760
 msgid "IFF: data stream seems to be truncated."
-msgstr "IFF: 数据流似乎已被截断."
+msgstr "IFF: 数据流似乎已被截断。"
 
 #: ../src/common/imagiff.cpp:744
 msgid "IFF: error in IFF image format."
-msgstr "IFF: IFF文件格式错误."
+msgstr "IFF: IFF文件格式错误。"
 
 #: ../src/common/imagiff.cpp:747
 msgid "IFF: not enough memory."
-msgstr "IFF: 没有足够内存."
+msgstr "IFF: 没有足够内存。"
 
 #: ../src/common/imagiff.cpp:750
 msgid "IFF: unknown error!!!"
@@ -4061,12 +3934,14 @@ msgstr ""
 msgid "ISO-2022-JP"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:2415
+#: ../src/osx/carbon/dataview.cpp:2421
 msgid "Icon & text renderer cannot render value; value type: "
 msgstr ""
 
 #: ../src/html/htmprint.cpp:283
-msgid "If possible, try changing the layout parameters to make the printout more narrow."
+msgid ""
+"If possible, try changing the layout parameters to make the printout more "
+"narrow."
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:355
@@ -4075,80 +3950,83 @@ msgid ""
 "report, please enter it here and it will be joined to it:"
 msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"
-"请在此输入, 它将会被加到错误报告中:"
+"请在此输入，它将会被加到错误报告中:"
 
 #: ../src/generic/dbgrptg.cpp:321
 msgid ""
-"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
+"If you wish to suppress this debug report completely, please choose the "
+"\"Cancel\" button,\n"
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
-"如果您想完全禁用调试报告, 请按\"取消\"按钮, \n"
-"但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
-"在可能的情况下, 请尽量选择让程序生成调试报告.\n"
+"如果您想完全禁用调试报告，请按\"取消\"按钮，\n"
+"但我们不建议这样做，因为调试报告有助于改进本程序。\n"
+"在可能的情况下，请尽量选择让程序生成调试报告。\n"
 
 #: ../src/msw/registry.cpp:1396
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr "忽略值 \"%s\" (键 \"%s\")."
+msgstr "忽略值 \"%s\" (键 \"%s\")。"
 
 #: ../src/common/xtistrm.cpp:300
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
-msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
+msgstr "非法的对象类 (非-wxEvtHandler) 作为事件源"
 
 #: ../src/common/xti.cpp:514
 msgid "Illegal Parameter Count for ConstructObject Method"
-msgstr "非法的针对ConstructObject方法的参数计数"
+msgstr "非法的针对 ConstructObject 方法的参数计数"
 
 #: ../src/common/xti.cpp:502
 msgid "Illegal Parameter Count for Create Method"
-msgstr "非法的针对Create方法的参数计数"
+msgstr "非法的针对 Create 方法的参数计数"
 
-#: ../src/generic/dirctrlg.cpp:662
-#: ../src/generic/filectrlg.cpp:785
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/filectrlg.cpp:785
 msgid "Illegal directory name."
-msgstr "不合法的目录名."
+msgstr "不合法的目录名。"
 
 #: ../src/generic/filectrlg.cpp:1370
 msgid "Illegal file specification."
-msgstr "不合规范的文件描述."
+msgstr "不合规范的文件描述。"
 
-#: ../src/common/image.cpp:2053
+#: ../src/common/image.cpp:2054
 msgid "Image and mask have different sizes."
-msgstr "图像和掩码的大小不一致."
+msgstr "图像和掩码的大小不一致。"
 
-#: ../src/common/image.cpp:2409
+#: ../src/common/image.cpp:2410
 #, fuzzy, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
-#: ../src/common/image.cpp:2529
+#: ../src/common/image.cpp:2540
 #, fuzzy, c-format
 msgid "Image is not of type %s."
 msgstr "图像文件的类型不是 %d."
 
-#: ../src/msw/textctrl.cpp:398
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
+#: ../src/msw/textctrl.cpp:399
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"
 
 #: ../src/unix/utilsunx.cpp:322
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
-#: ../src/common/filefn.cpp:1075
+#: ../src/common/filefn.cpp:1071
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "不可能获得文件 '%s'的许可权限"
+msgstr "不可能获得文件 '%s' 的许可权限"
 
-#: ../src/common/filefn.cpp:1089
+#: ../src/common/filefn.cpp:1085
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 
-#: ../src/common/filefn.cpp:1143
+#: ../src/common/filefn.cpp:1139
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "不可能设置文件 '%s'的许可权限"
+msgstr "不可能设置文件 '%s' 的许可权限"
 
 #: ../src/common/gifdecod.cpp:819
 #, c-format
@@ -4163,12 +4041,11 @@ msgstr ""
 msgid "Indent"
 msgstr "缩进"
 
-#: ../src/richtext/richtextformatdlg.cpp:327
+#: ../src/richtext/richtextformatdlg.cpp:325
 msgid "Indents && Spacing"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:167
-#: ../src/html/helpwnd.cpp:523
+#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:523
 msgid "Index"
 msgstr "索引"
 
@@ -4183,26 +4060,25 @@ msgstr "信息"
 
 #: ../src/common/init.cpp:261
 msgid "Initialization failed in post init, aborting."
-msgstr "在后初始化阶段出错, 退出..."
+msgstr "在后初始化阶段出错，退出..."
 
 #: ../src/richtext/richtextsymboldlg.cpp:469
 msgid "Insert"
 msgstr "插入"
 
-#: ../src/richtext/richtextbuffer.cpp:6786
-#: ../src/richtext/richtextbuffer.cpp:7638
+#: ../src/richtext/richtextbuffer.cpp:6985
+#: ../src/richtext/richtextbuffer.cpp:7840
 msgid "Insert Image"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:6830
+#: ../src/richtext/richtextbuffer.cpp:7029
 msgid "Insert Object"
 msgstr "插入对象"
 
-#: ../src/richtext/richtextctrl.cpp:1009
-#: ../src/richtext/richtextctrl.cpp:1207
-#: ../src/richtext/richtextbuffer.cpp:6633
-#: ../src/richtext/richtextbuffer.cpp:6660
-#: ../src/richtext/richtextbuffer.cpp:6704
+#: ../src/richtext/richtextctrl.cpp:1219 ../src/richtext/richtextctrl.cpp:1471
+#: ../src/richtext/richtextbuffer.cpp:6832
+#: ../src/richtext/richtextbuffer.cpp:6859
+#: ../src/richtext/richtextbuffer.cpp:6903
 msgid "Insert Text"
 msgstr ""
 
@@ -4221,19 +4097,18 @@ msgstr "缩进"
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:319
+#: ../src/common/imagtiff.cpp:315
 msgid "Invalid TIFF image index."
-msgstr "无效TIFF图像索引."
+msgstr "无效TIFF图像索引。"
 
-#: ../src/osx/carbon/dataview.cpp:1777
-#: ../src/osx/carbon/dataview.cpp:1872
+#: ../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:122
 #, c-format
@@ -4243,36 +4118,33 @@ msgstr "无效的几何规格 '%s'"
 #: ../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:410
-#: ../src/common/xtistrm.cpp:425
+#: ../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:440
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
-msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
+msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"
 
 #: ../src/common/regex.cpp:314
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
-#: ../src/common/config.cpp:229
+#: ../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:293
-#: ../src/osx/carbon/fontdlg.cpp:535
-#: ../src/common/stockitem.cpp:169
+#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:293
+#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169
 msgid "Italic"
 msgstr "斜体"
 
@@ -4282,11 +4154,11 @@ msgstr "意大利信封, 110 x 230 毫米"
 
 #: ../src/common/imagjpeg.cpp:256
 msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: 不能装入 - 文件也许已被破坏."
+msgstr "JPEG: 无法装入 - 文件也许已被破坏。"
 
-#: ../src/common/imagjpeg.cpp:428
+#: ../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"
@@ -4363,8 +4235,7 @@ msgstr "KOI8-R"
 msgid "KOI8-U"
 msgstr "KOI8-U"
 
-#: ../src/common/accelcmn.cpp:253
-#: ../src/common/accelcmn.cpp:320
+#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:326
 msgid "KP_"
 msgstr ""
 
@@ -4468,8 +4339,7 @@ msgstr ""
 msgid "LEFT"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:619
-#: ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874
 msgid "Landscape"
 msgstr "横向"
 
@@ -4481,7 +4351,7 @@ msgstr "最后"
 msgid "Last page"
 msgstr "最后一页"
 
-#: ../src/common/log.cpp:258
+#: ../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"
@@ -4497,7 +4367,7 @@ msgstr "帐簿, 17 x 11 英寸"
 #: ../src/richtext/richtextbulletspage.cpp:200
 #: ../src/richtext/richtextbulletspage.cpp:203
 #: ../src/richtext/richtextbulletspage.cpp:204
-#: ../src/richtext/richtextsizepage.cpp:173
+#: ../src/richtext/richtextsizepage.cpp:201
 msgid "Left"
 msgstr ""
 
@@ -4572,9 +4442,9 @@ msgstr ""
 
 #: ../src/html/chm.cpp:841
 msgid "Link contained '//', converted to absolute link."
-msgstr "链接包含 '//', 转换为绝对链接."
+msgstr "链接包含 '//'，转换为绝对链接."
 
-#: ../src/richtext/richtextformatdlg.cpp:346
+#: ../src/richtext/richtextformatdlg.cpp:344
 msgid "List Style"
 msgstr ""
 
@@ -4590,7 +4460,7 @@ msgstr ""
 #: ../src/richtext/richtextfontpage.cpp:154
 #: ../src/richtext/richtextfontpage.cpp:156
 msgid "Lists the available fonts."
-msgstr "列出可用字体."
+msgstr "列出可用字体。"
 
 #: ../src/common/fldlgcmn.cpp:326
 #, c-format
@@ -4604,17 +4474,17 @@ msgstr "装载: "
 #: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "锁文件 '%s' 没有正确的所有者."
+msgstr "锁文件 '%s' 没有正确的所有者。"
 
 #: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr "锁文件 '%s' 没有正确的权限."
+msgstr "锁文件 '%s' 没有正确的权限。"
 
-#: ../src/generic/logg.cpp:590
+#: ../src/generic/logg.cpp:586
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "日志保存到文件 '%s'."
+msgstr "日志保存到文件 '%s'。"
 
 #: ../src/richtext/richtextliststylepage.cpp:485
 #: ../src/richtext/richtextbulletspage.cpp:290
@@ -4626,20 +4496,21 @@ msgstr ""
 msgid "Lower case roman numerals"
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:431
-#: ../src/gtk1/mdi.cpp:432
+#: ../src/gtk/mdi.cpp:431 ../src/gtk1/mdi.cpp:432
 msgid "MDI child"
-msgstr "MDI子窗口"
+msgstr "MDI 子窗口"
 
 #: ../src/common/accelcmn.cpp:69
 msgid "MENU"
 msgstr ""
 
 #: ../src/msw/helpchm.cpp:57
-msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮助库. 请安装它."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr "MS HTML帮助功能不存在，因为此机器上没有安装 MS HTML 帮助库。请安装它。"
 
-#: ../src/univ/themes/win32.cpp:3776
+#: ../src/univ/themes/win32.cpp:3757
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
@@ -4812,7 +4683,7 @@ msgstr ""
 msgid "Make a selection:"
 msgstr "选段"
 
-#: ../src/richtext/richtextformatdlg.cpp:359
+#: ../src/richtext/richtextformatdlg.cpp:357
 #: ../src/richtext/richtextmarginspage.cpp:172
 msgid "Margins"
 msgstr ""
@@ -4821,12 +4692,22 @@ msgstr ""
 msgid "Match case"
 msgstr "区分大小写"
 
+#: ../src/richtext/richtextsizepage.cpp:363
+#, fuzzy
+msgid "Max height:"
+msgstr "高度(&H):"
+
+#: ../src/richtext/richtextsizepage.cpp:336
+#, fuzzy
+msgid "Max width:"
+msgstr "替换为:"
+
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 
-#: ../src/msw/frame.cpp:353
+#: ../src/msw/frame.cpp:354
 msgid "Menu"
 msgstr "菜单"
 
@@ -4842,19 +4723,23 @@ msgstr "金属主题"
 msgid "Method or property not found."
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:3774
+#: ../src/univ/themes/win32.cpp:3755
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
+#: ../src/richtext/richtextsizepage.cpp:309
+#, fuzzy
+msgid "Min height:"
+msgstr "字体粗细(&w):"
+
+#: ../src/richtext/richtextsizepage.cpp:282
+msgid "Min width:"
+msgstr ""
+
 #: ../src/msw/ole/automtn.cpp:639
 msgid "Missing a required parameter."
 msgstr ""
 
-#: ../src/mgl/app.cpp:114
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr "显示模式 %ix%i-%i位色 不支持."
-
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr "现代"
@@ -4870,7 +4755,7 @@ 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."
@@ -4884,17 +4769,17 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
-#: ../src/richtext/richtextsizepage.cpp:351
-#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:487
+#: ../src/richtext/richtextsizepage.cpp:489
 msgid "Moves the object to the next paragraph."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:345
-#: ../src/richtext/richtextsizepage.cpp:347
+#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:483
 msgid "Moves the object to the previous paragraph."
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:8063
+#: ../src/richtext/richtextbuffer.cpp:8265
 msgid "Multiple Cell Properties"
 msgstr ""
 
@@ -4914,26 +4799,33 @@ msgstr "网络"
 msgid "New"
 msgstr "新建"
 
-#: ../src/richtext/richtextstyledlg.cpp:220
+#: ../src/richtext/richtextstyledlg.cpp:247
+#, fuzzy
+msgid "New &Box Style..."
+msgstr "新增样式"
+
+#: ../src/richtext/richtextstyledlg.cpp:229
 msgid "New &Character Style..."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:232
+#: ../src/richtext/richtextstyledlg.cpp:241
 msgid "New &List Style..."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:226
+#: ../src/richtext/richtextstyledlg.cpp:235
 msgid "New &Paragraph Style..."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:577
-#: ../src/richtext/richtextstyledlg.cpp:582
-#: ../src/richtext/richtextstyledlg.cpp:625
-#: ../src/richtext/richtextstyledlg.cpp:630
-#: ../src/richtext/richtextstyledlg.cpp:780
-#: ../src/richtext/richtextstyledlg.cpp:785
-#: ../src/richtext/richtextstyledlg.cpp:853
-#: ../src/richtext/richtextstyledlg.cpp:861
+#: ../src/richtext/richtextstyledlg.cpp:607
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:655
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:821
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:894
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:935
+#: ../src/richtext/richtextstyledlg.cpp:940
 msgid "New Style"
 msgstr "新增样式"
 
@@ -4945,10 +4837,8 @@ msgstr "新目录"
 msgid "New item"
 msgstr "新项目"
 
-#: ../src/generic/dirdlgg.cpp:327
-#: ../src/generic/dirdlgg.cpp:337
-#: ../src/generic/filectrlg.cpp:647
-#: ../src/generic/filectrlg.cpp:656
+#: ../src/generic/dirdlgg.cpp:327 ../src/generic/dirdlgg.cpp:337
+#: ../src/generic/filectrlg.cpp:647 ../src/generic/filectrlg.cpp:656
 msgid "NewName"
 msgstr "新名称"
 
@@ -4956,13 +4846,11 @@ msgstr "新名称"
 msgid "Next"
 msgstr "下一个"
 
-#: ../src/common/prntbase.cpp:1512
-#: ../src/html/helpwnd.cpp:676
+#: ../src/common/prntbase.cpp:1512 ../src/html/helpwnd.cpp:676
 msgid "Next page"
 msgstr "下一页"
 
-#: ../src/common/stockitem.cpp:178
-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194
 msgid "No"
 msgstr "否"
 
@@ -4971,42 +4859,42 @@ msgstr "否"
 msgid "No animation handler for type %ld defined."
 msgstr "没有类型 %d 的图像处理器."
 
-#: ../src/dfb/bitmap.cpp:643
-#: ../src/dfb/bitmap.cpp:677
+#: ../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:1779
+#: ../src/osx/carbon/dataview.cpp:1785
 msgid "No column existing."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1669
+#: ../src/osx/carbon/dataview.cpp:1675
 msgid "No column for the specified column existing."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1418
+#: ../src/osx/carbon/dataview.cpp:1424
 msgid "No column for the specified column position existing."
 msgstr ""
 
-#: ../src/common/utilscmn.cpp:1045
+#: ../src/common/utilscmn.cpp:1046
 msgid "No default application configured for HTML files."
 msgstr ""
 
 #: ../src/generic/helpext.cpp:450
 msgid "No entries found."
-msgstr "没找到条目"
+msgstr "没找到条目。"
 
 #: ../src/common/fontmap.cpp:420
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
-"Do you want to use this encoding (otherwise you will have to choose another one)?"
+"Do you want to use this encoding (otherwise you will have to choose another "
+"one)?"
 msgstr ""
-"编码 '%s' 的字体未找到, 无法显示文本.\n"
-"但发现另一替代编码 '%s'.\n"
-"是否使用该编码(否则您必须选择另外的编码)?"
+"编码 '%s' 的字体未找到，无法显示文本。\n"
+"但发现另一替代编码 '%s'。\n"
+"是否使用该编码 (否则您必须选择另外的编码)?"
 
 #: ../src/common/fontmap.cpp:425
 #, c-format
@@ -5015,42 +4903,39 @@ 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"
+"编码 '%s' 的字体未找到，无法显示文本。\n"
 "请选择用于该编码的字体\n"
-"(否则该编码的文本将不能正确显示)?"
+"(否则该编码的文本将无法正确显示)?"
 
 #: ../src/generic/animateg.cpp:143
 #, fuzzy
 msgid "No handler found for animation type."
 msgstr "没有找到图像类型处理器."
 
-#: ../src/common/image.cpp:2391
+#: ../src/common/image.cpp:2392
 msgid "No handler found for image type."
-msgstr "没有找到图像类型处理器."
+msgstr "没有找到图像类型处理器。"
 
-#: ../src/common/image.cpp:2399
-#: ../src/common/image.cpp:2500
-#: ../src/common/image.cpp:2553
+#: ../src/common/image.cpp:2400 ../src/common/image.cpp:2511
+#: ../src/common/image.cpp:2564
 #, c-format
 msgid "No image handler for type %d defined."
-msgstr "没有类型 %d 的图像处理器."
+msgstr "没有类型 %d 的图像处理器。"
 
-#: ../src/common/image.cpp:2523
-#: ../src/common/image.cpp:2567
+#: ../src/common/image.cpp:2534 ../src/common/image.cpp:2578
 #, c-format
 msgid "No image handler for type %s defined."
-msgstr "没有类型 %s的图像处理器."
+msgstr "没有类型 %s的图像处理器。"
 
-#: ../src/html/helpwnd.cpp:871
+#: ../src/html/helpwnd.cpp:873
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
-#: ../src/osx/carbon/dataview.cpp:1671
-#: ../src/osx/carbon/dataview.cpp:1781
+#: ../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:1419
+#: ../src/osx/carbon/dataview.cpp:1425
 msgid "No renderer specified for column."
 msgstr ""
 
@@ -5058,14 +4943,13 @@ msgstr ""
 msgid "No sound"
 msgstr "没有声音"
 
-#: ../src/common/image.cpp:2061
-#: ../src/common/image.cpp:2102
+#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103
 msgid "No unused colour in image being masked."
-msgstr "图像中没有被掩码的未用颜色."
+msgstr "图像中没有被掩码的未用颜色。"
 
-#: ../src/common/image.cpp:3029
+#: ../src/common/image.cpp:3040
 msgid "No unused colour in image."
-msgstr "图像中没有未用的颜色."
+msgstr "图像中没有未用的颜色。"
 
 #: ../src/generic/helpext.cpp:307
 #, c-format
@@ -5073,9 +4957,9 @@ msgid "No valid mappings found in the file \"%s\"."
 msgstr ""
 
 #: ../src/richtext/richtextborderspage.cpp:542
-#: ../src/richtext/richtextsizepage.cpp:172
-#: ../src/richtext/richtextsizepage.cpp:175
-#: ../src/richtext/richtextsizepage.cpp:176
+#: ../src/richtext/richtextsizepage.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:203
+#: ../src/richtext/richtextsizepage.cpp:204
 #, fuzzy
 msgid "None"
 msgstr "完成"
@@ -5084,16 +4968,15 @@ msgstr "完成"
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:329
-#: ../src/generic/fontdlgg.cpp:332
+#: ../src/generic/fontdlgg.cpp:329 ../src/generic/fontdlgg.cpp:332
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpwnd.cpp:1271
+#: ../src/html/helpwnd.cpp:1273
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr "正常字体<br> 且 <u>带下划线</u>."
+msgstr "正常字体<br> 且 <u>带下划线</u>。"
 
-#: ../src/html/helpwnd.cpp:1213
+#: ../src/html/helpwnd.cpp:1215
 msgid "Normal font:"
 msgstr "正常字体:"
 
@@ -5102,8 +4985,7 @@ msgstr "正常字体:"
 msgid "Not %s"
 msgstr "关于(&A)"
 
-#: ../include/wx/filename.h:552
-#: ../include/wx/filename.h:557
+#: ../include/wx/filename.h:558 ../include/wx/filename.h:563
 #, fuzzy
 msgid "Not available"
 msgstr "没有可用的XBM工具!"
@@ -5122,21 +5004,17 @@ msgid "Notice"
 msgstr "注意"
 
 #: ../src/osx/carbon/dataview.cpp:903
-#, fuzzy
 msgid "Number of columns could not be determined."
-msgstr "文件不能被装载."
+msgstr "无法确定列数量。"
 
 #: ../src/richtext/richtextliststylepage.cpp:488
 #: ../src/richtext/richtextbulletspage.cpp:293
 msgid "Numbered outline"
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:286
-#: ../src/common/stockitem.cpp:179
-#: ../src/msw/msgdlg.cpp:483
-#: ../src/msw/msgdlg.cpp:763
-#: ../src/msw/dialog.cpp:120
-#: ../src/gtk1/fontdlg.cpp:139
+#: ../src/richtext/richtextstyledlg.cpp:301 ../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 "确认"
 
@@ -5158,13 +5036,11 @@ msgstr ""
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 
-#: ../src/common/docview.cpp:1733
-#: ../src/common/docview.cpp:1775
+#: ../src/common/docview.cpp:1736 ../src/common/docview.cpp:1778
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../src/html/helpwnd.cpp:682
-#: ../src/html/helpwnd.cpp:1561
+#: ../src/html/helpwnd.cpp:682 ../src/html/helpwnd.cpp:1563
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
@@ -5182,12 +5058,10 @@ msgstr "打开..."
 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
+#: ../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 "不允许的操作."
+msgstr "不允许的操作。"
 
 #: ../src/common/cmdline.cpp:728
 #, fuzzy, c-format
@@ -5197,20 +5071,18 @@ msgstr "目录'%s'不能被创建"
 #: ../src/common/cmdline.cpp:892
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "选项 '%s' 需要值."
+msgstr "选项 '%s' 需要值。"
 
 #: ../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:188
-#: ../src/generic/prntdlgg.cpp:624
+#: ../src/generic/dirdlgg.cpp:188 ../src/generic/prntdlgg.cpp:624
 msgid "Options"
 msgstr "选项"
 
-#: ../src/generic/prntdlgg.cpp:621
-#: ../src/generic/prntdlgg.cpp:875
+#: ../src/generic/prntdlgg.cpp:621 ../src/generic/prntdlgg.cpp:875
 msgid "Orientation"
 msgstr "方向"
 
@@ -5243,10 +5115,9 @@ msgstr ""
 msgid "PAUSE"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:458
-#: ../src/common/imagpcx.cpp:481
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481
 msgid "PCX: couldn't allocate memory"
-msgstr "PCX: 不能分配内存"
+msgstr "PCX: 无法分配内存"
 
 #: ../src/common/imagpcx.cpp:457
 msgid "PCX: image format unsupported"
@@ -5258,10 +5129,9 @@ msgstr "PCX: 无效图像"
 
 #: ../src/common/imagpcx.cpp:443
 msgid "PCX: this is not a PCX file."
-msgstr "PCX: 不是PCX文件."
+msgstr "PCX: 不是PCX文件。"
 
-#: ../src/common/imagpcx.cpp:460
-#: ../src/common/imagpcx.cpp:482
+#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:482
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 
@@ -5279,17 +5149,16 @@ msgstr ""
 
 #: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
-msgstr "PNM: 不能分配内存."
+msgstr "PNM: 无法分配内存。"
 
 #: ../src/common/imagpnm.cpp:74
 msgid "PNM: File format is not recognized."
-msgstr "PNM: 不能识别的文件格式."
+msgstr "PNM: 无法识别的文件格式。"
 
-#: ../src/common/imagpnm.cpp:113
-#: ../src/common/imagpnm.cpp:135
+#: ../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"
@@ -5414,12 +5283,11 @@ msgstr "页 %d"
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:834
-#: ../src/gtk/print.cpp:771
+#: ../src/gtk/print.cpp:770
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../src/common/prntbase.cpp:480
+#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:480
 #: ../src/gtk/gnome/gprint.cpp:706
 msgid "Page setup"
 msgstr "页面设置"
@@ -5428,15 +5296,9 @@ msgstr "页面设置"
 msgid "Pages"
 msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:807
-#: ../src/generic/prntdlgg.cpp:861
-#: ../src/generic/prntdlgg.cpp:1063
-msgid "Paper Size"
-msgstr "纸张大小"
-
-#: ../src/generic/prntdlgg.cpp:608
-#: ../src/generic/prntdlgg.cpp:848
-#: ../src/generic/prntdlgg.cpp:1058
+#: ../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 "纸张大小"
 
@@ -5452,8 +5314,7 @@ msgstr "传递一个已注册的对象给SetObject"
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
-#: ../src/richtext/richtextctrl.cpp:2772
-#: ../src/common/stockitem.cpp:181
+#: ../src/richtext/richtextctrl.cpp:3075 ../src/common/stockitem.cpp:181
 #: ../src/stc/stc_i18n.cpp:20
 msgid "Paste"
 msgstr "粘贴"
@@ -5471,7 +5332,7 @@ msgstr ""
 msgid "Permissions"
 msgstr "允许"
 
-#: ../src/richtext/richtextbuffer.cpp:10031
+#: ../src/richtext/richtextbuffer.cpp:10251
 #, fuzzy
 msgid "Picture Properties"
 msgstr "属性(&P)"
@@ -5496,18 +5357,18 @@ msgstr "请选择欲显示的页面:"
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
-#: ../src/msw/listctrl.cpp:372
+#: ../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/headerctrlcmn.cpp:59
+#: ../src/common/headerctrlcmn.cpp:60
 msgid "Please select the columns to show and define their order:"
 msgstr ""
 
@@ -5520,38 +5381,28 @@ msgstr "在打印时请等待\n"
 msgid "Point Size"
 msgstr "字体大小(Point size)(&P):"
 
-#: ../src/osx/carbon/dataview.cpp:1273
-#: ../src/osx/carbon/dataview.cpp:1324
-#: ../src/osx/carbon/dataview.cpp:1415
-#: ../src/osx/carbon/dataview.cpp:1438
-#: ../src/osx/carbon/dataview.cpp:1455
-#: ../src/osx/carbon/dataview.cpp:1472
-#: ../src/osx/carbon/dataview.cpp:1665
-#: ../src/osx/carbon/dataview.cpp:1774
-#: ../src/osx/carbon/dataview.cpp:1816
-#: ../src/osx/carbon/dataview.cpp:1869
-#: ../src/osx/carbon/dataview.cpp:1992
+#: ../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:1274
-#: ../src/osx/carbon/dataview.cpp:1333
-#: ../src/osx/carbon/dataview.cpp:1416
-#: ../src/osx/carbon/dataview.cpp:1473
-#: ../src/osx/carbon/dataview.cpp:1666
-#: ../src/osx/carbon/dataview.cpp:1775
-#: ../src/osx/carbon/dataview.cpp:1817
-#: ../src/osx/carbon/dataview.cpp:1870
-#: ../src/osx/carbon/dataview.cpp:1993
+#: ../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
+#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../src/richtext/richtextsizepage.cpp:296
+#: ../src/richtext/richtextsizepage.cpp:432
 #, fuzzy
 msgid "Position"
 msgstr "正在打印 "
@@ -5564,7 +5415,7 @@ msgstr "PostScript文件"
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: ../src/osx/menu_osx.cpp:530
+#: ../src/osx/menu_osx.cpp:550
 msgid "Preferences..."
 msgstr "偏好设置..."
 
@@ -5572,35 +5423,27 @@ msgstr "偏好设置..."
 msgid "Preview..."
 msgstr "预览..."
 
-#: ../src/generic/fontdlgg.cpp:456
-#: ../src/osx/carbon/fontdlg.cpp:564
-#: ../src/html/helpwnd.cpp:1230
+#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
+#: ../src/html/helpwnd.cpp:1232
 msgid "Preview:"
 msgstr "预览:"
 
-#: ../src/common/prntbase.cpp:1498
-#: ../src/html/helpwnd.cpp:675
+#: ../src/common/prntbase.cpp:1498 ../src/html/helpwnd.cpp:675
 msgid "Previous page"
 msgstr "前页"
 
-#: ../src/generic/prntdlgg.cpp:149
-#: ../src/generic/prntdlgg.cpp:163
-#: ../src/common/prntbase.cpp:422
-#: ../src/common/prntbase.cpp:1486
-#: ../src/gtk/print.cpp:590
-#: ../src/gtk/print.cpp:603
-#: ../src/gtk/gnome/gprint.cpp:537
-#: ../src/gtk/gnome/gprint.cpp:549
+#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:422 ../src/common/prntbase.cpp:1486
+#: ../src/gtk/print.cpp:589 ../src/gtk/print.cpp:602
+#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549
 msgid "Print"
 msgstr "打印"
 
-#: ../include/wx/prntbase.h:394
-#: ../src/common/docview.cpp:1241
+#: ../include/wx/prntbase.h:394 ../src/common/docview.cpp:1244
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../src/common/prntbase.cpp:1953
-#: ../src/common/prntbase.cpp:1995
+#: ../src/common/prntbase.cpp:1953 ../src/common/prntbase.cpp:1995
 #: ../src/common/prntbase.cpp:2003
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
@@ -5621,7 +5464,7 @@ msgstr "彩色打印"
 msgid "Print preview"
 msgstr "打印预览"
 
-#: ../src/common/docview.cpp:1235
+#: ../src/common/docview.cpp:1238
 #, fuzzy
 msgid "Print preview creation failed."
 msgstr "管道创建失败"
@@ -5666,13 +5509,11 @@ msgstr "打印机..."
 msgid "Printer:"
 msgstr "打印机:"
 
-#: ../include/wx/richtext/richtextprint.h:164
-#: ../src/html/htmprint.cpp:278
+#: ../include/wx/richtext/richtextprint.h:164 ../src/html/htmprint.cpp:278
 msgid "Printing"
 msgstr "正在打印 "
 
-#: ../src/common/prntbase.cpp:326
-#: ../src/common/prntbase.cpp:561
+#: ../src/common/prntbase.cpp:326 ../src/common/prntbase.cpp:561
 msgid "Printing "
 msgstr "正在打印 "
 
@@ -5689,18 +5530,18 @@ msgstr "正在打印页 %d..."
 msgid "Printing..."
 msgstr "打印..."
 
-#: ../include/wx/richtext/richtextprint.h:110
-#: ../include/wx/prntbase.h:262
-#: ../src/common/docview.cpp:2044
+#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:262
+#: ../src/common/docview.cpp:2047
 msgid "Printout"
 msgstr "打印"
 
 #: ../src/common/debugrpt.cpp:556
 #, c-format
-msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgid ""
+"Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
-#: ../src/osx/carbon/dataview.cpp:2467
+#: ../src/osx/carbon/dataview.cpp:2473
 msgid "Progress renderer cannot render value type; value type: "
 msgstr ""
 
@@ -5712,8 +5553,7 @@ msgstr "属性"
 msgid "Property"
 msgstr "属性"
 
-#: ../src/propgrid/propgrid.cpp:3168
-#: ../src/propgrid/propgrid.cpp:3300
+#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277
 msgid "Property Error"
 msgstr "属性错误"
 
@@ -5721,15 +5561,19 @@ msgstr "属性错误"
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
-#: ../src/generic/logg.cpp:1042
+#: ../src/generic/logg.cpp:1038
 msgid "Question"
 msgstr "问题"
 
-#: ../src/osx/menu_osx.cpp:545
 #: ../src/common/stockitem.cpp:157
 msgid "Quit"
 msgstr "退出"
 
+#: ../src/osx/menu_osx.cpp:564
+#, fuzzy, c-format
+msgid "Quit %s"
+msgstr "退出"
+
 #: ../src/common/stockitem.cpp:264
 msgid "Quit this program"
 msgstr "推出此程序"
@@ -5742,8 +5586,12 @@ msgstr ""
 msgid "RIGHT"
 msgstr ""
 
-#: ../src/common/ffile.cpp:114
-#: ../src/common/ffile.cpp:133
+#: ../src/common/accelcmn.cpp:318
+#, 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'出错"
@@ -5752,8 +5600,7 @@ msgstr "读文件 '%s'出错"
 msgid "Ready"
 msgstr "就绪"
 
-#: ../src/common/stockitem.cpp:186
-#: ../src/stc/stc_i18n.cpp:17
+#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17
 msgid "Redo"
 msgstr "恢复"
 
@@ -5773,7 +5620,7 @@ msgstr "注册键 '%s' 已存在."
 #: ../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:727
 #, c-format
@@ -5813,12 +5660,12 @@ msgstr "从书签中移去当前页"
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
-#: ../src/osx/carbon/dataview.cpp:1425
+#: ../src/osx/carbon/dataview.cpp:1431
 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 
-#: ../src/richtext/richtextbuffer.cpp:3898
+#: ../src/richtext/richtextbuffer.cpp:4091
 msgid "Renumber List"
 msgstr ""
 
@@ -5826,8 +5673,7 @@ msgstr ""
 msgid "Rep&lace"
 msgstr "替换(&l)"
 
-#: ../src/richtext/richtextctrl.cpp:2931
-#: ../src/common/stockitem.cpp:189
+#: ../src/richtext/richtextctrl.cpp:3234 ../src/common/stockitem.cpp:189
 #, fuzzy
 msgid "Replace"
 msgstr "替换(&R)"
@@ -5865,7 +5711,7 @@ msgstr "细"
 
 #: ../src/richtext/richtextliststylepage.cpp:252
 #: ../src/richtext/richtextbulletspage.cpp:202
-#: ../src/richtext/richtextsizepage.cpp:174
+#: ../src/richtext/richtextsizepage.cpp:202
 msgid "Right"
 msgstr "右"
 
@@ -5909,8 +5755,7 @@ msgstr ""
 msgid "SPACE"
 msgstr ""
 
-#: ../src/common/accelcmn.cpp:256
-#: ../src/common/accelcmn.cpp:322
+#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:328
 msgid "SPECIAL"
 msgstr ""
 
@@ -5918,8 +5763,7 @@ msgstr ""
 msgid "SUBTRACT"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:191
-#: ../src/common/sizer.cpp:2577
+#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2577
 msgid "Save"
 msgstr "保存"
 
@@ -5928,6 +5772,10 @@ msgstr "保存"
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
+#: ../src/generic/logg.cpp:520
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
 #: ../src/common/docview.cpp:362
 msgid "Save As"
 msgstr "另存为"
@@ -5945,7 +5793,7 @@ msgstr "选择文档视图"
 msgid "Save current document with a different filename"
 msgstr ""
 
-#: ../src/generic/logg.cpp:524
+#: ../src/generic/logg.cpp:520
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
@@ -5953,15 +5801,16 @@ msgstr "把日志内容保存到文件"
 msgid "Script"
 msgstr "Script"
 
-#: ../src/generic/srchctlg.cpp:68
-#: ../src/html/helpwnd.cpp:546
+#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:546
 #: ../src/html/helpwnd.cpp:561
 msgid "Search"
 msgstr "搜索"
 
 #: ../src/html/helpwnd.cpp:548
 #, fuzzy
-msgid "Search contents of help book(s) for all occurrences of the text you typed above"
+msgid ""
+"Search contents of help book(s) for all occurrences of the text you typed "
+"above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:161
@@ -5972,11 +5821,11 @@ msgstr "搜索方向"
 msgid "Search for:"
 msgstr "搜索:"
 
-#: ../src/html/helpwnd.cpp:1060
+#: ../src/html/helpwnd.cpp:1062
 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 
-#: ../src/html/helpwnd.cpp:870
+#: ../src/html/helpwnd.cpp:872
 msgid "Searching..."
 msgstr "搜索中..."
 
@@ -5987,30 +5836,27 @@ msgstr "段"
 #: ../src/common/ffile.cpp:219
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "文件 '%s'定位错误"
+msgstr "文件 '%s' 定位错误"
 
 #: ../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/richtext/richtextctrl.cpp:315
-#: ../src/osx/textctrl_osx.cpp:590
-#: ../src/common/stockitem.cpp:193
-#: ../src/msw/textctrl.cpp:2215
+#: ../src/richtext/richtextctrl.cpp:330 ../src/osx/textctrl_osx.cpp:588
+#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227
 msgid "Select &All"
 msgstr "全部选择(&A)"
 
-#: ../src/common/stockitem.cpp:193
-#: ../src/stc/stc_i18n.cpp:22
+#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22
 msgid "Select All"
 msgstr "全部选择"
 
-#: ../src/common/docview.cpp:1855
+#: ../src/common/docview.cpp:1858
 msgid "Select a document template"
 msgstr "选择文档模板"
 
-#: ../src/common/docview.cpp:1929
+#: ../src/common/docview.cpp:1932
 msgid "Select a document view"
 msgstr "选择文档视图"
 
@@ -6041,18 +5887,18 @@ msgstr ""
 #: ../src/common/cmdline.cpp:911
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "期望在选项 '%s'后存在分隔符."
+msgstr "期望在选项 '%s' 后存在分隔符。"
 
-#: ../src/richtext/richtextbuffer.cpp:9014
+#: ../src/richtext/richtextbuffer.cpp:9221
 #, fuzzy
 msgid "Set Cell Style"
 msgstr "删除项"
 
-#: ../include/wx/xtiprop.h:178
+#: ../include/wx/xtiprop.h:180
 msgid "SetProperty called w/o valid setter"
-msgstr "调用SetProperty时未带有效的setter"
+msgstr "调用 SetProperty 时未带有效的 setter"
 
-#: ../src/common/filename.cpp:2482
+#: ../src/common/filename.cpp:2533
 msgid "Setting directory access times is not supported under this OS version"
 msgstr ""
 
@@ -6064,7 +5910,7 @@ msgstr "设置..."
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
-#: ../src/common/accelcmn.cpp:313
+#: ../src/common/accelcmn.cpp:315
 msgid "Shift+"
 msgstr "Shift+"
 
@@ -6078,7 +5924,7 @@ msgstr "显示隐藏目录"
 msgid "Show &hidden files"
 msgstr "显示隐藏文件"
 
-#: ../src/osx/menu_osx.cpp:541
+#: ../src/osx/menu_osx.cpp:559
 #, fuzzy
 msgid "Show All"
 msgstr "全部显示"
@@ -6120,8 +5966,7 @@ msgstr ""
 msgid "Shows a preview of the font settings."
 msgstr ""
 
-#: ../src/osx/carbon/fontdlg.cpp:568
-#: ../src/osx/carbon/fontdlg.cpp:570
+#: ../src/osx/carbon/fontdlg.cpp:578 ../src/osx/carbon/fontdlg.cpp:580
 msgid "Shows a preview of the font."
 msgstr ""
 
@@ -6130,10 +5975,9 @@ msgstr ""
 msgid "Shows a preview of the paragraph settings."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:461
-#: ../src/generic/fontdlgg.cpp:463
+#: ../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"
@@ -6144,19 +5988,17 @@ msgstr ""
 msgid "Single"
 msgstr ""
 
-#: ../src/generic/filectrlg.cpp:454
-#: ../src/richtext/richtextformatdlg.cpp:353
-#: ../src/richtext/richtextsizepage.cpp:185
+#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:351
+#: ../src/richtext/richtextsizepage.cpp:213
 msgid "Size"
 msgstr "大小"
 
-#: ../src/osx/carbon/fontdlg.cpp:513
+#: ../src/osx/carbon/fontdlg.cpp:523
 msgid "Size:"
 msgstr "大小:"
 
-#: ../src/generic/progdlgg.cpp:253
-#: ../src/generic/progdlgg.cpp:763
-#: ../src/msw/progdlg.cpp:800
+#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
+#: ../src/msw/progdlg.cpp:802
 msgid "Skip"
 msgstr "跳过"
 
@@ -6169,34 +6011,34 @@ msgstr "倾斜"
 msgid "Solid"
 msgstr "粗体"
 
-#: ../src/common/docview.cpp:1751
+#: ../src/common/docview.cpp:1754
 msgid "Sorry, could not open this file."
-msgstr "对不起, 不能打开文件."
+msgstr "对不起，无法打开文件。"
 
-#: ../src/common/prntbase.cpp:1995
-#: ../src/common/prntbase.cpp:2003
+#: ../src/common/prntbase.cpp:1995 ../src/common/prntbase.cpp:2003
 msgid "Sorry, not enough memory to create a preview."
-msgstr "对不起, 没有足够内存创建预览."
+msgstr "对不起，没有足够内存创建预览。"
 
-#: ../src/richtext/richtextstyledlg.cpp:582
-#: ../src/richtext/richtextstyledlg.cpp:630
-#: ../src/richtext/richtextstyledlg.cpp:785
-#: ../src/richtext/richtextstyledlg.cpp:861
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:940
 msgid "Sorry, that name is taken. Please choose another."
 msgstr ""
 
-#: ../src/common/docview.cpp:1774
+#: ../src/common/docview.cpp:1777
 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/richtext/richtextliststylepage.cpp:468
 #, fuzzy
@@ -6214,7 +6056,7 @@ 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/generic/prntdlgg.cpp:210
 msgid "Status:"
@@ -6233,8 +6075,7 @@ msgstr ""
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
-#: ../src/richtext/richtextformatdlg.cpp:315
-#: ../src/propgrid/advprops.cpp:648
+#: ../src/richtext/richtextformatdlg.cpp:313 ../src/propgrid/advprops.cpp:648
 msgid "Style"
 msgstr "样式"
 
@@ -6242,7 +6083,7 @@ msgstr "样式"
 msgid "Style Organiser"
 msgstr ""
 
-#: ../src/osx/carbon/fontdlg.cpp:522
+#: ../src/osx/carbon/fontdlg.cpp:532
 msgid "Style:"
 msgstr "样式:"
 
@@ -6258,11 +6099,11 @@ msgstr "Script"
 
 #: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"
-msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"
+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 毫米"
+msgstr "SuperB/SuperB/A3 纸张，305 x 487 毫米"
 
 #: ../src/generic/fontdlgg.cpp:327
 msgid "Swiss"
@@ -6283,46 +6124,45 @@ msgstr "正常字体:"
 msgid "TAB"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:377
-#: ../src/common/imagtiff.cpp:390
-#: ../src/common/imagtiff.cpp:749
+#: ../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:309
+#: ../src/common/imagtiff.cpp:305
 msgid "TIFF: Error loading image."
-msgstr "TIFF: 装载图像错误."
+msgstr "TIFF: 装载图像错误。"
 
-#: ../src/common/imagtiff.cpp:476
+#: ../src/common/imagtiff.cpp:472
 msgid "TIFF: Error reading image."
-msgstr "TIFF: 读图像错误."
+msgstr "TIFF: 读图像错误。"
 
-#: ../src/common/imagtiff.cpp:616
+#: ../src/common/imagtiff.cpp:612
 msgid "TIFF: Error saving image."
-msgstr "TIFF: 保存图像错误."
+msgstr "TIFF: 保存图像错误。"
 
-#: ../src/common/imagtiff.cpp:854
+#: ../src/common/imagtiff.cpp:850
 msgid "TIFF: Error writing image."
-msgstr "TIFF: 写图像错误."
+msgstr "TIFF: 写图像错误。"
 
-#: ../src/common/imagtiff.cpp:363
+#: ../src/common/imagtiff.cpp:359
 msgid "TIFF: Image size is abnormally big."
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:9155
+#: ../src/richtext/richtextbuffer.cpp:9362
 #, fuzzy
 msgid "Table Properties"
 msgstr "属性(&P)"
 
 #: ../src/common/paper.cpp:147
 msgid "Tabloid Extra 11.69 x 18 in"
-msgstr "小报(特大), 11.69 x 18 英寸"
+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:333
+#: ../src/richtext/richtextformatdlg.cpp:331
 msgid "Tabs"
 msgstr ""
 
@@ -6330,11 +6170,11 @@ msgstr ""
 msgid "Teletype"
 msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1856
+#: ../src/common/docview.cpp:1859
 msgid "Templates"
 msgstr "模板"
 
-#: ../src/osx/carbon/dataview.cpp:2368
+#: ../src/osx/carbon/dataview.cpp:2374
 msgid "Text renderer cannot render value; value type: "
 msgstr ""
 
@@ -6344,11 +6184,11 @@ msgstr "泰语 (ISO-8859-11)"
 
 #: ../src/common/ftp.cpp:623
 msgid "The FTP server doesn't support passive mode."
-msgstr "FTP服务器不支持passive模式."
+msgstr "FTP服务器不支持 passive 模式。"
 
 #: ../src/common/ftp.cpp:609
 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
@@ -6357,8 +6197,8 @@ msgstr "FTP服务器不支持PORT命令."
 msgid "The available bullet styles."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:197
-#: ../src/richtext/richtextstyledlg.cpp:199
+#: ../src/richtext/richtextstyledlg.cpp:206
+#: ../src/richtext/richtextstyledlg.cpp:208
 #, fuzzy
 msgid "The available styles."
 msgstr "字体风格."
@@ -6404,14 +6244,13 @@ 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:162
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "剪贴板格式 '%d' 不存在."
+msgstr "剪贴板格式 '%d' 不存在。"
 
 #: ../src/richtext/richtextstylepage.cpp:129
 #: ../src/richtext/richtextstylepage.cpp:131
@@ -6424,25 +6263,26 @@ 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"
+"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:1175
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1178
+#, 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"
-"已从最近使用的文件列表(MRU)中移去."
+"文件 '%s' 不存在所以无法打开。\n"
+"已从最近使用的文件列表中移去。"
 
 #: ../src/richtext/richtextindentspage.cpp:221
 #: ../src/richtext/richtextindentspage.cpp:223
@@ -6456,48 +6296,41 @@ msgstr "字体大小(磅值)."
 msgid "The following standard GTK+ options are also supported:\n"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:415
-#: ../src/generic/fontdlgg.cpp:417
+#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417
 msgid "The font colour."
-msgstr "字体颜色."
+msgstr "字体颜色。"
 
-#: ../src/generic/fontdlgg.cpp:376
-#: ../src/generic/fontdlgg.cpp:378
+#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378
 msgid "The font family."
-msgstr "字体."
+msgstr "字体。"
 
 #: ../src/richtext/richtextsymboldlg.cpp:402
 #: ../src/richtext/richtextsymboldlg.cpp:404
 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
+#: ../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 "字体大小(磅值)."
+msgstr "字体大小 (磅值)。"
 
-#: ../src/osx/carbon/fontdlg.cpp:517
-#: ../src/osx/carbon/fontdlg.cpp:519
+#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529
 #, fuzzy
 msgid "The font size in points."
 msgstr "字体大小(磅值)."
 
-#: ../src/generic/fontdlgg.cpp:387
-#: ../src/generic/fontdlgg.cpp:389
+#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389
 msgid "The font style."
-msgstr "字体风格."
+msgstr "字体风格。"
 
-#: ../src/generic/fontdlgg.cpp:398
-#: ../src/generic/fontdlgg.cpp:400
+#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400
 msgid "The font weight."
-msgstr "字体粗细."
+msgstr "字体粗细。"
 
-#: ../src/common/docview.cpp:1436
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1439
+#, c-format
 msgid "The format of file '%s' couldn't be determined."
-msgstr "目录'%s'不能被创建"
+msgstr "无法确定文件 '%s' 格式。"
 
 #: ../src/richtext/richtextindentspage.cpp:212
 #: ../src/richtext/richtextindentspage.cpp:214
@@ -6535,14 +6368,38 @@ msgstr ""
 msgid "The locale ID is unknown."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:238
-#: ../src/richtext/richtextsizepage.cpp:240
+#: ../src/richtext/richtextsizepage.cpp:266
+#: ../src/richtext/richtextsizepage.cpp:268
 #, fuzzy
 msgid "The object height."
 msgstr "字体粗细."
 
-#: ../src/richtext/richtextsizepage.cpp:211
-#: ../src/richtext/richtextsizepage.cpp:213
+#: ../src/richtext/richtextsizepage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:376
+#, fuzzy
+msgid "The object maximum height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:347
+#: ../src/richtext/richtextsizepage.cpp:349
+#, fuzzy
+msgid "The object maximum width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:293
+#: ../src/richtext/richtextsizepage.cpp:295
+#, fuzzy
+msgid "The object minimum width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:320
+#: ../src/richtext/richtextsizepage.cpp:322
+#, fuzzy
+msgid "The object minmum height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:239
+#: ../src/richtext/richtextsizepage.cpp:241
 #, fuzzy
 msgid "The object width."
 msgstr "字体粗细."
@@ -6553,18 +6410,17 @@ msgstr "字体粗细."
 msgid "The outline level."
 msgstr "显示字体预览."
 
-#: ../src/common/log.cpp:230
+#: ../src/common/log.cpp:284
 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""
 
-#: ../src/common/log.cpp:223
+#: ../src/common/log.cpp:277
 msgid "The previous message repeated once."
 msgstr ""
 
-#: ../src/gtk/print.cpp:923
-#: ../src/gtk/print.cpp:1106
+#: ../src/gtk/print.cpp:922 ../src/gtk/print.cpp:1105
 msgid "The print dialog returned an error."
 msgstr ""
 
@@ -6575,16 +6431,17 @@ msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:319
 msgid ""
-"The report contains the files listed below. If any of these files contain private information,\n"
+"The report contains the files listed below. If any of these files contain "
+"private information,\n"
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
-"报告包含了以下文件. 如果这些文件含有私人信息, \n"
-"请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
+"报告包含了以下文件。如果这些文件含有私人信息，\n"
+"请去掉选中相应的文件，未选中的文件就会从报告中删除。\n"
 
 #: ../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
@@ -6629,8 +6486,8 @@ msgstr "字体风格."
 msgid "The style on which this style is based."
 msgstr ""
 
-#: ../src/richtext/richtextstyledlg.cpp:209
-#: ../src/richtext/richtextstyledlg.cpp:211
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:220
 #, fuzzy
 msgid "The style preview."
 msgstr "显示字体预览."
@@ -6650,9 +6507,9 @@ msgstr "字体大小(磅值)."
 msgid "The tab positions."
 msgstr "字体大小(磅值)."
 
-#: ../src/richtext/richtextctrl.cpp:2398
+#: ../src/richtext/richtextctrl.cpp:2682
 msgid "The text couldn't be saved."
-msgstr "文本不能被保存."
+msgstr "文本无法保存。"
 
 #: ../src/richtext/richtextmarginspage.cpp:243
 #: ../src/richtext/richtextmarginspage.cpp:245
@@ -6669,60 +6526,80 @@ 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:453
 #, fuzzy, c-format
-msgid "The version of remote access service (RAS) installed on this machine is too old, please upgrade (the following required function is missing: %s)."
+msgid ""
+"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/richtext/richtextsizepage.cpp:323
-#: ../src/richtext/richtextsizepage.cpp:325
+#: ../src/richtext/richtextsizepage.cpp:459
+#: ../src/richtext/richtextsizepage.cpp:461
 msgid "The vertical offset relative to the paragraph."
 msgstr ""
 
-#: ../src/gtk/print.cpp:951
+#: ../src/gtk/print.cpp:950
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1335
+#: ../src/osx/carbon/dataview.cpp:1341
 msgid "There is no column or renderer for the specified column index."
 msgstr ""
 
-#: ../src/richtext/richtextprint.cpp:606
-#: ../src/html/htmprint.cpp:736
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机."
+#: ../src/richtext/richtextprint.cpp:608 ../src/html/htmprint.cpp:736
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
 
 #: ../src/html/htmprint.cpp:256
-msgid "This document doesn't fit on the page horizontally and will be truncated when it is printed."
+msgid ""
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."
 msgstr ""
 
-#: ../src/common/image.cpp:2506
+#: ../src/common/image.cpp:2517
 #, c-format
 msgid "This is not a %s."
-msgstr "这不是 %s."
+msgstr "这不是 %s。"
+
+#: ../src/common/wincmn.cpp:1584
+msgid "This platform does not support background transparency."
+msgstr ""
+
+#: ../src/gtk/window.cpp:4147
+msgid ""
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."
+msgstr ""
 
 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy
-msgid "This system doesn't support date controls, please upgrade your version of comctl32.dll"
+msgid ""
+"This system doesn't support date controls, please upgrade your version of "
+"comctl32.dll"
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
-#: ../src/msw/thread.cpp:1267
-msgid "Thread module initialization failed: cannot store value in thread local storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
+#: ../src/msw/thread.cpp:1288
+msgid ""
+"Thread module initialization failed: cannot store value in thread local "
+"storage"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 
 #: ../src/unix/threadpsx.cpp:1714
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
-#: ../src/msw/thread.cpp:1255
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
+#: ../src/msw/thread.cpp:1276
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 
 #: ../src/unix/threadpsx.cpp:1216
 msgid "Thread priority setting is ignored."
-msgstr "线程优先级设置被忽略."
+msgstr "线程优先级设置被忽略。"
 
 #: ../src/msw/mdi.cpp:165
 msgid "Tile &Horizontally"
@@ -6734,7 +6611,7 @@ msgstr "垂直排布(&V)"
 
 #: ../src/common/ftp.cpp:205
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
-msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
+msgstr "等待FTP服务器连接时超时，请尝试用 passive 模式。"
 
 #: ../src/os2/timer.cpp:100
 msgid "Timer creation failed."
@@ -6746,28 +6623,27 @@ msgstr "每日技巧"
 
 #: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"
-msgstr "对不起, 没有所需技巧!"
+msgstr "对不起，没有所需技巧!"
 
 #: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 
-#: ../src/osx/carbon/dataview.cpp:2446
+#: ../src/osx/carbon/dataview.cpp:2452
 msgid "Toggle renderer cannot render value; value type: "
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:7074
+#: ../src/richtext/richtextbuffer.cpp:7276
 msgid "Too many EndStyle calls!"
 msgstr ""
 
-#: ../src/common/imagpng.cpp:289
+#: ../src/common/imagpng.cpp:287
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
+msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 
-#: ../src/richtext/richtextsizepage.cpp:280
-#: ../src/richtext/richtextsizepage.cpp:283
-#: ../src/richtext/richtextsizepage.cpp:284
-#: ../src/common/stockitem.cpp:201
+#: ../src/richtext/richtextsizepage.cpp:416
+#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:420 ../src/common/stockitem.cpp:201
 msgid "Top"
 msgstr "顶端"
 
@@ -6787,10 +6663,10 @@ msgstr ""
 msgid "True"
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:232
+#: ../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/fmapbase.cpp:155
 msgid "Turkish (ISO-8859-9)"
@@ -6803,7 +6679,7 @@ msgstr "类型"
 #: ../src/richtext/richtextfontpage.cpp:148
 #: ../src/richtext/richtextfontpage.cpp:150
 msgid "Type a font name."
-msgstr "输入字体名称."
+msgstr "输入字体名称。"
 
 #: ../src/richtext/richtextfontpage.cpp:166
 #: ../src/richtext/richtextfontpage.cpp:168
@@ -6815,15 +6691,16 @@ msgstr ""
 msgid "Type mismatch in argument %u."
 msgstr ""
 
-#: ../src/common/xtixml.cpp:357
-#: ../src/common/xtixml.cpp:510
+#: ../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/propgrid/propgridiface.cpp:383
 #, c-format
-msgid "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"."
+msgid ""
+"Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
+"\"%s\"."
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:59
@@ -6832,7 +6709,7 @@ msgstr ""
 
 #: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "美国标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿，14 7/8 x 11 英寸"
 
 #: ../src/common/fmapbase.cpp:193
 msgid "US-ASCII"
@@ -6866,9 +6743,9 @@ msgid "Unable to close path '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
 #: ../include/wx/msw/private/fswatcher.h:49
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to close the handle for '%s'"
-msgstr "关闭文件句柄失败."
+msgstr "无法关闭 '%s' 的句柄。"
 
 #: ../include/wx/msw/private/fswatcher.h:241
 #, fuzzy
@@ -6898,7 +6775,7 @@ msgstr ""
 msgid "Unable to get events from kqueue"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1898
+#: ../src/osx/carbon/dataview.cpp:1904
 msgid "Unable to handle native drag&drop data"
 msgstr ""
 
@@ -6907,32 +6784,30 @@ msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr ""
 
 #: ../src/gtk/app.cpp:273
-#, fuzzy
 msgid "Unable to initialize Hildon program"
-msgstr "不能初始化OpenGL"
+msgstr "无法初始化 Hildon 程序"
 
 #: ../include/wx/unix/private/fswatcher_kqueue.h:58
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to open path '%s'"
-msgstr "打开CHM存档 '%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:369
 msgid "Unable to play sound asynchronously."
-msgstr "不能异步地播放声音."
+msgstr "无法异步地播放声音。"
 
 #: ../include/wx/msw/private/fswatcher.h:208
 msgid "Unable to post completion status"
 msgstr ""
 
 #: ../src/unix/fswatcher_inotify.cpp:330
-#, fuzzy
 msgid "Unable to read from inotify descriptor"
-msgstr "不能从文件描述子 %d中读"
+msgstr "无法读取 inotify 描述符"
 
 #: ../src/unix/fswatcher_inotify.cpp:133
 msgid "Unable to remove inotify watch"
@@ -6943,9 +6818,9 @@ msgid "Unable to remove kqueue watch"
 msgstr ""
 
 #: ../src/msw/fswatcher.cpp:169
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to set up watch for '%s'"
-msgstr "对文件 '%s'进行touch操作失败"
+msgstr "无法为 '%s' 设定 watch"
 
 #: ../src/msw/fswatcher.cpp:92
 msgid "Unable to start IOCP worker thread"
@@ -6959,14 +6834,12 @@ msgstr "取消删除"
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/richtext/richtextfontpage.cpp:301
-#: ../src/osx/carbon/fontdlg.cpp:544
+#: ../src/richtext/richtextfontpage.cpp:301 ../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
+#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16
 msgid "Undo"
 msgstr "撤销"
 
@@ -6975,9 +6848,9 @@ msgid "Undo last action"
 msgstr "撤销上一次操作"
 
 #: ../src/common/cmdline.cpp:857
-#, fuzzy, c-format
+#, c-format
 msgid "Unexpected characters following option '%s'."
-msgstr "意外参数 '%s'"
+msgstr "选项 '%s' 后有意外字符。"
 
 #: ../src/common/cmdline.cpp:1017
 #, c-format
@@ -6997,41 +6870,39 @@ msgstr "不能等候线程终止"
 #: ../src/richtext/richtextsymboldlg.cpp:457
 #: ../src/richtext/richtextsymboldlg.cpp:458
 msgid "Unicode"
-msgstr "Unicode编码"
+msgstr "Unicode 编码"
 
-#: ../src/common/fmapbase.cpp:182
-#: ../src/common/fmapbase.cpp:188
+#: ../src/common/fmapbase.cpp:182 ../src/common/fmapbase.cpp:188
 msgid "Unicode 16 bit (UTF-16)"
-msgstr "16位的Unicode编码 (UTF-16)"
+msgstr "16位的 Unicode 编码 (UTF-16)"
 
 #: ../src/common/fmapbase.cpp:187
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
-msgstr "16位大字节序Unicode编码 (UTF-16BE)"
+msgstr "16位大字节序 Unicode 编码 (UTF-16BE)"
 
 #: ../src/common/fmapbase.cpp:183
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
-msgstr "16位小字节序Unicode编码 (UTF-16LE)"
+msgstr "16位小字节序 Unicode 编码 (UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:184
-#: ../src/common/fmapbase.cpp:190
+#: ../src/common/fmapbase.cpp:184 ../src/common/fmapbase.cpp:190
 msgid "Unicode 32 bit (UTF-32)"
-msgstr "32位的Unicode编码 (UTF-32)"
+msgstr "32位的 Unicode 编码 (UTF-32)"
 
 #: ../src/common/fmapbase.cpp:189
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
-msgstr "32位大字节序Unicode编码 (UTF-32BE)"
+msgstr "32位大字节序 Unicode 编码 (UTF-32BE)"
 
 #: ../src/common/fmapbase.cpp:185
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
-msgstr "32位小字节序Unicode编码 (UTF-32LE)"
+msgstr "32位小字节序 Unicode 编码 (UTF-32LE)"
 
 #: ../src/common/fmapbase.cpp:179
 msgid "Unicode 7 bit (UTF-7)"
-msgstr "7位的Unicode编码 (UTF-7)"
+msgstr "7位的 Unicode 编码 (UTF-7)"
 
 #: ../src/common/fmapbase.cpp:180
 msgid "Unicode 8 bit (UTF-8)"
-msgstr "8位的Unicode编码 (UTF-8)"
+msgstr "8位的 Unicode 编码 (UTF-8)"
 
 #: ../src/common/stockitem.cpp:205
 msgid "Unindent"
@@ -7077,18 +6948,42 @@ msgstr ""
 msgid "Units for the left padding."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:249
-#: ../src/richtext/richtextsizepage.cpp:251
+#: ../src/richtext/richtextsizepage.cpp:385
+#: ../src/richtext/richtextsizepage.cpp:387
+#, fuzzy
+msgid "Units for the maximum object height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:358
+#: ../src/richtext/richtextsizepage.cpp:360
+#, fuzzy
+msgid "Units for the maximum object width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:331
+#: ../src/richtext/richtextsizepage.cpp:333
+#, fuzzy
+msgid "Units for the minimum object height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:304
+#: ../src/richtext/richtextsizepage.cpp:306
+#, fuzzy
+msgid "Units for the minimum object width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:277
+#: ../src/richtext/richtextsizepage.cpp:279
 msgid "Units for the object height."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:333
-#: ../src/richtext/richtextsizepage.cpp:335
+#: ../src/richtext/richtextsizepage.cpp:469
+#: ../src/richtext/richtextsizepage.cpp:471
 msgid "Units for the object offset."
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:222
-#: ../src/richtext/richtextsizepage.cpp:224
+#: ../src/richtext/richtextsizepage.cpp:250
+#: ../src/richtext/richtextsizepage.cpp:252
 msgid "Units for the object width."
 msgstr ""
 
@@ -7133,36 +7028,35 @@ msgstr ""
 msgid "Units for the top padding."
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:372
-#: ../src/generic/progdlgg.cpp:645
+#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/msw/dde.cpp:1174
+#: ../src/msw/dde.cpp:1178
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 
 #: ../src/common/xtistrm.cpp:415
 msgid "Unknown Object passed to GetObjectClassInfo"
-msgstr "未知的对象被传递给GetObjectClassInfo"
+msgstr "未知的对象传递给 GetObjectClassInfo"
 
-#: ../src/common/imagpng.cpp:617
-#, fuzzy, c-format
+#: ../src/common/imagpng.cpp:615
+#, c-format
 msgid "Unknown PNG resolution unit %d"
-msgstr "未知选项 '%s'"
+msgstr "未知 PNG 解析度单位 %d"
 
 #: ../src/common/xtixml.cpp:328
 #, c-format
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 
-#: ../src/common/imagtiff.cpp:537
+#: ../src/common/imagtiff.cpp:533
 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1973
+#: ../src/osx/carbon/dataview.cpp:1979
 msgid "Unknown data format"
 msgstr "未知数据格式"
 
@@ -7184,10 +7078,9 @@ msgstr "未知错误 %08x"
 msgid "Unknown exception"
 msgstr "未知异常"
 
-#: ../src/common/image.cpp:2491
-#, fuzzy
+#: ../src/common/image.cpp:2502
 msgid "Unknown image data format."
-msgstr "未知数据格式"
+msgstr "未知图像数据格式"
 
 #: ../src/common/cmdline.cpp:742
 #, c-format
@@ -7195,12 +7088,10 @@ msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
 #: ../src/msw/ole/automtn.cpp:602
-#, fuzzy
 msgid "Unknown name or named argument."
-msgstr "未知数据格式"
+msgstr "未知名称或者命名参数"
 
-#: ../src/common/cmdline.cpp:757
-#: ../src/common/cmdline.cpp:779
+#: ../src/common/cmdline.cpp:757 ../src/common/cmdline.cpp:779
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
@@ -7208,31 +7099,27 @@ msgstr "未知选项 '%s'"
 #: ../src/common/mimecmn.cpp:231
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "类型 %s中有不配套的'{'."
+msgstr "类型 %s 中有不配套的 '{'。"
 
-#: ../src/common/cmdproc.cpp:263
-#: ../src/common/cmdproc.cpp:289
+#: ../src/common/cmdproc.cpp:263 ../src/common/cmdproc.cpp:289
 #: ../src/common/cmdproc.cpp:309
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
-#: ../src/propgrid/propgrid.cpp:398
-#, fuzzy
+#: ../src/propgrid/propgrid.cpp:399
 msgid "Unspecified"
-msgstr "分散对齐"
+msgstr "未指定"
 
-#: ../src/msw/clipbrd.cpp:269
-#: ../src/msw/clipbrd.cpp:441
+#: ../src/msw/clipbrd.cpp:269 ../src/msw/clipbrd.cpp:441
 msgid "Unsupported clipboard format."
-msgstr "不支持的剪贴板格式."
+msgstr "不支持的剪贴板格式。"
 
 #: ../src/common/appcmn.cpp:229
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "不支持的主题 '%s'."
+msgstr "不支持的主题 '%s'。"
 
-#: ../src/generic/fdrepdlg.cpp:153
-#: ../src/common/stockitem.cpp:206
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206
 msgid "Up"
 msgstr "向上"
 
@@ -7258,8 +7145,7 @@ msgstr "用法: %s"
 msgid "Use the current alignment setting."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:2653
-#: ../src/osx/carbon/dataview.cpp:2718
+#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724
 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 
@@ -7281,34 +7167,33 @@ msgstr ""
 msgid "Value must be %s or less."
 msgstr ""
 
-#: ../src/propgrid/props.cpp:389
-#: ../src/propgrid/props.cpp:416
-#, fuzzy, c-format
+#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416
+#, c-format
 msgid "Value must be between %s and %s."
-msgstr "输入页码范围(%d 至 %d):"
+msgstr "数值必须在 %s 和 %s 之间。"
 
 #: ../src/generic/aboutdlgg.cpp:129
 msgid "Version "
 msgstr "版本"
 
-#: ../src/richtext/richtextsizepage.cpp:314
+#: ../src/richtext/richtextsizepage.cpp:450
 msgid "Vertical &Offset:"
 msgstr ""
 
-#: ../src/richtext/richtextsizepage.cpp:285
-#: ../src/richtext/richtextsizepage.cpp:287
+#: ../src/richtext/richtextsizepage.cpp:421
+#: ../src/richtext/richtextsizepage.cpp:423
 msgid "Vertical alignment."
-msgstr "垂直对齐."
+msgstr "垂直对齐。"
 
-#: ../src/generic/filedlgg.cpp:218
+#: ../src/generic/filedlgg.cpp:216
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
-#: ../src/generic/filedlgg.cpp:216
+#: ../src/generic/filedlgg.cpp:214
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1930
+#: ../src/common/docview.cpp:1933
 msgid "Views"
 msgstr "视图"
 
@@ -7325,11 +7210,11 @@ msgid "WINDOWS_RIGHT"
 msgstr ""
 
 #: ../src/unix/epolldispatcher.cpp:214
-#, fuzzy, c-format
+#, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
-msgstr "等待子过程终止失败"
+msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 
-#: ../src/common/log.cpp:429
+#: ../src/common/log.cpp:230
 msgid "Warning: "
 msgstr "警告: "
 
@@ -7343,12 +7228,11 @@ msgstr "西欧 (ISO-8859-1)"
 
 #: ../src/common/fmapbase.cpp:161
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "西欧(带欧元符号) (ISO-8859-15)"
+msgstr "西欧带欧元符号 (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:447
-#: ../src/generic/fontdlgg.cpp:449
+#: ../src/generic/fontdlgg.cpp:447 ../src/generic/fontdlgg.cpp:449
 msgid "Whether the font is underlined."
-msgstr "字体是否为下划线."
+msgstr "字体是否为下划线。"
 
 #: ../src/generic/fdrepdlg.cpp:145
 msgid "Whole word"
@@ -7360,11 +7244,11 @@ msgstr "仅为整字"
 
 #: ../src/univ/themes/win32.cpp:1105
 msgid "Win32 theme"
-msgstr "Win32主题(theme)"
+msgstr "Win32 主题"
 
 #: ../src/msw/utils.cpp:1228
 msgid "Win32s on Windows 3.1"
-msgstr "Windows 3.1上的Win32s"
+msgstr "Windows 3.1 上的 Win32s"
 
 #: ../src/msw/utils.cpp:1278
 msgid "Windows 2000"
@@ -7492,7 +7376,7 @@ 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:837
 #, c-format
@@ -7504,19 +7388,18 @@ msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
 #: ../src/common/xpmdecod.cpp:706
-#, fuzzy, c-format
+#, c-format
 msgid "XPM: incorrect colour description in line %d"
-msgstr "XPM: 错误的颜色定义 '%s'!"
+msgstr "XPM: 在第 %d 行有错误的颜色描述"
 
 #: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:717
-#: ../src/common/xpmdecod.cpp:726
-#, fuzzy, c-format
+#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726
+#, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
-msgstr "XPM: 错误的颜色定义 '%s'!"
+msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d!"
 
 #: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"
@@ -7527,26 +7410,23 @@ msgstr ""
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:207
-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194
 msgid "Yes"
 msgstr "是"
 
 #: ../src/osx/carbon/overlay.cpp:156
-#, fuzzy
 msgid "You cannot Clear an overlay that is not inited"
-msgstr "你不能向该项中加入新的目录."
+msgstr "你无法清除未初始化的 overlay。"
 
-#: ../src/osx/carbon/overlay.cpp:108
-#: ../src/dfb/overlay.cpp:62
+#: ../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/propgrid/propgrid.cpp:3282
+#: ../src/propgrid/propgrid.cpp:3259
 msgid "You have entered invalid value. Press ESC to cancel editing."
 msgstr ""
 
@@ -7558,13 +7438,11 @@ msgstr "放大(&I)"
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
-#: ../src/common/stockitem.cpp:210
-#: ../src/common/prntbase.cpp:1539
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1539
 msgid "Zoom In"
 msgstr "放大"
 
-#: ../src/common/stockitem.cpp:211
-#: ../src/common/prntbase.cpp:1525
+#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1525
 msgid "Zoom Out"
 msgstr "缩小"
 
@@ -7576,99 +7454,100 @@ msgstr "缩放以适应窗口(&F)"
 msgid "Zoom to Fit"
 msgstr "缩放以适应窗口"
 
-#: ../src/msw/dde.cpp:1141
+#: ../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:1129
+#: ../src/msw/dde.cpp:1133
 msgid ""
-"a DDEML function was called without first calling the DdeInitialize function,\n"
+"a DDEML function was called without first calling the DdeInitialize "
+"function,\n"
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"没有调用DdeInitialize初始化函数就调用DDEML其它函数,\n"
+"没有调用 DdeInitialize 初始化函数就调用DDEML其它函数，\n"
 "或传给DDEML函数的是\n"
-"无效的实例标识."
+"无效的实例标识。"
 
-#: ../src/msw/dde.cpp:1147
+#: ../src/msw/dde.cpp:1151
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "客户试图建立的会话已失败."
+msgstr "客户试图建立的会话已失败。"
 
-#: ../src/msw/dde.cpp:1144
+#: ../src/msw/dde.cpp:1148
 msgid "a memory allocation failed."
-msgstr "内存分配失败."
+msgstr "内存分配失败。"
 
-#: ../src/msw/dde.cpp:1138
+#: ../src/msw/dde.cpp:1142
 msgid "a parameter failed to be validated by the DDEML."
-msgstr "DDEML参数验证失败."
+msgstr "DDEML 参数验证失败。"
 
-#: ../src/msw/dde.cpp:1120
+#: ../src/msw/dde.cpp:1124
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "同步advise事务请求已超时."
+msgstr "同步 advise 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1126
+#: ../src/msw/dde.cpp:1130
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "同步data事务请求已超时."
+msgstr "同步 data 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1135
+#: ../src/msw/dde.cpp:1139
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "同步execute事务请求已超时."
+msgstr "同步 execute 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1153
+#: ../src/msw/dde.cpp:1157
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "同步poke事务请求已超时."
+msgstr "同步 poke 事务请求超时。"
 
-#: ../src/msw/dde.cpp:1168
+#: ../src/msw/dde.cpp:1172
 msgid "a request to end an advise transaction has timed out."
-msgstr "终止advise事务的请求已超时."
+msgstr "终止 advise 事务的请求超时。"
 
-#: ../src/msw/dde.cpp:1162
+#: ../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:1150
+#: ../src/msw/dde.cpp:1154
 msgid "a transaction failed."
-msgstr "事务失败."
+msgstr "事务失败。"
 
 #: ../src/common/accelcmn.cpp:185
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1132
+#: ../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:1156
+#: ../src/msw/dde.cpp:1160
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "内部调用PostMessage失败. "
+msgstr "内部调用 PostMessage 失败。"
 
-#: ../src/msw/dde.cpp:1165
+#: ../src/msw/dde.cpp:1169
 msgid "an internal error has occurred in the DDEML."
-msgstr "在DDEML中发生内部错误."
+msgstr "在 DDEML 中发生内部错误。"
 
-#: ../src/msw/dde.cpp:1171
+#: ../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:1273
 #, fuzzy
@@ -7678,7 +7557,7 @@ msgstr "假定这是分段的zip文件"
 #: ../src/common/fileconf.cpp:1878
 #, 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"
@@ -7690,19 +7569,19 @@ msgstr "错误的签名"
 
 #: ../src/common/zipstrm.cpp:1716
 msgid "bad zipfile offset to entry"
-msgstr "zip文件中到条目的偏移值错误"
+msgstr "zip 文件中到条目的偏移值错误"
 
 #: ../src/common/ftp.cpp:408
 msgid "binary"
 msgstr "二进制"
 
-#: ../src/common/fontcmn.cpp:951
+#: ../src/common/fontcmn.cpp:979
 msgid "bold"
 msgstr "粗体"
 
 #: ../src/os2/iniconf.cpp:464
 msgid "buffer is too small for Windows directory."
-msgstr "Windows目录的缓存太小."
+msgstr "Windows 目录的缓存太小。"
 
 #: ../src/msw/utils.cpp:1324
 #, c-format
@@ -7712,129 +7591,125 @@ msgstr "build %lu"
 #: ../src/common/ffile.cpp:80
 #, c-format
 msgid "can't close file '%s'"
-msgstr "不能关闭文件 '%s'"
+msgstr "无法关闭文件 '%s'"
 
-#: ../src/common/file.cpp:281
+#: ../src/common/file.cpp:279
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "不能关闭文件描述子 %d"
+msgstr "无法关闭文件描述符 %d"
 
-#: ../src/common/file.cpp:579
+#: ../src/common/file.cpp:577
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "不能把修改提交给文件 '%s'"
+msgstr "无法把修改提交给文件 '%s'"
 
-#: ../src/common/file.cpp:215
+#: ../src/common/file.cpp:213
 #, c-format
 msgid "can't create file '%s'"
-msgstr "不能创建文件 '%s'"
+msgstr "无法创建文件 '%s'"
 
 #: ../src/common/fileconf.cpp:1177
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "不能删除用户配置文件 '%s'"
+msgstr "无法删除用户配置文件 '%s'"
 
-#: ../src/common/file.cpp:482
+#: ../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/msdos/utilsdos.cpp:311
-#: ../src/msdos/utilsdos.cpp:476
+#: ../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:452
+#: ../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
 msgid "can't find user's HOME, using current directory."
-msgstr "找不到用户的HOME目录, 使用当前目录."
+msgstr "找不到用户的 HOME 目录，使用当前目录。"
 
-#: ../src/common/file.cpp:353
+#: ../src/common/file.cpp:351
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "不能刷新文件描述子 %d"
+msgstr "无法刷新文件描述符 %d"
 
-#: ../src/common/file.cpp:409
-#: ../src/msw/wince/filefnwce.cpp:199
+#: ../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:324
 msgid "can't load any font, aborting"
-msgstr "不能装载任何字体, 正在中止"
+msgstr "无法装载任何字体，正在中止"
 
-#: ../src/common/file.cpp:267
-#: ../src/common/ffile.cpp:64
+#: ../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:352
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "不能打开全局配置文件 '%s'."
+msgstr "无法打开全局配置文件 '%s'。"
 
 #: ../src/common/fileconf.cpp:368
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "不能打开用户配置文件 '%s'."
+msgstr "无法打开用户配置文件 '%s'。"
 
 #: ../src/common/fileconf.cpp:1018
 msgid "can't open user configuration file."
-msgstr "不能打开用户配置文件."
+msgstr "无法打开用户配置文件。"
 
 #: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"
-msgstr "不能重新初始化zlib deflate(压缩)流."
+msgstr "无法重新初始化 zlib 压缩流。"
 
 #: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
-msgstr "不能重新初始化zlib inflate(解压)流."
+msgstr "无法重新初始化 zlib 解压流。"
 
-#: ../src/common/file.cpp:305
+#: ../src/common/file.cpp:303
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "不能从文件描述子 %d中读"
+msgstr "无法读取文件描述符 %d"
 
-#: ../src/common/file.cpp:574
+#: ../src/common/file.cpp:572
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "不能删除文件 '%s'"
+msgstr "无法删除文件 '%s'"
 
-#: ../src/common/file.cpp:591
+#: ../src/common/file.cpp:589
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "不能删除临时文件 '%s'"
+msgstr "无法删除临时文件 '%s'"
 
-#: ../src/common/file.cpp:395
-#: ../src/msw/wince/filefnwce.cpp:185
+#: ../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:300
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "不能把文件 '%s'写到磁盘."
+msgstr "无法把缓存区 '%s' 写到磁盘。"
 
-#: ../src/common/file.cpp:321
+#: ../src/common/file.cpp:319
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "不能写到文件描述子 %d"
+msgstr "无法写文件描述符 %d"
 
 #: ../src/common/fileconf.cpp:1032
 msgid "can't write user configuration file."
-msgstr "不能写用户配置文件."
+msgstr "无法写用户配置文件。"
 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
@@ -7860,9 +7735,13 @@ msgstr ""
 #: ../src/richtext/richtextmarginspage.cpp:341
 #: ../src/richtext/richtextmarginspage.cpp:364
 #: ../src/richtext/richtextmarginspage.cpp:389
-#: ../src/richtext/richtextsizepage.cpp:218
-#: ../src/richtext/richtextsizepage.cpp:245
-#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:273
+#: ../src/richtext/richtextsizepage.cpp:300
+#: ../src/richtext/richtextsizepage.cpp:327
+#: ../src/richtext/richtextsizepage.cpp:354
+#: ../src/richtext/richtextsizepage.cpp:381
+#: ../src/richtext/richtextsizepage.cpp:466
 msgid "cm"
 msgstr "厘米"
 
@@ -7872,7 +7751,7 @@ msgstr "压缩错误"
 
 #: ../src/common/regex.cpp:240
 msgid "conversion to 8-bit encoding failed"
-msgstr "不能转换为8-bit编码"
+msgstr "无法转换为 8 位编码"
 
 #: ../src/common/accelcmn.cpp:183
 msgid "ctrl"
@@ -7886,8 +7765,7 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
-#: ../src/richtext/richtextstyles.cpp:759
-#: ../src/common/fmapbase.cpp:807
+#: ../src/richtext/richtextstyles.cpp:759 ../src/common/fmapbase.cpp:807
 msgid "default"
 msgstr "缺省值"
 
@@ -7897,24 +7775,24 @@ msgstr ""
 
 #: ../src/common/debugrpt.cpp:534
 msgid "dump of the process state (binary)"
-msgstr "转储(dump)进程状态（二进制码）"
+msgstr "转储进程状态（二进制码）"
 
-#: ../src/common/datetimefmt.cpp:1782
+#: ../src/common/datetimefmt.cpp:1848
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetimefmt.cpp:1772
+#: ../src/common/datetimefmt.cpp:1838
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetimefmt.cpp:1775
+#: ../src/common/datetimefmt.cpp:1841
 msgid "eleventh"
 msgstr "第十一"
 
 #: ../src/common/fileconf.cpp:1864
 #, 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"
@@ -7931,72 +7809,72 @@ msgstr "打开文件出错"
 
 #: ../src/common/zipstrm.cpp:1577
 msgid "error reading zip central directory"
-msgstr "读zip中央目录时出错"
+msgstr "读 zip 中央目录时出错"
 
 #: ../src/common/zipstrm.cpp:1668
 msgid "error reading zip local header"
-msgstr "读zip本地头时出错"
+msgstr "读 zip 本地头时出错"
 
 #: ../src/common/zipstrm.cpp:2397
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
-msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
+msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"
 
 #: ../src/common/ffile.cpp:169
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "刷新文件 '%s'失败"
+msgstr "刷新文件 '%s' 失败"
 
-#: ../src/common/datetimefmt.cpp:1779
+#: ../src/common/datetimefmt.cpp:1845
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetimefmt.cpp:1769
+#: ../src/common/datetimefmt.cpp:1835
 msgid "fifth"
 msgstr "第五"
 
 #: ../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:640
 #, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "文件 '%s', 行 %d: 期待出现 '='."
+msgstr "文件 '%s'，行 %d: 期待出现 '='。"
 
 #: ../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: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:575
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
+msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 
-#: ../src/richtext/richtextbuffer.cpp:7449
+#: ../src/richtext/richtextbuffer.cpp:7651
 msgid "files"
 msgstr "文件"
 
-#: ../src/common/datetimefmt.cpp:1765
+#: ../src/common/datetimefmt.cpp:1831
 msgid "first"
 msgstr "第一"
 
-#: ../src/html/helpwnd.cpp:1260
+#: ../src/html/helpwnd.cpp:1262
 msgid "font size"
 msgstr "字体大小"
 
-#: ../src/common/datetimefmt.cpp:1778
+#: ../src/common/datetimefmt.cpp:1844
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetimefmt.cpp:1768
+#: ../src/common/datetimefmt.cpp:1834
 msgid "fourth"
 msgstr "第四"
 
@@ -8004,8 +7882,8 @@ msgstr "第四"
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
-#: ../src/richtext/richtextbuffer.cpp:10307
-#: ../src/richtext/richtextbuffer.cpp:10417
+#: ../src/richtext/richtextbuffer.cpp:10527
+#: ../src/richtext/richtextbuffer.cpp:10637
 msgid "image"
 msgstr ""
 
@@ -8015,7 +7893,7 @@ msgstr ""
 
 #: ../src/common/xtixml.cpp:490
 msgid "incorrect event handler string, missing dot"
-msgstr "错误的时间句柄字符串, 缺少点号('.')"
+msgstr "错误的时间句柄字符串，缺少点号('.')"
 
 #: ../src/common/tarstrm.cpp:1382
 msgid "incorrect size given for tar entry"
@@ -8025,19 +7903,19 @@ msgstr ""
 msgid "invalid data in extended tar header"
 msgstr ""
 
-#: ../src/generic/logg.cpp:1056
+#: ../src/generic/logg.cpp:1052
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 #: ../src/common/zipstrm.cpp:1446
 msgid "invalid zip file"
-msgstr "无效的zip文件"
+msgstr "无效的 zip 文件"
 
-#: ../src/common/fontcmn.cpp:956
+#: ../src/common/fontcmn.cpp:984
 msgid "italic"
 msgstr "斜体"
 
-#: ../src/common/fontcmn.cpp:946
+#: ../src/common/fontcmn.cpp:974
 #, fuzzy
 msgid "light"
 msgstr "细"
@@ -8045,23 +7923,23 @@ msgstr "细"
 #: ../src/common/intl.cpp:296
 #, c-format
 msgid "locale '%s' cannot be set."
-msgstr "不能设置语言(locale) '%s'."
+msgstr "无法设置地区为 '%s'。"
 
-#: ../src/common/datetimefmt.cpp:1918
+#: ../src/common/datetimefmt.cpp:1984
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/datetimefmt.cpp:1783
+#: ../src/common/datetimefmt.cpp:1849
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetimefmt.cpp:1773
+#: ../src/common/datetimefmt.cpp:1839
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:1116
+#: ../src/msw/dde.cpp:1120
 msgid "no DDE error."
-msgstr "没有DDE错误."
+msgstr "没有 DDE 错误。"
 
 #: ../src/html/chm.cpp:328
 msgid "no error"
@@ -8076,7 +7954,7 @@ msgstr ""
 msgid "noname"
 msgstr "未名"
 
-#: ../src/common/datetimefmt.cpp:1917
+#: ../src/common/datetimefmt.cpp:1983
 msgid "noon"
 msgstr "中午"
 
@@ -8084,8 +7962,7 @@ msgstr "中午"
 msgid "normal"
 msgstr "正常"
 
-#: ../src/gtk/print.cpp:1216
-#: ../src/gtk/print.cpp:1321
+#: ../src/gtk/print.cpp:1215 ../src/gtk/print.cpp:1320
 msgid "not implemented"
 msgstr ""
 
@@ -8095,14 +7972,18 @@ msgstr "num"
 
 #: ../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/richtext/richtextsizepage.cpp:219
-#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:247
+#: ../src/richtext/richtextsizepage.cpp:274
+#: ../src/richtext/richtextsizepage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:328
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:382
 msgid "percent"
 msgstr ""
 
@@ -8158,18 +8039,35 @@ msgstr "进程上下文描述"
 #: ../src/richtext/richtextmarginspage.cpp:388
 #: ../src/richtext/richtextmarginspage.cpp:390
 #: ../src/richtext/richtextmarginspage.cpp:391
-#: ../src/richtext/richtextsizepage.cpp:217
-#: ../src/richtext/richtextsizepage.cpp:220
-#: ../src/richtext/richtextsizepage.cpp:221
-#: ../src/richtext/richtextsizepage.cpp:244
-#: ../src/richtext/richtextsizepage.cpp:247
+#: ../src/richtext/richtextsizepage.cpp:245
 #: ../src/richtext/richtextsizepage.cpp:248
+#: ../src/richtext/richtextsizepage.cpp:249
+#: ../src/richtext/richtextsizepage.cpp:272
+#: ../src/richtext/richtextsizepage.cpp:275
+#: ../src/richtext/richtextsizepage.cpp:276
+#: ../src/richtext/richtextsizepage.cpp:299
+#: ../src/richtext/richtextsizepage.cpp:302
+#: ../src/richtext/richtextsizepage.cpp:303
+#: ../src/richtext/richtextsizepage.cpp:326
 #: ../src/richtext/richtextsizepage.cpp:329
-#: ../src/richtext/richtextsizepage.cpp:331
-#: ../src/richtext/richtextsizepage.cpp:332
+#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:356
+#: ../src/richtext/richtextsizepage.cpp:357
+#: ../src/richtext/richtextsizepage.cpp:380
+#: ../src/richtext/richtextsizepage.cpp:383
+#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:465
+#: ../src/richtext/richtextsizepage.cpp:467
+#: ../src/richtext/richtextsizepage.cpp:468
 msgid "px"
 msgstr "像素"
 
+#: ../src/common/accelcmn.cpp:189
+#, fuzzy
+msgid "rawctrl"
+msgstr "ctrl"
+
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
@@ -8177,18 +8075,18 @@ msgstr "读取错误"
 #: ../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:1878
 #, c-format
 msgid "reading zip stream (entry %s): bad length"
-msgstr "读入zip流 (条目 %s): 长度错误"
+msgstr "读入 zip 流 (条目 %s): 长度错误"
 
-#: ../src/msw/dde.cpp:1159
+#: ../src/msw/dde.cpp:1163
 msgid "reentrancy problem."
-msgstr "重入问题."
+msgstr "重入问题。"
 
-#: ../src/common/datetimefmt.cpp:1766
+#: ../src/common/datetimefmt.cpp:1832
 msgid "second"
 msgstr "第二"
 
@@ -8196,11 +8094,11 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
-#: ../src/common/datetimefmt.cpp:1781
+#: ../src/common/datetimefmt.cpp:1847
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetimefmt.cpp:1771
+#: ../src/common/datetimefmt.cpp:1837
 msgid "seventh"
 msgstr "第七"
 
@@ -8212,11 +8110,11 @@ msgstr "shift"
 msgid "show this help message"
 msgstr "显示帮助信息"
 
-#: ../src/common/datetimefmt.cpp:1780
+#: ../src/common/datetimefmt.cpp:1846
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetimefmt.cpp:1770
+#: ../src/common/datetimefmt.cpp:1836
 msgid "sixth"
 msgstr "第六"
 
@@ -8226,64 +8124,66 @@ msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
 #: ../src/common/appcmn.cpp:193
 msgid "specify the theme to use"
-msgstr "指定使用的主题(theme)"
+msgstr "指定使用的主题"
 
-#: ../src/richtext/richtextbuffer.cpp:7949
+#: ../src/richtext/richtextbuffer.cpp:8151
 msgid "standard/circle"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:7950
+#: ../src/richtext/richtextbuffer.cpp:8152
 msgid "standard/circle-outline"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:7952
+#: ../src/richtext/richtextbuffer.cpp:8154
 msgid "standard/diamond"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:7951
+#: ../src/richtext/richtextbuffer.cpp:8153
 msgid "standard/square"
 msgstr ""
 
-#: ../src/richtext/richtextbuffer.cpp:7953
+#: ../src/richtext/richtextbuffer.cpp:8155
 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:1304
 msgid "str"
 msgstr "str"
 
-#: ../src/common/tarstrm.cpp:1004
-#: ../src/common/tarstrm.cpp:1026
-#: ../src/common/tarstrm.cpp:1508
-#: ../src/common/tarstrm.cpp:1530
+#: ../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:1774
+#: ../src/common/datetimefmt.cpp:1840
 msgid "tenth"
 msgstr "第十"
 
-#: ../src/msw/dde.cpp:1123
+#: ../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/datetimefmt.cpp:1767
+#: ../src/common/datetimefmt.cpp:1833
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetimefmt.cpp:1777
+#: ../src/common/datetimefmt.cpp:1843
 msgid "thirteenth"
 msgstr "第十三"
 
-#: ../src/common/datetimefmt.cpp:1571
+#: ../src/common/datetimefmt.cpp:1637
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetimefmt.cpp:1573
+#: ../src/common/datetimefmt.cpp:1639
 msgid "tomorrow"
 msgstr "明天"
 
@@ -8296,16 +8196,15 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/common/datetimefmt.cpp:1776
+#: ../src/common/datetimefmt.cpp:1842
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetimefmt.cpp:1784
+#: ../src/common/datetimefmt.cpp:1850
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:771
-#: ../src/common/fontcmn.cpp:942
+#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966
 msgid "underlined"
 msgstr "下划线"
 
@@ -8315,14 +8214,11 @@ msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 #: ../src/common/tarstrm.cpp:1046
-#, fuzzy
 msgid "unexpected end of file"
-msgstr "在解析资源时意外到达文件结尾."
+msgstr "意外到达文件结尾"
 
-#: ../src/generic/progdlgg.cpp:389
-#: ../src/common/tarstrm.cpp:372
-#: ../src/common/tarstrm.cpp:395
-#: ../src/common/tarstrm.cpp:426
+#: ../src/generic/progdlgg.cpp:400 ../src/common/tarstrm.cpp:372
+#: ../src/common/tarstrm.cpp:395 ../src/common/tarstrm.cpp:426
 msgid "unknown"
 msgstr "未知"
 
@@ -8331,15 +8227,14 @@ msgstr "未知"
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
-#: ../src/common/regex.cpp:262
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "未知错误"
 
 #: ../src/msw/dialup.cpp:491
 #, c-format
 msgid "unknown error (error code %08x)."
-msgstr "未知错误(错误号 %08x)."
+msgstr "未知错误 (错误号 %08x)。"
 
 #: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
@@ -8350,74 +8245,107 @@ msgstr "未知搜索原点"
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:506
+#: ../src/common/docview.cpp:509
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1584
+#: ../src/common/docview.cpp:1587
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
-#: ../src/common/zipstrm.cpp:1797
-#: ../src/common/zipstrm.cpp:2185
+#: ../src/common/zipstrm.cpp:1797 ../src/common/zipstrm.cpp:2185
 msgid "unsupported Zip compression method"
-msgstr "不支持的Zip压缩方法"
+msgstr "不支持的 Zip 压缩方法"
 
 #: ../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/stopwatch.cpp:268
+#: ../src/common/time.cpp:331
 msgid "wxGetTimeOfDay failed."
-msgstr "wxGetTimeOfDay 失败."
+msgstr "wxGetTimeOfDay 失败。"
 
-#: ../src/gtk/print.cpp:979
+#: ../src/gtk/print.cpp:978
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 
-#: ../src/osx/carbon/dataview.cpp:1298
+#: ../src/osx/carbon/dataview.cpp:1304
 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:908
-#, fuzzy
 msgid "wxWidget's control not initialized."
-msgstr "不能初始化显示."
+msgstr "wxWidgets 的控件未初始化。"
 
 #: ../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:165
 msgid "wxWidgets could not open display. Exiting."
-msgstr "wxWidgets 不能打开显示设备: 已经存在."
+msgstr "wxWidgets 无法打开显示设备。退出。"
 
 #: ../src/richtext/richtextsymboldlg.cpp:431
 msgid "xxxx"
 msgstr "xxxx"
 
-#: ../src/common/datetimefmt.cpp:1572
+#: ../src/common/datetimefmt.cpp:1638
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../src/common/zstream.cpp:244
-#: ../src/common/zstream.cpp:419
+#: ../src/common/zstream.cpp:244 ../src/common/zstream.cpp:419
 #, c-format
 msgid "zlib error %d"
-msgstr "zlib错误 %d"
+msgstr "zlib 错误 %d"
 
 #: ../src/richtext/richtextliststylepage.cpp:497
 #: ../src/richtext/richtextbulletspage.cpp:302
 msgid "~"
 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"
 
@@ -8504,17 +8432,10 @@ msgstr "~"
 #~ msgid "Remaining time:"
 #~ msgstr "剩余时间 : "
 
-#~ msgid "Save &As..."
-#~ msgstr "另存为(&A)..."
-
 #~ msgid ""
 #~ "Streaming delegates for not already streamed objects not yet supported"
 #~ msgstr "不支持针对尚未形成流的对象的流委派"
 
-#, fuzzy
-#~ msgid "The file '%s' couldn't be opened."
-#~ msgstr "文件不能被装载."
-
 #, fuzzy
 #~ msgid "The file '%s' doesn't exist and couldn't be opened."
 #~ msgstr ""
@@ -8689,10 +8610,6 @@ msgstr "~"
 #~ msgid "%s: ill-formed resource file syntax."
 #~ msgstr "%s: 不良资源文件语法."
 
-#, fuzzy
-#~ msgid "&About"
-#~ msgstr "关于(&A)"
-
 #~ msgid "&Open"
 #~ msgstr "打开(&O)"