Add more checks for Intel compiler.

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 76229961b7218d2d2c1462b19f178b034cb4eb08..b8898776f03511c1f41bff9abb875c45fbb4adb2 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -7,19 +7,20 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: wxWidgets 2.8.10\n"
+"Project-Id-Version: wxWidgets 3.0\n"

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

-"POT-Creation-Date: 2012-08-27 11:51+0200\n"
-"PO-Revision-Date: 2012-12-31 12:24+0800\n"
-"Last-Translator: William Jiang <williamroot777@qq.com>\n"
+"POT-Creation-Date: 2013-10-01 19:04+0200\n"
+"PO-Revision-Date: 2013-09-27 10:30-0800\n"
+"Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"

 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"

+"Language: zh_CN\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"

 
 

-#: ../src/common/debugrpt.cpp:582
+#: ../src/common/debugrpt.cpp:591

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


@@ -27,176 +28,181 @@ msgstr ""
 "\n"
 "请将报告发送给程序维护人员，谢谢！\n"
 
 "\n"
 "请将报告发送给程序维护人员，谢谢！\n"
 

-#: ../src/richtext/richtextstyledlg.cpp:218
-#: ../src/richtext/richtextstyledlg.cpp:230
+#: ../src/richtext/richtextstyledlg.cpp:210
+#: ../src/richtext/richtextstyledlg.cpp:222

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

-#: ../src/generic/dbgrptg.cpp:323
+#: ../src/generic/dbgrptg.cpp:326

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

-#: ../src/common/prntbase.cpp:547
-#, fuzzy, c-format
+#: ../src/common/prntbase.cpp:546
+#, c-format

 msgid " (copy %d of %d)"
 msgid " (copy %d of %d)"

-msgstr "页 %d / %d"
+msgstr "(复制 %d / %d)"

 
 

-#: ../src/common/log.cpp:428
+#: ../src/common/log.cpp:425

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

-#: ../src/common/imagtiff.cpp:76
+#: ../src/common/imagtiff.cpp:75

 #, c-format
 msgid " (in module \"%s\")"
 msgstr " (于模块: \"%s\")"
 
 #, c-format
 msgid " (in module \"%s\")"
 msgstr " (于模块: \"%s\")"
 

-#: ../src/common/docview.cpp:1615
+#: ../src/common/docview.cpp:1624

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

-#: ../src/richtext/richtextprint.cpp:585 ../src/html/htmprint.cpp:705
+#: ../src/richtext/richtextprint.cpp:588 ../src/html/htmprint.cpp:704

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

-#: ../src/common/fontcmn.cpp:812
+#: ../src/common/fontcmn.cpp:811

 msgid " bold"
 msgstr " 粗体"
 
 msgid " bold"
 msgstr " 粗体"
 

-#: ../src/common/fontcmn.cpp:828
+#: ../src/common/fontcmn.cpp:827

 msgid " italic"
 msgstr " 斜体"
 
 msgid " italic"
 msgstr " 斜体"
 

-#: ../src/common/fontcmn.cpp:808
+#: ../src/common/fontcmn.cpp:807

 msgid " light"
 msgstr " 细体"
 
 msgid " light"
 msgstr " 细体"
 

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

 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封，4 1/8 x 9 1/2 英寸"
 
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封，4 1/8 x 9 1/2 英寸"
 

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

 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封，4 1/2 x 10 3/8 英寸"
 
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封，4 1/2 x 10 3/8 英寸"
 

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

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

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

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

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

 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 信封，3 7/8 x 8 7/8 英寸"
 
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 信封，3 7/8 x 8 7/8 英寸"
 

-#: ../src/html/helpwnd.cpp:1045
+#: ../src/html/helpwnd.cpp:1044

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

-#: ../src/html/helpwnd.cpp:1682 ../src/html/helpwnd.cpp:1720
+#: ../src/html/helpwnd.cpp:1681 ../src/html/helpwnd.cpp:1719

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

-#: ../src/generic/filectrlg.cpp:309
+#: ../src/generic/filectrlg.cpp:315

 #, c-format
 msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 
 #, c-format
 msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 

-#: ../src/html/helpwnd.cpp:1047
+#: ../src/html/helpwnd.cpp:1046

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

-#: ../src/common/cmdline.cpp:1043
+#: ../src/common/cmdline.cpp:1050

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

-#: ../src/generic/logg.cpp:231
+#: ../src/generic/logg.cpp:230

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

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

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

-#: ../src/generic/logg.cpp:235
+#: ../src/generic/preferencesg.cpp:110
+#, c-format
+msgid "%s Preferences"
+msgstr "%s 偏好设置"
+
+#: ../src/generic/logg.cpp:234

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

-#: ../src/common/tarstrm.cpp:1320
+#: ../src/common/tarstrm.cpp:1319

 #, c-format
 msgid "%s did not fit the tar header for entry '%s'"
 msgstr "%s 不符合tar项目 '%s' 的标头"
 
 #, c-format
 msgid "%s did not fit the tar header for entry '%s'"
 msgstr "%s 不符合tar项目 '%s' 的标头"
 

-#: ../src/common/fldlgcmn.cpp:107
+#: ../src/common/fldlgcmn.cpp:106

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

-#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143
-#: ../src/html/helpfrm.cpp:145
+#: ../src/common/stockitem.cpp:139 ../src/html/helpfrm.cpp:142
+#: ../src/html/helpfrm.cpp:144

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

-#: ../src/common/stockitem.cpp:208
+#: ../src/common/stockitem.cpp:207

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

-#: ../src/richtext/richtextindentspage.cpp:287
+#: ../src/richtext/richtextindentspage.cpp:262

 msgid "&After a paragraph:"
 msgstr "段落之后(&A):"
 
 msgid "&After a paragraph:"
 msgstr "段落之后(&A):"
 

-#: ../src/richtext/richtextindentspage.cpp:141
-#: ../src/richtext/richtextliststylepage.cpp:320
+#: ../src/richtext/richtextindentspage.cpp:128
+#: ../src/richtext/richtextliststylepage.cpp:319

 msgid "&Alignment"
 msgstr "对齐(&A)"
 
 msgid "&Alignment"
 msgstr "对齐(&A)"
 

-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:141

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

-#: ../src/richtext/richtextstyledlg.cpp:259
+#: ../src/richtext/richtextstyledlg.cpp:251

 msgid "&Apply Style"
 msgstr "应用样式(&A)"
 
 msgid "&Apply Style"
 msgstr "应用样式(&A)"
 

-#: ../src/msw/mdi.cpp:168
+#: ../src/msw/mdi.cpp:175

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

-#: ../src/common/stockitem.cpp:196
+#: ../src/common/stockitem.cpp:195

 msgid "&Ascending"
 msgstr "递增(&A)"
 
 msgid "&Ascending"
 msgstr "递增(&A)"
 

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

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

-#: ../src/richtext/richtextstylepage.cpp:114
+#: ../src/richtext/richtextstylepage.cpp:113

 msgid "&Based on:"
 msgstr "基于(&B):"
 
 msgid "&Based on:"
 msgstr "基于(&B):"
 

-#: ../src/richtext/richtextindentspage.cpp:278
+#: ../src/richtext/richtextindentspage.cpp:253

 msgid "&Before a paragraph:"
 msgstr "段落之前(&B):"
 
 msgid "&Before a paragraph:"
 msgstr "段落之前(&B):"
 

-#: ../src/richtext/richtextfontpage.cpp:269
+#: ../src/richtext/richtextfontpage.cpp:271

 msgid "&Bg colour:"
 msgstr "背景颜色(&B):"
 
 msgid "&Bg colour:"
 msgstr "背景颜色(&B):"
 

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

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

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

 msgid "&Bottom"
 msgstr "底端(&B)"
 
 msgid "&Bottom"
 msgstr "底端(&B)"
 


@@ -204,468 +210,472 @@ msgstr "底端(&B)"
 #: ../src/richtext/richtextborderspage.cpp:503
 #: ../src/richtext/richtextmarginspage.cpp:260
 #: ../src/richtext/richtextmarginspage.cpp:374
 #: ../src/richtext/richtextborderspage.cpp:503
 #: ../src/richtext/richtextmarginspage.cpp:260
 #: ../src/richtext/richtextmarginspage.cpp:374

-#: ../src/richtext/richtextsizepage.cpp:575
+#: ../src/richtext/richtextsizepage.cpp:637
+#: ../src/richtext/richtextsizepage.cpp:644

 msgid "&Bottom:"
 msgstr "底端(&B):"
 
 msgid "&Bottom:"
 msgstr "底端(&B):"
 

-#: ../include/wx/richtext/richtextbuffer.h:3464
+#: ../include/wx/richtext/richtextbuffer.h:3530

 #, fuzzy
 msgid "&Box"
 msgstr "粗体(&B)"
 
 #, fuzzy
 msgid "&Box"
 msgstr "粗体(&B)"
 

-#: ../src/richtext/richtextliststylepage.cpp:211
-#: ../src/richtext/richtextbulletspage.cpp:160
+#: ../src/richtext/richtextliststylepage.cpp:210
+#: ../src/richtext/richtextbulletspage.cpp:159

 msgid "&Bullet style:"
 msgstr "项目符号样式(&B):"
 
 msgid "&Bullet style:"
 msgstr "项目符号样式(&B):"
 

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

 msgid "&CD-Rom"
 msgstr "CD 光驱(&C)"
 
 msgid "&CD-Rom"
 msgstr "CD 光驱(&C)"
 

-#: ../src/generic/wizard.cpp:433 ../src/generic/fontdlgg.cpp:471
-#: ../src/generic/fontdlgg.cpp:490 ../src/osx/carbon/fontdlg.cpp:586
-#: ../src/common/stockitem.cpp:146
+#: ../src/generic/wizard.cpp:432 ../src/generic/fontdlgg.cpp:470
+#: ../src/generic/fontdlgg.cpp:489 ../src/osx/carbon/fontdlg.cpp:588
+#: ../src/common/stockitem.cpp:145

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

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

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

-#: ../include/wx/richtext/richtextbuffer.h:5476
+#: ../include/wx/richtext/richtextbuffer.h:5587

 #, fuzzy
 msgid "&Cell"
 msgstr "取消(&C)"
 
 #, fuzzy
 msgid "&Cell"
 msgstr "取消(&C)"
 

-#: ../src/richtext/richtextsymboldlg.cpp:440
+#: ../src/richtext/richtextsymboldlg.cpp:439

 msgid "&Character code:"
 msgstr "字符编码(&C):"
 
 msgid "&Character code:"
 msgstr "字符编码(&C):"
 

-#: ../src/common/stockitem.cpp:148
+#: ../src/common/stockitem.cpp:147

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

-#: ../src/generic/logg.cpp:520 ../src/common/stockitem.cpp:149
-#: ../src/common/prntbase.cpp:1571 ../src/univ/themes/win32.cpp:3757
-#: ../src/html/helpfrm.cpp:140
+#: ../src/generic/logg.cpp:522 ../src/common/stockitem.cpp:148
+#: ../src/common/prntbase.cpp:1570 ../src/univ/themes/win32.cpp:3756
+#: ../src/html/helpfrm.cpp:139

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

-#: ../src/common/stockitem.cpp:194
+#: ../src/common/stockitem.cpp:193

 msgid "&Color"
 msgstr "颜色(&C)"
 
 msgid "&Color"
 msgstr "颜色(&C)"
 

-#: ../src/richtext/richtextfontpage.cpp:256
+#: ../src/richtext/richtextfontpage.cpp:258

 msgid "&Colour:"
 msgstr "颜色(&C):"
 
 msgid "&Colour:"
 msgstr "颜色(&C):"
 

-#: ../src/common/stockitem.cpp:150
+#: ../src/common/stockitem.cpp:149

 msgid "&Convert"
 msgstr "转换(&C)"
 
 msgid "&Convert"
 msgstr "转换(&C)"
 

-#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:584
-#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:150 ../src/msw/textctrl.cpp:2284

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

-#: ../src/generic/hyperlinkg.cpp:157
+#: ../src/generic/hyperlinkg.cpp:156

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

-#: ../src/common/headerctrlcmn.cpp:329
+#: ../src/common/headerctrlcmn.cpp:328

 msgid "&Customize..."
 msgstr "自定义(&C)..."
 
 msgid "&Customize..."
 msgstr "自定义(&C)..."
 

-#: ../src/generic/dbgrptg.cpp:331
+#: ../src/generic/dbgrptg.cpp:334

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

-#: ../src/richtext/richtexttabspage.cpp:143
-#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:586
-#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225
+#: ../src/richtext/richtexttabspage.cpp:142
+#: ../src/richtext/richtextctrl.cpp:328 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2286

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

-#: ../src/richtext/richtextstyledlg.cpp:277
+#: ../src/richtext/richtextstyledlg.cpp:269

 msgid "&Delete Style..."
 msgstr "删除样式(&D)..."
 
 msgid "&Delete Style..."
 msgstr "删除样式(&D)..."
 

-#: ../src/common/stockitem.cpp:197
+#: ../src/common/stockitem.cpp:196

 msgid "&Descending"
 msgstr "递减(&D)"
 
 msgid "&Descending"
 msgstr "递减(&D)"
 

-#: ../src/generic/logg.cpp:692
+#: ../src/generic/logg.cpp:688

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

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

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

-#: ../src/common/stockitem.cpp:155
+#: ../src/common/stockitem.cpp:154

 msgid "&Edit"
 msgstr "编辑(&E)"
 
 msgid "&Edit"
 msgstr "编辑(&E)"
 

-#: ../src/richtext/richtextstyledlg.cpp:271
+#: ../src/richtext/richtextstyledlg.cpp:263

 msgid "&Edit Style..."
 msgstr "编辑样式(&E)..."
 
 msgid "&Edit Style..."
 msgstr "编辑样式(&E)..."
 

-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:155

 msgid "&Execute"
 msgstr "执行(&E)"
 
 msgid "&Execute"
 msgstr "执行(&E)"
 

-#: ../src/common/stockitem.cpp:158 ../src/html/helpfrm.cpp:147
+#: ../src/common/stockitem.cpp:157 ../src/html/helpfrm.cpp:146

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

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

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

-#: ../src/generic/wizard.cpp:627
+#: ../src/generic/wizard.cpp:626

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

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

 msgid "&First"
 msgstr "最前(&F)"
 
 msgid "&First"
 msgstr "最前(&F)"
 

-#: ../src/richtext/richtextsizepage.cpp:222
+#: ../src/richtext/richtextsizepage.cpp:244

 msgid "&Floating mode:"
 msgstr "浮动模式(&F):"
 
 msgid "&Floating mode:"
 msgstr "浮动模式(&F):"
 

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

 msgid "&Floppy"
 msgstr "软盘(&F)"
 
 msgid "&Floppy"
 msgstr "软盘(&F)"
 

-#: ../src/common/stockitem.cpp:195
+#: ../src/common/stockitem.cpp:194

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

-#: ../src/generic/fontdlgg.cpp:372
+#: ../src/generic/fontdlgg.cpp:371

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

-#: ../src/richtext/richtextliststylepage.cpp:195
+#: ../src/richtext/richtextliststylepage.cpp:194

 msgid "&Font for Level..."
 msgstr "层级字体(&F)..."
 
 msgid "&Font for Level..."
 msgstr "层级字体(&F)..."
 

-#: ../src/richtext/richtextfontpage.cpp:154
-#: ../src/richtext/richtextsymboldlg.cpp:401
+#: ../src/richtext/richtextfontpage.cpp:156
+#: ../src/richtext/richtextsymboldlg.cpp:400

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

-#: ../src/common/stockitem.cpp:162
+#: ../src/common/stockitem.cpp:161

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

-#: ../src/richtext/richtextsymboldlg.cpp:452
+#: ../src/richtext/richtextsymboldlg.cpp:451

 msgid "&From:"
 msgstr "从(&F):"
 
 msgid "&From:"
 msgstr "从(&F):"
 

-#: ../src/common/stockitem.cpp:163
+#: ../src/common/stockitem.cpp:162

 msgid "&Harddisk"
 msgstr "硬盘(&H)"
 
 msgid "&Harddisk"
 msgstr "硬盘(&H)"
 

-#: ../src/richtext/richtextsizepage.cpp:317
+#: ../src/richtext/richtextsizepage.cpp:351
+#: ../src/richtext/richtextsizepage.cpp:358

 msgid "&Height:"
 msgstr "高度(&H):"
 
 msgid "&Height:"
 msgstr "高度(&H):"
 

-#: ../src/generic/wizard.cpp:436 ../src/richtext/richtextstyledlg.cpp:311
-#: ../src/richtext/richtextsymboldlg.cpp:480 ../src/osx/menu_osx.cpp:685
-#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148
+#: ../src/generic/wizard.cpp:435 ../src/richtext/richtextstyledlg.cpp:303
+#: ../src/richtext/richtextsymboldlg.cpp:479 ../src/osx/menu_osx.cpp:785
+#: ../src/common/stockitem.cpp:163 ../src/html/helpfrm.cpp:147

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

-#: ../include/wx/richmsgdlg.h:31
+#: ../include/wx/richmsgdlg.h:30

 msgid "&Hide details"
 msgstr "隐藏细节(&H)"
 
 msgid "&Hide details"
 msgstr "隐藏细节(&H)"
 

-#: ../src/common/stockitem.cpp:165
+#: ../src/common/stockitem.cpp:164

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

-#: ../src/richtext/richtextindentspage.cpp:197
-#: ../src/richtext/richtextliststylepage.cpp:373
+#: ../src/richtext/richtextindentspage.cpp:184
+#: ../src/richtext/richtextliststylepage.cpp:372

 msgid "&Indentation (tenths of a mm)"
 msgstr "缩进(&I) (十分之一毫米)"
 
 msgid "&Indentation (tenths of a mm)"
 msgstr "缩进(&I) (十分之一毫米)"
 

-#: ../src/richtext/richtextindentspage.cpp:180
-#: ../src/richtext/richtextliststylepage.cpp:357
+#: ../src/richtext/richtextindentspage.cpp:167
+#: ../src/richtext/richtextliststylepage.cpp:356

 #, fuzzy
 msgid "&Indeterminate"
 msgstr "下划线(&U)"
 
 #, fuzzy
 msgid "&Indeterminate"
 msgstr "下划线(&U)"
 

-#: ../src/common/stockitem.cpp:167
+#: ../src/common/stockitem.cpp:166

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

-#: ../src/common/stockitem.cpp:168
+#: ../src/common/stockitem.cpp:167

 msgid "&Info"
 msgstr "信息(&I)"
 
 msgid "&Info"
 msgstr "信息(&I)"
 

-#: ../src/common/stockitem.cpp:169
+#: ../src/common/stockitem.cpp:168

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

-#: ../src/common/stockitem.cpp:170
+#: ../src/common/stockitem.cpp:169

 msgid "&Jump to"
 msgstr "跳转到(&J)"
 
 msgid "&Jump to"
 msgstr "跳转到(&J)"
 

-#: ../src/richtext/richtextindentspage.cpp:166
-#: ../src/richtext/richtextliststylepage.cpp:343
+#: ../src/richtext/richtextindentspage.cpp:153
+#: ../src/richtext/richtextliststylepage.cpp:342

 msgid "&Justified"
 msgstr "分散对齐(&J)"
 
 msgid "&Justified"
 msgstr "分散对齐(&J)"
 

-#: ../src/common/stockitem.cpp:175
+#: ../src/common/stockitem.cpp:174

 msgid "&Last"
 msgstr "最后(&L)"
 
 msgid "&Last"
 msgstr "最后(&L)"
 

-#: ../src/richtext/richtextindentspage.cpp:152
-#: ../src/richtext/richtextliststylepage.cpp:329
+#: ../src/richtext/richtextindentspage.cpp:139
+#: ../src/richtext/richtextliststylepage.cpp:328

 msgid "&Left"
 msgstr "左(&L)"
 
 msgid "&Left"
 msgstr "左(&L)"
 

-#: ../src/richtext/richtextindentspage.cpp:208
+#: ../src/richtext/richtextindentspage.cpp:195

 #: ../src/richtext/richtextborderspage.cpp:269
 #: ../src/richtext/richtextborderspage.cpp:413
 #: ../src/richtext/richtextborderspage.cpp:269
 #: ../src/richtext/richtextborderspage.cpp:413

-#: ../src/richtext/richtextliststylepage.cpp:382
+#: ../src/richtext/richtextliststylepage.cpp:381

 #: ../src/richtext/richtextmarginspage.cpp:187
 #: ../src/richtext/richtextmarginspage.cpp:301
 #: ../src/richtext/richtextmarginspage.cpp:187
 #: ../src/richtext/richtextmarginspage.cpp:301

-#: ../src/richtext/richtextsizepage.cpp:491
+#: ../src/richtext/richtextsizepage.cpp:532
+#: ../src/richtext/richtextsizepage.cpp:539

 msgid "&Left:"
 msgstr "左(&L):"
 
 msgid "&Left:"
 msgstr "左(&L):"
 

-#: ../src/richtext/richtextliststylepage.cpp:184
+#: ../src/richtext/richtextliststylepage.cpp:183

 msgid "&List level:"
 msgstr "列表层级(&L):"
 
 msgid "&List level:"
 msgstr "列表层级(&L):"
 

-#: ../src/generic/logg.cpp:521
+#: ../src/generic/logg.cpp:523

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

-#: ../src/univ/themes/win32.cpp:3749
+#: ../src/univ/themes/win32.cpp:3748

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

-#: ../src/richtext/richtextsizepage.cpp:606
+#: ../src/richtext/richtextsizepage.cpp:672

 msgid "&Move the object to:"
 msgstr "移动对象至(&M):"
 
 msgid "&Move the object to:"
 msgstr "移动对象至(&M):"
 

-#: ../src/common/stockitem.cpp:176
+#: ../src/common/stockitem.cpp:175

 msgid "&Network"
 msgstr "网络(&N)"
 
 msgid "&Network"
 msgstr "网络(&N)"
 

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

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

-#: ../src/aui/tabmdi.cpp:110 ../src/generic/mdig.cpp:101
-#: ../src/msw/mdi.cpp:169
+#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:100
+#: ../src/msw/mdi.cpp:176

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

-#: ../src/generic/wizard.cpp:432 ../src/generic/wizard.cpp:627
+#: ../src/generic/wizard.cpp:431 ../src/generic/wizard.cpp:626

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

-#: ../src/richtext/richtextsizepage.cpp:615
+#: ../src/richtext/richtextsizepage.cpp:681

 msgid "&Next Paragraph"
 msgstr "下一段落(&N)"
 
 msgid "&Next Paragraph"
 msgstr "下一段落(&N)"
 

-#: ../src/generic/tipdlg.cpp:277
+#: ../src/generic/tipdlg.cpp:276

 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 

-#: ../src/richtext/richtextstylepage.cpp:124
+#: ../src/richtext/richtextstylepage.cpp:123

 msgid "&Next style:"
 msgstr "下一个样式(&N):"
 
 msgid "&Next style:"
 msgstr "下一个样式(&N):"
 

-#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:476
+#: ../src/common/stockitem.cpp:177 ../src/msw/msgdlg.cpp:476

 msgid "&No"
 msgstr "否(&N)"
 
 msgid "&No"
 msgstr "否(&N)"
 

-#: ../src/generic/dbgrptg.cpp:353
+#: ../src/generic/dbgrptg.cpp:356

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

-#: ../src/richtext/richtextbulletspage.cpp:265
+#: ../src/richtext/richtextbulletspage.cpp:264

 msgid "&Number:"
 msgstr "编号(&N):"
 
 msgid "&Number:"
 msgstr "编号(&N):"
 

-#: ../src/generic/fontdlgg.cpp:476 ../src/generic/fontdlgg.cpp:483
-#: ../src/osx/carbon/fontdlg.cpp:592 ../src/common/stockitem.cpp:179
+#: ../src/generic/fontdlgg.cpp:475 ../src/generic/fontdlgg.cpp:482
+#: ../src/osx/carbon/fontdlg.cpp:594 ../src/common/stockitem.cpp:178

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

-#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180
-#: ../src/html/helpfrm.cpp:138
+#: ../src/generic/dbgrptg.cpp:342 ../src/common/stockitem.cpp:179
+#: ../src/html/helpfrm.cpp:137

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

-#: ../src/richtext/richtextindentspage.cpp:235
+#: ../src/richtext/richtextindentspage.cpp:222

 msgid "&Outline level:"
 msgstr "大纲层级(&O):"
 
 msgid "&Outline level:"
 msgstr "大纲层级(&O):"
 

-#: ../src/richtext/richtextindentspage.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:293

 msgid "&Page Break"
 msgstr "断页符号(&P)"
 
 msgid "&Page Break"
 msgstr "断页符号(&P)"
 

-#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:585
-#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:180 ../src/msw/textctrl.cpp:2285

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

-#: ../include/wx/richtext/richtextbuffer.h:4580
+#: ../include/wx/richtext/richtextbuffer.h:4655

 msgid "&Picture"
 msgstr "图片(&P)"
 
 msgid "&Picture"
 msgstr "图片(&P)"
 

-#: ../src/generic/fontdlgg.cpp:423
+#: ../src/generic/fontdlgg.cpp:422

 msgid "&Point size:"
 msgstr "字体大小(&P):"
 
 msgid "&Point size:"
 msgstr "字体大小(&P):"
 

-#: ../src/richtext/richtexttabspage.cpp:115
+#: ../src/richtext/richtexttabspage.cpp:114

 msgid "&Position (tenths of a mm):"
 msgstr "位置(&P) (十分之一毫米)"
 
 msgid "&Position (tenths of a mm):"
 msgstr "位置(&P) (十分之一毫米)"
 

-#: ../src/richtext/richtextsizepage.cpp:476
+#: ../src/richtext/richtextsizepage.cpp:514

 msgid "&Position mode:"
 msgstr "位置(&P)"
 
 msgid "&Position mode:"
 msgstr "位置(&P)"
 

-#: ../src/common/stockitem.cpp:182
+#: ../src/common/stockitem.cpp:181

 msgid "&Preferences"
 msgstr "偏好设置(&P)"
 
 msgid "&Preferences"
 msgstr "偏好设置(&P)"
 

-#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:102
-#: ../src/msw/mdi.cpp:170
+#: ../src/aui/tabmdi.cpp:112 ../src/generic/mdig.cpp:101
+#: ../src/msw/mdi.cpp:177

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

-#: ../src/richtext/richtextsizepage.cpp:609
+#: ../src/richtext/richtextsizepage.cpp:675

 msgid "&Previous Paragraph"
 msgstr "前一段落(&P)"
 
 msgid "&Previous Paragraph"
 msgstr "前一段落(&P)"
 

-#: ../src/common/stockitem.cpp:184
+#: ../src/common/stockitem.cpp:183

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

-#: ../src/richtext/richtextctrl.cpp:331 ../src/richtext/richtextctrl.cpp:4888
-#: ../src/common/stockitem.cpp:185
+#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4945
+#: ../src/common/stockitem.cpp:184

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

-#: ../src/common/stockitem.cpp:157
+#: ../src/common/stockitem.cpp:156

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

-#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:581
-#: ../src/common/stockitem.cpp:186 ../src/common/cmdproc.cpp:294
-#: ../src/common/cmdproc.cpp:301 ../src/msw/textctrl.cpp:2220
+#: ../src/richtext/richtextctrl.cpp:323 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:185 ../src/common/cmdproc.cpp:293
+#: ../src/common/cmdproc.cpp:300 ../src/msw/textctrl.cpp:2281

 msgid "&Redo"
 msgstr "恢复(&R)"
 
 msgid "&Redo"
 msgstr "恢复(&R)"
 

-#: ../src/common/cmdproc.cpp:290 ../src/common/cmdproc.cpp:310
+#: ../src/common/cmdproc.cpp:289 ../src/common/cmdproc.cpp:309

 msgid "&Redo "
 msgstr "恢复(&R) "
 
 msgid "&Redo "
 msgstr "恢复(&R) "
 

-#: ../src/richtext/richtextstyledlg.cpp:265
+#: ../src/richtext/richtextstyledlg.cpp:257

 msgid "&Rename Style..."
 msgstr "重命名样式(&R)..."
 
 msgid "&Rename Style..."
 msgstr "重命名样式(&R)..."
 

-#: ../src/generic/fdrepdlg.cpp:180
+#: ../src/generic/fdrepdlg.cpp:179

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

-#: ../src/richtext/richtextstyledlg.cpp:295
+#: ../src/richtext/richtextstyledlg.cpp:287

 msgid "&Restart numbering"
 msgstr "重新编号(&R)"
 
 msgid "&Restart numbering"
 msgstr "重新编号(&R)"
 

-#: ../src/univ/themes/win32.cpp:3748
+#: ../src/univ/themes/win32.cpp:3747

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

-#: ../src/richtext/richtextindentspage.cpp:159
-#: ../src/richtext/richtextliststylepage.cpp:336
+#: ../src/richtext/richtextindentspage.cpp:146
+#: ../src/richtext/richtextliststylepage.cpp:335

 msgid "&Right"
 msgstr "右(&R)"
 
 msgid "&Right"
 msgstr "右(&R)"
 

-#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextindentspage.cpp:213

 #: ../src/richtext/richtextborderspage.cpp:299
 #: ../src/richtext/richtextborderspage.cpp:443
 #: ../src/richtext/richtextborderspage.cpp:299
 #: ../src/richtext/richtextborderspage.cpp:443

-#: ../src/richtext/richtextliststylepage.cpp:400
+#: ../src/richtext/richtextliststylepage.cpp:399

 #: ../src/richtext/richtextmarginspage.cpp:212
 #: ../src/richtext/richtextmarginspage.cpp:326
 #: ../src/richtext/richtextmarginspage.cpp:212
 #: ../src/richtext/richtextmarginspage.cpp:326

-#: ../src/richtext/richtextsizepage.cpp:547
+#: ../src/richtext/richtextsizepage.cpp:602
+#: ../src/richtext/richtextsizepage.cpp:609

 msgid "&Right:"
 msgstr "右(&R):"
 
 msgid "&Right:"
 msgstr "右(&R):"
 

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

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

-#: ../src/common/stockitem.cpp:192
+#: ../src/common/stockitem.cpp:191

 msgid "&Save as"
 msgstr "另存为(&S)"
 
 msgid "&Save as"
 msgstr "另存为(&S)"
 

-#: ../include/wx/richmsgdlg.h:30
+#: ../include/wx/richmsgdlg.h:29

 msgid "&See details"
 msgstr "查看细节(&S)"
 
 msgid "&See details"
 msgstr "查看细节(&S)"
 

-#: ../src/generic/tipdlg.cpp:271
+#: ../src/generic/tipdlg.cpp:270

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

-#: ../src/univ/themes/win32.cpp:3751
+#: ../src/univ/themes/win32.cpp:3750

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

-#: ../src/richtext/richtextfontpage.cpp:166
+#: ../src/richtext/richtextfontpage.cpp:168

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

-#: ../src/generic/progdlgg.cpp:283
+#: ../src/generic/progdlgg.cpp:282

 msgid "&Skip"
 msgstr "跳过(&S)"
 
 msgid "&Skip"
 msgstr "跳过(&S)"
 

-#: ../src/richtext/richtextindentspage.cpp:267
-#: ../src/richtext/richtextliststylepage.cpp:418
+#: ../src/richtext/richtextindentspage.cpp:242
+#: ../src/richtext/richtextliststylepage.cpp:417

 msgid "&Spacing (tenths of a mm)"
 msgstr "间距(&S) (十分之一毫米)"
 
 msgid "&Spacing (tenths of a mm)"
 msgstr "间距(&S) (十分之一毫米)"
 

-#: ../src/common/stockitem.cpp:198
+#: ../src/common/stockitem.cpp:197

 msgid "&Spell Check"
 msgstr "拼写检查(&S)"
 
 msgid "&Spell Check"
 msgstr "拼写检查(&S)"
 

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

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

-#: ../src/richtext/richtextfontpage.cpp:282 ../src/common/stockitem.cpp:200
+#: ../src/richtext/richtextfontpage.cpp:284 ../src/common/stockitem.cpp:199

 msgid "&Strikethrough"
 msgstr "删除线(&S)"
 
 msgid "&Strikethrough"
 msgstr "删除线(&S)"
 

-#: ../src/generic/fontdlgg.cpp:383 ../src/richtext/richtextstylepage.cpp:105
+#: ../src/generic/fontdlgg.cpp:382 ../src/richtext/richtextstylepage.cpp:104

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

-#: ../src/richtext/richtextstyledlg.cpp:206
+#: ../src/richtext/richtextstyledlg.cpp:198

 msgid "&Styles:"
 msgstr "样式(&S):"
 
 msgid "&Styles:"
 msgstr "样式(&S):"
 

-#: ../src/richtext/richtextsymboldlg.cpp:414
+#: ../src/richtext/richtextsymboldlg.cpp:413

 msgid "&Subset:"
 msgstr "子集(&S):"
 
 msgid "&Subset:"
 msgstr "子集(&S):"
 

-#: ../src/richtext/richtextliststylepage.cpp:269
-#: ../src/richtext/richtextbulletspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:268
+#: ../src/richtext/richtextbulletspage.cpp:222

 msgid "&Symbol:"
 msgstr "符号(&S):"
 
 msgid "&Symbol:"
 msgstr "符号(&S):"
 

-#: ../include/wx/richtext/richtextbuffer.h:5558
+#: ../include/wx/richtext/richtextbuffer.h:5679

 msgid "&Table"
 msgstr "表格(&T)"
 
 msgid "&Table"
 msgstr "表格(&T)"
 

-#: ../src/common/stockitem.cpp:201
+#: ../src/common/stockitem.cpp:200

 msgid "&Top"
 msgstr "顶端(&T)"
 
 msgid "&Top"
 msgstr "顶端(&T)"
 


@@ -673,169 +683,166 @@ msgstr "顶端(&T)"
 #: ../src/richtext/richtextborderspage.cpp:473
 #: ../src/richtext/richtextmarginspage.cpp:235
 #: ../src/richtext/richtextmarginspage.cpp:349
 #: ../src/richtext/richtextborderspage.cpp:473
 #: ../src/richtext/richtextmarginspage.cpp:235
 #: ../src/richtext/richtextmarginspage.cpp:349

-#: ../src/richtext/richtextsizepage.cpp:519
+#: ../src/richtext/richtextsizepage.cpp:567
+#: ../src/richtext/richtextsizepage.cpp:574

 msgid "&Top:"
 msgstr "顶端(&T):"
 
 msgid "&Top:"
 msgstr "顶端(&T):"
 

-#: ../src/generic/fontdlgg.cpp:445 ../src/common/stockitem.cpp:203
+#: ../src/generic/fontdlgg.cpp:444 ../src/common/stockitem.cpp:202

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

-#: ../src/richtext/richtextfontpage.cpp:241
+#: ../src/richtext/richtextfontpage.cpp:243

 msgid "&Underlining:"
 msgstr "下划线(&U)"
 
 msgid "&Underlining:"
 msgstr "下划线(&U)"
 

-#: ../src/richtext/richtextctrl.cpp:321 ../src/osx/textctrl_osx.cpp:580
-#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
-#: ../src/msw/textctrl.cpp:2219
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:579
+#: ../src/common/stockitem.cpp:203 ../src/common/cmdproc.cpp:271
+#: ../src/msw/textctrl.cpp:2280

 msgid "&Undo"
 msgstr "撤销(&U)"
 
 msgid "&Undo"
 msgstr "撤销(&U)"
 

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

 msgid "&Undo "
 msgstr "撤销(&U) "
 
 msgid "&Undo "
 msgstr "撤销(&U) "
 

-#: ../src/common/stockitem.cpp:205
+#: ../src/common/stockitem.cpp:204

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

-#: ../src/common/stockitem.cpp:206
+#: ../src/common/stockitem.cpp:205

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

-#: ../src/richtext/richtextsizepage.cpp:254
+#: ../src/richtext/richtextsizepage.cpp:278

 msgid "&Vertical alignment:"
 msgstr "垂直对齐(&V)"
 
 msgid "&Vertical alignment:"
 msgstr "垂直对齐(&V)"
 

-#: ../src/generic/dbgrptg.cpp:337
+#: ../src/generic/dbgrptg.cpp:340

 msgid "&View..."
 msgstr "查看(&V)..."
 
 msgid "&View..."
 msgstr "查看(&V)..."
 

-#: ../src/generic/fontdlgg.cpp:394
+#: ../src/generic/fontdlgg.cpp:393

 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 

-#: ../src/richtext/richtextsizepage.cpp:290
+#: ../src/richtext/richtextsizepage.cpp:317
+#: ../src/richtext/richtextsizepage.cpp:324

 msgid "&Width:"
 msgstr "宽度(&W):"
 
 msgid "&Width:"
 msgstr "宽度(&W):"
 

-#: ../src/aui/tabmdi.cpp:303 ../src/aui/tabmdi.cpp:319
-#: ../src/aui/tabmdi.cpp:321 ../src/generic/mdig.cpp:295
-#: ../src/generic/mdig.cpp:311 ../src/generic/mdig.cpp:315
-#: ../src/msw/mdi.cpp:70
+#: ../src/aui/tabmdi.cpp:311 ../src/aui/tabmdi.cpp:327
+#: ../src/aui/tabmdi.cpp:329 ../src/generic/mdig.cpp:294
+#: ../src/generic/mdig.cpp:310 ../src/generic/mdig.cpp:314
+#: ../src/msw/mdi.cpp:77

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

-#: ../src/common/stockitem.cpp:207 ../src/msw/msgdlg.cpp:476
+#: ../src/common/stockitem.cpp:206 ../src/msw/msgdlg.cpp:476

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

-#: ../src/common/fontcmn.cpp:845
-msgid "'"
-msgstr "'"
-
-#: ../src/common/config.cpp:524 ../src/msw/regconf.cpp:259
+#: ../src/common/config.cpp:523 ../src/msw/regconf.cpp:258

 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有额外的 '..'，忽略之。"
 
 #, c-format
 msgid "'%s' has extra '..', ignored."
 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:249 ../src/common/valtext.cpp:251
+#: ../src/common/valtext.cpp:253 ../src/common/valtext.cpp:255

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

-#: ../src/common/cmdline.cpp:941 ../src/common/cmdline.cpp:959
+#: ../src/common/cmdline.cpp:948 ../src/common/cmdline.cpp:966

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

-#: ../src/common/translation.cpp:930
+#: ../src/common/translation.cpp:1086

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

-#: ../src/common/textbuf.cpp:240
+#: ../src/common/textbuf.cpp:239

 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或许是一个二进制文件。"
 
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或许是一个二进制文件。"
 

-#: ../src/common/valtext.cpp:248
+#: ../src/common/valtext.cpp:247

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

-#: ../src/common/valtext.cpp:240
+#: ../src/common/valtext.cpp:239

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

-#: ../src/common/valtext.cpp:242
+#: ../src/common/valtext.cpp:241

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

-#: ../src/common/valtext.cpp:244
+#: ../src/common/valtext.cpp:243

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

-#: ../src/common/valtext.cpp:246
+#: ../src/common/valtext.cpp:245

 #, c-format
 msgid "'%s' should only contain digits."
 msgstr "'%s' 应该仅包含数字。"
 
 #, c-format
 msgid "'%s' should only contain digits."
 msgstr "'%s' 应该仅包含数字。"
 

-#: ../src/richtext/richtextliststylepage.cpp:230
-#: ../src/richtext/richtextbulletspage.cpp:180
+#: ../src/richtext/richtextliststylepage.cpp:229
+#: ../src/richtext/richtextbulletspage.cpp:179

 msgid "(*)"
 msgstr "(*)"
 
 msgid "(*)"
 msgstr "(*)"
 

-#: ../src/html/helpwnd.cpp:977
+#: ../src/html/helpwnd.cpp:976

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

-#: ../src/richtext/richtextliststylepage.cpp:482
-#: ../src/richtext/richtextbulletspage.cpp:287
+#: ../src/richtext/richtextliststylepage.cpp:481
+#: ../src/richtext/richtextbulletspage.cpp:286

 msgid "(None)"
 msgstr "(无)"
 
 msgid "(None)"
 msgstr "(无)"
 

-#: ../src/richtext/richtextsymboldlg.cpp:505
+#: ../src/richtext/richtextsymboldlg.cpp:504

 msgid "(Normal text)"
 msgstr "(正常字体)"
 
 msgid "(Normal text)"
 msgstr "(正常字体)"
 

-#: ../src/html/helpwnd.cpp:427 ../src/html/helpwnd.cpp:1120
-#: ../src/html/helpwnd.cpp:1746
+#: ../src/html/helpwnd.cpp:426 ../src/html/helpwnd.cpp:1119
+#: ../src/html/helpwnd.cpp:1745

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

-#: ../src/richtext/richtextindentspage.cpp:239
-#: ../src/richtext/richtextindentspage.cpp:250
-#: ../src/richtext/richtextindentspage.cpp:251
-#: ../src/richtext/richtextindentspage.cpp:299
+#: ../src/richtext/richtextindentspage.cpp:274
+#: ../src/richtext/richtextindentspage.cpp:286
+#: ../src/richtext/richtextindentspage.cpp:287

 #: ../src/richtext/richtextindentspage.cpp:311
 #: ../src/richtext/richtextindentspage.cpp:311

-#: ../src/richtext/richtextindentspage.cpp:312
-#: ../src/richtext/richtextformatdlg.cpp:828
-#: ../src/richtext/richtextfontpage.cpp:322
-#: ../src/richtext/richtextfontpage.cpp:326
-#: ../src/richtext/richtextfontpage.cpp:330
-#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextindentspage.cpp:326
+#: ../src/richtext/richtextformatdlg.cpp:831
+#: ../src/richtext/richtextfontpage.cpp:331
+#: ../src/richtext/richtextfontpage.cpp:335
+#: ../src/richtext/richtextfontpage.cpp:339
+#: ../src/richtext/richtextliststylepage.cpp:448
+#: ../src/richtext/richtextliststylepage.cpp:460

 #: ../src/richtext/richtextliststylepage.cpp:461
 #: ../src/richtext/richtextliststylepage.cpp:461

-#: ../src/richtext/richtextliststylepage.cpp:462

 msgid "(none)"
 msgstr "(无)"
 
 msgid "(none)"
 msgstr "(无)"
 

-#: ../src/richtext/richtextliststylepage.cpp:493
-#: ../src/richtext/richtextbulletspage.cpp:298
+#: ../src/richtext/richtextliststylepage.cpp:492
+#: ../src/richtext/richtextbulletspage.cpp:297

 msgid "*"
 msgstr "*"
 
 msgid "*"
 msgstr "*"
 

-#: ../src/richtext/richtextliststylepage.cpp:237
-#: ../src/richtext/richtextbulletspage.cpp:187
+#: ../src/richtext/richtextliststylepage.cpp:236
+#: ../src/richtext/richtextbulletspage.cpp:186

 msgid "*)"
 msgstr "*)"
 
 msgid "*)"
 msgstr "*)"
 

-#: ../src/richtext/richtextliststylepage.cpp:496
-#: ../src/richtext/richtextbulletspage.cpp:301
+#: ../src/richtext/richtextliststylepage.cpp:495
+#: ../src/richtext/richtextbulletspage.cpp:300

 msgid "+"
 msgstr "+"
 
 msgid "+"
 msgstr "+"
 


@@ -843,570 +850,548 @@ msgstr "+"
 msgid ", 64-bit edition"
 msgstr "，64位版"
 
 msgid ", 64-bit edition"
 msgstr "，64位版"
 

-#: ../src/richtext/richtextliststylepage.cpp:494
-#: ../src/richtext/richtextbulletspage.cpp:299
+#: ../src/richtext/richtextliststylepage.cpp:493
+#: ../src/richtext/richtextbulletspage.cpp:298

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

-#: ../src/generic/filepickerg.cpp:67
+#: ../src/generic/filepickerg.cpp:66

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

-#: ../src/richtext/richtextindentspage.cpp:240
-msgid "1"
-msgstr "1"
-
-#: ../src/richtext/richtextindentspage.cpp:301
-#: ../src/richtext/richtextliststylepage.cpp:451
+#: ../src/richtext/richtextindentspage.cpp:276
+#: ../src/richtext/richtextliststylepage.cpp:450

 msgid "1.1"
 msgstr "1.1"
 
 msgid "1.1"
 msgstr "1.1"
 

-#: ../src/richtext/richtextindentspage.cpp:302
-#: ../src/richtext/richtextliststylepage.cpp:452
+#: ../src/richtext/richtextindentspage.cpp:277
+#: ../src/richtext/richtextliststylepage.cpp:451

 msgid "1.2"
 msgstr "1.2"
 
 msgid "1.2"
 msgstr "1.2"
 

-#: ../src/richtext/richtextindentspage.cpp:303
-#: ../src/richtext/richtextliststylepage.cpp:453
+#: ../src/richtext/richtextindentspage.cpp:278
+#: ../src/richtext/richtextliststylepage.cpp:452

 msgid "1.3"
 msgstr "1.3"
 
 msgid "1.3"
 msgstr "1.3"
 

-#: ../src/richtext/richtextindentspage.cpp:304
-#: ../src/richtext/richtextliststylepage.cpp:454
+#: ../src/richtext/richtextindentspage.cpp:279
+#: ../src/richtext/richtextliststylepage.cpp:453

 msgid "1.4"
 msgstr "1.4"
 
 msgid "1.4"
 msgstr "1.4"
 

-#: ../src/richtext/richtextindentspage.cpp:305
-#: ../src/richtext/richtextliststylepage.cpp:455
+#: ../src/richtext/richtextindentspage.cpp:280
+#: ../src/richtext/richtextliststylepage.cpp:454

 msgid "1.5"
 msgstr "1.5"
 
 msgid "1.5"
 msgstr "1.5"
 

-#: ../src/richtext/richtextindentspage.cpp:306
-#: ../src/richtext/richtextliststylepage.cpp:456
+#: ../src/richtext/richtextindentspage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:455

 msgid "1.6"
 msgstr "1.6"
 
 msgid "1.6"
 msgstr "1.6"
 

-#: ../src/richtext/richtextindentspage.cpp:307
-#: ../src/richtext/richtextliststylepage.cpp:457
+#: ../src/richtext/richtextindentspage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:456

 msgid "1.7"
 msgstr "1.7"
 
 msgid "1.7"
 msgstr "1.7"
 

-#: ../src/richtext/richtextindentspage.cpp:308
-#: ../src/richtext/richtextliststylepage.cpp:458
+#: ../src/richtext/richtextindentspage.cpp:283
+#: ../src/richtext/richtextliststylepage.cpp:457

 msgid "1.8"
 msgstr "1.8"
 
 msgid "1.8"
 msgstr "1.8"
 

-#: ../src/richtext/richtextindentspage.cpp:309
-#: ../src/richtext/richtextliststylepage.cpp:459
+#: ../src/richtext/richtextindentspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:458

 msgid "1.9"
 msgstr "1.9"
 
 msgid "1.9"
 msgstr "1.9"
 

-#: ../src/richtext/richtextindentspage.cpp:249
-msgid "10"
-msgstr "10"
-
-#: ../src/common/paper.cpp:142
+#: ../src/common/paper.cpp:141

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

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

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

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

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

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

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

-#: ../src/common/paper.cpp:143
+#: ../src/common/paper.cpp:142

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

-#: ../src/richtext/richtextindentspage.cpp:241
-#: ../src/richtext/richtextindentspage.cpp:310
-#: ../src/richtext/richtextliststylepage.cpp:460
+#: ../src/richtext/richtextindentspage.cpp:285
+#: ../src/richtext/richtextliststylepage.cpp:459

 msgid "2"
 msgstr "2"
 
 msgid "2"
 msgstr "2"
 

-#: ../src/richtext/richtextindentspage.cpp:242
-msgid "3"
-msgstr "3"
-
-#: ../src/richtext/richtextindentspage.cpp:243
-msgid "4"
-msgstr "4"
-
-#: ../src/richtext/richtextindentspage.cpp:244
-msgid "5"
-msgstr "5"
-
-#: ../src/richtext/richtextindentspage.cpp:245
-msgid "6"
-msgstr "6"
-
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:133

 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6 3/4 信封, 3 5/8 x 6 1/2 英寸"
 
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6 3/4 信封, 3 5/8 x 6 1/2 英寸"
 

-#: ../src/richtext/richtextindentspage.cpp:246
-msgid "7"
-msgstr "7"
-
-#: ../src/richtext/richtextindentspage.cpp:247
-msgid "8"
-msgstr "8"
-
-#: ../src/richtext/richtextindentspage.cpp:248
-msgid "9"
-msgstr "9"
-
-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:140

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

-#: ../src/html/htmprint.cpp:432
+#: ../src/html/htmprint.cpp:431

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

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

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

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

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

-#: ../src/generic/wizard.cpp:438
+#: ../src/generic/wizard.cpp:437

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

-#: ../src/osx/carbon/fontdlg.cpp:606 ../src/osx/carbon/fontdlg.cpp:813
-#: ../src/osx/carbon/fontdlg.cpp:833
+#: ../src/osx/carbon/fontdlg.cpp:608 ../src/osx/carbon/fontdlg.cpp:815
+#: ../src/osx/carbon/fontdlg.cpp:835

 msgid "<Any Decorative>"
 msgstr "<任意 Decorative>"
 
 msgid "<Any Decorative>"
 msgstr "<任意 Decorative>"
 

-#: ../src/osx/carbon/fontdlg.cpp:607 ../src/osx/carbon/fontdlg.cpp:815
-#: ../src/osx/carbon/fontdlg.cpp:835
+#: ../src/osx/carbon/fontdlg.cpp:609 ../src/osx/carbon/fontdlg.cpp:817
+#: ../src/osx/carbon/fontdlg.cpp:837

 msgid "<Any Modern>"
 msgstr "<任意 Modern>"
 
 msgid "<Any Modern>"
 msgstr "<任意 Modern>"
 

-#: ../src/osx/carbon/fontdlg.cpp:605 ../src/osx/carbon/fontdlg.cpp:811
-#: ../src/osx/carbon/fontdlg.cpp:831
+#: ../src/osx/carbon/fontdlg.cpp:607 ../src/osx/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:833

 msgid "<Any Roman>"
 msgstr "<任意 Roman>"
 
 msgid "<Any Roman>"
 msgstr "<任意 Roman>"
 

-#: ../src/osx/carbon/fontdlg.cpp:608 ../src/osx/carbon/fontdlg.cpp:817
-#: ../src/osx/carbon/fontdlg.cpp:837
+#: ../src/osx/carbon/fontdlg.cpp:610 ../src/osx/carbon/fontdlg.cpp:819
+#: ../src/osx/carbon/fontdlg.cpp:839

 msgid "<Any Script>"
 msgstr "<任意 Script>"
 
 msgid "<Any Script>"
 msgstr "<任意 Script>"
 

-#: ../src/osx/carbon/fontdlg.cpp:609 ../src/osx/carbon/fontdlg.cpp:822
-#: ../src/osx/carbon/fontdlg.cpp:841
+#: ../src/osx/carbon/fontdlg.cpp:611 ../src/osx/carbon/fontdlg.cpp:824
+#: ../src/osx/carbon/fontdlg.cpp:843

 msgid "<Any Swiss>"
 msgstr "<任意 Swiss>"
 
 msgid "<Any Swiss>"
 msgstr "<任意 Swiss>"
 

-#: ../src/osx/carbon/fontdlg.cpp:610 ../src/osx/carbon/fontdlg.cpp:819
-#: ../src/osx/carbon/fontdlg.cpp:839
+#: ../src/osx/carbon/fontdlg.cpp:612 ../src/osx/carbon/fontdlg.cpp:821
+#: ../src/osx/carbon/fontdlg.cpp:841

 msgid "<Any Teletype>"
 msgstr "<任意 Teletype>"
 
 msgid "<Any Teletype>"
 msgstr "<任意 Teletype>"
 

-#: ../src/osx/carbon/fontdlg.cpp:604
+#: ../src/osx/carbon/fontdlg.cpp:606

 msgid "<Any>"
 msgstr "<任意>"
 
 msgid "<Any>"
 msgstr "<任意>"
 

-#: ../src/generic/filectrlg.cpp:280 ../src/generic/filectrlg.cpp:303
+#: ../src/generic/filectrlg.cpp:286 ../src/generic/filectrlg.cpp:309

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

-#: ../src/generic/filectrlg.cpp:284 ../src/generic/filectrlg.cpp:307
+#: ../src/generic/filectrlg.cpp:290 ../src/generic/filectrlg.cpp:313

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

-#: ../src/generic/filectrlg.cpp:282 ../src/generic/filectrlg.cpp:305
+#: ../src/generic/filectrlg.cpp:288 ../src/generic/filectrlg.cpp:311

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

-#: ../src/html/helpwnd.cpp:1280
+#: ../src/html/helpwnd.cpp:1279

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

-#: ../src/html/helpwnd.cpp:1284
+#: ../src/html/helpwnd.cpp:1283

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

-#: ../src/html/helpwnd.cpp:1279
+#: ../src/html/helpwnd.cpp:1278

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

-#: ../src/html/helpwnd.cpp:1278
+#: ../src/html/helpwnd.cpp:1277

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

-#: ../src/richtext/richtextliststylepage.cpp:495
-#: ../src/richtext/richtextbulletspage.cpp:300
+#: ../src/richtext/richtextliststylepage.cpp:494
+#: ../src/richtext/richtextbulletspage.cpp:299

 msgid ">"
 msgstr ">"
 
 msgid ">"
 msgstr ">"
 

-#: ../src/generic/dbgrptg.cpp:315
+#: ../src/generic/dbgrptg.cpp:318

 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 

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

 msgid "A debug report has been generated. It can be found in"
 msgstr "产生了一份调试报告, 位于"
 
 msgid "A debug report has been generated. It can be found in"
 msgstr "产生了一份调试报告, 位于"
 

-#: ../src/common/xtixml.cpp:419
+#: ../src/common/xtixml.cpp:418

 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含 'element' 节点"
 
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必须包含 'element' 节点"
 

-#: ../src/richtext/richtextliststylepage.cpp:305
-#: ../src/richtext/richtextliststylepage.cpp:307
-#: ../src/richtext/richtextbulletspage.cpp:258
-#: ../src/richtext/richtextbulletspage.cpp:260
+#: ../src/richtext/richtextliststylepage.cpp:304
+#: ../src/richtext/richtextliststylepage.cpp:306
+#: ../src/richtext/richtextbulletspage.cpp:257
+#: ../src/richtext/richtextbulletspage.cpp:259

 msgid "A standard bullet name."
 msgstr "标准项目符号名称。"
 
 msgid "A standard bullet name."
 msgstr "标准项目符号名称。"
 

-#: ../src/common/paper.cpp:219
+#: ../src/common/paper.cpp:218

 msgid "A0 sheet, 841 x 1189 mm"
 msgstr "A0 纸张, 841 x 1189 毫米"
 
 msgid "A0 sheet, 841 x 1189 mm"
 msgstr "A0 纸张, 841 x 1189 毫米"
 

-#: ../src/common/paper.cpp:220
+#: ../src/common/paper.cpp:219

 msgid "A1 sheet, 594 x 841 mm"
 msgstr "A1 纸张, 594 x 841 毫米"
 
 msgid "A1 sheet, 594 x 841 mm"
 msgstr "A1 纸张, 594 x 841 毫米"
 

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

 msgid "A2 420 x 594 mm"
 msgstr "A2 纸张, 420 x 594 毫米"
 
 msgid "A2 420 x 594 mm"
 msgstr "A2 纸张, 420 x 594 毫米"
 

-#: ../src/common/paper.cpp:158
+#: ../src/common/paper.cpp:157

 msgid "A3 Extra 322 x 445 mm"
 msgstr "特大 A3 纸张, 322 x 445 毫米"
 
 msgid "A3 Extra 322 x 445 mm"
 msgstr "特大 A3 纸张, 322 x 445 毫米"
 

-#: ../src/common/paper.cpp:163
+#: ../src/common/paper.cpp:162

 msgid "A3 Extra Transverse 322 x 445 mm"
 msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
 
 msgid "A3 Extra Transverse 322 x 445 mm"
 msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
 

-#: ../src/common/paper.cpp:172
+#: ../src/common/paper.cpp:171

 msgid "A3 Rotated 420 x 297 mm"
 msgstr "横向 A3 纸张, 420 x 297 毫米"
 
 msgid "A3 Rotated 420 x 297 mm"
 msgstr "横向 A3 纸张, 420 x 297 毫米"
 

-#: ../src/common/paper.cpp:162
+#: ../src/common/paper.cpp:161

 msgid "A3 Transverse 297 x 420 mm"
 msgstr "A3 纸张(横排), 297 x 420 毫米"
 
 msgid "A3 Transverse 297 x 420 mm"
 msgstr "A3 纸张(横排), 297 x 420 毫米"
 

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

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

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

 msgid "A4 Extra 9.27 x 12.69 in"
 msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
 
 msgid "A4 Extra 9.27 x 12.69 in"
 msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
 

-#: ../src/common/paper.cpp:155
+#: ../src/common/paper.cpp:154

 msgid "A4 Plus 210 x 330 mm"
 msgstr "加大 A4 纸张, 210 x 330 毫米"
 
 msgid "A4 Plus 210 x 330 mm"
 msgstr "加大 A4 纸张, 210 x 330 毫米"
 

-#: ../src/common/paper.cpp:173
+#: ../src/common/paper.cpp:172

 msgid "A4 Rotated 297 x 210 mm"
 msgstr "横向 A4 纸张, 297 x 210 毫米"
 
 msgid "A4 Rotated 297 x 210 mm"
 msgstr "横向 A4 纸张, 297 x 210 毫米"
 

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

 msgid "A4 Transverse 210 x 297 mm"
 msgstr "A4 纸张(横排), 210 x 297 毫米"
 
 msgid "A4 Transverse 210 x 297 mm"
 msgstr "A4 纸张(横排), 210 x 297 毫米"
 

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

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

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

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

-#: ../src/common/paper.cpp:159
+#: ../src/common/paper.cpp:158

 msgid "A5 Extra 174 x 235 mm"
 msgstr "特大 A5 纸张, 174 x 235 毫米"
 
 msgid "A5 Extra 174 x 235 mm"
 msgstr "特大 A5 纸张, 174 x 235 毫米"
 

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

 msgid "A5 Rotated 210 x 148 mm"
 msgstr "横向 A5 纸张, 210 x 148 毫米"
 
 msgid "A5 Rotated 210 x 148 mm"
 msgstr "横向 A5 纸张, 210 x 148 毫米"
 

-#: ../src/common/paper.cpp:156
+#: ../src/common/paper.cpp:155

 msgid "A5 Transverse 148 x 210 mm"
 msgstr "A5 纸张(横排), 148 x 210 毫米"
 
 msgid "A5 Transverse 148 x 210 mm"
 msgstr "A5 纸张(横排), 148 x 210 毫米"
 

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

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

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

 msgid "A6 105 x 148 mm"
 msgstr "A6 纸张, 105 x 148 毫米"
 
 msgid "A6 105 x 148 mm"
 msgstr "A6 纸张, 105 x 148 毫米"
 

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

 msgid "A6 Rotated 148 x 105 mm"
 msgstr "横向 A5 纸张, 148 x 105 毫米"
 
 msgid "A6 Rotated 148 x 105 mm"
 msgstr "横向 A5 纸张, 148 x 105 毫米"
 

-#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:525
-#: ../src/osx/carbon/fontdlg.cpp:337
+#: ../src/generic/fontdlgg.cpp:83 ../src/richtext/richtextformatdlg.cpp:526
+#: ../src/osx/carbon/fontdlg.cpp:339

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

-#: ../src/common/accelcmn.cpp:77
+#: ../src/common/accelcmn.cpp:76

 msgid "ADD"
 msgstr "ADD"
 
 msgid "ADD"
 msgstr "ADD"
 

-#: ../src/richtext/richtextsymboldlg.cpp:459 ../src/common/ftp.cpp:406
+#: ../src/richtext/richtextsymboldlg.cpp:458 ../src/common/ftp.cpp:405

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

-#: ../src/osx/menu_osx.cpp:537 ../src/common/stockitem.cpp:140
+#: ../src/osx/menu_osx.cpp:630 ../src/common/stockitem.cpp:139

 msgid "About"
 msgstr "关于"
 
 msgid "About"
 msgstr "关于"
 

-#: ../src/generic/aboutdlgg.cpp:141 ../src/msw/aboutdlg.cpp:65
+#: ../src/generic/aboutdlgg.cpp:140 ../src/msw/aboutdlg.cpp:64

 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 

-#: ../src/richtext/richtextsizepage.cpp:482
+#: ../src/richtext/richtextsizepage.cpp:520

 msgid "Absolute"
 msgstr ""
 
 msgid "Absolute"
 msgstr ""
 

-#: ../src/common/stockitem.cpp:208
+#: ../src/common/stockitem.cpp:207

 msgid "Actual Size"
 msgstr "实际大小"
 
 msgid "Actual Size"
 msgstr "实际大小"
 

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

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

-#: ../src/html/helpwnd.cpp:440
+#: ../src/richtext/richtextbuffer.cpp:10751
+#, fuzzy
+msgid "Add Column"
+msgstr "添加列"
+
+#: ../src/richtext/richtextbuffer.cpp:10688
+#, fuzzy
+msgid "Add Row"
+msgstr "添加行"
+
+#: ../src/html/helpwnd.cpp:439

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

-#: ../src/generic/colrdlgg.cpp:284
+#: ../src/generic/colrdlgg.cpp:283

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

-#: ../include/wx/xtiprop.h:260
+#: ../include/wx/xtiprop.h:259

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

-#: ../include/wx/xtiprop.h:198
+#: ../include/wx/xtiprop.h:197

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

-#: ../src/html/helpctrl.cpp:160
+#: ../src/html/helpctrl.cpp:159

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

-#: ../src/osx/carbon/dataview.cpp:1934
+#: ../src/osx/carbon/dataview.cpp:1933

 msgid "Adding flavor TEXT failed"
 msgid "Adding flavor TEXT failed"

-msgstr ""
+msgstr "添加风格 TEXT 失败"

 
 

-#: ../src/osx/carbon/dataview.cpp:1955
+#: ../src/osx/carbon/dataview.cpp:1954

 msgid "Adding flavor utxt failed"
 msgid "Adding flavor utxt failed"

-msgstr ""
+msgstr "添加风格 utxt 失败"
+
+#: ../src/common/preferencescmn.cpp:41
+msgid "Advanced"
+msgstr "高级"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:436
+#: ../src/richtext/richtextliststylepage.cpp:435

 msgid "After a paragraph:"
 msgstr "段落之后:"
 
 msgid "After a paragraph:"
 msgstr "段落之后:"
 

-#: ../src/common/stockitem.cpp:173
+#: ../src/common/stockitem.cpp:172

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

-#: ../src/common/stockitem.cpp:174
+#: ../src/common/stockitem.cpp:173

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

-#: ../src/richtext/richtextsizepage.cpp:242
+#: ../src/richtext/richtextsizepage.cpp:266

 msgid "Alignment"
 msgstr "对齐"
 
 msgid "Alignment"
 msgstr "对齐"
 

-#: ../src/generic/prntdlgg.cpp:221
+#: ../src/generic/prntdlgg.cpp:215

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

-#: ../src/generic/filectrlg.cpp:1199 ../src/common/fldlgcmn.cpp:90
+#: ../src/generic/filectrlg.cpp:1205 ../src/common/fldlgcmn.cpp:89

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

-#: ../include/wx/defs.h:2774
+#: ../include/wx/defs.h:2922

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

-#: ../include/wx/defs.h:2771
+#: ../include/wx/defs.h:2919

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

-#: ../src/richtext/richtextstyles.cpp:1041
+#: ../src/richtext/richtextstyles.cpp:1057

 msgid "All styles"
 msgstr "所有样式"
 
 msgid "All styles"
 msgstr "所有样式"
 

-#: ../src/propgrid/manager.cpp:1495
+#: ../src/propgrid/manager.cpp:1496

 msgid "Alphabetic Mode"
 msgstr "字母顺序模式"
 
 msgid "Alphabetic Mode"
 msgstr "字母顺序模式"
 

-#: ../src/common/xtistrm.cpp:430
+#: ../src/common/xtistrm.cpp:429

 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "传递已注册对象给 SetObjectClassInfo"
 
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "传递已注册对象给 SetObjectClassInfo"
 

-#: ../src/unix/dialup.cpp:355
+#: ../src/unix/dialup.cpp:353

 msgid "Already dialling ISP."
 msgstr "已经拨接 ISP 。"
 
 msgid "Already dialling ISP."
 msgstr "已经拨接 ISP 。"
 

-#: ../src/common/accelcmn.cpp:321 ../src/univ/themes/win32.cpp:3757
+#: ../src/common/accelcmn.cpp:320 ../src/univ/themes/win32.cpp:3756

 msgid "Alt+"
 msgstr "Alt+"
 
 msgid "Alt+"
 msgstr "Alt+"
 

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

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

-#: ../src/generic/animateg.cpp:163
+#: ../src/generic/animateg.cpp:162

 #, c-format
 msgid "Animation file is not of type %ld."
 msgstr "动画文件的类型不是 %ld。"
 
 #, c-format
 msgid "Animation file is not of type %ld."
 msgstr "动画文件的类型不是 %ld。"
 

-#: ../src/generic/logg.cpp:1038
+#: ../src/generic/logg.cpp:1034

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

-#: ../src/osx/menu_osx.cpp:556 ../src/osx/menu_osx.cpp:564
+#: ../src/osx/menu_osx.cpp:602 ../src/osx/menu_osx.cpp:610
+#: ../src/osx/menu_osx.cpp:649 ../src/osx/menu_osx.cpp:657

 #, fuzzy
 msgid "Application"
 msgstr "选区"
 
 #, fuzzy
 msgid "Application"
 msgstr "选区"
 

-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:141

 msgid "Apply"
 msgstr "应用"
 
 msgid "Apply"
 msgstr "应用"
 

-#: ../src/richtext/richtextliststylepage.cpp:483
-#: ../src/richtext/richtextbulletspage.cpp:288
+#: ../src/richtext/richtextliststylepage.cpp:482
+#: ../src/richtext/richtextbulletspage.cpp:287

 msgid "Arabic"
 msgstr "阿拉伯数字"
 
 msgid "Arabic"
 msgstr "阿拉伯数字"
 

-#: ../src/common/fmapbase.cpp:154
+#: ../src/common/fmapbase.cpp:153

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

-#: ../src/msw/ole/automtn.cpp:656
+#: ../src/msw/ole/automtn.cpp:661

 #, c-format
 msgid "Argument %u not found."
 msgstr "找不到参数 %u。"
 
 #, c-format
 msgid "Argument %u not found."
 msgstr "找不到参数 %u。"
 

-#: ../src/generic/aboutdlgg.cpp:185
+#: ../src/generic/aboutdlgg.cpp:184

 msgid "Artists"
 msgstr "美术设计者"
 
 msgid "Artists"
 msgstr "美术设计者"
 

-#: ../src/common/stockitem.cpp:196
+#: ../src/common/stockitem.cpp:195

 msgid "Ascending"
 msgstr "升序"
 
 msgid "Ascending"
 msgstr "升序"
 

-#: ../src/generic/filectrlg.cpp:462
+#: ../src/generic/filectrlg.cpp:468

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

-#: ../src/richtext/richtextliststylepage.cpp:295
-#: ../src/richtext/richtextbulletspage.cpp:246
-#: ../src/richtext/richtextbulletspage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:294
+#: ../src/richtext/richtextbulletspage.cpp:245
+#: ../src/richtext/richtextbulletspage.cpp:247

 msgid "Available fonts."
 msgstr "可用字体。"
 
 msgid "Available fonts."
 msgstr "可用字体。"
 

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

 msgid "B4 (ISO) 250 x 353 mm"
 msgstr "B4 纸张(ISO), 250 x 353 毫米"
 
 msgid "B4 (ISO) 250 x 353 mm"
 msgstr "B4 纸张(ISO), 250 x 353 毫米"
 

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

 msgid "B4 (JIS) Rotated 364 x 257 mm"
 msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
 
 msgid "B4 (JIS) Rotated 364 x 257 mm"
 msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
 

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

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

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

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

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

 msgid "B5 (ISO) Extra 201 x 276 mm"
 msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
 
 msgid "B5 (ISO) Extra 201 x 276 mm"
 msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
 

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

 msgid "B5 (JIS) Rotated 257 x 182 mm"
 msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
 
 msgid "B5 (JIS) Rotated 257 x 182 mm"
 msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
 

-#: ../src/common/paper.cpp:157
+#: ../src/common/paper.cpp:156

 msgid "B5 (JIS) Transverse 182 x 257 mm"
 msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
 
 msgid "B5 (JIS) Transverse 182 x 257 mm"
 msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
 

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

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

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

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

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

 msgid "B6 (JIS) 128 x 182 mm"
 msgstr "B6 纸张(JIS), 128 x 182 毫米"
 
 msgid "B6 (JIS) 128 x 182 mm"
 msgstr "B6 纸张(JIS), 128 x 182 毫米"
 

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

 msgid "B6 (JIS) Rotated 182 x 128 mm"
 msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
 
 msgid "B6 (JIS) Rotated 182 x 128 mm"
 msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
 

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

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

-#: ../src/common/accelcmn.cpp:50
+#: ../src/common/accelcmn.cpp:49

 msgid "BACK"
 msgstr "BACK"
 
 msgid "BACK"
 msgstr "BACK"
 

-#: ../src/common/imagbmp.cpp:524 ../src/common/imagbmp.cpp:554
-#: ../src/common/imagbmp.cpp:569
+#: ../src/common/imagbmp.cpp:523 ../src/common/imagbmp.cpp:553
+#: ../src/common/imagbmp.cpp:568

 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 无法分配内存。"
 
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 无法分配内存。"
 

-#: ../src/common/imagbmp.cpp:98
+#: ../src/common/imagbmp.cpp:97

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

-#: ../src/common/imagbmp.cpp:339
+#: ../src/common/imagbmp.cpp:338

 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 无法写 RGB 色彩表。"
 
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 无法写 RGB 色彩表。"
 

-#: ../src/common/imagbmp.cpp:474
+#: ../src/common/imagbmp.cpp:473

 msgid "BMP: Couldn't write data."
 msgstr "BMP: 无法写数据。"
 
 msgid "BMP: Couldn't write data."
 msgstr "BMP: 无法写数据。"
 

-#: ../src/common/imagbmp.cpp:240
+#: ../src/common/imagbmp.cpp:239

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

-#: ../src/common/imagbmp.cpp:263
+#: ../src/common/imagbmp.cpp:262

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

-#: ../src/common/imagbmp.cpp:134
+#: ../src/common/imagbmp.cpp:133

 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr "BMP: wxImage 没有自己的 wxPalette。"
 
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr "BMP: wxImage 没有自己的 wxPalette。"
 

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

 msgid "Back"
 msgstr "返回"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:119
 msgid "Back"
 msgstr "返回"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:119

-#: ../src/richtext/richtextformatdlg.cpp:373
+#: ../src/richtext/richtextformatdlg.cpp:374

 msgid "Background"
 msgstr "背景"
 
 msgid "Background"
 msgstr "背景"
 


@@ -1414,33 +1399,33 @@ msgstr "背景"
 msgid "Background &colour:"
 msgstr "背景颜色(&c):"
 
 msgid "Background &colour:"
 msgstr "背景颜色(&c):"
 

-#: ../src/osx/carbon/fontdlg.cpp:404
+#: ../src/osx/carbon/fontdlg.cpp:406

 msgid "Background colour"
 msgstr "背景颜色"
 
 msgid "Background colour"
 msgstr "背景颜色"
 

-#: ../src/common/fmapbase.cpp:161
+#: ../src/common/fmapbase.cpp:160

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

-#: ../src/common/fmapbase.cpp:152
+#: ../src/common/fmapbase.cpp:151

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

-#: ../src/richtext/richtextliststylepage.cpp:427
+#: ../src/richtext/richtextliststylepage.cpp:426

 msgid "Before a paragraph:"
 msgstr "段落之前:"
 
 msgid "Before a paragraph:"
 msgstr "段落之前:"
 

-#: ../src/richtext/richtextliststylepage.cpp:490
-#: ../src/richtext/richtextbulletspage.cpp:295
+#: ../src/richtext/richtextliststylepage.cpp:489
+#: ../src/richtext/richtextbulletspage.cpp:294

 msgid "Bitmap"
 msgstr "位图"
 
 msgid "Bitmap"
 msgstr "位图"
 

-#: ../src/osx/carbon/dataview.cpp:2397
+#: ../src/osx/carbon/dataview.cpp:2396

 msgid "Bitmap renderer cannot render value; value type: "
 msgstr "位图渲染器无法渲染该值; 类型为:"
 
 msgid "Bitmap renderer cannot render value; value type: "
 msgstr "位图渲染器无法渲染该值; 类型为:"
 

-#: ../src/generic/fontdlgg.cpp:334 ../src/richtext/richtextfontpage.cpp:328
-#: ../src/osx/carbon/fontdlg.cpp:538 ../src/common/stockitem.cpp:144
+#: ../src/generic/fontdlgg.cpp:333 ../src/richtext/richtextfontpage.cpp:337
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/common/stockitem.cpp:143

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


@@ -1449,307 +1434,302 @@ msgstr "粗体"
 msgid "Border"
 msgstr "边框"
 
 msgid "Border"
 msgstr "边框"
 

-#: ../src/richtext/richtextformatdlg.cpp:367
+#: ../src/richtext/richtextformatdlg.cpp:368

 msgid "Borders"
 msgstr "边框"
 
 msgid "Borders"
 msgstr "边框"
 

-#: ../src/richtext/richtextsizepage.cpp:264 ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextsizepage.cpp:288 ../src/common/stockitem.cpp:144

 msgid "Bottom"
 msgstr "底端"
 
 msgid "Bottom"
 msgstr "底端"
 

-#: ../src/generic/prntdlgg.cpp:899
+#: ../src/generic/prntdlgg.cpp:893

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

-#: ../src/richtext/richtextbuffer.cpp:8431
+#: ../src/richtext/richtextbuffer.cpp:8919

 msgid "Box Properties"
 msgstr "方块属性"
 
 msgid "Box Properties"
 msgstr "方块属性"
 

-#: ../src/richtext/richtextstyles.cpp:1045
+#: ../src/richtext/richtextstyles.cpp:1061

 msgid "Box styles"
 msgstr "方块样式"
 
 msgid "Box styles"
 msgstr "方块样式"
 

-#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45
+#: ../src/common/filepickercmn.cpp:43 ../src/common/filepickercmn.cpp:44

 msgid "Browse"
 msgstr "浏览"
 
 msgid "Browse"
 msgstr "浏览"
 

-#: ../src/richtext/richtextliststylepage.cpp:246
-#: ../src/richtext/richtextbulletspage.cpp:196
+#: ../src/richtext/richtextliststylepage.cpp:245
+#: ../src/richtext/richtextbulletspage.cpp:195

 msgid "Bullet &Alignment:"
 msgstr "项目符号对齐(&A):"
 
 msgid "Bullet &Alignment:"
 msgstr "项目符号对齐(&A):"
 

-#: ../src/richtext/richtextliststylepage.cpp:310
+#: ../src/richtext/richtextliststylepage.cpp:309

 msgid "Bullet style"
 msgstr "项目符号样式"
 
 msgid "Bullet style"
 msgstr "项目符号样式"
 

-#: ../src/richtext/richtextformatdlg.cpp:341
+#: ../src/richtext/richtextformatdlg.cpp:342

 msgid "Bullets"
 msgstr "项目符号"
 
 msgid "Bullets"
 msgstr "项目符号"
 

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

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

-#: ../src/generic/logg.cpp:518
+#: ../src/generic/logg.cpp:520

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

-#: ../src/generic/fontdlgg.cpp:407
+#: ../src/generic/fontdlgg.cpp:406

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/common/accelcmn.cpp:67
+#: ../src/common/accelcmn.cpp:66

 msgid "CANCEL"
 msgstr "CANCEL"
 
 msgid "CANCEL"
 msgstr "CANCEL"
 

-#: ../src/common/accelcmn.cpp:71
+#: ../src/common/accelcmn.cpp:70

 msgid "CAPITAL"
 msgstr "CAPITAL"
 
 msgid "CAPITAL"
 msgstr "CAPITAL"
 

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

 msgid "CD-Rom"
 msgstr "CD 光驱"
 
 msgid "CD-Rom"
 msgstr "CD 光驱"
 

-#: ../src/html/chm.cpp:818 ../src/html/chm.cpp:877
+#: ../src/html/chm.cpp:815 ../src/html/chm.cpp:874

 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件！"
 
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM处理程序目前只支持本地文件！"
 

-#: ../src/common/accelcmn.cpp:68
+#: ../src/common/accelcmn.cpp:67

 msgid "CLEAR"
 msgstr "CLEAR"
 
 msgid "CLEAR"
 msgstr "CLEAR"
 

-#: ../src/common/accelcmn.cpp:112
+#: ../src/common/accelcmn.cpp:111

 msgid "COMMAND"
 msgstr "COMMAND"
 
 msgid "COMMAND"
 msgstr "COMMAND"
 

-#: ../src/richtext/richtextfontpage.cpp:289
+#: ../src/richtext/richtextfontpage.cpp:291

 msgid "Ca&pitals"
 msgstr "大写(&P)"
 
 msgid "Ca&pitals"
 msgstr "大写(&P)"
 

-#: ../src/common/cmdproc.cpp:268
+#: ../src/common/cmdproc.cpp:267

 msgid "Can't &Undo "
 msgstr "无法撤销(&U)"
 
 msgid "Can't &Undo "
 msgstr "无法撤销(&U)"
 

-#: ../src/common/image.cpp:2579
+#: ../src/common/image.cpp:2686

 msgid "Can't automatically determine the image format for non-seekable input."
 msgstr "不能自动确定不可定位输入的图像格式。"
 
 msgid "Can't automatically determine the image format for non-seekable input."
 msgstr "不能自动确定不可定位输入的图像格式。"
 

-#: ../src/msw/registry.cpp:506
+#: ../src/msw/registry.cpp:505

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

-#: ../src/msw/registry.cpp:584
+#: ../src/msw/registry.cpp:583

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

-#: ../src/msw/registry.cpp:487
+#: ../src/msw/registry.cpp:486

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

-#: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:495
+#: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:494

 msgid "Can't create thread"
 msgid "Can't create thread"

-msgstr "无法创建进程"
+msgstr "无法创建线程"

 
 

-#: ../src/msw/window.cpp:3780
+#: ../src/msw/window.cpp:3793

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

-#: ../src/msw/registry.cpp:777
+#: ../src/msw/registry.cpp:776

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

-#: ../src/msw/iniconf.cpp:459 ../src/os2/iniconf.cpp:472
+#: ../src/msw/iniconf.cpp:458 ../src/os2/iniconf.cpp:471

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

-#: ../src/msw/registry.cpp:805
+#: ../src/msw/registry.cpp:804

 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "无法删除值 '%s' 位于键 '%s'"
 
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "无法删除值 '%s' 位于键 '%s'"
 

-#: ../src/msw/registry.cpp:1162
+#: ../src/msw/registry.cpp:1161

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

-#: ../src/msw/registry.cpp:1117
+#: ../src/msw/registry.cpp:1116

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

-#: ../src/msw/registry.cpp:1380
+#: ../src/msw/registry.cpp:1379

 #, c-format
 msgid "Can't export value of unsupported type %d."
 msgstr "无法导出不支持的类型 %d 的值."
 
 #, c-format
 msgid "Can't export value of unsupported type %d."
 msgstr "无法导出不支持的类型 %d 的值."
 

-#: ../src/common/ffile.cpp:235
+#: ../src/common/ffile.cpp:236

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

-#: ../src/msw/registry.cpp:417
+#: ../src/msw/registry.cpp:416

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

-#: ../src/common/zstream.cpp:347
+#: ../src/common/zstream.cpp:346

 msgid "Can't initialize zlib deflate stream."
 msgstr "无法初始化 zlib 压缩流。"
 
 msgid "Can't initialize zlib deflate stream."
 msgstr "无法初始化 zlib 压缩流。"
 

-#: ../src/common/zstream.cpp:186
+#: ../src/common/zstream.cpp:185

 msgid "Can't initialize zlib inflate stream."
 msgstr "无法初始化 zlib 解压流。"
 
 msgid "Can't initialize zlib inflate stream."
 msgstr "无法初始化 zlib 解压流。"
 

-#: ../src/msw/fswatcher.cpp:429
+#: ../src/msw/fswatcher.cpp:432

 #, c-format
 msgid "Can't monitor non-existent directory \"%s\" for changes."
 msgstr "无法监视不存在目录 \"%s\" 的更新。"
 
 #, c-format
 msgid "Can't monitor non-existent directory \"%s\" for changes."
 msgstr "无法监视不存在目录 \"%s\" 的更新。"
 

-#: ../src/common/fswatchercmn.cpp:93
-#, c-format
-msgid "Can't monitor non-existent path \"%s\" for changes."
-msgstr "无法监视不存在路径 \"%s\" 的更新。"
-
-#: ../src/msw/registry.cpp:453
+#: ../src/msw/registry.cpp:452

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

-#: ../src/common/zstream.cpp:253
+#: ../src/common/zstream.cpp:252

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

-#: ../src/common/zstream.cpp:245
+#: ../src/common/zstream.cpp:244

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

-#: ../src/msw/registry.cpp:1049
+#: ../src/msw/registry.cpp:1048

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

-#: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910
-#: ../src/msw/registry.cpp:972
+#: ../src/msw/registry.cpp:877 ../src/msw/registry.cpp:909
+#: ../src/msw/registry.cpp:971

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

-#: ../src/common/image.cpp:2376
+#: ../src/common/image.cpp:2483

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

-#: ../src/generic/logg.cpp:579 ../src/generic/logg.cpp:1000
+#: ../src/generic/logg.cpp:579 ../src/generic/logg.cpp:996

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

-#: ../src/msw/thread.cpp:652 ../src/os2/thread.cpp:478
+#: ../src/msw/thread.cpp:652 ../src/os2/thread.cpp:477

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

-#: ../src/msw/registry.cpp:896 ../src/msw/registry.cpp:940
-#: ../src/msw/registry.cpp:1066
+#: ../src/msw/registry.cpp:895 ../src/msw/registry.cpp:939
+#: ../src/msw/registry.cpp:1065

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

-#: ../src/unix/utilsunx.cpp:352
+#: ../src/unix/utilsunx.cpp:357

 msgid "Can't write to child process's stdin"
 msgstr "无法写入子进程的标准输入"
 
 msgid "Can't write to child process's stdin"
 msgstr "无法写入子进程的标准输入"
 

-#: ../src/common/zstream.cpp:428
+#: ../src/common/zstream.cpp:427

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

-#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:308
-#: ../src/common/stockitem.cpp:146 ../src/msw/msgdlg.cpp:489
-#: ../src/msw/progdlg.cpp:674 ../src/gtk1/fontdlg.cpp:145
-#: ../src/motif/msgdlg.cpp:194
+#: ../include/wx/msgdlg.h:274 ../src/generic/dirdlgg.cpp:107
+#: ../src/richtext/richtextstyledlg.cpp:300 ../src/common/stockitem.cpp:145
+#: ../src/msw/msgdlg.cpp:489 ../src/msw/progdlg.cpp:673
+#: ../src/gtk1/fontdlg.cpp:144 ../src/motif/msgdlg.cpp:196

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

-#: ../src/os2/thread.cpp:117
+#: ../src/os2/thread.cpp:116

 msgid "Cannot create mutex."
 msgstr "无法创建互斥子。"
 
 msgid "Cannot create mutex."
 msgstr "无法创建互斥子。"
 

-#: ../src/osx/carbon/dataview.cpp:896
+#: ../src/osx/carbon/dataview.cpp:895

 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr "无法建立新的列 ID。可能已达到列数量的上限。"
 
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr "无法建立新的列 ID。可能已达到列数量的上限。"
 

-#: ../src/common/filefn.cpp:1330
+#: ../src/common/filefn.cpp:1336

 #, c-format
 msgid "Cannot enumerate files '%s'"
 msgstr "无法枚举文件 '%s'"
 
 #, c-format
 msgid "Cannot enumerate files '%s'"
 msgstr "无法枚举文件 '%s'"
 

-#: ../src/msw/dir.cpp:211
+#: ../src/msw/dir.cpp:264

 #, c-format
 msgid "Cannot enumerate files in directory '%s'"
 msgstr "无法枚举目录 '%s' 中的文件"
 
 #, c-format
 msgid "Cannot enumerate files in directory '%s'"
 msgstr "无法枚举目录 '%s' 中的文件"
 

-#: ../src/msw/dialup.cpp:543
+#: ../src/msw/dialup.cpp:542

 #, c-format
 msgid "Cannot find active dialup connection: %s"
 #, c-format
 msgid "Cannot find active dialup connection: %s"

-msgstr "æ\89¾ä¸\8d到活动的拨号连接: %s"
+msgstr "æ\97 æ³\95æ\89¾到活动的拨号连接: %s"

 
 

-#: ../src/msw/dialup.cpp:849
+#: ../src/msw/dialup.cpp:848

 msgid "Cannot find the location of address book file"
 msgid "Cannot find the location of address book file"

-msgstr "æ\89¾ä¸\8d到地址簿文件的位置"
+msgstr "æ\97 æ³\95æ\89¾到地址簿文件的位置"

 
 

-#: ../src/msw/ole/automtn.cpp:557
-#, fuzzy, c-format
+#: ../src/msw/ole/automtn.cpp:562
+#, c-format

 msgid "Cannot get an active instance of \"%s\""
 msgid "Cannot get an active instance of \"%s\""

-msgstr "æ\89¾ä¸\8då\88°æ´»å\8a¨ç\9a\84æ\8b¨å\8f·è¿\9eæ\8e¥: %s"
+msgstr "æ\97 æ³\95è\8e·å¾\97 \"%s\" ç\9a\84æ´»å\8a¨å®\9eä½\93"

 
 

-#: ../src/unix/threadpsx.cpp:1213
+#: ../src/unix/threadpsx.cpp:1030

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

-#: ../src/unix/utilsunx.cpp:878
+#: ../src/unix/utilsunx.cpp:988

 msgid "Cannot get the hostname"
 msgstr "无法获得主机名"
 
 msgid "Cannot get the hostname"
 msgstr "无法获得主机名"
 

-#: ../src/unix/utilsunx.cpp:914
+#: ../src/unix/utilsunx.cpp:1024

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

-#: ../src/msw/dialup.cpp:950
+#: ../src/msw/dialup.cpp:949

 msgid "Cannot hang up - no active dialup connection."
 msgstr "无法挂断 - 没有活动的拨号连接。"
 
 msgid "Cannot hang up - no active dialup connection."
 msgstr "无法挂断 - 没有活动的拨号连接。"
 

-#: ../include/wx/msw/ole/oleutils.h:53
+#: ../include/wx/msw/ole/oleutils.h:52

 msgid "Cannot initialize OLE"
 msgstr "无法初始化 OLE"
 
 msgid "Cannot initialize OLE"
 msgstr "无法初始化 OLE"
 

-#: ../src/common/socket.cpp:844
+#: ../src/common/socket.cpp:847

 msgid "Cannot initialize sockets"
 msgstr "无法初始化 sockets"
 
 msgid "Cannot initialize sockets"
 msgstr "无法初始化 sockets"
 


@@ -1758,453 +1738,460 @@ msgstr "无法初始化 sockets"
 msgid "Cannot load icon from '%s'."
 msgstr "无法从 '%s' 中读取图标。"
 
 msgid "Cannot load icon from '%s'."
 msgstr "无法从 '%s' 中读取图标。"
 

-#: ../src/xrc/xmlres.cpp:362
+#: ../src/xrc/xmlres.cpp:361

 #, c-format
 msgid "Cannot load resources from '%s'."
 msgstr "无法从文件 '%s' 中载入资源。"
 
 #, c-format
 msgid "Cannot load resources from '%s'."
 msgstr "无法从文件 '%s' 中载入资源。"
 

-#: ../src/xrc/xmlres.cpp:745
+#: ../src/xrc/xmlres.cpp:746

 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "无法从文件 '%s' 中载入资源。"
 
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "无法从文件 '%s' 中载入资源。"
 

-#: ../src/html/htmlfilt.cpp:138
+#: ../src/html/htmlfilt.cpp:137

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

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

 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "无法打开 HTML 帮助: %s"
 
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "无法打开 HTML 帮助: %s"
 

-#: ../src/html/helpdata.cpp:298
+#: ../src/html/helpdata.cpp:297

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

-#: ../src/generic/dcpsg.cpp:1719
+#: ../src/generic/dcpsg.cpp:1751

 msgid "Cannot open file for PostScript printing!"
 msgstr "无法打开文件进行 PostScript 打印！"
 
 msgid "Cannot open file for PostScript printing!"
 msgstr "无法打开文件进行 PostScript 打印！"
 

-#: ../src/html/helpdata.cpp:312
+#: ../src/html/helpdata.cpp:311

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

-#: ../src/xrc/xmlres.cpp:727
+#: ../src/xrc/xmlres.cpp:728

 #, c-format
 msgid "Cannot open resources file '%s'."
 msgstr "无法打开资源文件 '%s'。"
 
 #, c-format
 msgid "Cannot open resources file '%s'."
 msgstr "无法打开资源文件 '%s'。"
 

-#: ../src/html/helpwnd.cpp:1538
+#: ../src/html/helpwnd.cpp:1537

 msgid "Cannot print empty page."
 msgstr "无法打印空白页面。"
 
 msgid "Cannot print empty page."
 msgstr "无法打印空白页面。"
 

-#: ../src/msw/volume.cpp:508
+#: ../src/msw/volume.cpp:507

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

-#: ../src/os2/thread.cpp:528
+#: ../src/os2/thread.cpp:527

 #, c-format
 msgid "Cannot resume thread %lu"
 msgstr "无法恢复线程 %lu"
 
 #, c-format
 msgid "Cannot resume thread %lu"
 msgstr "无法恢复线程 %lu"
 

-#: ../src/msw/thread.cpp:922
+#: ../src/msw/thread.cpp:923

 #, c-format
 #, c-format

-msgid "Cannot resume thread %x"
-msgstr "无法恢复线程 %x"
+msgid "Cannot resume thread %lx"
+msgstr "无法恢复线程 %lx"

 
 

-#: ../src/unix/threadpsx.cpp:1194
+#: ../src/unix/threadpsx.cpp:1011

 msgid "Cannot retrieve thread scheduling policy."
 msgstr "无法找回线程调度策略。"
 
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "无法找回线程调度策略。"
 

-#: ../src/common/intl.cpp:545
+#: ../src/common/intl.cpp:542

 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr "无法设定为语言 \"%s\"。"
 
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr "无法设定为语言 \"%s\"。"
 

-#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570
+#: ../src/unix/threadpsx.cpp:831 ../src/msw/thread.cpp:569

 msgid "Cannot start thread: error writing TLS."
 msgstr "无法启动线程: 写 TLS 出错。"
 
 msgid "Cannot start thread: error writing TLS."
 msgstr "无法启动线程: 写 TLS 出错。"
 

-#: ../src/os2/thread.cpp:514
+#: ../src/os2/thread.cpp:513

 #, c-format
 msgid "Cannot suspend thread %lu"
 msgstr "无法挂起线程 %lu"
 
 #: ../src/msw/thread.cpp:907
 #, c-format
 #, c-format
 msgid "Cannot suspend thread %lu"
 msgstr "无法挂起线程 %lu"
 
 #: ../src/msw/thread.cpp:907
 #, c-format

-msgid "Cannot suspend thread %x"
-msgstr "无法挂起线程 %x"
+msgid "Cannot suspend thread %lx"
+msgstr "无法挂起线程 %lx"

 
 #: ../src/msw/thread.cpp:830
 msgid "Cannot wait for thread termination"
 msgstr "无法等候线程终止"
 
 
 #: ../src/msw/thread.cpp:830
 msgid "Cannot wait for thread termination"
 msgstr "无法等候线程终止"
 

-#: ../src/html/helpwnd.cpp:547
+#: ../src/html/helpwnd.cpp:546

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

-#: ../src/propgrid/manager.cpp:1494
+#: ../src/propgrid/manager.cpp:1495

 msgid "Categorized Mode"
 msgstr "分类模式"
 
 msgid "Categorized Mode"
 msgstr "分类模式"
 

-#: ../src/richtext/richtextbuffer.cpp:8843
+#: ../src/richtext/richtextbuffer.cpp:9347

 msgid "Cell Properties"
 msgstr "单元格属性"
 
 msgid "Cell Properties"
 msgstr "单元格属性"
 

-#: ../src/common/fmapbase.cpp:162
+#: ../src/common/fmapbase.cpp:161

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

-#: ../src/richtext/richtextindentspage.cpp:173
-#: ../src/richtext/richtextliststylepage.cpp:350
+#: ../src/richtext/richtextindentspage.cpp:160
+#: ../src/richtext/richtextliststylepage.cpp:349

 msgid "Cen&tred"
 msgstr "居中(&t)"
 
 msgid "Cen&tred"
 msgstr "居中(&t)"
 

-#: ../src/common/stockitem.cpp:171
+#: ../src/common/stockitem.cpp:170

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

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

 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 

-#: ../src/richtext/richtextliststylepage.cpp:251
-#: ../src/richtext/richtextbulletspage.cpp:201
+#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextbulletspage.cpp:200

 msgid "Centre"
 msgstr "居中"
 
 msgid "Centre"
 msgstr "居中"
 

-#: ../src/richtext/richtextindentspage.cpp:175
-#: ../src/richtext/richtextindentspage.cpp:177
-#: ../src/richtext/richtextliststylepage.cpp:352
-#: ../src/richtext/richtextliststylepage.cpp:354
+#: ../src/richtext/richtextindentspage.cpp:162
+#: ../src/richtext/richtextindentspage.cpp:164
+#: ../src/richtext/richtextliststylepage.cpp:351
+#: ../src/richtext/richtextliststylepage.cpp:353

 msgid "Centre text."
 msgstr "文字居中。"
 
 msgid "Centre text."
 msgstr "文字居中。"
 

-#: ../src/richtext/richtextsizepage.cpp:263
+#: ../src/richtext/richtextsizepage.cpp:287

 msgid "Centred"
 msgstr "居中"
 
 msgid "Centred"
 msgstr "居中"
 

-#: ../src/richtext/richtextliststylepage.cpp:281
-#: ../src/richtext/richtextbulletspage.cpp:233
+#: ../src/richtext/richtextliststylepage.cpp:280
+#: ../src/richtext/richtextbulletspage.cpp:232

 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 

-#: ../src/richtext/richtextbuffer.cpp:3936
+#: ../src/richtext/richtextbuffer.cpp:4041

 msgid "Change List Style"
 msgstr "更改列表样式"
 
 msgid "Change List Style"
 msgstr "更改列表样式"
 

-#: ../src/richtext/richtextbuffer.cpp:3300
+#: ../src/richtext/richtextbuffer.cpp:3392

 msgid "Change Object Style"
 msgstr "更改对象样式"
 
 msgid "Change Object Style"
 msgstr "更改对象样式"
 

-#: ../src/richtext/richtextbuffer.cpp:3566
+#: ../src/richtext/richtextbuffer.cpp:3658
+#: ../src/richtext/richtextbuffer.cpp:7749

 msgid "Change Properties"
 msgstr "修改属性"
 
 msgid "Change Properties"
 msgstr "修改属性"
 

-#: ../src/richtext/richtextbuffer.cpp:3127
+#: ../src/richtext/richtextbuffer.cpp:3209

 msgid "Change Style"
 msgstr "更改样式"
 
 msgid "Change Style"
 msgstr "更改样式"
 

-#: ../src/common/fileconf.cpp:373
+#: ../src/common/fileconf.cpp:372

 #, c-format
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr "为了防止重写已有文件 \"%s\" 更改不会被保存"
 
 #, c-format
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr "为了防止重写已有文件 \"%s\" 更改不会被保存"
 

-#: ../src/richtext/richtextstyles.cpp:1043
+#: ../src/richtext/richtextstyles.cpp:1059

 msgid "Character styles"
 msgstr "文字样式"
 
 msgid "Character styles"
 msgstr "文字样式"
 

-#: ../src/richtext/richtextliststylepage.cpp:225
-#: ../src/richtext/richtextliststylepage.cpp:227
-#: ../src/richtext/richtextbulletspage.cpp:175
-#: ../src/richtext/richtextbulletspage.cpp:177
+#: ../src/richtext/richtextliststylepage.cpp:224
+#: ../src/richtext/richtextliststylepage.cpp:226
+#: ../src/richtext/richtextbulletspage.cpp:174
+#: ../src/richtext/richtextbulletspage.cpp:176

 msgid "Check to add a period after the bullet."
 msgstr "勾选以在项目符号后加上句号"
 
 msgid "Check to add a period after the bullet."
 msgstr "勾选以在项目符号后加上句号"
 

-#: ../src/richtext/richtextliststylepage.cpp:239
-#: ../src/richtext/richtextliststylepage.cpp:241
-#: ../src/richtext/richtextbulletspage.cpp:189
-#: ../src/richtext/richtextbulletspage.cpp:191
+#: ../src/richtext/richtextliststylepage.cpp:238
+#: ../src/richtext/richtextliststylepage.cpp:240
+#: ../src/richtext/richtextbulletspage.cpp:188
+#: ../src/richtext/richtextbulletspage.cpp:190

 msgid "Check to add a right parenthesis."
 msgstr "勾选以加上右括号"
 
 msgid "Check to add a right parenthesis."
 msgstr "勾选以加上右括号"
 

-#: ../src/richtext/richtextliststylepage.cpp:232
-#: ../src/richtext/richtextliststylepage.cpp:234
-#: ../src/richtext/richtextbulletspage.cpp:182
-#: ../src/richtext/richtextbulletspage.cpp:184
+#: ../src/richtext/richtextliststylepage.cpp:231
+#: ../src/richtext/richtextliststylepage.cpp:233
+#: ../src/richtext/richtextbulletspage.cpp:181
+#: ../src/richtext/richtextbulletspage.cpp:183

 msgid "Check to enclose the bullet in parentheses."
 msgstr "勾选以将项目符号加上一对括号"
 
 msgid "Check to enclose the bullet in parentheses."
 msgstr "勾选以将项目符号加上一对括号"
 

-#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542
+#: ../src/osx/carbon/fontdlg.cpp:542 ../src/osx/carbon/fontdlg.cpp:544

 msgid "Check to make the font bold."
 msgstr "勾选设定为粗体。"
 
 msgid "Check to make the font bold."
 msgstr "勾选设定为粗体。"
 

-#: ../src/osx/carbon/fontdlg.cpp:547 ../src/osx/carbon/fontdlg.cpp:549
+#: ../src/osx/carbon/fontdlg.cpp:549 ../src/osx/carbon/fontdlg.cpp:551

 msgid "Check to make the font italic."
 msgstr "勾选设定为斜体。"
 
 msgid "Check to make the font italic."
 msgstr "勾选设定为斜体。"
 

-#: ../src/osx/carbon/fontdlg.cpp:556 ../src/osx/carbon/fontdlg.cpp:558
+#: ../src/osx/carbon/fontdlg.cpp:558 ../src/osx/carbon/fontdlg.cpp:560

 msgid "Check to make the font underlined."
 msgstr "勾选加下划线。"
 
 msgid "Check to make the font underlined."
 msgstr "勾选加下划线。"
 

-#: ../src/richtext/richtextstyledlg.cpp:297
-#: ../src/richtext/richtextstyledlg.cpp:299
+#: ../src/richtext/richtextstyledlg.cpp:289
+#: ../src/richtext/richtextstyledlg.cpp:291

 msgid "Check to restart numbering."
 msgstr "勾选以重新编号"
 
 msgid "Check to restart numbering."
 msgstr "勾选以重新编号"
 

-#: ../src/richtext/richtextfontpage.cpp:284

 #: ../src/richtext/richtextfontpage.cpp:286
 #: ../src/richtext/richtextfontpage.cpp:286

+#: ../src/richtext/richtextfontpage.cpp:288

 msgid "Check to show a line through the text."
 msgstr "勾选加删除线。"
 
 msgid "Check to show a line through the text."
 msgstr "勾选加删除线。"
 

-#: ../src/richtext/richtextfontpage.cpp:291

 #: ../src/richtext/richtextfontpage.cpp:293
 #: ../src/richtext/richtextfontpage.cpp:293

+#: ../src/richtext/richtextfontpage.cpp:295

 msgid "Check to show the text in capitals."
 msgstr "勾选显示为大写。"
 
 msgid "Check to show the text in capitals."
 msgstr "勾选显示为大写。"
 

-#: ../src/richtext/richtextfontpage.cpp:305
-#: ../src/richtext/richtextfontpage.cpp:307
+#: ../src/richtext/richtextfontpage.cpp:300
+#: ../src/richtext/richtextfontpage.cpp:302
+#, fuzzy
+msgid "Check to show the text in small capitals."
+msgstr "勾选显示为大写。"
+
+#: ../src/richtext/richtextfontpage.cpp:314
+#: ../src/richtext/richtextfontpage.cpp:316

 msgid "Check to show the text in subscript."
 msgstr "勾选显示为下标。"
 
 msgid "Check to show the text in subscript."
 msgstr "勾选显示为下标。"
 

-#: ../src/richtext/richtextfontpage.cpp:298
-#: ../src/richtext/richtextfontpage.cpp:300
+#: ../src/richtext/richtextfontpage.cpp:307
+#: ../src/richtext/richtextfontpage.cpp:309

 msgid "Check to show the text in superscript."
 msgstr "勾选显示为上标。"
 
 msgid "Check to show the text in superscript."
 msgstr "勾选显示为上标。"
 

-#: ../src/msw/dialup.cpp:785
+#: ../src/msw/dialup.cpp:784

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

-#: ../src/propgrid/props.cpp:1644
+#: ../src/propgrid/props.cpp:1643

 msgid "Choose a directory:"
 msgstr "选择目录:"
 
 msgid "Choose a directory:"
 msgstr "选择目录:"
 

-#: ../src/propgrid/props.cpp:1703
+#: ../src/propgrid/props.cpp:1702

 msgid "Choose a file"
 msgstr "选择文件"
 
 msgid "Choose a file"
 msgstr "选择文件"
 

-#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:62
+#: ../src/generic/colrdlgg.cpp:144 ../src/gtk/colordlg.cpp:63

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

-#: ../src/generic/fontpickerg.cpp:51 ../src/gtk/fontdlg.cpp:99
-#: ../src/gtk1/fontdlg.cpp:126
+#: ../src/generic/fontpickerg.cpp:50 ../src/gtk/fontdlg.cpp:75
+#: ../src/gtk1/fontdlg.cpp:125

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

-#: ../src/common/module.cpp:75
+#: ../src/common/module.cpp:74

 #, c-format
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr "检测到导致循环依赖模块 \"%s\" 。"
 
 #, c-format
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr "检测到导致循环依赖模块 \"%s\" 。"
 

-#: ../src/aui/tabmdi.cpp:107 ../src/generic/mdig.cpp:98
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:97

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

-#: ../src/msw/ole/automtn.cpp:668
+#: ../src/msw/ole/automtn.cpp:673

 msgid "Class not registered."
 msgstr "类未注册。"
 
 msgid "Class not registered."
 msgstr "类未注册。"
 

-#: ../src/common/stockitem.cpp:148
+#: ../src/common/stockitem.cpp:147

 msgid "Clear"
 msgstr "清除"
 
 msgid "Clear"
 msgstr "清除"
 

-#: ../src/generic/logg.cpp:518
+#: ../src/generic/logg.cpp:520

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

-#: ../src/richtext/richtextstyledlg.cpp:260
-#: ../src/richtext/richtextstyledlg.cpp:262
+#: ../src/richtext/richtextstyledlg.cpp:252
+#: ../src/richtext/richtextstyledlg.cpp:254

 msgid "Click to apply the selected style."
 msgstr "点击应用所选样式。"
 
 msgid "Click to apply the selected style."
 msgstr "点击应用所选样式。"
 

-#: ../src/richtext/richtextliststylepage.cpp:282
-#: ../src/richtext/richtextliststylepage.cpp:284
-#: ../src/richtext/richtextbulletspage.cpp:234
-#: ../src/richtext/richtextbulletspage.cpp:236
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:283
+#: ../src/richtext/richtextbulletspage.cpp:233
+#: ../src/richtext/richtextbulletspage.cpp:235

 msgid "Click to browse for a symbol."
 msgstr "点击浏览该符号。"
 
 msgid "Click to browse for a symbol."
 msgstr "点击浏览该符号。"
 

-#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589
+#: ../src/osx/carbon/fontdlg.cpp:589 ../src/osx/carbon/fontdlg.cpp:591

 msgid "Click to cancel changes to the font."
 msgstr "点击取消字体变更。"
 
 msgid "Click to cancel changes to the font."
 msgstr "点击取消字体变更。"
 

-#: ../src/generic/fontdlgg.cpp:473 ../src/generic/fontdlgg.cpp:492
+#: ../src/generic/fontdlgg.cpp:472 ../src/generic/fontdlgg.cpp:491

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

-#: ../src/osx/carbon/fontdlg.cpp:568 ../src/osx/carbon/fontdlg.cpp:570
+#: ../src/osx/carbon/fontdlg.cpp:570 ../src/osx/carbon/fontdlg.cpp:572

 msgid "Click to change the font colour."
 msgstr "点击更改字体颜色。"
 
 msgid "Click to change the font colour."
 msgstr "点击更改字体颜色。"
 

-#: ../src/richtext/richtextfontpage.cpp:274

 #: ../src/richtext/richtextfontpage.cpp:276
 #: ../src/richtext/richtextfontpage.cpp:276

+#: ../src/richtext/richtextfontpage.cpp:278

 msgid "Click to change the text background colour."
 msgstr "点击修改字体背景颜色。"
 
 msgid "Click to change the text background colour."
 msgstr "点击修改字体背景颜色。"
 

-#: ../src/richtext/richtextfontpage.cpp:261

 #: ../src/richtext/richtextfontpage.cpp:263
 #: ../src/richtext/richtextfontpage.cpp:263

+#: ../src/richtext/richtextfontpage.cpp:265

 msgid "Click to change the text colour."
 msgstr "点击修改字体颜色。"
 
 msgid "Click to change the text colour."
 msgstr "点击修改字体颜色。"
 

-#: ../src/richtext/richtextliststylepage.cpp:196
-#: ../src/richtext/richtextliststylepage.cpp:198
+#: ../src/richtext/richtextliststylepage.cpp:195
+#: ../src/richtext/richtextliststylepage.cpp:197

 msgid "Click to choose the font for this level."
 msgstr "点击选择此层级字体。"
 
 msgid "Click to choose the font for this level."
 msgstr "点击选择此层级字体。"
 

-#: ../src/richtext/richtextstyledlg.cpp:287
-#: ../src/richtext/richtextstyledlg.cpp:289
+#: ../src/richtext/richtextstyledlg.cpp:279
+#: ../src/richtext/richtextstyledlg.cpp:281

 msgid "Click to close this window."
 msgstr "点击关闭此窗口。"
 
 msgid "Click to close this window."
 msgstr "点击关闭此窗口。"
 

-#: ../src/osx/carbon/fontdlg.cpp:594 ../src/osx/carbon/fontdlg.cpp:596
+#: ../src/osx/carbon/fontdlg.cpp:596 ../src/osx/carbon/fontdlg.cpp:598

 msgid "Click to confirm changes to the font."
 msgstr "点击确认字体更改。"
 
 msgid "Click to confirm changes to the font."
 msgstr "点击确认字体更改。"
 

-#: ../src/generic/fontdlgg.cpp:478 ../src/generic/fontdlgg.cpp:480
-#: ../src/generic/fontdlgg.cpp:485 ../src/generic/fontdlgg.cpp:487
+#: ../src/generic/fontdlgg.cpp:477 ../src/generic/fontdlgg.cpp:479
+#: ../src/generic/fontdlgg.cpp:484 ../src/generic/fontdlgg.cpp:486

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

-#: ../src/richtext/richtextstyledlg.cpp:252
-#: ../src/richtext/richtextstyledlg.cpp:254
+#: ../src/richtext/richtextstyledlg.cpp:244
+#: ../src/richtext/richtextstyledlg.cpp:246

 msgid "Click to create a new box style."
 msgstr "点击新增方块样式。"
 
 msgid "Click to create a new box style."
 msgstr "点击新增方块样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:234
-#: ../src/richtext/richtextstyledlg.cpp:236
+#: ../src/richtext/richtextstyledlg.cpp:226
+#: ../src/richtext/richtextstyledlg.cpp:228

 msgid "Click to create a new character style."
 msgstr "点击新建文字样式。"
 
 msgid "Click to create a new character style."
 msgstr "点击新建文字样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:246
-#: ../src/richtext/richtextstyledlg.cpp:248
+#: ../src/richtext/richtextstyledlg.cpp:238
+#: ../src/richtext/richtextstyledlg.cpp:240

 msgid "Click to create a new list style."
 msgstr "点击新增列表样式。"
 
 msgid "Click to create a new list style."
 msgstr "点击新增列表样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:240
-#: ../src/richtext/richtextstyledlg.cpp:242
+#: ../src/richtext/richtextstyledlg.cpp:232
+#: ../src/richtext/richtextstyledlg.cpp:234

 msgid "Click to create a new paragraph style."
 msgstr "点击新建段落样式。"
 
 msgid "Click to create a new paragraph style."
 msgstr "点击新建段落样式。"
 

-#: ../src/richtext/richtexttabspage.cpp:138
-#: ../src/richtext/richtexttabspage.cpp:140
+#: ../src/richtext/richtexttabspage.cpp:137
+#: ../src/richtext/richtexttabspage.cpp:139

 msgid "Click to create a new tab position."
 msgstr "点击建立新的标签位置。"
 
 msgid "Click to create a new tab position."
 msgstr "点击建立新的标签位置。"
 

-#: ../src/richtext/richtexttabspage.cpp:150
-#: ../src/richtext/richtexttabspage.cpp:152
+#: ../src/richtext/richtexttabspage.cpp:149
+#: ../src/richtext/richtexttabspage.cpp:151

 msgid "Click to delete all tab positions."
 msgstr "点击删除所有标签位置。"
 
 msgid "Click to delete all tab positions."
 msgstr "点击删除所有标签位置。"
 

-#: ../src/richtext/richtextstyledlg.cpp:278
-#: ../src/richtext/richtextstyledlg.cpp:280
+#: ../src/richtext/richtextstyledlg.cpp:270
+#: ../src/richtext/richtextstyledlg.cpp:272

 msgid "Click to delete the selected style."
 msgstr "点击删除所选样式。"
 
 msgid "Click to delete the selected style."
 msgstr "点击删除所选样式。"
 

-#: ../src/richtext/richtexttabspage.cpp:144
-#: ../src/richtext/richtexttabspage.cpp:146
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtexttabspage.cpp:145

 msgid "Click to delete the selected tab position."
 msgstr "点击删除所选标签位置。"
 
 msgid "Click to delete the selected tab position."
 msgstr "点击删除所选标签位置。"
 

-#: ../src/richtext/richtextstyledlg.cpp:272
-#: ../src/richtext/richtextstyledlg.cpp:274
+#: ../src/richtext/richtextstyledlg.cpp:264
+#: ../src/richtext/richtextstyledlg.cpp:266

 msgid "Click to edit the selected style."
 msgstr "点击编辑所选样式。"
 
 msgid "Click to edit the selected style."
 msgstr "点击编辑所选样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:266
-#: ../src/richtext/richtextstyledlg.cpp:268
+#: ../src/richtext/richtextstyledlg.cpp:258
+#: ../src/richtext/richtextstyledlg.cpp:260

 msgid "Click to rename the selected style."
 msgstr "点击重命名所选样式。"
 
 msgid "Click to rename the selected style."
 msgstr "点击重命名所选样式。"
 

-#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
-#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:285
-#: ../src/richtext/richtextsymboldlg.cpp:477 ../src/common/stockitem.cpp:149
-#: ../src/msw/progdlg.cpp:171 ../src/msw/progdlg.cpp:680
-#: ../src/html/helpdlg.cpp:91
+#: ../src/generic/dbgrptg.cpp:97 ../src/generic/progdlgg.cpp:804
+#: ../src/generic/progdlgg.cpp:809 ../src/richtext/richtextstyledlg.cpp:277
+#: ../src/richtext/richtextsymboldlg.cpp:476 ../src/common/stockitem.cpp:148
+#: ../src/msw/progdlg.cpp:170 ../src/msw/progdlg.cpp:679
+#: ../src/html/helpdlg.cpp:90

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

-#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:99
+#: ../src/aui/tabmdi.cpp:109 ../src/generic/mdig.cpp:98

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

-#: ../src/common/stockitem.cpp:267
+#: ../src/common/stockitem.cpp:266

 msgid "Close current document"
 msgstr "关闭当前文档"
 
 msgid "Close current document"
 msgstr "关闭当前文档"
 

-#: ../src/generic/logg.cpp:520
+#: ../src/generic/logg.cpp:522

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

-#: ../src/common/stockitem.cpp:194
+#: ../src/common/stockitem.cpp:193

 msgid "Color"
 msgstr "颜色"
 
 msgid "Color"
 msgstr "颜色"
 

-#: ../src/richtext/richtextformatdlg.cpp:722
+#: ../src/richtext/richtextformatdlg.cpp:725

 msgid "Colour"
 msgstr "颜色"
 
 msgid "Colour"
 msgstr "颜色"
 

-#: ../src/msw/colordlg.cpp:154
+#: ../src/msw/colordlg.cpp:156

 #, c-format
 msgid "Colour selection dialog failed with error %0lx."
 msgstr "颜色选择对话框错误，错误码 %0lx。"
 
 #, c-format
 msgid "Colour selection dialog failed with error %0lx."
 msgstr "颜色选择对话框错误，错误码 %0lx。"
 

-#: ../src/osx/carbon/fontdlg.cpp:564
+#: ../src/osx/carbon/fontdlg.cpp:566

 msgid "Colour:"
 msgstr "颜色:"
 
 msgid "Colour:"
 msgstr "颜色:"
 

-#: ../src/osx/carbon/dataview.cpp:901
+#: ../src/osx/carbon/dataview.cpp:900

 msgid "Column could not be added."
 msgstr "无法增加列。"
 
 msgid "Column could not be added."
 msgstr "无法增加列。"
 

-#: ../src/osx/carbon/dataview.cpp:900
+#: ../src/osx/carbon/dataview.cpp:899

 msgid "Column description could not be initialized."
 msgstr "列描述无法初始化。"
 
 msgid "Column description could not be initialized."
 msgstr "列描述无法初始化。"
 

-#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560
+#: ../src/osx/carbon/dataview.cpp:1538 ../src/osx/carbon/dataview.cpp:1559

 msgid "Column index not found."
 msgstr "找不到列索引。"
 
 msgid "Column index not found."
 msgstr "找不到列索引。"
 

-#: ../src/osx/carbon/dataview.cpp:1615
+#: ../src/osx/carbon/dataview.cpp:1614

 msgid "Column width could not be determined"
 msgstr "无法确定列宽"
 
 msgid "Column width could not be determined"
 msgstr "无法确定列宽"
 

-#: ../src/osx/carbon/dataview.cpp:902
+#: ../src/osx/carbon/dataview.cpp:901

 msgid "Column width could not be set."
 msgstr "无法设定列宽。"
 
 msgid "Column width could not be set."
 msgstr "无法设定列宽。"
 

-#: ../src/common/init.cpp:185
+#: ../src/common/init.cpp:188

 #, c-format
 msgid ""
 "Command line argument %d couldn't be converted to Unicode and will be "
 "ignored."
 msgstr "命令行参数 %d 无法被转化成Unicode编码，其将被忽略。"
 
 #, c-format
 msgid ""
 "Command line argument %d couldn't be converted to Unicode and will be "
 "ignored."
 msgstr "命令行参数 %d 无法被转化成Unicode编码，其将被忽略。"
 

-#: ../src/msw/fontdlg.cpp:117
+#: ../src/msw/fontdlg.cpp:119

 #, c-format
 msgid "Common dialog failed with error code %0lx."
 msgstr "公共对话框错误，错误码 %0lx。"
 
 #, c-format
 msgid "Common dialog failed with error code %0lx."
 msgstr "公共对话框错误，错误码 %0lx。"
 

-#: ../src/gtk/window.cpp:4228
+#: ../src/gtk/window.cpp:4306

 msgid ""
 "Compositing not supported by this system, please enable it in your Window "
 "Manager."
 msgstr "当前系统不支持组合模式，请在窗口管理器中启用。"
 
 msgid ""
 "Compositing not supported by this system, please enable it in your Window "
 "Manager."
 msgstr "当前系统不支持组合模式，请在窗口管理器中启用。"
 

-#: ../src/html/helpwnd.cpp:1555
+#: ../src/html/helpwnd.cpp:1554

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

-#: ../src/generic/dirctrlg.cpp:536
+#: ../src/generic/dirctrlg.cpp:544

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

-#: ../src/common/fileconf.cpp:966
+#: ../src/common/fileconf.cpp:965

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


@@ -2213,232 +2200,230 @@ msgstr "配置条目名不能以 '%c' 开头。"
 msgid "Confirm"
 msgstr "确认"
 
 msgid "Confirm"
 msgstr "确认"
 

-#: ../src/msw/mimetype.cpp:715
+#: ../src/msw/mimetype.cpp:739

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

-#: ../src/html/htmlwin.cpp:540
+#: ../src/html/htmlwin.cpp:544

 msgid "Connecting..."
 msgstr "正在连接..."
 
 msgid "Connecting..."
 msgstr "正在连接..."
 

-#: ../src/html/helpwnd.cpp:483
+#: ../src/html/helpwnd.cpp:482

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

-#: ../src/common/strconv.cpp:2263
+#: ../src/common/strconv.cpp:2261

 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "无法进行到字符集 '%s' 的转换。"
 
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "无法进行到字符集 '%s' 的转换。"
 

-#: ../src/common/stockitem.cpp:150
+#: ../src/common/stockitem.cpp:149

 msgid "Convert"
 msgstr "转换"
 
 msgid "Convert"
 msgstr "转换"
 

-#: ../src/html/htmlwin.cpp:1053
+#: ../src/html/htmlwin.cpp:1057

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

-#: ../src/generic/prntdlgg.cpp:253
+#: ../src/generic/prntdlgg.cpp:247

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

-#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19
+#: ../src/common/stockitem.cpp:150 ../src/stc/stc_i18n.cpp:18

 msgid "Copy"
 msgstr "复制"
 
 msgid "Copy"
 msgstr "复制"
 

-#: ../src/common/stockitem.cpp:259
+#: ../src/common/stockitem.cpp:258

 msgid "Copy selection"
 msgstr "复制选区"
 
 msgid "Copy selection"
 msgstr "复制选区"
 

-#: ../src/html/chm.cpp:721
+#: ../src/html/chm.cpp:718

 #, c-format
 msgid "Could not create temporary file '%s'"
 msgstr "无法创建临时文件 '%s'"
 
 #, c-format
 msgid "Could not create temporary file '%s'"
 msgstr "无法创建临时文件 '%s'"
 

-#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673
+#: ../src/osx/carbon/dataview.cpp:1285 ../src/osx/carbon/dataview.cpp:1672

 msgid "Could not determine column index."
 msgstr "无法确定列索引。"
 
 msgid "Could not determine column index."
 msgstr "无法确定列索引。"
 

-#: ../src/osx/carbon/dataview.cpp:877
+#: ../src/osx/carbon/dataview.cpp:876

 msgid "Could not determine column's position"
 msgstr "无法确定列位置"
 
 msgid "Could not determine column's position"
 msgstr "无法确定列位置"
 

-#: ../src/osx/carbon/dataview.cpp:844
+#: ../src/osx/carbon/dataview.cpp:843

 msgid "Could not determine number of columns."
 msgstr "无法确定列数量。"
 
 msgid "Could not determine number of columns."
 msgstr "无法确定列数量。"
 

-#: ../src/osx/carbon/dataview.cpp:976
+#: ../src/osx/carbon/dataview.cpp:975

 msgid "Could not determine number of items"
 msgstr "无法确定项目数量"
 
 msgid "Could not determine number of items"
 msgstr "无法确定项目数量"
 

-#: ../src/html/chm.cpp:274
+#: ../src/html/chm.cpp:273

 #, c-format
 msgid "Could not extract %s into %s: %s"
 msgstr "无法将 %s 解开至 %s: %s"
 
 #, c-format
 msgid "Could not extract %s into %s: %s"
 msgstr "无法将 %s 解开至 %s: %s"
 

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

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

-#: ../src/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
+#: ../src/osx/carbon/dataview.cpp:2556 ../src/osx/carbon/dataview.cpp:2591
+#: ../src/osx/carbon/dataview.cpp:2615 ../src/osx/carbon/dataview.cpp:2636
+#: ../src/osx/carbon/dataview.cpp:2773

 msgid "Could not get header description."
 msgstr "无法获取表头描述。"
 
 msgid "Could not get header description."
 msgstr "无法获取表头描述。"
 

-#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196
+#: ../src/osx/carbon/dataview.cpp:1169 ../src/osx/carbon/dataview.cpp:1195

 msgid "Could not get items."
 msgstr "无法获取项目。"
 
 msgid "Could not get items."
 msgstr "无法获取项目。"
 

-#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725
+#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724

 msgid "Could not get property flags."
 msgstr "无法获取属性标志。"
 
 msgid "Could not get property flags."
 msgstr "无法获取属性标志。"
 

-#: ../src/osx/carbon/dataview.cpp:727
+#: ../src/osx/carbon/dataview.cpp:726

 msgid "Could not get selected items."
 msgstr "无法获取所选项目。"
 
 msgid "Could not get selected items."
 msgstr "无法获取所选项目。"
 

-#: ../src/html/chm.cpp:445
+#: ../src/html/chm.cpp:444

 #, c-format
 msgid "Could not locate file '%s'."
 msgstr "找不到文件 '%s'。"
 
 #, c-format
 msgid "Could not locate file '%s'."
 msgstr "找不到文件 '%s'。"
 

-#: ../src/osx/carbon/dataview.cpp:846
+#: ../src/osx/carbon/dataview.cpp:845

 msgid "Could not remove column."
 msgstr "无法删除列。"
 
 msgid "Could not remove column."
 msgstr "无法删除列。"
 

-#: ../src/osx/carbon/dataview.cpp:643
+#: ../src/osx/carbon/dataview.cpp:642

 msgid "Could not retrieve number of items"
 msgstr "无法获取项目数量"
 
 msgid "Could not retrieve number of items"
 msgstr "无法获取项目数量"
 

-#: ../src/osx/carbon/dataview.cpp:2573
+#: ../src/osx/carbon/dataview.cpp:2572

 msgid "Could not set alignment."
 msgstr "无法设定对齐。"
 
 msgid "Could not set alignment."
 msgstr "无法设定对齐。"
 

-#: ../src/osx/carbon/dataview.cpp:2804
+#: ../src/osx/carbon/dataview.cpp:2803

 msgid "Could not set column width."
 msgstr "无法启动文档预览。"
 
 msgid "Could not set column width."
 msgstr "无法启动文档预览。"
 

-#: ../src/common/filefn.cpp:1565
+#: ../src/common/filefn.cpp:1569

 msgid "Could not set current working directory"
 msgstr "无法设置当前工作目录"
 
 msgid "Could not set current working directory"
 msgstr "无法设置当前工作目录"
 

-#: ../src/osx/carbon/dataview.cpp:2776
+#: ../src/osx/carbon/dataview.cpp:2775

 msgid "Could not set header description."
 msgstr "无法启动打印。"
 
 msgid "Could not set header description."
 msgstr "无法启动打印。"
 

-#: ../src/osx/carbon/dataview.cpp:2597
+#: ../src/osx/carbon/dataview.cpp:2596

 msgid "Could not set icon."
 msgstr "无法启动打印。"
 
 msgid "Could not set icon."
 msgstr "无法启动打印。"
 

-#: ../src/osx/carbon/dataview.cpp:2618
+#: ../src/osx/carbon/dataview.cpp:2617

 msgid "Could not set maximum width."
 msgstr "无法设定最大宽度。"
 
 msgid "Could not set maximum width."
 msgstr "无法设定最大宽度。"
 

-#: ../src/osx/carbon/dataview.cpp:2639
+#: ../src/osx/carbon/dataview.cpp:2638

 msgid "Could not set minimum width."
 msgstr "无法设定最小宽度。"
 
 msgid "Could not set minimum width."
 msgstr "无法设定最小宽度。"
 

-#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730
+#: ../src/osx/carbon/dataview.cpp:2664 ../src/osx/carbon/dataview.cpp:2729

 msgid "Could not set property flags."
 msgstr "无法设定属性标志。"
 
 msgid "Could not set property flags."
 msgstr "无法设定属性标志。"
 

-#: ../src/common/prntbase.cpp:1986
+#: ../src/common/prntbase.cpp:1985

 msgid "Could not start document preview."
 msgstr "无法启动文档预览。"
 
 msgid "Could not start document preview."
 msgstr "无法启动文档预览。"
 

-#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:204
-#: ../src/gtk/print.cpp:1079 ../src/gtk/gnome/gprint.cpp:918
+#: ../src/generic/printps.cpp:178 ../src/msw/printwin.cpp:210
+#: ../src/gtk/print.cpp:1077

 msgid "Could not start printing."
 msgstr "无法启动打印。"
 
 msgid "Could not start printing."
 msgstr "无法启动打印。"
 

-#: ../src/common/wincmn.cpp:2024
+#: ../src/common/wincmn.cpp:2131

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

-#: ../src/os2/thread.cpp:161
+#: ../src/os2/thread.cpp:160

 msgid "Couldn't acquire a mutex lock"
 msgstr "无法得到互斥锁"
 
 msgid "Couldn't acquire a mutex lock"
 msgstr "无法得到互斥锁"
 

-#: ../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
+#: ../src/msw/imaglist.cpp:166 ../src/msw/imaglist.cpp:197
+#: ../src/msw/imaglist.cpp:209 ../src/msw/dragimag.cpp:193
+#: ../src/msw/dragimag.cpp:232

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

-#: ../src/msw/timer.cpp:135 ../src/os2/timer.cpp:114
+#: ../src/msw/timer.cpp:134 ../src/os2/timer.cpp:113

 msgid "Couldn't create a timer"
 msgstr "无法创建计时器"
 
 msgid "Couldn't create a timer"
 msgstr "无法创建计时器"
 

-#: ../src/osx/carbon/overlay.cpp:123
-#, fuzzy
+#: ../src/osx/carbon/overlay.cpp:122

 msgid "Couldn't create the overlay window"
 msgid "Couldn't create the overlay window"

-msgstr "无法创建计时器"
+msgstr "无法创建 overlay 窗口"

 
 

-#: ../src/common/translation.cpp:1853
+#: ../src/common/translation.cpp:2015

 #, fuzzy
 msgid "Couldn't enumerate translations"
 msgstr "无法终止线程"
 
 #, fuzzy
 msgid "Couldn't enumerate translations"
 msgstr "无法终止线程"
 

-#: ../src/common/dynlib.cpp:157
+#: ../src/common/dynlib.cpp:152

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

-#: ../src/gtk/print.cpp:2027
+#: ../src/gtk/print.cpp:2014

 msgid "Couldn't get hatch style from wxBrush."
 msgid "Couldn't get hatch style from wxBrush."

-msgstr ""
+msgstr "无法从 wxBrush 获取阴影样式。"

 
 

-#: ../src/msw/thread.cpp:948
+#: ../src/msw/thread.cpp:950

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

-#: ../src/osx/carbon/overlay.cpp:130
+#: ../src/osx/carbon/overlay.cpp:129

 #, fuzzy
 msgid "Couldn't init the context on the overlay window"
 msgstr "无法获得当前线程指针"
 
 #, fuzzy
 msgid "Couldn't init the context on the overlay window"
 msgstr "无法获得当前线程指针"
 

-#: ../src/common/imaggif.cpp:264
+#: ../src/common/imaggif.cpp:263

 #, fuzzy
 msgid "Couldn't initialize GIF hash table."
 msgstr "无法初始化 zlib 压缩流."
 
 #, fuzzy
 msgid "Couldn't initialize GIF hash table."
 msgstr "无法初始化 zlib 压缩流."
 

-#: ../src/common/imagpng.cpp:658
+#: ../src/common/imagpng.cpp:657

 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 

-#: ../src/unix/sound.cpp:471
+#: ../src/unix/sound.cpp:470

 #, c-format
 msgid "Couldn't load sound data from '%s'."
 msgstr "无法从 '%s' 中的读取声音数据。"
 
 #, c-format
 msgid "Couldn't load sound data from '%s'."
 msgstr "无法从 '%s' 中的读取声音数据。"
 

-#: ../src/msw/dirdlg.cpp:439
-#, fuzzy
+#: ../src/msw/dirdlg.cpp:441

 msgid "Couldn't obtain folder name"
 msgid "Couldn't obtain folder name"

-msgstr "无法创建计时器"
+msgstr "无法获取文件夹名称"

 
 

-#: ../src/unix/sound_sdl.cpp:226
+#: ../src/unix/sound_sdl.cpp:229

 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "无法打开音频: %s"
 
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "无法打开音频: %s"
 

-#: ../src/msw/ole/dataobj.cpp:160
+#: ../src/msw/ole/dataobj.cpp:350

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

-#: ../src/os2/thread.cpp:178
+#: ../src/os2/thread.cpp:177

 msgid "Couldn't release a mutex"
 msgstr "无法释放互斥子"
 
 msgid "Couldn't release a mutex"
 msgstr "无法释放互斥子"
 

-#: ../src/msw/listctrl.cpp:757
+#: ../src/msw/listctrl.cpp:756

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

-#: ../src/common/imagpng.cpp:747 ../src/common/imagpng.cpp:758
-#: ../src/common/imagpng.cpp:768
+#: ../src/common/imagpng.cpp:746 ../src/common/imagpng.cpp:757
+#: ../src/common/imagpng.cpp:767

 msgid "Couldn't save PNG image."
 msgstr "无法保存 PNG 图像。"
 
 msgid "Couldn't save PNG image."
 msgstr "无法保存 PNG 图像。"
 


@@ -2446,101 +2431,101 @@ msgstr "无法保存 PNG 图像。"
 msgid "Couldn't terminate thread"
 msgstr "无法终止线程"
 
 msgid "Couldn't terminate thread"
 msgstr "无法终止线程"
 

-#: ../src/common/xtistrm.cpp:171
-#, fuzzy, c-format
+#: ../src/common/xtistrm.cpp:170
+#, c-format

 msgid "Create Parameter %s not found in declared RTTI Parameters"
 msgid "Create Parameter %s not found in declared RTTI Parameters"

-msgstr "在声明的RTTI参数里找不到创建参数"
+msgstr "在声明的 RTTI 参数里找不到创建参数 %s"

 
 

-#: ../src/generic/dirdlgg.cpp:318
+#: ../src/generic/dirdlgg.cpp:317

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

-#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:132
+#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:131

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

-#: ../src/common/accelcmn.cpp:323
+#: ../src/common/accelcmn.cpp:322

 msgid "Ctrl+"
 msgstr "Ctrl+"
 
 msgid "Ctrl+"
 msgstr "Ctrl+"
 

-#: ../src/richtext/richtextctrl.cpp:324 ../src/osx/textctrl_osx.cpp:583
-#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:582
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2283

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

-#: ../src/generic/filectrlg.cpp:950
+#: ../src/generic/filectrlg.cpp:956

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

-#: ../src/gtk/print.cpp:764
+#: ../src/gtk/print.cpp:759

 msgid "Custom size"
 msgstr "自定义大小"
 
 msgid "Custom size"
 msgstr "自定义大小"
 

-#: ../src/common/headerctrlcmn.cpp:61
+#: ../src/common/headerctrlcmn.cpp:60

 msgid "Customize Columns"
 msgstr "自定义列"
 
 msgid "Customize Columns"
 msgstr "自定义列"
 

-#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:17

 msgid "Cut"
 msgstr "剪切"
 
 msgid "Cut"
 msgstr "剪切"
 

-#: ../src/common/stockitem.cpp:260
+#: ../src/common/stockitem.cpp:259

 msgid "Cut selection"
 msgstr "剪切选区"
 
 msgid "Cut selection"
 msgstr "剪切选区"
 

-#: ../src/common/fmapbase.cpp:153
+#: ../src/common/fmapbase.cpp:152

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

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

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

-#: ../src/msw/dde.cpp:709
+#: ../src/msw/dde.cpp:708

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

-#: ../src/common/accelcmn.cpp:80
+#: ../src/common/accelcmn.cpp:79

 msgid "DECIMAL"
 msgstr "DECIMAL"
 
 msgid "DECIMAL"
 msgstr "DECIMAL"
 

-#: ../src/common/accelcmn.cpp:48
+#: ../src/common/accelcmn.cpp:47

 msgid "DEL"
 msgstr "DEL"
 
 msgid "DEL"
 msgstr "DEL"
 

-#: ../src/common/accelcmn.cpp:49
+#: ../src/common/accelcmn.cpp:48

 msgid "DELETE"
 msgstr "DELETE"
 
 msgid "DELETE"
 msgstr "DELETE"
 

-#: ../src/common/imagbmp.cpp:1045
+#: ../src/common/imagbmp.cpp:1092

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

-#: ../src/common/imagbmp.cpp:1000
+#: ../src/common/imagbmp.cpp:1040

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

-#: ../src/common/imagbmp.cpp:992
+#: ../src/common/imagbmp.cpp:1032

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

-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1060

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

-#: ../src/common/imagbmp.cpp:1028
+#: ../src/common/imagbmp.cpp:1074

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

-#: ../src/common/accelcmn.cpp:81
+#: ../src/common/accelcmn.cpp:80

 msgid "DIVIDE"
 msgstr "DIVIDE"
 
 msgid "DIVIDE"
 msgstr "DIVIDE"
 

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

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

-#: ../src/common/accelcmn.cpp:60
+#: ../src/common/accelcmn.cpp:59

 msgid "DOWN"
 msgstr "DOWN"
 
 msgid "DOWN"
 msgstr "DOWN"
 


@@ -2548,155 +2533,165 @@ msgstr "DOWN"
 msgid "Dashed"
 msgstr ""
 
 msgid "Dashed"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1922
+#: ../src/osx/carbon/dataview.cpp:1921

 msgid "Data object has invalid data format"
 msgstr "数据对象有无效数据格式"
 
 msgid "Data object has invalid data format"
 msgstr "数据对象有无效数据格式"
 

-#: ../src/osx/carbon/dataview.cpp:2492
+#: ../src/osx/carbon/dataview.cpp:2491

 msgid "Date renderer cannot render value; value type: "
 msgstr "数据渲染器无法渲染该值; 类型为:"
 
 msgid "Date renderer cannot render value; value type: "
 msgstr "数据渲染器无法渲染该值; 类型为:"
 

-#: ../src/generic/dbgrptg.cpp:297
+#: ../src/generic/dbgrptg.cpp:300

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

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

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

-#: ../src/common/debugrpt.cpp:549
+#: ../src/common/debugrpt.cpp:558

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

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

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

-#: ../src/common/fmapbase.cpp:797
+#: ../src/common/fmapbase.cpp:796

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

-#: ../src/dfb/fontmgr.cpp:181
+#: ../src/dfb/fontmgr.cpp:180

 msgid "Default font"
 msgstr "缺省字体"
 
 msgid "Default font"
 msgstr "缺省字体"
 

-#: ../src/generic/prntdlgg.cpp:516
+#: ../src/generic/prntdlgg.cpp:510

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

-#: ../src/richtext/richtextbuffer.cpp:7367 ../src/common/stockitem.cpp:153
-#: ../src/stc/stc_i18n.cpp:21
+#: ../src/richtext/richtextbuffer.cpp:7841 ../src/common/stockitem.cpp:152
+#: ../src/stc/stc_i18n.cpp:20

 msgid "Delete"
 msgstr "删除"
 
 msgid "Delete"
 msgstr "删除"
 

-#: ../src/richtext/richtexttabspage.cpp:149
+#: ../src/richtext/richtexttabspage.cpp:148

 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 
 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 

-#: ../src/richtext/richtextstyledlg.cpp:787
+#: ../src/richtext/richtextbuffer.cpp:10637
+#, fuzzy
+msgid "Delete Column"
+msgstr "删除列"
+
+#: ../src/richtext/richtextbuffer.cpp:10587
+#, fuzzy
+msgid "Delete Row"
+msgstr "删除行"
+
+#: ../src/richtext/richtextstyledlg.cpp:779

 msgid "Delete Style"
 msgstr "删除样式"
 
 msgid "Delete Style"
 msgstr "删除样式"
 

-#: ../src/richtext/richtextctrl.cpp:1221 ../src/richtext/richtextctrl.cpp:1442
+#: ../src/richtext/richtextctrl.cpp:1231 ../src/richtext/richtextctrl.cpp:1452

 msgid "Delete Text"
 msgstr "删除文字"
 
 msgid "Delete Text"
 msgstr "删除文字"
 

-#: ../src/generic/editlbox.cpp:275
+#: ../src/generic/editlbox.cpp:274

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

-#: ../src/common/stockitem.cpp:261
+#: ../src/common/stockitem.cpp:260

 msgid "Delete selection"
 msgstr "删除选区"
 
 msgid "Delete selection"
 msgstr "删除选区"
 

-#: ../src/richtext/richtextstyledlg.cpp:787
+#: ../src/richtext/richtextstyledlg.cpp:779

 #, c-format
 msgid "Delete style %s?"
 msgstr "删除样式 %s?"
 
 #, c-format
 msgid "Delete style %s?"
 msgstr "删除样式 %s?"
 

-#: ../src/unix/snglinst.cpp:296
+#: ../src/unix/snglinst.cpp:295

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

-#: ../src/common/module.cpp:125
+#: ../src/common/module.cpp:124

 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
 msgstr "依赖 \"%s\" 对模块 \"%s\" 不存在。"
 
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
 msgstr "依赖 \"%s\" 对模块 \"%s\" 不存在。"
 

-#: ../src/common/stockitem.cpp:197
+#: ../src/common/stockitem.cpp:196

 msgid "Descending"
 msgstr "降序"
 
 msgid "Descending"
 msgstr "降序"
 

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

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

-#: ../src/generic/aboutdlgg.cpp:71
+#: ../src/generic/aboutdlgg.cpp:70

 msgid "Developed by "
 msgstr "开发由"
 
 msgid "Developed by "
 msgstr "开发由"
 

-#: ../src/generic/aboutdlgg.cpp:177
+#: ../src/generic/aboutdlgg.cpp:176

 msgid "Developers"
 msgstr "开发者"
 
 msgid "Developers"
 msgstr "开发者"
 

-#: ../src/msw/dialup.cpp:394
+#: ../src/msw/dialup.cpp:393

 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
+#: ../src/generic/tipdlg.cpp:230

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

-#: ../src/dfb/wrapdfb.cpp:64
+#: ../src/dfb/wrapdfb.cpp:63

 #, c-format
 msgid "DirectFB error %d occurred."
 msgstr "DirectFB错误 %d 发生。"
 
 #, c-format
 msgid "DirectFB error %d occurred."
 msgstr "DirectFB错误 %d 发生。"
 

-#: ../src/motif/filedlg.cpp:217
+#: ../src/motif/filedlg.cpp:219

 msgid "Directories"
 msgstr "目录"
 
 msgid "Directories"
 msgstr "目录"
 

-#: ../src/common/filefn.cpp:1245
+#: ../src/common/filefn.cpp:1251

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

-#: ../src/common/filefn.cpp:1265
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1271
+#, c-format

 msgid "Directory '%s' couldn't be deleted"
 msgid "Directory '%s' couldn't be deleted"

-msgstr "ç\9b®å½\95'%s'æ\97 æ³\95被å\88\9b建"
+msgstr "ç\9b®å½\95'%s'æ\97 æ³\95被å\88 é\99¤"

 
 

-#: ../src/generic/dirdlgg.cpp:234
+#: ../src/generic/dirdlgg.cpp:233

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

-#: ../src/generic/filectrlg.cpp:1406
+#: ../src/generic/filectrlg.cpp:1412

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

-#: ../src/common/docview.cpp:458
+#: ../src/common/docview.cpp:455

 msgid "Discard changes and reload the last saved version?"
 msgstr "放弃更改并重新载入最近保存的版本？"
 
 msgid "Discard changes and reload the last saved version?"
 msgstr "放弃更改并重新载入最近保存的版本？"
 

-#: ../src/html/helpwnd.cpp:513
+#: ../src/html/helpwnd.cpp:512

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

-#: ../src/html/helpwnd.cpp:693
+#: ../src/html/helpwnd.cpp:692

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

-#: ../src/html/helpwnd.cpp:327
+#: ../src/html/helpwnd.cpp:326

 msgid "Displays help as you browse the books on the left."
 msgstr ""
 
 msgid "Displays help as you browse the books on the left."
 msgstr ""
 

-#: ../src/msw/mimetype.cpp:708
+#: ../src/msw/mimetype.cpp:732

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


@@ -2711,32 +2706,32 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
 "新的值为 \n"
 "%s %1"
 

-#: ../src/common/docview.cpp:534
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:531
+#, c-format

 msgid "Do you want to save changes to %s?"
 msgid "Do you want to save changes to %s?"

-msgstr "你想保存对文档%s的修改?"
+msgstr "你想保存对文档 %s 的修改吗?"

 
 

-#: ../src/common/prntbase.cpp:526
+#: ../src/common/prntbase.cpp:525

 msgid "Document:"
 msgstr "文档："
 
 msgid "Document:"
 msgstr "文档："
 

-#: ../src/generic/aboutdlgg.cpp:74
+#: ../src/generic/aboutdlgg.cpp:73

 msgid "Documentation by "
 msgstr "文档撰写由"
 
 msgid "Documentation by "
 msgstr "文档撰写由"
 

-#: ../src/generic/aboutdlgg.cpp:181
+#: ../src/generic/aboutdlgg.cpp:180

 msgid "Documentation writers"
 msgstr "文档作者"
 
 msgid "Documentation writers"
 msgstr "文档作者"
 

-#: ../src/common/sizer.cpp:2657
+#: ../src/common/sizer.cpp:2680

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

-#: ../src/msw/frame.cpp:129 ../src/html/htmlwin.cpp:607
+#: ../src/msw/frame.cpp:122 ../src/html/htmlwin.cpp:611

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

-#: ../src/generic/progdlgg.cpp:482 ../src/msw/progdlg.cpp:408
+#: ../src/generic/progdlgg.cpp:481 ../src/msw/progdlg.cpp:407

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


@@ -2750,90 +2745,92 @@ msgstr "完成"
 msgid "Double"
 msgstr "完成"
 
 msgid "Double"
 msgstr "完成"
 

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

 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgstr "横向日本双明信片, 148 x 200 毫米"
 
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgstr "横向日本双明信片, 148 x 200 毫米"
 

-#: ../src/common/xtixml.cpp:274
+#: ../src/common/xtixml.cpp:273

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

-#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:154
+#: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:153

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

-#: ../src/richtext/richtextctrl.cpp:804
+#: ../src/richtext/richtextctrl.cpp:814

 msgid "Drag"
 msgstr "移动"
 
 msgid "Drag"
 msgstr "移动"
 

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

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

-#: ../src/common/accelcmn.cpp:62
+#: ../src/common/accelcmn.cpp:61

 msgid "END"
 msgstr "END"
 
 msgid "END"
 msgstr "END"
 

-#: ../src/common/accelcmn.cpp:53
+#: ../src/common/accelcmn.cpp:52

 msgid "ENTER"
 msgstr "ENTER"
 
 msgid "ENTER"
 msgstr "ENTER"
 

-#: ../src/unix/fswatcher_inotify.cpp:358
+#: ../src/unix/fswatcher_inotify.cpp:535

 msgid "EOF while reading from inotify descriptor"
 msgstr "读取 inotify 描述符时遇到 EOF"
 
 msgid "EOF while reading from inotify descriptor"
 msgstr "读取 inotify 描述符时遇到 EOF"
 

-#: ../src/common/accelcmn.cpp:65
+#: ../src/common/accelcmn.cpp:64

 msgid "ESC"
 msgstr "ESC"
 
 msgid "ESC"
 msgstr "ESC"
 

-#: ../src/common/accelcmn.cpp:66
+#: ../src/common/accelcmn.cpp:65

 msgid "ESCAPE"
 msgstr "ESCAPE"
 
 msgid "ESCAPE"
 msgstr "ESCAPE"
 

-#: ../src/common/accelcmn.cpp:74
+#: ../src/common/accelcmn.cpp:73

 msgid "EXECUTE"
 msgstr "EXECUTE"
 
 msgid "EXECUTE"
 msgstr "EXECUTE"
 

-#: ../src/common/stockitem.cpp:155
+#: ../src/common/stockitem.cpp:154

 msgid "Edit"
 msgstr "编辑"
 
 msgid "Edit"
 msgstr "编辑"
 

-#: ../src/generic/editlbox.cpp:273
+#: ../src/generic/editlbox.cpp:272

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

-#: ../src/richtext/richtextsizepage.cpp:319
-#: ../src/richtext/richtextsizepage.cpp:321
-#: ../src/richtext/richtextsizepage.cpp:427
-#: ../src/richtext/richtextsizepage.cpp:429
+#: ../include/wx/generic/progdlgg.h:84
+msgid "Elapsed time:"
+msgstr "用时: "
+
+#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:465
+#: ../src/richtext/richtextsizepage.cpp:467

 msgid "Enable the height value."
 msgstr "启用高度值。"
 
 msgid "Enable the height value."
 msgstr "启用高度值。"
 

-#: ../src/richtext/richtextsizepage.cpp:400
-#: ../src/richtext/richtextsizepage.cpp:402
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:438
+#: ../src/richtext/richtextsizepage.cpp:440

 msgid "Enable the maximum width value."
 msgid "Enable the maximum width value."

-msgstr "无法设定最大宽度。"
+msgstr "启用最大宽度值。"

 
 

-#: ../src/richtext/richtextsizepage.cpp:373
-#: ../src/richtext/richtextsizepage.cpp:375
+#: ../src/richtext/richtextsizepage.cpp:411
+#: ../src/richtext/richtextsizepage.cpp:413

 msgid "Enable the minimum height value."
 msgstr "启用最小高度值。"
 
 msgid "Enable the minimum height value."
 msgstr "启用最小高度值。"
 

-#: ../src/richtext/richtextsizepage.cpp:346
-#: ../src/richtext/richtextsizepage.cpp:348
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:386

 msgid "Enable the minimum width value."
 msgid "Enable the minimum width value."

-msgstr "无法设定最小宽度。"
+msgstr "启用最小宽度值。"

 
 

-#: ../src/richtext/richtextsizepage.cpp:292
-#: ../src/richtext/richtextsizepage.cpp:294
+#: ../src/richtext/richtextsizepage.cpp:319
+#: ../src/richtext/richtextsizepage.cpp:321

 msgid "Enable the width value."
 msgstr "启用宽度值。"
 
 msgid "Enable the width value."
 msgstr "启用宽度值。"
 

-#: ../src/richtext/richtextsizepage.cpp:256
-#: ../src/richtext/richtextsizepage.cpp:258
+#: ../src/richtext/richtextsizepage.cpp:280
+#: ../src/richtext/richtextsizepage.cpp:282

 msgid "Enable vertical alignment."
 msgstr "启用垂直对齐。"
 
 msgid "Enable vertical alignment."
 msgstr "启用垂直对齐。"
 


@@ -2842,492 +2839,491 @@ msgstr "启用垂直对齐。"
 msgid "Enables a background colour."
 msgstr "启用背景颜色。"
 
 msgid "Enables a background colour."
 msgstr "启用背景颜色。"
 

-#: ../src/richtext/richtextstyledlg.cpp:939
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:931

 msgid "Enter a box style name"
 msgid "Enter a box style name"

-msgstr "è¾\93å\85¥æ\96°æ ·å¼\8få\90\8d"
+msgstr "è¾\93å\85¥æ\96\87å­\97æ\96¹å\9d\97æ ·å¼\8få\90\8d称"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:611
+#: ../src/richtext/richtextstyledlg.cpp:603

 msgid "Enter a character style name"
 msgstr "输入文字样式名"
 
 msgid "Enter a character style name"
 msgstr "输入文字样式名"
 

-#: ../src/richtext/richtextstyledlg.cpp:825
+#: ../src/richtext/richtextstyledlg.cpp:817

 msgid "Enter a list style name"
 msgstr "输入列表样式名"
 
 msgid "Enter a list style name"
 msgstr "输入列表样式名"
 

-#: ../src/richtext/richtextstyledlg.cpp:898
+#: ../src/richtext/richtextstyledlg.cpp:890

 msgid "Enter a new style name"
 msgstr "输入新样式名"
 
 msgid "Enter a new style name"
 msgstr "输入新样式名"
 

-#: ../src/richtext/richtextstyledlg.cpp:659
+#: ../src/richtext/richtextstyledlg.cpp:651

 msgid "Enter a paragraph style name"
 msgstr "输入段落样式名"
 
 msgid "Enter a paragraph style name"
 msgstr "输入段落样式名"
 

-#: ../src/generic/dbgrptg.cpp:171
+#: ../src/generic/dbgrptg.cpp:174

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

-#: ../src/generic/helpext.cpp:464
+#: ../src/generic/helpext.cpp:463

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

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

 msgid "Envelope Invite 220 x 220 mm"
 msgstr "邀请信, 220 x 220 毫米"
 
 msgid "Envelope Invite 220 x 220 mm"
 msgstr "邀请信, 220 x 220 毫米"
 

-#: ../src/common/config.cpp:474
+#: ../src/common/config.cpp:473

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

-#: ../src/generic/dirctrlg.cpp:662 ../src/generic/dirctrlg.cpp:680
-#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
-#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:785
-#: ../src/generic/filectrlg.cpp:799 ../src/generic/filectrlg.cpp:815
-#: ../src/generic/filectrlg.cpp:1375 ../src/generic/filectrlg.cpp:1406
-#: ../src/gtk/filedlg.cpp:73 ../src/gtk1/fontdlg.cpp:75
+#: ../src/generic/dirctrlg.cpp:670 ../src/generic/dirctrlg.cpp:688
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/dirdlgg.cpp:352
+#: ../src/generic/filectrlg.cpp:677 ../src/generic/filectrlg.cpp:791
+#: ../src/generic/filectrlg.cpp:805 ../src/generic/filectrlg.cpp:821
+#: ../src/generic/filectrlg.cpp:1381 ../src/generic/filectrlg.cpp:1412
+#: ../src/gtk/filedlg.cpp:73 ../src/gtk1/fontdlg.cpp:74

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

-#: ../src/unix/epolldispatcher.cpp:104
+#: ../src/unix/epolldispatcher.cpp:103

 msgid "Error closing epoll descriptor"
 msgstr "关闭 epoll 描述符时发生错误"
 
 msgid "Error closing epoll descriptor"
 msgstr "关闭 epoll 描述符时发生错误"
 

-#: ../src/unix/fswatcher_kqueue.cpp:115
-#, fuzzy
+#: ../src/unix/fswatcher_kqueue.cpp:114

 msgid "Error closing kqueue instance"
 msgid "Error closing kqueue instance"

-msgstr "å\88\9b建ç\9b®å½\95错误"
+msgstr "å\85³é\97­ kqueue å®\9eä¾\8bæ\97¶å\8f\91ç\94\9f错误"

 
 

-#: ../src/generic/dirdlgg.cpp:252
+#: ../src/generic/dirdlgg.cpp:251

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

-#: ../src/common/imagbmp.cpp:1056
-#, fuzzy
+#: ../src/common/imagbmp.cpp:1103

 msgid "Error in reading image DIB."
 msgid "Error in reading image DIB."

-msgstr "读å\9b¾å\83\8fDIBé\94\99误."
+msgstr "读å\8f\96å\9b¾å\83\8f DIB é\94\99误ã\80\82"

 
 

-#: ../src/propgrid/propgrid.cpp:6565
+#: ../src/propgrid/propgrid.cpp:6563

 #, c-format
 msgid "Error in resource: %s"
 msgstr "资源错误: %s"
 
 #, c-format
 msgid "Error in resource: %s"
 msgstr "资源错误: %s"
 

-#: ../src/common/fileconf.cpp:454
+#: ../src/common/fileconf.cpp:453

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

-#: ../src/common/fileconf.cpp:1065
+#: ../src/common/fileconf.cpp:1064

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

-#: ../src/gtk/print.cpp:678
+#: ../src/gtk/print.cpp:671

 msgid "Error while printing: "
 msgstr "打印时出错: "
 
 msgid "Error while printing: "
 msgstr "打印时出错: "
 

-#: ../src/common/log.cpp:226
+#: ../src/common/log.cpp:223

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

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

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

-#: ../src/unix/fswatcher_inotify.cpp:441
+#: ../include/wx/generic/progdlgg.h:85
+msgid "Estimated time:"
+msgstr "预期时间:"
+
+#: ../src/unix/fswatcher_inotify.cpp:639

 msgid "Event queue overflowed"
 msgstr "消息队列溢出"
 
 msgid "Event queue overflowed"
 msgstr "消息队列溢出"
 

-#: ../src/generic/dbgrptg.cpp:231
+#: ../src/generic/dbgrptg.cpp:234

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

-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:155

 msgid "Execute"
 msgstr "执行"
 
 msgid "Execute"
 msgstr "执行"
 

-#: ../src/msw/utilsexc.cpp:899
+#: ../src/msw/utilsexc.cpp:888

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

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

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

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

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

-#: ../src/msw/registry.cpp:1231
+#: ../src/msw/registry.cpp:1230

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

-#: ../src/common/fmapbase.cpp:196
+#: ../src/common/fmapbase.cpp:195

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

-#: ../src/html/chm.cpp:728
+#: ../src/html/chm.cpp:725

 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s' 解压至 '%s' 失败。"
 
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s' 解压至 '%s' 失败。"
 

-#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:334
+#: ../src/common/accelcmn.cpp:238 ../src/common/accelcmn.cpp:333

 msgid "F"
 msgstr "F"
 
 msgid "F"
 msgstr "F"
 

-#: ../src/propgrid/advprops.cpp:641
-#, fuzzy
+#: ../src/propgrid/advprops.cpp:640

 msgid "Face Name"
 msgid "Face Name"

-msgstr "新名称"
+msgstr "字体名称"

 
 

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

 msgid "Failed to access lock file."
 msgid "Failed to access lock file."

-msgstr "访问锁文件失败。"
+msgstr "无法访问锁文件。"

 
 

-#: ../src/unix/epolldispatcher.cpp:117
+#: ../src/unix/epolldispatcher.cpp:116

 #, c-format
 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 
 #, c-format
 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 

-#: ../src/msw/dib.cpp:549
+#: ../src/msw/dib.cpp:548

 #, c-format
 msgid "Failed to allocate %luKb of memory for bitmap data."
 #, c-format
 msgid "Failed to allocate %luKb of memory for bitmap data."

-msgstr "为位图数据分配 %luKb 内存失败。"
+msgstr "无法为位图数据分配 %luKb 内存。"

 
 

-#: ../src/common/glcmn.cpp:88
+#: ../src/common/glcmn.cpp:87

 msgid "Failed to allocate colour for OpenGL"
 msgstr "无法为 OpenGL 分配颜色"
 
 msgid "Failed to allocate colour for OpenGL"
 msgstr "无法为 OpenGL 分配颜色"
 

-#: ../src/unix/displayx11.cpp:289
+#: ../src/unix/displayx11.cpp:288

 msgid "Failed to change video mode"
 msgid "Failed to change video mode"

-msgstr "æ\94¹å\8f\98è§\86é¢\91模å¼\8f失败。"
+msgstr "æ\97 æ³\95æ\94¹å\8f\98è§\86é¢\91模å¼\8f。"

 
 

-#: ../src/common/image.cpp:3036
+#: ../src/common/image.cpp:3139

 #, c-format
 msgid "Failed to check format of image file \"%s\"."
 msgstr "无法确认图像文件 \"%s\" 的格式。"
 
 #, c-format
 msgid "Failed to check format of image file \"%s\"."
 msgstr "无法确认图像文件 \"%s\" 的格式。"
 

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

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

-#: ../src/common/filename.cpp:209
+#: ../src/common/filename.cpp:211

 msgid "Failed to close file handle"
 msgid "Failed to close file handle"

-msgstr "关闭文件句柄失败"
+msgstr "无法关闭文件句柄"

 
 

-#: ../src/unix/snglinst.cpp:335
+#: ../src/unix/snglinst.cpp:334

 #, c-format
 msgid "Failed to close lock file '%s'"
 #, c-format
 msgid "Failed to close lock file '%s'"

-msgstr "关闭锁文件 '%s'失败"
+msgstr "无法关闭锁文件 '%s'"

 
 

-#: ../src/msw/clipbrd.cpp:116
+#: ../src/msw/clipbrd.cpp:115

 msgid "Failed to close the clipboard."
 msgid "Failed to close the clipboard."

-msgstr "关闭剪贴板失败。"
+msgstr "无法关闭剪贴板。"

 
 #: ../src/x11/utils.cpp:204
 
 #: ../src/x11/utils.cpp:204

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to close the display \"%s\""
 msgid "Failed to close the display \"%s\""

-msgstr "关闭剪贴板失败."
+msgstr "无法关闭显示 \"%s\""

 
 

-#: ../src/msw/dialup.cpp:819
+#: ../src/msw/dialup.cpp:818

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

-#: ../src/msw/dialup.cpp:765
+#: ../src/msw/dialup.cpp:764

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

-#: ../src/common/textfile.cpp:201
+#: ../src/common/textfile.cpp:200

 #, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "无法转换文件 \"%s\" 为 Unicode。"
 
 #, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "无法转换文件 \"%s\" 为 Unicode。"
 

-#: ../src/generic/logg.cpp:980
+#: ../src/generic/logg.cpp:976

 msgid "Failed to copy dialog contents to the clipboard."
 msgstr "无法将对话框内容复制到剪贴板。"
 
 msgid "Failed to copy dialog contents to the clipboard."
 msgstr "无法将对话框内容复制到剪贴板。"
 

-#: ../src/msw/registry.cpp:692
+#: ../src/msw/registry.cpp:691

 #, c-format
 msgid "Failed to copy registry value '%s'"
 #, c-format
 msgid "Failed to copy registry value '%s'"

-msgstr "复制注册键值失败 '%s'"
+msgstr "无法复制注册键值 '%s'"

 
 

-#: ../src/msw/registry.cpp:701
+#: ../src/msw/registry.cpp:700

 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."

-msgstr "æ\8a\8a注å\86\8cé\94®å\86\85容ä»\8e '%s' å¤\8då\88¶å\88° '%s' 失败。"
+msgstr "æ\97 æ³\95æ\8a\8a注å\86\8cé\94®å\86\85容ä»\8e '%s' å¤\8då\88¶å\88° '%s'。"

 
 

-#: ../src/common/filefn.cpp:1053
+#: ../src/common/filefn.cpp:1058

 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"

-msgstr "复制文件 '%s' 至 '%s' 失败"
+msgstr "无法复制文件 '%s' 至 '%s'"

 
 

-#: ../src/msw/registry.cpp:679
+#: ../src/msw/registry.cpp:678

 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."

-msgstr "复制注册表子键 '%s' 至 '%s' 失败。"
+msgstr "无法复制注册表子键 '%s' 至 '%s'。"

 
 

-#: ../src/msw/dde.cpp:1074
+#: ../src/msw/dde.cpp:1073

 msgid "Failed to create DDE string"
 msgid "Failed to create DDE string"

-msgstr "创建 DDE 字符串失败"
+msgstr "无法创建 DDE 字符串"

 
 

-#: ../src/msw/mdi.cpp:579
+#: ../src/msw/mdi.cpp:590

 msgid "Failed to create MDI parent frame."
 msgid "Failed to create MDI parent frame."

-msgstr "创建 MDI 父框架失败。"
+msgstr "无法创建 MDI 父框架。"

 
 

-#: ../src/common/filename.cpp:1019
+#: ../src/common/filename.cpp:1080

 msgid "Failed to create a temporary file name"
 msgid "Failed to create a temporary file name"

-msgstr "创建临时文件名失败"
+msgstr "无法创建临时文件名"

 
 

-#: ../src/msw/utilsexc.cpp:269
+#: ../src/msw/utilsexc.cpp:235

 msgid "Failed to create an anonymous pipe"
 msgid "Failed to create an anonymous pipe"

-msgstr "创建匿名管道失败"
+msgstr "无法创建匿名管道"

 
 

-#: ../src/msw/ole/automtn.cpp:517
+#: ../src/msw/ole/automtn.cpp:522

 #, c-format
 msgid "Failed to create an instance of \"%s\""
 msgstr "无法创建实例 \"%s\""
 
 #, c-format
 msgid "Failed to create an instance of \"%s\""
 msgstr "无法创建实例 \"%s\""
 

-#: ../src/msw/dde.cpp:443
+#: ../src/msw/dde.cpp:442

 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"

-msgstr "å\88\9b建å\88°æ\9c\8då\8a¡å\99¨ '%s' ç\9a\84å\85³äº\8e主é¢\98 '%s' ç\9a\84è¿\9eæ\8e¥å¤±è´¥"
+msgstr "æ\97 æ³\95å\88\9b建å\88°æ\9c\8då\8a¡å\99¨ '%s' å\85³äº\8e主é¢\98 '%s' ç\9a\84è¿\9eæ\8e¥"

 
 

-#: ../src/msw/cursor.cpp:213
+#: ../src/msw/cursor.cpp:212

 msgid "Failed to create cursor."
 msgid "Failed to create cursor."

-msgstr "创建游标失败。"
+msgstr "无法创建游标。"

 
 

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

 #, c-format
 msgid "Failed to create directory \"%s\""
 msgstr "无法创建目录 \"%s\""
 
 #, c-format
 msgid "Failed to create directory \"%s\""
 msgstr "无法创建目录 \"%s\""
 

-#: ../src/generic/dirdlgg.cpp:250
+#: ../src/generic/dirdlgg.cpp:249

 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""

-"创建目录 '%s' 失败\n"
+"无法创建目录 '%s'\n"

 "(您是否有所需的权限?)"
 
 "(您是否有所需的权限?)"
 

-#: ../src/unix/epolldispatcher.cpp:85
+#: ../src/unix/epolldispatcher.cpp:84

 msgid "Failed to create epoll descriptor"
 msgstr "无法创建 epoll 描述符"
 
 msgid "Failed to create epoll descriptor"
 msgstr "无法创建 epoll 描述符"
 

-#: ../src/msw/mimetype.cpp:199
+#: ../src/msw/mimetype.cpp:198

 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 #, c-format
 msgid "Failed to create registry entry for '%s' files."

-msgstr "为 '%s' 文件创建注册条目失败。"
+msgstr "无法为 '%s' 文件创建注册条目。"

 
 

-#: ../src/msw/fdrepdlg.cpp:443
+#: ../src/msw/fdrepdlg.cpp:442

 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"

-msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
+msgstr "无法创建标准\"查找/替换\"对话框 (错误号 %d)"

 
 

-#: ../src/unix/evtloopunix.cpp:96
+#: ../src/unix/wakeuppipe.cpp:52

 #, fuzzy
 msgid "Failed to create wake up pipe used by event loop."
 msgstr "创建状态条失败."
 
 #, fuzzy
 msgid "Failed to create wake up pipe used by event loop."
 msgstr "创建状态条失败."
 

-#: ../src/html/winpars.cpp:737
+#: ../src/html/winpars.cpp:739

 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 #, c-format
 msgid "Failed to display HTML document in %s encoding"

-msgstr "æ\8c\89ç¼\96ç \81 %s æ\98¾ç¤ºHTMLæ\96\87档失败"
+msgstr "æ\97 æ³\95æ\8c\89ç¼\96ç \81 %s æ\98¾ç¤º HTML æ\96\87æ¡£"

 
 

-#: ../src/msw/clipbrd.cpp:128
+#: ../src/msw/clipbrd.cpp:127

 msgid "Failed to empty the clipboard."
 msgid "Failed to empty the clipboard."

-msgstr "æ¸\85空å\89ªè´´æ\9d¿å¤±è´¥"
+msgstr "æ\97 æ³\95æ¸\85空å\89ªè´´æ\9d¿"

 
 

-#: ../src/unix/displayx11.cpp:266
+#: ../src/unix/displayx11.cpp:265

 msgid "Failed to enumerate video modes"
 msgid "Failed to enumerate video modes"

-msgstr "æ\9e\9a举è§\86é¢\91模å¼\8f失败"
+msgstr "æ\97 æ³\95æ\9e\9a举è§\86é¢\91模å¼\8f"

 
 

-#: ../src/msw/dde.cpp:728
+#: ../src/msw/dde.cpp:727

 msgid "Failed to establish an advise loop with DDE server"
 msgid "Failed to establish an advise loop with DDE server"

-msgstr "在DDE服务器建立advise循环失败"
+msgstr "无法在 DDE 服务器建立 advise 循环"

 
 

-#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:885
+#: ../src/msw/dialup.cpp:650 ../src/msw/dialup.cpp:884

 #, c-format
 msgid "Failed to establish dialup connection: %s"
 #, c-format
 msgid "Failed to establish dialup connection: %s"

-msgstr "建ç«\8bæ\8b¨å\8f·è¿\9eæ\8e¥å¤±è´¥: %s"
+msgstr "æ\97 æ³\95建ç«\8bæ\8b¨å\8f·è¿\9eæ\8e¥: %s"

 
 

-#: ../src/unix/utilsunx.cpp:528 ../src/unix/utilsunx.cpp:542
+#: ../src/unix/utilsunx.cpp:617

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

-msgstr "æ\89§è¡\8c '%s' 失败\n"
+msgstr "æ\97 æ³\95æ\89§è¡\8c '%s'\n"

 
 

-#: ../src/common/debugrpt.cpp:700
+#: ../src/common/debugrpt.cpp:725

 msgid "Failed to execute curl, please install it in PATH."
 msgstr "无法执行curl，请在PATH变量所指的目录中安装curl。"
 
 msgid "Failed to execute curl, please install it in PATH."
 msgstr "无法执行curl，请在PATH变量所指的目录中安装curl。"
 

-#: ../src/msw/ole/automtn.cpp:500
+#: ../src/msw/ole/automtn.cpp:505

 #, c-format
 msgid "Failed to find CLSID of \"%s\""
 msgstr "无法找到 \"%s\" 的 CLSID"
 
 #, c-format
 msgid "Failed to find CLSID of \"%s\""
 msgstr "无法找到 \"%s\" 的 CLSID"
 

-#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483
+#: ../src/common/regex.cpp:434 ../src/common/regex.cpp:482

 #, c-format
 msgid "Failed to find match for regular expression: %s"
 msgstr "无法找到匹配的正则表达式: %s"
 
 #, c-format
 msgid "Failed to find match for regular expression: %s"
 msgstr "无法找到匹配的正则表达式: %s"
 

-#: ../src/msw/dialup.cpp:717
+#: ../src/msw/dialup.cpp:716

 #, c-format
 msgid "Failed to get ISP names: %s"
 #, c-format
 msgid "Failed to get ISP names: %s"

-msgstr "获取 ISP 名失败: %s"
+msgstr "无法获取 ISP 名称: %s"

 
 

-#: ../src/msw/ole/automtn.cpp:569
+#: ../src/msw/ole/automtn.cpp:574

 #, fuzzy, c-format
 msgid "Failed to get OLE automation interface for \"%s\""
 msgstr "无法创建目录 \"%s\""
 
 #, fuzzy, c-format
 msgid "Failed to get OLE automation interface for \"%s\""
 msgstr "无法创建目录 \"%s\""
 

-#: ../src/msw/clipbrd.cpp:748
+#: ../src/msw/clipbrd.cpp:747

 msgid "Failed to get data from the clipboard"
 msgid "Failed to get data from the clipboard"

-msgstr "从剪贴板获取数据失败"
+msgstr "无法从剪贴板获取数据"

 
 

-#: ../src/common/time.cpp:250
+#: ../src/common/time.cpp:249

 msgid "Failed to get the local system time"
 msgid "Failed to get the local system time"

-msgstr "获取本地系统时间失败"
+msgstr "无法获取本地系统时间"

 
 

-#: ../src/common/filefn.cpp:1449
+#: ../src/common/filefn.cpp:1453

 msgid "Failed to get the working directory"
 msgid "Failed to get the working directory"

-msgstr "获取工作目录失败"
+msgstr "无法获取工作目录"

 
 

-#: ../src/univ/theme.cpp:114
+#: ../src/univ/theme.cpp:113

 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr "无法初始化 GUI: 找不到内嵌的主题。"
 
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr "无法初始化 GUI: 找不到内嵌的主题。"
 

-#: ../src/msw/helpchm.cpp:64
+#: ../src/msw/helpchm.cpp:63

 msgid "Failed to initialize MS HTML Help."
 msgid "Failed to initialize MS HTML Help."

-msgstr "初始化MS HTML 帮助失败。"
+msgstr "无法初始化 MS HTML 帮助。"

 
 

-#: ../src/msw/glcanvas.cpp:893
+#: ../src/msw/glcanvas.cpp:892

 msgid "Failed to initialize OpenGL"
 msgstr "无法初始化 OpenGL"
 
 msgid "Failed to initialize OpenGL"
 msgstr "无法初始化 OpenGL"
 

-#: ../src/msw/dialup.cpp:880
+#: ../src/msw/dialup.cpp:879

 #, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "无法初始化拨号连接: %s"
 
 #, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "无法初始化拨号连接: %s"
 

-#: ../src/gtk/textctrl.cpp:1059
+#: ../src/gtk/textctrl.cpp:1117

 msgid "Failed to insert text in the control."
 msgstr "无法在控件中插入文字。"
 
 msgid "Failed to insert text in the control."
 msgstr "无法在控件中插入文字。"
 

-#: ../src/unix/snglinst.cpp:242
+#: ../src/unix/snglinst.cpp:241

 #, c-format
 msgid "Failed to inspect the lock file '%s'"
 #, c-format
 msgid "Failed to inspect the lock file '%s'"

-msgstr "æ£\80æ\9f¥é\94\81æ\96\87件 '%s' 失败"
+msgstr "æ\97 æ³\95æ£\80æ\9f¥é\94\81æ\96\87件 '%s'"

 
 

-#: ../src/unix/appunix.cpp:90
-#, fuzzy
+#: ../src/unix/appunix.cpp:182

 msgid "Failed to install signal handler"
 msgid "Failed to install signal handler"

-msgstr "关闭文件句柄失败."
+msgstr "无法安装信号句柄"

 
 

-#: ../src/unix/threadpsx.cpp:1010
+#: ../src/unix/threadpsx.cpp:1162

 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"

-msgstr "合并线程失败，检测到潜在地内存丢失 - 请重新启动系统"
+msgstr "无法合并线程，检测到潜在地内存丢失 - 请重新启动系统"

 
 #: ../src/msw/utils.cpp:745
 #, c-format
 msgid "Failed to kill process %d"
 
 #: ../src/msw/utils.cpp:745
 #, c-format
 msgid "Failed to kill process %d"

-msgstr "终止进程 %d 失败"
+msgstr "无法终止进程 %d"

 
 

-#: ../src/common/image.cpp:2261
-#, fuzzy, c-format
+#: ../src/common/image.cpp:2365
+#, c-format

 msgid "Failed to load bitmap \"%s\" from resources."
 msgid "Failed to load bitmap \"%s\" from resources."

-msgstr "无法从数据流中载入图像 %d。"
+msgstr "无法从资源中载入图像 \"%s\"。"

 
 

-#: ../src/common/image.cpp:2270
-#, fuzzy, c-format
+#: ../src/common/image.cpp:2374
+#, c-format

 msgid "Failed to load icon \"%s\" from resources."
 msgid "Failed to load icon \"%s\" from resources."

-msgstr "无法从数据流中载入图像 %d。"
+msgstr "无法从资源中载入图标 \"%s\"。"

 
 

-#: ../src/common/iconbndl.cpp:183
+#: ../src/common/iconbndl.cpp:182

 #, c-format
 msgid "Failed to load image %%d from file '%s'."
 msgstr "无法从文件 '%s' 中读取图像 %%d。"
 
 #, c-format
 msgid "Failed to load image %%d from file '%s'."
 msgstr "无法从文件 '%s' 中读取图像 %%d。"
 

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

 #, c-format
 msgid "Failed to load image %d from stream."
 msgstr "无法从数据流中载入图像 %d。"
 
 #, c-format
 msgid "Failed to load image %d from stream."
 msgstr "无法从数据流中载入图像 %d。"
 

-#: ../src/common/image.cpp:2343 ../src/common/image.cpp:2362
-#, fuzzy, c-format
+#: ../src/common/image.cpp:2450 ../src/common/image.cpp:2469
+#, c-format

 msgid "Failed to load image from file \"%s\"."
 msgid "Failed to load image from file \"%s\"."

-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法从文件 \"%s\" 中读取图像。"

 
 

-#: ../src/msw/enhmeta.cpp:98
+#: ../src/msw/enhmeta.cpp:97

 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."

-msgstr "从文件 \"%s\" 读取元文件失败。"
+msgstr "无法从文件 \"%s\" 读取元文件。"

 
 

-#: ../src/msw/volume.cpp:328
+#: ../src/msw/volume.cpp:327

 msgid "Failed to load mpr.dll."
 msgid "Failed to load mpr.dll."

-msgstr "装载 mpr.dll 失败。"
+msgstr "无法装载 mpr.dll。"

 
 #: ../src/msw/utils.cpp:1120
 
 #: ../src/msw/utils.cpp:1120

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to load resource \"%s\"."
 msgid "Failed to load resource \"%s\"."

-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法载入资源 \"%s\"。"

 
 

-#: ../src/common/dynlib.cpp:105
+#: ../src/common/dynlib.cpp:100

 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "无法装载共享库 '%s'"
 
 #: ../src/msw/utils.cpp:1127
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "无法装载共享库 '%s'"
 
 #: ../src/msw/utils.cpp:1127

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to lock resource \"%s\"."
 msgid "Failed to lock resource \"%s\"."

-msgstr "锁定锁文件 '%s'失败"
+msgstr "无法锁定资源 \"%s\"。"

 
 

-#: ../src/unix/snglinst.cpp:199
+#: ../src/unix/snglinst.cpp:198

 #, c-format
 msgid "Failed to lock the lock file '%s'"
 #, c-format
 msgid "Failed to lock the lock file '%s'"

-msgstr "锁定锁文件 '%s' 失败"
+msgstr "无法锁定锁文件 '%s'"

 
 

-#: ../src/unix/epolldispatcher.cpp:137
+#: ../src/unix/epolldispatcher.cpp:136

 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr "无法修改描述符 %d (于epoll描述符 %d)"
 
 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr "无法修改描述符 %d (于epoll描述符 %d)"
 

-#: ../src/common/filename.cpp:2573
+#: ../src/common/filename.cpp:2681

 #, c-format
 msgid "Failed to modify file times for '%s'"
 #, c-format
 msgid "Failed to modify file times for '%s'"

-msgstr "为 '%s' 修改文件时间失败"
+msgstr "无法为 '%s' 修改文件时间"

 
 

-#: ../src/common/selectdispatcher.cpp:253
+#: ../src/common/selectdispatcher.cpp:252

 msgid "Failed to monitor I/O channels"
 msgstr "无法检测I/O通道"
 
 msgid "Failed to monitor I/O channels"
 msgstr "无法检测I/O通道"
 

-#: ../src/common/filename.cpp:192
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:194
+#, c-format

 msgid "Failed to open '%s' for reading"
 msgid "Failed to open '%s' for reading"

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95读å\8f\96æ\96\87件 '%s'"

 
 

-#: ../src/common/filename.cpp:197
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:199
+#, c-format

 msgid "Failed to open '%s' for writing"
 msgid "Failed to open '%s' for writing"

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95å\86\99å\85¥æ\96\87件 '%s'"

 
 

-#: ../src/html/chm.cpp:142
+#: ../src/html/chm.cpp:141

 #, c-format
 msgid "Failed to open CHM archive '%s'."
 #, c-format
 msgid "Failed to open CHM archive '%s'."

-msgstr "æ\89\93å¼\80CHMå­\98æ¡£ '%s' 失败。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 CHM å­\98æ¡£ '%s'。"

 
 

-#: ../src/common/utilscmn.cpp:1137
-#, fuzzy, c-format
+#: ../src/common/utilscmn.cpp:1135
+#, c-format

 msgid "Failed to open URL \"%s\" in default browser."
 msgid "Failed to open URL \"%s\" in default browser."

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95å\9c¨é»\98认æµ\8fè§\88å\99¨ä¸­æ\89\93å¼\80 URL \"%s\"ã\80\82"

 
 

-#: ../include/wx/msw/private/fswatcher.h:93
+#: ../include/wx/msw/private/fswatcher.h:92

 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\" for monitoring."
 msgstr "打开 '%s'(为 %s) 失败"
 #, fuzzy, c-format
 msgid "Failed to open directory \"%s\" for monitoring."
 msgstr "打开 '%s'(为 %s) 失败"


@@ -3337,259 +3333,261 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/common/filename.cpp:1054
+#: ../src/common/filename.cpp:1115

 msgid "Failed to open temporary file."
 msgid "Failed to open temporary file."

-msgstr "æ\89\93å¼\80临æ\97¶æ\96\87件失败。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80临æ\97¶æ\96\87件。"

 
 

-#: ../src/msw/clipbrd.cpp:95
+#: ../src/msw/clipbrd.cpp:94

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

-msgstr "æ\89\93å¼\80å\89ªè´´æ\9d¿å¤±è´¥。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80å\89ªè´´æ\9d¿。"

 
 

-#: ../src/common/translation.cpp:1014
+#: ../src/common/translation.cpp:1170

 #, c-format
 msgid "Failed to parse Plural-Forms: '%s'"
 msgstr "无法解析复数形式: '%s'"
 
 #, c-format
 msgid "Failed to parse Plural-Forms: '%s'"
 msgstr "无法解析复数形式: '%s'"
 

-#: ../src/unix/mediactrl.cpp:1269
+#: ../src/unix/mediactrl.cpp:1268

 #, fuzzy, c-format
 msgid "Failed to prepare playing \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 
 #, fuzzy, c-format
 msgid "Failed to prepare playing \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/msw/clipbrd.cpp:648
+#: ../src/msw/clipbrd.cpp:647

 msgid "Failed to put data on the clipboard"
 msgid "Failed to put data on the clipboard"

-msgstr "æ\8a\8aæ\95°æ\8d®æ\94¾å\88°å\89ªè´´æ\9d¿å¤±è´¥"
+msgstr "æ\97 æ³\95æ\8a\8aæ\95°æ\8d®æ\94¾å\88°å\89ªè´´æ\9d¿"

 
 

-#: ../src/unix/snglinst.cpp:279
+#: ../src/unix/snglinst.cpp:278

 msgid "Failed to read PID from lock file."
 msgid "Failed to read PID from lock file."

-msgstr "从锁文件读取 PID 失败。"
+msgstr "无法从锁文件读取 PID。"

 
 

-#: ../src/common/fileconf.cpp:465
-#, fuzzy
+#: ../src/common/fileconf.cpp:464

 msgid "Failed to read config options."
 msgid "Failed to read config options."

-msgstr "读配置选项错误."
+msgstr "无法读配置选项。"

 
 

-#: ../src/common/docview.cpp:681
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:678
+#, c-format

 msgid "Failed to read document from the file \"%s\"."
 msgid "Failed to read document from the file \"%s\"."

-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法从文件 \"%s\" 中读取文档。"

 
 

-#: ../src/dfb/evtloop.cpp:99
-#, fuzzy
+#: ../src/dfb/evtloop.cpp:98

 msgid "Failed to read event from DirectFB pipe"
 msgid "Failed to read event from DirectFB pipe"

-msgstr "从锁文件读取PID失败."
+msgstr "无法从 DirectFB 管道中读取事件"

 
 

-#: ../src/unix/evtloopunix.cpp:170
+#: ../src/unix/wakeuppipe.cpp:120

 #, fuzzy
 msgid "Failed to read from wake-up pipe"
 msgstr "从锁文件读取PID失败."
 
 #, fuzzy
 msgid "Failed to read from wake-up pipe"
 msgstr "从锁文件读取PID失败."
 

-#: ../src/unix/utilsunx.cpp:588
+#: ../src/unix/utilsunx.cpp:685

 msgid "Failed to redirect child process input/output"
 msgid "Failed to redirect child process input/output"

-msgstr "重定向子过程输入/输出失败"
+msgstr "无法重定向子过程输入/输出"

 
 

-#: ../src/msw/utilsexc.cpp:731
+#: ../src/msw/utilsexc.cpp:697

 msgid "Failed to redirect the child process IO"
 msgid "Failed to redirect the child process IO"

-msgstr "重定向子过程IO失败"
+msgstr "无法重定向子过程 IO"

 
 

-#: ../src/msw/dde.cpp:294
+#: ../src/msw/dde.cpp:293

 #, c-format
 msgid "Failed to register DDE server '%s'"
 #, c-format
 msgid "Failed to register DDE server '%s'"

-msgstr "注å\86\8cDDEæ\9c\8då\8a¡å\99¨ '%s' 失败"
+msgstr "æ\97 æ³\95注å\86\8c DDE æ\9c\8då\8a¡å\99¨ '%s'"

 
 

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

 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."

-msgstr "回忆字符集 '%s' 编码失败。"
+msgstr "无法记忆字符集 '%s' 的编码。"

 
 

-#: ../src/common/debugrpt.cpp:226
+#: ../src/common/debugrpt.cpp:227

 #, c-format
 msgid "Failed to remove debug report file \"%s\""
 msgstr "无法删除调试报告文件 \"%s\""
 
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
 msgstr "无法删除调试报告文件 \"%s\""
 

-#: ../src/unix/snglinst.cpp:323
+#: ../src/unix/snglinst.cpp:322

 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "无法删除锁文件 '%s'"
 
 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "无法删除锁文件 '%s'"
 

-#: ../src/unix/snglinst.cpp:289
+#: ../src/unix/snglinst.cpp:288

 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 #, c-format
 msgid "Failed to remove stale lock file '%s'."

-msgstr "删除过期的锁文件 '%s' 失败。"
+msgstr "无法删除过期的锁文件 '%s'。"

 
 

-#: ../src/msw/registry.cpp:529
+#: ../src/msw/registry.cpp:528

 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."

-msgstr "将注册值 '%s' 重命名为 '%s' 失败。"
+msgstr "无法将注册值 '%s' 重命名为 '%s'。"

 
 

-#: ../src/common/filefn.cpp:1163
+#: ../src/common/filefn.cpp:1168

 #, c-format
 msgid ""
 "Failed to rename the file '%s' to '%s' because the destination file already "
 "exists."
 msgstr "无法将文件'%s' 重命名为 '%s'，因为目标文件已存在。"
 
 #, c-format
 msgid ""
 "Failed to rename the file '%s' to '%s' because the destination file already "
 "exists."
 msgstr "无法将文件'%s' 重命名为 '%s'，因为目标文件已存在。"
 

-#: ../src/msw/registry.cpp:634
+#: ../src/msw/registry.cpp:633

 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."

-msgstr "将注册键 '%s' 重命名为 '%s' 失败。"
+msgstr "无法将注册键 '%s' 重命名为 '%s'。"

 
 

-#: ../src/msw/clipbrd.cpp:498
+#: ../src/msw/clipbrd.cpp:497

 msgid "Failed to retrieve data from the clipboard."
 msgid "Failed to retrieve data from the clipboard."

-msgstr "从剪贴板检取数据失败。"
+msgstr "无法从剪贴板检取数据。"

 
 

-#: ../src/common/filename.cpp:2669
+#: ../src/common/filename.cpp:2777

 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 #, c-format
 msgid "Failed to retrieve file times for '%s'"

-msgstr "æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´å¤±è´¥"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´"

 
 

-#: ../src/msw/dialup.cpp:488
+#: ../src/msw/dialup.cpp:487

 msgid "Failed to retrieve text of RAS error message"
 msgid "Failed to retrieve text of RAS error message"

-msgstr "æ\8f\90å\8f\96 RAS é\94\99误æ¶\88æ\81¯æ­£æ\96\87失败"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96 RAS é\94\99误æ¶\88æ\81¯æ­£æ\96\87"

 
 

-#: ../src/msw/clipbrd.cpp:785
+#: ../src/msw/clipbrd.cpp:784

 msgid "Failed to retrieve the supported clipboard formats"
 msgid "Failed to retrieve the supported clipboard formats"

-msgstr "æ\8f\90å\8f\96æ\94¯æ\8c\81ç\9a\84å\89ªè´´æ\9d¿æ ¼å¼\8f失败"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96æ\94¯æ\8c\81ç\9a\84å\89ªè´´æ\9d¿æ ¼å¼\8f"

 
 

-#: ../src/common/docview.cpp:652
+#: ../src/common/docview.cpp:649

 #, fuzzy, c-format
 msgid "Failed to save document to the file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 
 #, fuzzy, c-format
 msgid "Failed to save document to the file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\"失败."
 

-#: ../src/msw/dib.cpp:327
+#: ../src/msw/dib.cpp:326

 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."

-msgstr "将位图图像保存至文件 \"%s\" 失败。"
+msgstr "无法将位图图像保存至文件 \"%s\"。"

 
 

-#: ../src/msw/dde.cpp:769
+#: ../src/msw/dde.cpp:768

 msgid "Failed to send DDE advise notification"
 msgid "Failed to send DDE advise notification"

-msgstr "å\8f\91é\80\81 DDE advise é\80\9aç\9f¥å¤±è´¥"
+msgstr "æ\97 æ³\95å\8f\91é\80\81 DDE advise é\80\9aç\9f¥"

 
 

-#: ../src/common/ftp.cpp:405
+#: ../src/common/ftp.cpp:404

 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."

-msgstr "设置 FTP 传输模式为 %s 时失败。"
+msgstr "无法设置 FTP 传输模式为 %s。"

 
 

-#: ../src/msw/clipbrd.cpp:374
+#: ../src/msw/clipbrd.cpp:373

 msgid "Failed to set clipboard data."
 msgid "Failed to set clipboard data."

-msgstr "设置剪贴板数据失败。"
+msgstr "无法设置剪贴板数据。"

 
 

-#: ../src/unix/snglinst.cpp:182
+#: ../src/unix/snglinst.cpp:181

 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"

-msgstr "在锁文件 '%s' 上设置许可权限时失败"
+msgstr "无法在锁文件 '%s' 上设置许可权限"

 
 

-#: ../src/common/file.cpp:549
+#: ../src/unix/utilsunx.cpp:674
+msgid "Failed to set process priority"
+msgstr "无法设置线程优先级"
+
+#: ../src/common/file.cpp:576

 msgid "Failed to set temporary file permissions"
 msgid "Failed to set temporary file permissions"

-msgstr "设置临时文件的许可权限时失败"
+msgstr "无法设置临时文件的许可权限"

 
 

-#: ../src/gtk/textctrl.cpp:1000
+#: ../src/gtk/textctrl.cpp:1058

 #, fuzzy
 msgid "Failed to set text in the text control."
 msgstr "获取工作目录失败"
 
 #, fuzzy
 msgid "Failed to set text in the text control."
 msgstr "获取工作目录失败"
 

-#: ../src/unix/threadpsx.cpp:1141
+#: ../src/unix/threadpsx.cpp:1293

 #, fuzzy, c-format
 msgid "Failed to set thread concurrency level to %lu"
 msgstr "设置线程优先级 %d 失败。"
 
 #, fuzzy, c-format
 msgid "Failed to set thread concurrency level to %lu"
 msgstr "设置线程优先级 %d 失败。"
 

-#: ../src/unix/threadpsx.cpp:1338 ../src/unix/threadpsx.cpp:1348
+#: ../src/unix/threadpsx.cpp:1377 ../src/unix/threadpsx.cpp:1387

 #, c-format
 msgid "Failed to set thread priority %d."
 #, c-format
 msgid "Failed to set thread priority %d."

-msgstr "设置线程优先级 %d 失败。"
+msgstr "无法设置线程优先级 %d。"

 
 

-#: ../src/unix/utilsunx.cpp:709
+#: ../src/unix/utilsunx.cpp:791

 msgid "Failed to set up non-blocking pipe, the program might hang."
 msgstr "无法设置非闭塞通道，程序可能挂起。"
 
 msgid "Failed to set up non-blocking pipe, the program might hang."
 msgstr "无法设置非闭塞通道，程序可能挂起。"
 

-#: ../src/common/fs_mem.cpp:262
+#: ../src/common/fs_mem.cpp:261

 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"

-msgstr "将图像 '%s' 存到内存 VFS 失败！"
+msgstr "无法将图像 '%s' 存到内存 VFS！"

 
 

-#: ../src/dfb/evtloop.cpp:171
+#: ../src/dfb/evtloop.cpp:170

 msgid "Failed to switch DirectFB pipe to non-blocking mode"
 msgstr "无法将DirectFB通道切换至非闭塞模式"
 
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
 msgstr "无法将DirectFB通道切换至非闭塞模式"
 

-#: ../src/unix/evtloopunix.cpp:103
+#: ../src/unix/wakeuppipe.cpp:59

 msgid "Failed to switch wake up pipe to non-blocking mode"
 msgstr "无法将唤醒管道切换至非闭塞模式"
 
 msgid "Failed to switch wake up pipe to non-blocking mode"
 msgstr "无法将唤醒管道切换至非闭塞模式"
 

-#: ../src/unix/threadpsx.cpp:1530
+#: ../src/unix/threadpsx.cpp:1569

 msgid "Failed to terminate a thread."
 msgid "Failed to terminate a thread."

-msgstr "终止线程失败。"
+msgstr "无法终止线程。"

 
 

-#: ../src/msw/dde.cpp:747
+#: ../src/msw/dde.cpp:746

 msgid "Failed to terminate the advise loop with DDE server"
 msgid "Failed to terminate the advise loop with DDE server"

-msgstr "终止与 DDE 服务器的 advise 循环失败"
+msgstr "无法终止与 DDE 服务器的 advise 循环"

 
 

-#: ../src/msw/dialup.cpp:960
+#: ../src/msw/dialup.cpp:959

 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"

-msgstr "ç»\88æ­¢æ\8b¨å\8f·è¿\9eæ\8e¥å¤±è´¥: %s"
+msgstr "æ\97 æ³\95ç»\88æ­¢æ\8b¨å\8f·è¿\9eæ\8e¥: %s"

 
 

-#: ../src/common/filename.cpp:2588
+#: ../src/common/filename.cpp:2696

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

-#: ../src/unix/snglinst.cpp:329
+#: ../src/unix/snglinst.cpp:328

 #, c-format
 msgid "Failed to unlock lock file '%s'"
 #, c-format
 msgid "Failed to unlock lock file '%s'"

-msgstr "对已锁文件 '%s' 解锁失败"
+msgstr "无法对已锁文件 '%s' 解锁"

 
 

-#: ../src/msw/dde.cpp:315
+#: ../src/msw/dde.cpp:314

 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 #, c-format
 msgid "Failed to unregister DDE server '%s'"

-msgstr "æ\92¤æ¶\88 DDE æ\9c\8då\8a¡å\99¨ '%s' 注å\86\8c失败"
+msgstr "æ\97 æ³\95æ\92¤æ¶\88 DDE æ\9c\8då\8a¡å\99¨ '%s' ç\9a\84注å\86\8c"

 
 

-#: ../src/unix/epolldispatcher.cpp:156
+#: ../src/unix/epolldispatcher.cpp:155

 #, fuzzy, c-format
 msgid "Failed to unregister descriptor %d from epoll descriptor %d"
 msgstr "从剪贴板检取数据失败."
 
 #, fuzzy, c-format
 msgid "Failed to unregister descriptor %d from epoll descriptor %d"
 msgstr "从剪贴板检取数据失败."
 

-#: ../src/common/fileconf.cpp:1038
+#: ../src/common/fileconf.cpp:1037

 msgid "Failed to update user configuration file."
 msgstr "无法更新用户配置文件。"
 
 msgid "Failed to update user configuration file."
 msgstr "无法更新用户配置文件。"
 

-#: ../src/common/debugrpt.cpp:713
+#: ../src/common/debugrpt.cpp:738

 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."

-msgstr "上传调试报告失败 (错误号 %d)。"
+msgstr "无法上传调试报告 (错误号 %d)。"

 
 

-#: ../src/unix/snglinst.cpp:169
+#: ../src/unix/snglinst.cpp:168

 #, c-format
 msgid "Failed to write to lock file '%s'"
 #, c-format
 msgid "Failed to write to lock file '%s'"

-msgstr "写锁文件 '%s' 失败"
+msgstr "无法写入锁文件 '%s'"

 
 

-#: ../src/propgrid/propgrid.cpp:173
+#: ../src/propgrid/propgrid.cpp:172

 msgid "False"
 msgstr "False"
 
 msgid "False"
 msgstr "False"
 

-#: ../src/propgrid/advprops.cpp:659
+#: ../src/propgrid/advprops.cpp:658

 #, fuzzy
 msgid "Family"
 msgstr "字体(&F):"
 
 #, fuzzy
 msgid "Family"
 msgstr "字体(&F):"
 

-#: ../src/common/stockitem.cpp:158 ../src/msw/wince/filedlgwce.cpp:119
+#: ../src/common/stockitem.cpp:157 ../src/msw/wince/filedlgwce.cpp:121

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 

-#: ../src/common/docview.cpp:669
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:666
+#, c-format

 msgid "File \"%s\" could not be opened for reading."
 msgid "File \"%s\" could not be opened for reading."

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\96\87件 \"%s\" æ\97 æ³\95å¼\80å\90¯ä¸ºè¯»å\8f\96模å¼\8fã\80\82"

 
 

-#: ../src/common/docview.cpp:646
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:643
+#, c-format

 msgid "File \"%s\" could not be opened for writing."
 msgid "File \"%s\" could not be opened for writing."

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\96\87件 \"%s\" æ\97 æ³\95å¼\80å\90¯ä¸ºå\86\99å\85¥æ¨¡å¼\8fã\80\82"

 
 #: ../src/gtk/filedlg.cpp:56
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在，确实需要复写它?"
 
 
 #: ../src/gtk/filedlg.cpp:56
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在，确实需要复写它?"
 

-#: ../src/os2/filedlg.cpp:308
+#: ../src/os2/filedlg.cpp:310

 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -3598,200 +3596,200 @@ msgstr ""
 "文件 '%s' 已存在。\n"
 "真的需要替换它?"
 
 "文件 '%s' 已存在。\n"
 "真的需要替换它?"
 

-#: ../src/common/filefn.cpp:1201
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1207
+#, c-format

 msgid "File '%s' couldn't be removed"
 msgid "File '%s' couldn't be removed"

-msgstr "文件不能被装载."
+msgstr "文件 '%s' 无法被移除"

 
 

-#: ../src/common/filefn.cpp:1182
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1187
+#, c-format

 msgid "File '%s' couldn't be renamed '%s'"
 msgid "File '%s' couldn't be renamed '%s'"

-msgstr "文件不能被装载."
+msgstr "文件 '%s' 无法重命名为 '%s'"

 
 

-#: ../src/richtext/richtextctrl.cpp:2664 ../src/common/textcmn.cpp:920
+#: ../src/richtext/richtextctrl.cpp:2688 ../src/common/textcmn.cpp:921

 msgid "File couldn't be loaded."
 msgstr "文件无法装载。"
 
 msgid "File couldn't be loaded."
 msgstr "文件无法装载。"
 

-#: ../src/msw/filedlg.cpp:429
+#: ../src/msw/filedlg.cpp:458

 #, fuzzy, c-format
 msgid "File dialog failed with error code %0lx."
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
 #, fuzzy, c-format
 msgid "File dialog failed with error code %0lx."
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 

-#: ../src/common/docview.cpp:1762
+#: ../src/common/docview.cpp:1771

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

-#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799
+#: ../src/generic/dirctrlg.cpp:688 ../src/generic/filectrlg.cpp:805

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

-#: ../src/unix/fswatcher_inotify.cpp:439
-msgid "File system containing watched object was unmounted"
-msgstr "包含监控对象的文件系统已被卸载"
-
-#: ../src/motif/filedlg.cpp:218
+#: ../src/motif/filedlg.cpp:220

 msgid "Files"
 msgstr "文件"
 
 msgid "Files"
 msgstr "文件"
 

-#: ../src/common/filefn.cpp:1753
+#: ../src/common/filefn.cpp:1761

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

-#: ../src/motif/filedlg.cpp:216
+#: ../src/motif/filedlg.cpp:218

 msgid "Filter"
 msgstr "过滤器"
 
 msgid "Filter"
 msgstr "过滤器"
 

-#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:501
+#: ../src/common/stockitem.cpp:158 ../src/html/helpwnd.cpp:500

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

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

 msgid "First"
 msgstr "最前"
 
 msgid "First"
 msgstr "最前"
 

-#: ../src/common/prntbase.cpp:1519
+#: ../src/common/prntbase.cpp:1518

 msgid "First page"
 msgstr "第一页"
 
 msgid "First page"
 msgstr "第一页"
 

-#: ../src/richtext/richtextsizepage.cpp:483
+#: ../src/richtext/richtextsizepage.cpp:521

 msgid "Fixed"
 msgstr "固定"
 
 msgid "Fixed"
 msgstr "固定"
 

-#: ../src/html/helpwnd.cpp:1220
+#: ../src/html/helpwnd.cpp:1219

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

-#: ../src/html/helpwnd.cpp:1283
+#: ../src/html/helpwnd.cpp:1282

 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 

-#: ../src/richtext/richtextsizepage.cpp:207
+#: ../src/richtext/richtextsizepage.cpp:229

 msgid "Floating"
 msgstr "浮动"
 
 msgid "Floating"
 msgstr "浮动"
 

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

 msgid "Floppy"
 msgstr "软盘"
 
 msgid "Floppy"
 msgstr "软盘"
 

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

 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 

-#: ../src/richtext/richtextformatdlg.cpp:323 ../src/osx/carbon/fontdlg.cpp:471
-#: ../src/common/stockitem.cpp:195
+#: ../src/richtext/richtextformatdlg.cpp:324 ../src/osx/carbon/fontdlg.cpp:473
+#: ../src/common/stockitem.cpp:194

 msgid "Font"
 msgstr "字体"
 
 msgid "Font"
 msgstr "字体"
 

-#: ../src/richtext/richtextfontpage.cpp:228
+#: ../src/richtext/richtextfontpage.cpp:230

 msgid "Font &weight:"
 msgstr "字体粗细(&w):"
 
 msgid "Font &weight:"
 msgstr "字体粗细(&w):"
 

-#: ../src/html/helpwnd.cpp:1221
+#: ../src/html/helpwnd.cpp:1220

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

-#: ../src/richtext/richtextfontpage.cpp:215
+#: ../src/richtext/richtextfontpage.cpp:217

 msgid "Font st&yle:"
 msgstr "字体样式(&y):"
 
 msgid "Font st&yle:"
 msgstr "字体样式(&y):"
 

-#: ../src/osx/carbon/fontdlg.cpp:513
+#: ../src/osx/carbon/fontdlg.cpp:515

 msgid "Font:"
 msgstr "字体:"
 
 msgid "Font:"
 msgstr "字体:"
 

-#: ../src/dfb/fontmgr.cpp:199
+#: ../src/dfb/fontmgr.cpp:198

 #, c-format
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr "字体索引文件 %s 载入字体时丢失。"
 
 #, c-format
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr "字体索引文件 %s 载入字体时丢失。"
 

-#: ../src/unix/utilsunx.cpp:561
+#: ../src/unix/utilsunx.cpp:651

 msgid "Fork failed"
 msgstr "Fork 失败"
 
 msgid "Fork failed"
 msgstr "Fork 失败"
 

-#: ../src/common/stockitem.cpp:162
+#: ../src/common/stockitem.cpp:161

 msgid "Forward"
 msgstr "前进"
 
 msgid "Forward"
 msgstr "前进"
 

-#: ../src/common/xtixml.cpp:236
+#: ../src/common/xtixml.cpp:235

 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 

-#: ../src/html/helpwnd.cpp:889
+#: ../src/html/helpwnd.cpp:888

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

-#: ../src/generic/prntdlgg.cpp:244
+#: ../src/generic/prntdlgg.cpp:238

 msgid "From:"
 msgstr "从:"
 
 msgid "From:"
 msgstr "从:"
 

-#: ../src/common/imaggif.cpp:161
+#: ../src/common/imaggif.cpp:160

 msgid "GIF: Invalid gif index."
 msgstr "GIF: 无效的 gif 图像索引。"
 
 msgid "GIF: Invalid gif index."
 msgstr "GIF: 无效的 gif 图像索引。"
 

-#: ../src/common/imaggif.cpp:151
+#: ../src/common/imaggif.cpp:150

 msgid "GIF: data stream seems to be truncated."
 msgstr "GIF: 数据流似乎已被截断。"
 
 msgid "GIF: data stream seems to be truncated."
 msgstr "GIF: 数据流似乎已被截断。"
 

-#: ../src/common/imaggif.cpp:135
+#: ../src/common/imaggif.cpp:134

 msgid "GIF: error in GIF image format."
 msgstr "GIF: GIF文件格式错误。"
 
 msgid "GIF: error in GIF image format."
 msgstr "GIF: GIF文件格式错误。"
 

-#: ../src/common/imaggif.cpp:138
+#: ../src/common/imaggif.cpp:137

 msgid "GIF: not enough memory."
 msgstr "GIF: 没有足够内存。"
 
 msgid "GIF: not enough memory."
 msgstr "GIF: 没有足够内存。"
 

-#: ../src/common/imaggif.cpp:141
+#: ../src/common/imaggif.cpp:140

 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误！！！"
 
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误！！！"
 

-#: ../src/gtk/window.cpp:4210
+#: ../src/gtk/window.cpp:4288

 msgid ""
 "GTK+ installed on this machine is too old to support screen compositing, "
 "please install GTK+ 2.12 or later."
 msgstr "本机安装的GTK+版本过低，不支持屏幕组合，请安装GTK+2.12或者更新版本。"
 
 msgid ""
 "GTK+ installed on this machine is too old to support screen compositing, "
 "please install GTK+ 2.12 or later."
 msgstr "本机安装的GTK+版本过低，不支持屏幕组合，请安装GTK+2.12或者更新版本。"
 

-#: ../src/univ/themes/gtk.cpp:526
+#: ../src/univ/themes/gtk.cpp:525

 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 
 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 

-#: ../src/common/prntbase.cpp:244
+#: ../src/common/preferencescmn.cpp:39
+msgid "General"
+msgstr "通用"
+
+#: ../src/common/prntbase.cpp:243

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

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

 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 

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

 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 

-#: ../include/wx/xtiprop.h:189
+#: ../include/wx/xtiprop.h:188

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

-#: ../include/wx/xtiprop.h:267
+#: ../include/wx/xtiprop.h:266

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

-#: ../include/wx/xtiprop.h:207
+#: ../include/wx/xtiprop.h:206

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

-#: ../src/html/helpwnd.cpp:674
+#: ../src/html/helpwnd.cpp:673

 msgid "Go back"
 msgstr "返回"
 
 msgid "Go back"
 msgstr "返回"
 

-#: ../src/html/helpwnd.cpp:675
+#: ../src/html/helpwnd.cpp:674

 msgid "Go forward"
 msgstr "前进"
 
 msgid "Go forward"
 msgstr "前进"
 

-#: ../src/html/helpwnd.cpp:677
+#: ../src/html/helpwnd.cpp:676

 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 
 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 

-#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:136

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


@@ -3799,11 +3797,11 @@ msgstr "进入 home 目录"
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
 msgid "Go to parent directory"
 msgstr "进入父目录"
 

-#: ../src/generic/aboutdlgg.cpp:77
+#: ../src/generic/aboutdlgg.cpp:76

 msgid "Graphics art by "
 msgstr "图形艺术设计由 "
 
 msgid "Graphics art by "
 msgstr "图形艺术设计由 "
 

-#: ../src/common/fmapbase.cpp:155
+#: ../src/common/fmapbase.cpp:154

 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 


@@ -3811,167 +3809,168 @@ msgstr "希腊语 (ISO-8859-7)"
 msgid "Groove"
 msgstr ""
 
 msgid "Groove"
 msgstr ""
 

-#: ../src/common/zstream.cpp:159 ../src/common/zstream.cpp:319
+#: ../src/common/zstream.cpp:158 ../src/common/zstream.cpp:318

 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的 zlib 不支持 Gzip"
 
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的 zlib 不支持 Gzip"
 

-#: ../src/common/accelcmn.cpp:76
+#: ../src/common/accelcmn.cpp:75

 msgid "HELP"
 msgstr "HELP"
 
 msgid "HELP"
 msgstr "HELP"
 

-#: ../src/common/accelcmn.cpp:61
+#: ../src/common/accelcmn.cpp:60

 msgid "HOME"
 msgstr "HOME"
 
 msgid "HOME"
 msgstr "HOME"
 

-#: ../src/html/helpwnd.cpp:1553
+#: ../src/html/helpwnd.cpp:1552

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

-#: ../src/html/htmlwin.cpp:655
+#: ../src/html/htmlwin.cpp:659

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

-#: ../src/html/helpwnd.cpp:1551
+#: ../src/html/helpwnd.cpp:1550

 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 

-#: ../src/common/stockitem.cpp:163
+#: ../src/common/stockitem.cpp:162

 msgid "Harddisk"
 msgstr "磁盘"
 
 msgid "Harddisk"
 msgstr "磁盘"
 

-#: ../src/common/fmapbase.cpp:156
+#: ../src/common/fmapbase.cpp:155

 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
 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
+#: ../include/wx/msgdlg.h:275 ../src/osx/button_osx.cpp:39
+#: ../src/common/stockitem.cpp:163 ../src/html/helpdlg.cpp:66
+#: ../src/html/helpfrm.cpp:116

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

-#: ../src/html/helpwnd.cpp:1214
+#: ../src/html/helpwnd.cpp:1213

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

-#: ../src/generic/helpext.cpp:459 ../src/generic/helpext.cpp:460
+#: ../src/generic/helpext.cpp:458 ../src/generic/helpext.cpp:459

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

-#: ../src/html/helpwnd.cpp:1535
+#: ../src/html/helpwnd.cpp:1534

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

-#: ../src/html/helpwnd.cpp:815
+#: ../src/html/helpwnd.cpp:814

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

-#: ../src/html/helpwnd.cpp:1552
+#: ../src/html/helpwnd.cpp:1551

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

-#: ../src/generic/helpext.cpp:272
+#: ../src/generic/helpext.cpp:271

 #, c-format
 msgid "Help directory \"%s\" not found."
 msgstr "找不到帮助目录 \"%s\"。"
 
 #, c-format
 msgid "Help directory \"%s\" not found."
 msgstr "找不到帮助目录 \"%s\"。"
 

-#: ../src/generic/helpext.cpp:280
-#, fuzzy, c-format
+#: ../src/generic/helpext.cpp:279
+#, c-format

 msgid "Help file \"%s\" not found."
 msgid "Help file \"%s\" not found."

-msgstr "æ\89¾ä¸\8då\88°å\9f\9f '%s'ç\9a\84ç\9b®å½\95æ\96\87件."
+msgstr "æ\89¾ä¸\8då\88°å¸®å\8a©æ\96\87件 \"%s\"ã\80\82"

 
 

-#: ../src/html/helpctrl.cpp:64
+#: ../src/html/helpctrl.cpp:63

 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 
 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 

-#: ../src/osx/menu_osx.cpp:556
+#: ../src/osx/menu_osx.cpp:602 ../src/osx/menu_osx.cpp:649

 #, c-format
 msgid "Hide %s"
 msgstr "隐藏 %s"
 
 #, c-format
 msgid "Hide %s"
 msgstr "隐藏 %s"
 

-#: ../src/osx/menu_osx.cpp:558
+#: ../src/osx/menu_osx.cpp:604 ../src/osx/menu_osx.cpp:651

 msgid "Hide Others"
 msgstr "隐藏其他"
 
 msgid "Hide Others"
 msgstr "隐藏其他"
 

-#: ../src/generic/infobar.cpp:139
+#: ../src/generic/infobar.cpp:85

 msgid "Hide this notification message."
 msgstr "隐藏此通知消息。"
 
 msgid "Hide this notification message."
 msgstr "隐藏此通知消息。"
 

-#: ../src/generic/dirdlgg.cpp:99 ../src/common/stockitem.cpp:165
+#: ../src/generic/dirdlgg.cpp:98 ../src/common/stockitem.cpp:164

 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 

-#: ../src/generic/dirctrlg.cpp:616
+#: ../src/generic/dirctrlg.cpp:624

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

-#: ../src/richtext/richtextsizepage.cpp:231
-#: ../src/richtext/richtextsizepage.cpp:233
+#: ../src/richtext/richtextsizepage.cpp:253
+#: ../src/richtext/richtextsizepage.cpp:255

 msgid "How the object will float relative to the text."
 msgstr "对象怎样浮动与文本有关。"
 
 msgid "How the object will float relative to the text."
 msgstr "对象怎样浮动与文本有关。"
 

-#: ../src/common/imagbmp.cpp:1071
+#: ../src/common/imagbmp.cpp:1118

 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 读掩码DIB错误。"
 
 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
-#: ../src/common/imagbmp.cpp:1341
+#: ../src/common/imagbmp.cpp:1233 ../src/common/imagbmp.cpp:1294
+#: ../src/common/imagbmp.cpp:1305 ../src/common/imagbmp.cpp:1318
+#: ../src/common/imagbmp.cpp:1363 ../src/common/imagbmp.cpp:1375
+#: ../src/common/imagbmp.cpp:1386

 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误！"
 
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 写图像文件错误！"
 

-#: ../src/common/imagbmp.cpp:1151
+#: ../src/common/imagbmp.cpp:1198

 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 图像高度超出范围，不适合做图标。"
 
 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 图像高度超出范围，不适合做图标。"
 

-#: ../src/common/imagbmp.cpp:1159
+#: ../src/common/imagbmp.cpp:1206

 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 图像宽度超出范围，不适合做图标。"
 
 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 图像宽度超出范围，不适合做图标。"
 

-#: ../src/common/imagbmp.cpp:1416
+#: ../src/common/imagbmp.cpp:1466

 msgid "ICO: Invalid icon index."
 msgstr "ICO: 无效的图标索引。"
 
 msgid "ICO: Invalid icon index."
 msgstr "ICO: 无效的图标索引。"
 

-#: ../src/common/imagiff.cpp:760
+#: ../src/common/imagiff.cpp:759

 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 数据流似乎已被截断。"
 
 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 数据流似乎已被截断。"
 

-#: ../src/common/imagiff.cpp:744
+#: ../src/common/imagiff.cpp:743

 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF文件格式错误。"
 
 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF文件格式错误。"
 

-#: ../src/common/imagiff.cpp:747
+#: ../src/common/imagiff.cpp:746

 msgid "IFF: not enough memory."
 msgstr "IFF: 没有足够内存。"
 
 msgid "IFF: not enough memory."
 msgstr "IFF: 没有足够内存。"
 

-#: ../src/common/imagiff.cpp:750
+#: ../src/common/imagiff.cpp:749

 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误！！！"
 
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误！！！"
 

-#: ../src/common/accelcmn.cpp:51
+#: ../src/common/accelcmn.cpp:50

 msgid "INS"
 msgstr "INS"
 
 msgid "INS"
 msgstr "INS"
 

-#: ../src/common/accelcmn.cpp:52
+#: ../src/common/accelcmn.cpp:51

 msgid "INSERT"
 msgstr "INSERT"
 
 msgid "INSERT"
 msgstr "INSERT"
 

-#: ../src/common/fmapbase.cpp:198
+#: ../src/common/fmapbase.cpp:197

 msgid "ISO-2022-JP"
 msgstr "ISO-2022-JP"
 
 msgid "ISO-2022-JP"
 msgstr "ISO-2022-JP"
 

-#: ../src/osx/carbon/dataview.cpp:2421
+#: ../src/osx/carbon/dataview.cpp:2420

 msgid "Icon & text renderer cannot render value; value type: "
 msgstr "图标和文本渲染器无法渲染该值; 类型为:"
 
 msgid "Icon & text renderer cannot render value; value type: "
 msgstr "图标和文本渲染器无法渲染该值; 类型为:"
 

-#: ../src/html/htmprint.cpp:283
+#: ../src/html/htmprint.cpp:282

 msgid ""
 "If possible, try changing the layout parameters to make the printout more "
 "narrow."
 msgstr "如有可能，请尝试更改布局参数以使输出结果更紧凑。"
 
 msgid ""
 "If possible, try changing the layout parameters to make the printout more "
 "narrow."
 msgstr "如有可能，请尝试更改布局参数以使输出结果更紧凑。"
 

-#: ../src/generic/dbgrptg.cpp:355
+#: ../src/generic/dbgrptg.cpp:358

 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"
 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"


@@ -3979,7 +3978,7 @@ msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"
 "请在此输入，它将会被加到错误报告中:"
 
 "如果您有任何与此错误报告有关的信息, \n"
 "请在此输入，它将会被加到错误报告中:"
 

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

 msgid ""
 "If you wish to suppress this debug report completely, please choose the "
 "\"Cancel\" button,\n"
 msgid ""
 "If you wish to suppress this debug report completely, please choose the "
 "\"Cancel\" button,\n"


@@ -3990,44 +3989,44 @@ msgstr ""
 "但我们不建议这样做，因为调试报告有助于改进本程序。\n"
 "在可能的情况下，请尽量选择让程序生成调试报告。\n"
 
 "但我们不建议这样做，因为调试报告有助于改进本程序。\n"
 "在可能的情况下，请尽量选择让程序生成调试报告。\n"
 

-#: ../src/msw/registry.cpp:1396
+#: ../src/msw/registry.cpp:1395

 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 msgstr "忽略值 \"%s\" (键 \"%s\")。"
 
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 msgstr "忽略值 \"%s\" (键 \"%s\")。"
 

-#: ../src/common/xtistrm.cpp:300
+#: ../src/common/xtistrm.cpp:299

 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类 (非-wxEvtHandler) 作为事件源"
 
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr "非法的对象类 (非-wxEvtHandler) 作为事件源"
 

-#: ../src/common/xti.cpp:514
+#: ../src/common/xti.cpp:513

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

-#: ../src/common/xti.cpp:502
+#: ../src/common/xti.cpp:501

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

-#: ../src/generic/dirctrlg.cpp:662 ../src/generic/filectrlg.cpp:785
+#: ../src/generic/dirctrlg.cpp:670 ../src/generic/filectrlg.cpp:791

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

-#: ../src/generic/filectrlg.cpp:1374
+#: ../src/generic/filectrlg.cpp:1380

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

-#: ../src/common/image.cpp:2054
+#: ../src/common/image.cpp:2158

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

-#: ../src/common/image.cpp:2502
-#, fuzzy, c-format
+#: ../src/common/image.cpp:2609
+#, c-format

 msgid "Image file is not of type %d."
 msgid "Image file is not of type %d."

-msgstr "图像文件的类型不是 %d."
+msgstr "图像文件的类型不是 %d。"

 
 

-#: ../src/common/image.cpp:2632
-#, fuzzy, c-format
+#: ../src/common/image.cpp:2739
+#, c-format

 msgid "Image is not of type %s."
 msgid "Image is not of type %s."

-msgstr "图像文件的类型不是 %d."
+msgstr "图像的类型不是 %s。"

 
 #: ../src/msw/textctrl.cpp:399
 msgid ""
 
 #: ../src/msw/textctrl.cpp:399
 msgid ""


@@ -4036,85 +4035,85 @@ msgid ""
 msgstr ""
 "无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"
 
 msgstr ""
 "无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"
 

-#: ../src/unix/utilsunx.cpp:302
+#: ../src/unix/utilsunx.cpp:307

 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 

-#: ../src/common/filefn.cpp:1069
+#: ../src/common/filefn.cpp:1074

 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "不可能获得文件 '%s' 的许可权限"
 
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "不可能获得文件 '%s' 的许可权限"
 

-#: ../src/common/filefn.cpp:1083
+#: ../src/common/filefn.cpp:1088

 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "不可能复写文件 '%s'"
 

-#: ../src/common/filefn.cpp:1137
+#: ../src/common/filefn.cpp:1142

 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "不可能设置文件 '%s' 的许可权限"
 
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "不可能设置文件 '%s' 的许可权限"
 

-#: ../src/common/gifdecod.cpp:819
+#: ../src/common/gifdecod.cpp:818

 #, c-format
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr "错误的GIF帧尺寸(%u, %d)对于第#%u帧"
 
 #, c-format
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr "错误的GIF帧尺寸(%u, %d)对于第#%u帧"
 

-#: ../src/msw/ole/automtn.cpp:619
+#: ../src/msw/ole/automtn.cpp:624

 msgid "Incorrect number of arguments."
 msgstr "错误的变量数目。"
 
 msgid "Incorrect number of arguments."
 msgstr "错误的变量数目。"
 

-#: ../src/common/stockitem.cpp:166
+#: ../src/common/stockitem.cpp:165

 msgid "Indent"
 msgstr "缩进"
 
 msgid "Indent"
 msgstr "缩进"
 

-#: ../src/richtext/richtextformatdlg.cpp:329
+#: ../src/richtext/richtextformatdlg.cpp:330

 msgid "Indents && Spacing"
 msgstr "锁紧和空格"
 
 msgid "Indents && Spacing"
 msgstr "锁紧和空格"
 

-#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:526
+#: ../src/common/stockitem.cpp:166 ../src/html/helpwnd.cpp:525

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

-#: ../src/common/fmapbase.cpp:160
+#: ../src/common/fmapbase.cpp:159

 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 

-#: ../src/common/stockitem.cpp:168
+#: ../src/common/stockitem.cpp:167

 msgid "Info"
 msgstr "信息"
 
 msgid "Info"
 msgstr "信息"
 

-#: ../src/common/init.cpp:273
+#: ../src/common/init.cpp:276

 msgid "Initialization failed in post init, aborting."
 msgstr "在后初始化阶段出错，退出..."
 
 msgid "Initialization failed in post init, aborting."
 msgstr "在后初始化阶段出错，退出..."
 

-#: ../src/richtext/richtextsymboldlg.cpp:473
+#: ../src/richtext/richtextsymboldlg.cpp:472

 msgid "Insert"
 msgstr "插入"
 
 msgid "Insert"
 msgstr "插入"
 

-#: ../src/richtext/richtextbuffer.cpp:7246
+#: ../src/richtext/richtextbuffer.cpp:7687

 #, fuzzy
 msgid "Insert Field"
 msgstr "插入"
 
 #, fuzzy
 msgid "Insert Field"
 msgstr "插入"
 

-#: ../src/richtext/richtextbuffer.cpp:7157
-#: ../src/richtext/richtextbuffer.cpp:8063
+#: ../src/richtext/richtextbuffer.cpp:7598
+#: ../src/richtext/richtextbuffer.cpp:8551

 msgid "Insert Image"
 msgstr "插入图片"
 
 msgid "Insert Image"
 msgstr "插入图片"
 

-#: ../src/richtext/richtextbuffer.cpp:7204
+#: ../src/richtext/richtextbuffer.cpp:7645

 msgid "Insert Object"
 msgstr "插入对象"
 
 msgid "Insert Object"
 msgstr "插入对象"
 

-#: ../src/richtext/richtextctrl.cpp:1162 ../src/richtext/richtextctrl.cpp:1352
-#: ../src/richtext/richtextbuffer.cpp:7002
-#: ../src/richtext/richtextbuffer.cpp:7029
-#: ../src/richtext/richtextbuffer.cpp:7073
+#: ../src/richtext/richtextctrl.cpp:1172 ../src/richtext/richtextctrl.cpp:1362
+#: ../src/richtext/richtextbuffer.cpp:7440
+#: ../src/richtext/richtextbuffer.cpp:7470
+#: ../src/richtext/richtextbuffer.cpp:7514

 msgid "Insert Text"
 msgstr "插入文本"
 
 msgid "Insert Text"
 msgstr "插入文本"
 

-#: ../src/richtext/richtextindentspage.cpp:320
-#: ../src/richtext/richtextindentspage.cpp:322
+#: ../src/richtext/richtextindentspage.cpp:295
+#: ../src/richtext/richtextindentspage.cpp:297

 msgid "Inserts a page break before the paragraph."
 msgstr "在段落前插入断页符。"
 
 msgid "Inserts a page break before the paragraph."
 msgstr "在段落前插入断页符。"
 


@@ -4123,391 +4122,395 @@ msgstr "在段落前插入断页符。"
 msgid "Inset"
 msgstr "缩进"
 
 msgid "Inset"
 msgstr "缩进"
 

-#: ../src/gtk/app.cpp:432
+#: ../src/gtk/app.cpp:429

 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr "无效的GTK+命令行选项，使用 \"%s --help\""
 
 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr "无效的GTK+命令行选项，使用 \"%s --help\""
 

-#: ../src/common/imagtiff.cpp:315
+#: ../src/common/imagtiff.cpp:314

 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引。"
 
 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引。"
 

-#: ../src/osx/carbon/dataview.cpp:1783 ../src/osx/carbon/dataview.cpp:1878
+#: ../src/osx/carbon/dataview.cpp:1782 ../src/osx/carbon/dataview.cpp:1877

 msgid "Invalid data view item"
 msgstr "无效的数据视图项"
 
 msgid "Invalid data view item"
 msgstr "无效的数据视图项"
 

-#: ../src/common/appcmn.cpp:246
+#: ../src/common/appcmn.cpp:266

 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "无效的显示模式 '%s'。"
 
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "无效的显示模式 '%s'。"
 

-#: ../src/x11/app.cpp:122
+#: ../src/x11/app.cpp:121

 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "无效的几何规格 '%s'"
 
 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "无效的几何规格 '%s'"
 

-#: ../src/unix/snglinst.cpp:307
+#: ../src/unix/fswatcher_inotify.cpp:298
+#, c-format
+msgid "Invalid inotify event for \"%s\""
+msgstr "无效的 \"%s\" inotify 事件"
+
+#: ../src/unix/snglinst.cpp:306

 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'。"
 
 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'。"
 

-#: ../src/common/translation.cpp:955
-#, fuzzy
+#: ../src/common/translation.cpp:1111

 msgid "Invalid message catalog."
 msgid "Invalid message catalog."

-msgstr "'%s' 不是有效的消息目录."
+msgstr "无效的消息目录。"

 
 

-#: ../src/common/xtistrm.cpp:410 ../src/common/xtistrm.cpp:425
+#: ../src/common/xtistrm.cpp:409 ../src/common/xtistrm.cpp:424

 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"
 
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"
 

-#: ../src/common/xtistrm.cpp:440
+#: ../src/common/xtistrm.cpp:439

 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"
 
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"
 

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

 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 

-#: ../src/common/config.cpp:227
+#: ../src/common/config.cpp:226

 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr "配置文件中无效的值 %ld 于布尔键 \"%s\"。"
 
 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr "配置文件中无效的值 %ld 于布尔键 \"%s\"。"
 

-#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:324
-#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169
+#: ../src/generic/fontdlgg.cpp:329 ../src/richtext/richtextfontpage.cpp:333
+#: ../src/osx/carbon/fontdlg.cpp:547 ../src/common/stockitem.cpp:168

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

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

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

-#: ../src/common/imagjpeg.cpp:256
+#: ../src/common/imagjpeg.cpp:255

 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: 无法装入 - 文件也许已被破坏。"
 
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: 无法装入 - 文件也许已被破坏。"
 

-#: ../src/common/imagjpeg.cpp:435
+#: ../src/common/imagjpeg.cpp:434

 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 无法保存图像。"
 
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 无法保存图像。"
 

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

 msgid "Japanese Double Postcard 200 x 148 mm"
 msgstr "日本双明信片, 200 x 148 毫米"
 
 msgid "Japanese Double Postcard 200 x 148 mm"
 msgstr "日本双明信片, 200 x 148 毫米"
 

-#: ../src/common/paper.cpp:169
+#: ../src/common/paper.cpp:168

 msgid "Japanese Envelope Chou #3"
 msgstr "日本 Chou 3 信封"
 
 msgid "Japanese Envelope Chou #3"
 msgstr "日本 Chou 3 信封"
 

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

 msgid "Japanese Envelope Chou #3 Rotated"
 msgstr "日本 Chou 3 信封(横向)"
 
 msgid "Japanese Envelope Chou #3 Rotated"
 msgstr "日本 Chou 3 信封(横向)"
 

-#: ../src/common/paper.cpp:170
+#: ../src/common/paper.cpp:169

 msgid "Japanese Envelope Chou #4"
 msgstr "日本 Chou 4 信封"
 
 msgid "Japanese Envelope Chou #4"
 msgstr "日本 Chou 4 信封"
 

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

 msgid "Japanese Envelope Chou #4 Rotated"
 msgstr "日本 Chou 4 信封(横向)"
 
 msgid "Japanese Envelope Chou #4 Rotated"
 msgstr "日本 Chou 4 信封(横向)"
 

-#: ../src/common/paper.cpp:167
+#: ../src/common/paper.cpp:166

 msgid "Japanese Envelope Kaku #2"
 msgstr "日本 Kaku 2 信封"
 
 msgid "Japanese Envelope Kaku #2"
 msgstr "日本 Kaku 2 信封"
 

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

 msgid "Japanese Envelope Kaku #2 Rotated"
 msgstr "日本 Kaku 2 信封(横向)"
 
 msgid "Japanese Envelope Kaku #2 Rotated"
 msgstr "日本 Kaku 2 信封(横向)"
 

-#: ../src/common/paper.cpp:168
+#: ../src/common/paper.cpp:167

 msgid "Japanese Envelope Kaku #3"
 msgstr "日本 Kaku 3 信封"
 
 msgid "Japanese Envelope Kaku #3"
 msgstr "日本 Kaku 3 信封"
 

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

 msgid "Japanese Envelope Kaku #3 Rotated"
 msgstr "日本 Kaku 3 信封(横向)"
 
 msgid "Japanese Envelope Kaku #3 Rotated"
 msgstr "日本 Kaku 3 信封(横向)"
 

-#: ../src/common/paper.cpp:187
+#: ../src/common/paper.cpp:186

 msgid "Japanese Envelope You #4"
 msgstr "日本 You 4 信封"
 
 msgid "Japanese Envelope You #4"
 msgstr "日本 You 4 信封"
 

-#: ../src/common/paper.cpp:188
+#: ../src/common/paper.cpp:187

 msgid "Japanese Envelope You #4 Rotated"
 msgstr "日本 You 4 信封(横向)"
 
 msgid "Japanese Envelope You #4 Rotated"
 msgstr "日本 You 4 信封(横向)"
 

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

 msgid "Japanese Postcard 100 x 148 mm"
 msgstr "日本明信片, 100 x 148 毫米"
 
 msgid "Japanese Postcard 100 x 148 mm"
 msgstr "日本明信片, 100 x 148 毫米"
 

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

 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "横向日本明信片, 148 x 100 毫米"
 
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "横向日本明信片, 148 x 100 毫米"
 

-#: ../src/common/stockitem.cpp:170
+#: ../src/common/stockitem.cpp:169

 msgid "Jump to"
 msgstr "跳转至"
 
 msgid "Jump to"
 msgstr "跳转至"
 

-#: ../src/common/stockitem.cpp:172
+#: ../src/common/stockitem.cpp:171

 msgid "Justified"
 msgstr "分散对齐"
 
 msgid "Justified"
 msgstr "分散对齐"
 

-#: ../src/richtext/richtextindentspage.cpp:168
-#: ../src/richtext/richtextindentspage.cpp:170
-#: ../src/richtext/richtextliststylepage.cpp:345
-#: ../src/richtext/richtextliststylepage.cpp:347
+#: ../src/richtext/richtextindentspage.cpp:155
+#: ../src/richtext/richtextindentspage.cpp:157
+#: ../src/richtext/richtextliststylepage.cpp:344
+#: ../src/richtext/richtextliststylepage.cpp:346

 msgid "Justify text left and right."
 msgstr "文本左右对齐。"
 
 msgid "Justify text left and right."
 msgstr "文本左右对齐。"
 

-#: ../src/common/fmapbase.cpp:164
+#: ../src/common/fmapbase.cpp:163

 msgid "KOI8-R"
 msgstr "KOI8-R"
 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 

-#: ../src/common/fmapbase.cpp:165
+#: ../src/common/fmapbase.cpp:164

 msgid "KOI8-U"
 msgstr "KOI8-U"
 
 msgid "KOI8-U"
 msgstr "KOI8-U"
 

-#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:337
+#: ../src/common/accelcmn.cpp:254 ../src/common/accelcmn.cpp:336

 msgid "KP_"
 msgstr "KP_"
 
 msgid "KP_"
 msgstr "KP_"
 

-#: ../src/common/accelcmn.cpp:104
+#: ../src/common/accelcmn.cpp:103

 msgid "KP_ADD"
 msgstr "KP_ADD"
 
 msgid "KP_ADD"
 msgstr "KP_ADD"
 

-#: ../src/common/accelcmn.cpp:99
+#: ../src/common/accelcmn.cpp:98

 msgid "KP_BEGIN"
 msgstr "KP_BEGIN"
 
 msgid "KP_BEGIN"
 msgstr "KP_BEGIN"
 

-#: ../src/common/accelcmn.cpp:107
+#: ../src/common/accelcmn.cpp:106

 msgid "KP_DECIMAL"
 msgstr "KP_DECIMAL"
 
 msgid "KP_DECIMAL"
 msgstr "KP_DECIMAL"
 

-#: ../src/common/accelcmn.cpp:101
+#: ../src/common/accelcmn.cpp:100

 msgid "KP_DELETE"
 msgstr "KP_DELETE"
 
 msgid "KP_DELETE"
 msgstr "KP_DELETE"
 

-#: ../src/common/accelcmn.cpp:108
+#: ../src/common/accelcmn.cpp:107

 msgid "KP_DIVIDE"
 msgstr "KP_DIVIDE"
 
 msgid "KP_DIVIDE"
 msgstr "KP_DIVIDE"
 

-#: ../src/common/accelcmn.cpp:93
+#: ../src/common/accelcmn.cpp:92

 msgid "KP_DOWN"
 msgstr "KP_DOWN"
 
 msgid "KP_DOWN"
 msgstr "KP_DOWN"
 

-#: ../src/common/accelcmn.cpp:98
+#: ../src/common/accelcmn.cpp:97

 msgid "KP_END"
 msgstr "KP_END"
 
 msgid "KP_END"
 msgstr "KP_END"
 

-#: ../src/common/accelcmn.cpp:88
+#: ../src/common/accelcmn.cpp:87

 msgid "KP_ENTER"
 msgstr "KP_ENTER"
 
 msgid "KP_ENTER"
 msgstr "KP_ENTER"
 

-#: ../src/common/accelcmn.cpp:102
+#: ../src/common/accelcmn.cpp:101

 msgid "KP_EQUAL"
 msgstr "KP_EQUAL"
 
 msgid "KP_EQUAL"
 msgstr "KP_EQUAL"
 

-#: ../src/common/accelcmn.cpp:89
+#: ../src/common/accelcmn.cpp:88

 msgid "KP_HOME"
 msgstr "KP_HOME"
 
 msgid "KP_HOME"
 msgstr "KP_HOME"
 

-#: ../src/common/accelcmn.cpp:100
+#: ../src/common/accelcmn.cpp:99

 msgid "KP_INSERT"
 msgstr "KP_INSERT"
 
 msgid "KP_INSERT"
 msgstr "KP_INSERT"
 

-#: ../src/common/accelcmn.cpp:90
+#: ../src/common/accelcmn.cpp:89

 msgid "KP_LEFT"
 msgstr "KP_LEFT"
 
 msgid "KP_LEFT"
 msgstr "KP_LEFT"
 

-#: ../src/common/accelcmn.cpp:103
+#: ../src/common/accelcmn.cpp:102

 msgid "KP_MULTIPLY"
 msgstr "KP_MULTIPLY"
 
 msgid "KP_MULTIPLY"
 msgstr "KP_MULTIPLY"
 

-#: ../src/common/accelcmn.cpp:96
+#: ../src/common/accelcmn.cpp:95

 msgid "KP_NEXT"
 msgstr "KP_NEXT"
 
 msgid "KP_NEXT"
 msgstr "KP_NEXT"
 

-#: ../src/common/accelcmn.cpp:97
+#: ../src/common/accelcmn.cpp:96

 msgid "KP_PAGEDOWN"
 msgstr "KP_PAGEDOWN"
 
 msgid "KP_PAGEDOWN"
 msgstr "KP_PAGEDOWN"
 

-#: ../src/common/accelcmn.cpp:95
+#: ../src/common/accelcmn.cpp:94

 msgid "KP_PAGEUP"
 msgstr "KP_PAGEUP"
 
 msgid "KP_PAGEUP"
 msgstr "KP_PAGEUP"
 

-#: ../src/common/accelcmn.cpp:94
+#: ../src/common/accelcmn.cpp:93

 msgid "KP_PRIOR"
 msgstr "KP_PRIOR"
 
 msgid "KP_PRIOR"
 msgstr "KP_PRIOR"
 

-#: ../src/common/accelcmn.cpp:92
+#: ../src/common/accelcmn.cpp:91

 msgid "KP_RIGHT"
 msgstr "KP_RIGHT"
 
 msgid "KP_RIGHT"
 msgstr "KP_RIGHT"
 

-#: ../src/common/accelcmn.cpp:105
+#: ../src/common/accelcmn.cpp:104

 msgid "KP_SEPARATOR"
 msgstr "KP_SEPARATOR"
 
 msgid "KP_SEPARATOR"
 msgstr "KP_SEPARATOR"
 

-#: ../src/common/accelcmn.cpp:86
+#: ../src/common/accelcmn.cpp:85

 msgid "KP_SPACE"
 msgstr "KP_SPACE"
 
 msgid "KP_SPACE"
 msgstr "KP_SPACE"
 

-#: ../src/common/accelcmn.cpp:106
+#: ../src/common/accelcmn.cpp:105

 msgid "KP_SUBTRACT"
 msgstr "KP_SUBTRACT"
 
 msgid "KP_SUBTRACT"
 msgstr "KP_SUBTRACT"
 

-#: ../src/common/accelcmn.cpp:87
+#: ../src/common/accelcmn.cpp:86

 msgid "KP_TAB"
 msgstr "KP_TAB"
 
 msgid "KP_TAB"
 msgstr "KP_TAB"
 

-#: ../src/common/accelcmn.cpp:91
+#: ../src/common/accelcmn.cpp:90

 msgid "KP_UP"
 msgstr "KP_UP"
 
 msgid "KP_UP"
 msgstr "KP_UP"
 

-#: ../src/richtext/richtextindentspage.cpp:295
+#: ../src/richtext/richtextindentspage.cpp:270

 msgid "L&ine spacing:"
 msgstr "行距(&I):"
 
 msgid "L&ine spacing:"
 msgstr "行距(&I):"
 

-#: ../src/common/accelcmn.cpp:57
+#: ../src/common/accelcmn.cpp:56

 msgid "LEFT"
 msgstr "LEFT"
 
 msgid "LEFT"
 msgstr "LEFT"
 

-#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:613 ../src/generic/prntdlgg.cpp:868

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

-#: ../src/common/stockitem.cpp:175
+#: ../src/common/stockitem.cpp:174

 msgid "Last"
 msgstr "最后"
 
 msgid "Last"
 msgstr "最后"
 

-#: ../src/common/prntbase.cpp:1543
+#: ../src/common/prntbase.cpp:1542

 msgid "Last page"
 msgstr "最后一页"
 
 msgid "Last page"
 msgstr "最后一页"
 

-#: ../src/common/log.cpp:312
+#: ../src/common/log.cpp:309

 #, c-format
 msgid "Last repeated message (\"%s\", %lu time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
 msgstr[0] "最后重复消息(\"%s\", %lu time)未输出"
 
 #, c-format
 msgid "Last repeated message (\"%s\", %lu time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
 msgstr[0] "最后重复消息(\"%s\", %lu time)未输出"
 

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

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

-#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextliststylepage.cpp:249
+#: ../src/richtext/richtextliststylepage.cpp:252

 #: ../src/richtext/richtextliststylepage.cpp:253
 #: ../src/richtext/richtextliststylepage.cpp:253

-#: ../src/richtext/richtextliststylepage.cpp:254
-#: ../src/richtext/richtextbulletspage.cpp:200
+#: ../src/richtext/richtextbulletspage.cpp:199
+#: ../src/richtext/richtextbulletspage.cpp:202

 #: ../src/richtext/richtextbulletspage.cpp:203
 #: ../src/richtext/richtextbulletspage.cpp:203

-#: ../src/richtext/richtextbulletspage.cpp:204
-#: ../src/richtext/richtextsizepage.cpp:227
+#: ../src/richtext/richtextsizepage.cpp:249

 msgid "Left"
 msgstr "左"
 
 msgid "Left"
 msgstr "左"
 

-#: ../src/richtext/richtextindentspage.cpp:217
-#: ../src/richtext/richtextliststylepage.cpp:391
+#: ../src/richtext/richtextindentspage.cpp:204
+#: ../src/richtext/richtextliststylepage.cpp:390

 msgid "Left (&first line):"
 msgstr "左(第一行)(&F):"
 
 msgid "Left (&first line):"
 msgstr "左(第一行)(&F):"
 

-#: ../src/generic/prntdlgg.cpp:886
+#: ../src/generic/prntdlgg.cpp:880

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

-#: ../src/richtext/richtextindentspage.cpp:154
-#: ../src/richtext/richtextindentspage.cpp:156
-#: ../src/richtext/richtextliststylepage.cpp:331
-#: ../src/richtext/richtextliststylepage.cpp:333
+#: ../src/richtext/richtextindentspage.cpp:141
+#: ../src/richtext/richtextindentspage.cpp:143
+#: ../src/richtext/richtextliststylepage.cpp:330
+#: ../src/richtext/richtextliststylepage.cpp:332

 msgid "Left-align text."
 msgstr "文字左对齐。"
 
 msgid "Left-align text."
 msgstr "文字左对齐。"
 

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

 msgid "Legal Extra 9 1/2 x 15 in"
 msgstr "特大法律纸张, 9 1/2 x 15 英寸"
 
 msgid "Legal Extra 9 1/2 x 15 in"
 msgstr "特大法律纸张, 9 1/2 x 15 英寸"
 

-#: ../src/common/paper.cpp:98
+#: ../src/common/paper.cpp:97

 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 

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

 msgid "Letter Extra 9 1/2 x 12 in"
 msgstr "特大信纸, 9 1/2 x 12 英寸"
 
 msgid "Letter Extra 9 1/2 x 12 in"
 msgstr "特大信纸, 9 1/2 x 12 英寸"
 

-#: ../src/common/paper.cpp:151
+#: ../src/common/paper.cpp:150

 msgid "Letter Extra Transverse 9.275 x 12 in"
 msgstr "特大信纸(横排), 9.275 x 12 英寸"
 
 msgid "Letter Extra Transverse 9.275 x 12 in"
 msgstr "特大信纸(横排), 9.275 x 12 英寸"
 

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

 msgid "Letter Plus 8 1/2 x 12.69 in"
 msgstr "加大信纸, 8 1/2 x 12.69 英寸"
 
 msgid "Letter Plus 8 1/2 x 12.69 in"
 msgstr "加大信纸, 8 1/2 x 12.69 英寸"
 

-#: ../src/common/paper.cpp:171
+#: ../src/common/paper.cpp:170

 msgid "Letter Rotated 11 x 8 1/2 in"
 msgstr "横向信纸, 11 x 8 1/2 英寸"
 
 msgid "Letter Rotated 11 x 8 1/2 in"
 msgstr "横向信纸, 11 x 8 1/2 英寸"
 

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

 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "信纸(小), 8 1/2 x 11 英寸"
 

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

 msgid "Letter Transverse 8 1/2 x 11 in"
 msgstr "信纸(横排), 8 1/2 x 11 英寸"
 
 msgid "Letter Transverse 8 1/2 x 11 in"
 msgstr "信纸(横排), 8 1/2 x 11 英寸"
 

-#: ../src/common/paper.cpp:97
+#: ../src/common/paper.cpp:96

 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信纸, 8 1/2 x 11 英寸"
 

-#: ../src/generic/aboutdlgg.cpp:174
+#: ../src/generic/aboutdlgg.cpp:173

 msgid "License"
 msgstr "授权"
 
 msgid "License"
 msgstr "授权"
 

-#: ../src/generic/fontdlgg.cpp:333
+#: ../src/generic/fontdlgg.cpp:332

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

-#: ../src/generic/helpext.cpp:299
+#: ../src/generic/helpext.cpp:298

 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
 msgstr "行 %lu 的map文件 \"%s\" 有无效语法，跳过。"
 
 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
 msgstr "行 %lu 的map文件 \"%s\" 有无效语法，跳过。"
 

-#: ../src/richtext/richtextliststylepage.cpp:445
+#: ../src/richtext/richtextliststylepage.cpp:444

 msgid "Line spacing:"
 msgstr "行距:"
 
 msgid "Line spacing:"
 msgstr "行距:"
 

-#: ../src/html/chm.cpp:841
+#: ../src/html/chm.cpp:838

 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//'，转换为绝对链接."
 
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//'，转换为绝对链接."
 

-#: ../src/richtext/richtextformatdlg.cpp:348
+#: ../src/richtext/richtextformatdlg.cpp:349

 msgid "List Style"
 msgstr "列表样式"
 
 msgid "List Style"
 msgstr "列表样式"
 

-#: ../src/richtext/richtextstyles.cpp:1044
+#: ../src/richtext/richtextstyles.cpp:1060

 msgid "List styles"
 msgstr "列表样式"
 
 msgid "List styles"
 msgstr "列表样式"
 

-#: ../src/richtext/richtextfontpage.cpp:204

 #: ../src/richtext/richtextfontpage.cpp:206
 #: ../src/richtext/richtextfontpage.cpp:206

+#: ../src/richtext/richtextfontpage.cpp:208

 msgid "Lists font sizes in points."
 msgstr "列表字体大小"
 
 msgid "Lists font sizes in points."
 msgstr "列表字体大小"
 

-#: ../src/richtext/richtextfontpage.cpp:197

 #: ../src/richtext/richtextfontpage.cpp:199
 #: ../src/richtext/richtextfontpage.cpp:199

+#: ../src/richtext/richtextfontpage.cpp:201

 msgid "Lists the available fonts."
 msgstr "列出可用字体。"
 
 msgid "Lists the available fonts."
 msgstr "列出可用字体。"
 

-#: ../src/common/fldlgcmn.cpp:326
+#: ../src/common/fldlgcmn.cpp:325

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

-#: ../src/html/htmlwin.cpp:571
+#: ../src/html/htmlwin.cpp:575

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

-#: ../src/unix/snglinst.cpp:247
+#: ../src/unix/snglinst.cpp:246

 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 msgstr "锁文件 '%s' 没有正确的所有者。"
 
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 msgstr "锁文件 '%s' 没有正确的所有者。"
 

-#: ../src/unix/snglinst.cpp:252
+#: ../src/unix/snglinst.cpp:251

 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限。"
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限。"


@@ -4517,402 +4520,402 @@ msgstr "锁文件 '%s' 没有正确的权限。"
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'。"
 
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'。"
 

-#: ../src/richtext/richtextliststylepage.cpp:485
-#: ../src/richtext/richtextbulletspage.cpp:290
+#: ../src/richtext/richtextliststylepage.cpp:484
+#: ../src/richtext/richtextbulletspage.cpp:289

 msgid "Lower case letters"
 msgstr "小写字母"
 
 msgid "Lower case letters"
 msgstr "小写字母"
 

-#: ../src/richtext/richtextliststylepage.cpp:487
-#: ../src/richtext/richtextbulletspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:486
+#: ../src/richtext/richtextbulletspage.cpp:291

 msgid "Lower case roman numerals"
 msgstr "小写罗马数字"
 
 msgid "Lower case roman numerals"
 msgstr "小写罗马数字"
 

-#: ../src/gtk/mdi.cpp:423 ../src/gtk1/mdi.cpp:432
+#: ../src/gtk/mdi.cpp:422 ../src/gtk1/mdi.cpp:431

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

-#: ../src/common/accelcmn.cpp:69
+#: ../src/common/accelcmn.cpp:68

 msgid "MENU"
 msgstr "MENU"
 
 msgid "MENU"
 msgstr "MENU"
 

-#: ../src/msw/helpchm.cpp:57
+#: ../src/msw/helpchm.cpp:56

 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:3755
+#: ../src/univ/themes/win32.cpp:3754

 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 

-#: ../src/common/fmapbase.cpp:204
+#: ../src/common/fmapbase.cpp:203

 msgid "MacArabic"
 msgstr "MacArabic"
 
 msgid "MacArabic"
 msgstr "MacArabic"
 

-#: ../src/common/fmapbase.cpp:223
+#: ../src/common/fmapbase.cpp:222

 msgid "MacArmenian"
 msgstr "MacArmenian"
 
 msgid "MacArmenian"
 msgstr "MacArmenian"
 

-#: ../src/common/fmapbase.cpp:212
+#: ../src/common/fmapbase.cpp:211

 msgid "MacBengali"
 msgstr "MacBengali"
 
 msgid "MacBengali"
 msgstr "MacBengali"
 

-#: ../src/common/fmapbase.cpp:218
+#: ../src/common/fmapbase.cpp:217

 msgid "MacBurmese"
 msgstr "MacBurmese"
 
 msgid "MacBurmese"
 msgstr "MacBurmese"
 

-#: ../src/common/fmapbase.cpp:237
+#: ../src/common/fmapbase.cpp:236

 msgid "MacCeltic"
 msgstr "MacCeltic"
 
 msgid "MacCeltic"
 msgstr "MacCeltic"
 

-#: ../src/common/fmapbase.cpp:228
+#: ../src/common/fmapbase.cpp:227

 msgid "MacCentralEurRoman"
 msgstr "MacCentralEurRoman"
 
 msgid "MacCentralEurRoman"
 msgstr "MacCentralEurRoman"
 

-#: ../src/common/fmapbase.cpp:224
+#: ../src/common/fmapbase.cpp:223

 msgid "MacChineseSimp"
 msgstr "MacChineseSimp"
 
 msgid "MacChineseSimp"
 msgstr "MacChineseSimp"
 

-#: ../src/common/fmapbase.cpp:202
+#: ../src/common/fmapbase.cpp:201

 msgid "MacChineseTrad"
 msgstr "MacChineseTrad"
 
 msgid "MacChineseTrad"
 msgstr "MacChineseTrad"
 

-#: ../src/common/fmapbase.cpp:234
+#: ../src/common/fmapbase.cpp:233

 msgid "MacCroatian"
 msgstr "MacCroatian"
 
 msgid "MacCroatian"
 msgstr "MacCroatian"
 

-#: ../src/common/fmapbase.cpp:207
+#: ../src/common/fmapbase.cpp:206

 msgid "MacCyrillic"
 msgstr "MacCyrillic"
 
 msgid "MacCyrillic"
 msgstr "MacCyrillic"
 

-#: ../src/common/fmapbase.cpp:208
+#: ../src/common/fmapbase.cpp:207

 msgid "MacDevanagari"
 msgstr "MacDevanagari"
 
 msgid "MacDevanagari"
 msgstr "MacDevanagari"
 

-#: ../src/common/fmapbase.cpp:232
+#: ../src/common/fmapbase.cpp:231

 msgid "MacDingbats"
 msgstr "MacDingbats"
 
 msgid "MacDingbats"
 msgstr "MacDingbats"
 

-#: ../src/common/fmapbase.cpp:227
+#: ../src/common/fmapbase.cpp:226

 msgid "MacEthiopic"
 msgstr "MacEthiopic"
 
 msgid "MacEthiopic"
 msgstr "MacEthiopic"
 

-#: ../src/common/fmapbase.cpp:230
+#: ../src/common/fmapbase.cpp:229

 msgid "MacExtArabic"
 msgstr "MacExtArabic"
 
 msgid "MacExtArabic"
 msgstr "MacExtArabic"
 

-#: ../src/common/fmapbase.cpp:238
+#: ../src/common/fmapbase.cpp:237

 msgid "MacGaelic"
 msgstr "MacGaelic"
 
 msgid "MacGaelic"
 msgstr "MacGaelic"
 

-#: ../src/common/fmapbase.cpp:222
+#: ../src/common/fmapbase.cpp:221

 msgid "MacGeorgian"
 msgstr "MacGeorgian"
 
 msgid "MacGeorgian"
 msgstr "MacGeorgian"
 

-#: ../src/common/fmapbase.cpp:206
+#: ../src/common/fmapbase.cpp:205

 msgid "MacGreek"
 msgstr "MacGreek"
 
 msgid "MacGreek"
 msgstr "MacGreek"
 

-#: ../src/common/fmapbase.cpp:210
+#: ../src/common/fmapbase.cpp:209

 msgid "MacGujarati"
 msgstr "MacGujarati"
 
 msgid "MacGujarati"
 msgstr "MacGujarati"
 

-#: ../src/common/fmapbase.cpp:209
+#: ../src/common/fmapbase.cpp:208

 msgid "MacGurmukhi"
 msgstr "MacGurmukhi"
 
 msgid "MacGurmukhi"
 msgstr "MacGurmukhi"
 

-#: ../src/common/fmapbase.cpp:205
+#: ../src/common/fmapbase.cpp:204

 msgid "MacHebrew"
 msgstr "MacHebrew"
 
 msgid "MacHebrew"
 msgstr "MacHebrew"
 

-#: ../src/common/fmapbase.cpp:235
+#: ../src/common/fmapbase.cpp:234

 msgid "MacIcelandic"
 msgstr "MacIcelandic"
 
 msgid "MacIcelandic"
 msgstr "MacIcelandic"
 

-#: ../src/common/fmapbase.cpp:201
+#: ../src/common/fmapbase.cpp:200

 msgid "MacJapanese"
 msgstr "MacJapanese"
 
 msgid "MacJapanese"
 msgstr "MacJapanese"
 

-#: ../src/common/fmapbase.cpp:215
+#: ../src/common/fmapbase.cpp:214

 msgid "MacKannada"
 msgstr "MacKannada"
 
 msgid "MacKannada"
 msgstr "MacKannada"
 

-#: ../src/common/fmapbase.cpp:239
+#: ../src/common/fmapbase.cpp:238

 msgid "MacKeyboardGlyphs"
 msgstr "MacKeyboardGlyphs"
 
 msgid "MacKeyboardGlyphs"
 msgstr "MacKeyboardGlyphs"
 

-#: ../src/common/fmapbase.cpp:219
+#: ../src/common/fmapbase.cpp:218

 msgid "MacKhmer"
 msgstr "MacKhmer"
 
 msgid "MacKhmer"
 msgstr "MacKhmer"
 

-#: ../src/common/fmapbase.cpp:203
+#: ../src/common/fmapbase.cpp:202

 msgid "MacKorean"
 msgstr "MacKorean"
 
 msgid "MacKorean"
 msgstr "MacKorean"
 

-#: ../src/common/fmapbase.cpp:221
+#: ../src/common/fmapbase.cpp:220

 msgid "MacLaotian"
 msgstr "MacLaotian"
 
 msgid "MacLaotian"
 msgstr "MacLaotian"
 

-#: ../src/common/fmapbase.cpp:216
+#: ../src/common/fmapbase.cpp:215

 msgid "MacMalayalam"
 msgstr "MacMalayalam"
 
 msgid "MacMalayalam"
 msgstr "MacMalayalam"
 

-#: ../src/common/fmapbase.cpp:226
+#: ../src/common/fmapbase.cpp:225

 msgid "MacMongolian"
 msgstr "MacMongolian"
 
 msgid "MacMongolian"
 msgstr "MacMongolian"
 

-#: ../src/common/fmapbase.cpp:211
+#: ../src/common/fmapbase.cpp:210

 msgid "MacOriya"
 msgstr "MacOriya"
 
 msgid "MacOriya"
 msgstr "MacOriya"
 

-#: ../src/common/fmapbase.cpp:200
+#: ../src/common/fmapbase.cpp:199

 msgid "MacRoman"
 msgstr "MacRoman"
 
 msgid "MacRoman"
 msgstr "MacRoman"
 

-#: ../src/common/fmapbase.cpp:236
+#: ../src/common/fmapbase.cpp:235

 msgid "MacRomanian"
 msgstr "MacRomanian"
 
 msgid "MacRomanian"
 msgstr "MacRomanian"
 

-#: ../src/common/fmapbase.cpp:217
+#: ../src/common/fmapbase.cpp:216

 msgid "MacSinhalese"
 msgstr "MacSinhalese"
 
 msgid "MacSinhalese"
 msgstr "MacSinhalese"
 

-#: ../src/common/fmapbase.cpp:231
+#: ../src/common/fmapbase.cpp:230

 msgid "MacSymbol"
 msgstr "MacSymbol"
 
 msgid "MacSymbol"
 msgstr "MacSymbol"
 

-#: ../src/common/fmapbase.cpp:213
+#: ../src/common/fmapbase.cpp:212

 msgid "MacTamil"
 msgstr "MacTamil"
 
 msgid "MacTamil"
 msgstr "MacTamil"
 

-#: ../src/common/fmapbase.cpp:214
+#: ../src/common/fmapbase.cpp:213

 msgid "MacTelugu"
 msgstr "MacTelugu"
 
 msgid "MacTelugu"
 msgstr "MacTelugu"
 

-#: ../src/common/fmapbase.cpp:220
+#: ../src/common/fmapbase.cpp:219

 msgid "MacThai"
 msgstr "MacThai"
 
 msgid "MacThai"
 msgstr "MacThai"
 

-#: ../src/common/fmapbase.cpp:225
+#: ../src/common/fmapbase.cpp:224

 msgid "MacTibetan"
 msgstr "MacTibetan"
 
 msgid "MacTibetan"
 msgstr "MacTibetan"
 

-#: ../src/common/fmapbase.cpp:233
+#: ../src/common/fmapbase.cpp:232

 msgid "MacTurkish"
 msgstr "MacTurkish"
 
 msgid "MacTurkish"
 msgstr "MacTurkish"
 

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

 msgid "MacVietnamese"
 msgstr "MacVietnamese"
 
 msgid "MacVietnamese"
 msgstr "MacVietnamese"
 

-#: ../src/propgrid/advprops.cpp:2025
-#, fuzzy
+#: ../src/propgrid/advprops.cpp:2031

 msgid "Make a selection:"
 msgid "Make a selection:"

-msgstr "选段"
+msgstr "请选择:"

 
 

-#: ../src/richtext/richtextformatdlg.cpp:361
+#: ../src/richtext/richtextformatdlg.cpp:362

 #: ../src/richtext/richtextmarginspage.cpp:172
 msgid "Margins"
 msgstr "边距"
 
 #: ../src/richtext/richtextmarginspage.cpp:172
 msgid "Margins"
 msgstr "边距"
 

-#: ../src/generic/fdrepdlg.cpp:148
+#: ../src/generic/fdrepdlg.cpp:147

 msgid "Match case"
 msgstr "区分大小写"
 
 msgid "Match case"
 msgstr "区分大小写"
 

-#: ../src/richtext/richtextsizepage.cpp:425
+#: ../src/richtext/richtextsizepage.cpp:463

 msgid "Max height:"
 msgstr "最达高度:"
 
 msgid "Max height:"
 msgstr "最达高度:"
 

-#: ../src/richtext/richtextsizepage.cpp:398
+#: ../src/richtext/richtextsizepage.cpp:436

 msgid "Max width:"
 msgstr "最大宽度:"
 
 msgid "Max width:"
 msgstr "最大宽度:"
 

-#: ../src/unix/mediactrl.cpp:1007
+#: ../src/unix/mediactrl.cpp:1006

 #, c-format
 msgid "Media playback error: %s"
 msgstr "媒体回放错误：%s"
 
 #, c-format
 msgid "Media playback error: %s"
 msgstr "媒体回放错误：%s"
 

-#: ../src/common/fs_mem.cpp:176
+#: ../src/common/fs_mem.cpp:175

 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'！"
 
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'！"
 

-#: ../src/msw/frame.cpp:354
+#: ../src/msw/frame.cpp:347

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

-#: ../src/common/msgout.cpp:125
+#: ../src/common/msgout.cpp:124

 msgid "Message"
 msgstr "消息"
 
 msgid "Message"
 msgstr "消息"
 

-#: ../src/univ/themes/metal.cpp:169
+#: ../src/univ/themes/metal.cpp:168

 msgid "Metal theme"
 msgstr "金属主题"
 
 msgid "Metal theme"
 msgstr "金属主题"
 

-#: ../src/msw/ole/automtn.cpp:636
+#: ../src/msw/ole/automtn.cpp:641

 msgid "Method or property not found."
 msgstr "找不到方法或属性。"
 
 msgid "Method or property not found."
 msgstr "找不到方法或属性。"
 

-#: ../src/univ/themes/win32.cpp:3753
+#: ../src/univ/themes/win32.cpp:3752

 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 

-#: ../src/richtext/richtextsizepage.cpp:371
+#: ../src/richtext/richtextsizepage.cpp:409

 msgid "Min height:"
 msgstr "最小高度:"
 
 msgid "Min height:"
 msgstr "最小高度:"
 

-#: ../src/richtext/richtextsizepage.cpp:344
+#: ../src/richtext/richtextsizepage.cpp:382

 msgid "Min width:"
 msgstr "最小宽度: "
 
 msgid "Min width:"
 msgstr "最小宽度: "
 

-#: ../src/msw/ole/automtn.cpp:652
+#: ../src/msw/ole/automtn.cpp:657

 msgid "Missing a required parameter."
 msgstr "缺少必要参数。"
 
 msgid "Missing a required parameter."
 msgstr "缺少必要参数。"
 

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

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

-#: ../src/generic/filectrlg.cpp:456
+#: ../src/generic/filectrlg.cpp:462

 msgid "Modified"
 msgstr "修改日期"
 
 msgid "Modified"
 msgstr "修改日期"
 

-#: ../src/common/module.cpp:134
+#: ../src/common/module.cpp:133

 #, c-format
 msgid "Module \"%s\" initialization failed"
 msgstr "模块 \"%s\" 初始化失败"
 
 #, c-format
 msgid "Module \"%s\" initialization failed"
 msgstr "模块 \"%s\" 初始化失败"
 

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

 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "7.75信封，3 7/8 x 7 1/2 英寸"
 
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "7.75信封，3 7/8 x 7 1/2 英寸"
 

-#: ../src/msw/fswatcher.cpp:144
+#: ../src/msw/fswatcher.cpp:143

 msgid "Monitoring individual files for changes is not supported currently."
 msgstr "当前不支持监视单独文件的更改。"
 
 msgid "Monitoring individual files for changes is not supported currently."
 msgstr "当前不支持监视单独文件的更改。"
 

-#: ../src/generic/editlbox.cpp:277
+#: ../src/generic/editlbox.cpp:276

 msgid "Move down"
 msgstr "下移"
 
 msgid "Move down"
 msgstr "下移"
 

-#: ../src/generic/editlbox.cpp:276
+#: ../src/generic/editlbox.cpp:275

 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

-#: ../src/richtext/richtextsizepage.cpp:616
-#: ../src/richtext/richtextsizepage.cpp:618
+#: ../src/richtext/richtextsizepage.cpp:682
+#: ../src/richtext/richtextsizepage.cpp:684

 msgid "Moves the object to the next paragraph."
 msgstr "将对象移至下一段落"
 
 msgid "Moves the object to the next paragraph."
 msgstr "将对象移至下一段落"
 

-#: ../src/richtext/richtextsizepage.cpp:610
-#: ../src/richtext/richtextsizepage.cpp:612
+#: ../src/richtext/richtextsizepage.cpp:676
+#: ../src/richtext/richtextsizepage.cpp:678

 msgid "Moves the object to the previous paragraph."
 msgstr "将对象移至前一段落"
 
 msgid "Moves the object to the previous paragraph."
 msgstr "将对象移至前一段落"
 

-#: ../src/richtext/richtextbuffer.cpp:8841
+#: ../src/richtext/richtextbuffer.cpp:9345

 msgid "Multiple Cell Properties"
 msgstr "多重单元属性"
 
 msgid "Multiple Cell Properties"
 msgstr "多重单元属性"
 

-#: ../src/common/accelcmn.cpp:82
+#: ../src/common/accelcmn.cpp:81

 msgid "NUM_LOCK"
 msgstr "NUM_LOCK"
 
 msgid "NUM_LOCK"
 msgstr "NUM_LOCK"
 

-#: ../src/generic/filectrlg.cpp:453
+#: ../src/generic/filectrlg.cpp:459

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

-#: ../src/common/stockitem.cpp:176
+#: ../src/common/stockitem.cpp:175

 msgid "Network"
 msgstr "网络"
 
 msgid "Network"
 msgstr "网络"
 

-#: ../src/common/stockitem.cpp:177
+#: ../src/common/stockitem.cpp:176

 msgid "New"
 msgstr "新建"
 
 msgid "New"
 msgstr "新建"
 

-#: ../src/richtext/richtextstyledlg.cpp:251
+#: ../src/richtext/richtextstyledlg.cpp:243

 msgid "New &Box Style..."
 msgstr "新方块样式(&B)"
 
 msgid "New &Box Style..."
 msgstr "新方块样式(&B)"
 

-#: ../src/richtext/richtextstyledlg.cpp:233
+#: ../src/richtext/richtextstyledlg.cpp:225

 msgid "New &Character Style..."
 msgstr "新增字体样式(&C)..."
 
 msgid "New &Character Style..."
 msgstr "新增字体样式(&C)..."
 

-#: ../src/richtext/richtextstyledlg.cpp:245
+#: ../src/richtext/richtextstyledlg.cpp:237

 msgid "New &List Style..."
 msgstr "新增列表样式(&L)..."
 
 msgid "New &List Style..."
 msgstr "新增列表样式(&L)..."
 

-#: ../src/richtext/richtextstyledlg.cpp:239
+#: ../src/richtext/richtextstyledlg.cpp:231

 msgid "New &Paragraph Style..."
 msgstr "新增段落样式(&P)..."
 
 msgid "New &Paragraph Style..."
 msgstr "新增段落样式(&P)..."
 

-#: ../src/richtext/richtextstyledlg.cpp:611
-#: ../src/richtext/richtextstyledlg.cpp:616
-#: ../src/richtext/richtextstyledlg.cpp:659
-#: ../src/richtext/richtextstyledlg.cpp:664
-#: ../src/richtext/richtextstyledlg.cpp:825
-#: ../src/richtext/richtextstyledlg.cpp:830
+#: ../src/richtext/richtextstyledlg.cpp:603
+#: ../src/richtext/richtextstyledlg.cpp:608
+#: ../src/richtext/richtextstyledlg.cpp:651
+#: ../src/richtext/richtextstyledlg.cpp:656
+#: ../src/richtext/richtextstyledlg.cpp:817
+#: ../src/richtext/richtextstyledlg.cpp:822
+#: ../src/richtext/richtextstyledlg.cpp:890

 #: ../src/richtext/richtextstyledlg.cpp:898
 #: ../src/richtext/richtextstyledlg.cpp:898

-#: ../src/richtext/richtextstyledlg.cpp:906
-#: ../src/richtext/richtextstyledlg.cpp:939
-#: ../src/richtext/richtextstyledlg.cpp:944
+#: ../src/richtext/richtextstyledlg.cpp:931
+#: ../src/richtext/richtextstyledlg.cpp:936

 msgid "New Style"
 msgstr "新增样式"
 
 msgid "New Style"
 msgstr "新增样式"
 

-#: ../src/generic/dirdlgg.cpp:103
+#: ../src/generic/dirdlgg.cpp:102

 msgid "New directory"
 msgstr "新目录"
 
 msgid "New directory"
 msgstr "新目录"
 

-#: ../src/generic/editlbox.cpp:274
+#: ../src/generic/editlbox.cpp:273

 msgid "New item"
 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:326 ../src/generic/dirdlgg.cpp:336
+#: ../src/generic/filectrlg.cpp:653 ../src/generic/filectrlg.cpp:662

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

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

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

-#: ../src/common/prntbase.cpp:1538 ../src/html/helpwnd.cpp:679
+#: ../src/common/prntbase.cpp:1537 ../src/html/helpwnd.cpp:678

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

-#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194
+#: ../include/wx/msgdlg.h:272 ../src/common/stockitem.cpp:177
+#: ../src/motif/msgdlg.cpp:196

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

-#: ../src/generic/animateg.cpp:151
+#: ../src/generic/animateg.cpp:150

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

-#: ../src/dfb/bitmap.cpp:643 ../src/dfb/bitmap.cpp:677
+#: ../src/dfb/bitmap.cpp:642 ../src/dfb/bitmap.cpp:676

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

-#: ../src/osx/carbon/dataview.cpp:1785
+#: ../src/osx/carbon/dataview.cpp:1784

 msgid "No column existing."
 msgstr "没有任何列存在。"
 
 msgid "No column existing."
 msgstr "没有任何列存在。"
 

-#: ../src/osx/carbon/dataview.cpp:1675
+#: ../src/osx/carbon/dataview.cpp:1674

 msgid "No column for the specified column existing."
 msgstr "没有指定的列存在。"
 
 msgid "No column for the specified column existing."
 msgstr "没有指定的列存在。"
 

-#: ../src/osx/carbon/dataview.cpp:1424
+#: ../src/osx/carbon/dataview.cpp:1423

 msgid "No column for the specified column position existing."
 msgstr "没有指定的列位置存在。"
 
 msgid "No column for the specified column position existing."
 msgstr "没有指定的列位置存在。"
 

-#: ../src/common/utilscmn.cpp:1051
+#: ../src/common/utilscmn.cpp:1049

 msgid "No default application configured for HTML files."
 msgstr "没有设定HTML文件的默认应用。"
 
 msgid "No default application configured for HTML files."
 msgstr "没有设定HTML文件的默认应用。"
 

-#: ../src/generic/helpext.cpp:450
+#: ../src/generic/helpext.cpp:449

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

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

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


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

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

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


@@ -4935,116 +4938,115 @@ msgstr ""
 "请选择用于该编码的字体\n"
 "(否则该编码的文本将无法正确显示)?"
 
 "请选择用于该编码的字体\n"
 "(否则该编码的文本将无法正确显示)?"
 

-#: ../src/generic/animateg.cpp:143
-#, fuzzy
+#: ../src/generic/animateg.cpp:142

 msgid "No handler found for animation type."
 msgid "No handler found for animation type."

-msgstr "没æ\9c\89æ\89¾å\88°å\9b¾å\83\8fç±»å\9e\8bå¤\84ç\90\86å\99¨."
+msgstr "没æ\9c\89æ\89¾å\88°å\8a¨ç\94»ç±»å\9e\8bå¤\84ç\90\86å\99¨ã\80\82"

 
 

-#: ../src/common/image.cpp:2484
+#: ../src/common/image.cpp:2591

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

-#: ../src/common/image.cpp:2492 ../src/common/image.cpp:2603
-#: ../src/common/image.cpp:2656
+#: ../src/common/image.cpp:2599 ../src/common/image.cpp:2710
+#: ../src/common/image.cpp:2763

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

-#: ../src/common/image.cpp:2626 ../src/common/image.cpp:2670
+#: ../src/common/image.cpp:2733 ../src/common/image.cpp:2777

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

-#: ../src/html/helpwnd.cpp:872
+#: ../src/html/helpwnd.cpp:871

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

-#: ../src/osx/carbon/dataview.cpp:1677 ../src/osx/carbon/dataview.cpp:1787
+#: ../src/osx/carbon/dataview.cpp:1676 ../src/osx/carbon/dataview.cpp:1786

 msgid "No renderer or invalid renderer type specified for custom data column."
 msgstr "无渲染器或为该数据列指定了无效的渲染器"
 
 msgid "No renderer or invalid renderer type specified for custom data column."
 msgstr "无渲染器或为该数据列指定了无效的渲染器"
 

-#: ../src/osx/carbon/dataview.cpp:1425
+#: ../src/osx/carbon/dataview.cpp:1424

 msgid "No renderer specified for column."
 msgstr "该列未指定渲染器"
 
 msgid "No renderer specified for column."
 msgstr "该列未指定渲染器"
 

-#: ../src/unix/sound.cpp:82
+#: ../src/unix/sound.cpp:81

 msgid "No sound"
 msgstr "没有声音"
 
 msgid "No sound"
 msgstr "没有声音"
 

-#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103
+#: ../src/common/image.cpp:2166 ../src/common/image.cpp:2207

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

-#: ../src/common/image.cpp:3133
+#: ../src/common/image.cpp:3236

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

-#: ../src/generic/helpext.cpp:307
+#: ../src/generic/helpext.cpp:306

 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
 msgstr "文件 \"%s\" 中无效映射"
 
 #: ../src/richtext/richtextborderspage.cpp:542
 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
 msgstr "文件 \"%s\" 中无效映射"
 
 #: ../src/richtext/richtextborderspage.cpp:542

-#: ../src/richtext/richtextsizepage.cpp:226
-#: ../src/richtext/richtextsizepage.cpp:229
-#: ../src/richtext/richtextsizepage.cpp:230
+#: ../src/richtext/richtextsizepage.cpp:248
+#: ../src/richtext/richtextsizepage.cpp:252

 msgid "None"
 msgstr "无"
 
 msgid "None"
 msgstr "无"
 

-#: ../src/common/fmapbase.cpp:158
+#: ../src/common/fmapbase.cpp:157

 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 

-#: ../src/generic/fontdlgg.cpp:329 ../src/generic/fontdlgg.cpp:332
+#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:331

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

-#: ../src/html/helpwnd.cpp:1277
+#: ../src/html/helpwnd.cpp:1276

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

-#: ../src/html/helpwnd.cpp:1219
+#: ../src/html/helpwnd.cpp:1218

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

-#: ../src/propgrid/props.cpp:888
-#, fuzzy, c-format
+#: ../src/propgrid/props.cpp:887
+#, c-format

 msgid "Not %s"
 msgid "Not %s"

-msgstr "关于(&A)"
+msgstr "非 %s"

 
 

-#: ../include/wx/filename.h:558 ../include/wx/filename.h:563
+#: ../include/wx/filename.h:586 ../include/wx/filename.h:591

 msgid "Not available"
 msgstr "不可用"
 
 msgid "Not available"
 msgstr "不可用"
 

-#: ../src/richtext/richtextfontpage.cpp:331
+#: ../src/richtext/richtextfontpage.cpp:340

 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"
 
 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"
 

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

 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
 msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 

-#: ../src/generic/notifmsgg.cpp:105
+#: ../src/generic/notifmsgg.cpp:104

 msgid "Notice"
 msgstr "注意"
 
 msgid "Notice"
 msgstr "注意"
 

-#: ../src/osx/carbon/dataview.cpp:903
+#: ../src/osx/carbon/dataview.cpp:902

 msgid "Number of columns could not be determined."
 msgstr "无法确定列数量。"
 
 msgid "Number of columns could not be determined."
 msgstr "无法确定列数量。"
 

-#: ../src/richtext/richtextliststylepage.cpp:488
-#: ../src/richtext/richtextbulletspage.cpp:293
+#: ../src/richtext/richtextliststylepage.cpp:487
+#: ../src/richtext/richtextbulletspage.cpp:292

 msgid "Numbered outline"
 msgstr "大纲标号"
 
 msgid "Numbered outline"
 msgstr "大纲标号"
 

-#: ../src/richtext/richtextstyledlg.cpp:305 ../src/common/stockitem.cpp:179
-#: ../src/msw/msgdlg.cpp:489 ../src/msw/msgdlg.cpp:777
-#: ../src/msw/dialog.cpp:120 ../src/gtk1/fontdlg.cpp:139
+#: ../include/wx/msgdlg.h:273 ../src/richtext/richtextstyledlg.cpp:297
+#: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:489
+#: ../src/msw/msgdlg.cpp:799 ../src/msw/dialog.cpp:120
+#: ../src/gtk1/fontdlg.cpp:138

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

-#: ../src/msw/ole/automtn.cpp:676
+#: ../src/msw/ole/automtn.cpp:681

 #, c-format
 msgid "OLE Automation error in %s: %s"
 msgstr "OLE自动化错误%s: %s"
 #, c-format
 msgid "OLE Automation error in %s: %s"
 msgstr "OLE自动化错误%s: %s"


@@ -5053,65 +5055,65 @@ msgstr "OLE自动化错误%s: %s"
 msgid "Object Properties"
 msgstr "对象属性"
 
 msgid "Object Properties"
 msgstr "对象属性"
 

-#: ../src/msw/ole/automtn.cpp:644
+#: ../src/msw/ole/automtn.cpp:649

 msgid "Object implementation does not support named arguments."
 msgstr "对象实现不支持命名参数"
 
 msgid "Object implementation does not support named arguments."
 msgstr "对象实现不支持命名参数"
 

-#: ../src/common/xtixml.cpp:265
+#: ../src/common/xtixml.cpp:264

 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 

-#: ../src/common/docview.cpp:1746 ../src/common/docview.cpp:1788
+#: ../src/common/docview.cpp:1755 ../src/common/docview.cpp:1797

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

-#: ../src/html/helpwnd.cpp:685 ../src/html/helpwnd.cpp:1558
+#: ../src/html/helpwnd.cpp:684 ../src/html/helpwnd.cpp:1557

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

-#: ../src/generic/dbgrptg.cpp:160
+#: ../src/generic/dbgrptg.cpp:163

 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 
 #, c-format
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 

-#: ../src/common/stockitem.cpp:180
+#: ../src/common/stockitem.cpp:179

 msgid "Open..."
 msgstr "打开..."
 
 msgid "Open..."
 msgstr "打开..."
 

-#: ../src/osx/carbon/glcanvas.cpp:49
+#: ../src/osx/carbon/glcanvas.cpp:48

 #, c-format
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr "OpenGL函数 \"%s\"失败： %s (error %d)"
 
 #, c-format
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr "OpenGL函数 \"%s\"失败： %s (error %d)"
 

-#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
-#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:815
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/dirdlgg.cpp:352
+#: ../src/generic/filectrlg.cpp:677 ../src/generic/filectrlg.cpp:821

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

-#: ../src/common/cmdline.cpp:728
+#: ../src/common/cmdline.cpp:735

 #, fuzzy, c-format
 msgid "Option '%s' can't be negated"
 msgstr "目录'%s'不能被创建"
 
 #, fuzzy, c-format
 msgid "Option '%s' can't be negated"
 msgstr "目录'%s'不能被创建"
 

-#: ../src/common/cmdline.cpp:892
+#: ../src/common/cmdline.cpp:899

 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "选项 '%s' 需要值。"
 
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "选项 '%s' 需要值。"
 

-#: ../src/common/cmdline.cpp:975
+#: ../src/common/cmdline.cpp:982

 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 无法转成日期。"
 
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 无法转成日期。"
 

-#: ../src/generic/dirdlgg.cpp:188 ../src/generic/prntdlgg.cpp:624
+#: ../src/generic/dirdlgg.cpp:187 ../src/generic/prntdlgg.cpp:618

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

-#: ../src/generic/prntdlgg.cpp:621 ../src/generic/prntdlgg.cpp:875
+#: ../src/generic/prntdlgg.cpp:615 ../src/generic/prntdlgg.cpp:869

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

-#: ../src/common/windowid.cpp:260
+#: ../src/common/windowid.cpp:259

 msgid "Out of window IDs.  Recommend shutting down application."
 msgstr "window ID已用完。建议关闭应用。"
 
 msgid "Out of window IDs.  Recommend shutting down application."
 msgstr "window ID已用完。建议关闭应用。"
 


@@ -5124,172 +5126,172 @@ msgstr ""
 msgid "Outset"
 msgstr ""
 
 msgid "Outset"
 msgstr ""
 

-#: ../src/msw/ole/automtn.cpp:640
+#: ../src/msw/ole/automtn.cpp:645

 msgid "Overflow while coercing argument values."
 msgstr "强制修改参数值溢出"
 
 msgid "Overflow while coercing argument values."
 msgstr "强制修改参数值溢出"
 

-#: ../src/common/accelcmn.cpp:85
+#: ../src/common/accelcmn.cpp:84

 msgid "PAGEDOWN"
 msgstr "PAGEDOWN"
 
 msgid "PAGEDOWN"
 msgstr "PAGEDOWN"
 

-#: ../src/common/accelcmn.cpp:84
+#: ../src/common/accelcmn.cpp:83

 msgid "PAGEUP"
 msgstr "PAGEUP"
 
 msgid "PAGEUP"
 msgstr "PAGEUP"
 

-#: ../src/common/accelcmn.cpp:70
+#: ../src/common/accelcmn.cpp:69

 msgid "PAUSE"
 msgstr "PAUSE"
 
 msgid "PAUSE"
 msgstr "PAUSE"
 

-#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481
+#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:480

 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 无法分配内存"
 
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 无法分配内存"
 

-#: ../src/common/imagpcx.cpp:457
+#: ../src/common/imagpcx.cpp:456

 msgid "PCX: image format unsupported"
 msgstr "PCX: 图像格式不支持"
 
 msgid "PCX: image format unsupported"
 msgstr "PCX: 图像格式不支持"
 

-#: ../src/common/imagpcx.cpp:480
+#: ../src/common/imagpcx.cpp:479

 msgid "PCX: invalid image"
 msgstr "PCX: 无效图像"
 
 msgid "PCX: invalid image"
 msgstr "PCX: 无效图像"
 

-#: ../src/common/imagpcx.cpp:443
+#: ../src/common/imagpcx.cpp:442

 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是PCX文件。"
 
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是PCX文件。"
 

-#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:482
+#: ../src/common/imagpcx.cpp:459 ../src/common/imagpcx.cpp:481

 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误！！！"
 
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误！！！"
 

-#: ../src/common/imagpcx.cpp:459
+#: ../src/common/imagpcx.cpp:458

 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 

-#: ../src/common/accelcmn.cpp:56
+#: ../src/common/accelcmn.cpp:55

 msgid "PGDN"
 msgstr "PGDN"
 
 msgid "PGDN"
 msgstr "PGDN"
 

-#: ../src/common/accelcmn.cpp:55
+#: ../src/common/accelcmn.cpp:54

 msgid "PGUP"
 msgstr "PGUP"
 
 msgid "PGUP"
 msgstr "PGUP"
 

-#: ../src/common/imagpnm.cpp:92
+#: ../src/common/imagpnm.cpp:91

 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 无法分配内存。"
 
 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 无法分配内存。"
 

-#: ../src/common/imagpnm.cpp:74
+#: ../src/common/imagpnm.cpp:73

 msgid "PNM: File format is not recognized."
 msgstr "PNM: 无法识别的文件格式。"
 
 msgid "PNM: File format is not recognized."
 msgstr "PNM: 无法识别的文件格式。"
 

-#: ../src/common/imagpnm.cpp:113 ../src/common/imagpnm.cpp:135
-#: ../src/common/imagpnm.cpp:157
+#: ../src/common/imagpnm.cpp:112 ../src/common/imagpnm.cpp:134
+#: ../src/common/imagpnm.cpp:156

 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断。"
 
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断。"
 

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

 msgid "PRC 16K 146 x 215 mm"
 msgstr "中国 16开 纸, 146 x 215 毫米"
 
 msgid "PRC 16K 146 x 215 mm"
 msgstr "中国 16开 纸, 146 x 215 毫米"
 

-#: ../src/common/paper.cpp:202
+#: ../src/common/paper.cpp:201

 msgid "PRC 16K Rotated"
 msgstr "中国 16开 纸张(横向)"
 
 msgid "PRC 16K Rotated"
 msgstr "中国 16开 纸张(横向)"
 

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

 msgid "PRC 32K 97 x 151 mm"
 msgstr "中国 32开 纸, 97 x 151 毫米"
 
 msgid "PRC 32K 97 x 151 mm"
 msgstr "中国 32开 纸, 97 x 151 毫米"
 

-#: ../src/common/paper.cpp:203
+#: ../src/common/paper.cpp:202

 msgid "PRC 32K Rotated"
 msgstr "中国 32开 纸张(横向)"
 
 msgid "PRC 32K Rotated"
 msgstr "中国 32开 纸张(横向)"
 

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

 msgid "PRC 32K(Big) 97 x 151 mm"
 msgstr "中国 32开(大) 纸, 97 x 151 毫米"
 
 msgid "PRC 32K(Big) 97 x 151 mm"
 msgstr "中国 32开(大) 纸, 97 x 151 毫米"
 

-#: ../src/common/paper.cpp:204
+#: ../src/common/paper.cpp:203

 msgid "PRC 32K(Big) Rotated"
 msgstr "中国 32开(大) 纸张(横向)"
 
 msgid "PRC 32K(Big) Rotated"
 msgstr "中国 32开(大) 纸张(横向)"
 

-#: ../src/common/paper.cpp:192
+#: ../src/common/paper.cpp:191

 msgid "PRC Envelope #1 102 x 165 mm"
 msgstr "中国标准信封1#, 102 x 165 毫米"
 
 msgid "PRC Envelope #1 102 x 165 mm"
 msgstr "中国标准信封1#, 102 x 165 毫米"
 

-#: ../src/common/paper.cpp:205
+#: ../src/common/paper.cpp:204

 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
 msgstr "中国标准信封1#(横向), 165 x 102 毫米"
 
 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
 msgstr "中国标准信封1#(横向), 165 x 102 毫米"
 

-#: ../src/common/paper.cpp:201
+#: ../src/common/paper.cpp:200

 msgid "PRC Envelope #10 324 x 458 mm"
 msgstr "中国标准信封10#, 324 x 458 毫米"
 
 msgid "PRC Envelope #10 324 x 458 mm"
 msgstr "中国标准信封10#, 324 x 458 毫米"
 

-#: ../src/common/paper.cpp:214
+#: ../src/common/paper.cpp:213

 msgid "PRC Envelope #10 Rotated 458 x 324 mm"
 msgstr "中国标准信封10#(横向), 458 x 324 毫米"
 
 msgid "PRC Envelope #10 Rotated 458 x 324 mm"
 msgstr "中国标准信封10#(横向), 458 x 324 毫米"
 

-#: ../src/common/paper.cpp:193
+#: ../src/common/paper.cpp:192

 msgid "PRC Envelope #2 102 x 176 mm"
 msgstr "中国标准信封2#, 102 x 176 毫米"
 
 msgid "PRC Envelope #2 102 x 176 mm"
 msgstr "中国标准信封2#, 102 x 176 毫米"
 

-#: ../src/common/paper.cpp:206
+#: ../src/common/paper.cpp:205

 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
 msgstr "中国标准信封2#(横向), 176 x 102 毫米"
 
 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
 msgstr "中国标准信封2#(横向), 176 x 102 毫米"
 

-#: ../src/common/paper.cpp:194
+#: ../src/common/paper.cpp:193

 msgid "PRC Envelope #3 125 x 176 mm"
 msgstr "中国标准信封3#, 125 x 176 毫米"
 
 msgid "PRC Envelope #3 125 x 176 mm"
 msgstr "中国标准信封3#, 125 x 176 毫米"
 

-#: ../src/common/paper.cpp:207
+#: ../src/common/paper.cpp:206

 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
 msgstr "中国标准信封3#(横向), 176 x 125 毫米"
 
 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
 msgstr "中国标准信封3#(横向), 176 x 125 毫米"
 

-#: ../src/common/paper.cpp:195
+#: ../src/common/paper.cpp:194

 msgid "PRC Envelope #4 110 x 208 mm"
 msgstr "中国标准信封4#, 110 x 208 毫米"
 
 msgid "PRC Envelope #4 110 x 208 mm"
 msgstr "中国标准信封4#, 110 x 208 毫米"
 

-#: ../src/common/paper.cpp:208
+#: ../src/common/paper.cpp:207

 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
 msgstr "中国标准信封4#(横向), 208 x 110 毫米"
 
 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
 msgstr "中国标准信封4#(横向), 208 x 110 毫米"
 

-#: ../src/common/paper.cpp:196
+#: ../src/common/paper.cpp:195

 msgid "PRC Envelope #5 110 x 220 mm"
 msgstr "中国标准信封5#, 110 x 220 毫米"
 
 msgid "PRC Envelope #5 110 x 220 mm"
 msgstr "中国标准信封5#, 110 x 220 毫米"
 

-#: ../src/common/paper.cpp:209
+#: ../src/common/paper.cpp:208

 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
 msgstr "中国标准信封5#(横向), 220 x 110 毫米"
 
 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
 msgstr "中国标准信封5#(横向), 220 x 110 毫米"
 

-#: ../src/common/paper.cpp:197
+#: ../src/common/paper.cpp:196

 msgid "PRC Envelope #6 120 x 230 mm"
 msgstr "中国标准信封6#, 120 x 230 毫米"
 
 msgid "PRC Envelope #6 120 x 230 mm"
 msgstr "中国标准信封6#, 120 x 230 毫米"
 

-#: ../src/common/paper.cpp:210
+#: ../src/common/paper.cpp:209

 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
 msgstr "中国标准信封6#(横向), 230 x 120 毫米"
 
 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
 msgstr "中国标准信封6#(横向), 230 x 120 毫米"
 

-#: ../src/common/paper.cpp:198
+#: ../src/common/paper.cpp:197

 msgid "PRC Envelope #7 160 x 230 mm"
 msgstr "中国标准信封7#, 160 x 230 毫米"
 
 msgid "PRC Envelope #7 160 x 230 mm"
 msgstr "中国标准信封7#, 160 x 230 毫米"
 

-#: ../src/common/paper.cpp:211
+#: ../src/common/paper.cpp:210

 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
 msgstr "中国标准信封7#(横向), 230 x 160 毫米"
 
 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
 msgstr "中国标准信封7#(横向), 230 x 160 毫米"
 

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

 msgid "PRC Envelope #8 120 x 309 mm"
 msgstr "中国标准信封8#, 120 x 309 毫米"
 
 msgid "PRC Envelope #8 120 x 309 mm"
 msgstr "中国标准信封8#, 120 x 309 毫米"
 

-#: ../src/common/paper.cpp:212
+#: ../src/common/paper.cpp:211

 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
 msgstr "中国标准信封8#(横向), 309 x 120 毫米"
 
 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
 msgstr "中国标准信封8#(横向), 309 x 120 毫米"
 

-#: ../src/common/paper.cpp:200
+#: ../src/common/paper.cpp:199

 msgid "PRC Envelope #9 229 x 324 mm"
 msgstr "中国标准信封9#, 229 x 324 毫米"
 
 msgid "PRC Envelope #9 229 x 324 mm"
 msgstr "中国标准信封9#, 229 x 324 毫米"
 

-#: ../src/common/paper.cpp:213
+#: ../src/common/paper.cpp:212

 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgstr "中国标准信封9#(横向), 324 x 229 毫米"
 
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgstr "中国标准信封9#(横向), 324 x 229 毫米"
 

-#: ../src/common/accelcmn.cpp:73
+#: ../src/common/accelcmn.cpp:72

 msgid "PRINT"
 msgstr "PRINT"
 
 msgid "PRINT"
 msgstr "PRINT"
 


@@ -5298,67 +5300,66 @@ msgstr "PRINT"
 msgid "Padding"
 msgstr "正在读入"
 
 msgid "Padding"
 msgstr "正在读入"
 

-#: ../src/common/prntbase.cpp:2045
+#: ../src/common/prntbase.cpp:2044

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

-#: ../src/common/prntbase.cpp:2043
+#: ../src/common/prntbase.cpp:2042

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

-#: ../src/gtk/print.cpp:779
+#: ../src/gtk/print.cpp:774

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

-#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:468
-#: ../src/gtk/gnome/gprint.cpp:708
+#: ../src/generic/prntdlgg.cpp:828 ../src/common/prntbase.cpp:467

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

-#: ../src/generic/prntdlgg.cpp:222
+#: ../src/generic/prntdlgg.cpp:216

 msgid "Pages"
 msgstr "页"
 
 msgid "Pages"
 msgstr "页"
 

-#: ../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
+#: ../src/generic/prntdlgg.cpp:602 ../src/generic/prntdlgg.cpp:801
+#: ../src/generic/prntdlgg.cpp:842 ../src/generic/prntdlgg.cpp:855
+#: ../src/generic/prntdlgg.cpp:1052 ../src/generic/prntdlgg.cpp:1057

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

-#: ../src/richtext/richtextstyles.cpp:1042
+#: ../src/richtext/richtextstyles.cpp:1058

 msgid "Paragraph styles"
 msgstr "段落样式"
 
 msgid "Paragraph styles"
 msgstr "段落样式"
 

-#: ../src/common/xtistrm.cpp:470
+#: ../src/common/xtistrm.cpp:469

 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 

-#: ../src/common/xtistrm.cpp:481
+#: ../src/common/xtistrm.cpp:480

 #, fuzzy
 msgid "Passing an unknown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
 #, fuzzy
 msgid "Passing an unknown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/richtext/richtextctrl.cpp:3082 ../src/common/stockitem.cpp:181
-#: ../src/stc/stc_i18n.cpp:20
+#: ../src/richtext/richtextctrl.cpp:3117 ../src/common/stockitem.cpp:180
+#: ../src/stc/stc_i18n.cpp:19

 msgid "Paste"
 msgstr "粘贴"
 
 msgid "Paste"
 msgstr "粘贴"
 

-#: ../src/common/stockitem.cpp:263
+#: ../src/common/stockitem.cpp:262

 msgid "Paste selection"
 msgstr "粘贴选区"
 
 msgid "Paste selection"
 msgstr "粘贴选区"
 

-#: ../src/richtext/richtextliststylepage.cpp:223
-#: ../src/richtext/richtextbulletspage.cpp:173
+#: ../src/richtext/richtextliststylepage.cpp:222
+#: ../src/richtext/richtextbulletspage.cpp:172

 msgid "Peri&od"
 msgstr ""
 
 msgid "Peri&od"
 msgstr ""
 

-#: ../src/generic/filectrlg.cpp:459
+#: ../src/generic/filectrlg.cpp:465

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

-#: ../src/richtext/richtextbuffer.cpp:10953
+#: ../src/richtext/richtextbuffer.cpp:11942

 msgid "Picture Properties"
 msgstr "图片属性"
 
 msgid "Picture Properties"
 msgstr "图片属性"
 


@@ -5366,7 +5367,7 @@ msgstr "图片属性"
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 

-#: ../src/gtk1/fontdlg.cpp:75
+#: ../src/gtk1/fontdlg.cpp:74

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


@@ -5374,15 +5375,15 @@ msgstr "请选择一个有效的字体."
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 

-#: ../src/html/helpwnd.cpp:814
+#: ../src/html/helpwnd.cpp:813

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

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

 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 
 msgid "Please choose which ISP do you want to connect to"
 msgstr "请选择你想连接的ISP"
 

-#: ../src/msw/listctrl.cpp:373
+#: ../src/msw/listctrl.cpp:372

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"


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

-#: ../src/common/headerctrlcmn.cpp:60
+#: ../src/common/headerctrlcmn.cpp:59

 msgid "Please select the columns to show and define their order:"
 msgstr "请选择列并显示和定义它们的顺序"
 
 msgid "Please select the columns to show and define their order:"
 msgstr "请选择列并显示和定义它们的顺序"
 

-#: ../src/common/prntbase.cpp:522
+#: ../src/common/prntbase.cpp:521

 msgid "Please wait while printing..."
 msgstr "打印，请等待..."
 
 msgid "Please wait while printing..."
 msgstr "打印，请等待..."
 

-#: ../src/propgrid/advprops.cpp:632
+#: ../src/propgrid/advprops.cpp:631

 msgid "Point Size"
 msgstr "字体大小(磅值)"
 
 msgid "Point Size"
 msgstr "字体大小(磅值)"
 

-#: ../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
+#: ../src/osx/carbon/dataview.cpp:1278 ../src/osx/carbon/dataview.cpp:1329
+#: ../src/osx/carbon/dataview.cpp:1420 ../src/osx/carbon/dataview.cpp:1443
+#: ../src/osx/carbon/dataview.cpp:1460 ../src/osx/carbon/dataview.cpp:1477
+#: ../src/osx/carbon/dataview.cpp:1670 ../src/osx/carbon/dataview.cpp:1779
+#: ../src/osx/carbon/dataview.cpp:1821 ../src/osx/carbon/dataview.cpp:1874
+#: ../src/osx/carbon/dataview.cpp:1997

 msgid "Pointer to data view control not set correctly."
 msgstr "数据视图控制指针设定错误"
 
 msgid "Pointer to data view control not set correctly."
 msgstr "数据视图控制指针设定错误"
 

-#: ../src/osx/carbon/dataview.cpp:1280 ../src/osx/carbon/dataview.cpp:1339
-#: ../src/osx/carbon/dataview.cpp:1422 ../src/osx/carbon/dataview.cpp:1479
-#: ../src/osx/carbon/dataview.cpp:1672 ../src/osx/carbon/dataview.cpp:1781
-#: ../src/osx/carbon/dataview.cpp:1823 ../src/osx/carbon/dataview.cpp:1876
-#: ../src/osx/carbon/dataview.cpp:1999
+#: ../src/osx/carbon/dataview.cpp:1279 ../src/osx/carbon/dataview.cpp:1338
+#: ../src/osx/carbon/dataview.cpp:1421 ../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 model not set correctly."
 msgstr "模型指针设定错误"
 
 msgid "Pointer to model not set correctly."
 msgstr "模型指针设定错误"
 

-#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
+#: ../src/generic/prntdlgg.cpp:612 ../src/generic/prntdlgg.cpp:867

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

-#: ../src/richtext/richtextsizepage.cpp:458
+#: ../src/richtext/richtextsizepage.cpp:496

 msgid "Position"
 msgstr "位置"
 
 msgid "Position"
 msgstr "位置"
 

-#: ../src/generic/prntdlgg.cpp:304
+#: ../src/generic/prntdlgg.cpp:298

 msgid "PostScript file"
 msgstr "PostScript文件"
 
 msgid "PostScript file"
 msgstr "PostScript文件"
 

-#: ../src/common/stockitem.cpp:182
+#: ../src/common/stockitem.cpp:181

 msgid "Preferences"
 msgstr "偏好设置"
 
 msgid "Preferences"
 msgstr "偏好设置"
 

-#: ../src/osx/menu_osx.cpp:550
+#: ../src/osx/menu_osx.cpp:643

 msgid "Preferences..."
 msgstr "偏好设置..."
 
 msgid "Preferences..."
 msgstr "偏好设置..."
 

-#: ../src/common/prntbase.cpp:530
+#: ../src/common/prntbase.cpp:529

 msgid "Preparing"
 msgstr "准备中"
 
 msgid "Preparing"
 msgstr "准备中"
 

-#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
-#: ../src/html/helpwnd.cpp:1236
+#: ../src/generic/fontdlgg.cpp:455 ../src/osx/carbon/fontdlg.cpp:576
+#: ../src/html/helpwnd.cpp:1235

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

-#: ../src/common/prntbase.cpp:1524 ../src/html/helpwnd.cpp:678
+#: ../src/common/prntbase.cpp:1523 ../src/html/helpwnd.cpp:677

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

-#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
-#: ../src/common/prntbase.cpp:410 ../src/common/prntbase.cpp:1512
-#: ../src/gtk/print.cpp:593 ../src/gtk/print.cpp:606
-#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549
+#: ../src/generic/prntdlgg.cpp:143 ../src/generic/prntdlgg.cpp:157
+#: ../src/common/prntbase.cpp:409 ../src/common/prntbase.cpp:1511
+#: ../src/gtk/print.cpp:584 ../src/gtk/print.cpp:597

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: ../include/wx/prntbase.h:396 ../src/common/docview.cpp:1247
+#: ../include/wx/prntbase.h:395 ../src/common/docview.cpp:1250

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

-#: ../src/common/prntbase.cpp:1986 ../src/common/prntbase.cpp:2028
-#: ../src/common/prntbase.cpp:2036
+#: ../src/common/prntbase.cpp:1985 ../src/common/prntbase.cpp:2027
+#: ../src/common/prntbase.cpp:2035

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 

-#: ../src/generic/prntdlgg.cpp:230
+#: ../src/generic/prntdlgg.cpp:224

 msgid "Print Range"
 msgstr "打印范围"
 
 msgid "Print Range"
 msgstr "打印范围"
 

-#: ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/prntdlgg.cpp:449

 msgid "Print Setup"
 msgstr "打印设置"
 
 msgid "Print Setup"
 msgstr "打印设置"
 

-#: ../src/generic/prntdlgg.cpp:627
+#: ../src/generic/prntdlgg.cpp:621

 msgid "Print in colour"
 msgstr "彩色打印"
 
 msgid "Print in colour"
 msgstr "彩色打印"
 

-#: ../src/common/stockitem.cpp:183
+#: ../src/common/stockitem.cpp:182

 msgid "Print previe&w..."
 msgstr "打印预览(&W)..."
 
 msgid "Print previe&w..."
 msgstr "打印预览(&W)..."
 

-#: ../src/gtk/gnome/gprint.cpp:940
-msgid "Print preview"
-msgstr "打印预览"
-
-#: ../src/common/docview.cpp:1241
+#: ../src/common/docview.cpp:1244

 msgid "Print preview creation failed."
 msgstr "打印预览创建失败"
 
 msgid "Print preview creation failed."
 msgstr "打印预览创建失败"
 

-#: ../src/common/stockitem.cpp:183
+#: ../src/common/stockitem.cpp:182

 msgid "Print preview..."
 msgstr "打印预览..."
 
 msgid "Print preview..."
 msgstr "打印预览..."
 

-#: ../src/generic/prntdlgg.cpp:636
+#: ../src/generic/prntdlgg.cpp:630

 msgid "Print spooling"
 msgstr "打印假脱机"
 
 msgid "Print spooling"
 msgstr "打印假脱机"
 

-#: ../src/html/helpwnd.cpp:689
+#: ../src/html/helpwnd.cpp:688

 msgid "Print this page"
 msgstr "打印本页"
 
 msgid "Print this page"
 msgstr "打印本页"
 

-#: ../src/generic/prntdlgg.cpp:191
+#: ../src/generic/prntdlgg.cpp:185

 msgid "Print to File"
 msgstr "打印到文件"
 
 msgid "Print to File"
 msgstr "打印到文件"
 

-#: ../src/common/stockitem.cpp:184
+#: ../src/common/stockitem.cpp:183

 msgid "Print..."
 msgstr "打印..."
 
 msgid "Print..."
 msgstr "打印..."
 

-#: ../src/generic/prntdlgg.cpp:499
+#: ../src/generic/prntdlgg.cpp:493

 msgid "Printer"
 msgstr "打印机"
 
 msgid "Printer"
 msgstr "打印机"
 

-#: ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:633

 msgid "Printer command:"
 msgstr "打印机命令:"
 
 msgid "Printer command:"
 msgstr "打印机命令:"
 

-#: ../src/generic/prntdlgg.cpp:186
+#: ../src/generic/prntdlgg.cpp:180

 msgid "Printer options"
 msgstr "打印机选项"
 
 msgid "Printer options"
 msgstr "打印机选项"
 

-#: ../src/generic/prntdlgg.cpp:651
+#: ../src/generic/prntdlgg.cpp:645

 msgid "Printer options:"
 msgstr "打印机选项:"
 
 msgid "Printer options:"
 msgstr "打印机选项:"
 

-#: ../src/generic/prntdlgg.cpp:922
+#: ../src/generic/prntdlgg.cpp:916

 msgid "Printer..."
 msgstr "打印机..."
 
 msgid "Printer..."
 msgstr "打印机..."
 

-#: ../src/generic/prntdlgg.cpp:202
+#: ../src/generic/prntdlgg.cpp:196

 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../include/wx/richtext/richtextprint.h:164 ../src/common/prntbase.cpp:519
-#: ../src/html/htmprint.cpp:278
+#: ../include/wx/richtext/richtextprint.h:163 ../src/common/prntbase.cpp:518
+#: ../src/html/htmprint.cpp:277

 msgid "Printing"
 msgstr "正在打印 "
 
 msgid "Printing"
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:587
+#: ../src/common/prntbase.cpp:586

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:331
+#: ../src/common/prntbase.cpp:330

 msgid "Printing Error"
 msgstr "打印出错"
 
 msgid "Printing Error"
 msgstr "打印出错"
 

-#: ../src/common/prntbase.cpp:545
+#: ../src/common/prntbase.cpp:544

 #, c-format
 msgid "Printing page %d of %d"
 msgstr "正在打印页 %d 共 %d..."
 
 #, c-format
 msgid "Printing page %d of %d"
 msgstr "正在打印页 %d 共 %d..."
 

-#: ../src/generic/printps.cpp:202
+#: ../src/generic/printps.cpp:201

 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 
 #, c-format
 msgid "Printing page %d..."
 msgstr "正在打印页 %d..."
 

-#: ../src/generic/printps.cpp:162
+#: ../src/generic/printps.cpp:161

 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:264
-#: ../src/common/docview.cpp:2057
+#: ../include/wx/richtext/richtextprint.h:109 ../include/wx/prntbase.h:263
+#: ../src/common/docview.cpp:2124

 msgid "Printout"
 msgstr "打印"
 
 msgid "Printout"
 msgstr "打印"
 

-#: ../src/common/debugrpt.cpp:556
+#: ../src/common/debugrpt.cpp:565

 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 

-#: ../src/osx/carbon/dataview.cpp:2473
+#: ../src/osx/carbon/dataview.cpp:2472

 msgid "Progress renderer cannot render value type; value type: "
 msgstr "程序渲染器无法渲染该值；类型为:"
 
 msgid "Progress renderer cannot render value type; value type: "
 msgstr "程序渲染器无法渲染该值；类型为:"
 

-#: ../src/common/prntbase.cpp:529
+#: ../src/common/prntbase.cpp:528

 msgid "Progress:"
 msgid "Progress:"

-msgstr ""
+msgstr "进度:"

 
 

-#: ../src/common/stockitem.cpp:185
+#: ../src/common/stockitem.cpp:184

 msgid "Properties"
 msgstr "属性"
 
 msgid "Properties"
 msgstr "属性"
 

-#: ../src/propgrid/manager.cpp:238
+#: ../src/propgrid/manager.cpp:237

 msgid "Property"
 msgstr "属性"
 
 msgid "Property"
 msgstr "属性"
 

-#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277
+#: ../src/propgrid/propgrid.cpp:3144 ../src/propgrid/propgrid.cpp:3276

 msgid "Property Error"
 msgstr "属性错误"
 
 msgid "Property Error"
 msgstr "属性错误"
 

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

 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

-#: ../src/generic/logg.cpp:1040
+#: ../src/generic/logg.cpp:1036

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

-#: ../src/common/stockitem.cpp:157
+#: ../src/common/stockitem.cpp:156

 msgid "Quit"
 msgstr "退出"
 
 msgid "Quit"
 msgstr "退出"
 

-#: ../src/osx/menu_osx.cpp:564
+#: ../src/osx/menu_osx.cpp:610 ../src/osx/menu_osx.cpp:657

 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"
 
 #, c-format
 msgid "Quit %s"
 msgstr "退出 %s"
 

-#: ../src/common/stockitem.cpp:264
+#: ../src/common/stockitem.cpp:263

 msgid "Quit this program"
 msgstr "推出此程序"
 
 msgid "Quit this program"
 msgstr "推出此程序"
 

-#: ../src/common/accelcmn.cpp:54
+#: ../src/common/accelcmn.cpp:53

 msgid "RETURN"
 msgstr "RETURN"
 
 msgid "RETURN"
 msgstr "RETURN"
 

-#: ../src/common/accelcmn.cpp:58
+#: ../src/common/accelcmn.cpp:57

 msgid "RIGHT"
 msgstr "RIGHT"
 
 msgid "RIGHT"
 msgstr "RIGHT"
 

-#: ../src/common/accelcmn.cpp:328
-#, fuzzy
+#: ../src/common/accelcmn.cpp:327

 msgid "RawCtrl+"
 msgid "RawCtrl+"

-msgstr "Ctrl+"
+msgstr "RawCtrl+"

 
 

-#: ../src/common/ffile.cpp:114 ../src/common/ffile.cpp:133
+#: ../src/common/ffile.cpp:113 ../src/common/ffile.cpp:134

 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 

-#: ../src/common/prntbase.cpp:258
+#: ../src/common/prntbase.cpp:257

 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17
+#: ../src/common/stockitem.cpp:185 ../src/stc/stc_i18n.cpp:16

 msgid "Redo"
 msgstr "恢复"
 
 msgid "Redo"
 msgstr "恢复"
 

-#: ../src/common/stockitem.cpp:265
+#: ../src/common/stockitem.cpp:264

 msgid "Redo last action"
 msgstr "恢复上一次操作"
 
 msgid "Redo last action"
 msgstr "恢复上一次操作"
 

-#: ../src/common/stockitem.cpp:187
+#: ../src/common/stockitem.cpp:186

 msgid "Refresh"
 msgstr "刷新"
 
 msgid "Refresh"
 msgstr "刷新"
 

-#: ../src/msw/registry.cpp:626
+#: ../src/msw/registry.cpp:625

 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 

-#: ../src/msw/registry.cpp:595
+#: ../src/msw/registry.cpp:594

 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在，无法改名。"
 
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "注册键 '%s' 不存在，无法改名。"
 

-#: ../src/msw/registry.cpp:727
+#: ../src/msw/registry.cpp:726

 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"


@@ -5673,83 +5668,87 @@ msgstr ""
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 

-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:520

 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 

-#: ../src/richtext/richtextfontpage.cpp:323
-#: ../src/richtext/richtextfontpage.cpp:327
+#: ../src/richtext/richtextfontpage.cpp:332
+#: ../src/richtext/richtextfontpage.cpp:336

 msgid "Regular"
 msgstr "一般"
 
 msgid "Regular"
 msgstr "一般"
 

-#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:519

 #, fuzzy
 msgid "Relative"
 msgstr "修饰"
 
 #, fuzzy
 msgid "Relative"
 msgstr "修饰"
 

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

 msgid "Relevant entries:"
 msgstr "相关条目:"
 
 msgid "Relevant entries:"
 msgstr "相关条目:"
 

-#: ../src/common/stockitem.cpp:188
+#: ../include/wx/generic/progdlgg.h:86
+msgid "Remaining time:"
+msgstr "剩余时间:"
+
+#: ../src/common/stockitem.cpp:187

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../src/richtext/richtextctrl.cpp:1420
+#: ../src/richtext/richtextctrl.cpp:1430

 #, fuzzy
 msgid "Remove Bullet"
 msgstr "移除"
 
 #, fuzzy
 msgid "Remove Bullet"
 msgstr "移除"
 

-#: ../src/html/helpwnd.cpp:441
+#: ../src/html/helpwnd.cpp:440

 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 

-#: ../src/common/rendcmn.cpp:195
+#: ../src/common/rendcmn.cpp:194

 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 

-#: ../src/osx/carbon/dataview.cpp:1431
+#: ../src/osx/carbon/dataview.cpp:1430

 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 
 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 

-#: ../src/richtext/richtextbuffer.cpp:4109
+#: ../src/richtext/richtextbuffer.cpp:4214

 msgid "Renumber List"
 msgstr "重编号列表"
 
 msgid "Renumber List"
 msgstr "重编号列表"
 

-#: ../src/common/stockitem.cpp:189
+#: ../src/common/stockitem.cpp:188

 msgid "Rep&lace"
 msgstr "替换(&l)"
 
 msgid "Rep&lace"
 msgstr "替换(&l)"
 

-#: ../src/richtext/richtextctrl.cpp:3242 ../src/common/stockitem.cpp:189
+#: ../src/richtext/richtextctrl.cpp:3277 ../src/common/stockitem.cpp:188

 msgid "Replace"
 msgstr "替换"
 
 msgid "Replace"
 msgstr "替换"
 

-#: ../src/generic/fdrepdlg.cpp:183
+#: ../src/generic/fdrepdlg.cpp:182

 msgid "Replace &all"
 msgstr "全部替换(&a)"
 
 msgid "Replace &all"
 msgstr "全部替换(&a)"
 

-#: ../src/common/stockitem.cpp:262
+#: ../src/common/stockitem.cpp:261

 #, fuzzy
 msgid "Replace selection"
 msgstr "全部替换(&a)"
 
 #, fuzzy
 msgid "Replace selection"
 msgstr "全部替换(&a)"
 

-#: ../src/generic/fdrepdlg.cpp:125
+#: ../src/generic/fdrepdlg.cpp:124

 msgid "Replace with:"
 msgstr "替换为:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 

-#: ../src/common/valtext.cpp:162
+#: ../src/common/valtext.cpp:161

 msgid "Required information entry is empty."
 msgstr "所需的项目信息为空"
 
 msgid "Required information entry is empty."
 msgstr "所需的项目信息为空"
 

-#: ../src/common/translation.cpp:1804
+#: ../src/common/translation.cpp:1966

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

-#: ../src/common/stockitem.cpp:190
+#: ../src/common/stockitem.cpp:189

 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 


@@ -5758,490 +5757,498 @@ msgstr "还原为上次保存的文件"
 msgid "Ridge"
 msgstr "细"
 
 msgid "Ridge"
 msgstr "细"
 

-#: ../src/richtext/richtextliststylepage.cpp:252
-#: ../src/richtext/richtextbulletspage.cpp:202
-#: ../src/richtext/richtextsizepage.cpp:228
+#: ../src/richtext/richtextliststylepage.cpp:251
+#: ../src/richtext/richtextbulletspage.cpp:201
+#: ../src/richtext/richtextsizepage.cpp:250

 msgid "Right"
 msgstr "右"
 
 msgid "Right"
 msgstr "右"
 

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

 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 

-#: ../src/richtext/richtextindentspage.cpp:161
-#: ../src/richtext/richtextindentspage.cpp:163
-#: ../src/richtext/richtextliststylepage.cpp:338
-#: ../src/richtext/richtextliststylepage.cpp:340
+#: ../src/richtext/richtextindentspage.cpp:148
+#: ../src/richtext/richtextindentspage.cpp:150
+#: ../src/richtext/richtextliststylepage.cpp:337
+#: ../src/richtext/richtextliststylepage.cpp:339

 msgid "Right-align text."
 msgstr "文本右对齐"
 
 msgid "Right-align text."
 msgstr "文本右对齐"
 

-#: ../src/generic/fontdlgg.cpp:323
+#: ../src/generic/fontdlgg.cpp:322

 msgid "Roman"
 msgstr "罗马"
 
 msgid "Roman"
 msgstr "罗马"
 

-#: ../src/richtext/richtextliststylepage.cpp:300
-#: ../src/richtext/richtextbulletspage.cpp:253
+#: ../src/richtext/richtextliststylepage.cpp:299
+#: ../src/richtext/richtextbulletspage.cpp:252

 msgid "S&tandard bullet name:"
 msgstr "标准项目符号名称(&T)"
 
 msgid "S&tandard bullet name:"
 msgstr "标准项目符号名称(&T)"
 

-#: ../src/common/accelcmn.cpp:83
+#: ../src/common/accelcmn.cpp:82

 msgid "SCROLL_LOCK"
 msgstr "SCROLL_LOCK"
 
 msgid "SCROLL_LOCK"
 msgstr "SCROLL_LOCK"
 

-#: ../src/common/accelcmn.cpp:72
+#: ../src/common/accelcmn.cpp:71

 msgid "SELECT"
 msgstr "SELECT"
 
 msgid "SELECT"
 msgstr "SELECT"
 

-#: ../src/common/accelcmn.cpp:78
+#: ../src/common/accelcmn.cpp:77

 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 
 msgid "SEPARATOR"
 msgstr "SEPARATOR"
 

-#: ../src/common/accelcmn.cpp:75
+#: ../src/common/accelcmn.cpp:74

 msgid "SNAPSHOT"
 msgstr "SNAPSHOT"
 
 msgid "SNAPSHOT"
 msgstr "SNAPSHOT"
 

-#: ../src/common/accelcmn.cpp:63
+#: ../src/common/accelcmn.cpp:62

 msgid "SPACE"
 msgstr "SPACE"
 
 msgid "SPACE"
 msgstr "SPACE"
 

-#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:340
+#: ../src/common/accelcmn.cpp:257 ../src/common/accelcmn.cpp:339

 msgid "SPECIAL"
 msgstr "SPECIAL"
 
 msgid "SPECIAL"
 msgstr "SPECIAL"
 

-#: ../src/common/accelcmn.cpp:79
+#: ../src/common/accelcmn.cpp:78

 msgid "SUBTRACT"
 msgstr "SUBTRACT"
 
 msgid "SUBTRACT"
 msgstr "SUBTRACT"
 

-#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2655
+#: ../src/common/stockitem.cpp:190 ../src/common/sizer.cpp:2678

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: ../src/common/fldlgcmn.cpp:328
+#: ../src/common/fldlgcmn.cpp:327

 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 

-#: ../src/generic/logg.cpp:516
+#: ../src/generic/logg.cpp:518

 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 

-#: ../src/common/docview.cpp:363
+#: ../src/common/docview.cpp:360

 msgid "Save As"
 msgstr "另存为"
 
 msgid "Save As"
 msgstr "另存为"
 

-#: ../src/common/stockitem.cpp:192
+#: ../src/common/stockitem.cpp:191

 msgid "Save as"
 msgstr "另存为"
 
 msgid "Save as"
 msgstr "另存为"
 

-#: ../src/common/stockitem.cpp:268
+#: ../src/common/stockitem.cpp:267

 msgid "Save current document"
 msgstr "保存当前文档"
 
 msgid "Save current document"
 msgstr "保存当前文档"
 

-#: ../src/common/stockitem.cpp:269
+#: ../src/common/stockitem.cpp:268

 msgid "Save current document with a different filename"
 msgstr "保存当前文档至重命名"
 
 msgid "Save current document with a different filename"
 msgstr "保存当前文档至重命名"
 

-#: ../src/generic/logg.cpp:516
+#: ../src/generic/logg.cpp:518

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 

-#: ../src/generic/fontdlgg.cpp:326
+#: ../src/generic/fontdlgg.cpp:325

 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:549
-#: ../src/html/helpwnd.cpp:564
+#: ../src/generic/srchctlg.cpp:67 ../src/html/helpwnd.cpp:548
+#: ../src/html/helpwnd.cpp:563

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../src/html/helpwnd.cpp:551
+#: ../src/html/helpwnd.cpp:550

 msgid ""
 "Search contents of help book(s) for all occurrences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 msgid ""
 "Search contents of help book(s) for all occurrences of the text you typed "
 "above"
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 

-#: ../src/generic/fdrepdlg.cpp:161
+#: ../src/generic/fdrepdlg.cpp:160

 msgid "Search direction"
 msgstr "搜索方向"
 
 msgid "Search direction"
 msgstr "搜索方向"
 

-#: ../src/generic/fdrepdlg.cpp:113
+#: ../src/generic/fdrepdlg.cpp:112

 msgid "Search for:"
 msgstr "搜索:"
 
 msgid "Search for:"
 msgstr "搜索:"
 

-#: ../src/html/helpwnd.cpp:1066
+#: ../src/html/helpwnd.cpp:1065

 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 
 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 

-#: ../src/html/helpwnd.cpp:871
+#: ../src/html/helpwnd.cpp:870

 msgid "Searching..."
 msgstr "搜索中..."
 
 msgid "Searching..."
 msgstr "搜索中..."
 

-#: ../src/generic/dirctrlg.cpp:538
+#: ../src/generic/dirctrlg.cpp:546

 msgid "Sections"
 msgstr "段"
 
 msgid "Sections"
 msgstr "段"
 

-#: ../src/common/ffile.cpp:219
+#: ../src/common/ffile.cpp:220

 #, c-format
 msgid "Seek error on file '%s'"
 msgstr "文件 '%s' 定位错误"
 
 #, c-format
 msgid "Seek error on file '%s'"
 msgstr "文件 '%s' 定位错误"
 

-#: ../src/common/ffile.cpp:209
+#: ../src/common/ffile.cpp:210

 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"
 
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"
 

-#: ../src/richtext/richtextctrl.cpp:329 ../src/osx/textctrl_osx.cpp:588
-#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227
+#: ../src/richtext/richtextctrl.cpp:330 ../src/osx/textctrl_osx.cpp:587
+#: ../src/common/stockitem.cpp:192 ../src/msw/textctrl.cpp:2288

 msgid "Select &All"
 msgstr "全部选择(&A)"
 
 msgid "Select &All"
 msgstr "全部选择(&A)"
 

-#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22
+#: ../src/common/stockitem.cpp:192 ../src/stc/stc_i18n.cpp:21

 msgid "Select All"
 msgstr "全部选择"
 
 msgid "Select All"
 msgstr "全部选择"
 

-#: ../src/common/docview.cpp:1868
+#: ../src/common/docview.cpp:1877

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1942
+#: ../src/common/docview.cpp:1951

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/richtext/richtextfontpage.cpp:233

 #: ../src/richtext/richtextfontpage.cpp:235
 #: ../src/richtext/richtextfontpage.cpp:235

+#: ../src/richtext/richtextfontpage.cpp:237

 msgid "Select regular or bold."
 msgstr "选择是否粗体"
 
 msgid "Select regular or bold."
 msgstr "选择是否粗体"
 

-#: ../src/richtext/richtextfontpage.cpp:220

 #: ../src/richtext/richtextfontpage.cpp:222
 #: ../src/richtext/richtextfontpage.cpp:222

+#: ../src/richtext/richtextfontpage.cpp:224

 msgid "Select regular or italic style."
 msgstr "选择是否斜体"
 
 msgid "Select regular or italic style."
 msgstr "选择是否斜体"
 

-#: ../src/richtext/richtextfontpage.cpp:246

 #: ../src/richtext/richtextfontpage.cpp:248
 #: ../src/richtext/richtextfontpage.cpp:248

+#: ../src/richtext/richtextfontpage.cpp:250

 msgid "Select underlining or no underlining."
 msgstr "选择是否下划线"
 
 msgid "Select underlining or no underlining."
 msgstr "选择是否下划线"
 

-#: ../src/motif/filedlg.cpp:218
+#: ../src/motif/filedlg.cpp:220

 msgid "Selection"
 msgstr "选区"
 
 msgid "Selection"
 msgstr "选区"
 

-#: ../src/richtext/richtextliststylepage.cpp:188
-#: ../src/richtext/richtextliststylepage.cpp:190
+#: ../src/richtext/richtextliststylepage.cpp:187
+#: ../src/richtext/richtextliststylepage.cpp:189

 msgid "Selects the list level to edit."
 msgstr "选择并辨析列表层级"
 
 msgid "Selects the list level to edit."
 msgstr "选择并辨析列表层级"
 

-#: ../src/common/cmdline.cpp:911
+#: ../src/common/cmdline.cpp:918

 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s' 后存在分隔符。"
 
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s' 后存在分隔符。"
 

-#: ../src/richtext/richtextbuffer.cpp:9797
+#: ../src/richtext/richtextbuffer.cpp:10513

 msgid "Set Cell Style"
 msgstr "设置单元格样式"
 
 msgid "Set Cell Style"
 msgstr "设置单元格样式"
 

-#: ../include/wx/xtiprop.h:180
+#: ../include/wx/xtiprop.h:179

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

-#: ../src/common/filename.cpp:2524
+#: ../src/common/filename.cpp:2632

 msgid "Setting directory access times is not supported under this OS version"
 msgstr "当前操作系统不支持目录访问次数设定"
 
 msgid "Setting directory access times is not supported under this OS version"
 msgstr "当前操作系统不支持目录访问次数设定"
 

-#: ../src/generic/prntdlgg.cpp:194
+#: ../src/generic/prntdlgg.cpp:188

 msgid "Setup..."
 msgstr "设置..."
 
 msgid "Setup..."
 msgstr "设置..."
 

-#: ../src/msw/dialup.cpp:564
+#: ../src/msw/dialup.cpp:563

 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 

-#: ../src/common/accelcmn.cpp:325
+#: ../src/common/accelcmn.cpp:324

 msgid "Shift+"
 msgstr "Shift+"
 
 msgid "Shift+"
 msgstr "Shift+"
 

-#: ../src/generic/dirdlgg.cpp:171
+#: ../src/generic/dirdlgg.cpp:170

 msgid "Show &hidden directories"
 msgstr "显示隐藏目录(&H)"
 
 msgid "Show &hidden directories"
 msgstr "显示隐藏目录(&H)"
 

-#: ../src/generic/filectrlg.cpp:997
+#: ../src/generic/filectrlg.cpp:1003

 msgid "Show &hidden files"
 msgstr "显示隐藏文件(&H)"
 
 msgid "Show &hidden files"
 msgstr "显示隐藏文件(&H)"
 

-#: ../src/osx/menu_osx.cpp:559
+#: ../src/osx/menu_osx.cpp:605 ../src/osx/menu_osx.cpp:652

 msgid "Show All"
 msgstr "显示全部"
 
 msgid "Show All"
 msgstr "显示全部"
 

-#: ../src/common/stockitem.cpp:258
+#: ../src/common/stockitem.cpp:257

 msgid "Show about dialog"
 msgstr "显示关于对话框"
 
 msgid "Show about dialog"
 msgstr "显示关于对话框"
 

-#: ../src/html/helpwnd.cpp:503
+#: ../src/html/helpwnd.cpp:502

 msgid "Show all"
 msgstr "显示全部"
 
 msgid "Show all"
 msgstr "显示全部"
 

-#: ../src/html/helpwnd.cpp:514
+#: ../src/html/helpwnd.cpp:513

 msgid "Show all items in index"
 msgstr "以索引方式显示所有项目"
 
 msgid "Show all items in index"
 msgstr "以索引方式显示所有项目"
 

-#: ../src/generic/dirdlgg.cpp:106
+#: ../src/generic/dirdlgg.cpp:105

 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/html/helpwnd.cpp:672
+#: ../src/html/helpwnd.cpp:671

 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/richtext/richtextsymboldlg.cpp:422
-#: ../src/richtext/richtextsymboldlg.cpp:424
+#: ../src/richtext/richtextsymboldlg.cpp:421
+#: ../src/richtext/richtextsymboldlg.cpp:423

 msgid "Shows a Unicode subset."
 msgstr "显示Unicode子集"
 
 msgid "Shows a Unicode subset."
 msgstr "显示Unicode子集"
 

-#: ../src/richtext/richtextliststylepage.cpp:473
-#: ../src/richtext/richtextliststylepage.cpp:475
-#: ../src/richtext/richtextbulletspage.cpp:277
-#: ../src/richtext/richtextbulletspage.cpp:279
+#: ../src/richtext/richtextliststylepage.cpp:472
+#: ../src/richtext/richtextliststylepage.cpp:474
+#: ../src/richtext/richtextbulletspage.cpp:276
+#: ../src/richtext/richtextbulletspage.cpp:278

 msgid "Shows a preview of the bullet settings."
 msgstr "预览项目符号设定"
 
 msgid "Shows a preview of the bullet settings."
 msgstr "预览项目符号设定"
 

-#: ../src/richtext/richtextfontpage.cpp:313
-#: ../src/richtext/richtextfontpage.cpp:315
+#: ../src/richtext/richtextfontpage.cpp:322
+#: ../src/richtext/richtextfontpage.cpp:324

 msgid "Shows a preview of the font settings."
 msgstr "预览字体设定"
 
 msgid "Shows a preview of the font settings."
 msgstr "预览字体设定"
 

-#: ../src/osx/carbon/fontdlg.cpp:578 ../src/osx/carbon/fontdlg.cpp:580
+#: ../src/osx/carbon/fontdlg.cpp:580 ../src/osx/carbon/fontdlg.cpp:582

 msgid "Shows a preview of the font."
 msgstr "预览字体"
 
 msgid "Shows a preview of the font."
 msgstr "预览字体"
 

-#: ../src/richtext/richtextindentspage.cpp:328
-#: ../src/richtext/richtextindentspage.cpp:330
+#: ../src/richtext/richtextindentspage.cpp:303
+#: ../src/richtext/richtextindentspage.cpp:305

 msgid "Shows a preview of the paragraph settings."
 msgstr "预览段落设定"
 
 msgid "Shows a preview of the paragraph settings."
 msgstr "预览段落设定"
 

-#: ../src/generic/fontdlgg.cpp:461 ../src/generic/fontdlgg.cpp:463
+#: ../src/generic/fontdlgg.cpp:460 ../src/generic/fontdlgg.cpp:462

 msgid "Shows the font preview."
 msgstr "显示字体预览。"
 
 msgid "Shows the font preview."
 msgstr "显示字体预览。"
 

-#: ../src/univ/themes/mono.cpp:517
+#: ../src/univ/themes/mono.cpp:516

 msgid "Simple monochrome theme"
 msgstr "简单黑白主题"
 
 msgid "Simple monochrome theme"
 msgstr "简单黑白主题"
 

-#: ../src/richtext/richtextindentspage.cpp:300
-#: ../src/richtext/richtextliststylepage.cpp:450
+#: ../src/richtext/richtextindentspage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:449

 msgid "Single"
 msgstr ""
 
 msgid "Single"
 msgstr ""
 

-#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:355
-#: ../src/richtext/richtextsizepage.cpp:275
+#: ../src/generic/filectrlg.cpp:460 ../src/richtext/richtextformatdlg.cpp:356
+#: ../src/richtext/richtextsizepage.cpp:299

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: ../src/osx/carbon/fontdlg.cpp:523
+#: ../src/osx/carbon/fontdlg.cpp:525

 msgid "Size:"
 msgstr "大小:"
 
 msgid "Size:"
 msgstr "大小:"
 

-#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
-#: ../src/msw/progdlg.cpp:802
+#: ../src/generic/progdlgg.cpp:262 ../src/generic/progdlgg.cpp:773
+#: ../src/msw/progdlg.cpp:801

 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 

-#: ../src/generic/fontdlgg.cpp:331
+#: ../src/generic/fontdlgg.cpp:330

 msgid "Slant"
 msgstr "倾斜"
 
 msgid "Slant"
 msgstr "倾斜"
 

+#: ../src/richtext/richtextfontpage.cpp:298
+#, fuzzy
+msgid "Small C&apitals"
+msgstr "大写(&P)"
+

 #: ../src/richtext/richtextborderspage.cpp:543
 msgid "Solid"
 msgstr "实线"
 
 #: ../src/richtext/richtextborderspage.cpp:543
 msgid "Solid"
 msgstr "实线"
 

-#: ../src/common/docview.cpp:1764
+#: ../src/common/docview.cpp:1773

 msgid "Sorry, could not open this file."
 msgstr "对不起，无法打开文件。"
 
 msgid "Sorry, could not open this file."
 msgstr "对不起，无法打开文件。"
 

-#: ../src/common/prntbase.cpp:2028 ../src/common/prntbase.cpp:2036
+#: ../src/common/prntbase.cpp:2027 ../src/common/prntbase.cpp:2035

 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起，没有足够内存创建预览。"
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起，没有足够内存创建预览。"
 

-#: ../src/richtext/richtextstyledlg.cpp:616
-#: ../src/richtext/richtextstyledlg.cpp:664
-#: ../src/richtext/richtextstyledlg.cpp:830
-#: ../src/richtext/richtextstyledlg.cpp:906
-#: ../src/richtext/richtextstyledlg.cpp:944
+#: ../src/richtext/richtextstyledlg.cpp:608
+#: ../src/richtext/richtextstyledlg.cpp:656
+#: ../src/richtext/richtextstyledlg.cpp:822
+#: ../src/richtext/richtextstyledlg.cpp:898
+#: ../src/richtext/richtextstyledlg.cpp:936

 msgid "Sorry, that name is taken. Please choose another."
 msgstr "抱歉，名字已被使用。请选择其他名字。"
 
 msgid "Sorry, that name is taken. Please choose another."
 msgstr "抱歉，名字已被使用。请选择其他名字。"
 

-#: ../src/common/docview.cpp:1787
+#: ../src/common/docview.cpp:1796

 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起，此文件的格式未知。"
 
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起，此文件的格式未知。"
 

-#: ../src/unix/sound.cpp:493
+#: ../src/unix/sound.cpp:492

 msgid "Sound data are in unsupported format."
 msgstr "声音数据为不支持的格式。"
 
 msgid "Sound data are in unsupported format."
 msgstr "声音数据为不支持的格式。"
 

-#: ../src/unix/sound.cpp:478
+#: ../src/unix/sound.cpp:477

 #, c-format
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s' 为不支持的格式。"
 
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
 msgstr "声音文件 '%s' 为不支持的格式。"
 

-#: ../src/richtext/richtextliststylepage.cpp:468
+#: ../src/richtext/richtextliststylepage.cpp:467

 msgid "Spacing"
 msgstr "空格"
 
 msgid "Spacing"
 msgstr "空格"
 

-#: ../src/common/stockitem.cpp:198
+#: ../src/common/stockitem.cpp:197

 msgid "Spell Check"
 msgstr "拼写检查"
 
 msgid "Spell Check"
 msgstr "拼写检查"
 

-#: ../src/richtext/richtextliststylepage.cpp:491
-#: ../src/richtext/richtextbulletspage.cpp:296
+#: ../src/richtext/richtextliststylepage.cpp:490
+#: ../src/richtext/richtextbulletspage.cpp:295

 msgid "Standard"
 msgstr "标准"
 
 msgid "Standard"
 msgstr "标准"
 

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

 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸，5 1/2 x 8 1/2 英寸"
 
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸，5 1/2 x 8 1/2 英寸"
 

-#: ../src/richtext/richtextsizepage.cpp:480
-#: ../src/richtext/richtextsizepage.cpp:484
-#: ../src/richtext/richtextsizepage.cpp:485
+#: ../src/richtext/richtextsizepage.cpp:518
+#: ../src/richtext/richtextsizepage.cpp:523

 msgid "Static"
 msgstr "状态:"
 
 msgid "Static"
 msgstr "状态:"
 

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

 msgid "Status:"
 msgstr "状态:"
 
 msgid "Status:"
 msgstr "状态:"
 

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

 msgid "Stop"
 msgstr "停止"
 
 msgid "Stop"
 msgstr "停止"
 

-#: ../src/common/stockitem.cpp:200
+#: ../src/common/stockitem.cpp:199

 msgid "Strikethrough"
 msgstr "删除线"
 
 msgid "Strikethrough"
 msgstr "删除线"
 

-#: ../src/common/colourcmn.cpp:46
+#: ../src/common/colourcmn.cpp:45

 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../src/richtext/richtextformatdlg.cpp:317 ../src/propgrid/advprops.cpp:648
+#: ../src/richtext/richtextformatdlg.cpp:318 ../src/propgrid/advprops.cpp:647

 msgid "Style"
 msgstr "样式"
 
 msgid "Style"
 msgstr "样式"
 

-#: ../include/wx/richtext/richtextstyledlg.h:48
+#: ../include/wx/richtext/richtextstyledlg.h:47

 msgid "Style Organiser"
 msgstr "样式组织器"
 
 msgid "Style Organiser"
 msgstr "样式组织器"
 

-#: ../src/osx/carbon/fontdlg.cpp:532
+#: ../src/osx/carbon/fontdlg.cpp:534

 msgid "Style:"
 msgstr "样式:"
 
 msgid "Style:"
 msgstr "样式:"
 

-#: ../src/richtext/richtextfontpage.cpp:303
+#: ../src/richtext/richtextfontpage.cpp:312

 msgid "Subscrip&t"
 msgstr "下标(&T)"
 
 msgid "Subscrip&t"
 msgstr "下标(&T)"
 

-#: ../src/richtext/richtextfontpage.cpp:296
+#: ../src/richtext/richtextfontpage.cpp:305

 msgid "Supe&rscript"
 msgstr "上标(&R)"
 
 msgid "Supe&rscript"
 msgstr "上标(&R)"
 

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

 msgid "SuperA/SuperA/A4 227 x 356 mm"
 msgstr "SuperA/SuperA/A4 纸张，227 x 356 毫米"
 
 msgid "SuperA/SuperA/A4 227 x 356 mm"
 msgstr "SuperA/SuperA/A4 纸张，227 x 356 毫米"
 

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

 msgid "SuperB/SuperB/A3 305 x 487 mm"
 msgstr "SuperB/SuperB/A3 纸张，305 x 487 毫米"
 
 msgid "SuperB/SuperB/A3 305 x 487 mm"
 msgstr "SuperB/SuperB/A3 纸张，305 x 487 毫米"
 

-#: ../src/generic/fontdlgg.cpp:327
+#: ../src/generic/fontdlgg.cpp:326

 msgid "Swiss"
 msgstr "瑞士"
 
 msgid "Swiss"
 msgstr "瑞士"
 

-#: ../src/richtext/richtextliststylepage.cpp:489
-#: ../src/richtext/richtextbulletspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:488
+#: ../src/richtext/richtextbulletspage.cpp:293

 msgid "Symbol"
 msgstr "符号"
 
 msgid "Symbol"
 msgstr "符号"
 

-#: ../src/richtext/richtextliststylepage.cpp:289
-#: ../src/richtext/richtextbulletspage.cpp:241
+#: ../src/richtext/richtextliststylepage.cpp:288
+#: ../src/richtext/richtextbulletspage.cpp:240

 msgid "Symbol &font:"
 msgstr "符号样式(&F)"
 
 msgid "Symbol &font:"
 msgstr "符号样式(&F)"
 

-#: ../src/common/accelcmn.cpp:64
+#: ../include/wx/richtext/richtextsymboldlg.h:47
+msgid "Symbols"
+msgstr "符号"
+
+#: ../src/common/accelcmn.cpp:63

 msgid "TAB"
 msgstr "TAB"
 
 msgid "TAB"
 msgstr "TAB"
 

-#: ../src/common/imagtiff.cpp:373 ../src/common/imagtiff.cpp:386
-#: ../src/common/imagtiff.cpp:745
+#: ../src/common/imagtiff.cpp:372 ../src/common/imagtiff.cpp:385
+#: ../src/common/imagtiff.cpp:744

 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 无法分配内存。"
 
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 无法分配内存。"
 

-#: ../src/common/imagtiff.cpp:305
+#: ../src/common/imagtiff.cpp:304

 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误。"
 
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误。"
 

-#: ../src/common/imagtiff.cpp:472
+#: ../src/common/imagtiff.cpp:471

 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误。"
 
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误。"
 

-#: ../src/common/imagtiff.cpp:612
+#: ../src/common/imagtiff.cpp:611

 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误。"
 
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误。"
 

-#: ../src/common/imagtiff.cpp:850
+#: ../src/common/imagtiff.cpp:849

 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误。"
 
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误。"
 

-#: ../src/common/imagtiff.cpp:359
+#: ../src/common/imagtiff.cpp:358

 msgid "TIFF: Image size is abnormally big."
 msgstr "TIFF: 图像大小过大。"
 
 msgid "TIFF: Image size is abnormally big."
 msgstr "TIFF: 图像大小过大。"
 

-#: ../src/richtext/richtextbuffer.cpp:9938
+#: ../src/richtext/richtextbuffer.cpp:10794

 msgid "Table Properties"
 msgstr "表格属性"
 
 msgid "Table Properties"
 msgstr "表格属性"
 

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

 msgid "Tabloid Extra 11.69 x 18 in"
 msgstr "小报(特大)，11.69 x 18 英寸"
 
 msgid "Tabloid Extra 11.69 x 18 in"
 msgstr "小报(特大)，11.69 x 18 英寸"
 

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

 msgid "Tabloid, 11 x 17 in"
 msgstr "小报，11 x 17 英寸"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报，11 x 17 英寸"
 

-#: ../src/richtext/richtextformatdlg.cpp:335
+#: ../src/richtext/richtextformatdlg.cpp:336

 msgid "Tabs"
 msgstr "标签"
 
 msgid "Tabs"
 msgstr "标签"
 

-#: ../src/generic/fontdlgg.cpp:328
+#: ../src/generic/fontdlgg.cpp:327

 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1869
+#: ../src/common/docview.cpp:1878

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 

-#: ../src/osx/carbon/dataview.cpp:2374
+#: ../src/osx/carbon/dataview.cpp:2373

 msgid "Text renderer cannot render value; value type: "
 msgstr "文本渲染器无法渲染该值；类型为:"
 
 msgid "Text renderer cannot render value; value type: "
 msgstr "文本渲染器无法渲染该值；类型为:"
 

-#: ../src/common/fmapbase.cpp:159
+#: ../src/common/fmapbase.cpp:158

 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 

-#: ../src/common/ftp.cpp:621
+#: ../src/common/ftp.cpp:620

 msgid "The FTP server doesn't support passive mode."
 msgstr "FTP服务器不支持 passive 模式。"
 
 msgid "The FTP server doesn't support passive mode."
 msgstr "FTP服务器不支持 passive 模式。"
 

-#: ../src/common/ftp.cpp:607
+#: ../src/common/ftp.cpp:606

 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持 PORT 命令。"
 
 msgid "The FTP server doesn't support the PORT command."
 msgstr "FTP服务器不支持 PORT 命令。"
 

-#: ../src/richtext/richtextliststylepage.cpp:216
-#: ../src/richtext/richtextliststylepage.cpp:218
-#: ../src/richtext/richtextbulletspage.cpp:165
-#: ../src/richtext/richtextbulletspage.cpp:167
+#: ../src/richtext/richtextliststylepage.cpp:215
+#: ../src/richtext/richtextliststylepage.cpp:217
+#: ../src/richtext/richtextbulletspage.cpp:164
+#: ../src/richtext/richtextbulletspage.cpp:166

 msgid "The available bullet styles."
 msgstr "可用的项目符号样式"
 
 msgid "The available bullet styles."
 msgstr "可用的项目符号样式"
 

-#: ../src/richtext/richtextstyledlg.cpp:210
-#: ../src/richtext/richtextstyledlg.cpp:212
+#: ../src/richtext/richtextstyledlg.cpp:202
+#: ../src/richtext/richtextstyledlg.cpp:204

 msgid "The available styles."
 msgstr "可用样式"
 
 msgid "The available styles."
 msgstr "可用样式"
 


@@ -6260,30 +6267,30 @@ msgstr "底边距"
 msgid "The bottom padding size."
 msgstr "底内衬大小"
 
 msgid "The bottom padding size."
 msgstr "底内衬大小"
 

-#: ../src/richtext/richtextsizepage.cpp:577
-#: ../src/richtext/richtextsizepage.cpp:579
-#: ../src/richtext/richtextsizepage.cpp:587
-#: ../src/richtext/richtextsizepage.cpp:589
+#: ../src/richtext/richtextsizepage.cpp:639
+#: ../src/richtext/richtextsizepage.cpp:641
+#: ../src/richtext/richtextsizepage.cpp:653
+#: ../src/richtext/richtextsizepage.cpp:655

 msgid "The bottom position."
 msgstr "底部位置"
 
 msgid "The bottom position."
 msgstr "底部位置"
 

-#: ../src/richtext/richtextliststylepage.cpp:255
-#: ../src/richtext/richtextliststylepage.cpp:257
-#: ../src/richtext/richtextliststylepage.cpp:276
-#: ../src/richtext/richtextliststylepage.cpp:278
-#: ../src/richtext/richtextbulletspage.cpp:205
-#: ../src/richtext/richtextbulletspage.cpp:207
-#: ../src/richtext/richtextbulletspage.cpp:228
-#: ../src/richtext/richtextbulletspage.cpp:230
+#: ../src/richtext/richtextliststylepage.cpp:254
+#: ../src/richtext/richtextliststylepage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:277
+#: ../src/richtext/richtextbulletspage.cpp:204
+#: ../src/richtext/richtextbulletspage.cpp:206
+#: ../src/richtext/richtextbulletspage.cpp:227
+#: ../src/richtext/richtextbulletspage.cpp:229

 msgid "The bullet character."
 msgstr "项目符号字符"
 
 msgid "The bullet character."
 msgstr "项目符号字符"
 

-#: ../src/richtext/richtextsymboldlg.cpp:444
-#: ../src/richtext/richtextsymboldlg.cpp:446
+#: ../src/richtext/richtextsymboldlg.cpp:443
+#: ../src/richtext/richtextsymboldlg.cpp:445

 msgid "The character code."
 msgstr "字符编码"
 
 msgid "The character code."
 msgstr "字符编码"
 

-#: ../src/common/fontmap.cpp:204
+#: ../src/common/fontmap.cpp:203

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"


@@ -6293,17 +6300,17 @@ msgstr ""
 "未知字符集 '%s'。选择其它字符集\n"
 "代替它，如果无法替代请选择 [取消] "
 
 "未知字符集 '%s'。选择其它字符集\n"
 "代替它，如果无法替代请选择 [取消] "
 

-#: ../src/msw/ole/dataobj.cpp:177
+#: ../src/msw/ole/dataobj.cpp:367

 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在。"
 
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在。"
 

-#: ../src/richtext/richtextstylepage.cpp:129
-#: ../src/richtext/richtextstylepage.cpp:131
+#: ../src/richtext/richtextstylepage.cpp:128
+#: ../src/richtext/richtextstylepage.cpp:130

 msgid "The default style for the next paragraph."
 msgstr "下一段落默认样式"
 
 msgid "The default style for the next paragraph."
 msgstr "下一段落默认样式"
 

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

 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"


@@ -6312,7 +6319,7 @@ msgstr ""
 "目录 '%s' 不存在\n"
 "是否现在创建?"
 
 "目录 '%s' 不存在\n"
 "是否现在创建?"
 

-#: ../src/html/htmprint.cpp:272
+#: ../src/html/htmprint.cpp:271

 #, c-format
 msgid ""
 "The document \"%s\" doesn't fit on the page horizontally and will be "
 #, c-format
 msgid ""
 "The document \"%s\" doesn't fit on the page horizontally and will be "


@@ -6324,7 +6331,7 @@ msgstr ""
 "\n"
 "强制打印该文档？"
 
 "\n"
 "强制打印该文档？"
 

-#: ../src/common/docview.cpp:1181
+#: ../src/common/docview.cpp:1184

 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"


@@ -6333,61 +6340,61 @@ msgstr ""
 "文件 '%s' 不存在所以无法打开。\n"
 "已从最近使用的文件列表中移去。"
 
 "文件 '%s' 不存在所以无法打开。\n"
 "已从最近使用的文件列表中移去。"
 

-#: ../src/richtext/richtextindentspage.cpp:221
-#: ../src/richtext/richtextindentspage.cpp:223
-#: ../src/richtext/richtextliststylepage.cpp:395
-#: ../src/richtext/richtextliststylepage.cpp:397
+#: ../src/richtext/richtextindentspage.cpp:208
+#: ../src/richtext/richtextindentspage.cpp:210
+#: ../src/richtext/richtextliststylepage.cpp:394
+#: ../src/richtext/richtextliststylepage.cpp:396

 msgid "The first line indent."
 msgstr "首行缩进"
 
 msgid "The first line indent."
 msgstr "首行缩进"
 

-#: ../src/gtk/utilsgtk.cpp:478
+#: ../src/gtk/utilsgtk.cpp:427

 msgid "The following standard GTK+ options are also supported:\n"
 msgstr "以下标准GTK+选项也被支持:\n"
 
 msgid "The following standard GTK+ options are also supported:\n"
 msgstr "以下标准GTK+选项也被支持:\n"
 

-#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417
+#: ../src/generic/fontdlgg.cpp:414 ../src/generic/fontdlgg.cpp:416

 msgid "The font colour."
 msgstr "字体颜色。"
 
 msgid "The font colour."
 msgstr "字体颜色。"
 

-#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378
+#: ../src/generic/fontdlgg.cpp:375 ../src/generic/fontdlgg.cpp:377

 msgid "The font family."
 msgstr "字体。"
 
 msgid "The font family."
 msgstr "字体。"
 

-#: ../src/richtext/richtextsymboldlg.cpp:406
-#: ../src/richtext/richtextsymboldlg.cpp:408
+#: ../src/richtext/richtextsymboldlg.cpp:405
+#: ../src/richtext/richtextsymboldlg.cpp:407

 msgid "The font from which to take the symbol."
 msgstr "符号使用该字体"
 
 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:427 ../src/generic/fontdlgg.cpp:429
+#: ../src/generic/fontdlgg.cpp:434 ../src/generic/fontdlgg.cpp:436

 msgid "The font point size."
 msgstr "字体大小 (磅值)。"
 
 msgid "The font point size."
 msgstr "字体大小 (磅值)。"
 

-#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529
+#: ../src/osx/carbon/fontdlg.cpp:529 ../src/osx/carbon/fontdlg.cpp:531

 msgid "The font size in points."
 msgstr "字体大小(磅值)"
 
 msgid "The font size in points."
 msgstr "字体大小(磅值)"
 

-#: ../src/richtext/richtextfontpage.cpp:188

 #: ../src/richtext/richtextfontpage.cpp:190
 #: ../src/richtext/richtextfontpage.cpp:190

+#: ../src/richtext/richtextfontpage.cpp:192

 msgid "The font size units, points or pixels."
 msgstr "字体大小单位，磅值或像素值"
 
 msgid "The font size units, points or pixels."
 msgstr "字体大小单位，磅值或像素值"
 

-#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389
+#: ../src/generic/fontdlgg.cpp:386 ../src/generic/fontdlgg.cpp:388

 msgid "The font style."
 msgstr "字体风格。"
 
 msgid "The font style."
 msgstr "字体风格。"
 

-#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400
+#: ../src/generic/fontdlgg.cpp:397 ../src/generic/fontdlgg.cpp:399

 msgid "The font weight."
 msgstr "字体粗细。"
 
 msgid "The font weight."
 msgstr "字体粗细。"
 

-#: ../src/common/docview.cpp:1449
+#: ../src/common/docview.cpp:1465

 #, c-format
 msgid "The format of file '%s' couldn't be determined."
 msgstr "无法确定文件 '%s' 格式。"
 
 #, c-format
 msgid "The format of file '%s' couldn't be determined."
 msgstr "无法确定文件 '%s' 格式。"
 

-#: ../src/richtext/richtextindentspage.cpp:212
-#: ../src/richtext/richtextindentspage.cpp:214
-#: ../src/richtext/richtextliststylepage.cpp:386
-#: ../src/richtext/richtextliststylepage.cpp:388
+#: ../src/richtext/richtextindentspage.cpp:199
+#: ../src/richtext/richtextindentspage.cpp:201
+#: ../src/richtext/richtextliststylepage.cpp:385
+#: ../src/richtext/richtextliststylepage.cpp:387

 msgid "The left indent."
 msgstr "左缩进"
 
 msgid "The left indent."
 msgstr "左缩进"
 


@@ -6401,84 +6408,84 @@ msgstr "左边距大小"
 msgid "The left padding size."
 msgstr "左内衬大小"
 
 msgid "The left padding size."
 msgstr "左内衬大小"
 

-#: ../src/richtext/richtextsizepage.cpp:493
-#: ../src/richtext/richtextsizepage.cpp:495
-#: ../src/richtext/richtextsizepage.cpp:503
-#: ../src/richtext/richtextsizepage.cpp:505
+#: ../src/richtext/richtextsizepage.cpp:534
+#: ../src/richtext/richtextsizepage.cpp:536
+#: ../src/richtext/richtextsizepage.cpp:548
+#: ../src/richtext/richtextsizepage.cpp:550

 msgid "The left position."
 msgstr "左位置"
 
 msgid "The left position."
 msgstr "左位置"
 

-#: ../src/richtext/richtextindentspage.cpp:313
-#: ../src/richtext/richtextindentspage.cpp:315
-#: ../src/richtext/richtextliststylepage.cpp:463
-#: ../src/richtext/richtextliststylepage.cpp:465
+#: ../src/richtext/richtextindentspage.cpp:288
+#: ../src/richtext/richtextindentspage.cpp:290
+#: ../src/richtext/richtextliststylepage.cpp:462
+#: ../src/richtext/richtextliststylepage.cpp:464

 msgid "The line spacing."
 msgstr "行距。"
 
 msgid "The line spacing."
 msgstr "行距。"
 

-#: ../src/richtext/richtextbulletspage.cpp:269
-#: ../src/richtext/richtextbulletspage.cpp:271
+#: ../src/richtext/richtextbulletspage.cpp:268
+#: ../src/richtext/richtextbulletspage.cpp:270

 msgid "The list item number."
 msgstr "列表编号"
 
 msgid "The list item number."
 msgstr "列表编号"
 

-#: ../src/msw/ole/automtn.cpp:648
+#: ../src/msw/ole/automtn.cpp:653

 msgid "The locale ID is unknown."
 msgstr "区域ID未知"
 
 msgid "The locale ID is unknown."
 msgstr "区域ID未知"
 

-#: ../src/richtext/richtextsizepage.cpp:328
-#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:366
+#: ../src/richtext/richtextsizepage.cpp:368

 msgid "The object height."
 msgstr "对象高度。"
 
 msgid "The object height."
 msgstr "对象高度。"
 

-#: ../src/richtext/richtextsizepage.cpp:436
-#: ../src/richtext/richtextsizepage.cpp:438
+#: ../src/richtext/richtextsizepage.cpp:474
+#: ../src/richtext/richtextsizepage.cpp:476

 msgid "The object maximum height."
 msgstr "对象最大高度。"
 
 msgid "The object maximum height."
 msgstr "对象最大高度。"
 

-#: ../src/richtext/richtextsizepage.cpp:409
-#: ../src/richtext/richtextsizepage.cpp:411
+#: ../src/richtext/richtextsizepage.cpp:447
+#: ../src/richtext/richtextsizepage.cpp:449

 msgid "The object maximum width."
 msgstr "对象最大宽度。"
 
 msgid "The object maximum width."
 msgstr "对象最大宽度。"
 

-#: ../src/richtext/richtextsizepage.cpp:382
-#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:420
+#: ../src/richtext/richtextsizepage.cpp:422

 msgid "The object minimum height."
 msgstr "对象最小高度"
 
 msgid "The object minimum height."
 msgstr "对象最小高度"
 

-#: ../src/richtext/richtextsizepage.cpp:355
-#: ../src/richtext/richtextsizepage.cpp:357
+#: ../src/richtext/richtextsizepage.cpp:393
+#: ../src/richtext/richtextsizepage.cpp:395

 msgid "The object minimum width."
 msgstr "对象最小宽度。"
 
 msgid "The object minimum width."
 msgstr "对象最小宽度。"
 

-#: ../src/richtext/richtextsizepage.cpp:301
-#: ../src/richtext/richtextsizepage.cpp:303
+#: ../src/richtext/richtextsizepage.cpp:332
+#: ../src/richtext/richtextsizepage.cpp:334

 msgid "The object width."
 msgstr "对象宽度。"
 
 msgid "The object width."
 msgstr "对象宽度。"
 

-#: ../src/richtext/richtextindentspage.cpp:252
-#: ../src/richtext/richtextindentspage.cpp:254
+#: ../src/richtext/richtextindentspage.cpp:227
+#: ../src/richtext/richtextindentspage.cpp:229

 msgid "The outline level."
 msgstr "大纲层级"
 
 msgid "The outline level."
 msgstr "大纲层级"
 

-#: ../src/common/log.cpp:284
+#: ../src/common/log.cpp:281

 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] "前一消息重复 %lu 次"
 
 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] "前一消息重复 %lu 次"
 

-#: ../src/common/log.cpp:277
+#: ../src/common/log.cpp:274

 msgid "The previous message repeated once."
 msgstr "前一消息重复一次"
 
 msgid "The previous message repeated once."
 msgstr "前一消息重复一次"
 

-#: ../src/gtk/print.cpp:933 ../src/gtk/print.cpp:1116
+#: ../src/gtk/print.cpp:931 ../src/gtk/print.cpp:1114

 msgid "The print dialog returned an error."
 msgstr "打印对话返回错误"
 
 msgid "The print dialog returned an error."
 msgstr "打印对话返回错误"
 

-#: ../src/richtext/richtextsymboldlg.cpp:463
-#: ../src/richtext/richtextsymboldlg.cpp:465
+#: ../src/richtext/richtextsymboldlg.cpp:462
+#: ../src/richtext/richtextsymboldlg.cpp:464

 msgid "The range to show."
 msgstr "显示的范围。"
 
 msgid "The range to show."
 msgstr "显示的范围。"
 

-#: ../src/generic/dbgrptg.cpp:319
+#: ../src/generic/dbgrptg.cpp:322

 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"
 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"


@@ -6487,15 +6494,15 @@ msgstr ""
 "报告包含了以下文件。如果这些文件含有私人信息，\n"
 "请去掉选中相应的文件，未选中的文件就会从报告中删除。\n"
 
 "报告包含了以下文件。如果这些文件含有私人信息，\n"
 "请去掉选中相应的文件，未选中的文件就会从报告中删除。\n"
 

-#: ../src/common/cmdline.cpp:1076
+#: ../src/common/cmdline.cpp:1083

 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必须的参数 '%s' 没有指定。"
 
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必须的参数 '%s' 没有指定。"
 

-#: ../src/richtext/richtextindentspage.cpp:230
-#: ../src/richtext/richtextindentspage.cpp:232
-#: ../src/richtext/richtextliststylepage.cpp:404
-#: ../src/richtext/richtextliststylepage.cpp:406
+#: ../src/richtext/richtextindentspage.cpp:217
+#: ../src/richtext/richtextindentspage.cpp:219
+#: ../src/richtext/richtextliststylepage.cpp:403
+#: ../src/richtext/richtextliststylepage.cpp:405

 msgid "The right indent."
 msgstr "右侧缩进。"
 
 msgid "The right indent."
 msgstr "右侧缩进。"
 


@@ -6509,55 +6516,55 @@ msgstr "右边距大小。"
 msgid "The right padding size."
 msgstr "右内衬"
 
 msgid "The right padding size."
 msgstr "右内衬"
 

-#: ../src/richtext/richtextsizepage.cpp:549
-#: ../src/richtext/richtextsizepage.cpp:551
-#: ../src/richtext/richtextsizepage.cpp:559
-#: ../src/richtext/richtextsizepage.cpp:561
+#: ../src/richtext/richtextsizepage.cpp:604
+#: ../src/richtext/richtextsizepage.cpp:606
+#: ../src/richtext/richtextsizepage.cpp:618
+#: ../src/richtext/richtextsizepage.cpp:620

 msgid "The right position."
 msgstr "又位置"
 
 msgid "The right position."
 msgstr "又位置"
 

-#: ../src/richtext/richtextindentspage.cpp:292
-#: ../src/richtext/richtextliststylepage.cpp:440
-#: ../src/richtext/richtextliststylepage.cpp:442
+#: ../src/richtext/richtextindentspage.cpp:267
+#: ../src/richtext/richtextliststylepage.cpp:439
+#: ../src/richtext/richtextliststylepage.cpp:441

 msgid "The spacing after the paragraph."
 msgstr "段落之后的间距。"
 
 msgid "The spacing after the paragraph."
 msgstr "段落之后的间距。"
 

-#: ../src/richtext/richtextindentspage.cpp:282
-#: ../src/richtext/richtextindentspage.cpp:284
-#: ../src/richtext/richtextliststylepage.cpp:431
-#: ../src/richtext/richtextliststylepage.cpp:433
+#: ../src/richtext/richtextindentspage.cpp:257
+#: ../src/richtext/richtextindentspage.cpp:259
+#: ../src/richtext/richtextliststylepage.cpp:430
+#: ../src/richtext/richtextliststylepage.cpp:432

 msgid "The spacing before the paragraph."
 msgstr "段落之前的间距。"
 
 msgid "The spacing before the paragraph."
 msgstr "段落之前的间距。"
 

-#: ../src/richtext/richtextstylepage.cpp:109
-#: ../src/richtext/richtextstylepage.cpp:111
+#: ../src/richtext/richtextstylepage.cpp:108
+#: ../src/richtext/richtextstylepage.cpp:110

 msgid "The style name."
 msgstr "样式名称"
 
 msgid "The style name."
 msgstr "样式名称"
 

-#: ../src/richtext/richtextstylepage.cpp:119
-#: ../src/richtext/richtextstylepage.cpp:121
+#: ../src/richtext/richtextstylepage.cpp:118
+#: ../src/richtext/richtextstylepage.cpp:120

 msgid "The style on which this style is based."
 msgstr "此样式的基础样式"
 
 msgid "The style on which this style is based."
 msgstr "此样式的基础样式"
 

-#: ../src/richtext/richtextstyledlg.cpp:222
-#: ../src/richtext/richtextstyledlg.cpp:224
+#: ../src/richtext/richtextstyledlg.cpp:214
+#: ../src/richtext/richtextstyledlg.cpp:216

 msgid "The style preview."
 msgstr "样式预览。"
 
 msgid "The style preview."
 msgstr "样式预览。"
 

-#: ../src/msw/ole/automtn.cpp:664
+#: ../src/msw/ole/automtn.cpp:669

 msgid "The system cannot find the file specified."
 msgstr "系统无法找到指定的文件。"
 
 msgid "The system cannot find the file specified."
 msgstr "系统无法找到指定的文件。"
 

-#: ../src/richtext/richtexttabspage.cpp:119
-#: ../src/richtext/richtexttabspage.cpp:121
+#: ../src/richtext/richtexttabspage.cpp:118
+#: ../src/richtext/richtexttabspage.cpp:120

 msgid "The tab position."
 msgstr "标签位置"
 
 msgid "The tab position."
 msgstr "标签位置"
 

-#: ../src/richtext/richtexttabspage.cpp:125
+#: ../src/richtext/richtexttabspage.cpp:124

 msgid "The tab positions."
 msgstr "标签位置"
 
 msgid "The tab positions."
 msgstr "标签位置"
 

-#: ../src/richtext/richtextctrl.cpp:2681
+#: ../src/richtext/richtextctrl.cpp:2705

 msgid "The text couldn't be saved."
 msgstr "文本无法保存。"
 
 msgid "The text couldn't be saved."
 msgstr "文本无法保存。"
 


@@ -6571,385 +6578,386 @@ msgstr "上边距大小。"
 msgid "The top padding size."
 msgstr "上内衬大小"
 
 msgid "The top padding size."
 msgstr "上内衬大小"
 

-#: ../src/richtext/richtextsizepage.cpp:521
-#: ../src/richtext/richtextsizepage.cpp:523
-#: ../src/richtext/richtextsizepage.cpp:531
-#: ../src/richtext/richtextsizepage.cpp:533
+#: ../src/richtext/richtextsizepage.cpp:569
+#: ../src/richtext/richtextsizepage.cpp:571
+#: ../src/richtext/richtextsizepage.cpp:583
+#: ../src/richtext/richtextsizepage.cpp:585

 msgid "The top position."
 msgstr "顶部位置。"
 
 msgid "The top position."
 msgstr "顶部位置。"
 

-#: ../src/common/cmdline.cpp:1054
+#: ../src/common/cmdline.cpp:1061

 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s' 的值必须被指定。"
 
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s' 的值必须被指定。"
 

-#: ../src/msw/dialup.cpp:453
+#: ../src/msw/dialup.cpp:452

 #, 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)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (缺少下列必要的函数: %s)."
 
 #, 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)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (缺少下列必要的函数: %s)."
 

-#: ../src/gtk/print.cpp:961
+#: ../src/gtk/print.cpp:959

 msgid "The wxGtkPrinterDC cannot be used."
 msgstr "wxGtkPrinterDC无法使用"
 
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr "wxGtkPrinterDC无法使用"
 

-#: ../src/osx/carbon/dataview.cpp:1341
+#: ../src/osx/carbon/dataview.cpp:1340

 msgid "There is no column or renderer for the specified column index."
 msgstr "所指定的列索引或渲染器不存在"
 
 msgid "There is no column or renderer for the specified column index."
 msgstr "所指定的列索引或渲染器不存在"
 

-#: ../src/richtext/richtextprint.cpp:611 ../src/html/htmprint.cpp:736
+#: ../src/richtext/richtextprint.cpp:614 ../src/html/htmprint.cpp:735

 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
 
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
 

-#: ../src/html/htmprint.cpp:256
+#: ../src/html/htmprint.cpp:255

 msgid ""
 "This document doesn't fit on the page horizontally and will be truncated "
 "when it is printed."
 msgstr "该文档的水平尺寸不符合页面，若打印将会被截断。"
 
 msgid ""
 "This document doesn't fit on the page horizontally and will be truncated "
 "when it is printed."
 msgstr "该文档的水平尺寸不符合页面，若打印将会被截断。"
 

-#: ../src/common/image.cpp:2609
+#: ../src/common/image.cpp:2716

 #, c-format
 msgid "This is not a %s."
 msgstr "这不是 %s。"
 
 #, c-format
 msgid "This is not a %s."
 msgstr "这不是 %s。"
 

-#: ../src/common/wincmn.cpp:1633
+#: ../src/common/wincmn.cpp:1653

 msgid "This platform does not support background transparency."
 msgstr "该平台不支持背景透明度"
 
 msgid "This platform does not support background transparency."
 msgstr "该平台不支持背景透明度"
 

-#: ../src/gtk/window.cpp:4239
+#: ../src/gtk/window.cpp:4317

 msgid ""
 "This program was compiled with a too old version of GTK+, please rebuild "
 "with GTK+ 2.12 or newer."
 msgstr "该应用由过早版本的GTK+编译，请用GTK+ 2.12或以上版本重新构建。"
 
 msgid ""
 "This program was compiled with a too old version of GTK+, please rebuild "
 "with GTK+ 2.12 or newer."
 msgstr "该应用由过早版本的GTK+编译，请用GTK+ 2.12或以上版本重新构建。"
 

-#: ../src/msw/datecontrols.cpp:60
+#: ../src/msw/datecontrols.cpp:59

 msgid ""
 "This system doesn't support date controls, please upgrade your version of "
 "comctl32.dll"
 msgstr "本系统不支持日期控制, 请升级您的comctl32.dll"
 
 msgid ""
 "This system doesn't support date controls, please upgrade your version of "
 "comctl32.dll"
 msgstr "本系统不支持日期控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1290
+#: ../src/msw/thread.cpp:1300

 msgid ""
 "Thread module initialization failed: cannot store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 
 msgid ""
 "Thread module initialization failed: cannot store value in thread local "
 "storage"
 msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 

-#: ../src/unix/threadpsx.cpp:1719
+#: ../src/unix/threadpsx.cpp:1758

 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "线程模块初始化失败: 创建线程键失败"
 

-#: ../src/msw/thread.cpp:1278
+#: ../src/msw/thread.cpp:1288

 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 

-#: ../src/unix/threadpsx.cpp:1221
+#: ../src/unix/threadpsx.cpp:1038

 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略。"
 
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略。"
 

-#: ../src/msw/mdi.cpp:165
+#: ../src/msw/mdi.cpp:172

 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 
 msgid "Tile &Horizontally"
 msgstr "水平排布(&H)"
 

-#: ../src/msw/mdi.cpp:166
+#: ../src/msw/mdi.cpp:173

 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 

-#: ../src/common/ftp.cpp:203
+#: ../src/common/ftp.cpp:202

 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时，请尝试用 passive 模式。"
 
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgstr "等待FTP服务器连接时超时，请尝试用 passive 模式。"
 

-#: ../src/os2/timer.cpp:100
+#: ../src/os2/timer.cpp:99

 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 
 msgid "Timer creation failed."
 msgstr "计时器创建失败"
 

-#: ../src/generic/tipdlg.cpp:221
+#: ../src/generic/tipdlg.cpp:220

 msgid "Tip of the Day"
 msgstr "每日技巧"
 
 msgid "Tip of the Day"
 msgstr "每日技巧"
 

-#: ../src/generic/tipdlg.cpp:155
+#: ../src/generic/tipdlg.cpp:154

 msgid "Tips not available, sorry!"
 msgstr "对不起，没有所需的提示！"
 
 msgid "Tips not available, sorry!"
 msgstr "对不起，没有所需的提示！"
 

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

 msgid "To:"
 msgstr "到:"
 
 msgid "To:"
 msgstr "到:"
 

-#: ../src/osx/carbon/dataview.cpp:2452
+#: ../src/osx/carbon/dataview.cpp:2451

 msgid "Toggle renderer cannot render value; value type: "
 msgstr "切换渲染器无法渲染该；类型为:"
 
 msgid "Toggle renderer cannot render value; value type: "
 msgstr "切换渲染器无法渲染该；类型为:"
 

-#: ../src/richtext/richtextbuffer.cpp:7499
+#: ../src/richtext/richtextbuffer.cpp:7983

 msgid "Too many EndStyle calls!"
 msgstr "呼叫EndStyle太多次！"
 
 msgid "Too many EndStyle calls!"
 msgstr "呼叫EndStyle太多次！"
 

-#: ../src/common/imagpng.cpp:287
+#: ../src/common/imagpng.cpp:286

 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 

-#: ../src/richtext/richtextsizepage.cpp:262
-#: ../src/richtext/richtextsizepage.cpp:265
-#: ../src/richtext/richtextsizepage.cpp:266 ../src/common/stockitem.cpp:201
+#: ../src/richtext/richtextsizepage.cpp:286
+#: ../src/richtext/richtextsizepage.cpp:290 ../src/common/stockitem.cpp:200

 msgid "Top"
 msgstr "顶端"
 
 msgid "Top"
 msgstr "顶端"
 

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

 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 

-#: ../src/generic/aboutdlgg.cpp:80
+#: ../src/generic/aboutdlgg.cpp:79

 msgid "Translations by "
 msgstr "翻译由"
 
 msgid "Translations by "
 msgstr "翻译由"
 

-#: ../src/generic/aboutdlgg.cpp:189
+#: ../src/generic/aboutdlgg.cpp:188

 msgid "Translators"
 msgstr "翻译者"
 
 msgid "Translators"
 msgstr "翻译者"
 

-#: ../src/propgrid/propgrid.cpp:174
+#: ../src/propgrid/propgrid.cpp:173

 msgid "True"
 msgstr "True"
 
 msgid "True"
 msgstr "True"
 

-#: ../src/common/fs_mem.cpp:228
+#: ../src/common/fs_mem.cpp:227

 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存 VFS 中移去文件 '%s'，但它并没有被装入内存！"
 
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "试图从内存 VFS 中移去文件 '%s'，但它并没有被装入内存！"
 

-#: ../src/common/fmapbase.cpp:157
+#: ../src/common/fmapbase.cpp:156

 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 

-#: ../src/generic/filectrlg.cpp:455
+#: ../src/generic/filectrlg.cpp:461

 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: ../src/richtext/richtextfontpage.cpp:158

 #: ../src/richtext/richtextfontpage.cpp:160
 #: ../src/richtext/richtextfontpage.cpp:160

+#: ../src/richtext/richtextfontpage.cpp:162

 msgid "Type a font name."
 msgstr "输入字体名称。"
 
 msgid "Type a font name."
 msgstr "输入字体名称。"
 

-#: ../src/richtext/richtextfontpage.cpp:173

 #: ../src/richtext/richtextfontpage.cpp:175
 #: ../src/richtext/richtextfontpage.cpp:175

+#: ../src/richtext/richtextfontpage.cpp:177

 msgid "Type a size in points."
 msgstr "输入大小，以磅为单位"
 
 msgid "Type a size in points."
 msgstr "输入大小，以磅为单位"
 

-#: ../src/msw/ole/automtn.cpp:660
+#: ../src/msw/ole/automtn.cpp:665

 #, c-format
 msgid "Type mismatch in argument %u."
 msgstr "参数 %u 的类型不匹配。"
 
 #, c-format
 msgid "Type mismatch in argument %u."
 msgstr "参数 %u 的类型不匹配。"
 

-#: ../src/common/xtixml.cpp:357 ../src/common/xtixml.cpp:510
-#: ../src/common/xtistrm.cpp:323
+#: ../src/common/xtixml.cpp:356 ../src/common/xtixml.cpp:509
+#: ../src/common/xtistrm.cpp:322

 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 

-#: ../src/propgrid/propgridiface.cpp:383
+#: ../src/propgrid/propgridiface.cpp:382

 #, c-format
 msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
 
 #, c-format
 msgid ""
 "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
 "\"%s\"."
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:59
+#: ../src/common/accelcmn.cpp:58

 msgid "UP"
 msgstr "UP"
 
 msgid "UP"
 msgstr "UP"
 

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

 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "美国标准复写簿，14 7/8 x 11 英寸"
 
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "美国标准复写簿，14 7/8 x 11 英寸"
 

-#: ../src/common/fmapbase.cpp:197
+#: ../src/common/fmapbase.cpp:196

 msgid "US-ASCII"
 msgstr "US-ASCII"
 
 msgid "US-ASCII"
 msgstr "US-ASCII"
 

-#: ../src/unix/fswatcher_inotify.cpp:110
+#: ../src/unix/fswatcher_inotify.cpp:109

 msgid "Unable to add inotify watch"
 msgstr "无法添加 inotify watch"
 
 msgid "Unable to add inotify watch"
 msgstr "无法添加 inotify watch"
 

-#: ../src/unix/fswatcher_kqueue.cpp:137
+#: ../src/unix/fswatcher_kqueue.cpp:136

 msgid "Unable to add kqueue watch"
 msgstr "无法添加 kqueue watch"
 
 msgid "Unable to add kqueue watch"
 msgstr "无法添加 kqueue watch"
 

-#: ../include/wx/msw/private/fswatcher.h:143
+#: ../include/wx/msw/private/fswatcher.h:142

 msgid "Unable to associate handle with I/O completion port"
 msgid "Unable to associate handle with I/O completion port"

-msgstr ""
+msgstr "无法将句柄与 I/O 完成端口相关联"

 
 

-#: ../include/wx/msw/private/fswatcher.h:126
-#, fuzzy
+#: ../include/wx/msw/private/fswatcher.h:125

 msgid "Unable to close I/O completion port handle"
 msgid "Unable to close I/O completion port handle"

-msgstr "关闭文件句柄失败."
+msgstr "无法关闭 I/O 完成口的句柄"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:98
+#: ../src/unix/fswatcher_inotify.cpp:97

 msgid "Unable to close inotify instance"
 msgstr "无法关闭 inotify 实例"
 
 msgid "Unable to close inotify instance"
 msgstr "无法关闭 inotify 实例"
 

-#: ../include/wx/unix/private/fswatcher_kqueue.h:75
+#: ../include/wx/unix/private/fswatcher_kqueue.h:74

 #, c-format
 msgid "Unable to close path '%s'"
 msgstr "无法关闭路径 '%s'"
 
 #, c-format
 msgid "Unable to close path '%s'"
 msgstr "无法关闭路径 '%s'"
 

-#: ../include/wx/msw/private/fswatcher.h:49
+#: ../include/wx/msw/private/fswatcher.h:48

 #, c-format
 msgid "Unable to close the handle for '%s'"
 msgstr "无法关闭 '%s' 的句柄。"
 
 #, c-format
 msgid "Unable to close the handle for '%s'"
 msgstr "无法关闭 '%s' 的句柄。"
 

-#: ../include/wx/msw/private/fswatcher.h:241
-#, fuzzy
+#: ../include/wx/msw/private/fswatcher.h:240

 msgid "Unable to create I/O completion port"
 msgid "Unable to create I/O completion port"

-msgstr "创建游标失败."
+msgstr "无法创建 I/O 完成口"

 
 

-#: ../src/msw/fswatcher.cpp:85
-#, fuzzy
+#: ../src/msw/fswatcher.cpp:84

 msgid "Unable to create IOCP worker thread"
 msgid "Unable to create IOCP worker thread"

-msgstr "创建 MDI 父框架失败."
+msgstr "无法创建 IOCP 工作线程"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:75
+#: ../src/unix/fswatcher_inotify.cpp:74

 msgid "Unable to create inotify instance"
 msgstr "无法创建 inotify 实例"
 
 msgid "Unable to create inotify instance"
 msgstr "无法创建 inotify 实例"
 

-#: ../src/unix/fswatcher_kqueue.cpp:98
+#: ../src/unix/fswatcher_kqueue.cpp:97

 msgid "Unable to create kqueue instance"
 msgstr "无法创建 kqueue 实例"
 
 msgid "Unable to create kqueue instance"
 msgstr "无法创建 kqueue 实例"
 

-#: ../include/wx/msw/private/fswatcher.h:230
+#: ../include/wx/msw/private/fswatcher.h:229

 msgid "Unable to dequeue completion packet"
 msgid "Unable to dequeue completion packet"

-msgstr ""
+msgstr "无法移出完成封包"

 
 

-#: ../src/unix/fswatcher_kqueue.cpp:187
+#: ../src/unix/fswatcher_kqueue.cpp:185

 msgid "Unable to get events from kqueue"
 msgid "Unable to get events from kqueue"

-msgstr ""
+msgstr "无法从 kqueue 中获取事件"

 
 

-#: ../src/osx/carbon/dataview.cpp:1904
+#: ../src/osx/carbon/dataview.cpp:1903

 msgid "Unable to handle native drag&drop data"
 msgid "Unable to handle native drag&drop data"

-msgstr ""
+msgstr "无法处理原生的拖放数据"

 
 

-#: ../src/gtk/app.cpp:442
+#: ../src/gtk/app.cpp:439

 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr "无法初始化 GTK+，DISPLAY 是否已正确设置？"
 
 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr "无法初始化 GTK+，DISPLAY 是否已正确设置？"
 

-#: ../src/gtk/app.cpp:275
+#: ../src/gtk/app.cpp:276

 msgid "Unable to initialize Hildon program"
 msgstr "无法初始化 Hildon 程序"
 
 msgid "Unable to initialize Hildon program"
 msgstr "无法初始化 Hildon 程序"
 

-#: ../include/wx/unix/private/fswatcher_kqueue.h:58
+#: ../include/wx/unix/private/fswatcher_kqueue.h:57

 #, c-format
 msgid "Unable to open path '%s'"
 msgstr "无法打开路径 '%s'"
 
 #, c-format
 msgid "Unable to open path '%s'"
 msgstr "无法打开路径 '%s'"
 

-#: ../src/html/htmlwin.cpp:557
+#: ../src/html/htmlwin.cpp:561

 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "无法打开 HTML 文档: %s"
 
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "无法打开 HTML 文档: %s"
 

-#: ../src/unix/sound.cpp:369
+#: ../src/unix/sound.cpp:368

 msgid "Unable to play sound asynchronously."
 msgstr "无法异步地播放声音。"
 
 msgid "Unable to play sound asynchronously."
 msgstr "无法异步地播放声音。"
 

-#: ../include/wx/msw/private/fswatcher.h:208
+#: ../include/wx/msw/private/fswatcher.h:207

 msgid "Unable to post completion status"
 msgid "Unable to post completion status"

-msgstr ""
+msgstr "无法贴上完成状态"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:353
+#: ../src/unix/fswatcher_inotify.cpp:530

 msgid "Unable to read from inotify descriptor"
 msgstr "无法读取 inotify 描述符"
 
 msgid "Unable to read from inotify descriptor"
 msgstr "无法读取 inotify 描述符"
 

-#: ../src/unix/fswatcher_inotify.cpp:133
+#: ../src/unix/fswatcher_inotify.cpp:132

 msgid "Unable to remove inotify watch"
 msgstr "无法删除 inotify watch"
 
 msgid "Unable to remove inotify watch"
 msgstr "无法删除 inotify watch"
 

-#: ../src/unix/fswatcher_kqueue.cpp:155
+#: ../src/unix/fswatcher_kqueue.cpp:153

 msgid "Unable to remove kqueue watch"
 msgstr "无法删除 kqueue watch"
 
 msgid "Unable to remove kqueue watch"
 msgstr "无法删除 kqueue watch"
 

-#: ../src/msw/fswatcher.cpp:169
+#: ../src/msw/fswatcher.cpp:168

 #, c-format
 msgid "Unable to set up watch for '%s'"
 msgstr "无法为 '%s' 设定 watch"
 
 #, c-format
 msgid "Unable to set up watch for '%s'"
 msgstr "无法为 '%s' 设定 watch"
 

-#: ../src/msw/fswatcher.cpp:92
+#: ../src/msw/fswatcher.cpp:91

 msgid "Unable to start IOCP worker thread"
 msgstr "无法开始 IOCP 工作线程"
 
 msgid "Unable to start IOCP worker thread"
 msgstr "无法开始 IOCP 工作线程"
 

-#: ../src/common/stockitem.cpp:202
+#: ../src/common/stockitem.cpp:201

 msgid "Undelete"
 msgstr "取消删除"
 
 msgid "Undelete"
 msgstr "取消删除"
 

-#: ../src/common/stockitem.cpp:203
+#: ../src/common/stockitem.cpp:202

 msgid "Underline"
 msgstr "下划线"
 
 msgid "Underline"
 msgstr "下划线"
 

-#: ../src/richtext/richtextfontpage.cpp:332 ../src/osx/carbon/fontdlg.cpp:554
-#: ../src/propgrid/advprops.cpp:656
+#: ../src/richtext/richtextfontpage.cpp:341 ../src/osx/carbon/fontdlg.cpp:556
+#: ../src/propgrid/advprops.cpp:655

 msgid "Underlined"
 msgstr "下划线"
 
 msgid "Underlined"
 msgstr "下划线"
 

-#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16
+#: ../src/common/stockitem.cpp:203 ../src/stc/stc_i18n.cpp:15

 msgid "Undo"
 msgstr "撤销"
 
 msgid "Undo"
 msgstr "撤销"
 

-#: ../src/common/stockitem.cpp:266
+#: ../src/common/stockitem.cpp:265

 msgid "Undo last action"
 msgstr "撤销上一次操作"
 
 msgid "Undo last action"
 msgstr "撤销上一次操作"
 

-#: ../src/common/cmdline.cpp:857
+#: ../src/common/cmdline.cpp:864

 #, c-format
 msgid "Unexpected characters following option '%s'."
 msgstr "选项 '%s' 后有意外字符。"
 
 #, c-format
 msgid "Unexpected characters following option '%s'."
 msgstr "选项 '%s' 后有意外字符。"
 

-#: ../src/common/cmdline.cpp:1017
+#: ../src/unix/fswatcher_inotify.cpp:261
+#, c-format
+msgid "Unexpected event for \"%s\": no matching watch descriptor."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1024

 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 

-#: ../include/wx/msw/private/fswatcher.h:149
+#: ../include/wx/msw/private/fswatcher.h:148

 msgid "Unexpectedly new I/O completion port was created"
 msgstr ""
 
 msgid "Unexpectedly new I/O completion port was created"
 msgstr ""
 

-#: ../src/msw/fswatcher.cpp:71
+#: ../src/msw/fswatcher.cpp:70

 msgid "Ungraceful worker thread termination"
 msgstr "工作线程非正常终止"
 
 msgid "Ungraceful worker thread termination"
 msgstr "工作线程非正常终止"
 

+#: ../src/richtext/richtextsymboldlg.cpp:459

 #: ../src/richtext/richtextsymboldlg.cpp:460
 #: ../src/richtext/richtextsymboldlg.cpp:461
 #: ../src/richtext/richtextsymboldlg.cpp:460
 #: ../src/richtext/richtextsymboldlg.cpp:461

-#: ../src/richtext/richtextsymboldlg.cpp:462

 msgid "Unicode"
 msgstr "Unicode 编码"
 
 msgid "Unicode"
 msgstr "Unicode 编码"
 

-#: ../src/common/fmapbase.cpp:186 ../src/common/fmapbase.cpp:192
+#: ../src/common/fmapbase.cpp:185 ../src/common/fmapbase.cpp:191

 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的 Unicode 编码 (UTF-16)"
 
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "16位的 Unicode 编码 (UTF-16)"
 

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

 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序 Unicode 编码 (UTF-16BE)"
 
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "16位大字节序 Unicode 编码 (UTF-16BE)"
 

-#: ../src/common/fmapbase.cpp:187
+#: ../src/common/fmapbase.cpp:186

 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序 Unicode 编码 (UTF-16LE)"
 
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "16位小字节序 Unicode 编码 (UTF-16LE)"
 

-#: ../src/common/fmapbase.cpp:188 ../src/common/fmapbase.cpp:194
+#: ../src/common/fmapbase.cpp:187 ../src/common/fmapbase.cpp:193

 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的 Unicode 编码 (UTF-32)"
 
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "32位的 Unicode 编码 (UTF-32)"
 

-#: ../src/common/fmapbase.cpp:193
+#: ../src/common/fmapbase.cpp:192

 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序 Unicode 编码 (UTF-32BE)"
 
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "32位大字节序 Unicode 编码 (UTF-32BE)"
 

-#: ../src/common/fmapbase.cpp:189
+#: ../src/common/fmapbase.cpp:188

 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序 Unicode 编码 (UTF-32LE)"
 
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "32位小字节序 Unicode 编码 (UTF-32LE)"
 

-#: ../src/common/fmapbase.cpp:183
+#: ../src/common/fmapbase.cpp:182

 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的 Unicode 编码 (UTF-7)"
 
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "7位的 Unicode 编码 (UTF-7)"
 

-#: ../src/common/fmapbase.cpp:184
+#: ../src/common/fmapbase.cpp:183

 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的 Unicode 编码 (UTF-8)"
 
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的 Unicode 编码 (UTF-8)"
 

-#: ../src/common/stockitem.cpp:205
+#: ../src/common/stockitem.cpp:204

 msgid "Unindent"
 msgstr "取消缩进"
 
 msgid "Unindent"
 msgstr "取消缩进"
 


@@ -6973,8 +6981,8 @@ msgstr "下轮廓单位"
 msgid "Units for the bottom padding."
 msgstr "下内衬单位"
 
 msgid "Units for the bottom padding."
 msgstr "下内衬单位"
 

-#: ../src/richtext/richtextsizepage.cpp:598
-#: ../src/richtext/richtextsizepage.cpp:600
+#: ../src/richtext/richtextsizepage.cpp:664
+#: ../src/richtext/richtextsizepage.cpp:666

 msgid "Units for the bottom position."
 msgstr "下位置单位"
 
 msgid "Units for the bottom position."
 msgstr "下位置单位"
 


@@ -6998,38 +7006,38 @@ msgstr "左轮廓单位"
 msgid "Units for the left padding."
 msgstr "左内衬单位"
 
 msgid "Units for the left padding."
 msgstr "左内衬单位"
 

-#: ../src/richtext/richtextsizepage.cpp:514
-#: ../src/richtext/richtextsizepage.cpp:516
+#: ../src/richtext/richtextsizepage.cpp:559
+#: ../src/richtext/richtextsizepage.cpp:561

 msgid "Units for the left position."
 msgstr "左位置单位"
 
 msgid "Units for the left position."
 msgstr "左位置单位"
 

-#: ../src/richtext/richtextsizepage.cpp:447
-#: ../src/richtext/richtextsizepage.cpp:449
+#: ../src/richtext/richtextsizepage.cpp:485
+#: ../src/richtext/richtextsizepage.cpp:487

 msgid "Units for the maximum object height."
 msgstr "最大对象高度单位。"
 
 msgid "Units for the maximum object height."
 msgstr "最大对象高度单位。"
 

-#: ../src/richtext/richtextsizepage.cpp:420
-#: ../src/richtext/richtextsizepage.cpp:422
+#: ../src/richtext/richtextsizepage.cpp:458
+#: ../src/richtext/richtextsizepage.cpp:460

 msgid "Units for the maximum object width."
 msgstr "最大对象宽度单位。"
 
 msgid "Units for the maximum object width."
 msgstr "最大对象宽度单位。"
 

-#: ../src/richtext/richtextsizepage.cpp:393
-#: ../src/richtext/richtextsizepage.cpp:395
+#: ../src/richtext/richtextsizepage.cpp:431
+#: ../src/richtext/richtextsizepage.cpp:433

 msgid "Units for the minimum object height."
 msgstr "最小对象高度单位。"
 
 msgid "Units for the minimum object height."
 msgstr "最小对象高度单位。"
 

-#: ../src/richtext/richtextsizepage.cpp:366
-#: ../src/richtext/richtextsizepage.cpp:368
+#: ../src/richtext/richtextsizepage.cpp:404
+#: ../src/richtext/richtextsizepage.cpp:406

 msgid "Units for the minimum object width."
 msgstr "最小对象宽度单位。"
 
 msgid "Units for the minimum object width."
 msgstr "最小对象宽度单位。"
 

-#: ../src/richtext/richtextsizepage.cpp:339
-#: ../src/richtext/richtextsizepage.cpp:341
+#: ../src/richtext/richtextsizepage.cpp:377
+#: ../src/richtext/richtextsizepage.cpp:379

 msgid "Units for the object height."
 msgstr "对象高度单位"
 
 msgid "Units for the object height."
 msgstr "对象高度单位"
 

-#: ../src/richtext/richtextsizepage.cpp:312
-#: ../src/richtext/richtextsizepage.cpp:314
+#: ../src/richtext/richtextsizepage.cpp:343
+#: ../src/richtext/richtextsizepage.cpp:345

 msgid "Units for the object width."
 msgstr "对象宽度单位"
 
 msgid "Units for the object width."
 msgstr "对象宽度单位"
 


@@ -7053,8 +7061,8 @@ msgstr "右轮廓单位"
 msgid "Units for the right padding."
 msgstr "右内衬单位"
 
 msgid "Units for the right padding."
 msgstr "右内衬单位"
 

-#: ../src/richtext/richtextsizepage.cpp:570
-#: ../src/richtext/richtextsizepage.cpp:572
+#: ../src/richtext/richtextsizepage.cpp:629
+#: ../src/richtext/richtextsizepage.cpp:631

 msgid "Units for the right position."
 msgstr "右位置单位"
 
 msgid "Units for the right position."
 msgstr "右位置单位"
 


@@ -7078,161 +7086,161 @@ msgstr "上轮廓单位"
 msgid "Units for the top padding."
 msgstr "上内衬单位"
 
 msgid "Units for the top padding."
 msgstr "上内衬单位"
 

-#: ../src/richtext/richtextsizepage.cpp:542
-#: ../src/richtext/richtextsizepage.cpp:544
+#: ../src/richtext/richtextsizepage.cpp:594
+#: ../src/richtext/richtextsizepage.cpp:596

 msgid "Units for the top position."
 msgstr "上位置单位"
 
 msgid "Units for the top position."
 msgstr "上位置单位"
 

-#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656
+#: ../src/generic/progdlgg.cpp:382 ../src/generic/progdlgg.cpp:655

 msgid "Unknown"
 msgstr "未知"
 
 msgid "Unknown"
 msgstr "未知"
 

-#: ../src/msw/dde.cpp:1178
+#: ../src/msw/dde.cpp:1177

 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 

-#: ../src/common/xtistrm.cpp:415
+#: ../src/common/xtistrm.cpp:414

 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象传递给 GetObjectClassInfo"
 
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象传递给 GetObjectClassInfo"
 

-#: ../src/common/imagpng.cpp:615
+#: ../src/common/imagpng.cpp:614

 #, c-format
 msgid "Unknown PNG resolution unit %d"
 msgstr "未知 PNG 解析度单位 %d"
 
 #, c-format
 msgid "Unknown PNG resolution unit %d"
 msgstr "未知 PNG 解析度单位 %d"
 

-#: ../src/common/xtixml.cpp:328
+#: ../src/common/xtixml.cpp:327

 #, c-format
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 
 #, c-format
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 

-#: ../src/common/imagtiff.cpp:533
+#: ../src/common/imagtiff.cpp:532

 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"

-msgstr ""
+msgstr "未知 TIFF 解析度单位 %d，忽略之"

 
 

-#: ../src/osx/carbon/dataview.cpp:1979
+#: ../src/osx/carbon/dataview.cpp:1978

 msgid "Unknown data format"
 msgstr "未知数据格式"
 
 msgid "Unknown data format"
 msgstr "未知数据格式"
 

-#: ../src/unix/dlunix.cpp:335
+#: ../src/unix/dlunix.cpp:325

 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

-#: ../src/common/fmapbase.cpp:811
+#: ../src/common/fmapbase.cpp:810

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 

-#: ../src/msw/ole/automtn.cpp:672
+#: ../src/msw/ole/automtn.cpp:677

 #, c-format
 msgid "Unknown error %08x"
 msgstr "未知错误 %08x"
 
 #, c-format
 msgid "Unknown error %08x"
 msgstr "未知错误 %08x"
 

-#: ../src/msw/ole/automtn.cpp:631
+#: ../src/msw/ole/automtn.cpp:636

 msgid "Unknown exception"
 msgstr "未知异常"
 
 msgid "Unknown exception"
 msgstr "未知异常"
 

-#: ../src/common/image.cpp:2594
+#: ../src/common/image.cpp:2701

 msgid "Unknown image data format."
 msgstr "未知图像数据格式"
 
 msgid "Unknown image data format."
 msgstr "未知图像数据格式"
 

-#: ../src/common/cmdline.cpp:742
+#: ../src/common/cmdline.cpp:749

 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 

-#: ../src/msw/ole/automtn.cpp:615
+#: ../src/msw/ole/automtn.cpp:620

 msgid "Unknown name or named argument."
 msgstr "未知名称或者命名参数"
 
 msgid "Unknown name or named argument."
 msgstr "未知名称或者命名参数"
 

-#: ../src/common/cmdline.cpp:757 ../src/common/cmdline.cpp:779
+#: ../src/common/cmdline.cpp:764 ../src/common/cmdline.cpp:786

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 

-#: ../src/common/mimecmn.cpp:231
+#: ../src/common/mimecmn.cpp:230

 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s 中有不配套的 '{'。"
 
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s 中有不配套的 '{'。"
 

-#: ../src/common/cmdproc.cpp:263 ../src/common/cmdproc.cpp:289
-#: ../src/common/cmdproc.cpp:309
+#: ../src/common/cmdproc.cpp:262 ../src/common/cmdproc.cpp:288
+#: ../src/common/cmdproc.cpp:308

 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 msgid "Unnamed command"
 msgstr "未命名的命令"
 

-#: ../src/propgrid/propgrid.cpp:399
+#: ../src/propgrid/propgrid.cpp:398

 msgid "Unspecified"
 msgstr "未指定"
 
 msgid "Unspecified"
 msgstr "未指定"
 

-#: ../src/msw/clipbrd.cpp:272 ../src/msw/clipbrd.cpp:440
+#: ../src/msw/clipbrd.cpp:271 ../src/msw/clipbrd.cpp:439

 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式。"
 
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式。"
 

-#: ../src/common/appcmn.cpp:229
+#: ../src/common/appcmn.cpp:249

 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题 '%s'。"
 
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题 '%s'。"
 

-#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206
+#: ../src/generic/fdrepdlg.cpp:152 ../src/common/stockitem.cpp:205

 msgid "Up"
 msgstr "向上"
 
 msgid "Up"
 msgstr "向上"
 

-#: ../src/richtext/richtextliststylepage.cpp:484
-#: ../src/richtext/richtextbulletspage.cpp:289
+#: ../src/richtext/richtextliststylepage.cpp:483
+#: ../src/richtext/richtextbulletspage.cpp:288

 msgid "Upper case letters"
 msgstr "大写字母"
 
 msgid "Upper case letters"
 msgstr "大写字母"
 

-#: ../src/richtext/richtextliststylepage.cpp:486
-#: ../src/richtext/richtextbulletspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:485
+#: ../src/richtext/richtextbulletspage.cpp:290

 msgid "Upper case roman numerals"
 msgid "Upper case roman numerals"

-msgstr ""
+msgstr "大写罗马数字"

 
 

-#: ../src/common/cmdline.cpp:1148
+#: ../src/common/cmdline.cpp:1155

 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 

-#: ../src/richtext/richtextindentspage.cpp:182
-#: ../src/richtext/richtextindentspage.cpp:184
-#: ../src/richtext/richtextliststylepage.cpp:359
-#: ../src/richtext/richtextliststylepage.cpp:361
+#: ../src/richtext/richtextindentspage.cpp:169
+#: ../src/richtext/richtextindentspage.cpp:171
+#: ../src/richtext/richtextliststylepage.cpp:358
+#: ../src/richtext/richtextliststylepage.cpp:360

 msgid "Use the current alignment setting."
 msgid "Use the current alignment setting."

-msgstr ""
+msgstr "使用当前的对齐设置。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724
+#: ../src/osx/carbon/dataview.cpp:2658 ../src/osx/carbon/dataview.cpp:2723

 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 
 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 

-#: ../src/common/valtext.cpp:175
+#: ../src/common/valtext.cpp:174

 msgid "Validation conflict"
 msgstr "验证冲突"
 
 msgid "Validation conflict"
 msgstr "验证冲突"
 

-#: ../src/propgrid/manager.cpp:239
+#: ../src/propgrid/manager.cpp:238

 msgid "Value"
 msgstr "值"
 
 msgid "Value"
 msgstr "值"
 

-#: ../src/propgrid/props.cpp:385
+#: ../src/propgrid/props.cpp:384

 #, c-format
 msgid "Value must be %s or higher."
 msgstr "数值必须大于或等于 %s。"
 
 #, c-format
 msgid "Value must be %s or higher."
 msgstr "数值必须大于或等于 %s。"
 

-#: ../src/propgrid/props.cpp:412
+#: ../src/propgrid/props.cpp:411

 #, c-format
 msgid "Value must be %s or less."
 msgstr "数值必须小于或等于 %s。"
 
 #, c-format
 msgid "Value must be %s or less."
 msgstr "数值必须小于或等于 %s。"
 

-#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416
+#: ../src/propgrid/props.cpp:388 ../src/propgrid/props.cpp:415

 #, c-format
 msgid "Value must be between %s and %s."
 msgstr "数值必须在 %s 和 %s 之间。"
 
 #, c-format
 msgid "Value must be between %s and %s."
 msgstr "数值必须在 %s 和 %s 之间。"
 

-#: ../src/generic/aboutdlgg.cpp:129
+#: ../src/generic/aboutdlgg.cpp:128

 msgid "Version "
 msgstr "版本"
 
 msgid "Version "
 msgstr "版本"
 

-#: ../src/richtext/richtextsizepage.cpp:267
-#: ../src/richtext/richtextsizepage.cpp:269
+#: ../src/richtext/richtextsizepage.cpp:291
+#: ../src/richtext/richtextsizepage.cpp:293

 msgid "Vertical alignment."
 msgstr "垂直对齐。"
 
 msgid "Vertical alignment."
 msgstr "垂直对齐。"
 


@@ -7244,56 +7252,56 @@ msgstr "按详细视图观看文件"
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 

-#: ../src/common/docview.cpp:1943
+#: ../src/common/docview.cpp:1952

 msgid "Views"
 msgstr "视图"
 
 msgid "Views"
 msgstr "视图"
 

-#: ../src/common/accelcmn.cpp:109
+#: ../src/common/accelcmn.cpp:108

 msgid "WINDOWS_LEFT"
 msgstr "WINDOWS_LEFT"
 
 msgid "WINDOWS_LEFT"
 msgstr "WINDOWS_LEFT"
 

-#: ../src/common/accelcmn.cpp:111
+#: ../src/common/accelcmn.cpp:110

 msgid "WINDOWS_MENU"
 msgstr "WINDOWS_MENU"
 
 msgid "WINDOWS_MENU"
 msgstr "WINDOWS_MENU"
 

-#: ../src/common/accelcmn.cpp:110
+#: ../src/common/accelcmn.cpp:109

 msgid "WINDOWS_RIGHT"
 msgstr "WINDOWS_RIGHT"
 
 msgid "WINDOWS_RIGHT"
 msgstr "WINDOWS_RIGHT"
 

-#: ../src/unix/epolldispatcher.cpp:214
+#: ../src/unix/epolldispatcher.cpp:213

 #, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 
 #, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 

-#: ../src/common/log.cpp:230
+#: ../src/common/log.cpp:227

 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 

-#: ../src/propgrid/advprops.cpp:652
+#: ../src/propgrid/advprops.cpp:651

 msgid "Weight"
 msgstr "字体粗细"
 
 msgid "Weight"
 msgstr "字体粗细"
 

-#: ../src/common/fmapbase.cpp:149
+#: ../src/common/fmapbase.cpp:148

 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 

-#: ../src/common/fmapbase.cpp:163
+#: ../src/common/fmapbase.cpp:162

 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧带欧元符号 (ISO-8859-15)"
 
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西欧带欧元符号 (ISO-8859-15)"
 

-#: ../src/generic/fontdlgg.cpp:447 ../src/generic/fontdlgg.cpp:449
+#: ../src/generic/fontdlgg.cpp:446 ../src/generic/fontdlgg.cpp:448

 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线。"
 
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线。"
 

-#: ../src/generic/fdrepdlg.cpp:145
+#: ../src/generic/fdrepdlg.cpp:144

 msgid "Whole word"
 msgstr "整字"
 
 msgid "Whole word"
 msgstr "整字"
 

-#: ../src/html/helpwnd.cpp:548
+#: ../src/html/helpwnd.cpp:547

 msgid "Whole words only"
 msgstr "仅为整字"
 
 msgid "Whole words only"
 msgstr "仅为整字"
 

-#: ../src/univ/themes/win32.cpp:1103
+#: ../src/univ/themes/win32.cpp:1102

 msgid "Win32 theme"
 msgstr "Win32 主题"
 
 msgid "Win32 theme"
 msgstr "Win32 主题"
 


@@ -7330,11 +7338,11 @@ msgstr "Windows 98 SE"
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:178
+#: ../src/common/fmapbase.cpp:177

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 

-#: ../src/common/fmapbase.cpp:179
+#: ../src/common/fmapbase.cpp:178

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 


@@ -7343,39 +7351,39 @@ msgstr "Windows 波罗的海语 (CP 1257)"
 msgid "Windows CE (%d.%d)"
 msgstr "Windows CE (%d.%d)"
 
 msgid "Windows CE (%d.%d)"
 msgstr "Windows CE (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:172
+#: ../src/common/fmapbase.cpp:171

 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 

-#: ../src/common/fmapbase.cpp:169
+#: ../src/common/fmapbase.cpp:168

 msgid "Windows Chinese Simplified (CP 936) or GB-2312"
 msgstr "Windows 简体中文 (CP 936) 或 GB-2312"
 
 msgid "Windows Chinese Simplified (CP 936) or GB-2312"
 msgstr "Windows 简体中文 (CP 936) 或 GB-2312"
 

-#: ../src/common/fmapbase.cpp:171
+#: ../src/common/fmapbase.cpp:170

 msgid "Windows Chinese Traditional (CP 950) or Big-5"
 msgstr "Windows 繁体中文 (CP 950) 或 Big-5"
 
 msgid "Windows Chinese Traditional (CP 950) or Big-5"
 msgstr "Windows 繁体中文 (CP 950) 或 Big-5"
 

-#: ../src/common/fmapbase.cpp:173
+#: ../src/common/fmapbase.cpp:172

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 

-#: ../src/common/fmapbase.cpp:175
+#: ../src/common/fmapbase.cpp:174

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 

-#: ../src/common/fmapbase.cpp:177
+#: ../src/common/fmapbase.cpp:176

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 

-#: ../src/common/fmapbase.cpp:168
+#: ../src/common/fmapbase.cpp:167

 msgid "Windows Japanese (CP 932) or Shift-JIS"
 msgstr "Windows 日语 (CP 932) 或 Shift-JIS"
 
 msgid "Windows Japanese (CP 932) or Shift-JIS"
 msgstr "Windows 日语 (CP 932) 或 Shift-JIS"
 

-#: ../src/common/fmapbase.cpp:181
+#: ../src/common/fmapbase.cpp:180

 msgid "Windows Johab (CP 1361)"
 msgstr "Windows 朝鲜语 (CP 1361)"
 
 msgid "Windows Johab (CP 1361)"
 msgstr "Windows 朝鲜语 (CP 1361)"
 

-#: ../src/common/fmapbase.cpp:170
+#: ../src/common/fmapbase.cpp:169

 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 


@@ -7400,15 +7408,15 @@ msgstr "Windows Server 2008"
 msgid "Windows Server 2008 R2"
 msgstr "Windows Server 2008 R2"
 
 msgid "Windows Server 2008 R2"
 msgstr "Windows Server 2008 R2"
 

-#: ../src/common/fmapbase.cpp:167
+#: ../src/common/fmapbase.cpp:166

 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 
 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 

-#: ../src/common/fmapbase.cpp:176
+#: ../src/common/fmapbase.cpp:175

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 

-#: ../src/common/fmapbase.cpp:180
+#: ../src/common/fmapbase.cpp:179

 msgid "Windows Vietnamese (CP 1258)"
 msgstr "Windows 越南语 (CP 1258)"
 
 msgid "Windows Vietnamese (CP 1258)"
 msgstr "Windows 越南语 (CP 1258)"
 


@@ -7416,7 +7424,7 @@ msgstr "Windows 越南语 (CP 1258)"
 msgid "Windows Vista"
 msgstr "Windows Vista"
 
 msgid "Windows Vista"
 msgstr "Windows Vista"
 

-#: ../src/common/fmapbase.cpp:174
+#: ../src/common/fmapbase.cpp:173

 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 


@@ -7424,100 +7432,101 @@ msgstr "Windows 西欧 (CP 1252)"
 msgid "Windows XP"
 msgstr "Windows XP"
 
 msgid "Windows XP"
 msgstr "Windows XP"
 

-#: ../src/common/fmapbase.cpp:182
+#: ../src/common/fmapbase.cpp:181

 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 

-#: ../src/common/fmapbase.cpp:166
+#: ../src/common/fmapbase.cpp:165

 msgid "Windows/DOS OEM Cyrillic (CP 866)"
 msgstr "Windows/DOS OEM 西里尔语 (CP 866)"
 
 msgid "Windows/DOS OEM Cyrillic (CP 866)"
 msgstr "Windows/DOS OEM 西里尔语 (CP 866)"
 

-#: ../src/common/ffile.cpp:147
+#: ../src/common/ffile.cpp:148

 #, c-format
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s' 错误"
 
 #, c-format
 msgid "Write error on file '%s'"
 msgstr "写文件 '%s' 错误"
 

-#: ../src/xml/xml.cpp:837
+#: ../src/xml/xml.cpp:844

 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 #, c-format
 msgid "XML parsing error: '%s' at line %d"

-msgstr "XML解析错误: '%s' 位于 行 %d"
+msgstr "XML 解析错误: '%s'，位于行 %d"

 
 

-#: ../src/common/xpmdecod.cpp:797
+#: ../src/common/xpmdecod.cpp:796

 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据！"
 
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据！"
 

-#: ../src/common/xpmdecod.cpp:706
+#: ../src/common/xpmdecod.cpp:705

 #, c-format
 msgid "XPM: incorrect colour description in line %d"
 msgstr "XPM: 在第 %d 行有错误的颜色描述"
 
 #, c-format
 msgid "XPM: incorrect colour description in line %d"
 msgstr "XPM: 在第 %d 行有错误的颜色描述"
 

-#: ../src/common/xpmdecod.cpp:681
+#: ../src/common/xpmdecod.cpp:680

 msgid "XPM: incorrect header format!"
 msgstr "XPM: 不正确的头格式！"
 
 msgid "XPM: incorrect header format!"
 msgstr "XPM: 不正确的头格式！"
 

-#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726
+#: ../src/common/xpmdecod.cpp:716 ../src/common/xpmdecod.cpp:725

 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
 msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d！"
 
 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
 msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d！"
 

-#: ../src/common/xpmdecod.cpp:756
+#: ../src/common/xpmdecod.cpp:755

 msgid "XPM: no colors left to use for mask!"
 msgid "XPM: no colors left to use for mask!"

-msgstr ""
+msgstr "XPM: 没有剩下可供选择的掩码颜色！"

 
 

-#: ../src/common/xpmdecod.cpp:783
+#: ../src/common/xpmdecod.cpp:782

 #, c-format
 msgid "XPM: truncated image data at line %d!"
 #, c-format
 msgid "XPM: truncated image data at line %d!"

-msgstr ""
+msgstr "XPM: 图像数据被截断，位于行 %d！"

 
 

-#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194
+#: ../include/wx/msgdlg.h:271 ../src/common/stockitem.cpp:206
+#: ../src/motif/msgdlg.cpp:196

 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 

-#: ../src/osx/carbon/overlay.cpp:156
+#: ../src/osx/carbon/overlay.cpp:155

 msgid "You cannot Clear an overlay that is not inited"
 msgstr "你无法清除未初始化的 overlay。"
 
 msgid "You cannot Clear an overlay that is not inited"
 msgstr "你无法清除未初始化的 overlay。"
 

-#: ../src/osx/carbon/overlay.cpp:108 ../src/dfb/overlay.cpp:62
+#: ../src/osx/carbon/overlay.cpp:107 ../src/dfb/overlay.cpp:61

 msgid "You cannot Init an overlay twice"
 msgid "You cannot Init an overlay twice"

-msgstr "你不能初始化overlay两次"
+msgstr "你不能初始化 overlay 两次"

 
 

-#: ../src/generic/dirdlgg.cpp:317
+#: ../src/generic/dirdlgg.cpp:316

 msgid "You cannot add a new directory to this section."
 msgstr "你无法向该项中加入新的目录。"
 
 msgid "You cannot add a new directory to this section."
 msgstr "你无法向该项中加入新的目录。"
 

-#: ../src/propgrid/propgrid.cpp:3259
+#: ../src/propgrid/propgrid.cpp:3258

 msgid "You have entered invalid value. Press ESC to cancel editing."
 msgstr "你输入了无效值。按 ESC 取消编辑。"
 
 msgid "You have entered invalid value. Press ESC to cancel editing."
 msgstr "你输入了无效值。按 ESC 取消编辑。"
 

-#: ../src/common/stockitem.cpp:210
+#: ../src/common/stockitem.cpp:209

 msgid "Zoom &In"
 msgstr "放大(&I)"
 
 msgid "Zoom &In"
 msgstr "放大(&I)"
 

-#: ../src/common/stockitem.cpp:211
+#: ../src/common/stockitem.cpp:210

 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 

-#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1565
+#: ../src/common/stockitem.cpp:209 ../src/common/prntbase.cpp:1564

 msgid "Zoom In"
 msgstr "放大"
 
 msgid "Zoom In"
 msgstr "放大"
 

-#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1551
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1550

 msgid "Zoom Out"
 msgstr "缩小"
 
 msgid "Zoom Out"
 msgstr "缩小"
 

-#: ../src/common/stockitem.cpp:209
+#: ../src/common/stockitem.cpp:208

 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 

-#: ../src/common/stockitem.cpp:209
+#: ../src/common/stockitem.cpp:208

 msgid "Zoom to Fit"
 msgstr "缩放以适应窗口"
 
 msgid "Zoom to Fit"
 msgstr "缩放以适应窗口"
 

-#: ../src/msw/dde.cpp:1145
+#: ../src/msw/dde.cpp:1144

 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 应用程序已创建延时 race 条件."
 
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 应用程序已创建延时 race 条件."
 

-#: ../src/msw/dde.cpp:1133
+#: ../src/msw/dde.cpp:1132

 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"


@@ -7528,39 +7537,39 @@ msgstr ""
 "或传给DDEML函数的是\n"
 "无效的实例标识。"
 
 "或传给DDEML函数的是\n"
 "无效的实例标识。"
 

-#: ../src/msw/dde.cpp:1151
+#: ../src/msw/dde.cpp:1150

 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败。"
 
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败。"
 

-#: ../src/msw/dde.cpp:1148
+#: ../src/msw/dde.cpp:1147

 msgid "a memory allocation failed."
 msgstr "内存分配失败。"
 
 msgid "a memory allocation failed."
 msgstr "内存分配失败。"
 

-#: ../src/msw/dde.cpp:1142
+#: ../src/msw/dde.cpp:1141

 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML 参数验证失败。"
 
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML 参数验证失败。"
 

-#: ../src/msw/dde.cpp:1124
+#: ../src/msw/dde.cpp:1123

 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步 advise 事务请求超时。"
 
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步 advise 事务请求超时。"
 

-#: ../src/msw/dde.cpp:1130
+#: ../src/msw/dde.cpp:1129

 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步 data 事务请求超时。"
 
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步 data 事务请求超时。"
 

-#: ../src/msw/dde.cpp:1139
+#: ../src/msw/dde.cpp:1138

 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步 execute 事务请求超时。"
 
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步 execute 事务请求超时。"
 

-#: ../src/msw/dde.cpp:1157
+#: ../src/msw/dde.cpp:1156

 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步 poke 事务请求超时。"
 
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步 poke 事务请求超时。"
 

-#: ../src/msw/dde.cpp:1172
+#: ../src/msw/dde.cpp:1171

 msgid "a request to end an advise transaction has timed out."
 msgstr "终止 advise 事务的请求超时。"
 
 msgid "a request to end an advise transaction has timed out."
 msgstr "终止 advise 事务的请求超时。"
 

-#: ../src/msw/dde.cpp:1166
+#: ../src/msw/dde.cpp:1165

 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"


@@ -7570,15 +7579,15 @@ msgstr ""
 "已被客户端终止的会话，或服务器\n"
 "在完成事务前终止。"
 
 "已被客户端终止的会话，或服务器\n"
 "在完成事务前终止。"
 

-#: ../src/msw/dde.cpp:1154
+#: ../src/msw/dde.cpp:1153

 msgid "a transaction failed."
 msgstr "事务失败。"
 
 msgid "a transaction failed."
 msgstr "事务失败。"
 

-#: ../src/common/accelcmn.cpp:185
+#: ../src/common/accelcmn.cpp:184

 msgid "alt"
 msgstr "alt"
 
 msgid "alt"
 msgstr "alt"
 

-#: ../src/msw/dde.cpp:1136
+#: ../src/msw/dde.cpp:1135

 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"


@@ -7590,15 +7599,15 @@ msgstr ""
 "或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
 "视图执行服务器事务。"
 
 "或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
 "视图执行服务器事务。"
 

-#: ../src/msw/dde.cpp:1160
+#: ../src/msw/dde.cpp:1159

 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用 PostMessage 失败。"
 
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用 PostMessage 失败。"
 

-#: ../src/msw/dde.cpp:1169
+#: ../src/msw/dde.cpp:1168

 msgid "an internal error has occurred in the DDEML."
 msgstr "在 DDEML 中发生内部错误。"
 
 msgid "an internal error has occurred in the DDEML."
 msgstr "在 DDEML 中发生内部错误。"
 

-#: ../src/msw/dde.cpp:1175
+#: ../src/msw/dde.cpp:1174

 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"


@@ -7608,36 +7617,36 @@ msgstr ""
 "一旦应用程序从 XTYP_XACT_COMPLETE 回调函数返回，\n"
 "回调函数事务标识符就不再有效。"
 
 "一旦应用程序从 XTYP_XACT_COMPLETE 回调函数返回，\n"
 "回调函数事务标识符就不再有效。"
 

-#: ../src/common/zipstrm.cpp:1273
+#: ../src/common/zipstrm.cpp:1272

 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是一个分段 zip 文件的合并"
 
 msgid "assuming this is a multi-part zip concatenated"
 msgstr "假定这是一个分段 zip 文件的合并"
 

-#: ../src/common/fileconf.cpp:1883
+#: ../src/common/fileconf.cpp:1882

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s' 的修改。"
 
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s' 的修改。"
 

-#: ../src/html/chm.cpp:330
+#: ../src/html/chm.cpp:329

 msgid "bad arguments to library function"
 msgstr "库函数参数错误"
 
 msgid "bad arguments to library function"
 msgstr "库函数参数错误"
 

-#: ../src/html/chm.cpp:342
+#: ../src/html/chm.cpp:341

 msgid "bad signature"
 msgstr "错误的签名"
 
 msgid "bad signature"
 msgstr "错误的签名"
 

-#: ../src/common/zipstrm.cpp:1716
+#: ../src/common/zipstrm.cpp:1715

 msgid "bad zipfile offset to entry"
 msgstr "zip 文件中到条目的偏移值错误"
 
 msgid "bad zipfile offset to entry"
 msgstr "zip 文件中到条目的偏移值错误"
 

-#: ../src/common/ftp.cpp:406
+#: ../src/common/ftp.cpp:405

 msgid "binary"
 msgstr "二进制"
 
 msgid "binary"
 msgstr "二进制"
 

-#: ../src/common/fontcmn.cpp:979
+#: ../src/common/fontcmn.cpp:978

 msgid "bold"
 msgstr "粗体"
 
 msgid "bold"
 msgstr "粗体"
 

-#: ../src/os2/iniconf.cpp:464
+#: ../src/os2/iniconf.cpp:463

 msgid "buffer is too small for Windows directory."
 msgstr "Windows 目录的缓存太小。"
 
 msgid "buffer is too small for Windows directory."
 msgstr "Windows 目录的缓存太小。"
 


@@ -7646,134 +7655,134 @@ msgstr "Windows 目录的缓存太小。"
 msgid "build %lu"
 msgstr "build %lu"
 
 msgid "build %lu"
 msgstr "build %lu"
 

-#: ../src/common/ffile.cpp:80
+#: ../src/common/ffile.cpp:79

 #, c-format
 msgid "can't close file '%s'"
 msgstr "无法关闭文件 '%s'"
 
 #, c-format
 msgid "can't close file '%s'"
 msgstr "无法关闭文件 '%s'"
 

-#: ../src/common/file.cpp:279
+#: ../src/common/file.cpp:278

 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "无法关闭文件描述符 %d"
 
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "无法关闭文件描述符 %d"
 

-#: ../src/common/file.cpp:577
+#: ../src/common/file.cpp:604

 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "无法把修改提交给文件 '%s'"
 
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "无法把修改提交给文件 '%s'"
 

-#: ../src/common/file.cpp:213
+#: ../src/common/file.cpp:212

 #, c-format
 msgid "can't create file '%s'"
 msgstr "无法创建文件 '%s'"
 
 #, c-format
 msgid "can't create file '%s'"
 msgstr "无法创建文件 '%s'"
 

-#: ../src/common/fileconf.cpp:1177
+#: ../src/common/fileconf.cpp:1176

 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "无法删除用户配置文件 '%s'"
 
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "无法删除用户配置文件 '%s'"
 

-#: ../src/common/file.cpp:480
+#: ../src/common/file.cpp:511

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "无法确定是否已达描述符 %d 的尾部"
 
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "无法确定是否已达描述符 %d 的尾部"
 

-#: ../src/msdos/utilsdos.cpp:311 ../src/msdos/utilsdos.cpp:476
+#: ../src/msdos/utilsdos.cpp:310 ../src/msdos/utilsdos.cpp:475

 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"
 
 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"
 

-#: ../src/common/zipstrm.cpp:1491
+#: ../src/common/zipstrm.cpp:1490

 msgid "can't find central directory in zip"
 msgstr "无法在 zip 文件中找到中央目录"
 
 msgid "can't find central directory in zip"
 msgstr "无法在 zip 文件中找到中央目录"
 

-#: ../src/common/file.cpp:450
+#: ../src/common/file.cpp:481

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的文件长度"
 
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的文件长度"
 

-#: ../src/msw/utils.cpp:374
+#: ../src/msw/utils.cpp:373

 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的 HOME 目录，使用当前目录。"
 
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的 HOME 目录，使用当前目录。"
 

-#: ../src/common/file.cpp:351
+#: ../src/common/file.cpp:382

 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "无法刷新文件描述符 %d"
 
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "无法刷新文件描述符 %d"
 

-#: ../src/common/file.cpp:407 ../src/msw/wince/filefnwce.cpp:199
+#: ../src/common/file.cpp:438 ../src/msw/wince/filefnwce.cpp:204

 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的指针位置"
 
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的指针位置"
 

-#: ../src/common/fontmap.cpp:326
+#: ../src/common/fontmap.cpp:325

 msgid "can't load any font, aborting"
 msgstr "无法装载任何字体，正在中止"
 
 msgid "can't load any font, aborting"
 msgstr "无法装载任何字体，正在中止"
 

-#: ../src/common/file.cpp:265 ../src/common/ffile.cpp:64
+#: ../src/common/file.cpp:264 ../src/common/ffile.cpp:63

 #, c-format
 msgid "can't open file '%s'"
 msgstr "无法打开文件 '%s'"
 
 #, c-format
 msgid "can't open file '%s'"
 msgstr "无法打开文件 '%s'"
 

-#: ../src/common/fileconf.cpp:352
+#: ../src/common/fileconf.cpp:351

 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "无法打开全局配置文件 '%s'。"
 
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "无法打开全局配置文件 '%s'。"
 

-#: ../src/common/fileconf.cpp:368
+#: ../src/common/fileconf.cpp:367

 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "无法打开用户配置文件 '%s'。"
 
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "无法打开用户配置文件 '%s'。"
 

-#: ../src/common/fileconf.cpp:1018
+#: ../src/common/fileconf.cpp:1017

 msgid "can't open user configuration file."
 msgstr "无法打开用户配置文件。"
 
 msgid "can't open user configuration file."
 msgstr "无法打开用户配置文件。"
 

-#: ../src/common/zipstrm.cpp:528
+#: ../src/common/zipstrm.cpp:527

 msgid "can't re-initialize zlib deflate stream"
 msgstr "无法重新初始化 zlib 压缩流。"
 
 msgid "can't re-initialize zlib deflate stream"
 msgstr "无法重新初始化 zlib 压缩流。"
 

-#: ../src/common/zipstrm.cpp:553
+#: ../src/common/zipstrm.cpp:552

 msgid "can't re-initialize zlib inflate stream"
 msgstr "无法重新初始化 zlib 解压流。"
 
 msgid "can't re-initialize zlib inflate stream"
 msgstr "无法重新初始化 zlib 解压流。"
 

-#: ../src/common/file.cpp:303
+#: ../src/common/file.cpp:334

 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "无法读取文件描述符 %d"
 
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "无法读取文件描述符 %d"
 

-#: ../src/common/file.cpp:572
+#: ../src/common/file.cpp:599

 #, c-format
 msgid "can't remove file '%s'"
 msgstr "无法删除文件 '%s'"
 
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "无法删除文件 '%s'"
 

-#: ../src/common/file.cpp:589
+#: ../src/common/file.cpp:616

 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "无法删除临时文件 '%s'"
 
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "无法删除临时文件 '%s'"
 

-#: ../src/common/file.cpp:393 ../src/msw/wince/filefnwce.cpp:185
+#: ../src/common/file.cpp:424 ../src/msw/wince/filefnwce.cpp:190

 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "无法定位文件描述符 %d"
 
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "无法定位文件描述符 %d"
 

-#: ../src/common/textfile.cpp:300
+#: ../src/common/textfile.cpp:299

 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "无法把缓存区 '%s' 写到磁盘。"
 
 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "无法把缓存区 '%s' 写到磁盘。"
 

-#: ../src/common/file.cpp:319
+#: ../src/common/file.cpp:350

 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "无法写文件描述符 %d"
 
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "无法写文件描述符 %d"
 

-#: ../src/common/fileconf.cpp:1032
+#: ../src/common/fileconf.cpp:1031

 msgid "can't write user configuration file."
 msgstr "无法写用户配置文件。"
 
 msgid "can't write user configuration file."
 msgstr "无法写用户配置文件。"
 

-#: ../src/html/chm.cpp:346
+#: ../src/html/chm.cpp:345

 msgid "checksum error"
 msgstr "校验和错误"
 
 msgid "checksum error"
 msgstr "校验和错误"
 

-#: ../src/common/tarstrm.cpp:821
+#: ../src/common/tarstrm.cpp:820

 msgid "checksum failure reading tar header block"
 msgstr "读取tar头部块发生校验和错误"
 
 msgid "checksum failure reading tar header block"
 msgstr "读取tar头部块发生校验和错误"
 


@@ -7793,274 +7802,274 @@ msgstr "读取tar头部块发生校验和错误"
 #: ../src/richtext/richtextmarginspage.cpp:341
 #: ../src/richtext/richtextmarginspage.cpp:364
 #: ../src/richtext/richtextmarginspage.cpp:389
 #: ../src/richtext/richtextmarginspage.cpp:341
 #: ../src/richtext/richtextmarginspage.cpp:364
 #: ../src/richtext/richtextmarginspage.cpp:389

-#: ../src/richtext/richtextsizepage.cpp:308
-#: ../src/richtext/richtextsizepage.cpp:335
-#: ../src/richtext/richtextsizepage.cpp:362
-#: ../src/richtext/richtextsizepage.cpp:389
-#: ../src/richtext/richtextsizepage.cpp:416
-#: ../src/richtext/richtextsizepage.cpp:443
-#: ../src/richtext/richtextsizepage.cpp:510
-#: ../src/richtext/richtextsizepage.cpp:538
-#: ../src/richtext/richtextsizepage.cpp:566
-#: ../src/richtext/richtextsizepage.cpp:594
+#: ../src/richtext/richtextsizepage.cpp:339
+#: ../src/richtext/richtextsizepage.cpp:373
+#: ../src/richtext/richtextsizepage.cpp:400
+#: ../src/richtext/richtextsizepage.cpp:427
+#: ../src/richtext/richtextsizepage.cpp:454
+#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:555
+#: ../src/richtext/richtextsizepage.cpp:590
+#: ../src/richtext/richtextsizepage.cpp:625
+#: ../src/richtext/richtextsizepage.cpp:660

 msgid "cm"
 msgstr "厘米"
 
 msgid "cm"
 msgstr "厘米"
 

-#: ../src/html/chm.cpp:348
+#: ../src/html/chm.cpp:347

 msgid "compression error"
 msgstr "压缩错误"
 
 msgid "compression error"
 msgstr "压缩错误"
 

-#: ../src/common/regex.cpp:240
+#: ../src/common/regex.cpp:239

 msgid "conversion to 8-bit encoding failed"
 msgstr "无法转换为 8 位编码"
 
 msgid "conversion to 8-bit encoding failed"
 msgstr "无法转换为 8 位编码"
 

-#: ../src/common/accelcmn.cpp:183
+#: ../src/common/accelcmn.cpp:182

 msgid "ctrl"
 msgstr "ctrl"
 
 msgid "ctrl"
 msgstr "ctrl"
 

-#: ../src/common/cmdline.cpp:1316
+#: ../src/common/cmdline.cpp:1323

 msgid "date"
 msgstr "日期"
 
 msgid "date"
 msgstr "日期"
 

-#: ../src/html/chm.cpp:350
+#: ../src/html/chm.cpp:349

 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/richtext/richtextstyles.cpp:768 ../src/common/fmapbase.cpp:821
+#: ../src/richtext/richtextstyles.cpp:780 ../src/common/fmapbase.cpp:820

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 

-#: ../src/common/cmdline.cpp:1312
+#: ../src/common/cmdline.cpp:1319

 msgid "double"
 msgstr ""
 
 msgid "double"
 msgstr ""
 

-#: ../src/common/debugrpt.cpp:534
+#: ../src/common/debugrpt.cpp:543

 msgid "dump of the process state (binary)"
 msgstr "转储进程状态（二进制码）"
 
 msgid "dump of the process state (binary)"
 msgstr "转储进程状态（二进制码）"
 

-#: ../src/common/datetimefmt.cpp:1925
+#: ../src/common/datetimefmt.cpp:1936

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetimefmt.cpp:1915
+#: ../src/common/datetimefmt.cpp:1926

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetimefmt.cpp:1918
+#: ../src/common/datetimefmt.cpp:1929

 msgid "eleventh"
 msgstr "第十一"
 
 msgid "eleventh"
 msgstr "第十一"
 

-#: ../src/common/fileconf.cpp:1869
+#: ../src/common/fileconf.cpp:1868

 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s' 中已出现一次以上"
 
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "条目 '%s' 在组 '%s' 中已出现一次以上"
 

-#: ../src/html/chm.cpp:344
+#: ../src/html/chm.cpp:343

 msgid "error in data format"
 msgstr "文件格式错误"
 
 msgid "error in data format"
 msgstr "文件格式错误"
 

-#: ../src/msdos/utilsdos.cpp:414
+#: ../src/msdos/utilsdos.cpp:413

 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 

-#: ../src/html/chm.cpp:332
+#: ../src/html/chm.cpp:331

 msgid "error opening file"
 msgstr "打开文件出错"
 
 msgid "error opening file"
 msgstr "打开文件出错"
 

-#: ../src/common/zipstrm.cpp:1577
+#: ../src/common/zipstrm.cpp:1576

 msgid "error reading zip central directory"
 msgstr "读 zip 中央目录时出错"
 
 msgid "error reading zip central directory"
 msgstr "读 zip 中央目录时出错"
 

-#: ../src/common/zipstrm.cpp:1668
+#: ../src/common/zipstrm.cpp:1667

 msgid "error reading zip local header"
 msgstr "读 zip 本地头时出错"
 
 msgid "error reading zip local header"
 msgstr "读 zip 本地头时出错"
 

-#: ../src/common/zipstrm.cpp:2397
+#: ../src/common/zipstrm.cpp:2396

 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"
 
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"
 

-#: ../src/common/ffile.cpp:169
+#: ../src/common/ffile.cpp:170

 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s' 失败"
 
 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s' 失败"
 

-#: ../src/common/datetimefmt.cpp:1922
+#: ../src/common/datetimefmt.cpp:1933

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetimefmt.cpp:1912
+#: ../src/common/datetimefmt.cpp:1923

 msgid "fifth"
 msgstr "第五"
 
 msgid "fifth"
 msgstr "第五"
 

-#: ../src/common/fileconf.cpp:611
+#: ../src/common/fileconf.cpp:610

 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "文件 '%s'，行 %d: 组头之后的 '%s' 被忽略。"
 
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "文件 '%s'，行 %d: 组头之后的 '%s' 被忽略。"
 

-#: ../src/common/fileconf.cpp:640
+#: ../src/common/fileconf.cpp:639

 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "文件 '%s'，行 %d: 期待出现 '='。"
 
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "文件 '%s'，行 %d: 期待出现 '='。"
 

-#: ../src/common/fileconf.cpp:663
+#: ../src/common/fileconf.cpp:662

 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s'，行 %d: 键 '%s' 第一次出现在行 %d。"
 
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "文件 '%s'，行 %d: 键 '%s' 第一次出现在行 %d。"
 

-#: ../src/common/fileconf.cpp:653
+#: ../src/common/fileconf.cpp:652

 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"
 
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"
 

-#: ../src/common/fileconf.cpp:575
+#: ../src/common/fileconf.cpp:574

 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 

-#: ../src/richtext/richtextbuffer.cpp:7874
+#: ../src/richtext/richtextbuffer.cpp:8358

 msgid "files"
 msgstr "文件"
 
 msgid "files"
 msgstr "文件"
 

-#: ../src/common/datetimefmt.cpp:1908
+#: ../src/common/datetimefmt.cpp:1919

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 

-#: ../src/html/helpwnd.cpp:1266
+#: ../src/html/helpwnd.cpp:1265

 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetimefmt.cpp:1921
+#: ../src/common/datetimefmt.cpp:1932

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetimefmt.cpp:1911
+#: ../src/common/datetimefmt.cpp:1922

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 

-#: ../src/common/appbase.cpp:679
+#: ../src/common/appbase.cpp:695

 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 

-#: ../src/richtext/richtextbuffer.cpp:11223
-#: ../src/richtext/richtextbuffer.cpp:11333
+#: ../src/richtext/richtextbuffer.cpp:12212
+#: ../src/richtext/richtextbuffer.cpp:12322

 msgid "image"
 msgstr "图片"
 
 msgid "image"
 msgstr "图片"
 

-#: ../src/common/tarstrm.cpp:797
+#: ../src/common/tarstrm.cpp:796

 msgid "incomplete header block in tar"
 msgstr "tar头部块不完整"
 
 msgid "incomplete header block in tar"
 msgstr "tar头部块不完整"
 

-#: ../src/common/xtixml.cpp:490
+#: ../src/common/xtixml.cpp:489

 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串，缺少点号('.')"
 
 msgid "incorrect event handler string, missing dot"
 msgstr "错误的时间句柄字符串，缺少点号('.')"
 

-#: ../src/common/tarstrm.cpp:1382
+#: ../src/common/tarstrm.cpp:1381

 msgid "incorrect size given for tar entry"
 msgstr "tar项目不正确的大小"
 
 msgid "incorrect size given for tar entry"
 msgstr "tar项目不正确的大小"
 

-#: ../src/common/tarstrm.cpp:994
+#: ../src/common/tarstrm.cpp:993

 msgid "invalid data in extended tar header"
 msgstr "tar扩展头部中有图小数据"
 
 msgid "invalid data in extended tar header"
 msgstr "tar扩展头部中有图小数据"
 

-#: ../src/generic/logg.cpp:1054
+#: ../src/generic/logg.cpp:1050

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 

-#: ../src/common/zipstrm.cpp:1446
+#: ../src/common/zipstrm.cpp:1445

 msgid "invalid zip file"
 msgstr "无效的 zip 文件"
 
 msgid "invalid zip file"
 msgstr "无效的 zip 文件"
 

-#: ../src/common/fontcmn.cpp:984
+#: ../src/common/fontcmn.cpp:983

 msgid "italic"
 msgstr "斜体"
 
 msgid "italic"
 msgstr "斜体"
 

-#: ../src/common/fontcmn.cpp:974
+#: ../src/common/fontcmn.cpp:973

 msgid "light"
 msgstr "细体"
 
 msgid "light"
 msgstr "细体"
 

-#: ../src/common/intl.cpp:296
+#: ../src/common/intl.cpp:293

 #, c-format
 msgid "locale '%s' cannot be set."
 msgstr "无法设置地区为 '%s'。"
 
 #, c-format
 msgid "locale '%s' cannot be set."
 msgstr "无法设置地区为 '%s'。"
 

-#: ../src/common/datetimefmt.cpp:2081
+#: ../src/common/datetimefmt.cpp:2092

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetimefmt.cpp:1926
+#: ../src/common/datetimefmt.cpp:1937

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetimefmt.cpp:1916
+#: ../src/common/datetimefmt.cpp:1927

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 

-#: ../src/msw/dde.cpp:1120
+#: ../src/msw/dde.cpp:1119

 msgid "no DDE error."
 msgstr "没有 DDE 错误。"
 
 msgid "no DDE error."
 msgstr "没有 DDE 错误。"
 

-#: ../src/html/chm.cpp:328
+#: ../src/html/chm.cpp:327

 msgid "no error"
 msgstr "没有错误"
 
 msgid "no error"
 msgstr "没有错误"
 

-#: ../src/dfb/fontmgr.cpp:175
+#: ../src/dfb/fontmgr.cpp:174

 #, c-format
 msgid "no fonts found in %s, using builtin font"
 msgstr "%s中字体为找到，将使用内置字体"
 
 #, c-format
 msgid "no fonts found in %s, using builtin font"
 msgstr "%s中字体为找到，将使用内置字体"
 

-#: ../src/html/helpdata.cpp:641
+#: ../src/html/helpdata.cpp:655

 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetimefmt.cpp:2080
+#: ../src/common/datetimefmt.cpp:2091

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 

-#: ../src/richtext/richtextstyles.cpp:767
+#: ../src/richtext/richtextstyles.cpp:779

 msgid "normal"
 msgstr "正常"
 
 msgid "normal"
 msgstr "正常"
 

-#: ../src/gtk/print.cpp:1231 ../src/gtk/print.cpp:1336
+#: ../src/gtk/print.cpp:1218 ../src/gtk/print.cpp:1323

 msgid "not implemented"
 msgstr "为实现"
 
 msgid "not implemented"
 msgstr "为实现"
 

-#: ../src/common/cmdline.cpp:1308
+#: ../src/common/cmdline.cpp:1315

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 

-#: ../src/common/xtixml.cpp:260
+#: ../src/common/xtixml.cpp:259

 msgid "objects cannot have XML Text Nodes"
 msgstr "对象不能有 XML 文本节点"
 
 msgid "objects cannot have XML Text Nodes"
 msgstr "对象不能有 XML 文本节点"
 

-#: ../src/html/chm.cpp:340
+#: ../src/html/chm.cpp:339

 msgid "out of memory"
 msgstr "内存耗尽"
 
 msgid "out of memory"
 msgstr "内存耗尽"
 

-#: ../src/richtext/richtextsizepage.cpp:309
-#: ../src/richtext/richtextsizepage.cpp:336
-#: ../src/richtext/richtextsizepage.cpp:363
-#: ../src/richtext/richtextsizepage.cpp:390
-#: ../src/richtext/richtextsizepage.cpp:417
-#: ../src/richtext/richtextsizepage.cpp:444
-#: ../src/richtext/richtextsizepage.cpp:511
-#: ../src/richtext/richtextsizepage.cpp:539
-#: ../src/richtext/richtextsizepage.cpp:567
-#: ../src/richtext/richtextsizepage.cpp:595
+#: ../src/richtext/richtextsizepage.cpp:340
+#: ../src/richtext/richtextsizepage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:401
+#: ../src/richtext/richtextsizepage.cpp:428
+#: ../src/richtext/richtextsizepage.cpp:455
+#: ../src/richtext/richtextsizepage.cpp:482
+#: ../src/richtext/richtextsizepage.cpp:556
+#: ../src/richtext/richtextsizepage.cpp:591
+#: ../src/richtext/richtextsizepage.cpp:626
+#: ../src/richtext/richtextsizepage.cpp:661

 msgid "percent"
 msgstr "百分比"
 
 msgid "percent"
 msgstr "百分比"
 

-#: ../src/common/debugrpt.cpp:510
+#: ../src/common/debugrpt.cpp:519

 msgid "process context description"
 msgstr "进程上下文描述"
 
 msgid "process context description"
 msgstr "进程上下文描述"
 

-#: ../src/richtext/richtextfontpage.cpp:184
-#: ../src/richtext/richtextfontpage.cpp:187
+#: ../src/richtext/richtextfontpage.cpp:186
+#: ../src/richtext/richtextfontpage.cpp:189

 msgid "pt"
 msgid "pt"

-msgstr ""
+msgstr "点"

 
 

-#: ../src/richtext/richtextfontpage.cpp:185
+#: ../src/richtext/richtextfontpage.cpp:187

 #: ../src/richtext/richtextborderspage.cpp:279
 #: ../src/richtext/richtextborderspage.cpp:281
 #: ../src/richtext/richtextborderspage.cpp:282
 #: ../src/richtext/richtextborderspage.cpp:279
 #: ../src/richtext/richtextborderspage.cpp:281
 #: ../src/richtext/richtextborderspage.cpp:282


@@ -8109,286 +8118,324 @@ msgstr ""
 #: ../src/richtext/richtextmarginspage.cpp:388
 #: ../src/richtext/richtextmarginspage.cpp:390
 #: ../src/richtext/richtextmarginspage.cpp:391
 #: ../src/richtext/richtextmarginspage.cpp:388
 #: ../src/richtext/richtextmarginspage.cpp:390
 #: ../src/richtext/richtextmarginspage.cpp:391

-#: ../src/richtext/richtextsizepage.cpp:307
-#: ../src/richtext/richtextsizepage.cpp:310
-#: ../src/richtext/richtextsizepage.cpp:311
-#: ../src/richtext/richtextsizepage.cpp:334
-#: ../src/richtext/richtextsizepage.cpp:337

 #: ../src/richtext/richtextsizepage.cpp:338
 #: ../src/richtext/richtextsizepage.cpp:338

-#: ../src/richtext/richtextsizepage.cpp:361
-#: ../src/richtext/richtextsizepage.cpp:364
-#: ../src/richtext/richtextsizepage.cpp:365
-#: ../src/richtext/richtextsizepage.cpp:388
-#: ../src/richtext/richtextsizepage.cpp:391
-#: ../src/richtext/richtextsizepage.cpp:392
-#: ../src/richtext/richtextsizepage.cpp:415
-#: ../src/richtext/richtextsizepage.cpp:418
-#: ../src/richtext/richtextsizepage.cpp:419
-#: ../src/richtext/richtextsizepage.cpp:442
-#: ../src/richtext/richtextsizepage.cpp:445
-#: ../src/richtext/richtextsizepage.cpp:446
-#: ../src/richtext/richtextsizepage.cpp:509
-#: ../src/richtext/richtextsizepage.cpp:512
-#: ../src/richtext/richtextsizepage.cpp:513
-#: ../src/richtext/richtextsizepage.cpp:537
-#: ../src/richtext/richtextsizepage.cpp:540
-#: ../src/richtext/richtextsizepage.cpp:541
-#: ../src/richtext/richtextsizepage.cpp:565
-#: ../src/richtext/richtextsizepage.cpp:568
-#: ../src/richtext/richtextsizepage.cpp:569
+#: ../src/richtext/richtextsizepage.cpp:341
+#: ../src/richtext/richtextsizepage.cpp:342
+#: ../src/richtext/richtextsizepage.cpp:372
+#: ../src/richtext/richtextsizepage.cpp:375
+#: ../src/richtext/richtextsizepage.cpp:376
+#: ../src/richtext/richtextsizepage.cpp:399
+#: ../src/richtext/richtextsizepage.cpp:402
+#: ../src/richtext/richtextsizepage.cpp:403
+#: ../src/richtext/richtextsizepage.cpp:426
+#: ../src/richtext/richtextsizepage.cpp:429
+#: ../src/richtext/richtextsizepage.cpp:430
+#: ../src/richtext/richtextsizepage.cpp:453
+#: ../src/richtext/richtextsizepage.cpp:456
+#: ../src/richtext/richtextsizepage.cpp:457
+#: ../src/richtext/richtextsizepage.cpp:480
+#: ../src/richtext/richtextsizepage.cpp:483
+#: ../src/richtext/richtextsizepage.cpp:484
+#: ../src/richtext/richtextsizepage.cpp:554
+#: ../src/richtext/richtextsizepage.cpp:557
+#: ../src/richtext/richtextsizepage.cpp:558
+#: ../src/richtext/richtextsizepage.cpp:589
+#: ../src/richtext/richtextsizepage.cpp:592

 #: ../src/richtext/richtextsizepage.cpp:593
 #: ../src/richtext/richtextsizepage.cpp:593

-#: ../src/richtext/richtextsizepage.cpp:596
-#: ../src/richtext/richtextsizepage.cpp:597
+#: ../src/richtext/richtextsizepage.cpp:624
+#: ../src/richtext/richtextsizepage.cpp:627
+#: ../src/richtext/richtextsizepage.cpp:628
+#: ../src/richtext/richtextsizepage.cpp:659
+#: ../src/richtext/richtextsizepage.cpp:662
+#: ../src/richtext/richtextsizepage.cpp:663

 msgid "px"
 msgstr "像素"
 
 msgid "px"
 msgstr "像素"
 

-#: ../src/common/accelcmn.cpp:189
-#, fuzzy
+#: ../src/common/accelcmn.cpp:188

 msgid "rawctrl"
 msgid "rawctrl"

-msgstr "ctrl"
+msgstr "rawctrl"

 
 

-#: ../src/html/chm.cpp:334
+#: ../src/html/chm.cpp:333

 msgid "read error"
 msgstr "读取错误"
 
 msgid "read error"
 msgstr "读取错误"
 

-#: ../src/common/zipstrm.cpp:1883
+#: ../src/common/zipstrm.cpp:1882

 #, c-format
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入 zip 流 (条目 %s): crc校验错误"
 
 #, c-format
 msgid "reading zip stream (entry %s): bad crc"
 msgstr "读入 zip 流 (条目 %s): crc校验错误"
 

-#: ../src/common/zipstrm.cpp:1878
+#: ../src/common/zipstrm.cpp:1877

 #, c-format
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入 zip 流 (条目 %s): 长度错误"
 
 #, c-format
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入 zip 流 (条目 %s): 长度错误"
 

-#: ../src/msw/dde.cpp:1163
+#: ../src/msw/dde.cpp:1162

 msgid "reentrancy problem."
 msgstr "重入问题。"
 
 msgid "reentrancy problem."
 msgstr "重入问题。"
 

-#: ../src/common/datetimefmt.cpp:1909
+#: ../src/common/datetimefmt.cpp:1920

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 

-#: ../src/html/chm.cpp:338
+#: ../src/html/chm.cpp:337

 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetimefmt.cpp:1924
+#: ../src/common/datetimefmt.cpp:1935

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetimefmt.cpp:1914
+#: ../src/common/datetimefmt.cpp:1925

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 

-#: ../src/common/accelcmn.cpp:187
+#: ../src/common/accelcmn.cpp:186

 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appbase.cpp:669
+#: ../src/common/appbase.cpp:685

 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetimefmt.cpp:1923
+#: ../src/common/datetimefmt.cpp:1934

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetimefmt.cpp:1913
+#: ../src/common/datetimefmt.cpp:1924

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 

-#: ../src/common/appcmn.cpp:207
+#: ../src/common/appcmn.cpp:227

 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 

-#: ../src/common/appcmn.cpp:193
+#: ../src/common/appcmn.cpp:213

 msgid "specify the theme to use"
 msgstr "指定使用的主题"
 
 msgid "specify the theme to use"
 msgstr "指定使用的主题"
 

-#: ../src/richtext/richtextbuffer.cpp:8388
+#: ../src/richtext/richtextbuffer.cpp:8876

 msgid "standard/circle"
 msgstr "标准/圆形"
 
 msgid "standard/circle"
 msgstr "标准/圆形"
 

-#: ../src/richtext/richtextbuffer.cpp:8389
+#: ../src/richtext/richtextbuffer.cpp:8877

 msgid "standard/circle-outline"
 msgstr "标准/圆框"
 
 msgid "standard/circle-outline"
 msgstr "标准/圆框"
 

-#: ../src/richtext/richtextbuffer.cpp:8391
+#: ../src/richtext/richtextbuffer.cpp:8879

 msgid "standard/diamond"
 msgstr "标准/菱形"
 
 msgid "standard/diamond"
 msgstr "标准/菱形"
 

-#: ../src/richtext/richtextbuffer.cpp:8390
+#: ../src/richtext/richtextbuffer.cpp:8878

 msgid "standard/square"
 msgstr "标准/方形"
 
 msgid "standard/square"
 msgstr "标准/方形"
 

-#: ../src/richtext/richtextbuffer.cpp:8392
+#: ../src/richtext/richtextbuffer.cpp:8880

 msgid "standard/triangle"
 msgstr "标准/三角形"
 
 msgid "standard/triangle"
 msgstr "标准/三角形"
 

-#: ../src/common/zipstrm.cpp:1783
+#: ../src/common/zipstrm.cpp:1782

 msgid "stored file length not in Zip header"
 msgstr "Zip 头没有已存文件的长度信息"
 
 msgid "stored file length not in Zip header"
 msgstr "Zip 头没有已存文件的长度信息"
 

-#: ../src/common/cmdline.cpp:1304
+#: ../src/common/cmdline.cpp:1311

 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/fontcmn.cpp:795 ../src/common/fontcmn.cpp:970
+#: ../src/common/fontcmn.cpp:794 ../src/common/fontcmn.cpp:969

 msgid "strikethrough"
 msgstr "删除线"
 
 msgid "strikethrough"
 msgstr "删除线"
 

-#: ../src/common/tarstrm.cpp:1004 ../src/common/tarstrm.cpp:1026
-#: ../src/common/tarstrm.cpp:1508 ../src/common/tarstrm.cpp:1530
+#: ../src/common/tarstrm.cpp:1003 ../src/common/tarstrm.cpp:1025
+#: ../src/common/tarstrm.cpp:1507 ../src/common/tarstrm.cpp:1529

 msgid "tar entry not open"
 msgstr "tar标头未打开"
 
 msgid "tar entry not open"
 msgstr "tar标头未打开"
 

-#: ../src/common/datetimefmt.cpp:1917
+#: ../src/common/datetimefmt.cpp:1928

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 

-#: ../src/msw/dde.cpp:1127
+#: ../src/msw/dde.cpp:1126

 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"
 
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"
 

-#: ../src/common/datetimefmt.cpp:1910
+#: ../src/common/datetimefmt.cpp:1921

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetimefmt.cpp:1920
+#: ../src/common/datetimefmt.cpp:1931

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 

-#: ../src/common/datetimefmt.cpp:1714
+#: ../src/common/datetimefmt.cpp:1725

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetimefmt.cpp:1716
+#: ../src/common/datetimefmt.cpp:1727

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 

-#: ../src/common/fileconf.cpp:1980
+#: ../src/common/fileconf.cpp:1979

 #, c-format
 msgid "trailing backslash ignored in '%s'"
 msgstr "'%s'尾部的斜线将被忽略"
 
 #, c-format
 msgid "trailing backslash ignored in '%s'"
 msgstr "'%s'尾部的斜线将被忽略"
 

-#: ../src/gtk/aboutdlg.cpp:219
+#: ../src/gtk/aboutdlg.cpp:218

 msgid "translator-credits"
 msgstr "翻译人员"
 
 msgid "translator-credits"
 msgstr "翻译人员"
 

-#: ../src/common/datetimefmt.cpp:1919
+#: ../src/common/datetimefmt.cpp:1930

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetimefmt.cpp:1927
+#: ../src/common/datetimefmt.cpp:1938

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 

-#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966
+#: ../src/common/fontcmn.cpp:789 ../src/common/fontcmn.cpp:965

 msgid "underlined"
 msgstr "下划线"
 
 msgid "underlined"
 msgstr "下划线"
 

-#: ../src/common/fileconf.cpp:2015
+#: ../src/common/fileconf.cpp:2014

 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 

-#: ../src/common/tarstrm.cpp:1046
+#: ../src/common/tarstrm.cpp:1045

 msgid "unexpected end of file"
 msgstr "意外到达文件结尾"
 
 msgid "unexpected end of file"
 msgstr "意外到达文件结尾"
 

-#: ../src/generic/progdlgg.cpp:400 ../src/common/tarstrm.cpp:372
-#: ../src/common/tarstrm.cpp:395 ../src/common/tarstrm.cpp:426
+#: ../src/generic/progdlgg.cpp:399 ../src/common/tarstrm.cpp:371
+#: ../src/common/tarstrm.cpp:394 ../src/common/tarstrm.cpp:425

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 

-#: ../src/common/xtixml.cpp:254
+#: ../src/common/xtixml.cpp:253

 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 

-#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:261 ../src/html/chm.cpp:351

 msgid "unknown error"
 msgstr "未知错误"
 
 msgid "unknown error"
 msgstr "未知错误"
 

-#: ../src/msw/dialup.cpp:491
+#: ../src/msw/dialup.cpp:490

 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误 (错误号 %08x)。"
 
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知错误 (错误号 %08x)。"
 

-#: ../src/msw/wince/filefnwce.cpp:167
+#: ../src/msw/wince/filefnwce.cpp:172

 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 

-#: ../src/common/fmapbase.cpp:835
+#: ../src/common/fmapbase.cpp:834

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 

-#: ../src/common/docview.cpp:510
+#: ../src/common/docview.cpp:507

 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1597
+#: ../src/common/docview.cpp:1606

 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
 

-#: ../src/common/zipstrm.cpp:1797 ../src/common/zipstrm.cpp:2185
+#: ../src/common/zipstrm.cpp:1796 ../src/common/zipstrm.cpp:2184

 msgid "unsupported Zip compression method"
 msgstr "不支持的 Zip 压缩方法"
 
 msgid "unsupported Zip compression method"
 msgstr "不支持的 Zip 压缩方法"
 

-#: ../src/common/translation.cpp:1724
+#: ../src/common/translation.cpp:1883

 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'。"
 
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'。"
 

-#: ../src/html/chm.cpp:336
+#: ../src/html/chm.cpp:335

 msgid "write error"
 msgstr "写错误"
 
 msgid "write error"
 msgstr "写错误"
 

-#: ../src/common/time.cpp:319
+#: ../src/common/time.cpp:318

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败。"
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败。"
 

-#: ../src/gtk/print.cpp:989
+#: ../src/gtk/print.cpp:987

 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr "wxPrintout::GetPageInfo给出无效maxPage"
 
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr "wxPrintout::GetPageInfo给出无效maxPage"
 

-#: ../src/osx/carbon/dataview.cpp:1304
+#: ../src/osx/carbon/dataview.cpp:1303

 msgid "wxWidget control pointer is not a data view pointer"
 msgstr "wxWidget控制指针不是一个数据视图指针"
 
 msgid "wxWidget control pointer is not a data view pointer"
 msgstr "wxWidget控制指针不是一个数据视图指针"
 

-#: ../src/osx/carbon/dataview.cpp:908
+#: ../src/osx/carbon/dataview.cpp:907

 msgid "wxWidget's control not initialized."
 msgstr "wxWidgets 的控件未初始化。"
 
 msgid "wxWidget's control not initialized."
 msgstr "wxWidgets 的控件未初始化。"
 

-#: ../src/motif/app.cpp:246
+#: ../src/motif/app.cpp:245

 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 无法为 '%s' 打开显示设备: 退出。"
 
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 无法为 '%s' 打开显示设备: 退出。"
 

-#: ../src/x11/app.cpp:165
+#: ../src/x11/app.cpp:164

 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 无法打开显示设备。退出。"
 
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 无法打开显示设备。退出。"
 

-#: ../src/richtext/richtextsymboldlg.cpp:435
+#: ../src/richtext/richtextsymboldlg.cpp:434

 msgid "xxxx"
 msgstr "xxxx"
 
 msgid "xxxx"
 msgstr "xxxx"
 

-#: ../src/common/datetimefmt.cpp:1715
+#: ../src/common/datetimefmt.cpp:1726

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 

-#: ../src/common/zstream.cpp:252 ../src/common/zstream.cpp:427
+#: ../src/common/zstream.cpp:251 ../src/common/zstream.cpp:426

 #, c-format
 msgid "zlib error %d"
 msgstr "zlib 错误 %d"
 
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib 错误 %d"
 

-#: ../src/richtext/richtextliststylepage.cpp:497
-#: ../src/richtext/richtextbulletspage.cpp:302
+#: ../src/richtext/richtextliststylepage.cpp:496
+#: ../src/richtext/richtextbulletspage.cpp:301

 msgid "~"
 msgstr "~"
 
 msgid "~"
 msgstr "~"
 

+#~ msgid "Print preview"
+#~ msgstr "打印预览"
+
+#~ msgid "'"
+#~ msgstr "'"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "10"
+#~ msgstr "10"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "Can't monitor non-existent path \"%s\" for changes."
+#~ msgstr "无法监视不存在路径 \"%s\" 的更新。"
+
+#~ msgid "File system containing watched object was unmounted"
+#~ msgstr "包含监控对象的文件系统已被卸载"
+

 #~ msgid "&Preview..."
 #~ msgstr "预览(&P)..."
 
 #~ msgid "&Preview..."
 #~ msgstr "预览(&P)..."
 


@@ -8470,14 +8517,6 @@ msgstr "~"
 #~ msgid "Column could not be added to native control."
 #~ msgstr "文件不能被装载."
 
 #~ msgid "Column could not be added to native control."
 #~ msgstr "文件不能被装载."
 

-#, fuzzy
-#~ msgid "Elapsed time:"
-#~ msgstr "用时: "
-
-#, fuzzy
-#~ msgid "Estimated time:"
-#~ msgstr "预期时间: "
-

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


@@ -8509,10 +8548,6 @@ msgstr "~"
 #~ msgid "Passing a already registered object to SetObjectName"
 #~ msgstr "传递一个已注册的对象给SetObjectName"
 
 #~ msgid "Passing a already registered object to SetObjectName"
 #~ msgstr "传递一个已注册的对象给SetObjectName"
 

-#, fuzzy
-#~ msgid "Remaining time:"
-#~ msgstr "剩余时间 : "
-

 #~ msgid ""
 #~ "Streaming delegates for not already streamed objects not yet supported"
 #~ msgstr "不支持针对尚未形成流的对象的流委派"
 #~ msgid ""
 #~ "Streaming delegates for not already streamed objects not yet supported"
 #~ msgstr "不支持针对尚未形成流的对象的流委派"