using button impl

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index dc0a33a0b2b9ac05cce9b2addc25ed869ff5223f..00455edb5f3688d10e826fedf4d5db2303849257 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -9,10 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets 2.8.10\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: wxWidgets 2.8.10\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2011-11-06 12:44+0100\n"
-"PO-Revision-Date: 2011-11-30 23:13-0800\n"
+"POT-Creation-Date: 2012-08-27 11:51+0200\n"
+"PO-Revision-Date: 2012-08-26 22:18-0800\n"

 "Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"


@@ -24,46 +25,49 @@ msgid ""
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"

-"请将报告发送给程序维护人员，谢谢!\n"
+"请将报告发送给程序维护人员，谢谢！\n"

 
 

-#: ../src/palmos/utils.cpp:265
-#: ../src/richtext/richtextstyledlg.cpp:205
-#: ../src/richtext/richtextstyledlg.cpp:217
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:230

 msgid " "
 msgstr " "
 
 #: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgid " "
 msgstr " "
 
 #: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"

-msgstr "              谢谢，我们对您遇到的不便表示抱歉!\n"
+msgstr "              谢谢，我们对您遇到的不便表示抱歉！\n"

 
 

-#: ../src/common/log.cpp:376
+#: ../src/common/prntbase.cpp:547
+#, fuzzy, c-format
+msgid " (copy %d of %d)"
+msgstr "页 %d / %d"
+
+#: ../src/common/log.cpp:428

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -87,13 +91,12 @@ msgstr "#14 信封，5 x 11 1/2 英寸"
 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:1042
+#: ../src/html/helpwnd.cpp:1045

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

-#: ../src/html/helpwnd.cpp:1685
-#: ../src/html/helpwnd.cpp:1723
+#: ../src/html/helpwnd.cpp:1682 ../src/html/helpwnd.cpp:1720

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


@@ -104,7 +107,7 @@ msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 

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

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


@@ -114,17 +117,17 @@ msgstr "%lu / %lu"
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 

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

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

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

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

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

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


@@ -139,10 +142,9 @@ msgstr ""
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 
 msgid "%s files (%s)|%s"
 msgstr "%s 文件 (%s)|%s"
 

-#: ../src/common/stockitem.cpp:140
-#: ../src/html/helpfrm.cpp:143
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143

 #: ../src/html/helpfrm.cpp:145
 #: ../src/html/helpfrm.cpp:145

-msgid "&About..."
+msgid "&About"

 msgstr "关于(&A)"
 
 #: ../src/common/stockitem.cpp:208
 msgstr "关于(&A)"
 
 #: ../src/common/stockitem.cpp:208


@@ -162,7 +164,7 @@ msgstr "对齐(&A)"
 msgid "&Apply"
 msgstr "应用(&A)"
 
 msgid "&Apply"
 msgstr "应用(&A)"
 

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

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


@@ -186,7 +188,7 @@ msgstr ""
 msgid "&Before a paragraph:"
 msgstr ""
 
 msgid "&Before a paragraph:"
 msgstr ""
 

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

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


@@ -202,10 +204,11 @@ msgstr ""
 #: ../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

 msgid "&Bottom:"
 msgstr ""
 
 msgid "&Bottom:"
 msgstr ""
 

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

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


@@ -213,16 +216,14 @@ msgstr "粗体(&B)"
 #: ../src/richtext/richtextliststylepage.cpp:211
 #: ../src/richtext/richtextbulletspage.cpp:160
 msgid "&Bullet style:"
 #: ../src/richtext/richtextliststylepage.cpp:211
 #: ../src/richtext/richtextbulletspage.cpp:160
 msgid "&Bullet style:"

-msgstr ""
+msgstr "项目符号样式(&B):"

 
 #: ../src/common/stockitem.cpp:147
 msgid "&CD-Rom"
 
 #: ../src/common/stockitem.cpp:147
 msgid "&CD-Rom"

-msgstr ""
+msgstr "CD 光驱(&C)"

 
 

-#: ../src/generic/wizard.cpp:432
-#: ../src/generic/fontdlgg.cpp:471
-#: ../src/generic/fontdlgg.cpp:490
-#: ../src/osx/carbon/fontdlg.cpp:576
+#: ../src/generic/wizard.cpp:433 ../src/generic/fontdlgg.cpp:471
+#: ../src/generic/fontdlgg.cpp:490 ../src/osx/carbon/fontdlg.cpp:586

 #: ../src/common/stockitem.cpp:146
 msgid "&Cancel"
 msgstr "取消(&C)"
 #: ../src/common/stockitem.cpp:146
 msgid "&Cancel"
 msgstr "取消(&C)"


@@ -231,12 +232,12 @@ msgstr "取消(&C)"
 msgid "&Cascade"
 msgstr "层叠(&C)"
 
 msgid "&Cascade"
 msgstr "层叠(&C)"
 

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

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

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

 msgid "&Character code:"
 msgstr ""
 
 msgid "&Character code:"
 msgstr ""
 


@@ -244,9 +245,8 @@ msgstr ""
 msgid "&Clear"
 msgstr "清除(&C)"
 
 msgid "&Clear"
 msgstr "清除(&C)"
 

-#: ../src/generic/logg.cpp:528
-#: ../src/common/stockitem.cpp:149
-#: ../src/common/prntbase.cpp:1545
+#: ../src/generic/logg.cpp:520 ../src/common/stockitem.cpp:149
+#: ../src/common/prntbase.cpp:1571 ../src/univ/themes/win32.cpp:3757

 #: ../src/html/helpfrm.cpp:140
 msgid "&Close"
 msgstr "关闭(&C)"
 #: ../src/html/helpfrm.cpp:140
 msgid "&Close"
 msgstr "关闭(&C)"


@@ -255,7 +255,7 @@ msgstr "关闭(&C)"
 msgid "&Color"
 msgstr "颜色(&C)"
 
 msgid "&Color"
 msgstr "颜色(&C)"
 

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

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


@@ -263,10 +263,8 @@ msgstr "颜色(&C):"
 msgid "&Convert"
 msgstr "转换(&C)"
 
 msgid "&Convert"
 msgstr "转换(&C)"
 

-#: ../src/richtext/richtextctrl.cpp:311
-#: ../src/osx/textctrl_osx.cpp:586
-#: ../src/common/stockitem.cpp:151
-#: ../src/msw/textctrl.cpp:2211
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223

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


@@ -274,7 +272,7 @@ msgstr "复制(&C)"
 msgid "&Copy URL"
 msgstr "复制 URL(&C)"
 
 msgid "&Copy URL"
 msgstr "复制 URL(&C)"
 

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

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


@@ -283,14 +281,12 @@ msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 
 #: ../src/richtext/richtexttabspage.cpp:143
 msgstr "调试报告预览(&D): "
 
 #: ../src/richtext/richtexttabspage.cpp:143

-#: ../src/richtext/richtextctrl.cpp:313
-#: ../src/osx/textctrl_osx.cpp:588
-#: ../src/common/stockitem.cpp:153
-#: ../src/msw/textctrl.cpp:2213
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:586
+#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225

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

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

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


@@ -298,7 +294,7 @@ msgstr "删除样式(&D)..."
 msgid "&Descending"
 msgstr ""
 
 msgid "&Descending"
 msgstr ""
 

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

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


@@ -308,18 +304,17 @@ msgstr "向下(&D)"
 
 #: ../src/common/stockitem.cpp:155
 msgid "&Edit"
 
 #: ../src/common/stockitem.cpp:155
 msgid "&Edit"

-msgstr ""
+msgstr "编辑(&E)"

 
 

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

 msgid "&Edit Style..."
 msgstr "编辑样式(&E)..."
 
 #: ../src/common/stockitem.cpp:156
 msgid "&Execute"
 msgid "&Edit Style..."
 msgstr "编辑样式(&E)..."
 
 #: ../src/common/stockitem.cpp:156
 msgid "&Execute"

-msgstr ""
+msgstr "执行(&E)"

 
 

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

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


@@ -327,7 +322,7 @@ msgstr "文件(&F)"
 msgid "&Find"
 msgstr "查找(&F)"
 
 msgid "&Find"
 msgstr "查找(&F)"
 

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

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


@@ -335,7 +330,7 @@ msgstr "完成(&F)"
 msgid "&First"
 msgstr "最前(&F)"
 
 msgid "&First"
 msgstr "最前(&F)"
 

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

 msgid "&Floating mode:"
 msgstr ""
 
 msgid "&Floating mode:"
 msgstr ""
 


@@ -355,8 +350,8 @@ msgstr "字体(&F):"
 msgid "&Font for Level..."
 msgstr ""
 
 msgid "&Font for Level..."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:144
-#: ../src/richtext/richtextsymboldlg.cpp:397
+#: ../src/richtext/richtextfontpage.cpp:154
+#: ../src/richtext/richtextsymboldlg.cpp:401

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


@@ -364,24 +359,21 @@ msgstr "字体(&F):"
 msgid "&Forward"
 msgstr "前进(&F)"
 
 msgid "&Forward"
 msgstr "前进(&F)"
 

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

 msgid "&From:"
 msgstr "从(&F):"
 
 #: ../src/common/stockitem.cpp:163
 msgid "&Harddisk"
 msgid "&From:"
 msgstr "从(&F):"
 
 #: ../src/common/stockitem.cpp:163
 msgid "&Harddisk"

-msgstr ""
+msgstr "硬盘(&H)"

 
 

-#: ../src/richtext/richtextsizepage.cpp:227
+#: ../src/richtext/richtextsizepage.cpp:317

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

-#: ../src/generic/wizard.cpp:435
-#: ../src/richtext/richtextstyledlg.cpp:292
-#: ../src/richtext/richtextsymboldlg.cpp:476
-#: ../src/osx/menu_osx.cpp:669
-#: ../src/common/stockitem.cpp:164
-#: ../src/html/helpfrm.cpp:148
+#: ../src/generic/wizard.cpp:436 ../src/richtext/richtextstyledlg.cpp:311
+#: ../src/richtext/richtextsymboldlg.cpp:480 ../src/osx/menu_osx.cpp:685
+#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148

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


@@ -418,7 +410,7 @@ msgstr "斜体(&I)"
 
 #: ../src/common/stockitem.cpp:170
 msgid "&Jump to"
 
 #: ../src/common/stockitem.cpp:170
 msgid "&Jump to"

-msgstr ""
+msgstr "跳转到(&J)"

 
 #: ../src/richtext/richtextindentspage.cpp:166
 #: ../src/richtext/richtextliststylepage.cpp:343
 
 #: ../src/richtext/richtextindentspage.cpp:166
 #: ../src/richtext/richtextliststylepage.cpp:343


@@ -433,7 +425,7 @@ msgstr "最后(&L)"
 #: ../src/richtext/richtextindentspage.cpp:152
 #: ../src/richtext/richtextliststylepage.cpp:329
 msgid "&Left"
 #: ../src/richtext/richtextindentspage.cpp:152
 #: ../src/richtext/richtextliststylepage.cpp:329
 msgid "&Left"

-msgstr ""
+msgstr "左(&L)"

 
 #: ../src/richtext/richtextindentspage.cpp:208
 #: ../src/richtext/richtextborderspage.cpp:269
 
 #: ../src/richtext/richtextindentspage.cpp:208
 #: ../src/richtext/richtextborderspage.cpp:269


@@ -441,22 +433,23 @@ msgstr ""
 #: ../src/richtext/richtextliststylepage.cpp:382
 #: ../src/richtext/richtextmarginspage.cpp:187
 #: ../src/richtext/richtextmarginspage.cpp:301
 #: ../src/richtext/richtextliststylepage.cpp:382
 #: ../src/richtext/richtextmarginspage.cpp:187
 #: ../src/richtext/richtextmarginspage.cpp:301

+#: ../src/richtext/richtextsizepage.cpp:491

 msgid "&Left:"
 msgid "&Left:"

-msgstr ""
+msgstr "左(&L):"

 
 #: ../src/richtext/richtextliststylepage.cpp:184
 msgid "&List level:"
 msgstr ""
 
 
 #: ../src/richtext/richtextliststylepage.cpp:184
 msgid "&List level:"
 msgstr ""
 

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

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

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

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

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

 msgid "&Move the object to:"
 msgstr ""
 
 msgid "&Move the object to:"
 msgstr ""
 


@@ -464,23 +457,20 @@ msgstr ""
 msgid "&Network"
 msgstr "网络(&N)"
 
 msgid "&Network"
 msgstr "网络(&N)"
 

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

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

-#: ../src/aui/tabmdi.cpp:108
-#: ../src/generic/mdig.cpp:101
+#: ../src/aui/tabmdi.cpp:110 ../src/generic/mdig.cpp:101

 #: ../src/msw/mdi.cpp:169
 msgid "&Next"
 msgstr "下一个(&N)"
 
 #: ../src/msw/mdi.cpp:169
 msgid "&Next"
 msgstr "下一个(&N)"
 

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

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

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

 msgid "&Next Paragraph"
 msgstr ""
 
 msgid "&Next Paragraph"
 msgstr ""
 


@@ -492,8 +482,7 @@ msgstr "下一技巧(&N)"
 msgid "&Next style:"
 msgstr "下一个样式(&N):"
 
 msgid "&Next style:"
 msgstr "下一个样式(&N):"
 

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

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


@@ -505,15 +494,12 @@ msgstr "注意(&N):"
 msgid "&Number:"
 msgstr ""
 
 msgid "&Number:"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:476
-#: ../src/generic/fontdlgg.cpp:483
-#: ../src/osx/carbon/fontdlg.cpp:582
-#: ../src/common/stockitem.cpp:179
+#: ../src/generic/fontdlgg.cpp:476 ../src/generic/fontdlgg.cpp:483
+#: ../src/osx/carbon/fontdlg.cpp:592 ../src/common/stockitem.cpp:179

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

-#: ../src/generic/dbgrptg.cpp:339
-#: ../src/common/stockitem.cpp:180
+#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180

 #: ../src/html/helpfrm.cpp:138
 msgid "&Open..."
 msgstr "打开(&O)..."
 #: ../src/html/helpfrm.cpp:138
 msgid "&Open..."
 msgstr "打开(&O)..."


@@ -526,14 +512,12 @@ msgstr ""
 msgid "&Page Break"
 msgstr ""
 
 msgid "&Page Break"
 msgstr ""
 

-#: ../src/richtext/richtextctrl.cpp:312
-#: ../src/osx/textctrl_osx.cpp:587
-#: ../src/common/stockitem.cpp:181
-#: ../src/msw/textctrl.cpp:2212
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224

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

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

 msgid "&Picture"
 msgstr ""
 
 msgid "&Picture"
 msgstr ""
 


@@ -545,21 +529,21 @@ msgstr "字体大小(&P):"
 msgid "&Position (tenths of a mm):"
 msgstr ""
 
 msgid "&Position (tenths of a mm):"
 msgstr ""
 

+#: ../src/richtext/richtextsizepage.cpp:476
+#, fuzzy
+msgid "&Position mode:"
+msgstr "位置"
+

 #: ../src/common/stockitem.cpp:182
 msgid "&Preferences"
 msgstr "偏好设置(&P)"
 
 #: ../src/common/stockitem.cpp:182
 msgid "&Preferences"
 msgstr "偏好设置(&P)"
 

-#: ../src/common/stockitem.cpp:183
-msgid "&Preview..."
-msgstr "预览(&P)..."
-
-#: ../src/aui/tabmdi.cpp:109
-#: ../src/generic/mdig.cpp:102
+#: ../src/aui/tabmdi.cpp:111 ../src/generic/mdig.cpp:102

 #: ../src/msw/mdi.cpp:170
 msgid "&Previous"
 msgstr "前页(&P)"
 
 #: ../src/msw/mdi.cpp:170
 msgid "&Previous"
 msgstr "前页(&P)"
 

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

 #, fuzzy
 msgid "&Previous Paragraph"
 msgstr "前页"
 #, fuzzy
 msgid "&Previous Paragraph"
 msgstr "前页"


@@ -568,8 +552,7 @@ msgstr "前页"
 msgid "&Print..."
 msgstr "打印(&P)..."
 
 msgid "&Print..."
 msgstr "打印(&P)..."
 

-#: ../src/richtext/richtextctrl.cpp:317
-#: ../src/richtext/richtextctrl.cpp:4257
+#: ../src/richtext/richtextctrl.cpp:331 ../src/richtext/richtextctrl.cpp:4888

 #: ../src/common/stockitem.cpp:185
 msgid "&Properties"
 msgstr "属性(&P)"
 #: ../src/common/stockitem.cpp:185
 msgid "&Properties"
 msgstr "属性(&P)"


@@ -578,21 +561,17 @@ msgstr "属性(&P)"
 msgid "&Quit"
 msgstr "退出(&Q)"
 
 msgid "&Quit"
 msgstr "退出(&Q)"
 

-#: ../src/richtext/richtextctrl.cpp:308
-#: ../src/osx/textctrl_osx.cpp:583
-#: ../src/common/stockitem.cpp:186
-#: ../src/common/cmdproc.cpp:294
-#: ../src/common/cmdproc.cpp:301
-#: ../src/msw/textctrl.cpp:2208
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:581
+#: ../src/common/stockitem.cpp:186 ../src/common/cmdproc.cpp:294
+#: ../src/common/cmdproc.cpp:301 ../src/msw/textctrl.cpp:2220

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

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

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

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

 msgid "&Rename Style..."
 msgstr ""
 
 msgid "&Rename Style..."
 msgstr ""
 


@@ -600,11 +579,11 @@ msgstr ""
 msgid "&Replace"
 msgstr "替换(&R)"
 
 msgid "&Replace"
 msgstr "替换(&R)"
 

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

 msgid "&Restart numbering"
 msgstr ""
 
 msgid "&Restart numbering"
 msgstr ""
 

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

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


@@ -619,6 +598,7 @@ msgstr "右(&R)"
 #: ../src/richtext/richtextliststylepage.cpp:400
 #: ../src/richtext/richtextmarginspage.cpp:212
 #: ../src/richtext/richtextmarginspage.cpp:326
 #: ../src/richtext/richtextliststylepage.cpp:400
 #: ../src/richtext/richtextmarginspage.cpp:212
 #: ../src/richtext/richtextmarginspage.cpp:326

+#: ../src/richtext/richtextsizepage.cpp:547

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


@@ -630,10 +610,6 @@ msgstr "保存(&S)"
 msgid "&Save as"
 msgstr "另存为(&S)"
 
 msgid "&Save as"
 msgstr "另存为(&S)"
 

-#: ../src/generic/logg.cpp:524
-msgid "&Save..."
-msgstr "保存(&S)..."
-

 #: ../include/wx/richmsgdlg.h:30
 msgid "&See details"
 msgstr "查看细节(&S)"
 #: ../include/wx/richmsgdlg.h:30
 msgid "&See details"
 msgstr "查看细节(&S)"


@@ -642,15 +618,15 @@ msgstr "查看细节(&S)"
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 

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

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

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

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

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

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


@@ -667,21 +643,19 @@ msgstr ""
 msgid "&Stop"
 msgstr "停止(&S)"
 
 msgid "&Stop"
 msgstr "停止(&S)"
 

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

 msgid "&Strikethrough"
 msgstr ""
 
 msgid "&Strikethrough"
 msgstr ""
 

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

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

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

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

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

 msgid "&Subset:"
 msgstr ""
 
 msgid "&Subset:"
 msgstr ""
 


@@ -690,7 +664,7 @@ msgstr ""
 msgid "&Symbol:"
 msgstr "符号(&S):"
 
 msgid "&Symbol:"
 msgstr "符号(&S):"
 

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

 msgid "&Table"
 msgstr ""
 
 msgid "&Table"
 msgstr ""
 


@@ -702,23 +676,21 @@ 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

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

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

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

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

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

-#: ../src/richtext/richtextctrl.cpp:307
-#: ../src/osx/textctrl_osx.cpp:582
-#: ../src/common/stockitem.cpp:204
-#: ../src/common/cmdproc.cpp:272
-#: ../src/msw/textctrl.cpp:2207
+#: ../src/richtext/richtextctrl.cpp:321 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
+#: ../src/msw/textctrl.cpp:2219

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


@@ -734,7 +706,7 @@ msgstr "取消缩进(&U)"
 msgid "&Up"
 msgstr "向上(&U)"
 
 msgid "&Up"
 msgstr "向上(&U)"
 

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

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


@@ -746,45 +718,37 @@ msgstr "查看(&V)..."
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 

-#: ../src/richtext/richtextsizepage.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:290

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

-#: ../src/aui/tabmdi.cpp:301
-#: ../src/aui/tabmdi.cpp:317
-#: ../src/aui/tabmdi.cpp:319
-#: ../src/generic/mdig.cpp:295
-#: ../src/generic/mdig.cpp:311
-#: ../src/generic/mdig.cpp:315
+#: ../src/aui/tabmdi.cpp:303 ../src/aui/tabmdi.cpp:319
+#: ../src/aui/tabmdi.cpp:321 ../src/generic/mdig.cpp:295
+#: ../src/generic/mdig.cpp:311 ../src/generic/mdig.cpp:315

 #: ../src/msw/mdi.cpp:70
 msgid "&Window"
 msgstr "窗口(&W)"
 
 #: ../src/msw/mdi.cpp:70
 msgid "&Window"
 msgstr "窗口(&W)"
 

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

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

-#: ../src/common/fontcmn.cpp:821
+#: ../src/common/fontcmn.cpp:845

 msgid "'"
 msgstr "'"
 
 msgid "'"
 msgstr "'"
 

-#: ../src/common/config.cpp:526
-#: ../src/msw/regconf.cpp:259
+#: ../src/common/config.cpp:524 ../src/msw/regconf.cpp:259

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

 #, 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:941 ../src/common/cmdline.cpp:959

 #, 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'的正确数字值。"


@@ -794,7 +758,7 @@ msgstr "'%s' 不是匹配选项 '%s'的正确数字值。"
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录。"
 
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录。"
 

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

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


@@ -836,15 +800,14 @@ msgstr "(帮助)"
 #: ../src/richtext/richtextliststylepage.cpp:482
 #: ../src/richtext/richtextbulletspage.cpp:287
 msgid "(None)"
 #: ../src/richtext/richtextliststylepage.cpp:482
 #: ../src/richtext/richtextbulletspage.cpp:287
 msgid "(None)"

-msgstr ""
+msgstr "(无)"

 
 

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

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

-#: ../src/html/helpwnd.cpp:424
-#: ../src/html/helpwnd.cpp:1114
-#: ../src/html/helpwnd.cpp:1750
+#: ../src/html/helpwnd.cpp:427 ../src/html/helpwnd.cpp:1120
+#: ../src/html/helpwnd.cpp:1746

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


@@ -854,10 +817,10 @@ msgstr "(书签)"
 #: ../src/richtext/richtextindentspage.cpp:299
 #: ../src/richtext/richtextindentspage.cpp:311
 #: ../src/richtext/richtextindentspage.cpp:312
 #: ../src/richtext/richtextindentspage.cpp:299
 #: ../src/richtext/richtextindentspage.cpp:311
 #: ../src/richtext/richtextindentspage.cpp:312

-#: ../src/richtext/richtextformatdlg.cpp:826
-#: ../src/richtext/richtextfontpage.cpp:291
-#: ../src/richtext/richtextfontpage.cpp:295
-#: ../src/richtext/richtextfontpage.cpp:299
+#: ../src/richtext/richtextformatdlg.cpp:828
+#: ../src/richtext/richtextfontpage.cpp:322
+#: ../src/richtext/richtextfontpage.cpp:326
+#: ../src/richtext/richtextfontpage.cpp:330

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


@@ -879,16 +842,16 @@ msgstr "*)"
 msgid "+"
 msgstr "+"
 
 msgid "+"
 msgstr "+"
 

-#: ../src/msw/utils.cpp:1332
+#: ../src/msw/utils.cpp:1324

 msgid ", 64-bit edition"
 msgid ", 64-bit edition"

-msgstr ""
+msgstr "，64位版"

 
 #: ../src/richtext/richtextliststylepage.cpp:494
 #: ../src/richtext/richtextbulletspage.cpp:299
 msgid "-"
 msgstr "-"
 
 
 #: ../src/richtext/richtextliststylepage.cpp:494
 #: ../src/richtext/richtextbulletspage.cpp:299
 msgid "-"
 msgstr "-"
 

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

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


@@ -1011,86 +974,77 @@ msgstr "9 x 11 英寸"
 msgid ": file does not exist!"
 msgstr ": 文件不存在！"
 
 msgid ": file does not exist!"
 msgstr ": 文件不存在！"
 

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

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

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

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

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

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

-#: ../src/osx/carbon/fontdlg.cpp:596
-#: ../src/osx/carbon/fontdlg.cpp:803
-#: ../src/osx/carbon/fontdlg.cpp:823
+#: ../src/osx/carbon/fontdlg.cpp:606 ../src/osx/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:833

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

-#: ../src/osx/carbon/fontdlg.cpp:597
-#: ../src/osx/carbon/fontdlg.cpp:805
-#: ../src/osx/carbon/fontdlg.cpp:825
+#: ../src/osx/carbon/fontdlg.cpp:607 ../src/osx/carbon/fontdlg.cpp:815
+#: ../src/osx/carbon/fontdlg.cpp:835

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

-#: ../src/osx/carbon/fontdlg.cpp:595
-#: ../src/osx/carbon/fontdlg.cpp:801
-#: ../src/osx/carbon/fontdlg.cpp:821
+#: ../src/osx/carbon/fontdlg.cpp:605 ../src/osx/carbon/fontdlg.cpp:811
+#: ../src/osx/carbon/fontdlg.cpp:831

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

-#: ../src/osx/carbon/fontdlg.cpp:598
-#: ../src/osx/carbon/fontdlg.cpp:807
-#: ../src/osx/carbon/fontdlg.cpp:827
+#: ../src/osx/carbon/fontdlg.cpp:608 ../src/osx/carbon/fontdlg.cpp:817
+#: ../src/osx/carbon/fontdlg.cpp:837

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

-#: ../src/osx/carbon/fontdlg.cpp:599
-#: ../src/osx/carbon/fontdlg.cpp:812
-#: ../src/osx/carbon/fontdlg.cpp:831
+#: ../src/osx/carbon/fontdlg.cpp:609 ../src/osx/carbon/fontdlg.cpp:822
+#: ../src/osx/carbon/fontdlg.cpp:841

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

-#: ../src/osx/carbon/fontdlg.cpp:600
-#: ../src/osx/carbon/fontdlg.cpp:809
-#: ../src/osx/carbon/fontdlg.cpp:829
+#: ../src/osx/carbon/fontdlg.cpp:610 ../src/osx/carbon/fontdlg.cpp:819
+#: ../src/osx/carbon/fontdlg.cpp:839

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

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

 msgid "<Any>"
 msgid "<Any>"

-msgstr ""
+msgstr "<任意>"

 
 

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

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

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

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

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

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

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

 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:1278
+#: ../src/html/helpwnd.cpp:1284

 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:1273
+#: ../src/html/helpwnd.cpp:1279

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

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

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


@@ -1198,37 +1152,31 @@ msgstr "A6 纸张, 105 x 148 毫米"
 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:523
-#: ../src/osx/carbon/fontdlg.cpp:327
+#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:525
+#: ../src/osx/carbon/fontdlg.cpp:337

 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
 #: ../src/common/accelcmn.cpp:77
 msgid "ADD"
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
 #: ../src/common/accelcmn.cpp:77
 msgid "ADD"

-msgstr ""
+msgstr "ADD"

 
 

-#: ../src/richtext/richtextsymboldlg.cpp:455
-#: ../src/common/ftp.cpp:408
+#: ../src/richtext/richtextsymboldlg.cpp:459 ../src/common/ftp.cpp:406

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

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

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

-#: ../src/generic/aboutdlgg.cpp:141
-msgid "About "
-msgstr "关于"
-
-#: ../src/msw/aboutdlg.cpp:65
+#: ../src/generic/aboutdlgg.cpp:141 ../src/msw/aboutdlg.cpp:65

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

-#: ../src/common/stockitem.cpp:140
-msgid "About..."
-msgstr "关于..."
+#: ../src/richtext/richtextsizepage.cpp:482
+msgid "Absolute"
+msgstr ""

 
 #: ../src/common/stockitem.cpp:208
 msgid "Actual Size"
 
 #: ../src/common/stockitem.cpp:208
 msgid "Actual Size"


@@ -1238,32 +1186,32 @@ msgstr "实际大小"
 msgid "Add"
 msgstr "加入"
 
 msgid "Add"
 msgstr "加入"
 

-#: ../src/html/helpwnd.cpp:437
+#: ../src/html/helpwnd.cpp:440

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -1279,7 +1227,7 @@ msgstr "左对齐"
 msgid "Align Right"
 msgstr "右对齐"
 
 msgid "Align Right"
 msgstr "右对齐"
 

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

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


@@ -1287,27 +1235,20 @@ msgstr "对齐"
 msgid "All"
 msgstr "所有"
 
 msgid "All"
 msgstr "所有"
 

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

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

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

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

-#: ../src/html/helpwnd.cpp:1560
-msgid "All files (*.*)|*"
-msgstr "所有文件 (*.*)|*"
-
-#: ../include/wx/defs.h:2806
-#: ../src/propgrid/props.cpp:1706
-#: ../src/propgrid/props.cpp:1735
+#: ../include/wx/defs.h:2771

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

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

 msgid "All styles"
 msgstr ""
 
 msgid "All styles"
 msgstr ""
 


@@ -1323,9 +1264,9 @@ msgstr "传递已注册对象给 SetObjectClassInfo"
 msgid "Already dialling ISP."
 msgstr "已经拨接 ISP 。"
 
 msgid "Already dialling ISP."
 msgstr "已经拨接 ISP 。"
 

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

 msgid "Alt+"
 msgid "Alt+"

-msgstr ""
+msgstr "Alt+"

 
 #: ../src/common/debugrpt.cpp:572
 msgid "And includes the following files:\n"
 
 #: ../src/common/debugrpt.cpp:572
 msgid "And includes the following files:\n"


@@ -1336,11 +1277,16 @@ msgstr "并且包含以下文件:\n"
 msgid "Animation file is not of type %ld."
 msgstr "动画文件的类型不是 %ld。"
 
 msgid "Animation file is not of type %ld."
 msgstr "动画文件的类型不是 %ld。"
 

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

 #, 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
+#, fuzzy
+msgid "Application"
+msgstr "选区"
+

 #: ../src/common/stockitem.cpp:142
 msgid "Apply"
 msgstr "应用"
 #: ../src/common/stockitem.cpp:142
 msgid "Apply"
 msgstr "应用"


@@ -1350,11 +1296,11 @@ msgstr "应用"
 msgid "Arabic"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 

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

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

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

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


@@ -1427,10 +1373,9 @@ msgstr "B6 信封, 176 x 125 毫米"
 
 #: ../src/common/accelcmn.cpp:50
 msgid "BACK"
 
 #: ../src/common/accelcmn.cpp:50
 msgid "BACK"

-msgstr ""
+msgstr "BACK"

 
 

-#: ../src/common/imagbmp.cpp:524
-#: ../src/common/imagbmp.cpp:554
+#: ../src/common/imagbmp.cpp:524 ../src/common/imagbmp.cpp:554

 #: ../src/common/imagbmp.cpp:569
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 无法分配内存。"
 #: ../src/common/imagbmp.cpp:569
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 无法分配内存。"


@@ -1464,23 +1409,23 @@ msgid "Back"
 msgstr "返回"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:119
 msgstr "返回"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:119

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

 msgid "Background"
 msgid "Background"

-msgstr ""
+msgstr "背景"

 
 #: ../src/richtext/richtextbackgroundpage.cpp:131
 msgid "Background &colour:"
 msgstr "背景颜色(&c):"
 
 
 #: ../src/richtext/richtextbackgroundpage.cpp:131
 msgid "Background &colour:"
 msgstr "背景颜色(&c):"
 

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

 msgid "Background colour"
 msgid "Background colour"

-msgstr ""
+msgstr "背景颜色"

 
 

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

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

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

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


@@ -1491,16 +1436,14 @@ msgstr ""
 #: ../src/richtext/richtextliststylepage.cpp:490
 #: ../src/richtext/richtextbulletspage.cpp:295
 msgid "Bitmap"
 #: ../src/richtext/richtextliststylepage.cpp:490
 #: ../src/richtext/richtextbulletspage.cpp:295
 msgid "Bitmap"

-msgstr ""
+msgstr "位图"

 
 

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

 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:297
-#: ../src/osx/carbon/fontdlg.cpp:528
-#: ../src/common/stockitem.cpp:144
+#: ../src/generic/fontdlgg.cpp:334 ../src/richtext/richtextfontpage.cpp:328
+#: ../src/osx/carbon/fontdlg.cpp:538 ../src/common/stockitem.cpp:144

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


@@ -1509,12 +1452,11 @@ msgstr "粗体"
 msgid "Border"
 msgstr "边框"
 
 msgid "Border"
 msgstr "边框"
 

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

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

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

 msgid "Bottom"
 msgstr ""
 
 msgid "Bottom"
 msgstr ""
 


@@ -1522,39 +1464,38 @@ msgstr ""
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 

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

 #, fuzzy
 msgid "Box Properties"
 msgstr "属性(&P)"
 
 #, fuzzy
 msgid "Box Properties"
 msgstr "属性(&P)"
 

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

 #, fuzzy
 msgid "Box styles"
 msgstr "下一个样式(&N):"
 
 #, fuzzy
 msgid "Box styles"
 msgstr "下一个样式(&N):"
 

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

 msgid "Browse"
 msgid "Browse"

-msgstr ""
+msgstr "浏览"

 
 #: ../src/richtext/richtextliststylepage.cpp:246
 #: ../src/richtext/richtextbulletspage.cpp:196
 msgid "Bullet &Alignment:"
 
 #: ../src/richtext/richtextliststylepage.cpp:246
 #: ../src/richtext/richtextbulletspage.cpp:196
 msgid "Bullet &Alignment:"

-msgstr ""
+msgstr "项目符号对齐(&A):"

 
 #: ../src/richtext/richtextliststylepage.cpp:310
 msgid "Bullet style"
 
 #: ../src/richtext/richtextliststylepage.cpp:310
 msgid "Bullet style"

-msgstr ""
+msgstr "项目符号样式"

 
 

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

 msgid "Bullets"
 msgid "Bullets"

-msgstr ""
+msgstr "项目符号"

 
 #: ../src/common/paper.cpp:100
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
 
 #: ../src/common/paper.cpp:100
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 

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

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


@@ -1584,30 +1525,29 @@ msgstr "C65 信封, 114 x 229 毫米"
 
 #: ../src/common/accelcmn.cpp:67
 msgid "CANCEL"
 
 #: ../src/common/accelcmn.cpp:67
 msgid "CANCEL"

-msgstr ""
+msgstr "CANCEL"

 
 #: ../src/common/accelcmn.cpp:71
 msgid "CAPITAL"
 
 #: ../src/common/accelcmn.cpp:71
 msgid "CAPITAL"

-msgstr ""
+msgstr "CAPITAL"

 
 #: ../src/common/stockitem.cpp:147
 msgid "CD-Rom"
 
 #: ../src/common/stockitem.cpp:147
 msgid "CD-Rom"

-msgstr ""
+msgstr "CD 光驱"

 
 

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

 msgid "CHM handler currently supports only local files!"
 msgid "CHM handler currently supports only local files!"

-msgstr "CHM处理程序目前只支持本地文件!"
+msgstr "CHM处理程序目前只支持本地文件！"

 
 #: ../src/common/accelcmn.cpp:68
 msgid "CLEAR"
 
 #: ../src/common/accelcmn.cpp:68
 msgid "CLEAR"

-msgstr ""
+msgstr "CLEAR"

 
 #: ../src/common/accelcmn.cpp:112
 msgid "COMMAND"
 
 #: ../src/common/accelcmn.cpp:112
 msgid "COMMAND"

-msgstr ""
+msgstr "COMMAND"

 
 

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

 msgid "Ca&pitals"
 msgstr ""
 
 msgid "Ca&pitals"
 msgstr ""
 


@@ -1615,7 +1555,7 @@ msgstr ""
 msgid "Can't &Undo "
 msgstr "无法撤销(&U)"
 
 msgid "Can't &Undo "
 msgstr "无法撤销(&U)"
 

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

 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 ""
 


@@ -1634,12 +1574,11 @@ msgstr "无法复制不支持的类型 %d 的值."
 msgid "Can't create registry key '%s'"
 msgstr "无法创建注册键 '%s'"
 
 msgid "Can't create registry key '%s'"
 msgstr "无法创建注册键 '%s'"
 

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

 msgid "Can't create thread"
 msgstr "无法创建进程"
 
 msgid "Can't create thread"
 msgstr "无法创建进程"
 

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

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


@@ -1649,8 +1588,7 @@ msgstr "无法创建窗口类 %s"
 msgid "Can't delete key '%s'"
 msgstr "无法删除键 '%s'"
 
 msgid "Can't delete key '%s'"
 msgstr "无法删除键 '%s'"
 

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

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


@@ -1685,18 +1623,18 @@ msgstr "无法在文件 '%s' 中找到当前位置"
 msgid "Can't get info about registry key '%s'"
 msgstr "无法获得注册键 '%s' 的信息"
 
 msgid "Can't get info about registry key '%s'"
 msgstr "无法获得注册键 '%s' 的信息"
 

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

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

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

 msgid "Can't initialize zlib inflate stream."
 msgstr "无法初始化 zlib 解压流。"
 
 #: ../src/msw/fswatcher.cpp:429
 msgid "Can't initialize zlib inflate stream."
 msgstr "无法初始化 zlib 解压流。"
 
 #: ../src/msw/fswatcher.cpp:429

-#, fuzzy, c-format
+#, c-format

 msgid "Can't monitor non-existent directory \"%s\" for changes."
 msgid "Can't monitor non-existent directory \"%s\" for changes."

-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95ç\9b\91è§\86ä¸\8då­\98å\9c¨ç\9b®å½\95 \"%s\" ç\9a\84æ\9b´æ\96°ã\80\82"

 
 #: ../src/common/fswatchercmn.cpp:93
 #, c-format
 
 #: ../src/common/fswatchercmn.cpp:93
 #, c-format


@@ -1708,12 +1646,12 @@ msgstr ""
 msgid "Can't open registry key '%s'"
 msgstr "无法打开注册键 '%s'"
 
 msgid "Can't open registry key '%s'"
 msgstr "无法打开注册键 '%s'"
 

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

 #, 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:237
+#: ../src/common/zstream.cpp:245

 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。"
 


@@ -1722,50 +1660,43 @@ msgstr "无法读解压流: 流内有异常的 EOF。"
 msgid "Can't read value of '%s'"
 msgstr "无法读 '%s' 的值"
 
 msgid "Can't read value of '%s'"
 msgstr "无法读 '%s' 的值"
 

-#: ../src/msw/registry.cpp:878
-#: ../src/msw/registry.cpp:910
+#: ../src/msw/registry.cpp:878 ../src/msw/registry.cpp:910

 #: ../src/msw/registry.cpp:972
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "无法读键 '%s' 的值"
 
 #: ../src/msw/registry.cpp:972
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "无法读键 '%s' 的值"
 

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

 #, 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:587
-#: ../src/generic/logg.cpp:1002
+#: ../src/generic/logg.cpp:579 ../src/generic/logg.cpp:1000

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

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

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

-#: ../src/msw/registry.cpp:896
-#: ../src/msw/registry.cpp:940
+#: ../src/msw/registry.cpp:896 ../src/msw/registry.cpp:940

 #: ../src/msw/registry.cpp:1066
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "无法设置 '%s' 的值"
 
 #: ../src/msw/registry.cpp:1066
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "无法设置 '%s' 的值"
 

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

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

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

 #, 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:289
-#: ../src/common/stockitem.cpp:146
-#: ../src/msw/msgdlg.cpp:483
-#: ../src/msw/progdlg.cpp:672
-#: ../src/gtk1/fontdlg.cpp:145
+#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:308
+#: ../src/common/stockitem.cpp:146 ../src/msw/msgdlg.cpp:489
+#: ../src/msw/progdlg.cpp:674 ../src/gtk1/fontdlg.cpp:145

 #: ../src/motif/msgdlg.cpp:194
 msgid "Cancel"
 msgstr "取消"
 #: ../src/motif/msgdlg.cpp:194
 msgid "Cancel"
 msgstr "取消"


@@ -1776,9 +1707,9 @@ msgstr "无法创建互斥子。"
 
 #: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 
 #: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."

-msgstr ""
+msgstr "无法建立新的列 ID。可能已达到列数量的上限。"

 
 

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

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


@@ -1793,29 +1724,29 @@ msgstr "无法枚举目录 '%s' 中的文件"
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到活动的拨号连接: %s"
 
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到活动的拨号连接: %s"
 

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

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

-#: ../src/msw/ole/automtn.cpp:554
+#: ../src/msw/ole/automtn.cpp:557

 #, fuzzy, c-format
 msgid "Cannot get an active instance of \"%s\""
 msgstr "找不到活动的拨号连接: %s"
 
 #, fuzzy, c-format
 msgid "Cannot get an active instance of \"%s\""
 msgstr "找不到活动的拨号连接: %s"
 

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

 #, 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:898
+#: ../src/unix/utilsunx.cpp:878

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

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

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

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

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


@@ -1823,19 +1754,11 @@ msgstr "无法挂断 - 没有活动的拨号连接。"
 msgid "Cannot initialize OLE"
 msgstr "无法初始化 OLE"
 
 msgid "Cannot initialize OLE"
 msgstr "无法初始化 OLE"
 

-#: ../src/mgl/app.cpp:224
-msgid "Cannot initialize SciTech MGL!"
-msgstr "无法初始化 SciTech MGL!"
-
-#: ../src/mgl/window.cpp:547
-msgid "Cannot initialize display."
-msgstr "无法初始化显示。"
-

 #: ../src/common/socket.cpp:844
 msgid "Cannot initialize sockets"
 msgstr "无法初始化 sockets"
 
 #: ../src/common/socket.cpp:844
 msgid "Cannot initialize sockets"
 msgstr "无法初始化 sockets"
 

-#: ../src/msw/volume.cpp:619
+#: ../src/msw/volume.cpp:620

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


@@ -1867,7 +1790,7 @@ msgstr "无法打开目录文件: %s"
 
 #: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
 
 #: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"

-msgstr "无法打开文件进行PostScript打印!"
+msgstr "无法打开文件进行 PostScript 打印！"

 
 #: ../src/html/helpdata.cpp:312
 #, c-format
 
 #: ../src/html/helpdata.cpp:312
 #, c-format


@@ -1879,39 +1802,35 @@ msgstr "无法打开索引文件: %s"
 msgid "Cannot open resources file '%s'."
 msgstr "无法打开资源文件 '%s'。"
 
 msgid "Cannot open resources file '%s'."
 msgstr "无法打开资源文件 '%s'。"
 

-#: ../src/html/helpwnd.cpp:1541
+#: ../src/html/helpwnd.cpp:1538

 msgid "Cannot print empty page."
 msgstr "无法打印空白页面。"
 
 #: ../src/msw/volume.cpp:508
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgid "Cannot print empty page."
 msgstr "无法打印空白页面。"
 
 #: ../src/msw/volume.cpp:508
 #, c-format
 msgid "Cannot read typename from '%s'!"

-msgstr "无法从 '%s' 中读取类型名称!"
+msgstr "无法从 '%s' 中读取类型名称！"

 
 #: ../src/os2/thread.cpp:528
 #, c-format
 msgid "Cannot resume thread %lu"
 msgstr "无法恢复线程 %lu"
 
 
 #: ../src/os2/thread.cpp:528
 #, c-format
 msgid "Cannot resume thread %lu"
 msgstr "无法恢复线程 %lu"
 

-#: ../src/msw/thread.cpp:901
+#: ../src/msw/thread.cpp:922

 #, c-format
 msgid "Cannot resume thread %x"
 msgstr "无法恢复线程 %x"
 
 #, c-format
 msgid "Cannot resume thread %x"
 msgstr "无法恢复线程 %x"
 

-#: ../src/unix/threadpsx.cpp:1189
+#: ../src/unix/threadpsx.cpp:1194

 msgid "Cannot retrieve thread scheduling policy."
 msgstr "无法找回线程调度策略。"
 
 #: ../src/common/intl.cpp:545
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "无法找回线程调度策略。"
 
 #: ../src/common/intl.cpp:545
 #, c-format
 msgid "Cannot set locale to language \"%s\"."

-msgstr ""
-
-#: ../src/unix/threadpsx.cpp:818
-msgid "Cannot start thread: error writing TLS"
-msgstr "无法启动线程: 写 TLS 错误"
+msgstr "无法设定为语言 \"%s\"。"

 
 

-#: ../src/msw/thread.cpp:549
+#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570

 msgid "Cannot start thread: error writing TLS."
 msgstr "无法启动线程: 写 TLS 出错。"
 
 msgid "Cannot start thread: error writing TLS."
 msgstr "无法启动线程: 写 TLS 出错。"
 


@@ -1920,16 +1839,16 @@ msgstr "无法启动线程: 写 TLS 出错。"
 msgid "Cannot suspend thread %lu"
 msgstr "无法挂起线程 %lu"
 
 msgid "Cannot suspend thread %lu"
 msgstr "无法挂起线程 %lu"
 

-#: ../src/msw/thread.cpp:886
+#: ../src/msw/thread.cpp:907

 #, c-format
 msgid "Cannot suspend thread %x"
 msgstr "无法挂起线程 %x"
 
 #, c-format
 msgid "Cannot suspend thread %x"
 msgstr "无法挂起线程 %x"
 

-#: ../src/msw/thread.cpp:809
+#: ../src/msw/thread.cpp:830

 msgid "Cannot wait for thread termination"
 msgstr "无法等候线程终止"
 
 msgid "Cannot wait for thread termination"
 msgstr "无法等候线程终止"
 

-#: ../src/html/helpwnd.cpp:544
+#: ../src/html/helpwnd.cpp:547

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


@@ -1937,11 +1856,11 @@ msgstr "大小写敏感"
 msgid "Categorized Mode"
 msgstr ""
 
 msgid "Categorized Mode"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:8065
+#: ../src/richtext/richtextbuffer.cpp:8843

 msgid "Cell Properties"
 msgstr "单元格属性"
 
 msgid "Cell Properties"
 msgstr "单元格属性"
 

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

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


@@ -1954,7 +1873,7 @@ msgstr "居中(&t)"
 msgid "Centered"
 msgstr "居中"
 
 msgid "Centered"
 msgstr "居中"
 

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

 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧语系 (ISO-8859-2)"
 


@@ -1970,7 +1889,7 @@ msgstr "居中"
 msgid "Centre text."
 msgstr "文字居中。"
 
 msgid "Centre text."
 msgstr "文字居中。"
 

-#: ../src/richtext/richtextsizepage.cpp:281
+#: ../src/richtext/richtextsizepage.cpp:263

 msgid "Centred"
 msgstr "居中"
 
 msgid "Centred"
 msgstr "居中"
 


@@ -1979,24 +1898,28 @@ msgstr "居中"
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 

-#: ../src/richtext/richtextbuffer.cpp:3734
+#: ../src/richtext/richtextbuffer.cpp:3936

 msgid "Change List Style"
 msgstr ""
 
 msgid "Change List Style"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:3265
+#: ../src/richtext/richtextbuffer.cpp:3300

 msgid "Change Object Style"
 msgid "Change Object Style"

-msgstr ""
+msgstr "更改对象样式"

 
 

-#: ../src/richtext/richtextbuffer.cpp:3092
+#: ../src/richtext/richtextbuffer.cpp:3566
+msgid "Change Properties"
+msgstr "修改属性"
+
+#: ../src/richtext/richtextbuffer.cpp:3127

 msgid "Change Style"
 msgid "Change Style"

-msgstr ""
+msgstr "更改样式"

 
 #: ../src/common/fileconf.cpp:373
 #, c-format
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 
 
 #: ../src/common/fileconf.cpp:373
 #, c-format
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 

-#: ../src/richtext/richtextstyles.cpp:1034
+#: ../src/richtext/richtextstyles.cpp:1043

 msgid "Character styles"
 msgstr ""
 
 msgid "Character styles"
 msgstr ""
 


@@ -2021,43 +1944,40 @@ msgstr ""
 msgid "Check to enclose the bullet in parentheses."
 msgstr ""
 
 msgid "Check to enclose the bullet in parentheses."
 msgstr ""
 

-#: ../src/osx/carbon/fontdlg.cpp:530
-#: ../src/osx/carbon/fontdlg.cpp:532
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542

 msgid "Check to make the font bold."
 msgstr "勾选设定为粗体。"
 
 msgid "Check to make the font bold."
 msgstr "勾选设定为粗体。"
 

-#: ../src/osx/carbon/fontdlg.cpp:537
-#: ../src/osx/carbon/fontdlg.cpp:539
+#: ../src/osx/carbon/fontdlg.cpp:547 ../src/osx/carbon/fontdlg.cpp:549

 msgid "Check to make the font italic."
 msgstr "勾选设定为斜体。"
 
 msgid "Check to make the font italic."
 msgstr "勾选设定为斜体。"
 

-#: ../src/osx/carbon/fontdlg.cpp:546
-#: ../src/osx/carbon/fontdlg.cpp:548
+#: ../src/osx/carbon/fontdlg.cpp:556 ../src/osx/carbon/fontdlg.cpp:558

 msgid "Check to make the font underlined."
 msgstr "勾选加下划线。"
 
 msgid "Check to make the font underlined."
 msgstr "勾选加下划线。"
 

-#: ../src/richtext/richtextstyledlg.cpp:278
-#: ../src/richtext/richtextstyledlg.cpp:280
+#: ../src/richtext/richtextstyledlg.cpp:297
+#: ../src/richtext/richtextstyledlg.cpp:299

 msgid "Check to restart numbering."
 msgstr ""
 
 msgid "Check to restart numbering."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:253
-#: ../src/richtext/richtextfontpage.cpp:255
+#: ../src/richtext/richtextfontpage.cpp:284
+#: ../src/richtext/richtextfontpage.cpp:286

 msgid "Check to show a line through the text."
 msgstr "勾选加删除线。"
 
 msgid "Check to show a line through the text."
 msgstr "勾选加删除线。"
 

-#: ../src/richtext/richtextfontpage.cpp:260
-#: ../src/richtext/richtextfontpage.cpp:262
+#: ../src/richtext/richtextfontpage.cpp:291
+#: ../src/richtext/richtextfontpage.cpp:293

 msgid "Check to show the text in capitals."
 msgstr "勾选显示为大写。"
 
 msgid "Check to show the text in capitals."
 msgstr "勾选显示为大写。"
 

-#: ../src/richtext/richtextfontpage.cpp:274
-#: ../src/richtext/richtextfontpage.cpp:276
+#: ../src/richtext/richtextfontpage.cpp:305
+#: ../src/richtext/richtextfontpage.cpp:307

 msgid "Check to show the text in subscript."
 msgstr "勾选显示为下标。"
 
 msgid "Check to show the text in subscript."
 msgstr "勾选显示为下标。"
 

-#: ../src/richtext/richtextfontpage.cpp:267
-#: ../src/richtext/richtextfontpage.cpp:269
+#: ../src/richtext/richtextfontpage.cpp:298
+#: ../src/richtext/richtextfontpage.cpp:300

 msgid "Check to show the text in superscript."
 msgstr "勾选显示为上标。"
 
 msgid "Check to show the text in superscript."
 msgstr "勾选显示为上标。"
 


@@ -2073,14 +1993,11 @@ msgstr "选择目录:"
 msgid "Choose a file"
 msgstr "选择文件"
 
 msgid "Choose a file"
 msgstr "选择文件"
 

-#: ../src/palmos/colordlg.cpp:73
-#: ../src/generic/colrdlgg.cpp:145
-#: ../src/gtk/colordlg.cpp:60
+#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:62

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

-#: ../src/generic/fontpickerg.cpp:51
-#: ../src/gtk/fontdlg.cpp:99
+#: ../src/generic/fontpickerg.cpp:51 ../src/gtk/fontdlg.cpp:99

 #: ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "选择字体"
 #: ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "选择字体"


@@ -2090,12 +2007,11 @@ msgstr "选择字体"
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr ""
 
 msgid "Circular dependency involving module \"%s\" detected."
 msgstr ""
 

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

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

-#: ../src/msw/ole/automtn.cpp:655
+#: ../src/msw/ole/automtn.cpp:668

 msgid "Class not registered."
 msgstr "类未注册。"
 
 msgid "Class not registered."
 msgstr "类未注册。"
 


@@ -2103,12 +2019,12 @@ msgstr "类未注册。"
 msgid "Clear"
 msgstr "清除"
 
 msgid "Clear"
 msgstr "清除"
 

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

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

-#: ../src/richtext/richtextstyledlg.cpp:241
-#: ../src/richtext/richtextstyledlg.cpp:243
+#: ../src/richtext/richtextstyledlg.cpp:260
+#: ../src/richtext/richtextstyledlg.cpp:262

 msgid "Click to apply the selected style."
 msgstr "点击应用所选样式。"
 
 msgid "Click to apply the selected style."
 msgstr "点击应用所选样式。"
 


@@ -2119,28 +2035,25 @@ msgstr "点击应用所选样式。"
 msgid "Click to browse for a symbol."
 msgstr ""
 
 msgid "Click to browse for a symbol."
 msgstr ""
 

-#: ../src/osx/carbon/fontdlg.cpp:577
-#: ../src/osx/carbon/fontdlg.cpp:579
+#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589

 msgid "Click to cancel changes to the font."
 msgstr "点击取消字体变更。"
 
 msgid "Click to cancel changes to the font."
 msgstr "点击取消字体变更。"
 

-#: ../src/generic/fontdlgg.cpp:473
-#: ../src/generic/fontdlgg.cpp:492
+#: ../src/generic/fontdlgg.cpp:473 ../src/generic/fontdlgg.cpp:492

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

-#: ../src/osx/carbon/fontdlg.cpp:558
-#: ../src/osx/carbon/fontdlg.cpp:560
+#: ../src/osx/carbon/fontdlg.cpp:568 ../src/osx/carbon/fontdlg.cpp:570

 msgid "Click to change the font colour."
 msgstr "点击更改字体颜色。"
 
 msgid "Click to change the font colour."
 msgstr "点击更改字体颜色。"
 

-#: ../src/richtext/richtextfontpage.cpp:243
-#: ../src/richtext/richtextfontpage.cpp:245
+#: ../src/richtext/richtextfontpage.cpp:274
+#: ../src/richtext/richtextfontpage.cpp:276

 msgid "Click to change the text background colour."
 msgstr "点击修改字体背景颜色。"
 
 msgid "Click to change the text background colour."
 msgstr "点击修改字体背景颜色。"
 

-#: ../src/richtext/richtextfontpage.cpp:230
-#: ../src/richtext/richtextfontpage.cpp:232
+#: ../src/richtext/richtextfontpage.cpp:261
+#: ../src/richtext/richtextfontpage.cpp:263

 msgid "Click to change the text colour."
 msgstr "点击修改字体颜色。"
 
 msgid "Click to change the text colour."
 msgstr "点击修改字体颜色。"
 


@@ -2149,35 +2062,38 @@ msgstr "点击修改字体颜色。"
 msgid "Click to choose the font for this level."
 msgstr "点击选择此层级字体。"
 
 msgid "Click to choose the font for this level."
 msgstr "点击选择此层级字体。"
 

-#: ../src/richtext/richtextstyledlg.cpp:268
-#: ../src/richtext/richtextstyledlg.cpp:270
+#: ../src/richtext/richtextstyledlg.cpp:287
+#: ../src/richtext/richtextstyledlg.cpp:289

 msgid "Click to close this window."
 msgstr "点击关闭此窗口。"
 
 msgid "Click to close this window."
 msgstr "点击关闭此窗口。"
 

-#: ../src/osx/carbon/fontdlg.cpp:584
-#: ../src/osx/carbon/fontdlg.cpp:586
+#: ../src/osx/carbon/fontdlg.cpp:594 ../src/osx/carbon/fontdlg.cpp:596

 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:478 ../src/generic/fontdlgg.cpp:480
+#: ../src/generic/fontdlgg.cpp:485 ../src/generic/fontdlgg.cpp:487

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

-#: ../src/richtext/richtextstyledlg.cpp:221
-#: ../src/richtext/richtextstyledlg.cpp:223
+#: ../src/richtext/richtextstyledlg.cpp:252
+#: ../src/richtext/richtextstyledlg.cpp:254
+#, fuzzy
+msgid "Click to create a new box style."
+msgstr "点击新增列表样式。"
+
+#: ../src/richtext/richtextstyledlg.cpp:234
+#: ../src/richtext/richtextstyledlg.cpp:236

 msgid "Click to create a new character style."
 msgstr ""
 
 msgid "Click to create a new character style."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:233
-#: ../src/richtext/richtextstyledlg.cpp:235
+#: ../src/richtext/richtextstyledlg.cpp:246
+#: ../src/richtext/richtextstyledlg.cpp:248

 msgid "Click to create a new list style."
 msgstr "点击新增列表样式。"
 
 msgid "Click to create a new list style."
 msgstr "点击新增列表样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:227
-#: ../src/richtext/richtextstyledlg.cpp:229
+#: ../src/richtext/richtextstyledlg.cpp:240
+#: ../src/richtext/richtextstyledlg.cpp:242

 msgid "Click to create a new paragraph style."
 msgstr ""
 
 msgid "Click to create a new paragraph style."
 msgstr ""
 


@@ -2191,8 +2107,8 @@ msgstr "点击建立新的标签位置。"
 msgid "Click to delete all tab positions."
 msgstr "点击删除所有标签位置。"
 
 msgid "Click to delete all tab positions."
 msgstr "点击删除所有标签位置。"
 

-#: ../src/richtext/richtextstyledlg.cpp:259
-#: ../src/richtext/richtextstyledlg.cpp:261
+#: ../src/richtext/richtextstyledlg.cpp:278
+#: ../src/richtext/richtextstyledlg.cpp:280

 msgid "Click to delete the selected style."
 msgstr "点击删除所选样式。"
 
 msgid "Click to delete the selected style."
 msgstr "点击删除所选样式。"
 


@@ -2201,34 +2117,25 @@ msgstr "点击删除所选样式。"
 msgid "Click to delete the selected tab position."
 msgstr "点击删除所选标签位置。"
 
 msgid "Click to delete the selected tab position."
 msgstr "点击删除所选标签位置。"
 

-#: ../src/richtext/richtextstyledlg.cpp:253
-#: ../src/richtext/richtextstyledlg.cpp:255
+#: ../src/richtext/richtextstyledlg.cpp:272
+#: ../src/richtext/richtextstyledlg.cpp:274

 msgid "Click to edit the selected style."
 msgstr "点击编辑所选样式。"
 
 msgid "Click to edit the selected style."
 msgstr "点击编辑所选样式。"
 

-#: ../src/richtext/richtextstyledlg.cpp:247
-#: ../src/richtext/richtextstyledlg.cpp:249
+#: ../src/richtext/richtextstyledlg.cpp:266
+#: ../src/richtext/richtextstyledlg.cpp:268

 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:794
-#: ../src/generic/progdlgg.cpp:799
-#: ../src/richtext/richtextstyledlg.cpp:266
-#: ../src/richtext/richtextsymboldlg.cpp:473
-#: ../src/common/stockitem.cpp:149
-#: ../src/msw/progdlg.cpp:171
-#: ../src/msw/progdlg.cpp:678
+#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
+#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:285
+#: ../src/richtext/richtextsymboldlg.cpp:477 ../src/common/stockitem.cpp:149
+#: ../src/msw/progdlg.cpp:171 ../src/msw/progdlg.cpp:680

 #: ../src/html/helpdlg.cpp:91
 msgid "Close"
 msgstr "关闭"
 
 #: ../src/html/helpdlg.cpp:91
 msgid "Close"
 msgstr "关闭"
 

-#: ../src/univ/themes/win32.cpp:3778
-msgid "Close\tAlt-F4"
-msgstr "关闭\tAlt-F4"
-
-#: ../src/aui/tabmdi.cpp:106
-#: ../src/generic/mdig.cpp:99
+#: ../src/aui/tabmdi.cpp:108 ../src/generic/mdig.cpp:99

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


@@ -2236,7 +2143,7 @@ msgstr "全部关闭"
 msgid "Close current document"
 msgstr ""
 
 msgid "Close current document"
 msgstr ""
 

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

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


@@ -2244,7 +2151,7 @@ msgstr "关闭此窗口"
 msgid "Color"
 msgstr "颜色"
 
 msgid "Color"
 msgstr "颜色"
 

-#: ../src/richtext/richtextformatdlg.cpp:720
+#: ../src/richtext/richtextformatdlg.cpp:722

 msgid "Colour"
 msgstr "颜色"
 
 msgid "Colour"
 msgstr "颜色"
 


@@ -2253,7 +2160,7 @@ msgstr "颜色"
 msgid "Colour selection dialog failed with error %0lx."
 msgstr "颜色选择对话框错误，错误码 %0lx。"
 
 msgid "Colour selection dialog failed with error %0lx."
 msgstr "颜色选择对话框错误，错误码 %0lx。"
 

-#: ../src/osx/carbon/fontdlg.cpp:554
+#: ../src/osx/carbon/fontdlg.cpp:564

 msgid "Colour:"
 msgstr "颜色:"
 
 msgid "Colour:"
 msgstr "颜色:"
 


@@ -2265,12 +2172,11 @@ msgstr "无法增加列。"
 msgid "Column description could not be initialized."
 msgstr ""
 
 msgid "Column description could not be initialized."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1533
-#: ../src/osx/carbon/dataview.cpp:1554
+#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560

 msgid "Column index not found."
 msgstr "找不到列索引。"
 
 msgid "Column index not found."
 msgstr "找不到列索引。"
 

-#: ../src/osx/carbon/dataview.cpp:1609
+#: ../src/osx/carbon/dataview.cpp:1615

 msgid "Column width could not be determined"
 msgstr ""
 
 msgid "Column width could not be determined"
 msgstr ""
 


@@ -2280,7 +2186,9 @@ msgstr ""
 
 #: ../src/common/init.cpp:185
 #, c-format
 
 #: ../src/common/init.cpp:185
 #, c-format

-msgid "Command line argument %d couldn't be converted to Unicode and will be ignored."
+msgid ""
+"Command line argument %d couldn't be converted to Unicode and will be "
+"ignored."

 msgstr ""
 
 #: ../src/msw/fontdlg.cpp:117
 msgstr ""
 
 #: ../src/msw/fontdlg.cpp:117


@@ -2288,7 +2196,13 @@ msgstr ""
 msgid "Common dialog failed with error code %0lx."
 msgstr "公共对话框错误，错误码 %0lx。"
 
 msgid "Common dialog failed with error code %0lx."
 msgstr "公共对话框错误，错误码 %0lx。"
 

-#: ../src/html/helpwnd.cpp:1558
+#: ../src/gtk/window.cpp:4228
+msgid ""
+"Compositing not supported by this system, please enable it in your Window "
+"Manager."
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1555

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


@@ -2301,7 +2215,7 @@ msgstr "计算机"
 msgid "Config entry name cannot start with '%c'."
 msgstr "配置条目名不能以 '%c' 开头。"
 
 msgid "Config entry name cannot start with '%c'."
 msgstr "配置条目名不能以 '%c' 开头。"
 

-#: ../src/gtk/filedlg.cpp:56
+#: ../src/gtk/filedlg.cpp:59

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


@@ -2313,11 +2227,11 @@ msgstr "确认更新注册表"
 msgid "Connecting..."
 msgstr "正在连接..."
 
 msgid "Connecting..."
 msgstr "正在连接..."
 

-#: ../src/html/helpwnd.cpp:480
+#: ../src/html/helpwnd.cpp:483

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

-#: ../src/common/strconv.cpp:2253
+#: ../src/common/strconv.cpp:2263

 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "无法进行到字符集 '%s' 的转换。"
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "无法进行到字符集 '%s' 的转换。"


@@ -2335,8 +2249,7 @@ msgstr "已复制到剪贴板:\"%s\""
 msgid "Copies:"
 msgstr "份数:"
 
 msgid "Copies:"
 msgstr "份数:"
 

-#: ../src/common/stockitem.cpp:151
-#: ../src/stc/stc_i18n.cpp:19
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19

 msgid "Copy"
 msgstr "复制"
 
 msgid "Copy"
 msgstr "复制"
 


@@ -2349,8 +2262,7 @@ msgstr "复制选区"
 msgid "Could not create temporary file '%s'"
 msgstr "无法创建临时文件 '%s'"
 
 msgid "Could not create temporary file '%s'"
 msgstr "无法创建临时文件 '%s'"
 

-#: ../src/osx/carbon/dataview.cpp:1280
-#: ../src/osx/carbon/dataview.cpp:1667
+#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673

 msgid "Could not determine column index."
 msgstr "无法确定列索引。"
 
 msgid "Could not determine column index."
 msgstr "无法确定列索引。"
 


@@ -2375,21 +2287,17 @@ msgstr "无法将 %s 解开至 %s: %s"
 msgid "Could not find tab for id"
 msgstr "找不到 id 的标签"
 
 msgid "Could not find tab for id"
 msgstr "找不到 id 的标签"
 

-#: ../src/osx/carbon/dataview.cpp:2551
-#: ../src/osx/carbon/dataview.cpp:2586
-#: ../src/osx/carbon/dataview.cpp:2610
-#: ../src/osx/carbon/dataview.cpp:2631
-#: ../src/osx/carbon/dataview.cpp:2768
+#: ../src/osx/carbon/dataview.cpp:2557 ../src/osx/carbon/dataview.cpp:2592
+#: ../src/osx/carbon/dataview.cpp:2616 ../src/osx/carbon/dataview.cpp:2637
+#: ../src/osx/carbon/dataview.cpp:2774

 msgid "Could not get header description."
 msgstr "无法获取表头描述。"
 
 msgid "Could not get header description."
 msgstr "无法获取表头描述。"
 

-#: ../src/osx/carbon/dataview.cpp:1164
-#: ../src/osx/carbon/dataview.cpp:1190
+#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196

 msgid "Could not get items."
 msgstr "无法获取项目。"
 
 msgid "Could not get items."
 msgstr "无法获取项目。"
 

-#: ../src/osx/carbon/dataview.cpp:2654
-#: ../src/osx/carbon/dataview.cpp:2719
+#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725

 msgid "Could not get property flags."
 msgstr "无法获取属性标志。"
 
 msgid "Could not get property flags."
 msgstr "无法获取属性标志。"
 


@@ -2410,47 +2318,48 @@ msgstr "无法删除列。"
 msgid "Could not retrieve number of items"
 msgstr "无法获取项目数量"
 
 msgid "Could not retrieve number of items"
 msgstr "无法获取项目数量"
 

-#: ../src/osx/carbon/dataview.cpp:2567
+#: ../src/osx/carbon/dataview.cpp:2573

 msgid "Could not set alignment."
 msgstr "无法设定对齐。"
 
 msgid "Could not set alignment."
 msgstr "无法设定对齐。"
 

-#: ../src/osx/carbon/dataview.cpp:2798
+#: ../src/osx/carbon/dataview.cpp:2804

 msgid "Could not set column width."
 msgstr "无法启动文档预览。"
 
 msgid "Could not set column width."
 msgstr "无法启动文档预览。"
 

-#: ../src/osx/carbon/dataview.cpp:2770
+#: ../src/common/filefn.cpp:1565
+msgid "Could not set current working directory"
+msgstr "无法设置当前工作目录"
+
+#: ../src/osx/carbon/dataview.cpp:2776

 msgid "Could not set header description."
 msgstr "无法启动打印。"
 
 msgid "Could not set header description."
 msgstr "无法启动打印。"
 

-#: ../src/osx/carbon/dataview.cpp:2591
+#: ../src/osx/carbon/dataview.cpp:2597

 msgid "Could not set icon."
 msgstr "无法启动打印。"
 
 msgid "Could not set icon."
 msgstr "无法启动打印。"
 

-#: ../src/osx/carbon/dataview.cpp:2612
+#: ../src/osx/carbon/dataview.cpp:2618

 msgid "Could not set maximum width."
 msgstr "无法设定最大宽度。"
 
 msgid "Could not set maximum width."
 msgstr "无法设定最大宽度。"
 

-#: ../src/osx/carbon/dataview.cpp:2633
+#: ../src/osx/carbon/dataview.cpp:2639

 msgid "Could not set minimum width."
 msgstr "无法设定最小宽度。"
 
 msgid "Could not set minimum width."
 msgstr "无法设定最小宽度。"
 

-#: ../src/osx/carbon/dataview.cpp:2659
-#: ../src/osx/carbon/dataview.cpp:2724
+#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730

 msgid "Could not set property flags."
 msgstr "无法设定属性标志。"
 
 msgid "Could not set property flags."
 msgstr "无法设定属性标志。"
 

-#: ../src/common/prntbase.cpp:1953
+#: ../src/common/prntbase.cpp:1986

 msgid "Could not start document preview."
 msgstr "无法启动文档预览。"
 
 msgid "Could not start document preview."
 msgstr "无法启动文档预览。"
 

-#: ../src/generic/printps.cpp:179
-#: ../src/msw/printwin.cpp:206
-#: ../src/gtk/print.cpp:1069
-#: ../src/gtk/gnome/gprint.cpp:916
+#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:204
+#: ../src/gtk/print.cpp:1079 ../src/gtk/gnome/gprint.cpp:918

 msgid "Could not start printing."
 msgstr "无法启动打印。"
 
 msgid "Could not start printing."
 msgstr "无法启动打印。"
 

-#: ../src/common/wincmn.cpp:1940
+#: ../src/common/wincmn.cpp:2024

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


@@ -2458,24 +2367,16 @@ msgstr "无法把数据转到窗口"
 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:156
-#: ../src/msw/dragimag.cpp:195
+#: ../src/msw/imaglist.cpp:167 ../src/msw/imaglist.cpp:198
+#: ../src/msw/imaglist.cpp:210 ../src/msw/dragimag.cpp:194
+#: ../src/msw/dragimag.cpp:233

 msgid "Couldn't add an image to the image list."
 msgstr "无法把图像加到图象列表。"
 
 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:135 ../src/os2/timer.cpp:114

 msgid "Couldn't create a timer"
 msgstr "无法创建计时器"
 
 msgid "Couldn't create a timer"
 msgstr "无法创建计时器"
 

-#: ../src/mgl/cursor.cpp:132
-#: ../src/mgl/cursor.cpp:153
-msgid "Couldn't create cursor."
-msgstr "无法创建光标。"
-

 #: ../src/osx/carbon/overlay.cpp:123
 #, fuzzy
 msgid "Couldn't create the overlay window"
 #: ../src/osx/carbon/overlay.cpp:123
 #, fuzzy
 msgid "Couldn't create the overlay window"


@@ -2491,11 +2392,11 @@ msgstr "无法终止线程"
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号 '%s'"
 
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号 '%s'"
 

-#: ../src/gtk/print.cpp:2019
+#: ../src/gtk/print.cpp:2027

 msgid "Couldn't get hatch style from wxBrush."
 msgstr ""
 
 msgid "Couldn't get hatch style from wxBrush."
 msgstr ""
 

-#: ../src/msw/thread.cpp:927
+#: ../src/msw/thread.cpp:948

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


@@ -2509,7 +2410,7 @@ msgstr "无法获得当前线程指针"
 msgid "Couldn't initialize GIF hash table."
 msgstr "无法初始化 zlib 压缩流."
 
 msgid "Couldn't initialize GIF hash table."
 msgstr "无法初始化 zlib 压缩流."
 

-#: ../src/common/imagpng.cpp:660
+#: ../src/common/imagpng.cpp:658

 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 


@@ -2518,12 +2419,17 @@ msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"
 msgid "Couldn't load sound data from '%s'."
 msgstr "无法从 '%s' 中的读取声音数据。"
 
 msgid "Couldn't load sound data from '%s'."
 msgstr "无法从 '%s' 中的读取声音数据。"
 

+#: ../src/msw/dirdlg.cpp:439
+#, fuzzy
+msgid "Couldn't obtain folder name"
+msgstr "无法创建计时器"
+

 #: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "无法打开音频: %s"
 
 #: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "无法打开音频: %s"
 

-#: ../src/msw/ole/dataobj.cpp:145
+#: ../src/msw/ole/dataobj.cpp:160

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


@@ -2532,18 +2438,17 @@ msgstr "无法注册剪贴板格式 '%s'。"
 msgid "Couldn't release a mutex"
 msgstr "无法释放互斥子"
 
 msgid "Couldn't release a mutex"
 msgstr "无法释放互斥子"
 

-#: ../src/msw/listctrl.cpp:756
+#: ../src/msw/listctrl.cpp:757

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

-#: ../src/common/imagpng.cpp:749
-#: ../src/common/imagpng.cpp:760
-#: ../src/common/imagpng.cpp:770
+#: ../src/common/imagpng.cpp:747 ../src/common/imagpng.cpp:758
+#: ../src/common/imagpng.cpp:768

 msgid "Couldn't save PNG image."
 msgstr "无法保存 PNG 图像。"
 
 msgid "Couldn't save PNG image."
 msgstr "无法保存 PNG 图像。"
 

-#: ../src/msw/thread.cpp:694
+#: ../src/msw/thread.cpp:715

 msgid "Couldn't terminate thread"
 msgstr "无法终止线程"
 
 msgid "Couldn't terminate thread"
 msgstr "无法终止线程"
 


@@ -2556,36 +2461,32 @@ msgstr "在声明的RTTI参数里找不到创建参数"
 msgid "Create directory"
 msgstr "创建目录"
 
 msgid "Create directory"
 msgstr "创建目录"
 

-#: ../src/generic/filedlgg.cpp:230
-#: ../src/generic/dirdlgg.cpp:132
+#: ../src/generic/filedlgg.cpp:228 ../src/generic/dirdlgg.cpp:132

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

-#: ../src/common/accelcmn.cpp:311
+#: ../src/common/accelcmn.cpp:323

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

-#: ../src/richtext/richtextctrl.cpp:310
-#: ../src/osx/textctrl_osx.cpp:585
-#: ../src/common/stockitem.cpp:152
-#: ../src/msw/textctrl.cpp:2210
+#: ../src/richtext/richtextctrl.cpp:324 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222

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

-#: ../src/generic/filectrlg.cpp:946
+#: ../src/generic/filectrlg.cpp:950

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

-#: ../src/gtk/print.cpp:756
+#: ../src/gtk/print.cpp:764

 msgid "Custom size"
 msgstr "自定义大小"
 
 msgid "Custom size"
 msgstr "自定义大小"
 

-#: ../src/common/headerctrlcmn.cpp:60
+#: ../src/common/headerctrlcmn.cpp:61

 msgid "Customize Columns"
 msgstr "自定义列"
 
 msgid "Customize Columns"
 msgstr "自定义列"
 

-#: ../src/common/stockitem.cpp:152
-#: ../src/stc/stc_i18n.cpp:18
+#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18

 msgid "Cut"
 msgstr "剪切"
 
 msgid "Cut"
 msgstr "剪切"
 


@@ -2593,7 +2494,7 @@ msgstr "剪切"
 msgid "Cut selection"
 msgstr "剪切选区"
 
 msgid "Cut selection"
 msgstr "剪切选区"
 

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

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


@@ -2601,21 +2502,21 @@ msgstr "西里尔语 (ISO-8859-5)"
 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:705
+#: ../src/msw/dde.cpp:709

 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
 #: ../src/common/accelcmn.cpp:80
 msgid "DECIMAL"
 msgid "DDE poke request failed"
 msgstr "DDE poke 请求失败"
 
 #: ../src/common/accelcmn.cpp:80
 msgid "DECIMAL"

-msgstr ""
+msgstr "DECIMAL"

 
 #: ../src/common/accelcmn.cpp:48
 msgid "DEL"
 
 #: ../src/common/accelcmn.cpp:48
 msgid "DEL"

-msgstr ""
+msgstr "DEL"

 
 #: ../src/common/accelcmn.cpp:49
 msgid "DELETE"
 
 #: ../src/common/accelcmn.cpp:49
 msgid "DELETE"

-msgstr ""
+msgstr "DELETE"

 
 #: ../src/common/imagbmp.cpp:1045
 msgid "DIB Header: Encoding doesn't match bitdepth."
 
 #: ../src/common/imagbmp.cpp:1045
 msgid "DIB Header: Encoding doesn't match bitdepth."


@@ -2638,9 +2539,8 @@ msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB头: 文件编码未知。"
 
 #: ../src/common/accelcmn.cpp:81
 msgstr "DIB头: 文件编码未知。"
 
 #: ../src/common/accelcmn.cpp:81

-#, fuzzy

 msgid "DIVIDE"
 msgid "DIVIDE"

-msgstr "<盘符>"
+msgstr "DIVIDE"

 
 #: ../src/common/paper.cpp:123
 msgid "DL Envelope, 110 x 220 mm"
 
 #: ../src/common/paper.cpp:123
 msgid "DL Envelope, 110 x 220 mm"


@@ -2648,17 +2548,17 @@ msgstr "DL 信封, 110 x 220 毫米"
 
 #: ../src/common/accelcmn.cpp:60
 msgid "DOWN"
 
 #: ../src/common/accelcmn.cpp:60
 msgid "DOWN"

-msgstr ""
+msgstr "DOWN"

 
 #: ../src/richtext/richtextborderspage.cpp:545
 msgid "Dashed"
 msgstr ""
 
 
 #: ../src/richtext/richtextborderspage.cpp:545
 msgid "Dashed"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1916
+#: ../src/osx/carbon/dataview.cpp:1922

 msgid "Data object has invalid data format"
 msgstr ""
 
 msgid "Data object has invalid data format"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:2486
+#: ../src/osx/carbon/dataview.cpp:2492

 msgid "Date renderer cannot render value; value type: "
 msgstr ""
 
 msgid "Date renderer cannot render value; value type: "
 msgstr ""
 


@@ -2679,7 +2579,7 @@ msgstr "无法生成调试报告。"
 msgid "Decorative"
 msgstr "修饰"
 
 msgid "Decorative"
 msgstr "修饰"
 

-#: ../src/common/fmapbase.cpp:783
+#: ../src/common/fmapbase.cpp:797

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


@@ -2691,8 +2591,7 @@ msgstr "缺省字体"
 msgid "Default printer"
 msgstr "缺省的打印机"
 
 msgid "Default printer"
 msgstr "缺省的打印机"
 

-#: ../src/richtext/richtextbuffer.cpp:6946
-#: ../src/common/stockitem.cpp:153
+#: ../src/richtext/richtextbuffer.cpp:7367 ../src/common/stockitem.cpp:153

 #: ../src/stc/stc_i18n.cpp:21
 msgid "Delete"
 msgstr "删除"
 #: ../src/stc/stc_i18n.cpp:21
 msgid "Delete"
 msgstr "删除"


@@ -2701,13 +2600,11 @@ msgstr "删除"
 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 
 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 

-#: ../src/richtext/richtextstyledlg.cpp:744
+#: ../src/richtext/richtextstyledlg.cpp:787

 msgid "Delete Style"
 msgstr "删除样式"
 
 msgid "Delete Style"
 msgstr "删除样式"
 

-#: ../src/richtext/richtextctrl.cpp:945
-#: ../src/richtext/richtextctrl.cpp:1051
-#: ../src/richtext/richtextctrl.cpp:1101
+#: ../src/richtext/richtextctrl.cpp:1221 ../src/richtext/richtextctrl.cpp:1442

 msgid "Delete Text"
 msgstr "删除文字"
 
 msgid "Delete Text"
 msgstr "删除文字"
 


@@ -2719,7 +2616,7 @@ msgstr "删除项"
 msgid "Delete selection"
 msgstr "删除选区"
 
 msgid "Delete selection"
 msgstr "删除选区"
 

-#: ../src/richtext/richtextstyledlg.cpp:744
+#: ../src/richtext/richtextstyledlg.cpp:787

 #, c-format
 msgid "Delete style %s?"
 msgstr "删除样式 %s?"
 #, c-format
 msgid "Delete style %s?"
 msgstr "删除样式 %s?"


@@ -2751,7 +2648,9 @@ msgid "Developers"
 msgstr ""
 
 #: ../src/msw/dialup.cpp:394
 msgstr ""
 
 #: ../src/msw/dialup.cpp:394

-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
+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
 msgstr "由于远程访问服务(RAS)没有安装在本机，拨号功能无法使用。请安装它。"
 
 #: ../src/generic/tipdlg.cpp:231


@@ -2760,55 +2659,53 @@ msgstr "你知道吗..."
 
 #: ../src/dfb/wrapdfb.cpp:64
 #, c-format
 
 #: ../src/dfb/wrapdfb.cpp:64
 #, c-format

-msgid "DirectFB error %d occured."
+msgid "DirectFB error %d occurred."

 msgstr ""
 
 msgstr ""
 

-#: ../src/motif/filedlg.cpp:218
+#: ../src/motif/filedlg.cpp:217

 msgid "Directories"
 msgstr "目录"
 
 msgid "Directories"
 msgstr "目录"
 

-#: ../src/common/filefn.cpp:1254
+#: ../src/common/filefn.cpp:1245

 #, 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:1278
+#: ../src/common/filefn.cpp:1265

 #, fuzzy, c-format
 msgid "Directory '%s' couldn't be deleted"
 msgstr "目录'%s'无法被创建"
 
 #, fuzzy, c-format
 msgid "Directory '%s' couldn't be deleted"
 msgstr "目录'%s'无法被创建"
 

-#: ../src/mgl/dirmgl.cpp:200
-#, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr "目录 '%s'不存在!"
-

 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr "目录不存在"
 
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 msgstr "目录不存在"
 

-#: ../src/generic/filectrlg.cpp:1402
+#: ../src/generic/filectrlg.cpp:1406

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

-#: ../src/common/docview.cpp:454
+#: ../src/common/docview.cpp:458

 msgid "Discard changes and reload the last saved version?"
 msgstr ""
 
 msgid "Discard changes and reload the last saved version?"
 msgstr ""
 

-#: ../src/html/helpwnd.cpp:510
-msgid "Display all index items that contain given substring. Search is case insensitive."
+#: ../src/html/helpwnd.cpp:513
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."

 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 

-#: ../src/html/helpwnd.cpp:690
+#: ../src/html/helpwnd.cpp:693

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

-#: ../src/html/helpwnd.cpp:329
+#: ../src/html/helpwnd.cpp:327

 msgid "Displays help as you browse the books on the left."
 msgstr ""
 
 #: ../src/msw/mimetype.cpp:708
 msgid ""
 msgid "Displays help as you browse the books on the left."
 msgstr ""
 
 #: ../src/msw/mimetype.cpp:708
 msgid ""

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

 "Current value is \n"
 "%s, \n"
 "New value is \n"
 "Current value is \n"
 "%s, \n"
 "New value is \n"


@@ -2820,11 +2717,15 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
 "新的值为 \n"
 "%s %1"
 

-#: ../src/common/docview.cpp:530
+#: ../src/common/docview.cpp:534

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

+#: ../src/common/prntbase.cpp:526
+msgid "Document:"
+msgstr ""
+

 #: ../src/generic/aboutdlgg.cpp:74
 msgid "Documentation by "
 msgstr ""
 #: ../src/generic/aboutdlgg.cpp:74
 msgid "Documentation by "
 msgstr ""


@@ -2833,17 +2734,15 @@ msgstr ""
 msgid "Documentation writers"
 msgstr ""
 
 msgid "Documentation writers"
 msgstr ""
 

-#: ../src/common/sizer.cpp:2579
+#: ../src/common/sizer.cpp:2657

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

-#: ../src/msw/frame.cpp:123
-#: ../src/html/htmlwin.cpp:607
+#: ../src/msw/frame.cpp:129 ../src/html/htmlwin.cpp:607

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

-#: ../src/generic/progdlgg.cpp:471
-#: ../src/msw/progdlg.cpp:406
+#: ../src/generic/progdlgg.cpp:482 ../src/msw/progdlg.cpp:408

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


@@ -2866,39 +2765,41 @@ msgstr "横向日本双明信片, 148 x 200 毫米"
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 
 msgid "Doubly used id : %d"
 msgstr "重复使用的id : %d"
 

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

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

+#: ../src/richtext/richtextctrl.cpp:804
+msgid "Drag"
+msgstr ""
+

 #: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 msgstr "E 纸张，34 x 44 英寸"
 
 #: ../src/common/accelcmn.cpp:62
 msgid "END"
 #: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 msgstr "E 纸张，34 x 44 英寸"
 
 #: ../src/common/accelcmn.cpp:62
 msgid "END"

-msgstr ""
+msgstr "END"

 
 #: ../src/common/accelcmn.cpp:53
 msgid "ENTER"
 
 #: ../src/common/accelcmn.cpp:53
 msgid "ENTER"

-msgstr ""
+msgstr "ENTER"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:335
-#, fuzzy
+#: ../src/unix/fswatcher_inotify.cpp:358

 msgid "EOF while reading from inotify descriptor"
 msgid "EOF while reading from inotify descriptor"

-msgstr "无法从文件描述子 %d中读"
+msgstr "读取 inotify 描述符时遇到 EOF"

 
 #: ../src/common/accelcmn.cpp:65
 msgid "ESC"
 
 #: ../src/common/accelcmn.cpp:65
 msgid "ESC"

-msgstr ""
+msgstr "ESC"

 
 #: ../src/common/accelcmn.cpp:66
 msgid "ESCAPE"
 
 #: ../src/common/accelcmn.cpp:66
 msgid "ESCAPE"

-msgstr ""
+msgstr "ESCAPE"

 
 #: ../src/common/accelcmn.cpp:74
 msgid "EXECUTE"
 
 #: ../src/common/accelcmn.cpp:74
 msgid "EXECUTE"

-msgstr ""
+msgstr "EXECUTE"

 
 #: ../src/common/stockitem.cpp:155
 msgid "Edit"
 
 #: ../src/common/stockitem.cpp:155
 msgid "Edit"


@@ -2908,44 +2809,63 @@ msgstr "编辑"
 msgid "Edit item"
 msgstr "编辑项"
 
 msgid "Edit item"
 msgstr "编辑项"
 

-#: ../src/richtext/richtextsizepage.cpp:229
-#: ../src/richtext/richtextsizepage.cpp:231
+#: ../src/richtext/richtextsizepage.cpp:319
+#: ../src/richtext/richtextsizepage.cpp:321
+#: ../src/richtext/richtextsizepage.cpp:427
+#: ../src/richtext/richtextsizepage.cpp:429

 msgid "Enable the height value."
 msgstr ""
 
 msgid "Enable the height value."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:202
-#: ../src/richtext/richtextsizepage.cpp:204
+#: ../src/richtext/richtextsizepage.cpp:400
+#: ../src/richtext/richtextsizepage.cpp:402
+#, fuzzy
+msgid "Enable the maximum width value."
+msgstr "无法设定最大宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:373
+#: ../src/richtext/richtextsizepage.cpp:375
+msgid "Enable the minimum height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:346
+#: ../src/richtext/richtextsizepage.cpp:348
+#, fuzzy
+msgid "Enable the minimum width value."
+msgstr "无法设定最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:292
+#: ../src/richtext/richtextsizepage.cpp:294

 msgid "Enable the width value."
 msgstr ""
 
 msgid "Enable the width value."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:274
-#: ../src/richtext/richtextsizepage.cpp:276
+#: ../src/richtext/richtextsizepage.cpp:256
+#: ../src/richtext/richtextsizepage.cpp:258

 msgid "Enable vertical alignment."
 msgstr "启用垂直对齐。"
 
 msgid "Enable vertical alignment."
 msgstr "启用垂直对齐。"
 

-#: ../src/richtext/richtextsizepage.cpp:316
-#: ../src/richtext/richtextsizepage.cpp:318
-msgid "Enable vertical offset."
-msgstr ""
-

 #: ../src/richtext/richtextbackgroundpage.cpp:133
 #: ../src/richtext/richtextbackgroundpage.cpp:135
 msgid "Enables a background colour."
 msgstr "启用背景颜色。"
 
 #: ../src/richtext/richtextbackgroundpage.cpp:133
 #: ../src/richtext/richtextbackgroundpage.cpp:135
 msgid "Enables a background colour."
 msgstr "启用背景颜色。"
 

-#: ../src/richtext/richtextstyledlg.cpp:577
+#: ../src/richtext/richtextstyledlg.cpp:939
+#, fuzzy
+msgid "Enter a box style name"
+msgstr "输入新样式名"
+
+#: ../src/richtext/richtextstyledlg.cpp:611

 msgid "Enter a character style name"
 msgstr ""
 
 msgid "Enter a character style name"
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:780
+#: ../src/richtext/richtextstyledlg.cpp:825

 msgid "Enter a list style name"
 msgstr ""
 
 msgid "Enter a list style name"
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:853
+#: ../src/richtext/richtextstyledlg.cpp:898

 msgid "Enter a new style name"
 msgstr "输入新样式名"
 
 msgid "Enter a new style name"
 msgstr "输入新样式名"
 

-#: ../src/richtext/richtextstyledlg.cpp:625
+#: ../src/richtext/richtextstyledlg.cpp:659

 msgid "Enter a paragraph style name"
 msgstr ""
 
 msgid "Enter a paragraph style name"
 msgstr ""
 


@@ -2962,23 +2882,18 @@ msgstr "找到的条目"
 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:476
+#: ../src/common/config.cpp:474

 #, c-format
 #, c-format

-msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %u in '%s'."

 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'。"
 
 msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'。"
 

-#: ../src/generic/dirctrlg.cpp:662
-#: ../src/generic/dirctrlg.cpp:680
-#: ../src/generic/dirctrlg.cpp:691
-#: ../src/generic/dirdlgg.cpp:353
-#: ../src/generic/filectrlg.cpp:671
-#: ../src/generic/filectrlg.cpp:785
-#: ../src/generic/filectrlg.cpp:799
-#: ../src/generic/filectrlg.cpp:815
-#: ../src/generic/filectrlg.cpp:1371
-#: ../src/generic/filectrlg.cpp:1402
-#: ../src/gtk/filedlg.cpp:69
-#: ../src/gtk1/fontdlg.cpp:75
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/dirctrlg.cpp:680
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:785
+#: ../src/generic/filectrlg.cpp:799 ../src/generic/filectrlg.cpp:815
+#: ../src/generic/filectrlg.cpp:1375 ../src/generic/filectrlg.cpp:1406
+#: ../src/gtk/filedlg.cpp:73 ../src/gtk1/fontdlg.cpp:75

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


@@ -3000,7 +2915,7 @@ msgstr "创建目录错误"
 msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 
 msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 

-#: ../src/propgrid/propgrid.cpp:6586
+#: ../src/propgrid/propgrid.cpp:6565

 #, c-format
 msgid "Error in resource: %s"
 msgstr ""
 #, c-format
 msgid "Error in resource: %s"
 msgstr ""


@@ -3013,31 +2928,31 @@ msgstr "读配置选项错误。"
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 

-#: ../src/gtk/print.cpp:670
+#: ../src/gtk/print.cpp:678

 msgid "Error while printing: "
 msgstr "打印时出错: "
 
 msgid "Error while printing: "
 msgstr "打印时出错: "
 

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

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

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

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

-#: ../src/unix/fswatcher_inotify.cpp:415
+#: ../src/unix/fswatcher_inotify.cpp:441

 msgid "Event queue overflowed"
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:231
 msgid "Event queue overflowed"
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:231

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

 
 #: ../src/common/stockitem.cpp:156
 msgid "Execute"
 msgstr ""
 
 
 #: ../src/common/stockitem.cpp:156
 msgid "Execute"
 msgstr ""
 

-#: ../src/msw/utilsexc.cpp:898
+#: ../src/msw/utilsexc.cpp:899

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


@@ -3053,10 +2968,11 @@ msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
 #: ../src/msw/registry.cpp:1231
 #, c-format
 
 #: ../src/msw/registry.cpp:1231
 #, c-format

-msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgid ""
+"Exporting registry key: file \"%s\" already exists and won't be overwritten."

 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 
 msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
 

-#: ../src/common/fmapbase.cpp:192
+#: ../src/common/fmapbase.cpp:196

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


@@ -3065,10 +2981,9 @@ msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s' 解压至 '%s' 失败。"
 
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "将 '%s' 解压至 '%s' 失败。"
 

-#: ../src/common/accelcmn.cpp:237
-#: ../src/common/accelcmn.cpp:318
+#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:334

 msgid "F"
 msgid "F"

-msgstr ""
+msgstr "F"

 
 #: ../src/propgrid/advprops.cpp:641
 #, fuzzy
 
 #: ../src/propgrid/advprops.cpp:641
 #, fuzzy


@@ -3084,31 +2999,30 @@ msgstr "访问锁文件失败。"
 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 
 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 

-#: ../src/msw/dib.cpp:551
-#, fuzzy, c-format
+#: ../src/msw/dib.cpp:549
+#, c-format

 msgid "Failed to allocate %luKb of memory for bitmap data."
 msgid "Failed to allocate %luKb of memory for bitmap data."

-msgstr "为位图数据分配 %luKb 内存失败."
+msgstr "为位图数据分配 %luKb 内存失败。"

 
 #: ../src/common/glcmn.cpp:88
 
 #: ../src/common/glcmn.cpp:88

-#, fuzzy

 msgid "Failed to allocate colour for OpenGL"
 msgid "Failed to allocate colour for OpenGL"

-msgstr "创建游标失败."
+msgstr "无法为 OpenGL 分配颜色"

 
 #: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败。"
 
 
 #: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
 msgstr "改变视频模式失败。"
 

-#: ../src/common/image.cpp:2932
-#, fuzzy, c-format
+#: ../src/common/image.cpp:3036
+#, c-format

 msgid "Failed to check format of image file \"%s\"."
 msgid "Failed to check format of image file \"%s\"."

-msgstr "将位图图像保存至文件 \"%s\"失败."
+msgstr "无法确认图像文件 \"%s\" 的格式。"

 
 #: ../src/common/debugrpt.cpp:243
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 
 
 #: ../src/common/debugrpt.cpp:243
 #, c-format
 msgid "Failed to clean up debug report directory \"%s\""
 msgstr "无法清除调试报告目录 \"%s\""
 

-#: ../src/common/filename.cpp:216
+#: ../src/common/filename.cpp:209

 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败"
 
 msgid "Failed to close file handle"
 msgstr "关闭文件句柄失败"
 


@@ -3117,11 +3031,11 @@ msgstr "关闭文件句柄失败"
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
 msgid "Failed to close lock file '%s'"
 msgstr "关闭锁文件 '%s'失败"
 

-#: ../src/msw/clipbrd.cpp:115
+#: ../src/msw/clipbrd.cpp:116

 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败。"
 
 msgid "Failed to close the clipboard."
 msgstr "关闭剪贴板失败。"
 

-#: ../src/x11/utils.cpp:207
+#: ../src/x11/utils.cpp:204

 #, fuzzy, c-format
 msgid "Failed to close the display \"%s\""
 msgstr "关闭剪贴板失败."
 #, fuzzy, c-format
 msgid "Failed to close the display \"%s\""
 msgstr "关闭剪贴板失败."


@@ -3135,14 +3049,13 @@ msgid "Failed to connect: no ISP to dial."
 msgstr "连接失败: 没有要拨号的 ISP。"
 
 #: ../src/common/textfile.cpp:201
 msgstr "连接失败: 没有要拨号的 ISP。"
 
 #: ../src/common/textfile.cpp:201

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to convert file \"%s\" to Unicode."
 msgid "Failed to convert file \"%s\" to Unicode."

-msgstr "关闭文件句柄失败."
+msgstr "无法转换文件 \"%s\" 为 Unicode。"

 
 

-#: ../src/generic/logg.cpp:982
-#, fuzzy
+#: ../src/generic/logg.cpp:980

 msgid "Failed to copy dialog contents to the clipboard."
 msgid "Failed to copy dialog contents to the clipboard."

-msgstr "æ\89\93å¼\80å\89ªè´´æ\9d¿å¤±è´¥."
+msgstr "æ\97 æ³\95å°\86对è¯\9dæ¡\86å\86\85容å¤\8då\88¶å\88°å\89ªè´´æ\9d¿ã\80\82"

 
 #: ../src/msw/registry.cpp:692
 #, c-format
 
 #: ../src/msw/registry.cpp:692
 #, c-format


@@ -3154,7 +3067,7 @@ msgstr "复制注册键值失败 '%s'"
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s' 失败。"
 
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "把注册键内容从 '%s' 复制到 '%s' 失败。"
 

-#: ../src/common/filefn.cpp:1056
+#: ../src/common/filefn.cpp:1053

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


@@ -3164,26 +3077,26 @@ msgstr "复制文件 '%s' 至 '%s' 失败"
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 msgstr "复制注册表子键 '%s' 至 '%s' 失败。"
 
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 msgstr "复制注册表子键 '%s' 至 '%s' 失败。"
 

-#: ../src/msw/dde.cpp:1070
+#: ../src/msw/dde.cpp:1074

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

-#: ../src/msw/mdi.cpp:569
+#: ../src/msw/mdi.cpp:579

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

-#: ../src/common/filename.cpp:981
+#: ../src/common/filename.cpp:1019

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

-#: ../src/msw/utilsexc.cpp:271
+#: ../src/msw/utilsexc.cpp:269

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

-#: ../src/msw/ole/automtn.cpp:514
-#, fuzzy, c-format
+#: ../src/msw/ole/automtn.cpp:517
+#, c-format

 msgid "Failed to create an instance of \"%s\""
 msgid "Failed to create an instance of \"%s\""

-msgstr "无法创建目录 \"%s\""
+msgstr "无法创建实例 \"%s\""

 
 #: ../src/msw/dde.cpp:443
 #, c-format
 
 #: ../src/msw/dde.cpp:443
 #, c-format


@@ -3209,9 +3122,8 @@ msgstr ""
 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:85
 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:85

-#, fuzzy

 msgid "Failed to create epoll descriptor"
 msgid "Failed to create epoll descriptor"

-msgstr "创建游标失败."
+msgstr "无法创建 epoll 描述符"

 
 #: ../src/msw/mimetype.cpp:199
 #, c-format
 
 #: ../src/msw/mimetype.cpp:199
 #, c-format


@@ -3223,17 +3135,17 @@ msgstr "为 '%s' 文件创建注册条目失败。"
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 

-#: ../src/unix/evtloopunix.cpp:87
+#: ../src/unix/evtloopunix.cpp:96

 #, 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:733
+#: ../src/html/winpars.cpp:737

 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "按编码 %s 显示HTML文档失败"
 

-#: ../src/msw/clipbrd.cpp:127
+#: ../src/msw/clipbrd.cpp:128

 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 
 msgid "Failed to empty the clipboard."
 msgstr "清空剪贴板失败"
 


@@ -3241,18 +3153,16 @@ msgstr "清空剪贴板失败"
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 

-#: ../src/msw/dde.cpp:724
+#: ../src/msw/dde.cpp:728

 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "在DDE服务器建立advise循环失败"
 

-#: ../src/msw/dialup.cpp:651
-#: ../src/msw/dialup.cpp:886
+#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:885

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

-#: ../src/unix/utilsunx.cpp:548
-#: ../src/unix/utilsunx.cpp:562
+#: ../src/unix/utilsunx.cpp:528 ../src/unix/utilsunx.cpp:542

 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s' 失败\n"
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "执行 '%s' 失败\n"


@@ -3261,13 +3171,12 @@ msgstr "执行 '%s' 失败\n"
 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:497
-#, fuzzy, c-format
+#: ../src/msw/ole/automtn.cpp:500
+#, c-format

 msgid "Failed to find CLSID of \"%s\""
 msgid "Failed to find CLSID of \"%s\""

-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法找到 \"%s\" 的 CLSID"

 
 

-#: ../src/common/regex.cpp:435
-#: ../src/common/regex.cpp:483
+#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483

 #, 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"


@@ -3277,20 +3186,20 @@ msgstr "无法找到匹配的正则表达式: %s"
 msgid "Failed to get ISP names: %s"
 msgstr "获取 ISP 名失败: %s"
 
 msgid "Failed to get ISP names: %s"
 msgstr "获取 ISP 名失败: %s"
 

-#: ../src/msw/ole/automtn.cpp:566
+#: ../src/msw/ole/automtn.cpp:569

 #, 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:745
+#: ../src/msw/clipbrd.cpp:748

 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 

-#: ../src/common/stopwatch.cpp:210
+#: ../src/common/time.cpp:250

 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 

-#: ../src/common/filefn.cpp:1471
+#: ../src/common/filefn.cpp:1449

 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 


@@ -3306,15 +3215,14 @@ msgstr "初始化MS HTML 帮助失败。"
 msgid "Failed to initialize OpenGL"
 msgstr "无法初始化 OpenGL"
 
 msgid "Failed to initialize OpenGL"
 msgstr "无法初始化 OpenGL"
 

-#: ../src/msw/dialup.cpp:881
-#, fuzzy, c-format
+#: ../src/msw/dialup.cpp:880
+#, c-format

 msgid "Failed to initiate dialup connection: %s"
 msgid "Failed to initiate dialup connection: %s"

-msgstr "终止拨号连接: %s失败"
+msgstr "无法初始化拨号连接: %s"

 
 

-#: ../src/gtk/textctrl.cpp:1088
-#, fuzzy
+#: ../src/gtk/textctrl.cpp:1059

 msgid "Failed to insert text in the control."
 msgid "Failed to insert text in the control."

-msgstr "获取工作目录失败"
+msgstr "无法在控件中插入文字。"

 
 #: ../src/unix/snglinst.cpp:242
 #, c-format
 
 #: ../src/unix/snglinst.cpp:242
 #, c-format


@@ -3327,26 +3235,37 @@ msgid "Failed to install signal handler"
 msgstr "关闭文件句柄失败."
 
 #: ../src/unix/threadpsx.cpp:1010
 msgstr "关闭文件句柄失败."
 
 #: ../src/unix/threadpsx.cpp:1010

-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:747
+#: ../src/msw/utils.cpp:745

 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 

-#: ../src/common/iconbndl.cpp:183
+#: ../src/common/image.cpp:2261
+#, fuzzy, c-format
+msgid "Failed to load bitmap \"%s\" from resources."
+msgstr "无法从数据流中载入图像 %d。"
+
+#: ../src/common/image.cpp:2270

 #, fuzzy, c-format
 #, fuzzy, c-format

+msgid "Failed to load icon \"%s\" from resources."
+msgstr "无法从数据流中载入图像 %d。"
+
+#: ../src/common/iconbndl.cpp:183
+#, c-format

 msgid "Failed to load image %%d from file '%s'."
 msgid "Failed to load image %%d from file '%s'."

-msgstr "读取图像 %d (从文件 '%s'中)失败."
+msgstr "无法从文件 '%s' 中读取图像 %%d。"

 
 #: ../src/common/iconbndl.cpp:191
 
 #: ../src/common/iconbndl.cpp:191

-#, fuzzy, c-format
+#, c-format

 msgid "Failed to load image %d from stream."
 msgid "Failed to load image %d from stream."

-msgstr "读取图像 %d (从文件 '%s'中)失败."
+msgstr "无法从数据流中载入图像 %d。"

 
 

-#: ../src/common/image.cpp:2250
-#: ../src/common/image.cpp:2269
+#: ../src/common/image.cpp:2343 ../src/common/image.cpp:2362

 #, fuzzy, c-format
 msgid "Failed to load image from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 #, fuzzy, c-format
 msgid "Failed to load image from file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."


@@ -3360,7 +3279,7 @@ msgstr "从文件 \"%s\" 读取元文件失败。"
 msgid "Failed to load mpr.dll."
 msgstr "装载 mpr.dll 失败。"
 
 msgid "Failed to load mpr.dll."
 msgstr "装载 mpr.dll 失败。"
 

-#: ../src/msw/utils.cpp:1128
+#: ../src/msw/utils.cpp:1120

 #, fuzzy, c-format
 msgid "Failed to load resource \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 #, fuzzy, c-format
 msgid "Failed to load resource \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."


@@ -3370,7 +3289,7 @@ msgstr "从文件 \"%s\"读取元文件失败."
 msgid "Failed to load shared library '%s'"
 msgstr "无法装载共享库 '%s'"
 
 msgid "Failed to load shared library '%s'"
 msgstr "无法装载共享库 '%s'"
 

-#: ../src/msw/utils.cpp:1135
+#: ../src/msw/utils.cpp:1127

 #, fuzzy, c-format
 msgid "Failed to lock resource \"%s\"."
 msgstr "锁定锁文件 '%s'失败"
 #, fuzzy, c-format
 msgid "Failed to lock resource \"%s\"."
 msgstr "锁定锁文件 '%s'失败"


@@ -3385,7 +3304,7 @@ msgstr "锁定锁文件 '%s' 失败"
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 

-#: ../src/common/filename.cpp:2531
+#: ../src/common/filename.cpp:2573

 #, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "为 '%s' 修改文件时间失败"
 #, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "为 '%s' 修改文件时间失败"


@@ -3394,12 +3313,12 @@ msgstr "为 '%s' 修改文件时间失败"
 msgid "Failed to monitor I/O channels"
 msgstr ""
 
 msgid "Failed to monitor I/O channels"
 msgstr ""
 

-#: ../src/common/filename.cpp:199
+#: ../src/common/filename.cpp:192

 #, fuzzy, c-format
 msgid "Failed to open '%s' for reading"
 msgstr "打开 '%s'(为 %s) 失败"
 
 #, fuzzy, c-format
 msgid "Failed to open '%s' for reading"
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/common/filename.cpp:204
+#: ../src/common/filename.cpp:197

 #, fuzzy, c-format
 msgid "Failed to open '%s' for writing"
 msgstr "打开 '%s'(为 %s) 失败"
 #, fuzzy, c-format
 msgid "Failed to open '%s' for writing"
 msgstr "打开 '%s'(为 %s) 失败"


@@ -3409,7 +3328,7 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s' 失败。"
 
 msgid "Failed to open CHM archive '%s'."
 msgstr "打开CHM存档 '%s' 失败。"
 

-#: ../src/common/utilscmn.cpp:1131
+#: ../src/common/utilscmn.cpp:1137

 #, fuzzy, c-format
 msgid "Failed to open URL \"%s\" in default browser."
 msgstr "打开 '%s'(为 %s) 失败"
 #, fuzzy, c-format
 msgid "Failed to open URL \"%s\" in default browser."
 msgstr "打开 '%s'(为 %s) 失败"


@@ -3419,16 +3338,16 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open directory \"%s\" for monitoring."
 msgstr "打开 '%s'(为 %s) 失败"
 
 msgid "Failed to open directory \"%s\" for monitoring."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/x11/utils.cpp:226
+#: ../src/x11/utils.cpp:223

 #, fuzzy, c-format
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 
 #, fuzzy, c-format
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/common/filename.cpp:1016
+#: ../src/common/filename.cpp:1054

 msgid "Failed to open temporary file."
 msgstr "打开临时文件失败。"
 
 msgid "Failed to open temporary file."
 msgstr "打开临时文件失败。"
 

-#: ../src/msw/clipbrd.cpp:94
+#: ../src/msw/clipbrd.cpp:95

 msgid "Failed to open the clipboard."
 msgstr "打开剪贴板失败。"
 
 msgid "Failed to open the clipboard."
 msgstr "打开剪贴板失败。"
 


@@ -3437,7 +3356,12 @@ msgstr "打开剪贴板失败。"
 msgid "Failed to parse Plural-Forms: '%s'"
 msgstr "无法解析复数形式: '%s'"
 
 msgid "Failed to parse Plural-Forms: '%s'"
 msgstr "无法解析复数形式: '%s'"
 

-#: ../src/msw/clipbrd.cpp:645
+#: ../src/unix/mediactrl.cpp:1269
+#, fuzzy, c-format
+msgid "Failed to prepare playing \"%s\"."
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/msw/clipbrd.cpp:648

 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 
 msgid "Failed to put data on the clipboard"
 msgstr "把数据放到剪贴板失败"
 


@@ -3450,7 +3374,7 @@ msgstr "从锁文件读取 PID 失败。"
 msgid "Failed to read config options."
 msgstr "读配置选项错误."
 
 msgid "Failed to read config options."
 msgstr "读配置选项错误."
 

-#: ../src/common/docview.cpp:677
+#: ../src/common/docview.cpp:681

 #, fuzzy, c-format
 msgid "Failed to read document from the file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 #, fuzzy, c-format
 msgid "Failed to read document from the file \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."


@@ -3460,16 +3384,16 @@ msgstr "从文件 \"%s\"读取元文件失败."
 msgid "Failed to read event from DirectFB pipe"
 msgstr "从锁文件读取PID失败."
 
 msgid "Failed to read event from DirectFB pipe"
 msgstr "从锁文件读取PID失败."
 

-#: ../src/unix/evtloopunix.cpp:136
+#: ../src/unix/evtloopunix.cpp:170

 #, 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:608
+#: ../src/unix/utilsunx.cpp:588

 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 

-#: ../src/msw/utilsexc.cpp:733
+#: ../src/msw/utilsexc.cpp:731

 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 


@@ -3478,7 +3402,7 @@ msgstr "重定向子过程IO失败"
 msgid "Failed to register DDE server '%s'"
 msgstr "注册DDE服务器 '%s' 失败"
 
 msgid "Failed to register DDE server '%s'"
 msgstr "注册DDE服务器 '%s' 失败"
 

-#: ../src/common/fontmap.cpp:244
+#: ../src/common/fontmap.cpp:246

 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s' 编码失败。"
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "回忆字符集 '%s' 编码失败。"


@@ -3503,9 +3427,11 @@ msgstr "删除过期的锁文件 '%s' 失败。"
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "将注册值 '%s' 重命名为 '%s' 失败。"
 
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "将注册值 '%s' 重命名为 '%s' 失败。"
 

-#: ../src/common/filefn.cpp:1169
+#: ../src/common/filefn.cpp:1163

 #, c-format
 #, c-format

-msgid "Failed to rename the file '%s' to '%s' because the destination file already exists."
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."

 msgstr ""
 
 #: ../src/msw/registry.cpp:634
 msgstr ""
 
 #: ../src/msw/registry.cpp:634


@@ -3513,11 +3439,11 @@ msgstr ""
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s' 重命名为 '%s' 失败。"
 
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "将注册键 '%s' 重命名为 '%s' 失败。"
 

-#: ../src/msw/clipbrd.cpp:499
+#: ../src/msw/clipbrd.cpp:498

 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败。"
 
 msgid "Failed to retrieve data from the clipboard."
 msgstr "从剪贴板检取数据失败。"
 

-#: ../src/common/filename.cpp:2625
+#: ../src/common/filename.cpp:2669

 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "提取 '%s' 文件时间失败"
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "提取 '%s' 文件时间失败"


@@ -3526,30 +3452,30 @@ msgstr "提取 '%s' 文件时间失败"
 msgid "Failed to retrieve text of RAS error message"
 msgstr "提取 RAS 错误消息正文失败"
 
 msgid "Failed to retrieve text of RAS error message"
 msgstr "提取 RAS 错误消息正文失败"
 

-#: ../src/msw/clipbrd.cpp:782
+#: ../src/msw/clipbrd.cpp:785

 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "提取支持的剪贴板格式失败"
 
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "提取支持的剪贴板格式失败"
 

-#: ../src/common/docview.cpp:648
+#: ../src/common/docview.cpp:652

 #, 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:329
+#: ../src/msw/dib.cpp:327

 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\" 失败。"
 
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "将位图图像保存至文件 \"%s\" 失败。"
 

-#: ../src/msw/dde.cpp:765
+#: ../src/msw/dde.cpp:769

 msgid "Failed to send DDE advise notification"
 msgstr "发送 DDE advise 通知失败"
 
 msgid "Failed to send DDE advise notification"
 msgstr "发送 DDE advise 通知失败"
 

-#: ../src/common/ftp.cpp:407
+#: ../src/common/ftp.cpp:405

 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置 FTP 传输模式为 %s 时失败。"
 
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "设置 FTP 传输模式为 %s 时失败。"
 

-#: ../src/msw/clipbrd.cpp:375
+#: ../src/msw/clipbrd.cpp:374

 msgid "Failed to set clipboard data."
 msgstr "设置剪贴板数据失败。"
 
 msgid "Failed to set clipboard data."
 msgstr "设置剪贴板数据失败。"
 


@@ -3558,52 +3484,56 @@ msgstr "设置剪贴板数据失败。"
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s' 上设置许可权限时失败"
 
 msgid "Failed to set permissions on lock file '%s'"
 msgstr "在锁文件 '%s' 上设置许可权限时失败"
 

-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:549

 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 
 msgid "Failed to set temporary file permissions"
 msgstr "设置临时文件的许可权限时失败"
 

-#: ../src/gtk/textctrl.cpp:1029
+#: ../src/gtk/textctrl.cpp:1000

 #, 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:1333
-#: ../src/unix/threadpsx.cpp:1343
+#: ../src/unix/threadpsx.cpp:1141
+#, fuzzy, c-format
+msgid "Failed to set thread concurrency level to %lu"
+msgstr "设置线程优先级 %d 失败。"
+
+#: ../src/unix/threadpsx.cpp:1338 ../src/unix/threadpsx.cpp:1348

 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "设置线程优先级 %d 失败。"
 
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "设置线程优先级 %d 失败。"
 

-#: ../src/unix/utilsunx.cpp:729
+#: ../src/unix/utilsunx.cpp:709

 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:266
+#: ../src/common/fs_mem.cpp:262

 #, 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
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
 msgstr ""
 
 
 #: ../src/dfb/evtloop.cpp:171
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
 msgstr ""
 

-#: ../src/unix/evtloopunix.cpp:93
+#: ../src/unix/evtloopunix.cpp:103

 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:1525
+#: ../src/unix/threadpsx.cpp:1530

 msgid "Failed to terminate a thread."
 msgstr "终止线程失败。"
 
 msgid "Failed to terminate a thread."
 msgstr "终止线程失败。"
 

-#: ../src/msw/dde.cpp:743
+#: ../src/msw/dde.cpp:747

 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "终止与 DDE 服务器的 advise 循环失败"
 
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "终止与 DDE 服务器的 advise 循环失败"
 

-#: ../src/msw/dialup.cpp:961
+#: ../src/msw/dialup.cpp:960

 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接失败: %s"
 
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "终止拨号连接失败: %s"
 

-#: ../src/common/filename.cpp:2546
+#: ../src/common/filename.cpp:2588

 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s' 进行 touch 操作时失败"
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "对文件 '%s' 进行 touch 操作时失败"


@@ -3646,27 +3576,21 @@ msgstr "False"
 msgid "Family"
 msgstr "字体(&F):"
 
 msgid "Family"
 msgstr "字体(&F):"
 

-#: ../src/common/stockitem.cpp:158
-#: ../src/msw/wince/filedlgwce.cpp:119
+#: ../src/common/stockitem.cpp:158 ../src/msw/wince/filedlgwce.cpp:119

 msgid "File"
 msgstr "文件"
 
 msgid "File"
 msgstr "文件"
 

-#: ../src/common/docview.cpp:665
+#: ../src/common/docview.cpp:669

 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for reading."
 msgstr "打开 '%s'(为 %s) 失败"
 
 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for reading."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/common/docview.cpp:642
+#: ../src/common/docview.cpp:646

 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for writing."
 msgstr "打开 '%s'(为 %s) 失败"
 
 #, fuzzy, c-format
 msgid "File \"%s\" could not be opened for writing."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/mgl/bitmap.cpp:439
-#, c-format
-msgid "File %s does not exist."
-msgstr "文件 %s 不存在。"
-
-#: ../src/gtk/filedlg.cpp:53
+#: ../src/gtk/filedlg.cpp:56

 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在，确实需要复写它?"
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "文件 '%s' 已存在，确实需要复写它?"


@@ -3680,44 +3604,51 @@ msgstr ""
 "文件 '%s' 已存在。\n"
 "真的需要替换它?"
 
 "文件 '%s' 已存在。\n"
 "真的需要替换它?"
 

-#: ../src/richtext/richtextctrl.cpp:2381
-#: ../src/common/textcmn.cpp:853
+#: ../src/common/filefn.cpp:1201
+#, fuzzy, c-format
+msgid "File '%s' couldn't be removed"
+msgstr "文件不能被装载."
+
+#: ../src/common/filefn.cpp:1182
+#, fuzzy, c-format
+msgid "File '%s' couldn't be renamed '%s'"
+msgstr "文件不能被装载."
+
+#: ../src/richtext/richtextctrl.cpp:2664 ../src/common/textcmn.cpp:920

 msgid "File couldn't be loaded."
 msgstr "文件无法装载。"
 
 msgid "File couldn't be loaded."
 msgstr "文件无法装载。"
 

-#: ../src/msw/filedlg.cpp:355
+#: ../src/msw/filedlg.cpp:429

 #, 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:1749
+#: ../src/common/docview.cpp:1762

 msgid "File error"
 msgstr "文件错误"
 
 msgid "File error"
 msgstr "文件错误"
 

-#: ../src/generic/dirctrlg.cpp:680
-#: ../src/generic/filectrlg.cpp:799
+#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799

 msgid "File name exists already."
 msgstr "文件名已存在。"
 
 msgid "File name exists already."
 msgstr "文件名已存在。"
 

-#: ../src/unix/fswatcher_inotify.cpp:413
+#: ../src/unix/fswatcher_inotify.cpp:439

 msgid "File system containing watched object was unmounted"
 msgstr ""
 
 msgid "File system containing watched object was unmounted"
 msgstr ""
 

-#: ../src/motif/filedlg.cpp:219
+#: ../src/motif/filedlg.cpp:218

 msgid "Files"
 msgstr "文件"
 
 msgid "Files"
 msgstr "文件"
 

-#: ../src/common/filefn.cpp:1772
+#: ../src/common/filefn.cpp:1753

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

-#: ../src/motif/filedlg.cpp:217
+#: ../src/motif/filedlg.cpp:216

 msgid "Filter"
 msgstr "过滤器"
 
 msgid "Filter"
 msgstr "过滤器"
 

-#: ../src/common/stockitem.cpp:159
-#: ../src/html/helpwnd.cpp:498
+#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:501

 msgid "Find"
 msgstr "查找"
 
 msgid "Find"
 msgstr "查找"
 


@@ -3725,19 +3656,24 @@ msgstr "查找"
 msgid "First"
 msgstr "最前"
 
 msgid "First"
 msgstr "最前"
 

-#: ../src/common/prntbase.cpp:1493
+#: ../src/common/prntbase.cpp:1519

 msgid "First page"
 msgstr "第一页"
 
 msgid "First page"
 msgstr "第一页"
 

-#: ../src/html/helpwnd.cpp:1214
+#: ../src/richtext/richtextsizepage.cpp:483
+#, fuzzy
+msgid "Fixed"
+msgstr "固定字体:"
+
+#: ../src/html/helpwnd.cpp:1220

 msgid "Fixed font:"
 msgstr "固定字体:"
 
 msgid "Fixed font:"
 msgstr "固定字体:"
 

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

 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:153
+#: ../src/richtext/richtextsizepage.cpp:207

 msgid "Floating"
 msgstr ""
 
 msgid "Floating"
 msgstr ""
 


@@ -3749,25 +3685,24 @@ msgstr "软盘"
 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:321
-#: ../src/osx/carbon/fontdlg.cpp:461
+#: ../src/richtext/richtextformatdlg.cpp:323 ../src/osx/carbon/fontdlg.cpp:471

 #: ../src/common/stockitem.cpp:195
 msgid "Font"
 #: ../src/common/stockitem.cpp:195
 msgid "Font"

-msgstr ""
+msgstr "字体"

 
 

-#: ../src/richtext/richtextfontpage.cpp:197
+#: ../src/richtext/richtextfontpage.cpp:228

 msgid "Font &weight:"
 msgstr "字体粗细(&w):"
 
 msgid "Font &weight:"
 msgstr "字体粗细(&w):"
 

-#: ../src/html/helpwnd.cpp:1215
+#: ../src/html/helpwnd.cpp:1221

 msgid "Font size:"
 msgstr "字体大小:"
 
 msgid "Font size:"
 msgstr "字体大小:"
 

-#: ../src/richtext/richtextfontpage.cpp:184
+#: ../src/richtext/richtextfontpage.cpp:215

 msgid "Font st&yle:"
 msgstr "字体样式(&y):"
 
 msgid "Font st&yle:"
 msgstr "字体样式(&y):"
 

-#: ../src/osx/carbon/fontdlg.cpp:503
+#: ../src/osx/carbon/fontdlg.cpp:513

 msgid "Font:"
 msgstr "字体:"
 
 msgid "Font:"
 msgstr "字体:"
 


@@ -3776,7 +3711,7 @@ msgstr "字体:"
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr ""
 
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr ""
 

-#: ../src/unix/utilsunx.cpp:581
+#: ../src/unix/utilsunx.cpp:561

 msgid "Fork failed"
 msgstr "Fork 失败"
 
 msgid "Fork failed"
 msgstr "Fork 失败"
 


@@ -3788,7 +3723,7 @@ msgstr "前进"
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 
 msgid "Forward hrefs are not supported"
 msgstr "不支持传递hrefs"
 

-#: ../src/html/helpwnd.cpp:888
+#: ../src/html/helpwnd.cpp:889

 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"


@@ -3815,9 +3750,15 @@ msgstr "GIF: 没有足够内存。"
 
 #: ../src/common/imaggif.cpp:141
 msgid "GIF: unknown error!!!"
 
 #: ../src/common/imaggif.cpp:141
 msgid "GIF: unknown error!!!"

-msgstr "GIF: 位置错误!!!"
+msgstr "GIF: 位置错误！！！"
+
+#: ../src/gtk/window.cpp:4210
+msgid ""
+"GTK+ installed on this machine is too old to support screen compositing, "
+"please install GTK+ 2.12 or later."
+msgstr ""

 
 

-#: ../src/univ/themes/gtk.cpp:528
+#: ../src/univ/themes/gtk.cpp:526

 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 
 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 


@@ -3833,44 +3774,43 @@ msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 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:187
+#: ../include/wx/xtiprop.h:189

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

-#: ../include/wx/xtiprop.h:265
+#: ../include/wx/xtiprop.h:267

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

-#: ../include/wx/xtiprop.h:205
+#: ../include/wx/xtiprop.h:207

 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 
 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr "调用GetPropertyCollection时未带有效的collection getter"
 

-#: ../src/html/helpwnd.cpp:671
+#: ../src/html/helpwnd.cpp:674

 msgid "Go back"
 msgstr "返回"
 
 msgid "Go back"
 msgstr "返回"
 

-#: ../src/html/helpwnd.cpp:672
+#: ../src/html/helpwnd.cpp:675

 msgid "Go forward"
 msgstr "前进"
 
 msgid "Go forward"
 msgstr "前进"
 

-#: ../src/html/helpwnd.cpp:674
+#: ../src/html/helpwnd.cpp:677

 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 
 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 

-#: ../src/generic/filedlgg.cpp:225
-#: ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137

 msgid "Go to home directory"
 msgid "Go to home directory"

-msgstr "进入home目录"
+msgstr "进入 home 目录"

 
 

-#: ../src/generic/filedlgg.cpp:221
+#: ../src/generic/filedlgg.cpp:219

 msgid "Go to parent directory"
 msgstr "进入父目录"
 
 #: ../src/generic/aboutdlgg.cpp:77
 msgid "Graphics art by "
 msgid "Go to parent directory"
 msgstr "进入父目录"
 
 #: ../src/generic/aboutdlgg.cpp:77
 msgid "Graphics art by "

-msgstr ""
+msgstr "图形艺术设计由 "

 
 

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

 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 


@@ -3878,20 +3818,19 @@ msgstr "希腊语 (ISO-8859-7)"
 msgid "Groove"
 msgstr ""
 
 msgid "Groove"
 msgstr ""
 

-#: ../src/common/zstream.cpp:151
-#: ../src/common/zstream.cpp:311
+#: ../src/common/zstream.cpp:159 ../src/common/zstream.cpp:319

 msgid "Gzip not supported by this version of zlib"
 msgid "Gzip not supported by this version of zlib"

-msgstr "此版本的zlib不支持Gzip"
+msgstr "此版本的 zlib 不支持 Gzip"

 
 #: ../src/common/accelcmn.cpp:76
 msgid "HELP"
 
 #: ../src/common/accelcmn.cpp:76
 msgid "HELP"

-msgstr ""
+msgstr "HELP"

 
 #: ../src/common/accelcmn.cpp:61
 msgid "HOME"
 
 #: ../src/common/accelcmn.cpp:61
 msgid "HOME"

-msgstr ""
+msgstr "HOME"

 
 

-#: ../src/html/helpwnd.cpp:1556
+#: ../src/html/helpwnd.cpp:1553

 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 


@@ -3900,7 +3839,7 @@ msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 锚 %s 不存在。"
 
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 锚 %s 不存在。"
 

-#: ../src/html/helpwnd.cpp:1554
+#: ../src/html/helpwnd.cpp:1551

 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|"
 


@@ -3908,27 +3847,24 @@ msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 msgid "Harddisk"
 msgstr ""
 
 msgid "Harddisk"
 msgstr ""
 

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

 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
+#: ../src/osx/button_osx.cpp:40 ../src/common/stockitem.cpp:164
+#: ../src/html/helpdlg.cpp:67 ../src/html/helpfrm.cpp:117

 msgid "Help"
 msgstr "帮助"
 
 msgid "Help"
 msgstr "帮助"
 

-#: ../src/html/helpwnd.cpp:1208
+#: ../src/html/helpwnd.cpp:1214

 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 

-#: ../src/generic/helpext.cpp:459
-#: ../src/generic/helpext.cpp:460
+#: ../src/generic/helpext.cpp:459 ../src/generic/helpext.cpp:460

 msgid "Help Index"
 msgstr "帮助索引"
 
 msgid "Help Index"
 msgstr "帮助索引"
 

-#: ../src/html/helpwnd.cpp:1538
+#: ../src/html/helpwnd.cpp:1535

 msgid "Help Printing"
 msgstr "帮助打印"
 
 msgid "Help Printing"
 msgstr "帮助打印"
 


@@ -3936,30 +3872,31 @@ msgstr "帮助打印"
 msgid "Help Topics"
 msgstr "帮助主题"
 
 msgid "Help Topics"
 msgstr "帮助主题"
 

-#: ../src/html/helpwnd.cpp:1555
+#: ../src/html/helpwnd.cpp:1552

 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
 #: ../src/generic/helpext.cpp:272
 #, c-format
 msgid "Help directory \"%s\" not found."
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
 #: ../src/generic/helpext.cpp:272
 #, c-format
 msgid "Help directory \"%s\" not found."

-msgstr ""
+msgstr "找不到帮助目录 \"%s\"。"

 
 #: ../src/generic/helpext.cpp:280
 #, fuzzy, c-format
 msgid "Help file \"%s\" not found."
 msgstr "找不到域 '%s'的目录文件."
 
 
 #: ../src/generic/helpext.cpp:280
 #, fuzzy, c-format
 msgid "Help file \"%s\" not found."
 msgstr "找不到域 '%s'的目录文件."
 

-#: ../src/html/helpctrl.cpp:53
+#: ../src/html/helpctrl.cpp:64

 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 
 #, c-format
 msgid "Help: %s"
 msgstr "帮助: %s"
 

-#: ../src/osx/menu_osx.cpp:535
-msgid "Hide"
-msgstr ""
+#: ../src/osx/menu_osx.cpp:556
+#, c-format
+msgid "Hide %s"
+msgstr "隐藏 %s"

 
 

-#: ../src/osx/menu_osx.cpp:540
+#: ../src/osx/menu_osx.cpp:558

 msgid "Hide Others"
 msgstr ""
 
 msgid "Hide Others"
 msgstr ""
 


@@ -3967,8 +3904,7 @@ msgstr ""
 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:99 ../src/common/stockitem.cpp:165

 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 


@@ -3976,8 +3912,8 @@ msgstr "Home"
 msgid "Home directory"
 msgstr "Home 目录"
 
 msgid "Home directory"
 msgstr "Home 目录"
 

-#: ../src/richtext/richtextsizepage.cpp:177
-#: ../src/richtext/richtextsizepage.cpp:179
+#: ../src/richtext/richtextsizepage.cpp:231
+#: ../src/richtext/richtextsizepage.cpp:233

 msgid "How the object will float relative to the text."
 msgstr ""
 
 msgid "How the object will float relative to the text."
 msgstr ""
 


@@ -3985,15 +3921,12 @@ msgstr ""
 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:1187 ../src/common/imagbmp.cpp:1248
+#: ../src/common/imagbmp.cpp:1259 ../src/common/imagbmp.cpp:1272
+#: ../src/common/imagbmp.cpp:1318 ../src/common/imagbmp.cpp:1330

 #: ../src/common/imagbmp.cpp:1341
 msgid "ICO: Error writing the image file!"
 #: ../src/common/imagbmp.cpp:1341
 msgid "ICO: Error writing the image file!"

-msgstr "ICO: 写图像文件错误!"
+msgstr "ICO: 写图像文件错误！"

 
 #: ../src/common/imagbmp.cpp:1151
 msgid "ICO: Image too tall for an icon."
 
 #: ../src/common/imagbmp.cpp:1151
 msgid "ICO: Image too tall for an icon."


@@ -4021,26 +3954,28 @@ msgstr "IFF: 没有足够内存。"
 
 #: ../src/common/imagiff.cpp:750
 msgid "IFF: unknown error!!!"
 
 #: ../src/common/imagiff.cpp:750
 msgid "IFF: unknown error!!!"

-msgstr "IFF: 位置错误!!!"
+msgstr "IFF: 位置错误！！！"

 
 #: ../src/common/accelcmn.cpp:51
 msgid "INS"
 
 #: ../src/common/accelcmn.cpp:51
 msgid "INS"

-msgstr ""
+msgstr "INS"

 
 #: ../src/common/accelcmn.cpp:52
 msgid "INSERT"
 
 #: ../src/common/accelcmn.cpp:52
 msgid "INSERT"

-msgstr ""
+msgstr "INSERT"

 
 

-#: ../src/common/fmapbase.cpp:194
+#: ../src/common/fmapbase.cpp:198

 msgid "ISO-2022-JP"
 msgid "ISO-2022-JP"

-msgstr ""
+msgstr "ISO-2022-JP"

 
 

-#: ../src/osx/carbon/dataview.cpp:2415
+#: ../src/osx/carbon/dataview.cpp:2421

 msgid "Icon & text renderer cannot render value; value type: "
 msgstr ""
 
 #: ../src/html/htmprint.cpp:283
 msgid "Icon & text renderer cannot render value; value type: "
 msgstr ""
 
 #: ../src/html/htmprint.cpp:283

-msgid "If possible, try changing the layout parameters to make the printout more narrow."
+msgid ""
+"If possible, try changing the layout parameters to make the printout more "
+"narrow."

 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:355
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:355


@@ -4053,7 +3988,8 @@ msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:321
 msgid ""
 
 #: ../src/generic/dbgrptg.cpp:321
 msgid ""

-"If you wish to suppress this debug report completely, please choose the \"Cancel\" button,\n"
+"If you wish to suppress this debug report completely, please choose the "
+"\"Cancel\" button,\n"

 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""


@@ -4078,48 +4014,50 @@ msgstr "非法的针对 ConstructObject 方法的参数计数"
 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:662 ../src/generic/filectrlg.cpp:785

 msgid "Illegal directory name."
 msgstr "不合法的目录名。"
 
 msgid "Illegal directory name."
 msgstr "不合法的目录名。"
 

-#: ../src/generic/filectrlg.cpp:1370
+#: ../src/generic/filectrlg.cpp:1374

 msgid "Illegal file specification."
 msgstr "不合规范的文件描述。"
 
 msgid "Illegal file specification."
 msgstr "不合规范的文件描述。"
 

-#: ../src/common/image.cpp:2053
+#: ../src/common/image.cpp:2054

 msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致。"
 
 msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致。"
 

-#: ../src/common/image.cpp:2409
+#: ../src/common/image.cpp:2502

 #, fuzzy, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 
 #, fuzzy, c-format
 msgid "Image file is not of type %d."
 msgstr "图像文件的类型不是 %d."
 

-#: ../src/common/image.cpp:2529
+#: ../src/common/image.cpp:2632

 #, fuzzy, c-format
 msgid "Image is not of type %s."
 msgstr "图像文件的类型不是 %d."
 
 #, fuzzy, c-format
 msgid "Image is not of type %s."
 msgstr "图像文件的类型不是 %d."
 

-#: ../src/msw/textctrl.cpp:398
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"
+#: ../src/msw/textctrl.cpp:399
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"

 
 

-#: ../src/unix/utilsunx.cpp:322
+#: ../src/unix/utilsunx.cpp:302

 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 

-#: ../src/common/filefn.cpp:1075
+#: ../src/common/filefn.cpp:1069

 #, 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:1089
+#: ../src/common/filefn.cpp:1083

 #, 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:1143
+#: ../src/common/filefn.cpp:1137

 #, 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' 的许可权限"


@@ -4129,7 +4067,7 @@ msgstr "不可能设置文件 '%s' 的许可权限"
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr ""
 
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr ""
 

-#: ../src/msw/ole/automtn.cpp:606
+#: ../src/msw/ole/automtn.cpp:619

 msgid "Incorrect number of arguments."
 msgstr ""
 
 msgid "Incorrect number of arguments."
 msgstr ""
 


@@ -4137,17 +4075,15 @@ msgstr ""
 msgid "Indent"
 msgstr "缩进"
 
 msgid "Indent"
 msgstr "缩进"
 

-#: ../src/richtext/richtextformatdlg.cpp:327
+#: ../src/richtext/richtextformatdlg.cpp:329

 msgid "Indents && Spacing"
 msgstr ""
 
 msgid "Indents && Spacing"
 msgstr ""
 

-#: ../src/common/stockitem.cpp:167
-#: ../src/html/helpwnd.cpp:523
+#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:526

 msgid "Index"
 msgstr "索引"
 
 msgid "Index"
 msgstr "索引"
 

-#: ../src/common/fmapbase.cpp:158
-#, fuzzy
+#: ../src/common/fmapbase.cpp:160

 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 


@@ -4155,28 +4091,32 @@ msgstr "印地安语 (ISO-8859-12)"
 msgid "Info"
 msgstr "信息"
 
 msgid "Info"
 msgstr "信息"
 

-#: ../src/common/init.cpp:261
+#: ../src/common/init.cpp:273

 msgid "Initialization failed in post init, aborting."
 msgstr "在后初始化阶段出错，退出..."
 
 msgid "Initialization failed in post init, aborting."
 msgstr "在后初始化阶段出错，退出..."
 

-#: ../src/richtext/richtextsymboldlg.cpp:469
+#: ../src/richtext/richtextsymboldlg.cpp:473

 msgid "Insert"
 msgstr "插入"
 
 msgid "Insert"
 msgstr "插入"
 

-#: ../src/richtext/richtextbuffer.cpp:6786
-#: ../src/richtext/richtextbuffer.cpp:7638
+#: ../src/richtext/richtextbuffer.cpp:7246
+#, fuzzy
+msgid "Insert Field"
+msgstr "插入"
+
+#: ../src/richtext/richtextbuffer.cpp:7157
+#: ../src/richtext/richtextbuffer.cpp:8063

 msgid "Insert Image"
 msgstr ""
 
 msgid "Insert Image"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:6830
+#: ../src/richtext/richtextbuffer.cpp:7204

 msgid "Insert Object"
 msgstr "插入对象"
 
 msgid "Insert Object"
 msgstr "插入对象"
 

-#: ../src/richtext/richtextctrl.cpp:1009
-#: ../src/richtext/richtextctrl.cpp:1207
-#: ../src/richtext/richtextbuffer.cpp:6633
-#: ../src/richtext/richtextbuffer.cpp:6660
-#: ../src/richtext/richtextbuffer.cpp:6704
+#: ../src/richtext/richtextctrl.cpp:1162 ../src/richtext/richtextctrl.cpp:1352
+#: ../src/richtext/richtextbuffer.cpp:7002
+#: ../src/richtext/richtextbuffer.cpp:7029
+#: ../src/richtext/richtextbuffer.cpp:7073

 msgid "Insert Text"
 msgstr ""
 
 msgid "Insert Text"
 msgstr ""
 


@@ -4190,17 +4130,16 @@ msgstr ""
 msgid "Inset"
 msgstr "缩进"
 
 msgid "Inset"
 msgstr "缩进"
 

-#: ../src/gtk/app.cpp:428
+#: ../src/gtk/app.cpp:432

 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr ""
 
 #, c-format
 msgid "Invalid GTK+ command line option, use \"%s --help\""
 msgstr ""
 

-#: ../src/common/imagtiff.cpp:319
+#: ../src/common/imagtiff.cpp:315

 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引。"
 
 msgid "Invalid TIFF image index."
 msgstr "无效TIFF图像索引。"
 

-#: ../src/osx/carbon/dataview.cpp:1777
-#: ../src/osx/carbon/dataview.cpp:1872
+#: ../src/osx/carbon/dataview.cpp:1783 ../src/osx/carbon/dataview.cpp:1878

 msgid "Invalid data view item"
 msgstr ""
 
 msgid "Invalid data view item"
 msgstr ""
 


@@ -4224,8 +4163,7 @@ msgstr "无效的锁文件 '%s'。"
 msgid "Invalid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 
 msgid "Invalid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 

-#: ../src/common/xtistrm.cpp:410
-#: ../src/common/xtistrm.cpp:425
+#: ../src/common/xtistrm.cpp:410 ../src/common/xtistrm.cpp:425

 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"
 
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"
 


@@ -4238,15 +4176,13 @@ msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 

-#: ../src/common/config.cpp:229
+#: ../src/common/config.cpp:227

 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr ""
 
 #, c-format
 msgid "Invalid value %ld for a boolean key \"%s\" in config file."
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:330
-#: ../src/richtext/richtextfontpage.cpp:293
-#: ../src/osx/carbon/fontdlg.cpp:535
-#: ../src/common/stockitem.cpp:169
+#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:324
+#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169

 msgid "Italic"
 msgstr "斜体"
 
 msgid "Italic"
 msgstr "斜体"
 


@@ -4258,7 +4194,7 @@ msgstr "意大利信封, 110 x 230 毫米"
 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:428
+#: ../src/common/imagjpeg.cpp:435

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


@@ -4316,7 +4252,7 @@ msgstr "横向日本明信片, 148 x 100 毫米"
 
 #: ../src/common/stockitem.cpp:170
 msgid "Jump to"
 
 #: ../src/common/stockitem.cpp:170
 msgid "Jump to"

-msgstr ""
+msgstr "跳转至"

 
 #: ../src/common/stockitem.cpp:172
 msgid "Justified"
 
 #: ../src/common/stockitem.cpp:172
 msgid "Justified"


@@ -4329,110 +4265,109 @@ msgstr "分散对齐"
 msgid "Justify text left and right."
 msgstr ""
 
 msgid "Justify text left and right."
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:162
+#: ../src/common/fmapbase.cpp:164

 msgid "KOI8-R"
 msgstr "KOI8-R"
 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 

-#: ../src/common/fmapbase.cpp:163
+#: ../src/common/fmapbase.cpp:165

 msgid "KOI8-U"
 msgstr "KOI8-U"
 
 msgid "KOI8-U"
 msgstr "KOI8-U"
 

-#: ../src/common/accelcmn.cpp:253
-#: ../src/common/accelcmn.cpp:320
+#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:337

 msgid "KP_"
 msgid "KP_"

-msgstr ""
+msgstr "KP_"

 
 #: ../src/common/accelcmn.cpp:104
 msgid "KP_ADD"
 
 #: ../src/common/accelcmn.cpp:104
 msgid "KP_ADD"

-msgstr ""
+msgstr "KP_ADD"

 
 #: ../src/common/accelcmn.cpp:99
 msgid "KP_BEGIN"
 
 #: ../src/common/accelcmn.cpp:99
 msgid "KP_BEGIN"

-msgstr ""
+msgstr "KP_BEGIN"

 
 #: ../src/common/accelcmn.cpp:107
 msgid "KP_DECIMAL"
 
 #: ../src/common/accelcmn.cpp:107
 msgid "KP_DECIMAL"

-msgstr ""
+msgstr "KP_DECIMAL"

 
 #: ../src/common/accelcmn.cpp:101
 msgid "KP_DELETE"
 
 #: ../src/common/accelcmn.cpp:101
 msgid "KP_DELETE"

-msgstr ""
+msgstr "KP_DELETE"

 
 #: ../src/common/accelcmn.cpp:108
 msgid "KP_DIVIDE"
 
 #: ../src/common/accelcmn.cpp:108
 msgid "KP_DIVIDE"

-msgstr ""
+msgstr "KP_DIVIDE"

 
 #: ../src/common/accelcmn.cpp:93
 msgid "KP_DOWN"
 
 #: ../src/common/accelcmn.cpp:93
 msgid "KP_DOWN"

-msgstr ""
+msgstr "KP_DOWN"

 
 #: ../src/common/accelcmn.cpp:98
 msgid "KP_END"
 
 #: ../src/common/accelcmn.cpp:98
 msgid "KP_END"

-msgstr ""
+msgstr "KP_END"

 
 #: ../src/common/accelcmn.cpp:88
 msgid "KP_ENTER"
 
 #: ../src/common/accelcmn.cpp:88
 msgid "KP_ENTER"

-msgstr ""
+msgstr "KP_ENTER"

 
 #: ../src/common/accelcmn.cpp:102
 msgid "KP_EQUAL"
 
 #: ../src/common/accelcmn.cpp:102
 msgid "KP_EQUAL"

-msgstr ""
+msgstr "KP_EQUAL"

 
 #: ../src/common/accelcmn.cpp:89
 msgid "KP_HOME"
 
 #: ../src/common/accelcmn.cpp:89
 msgid "KP_HOME"

-msgstr ""
+msgstr "KP_HOME"

 
 #: ../src/common/accelcmn.cpp:100
 msgid "KP_INSERT"
 
 #: ../src/common/accelcmn.cpp:100
 msgid "KP_INSERT"

-msgstr ""
+msgstr "KP_INSERT"

 
 #: ../src/common/accelcmn.cpp:90
 msgid "KP_LEFT"
 
 #: ../src/common/accelcmn.cpp:90
 msgid "KP_LEFT"

-msgstr ""
+msgstr "KP_LEFT"

 
 #: ../src/common/accelcmn.cpp:103
 msgid "KP_MULTIPLY"
 
 #: ../src/common/accelcmn.cpp:103
 msgid "KP_MULTIPLY"

-msgstr ""
+msgstr "KP_MULTIPLY"

 
 #: ../src/common/accelcmn.cpp:96
 msgid "KP_NEXT"
 
 #: ../src/common/accelcmn.cpp:96
 msgid "KP_NEXT"

-msgstr ""
+msgstr "KP_NEXT"

 
 #: ../src/common/accelcmn.cpp:97
 msgid "KP_PAGEDOWN"
 
 #: ../src/common/accelcmn.cpp:97
 msgid "KP_PAGEDOWN"

-msgstr ""
+msgstr "KP_PAGEDOWN"

 
 #: ../src/common/accelcmn.cpp:95
 msgid "KP_PAGEUP"
 
 #: ../src/common/accelcmn.cpp:95
 msgid "KP_PAGEUP"

-msgstr ""
+msgstr "KP_PAGEUP"

 
 #: ../src/common/accelcmn.cpp:94
 msgid "KP_PRIOR"
 
 #: ../src/common/accelcmn.cpp:94
 msgid "KP_PRIOR"

-msgstr ""
+msgstr "KP_PRIOR"

 
 #: ../src/common/accelcmn.cpp:92
 msgid "KP_RIGHT"
 
 #: ../src/common/accelcmn.cpp:92
 msgid "KP_RIGHT"

-msgstr ""
+msgstr "KP_RIGHT"

 
 #: ../src/common/accelcmn.cpp:105
 msgid "KP_SEPARATOR"
 
 #: ../src/common/accelcmn.cpp:105
 msgid "KP_SEPARATOR"

-msgstr ""
+msgstr "KP_SEPARATOR"

 
 #: ../src/common/accelcmn.cpp:86
 msgid "KP_SPACE"
 
 #: ../src/common/accelcmn.cpp:86
 msgid "KP_SPACE"

-msgstr ""
+msgstr "KP_SPACE"

 
 #: ../src/common/accelcmn.cpp:106
 msgid "KP_SUBTRACT"
 
 #: ../src/common/accelcmn.cpp:106
 msgid "KP_SUBTRACT"

-msgstr ""
+msgstr "KP_SUBTRACT"

 
 #: ../src/common/accelcmn.cpp:87
 msgid "KP_TAB"
 
 #: ../src/common/accelcmn.cpp:87
 msgid "KP_TAB"

-msgstr ""
+msgstr "KP_TAB"

 
 #: ../src/common/accelcmn.cpp:91
 msgid "KP_UP"
 
 #: ../src/common/accelcmn.cpp:91
 msgid "KP_UP"

-msgstr ""
+msgstr "KP_UP"

 
 #: ../src/richtext/richtextindentspage.cpp:295
 msgid "L&ine spacing:"
 
 #: ../src/richtext/richtextindentspage.cpp:295
 msgid "L&ine spacing:"


@@ -4440,10 +4375,9 @@ msgstr ""
 
 #: ../src/common/accelcmn.cpp:57
 msgid "LEFT"
 
 #: ../src/common/accelcmn.cpp:57
 msgid "LEFT"

-msgstr ""
+msgstr "LEFT"

 
 

-#: ../src/generic/prntdlgg.cpp:619
-#: ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874

 msgid "Landscape"
 msgstr "横向"
 
 msgid "Landscape"
 msgstr "横向"
 


@@ -4451,11 +4385,11 @@ msgstr "横向"
 msgid "Last"
 msgstr "最后"
 
 msgid "Last"
 msgstr "最后"
 

-#: ../src/common/prntbase.cpp:1517
+#: ../src/common/prntbase.cpp:1543

 msgid "Last page"
 msgstr "最后一页"
 
 msgid "Last page"
 msgstr "最后一页"
 

-#: ../src/common/log.cpp:258
+#: ../src/common/log.cpp:312

 #, c-format
 msgid "Last repeated message (\"%s\", %lu time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
 #, c-format
 msgid "Last repeated message (\"%s\", %lu time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"


@@ -4471,14 +4405,14 @@ msgstr "帐簿, 17 x 11 英寸"
 #: ../src/richtext/richtextbulletspage.cpp:200
 #: ../src/richtext/richtextbulletspage.cpp:203
 #: ../src/richtext/richtextbulletspage.cpp:204
 #: ../src/richtext/richtextbulletspage.cpp:200
 #: ../src/richtext/richtextbulletspage.cpp:203
 #: ../src/richtext/richtextbulletspage.cpp:204

-#: ../src/richtext/richtextsizepage.cpp:173
+#: ../src/richtext/richtextsizepage.cpp:227

 msgid "Left"
 msgid "Left"

-msgstr ""
+msgstr "左"

 
 #: ../src/richtext/richtextindentspage.cpp:217
 #: ../src/richtext/richtextliststylepage.cpp:391
 msgid "Left (&first line):"
 
 #: ../src/richtext/richtextindentspage.cpp:217
 #: ../src/richtext/richtextliststylepage.cpp:391
 msgid "Left (&first line):"

-msgstr ""
+msgstr "左(第一行)(&F):"

 
 #: ../src/generic/prntdlgg.cpp:886
 msgid "Left margin (mm):"
 
 #: ../src/generic/prntdlgg.cpp:886
 msgid "Left margin (mm):"


@@ -4489,7 +4423,7 @@ msgstr "左边距 (毫米):"
 #: ../src/richtext/richtextliststylepage.cpp:331
 #: ../src/richtext/richtextliststylepage.cpp:333
 msgid "Left-align text."
 #: ../src/richtext/richtextliststylepage.cpp:331
 #: ../src/richtext/richtextliststylepage.cpp:333
 msgid "Left-align text."

-msgstr ""
+msgstr "文字左对齐。"

 
 #: ../src/common/paper.cpp:146
 msgid "Legal Extra 9 1/2 x 15 in"
 
 #: ../src/common/paper.cpp:146
 msgid "Legal Extra 9 1/2 x 15 in"


@@ -4529,7 +4463,7 @@ msgstr "信纸, 8 1/2 x 11 英寸"
 
 #: ../src/generic/aboutdlgg.cpp:174
 msgid "License"
 
 #: ../src/generic/aboutdlgg.cpp:174
 msgid "License"

-msgstr ""
+msgstr "授权"

 
 #: ../src/generic/fontdlgg.cpp:333
 msgid "Light"
 
 #: ../src/generic/fontdlgg.cpp:333
 msgid "Light"


@@ -4548,21 +4482,21 @@ msgstr ""
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//'，转换为绝对链接."
 
 msgid "Link contained '//', converted to absolute link."
 msgstr "链接包含 '//'，转换为绝对链接."
 

-#: ../src/richtext/richtextformatdlg.cpp:346
+#: ../src/richtext/richtextformatdlg.cpp:348

 msgid "List Style"
 msgstr ""
 
 msgid "List Style"
 msgstr ""
 

-#: ../src/richtext/richtextstyles.cpp:1035
+#: ../src/richtext/richtextstyles.cpp:1044

 msgid "List styles"
 msgstr ""
 
 msgid "List styles"
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:173
-#: ../src/richtext/richtextfontpage.cpp:175
+#: ../src/richtext/richtextfontpage.cpp:204
+#: ../src/richtext/richtextfontpage.cpp:206

 msgid "Lists font sizes in points."
 msgstr ""
 
 msgid "Lists font sizes in points."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:154
-#: ../src/richtext/richtextfontpage.cpp:156
+#: ../src/richtext/richtextfontpage.cpp:197
+#: ../src/richtext/richtextfontpage.cpp:199

 msgid "Lists the available fonts."
 msgstr "列出可用字体。"
 
 msgid "Lists the available fonts."
 msgstr "列出可用字体。"
 


@@ -4585,7 +4519,7 @@ msgstr "锁文件 '%s' 没有正确的所有者。"
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限。"
 
 msgid "Lock file '%s' has incorrect permissions."
 msgstr "锁文件 '%s' 没有正确的权限。"
 

-#: ../src/generic/logg.cpp:590
+#: ../src/generic/logg.cpp:582

 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'。"
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "日志保存到文件 '%s'。"


@@ -4600,207 +4534,217 @@ msgstr ""
 msgid "Lower case roman numerals"
 msgstr ""
 
 msgid "Lower case roman numerals"
 msgstr ""
 

-#: ../src/gtk/mdi.cpp:431
-#: ../src/gtk1/mdi.cpp:432
+#: ../src/gtk/mdi.cpp:423 ../src/gtk1/mdi.cpp:432

 msgid "MDI child"
 msgstr "MDI 子窗口"
 
 #: ../src/common/accelcmn.cpp:69
 msgid "MENU"
 msgid "MDI child"
 msgstr "MDI 子窗口"
 
 #: ../src/common/accelcmn.cpp:69
 msgid "MENU"

-msgstr ""
+msgstr "MENU"

 
 #: ../src/msw/helpchm.cpp:57
 
 #: ../src/msw/helpchm.cpp:57

-msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."

 msgstr "MS HTML帮助功能不存在，因为此机器上没有安装 MS HTML 帮助库。请安装它。"
 
 msgstr "MS HTML帮助功能不存在，因为此机器上没有安装 MS HTML 帮助库。请安装它。"
 

-#: ../src/univ/themes/win32.cpp:3776
+#: ../src/univ/themes/win32.cpp:3755

 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 

-#: ../src/common/fmapbase.cpp:200
+#: ../src/common/fmapbase.cpp:204

 msgid "MacArabic"
 msgid "MacArabic"

-msgstr ""
+msgstr "MacArabic"

 
 

-#: ../src/common/fmapbase.cpp:219
+#: ../src/common/fmapbase.cpp:223

 msgid "MacArmenian"
 msgid "MacArmenian"

-msgstr ""
+msgstr "MacArmenian"

 
 

-#: ../src/common/fmapbase.cpp:208
+#: ../src/common/fmapbase.cpp:212

 msgid "MacBengali"
 msgid "MacBengali"

-msgstr ""
+msgstr "MacBengali"

 
 

-#: ../src/common/fmapbase.cpp:214
+#: ../src/common/fmapbase.cpp:218

 msgid "MacBurmese"
 msgid "MacBurmese"

-msgstr ""
+msgstr "MacBurmese"

 
 

-#: ../src/common/fmapbase.cpp:233
+#: ../src/common/fmapbase.cpp:237

 msgid "MacCeltic"
 msgid "MacCeltic"

-msgstr ""
+msgstr "MacCeltic"

 
 

-#: ../src/common/fmapbase.cpp:224
+#: ../src/common/fmapbase.cpp:228

 msgid "MacCentralEurRoman"
 msgid "MacCentralEurRoman"

-msgstr ""
+msgstr "MacCentralEurRoman"

 
 

-#: ../src/common/fmapbase.cpp:220
+#: ../src/common/fmapbase.cpp:224

 msgid "MacChineseSimp"
 msgid "MacChineseSimp"

-msgstr ""
+msgstr "MacChineseSimp"

 
 

-#: ../src/common/fmapbase.cpp:198
+#: ../src/common/fmapbase.cpp:202

 msgid "MacChineseTrad"
 msgid "MacChineseTrad"

-msgstr ""
+msgstr "MacChineseTrad"

 
 

-#: ../src/common/fmapbase.cpp:230
+#: ../src/common/fmapbase.cpp:234

 msgid "MacCroatian"
 msgid "MacCroatian"

-msgstr ""
+msgstr "MacCroatian"

 
 

-#: ../src/common/fmapbase.cpp:203
+#: ../src/common/fmapbase.cpp:207

 msgid "MacCyrillic"
 msgid "MacCyrillic"

-msgstr ""
+msgstr "MacCyrillic"

 
 

-#: ../src/common/fmapbase.cpp:204
+#: ../src/common/fmapbase.cpp:208

 msgid "MacDevanagari"
 msgid "MacDevanagari"

-msgstr ""
+msgstr "MacDevanagari"

 
 

-#: ../src/common/fmapbase.cpp:228
+#: ../src/common/fmapbase.cpp:232

 msgid "MacDingbats"
 msgid "MacDingbats"

-msgstr ""
+msgstr "MacDingbats"

 
 

-#: ../src/common/fmapbase.cpp:223
+#: ../src/common/fmapbase.cpp:227

 msgid "MacEthiopic"
 msgid "MacEthiopic"

-msgstr ""
+msgstr "MacEthiopic"

 
 

-#: ../src/common/fmapbase.cpp:226
+#: ../src/common/fmapbase.cpp:230

 msgid "MacExtArabic"
 msgid "MacExtArabic"

-msgstr ""
+msgstr "MacExtArabic"

 
 

-#: ../src/common/fmapbase.cpp:234
+#: ../src/common/fmapbase.cpp:238

 msgid "MacGaelic"
 msgid "MacGaelic"

-msgstr ""
+msgstr "MacGaelic"

 
 

-#: ../src/common/fmapbase.cpp:218
+#: ../src/common/fmapbase.cpp:222

 msgid "MacGeorgian"
 msgid "MacGeorgian"

-msgstr ""
+msgstr "MacGeorgian"

 
 

-#: ../src/common/fmapbase.cpp:202
+#: ../src/common/fmapbase.cpp:206

 msgid "MacGreek"
 msgid "MacGreek"

-msgstr ""
+msgstr "MacGreek"

 
 

-#: ../src/common/fmapbase.cpp:206
+#: ../src/common/fmapbase.cpp:210

 msgid "MacGujarati"
 msgid "MacGujarati"

-msgstr ""
+msgstr "MacGujarati"

 
 

-#: ../src/common/fmapbase.cpp:205
+#: ../src/common/fmapbase.cpp:209

 msgid "MacGurmukhi"
 msgid "MacGurmukhi"

-msgstr ""
+msgstr "MacGurmukhi"

 
 

-#: ../src/common/fmapbase.cpp:201
+#: ../src/common/fmapbase.cpp:205

 msgid "MacHebrew"
 msgid "MacHebrew"

-msgstr ""
+msgstr "MacHebrew"

 
 

-#: ../src/common/fmapbase.cpp:231
+#: ../src/common/fmapbase.cpp:235

 msgid "MacIcelandic"
 msgid "MacIcelandic"

-msgstr ""
+msgstr "MacIcelandic"

 
 

-#: ../src/common/fmapbase.cpp:197
+#: ../src/common/fmapbase.cpp:201

 msgid "MacJapanese"
 msgid "MacJapanese"

-msgstr ""
+msgstr "MacJapanese"

 
 

-#: ../src/common/fmapbase.cpp:211
+#: ../src/common/fmapbase.cpp:215

 msgid "MacKannada"
 msgid "MacKannada"

-msgstr ""
+msgstr "MacKannada"

 
 

-#: ../src/common/fmapbase.cpp:235
+#: ../src/common/fmapbase.cpp:239

 msgid "MacKeyboardGlyphs"
 msgid "MacKeyboardGlyphs"

-msgstr ""
+msgstr "MacKeyboardGlyphs"

 
 

-#: ../src/common/fmapbase.cpp:215
+#: ../src/common/fmapbase.cpp:219

 msgid "MacKhmer"
 msgid "MacKhmer"

-msgstr ""
+msgstr "MacKhmer"

 
 

-#: ../src/common/fmapbase.cpp:199
+#: ../src/common/fmapbase.cpp:203

 msgid "MacKorean"
 msgid "MacKorean"

-msgstr ""
+msgstr "MacKorean"

 
 

-#: ../src/common/fmapbase.cpp:217
+#: ../src/common/fmapbase.cpp:221

 msgid "MacLaotian"
 msgid "MacLaotian"

-msgstr ""
+msgstr "MacLaotian"

 
 

-#: ../src/common/fmapbase.cpp:212
+#: ../src/common/fmapbase.cpp:216

 msgid "MacMalayalam"
 msgid "MacMalayalam"

-msgstr ""
+msgstr "MacMalayalam"

 
 

-#: ../src/common/fmapbase.cpp:222
+#: ../src/common/fmapbase.cpp:226

 msgid "MacMongolian"
 msgid "MacMongolian"

-msgstr ""
+msgstr "MacMongolian"

 
 

-#: ../src/common/fmapbase.cpp:207
+#: ../src/common/fmapbase.cpp:211

 msgid "MacOriya"
 msgid "MacOriya"

-msgstr ""
+msgstr "MacOriya"

 
 

-#: ../src/common/fmapbase.cpp:196
-#, fuzzy
+#: ../src/common/fmapbase.cpp:200

 msgid "MacRoman"
 msgid "MacRoman"

-msgstr "罗马"
+msgstr "MacRoman"

 
 

-#: ../src/common/fmapbase.cpp:232
-#, fuzzy
+#: ../src/common/fmapbase.cpp:236

 msgid "MacRomanian"
 msgid "MacRomanian"

-msgstr "罗马"
+msgstr "MacRomanian"

 
 

-#: ../src/common/fmapbase.cpp:213
-#, fuzzy
+#: ../src/common/fmapbase.cpp:217

 msgid "MacSinhalese"
 msgid "MacSinhalese"

-msgstr "区分大小写"
+msgstr "MacSinhalese"

 
 

-#: ../src/common/fmapbase.cpp:227
-#, fuzzy
+#: ../src/common/fmapbase.cpp:231

 msgid "MacSymbol"
 msgid "MacSymbol"

-msgstr "字体(&S):"
+msgstr "MacSymbol"

 
 

-#: ../src/common/fmapbase.cpp:209
+#: ../src/common/fmapbase.cpp:213

 msgid "MacTamil"
 msgid "MacTamil"

-msgstr ""
+msgstr "MacTamil"

 
 

-#: ../src/common/fmapbase.cpp:210
+#: ../src/common/fmapbase.cpp:214

 msgid "MacTelugu"
 msgid "MacTelugu"

-msgstr ""
+msgstr "MacTelugu"

 
 

-#: ../src/common/fmapbase.cpp:216
+#: ../src/common/fmapbase.cpp:220

 msgid "MacThai"
 msgid "MacThai"

-msgstr ""
+msgstr "MacThai"

 
 

-#: ../src/common/fmapbase.cpp:221
+#: ../src/common/fmapbase.cpp:225

 msgid "MacTibetan"
 msgid "MacTibetan"

-msgstr ""
+msgstr "MacTibetan"

 
 

-#: ../src/common/fmapbase.cpp:229
+#: ../src/common/fmapbase.cpp:233

 msgid "MacTurkish"
 msgid "MacTurkish"

-msgstr ""
+msgstr "MacTurkish"

 
 

-#: ../src/common/fmapbase.cpp:225
+#: ../src/common/fmapbase.cpp:229

 msgid "MacVietnamese"
 msgid "MacVietnamese"

-msgstr ""
+msgstr "MacVietnamese"

 
 #: ../src/propgrid/advprops.cpp:2025
 #, fuzzy
 msgid "Make a selection:"
 msgstr "选段"
 
 
 #: ../src/propgrid/advprops.cpp:2025
 #, fuzzy
 msgid "Make a selection:"
 msgstr "选段"
 

-#: ../src/richtext/richtextformatdlg.cpp:359
+#: ../src/richtext/richtextformatdlg.cpp:361

 #: ../src/richtext/richtextmarginspage.cpp:172
 msgid "Margins"
 #: ../src/richtext/richtextmarginspage.cpp:172
 msgid "Margins"

-msgstr ""
+msgstr "边距"

 
 #: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
 msgstr "区分大小写"
 
 
 #: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
 msgstr "区分大小写"
 

+#: ../src/richtext/richtextsizepage.cpp:425
+msgid "Max height:"
+msgstr "最达高度:"
+
+#: ../src/richtext/richtextsizepage.cpp:398
+msgid "Max width:"
+msgstr "最大宽度:"
+
+#: ../src/unix/mediactrl.cpp:1007
+#, c-format
+msgid "Media playback error: %s"
+msgstr ""
+

 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"

-msgstr "内存 VFS 已包含文件 '%s'!"
+msgstr "内存 VFS 已包含文件 '%s'！"

 
 

-#: ../src/msw/frame.cpp:353
+#: ../src/msw/frame.cpp:354

 msgid "Menu"
 msgstr "菜单"
 
 msgid "Menu"
 msgstr "菜单"
 


@@ -4812,23 +4756,26 @@ msgstr "消息"
 msgid "Metal theme"
 msgstr "金属主题"
 
 msgid "Metal theme"
 msgstr "金属主题"
 

-#: ../src/msw/ole/automtn.cpp:623
+#: ../src/msw/ole/automtn.cpp:636

 msgid "Method or property not found."
 msgstr ""
 
 msgid "Method or property not found."
 msgstr ""
 

-#: ../src/univ/themes/win32.cpp:3774
+#: ../src/univ/themes/win32.cpp:3753

 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 

-#: ../src/msw/ole/automtn.cpp:639
+#: ../src/richtext/richtextsizepage.cpp:371
+msgid "Min height:"
+msgstr "最小高度:"
+
+#: ../src/richtext/richtextsizepage.cpp:344
+msgid "Min width:"
+msgstr "最小宽度: "
+
+#: ../src/msw/ole/automtn.cpp:652

 msgid "Missing a required parameter."
 msgstr ""
 
 msgid "Missing a required parameter."
 msgstr ""
 

-#: ../src/mgl/app.cpp:114
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr "显示模式 %ix%i-%i位色 不支持。"
-

 #: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr "现代"
 #: ../src/generic/fontdlgg.cpp:325
 msgid "Modern"
 msgstr "现代"


@@ -4858,23 +4805,23 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

-#: ../src/richtext/richtextsizepage.cpp:351
-#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:616
+#: ../src/richtext/richtextsizepage.cpp:618

 msgid "Moves the object to the next paragraph."
 msgstr ""
 
 msgid "Moves the object to the next paragraph."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:345
-#: ../src/richtext/richtextsizepage.cpp:347
+#: ../src/richtext/richtextsizepage.cpp:610
+#: ../src/richtext/richtextsizepage.cpp:612

 msgid "Moves the object to the previous paragraph."
 msgstr ""
 
 msgid "Moves the object to the previous paragraph."
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:8063
+#: ../src/richtext/richtextbuffer.cpp:8841

 msgid "Multiple Cell Properties"
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:82
 msgid "NUM_LOCK"
 msgid "Multiple Cell Properties"
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:82
 msgid "NUM_LOCK"

-msgstr ""
+msgstr "NUM_LOCK"

 
 #: ../src/generic/filectrlg.cpp:453
 msgid "Name"
 
 #: ../src/generic/filectrlg.cpp:453
 msgid "Name"


@@ -4888,26 +4835,33 @@ msgstr "网络"
 msgid "New"
 msgstr "新建"
 
 msgid "New"
 msgstr "新建"
 

-#: ../src/richtext/richtextstyledlg.cpp:220
+#: ../src/richtext/richtextstyledlg.cpp:251
+#, fuzzy
+msgid "New &Box Style..."
+msgstr "新增样式"
+
+#: ../src/richtext/richtextstyledlg.cpp:233

 msgid "New &Character Style..."
 msgstr ""
 
 msgid "New &Character Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:232
+#: ../src/richtext/richtextstyledlg.cpp:245

 msgid "New &List Style..."
 msgstr ""
 
 msgid "New &List Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:226
+#: ../src/richtext/richtextstyledlg.cpp:239

 msgid "New &Paragraph Style..."
 msgstr ""
 
 msgid "New &Paragraph Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:577
-#: ../src/richtext/richtextstyledlg.cpp:582
-#: ../src/richtext/richtextstyledlg.cpp:625
-#: ../src/richtext/richtextstyledlg.cpp:630
-#: ../src/richtext/richtextstyledlg.cpp:780
-#: ../src/richtext/richtextstyledlg.cpp:785
-#: ../src/richtext/richtextstyledlg.cpp:853
-#: ../src/richtext/richtextstyledlg.cpp:861
+#: ../src/richtext/richtextstyledlg.cpp:611
+#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:659
+#: ../src/richtext/richtextstyledlg.cpp:664
+#: ../src/richtext/richtextstyledlg.cpp:825
+#: ../src/richtext/richtextstyledlg.cpp:830
+#: ../src/richtext/richtextstyledlg.cpp:898
+#: ../src/richtext/richtextstyledlg.cpp:906
+#: ../src/richtext/richtextstyledlg.cpp:939
+#: ../src/richtext/richtextstyledlg.cpp:944

 msgid "New Style"
 msgstr "新增样式"
 
 msgid "New Style"
 msgstr "新增样式"
 


@@ -4919,10 +4873,8 @@ msgstr "新目录"
 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:327 ../src/generic/dirdlgg.cpp:337
+#: ../src/generic/filectrlg.cpp:647 ../src/generic/filectrlg.cpp:656

 msgid "NewName"
 msgstr "新名称"
 
 msgid "NewName"
 msgstr "新名称"
 


@@ -4930,13 +4882,11 @@ msgstr "新名称"
 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: ../src/common/prntbase.cpp:1512
-#: ../src/html/helpwnd.cpp:676
+#: ../src/common/prntbase.cpp:1538 ../src/html/helpwnd.cpp:679

 msgid "Next page"
 msgstr "下一页"
 
 msgid "Next page"
 msgstr "下一页"
 

-#: ../src/common/stockitem.cpp:178
-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194

 msgid "No"
 msgstr "否"
 
 msgid "No"
 msgstr "否"
 


@@ -4945,25 +4895,24 @@ msgstr "否"
 msgid "No animation handler for type %ld defined."
 msgstr "没有类型 %d 的图像处理器."
 
 msgid "No animation handler for type %ld defined."
 msgstr "没有类型 %d 的图像处理器."
 

-#: ../src/dfb/bitmap.cpp:643
-#: ../src/dfb/bitmap.cpp:677
+#: ../src/dfb/bitmap.cpp:643 ../src/dfb/bitmap.cpp:677

 #, fuzzy, c-format
 msgid "No bitmap handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器."
 
 #, fuzzy, c-format
 msgid "No bitmap handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器."
 

-#: ../src/osx/carbon/dataview.cpp:1779
+#: ../src/osx/carbon/dataview.cpp:1785

 msgid "No column existing."
 msgstr ""
 
 msgid "No column existing."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1669
+#: ../src/osx/carbon/dataview.cpp:1675

 msgid "No column for the specified column existing."
 msgstr ""
 
 msgid "No column for the specified column existing."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1418
+#: ../src/osx/carbon/dataview.cpp:1424

 msgid "No column for the specified column position existing."
 msgstr ""
 
 msgid "No column for the specified column position existing."
 msgstr ""
 

-#: ../src/common/utilscmn.cpp:1045
+#: ../src/common/utilscmn.cpp:1051

 msgid "No default application configured for HTML files."
 msgstr ""
 
 msgid "No default application configured for HTML files."
 msgstr ""
 


@@ -4971,18 +4920,19 @@ msgstr ""
 msgid "No entries found."
 msgstr "没找到条目。"
 
 msgid "No entries found."
 msgstr "没找到条目。"
 

-#: ../src/common/fontmap.cpp:420
+#: ../src/common/fontmap.cpp:422

 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"

-"Do you want to use this encoding (otherwise you will have to choose another one)?"
+"Do you want to use this encoding (otherwise you will have to choose another "
+"one)?"

 msgstr ""
 "编码 '%s' 的字体未找到，无法显示文本。\n"
 "但发现另一替代编码 '%s'。\n"
 "是否使用该编码 (否则您必须选择另外的编码)?"
 
 msgstr ""
 "编码 '%s' 的字体未找到，无法显示文本。\n"
 "但发现另一替代编码 '%s'。\n"
 "是否使用该编码 (否则您必须选择另外的编码)?"
 

-#: ../src/common/fontmap.cpp:425
+#: ../src/common/fontmap.cpp:427

 #, 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"


@@ -4998,33 +4948,30 @@ msgstr ""
 msgid "No handler found for animation type."
 msgstr "没有找到图像类型处理器."
 
 msgid "No handler found for animation type."
 msgstr "没有找到图像类型处理器."
 

-#: ../src/common/image.cpp:2391
+#: ../src/common/image.cpp:2484

 msgid "No handler found for image type."
 msgstr "没有找到图像类型处理器。"
 
 msgid "No handler found for image type."
 msgstr "没有找到图像类型处理器。"
 

-#: ../src/common/image.cpp:2399
-#: ../src/common/image.cpp:2500
-#: ../src/common/image.cpp:2553
+#: ../src/common/image.cpp:2492 ../src/common/image.cpp:2603
+#: ../src/common/image.cpp:2656

 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器。"
 
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "没有类型 %d 的图像处理器。"
 

-#: ../src/common/image.cpp:2523
-#: ../src/common/image.cpp:2567
+#: ../src/common/image.cpp:2626 ../src/common/image.cpp:2670

 #, 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:871
+#: ../src/html/helpwnd.cpp:872

 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 

-#: ../src/osx/carbon/dataview.cpp:1671
-#: ../src/osx/carbon/dataview.cpp:1781
+#: ../src/osx/carbon/dataview.cpp:1677 ../src/osx/carbon/dataview.cpp:1787

 msgid "No renderer or invalid renderer type specified for custom data column."
 msgstr ""
 
 msgid "No renderer or invalid renderer type specified for custom data column."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1419
+#: ../src/osx/carbon/dataview.cpp:1425

 msgid "No renderer specified for column."
 msgstr ""
 
 msgid "No renderer specified for column."
 msgstr ""
 


@@ -5032,12 +4979,11 @@ msgstr ""
 msgid "No sound"
 msgstr "没有声音"
 
 msgid "No sound"
 msgstr "没有声音"
 

-#: ../src/common/image.cpp:2061
-#: ../src/common/image.cpp:2102
+#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103

 msgid "No unused colour in image being masked."
 msgstr "图像中没有被掩码的未用颜色。"
 
 msgid "No unused colour in image being masked."
 msgstr "图像中没有被掩码的未用颜色。"
 

-#: ../src/common/image.cpp:3029
+#: ../src/common/image.cpp:3133

 msgid "No unused colour in image."
 msgstr "图像中没有未用的颜色。"
 
 msgid "No unused colour in image."
 msgstr "图像中没有未用的颜色。"
 


@@ -5047,27 +4993,25 @@ msgid "No valid mappings found in the file \"%s\"."
 msgstr ""
 
 #: ../src/richtext/richtextborderspage.cpp:542
 msgstr ""
 
 #: ../src/richtext/richtextborderspage.cpp:542

-#: ../src/richtext/richtextsizepage.cpp:172
-#: ../src/richtext/richtextsizepage.cpp:175
-#: ../src/richtext/richtextsizepage.cpp:176
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:226
+#: ../src/richtext/richtextsizepage.cpp:229
+#: ../src/richtext/richtextsizepage.cpp:230

 msgid "None"
 msgid "None"

-msgstr "完成"
+msgstr "无"

 
 

-#: ../src/common/fmapbase.cpp:156
+#: ../src/common/fmapbase.cpp:158

 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:329 ../src/generic/fontdlgg.cpp:332

 msgid "Normal"
 msgstr "正常"
 
 msgid "Normal"
 msgstr "正常"
 

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

 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:1213
+#: ../src/html/helpwnd.cpp:1219

 msgid "Normal font:"
 msgstr "正常字体:"
 
 msgid "Normal font:"
 msgstr "正常字体:"
 


@@ -5076,13 +5020,12 @@ msgstr "正常字体:"
 msgid "Not %s"
 msgstr "关于(&A)"
 
 msgid "Not %s"
 msgstr "关于(&A)"
 

-#: ../include/wx/filename.h:552
-#: ../include/wx/filename.h:557
+#: ../include/wx/filename.h:558 ../include/wx/filename.h:563

 #, fuzzy
 msgid "Not available"
 msgstr "没有可用的XBM工具!"
 
 #, fuzzy
 msgid "Not available"
 msgstr "没有可用的XBM工具!"
 

-#: ../src/richtext/richtextfontpage.cpp:300
+#: ../src/richtext/richtextfontpage.cpp:331

 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"
 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"


@@ -5104,16 +5047,13 @@ msgstr "无法确定列数量。"
 msgid "Numbered outline"
 msgstr ""
 
 msgid "Numbered outline"
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:286
-#: ../src/common/stockitem.cpp:179
-#: ../src/msw/msgdlg.cpp:483
-#: ../src/msw/msgdlg.cpp:763
-#: ../src/msw/dialog.cpp:120
-#: ../src/gtk1/fontdlg.cpp:139
+#: ../src/richtext/richtextstyledlg.cpp:305 ../src/common/stockitem.cpp:179
+#: ../src/msw/msgdlg.cpp:489 ../src/msw/msgdlg.cpp:777
+#: ../src/msw/dialog.cpp:120 ../src/gtk1/fontdlg.cpp:139

 msgid "OK"
 msgstr "确认"
 
 msgid "OK"
 msgstr "确认"
 

-#: ../src/msw/ole/automtn.cpp:663
+#: ../src/msw/ole/automtn.cpp:676

 #, c-format
 msgid "OLE Automation error in %s: %s"
 msgstr ""
 #, c-format
 msgid "OLE Automation error in %s: %s"
 msgstr ""


@@ -5123,7 +5063,7 @@ msgstr ""
 msgid "Object Properties"
 msgstr "属性(&P)"
 
 msgid "Object Properties"
 msgstr "属性(&P)"
 

-#: ../src/msw/ole/automtn.cpp:631
+#: ../src/msw/ole/automtn.cpp:644

 msgid "Object implementation does not support named arguments."
 msgstr ""
 
 msgid "Object implementation does not support named arguments."
 msgstr ""
 


@@ -5131,13 +5071,11 @@ msgstr ""
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 

-#: ../src/common/docview.cpp:1733
-#: ../src/common/docview.cpp:1775
+#: ../src/common/docview.cpp:1746 ../src/common/docview.cpp:1788

 msgid "Open File"
 msgstr "打开文件"
 
 msgid "Open File"
 msgstr "打开文件"
 

-#: ../src/html/helpwnd.cpp:682
-#: ../src/html/helpwnd.cpp:1561
+#: ../src/html/helpwnd.cpp:685 ../src/html/helpwnd.cpp:1558

 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 


@@ -5155,10 +5093,8 @@ msgstr "打开..."
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr ""
 
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr ""
 

-#: ../src/generic/dirctrlg.cpp:691
-#: ../src/generic/dirdlgg.cpp:353
-#: ../src/generic/filectrlg.cpp:671
-#: ../src/generic/filectrlg.cpp:815
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:815

 msgid "Operation not permitted."
 msgstr "不允许的操作。"
 
 msgid "Operation not permitted."
 msgstr "不允许的操作。"
 


@@ -5177,13 +5113,11 @@ msgstr "选项 '%s' 需要值。"
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 无法转成日期。"
 
 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:188 ../src/generic/prntdlgg.cpp:624

 msgid "Options"
 msgstr "选项"
 
 msgid "Options"
 msgstr "选项"
 

-#: ../src/generic/prntdlgg.cpp:621
-#: ../src/generic/prntdlgg.cpp:875
+#: ../src/generic/prntdlgg.cpp:621 ../src/generic/prntdlgg.cpp:875

 msgid "Orientation"
 msgstr "方向"
 
 msgid "Orientation"
 msgstr "方向"
 


@@ -5200,24 +5134,23 @@ msgstr ""
 msgid "Outset"
 msgstr ""
 
 msgid "Outset"
 msgstr ""
 

-#: ../src/msw/ole/automtn.cpp:627
+#: ../src/msw/ole/automtn.cpp:640

 msgid "Overflow while coercing argument values."
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:85
 msgid "PAGEDOWN"
 msgid "Overflow while coercing argument values."
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:85
 msgid "PAGEDOWN"

-msgstr ""
+msgstr "PAGEDOWN"

 
 #: ../src/common/accelcmn.cpp:84
 msgid "PAGEUP"
 
 #: ../src/common/accelcmn.cpp:84
 msgid "PAGEUP"

-msgstr ""
+msgstr "PAGEUP"

 
 #: ../src/common/accelcmn.cpp:70
 msgid "PAUSE"
 
 #: ../src/common/accelcmn.cpp:70
 msgid "PAUSE"

-msgstr ""
+msgstr "PAUSE"

 
 

-#: ../src/common/imagpcx.cpp:458
-#: ../src/common/imagpcx.cpp:481
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481

 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 无法分配内存"
 
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 无法分配内存"
 


@@ -5233,10 +5166,9 @@ msgstr "PCX: 无效图像"
 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:460 ../src/common/imagpcx.cpp:482

 msgid "PCX: unknown error !!!"
 msgid "PCX: unknown error !!!"

-msgstr "PCX: 未知错误 !!!"
+msgstr "PCX: 未知错误！！！"

 
 #: ../src/common/imagpcx.cpp:459
 msgid "PCX: version number too low"
 
 #: ../src/common/imagpcx.cpp:459
 msgid "PCX: version number too low"


@@ -5244,11 +5176,11 @@ msgstr "PCX: 版本号太小"
 
 #: ../src/common/accelcmn.cpp:56
 msgid "PGDN"
 
 #: ../src/common/accelcmn.cpp:56
 msgid "PGDN"

-msgstr ""
+msgstr "PGDN"

 
 #: ../src/common/accelcmn.cpp:55
 msgid "PGUP"
 
 #: ../src/common/accelcmn.cpp:55
 msgid "PGUP"

-msgstr ""
+msgstr "PGUP"

 
 #: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
 
 #: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."


@@ -5258,8 +5190,7 @@ msgstr "PNM: 无法分配内存。"
 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:113 ../src/common/imagpnm.cpp:135

 #: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断。"
 #: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."
 msgstr "PNM: 文件似乎已被截断。"


@@ -5370,30 +5301,29 @@ msgstr "中国标准信封9#(横向), 324 x 229 毫米"
 
 #: ../src/common/accelcmn.cpp:73
 msgid "PRINT"
 
 #: ../src/common/accelcmn.cpp:73
 msgid "PRINT"

-msgstr ""
+msgstr "PRINT"

 
 #: ../src/richtext/richtextmarginspage.cpp:286
 #, fuzzy
 msgid "Padding"
 msgstr "正在读入"
 
 
 #: ../src/richtext/richtextmarginspage.cpp:286
 #, fuzzy
 msgid "Padding"
 msgstr "正在读入"
 

-#: ../src/common/prntbase.cpp:2012
+#: ../src/common/prntbase.cpp:2045

 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 

-#: ../src/common/prntbase.cpp:2010
+#: ../src/common/prntbase.cpp:2043

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

-#: ../src/generic/prntdlgg.cpp:834
-#: ../src/gtk/print.cpp:771
+#: ../src/gtk/print.cpp:779

 msgid "Page Setup"
 msgstr "页面设置"
 
 msgid "Page Setup"
 msgstr "页面设置"
 

-#: ../src/common/prntbase.cpp:480
-#: ../src/gtk/gnome/gprint.cpp:706
+#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:468
+#: ../src/gtk/gnome/gprint.cpp:708

 msgid "Page setup"
 msgstr "页面设置"
 
 msgid "Page setup"
 msgstr "页面设置"
 


@@ -5401,19 +5331,13 @@ msgstr "页面设置"
 msgid "Pages"
 msgstr "页"
 
 msgid "Pages"
 msgstr "页"
 

-#: ../src/generic/prntdlgg.cpp:807
-#: ../src/generic/prntdlgg.cpp:861
-#: ../src/generic/prntdlgg.cpp:1063
-msgid "Paper Size"
-msgstr "纸张大小"
-
-#: ../src/generic/prntdlgg.cpp:608
-#: ../src/generic/prntdlgg.cpp:848
-#: ../src/generic/prntdlgg.cpp:1058
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:807
+#: ../src/generic/prntdlgg.cpp:848 ../src/generic/prntdlgg.cpp:861
+#: ../src/generic/prntdlgg.cpp:1058 ../src/generic/prntdlgg.cpp:1063

 msgid "Paper size"
 msgstr "纸张大小"
 
 msgid "Paper size"
 msgstr "纸张大小"
 

-#: ../src/richtext/richtextstyles.cpp:1033
+#: ../src/richtext/richtextstyles.cpp:1042

 msgid "Paragraph styles"
 msgstr ""
 
 msgid "Paragraph styles"
 msgstr ""
 


@@ -5422,11 +5346,11 @@ msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
 #: ../src/common/xtistrm.cpp:481
 msgstr "传递一个已注册的对象给SetObject"
 
 #: ../src/common/xtistrm.cpp:481

-msgid "Passing an unkown object to GetObject"
+#, fuzzy
+msgid "Passing an unknown object to GetObject"

 msgstr "传递一个未知对象给GetObject"
 
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/richtext/richtextctrl.cpp:2772
-#: ../src/common/stockitem.cpp:181
+#: ../src/richtext/richtextctrl.cpp:3082 ../src/common/stockitem.cpp:181

 #: ../src/stc/stc_i18n.cpp:20
 msgid "Paste"
 msgstr "粘贴"
 #: ../src/stc/stc_i18n.cpp:20
 msgid "Paste"
 msgstr "粘贴"


@@ -5444,10 +5368,9 @@ msgstr ""
 msgid "Permissions"
 msgstr "允许"
 
 msgid "Permissions"
 msgstr "允许"
 

-#: ../src/richtext/richtextbuffer.cpp:10031
-#, fuzzy
+#: ../src/richtext/richtextbuffer.cpp:10953

 msgid "Picture Properties"
 msgid "Picture Properties"

-msgstr "å±\9eæ\80§(&P)"
+msgstr "å\9b¾ç\89\87å±\9eæ\80§"

 
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
 
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"


@@ -5457,7 +5380,7 @@ msgstr "管道创建失败"
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 
 msgid "Please choose a valid font."
 msgstr "请选择一个有效的字体."
 

-#: ../src/gtk/filedlg.cpp:68
+#: ../src/gtk/filedlg.cpp:72

 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 
 msgid "Please choose an existing file."
 msgstr "请选择一个已存在的文件."
 


@@ -5469,7 +5392,7 @@ msgstr "请选择欲显示的页面:"
 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:372
+#: ../src/msw/listctrl.cpp:373

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"


@@ -5480,12 +5403,13 @@ msgstr ""
 "(至少需要4.70版，您现有的版本是 %d.%02d)，\n"
 "否则此程序无法正确运行。"
 
 "(至少需要4.70版，您现有的版本是 %d.%02d)，\n"
 "否则此程序无法正确运行。"
 

-#: ../src/common/headerctrlcmn.cpp:59
+#: ../src/common/headerctrlcmn.cpp:60

 msgid "Please select the columns to show and define their order:"
 msgstr ""
 
 msgid "Please select the columns to show and define their order:"
 msgstr ""
 

-#: ../src/common/prntbase.cpp:329
-msgid "Please wait while printing\n"
+#: ../src/common/prntbase.cpp:522
+#, fuzzy
+msgid "Please wait while printing..."

 msgstr "在打印时请等待\n"
 
 #: ../src/propgrid/advprops.cpp:632
 msgstr "在打印时请等待\n"
 
 #: ../src/propgrid/advprops.cpp:632


@@ -5493,41 +5417,30 @@ msgstr "在打印时请等待\n"
 msgid "Point Size"
 msgstr "字体大小(Point size)(&P):"
 
 msgid "Point Size"
 msgstr "字体大小(Point size)(&P):"
 

-#: ../src/osx/carbon/dataview.cpp:1273
-#: ../src/osx/carbon/dataview.cpp:1324
-#: ../src/osx/carbon/dataview.cpp:1415
-#: ../src/osx/carbon/dataview.cpp:1438
-#: ../src/osx/carbon/dataview.cpp:1455
-#: ../src/osx/carbon/dataview.cpp:1472
-#: ../src/osx/carbon/dataview.cpp:1665
-#: ../src/osx/carbon/dataview.cpp:1774
-#: ../src/osx/carbon/dataview.cpp:1816
-#: ../src/osx/carbon/dataview.cpp:1869
-#: ../src/osx/carbon/dataview.cpp:1992
+#: ../src/osx/carbon/dataview.cpp:1279 ../src/osx/carbon/dataview.cpp:1330
+#: ../src/osx/carbon/dataview.cpp:1421 ../src/osx/carbon/dataview.cpp:1444
+#: ../src/osx/carbon/dataview.cpp:1461 ../src/osx/carbon/dataview.cpp:1478
+#: ../src/osx/carbon/dataview.cpp:1671 ../src/osx/carbon/dataview.cpp:1780
+#: ../src/osx/carbon/dataview.cpp:1822 ../src/osx/carbon/dataview.cpp:1875
+#: ../src/osx/carbon/dataview.cpp:1998

 msgid "Pointer to data view control not set correctly."
 msgstr ""
 
 msgid "Pointer to data view control not set correctly."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1274
-#: ../src/osx/carbon/dataview.cpp:1333
-#: ../src/osx/carbon/dataview.cpp:1416
-#: ../src/osx/carbon/dataview.cpp:1473
-#: ../src/osx/carbon/dataview.cpp:1666
-#: ../src/osx/carbon/dataview.cpp:1775
-#: ../src/osx/carbon/dataview.cpp:1817
-#: ../src/osx/carbon/dataview.cpp:1870
-#: ../src/osx/carbon/dataview.cpp:1993
+#: ../src/osx/carbon/dataview.cpp:1280 ../src/osx/carbon/dataview.cpp:1339
+#: ../src/osx/carbon/dataview.cpp:1422 ../src/osx/carbon/dataview.cpp:1479
+#: ../src/osx/carbon/dataview.cpp:1672 ../src/osx/carbon/dataview.cpp:1781
+#: ../src/osx/carbon/dataview.cpp:1823 ../src/osx/carbon/dataview.cpp:1876
+#: ../src/osx/carbon/dataview.cpp:1999

 msgid "Pointer to model not set correctly."
 msgstr ""
 
 msgid "Pointer to model not set correctly."
 msgstr ""
 

-#: ../src/generic/prntdlgg.cpp:618
-#: ../src/generic/prntdlgg.cpp:873
+#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873

 msgid "Portrait"
 msgstr "纵向"
 
 msgid "Portrait"
 msgstr "纵向"
 

-#: ../src/richtext/richtextsizepage.cpp:296
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:458

 msgid "Position"
 msgid "Position"

-msgstr "正在打印 "
+msgstr "位置"

 
 #: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"
 
 #: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"


@@ -5537,44 +5450,36 @@ msgstr "PostScript文件"
 msgid "Preferences"
 msgstr "偏好设置"
 
 msgid "Preferences"
 msgstr "偏好设置"
 

-#: ../src/osx/menu_osx.cpp:530
+#: ../src/osx/menu_osx.cpp:550

 msgid "Preferences..."
 msgstr "偏好设置..."
 
 msgid "Preferences..."
 msgstr "偏好设置..."
 

-#: ../src/common/stockitem.cpp:183
-msgid "Preview..."
-msgstr "预览..."
+#: ../src/common/prntbase.cpp:530
+msgid "Preparing"
+msgstr ""

 
 

-#: ../src/generic/fontdlgg.cpp:456
-#: ../src/osx/carbon/fontdlg.cpp:564
-#: ../src/html/helpwnd.cpp:1230
+#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
+#: ../src/html/helpwnd.cpp:1236

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

-#: ../src/common/prntbase.cpp:1498
-#: ../src/html/helpwnd.cpp:675
+#: ../src/common/prntbase.cpp:1524 ../src/html/helpwnd.cpp:678

 msgid "Previous page"
 msgstr "前页"
 
 msgid "Previous page"
 msgstr "前页"
 

-#: ../src/generic/prntdlgg.cpp:149
-#: ../src/generic/prntdlgg.cpp:163
-#: ../src/common/prntbase.cpp:422
-#: ../src/common/prntbase.cpp:1486
-#: ../src/gtk/print.cpp:590
-#: ../src/gtk/print.cpp:603
-#: ../src/gtk/gnome/gprint.cpp:537
-#: ../src/gtk/gnome/gprint.cpp:549
+#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:410 ../src/common/prntbase.cpp:1512
+#: ../src/gtk/print.cpp:593 ../src/gtk/print.cpp:606
+#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: ../include/wx/prntbase.h:394
-#: ../src/common/docview.cpp:1241
+#: ../include/wx/prntbase.h:396 ../src/common/docview.cpp:1247

 msgid "Print Preview"
 msgstr "打印预览"
 
 msgid "Print Preview"
 msgstr "打印预览"
 

-#: ../src/common/prntbase.cpp:1953
-#: ../src/common/prntbase.cpp:1995
-#: ../src/common/prntbase.cpp:2003
+#: ../src/common/prntbase.cpp:1986 ../src/common/prntbase.cpp:2028
+#: ../src/common/prntbase.cpp:2036

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 


@@ -5590,20 +5495,30 @@ msgstr "打印设置"
 msgid "Print in colour"
 msgstr "彩色打印"
 
 msgid "Print in colour"
 msgstr "彩色打印"
 

-#: ../src/gtk/gnome/gprint.cpp:938
+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "Print previe&w..."
+msgstr "打印预览(&w)"
+
+#: ../src/gtk/gnome/gprint.cpp:940

 msgid "Print preview"
 msgstr "打印预览"
 
 msgid "Print preview"
 msgstr "打印预览"
 

-#: ../src/common/docview.cpp:1235
+#: ../src/common/docview.cpp:1241

 #, fuzzy
 msgid "Print preview creation failed."
 msgstr "管道创建失败"
 
 #, fuzzy
 msgid "Print preview creation failed."
 msgstr "管道创建失败"
 

+#: ../src/common/stockitem.cpp:183
+#, fuzzy
+msgid "Print preview..."
+msgstr "打印预览"
+

 #: ../src/generic/prntdlgg.cpp:636
 msgid "Print spooling"
 msgstr "打印假脱机"
 
 #: ../src/generic/prntdlgg.cpp:636
 msgid "Print spooling"
 msgstr "打印假脱机"
 

-#: ../src/html/helpwnd.cpp:686
+#: ../src/html/helpwnd.cpp:689

 msgid "Print this page"
 msgstr "打印本页"
 
 msgid "Print this page"
 msgstr "打印本页"
 


@@ -5639,20 +5554,24 @@ msgstr "打印机..."
 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../include/wx/richtext/richtextprint.h:164
+#: ../include/wx/richtext/richtextprint.h:164 ../src/common/prntbase.cpp:519

 #: ../src/html/htmprint.cpp:278
 msgid "Printing"
 msgstr "正在打印 "
 
 #: ../src/html/htmprint.cpp:278
 msgid "Printing"
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:326
-#: ../src/common/prntbase.cpp:561
+#: ../src/common/prntbase.cpp:587

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:343
+#: ../src/common/prntbase.cpp:331

 msgid "Printing Error"
 msgstr "打印出错"
 
 msgid "Printing Error"
 msgstr "打印出错"
 

+#: ../src/common/prntbase.cpp:545
+#, fuzzy, c-format
+msgid "Printing page %d of %d"
+msgstr "正在打印页 %d..."
+

 #: ../src/generic/printps.cpp:202
 #, c-format
 msgid "Printing page %d..."
 #: ../src/generic/printps.cpp:202
 #, c-format
 msgid "Printing page %d..."


@@ -5662,21 +5581,25 @@ msgstr "正在打印页 %d..."
 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../include/wx/richtext/richtextprint.h:110
-#: ../include/wx/prntbase.h:262
-#: ../src/common/docview.cpp:2044
+#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:264
+#: ../src/common/docview.cpp:2057

 msgid "Printout"
 msgstr "打印"
 
 #: ../src/common/debugrpt.cpp:556
 #, c-format
 msgid "Printout"
 msgstr "打印"
 
 #: ../src/common/debugrpt.cpp:556
 #, c-format

-msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgid ""
+"Processing debug report has failed, leaving the files in \"%s\" directory."

 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
 msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 

-#: ../src/osx/carbon/dataview.cpp:2467
+#: ../src/osx/carbon/dataview.cpp:2473

 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
+msgid "Progress:"
+msgstr ""
+

 #: ../src/common/stockitem.cpp:185
 msgid "Properties"
 msgstr "属性"
 #: ../src/common/stockitem.cpp:185
 msgid "Properties"
 msgstr "属性"


@@ -5685,8 +5608,7 @@ msgstr "属性"
 msgid "Property"
 msgstr "属性"
 
 msgid "Property"
 msgstr "属性"
 

-#: ../src/propgrid/propgrid.cpp:3168
-#: ../src/propgrid/propgrid.cpp:3300
+#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277

 msgid "Property Error"
 msgstr "属性错误"
 
 msgid "Property Error"
 msgstr "属性错误"
 


@@ -5694,29 +5616,37 @@ msgstr "属性错误"
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

-#: ../src/generic/logg.cpp:1042
+#: ../src/generic/logg.cpp:1040

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

-#: ../src/osx/menu_osx.cpp:545

 #: ../src/common/stockitem.cpp:157
 msgid "Quit"
 msgstr "退出"
 
 #: ../src/common/stockitem.cpp:157
 msgid "Quit"
 msgstr "退出"
 

+#: ../src/osx/menu_osx.cpp:564
+#, c-format
+msgid "Quit %s"
+msgstr "退出 %s"
+

 #: ../src/common/stockitem.cpp:264
 msgid "Quit this program"
 msgstr "推出此程序"
 
 #: ../src/common/accelcmn.cpp:54
 msgid "RETURN"
 #: ../src/common/stockitem.cpp:264
 msgid "Quit this program"
 msgstr "推出此程序"
 
 #: ../src/common/accelcmn.cpp:54
 msgid "RETURN"

-msgstr ""
+msgstr "RETURN"

 
 #: ../src/common/accelcmn.cpp:58
 msgid "RIGHT"
 
 #: ../src/common/accelcmn.cpp:58
 msgid "RIGHT"

-msgstr ""
+msgstr "RIGHT"
+
+#: ../src/common/accelcmn.cpp:328
+#, fuzzy
+msgid "RawCtrl+"
+msgstr "Ctrl+"

 
 

-#: ../src/common/ffile.cpp:114
-#: ../src/common/ffile.cpp:133
+#: ../src/common/ffile.cpp:114 ../src/common/ffile.cpp:133

 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"


@@ -5725,8 +5655,7 @@ msgstr "读文件 '%s'出错"
 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../src/common/stockitem.cpp:186
-#: ../src/stc/stc_i18n.cpp:17
+#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17

 msgid "Redo"
 msgstr "恢复"
 
 msgid "Redo"
 msgstr "恢复"
 


@@ -5764,11 +5693,16 @@ msgstr ""
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 

-#: ../src/richtext/richtextfontpage.cpp:292
-#: ../src/richtext/richtextfontpage.cpp:296
+#: ../src/richtext/richtextfontpage.cpp:323
+#: ../src/richtext/richtextfontpage.cpp:327

 msgid "Regular"
 msgstr ""
 
 msgid "Regular"
 msgstr ""
 

+#: ../src/richtext/richtextsizepage.cpp:481
+#, fuzzy
+msgid "Relative"
+msgstr "修饰"
+

 #: ../src/generic/helpext.cpp:463
 msgid "Relevant entries:"
 msgstr "相关条目:"
 #: ../src/generic/helpext.cpp:463
 msgid "Relevant entries:"
 msgstr "相关条目:"


@@ -5777,7 +5711,12 @@ msgstr "相关条目:"
 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 

-#: ../src/html/helpwnd.cpp:438
+#: ../src/richtext/richtextctrl.cpp:1420
+#, fuzzy
+msgid "Remove Bullet"
+msgstr "移除"
+
+#: ../src/html/helpwnd.cpp:441

 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 
 msgid "Remove current page from bookmarks"
 msgstr "从书签中移去当前页"
 


@@ -5786,12 +5725,12 @@ msgstr "从书签中移去当前页"
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 

-#: ../src/osx/carbon/dataview.cpp:1425
+#: ../src/osx/carbon/dataview.cpp:1431

 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 
 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 

-#: ../src/richtext/richtextbuffer.cpp:3898
+#: ../src/richtext/richtextbuffer.cpp:4109

 msgid "Renumber List"
 msgstr ""
 
 msgid "Renumber List"
 msgstr ""
 


@@ -5799,11 +5738,9 @@ msgstr ""
 msgid "Rep&lace"
 msgstr "替换(&l)"
 
 msgid "Rep&lace"
 msgstr "替换(&l)"
 

-#: ../src/richtext/richtextctrl.cpp:2931
-#: ../src/common/stockitem.cpp:189
-#, fuzzy
+#: ../src/richtext/richtextctrl.cpp:3242 ../src/common/stockitem.cpp:189

 msgid "Replace"
 msgid "Replace"

-msgstr "替换(&R)"
+msgstr "替换"

 
 #: ../src/generic/fdrepdlg.cpp:183
 msgid "Replace &all"
 
 #: ../src/generic/fdrepdlg.cpp:183
 msgid "Replace &all"


@@ -5838,7 +5775,7 @@ msgstr "细"
 
 #: ../src/richtext/richtextliststylepage.cpp:252
 #: ../src/richtext/richtextbulletspage.cpp:202
 
 #: ../src/richtext/richtextliststylepage.cpp:252
 #: ../src/richtext/richtextbulletspage.cpp:202

-#: ../src/richtext/richtextsizepage.cpp:174
+#: ../src/richtext/richtextsizepage.cpp:228

 msgid "Right"
 msgstr "右"
 
 msgid "Right"
 msgstr "右"
 


@@ -5864,35 +5801,33 @@ msgstr ""
 
 #: ../src/common/accelcmn.cpp:83
 msgid "SCROLL_LOCK"
 
 #: ../src/common/accelcmn.cpp:83
 msgid "SCROLL_LOCK"

-msgstr ""
+msgstr "SCROLL_LOCK"

 
 #: ../src/common/accelcmn.cpp:72
 msgid "SELECT"
 
 #: ../src/common/accelcmn.cpp:72
 msgid "SELECT"

-msgstr ""
+msgstr "SELECT"

 
 #: ../src/common/accelcmn.cpp:78
 msgid "SEPARATOR"
 
 #: ../src/common/accelcmn.cpp:78
 msgid "SEPARATOR"

-msgstr ""
+msgstr "SEPARATOR"

 
 #: ../src/common/accelcmn.cpp:75
 msgid "SNAPSHOT"
 
 #: ../src/common/accelcmn.cpp:75
 msgid "SNAPSHOT"

-msgstr ""
+msgstr "SNAPSHOT"

 
 #: ../src/common/accelcmn.cpp:63
 msgid "SPACE"
 
 #: ../src/common/accelcmn.cpp:63
 msgid "SPACE"

-msgstr ""
+msgstr "SPACE"

 
 

-#: ../src/common/accelcmn.cpp:256
-#: ../src/common/accelcmn.cpp:322
+#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:340

 msgid "SPECIAL"
 msgid "SPECIAL"

-msgstr ""
+msgstr "SPECIAL"

 
 #: ../src/common/accelcmn.cpp:79
 msgid "SUBTRACT"
 
 #: ../src/common/accelcmn.cpp:79
 msgid "SUBTRACT"

-msgstr ""
+msgstr "SUBTRACT"

 
 

-#: ../src/common/stockitem.cpp:191
-#: ../src/common/sizer.cpp:2577
+#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2655

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 


@@ -5901,7 +5836,11 @@ msgstr "保存"
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 msgid "Save %s file"
 msgstr "保存文件 %s "
 

-#: ../src/common/docview.cpp:362
+#: ../src/generic/logg.cpp:516
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#: ../src/common/docview.cpp:363

 msgid "Save As"
 msgstr "另存为"
 
 msgid "Save As"
 msgstr "另存为"
 


@@ -5918,7 +5857,7 @@ msgstr "选择文档视图"
 msgid "Save current document with a different filename"
 msgstr ""
 
 msgid "Save current document with a different filename"
 msgstr ""
 

-#: ../src/generic/logg.cpp:524
+#: ../src/generic/logg.cpp:516

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 


@@ -5926,15 +5865,16 @@ msgstr "把日志内容保存到文件"
 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/generic/srchctlg.cpp:68
-#: ../src/html/helpwnd.cpp:546
-#: ../src/html/helpwnd.cpp:561
+#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:549
+#: ../src/html/helpwnd.cpp:564

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: ../src/html/helpwnd.cpp:548
+#: ../src/html/helpwnd.cpp:551

 #, fuzzy
 #, fuzzy

-msgid "Search contents of help book(s) for all occurrences of the text you typed above"
+msgid ""
+"Search contents of help book(s) for all occurrences of the text you typed "
+"above"

 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:161
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:161


@@ -5945,11 +5885,11 @@ msgstr "搜索方向"
 msgid "Search for:"
 msgstr "搜索:"
 
 msgid "Search for:"
 msgstr "搜索:"
 

-#: ../src/html/helpwnd.cpp:1060
+#: ../src/html/helpwnd.cpp:1066

 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 
 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 

-#: ../src/html/helpwnd.cpp:870
+#: ../src/html/helpwnd.cpp:871

 msgid "Searching..."
 msgstr "搜索中..."
 
 msgid "Searching..."
 msgstr "搜索中..."
 


@@ -5967,42 +5907,39 @@ msgstr "文件 '%s' 定位错误"
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"
 
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"
 

-#: ../src/richtext/richtextctrl.cpp:315
-#: ../src/osx/textctrl_osx.cpp:590
-#: ../src/common/stockitem.cpp:193
-#: ../src/msw/textctrl.cpp:2215
+#: ../src/richtext/richtextctrl.cpp:329 ../src/osx/textctrl_osx.cpp:588
+#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227

 msgid "Select &All"
 msgstr "全部选择(&A)"
 
 msgid "Select &All"
 msgstr "全部选择(&A)"
 

-#: ../src/common/stockitem.cpp:193
-#: ../src/stc/stc_i18n.cpp:22
+#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22

 msgid "Select All"
 msgstr "全部选择"
 
 msgid "Select All"
 msgstr "全部选择"
 

-#: ../src/common/docview.cpp:1855
+#: ../src/common/docview.cpp:1868

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1929
+#: ../src/common/docview.cpp:1942

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/richtext/richtextfontpage.cpp:202
-#: ../src/richtext/richtextfontpage.cpp:204
+#: ../src/richtext/richtextfontpage.cpp:233
+#: ../src/richtext/richtextfontpage.cpp:235

 msgid "Select regular or bold."
 msgstr ""
 
 msgid "Select regular or bold."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:189
-#: ../src/richtext/richtextfontpage.cpp:191
+#: ../src/richtext/richtextfontpage.cpp:220
+#: ../src/richtext/richtextfontpage.cpp:222

 msgid "Select regular or italic style."
 msgstr ""
 
 msgid "Select regular or italic style."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:215
-#: ../src/richtext/richtextfontpage.cpp:217
+#: ../src/richtext/richtextfontpage.cpp:246
+#: ../src/richtext/richtextfontpage.cpp:248

 msgid "Select underlining or no underlining."
 msgstr ""
 
 msgid "Select underlining or no underlining."
 msgstr ""
 

-#: ../src/motif/filedlg.cpp:219
+#: ../src/motif/filedlg.cpp:218

 msgid "Selection"
 msgstr "选区"
 
 msgid "Selection"
 msgstr "选区"
 


@@ -6016,16 +5953,16 @@ msgstr ""
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s' 后存在分隔符。"
 
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s' 后存在分隔符。"
 

-#: ../src/richtext/richtextbuffer.cpp:9014
+#: ../src/richtext/richtextbuffer.cpp:9797

 #, fuzzy
 msgid "Set Cell Style"
 msgstr "删除项"
 
 #, fuzzy
 msgid "Set Cell Style"
 msgstr "删除项"
 

-#: ../include/wx/xtiprop.h:178
+#: ../include/wx/xtiprop.h:180

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

-#: ../src/common/filename.cpp:2482
+#: ../src/common/filename.cpp:2524

 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 ""
 


@@ -6037,7 +5974,7 @@ msgstr "设置..."
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 

-#: ../src/common/accelcmn.cpp:313
+#: ../src/common/accelcmn.cpp:325

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


@@ -6046,25 +5983,24 @@ msgstr "Shift+"
 msgid "Show &hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show &hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/generic/filectrlg.cpp:993
+#: ../src/generic/filectrlg.cpp:997

 #, fuzzy
 msgid "Show &hidden files"
 msgstr "显示隐藏文件"
 
 #, fuzzy
 msgid "Show &hidden files"
 msgstr "显示隐藏文件"
 

-#: ../src/osx/menu_osx.cpp:541
-#, fuzzy
+#: ../src/osx/menu_osx.cpp:559

 msgid "Show All"
 msgid "Show All"

-msgstr "全部显示"
+msgstr "显示全部"

 
 #: ../src/common/stockitem.cpp:258
 msgid "Show about dialog"
 
 #: ../src/common/stockitem.cpp:258
 msgid "Show about dialog"

-msgstr ""
+msgstr "显示关于对话框"

 
 

-#: ../src/html/helpwnd.cpp:500
+#: ../src/html/helpwnd.cpp:503

 msgid "Show all"
 msgid "Show all"

-msgstr "全部显示"
+msgstr "显示全部"

 
 

-#: ../src/html/helpwnd.cpp:511
+#: ../src/html/helpwnd.cpp:514

 msgid "Show all items in index"
 msgstr "以索引方式显示所有项目"
 
 msgid "Show all items in index"
 msgstr "以索引方式显示所有项目"
 


@@ -6072,12 +6008,12 @@ msgstr "以索引方式显示所有项目"
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 
 msgid "Show hidden directories"
 msgstr "显示隐藏目录"
 

-#: ../src/html/helpwnd.cpp:669
+#: ../src/html/helpwnd.cpp:672

 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/richtext/richtextsymboldlg.cpp:418
-#: ../src/richtext/richtextsymboldlg.cpp:420
+#: ../src/richtext/richtextsymboldlg.cpp:422
+#: ../src/richtext/richtextsymboldlg.cpp:424

 msgid "Shows a Unicode subset."
 msgstr ""
 
 msgid "Shows a Unicode subset."
 msgstr ""
 


@@ -6088,13 +6024,12 @@ msgstr ""
 msgid "Shows a preview of the bullet settings."
 msgstr ""
 
 msgid "Shows a preview of the bullet settings."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:282
-#: ../src/richtext/richtextfontpage.cpp:284
+#: ../src/richtext/richtextfontpage.cpp:313
+#: ../src/richtext/richtextfontpage.cpp:315

 msgid "Shows a preview of the font settings."
 msgstr ""
 
 msgid "Shows a preview of the font settings."
 msgstr ""
 

-#: ../src/osx/carbon/fontdlg.cpp:568
-#: ../src/osx/carbon/fontdlg.cpp:570
+#: ../src/osx/carbon/fontdlg.cpp:578 ../src/osx/carbon/fontdlg.cpp:580

 msgid "Shows a preview of the font."
 msgstr ""
 
 msgid "Shows a preview of the font."
 msgstr ""
 


@@ -6103,8 +6038,7 @@ msgstr ""
 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:461 ../src/generic/fontdlgg.cpp:463

 msgid "Shows the font preview."
 msgstr "显示字体预览。"
 
 msgid "Shows the font preview."
 msgstr "显示字体预览。"
 


@@ -6117,19 +6051,17 @@ msgstr ""
 msgid "Single"
 msgstr ""
 
 msgid "Single"
 msgstr ""
 

-#: ../src/generic/filectrlg.cpp:454
-#: ../src/richtext/richtextformatdlg.cpp:353
-#: ../src/richtext/richtextsizepage.cpp:185
+#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:275

 msgid "Size"
 msgstr "大小"
 
 msgid "Size"
 msgstr "大小"
 

-#: ../src/osx/carbon/fontdlg.cpp:513
+#: ../src/osx/carbon/fontdlg.cpp:523

 msgid "Size:"
 msgstr "大小:"
 
 msgid "Size:"
 msgstr "大小:"
 

-#: ../src/generic/progdlgg.cpp:253
-#: ../src/generic/progdlgg.cpp:763
-#: ../src/msw/progdlg.cpp:800
+#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
+#: ../src/msw/progdlg.cpp:802

 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 


@@ -6142,23 +6074,23 @@ msgstr "倾斜"
 msgid "Solid"
 msgstr "粗体"
 
 msgid "Solid"
 msgstr "粗体"
 

-#: ../src/common/docview.cpp:1751
+#: ../src/common/docview.cpp:1764

 msgid "Sorry, could not open this file."
 msgstr "对不起，无法打开文件。"
 
 msgid "Sorry, could not open this file."
 msgstr "对不起，无法打开文件。"
 

-#: ../src/common/prntbase.cpp:1995
-#: ../src/common/prntbase.cpp:2003
+#: ../src/common/prntbase.cpp:2028 ../src/common/prntbase.cpp:2036

 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起，没有足够内存创建预览。"
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "对不起，没有足够内存创建预览。"
 

-#: ../src/richtext/richtextstyledlg.cpp:582
-#: ../src/richtext/richtextstyledlg.cpp:630
-#: ../src/richtext/richtextstyledlg.cpp:785
-#: ../src/richtext/richtextstyledlg.cpp:861
+#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:664
+#: ../src/richtext/richtextstyledlg.cpp:830
+#: ../src/richtext/richtextstyledlg.cpp:906
+#: ../src/richtext/richtextstyledlg.cpp:944

 msgid "Sorry, that name is taken. Please choose another."
 msgid "Sorry, that name is taken. Please choose another."

-msgstr ""
+msgstr "抱歉，名字已被使用。请选择其他名字。"

 
 

-#: ../src/common/docview.cpp:1774
+#: ../src/common/docview.cpp:1787

 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起，此文件的格式未知。"
 
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起，此文件的格式未知。"
 


@@ -6178,17 +6110,24 @@ msgstr "搜索中..."
 
 #: ../src/common/stockitem.cpp:198
 msgid "Spell Check"
 
 #: ../src/common/stockitem.cpp:198
 msgid "Spell Check"

-msgstr ""
+msgstr "拼写检查"

 
 #: ../src/richtext/richtextliststylepage.cpp:491
 #: ../src/richtext/richtextbulletspage.cpp:296
 msgid "Standard"
 
 #: ../src/richtext/richtextliststylepage.cpp:491
 #: ../src/richtext/richtextbulletspage.cpp:296
 msgid "Standard"

-msgstr ""
+msgstr "标准"

 
 #: ../src/common/paper.cpp:106
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸，5 1/2 x 8 1/2 英寸"
 
 
 #: ../src/common/paper.cpp:106
 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
+#, fuzzy
+msgid "Static"
+msgstr "状态:"
+

 #: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"
 #: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"


@@ -6199,15 +6138,14 @@ msgstr "停止"
 
 #: ../src/common/stockitem.cpp:200
 msgid "Strikethrough"
 
 #: ../src/common/stockitem.cpp:200
 msgid "Strikethrough"

-msgstr ""
+msgstr "删除线"

 
 #: ../src/common/colourcmn.cpp:46
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
 
 #: ../src/common/colourcmn.cpp:46
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../src/richtext/richtextformatdlg.cpp:315
-#: ../src/propgrid/advprops.cpp:648
+#: ../src/richtext/richtextformatdlg.cpp:317 ../src/propgrid/advprops.cpp:648

 msgid "Style"
 msgstr "样式"
 
 msgid "Style"
 msgstr "样式"
 


@@ -6215,19 +6153,17 @@ msgstr "样式"
 msgid "Style Organiser"
 msgstr ""
 
 msgid "Style Organiser"
 msgstr ""
 

-#: ../src/osx/carbon/fontdlg.cpp:522
+#: ../src/osx/carbon/fontdlg.cpp:532

 msgid "Style:"
 msgstr "样式:"
 
 msgid "Style:"
 msgstr "样式:"
 

-#: ../src/richtext/richtextfontpage.cpp:272
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:303

 msgid "Subscrip&t"
 msgid "Subscrip&t"

-msgstr "Script"
+msgstr "下标(&T)"

 
 

-#: ../src/richtext/richtextfontpage.cpp:265
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:296

 msgid "Supe&rscript"
 msgid "Supe&rscript"

-msgstr "Script"
+msgstr "上标(&R)"

 
 #: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"
 
 #: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"


@@ -6254,35 +6190,34 @@ msgstr "正常字体:"
 
 #: ../src/common/accelcmn.cpp:64
 msgid "TAB"
 
 #: ../src/common/accelcmn.cpp:64
 msgid "TAB"

-msgstr ""
+msgstr "TAB"

 
 

-#: ../src/common/imagtiff.cpp:377
-#: ../src/common/imagtiff.cpp:390
-#: ../src/common/imagtiff.cpp:749
+#: ../src/common/imagtiff.cpp:373 ../src/common/imagtiff.cpp:386
+#: ../src/common/imagtiff.cpp:745

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

-#: ../src/common/imagtiff.cpp:309
+#: ../src/common/imagtiff.cpp:305

 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误。"
 
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 装载图像错误。"
 

-#: ../src/common/imagtiff.cpp:476
+#: ../src/common/imagtiff.cpp:472

 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误。"
 
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 读图像错误。"
 

-#: ../src/common/imagtiff.cpp:616
+#: ../src/common/imagtiff.cpp:612

 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误。"
 
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 保存图像错误。"
 

-#: ../src/common/imagtiff.cpp:854
+#: ../src/common/imagtiff.cpp:850

 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误。"
 
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 写图像错误。"
 

-#: ../src/common/imagtiff.cpp:363
+#: ../src/common/imagtiff.cpp:359

 msgid "TIFF: Image size is abnormally big."
 msgid "TIFF: Image size is abnormally big."

-msgstr ""
+msgstr "TIFF: 图像大小过大。"

 
 

-#: ../src/richtext/richtextbuffer.cpp:9155
+#: ../src/richtext/richtextbuffer.cpp:9938

 #, fuzzy
 msgid "Table Properties"
 msgstr "属性(&P)"
 #, fuzzy
 msgid "Table Properties"
 msgstr "属性(&P)"


@@ -6295,7 +6230,7 @@ msgstr "小报(特大)，11.69 x 18 英寸"
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报，11 x 17 英寸"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "小报，11 x 17 英寸"
 

-#: ../src/richtext/richtextformatdlg.cpp:333
+#: ../src/richtext/richtextformatdlg.cpp:335

 msgid "Tabs"
 msgstr ""
 
 msgid "Tabs"
 msgstr ""
 


@@ -6303,23 +6238,23 @@ msgstr ""
 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1856
+#: ../src/common/docview.cpp:1869

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 

-#: ../src/osx/carbon/dataview.cpp:2368
+#: ../src/osx/carbon/dataview.cpp:2374

 msgid "Text renderer cannot render value; value type: "
 msgstr ""
 
 msgid "Text renderer cannot render value; value type: "
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:157
+#: ../src/common/fmapbase.cpp:159

 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 

-#: ../src/common/ftp.cpp:623
+#: ../src/common/ftp.cpp:621

 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:609
+#: ../src/common/ftp.cpp:607

 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 命令。"
 


@@ -6330,8 +6265,8 @@ msgstr "FTP服务器不支持 PORT 命令。"
 msgid "The available bullet styles."
 msgstr ""
 
 msgid "The available bullet styles."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:197
-#: ../src/richtext/richtextstyledlg.cpp:199
+#: ../src/richtext/richtextstyledlg.cpp:210
+#: ../src/richtext/richtextstyledlg.cpp:212

 #, fuzzy
 msgid "The available styles."
 msgstr "字体风格."
 #, fuzzy
 msgid "The available styles."
 msgstr "字体风格."


@@ -6354,6 +6289,14 @@ 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
+#, fuzzy
+msgid "The bottom position."
+msgstr "字体大小(磅值)."
+

 #: ../src/richtext/richtextliststylepage.cpp:255
 #: ../src/richtext/richtextliststylepage.cpp:257
 #: ../src/richtext/richtextliststylepage.cpp:276
 #: ../src/richtext/richtextliststylepage.cpp:255
 #: ../src/richtext/richtextliststylepage.cpp:257
 #: ../src/richtext/richtextliststylepage.cpp:276


@@ -6365,12 +6308,12 @@ msgstr "字体大小(磅值)."
 msgid "The bullet character."
 msgstr ""
 
 msgid "The bullet character."
 msgstr ""
 

-#: ../src/richtext/richtextsymboldlg.cpp:440
-#: ../src/richtext/richtextsymboldlg.cpp:442
+#: ../src/richtext/richtextsymboldlg.cpp:444
+#: ../src/richtext/richtextsymboldlg.cpp:446

 msgid "The character code."
 msgstr ""
 
 msgid "The character code."
 msgstr ""
 

-#: ../src/common/fontmap.cpp:202
+#: ../src/common/fontmap.cpp:204

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"


@@ -6380,7 +6323,7 @@ msgstr ""
 "未知字符集 '%s'。选择其它字符集\n"
 "代替它，如果无法替代请选择 [取消] "
 
 "未知字符集 '%s'。选择其它字符集\n"
 "代替它，如果无法替代请选择 [取消] "
 

-#: ../src/msw/ole/dataobj.cpp:162
+#: ../src/msw/ole/dataobj.cpp:177

 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在。"
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪贴板格式 '%d' 不存在。"


@@ -6402,12 +6345,13 @@ msgstr ""
 #: ../src/html/htmprint.cpp:272
 #, c-format
 msgid ""
 #: ../src/html/htmprint.cpp:272
 #, c-format
 msgid ""

-"The document \"%s\" doesn't fit on the page horizontally and will be truncated if printed.\n"
+"The document \"%s\" doesn't fit on the page horizontally and will be "
+"truncated if printed.\n"

 "\n"
 "Would you like to proceed with printing it nevertheless?"
 msgstr ""
 
 "\n"
 "Would you like to proceed with printing it nevertheless?"
 msgstr ""
 

-#: ../src/common/docview.cpp:1175
+#: ../src/common/docview.cpp:1181

 #, 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"


@@ -6424,49 +6368,48 @@ msgstr ""
 msgid "The first line indent."
 msgstr "字体大小(磅值)."
 
 msgid "The first line indent."
 msgstr "字体大小(磅值)."
 

-#: ../src/gtk/utilsgtk.cpp:475
+#: ../src/gtk/utilsgtk.cpp:478

 msgid "The following standard GTK+ options are also supported:\n"
 msgstr ""
 
 msgid "The following standard GTK+ options are also supported:\n"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:415
-#: ../src/generic/fontdlgg.cpp:417
+#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417

 msgid "The font colour."
 msgstr "字体颜色。"
 
 msgid "The font colour."
 msgstr "字体颜色。"
 

-#: ../src/generic/fontdlgg.cpp:376
-#: ../src/generic/fontdlgg.cpp:378
+#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378

 msgid "The font family."
 msgstr "字体。"
 
 msgid "The font family."
 msgstr "字体。"
 

-#: ../src/richtext/richtextsymboldlg.cpp:402
-#: ../src/richtext/richtextsymboldlg.cpp:404
+#: ../src/richtext/richtextsymboldlg.cpp:406
+#: ../src/richtext/richtextsymboldlg.cpp:408

 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:428 ../src/generic/fontdlgg.cpp:430
+#: ../src/generic/fontdlgg.cpp:435 ../src/generic/fontdlgg.cpp:437

 msgid "The font point size."
 msgstr "字体大小 (磅值)。"
 
 msgid "The font point size."
 msgstr "字体大小 (磅值)。"
 

-#: ../src/osx/carbon/fontdlg.cpp:517
-#: ../src/osx/carbon/fontdlg.cpp:519
+#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529

 #, fuzzy
 msgid "The font size in points."
 msgstr "字体大小(磅值)."
 
 #, fuzzy
 msgid "The font size in points."
 msgstr "字体大小(磅值)."
 

-#: ../src/generic/fontdlgg.cpp:387
-#: ../src/generic/fontdlgg.cpp:389
+#: ../src/richtext/richtextfontpage.cpp:188
+#: ../src/richtext/richtextfontpage.cpp:190
+#, fuzzy
+msgid "The font size units, points or pixels."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389

 msgid "The font style."
 msgstr "字体风格。"
 
 msgid "The font style."
 msgstr "字体风格。"
 

-#: ../src/generic/fontdlgg.cpp:398
-#: ../src/generic/fontdlgg.cpp:400
+#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400

 msgid "The font weight."
 msgstr "字体粗细。"
 
 msgid "The font weight."
 msgstr "字体粗细。"
 

-#: ../src/common/docview.cpp:1436
+#: ../src/common/docview.cpp:1449

 #, 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' 格式。"


@@ -6491,6 +6434,14 @@ 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
+#, fuzzy
+msgid "The left position."
+msgstr "字体大小(磅值)."
+

 #: ../src/richtext/richtextindentspage.cpp:313
 #: ../src/richtext/richtextindentspage.cpp:315
 #: ../src/richtext/richtextliststylepage.cpp:463
 #: ../src/richtext/richtextindentspage.cpp:313
 #: ../src/richtext/richtextindentspage.cpp:315
 #: ../src/richtext/richtextliststylepage.cpp:463


@@ -6503,21 +6454,40 @@ msgstr ""
 msgid "The list item number."
 msgstr ""
 
 msgid "The list item number."
 msgstr ""
 

-#: ../src/msw/ole/automtn.cpp:635
+#: ../src/msw/ole/automtn.cpp:648

 msgid "The locale ID is unknown."
 msgstr ""
 
 msgid "The locale ID is unknown."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:238
-#: ../src/richtext/richtextsizepage.cpp:240
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:328
+#: ../src/richtext/richtextsizepage.cpp:330

 msgid "The object height."
 msgid "The object height."

-msgstr "字体粗细."
+msgstr "对象高度。"
+
+#: ../src/richtext/richtextsizepage.cpp:436
+#: ../src/richtext/richtextsizepage.cpp:438
+msgid "The object maximum height."
+msgstr "对象最大高度。"
+
+#: ../src/richtext/richtextsizepage.cpp:409
+#: ../src/richtext/richtextsizepage.cpp:411
+msgid "The object maximum width."
+msgstr "对象最大宽度。"

 
 

-#: ../src/richtext/richtextsizepage.cpp:211
-#: ../src/richtext/richtextsizepage.cpp:213
+#: ../src/richtext/richtextsizepage.cpp:382
+#: ../src/richtext/richtextsizepage.cpp:384

 #, fuzzy
 #, fuzzy

+msgid "The object minimum height."
+msgstr "对象最小高度。"
+
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:357
+msgid "The object minimum width."
+msgstr "对象最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:303

 msgid "The object width."
 msgid "The object width."

-msgstr "å­\97ä½\93ç²\97ç»\86."
+msgstr "对象宽度ã\80\82"

 
 #: ../src/richtext/richtextindentspage.cpp:252
 #: ../src/richtext/richtextindentspage.cpp:254
 
 #: ../src/richtext/richtextindentspage.cpp:252
 #: ../src/richtext/richtextindentspage.cpp:254


@@ -6525,29 +6495,29 @@ msgstr "字体粗细."
 msgid "The outline level."
 msgstr "显示字体预览."
 
 msgid "The outline level."
 msgstr "显示字体预览."
 

-#: ../src/common/log.cpp:230
+#: ../src/common/log.cpp:284

 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""
 
 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""
 

-#: ../src/common/log.cpp:223
+#: ../src/common/log.cpp:277

 msgid "The previous message repeated once."
 msgstr ""
 
 msgid "The previous message repeated once."
 msgstr ""
 

-#: ../src/gtk/print.cpp:923
-#: ../src/gtk/print.cpp:1106
+#: ../src/gtk/print.cpp:933 ../src/gtk/print.cpp:1116

 msgid "The print dialog returned an error."
 msgstr ""
 
 msgid "The print dialog returned an error."
 msgstr ""
 

-#: ../src/richtext/richtextsymboldlg.cpp:459
-#: ../src/richtext/richtextsymboldlg.cpp:461
+#: ../src/richtext/richtextsymboldlg.cpp:463
+#: ../src/richtext/richtextsymboldlg.cpp:465

 msgid "The range to show."
 msgid "The range to show."

-msgstr ""
+msgstr "显示的范围。"

 
 #: ../src/generic/dbgrptg.cpp:319
 msgid ""
 
 #: ../src/generic/dbgrptg.cpp:319
 msgid ""

-"The report contains the files listed below. If any of these files contain private information,\n"
+"The report contains the files listed below. If any of these files contain "
+"private information,\n"

 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
 "报告包含了以下文件。如果这些文件含有私人信息，\n"
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
 "报告包含了以下文件。如果这些文件含有私人信息，\n"


@@ -6563,13 +6533,12 @@ msgstr "必须的参数 '%s' 没有指定。"
 #: ../src/richtext/richtextliststylepage.cpp:404
 #: ../src/richtext/richtextliststylepage.cpp:406
 msgid "The right indent."
 #: ../src/richtext/richtextliststylepage.cpp:404
 #: ../src/richtext/richtextliststylepage.cpp:406
 msgid "The right indent."

-msgstr ""
+msgstr "右侧缩进。"

 
 #: ../src/richtext/richtextmarginspage.cpp:220
 #: ../src/richtext/richtextmarginspage.cpp:222
 
 #: ../src/richtext/richtextmarginspage.cpp:220
 #: ../src/richtext/richtextmarginspage.cpp:222

-#, fuzzy

 msgid "The right margin size."
 msgid "The right margin size."

-msgstr "å­\97ä½\93大å°\8f(ç£\85å\80¼)."
+msgstr "å\8f³è¾¹è·\9d大å°\8fã\80\82"

 
 #: ../src/richtext/richtextmarginspage.cpp:334
 #: ../src/richtext/richtextmarginspage.cpp:336
 
 #: ../src/richtext/richtextmarginspage.cpp:334
 #: ../src/richtext/richtextmarginspage.cpp:336


@@ -6577,18 +6546,26 @@ 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
+#, fuzzy
+msgid "The right position."
+msgstr "字体大小(磅值)."
+

 #: ../src/richtext/richtextindentspage.cpp:292
 #: ../src/richtext/richtextliststylepage.cpp:440
 #: ../src/richtext/richtextliststylepage.cpp:442
 msgid "The spacing after the paragraph."
 #: ../src/richtext/richtextindentspage.cpp:292
 #: ../src/richtext/richtextliststylepage.cpp:440
 #: ../src/richtext/richtextliststylepage.cpp:442
 msgid "The spacing after the paragraph."

-msgstr ""
+msgstr "段落之后的间距。"

 
 #: ../src/richtext/richtextindentspage.cpp:282
 #: ../src/richtext/richtextindentspage.cpp:284
 #: ../src/richtext/richtextliststylepage.cpp:431
 #: ../src/richtext/richtextliststylepage.cpp:433
 msgid "The spacing before the paragraph."
 
 #: ../src/richtext/richtextindentspage.cpp:282
 #: ../src/richtext/richtextindentspage.cpp:284
 #: ../src/richtext/richtextliststylepage.cpp:431
 #: ../src/richtext/richtextliststylepage.cpp:433
 msgid "The spacing before the paragraph."

-msgstr ""
+msgstr "段落之前的间距。"

 
 #: ../src/richtext/richtextstylepage.cpp:109
 #: ../src/richtext/richtextstylepage.cpp:111
 
 #: ../src/richtext/richtextstylepage.cpp:109
 #: ../src/richtext/richtextstylepage.cpp:111


@@ -6601,15 +6578,14 @@ msgstr "字体风格."
 msgid "The style on which this style is based."
 msgstr ""
 
 msgid "The style on which this style is based."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:209
-#: ../src/richtext/richtextstyledlg.cpp:211
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:222
+#: ../src/richtext/richtextstyledlg.cpp:224

 msgid "The style preview."
 msgid "The style preview."

-msgstr "æ\98¾ç¤ºå­\97ä½\93é¢\84è§\88."
+msgstr "æ ·å¼\8fé¢\84è§\88ã\80\82"

 
 

-#: ../src/msw/ole/automtn.cpp:651
+#: ../src/msw/ole/automtn.cpp:664

 msgid "The system cannot find the file specified."
 msgid "The system cannot find the file specified."

-msgstr ""
+msgstr "系统无法找到指定的文件。"

 
 #: ../src/richtext/richtexttabspage.cpp:119
 #: ../src/richtext/richtexttabspage.cpp:121
 
 #: ../src/richtext/richtexttabspage.cpp:119
 #: ../src/richtext/richtexttabspage.cpp:121


@@ -6622,15 +6598,14 @@ msgstr "字体大小(磅值)."
 msgid "The tab positions."
 msgstr "字体大小(磅值)."
 
 msgid "The tab positions."
 msgstr "字体大小(磅值)."
 

-#: ../src/richtext/richtextctrl.cpp:2398
+#: ../src/richtext/richtextctrl.cpp:2681

 msgid "The text couldn't be saved."
 msgstr "文本无法保存。"
 
 #: ../src/richtext/richtextmarginspage.cpp:243
 #: ../src/richtext/richtextmarginspage.cpp:245
 msgid "The text couldn't be saved."
 msgstr "文本无法保存。"
 
 #: ../src/richtext/richtextmarginspage.cpp:243
 #: ../src/richtext/richtextmarginspage.cpp:245

-#, fuzzy

 msgid "The top margin size."
 msgid "The top margin size."

-msgstr "字体大小(磅值)."
+msgstr "上边距大小。"

 
 #: ../src/richtext/richtextmarginspage.cpp:357
 #: ../src/richtext/richtextmarginspage.cpp:359
 
 #: ../src/richtext/richtextmarginspage.cpp:357
 #: ../src/richtext/richtextmarginspage.cpp:359


@@ -6638,61 +6613,84 @@ 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
+#, fuzzy
+msgid "The top position."
+msgstr "字体大小(磅值)."
+

 #: ../src/common/cmdline.cpp:1054
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s' 的值必须被指定。"
 
 #: ../src/msw/dialup.cpp:453
 #: ../src/common/cmdline.cpp:1054
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "选项 '%s' 的值必须被指定。"
 
 #: ../src/msw/dialup.cpp:453

-#, fuzzy, c-format
-msgid "The version of remote access service (RAS) installed on this machine is too old, please upgrade (the following required function is missing: %s)."
-msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
-
-#: ../src/richtext/richtextsizepage.cpp:323
-#: ../src/richtext/richtextsizepage.cpp:325
-msgid "The vertical offset relative to the paragraph."
-msgstr ""
+#, 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:951
+#: ../src/gtk/print.cpp:961

 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1335
+#: ../src/osx/carbon/dataview.cpp:1341

 msgid "There is no column or renderer for the specified column index."
 msgstr ""
 
 msgid "There is no column or renderer for the specified column index."
 msgstr ""
 

-#: ../src/richtext/richtextprint.cpp:606
-#: ../src/html/htmprint.cpp:736
-msgid "There was a problem during page setup: you may need to set a default printer."
+#: ../src/richtext/richtextprint.cpp:611 ../src/html/htmprint.cpp:736
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."

 msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
 
 #: ../src/html/htmprint.cpp:256
 msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"
 
 #: ../src/html/htmprint.cpp:256

-msgid "This document doesn't fit on the page horizontally and will be truncated when it is printed."
+msgid ""
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/image.cpp:2506
+#: ../src/common/image.cpp:2609

 #, 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
+msgid "This platform does not support background transparency."
+msgstr ""
+
+#: ../src/gtk/window.cpp:4239
+msgid ""
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."
+msgstr ""
+

 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy
 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy

-msgid "This system doesn't support date controls, please upgrade your version of comctl32.dll"
+msgid ""
+"This system doesn't support date controls, please upgrade your version of "
+"comctl32.dll"

 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1267
-msgid "Thread module initialization failed: cannot store value in thread local storage"
+#: ../src/msw/thread.cpp:1290
+msgid ""
+"Thread module initialization failed: cannot store value in thread local "
+"storage"

 msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 
 msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"
 

-#: ../src/unix/threadpsx.cpp:1714
+#: ../src/unix/threadpsx.cpp:1719

 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:1255
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
+#: ../src/msw/thread.cpp:1278
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"

 msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 
 msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"
 

-#: ../src/unix/threadpsx.cpp:1216
+#: ../src/unix/threadpsx.cpp:1221

 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略。"
 
 msgid "Thread priority setting is ignored."
 msgstr "线程优先级设置被忽略。"
 


@@ -6704,7 +6702,7 @@ msgstr "水平排布(&H)"
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 

-#: ../src/common/ftp.cpp:205
+#: ../src/common/ftp.cpp:203

 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 模式。"
 


@@ -6718,28 +6716,27 @@ msgstr "每日技巧"
 
 #: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"
 
 #: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"

-msgstr "对不起，没有所需技巧!"
+msgstr "对不起，没有所需的提示！"

 
 #: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 
 
 #: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 

-#: ../src/osx/carbon/dataview.cpp:2446
+#: ../src/osx/carbon/dataview.cpp:2452

 msgid "Toggle renderer cannot render value; value type: "
 msgstr ""
 
 msgid "Toggle renderer cannot render value; value type: "
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:7074
+#: ../src/richtext/richtextbuffer.cpp:7499

 msgid "Too many EndStyle calls!"
 msgstr ""
 
 msgid "Too many EndStyle calls!"
 msgstr ""
 

-#: ../src/common/imagpng.cpp:289
+#: ../src/common/imagpng.cpp:287

 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 

-#: ../src/richtext/richtextsizepage.cpp:280
-#: ../src/richtext/richtextsizepage.cpp:283
-#: ../src/richtext/richtextsizepage.cpp:284
-#: ../src/common/stockitem.cpp:201
+#: ../src/richtext/richtextsizepage.cpp:262
+#: ../src/richtext/richtextsizepage.cpp:265
+#: ../src/richtext/richtextsizepage.cpp:266 ../src/common/stockitem.cpp:201

 msgid "Top"
 msgstr "顶端"
 
 msgid "Top"
 msgstr "顶端"
 


@@ -6749,22 +6746,22 @@ msgstr "上页边距 (毫米):"
 
 #: ../src/generic/aboutdlgg.cpp:80
 msgid "Translations by "
 
 #: ../src/generic/aboutdlgg.cpp:80
 msgid "Translations by "

-msgstr ""
+msgstr "翻译由"

 
 #: ../src/generic/aboutdlgg.cpp:189
 msgid "Translators"
 
 #: ../src/generic/aboutdlgg.cpp:189
 msgid "Translators"

-msgstr ""
+msgstr "翻译者"

 
 #: ../src/propgrid/propgrid.cpp:174
 msgid "True"
 
 #: ../src/propgrid/propgrid.cpp:174
 msgid "True"

-msgstr ""
+msgstr "True"

 
 

-#: ../src/common/fs_mem.cpp:232
+#: ../src/common/fs_mem.cpp:228

 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"

-msgstr "试图从内存 VFS 中移去文件 '%s'，但它并没有被装入内存!"
+msgstr "试图从内存 VFS 中移去文件 '%s'，但它并没有被装入内存！"

 
 

-#: ../src/common/fmapbase.cpp:155
+#: ../src/common/fmapbase.cpp:157

 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 


@@ -6772,51 +6769,52 @@ msgstr "土耳其语 (ISO-8859-9)"
 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: ../src/richtext/richtextfontpage.cpp:148
-#: ../src/richtext/richtextfontpage.cpp:150
+#: ../src/richtext/richtextfontpage.cpp:158
+#: ../src/richtext/richtextfontpage.cpp:160

 msgid "Type a font name."
 msgstr "输入字体名称。"
 
 msgid "Type a font name."
 msgstr "输入字体名称。"
 

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

 msgid "Type a size in points."
 msgstr ""
 
 msgid "Type a size in points."
 msgstr ""
 

-#: ../src/msw/ole/automtn.cpp:647
+#: ../src/msw/ole/automtn.cpp:660

 #, c-format
 msgid "Type mismatch in argument %u."
 #, c-format
 msgid "Type mismatch in argument %u."

-msgstr ""
+msgstr "参数 %u 的类型不匹配。"

 
 

-#: ../src/common/xtixml.cpp:357
-#: ../src/common/xtixml.cpp:510
+#: ../src/common/xtixml.cpp:357 ../src/common/xtixml.cpp:510

 #: ../src/common/xtistrm.cpp:323
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 #: ../src/propgrid/propgridiface.cpp:383
 #, c-format
 #: ../src/common/xtistrm.cpp:323
 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 #: ../src/propgrid/propgridiface.cpp:383
 #, c-format

-msgid "Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT \"%s\"."
+msgid ""
+"Type operation \"%s\" failed: Property labeled \"%s\" is of type \"%s\", NOT "
+"\"%s\"."

 msgstr ""
 
 #: ../src/common/accelcmn.cpp:59
 msgid "UP"
 msgstr ""
 
 #: ../src/common/accelcmn.cpp:59
 msgid "UP"

-msgstr ""
+msgstr "UP"

 
 #: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "美国标准复写簿，14 7/8 x 11 英寸"
 
 
 #: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "美国标准复写簿，14 7/8 x 11 英寸"
 

-#: ../src/common/fmapbase.cpp:193
+#: ../src/common/fmapbase.cpp:197

 msgid "US-ASCII"
 msgstr "US-ASCII"
 
 #: ../src/unix/fswatcher_inotify.cpp:110
 msgid "Unable to add inotify watch"
 msgid "US-ASCII"
 msgstr "US-ASCII"
 
 #: ../src/unix/fswatcher_inotify.cpp:110
 msgid "Unable to add inotify watch"

-msgstr ""
+msgstr "无法添加 inotify watch"

 
 #: ../src/unix/fswatcher_kqueue.cpp:137
 msgid "Unable to add kqueue watch"
 
 #: ../src/unix/fswatcher_kqueue.cpp:137
 msgid "Unable to add kqueue watch"

-msgstr ""
+msgstr "无法添加 kqueue watch"

 
 #: ../include/wx/msw/private/fswatcher.h:143
 msgid "Unable to associate handle with I/O completion port"
 
 #: ../include/wx/msw/private/fswatcher.h:143
 msgid "Unable to associate handle with I/O completion port"


@@ -6828,14 +6826,13 @@ msgid "Unable to close I/O completion port handle"
 msgstr "关闭文件句柄失败."
 
 #: ../src/unix/fswatcher_inotify.cpp:98
 msgstr "关闭文件句柄失败."
 
 #: ../src/unix/fswatcher_inotify.cpp:98

-#, fuzzy

 msgid "Unable to close inotify instance"
 msgid "Unable to close inotify instance"

-msgstr "关闭文件句柄失败."
+msgstr "无法关闭 inotify 实例"

 
 #: ../include/wx/unix/private/fswatcher_kqueue.h:75
 
 #: ../include/wx/unix/private/fswatcher_kqueue.h:75

-#, fuzzy, c-format
+#, c-format

 msgid "Unable to close path '%s'"
 msgid "Unable to close path '%s'"

-msgstr "关闭锁文件 '%s'失败"
+msgstr "无法关闭路径 '%s'"

 
 #: ../include/wx/msw/private/fswatcher.h:49
 #, c-format
 
 #: ../include/wx/msw/private/fswatcher.h:49
 #, c-format


@@ -6853,14 +6850,12 @@ msgid "Unable to create IOCP worker thread"
 msgstr "创建 MDI 父框架失败."
 
 #: ../src/unix/fswatcher_inotify.cpp:75
 msgstr "创建 MDI 父框架失败."
 
 #: ../src/unix/fswatcher_inotify.cpp:75

-#, fuzzy

 msgid "Unable to create inotify instance"
 msgid "Unable to create inotify instance"

-msgstr "创建 DDE 字符串失败"
+msgstr "无法创建 inotify 实例"

 
 #: ../src/unix/fswatcher_kqueue.cpp:98
 
 #: ../src/unix/fswatcher_kqueue.cpp:98

-#, fuzzy

 msgid "Unable to create kqueue instance"
 msgid "Unable to create kqueue instance"

-msgstr "创建 DDE 字符串失败"
+msgstr "无法创建 kqueue 实例"

 
 #: ../include/wx/msw/private/fswatcher.h:230
 msgid "Unable to dequeue completion packet"
 
 #: ../include/wx/msw/private/fswatcher.h:230
 msgid "Unable to dequeue completion packet"


@@ -6870,15 +6865,15 @@ msgstr ""
 msgid "Unable to get events from kqueue"
 msgstr ""
 
 msgid "Unable to get events from kqueue"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1898
+#: ../src/osx/carbon/dataview.cpp:1904

 msgid "Unable to handle native drag&drop data"
 msgstr ""
 
 msgid "Unable to handle native drag&drop data"
 msgstr ""
 

-#: ../src/gtk/app.cpp:438
+#: ../src/gtk/app.cpp:442

 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgid "Unable to initialize GTK+, is DISPLAY set properly?"

-msgstr ""
+msgstr "无法初始化 GTK+，DISPLAY 是否已正确设置？"

 
 

-#: ../src/gtk/app.cpp:273
+#: ../src/gtk/app.cpp:275

 msgid "Unable to initialize Hildon program"
 msgstr "无法初始化 Hildon 程序"
 
 msgid "Unable to initialize Hildon program"
 msgstr "无法初始化 Hildon 程序"
 


@@ -6900,17 +6895,17 @@ msgstr "无法异步地播放声音。"
 msgid "Unable to post completion status"
 msgstr ""
 
 msgid "Unable to post completion status"
 msgstr ""
 

-#: ../src/unix/fswatcher_inotify.cpp:330
+#: ../src/unix/fswatcher_inotify.cpp:353

 msgid "Unable to read from inotify descriptor"
 msgstr "无法读取 inotify 描述符"
 
 #: ../src/unix/fswatcher_inotify.cpp:133
 msgid "Unable to remove inotify watch"
 msgid "Unable to read from inotify descriptor"
 msgstr "无法读取 inotify 描述符"
 
 #: ../src/unix/fswatcher_inotify.cpp:133
 msgid "Unable to remove inotify watch"

-msgstr ""
+msgstr "无法删除 inotify watch"

 
 #: ../src/unix/fswatcher_kqueue.cpp:155
 msgid "Unable to remove kqueue watch"
 
 #: ../src/unix/fswatcher_kqueue.cpp:155
 msgid "Unable to remove kqueue watch"

-msgstr ""
+msgstr "无法删除 kqueue watch"

 
 #: ../src/msw/fswatcher.cpp:169
 #, c-format
 
 #: ../src/msw/fswatcher.cpp:169
 #, c-format


@@ -6919,7 +6914,7 @@ msgstr "无法为 '%s' 设定 watch"
 
 #: ../src/msw/fswatcher.cpp:92
 msgid "Unable to start IOCP worker thread"
 
 #: ../src/msw/fswatcher.cpp:92
 msgid "Unable to start IOCP worker thread"

-msgstr ""
+msgstr "无法开始 IOCP 工作线程"

 
 #: ../src/common/stockitem.cpp:202
 msgid "Undelete"
 
 #: ../src/common/stockitem.cpp:202
 msgid "Undelete"


@@ -6929,14 +6924,12 @@ msgstr "取消删除"
 msgid "Underline"
 msgstr "下划线"
 
 msgid "Underline"
 msgstr "下划线"
 

-#: ../src/richtext/richtextfontpage.cpp:301
-#: ../src/osx/carbon/fontdlg.cpp:544
+#: ../src/richtext/richtextfontpage.cpp:332 ../src/osx/carbon/fontdlg.cpp:554

 #: ../src/propgrid/advprops.cpp:656
 msgid "Underlined"
 msgstr "下划线"
 
 #: ../src/propgrid/advprops.cpp:656
 msgid "Underlined"
 msgstr "下划线"
 

-#: ../src/common/stockitem.cpp:204
-#: ../src/stc/stc_i18n.cpp:16
+#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16

 msgid "Undo"
 msgstr "撤销"
 
 msgid "Undo"
 msgstr "撤销"
 


@@ -6963,43 +6956,41 @@ msgstr ""
 msgid "Ungraceful worker thread termination"
 msgstr "不能等候线程终止"
 
 msgid "Ungraceful worker thread termination"
 msgstr "不能等候线程终止"
 

-#: ../src/richtext/richtextsymboldlg.cpp:456
-#: ../src/richtext/richtextsymboldlg.cpp:457
-#: ../src/richtext/richtextsymboldlg.cpp:458
+#: ../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:182
-#: ../src/common/fmapbase.cpp:188
+#: ../src/common/fmapbase.cpp:186 ../src/common/fmapbase.cpp:192

 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:187
+#: ../src/common/fmapbase.cpp:191

 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:183
+#: ../src/common/fmapbase.cpp:187

 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:184
-#: ../src/common/fmapbase.cpp:190
+#: ../src/common/fmapbase.cpp:188 ../src/common/fmapbase.cpp:194

 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:189
+#: ../src/common/fmapbase.cpp:193

 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:185
+#: ../src/common/fmapbase.cpp:189

 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:179
+#: ../src/common/fmapbase.cpp:183

 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:180
+#: ../src/common/fmapbase.cpp:184

 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的 Unicode 编码 (UTF-8)"
 
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "8位的 Unicode 编码 (UTF-8)"
 


@@ -7027,6 +7018,12 @@ 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
+#, fuzzy
+msgid "Units for the bottom position."
+msgstr "上边距单位"
+

 #: ../src/richtext/richtextborderspage.cpp:283
 #: ../src/richtext/richtextborderspage.cpp:285
 msgid "Units for the left border width."
 #: ../src/richtext/richtextborderspage.cpp:283
 #: ../src/richtext/richtextborderspage.cpp:285
 msgid "Units for the left border width."


@@ -7047,18 +7044,39 @@ msgstr ""
 msgid "Units for the left padding."
 msgstr ""
 
 msgid "Units for the left padding."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:249
-#: ../src/richtext/richtextsizepage.cpp:251
+#: ../src/richtext/richtextsizepage.cpp:514
+#: ../src/richtext/richtextsizepage.cpp:516
+#, fuzzy
+msgid "Units for the left position."
+msgstr "上边距单位"
+
+#: ../src/richtext/richtextsizepage.cpp:447
+#: ../src/richtext/richtextsizepage.cpp:449
+msgid "Units for the maximum object height."
+msgstr "最大对象高度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:420
+#: ../src/richtext/richtextsizepage.cpp:422
+msgid "Units for the maximum object width."
+msgstr "最大对象宽度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:393
+#: ../src/richtext/richtextsizepage.cpp:395
+msgid "Units for the minimum object height."
+msgstr "最小对象高度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:366
+#: ../src/richtext/richtextsizepage.cpp:368
+msgid "Units for the minimum object width."
+msgstr "最小对象宽度单位。"
+
+#: ../src/richtext/richtextsizepage.cpp:339
+#: ../src/richtext/richtextsizepage.cpp:341

 msgid "Units for the object height."
 msgstr ""
 
 msgid "Units for the object height."
 msgstr ""
 

-#: ../src/richtext/richtextsizepage.cpp:333
-#: ../src/richtext/richtextsizepage.cpp:335
-msgid "Units for the object offset."
-msgstr ""
-
-#: ../src/richtext/richtextsizepage.cpp:222
-#: ../src/richtext/richtextsizepage.cpp:224
+#: ../src/richtext/richtextsizepage.cpp:312
+#: ../src/richtext/richtextsizepage.cpp:314

 msgid "Units for the object width."
 msgstr ""
 
 msgid "Units for the object width."
 msgstr ""
 


@@ -7082,6 +7100,12 @@ 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
+#, fuzzy
+msgid "Units for the right position."
+msgstr "上边距单位"
+

 #: ../src/richtext/richtextborderspage.cpp:343
 #: ../src/richtext/richtextborderspage.cpp:345
 msgid "Units for the top border width."
 #: ../src/richtext/richtextborderspage.cpp:343
 #: ../src/richtext/richtextborderspage.cpp:345
 msgid "Units for the top border width."


@@ -7089,9 +7113,8 @@ msgstr ""
 
 #: ../src/richtext/richtextmarginspage.cpp:253
 #: ../src/richtext/richtextmarginspage.cpp:255
 
 #: ../src/richtext/richtextmarginspage.cpp:253
 #: ../src/richtext/richtextmarginspage.cpp:255

-#, fuzzy

 msgid "Units for the top margin."
 msgid "Units for the top margin."

-msgstr "ä¸\8dè\83½ç­\89å\80\99线ç¨\8bç»\88æ­¢."
+msgstr "ä¸\8aè¾¹è·\9då\8d\95ä½\8d"

 
 #: ../src/richtext/richtextborderspage.cpp:487
 #: ../src/richtext/richtextborderspage.cpp:489
 
 #: ../src/richtext/richtextborderspage.cpp:487
 #: ../src/richtext/richtextborderspage.cpp:489


@@ -7103,12 +7126,17 @@ msgstr ""
 msgid "Units for the top padding."
 msgstr ""
 
 msgid "Units for the top padding."
 msgstr ""
 

-#: ../src/generic/progdlgg.cpp:372
-#: ../src/generic/progdlgg.cpp:645
+#: ../src/richtext/richtextsizepage.cpp:542
+#: ../src/richtext/richtextsizepage.cpp:544
+#, fuzzy
+msgid "Units for the top position."
+msgstr "上边距单位"
+
+#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656

 msgid "Unknown"
 msgstr "未知"
 
 msgid "Unknown"
 msgstr "未知"
 

-#: ../src/msw/dde.cpp:1174
+#: ../src/msw/dde.cpp:1178

 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知 DDE 错误 %08x"


@@ -7117,7 +7145,7 @@ msgstr "未知 DDE 错误 %08x"
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象传递给 GetObjectClassInfo"
 
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "未知的对象传递给 GetObjectClassInfo"
 

-#: ../src/common/imagpng.cpp:617
+#: ../src/common/imagpng.cpp:615

 #, c-format
 msgid "Unknown PNG resolution unit %d"
 msgstr "未知 PNG 解析度单位 %d"
 #, c-format
 msgid "Unknown PNG resolution unit %d"
 msgstr "未知 PNG 解析度单位 %d"


@@ -7127,12 +7155,12 @@ msgstr "未知 PNG 解析度单位 %d"
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 

-#: ../src/common/imagtiff.cpp:537
+#: ../src/common/imagtiff.cpp:533

 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
 msgstr ""
 
 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1973
+#: ../src/osx/carbon/dataview.cpp:1979

 msgid "Unknown data format"
 msgstr "未知数据格式"
 
 msgid "Unknown data format"
 msgstr "未知数据格式"
 


@@ -7140,21 +7168,21 @@ msgstr "未知数据格式"
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

-#: ../src/common/fmapbase.cpp:797
+#: ../src/common/fmapbase.cpp:811

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 

-#: ../src/msw/ole/automtn.cpp:659
+#: ../src/msw/ole/automtn.cpp:672

 #, c-format
 msgid "Unknown error %08x"
 msgstr "未知错误 %08x"
 
 #, c-format
 msgid "Unknown error %08x"
 msgstr "未知错误 %08x"
 

-#: ../src/msw/ole/automtn.cpp:618
+#: ../src/msw/ole/automtn.cpp:631

 msgid "Unknown exception"
 msgstr "未知异常"
 
 msgid "Unknown exception"
 msgstr "未知异常"
 

-#: ../src/common/image.cpp:2491
+#: ../src/common/image.cpp:2594

 msgid "Unknown image data format."
 msgstr "未知图像数据格式"
 
 msgid "Unknown image data format."
 msgstr "未知图像数据格式"
 


@@ -7163,12 +7191,11 @@ msgstr "未知图像数据格式"
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 

-#: ../src/msw/ole/automtn.cpp:602
+#: ../src/msw/ole/automtn.cpp:615

 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:757 ../src/common/cmdline.cpp:779

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"


@@ -7178,18 +7205,16 @@ msgstr "未知选项 '%s'"
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "类型 %s 中有不配套的 '{'。"
 
 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:263 ../src/common/cmdproc.cpp:289

 #: ../src/common/cmdproc.cpp:309
 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 #: ../src/common/cmdproc.cpp:309
 msgid "Unnamed command"
 msgstr "未命名的命令"
 

-#: ../src/propgrid/propgrid.cpp:398
+#: ../src/propgrid/propgrid.cpp:399

 msgid "Unspecified"
 msgstr "未指定"
 
 msgid "Unspecified"
 msgstr "未指定"
 

-#: ../src/msw/clipbrd.cpp:269
-#: ../src/msw/clipbrd.cpp:441
+#: ../src/msw/clipbrd.cpp:272 ../src/msw/clipbrd.cpp:440

 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式。"
 
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式。"
 


@@ -7198,15 +7223,14 @@ msgstr "不支持的剪贴板格式。"
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题 '%s'。"
 
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题 '%s'。"
 

-#: ../src/generic/fdrepdlg.cpp:153
-#: ../src/common/stockitem.cpp:206
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206

 msgid "Up"
 msgstr "向上"
 
 #: ../src/richtext/richtextliststylepage.cpp:484
 #: ../src/richtext/richtextbulletspage.cpp:289
 msgid "Upper case letters"
 msgid "Up"
 msgstr "向上"
 
 #: ../src/richtext/richtextliststylepage.cpp:484
 #: ../src/richtext/richtextbulletspage.cpp:289
 msgid "Upper case letters"

-msgstr ""
+msgstr "大写字母"

 
 #: ../src/richtext/richtextliststylepage.cpp:486
 #: ../src/richtext/richtextbulletspage.cpp:291
 
 #: ../src/richtext/richtextliststylepage.cpp:486
 #: ../src/richtext/richtextbulletspage.cpp:291


@@ -7225,8 +7249,7 @@ msgstr "用法: %s"
 msgid "Use the current alignment setting."
 msgstr ""
 
 msgid "Use the current alignment setting."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:2653
-#: ../src/osx/carbon/dataview.cpp:2718
+#: ../src/osx/carbon/dataview.cpp:2659 ../src/osx/carbon/dataview.cpp:2724

 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 
 msgid "Valid pointer to native data view control does not exist"
 msgstr ""
 


@@ -7241,15 +7264,14 @@ msgstr "值"
 #: ../src/propgrid/props.cpp:385
 #, c-format
 msgid "Value must be %s or higher."
 #: ../src/propgrid/props.cpp:385
 #, c-format
 msgid "Value must be %s or higher."

-msgstr ""
+msgstr "数值必须大于或等于 %s。"

 
 #: ../src/propgrid/props.cpp:412
 #, c-format
 msgid "Value must be %s or less."
 
 #: ../src/propgrid/props.cpp:412
 #, c-format
 msgid "Value must be %s or less."

-msgstr ""
+msgstr "数值必须小于或等于 %s。"

 
 

-#: ../src/propgrid/props.cpp:389
-#: ../src/propgrid/props.cpp:416
+#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416

 #, 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 之间。"


@@ -7258,45 +7280,41 @@ msgstr "数值必须在 %s 和 %s 之间。"
 msgid "Version "
 msgstr "版本"
 
 msgid "Version "
 msgstr "版本"
 

-#: ../src/richtext/richtextsizepage.cpp:314
-msgid "Vertical &Offset:"
-msgstr ""
-
-#: ../src/richtext/richtextsizepage.cpp:285
-#: ../src/richtext/richtextsizepage.cpp:287
+#: ../src/richtext/richtextsizepage.cpp:267
+#: ../src/richtext/richtextsizepage.cpp:269

 msgid "Vertical alignment."
 msgstr "垂直对齐。"
 
 msgid "Vertical alignment."
 msgstr "垂直对齐。"
 

-#: ../src/generic/filedlgg.cpp:218
+#: ../src/generic/filedlgg.cpp:216

 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 
 msgid "View files as a detailed view"
 msgstr "按详细视图观看文件"
 

-#: ../src/generic/filedlgg.cpp:216
+#: ../src/generic/filedlgg.cpp:214

 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 

-#: ../src/common/docview.cpp:1930
+#: ../src/common/docview.cpp:1943

 msgid "Views"
 msgstr "视图"
 
 #: ../src/common/accelcmn.cpp:109
 msgid "WINDOWS_LEFT"
 msgid "Views"
 msgstr "视图"
 
 #: ../src/common/accelcmn.cpp:109
 msgid "WINDOWS_LEFT"

-msgstr ""
+msgstr "WINDOWS_LEFT"

 
 #: ../src/common/accelcmn.cpp:111
 msgid "WINDOWS_MENU"
 
 #: ../src/common/accelcmn.cpp:111
 msgid "WINDOWS_MENU"

-msgstr ""
+msgstr "WINDOWS_MENU"

 
 #: ../src/common/accelcmn.cpp:110
 msgid "WINDOWS_RIGHT"
 
 #: ../src/common/accelcmn.cpp:110
 msgid "WINDOWS_RIGHT"

-msgstr ""
+msgstr "WINDOWS_RIGHT"

 
 #: ../src/unix/epolldispatcher.cpp:214
 #, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 
 
 #: ../src/unix/epolldispatcher.cpp:214
 #, c-format
 msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 

-#: ../src/common/log.cpp:429
+#: ../src/common/log.cpp:230

 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 


@@ -7304,16 +7322,15 @@ msgstr "警告: "
 msgid "Weight"
 msgstr "字体粗细"
 
 msgid "Weight"
 msgstr "字体粗细"
 

-#: ../src/common/fmapbase.cpp:147
+#: ../src/common/fmapbase.cpp:149

 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 

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

 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:447 ../src/generic/fontdlgg.cpp:449

 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线。"
 
 msgid "Whether the font is underlined."
 msgstr "字体是否为下划线。"
 


@@ -7321,138 +7338,148 @@ msgstr "字体是否为下划线。"
 msgid "Whole word"
 msgstr "整字"
 
 msgid "Whole word"
 msgstr "整字"
 

-#: ../src/html/helpwnd.cpp:545
+#: ../src/html/helpwnd.cpp:548

 msgid "Whole words only"
 msgstr "仅为整字"
 
 msgid "Whole words only"
 msgstr "仅为整字"
 

-#: ../src/univ/themes/win32.cpp:1105
+#: ../src/univ/themes/win32.cpp:1103

 msgid "Win32 theme"
 msgstr "Win32 主题"
 
 msgid "Win32 theme"
 msgstr "Win32 主题"
 

-#: ../src/msw/utils.cpp:1228
+#: ../src/msw/utils.cpp:1220

 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1 上的 Win32s"
 
 msgid "Win32s on Windows 3.1"
 msgstr "Windows 3.1 上的 Win32s"
 

-#: ../src/msw/utils.cpp:1278
+#: ../src/msw/utils.cpp:1270

 msgid "Windows 2000"
 msgstr "Windows 2000"
 
 msgid "Windows 2000"
 msgstr "Windows 2000"
 

-#: ../src/msw/utils.cpp:1310
+#: ../src/msw/utils.cpp:1302

 msgid "Windows 7"
 msgstr "Windows 7"
 
 msgid "Windows 7"
 msgstr "Windows 7"
 

-#: ../src/msw/utils.cpp:1242
+#: ../src/msw/utils.cpp:1234

 msgid "Windows 95"
 msgstr "Windows 95"
 
 msgid "Windows 95"
 msgstr "Windows 95"
 

-#: ../src/msw/utils.cpp:1238
+#: ../src/msw/utils.cpp:1230

 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 

-#: ../src/msw/utils.cpp:1253
+#: ../src/msw/utils.cpp:1245

 msgid "Windows 98"
 msgstr "Windows 98"
 
 msgid "Windows 98"
 msgstr "Windows 98"
 

-#: ../src/msw/utils.cpp:1249
+#: ../src/msw/utils.cpp:1241

 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 

-#: ../src/msw/utils.cpp:1260
+#: ../src/msw/utils.cpp:1252

 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 
 #, c-format
 msgid "Windows 9x (%d.%d)"
 msgstr "Windows 9x (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:176
+#: ../src/common/fmapbase.cpp:178

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 

-#: ../src/common/fmapbase.cpp:177
+#: ../src/common/fmapbase.cpp:179

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 

-#: ../src/msw/utils.cpp:1222
+#: ../src/msw/utils.cpp:1214

 #, c-format
 msgid "Windows CE (%d.%d)"
 msgstr "Windows CE (%d.%d)"
 
 #, c-format
 msgid "Windows CE (%d.%d)"
 msgstr "Windows CE (%d.%d)"
 

-#: ../src/common/fmapbase.cpp:170
+#: ../src/common/fmapbase.cpp:172

 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 

-#: ../src/common/fmapbase.cpp:167
+#: ../src/common/fmapbase.cpp:169

 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:169
+#: ../src/common/fmapbase.cpp:171

 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:171
+#: ../src/common/fmapbase.cpp:173

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 

-#: ../src/common/fmapbase.cpp:173
+#: ../src/common/fmapbase.cpp:175

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 

-#: ../src/common/fmapbase.cpp:175
+#: ../src/common/fmapbase.cpp:177

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 

-#: ../src/common/fmapbase.cpp:166
+#: ../src/common/fmapbase.cpp:168

 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:168
+#: ../src/common/fmapbase.cpp:181
+#, fuzzy
+msgid "Windows Johab (CP 1361)"
+msgstr "Windows 阿拉伯语 (CP 1256)"
+
+#: ../src/common/fmapbase.cpp:170

 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 

-#: ../src/msw/utils.cpp:1257
+#: ../src/msw/utils.cpp:1249

 msgid "Windows ME"
 msgstr "Windows ME"
 
 msgid "Windows ME"
 msgstr "Windows ME"
 

-#: ../src/msw/utils.cpp:1318
+#: ../src/msw/utils.cpp:1310

 #, c-format
 msgid "Windows NT %lu.%lu"
 msgstr "Windows NT %lu.%lu"
 
 #, c-format
 msgid "Windows NT %lu.%lu"
 msgstr "Windows NT %lu.%lu"
 

-#: ../src/msw/utils.cpp:1287
+#: ../src/msw/utils.cpp:1279

 msgid "Windows Server 2003"
 msgstr "Windows Server 2003"
 
 msgid "Windows Server 2003"
 msgstr "Windows Server 2003"
 

-#: ../src/msw/utils.cpp:1303
+#: ../src/msw/utils.cpp:1295

 msgid "Windows Server 2008"
 msgstr "Windows Server 2008"
 
 msgid "Windows Server 2008"
 msgstr "Windows Server 2008"
 

-#: ../src/msw/utils.cpp:1309
+#: ../src/msw/utils.cpp:1301

 msgid "Windows Server 2008 R2"
 msgstr "Windows Server 2008 R2"
 
 msgid "Windows Server 2008 R2"
 msgstr "Windows Server 2008 R2"
 

-#: ../src/common/fmapbase.cpp:165
+#: ../src/common/fmapbase.cpp:167

 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 
 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 

-#: ../src/common/fmapbase.cpp:174
+#: ../src/common/fmapbase.cpp:176

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 

-#: ../src/msw/utils.cpp:1304
+#: ../src/common/fmapbase.cpp:180
+#, fuzzy
+msgid "Windows Vietnamese (CP 1258)"
+msgstr "Windows 希腊语 (CP 1253)"
+
+#: ../src/msw/utils.cpp:1296

 msgid "Windows Vista"
 msgstr "Windows Vista"
 
 msgid "Windows Vista"
 msgstr "Windows Vista"
 

-#: ../src/common/fmapbase.cpp:172
+#: ../src/common/fmapbase.cpp:174

 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 

-#: ../src/msw/utils.cpp:1293
+#: ../src/msw/utils.cpp:1285

 msgid "Windows XP"
 msgstr "Windows XP"
 
 msgid "Windows XP"
 msgstr "Windows XP"
 

-#: ../src/common/fmapbase.cpp:178
+#: ../src/common/fmapbase.cpp:182

 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:164
+#: ../src/common/fmapbase.cpp:166

 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)"
 


@@ -7468,7 +7495,7 @@ msgstr "XML解析错误: '%s' 位于 行 %d"
 
 #: ../src/common/xpmdecod.cpp:797
 msgid "XPM: Malformed pixel data!"
 
 #: ../src/common/xpmdecod.cpp:797
 msgid "XPM: Malformed pixel data!"

-msgstr "XPM: 错误的象素数据!"
+msgstr "XPM: 错误的象素数据！"

 
 #: ../src/common/xpmdecod.cpp:706
 #, c-format
 
 #: ../src/common/xpmdecod.cpp:706
 #, c-format


@@ -7477,13 +7504,12 @@ msgstr "XPM: 在第 %d 行有错误的颜色描述"
 
 #: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"
 
 #: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"

-msgstr ""
+msgstr "XPM: 不正确的头格式！"

 
 

-#: ../src/common/xpmdecod.cpp:717
-#: ../src/common/xpmdecod.cpp:726
+#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726

 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"
 #, c-format
 msgid "XPM: malformed colour definition '%s' at line %d!"

-msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d!"
+msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d！"

 
 #: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"
 
 #: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"


@@ -7494,8 +7520,7 @@ msgstr ""
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 

-#: ../src/common/stockitem.cpp:207
-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194

 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 


@@ -7503,8 +7528,7 @@ msgstr "是"
 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:108 ../src/dfb/overlay.cpp:62

 msgid "You cannot Init an overlay twice"
 msgstr ""
 
 msgid "You cannot Init an overlay twice"
 msgstr ""
 


@@ -7512,9 +7536,9 @@ msgstr ""
 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:3282
+#: ../src/propgrid/propgrid.cpp:3259

 msgid "You have entered invalid value. Press ESC to cancel editing."
 msgid "You have entered invalid value. Press ESC to cancel editing."

-msgstr ""
+msgstr "你输入了无效值。按 ESC 取消编辑。"

 
 #: ../src/common/stockitem.cpp:210
 msgid "Zoom &In"
 
 #: ../src/common/stockitem.cpp:210
 msgid "Zoom &In"


@@ -7524,13 +7548,11 @@ msgstr "放大(&I)"
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 

-#: ../src/common/stockitem.cpp:210
-#: ../src/common/prntbase.cpp:1539
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1565

 msgid "Zoom In"
 msgstr "放大"
 
 msgid "Zoom In"
 msgstr "放大"
 

-#: ../src/common/stockitem.cpp:211
-#: ../src/common/prntbase.cpp:1525
+#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1551

 msgid "Zoom Out"
 msgstr "缩小"
 
 msgid "Zoom Out"
 msgstr "缩小"
 


@@ -7542,13 +7564,14 @@ msgstr "缩放以适应窗口(&F)"
 msgid "Zoom to Fit"
 msgstr "缩放以适应窗口"
 
 msgid "Zoom to Fit"
 msgstr "缩放以适应窗口"
 

-#: ../src/msw/dde.cpp:1141
+#: ../src/msw/dde.cpp:1145

 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 应用程序已创建延时 race 条件."
 
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 应用程序已创建延时 race 条件."
 

-#: ../src/msw/dde.cpp:1129
+#: ../src/msw/dde.cpp:1133

 msgid ""
 msgid ""

-"a DDEML function was called without first calling the DdeInitialize function,\n"
+"a DDEML function was called without first calling the DdeInitialize "
+"function,\n"

 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""


@@ -7556,39 +7579,39 @@ msgstr ""
 "或传给DDEML函数的是\n"
 "无效的实例标识。"
 
 "或传给DDEML函数的是\n"
 "无效的实例标识。"
 

-#: ../src/msw/dde.cpp:1147
+#: ../src/msw/dde.cpp:1151

 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败。"
 
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "客户试图建立的会话已失败。"
 

-#: ../src/msw/dde.cpp:1144
+#: ../src/msw/dde.cpp:1148

 msgid "a memory allocation failed."
 msgstr "内存分配失败。"
 
 msgid "a memory allocation failed."
 msgstr "内存分配失败。"
 

-#: ../src/msw/dde.cpp:1138
+#: ../src/msw/dde.cpp:1142

 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:1120
+#: ../src/msw/dde.cpp:1124

 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:1126
+#: ../src/msw/dde.cpp:1130

 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:1135
+#: ../src/msw/dde.cpp:1139

 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:1153
+#: ../src/msw/dde.cpp:1157

 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:1168
+#: ../src/msw/dde.cpp:1172

 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:1162
+#: ../src/msw/dde.cpp:1166

 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"


@@ -7598,7 +7621,7 @@ msgstr ""
 "已被客户端终止的会话，或服务器\n"
 "在完成事务前终止。"
 
 "已被客户端终止的会话，或服务器\n"
 "在完成事务前终止。"
 

-#: ../src/msw/dde.cpp:1150
+#: ../src/msw/dde.cpp:1154

 msgid "a transaction failed."
 msgstr "事务失败。"
 
 msgid "a transaction failed."
 msgstr "事务失败。"
 


@@ -7606,7 +7629,7 @@ msgstr "事务失败。"
 msgid "alt"
 msgstr "alt"
 
 msgid "alt"
 msgstr "alt"
 

-#: ../src/msw/dde.cpp:1132
+#: ../src/msw/dde.cpp:1136

 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"


@@ -7618,15 +7641,15 @@ msgstr ""
 "或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
 "视图执行服务器事务。"
 
 "或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
 "视图执行服务器事务。"
 

-#: ../src/msw/dde.cpp:1156
+#: ../src/msw/dde.cpp:1160

 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用 PostMessage 失败。"
 
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "内部调用 PostMessage 失败。"
 

-#: ../src/msw/dde.cpp:1165
+#: ../src/msw/dde.cpp:1169

 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:1171
+#: ../src/msw/dde.cpp:1175

 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"


@@ -7637,11 +7660,10 @@ msgstr ""
 "回调函数事务标识符就不再有效。"
 
 #: ../src/common/zipstrm.cpp:1273
 "回调函数事务标识符就不再有效。"
 
 #: ../src/common/zipstrm.cpp:1273

-#, fuzzy

 msgid "assuming this is a multi-part zip concatenated"
 msgid "assuming this is a multi-part zip concatenated"

-msgstr "假定这是å\88\86段ç\9a\84zipæ\96\87件"
+msgstr "假定这是ä¸\80个å\88\86段 zip æ\96\87件ç\9a\84å\90\88并"

 
 

-#: ../src/common/fileconf.cpp:1878
+#: ../src/common/fileconf.cpp:1883

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s' 的修改。"
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略对只读键 '%s' 的修改。"


@@ -7658,11 +7680,11 @@ msgstr "错误的签名"
 msgid "bad zipfile offset to entry"
 msgstr "zip 文件中到条目的偏移值错误"
 
 msgid "bad zipfile offset to entry"
 msgstr "zip 文件中到条目的偏移值错误"
 

-#: ../src/common/ftp.cpp:408
+#: ../src/common/ftp.cpp:406

 msgid "binary"
 msgstr "二进制"
 
 msgid "binary"
 msgstr "二进制"
 

-#: ../src/common/fontcmn.cpp:951
+#: ../src/common/fontcmn.cpp:979

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


@@ -7670,7 +7692,7 @@ msgstr "粗体"
 msgid "buffer is too small for Windows directory."
 msgstr "Windows 目录的缓存太小。"
 
 msgid "buffer is too small for Windows directory."
 msgstr "Windows 目录的缓存太小。"
 

-#: ../src/msw/utils.cpp:1324
+#: ../src/msw/utils.cpp:1316

 #, c-format
 msgid "build %lu"
 msgstr "build %lu"
 #, c-format
 msgid "build %lu"
 msgstr "build %lu"


@@ -7680,17 +7702,17 @@ msgstr "build %lu"
 msgid "can't close file '%s'"
 msgstr "无法关闭文件 '%s'"
 
 msgid "can't close file '%s'"
 msgstr "无法关闭文件 '%s'"
 

-#: ../src/common/file.cpp:281
+#: ../src/common/file.cpp:279

 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "无法关闭文件描述符 %d"
 
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "无法关闭文件描述符 %d"
 

-#: ../src/common/file.cpp:579
+#: ../src/common/file.cpp:577

 #, 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:215
+#: ../src/common/file.cpp:213

 #, c-format
 msgid "can't create file '%s'"
 msgstr "无法创建文件 '%s'"
 #, c-format
 msgid "can't create file '%s'"
 msgstr "无法创建文件 '%s'"


@@ -7700,13 +7722,12 @@ msgstr "无法创建文件 '%s'"
 msgid "can't delete user configuration file '%s'"
 msgstr "无法删除用户配置文件 '%s'"
 
 msgid "can't delete user configuration file '%s'"
 msgstr "无法删除用户配置文件 '%s'"
 

-#: ../src/common/file.cpp:482
+#: ../src/common/file.cpp:480

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "无法确定是否已达描述符 %d 的尾部"
 
 #, 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:311 ../src/msdos/utilsdos.cpp:476

 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"
 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"


@@ -7715,32 +7736,30 @@ msgstr "执行 '%s'失败"
 msgid "can't find central directory in zip"
 msgstr "无法在 zip 文件中找到中央目录"
 
 msgid "can't find central directory in zip"
 msgstr "无法在 zip 文件中找到中央目录"
 

-#: ../src/common/file.cpp:452
+#: ../src/common/file.cpp:450

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的文件长度"
 
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的文件长度"
 

-#: ../src/msw/utils.cpp:376
+#: ../src/msw/utils.cpp:374

 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的 HOME 目录，使用当前目录。"
 
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到用户的 HOME 目录，使用当前目录。"
 

-#: ../src/common/file.cpp:353
+#: ../src/common/file.cpp:351

 #, 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:409
-#: ../src/msw/wince/filefnwce.cpp:199
+#: ../src/common/file.cpp:407 ../src/msw/wince/filefnwce.cpp:199

 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的指针位置"
 
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "无法获得文件描述符 %d 的指针位置"
 

-#: ../src/common/fontmap.cpp:324
+#: ../src/common/fontmap.cpp:326

 msgid "can't load any font, aborting"
 msgstr "无法装载任何字体，正在中止"
 
 msgid "can't load any font, aborting"
 msgstr "无法装载任何字体，正在中止"
 

-#: ../src/common/file.cpp:267
-#: ../src/common/ffile.cpp:64
+#: ../src/common/file.cpp:265 ../src/common/ffile.cpp:64

 #, c-format
 msgid "can't open file '%s'"
 msgstr "无法打开文件 '%s'"
 #, c-format
 msgid "can't open file '%s'"
 msgstr "无法打开文件 '%s'"


@@ -7767,23 +7786,22 @@ msgstr "无法重新初始化 zlib 压缩流。"
 msgid "can't re-initialize zlib inflate stream"
 msgstr "无法重新初始化 zlib 解压流。"
 
 msgid "can't re-initialize zlib inflate stream"
 msgstr "无法重新初始化 zlib 解压流。"
 

-#: ../src/common/file.cpp:305
+#: ../src/common/file.cpp:303

 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "无法读取文件描述符 %d"
 
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "无法读取文件描述符 %d"
 

-#: ../src/common/file.cpp:574
+#: ../src/common/file.cpp:572

 #, c-format
 msgid "can't remove file '%s'"
 msgstr "无法删除文件 '%s'"
 
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "无法删除文件 '%s'"
 

-#: ../src/common/file.cpp:591
+#: ../src/common/file.cpp:589

 #, 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:395
-#: ../src/msw/wince/filefnwce.cpp:185
+#: ../src/common/file.cpp:393 ../src/msw/wince/filefnwce.cpp:185

 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "无法定位文件描述符 %d"
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "无法定位文件描述符 %d"


@@ -7793,7 +7811,7 @@ msgstr "无法定位文件描述符 %d"
 msgid "can't write buffer '%s' to disk."
 msgstr "无法把缓存区 '%s' 写到磁盘。"
 
 msgid "can't write buffer '%s' to disk."
 msgstr "无法把缓存区 '%s' 写到磁盘。"
 

-#: ../src/common/file.cpp:321
+#: ../src/common/file.cpp:319

 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "无法写文件描述符 %d"
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "无法写文件描述符 %d"


@@ -7826,9 +7844,16 @@ msgstr ""
 #: ../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:218
-#: ../src/richtext/richtextsizepage.cpp:245
-#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:308
+#: ../src/richtext/richtextsizepage.cpp:335
+#: ../src/richtext/richtextsizepage.cpp:362
+#: ../src/richtext/richtextsizepage.cpp:389
+#: ../src/richtext/richtextsizepage.cpp:416
+#: ../src/richtext/richtextsizepage.cpp:443
+#: ../src/richtext/richtextsizepage.cpp:510
+#: ../src/richtext/richtextsizepage.cpp:538
+#: ../src/richtext/richtextsizepage.cpp:566
+#: ../src/richtext/richtextsizepage.cpp:594

 msgid "cm"
 msgstr "厘米"
 
 msgid "cm"
 msgstr "厘米"
 


@@ -7852,8 +7877,7 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/richtext/richtextstyles.cpp:759
-#: ../src/common/fmapbase.cpp:807
+#: ../src/richtext/richtextstyles.cpp:768 ../src/common/fmapbase.cpp:821

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 


@@ -7865,19 +7889,19 @@ msgstr ""
 msgid "dump of the process state (binary)"
 msgstr "转储进程状态（二进制码）"
 
 msgid "dump of the process state (binary)"
 msgstr "转储进程状态（二进制码）"
 

-#: ../src/common/datetimefmt.cpp:1782
+#: ../src/common/datetimefmt.cpp:1925

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetimefmt.cpp:1772
+#: ../src/common/datetimefmt.cpp:1915

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetimefmt.cpp:1775
+#: ../src/common/datetimefmt.cpp:1918

 msgid "eleventh"
 msgstr "第十一"
 
 msgid "eleventh"
 msgstr "第十一"
 

-#: ../src/common/fileconf.cpp:1864
+#: ../src/common/fileconf.cpp:1869

 #, 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' 中已出现一次以上"


@@ -7913,11 +7937,11 @@ msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s' 失败"
 
 msgid "failed to flush the file '%s'"
 msgstr "刷新文件 '%s' 失败"
 

-#: ../src/common/datetimefmt.cpp:1779
+#: ../src/common/datetimefmt.cpp:1922

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetimefmt.cpp:1769
+#: ../src/common/datetimefmt.cpp:1912

 msgid "fifth"
 msgstr "第五"
 
 msgid "fifth"
 msgstr "第五"
 


@@ -7946,23 +7970,23 @@ msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 

-#: ../src/richtext/richtextbuffer.cpp:7449
+#: ../src/richtext/richtextbuffer.cpp:7874

 msgid "files"
 msgstr "文件"
 
 msgid "files"
 msgstr "文件"
 

-#: ../src/common/datetimefmt.cpp:1765
+#: ../src/common/datetimefmt.cpp:1908

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 

-#: ../src/html/helpwnd.cpp:1260
+#: ../src/html/helpwnd.cpp:1266

 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetimefmt.cpp:1778
+#: ../src/common/datetimefmt.cpp:1921

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetimefmt.cpp:1768
+#: ../src/common/datetimefmt.cpp:1911

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 


@@ -7970,8 +7994,8 @@ msgstr "第四"
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 

-#: ../src/richtext/richtextbuffer.cpp:10307
-#: ../src/richtext/richtextbuffer.cpp:10417
+#: ../src/richtext/richtextbuffer.cpp:11223
+#: ../src/richtext/richtextbuffer.cpp:11333

 msgid "image"
 msgstr ""
 
 msgid "image"
 msgstr ""
 


@@ -7991,7 +8015,7 @@ msgstr ""
 msgid "invalid data in extended tar header"
 msgstr ""
 
 msgid "invalid data in extended tar header"
 msgstr ""
 

-#: ../src/generic/logg.cpp:1056
+#: ../src/generic/logg.cpp:1054

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 


@@ -7999,33 +8023,32 @@ msgstr "消息框返回无效的值"
 msgid "invalid zip file"
 msgstr "无效的 zip 文件"
 
 msgid "invalid zip file"
 msgstr "无效的 zip 文件"
 

-#: ../src/common/fontcmn.cpp:956
+#: ../src/common/fontcmn.cpp:984

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

-#: ../src/common/fontcmn.cpp:946
-#, fuzzy
+#: ../src/common/fontcmn.cpp:974

 msgid "light"
 msgid "light"

-msgstr "细"
+msgstr "细体"

 
 #: ../src/common/intl.cpp:296
 #, c-format
 msgid "locale '%s' cannot be set."
 msgstr "无法设置地区为 '%s'。"
 
 
 #: ../src/common/intl.cpp:296
 #, c-format
 msgid "locale '%s' cannot be set."
 msgstr "无法设置地区为 '%s'。"
 

-#: ../src/common/datetimefmt.cpp:1918
+#: ../src/common/datetimefmt.cpp:2081

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetimefmt.cpp:1783
+#: ../src/common/datetimefmt.cpp:1926

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetimefmt.cpp:1773
+#: ../src/common/datetimefmt.cpp:1916

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 

-#: ../src/msw/dde.cpp:1116
+#: ../src/msw/dde.cpp:1120

 msgid "no DDE error."
 msgstr "没有 DDE 错误。"
 
 msgid "no DDE error."
 msgstr "没有 DDE 错误。"
 


@@ -8042,16 +8065,15 @@ msgstr ""
 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetimefmt.cpp:1917
+#: ../src/common/datetimefmt.cpp:2080

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 

-#: ../src/richtext/richtextstyles.cpp:758
+#: ../src/richtext/richtextstyles.cpp:767

 msgid "normal"
 msgstr "正常"
 
 msgid "normal"
 msgstr "正常"
 

-#: ../src/gtk/print.cpp:1216
-#: ../src/gtk/print.cpp:1321
+#: ../src/gtk/print.cpp:1231 ../src/gtk/print.cpp:1336

 msgid "not implemented"
 msgstr ""
 
 msgid "not implemented"
 msgstr ""
 


@@ -8067,8 +8089,16 @@ msgstr "对象不能有 XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
 msgid "out of memory"
 msgstr "内存耗尽"
 

-#: ../src/richtext/richtextsizepage.cpp:219
-#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:309
+#: ../src/richtext/richtextsizepage.cpp:336
+#: ../src/richtext/richtextsizepage.cpp:363
+#: ../src/richtext/richtextsizepage.cpp:390
+#: ../src/richtext/richtextsizepage.cpp:417
+#: ../src/richtext/richtextsizepage.cpp:444
+#: ../src/richtext/richtextsizepage.cpp:511
+#: ../src/richtext/richtextsizepage.cpp:539
+#: ../src/richtext/richtextsizepage.cpp:567
+#: ../src/richtext/richtextsizepage.cpp:595

 msgid "percent"
 msgstr ""
 
 msgid "percent"
 msgstr ""
 


@@ -8076,6 +8106,12 @@ msgstr ""
 msgid "process context description"
 msgstr "进程上下文描述"
 
 msgid "process context description"
 msgstr "进程上下文描述"
 

+#: ../src/richtext/richtextfontpage.cpp:184
+#: ../src/richtext/richtextfontpage.cpp:187
+msgid "pt"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:185

 #: ../src/richtext/richtextborderspage.cpp:279
 #: ../src/richtext/richtextborderspage.cpp:281
 #: ../src/richtext/richtextborderspage.cpp:282
 #: ../src/richtext/richtextborderspage.cpp:279
 #: ../src/richtext/richtextborderspage.cpp:281
 #: ../src/richtext/richtextborderspage.cpp:282


@@ -8124,18 +8160,44 @@ 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:217
-#: ../src/richtext/richtextsizepage.cpp:220
-#: ../src/richtext/richtextsizepage.cpp:221
-#: ../src/richtext/richtextsizepage.cpp:244
-#: ../src/richtext/richtextsizepage.cpp:247
-#: ../src/richtext/richtextsizepage.cpp:248
-#: ../src/richtext/richtextsizepage.cpp:329
-#: ../src/richtext/richtextsizepage.cpp:331
-#: ../src/richtext/richtextsizepage.cpp:332
+#: ../src/richtext/richtextsizepage.cpp:307
+#: ../src/richtext/richtextsizepage.cpp:310
+#: ../src/richtext/richtextsizepage.cpp:311
+#: ../src/richtext/richtextsizepage.cpp:334
+#: ../src/richtext/richtextsizepage.cpp:337
+#: ../src/richtext/richtextsizepage.cpp:338
+#: ../src/richtext/richtextsizepage.cpp:361
+#: ../src/richtext/richtextsizepage.cpp:364
+#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:388
+#: ../src/richtext/richtextsizepage.cpp:391
+#: ../src/richtext/richtextsizepage.cpp:392
+#: ../src/richtext/richtextsizepage.cpp:415
+#: ../src/richtext/richtextsizepage.cpp:418
+#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:442
+#: ../src/richtext/richtextsizepage.cpp:445
+#: ../src/richtext/richtextsizepage.cpp:446
+#: ../src/richtext/richtextsizepage.cpp:509
+#: ../src/richtext/richtextsizepage.cpp:512
+#: ../src/richtext/richtextsizepage.cpp:513
+#: ../src/richtext/richtextsizepage.cpp:537
+#: ../src/richtext/richtextsizepage.cpp:540
+#: ../src/richtext/richtextsizepage.cpp:541
+#: ../src/richtext/richtextsizepage.cpp:565
+#: ../src/richtext/richtextsizepage.cpp:568
+#: ../src/richtext/richtextsizepage.cpp:569
+#: ../src/richtext/richtextsizepage.cpp:593
+#: ../src/richtext/richtextsizepage.cpp:596
+#: ../src/richtext/richtextsizepage.cpp:597

 msgid "px"
 msgstr "像素"
 
 msgid "px"
 msgstr "像素"
 

+#: ../src/common/accelcmn.cpp:189
+#, fuzzy
+msgid "rawctrl"
+msgstr "ctrl"
+

 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"


@@ -8150,11 +8212,11 @@ msgstr "读入 zip 流 (条目 %s): crc校验错误"
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入 zip 流 (条目 %s): 长度错误"
 
 msgid "reading zip stream (entry %s): bad length"
 msgstr "读入 zip 流 (条目 %s): 长度错误"
 

-#: ../src/msw/dde.cpp:1159
+#: ../src/msw/dde.cpp:1163

 msgid "reentrancy problem."
 msgstr "重入问题。"
 
 msgid "reentrancy problem."
 msgstr "重入问题。"
 

-#: ../src/common/datetimefmt.cpp:1766
+#: ../src/common/datetimefmt.cpp:1909

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 


@@ -8162,11 +8224,11 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetimefmt.cpp:1781
+#: ../src/common/datetimefmt.cpp:1924

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetimefmt.cpp:1771
+#: ../src/common/datetimefmt.cpp:1914

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 


@@ -8178,11 +8240,11 @@ msgstr "shift"
 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetimefmt.cpp:1780
+#: ../src/common/datetimefmt.cpp:1923

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetimefmt.cpp:1770
+#: ../src/common/datetimefmt.cpp:1913

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 


@@ -8194,23 +8256,23 @@ msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 msgid "specify the theme to use"
 msgstr "指定使用的主题"
 
 msgid "specify the theme to use"
 msgstr "指定使用的主题"
 

-#: ../src/richtext/richtextbuffer.cpp:7949
+#: ../src/richtext/richtextbuffer.cpp:8388

 msgid "standard/circle"
 msgstr ""
 
 msgid "standard/circle"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:7950
+#: ../src/richtext/richtextbuffer.cpp:8389

 msgid "standard/circle-outline"
 msgstr ""
 
 msgid "standard/circle-outline"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:7952
+#: ../src/richtext/richtextbuffer.cpp:8391

 msgid "standard/diamond"
 msgstr ""
 
 msgid "standard/diamond"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:7951
+#: ../src/richtext/richtextbuffer.cpp:8390

 msgid "standard/square"
 msgstr ""
 
 msgid "standard/square"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:7953
+#: ../src/richtext/richtextbuffer.cpp:8392

 msgid "standard/triangle"
 msgstr ""
 
 msgid "standard/triangle"
 msgstr ""
 


@@ -8222,60 +8284,61 @@ msgstr "Zip 头没有已存文件的长度信息"
 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/tarstrm.cpp:1004
-#: ../src/common/tarstrm.cpp:1026
-#: ../src/common/tarstrm.cpp:1508
-#: ../src/common/tarstrm.cpp:1530
+#: ../src/common/fontcmn.cpp:795 ../src/common/fontcmn.cpp:970
+msgid "strikethrough"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:1004 ../src/common/tarstrm.cpp:1026
+#: ../src/common/tarstrm.cpp:1508 ../src/common/tarstrm.cpp:1530

 msgid "tar entry not open"
 msgstr ""
 
 msgid "tar entry not open"
 msgstr ""
 

-#: ../src/common/datetimefmt.cpp:1774
+#: ../src/common/datetimefmt.cpp:1917

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 

-#: ../src/msw/dde.cpp:1123
+#: ../src/msw/dde.cpp:1127

 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"
 
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"
 

-#: ../src/common/datetimefmt.cpp:1767
+#: ../src/common/datetimefmt.cpp:1910

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetimefmt.cpp:1777
+#: ../src/common/datetimefmt.cpp:1920

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 

-#: ../src/common/datetimefmt.cpp:1571
+#: ../src/common/datetimefmt.cpp:1714

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetimefmt.cpp:1573
+#: ../src/common/datetimefmt.cpp:1716

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 

-#: ../src/common/fileconf.cpp:1975
+#: ../src/common/fileconf.cpp:1980

 #, c-format
 msgid "trailing backslash ignored in '%s'"
 msgstr ""
 
 #, c-format
 msgid "trailing backslash ignored in '%s'"
 msgstr ""
 

-#: ../src/gtk/aboutdlg.cpp:198
+#: ../src/gtk/aboutdlg.cpp:219

 msgid "translator-credits"
 msgstr ""
 
 msgid "translator-credits"
 msgstr ""
 

-#: ../src/common/datetimefmt.cpp:1776
+#: ../src/common/datetimefmt.cpp:1919

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetimefmt.cpp:1784
+#: ../src/common/datetimefmt.cpp:1927

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 

-#: ../src/common/fontcmn.cpp:771
-#: ../src/common/fontcmn.cpp:942
+#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966

 msgid "underlined"
 msgstr "下划线"
 
 msgid "underlined"
 msgstr "下划线"
 

-#: ../src/common/fileconf.cpp:2010
+#: ../src/common/fileconf.cpp:2015

 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."


@@ -8284,10 +8347,8 @@ msgstr "例外的 \" 在位置 %d (位于 '%s')."
 msgid "unexpected end of file"
 msgstr "意外到达文件结尾"
 
 msgid "unexpected end of file"
 msgstr "意外到达文件结尾"
 

-#: ../src/generic/progdlgg.cpp:389
-#: ../src/common/tarstrm.cpp:372
-#: ../src/common/tarstrm.cpp:395
-#: ../src/common/tarstrm.cpp:426
+#: ../src/generic/progdlgg.cpp:400 ../src/common/tarstrm.cpp:372
+#: ../src/common/tarstrm.cpp:395 ../src/common/tarstrm.cpp:426

 msgid "unknown"
 msgstr "未知"
 
 msgid "unknown"
 msgstr "未知"
 


@@ -8296,8 +8357,7 @@ msgstr "未知"
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
 msgid "unknown class %s"
 msgstr "未知类 %s"
 

-#: ../src/common/regex.cpp:262
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352

 msgid "unknown error"
 msgstr "未知错误"
 
 msgid "unknown error"
 msgstr "未知错误"
 


@@ -8310,22 +8370,21 @@ msgstr "未知错误 (错误号 %08x)。"
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 

-#: ../src/common/fmapbase.cpp:821
+#: ../src/common/fmapbase.cpp:835

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 

-#: ../src/common/docview.cpp:506
+#: ../src/common/docview.cpp:510

 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1584
+#: ../src/common/docview.cpp:1597

 #, 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:1797 ../src/common/zipstrm.cpp:2185

 msgid "unsupported Zip compression method"
 msgstr "不支持的 Zip 压缩方法"
 
 msgid "unsupported Zip compression method"
 msgstr "不支持的 Zip 压缩方法"
 


@@ -8338,15 +8397,15 @@ msgstr "使用目录 '%s' 从 '%s'。"
 msgid "write error"
 msgstr "写错误"
 
 msgid "write error"
 msgstr "写错误"
 

-#: ../src/common/stopwatch.cpp:268
+#: ../src/common/time.cpp:319

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败。"
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败。"
 

-#: ../src/gtk/print.cpp:979
+#: ../src/gtk/print.cpp:989

 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1298
+#: ../src/osx/carbon/dataview.cpp:1304

 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 
 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 


@@ -8363,16 +8422,15 @@ msgstr "wxWidgets 无法为 '%s' 打开显示设备: 退出。"
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 无法打开显示设备。退出。"
 
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 无法打开显示设备。退出。"
 

-#: ../src/richtext/richtextsymboldlg.cpp:431
+#: ../src/richtext/richtextsymboldlg.cpp:435

 msgid "xxxx"
 msgstr "xxxx"
 
 msgid "xxxx"
 msgstr "xxxx"
 

-#: ../src/common/datetimefmt.cpp:1572
+#: ../src/common/datetimefmt.cpp:1715

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 

-#: ../src/common/zstream.cpp:244
-#: ../src/common/zstream.cpp:419
+#: ../src/common/zstream.cpp:252 ../src/common/zstream.cpp:427

 #, c-format
 msgid "zlib error %d"
 msgstr "zlib 错误 %d"
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib 错误 %d"


@@ -8382,6 +8440,51 @@ msgstr "zlib 错误 %d"
 msgid "~"
 msgstr "~"
 
 msgid "~"
 msgstr "~"
 

+#~ msgid "&Preview..."
+#~ msgstr "预览(&P)..."
+
+#~ msgid "Passing an unkown object to GetObject"
+#~ msgstr "传递一个未知对象给GetObject"
+
+#~ msgid "Preview..."
+#~ msgstr "预览..."
+
+#~ msgid "&Save..."
+#~ msgstr "保存(&S)..."
+
+#~ msgid "About "
+#~ msgstr "关于"
+
+#~ msgid "All files (*.*)|*"
+#~ msgstr "所有文件 (*.*)|*"
+
+#~ msgid "Cannot initialize SciTech MGL!"
+#~ msgstr "无法初始化 SciTech MGL!"
+
+#~ msgid "Cannot initialize display."
+#~ msgstr "无法初始化显示。"
+
+#~ msgid "Cannot start thread: error writing TLS"
+#~ msgstr "无法启动线程: 写 TLS 错误"
+
+#~ msgid "Close\tAlt-F4"
+#~ msgstr "关闭\tAlt-F4"
+
+#~ msgid "Couldn't create cursor."
+#~ msgstr "无法创建光标。"
+
+#~ msgid "Directory '%s' doesn't exist!"
+#~ msgstr "目录 '%s'不存在!"
+
+#~ msgid "File %s does not exist."
+#~ msgstr "文件 %s 不存在。"
+
+#~ msgid "Mode %ix%i-%i not available."
+#~ msgstr "显示模式 %ix%i-%i位色 不支持。"
+
+#~ msgid "Paper Size"
+#~ msgstr "纸张大小"
+

 #~ msgid "%s"
 #~ msgstr "%s"
 
 #~ msgid "%s"
 #~ msgstr "%s"
 


@@ -8457,28 +8560,14 @@ msgstr "~"
 #~ msgid "Passing a already registered object to SetObjectName"
 #~ msgstr "传递一个已注册的对象给SetObjectName"
 
 #~ msgid "Passing a already registered object to SetObjectName"
 #~ msgstr "传递一个已注册的对象给SetObjectName"
 

-#, fuzzy
-#~ msgid "Passing an unknown object to GetObject"
-#~ msgstr "传递一个未知对象给GetObject"
-
-#~ msgid "Print previe&w"
-#~ msgstr "打印预览(&w)"
-

 #, fuzzy
 #~ msgid "Remaining time:"
 #~ msgstr "剩余时间 : "
 
 #, fuzzy
 #~ msgid "Remaining time:"
 #~ msgstr "剩余时间 : "
 

-#~ msgid "Save &As..."
-#~ msgstr "另存为(&A)..."
-

 #~ msgid ""
 #~ "Streaming delegates for not already streamed objects not yet supported"
 #~ msgstr "不支持针对尚未形成流的对象的流委派"
 
 #~ msgid ""
 #~ "Streaming delegates for not already streamed objects not yet supported"
 #~ msgstr "不支持针对尚未形成流的对象的流委派"
 

-#, fuzzy
-#~ msgid "The file '%s' couldn't be opened."
-#~ msgstr "文件不能被装载."
-

 #, fuzzy
 #~ msgid "The file '%s' doesn't exist and couldn't be opened."
 #~ msgstr ""
 #, fuzzy
 #~ msgid "The file '%s' doesn't exist and couldn't be opened."
 #~ msgstr ""


@@ -8653,10 +8742,6 @@ msgstr "~"
 #~ msgid "%s: ill-formed resource file syntax."
 #~ msgstr "%s: 不良资源文件语法."
 
 #~ msgid "%s: ill-formed resource file syntax."
 #~ msgstr "%s: 不良资源文件语法."
 

-#, fuzzy
-#~ msgid "&About"
-#~ msgstr "关于(&A)"
-

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