Removed redundant DoEnable

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 955e384b8261e26d229ccab60fb3a4d7c0fdb521..fd2f400353e577035d6c56d70aa35f99ef28414b 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets 2.8.10\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: wxWidgets 2.8.10\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-05-31 16:38+0200\n"
-"PO-Revision-Date: 2011-11-06 00:23-0800\n"
+"POT-Creation-Date: 2012-02-18 18:11+0100\n"
+"PO-Revision-Date: 2011-11-30 23:13-0800\n"

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


@@ -18,79 +18,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 

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

 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
 "\n"
 msgid ""
 "\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:202

 #: ../src/richtext/richtextstyledlg.cpp:214
 #: ../src/richtext/richtextstyledlg.cpp:214

+#: ../src/richtext/richtextstyledlg.cpp:226

 msgid " "
 msgstr " "
 
 #: ../src/generic/dbgrptg.cpp:323
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 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:355
+#: ../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:79
+#: ../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:1500
+#: ../src/common/docview.cpp:1605

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

-#: ../src/richtext/richtextprint.cpp:549
-#: ../src/html/htmprint.cpp:712
+#: ../src/richtext/richtextprint.cpp:582 ../src/html/htmprint.cpp:705

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

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

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

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

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

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

 msgid " light"
 msgstr " 细体"
 
 #: ../src/common/paper.cpp:119
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgid " light"
 msgstr " 细体"
 
 #: ../src/common/paper.cpp:119
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"

-msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
+msgstr "#10 信封，4 1/8 x 9 1/2 英寸"

 
 #: ../src/common/paper.cpp:120
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 
 #: ../src/common/paper.cpp:120
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"

-msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
+msgstr "#11 信封，4 1/2 x 10 3/8 英寸"

 
 #: ../src/common/paper.cpp:121
 msgid "#12 Envelope, 4 3/4 x 11 in"
 
 #: ../src/common/paper.cpp:121
 msgid "#12 Envelope, 4 3/4 x 11 in"

-msgstr "#12 信封, 4 3/4 x 11 英寸"
+msgstr "#12 信封，4 3/4 x 11 英寸"

 
 #: ../src/common/paper.cpp:122
 msgid "#14 Envelope, 5 x 11 1/2 in"
 
 #: ../src/common/paper.cpp:122
 msgid "#14 Envelope, 5 x 11 1/2 in"

-msgstr "#14 信封, 5 x 11 1/2 英寸"
+msgstr "#14 信封，5 x 11 1/2 英寸"

 
 #: ../src/common/paper.cpp:118
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 
 #: ../src/common/paper.cpp:118
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"

-msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
+msgstr "#9 信封，3 7/8 x 8 7/8 英寸"

 
 

-#: ../src/html/helpwnd.cpp:1042

 #: ../src/html/helpwnd.cpp:1044
 #: ../src/html/helpwnd.cpp:1044

-#: ../src/html/helpwnd.cpp:1685
-#: ../src/html/helpwnd.cpp:1723
+#, c-format
+msgid "%d of %lu"
+msgstr "%d / %lu"
+
+#: ../src/html/helpwnd.cpp:1687 ../src/html/helpwnd.cpp:1725

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


@@ -101,27 +101,27 @@ msgid "%ld byte"
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 
 msgid_plural "%ld bytes"
 msgstr[0] "%ld 字节"
 

-#: ../src/gtk/print.cpp:652
+#: ../src/html/helpwnd.cpp:1046

 #, c-format
 #, c-format

-msgid "%s"
-msgstr "%s"
+msgid "%lu of %lu"
+msgstr "%lu / %lu"

 
 

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

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

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

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

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

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

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

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


@@ -131,35 +131,34 @@ msgstr "%s 警告"
 msgid "%s did not fit the tar header for entry '%s'"
 msgstr ""
 
 msgid "%s did not fit the tar header for entry '%s'"
 msgstr ""
 

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

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

-#: ../src/common/stockitem.cpp:128
-#: ../src/html/helpfrm.cpp:142
-#: ../src/html/helpfrm.cpp:144
-msgid "&About..."
+#: ../src/common/stockitem.cpp:140 ../src/html/helpfrm.cpp:143
+#: ../src/html/helpfrm.cpp:145
+msgid "&About"

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

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

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

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

 msgid "&After a paragraph:"
 msgstr ""
 
 msgid "&After a paragraph:"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:138
-#: ../src/richtext/richtextliststylepage.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:141
+#: ../src/richtext/richtextliststylepage.cpp:320

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

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

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

-#: ../src/richtext/richtextstyledlg.cpp:237
+#: ../src/richtext/richtextstyledlg.cpp:255

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


@@ -167,48 +166,58 @@ msgstr "应用样式(&A)"
 msgid "&Arrange Icons"
 msgstr "重排图标(&A)"
 
 msgid "&Arrange Icons"
 msgstr "重排图标(&A)"
 

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

 msgid "&Ascending"
 msgstr ""
 
 msgid "&Ascending"
 msgstr ""
 

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

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

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

 msgid "&Based on:"
 msgstr ""
 
 msgid "&Based on:"
 msgstr ""
 

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

 msgid "&Before a paragraph:"
 msgstr ""
 
 msgid "&Before a paragraph:"
 msgstr ""
 

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

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

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

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

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

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

-#: ../src/richtext/richtextliststylepage.cpp:209
-#: ../src/richtext/richtextbulletspage.cpp:156
+#: ../src/richtext/richtextborderspage.cpp:359
+#: ../src/richtext/richtextborderspage.cpp:503
+#: ../src/richtext/richtextmarginspage.cpp:260
+#: ../src/richtext/richtextmarginspage.cpp:374
+msgid "&Bottom:"
+msgstr ""
+
+#: ../include/wx/richtext/richtextbuffer.h:3408
+#, fuzzy
+msgid "&Box"
+msgstr "粗体(&B)"
+
+#: ../src/richtext/richtextliststylepage.cpp:211
+#: ../src/richtext/richtextbulletspage.cpp:160

 msgid "&Bullet style:"
 msgstr ""
 
 msgid "&Bullet style:"
 msgstr ""
 

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

 msgid "&CD-Rom"
 msgstr ""
 
 msgid "&CD-Rom"
 msgstr ""
 

-#: ../src/generic/wizard.cpp:439
-#: ../src/generic/fontdlgg.cpp:472
-#: ../src/generic/fontdlgg.cpp:491
-#: ../src/osx/carbon/fontdlg.cpp:576
-#: ../src/common/stockitem.cpp:134
+#: ../src/generic/wizard.cpp:432 ../src/generic/fontdlgg.cpp:471
+#: ../src/generic/fontdlgg.cpp:490 ../src/osx/carbon/fontdlg.cpp:586
+#: ../src/common/stockitem.cpp:146

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


@@ -216,45 +225,47 @@ msgstr "取消(&C)"
 msgid "&Cascade"
 msgstr "层叠(&C)"
 
 msgid "&Cascade"
 msgstr "层叠(&C)"
 

-#: ../src/richtext/richtextsymboldlg.cpp:433
+#: ../include/wx/richtext/richtextbuffer.h:4870
+#, fuzzy
+msgid "&Cell"
+msgstr "取消(&C)"
+
+#: ../src/richtext/richtextsymboldlg.cpp:436

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

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

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

-#: ../src/generic/logg.cpp:528
-#: ../src/common/stockitem.cpp:137
-#: ../src/common/prntbase.cpp:1136
-#: ../src/html/helpfrm.cpp:139
+#: ../src/generic/logg.cpp:524 ../src/common/stockitem.cpp:149
+#: ../src/common/prntbase.cpp:1545 ../src/univ/themes/win32.cpp:3759
+#: ../src/html/helpfrm.cpp:140

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

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

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

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

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

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

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

-#: ../src/richtext/richtextctrl.cpp:297
-#: ../src/osx/textctrl_osx.cpp:588
-#: ../src/common/stockitem.cpp:139
-#: ../src/msw/textctrl.cpp:2175
+#: ../src/richtext/richtextctrl.cpp:326 ../src/osx/textctrl_osx.cpp:584
+#: ../src/common/stockitem.cpp:151 ../src/msw/textctrl.cpp:2223

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

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

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

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

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


@@ -262,196 +273,208 @@ msgstr "自定义(&C)..."
 msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 
 msgid "&Debug report preview:"
 msgstr "调试报告预览(&D): "
 

-#: ../src/richtext/richtexttabspage.cpp:141
-#: ../src/richtext/richtextctrl.cpp:299
-#: ../src/osx/textctrl_osx.cpp:590
-#: ../src/common/stockitem.cpp:141
-#: ../src/msw/textctrl.cpp:2177
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtextctrl.cpp:328 ../src/osx/textctrl_osx.cpp:586
+#: ../src/common/stockitem.cpp:153 ../src/msw/textctrl.cpp:2225

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

-#: ../src/richtext/richtextstyledlg.cpp:255
+#: ../src/richtext/richtextstyledlg.cpp:273

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

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

 msgid "&Descending"
 msgstr ""
 
 msgid "&Descending"
 msgstr ""
 

-#: ../src/generic/logg.cpp:695
+#: ../src/generic/logg.cpp:696

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

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

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

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

 msgid "&Edit"
 msgstr ""
 
 msgid "&Edit"
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:249
+#: ../src/richtext/richtextstyledlg.cpp:267

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

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

 msgid "&Execute"
 msgstr ""
 
 msgid "&Execute"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: ../src/common/stockitem.cpp:149
+#: ../src/richtext/richtextsizepage.cpp:196
+msgid "&Floating mode:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161

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

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

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

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

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

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

 msgid "&Font for Level..."
 msgstr ""
 
 msgid "&Font for Level..."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:137
-#: ../src/richtext/richtextsymboldlg.cpp:394
+#: ../src/richtext/richtextfontpage.cpp:144
+#: ../src/richtext/richtextsymboldlg.cpp:397

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

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

 msgid "&Forward"
 msgid "&Forward"

-msgstr "å\90\91å\89\8d(&F)"
+msgstr "å\89\8dè¿\9b(&F)"

 
 

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

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

-#: ../src/common/prntbase.cpp:1182
-msgid "&Goto..."
-msgstr "跳转(&G)..."
-
-#: ../src/common/stockitem.cpp:151
+#: ../src/common/stockitem.cpp:163

 msgid "&Harddisk"
 msgstr ""
 
 msgid "&Harddisk"
 msgstr ""
 

-#: ../src/generic/wizard.cpp:442
-#: ../src/osx/menu_osx.cpp:637
-#: ../src/common/stockitem.cpp:152
-#: ../src/html/helpfrm.cpp:147
+#: ../src/richtext/richtextsizepage.cpp:255
+msgid "&Height:"
+msgstr "高度(&H):"
+
+#: ../src/generic/wizard.cpp:435 ../src/richtext/richtextstyledlg.cpp:307
+#: ../src/richtext/richtextsymboldlg.cpp:476 ../src/osx/menu_osx.cpp:685
+#: ../src/common/stockitem.cpp:164 ../src/html/helpfrm.cpp:148

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

-#: ../src/common/stockitem.cpp:153
+#: ../include/wx/richmsgdlg.h:31
+msgid "&Hide details"
+msgstr "隐藏细节(&H)"
+
+#: ../src/common/stockitem.cpp:165

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

-#: ../src/richtext/richtextindentspage.cpp:194
-#: ../src/richtext/richtextliststylepage.cpp:371
+#: ../src/richtext/richtextindentspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:373

 msgid "&Indentation (tenths of a mm)"
 msgstr ""
 
 msgid "&Indentation (tenths of a mm)"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:177
-#: ../src/richtext/richtextliststylepage.cpp:355
+#: ../src/richtext/richtextindentspage.cpp:180
+#: ../src/richtext/richtextliststylepage.cpp:357

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

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

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

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

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

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

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

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

 msgid "&Jump to"
 msgstr ""
 
 msgid "&Jump to"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:163
-#: ../src/richtext/richtextliststylepage.cpp:341
+#: ../src/richtext/richtextindentspage.cpp:166
+#: ../src/richtext/richtextliststylepage.cpp:343

 #, fuzzy
 msgid "&Justified"
 msgstr "分散对齐"
 
 #, fuzzy
 msgid "&Justified"
 msgstr "分散对齐"
 

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

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

-#: ../src/richtext/richtextindentspage.cpp:149
-#: ../src/richtext/richtextliststylepage.cpp:327
+#: ../src/richtext/richtextindentspage.cpp:152
+#: ../src/richtext/richtextliststylepage.cpp:329

 msgid "&Left"
 msgstr ""
 
 msgid "&Left"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:205
-#: ../src/richtext/richtextliststylepage.cpp:380
+#: ../src/richtext/richtextindentspage.cpp:208
+#: ../src/richtext/richtextborderspage.cpp:269
+#: ../src/richtext/richtextborderspage.cpp:413
+#: ../src/richtext/richtextliststylepage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:187
+#: ../src/richtext/richtextmarginspage.cpp:301

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

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

 msgid "&List level:"
 msgstr ""
 
 msgid "&List level:"
 msgstr ""
 

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

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

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

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

-#: ../src/common/stockitem.cpp:164
+#: ../src/richtext/richtextsizepage.cpp:477
+msgid "&Move the object to:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:176

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

-#: ../src/richtext/richtexttabspage.cpp:135
-#: ../src/common/stockitem.cpp:165
+#: ../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:105
+#: ../src/aui/tabmdi.cpp:108 ../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:438
-#: ../src/generic/wizard.cpp:630
+#: ../src/generic/wizard.cpp:431 ../src/generic/wizard.cpp:626

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

+#: ../src/richtext/richtextsizepage.cpp:486
+msgid "&Next Paragraph"
+msgstr ""
+

 #: ../src/generic/tipdlg.cpp:277
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
 #: ../src/generic/tipdlg.cpp:277
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 

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

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

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

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


@@ -459,80 +482,87 @@ msgstr "否(&N)"
 msgid "&Notes:"
 msgstr "注意(&N):"
 
 msgid "&Notes:"
 msgstr "注意(&N):"
 

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

 msgid "&Number:"
 msgstr ""
 
 msgid "&Number:"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:477
-#: ../src/generic/fontdlgg.cpp:484
-#: ../src/osx/carbon/fontdlg.cpp:582
-#: ../src/common/stockitem.cpp:167
+#: ../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:168
-#: ../src/html/helpfrm.cpp:137
+#: ../src/generic/dbgrptg.cpp:339 ../src/common/stockitem.cpp:180
+#: ../src/html/helpfrm.cpp:138

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

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

 msgid "&Outline level:"
 msgstr ""
 
 msgid "&Outline level:"
 msgstr ""
 

-#: ../src/richtext/richtextctrl.cpp:298
-#: ../src/osx/textctrl_osx.cpp:589
-#: ../src/common/stockitem.cpp:169
-#: ../src/msw/textctrl.cpp:2176
+#: ../src/richtext/richtextindentspage.cpp:318
+msgid "&Page Break"
+msgstr ""
+
+#: ../src/richtext/richtextctrl.cpp:327 ../src/osx/textctrl_osx.cpp:585
+#: ../src/common/stockitem.cpp:181 ../src/msw/textctrl.cpp:2224

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

-#: ../src/generic/fontdlgg.cpp:424
+#: ../include/wx/richtext/richtextbuffer.h:4051
+msgid "&Picture"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:423

 msgid "&Point size:"
 msgid "&Point size:"

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

 
 

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

 msgid "&Position (tenths of a mm):"
 msgstr ""
 
 msgid "&Position (tenths of a mm):"
 msgstr ""
 

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

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

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

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

-#: ../src/common/stockitem.cpp:172
-#: ../src/common/prntbase.cpp:1141
+#: ../src/richtext/richtextsizepage.cpp:480
+#, fuzzy
+msgid "&Previous Paragraph"
+msgstr "前页"
+
+#: ../src/common/stockitem.cpp:184

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

-#: ../src/common/stockitem.cpp:173
+#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4730
+#: ../src/common/stockitem.cpp:185

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

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

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

-#: ../src/richtext/richtextctrl.cpp:294
-#: ../src/osx/textctrl_osx.cpp:585
-#: ../src/common/stockitem.cpp:174
-#: ../src/common/cmdproc.cpp:292
-#: ../src/common/cmdproc.cpp:299
-#: ../src/msw/textctrl.cpp:2172
+#: ../src/richtext/richtextctrl.cpp:323 ../src/osx/textctrl_osx.cpp:581
+#: ../src/common/stockitem.cpp:186 ../src/common/cmdproc.cpp:294
+#: ../src/common/cmdproc.cpp:301 ../src/msw/textctrl.cpp:2220

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

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

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

-#: ../src/richtext/richtextstyledlg.cpp:243
+#: ../src/richtext/richtextstyledlg.cpp:261

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


@@ -540,292 +570,333 @@ msgstr ""
 msgid "&Replace"
 msgstr "替换(&R)"
 
 msgid "&Replace"
 msgstr "替换(&R)"
 

-#: ../src/richtext/richtextstyledlg.cpp:273
+#: ../src/richtext/richtextstyledlg.cpp:291

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

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

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

-#: ../src/richtext/richtextindentspage.cpp:156
-#: ../src/richtext/richtextliststylepage.cpp:334
+#: ../src/richtext/richtextindentspage.cpp:159
+#: ../src/richtext/richtextliststylepage.cpp:336

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

-#: ../src/richtext/richtextindentspage.cpp:229
-#: ../src/richtext/richtextliststylepage.cpp:402
+#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextborderspage.cpp:299
+#: ../src/richtext/richtextborderspage.cpp:443
+#: ../src/richtext/richtextliststylepage.cpp:400
+#: ../src/richtext/richtextmarginspage.cpp:212
+#: ../src/richtext/richtextmarginspage.cpp:326

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

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

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

-#: ../src/generic/logg.cpp:524
-msgid "&Save..."
-msgstr "保存(&S)..."
+#: ../src/common/stockitem.cpp:192
+msgid "&Save as"
+msgstr "另存为(&S)"
+
+#: ../include/wx/richmsgdlg.h:30
+msgid "&See details"
+msgstr "查看细节(&S)"

 
 #: ../src/generic/tipdlg.cpp:271
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 
 
 #: ../src/generic/tipdlg.cpp:271
 msgid "&Show tips at startup"
 msgstr "启动时显示技巧(&S)"
 

-#: ../src/univ/themes/win32.cpp:3774
+#: ../src/univ/themes/win32.cpp:3753

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

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

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

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

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

-#: ../src/richtext/richtextindentspage.cpp:272
-#: ../src/richtext/richtextliststylepage.cpp:422
+#: ../src/richtext/richtextindentspage.cpp:267
+#: ../src/richtext/richtextliststylepage.cpp:418

 msgid "&Spacing (tenths of a mm)"
 msgstr ""
 
 msgid "&Spacing (tenths of a mm)"
 msgstr ""
 

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

 msgid "&Spell Check"
 msgstr ""
 
 msgid "&Spell Check"
 msgstr ""
 

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

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

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

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

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

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

-#: ../src/richtext/richtextstyledlg.cpp:190
+#: ../src/richtext/richtextstyledlg.cpp:202

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

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

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

-#: ../src/richtext/richtextliststylepage.cpp:267
-#: ../src/richtext/richtextbulletspage.cpp:219
+#: ../src/richtext/richtextliststylepage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:223

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

-#: ../src/common/stockitem.cpp:189
+#: ../include/wx/richtext/richtextbuffer.h:4952
+msgid "&Table"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:201

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

-#: ../src/generic/fontdlgg.cpp:446
-#: ../src/common/stockitem.cpp:191
+#: ../src/richtext/richtextborderspage.cpp:329
+#: ../src/richtext/richtextborderspage.cpp:473
+#: ../src/richtext/richtextmarginspage.cpp:235
+#: ../src/richtext/richtextmarginspage.cpp:349
+msgid "&Top:"
+msgstr "顶端(&T):"
+
+#: ../src/generic/fontdlgg.cpp:445 ../src/common/stockitem.cpp:203

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

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

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

-#: ../src/richtext/richtextctrl.cpp:293
-#: ../src/osx/textctrl_osx.cpp:584
-#: ../src/common/stockitem.cpp:192
-#: ../src/common/cmdproc.cpp:270
-#: ../src/msw/textctrl.cpp:2171
+#: ../src/richtext/richtextctrl.cpp:322 ../src/osx/textctrl_osx.cpp:580
+#: ../src/common/stockitem.cpp:204 ../src/common/cmdproc.cpp:272
+#: ../src/msw/textctrl.cpp:2219

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

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

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

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

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

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

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

+#: ../src/richtext/richtextsizepage.cpp:408
+msgid "&Vertical alignment:"
+msgstr "垂直对齐(&V)"
+

 #: ../src/generic/dbgrptg.cpp:337
 msgid "&View..."
 msgstr "查看(&V)..."
 
 #: ../src/generic/dbgrptg.cpp:337
 msgid "&View..."
 msgstr "查看(&V)..."
 

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

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

-#: ../src/aui/tabmdi.cpp:301
-#: ../src/aui/tabmdi.cpp:317
-#: ../src/aui/tabmdi.cpp:319
-#: ../src/generic/mdig.cpp:299
-#: ../src/generic/mdig.cpp:315
-#: ../src/generic/mdig.cpp:319
+#: ../src/richtext/richtextsizepage.cpp:228
+msgid "&Width:"
+msgstr "宽度(&W):"
+
+#: ../src/aui/tabmdi.cpp:301 ../src/aui/tabmdi.cpp:317
+#: ../src/aui/tabmdi.cpp:319 ../src/generic/mdig.cpp:295
+#: ../src/generic/mdig.cpp:311 ../src/generic/mdig.cpp:315

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

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

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

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

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

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

 #, c-format
 msgid "'%s' has extra '..', ignored."
 #, c-format
 msgid "'%s' has extra '..', ignored."

-msgstr "'%s' 有额外的 '..', 忽略之."
+msgstr "'%s' 有额外的 '..'，忽略之。"

 
 

-#: ../src/common/valtext.cpp:240
-#: ../src/common/valtext.cpp:242
-#: ../src/common/valtext.cpp:244
-#: ../src/common/valtext.cpp:246
+#: ../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:878
-#: ../src/common/cmdline.cpp:896
+#: ../src/common/cmdline.cpp:941 ../src/common/cmdline.cpp:959

 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."

-msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
+msgstr "'%s' 不是匹配选项 '%s'的正确数字值。"

 
 

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

 #, c-format
 msgid "'%s' is not a valid message catalog."
 #, c-format
 msgid "'%s' is not a valid message catalog."

-msgstr "'%s' 不是有效的消息目录."
+msgstr "'%s' 不是有效的消息目录。"

 
 #: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."
 
 #: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."

-msgstr "'%s' 或许是一个二进制文件."
+msgstr "'%s' 或许是一个二进制文件。"

 
 

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

 #, c-format
 msgid "'%s' should be numeric."
 #, c-format
 msgid "'%s' should be numeric."

-msgstr "'%s' 应该是一个数值."
+msgstr "'%s' 应该是一个数值。"

 
 

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

 #, c-format
 msgid "'%s' should only contain ASCII characters."
 #, c-format
 msgid "'%s' should only contain ASCII characters."

-msgstr "'%s' 应该仅包含ASCII字符."
+msgstr "'%s' 应该仅包含ASCII字符。"

 
 

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

 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 #, c-format
 msgid "'%s' should only contain alphabetic characters."

-msgstr "'%s' 应仅包含字母字符."
+msgstr "'%s' 应仅包含字母字符。"

 
 

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

 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."

-msgstr "'%s' 应仅包含字母或数字字符."
+msgstr "'%s' 应仅包含字母或数字字符。"

 
 

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

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

-#: ../src/richtext/richtextliststylepage.cpp:228
-#: ../src/richtext/richtextbulletspage.cpp:176
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextbulletspage.cpp:180

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

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

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

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

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

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

 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:424 ../src/html/helpwnd.cpp:1116
+#: ../src/html/helpwnd.cpp:1752

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

-#: ../src/richtext/richtextformatdlg.cpp:629
+#: ../src/richtext/richtextindentspage.cpp:239
+#: ../src/richtext/richtextindentspage.cpp:250
+#: ../src/richtext/richtextindentspage.cpp:251
+#: ../src/richtext/richtextindentspage.cpp:299
+#: ../src/richtext/richtextindentspage.cpp:311
+#: ../src/richtext/richtextindentspage.cpp:312
+#: ../src/richtext/richtextformatdlg.cpp:824
+#: ../src/richtext/richtextfontpage.cpp:291
+#: ../src/richtext/richtextfontpage.cpp:295
+#: ../src/richtext/richtextfontpage.cpp:299
+#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextliststylepage.cpp:461
+#: ../src/richtext/richtextliststylepage.cpp:462

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

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

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

-#: ../src/richtext/richtextliststylepage.cpp:235
-#: ../src/richtext/richtextbulletspage.cpp:183
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextbulletspage.cpp:187

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

-#: ../src/richtext/richtextliststylepage.cpp:497
-#: ../src/richtext/richtextbulletspage.cpp:297
+#: ../src/richtext/richtextliststylepage.cpp:496
+#: ../src/richtext/richtextbulletspage.cpp:301

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

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

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

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

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

-#: ../src/richtext/richtextindentspage.cpp:246
+#: ../src/generic/filepickerg.cpp:67
+msgid "..."
+msgstr "..."
+
+#: ../src/richtext/richtextindentspage.cpp:240

 msgid "1"
 msgstr "1"
 
 msgid "1"
 msgstr "1"
 

-#: ../src/richtext/richtextindentspage.cpp:315
+#: ../src/richtext/richtextindentspage.cpp:301
+#: ../src/richtext/richtextliststylepage.cpp:451

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

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

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

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

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

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

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

-#: ../src/richtext/richtextindentspage.cpp:319
-#: ../src/richtext/richtextliststylepage.cpp:460
+#: ../src/richtext/richtextindentspage.cpp:305
+#: ../src/richtext/richtextliststylepage.cpp:455

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

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

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

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

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

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

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

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

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

+#: ../src/richtext/richtextindentspage.cpp:249
+msgid "10"
+msgstr "10"
+

 #: ../src/common/paper.cpp:142
 msgid "10 x 11 in"
 msgstr "10 x 11 英寸"
 #: ../src/common/paper.cpp:142
 msgid "10 x 11 in"
 msgstr "10 x 11 英寸"


@@ -846,41 +917,41 @@ msgstr "12 x 11 英寸"
 msgid "15 x 11 in"
 msgstr "15 x 11 英寸"
 
 msgid "15 x 11 in"
 msgstr "15 x 11 英寸"
 

-#: ../src/richtext/richtextindentspage.cpp:247
-#: ../src/richtext/richtextindentspage.cpp:324
-#: ../src/richtext/richtextliststylepage.cpp:461
+#: ../src/richtext/richtextindentspage.cpp:241
+#: ../src/richtext/richtextindentspage.cpp:310
+#: ../src/richtext/richtextliststylepage.cpp:460

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

-#: ../src/richtext/richtextindentspage.cpp:248
+#: ../src/richtext/richtextindentspage.cpp:242

 msgid "3"
 msgstr "3"
 
 msgid "3"
 msgstr "3"
 

-#: ../src/richtext/richtextindentspage.cpp:249
+#: ../src/richtext/richtextindentspage.cpp:243

 msgid "4"
 msgstr "4"
 
 msgid "4"
 msgstr "4"
 

-#: ../src/richtext/richtextindentspage.cpp:250
+#: ../src/richtext/richtextindentspage.cpp:244

 msgid "5"
 msgstr "5"
 
 msgid "5"
 msgstr "5"
 

-#: ../src/richtext/richtextindentspage.cpp:251
+#: ../src/richtext/richtextindentspage.cpp:245

 msgid "6"
 msgstr "6"
 
 #: ../src/common/paper.cpp:134
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgid "6"
 msgstr "6"
 
 #: ../src/common/paper.cpp:134
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"

-msgstr "6又3/4 信封, 3 5/8 x 6 1/2 英寸"
+msgstr "6 3/4 信封, 3 5/8 x 6 1/2 英寸"

 
 

-#: ../src/richtext/richtextindentspage.cpp:252
+#: ../src/richtext/richtextindentspage.cpp:246

 msgid "7"
 msgstr "7"
 
 msgid "7"
 msgstr "7"
 

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

 msgid "8"
 msgstr "8"
 
 msgid "8"
 msgstr "8"
 

-#: ../src/richtext/richtextindentspage.cpp:254
+#: ../src/richtext/richtextindentspage.cpp:248

 msgid "9"
 msgstr "9"
 
 msgid "9"
 msgstr "9"
 


@@ -890,132 +961,103 @@ msgstr "9 x 11 英寸"
 
 #: ../src/html/htmprint.cpp:432
 msgid ": file does not exist!"
 
 #: ../src/html/htmprint.cpp:432
 msgid ": file does not exist!"

-msgstr ": 文件不存在!"
+msgstr ": 文件不存在！"

 
 

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

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

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

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

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

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

-#: ../src/common/prntbase.cpp:1164
-msgid "<<"
-msgstr "<<"
-
-#: ../src/osx/carbon/fontdlg.cpp:596
-#: ../src/osx/carbon/fontdlg.cpp:803
-#: ../src/osx/carbon/fontdlg.cpp:823
-#, fuzzy
+#: ../src/osx/carbon/fontdlg.cpp:606 ../src/osx/carbon/fontdlg.cpp:813
+#: ../src/osx/carbon/fontdlg.cpp:833

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

-msgstr "修饰"
+msgstr "<任意 Decorative>"

 
 

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

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

-msgstr "现代"
+msgstr "<任意 Modern>"

 
 

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

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

-msgstr "罗马"
+msgstr "<任意 Roman>"

 
 

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

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

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

 
 

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

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

-msgstr "瑞士"
+msgstr "<任意 Swiss>"

 
 

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

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

-msgstr "电传打字机"
+msgstr "<任意 Teletype>"

 
 

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

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

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

 msgid "<DIR>"
 msgstr "<目录>"
 
 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:1276

 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:1280

 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:1275

 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:1274

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

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

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

-#: ../src/common/prntbase.cpp:1170
-msgid ">>"
-msgstr ">>"
-
-#: ../src/common/prntbase.cpp:1176
-msgid ">>|"
-msgstr ">>|"
-

 #: ../src/generic/dbgrptg.cpp:315
 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 
 #: ../src/generic/dbgrptg.cpp:315
 msgid "A debug report has been generated in the directory\n"
 msgstr "产生了一份调试报告, 位于目录\n"
 

-#: ../src/common/debugrpt.cpp:567
-#, fuzzy
+#: ../src/common/debugrpt.cpp:569

 msgid "A debug report has been generated. It can be found in"
 msgid "A debug report has been generated. It can be found in"

-msgstr "产生了一份调试报告, 位于目录\n"
+msgstr "产生了一份调试报告, 位于"

 
 

-#: ../src/common/xtixml.cpp:406
-#, fuzzy
+#: ../src/common/xtixml.cpp:419

 msgid "A non empty collection must consist of 'element' nodes"
 msgid "A non empty collection must consist of 'element' nodes"

-msgstr "非空集合必须包含元素('element')节点"
+msgstr "非空集合必须包含 'element' 节点"

 
 

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

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

-#: ../src/richtext/richtextbulletspage.cpp:254
-#: ../src/richtext/richtextbulletspage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:307
+#: ../src/richtext/richtextbulletspage.cpp:258
+#: ../src/richtext/richtextbulletspage.cpp:260

 msgid "A standard bullet name."
 msgstr ""
 
 msgid "A standard bullet name."
 msgstr ""
 


@@ -1099,32 +1141,33 @@ 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:85
-#: ../src/richtext/richtextformatdlg.cpp:426
-#: ../src/osx/carbon/fontdlg.cpp:327
+#: ../src/generic/fontdlgg.cpp:84 ../src/richtext/richtextformatdlg.cpp:521
+#: ../src/osx/carbon/fontdlg.cpp:337

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

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

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

-#: ../src/richtext/richtextsymboldlg.cpp:452
-#: ../src/common/ftp.cpp:405
+#: ../src/richtext/richtextsymboldlg.cpp:455 ../src/common/ftp.cpp:408

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

-#: ../src/generic/aboutdlgg.cpp:141
-msgid "About "
+#: ../src/osx/menu_osx.cpp:537 ../src/common/stockitem.cpp:140
+msgid "About"

 msgstr "关于"
 
 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:129
-#: ../src/propgrid/props.cpp:2133
+#: ../src/common/stockitem.cpp:208
+msgid "Actual Size"
+msgstr "实际大小"
+
+#: ../src/common/stockitem.cpp:141

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


@@ -1132,117 +1175,136 @@ msgstr "加入"
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 

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

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

-#: ../src/osx/dataview_osx.cpp:99
-msgid "Added item is invalid."
-msgstr ""
+#: ../include/wx/xtiprop.h:260
+msgid "AddToPropertyCollection called on a generic accessor"
+msgstr "在一个通用处理器上调用AddToPropertyCollection"
+
+#: ../include/wx/xtiprop.h:198
+msgid "AddToPropertyCollection called w/o valid adder"
+msgstr "调用AddToPropertyCollection时未带有效的adder"

 
 

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

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

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

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

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

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

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

 msgid "After a paragraph:"
 msgstr ""
 
 msgid "After a paragraph:"
 msgstr ""
 

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

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

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

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

+#: ../src/richtext/richtextsizepage.cpp:396
+msgid "Alignment"
+msgstr "对齐"
+

 #: ../src/generic/prntdlgg.cpp:221
 msgid "All"
 msgstr "所有"
 
 #: ../src/generic/prntdlgg.cpp:221
 msgid "All"
 msgstr "所有"
 

-#: ../src/generic/filectrlg.cpp:1195
-#: ../src/common/fldlgcmn.cpp:80
+#: ../src/generic/filectrlg.cpp:1195 ../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:2658
+#: ../include/wx/defs.h:2769

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

-#: ../src/html/helpwnd.cpp:1560
-msgid "All files (*.*)|*"
-msgstr "所有文件 (*)|*"
-
-#: ../include/wx/defs.h:2655
-#: ../src/propgrid/props.cpp:1609
-#: ../src/propgrid/props.cpp:1638
+#: ../include/wx/defs.h:2766

 msgid "All files (*.*)|*.*"
 msgid "All files (*.*)|*.*"

-msgstr "所有文件 (*)|*"
+msgstr "所有文件 (*.*)|*.*"

 
 

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

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

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

 msgid "Alphabetic Mode"
 msgstr ""
 
 msgid "Alphabetic Mode"
 msgstr ""
 

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

 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgid "Already Registered Object passed to SetObjectClassInfo"

-msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
+msgstr "传递已注册对象给 SetObjectClassInfo"

 
 

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

 msgid "Already dialling ISP."
 msgid "Already dialling ISP."

-msgstr "已经拨接ISP."
+msgstr "已经拨接 ISP 。"

 
 

-#: ../src/common/accelcmn.cpp:294
+#: ../src/common/accelcmn.cpp:311 ../src/univ/themes/win32.cpp:3759

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

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

 msgid "And includes the following files:\n"
 msgstr "并且包含以下文件:\n"
 
 #: ../src/generic/animateg.cpp:163
 msgid "And includes the following files:\n"
 msgstr "并且包含以下文件:\n"
 
 #: ../src/generic/animateg.cpp:163

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

 msgid "Animation file is not of type %ld."
 msgid "Animation file is not of type %ld."

-msgstr "å\9b¾å\83\8fæ\96\87件ç\9a\84ç±»å\9e\8bä¸\8dæ\98¯ %d."
+msgstr "å\8a¨ç\94»æ\96\87件ç\9a\84ç±»å\9e\8bä¸\8dæ\98¯ %ldã\80\82"

 
 

-#: ../src/generic/logg.cpp:1035
+#: ../src/generic/logg.cpp:1036

 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"

-msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
+msgstr "把日志添加到文件 '%s' (选择 [否] 将覆盖该文件)?"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:484
-#: ../src/richtext/richtextbulletspage.cpp:284
+#: ../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/richtext/richtextliststylepage.cpp:483
+#: ../src/richtext/richtextbulletspage.cpp:288

 msgid "Arabic"
 msgstr ""
 
 msgid "Arabic"
 msgstr ""
 

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

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

+#: ../src/msw/ole/automtn.cpp:643
+#, c-format
+msgid "Argument %u not found."
+msgstr "找不到参数 %u。"
+

 #: ../src/generic/aboutdlgg.cpp:185
 msgid "Artists"
 msgstr ""
 
 #: ../src/generic/aboutdlgg.cpp:185
 msgid "Artists"
 msgstr ""
 

+#: ../src/common/stockitem.cpp:196
+msgid "Ascending"
+msgstr "升序"
+

 #: ../src/generic/filectrlg.cpp:462
 msgid "Attributes"
 msgstr "属性(Attributes)"
 
 #: ../src/generic/filectrlg.cpp:462
 msgid "Attributes"
 msgstr "属性(Attributes)"
 

-#: ../src/richtext/richtextliststylepage.cpp:293
-#: ../src/richtext/richtextbulletspage.cpp:242
-#: ../src/richtext/richtextbulletspage.cpp:244
+#: ../src/richtext/richtextliststylepage.cpp:295
+#: ../src/richtext/richtextbulletspage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:248

 msgid "Available fonts."
 msgstr ""
 
 msgid "Available fonts."
 msgstr ""
 


@@ -1294,96 +1356,123 @@ msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 

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

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

-#: ../src/common/fmapbase.cpp:195
-msgid "BIG5"
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:514
-#: ../src/common/imagbmp.cpp:536
-#: ../src/common/imagbmp.cpp:551
+#: ../src/common/imagbmp.cpp:524 ../src/common/imagbmp.cpp:554
+#: ../src/common/imagbmp.cpp:569

 msgid "BMP: Couldn't allocate memory."
 msgid "BMP: Couldn't allocate memory."

-msgstr "BMP: 不能分配内存."
+msgstr "BMP: 无法分配内存。"

 
 

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

 msgid "BMP: Couldn't save invalid image."
 msgid "BMP: Couldn't save invalid image."

-msgstr "BMP: 不能保存无效图像."
+msgstr "BMP: 无法保存无效图像。"

 
 

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

 msgid "BMP: Couldn't write RGB color map."
 msgid "BMP: Couldn't write RGB color map."

-msgstr "BMP: 不能写RGB色彩表."
+msgstr "BMP: 无法写 RGB 色彩表。"

 
 

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

 msgid "BMP: Couldn't write data."
 msgid "BMP: Couldn't write data."

-msgstr "BMP: 不能写数据."
+msgstr "BMP: 无法写数据。"

 
 

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

 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgid "BMP: Couldn't write the file (Bitmap) header."

-msgstr "BMP: 不能写文件头(Bitmap)."
+msgstr "BMP: 无法写文件头 (Bitmap)。"

 
 

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

 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgid "BMP: Couldn't write the file (BitmapInfo) header."

-msgstr "BMP: 不能写文件头(BitmapInfo)."
+msgstr "BMP: 无法写文件头 (BitmapInfo)。"

 
 

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

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

-msgstr "BMP: wxImage没有自己的wxPalette."
+msgstr "BMP: wxImage 没有自己的 wxPalette。"
+
+#: ../src/common/stockitem.cpp:143
+msgid "Back"
+msgstr "返回"
+
+#: ../src/richtext/richtextbackgroundpage.cpp:119
+#: ../src/richtext/richtextformatdlg.cpp:369
+msgid "Background"
+msgstr ""
+
+#: ../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"
 msgstr ""
 
 msgid "Background colour"
 msgstr ""
 

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

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

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

 msgid "Baltic (old) (ISO-8859-4)"
 msgid "Baltic (old) (ISO-8859-4)"

-msgstr "波罗的海语 (旧的) (ISO-8859-4)"
+msgstr "波罗的海语 (旧式) (ISO-8859-4)"

 
 

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

 msgid "Before a paragraph:"
 msgstr ""
 
 msgid "Before a paragraph:"
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:491
-#: ../src/richtext/richtextbulletspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:490
+#: ../src/richtext/richtextbulletspage.cpp:295

 msgid "Bitmap"
 msgstr ""
 
 msgid "Bitmap"
 msgstr ""
 

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

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

+#: ../src/richtext/richtextborderspage.cpp:256
+#: ../src/richtext/richtextborderspage.cpp:389
+msgid "Border"
+msgstr "边框"
+
+#: ../src/richtext/richtextformatdlg.cpp:363
+msgid "Borders"
+msgstr "边框"
+
+#: ../src/richtext/richtextsizepage.cpp:418 ../src/common/stockitem.cpp:145
+msgid "Bottom"
+msgstr ""
+

 #: ../src/generic/prntdlgg.cpp:899
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
 #: ../src/generic/prntdlgg.cpp:899
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 

-#: ../src/common/filepickercmn.cpp:44
-#: ../src/common/filepickercmn.cpp:45
+#: ../src/richtext/richtextbuffer.cpp:8194
+#, fuzzy
+msgid "Box Properties"
+msgstr "属性(&P)"
+
+#: ../src/richtext/richtextstyles.cpp:1036
+#, fuzzy
+msgid "Box styles"
+msgstr "下一个样式(&N):"
+
+#: ../src/common/filepickercmn.cpp:44 ../src/common/filepickercmn.cpp:45

 msgid "Browse"
 msgstr ""
 
 msgid "Browse"
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:244
-#: ../src/richtext/richtextbulletspage.cpp:192
+#: ../src/richtext/richtextliststylepage.cpp:246
+#: ../src/richtext/richtextbulletspage.cpp:196

 msgid "Bullet &Alignment:"
 msgstr ""
 
 msgid "Bullet &Alignment:"
 msgstr ""
 

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

 msgid "Bullet style"
 msgstr ""
 
 msgid "Bullet style"
 msgstr ""
 

-#: ../src/richtext/richtextformatdlg.cpp:293
+#: ../src/richtext/richtextformatdlg.cpp:337

 msgid "Bullets"
 msgstr ""
 
 msgid "Bullets"
 msgstr ""
 


@@ -1391,11 +1480,11 @@ msgstr ""
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 
 msgid "C sheet, 17 x 22 in"
 msgstr "C 纸张, 17 x 22 英寸"
 

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

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

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

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


@@ -1419,389 +1508,396 @@ msgstr "C6 信封, 114 x 162 毫米"
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 

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

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

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

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

-#: ../src/html/chm.cpp:814
-#: ../src/html/chm.cpp:871
+#: ../src/common/stockitem.cpp:147
+msgid "CD-Rom"
+msgstr ""
+
+#: ../src/html/chm.cpp:818 ../src/html/chm.cpp:877

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

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

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

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

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

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

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

-#: ../src/os2/thread.cpp:117
-msgid "Cannot create mutex."
-msgstr "不能创建互斥对象."
-
-#: ../src/common/filefn.cpp:1359
-#, c-format
-msgid "Cannot enumerate files '%s'"
-msgstr "不能枚举文件 '%s'"
-
-#: ../src/msw/dir.cpp:212
-#, c-format
-msgid "Cannot enumerate files in directory '%s'"
-msgstr "不能枚举目录 '%s'中的文件"
-
-#: ../src/os2/thread.cpp:528
-#, c-format
-msgid "Cannot resume thread %lu"
-msgstr "不能恢复线程 %lu"
-
-#: ../src/msw/thread.cpp:895
-#, c-format
-msgid "Cannot resume thread %x"
-msgstr "不能恢复线程 %x"
-
-#: ../src/msw/thread.cpp:548
-msgid "Cannot start thread: error writing TLS."
-msgstr "不能启动线程: 写TLS出错."
-
-#: ../src/os2/thread.cpp:514
-#, c-format
-msgid "Cannot suspend thread %lu"
-msgstr "不能挂起线程 %lu"
-
-#: ../src/msw/thread.cpp:880
-#, c-format
-msgid "Cannot suspend thread %x"
-msgstr "不能挂起线程 %x"
-
-#: ../src/msw/thread.cpp:803
-msgid "Cannot wait for thread termination"
-msgstr "不能等候线程终止"
-
-#: ../src/common/cmdproc.cpp:266
+#: ../src/common/cmdproc.cpp:268

 msgid "Can't &Undo "
 msgid "Can't &Undo "

-msgstr "不能撤销(&U)"
+msgstr "无法撤销(&U)"

 
 

-#: ../src/common/image.cpp:2843
-#, c-format
-msgid "Can't check image format of file '%s': file does not exist."
-msgstr "不能检查文件格式 '%s': 文件不存在."
+#: ../src/common/image.cpp:2487
+msgid "Can't automatically determine the image format for non-seekable input."
+msgstr ""

 
 

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

 #, c-format
 msgid "Can't close registry key '%s'"
 #, c-format
 msgid "Can't close registry key '%s'"

-msgstr "不能关闭注册键 '%s'"
+msgstr "无法关闭注册键 '%s'"

 
 

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

 #, c-format
 msgid "Can't copy values of unsupported type %d."
 #, c-format
 msgid "Can't copy values of unsupported type %d."

-msgstr "不能复制不支持的类型 %d 的值."
+msgstr "无法复制不支持的类型 %d 的值."

 
 

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

 #, c-format
 msgid "Can't create registry key '%s'"
 #, c-format
 msgid "Can't create registry key '%s'"

-msgstr "不能创建注册键 '%s'"
+msgstr "无法创建注册键 '%s'"

 
 

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

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

-msgstr "不能创建进程"
+msgstr "无法创建进程"

 
 

-#: ../src/msw/window.cpp:3745
+#: ../src/msw/window.cpp:3772

 #, c-format
 msgid "Can't create window of class %s"
 #, c-format
 msgid "Can't create window of class %s"

-msgstr "不能创建类 '%s' 的窗口"
+msgstr "无法创建窗口类 %s"

 
 

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

 #, c-format
 msgid "Can't delete key '%s'"
 #, c-format
 msgid "Can't delete key '%s'"

-msgstr "不能删除键 '%s'"
+msgstr "无法删除键 '%s'"

 
 

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

 #, c-format
 msgid "Can't delete the INI file '%s'"
 #, c-format
 msgid "Can't delete the INI file '%s'"

-msgstr "不能删除 INI 文件 '%s'"
+msgstr "无法删除 INI 文件 '%s'"

 
 

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

 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"

-msgstr "不能删除键值 '%s'/ '%s'"
+msgstr "无法删除值 '%s' 位于键 '%s'"

 
 

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

 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"

-msgstr "不能枚举键 '%s'的子键"
+msgstr "无法枚举键 '%s' 的子键"

 
 

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

 #, c-format
 msgid "Can't enumerate values of key '%s'"
 #, c-format
 msgid "Can't enumerate values of key '%s'"

-msgstr "不能枚举键 '%s'的值"
+msgstr "无法枚举键 '%s' 的值"

 
 

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

 #, c-format
 msgid "Can't export value of unsupported type %d."
 #, c-format
 msgid "Can't export value of unsupported type %d."

-msgstr "不能导出不支持的类型 %d 的值."
+msgstr "无法导出不支持的类型 %d 的值."

 
 #: ../src/common/ffile.cpp:235
 #, c-format
 msgid "Can't find current position in file '%s'"
 
 #: ../src/common/ffile.cpp:235
 #, c-format
 msgid "Can't find current position in file '%s'"

-msgstr "不能在文件'%s'中找到当前位置"
+msgstr "无法在文件 '%s' 中找到当前位置"

 
 

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

 #, c-format
 msgid "Can't get info about registry key '%s'"
 #, c-format
 msgid "Can't get info about registry key '%s'"

-msgstr "不能获得注册键 '%s'的信息"
+msgstr "无法获得注册键 '%s' 的信息"

 
 

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

 msgid "Can't initialize zlib deflate stream."
 msgid "Can't initialize zlib deflate stream."

-msgstr "不能初始化zlib deflate(压缩)流."
+msgstr "无法初始化 zlib 压缩流。"

 
 

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

 msgid "Can't initialize zlib inflate stream."
 msgid "Can't initialize zlib inflate stream."

-msgstr "不能初始化zlib inflate(解压)流."
+msgstr "无法初始化 zlib 解压流。"
+
+#: ../src/msw/fswatcher.cpp:429
+#, fuzzy, c-format
+msgid "Can't monitor non-existent directory \"%s\" for changes."
+msgstr "打开 '%s'(为 %s) 失败"

 
 

-#: ../src/common/image.cpp:2175
-#: ../src/common/image.cpp:2197
+#: ../src/common/fswatchercmn.cpp:93

 #, c-format
 #, c-format

-msgid "Can't load image from file '%s': file does not exist."
-msgstr "不能从文件 '%s'中装入图像: 文件不存在."
+msgid "Can't monitor non-existent path \"%s\" for changes."
+msgstr ""

 
 

-#: ../src/msw/registry.cpp:408
+#: ../src/msw/registry.cpp:453

 #, c-format
 msgid "Can't open registry key '%s'"
 #, c-format
 msgid "Can't open registry key '%s'"

-msgstr "不能打开注册键 '%s'"
+msgstr "无法打开注册键 '%s'"

 
 

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

 #, c-format
 msgid "Can't read from inflate stream: %s"
 #, c-format
 msgid "Can't read from inflate stream: %s"

-msgstr "不能从解压流 %s 中读"
+msgstr "无法从解压流 %s 中读取"

 
 

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

 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."

-msgstr "不能读解压流: 流内有异常的EOF."
+msgstr "无法读解压流: 流内有异常的 EOF。"

 
 

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

 #, c-format
 msgid "Can't read value of '%s'"
 #, c-format
 msgid "Can't read value of '%s'"

-msgstr "不能读 '%s'的值"
+msgstr "无法读 '%s' 的值"

 
 

-#: ../src/msw/registry.cpp:818
-#: ../src/msw/registry.cpp:850
-#: ../src/msw/registry.cpp:912
+#: ../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'"
 #, c-format
 msgid "Can't read value of key '%s'"

-msgstr "不能读键 '%s'的值"
+msgstr "无法读键 '%s' 的值"

 
 

-#: ../src/common/image.cpp:2214
+#: ../src/common/image.cpp:2284

 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."

-msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
+msgstr "无法从将图像保存至文件 '%s' 中: 无法识别的扩展名。"

 
 

-#: ../src/generic/logg.cpp:587
-#: ../src/generic/logg.cpp:997
+#: ../src/generic/logg.cpp:583 ../src/generic/logg.cpp:998

 msgid "Can't save log contents to file."
 msgid "Can't save log contents to file."

-msgstr "不能把日志内容保存到文件."
+msgstr "无法把日志内容保存到文件。"

 
 

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

 msgid "Can't set thread priority"
 msgid "Can't set thread priority"

-msgstr "不能设置线程优先级"
+msgstr "无法设置线程优先级"

 
 

-#: ../src/msw/registry.cpp:836
-#: ../src/msw/registry.cpp:880
-#: ../src/msw/registry.cpp:1006
+#: ../src/msw/registry.cpp:896 ../src/msw/registry.cpp:940
+#: ../src/msw/registry.cpp:1066

 #, c-format
 msgid "Can't set value of '%s'"
 #, c-format
 msgid "Can't set value of '%s'"

-msgstr "不能设置 '%s'的值"
+msgstr "无法设置 '%s' 的值"

 
 

-#: ../src/common/zstream.cpp:414
+#: ../src/unix/utilsunx.cpp:372
+msgid "Can't write to child process's stdin"
+msgstr "无法写入子进程的标准输入"
+
+#: ../src/common/zstream.cpp:420

 #, c-format
 msgid "Can't write to deflate stream: %s"
 #, c-format
 msgid "Can't write to deflate stream: %s"

-msgstr "不能写到压缩流: %s"
+msgstr "无法写到压缩流: %s"

 
 

-#: ../src/generic/dirdlgg.cpp:108
-#: ../src/richtext/richtextstyledlg.cpp:289
-#: ../src/msw/msgdlg.cpp:473
-#: ../src/gtk1/fontdlg.cpp:145
+#: ../src/generic/dirdlgg.cpp:108 ../src/richtext/richtextstyledlg.cpp:304
+#: ../src/common/stockitem.cpp:146 ../src/msw/msgdlg.cpp:489
+#: ../src/msw/progdlg.cpp:674 ../src/gtk1/fontdlg.cpp:145

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

+#: ../src/os2/thread.cpp:117
+msgid "Cannot create mutex."
+msgstr "无法创建互斥子。"
+

 #: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:896
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr ""
 

-#: ../src/msw/dialup.cpp:546
+#: ../src/common/filefn.cpp:1333
+#, c-format
+msgid "Cannot enumerate files '%s'"
+msgstr "无法枚举文件 '%s'"
+
+#: ../src/msw/dir.cpp:211
+#, c-format
+msgid "Cannot enumerate files in directory '%s'"
+msgstr "无法枚举目录 '%s' 中的文件"
+
+#: ../src/msw/dialup.cpp:543

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

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

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

-#: ../src/unix/threadpsx.cpp:1197
+#: ../src/msw/ole/automtn.cpp:554
+#, fuzzy, c-format
+msgid "Cannot get an active instance of \"%s\""
+msgstr "找不到活动的拨号连接: %s"
+
+#: ../src/unix/threadpsx.cpp:1208

 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."

-msgstr "不能获得调度策略 %d 的优先级范围."
+msgstr "无法获得调度策略 %d 的优先级范围。"

 
 

-#: ../src/unix/utilsunx.cpp:779
+#: ../src/unix/utilsunx.cpp:898

 msgid "Cannot get the hostname"
 msgid "Cannot get the hostname"

-msgstr "不能获得主机名"
+msgstr "无法获得主机名"

 
 

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

 msgid "Cannot get the official hostname"
 msgid "Cannot get the official hostname"

-msgstr "不能获得正式的主机名"
+msgstr "无法获得正式的主机名"

 
 

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

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

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

 
 

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

 msgid "Cannot initialize OLE"
 msgid "Cannot initialize OLE"

-msgstr "不能初始化 OLE"
-
-#: ../src/mgl/app.cpp:229
-msgid "Cannot initialize SciTech MGL!"
-msgstr "不能初始化 SciTech MGL!"
-
-#: ../src/mgl/window.cpp:547
-msgid "Cannot initialize display."
-msgstr "不能初始化显示."
+msgstr "无法初始化 OLE"

 
 #: ../src/common/socket.cpp:844
 
 #: ../src/common/socket.cpp:844

-#, fuzzy

 msgid "Cannot initialize sockets"
 msgid "Cannot initialize sockets"

-msgstr "不能初始化 OLE"
+msgstr "无法初始化 sockets"

 
 #: ../src/msw/volume.cpp:619
 #, c-format
 msgid "Cannot load icon from '%s'."
 
 #: ../src/msw/volume.cpp:619
 #, c-format
 msgid "Cannot load icon from '%s'."

-msgstr "不能从 '%s'中读取图标."
+msgstr "无法从 '%s' 中读取图标。"

 
 

-#: ../src/xrc/xmlres.cpp:264
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:362
+#, c-format

 msgid "Cannot load resources from '%s'."
 msgid "Cannot load resources from '%s'."

-msgstr "不能从文件 '%s'中读取资源."
+msgstr "无法从文件 '%s' 中载入资源。"

 
 

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

 #, c-format
 msgid "Cannot load resources from file '%s'."
 #, c-format
 msgid "Cannot load resources from file '%s'."

-msgstr "不能从文件 '%s'中读取资源."
+msgstr "无法从文件 '%s' 中载入资源。"

 
 #: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"
 
 #: ../src/html/htmlfilt.cpp:138
 #, c-format
 msgid "Cannot open HTML document: %s"

-msgstr "不能打开 HTML 文档: %s"
+msgstr "无法打开 HTML 文档: %s"

 
 

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

 #, c-format
 msgid "Cannot open HTML help book: %s"
 #, c-format
 msgid "Cannot open HTML help book: %s"

-msgstr "不能打开 HTML 帮助: %s"
+msgstr "无法打开 HTML 帮助: %s"

 
 #: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"
 
 #: ../src/html/helpdata.cpp:298
 #, c-format
 msgid "Cannot open contents file: %s"

-msgstr "不能打开目录文件: %s"
-
-#: ../src/xrc/xmlres.cpp:564
-#, c-format
-msgid "Cannot open file '%s'."
-msgstr "不能打开文件 '%s'."
+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
 msgid "Cannot open index file: %s"
 
 #: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open index file: %s"

-msgstr "不能打开索引文件: %s"
+msgstr "无法打开索引文件: %s"
+
+#: ../src/xrc/xmlres.cpp:727
+#, c-format
+msgid "Cannot open resources file '%s'."
+msgstr "无法打开资源文件 '%s'。"

 
 

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

 msgid "Cannot print empty page."
 msgid "Cannot print empty page."

-msgstr "不能打印空页面."
+msgstr "无法打印空白页面。"

 
 #: ../src/msw/volume.cpp:508
 #, c-format
 msgid "Cannot read typename from '%s'!"
 
 #: ../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/unix/threadpsx.cpp:1178
+#: ../src/msw/thread.cpp:922
+#, c-format
+msgid "Cannot resume thread %x"
+msgstr "无法恢复线程 %x"
+
+#: ../src/unix/threadpsx.cpp:1189

 msgid "Cannot retrieve thread scheduling policy."
 msgid "Cannot retrieve thread scheduling policy."

-msgstr "不能找回线程调度策略."
+msgstr "无法找回线程调度策略。"

 
 

-#: ../src/common/intl.cpp:546
+#: ../src/common/intl.cpp:545

 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "Cannot set locale to language \"%s\"."
 msgstr ""
 

-#: ../src/unix/threadpsx.cpp:819
-msgid "Cannot start thread: error writing TLS"
-msgstr "不能启动线程: 写TLS错误"
+#: ../src/unix/threadpsx.cpp:818 ../src/msw/thread.cpp:570
+msgid "Cannot start thread: error writing TLS."
+msgstr "无法启动线程: 写 TLS 出错。"
+
+#: ../src/os2/thread.cpp:514
+#, c-format
+msgid "Cannot suspend thread %lu"
+msgstr "无法挂起线程 %lu"
+
+#: ../src/msw/thread.cpp:907
+#, c-format
+msgid "Cannot suspend thread %x"
+msgstr "无法挂起线程 %x"
+
+#: ../src/msw/thread.cpp:830
+msgid "Cannot wait for thread termination"
+msgstr "无法等候线程终止"

 
 #: ../src/html/helpwnd.cpp:544
 msgid "Case sensitive"
 msgstr "大小写敏感"
 
 
 #: ../src/html/helpwnd.cpp:544
 msgid "Case sensitive"
 msgstr "大小写敏感"
 

-#: ../src/propgrid/manager.cpp:1505
+#: ../src/propgrid/manager.cpp:1494

 msgid "Categorized Mode"
 msgstr ""
 
 msgid "Categorized Mode"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:162
+#: ../src/richtext/richtextbuffer.cpp:8267
+msgid "Cell Properties"
+msgstr "单元格属性"
+
+#: ../src/common/fmapbase.cpp:160

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

-#: ../src/richtext/richtextindentspage.cpp:170
-#: ../src/richtext/richtextliststylepage.cpp:348
+#: ../src/richtext/richtextindentspage.cpp:173
+#: ../src/richtext/richtextliststylepage.cpp:350

 msgid "Cen&tred"
 msgstr "居中(&t)"
 
 msgid "Cen&tred"
 msgstr "居中(&t)"
 

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

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

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

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

-#: ../src/richtext/richtextliststylepage.cpp:249
-#: ../src/richtext/richtextbulletspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:251
+#: ../src/richtext/richtextbulletspage.cpp:201

 msgid "Centre"
 msgstr "居中"
 
 msgid "Centre"
 msgstr "居中"
 

-#: ../src/richtext/richtextindentspage.cpp:172
-#: ../src/richtext/richtextindentspage.cpp:174
-#: ../src/richtext/richtextliststylepage.cpp:350
+#: ../src/richtext/richtextindentspage.cpp:175
+#: ../src/richtext/richtextindentspage.cpp:177

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

-#, fuzzy
+#: ../src/richtext/richtextliststylepage.cpp:354

 msgid "Centre text."
 msgid "Centre text."

-msgstr "不能创建互斥对象."
+msgstr "文字居中。"
+
+#: ../src/richtext/richtextsizepage.cpp:417
+msgid "Centred"
+msgstr "居中"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:279
-#: ../src/richtext/richtextbulletspage.cpp:229
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextbulletspage.cpp:233

 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 

-#: ../src/richtext/richtextbuffer.cpp:2738
+#: ../src/richtext/richtextbuffer.cpp:3925

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

-#: ../src/richtext/richtextbuffer.cpp:1733
-msgid "Change Style"
+#: ../src/richtext/richtextbuffer.cpp:3289
+msgid "Change Object Style"

 msgstr ""
 
 msgstr ""
 

-#: ../src/osx/dataview_osx.cpp:120
-msgid "Changed item is invalid."
+#: ../src/richtext/richtextbuffer.cpp:3555
+#, fuzzy
+msgid "Change Properties"
+msgstr "单元格属性"
+
+#: ../src/richtext/richtextbuffer.cpp:3116
+msgid "Change Style"

 msgstr ""
 
 #: ../src/common/fileconf.cpp:373
 msgstr ""
 
 #: ../src/common/fileconf.cpp:373


@@ -1809,98 +1905,85 @@ msgstr ""
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 
 msgid "Changes won't be saved to avoid overwriting the existing file \"%s\""
 msgstr ""
 

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

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

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

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

-#: ../src/richtext/richtextbulletspage.cpp:171
-#: ../src/richtext/richtextbulletspage.cpp:173
+#: ../src/richtext/richtextliststylepage.cpp:227
+#: ../src/richtext/richtextbulletspage.cpp:175
+#: ../src/richtext/richtextbulletspage.cpp:177

 msgid "Check to add a period after the bullet."
 msgstr ""
 
 msgid "Check to add a period after the bullet."
 msgstr ""
 

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

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

-#: ../src/richtext/richtextbulletspage.cpp:185
-#: ../src/richtext/richtextbulletspage.cpp:187
+#: ../src/richtext/richtextliststylepage.cpp:241
+#: ../src/richtext/richtextbulletspage.cpp:189
+#: ../src/richtext/richtextbulletspage.cpp:191

 msgid "Check to add a right parenthesis."
 msgstr ""
 
 msgid "Check to add a right parenthesis."
 msgstr ""
 

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

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

-#: ../src/richtext/richtextbulletspage.cpp:178
-#: ../src/richtext/richtextbulletspage.cpp:180
+#: ../src/richtext/richtextliststylepage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:182
+#: ../src/richtext/richtextbulletspage.cpp:184

 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
-#, fuzzy
+#: ../src/osx/carbon/fontdlg.cpp:540 ../src/osx/carbon/fontdlg.cpp:542

 msgid "Check to make the font bold."
 msgid "Check to make the font bold."

-msgstr "点击取消字体选择."
+msgstr "勾选设定为粗体。"

 
 

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

 msgid "Check to make the font italic."
 msgid "Check to make the font italic."

-msgstr "点击取消字体选择."
+msgstr "勾选设定为斜体。"

 
 

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

 msgid "Check to make the font underlined."
 msgid "Check to make the font underlined."

-msgstr "å­\97ä½\93æ\98¯å\90¦ä¸ºä¸\8bå\88\92线."
+msgstr "å\8b¾é\80\89å\8a ä¸\8bå\88\92线ã\80\82"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:275
-#: ../src/richtext/richtextstyledlg.cpp:277
+#: ../src/richtext/richtextstyledlg.cpp:293
+#: ../src/richtext/richtextstyledlg.cpp:295

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

-#: ../src/richtext/richtextfontpage.cpp:244
-#: ../src/richtext/richtextfontpage.cpp:246
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:253
+#: ../src/richtext/richtextfontpage.cpp:255

 msgid "Check to show a line through the text."
 msgid "Check to show a line through the text."

-msgstr "点击取消字体选择."
+msgstr "勾选加删除线。"

 
 

-#: ../src/richtext/richtextfontpage.cpp:251
-#: ../src/richtext/richtextfontpage.cpp:253
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:260
+#: ../src/richtext/richtextfontpage.cpp:262

 msgid "Check to show the text in capitals."
 msgid "Check to show the text in capitals."

-msgstr "点击取消字体选择."
+msgstr "勾选显示为大写。"

 
 

-#: ../src/richtext/richtextfontpage.cpp:265
-#: ../src/richtext/richtextfontpage.cpp:267
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:274
+#: ../src/richtext/richtextfontpage.cpp:276

 msgid "Check to show the text in subscript."
 msgid "Check to show the text in subscript."

-msgstr "点击取消字体选择."
+msgstr "勾选显示为下标。"

 
 

-#: ../src/richtext/richtextfontpage.cpp:258
-#: ../src/richtext/richtextfontpage.cpp:260
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:267
+#: ../src/richtext/richtextfontpage.cpp:269

 msgid "Check to show the text in superscript."
 msgid "Check to show the text in superscript."

-msgstr "点击取消字体选择."
+msgstr "勾选显示为上标。"

 
 

-#: ../src/msw/dialup.cpp:792
+#: ../src/msw/dialup.cpp:785

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

-#: ../src/propgrid/props.cpp:1547
+#: ../src/propgrid/props.cpp:1644

 msgid "Choose a directory:"
 msgstr "选择目录:"
 
 msgid "Choose a directory:"
 msgstr "选择目录:"
 

-#: ../src/propgrid/props.cpp:1606
+#: ../src/propgrid/props.cpp:1703

 msgid "Choose a file"
 msgstr "选择文件"
 
 msgid "Choose a file"
 msgstr "选择文件"
 

-#: ../src/palmos/colordlg.cpp:74
-#: ../src/generic/colrdlgg.cpp:144
-#: ../src/gtk/colordlg.cpp:60
+#: ../src/generic/colrdlgg.cpp:145 ../src/gtk/colordlg.cpp:60

 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 "选择字体"


@@ -1910,214 +1993,176 @@ 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:102
+#: ../src/aui/tabmdi.cpp:105 ../src/generic/mdig.cpp:98

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

-#: ../src/generic/logg.cpp:526
+#: ../src/msw/ole/automtn.cpp:655
+msgid "Class not registered."
+msgstr "类未注册。"
+
+#: ../src/common/stockitem.cpp:148
+msgid "Clear"
+msgstr "清除"
+
+#: ../src/generic/logg.cpp:522

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

-#: ../src/richtext/richtextstyledlg.cpp:238
-#: ../src/richtext/richtextstyledlg.cpp:240
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:256
+#: ../src/richtext/richtextstyledlg.cpp:258

 msgid "Click to apply the selected style."
 msgid "Click to apply the selected style."

-msgstr "ç\82¹å\87»å\8f\96æ¶\88å­\97ä½\93é\80\89æ\8b©."
+msgstr "ç\82¹å\87»åº\94ç\94¨æ\89\80é\80\89æ ·å¼\8fã\80\82"

 
 

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

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

-#: ../src/richtext/richtextbulletspage.cpp:230
-#: ../src/richtext/richtextbulletspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:284
+#: ../src/richtext/richtextbulletspage.cpp:234
+#: ../src/richtext/richtextbulletspage.cpp:236

 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
-#, fuzzy
+#: ../src/osx/carbon/fontdlg.cpp:587 ../src/osx/carbon/fontdlg.cpp:589

 msgid "Click to cancel changes to the font."
 msgid "Click to cancel changes to the font."

-msgstr "点击取消字体选择."
+msgstr "点击取消字体变更。"

 
 

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

 msgid "Click to cancel the font selection."
 msgid "Click to cancel the font selection."

-msgstr "点击取消字体选择."
-
-#: ../src/richtext/richtextstyledlg.cpp:290
-#: ../src/richtext/richtextstyledlg.cpp:292
-#, fuzzy
-msgid "Click to cancel this window."
-msgstr "关闭此窗口"
+msgstr "点击取消字体选择。"

 
 

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

 msgid "Click to change the font colour."
 msgid "Click to change the font colour."

-msgstr "点击取消字体选择."
+msgstr "点击更改字体颜色。"

 
 

-#: ../src/richtext/richtextfontpage.cpp:234
-#: ../src/richtext/richtextfontpage.cpp:236
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:243
+#: ../src/richtext/richtextfontpage.cpp:245

 msgid "Click to change the text background colour."
 msgid "Click to change the text background colour."

-msgstr "点击取消字体选择."
+msgstr "点击修改字体背景颜色。"

 
 

-#: ../src/richtext/richtextfontpage.cpp:222
-#: ../src/richtext/richtextfontpage.cpp:224
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:230
+#: ../src/richtext/richtextfontpage.cpp:232

 msgid "Click to change the text colour."
 msgid "Click to change the text colour."

-msgstr "点击取消字体选择."
+msgstr "点击修改字体颜色。"

 
 

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

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

-#, fuzzy
+#: ../src/richtext/richtextliststylepage.cpp:198

 msgid "Click to choose the font for this level."
 msgid "Click to choose the font for this level."

-msgstr "点击取消字体选择."
+msgstr "点击选择此层级字体。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:265
-#: ../src/richtext/richtextstyledlg.cpp:267
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:283
+#: ../src/richtext/richtextstyledlg.cpp:285

 msgid "Click to close this window."
 msgid "Click to close this window."

-msgstr "关闭此窗口"
+msgstr "点击关闭此窗口。"

 
 

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

 msgid "Click to confirm changes to the font."
 msgid "Click to confirm changes to the font."

-msgstr "点击确认字体选择."
+msgstr "点击确认字体更改。"

 
 

-#: ../src/generic/fontdlgg.cpp:479
-#: ../src/generic/fontdlgg.cpp:481
-#: ../src/generic/fontdlgg.cpp:486
-#: ../src/generic/fontdlgg.cpp:488
+#: ../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."
 msgid "Click to confirm the font selection."

-msgstr "点击确认字体选择."
+msgstr "点击确认字体选择。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:284
-#: ../src/richtext/richtextstyledlg.cpp:286
+#: ../src/richtext/richtextstyledlg.cpp:248
+#: ../src/richtext/richtextstyledlg.cpp:250

 #, fuzzy
 #, fuzzy

-msgid "Click to confirm your selection."
-msgstr "点击确认字体选择."
+msgid "Click to create a new box style."
+msgstr "点击新增列表样式。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:218
-#: ../src/richtext/richtextstyledlg.cpp:220
+#: ../src/richtext/richtextstyledlg.cpp:230
+#: ../src/richtext/richtextstyledlg.cpp:232

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

-#: ../src/richtext/richtextstyledlg.cpp:230
-#: ../src/richtext/richtextstyledlg.cpp:232
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:242
+#: ../src/richtext/richtextstyledlg.cpp:244

 msgid "Click to create a new list style."
 msgid "Click to create a new list style."

-msgstr "点击取消字体选择."
+msgstr "点击新增列表样式。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:224
-#: ../src/richtext/richtextstyledlg.cpp:226
+#: ../src/richtext/richtextstyledlg.cpp:236
+#: ../src/richtext/richtextstyledlg.cpp:238

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

-#: ../src/richtext/richtexttabspage.cpp:136

 #: ../src/richtext/richtexttabspage.cpp:138
 #: ../src/richtext/richtexttabspage.cpp:138

-#, fuzzy
+#: ../src/richtext/richtexttabspage.cpp:140

 msgid "Click to create a new tab position."
 msgid "Click to create a new tab position."

-msgstr "ç\82¹å\87»å\8f\96æ¶\88å­\97ä½\93é\80\89æ\8b©."
+msgstr "ç\82¹å\87»å»ºç«\8bæ\96°ç\9a\84æ \87ç­¾ä½\8dç½®ã\80\82"

 
 

-#: ../src/richtext/richtexttabspage.cpp:148

 #: ../src/richtext/richtexttabspage.cpp:150
 #: ../src/richtext/richtexttabspage.cpp:150

-#, fuzzy
+#: ../src/richtext/richtexttabspage.cpp:152

 msgid "Click to delete all tab positions."
 msgid "Click to delete all tab positions."

-msgstr "ç\82¹å\87»å\8f\96æ¶\88å­\97ä½\93é\80\89æ\8b©."
+msgstr "ç\82¹å\87»å\88 é\99¤æ\89\80æ\9c\89æ \87ç­¾ä½\8dç½®ã\80\82"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:256
-#: ../src/richtext/richtextstyledlg.cpp:258
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:274
+#: ../src/richtext/richtextstyledlg.cpp:276

 msgid "Click to delete the selected style."
 msgid "Click to delete the selected style."

-msgstr "ç\82¹å\87»å\8f\96æ¶\88å­\97ä½\93é\80\89æ\8b©."
+msgstr "ç\82¹å\87»å\88 é\99¤æ\89\80é\80\89æ ·å¼\8fã\80\82"

 
 

-#: ../src/richtext/richtexttabspage.cpp:142

 #: ../src/richtext/richtexttabspage.cpp:144
 #: ../src/richtext/richtexttabspage.cpp:144

-#, fuzzy
+#: ../src/richtext/richtexttabspage.cpp:146

 msgid "Click to delete the selected tab position."
 msgid "Click to delete the selected tab position."

-msgstr "ç\82¹å\87»å\8f\96æ¶\88å­\97ä½\93é\80\89æ\8b©."
+msgstr "ç\82¹å\87»å\88 é\99¤æ\89\80é\80\89æ \87ç­¾ä½\8dç½®ã\80\82"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:250
-#: ../src/richtext/richtextstyledlg.cpp:252
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:268
+#: ../src/richtext/richtextstyledlg.cpp:270

 msgid "Click to edit the selected style."
 msgid "Click to edit the selected style."

-msgstr "点击取消字体选择."
+msgstr "点击编辑所选样式。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:244
-#: ../src/richtext/richtextstyledlg.cpp:246
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:262
+#: ../src/richtext/richtextstyledlg.cpp:264

 msgid "Click to rename the selected style."
 msgid "Click to rename the selected style."

-msgstr "点击取消字体选择."
+msgstr "点击重命名所选样式。"

 
 

-#: ../src/generic/dbgrptg.cpp:94
-#: ../src/generic/progdlgg.cpp:717
-#: ../src/generic/progdlgg.cpp:722
-#: ../src/richtext/richtextstyledlg.cpp:263
-#: ../src/richtext/richtextsymboldlg.cpp:475
+#: ../src/generic/dbgrptg.cpp:94 ../src/generic/progdlgg.cpp:805
+#: ../src/generic/progdlgg.cpp:810 ../src/richtext/richtextstyledlg.cpp:281
+#: ../src/richtext/richtextsymboldlg.cpp:473 ../src/common/stockitem.cpp:149
+#: ../src/msw/progdlg.cpp:171 ../src/msw/progdlg.cpp:680

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

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

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

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

 msgid "Close current document"
 msgstr ""
 
 msgid "Close current document"
 msgstr ""
 

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

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

-#: ../src/richtext/richtextformatdlg.cpp:523
+#: ../src/common/stockitem.cpp:194
+msgid "Color"
+msgstr "颜色"
+
+#: ../src/richtext/richtextformatdlg.cpp:718

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

-#: ../src/msw/colordlg.cpp:156
-#, fuzzy, c-format
+#: ../src/msw/colordlg.cpp:154
+#, c-format

 msgid "Colour selection dialog failed with error %0lx."
 msgid "Colour selection dialog failed with error %0lx."

-msgstr "命令 '%s'执行失败, 错误信息: %ul"
+msgstr "颜色选择对话框错误，错误码 %0lx。"

 
 

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

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

-#: ../src/osx/dataview_osx.cpp:406
-#, fuzzy
-msgid "Column could not be added to native control."
-msgstr "文件不能被装载."
-

 #: ../src/osx/carbon/dataview.cpp:901
 #: ../src/osx/carbon/dataview.cpp:901

-#, fuzzy

 msgid "Column could not be added."
 msgid "Column could not be added."

-msgstr "æ\96\87件ä¸\8dè\83½è¢«è£\85è½½."
+msgstr "æ\97 æ³\95å¢\9eå\8a å\88\97ã\80\82"

 
 #: ../src/osx/carbon/dataview.cpp:900
 msgid "Column description could not be initialized."
 msgstr ""
 
 
 #: ../src/osx/carbon/dataview.cpp:900
 msgid "Column description could not be initialized."
 msgstr ""
 

-#: ../src/osx/dataview_osx.cpp:380
-msgid "Column does not have a renderer."
-msgstr ""
-
-#: ../src/osx/carbon/dataview.cpp:1499
-#: ../src/osx/carbon/dataview.cpp:1520
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:1539 ../src/osx/carbon/dataview.cpp:1560

 msgid "Column index not found."
 msgid "Column index not found."

-msgstr "æ\89¾ä¸\8då\88°å\9f\9f '%s'ç\9a\84ç\9b®å½\95æ\96\87件."
+msgstr "æ\89¾ä¸\8då\88°å\88\97ç´¢å¼\95ã\80\82"

 
 

-#: ../src/osx/dataview_osx.cpp:379
-msgid "Column pointer must not be NULL."
-msgstr ""
-
-#: ../src/osx/carbon/dataview.cpp:1575
+#: ../src/osx/carbon/dataview.cpp:1615

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


@@ -2125,32 +2170,36 @@ msgstr ""
 msgid "Column width could not be set."
 msgstr ""
 
 msgid "Column width could not be set."
 msgstr ""
 

-#: ../src/osx/dataview_osx.cpp:383
-msgid "Column's model column has no equivalent in the associated model."
-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 ""
 
 msgstr ""
 

-#: ../src/msw/fontdlg.cpp:118
-#, fuzzy, c-format
+#: ../src/msw/fontdlg.cpp:117
+#, c-format

 msgid "Common dialog failed with error code %0lx."
 msgid "Common dialog failed with error code %0lx."

-msgstr "å\91½ä»¤ '%s'æ\89§è¡\8c失败, é\94\99误信æ\81¯: %ul"
+msgstr "å\85¬å\85±å¯¹è¯\9dæ¡\86é\94\99误ï¼\8cé\94\99误ç \81 %0lxã\80\82"

 
 

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

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

-#: ../src/generic/dirctrlg.cpp:595
+#: ../src/generic/dirctrlg.cpp:536

 msgid "Computer"
 msgstr "计算机"
 
 #: ../src/common/fileconf.cpp:966
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgid "Computer"
 msgstr "计算机"
 
 #: ../src/common/fileconf.cpp:966
 #, c-format
 msgid "Config entry name cannot start with '%c'."

-msgstr "配置条目名不能以 '%c'开头."
+msgstr "配置条目名不能以 '%c' 开头。"

 
 #: ../src/gtk/filedlg.cpp:56
 msgid "Confirm"
 
 #: ../src/gtk/filedlg.cpp:56
 msgid "Confirm"


@@ -2160,20 +2209,24 @@ msgstr "确认"
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 
 msgid "Confirm registry update"
 msgstr "确认更新注册表"
 

-#: ../src/html/htmlwin.cpp:541
+#: ../src/html/htmlwin.cpp:540

 msgid "Connecting..."
 msgid "Connecting..."

-msgstr "连接..."
+msgstr "正在连接..."

 
 #: ../src/html/helpwnd.cpp:480
 msgid "Contents"
 msgstr "目录"
 
 
 #: ../src/html/helpwnd.cpp:480
 msgid "Contents"
 msgstr "目录"
 

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

 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."

-msgstr "不能进行到字符集 '%s'的变换."
+msgstr "无法进行到字符集 '%s' 的转换。"
+
+#: ../src/common/stockitem.cpp:150
+msgid "Convert"
+msgstr "转换"

 
 

-#: ../src/html/htmlwin.cpp:1054
+#: ../src/html/htmlwin.cpp:1053

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


@@ -2182,249 +2235,224 @@ msgstr "已复制到剪贴板:\"%s\""
 msgid "Copies:"
 msgstr "份数:"
 
 msgid "Copies:"
 msgstr "份数:"
 

-#: ../src/stc/scintilla/src/ScintillaBase.cxx:456
+#: ../src/common/stockitem.cpp:151 ../src/stc/stc_i18n.cpp:19

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

-#: ../src/common/stockitem.cpp:260
-#, fuzzy
+#: ../src/common/stockitem.cpp:259

 msgid "Copy selection"
 msgid "Copy selection"

-msgstr "选段"
-
-#: ../src/osx/dataview_osx.cpp:415
-msgid "Could not add column to internal structures."
-msgstr ""
+msgstr "复制选区"

 
 

-#: ../src/html/chm.cpp:717
+#: ../src/html/chm.cpp:721

 #, c-format
 msgid "Could not create temporary file '%s'"
 #, c-format
 msgid "Could not create temporary file '%s'"

-msgstr "不能创建临时文件 '%s'"
+msgstr "无法创建临时文件 '%s'"

 
 

-#: ../src/osx/carbon/dataview.cpp:1246
-#: ../src/osx/carbon/dataview.cpp:1633
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:1286 ../src/osx/carbon/dataview.cpp:1673

 msgid "Could not determine column index."
 msgid "Could not determine column index."

-msgstr "不能启动文档预览."
+msgstr "无法确定列索引。"

 
 #: ../src/osx/carbon/dataview.cpp:877
 msgid "Could not determine column's position"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:844
 
 #: ../src/osx/carbon/dataview.cpp:877
 msgid "Could not determine column's position"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:844

-#, fuzzy

 msgid "Could not determine number of columns."
 msgid "Could not determine number of columns."

-msgstr "æ\89¾ä¸\8då\88°èµ\84æº\90å\8c\85å\90«æ\96\87件 %s."
+msgstr "æ\97 æ³\95ç¡®å®\9aå\88\97æ\95°é\87\8fã\80\82"

 
 #: ../src/osx/carbon/dataview.cpp:976
 
 #: ../src/osx/carbon/dataview.cpp:976

-#, fuzzy

 msgid "Could not determine number of items"
 msgid "Could not determine number of items"

-msgstr "æ\89¾ä¸\8då\88°èµ\84æº\90å\8c\85å\90«æ\96\87件 %s."
+msgstr "æ\97 æ³\95ç¡®å®\9a项ç\9b®æ\95°é\87\8f"

 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"

-msgstr "不能将 %s解开至 %s: %s"
+msgstr "无法将 %s 解开至 %s: %s"

 
 #: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
 
 #: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"

-msgstr "找不到id的标签"
+msgstr "找不到 id 的标签"

 
 

-#: ../src/osx/carbon/dataview.cpp:2511
-#: ../src/osx/carbon/dataview.cpp:2546
-#: ../src/osx/carbon/dataview.cpp:2570
-#: ../src/osx/carbon/dataview.cpp:2591
-#: ../src/osx/carbon/dataview.cpp:2728
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2557 ../src/osx/carbon/dataview.cpp:2592
+#: ../src/osx/carbon/dataview.cpp:2616 ../src/osx/carbon/dataview.cpp:2637
+#: ../src/osx/carbon/dataview.cpp:2774

 msgid "Could not get header description."
 msgid "Could not get header description."

-msgstr "不能启动打印."
+msgstr "无法获取表头描述。"

 
 

-#: ../src/osx/carbon/dataview.cpp:1135
-#: ../src/osx/carbon/dataview.cpp:1161
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:1170 ../src/osx/carbon/dataview.cpp:1196

 msgid "Could not get items."
 msgid "Could not get items."

-msgstr "æ\89¾ä¸\8då\88°æ\96\87件 '%s'"
+msgstr "æ\97 æ³\95è\8e·å\8f\96项ç\9b®ã\80\82"

 
 

-#: ../src/osx/carbon/dataview.cpp:2614
-#: ../src/osx/carbon/dataview.cpp:2679
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2660 ../src/osx/carbon/dataview.cpp:2725

 msgid "Could not get property flags."
 msgid "Could not get property flags."

-msgstr "不能创建临时文件 '%s'"
+msgstr "无法获取属性标志。"

 
 #: ../src/osx/carbon/dataview.cpp:727
 
 #: ../src/osx/carbon/dataview.cpp:727

-#, fuzzy

 msgid "Could not get selected items."
 msgid "Could not get selected items."

-msgstr "æ\89¾ä¸\8då\88°æ\96\87件 '%s'"
+msgstr "æ\97 æ³\95è\8e·å\8f\96æ\89\80é\80\89项ç\9b®ã\80\82"

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

-msgstr "找不到文件 '%s'"
+msgstr "找不到文件 '%s'。"

 
 #: ../src/osx/carbon/dataview.cpp:846
 
 #: ../src/osx/carbon/dataview.cpp:846

-#, fuzzy

 msgid "Could not remove column."
 msgid "Could not remove column."

-msgstr "不能创建游标"
+msgstr "无法删除列。"

 
 #: ../src/osx/carbon/dataview.cpp:643
 
 #: ../src/osx/carbon/dataview.cpp:643

-#, fuzzy

 msgid "Could not retrieve number of items"
 msgid "Could not retrieve number of items"

-msgstr "不能创建临时文件 '%s'"
+msgstr "无法获取项目数量"

 
 

-#: ../src/osx/carbon/dataview.cpp:2527
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2573

 msgid "Could not set alignment."
 msgid "Could not set alignment."

-msgstr "不能启动打印."
+msgstr "无法设定对齐。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2748
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2804

 msgid "Could not set column width."
 msgid "Could not set column width."

-msgstr "不能启动文档预览."
+msgstr "无法启动文档预览。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2730
+#: ../src/common/filefn.cpp:1568

 #, fuzzy
 #, fuzzy

+msgid "Could not set current working directory"
+msgstr "获取工作目录失败"
+
+#: ../src/osx/carbon/dataview.cpp:2776

 msgid "Could not set header description."
 msgid "Could not set header description."

-msgstr "不能启动打印."
+msgstr "无法启动打印。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2551
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2597

 msgid "Could not set icon."
 msgid "Could not set icon."

-msgstr "不能启动打印."
+msgstr "无法启动打印。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2572
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2618

 msgid "Could not set maximum width."
 msgid "Could not set maximum width."

-msgstr "不能启动打印."
+msgstr "无法设定最大宽度。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2593
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2639

 msgid "Could not set minimum width."
 msgid "Could not set minimum width."

-msgstr "不能启动打印."
+msgstr "无法设定最小宽度。"

 
 

-#: ../src/osx/carbon/dataview.cpp:2619
-#: ../src/osx/carbon/dataview.cpp:2684
-#, fuzzy
+#: ../src/osx/carbon/dataview.cpp:2665 ../src/osx/carbon/dataview.cpp:2730

 msgid "Could not set property flags."
 msgid "Could not set property flags."

-msgstr "不能启动打印."
+msgstr "无法设定属性标志。"

 
 

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

 msgid "Could not start document preview."
 msgid "Could not start document preview."

-msgstr "不能启动文档预览."
+msgstr "无法启动文档预览。"

 
 

-#: ../src/generic/printps.cpp:179
-#: ../src/msw/printwin.cpp:205
-#: ../src/gtk/print.cpp:1011
-#: ../src/gtk/gnome/gprint.cpp:916
+#: ../src/generic/printps.cpp:179 ../src/msw/printwin.cpp:206
+#: ../src/gtk/print.cpp:1068 ../src/gtk/gnome/gprint.cpp:916

 msgid "Could not start printing."
 msgid "Could not start printing."

-msgstr "不能启动打印."
+msgstr "无法启动打印。"

 
 

-#: ../src/common/wincmn.cpp:1786
+#: ../src/common/wincmn.cpp:1973

 msgid "Could not transfer data to window"
 msgid "Could not transfer data to window"

-msgstr "不能把数据转到窗口"
+msgstr "无法把数据转到窗口"

 
 #: ../src/os2/thread.cpp:161
 msgid "Couldn't acquire a mutex lock"
 
 #: ../src/os2/thread.cpp:161
 msgid "Couldn't acquire a mutex lock"

-msgstr "不能得到互斥锁"
+msgstr "无法得到互斥锁"

 
 

-#: ../src/msw/imaglist.cpp:147
-#: ../src/msw/imaglist.cpp:165
-#: ../src/msw/imaglist.cpp:177
-#: ../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."
 msgid "Couldn't add an image to the image list."

-msgstr "不能把图像加到图象列表."
+msgstr "无法把图像加到图象列表。"

 
 

-#: ../src/msw/timer.cpp:139
-#: ../src/os2/timer.cpp:114
+#: ../src/msw/timer.cpp:135 ../src/os2/timer.cpp:114

 msgid "Couldn't create a timer"
 msgid "Couldn't create a timer"

-msgstr "不能创建计时器"
-
-#: ../src/mgl/cursor.cpp:132
-#: ../src/mgl/cursor.cpp:153
-msgid "Couldn't create cursor."
-msgstr "不能创建游标"
+msgstr "无法创建计时器"

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

-msgstr "不能创建计时器"
+msgstr "无法创建计时器"
+
+#: ../src/common/translation.cpp:1853
+#, fuzzy
+msgid "Couldn't enumerate translations"
+msgstr "无法终止线程"

 
 #: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 
 #: ../src/common/dynlib.cpp:157
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"

-msgstr "在动态连接库中找不到符号'%s'"
+msgstr "在动态连接库中找不到符号 '%s'"

 
 

-#: ../src/gtk/print.cpp:1957
+#: ../src/gtk/print.cpp:2005

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

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

 msgid "Couldn't get the current thread pointer"
 msgid "Couldn't get the current thread pointer"

-msgstr "不能获得当前线程指针"
+msgstr "无法获得当前线程指针"

 
 #: ../src/osx/carbon/overlay.cpp:130
 #, fuzzy
 msgid "Couldn't init the context on the overlay window"
 
 #: ../src/osx/carbon/overlay.cpp:130
 #, fuzzy
 msgid "Couldn't init the context on the overlay window"

-msgstr "不能获得当前线程指针"
+msgstr "无法获得当前线程指针"
+
+#: ../src/common/imaggif.cpp:264
+#, fuzzy
+msgid "Couldn't initialize GIF hash table."
+msgstr "无法初始化 zlib 压缩流."

 
 

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

 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."

-msgstr "不能装入PNG图像 - 文件被破坏 或 没有足够内存."
+msgstr "无法装入 PNG 图像 - 文件被破坏 或者 没有足够内存。"

 
 #: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
 
 #: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."

-msgstr "不能从 '%s'中的读取声音数据."
+msgstr "无法从 '%s' 中的读取声音数据。"

 
 #: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"
 
 #: ../src/unix/sound_sdl.cpp:226
 #, c-format
 msgid "Couldn't open audio: %s"

-msgstr "不能打开音频: %s"
+msgstr "无法打开音频: %s"

 
 #: ../src/msw/ole/dataobj.cpp:145
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 
 #: ../src/msw/ole/dataobj.cpp:145
 #, c-format
 msgid "Couldn't register clipboard format '%s'."

-msgstr "不能注册剪贴板格式 '%s'."
+msgstr "无法注册剪贴板格式 '%s'。"

 
 #: ../src/os2/thread.cpp:178
 msgid "Couldn't release a mutex"
 
 #: ../src/os2/thread.cpp:178
 msgid "Couldn't release a mutex"

-msgstr "不能释放互斥体"
+msgstr "无法释放互斥子"

 
 

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

 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."

-msgstr "不能获得列表控件的项 %d信息."
+msgstr "无法获得列表控件的项 %d 信息。"

 
 

-#: ../src/common/imagpng.cpp:665
-#: ../src/common/imagpng.cpp:676
-#: ../src/common/imagpng.cpp:686
+#: ../src/common/imagpng.cpp:747 ../src/common/imagpng.cpp:758
+#: ../src/common/imagpng.cpp:768

 msgid "Couldn't save PNG image."
 msgid "Couldn't save PNG image."

-msgstr "不能保存PNG图像."
+msgstr "无法保存 PNG 图像。"

 
 

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

 msgid "Couldn't terminate thread"
 msgid "Couldn't terminate thread"

-msgstr "不能终止线程"
+msgstr "无法终止线程"

 
 

-#: ../src/common/xtistrm.cpp:157
-msgid "Create Parameter not found in declared RTTI Parameters"
+#: ../src/common/xtistrm.cpp:171
+#, fuzzy, c-format
+msgid "Create Parameter %s not found in declared RTTI Parameters"

 msgstr "在声明的RTTI参数里找不到创建参数"
 
 #: ../src/generic/dirdlgg.cpp:318
 msgid "Create directory"
 msgstr "创建目录"
 
 msgstr "在声明的RTTI参数里找不到创建参数"
 
 #: ../src/generic/dirdlgg.cpp:318
 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:296
+#: ../src/common/accelcmn.cpp:313

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

-#: ../src/richtext/richtextctrl.cpp:296
-#: ../src/osx/textctrl_osx.cpp:587
-#: ../src/common/stockitem.cpp:140
-#: ../src/msw/textctrl.cpp:2174
+#: ../src/richtext/richtextctrl.cpp:325 ../src/osx/textctrl_osx.cpp:583
+#: ../src/common/stockitem.cpp:152 ../src/msw/textctrl.cpp:2222

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


@@ -2432,25 +2460,23 @@ msgstr "剪切(&t)"
 msgid "Current directory:"
 msgstr "当前目录:"
 
 msgid "Current directory:"
 msgstr "当前目录:"
 

-#: ../src/gtk/print.cpp:731
+#: ../src/gtk/print.cpp:755

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

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

 msgid "Customize Columns"
 msgid "Customize Columns"

-msgstr "字体大小"
+msgstr "自定义列"

 
 

-#: ../src/stc/scintilla/src/ScintillaBase.cxx:455
+#: ../src/common/stockitem.cpp:152 ../src/stc/stc_i18n.cpp:18

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

-#: ../src/common/stockitem.cpp:261
-#, fuzzy
+#: ../src/common/stockitem.cpp:260

 msgid "Cut selection"
 msgid "Cut selection"

-msgstr "选段"
+msgstr "剪切选区"

 
 

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

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


@@ -2458,43 +2484,43 @@ 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:706
+#: ../src/msw/dde.cpp:709

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

-#: ../src/common/accelcmn.cpp:78
+#: ../src/common/accelcmn.cpp:80

 msgid "DECIMAL"
 msgstr ""
 
 msgid "DECIMAL"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:46
+#: ../src/common/accelcmn.cpp:48

 msgid "DEL"
 msgstr ""
 
 msgid "DEL"
 msgstr ""
 

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

 msgid "DELETE"
 msgstr ""
 
 msgid "DELETE"
 msgstr ""
 

-#: ../src/common/imagbmp.cpp:1019
+#: ../src/common/imagbmp.cpp:1045

 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgid "DIB Header: Encoding doesn't match bitdepth."

-msgstr "DIB头: 编码不能匹配颜色位数."
+msgstr "DIB头: 编码不匹配颜色位数。"

 
 

-#: ../src/common/imagbmp.cpp:974
+#: ../src/common/imagbmp.cpp:1000

 msgid "DIB Header: Image height > 32767 pixels for file."
 msgid "DIB Header: Image height > 32767 pixels for file."

-msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素。"

 
 

-#: ../src/common/imagbmp.cpp:966
+#: ../src/common/imagbmp.cpp:992

 msgid "DIB Header: Image width > 32767 pixels for file."
 msgid "DIB Header: Image width > 32767 pixels for file."

-msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素。"

 
 

-#: ../src/common/imagbmp.cpp:990
+#: ../src/common/imagbmp.cpp:1016

 msgid "DIB Header: Unknown bitdepth in file."
 msgid "DIB Header: Unknown bitdepth in file."

-msgstr "DIB头: 文件中颜色位数未知."
+msgstr "DIB头: 文件中颜色位数未知。"

 
 

-#: ../src/common/imagbmp.cpp:1002
+#: ../src/common/imagbmp.cpp:1028

 msgid "DIB Header: Unknown encoding in file."
 msgid "DIB Header: Unknown encoding in file."

-msgstr "DIB头: 文件编码未知."
+msgstr "DIB头: 文件编码未知。"

 
 

-#: ../src/common/accelcmn.cpp:79
+#: ../src/common/accelcmn.cpp:81

 #, fuzzy
 msgid "DIVIDE"
 msgstr "<盘符>"
 #, fuzzy
 msgid "DIVIDE"
 msgstr "<盘符>"


@@ -2503,15 +2529,19 @@ msgstr "<盘符>"
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 

-#: ../src/common/accelcmn.cpp:58
+#: ../src/common/accelcmn.cpp:60

 msgid "DOWN"
 msgstr ""
 
 msgid "DOWN"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1879
+#: ../src/richtext/richtextborderspage.cpp:545
+msgid "Dashed"
+msgstr ""
+
+#: ../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:2448
+#: ../src/osx/carbon/dataview.cpp:2492

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


@@ -2522,17 +2552,17 @@ msgstr "调试报告 \"%s\""
 
 #: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."
 
 #: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."

-msgstr "无法创建调试报告."
+msgstr "无法创建调试报告。"

 
 

-#: ../src/common/debugrpt.cpp:547
+#: ../src/common/debugrpt.cpp:549

 msgid "Debug report generation has failed."
 msgid "Debug report generation has failed."

-msgstr "无法生成调试报告."
+msgstr "无法生成调试报告。"

 
 

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

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

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

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


@@ -2544,53 +2574,52 @@ msgstr "缺省字体"
 msgid "Default printer"
 msgstr "缺省的打印机"
 
 msgid "Default printer"
 msgstr "缺省的打印机"
 

-#: ../src/richtext/richtextbuffer.cpp:5538
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:458
+#: ../src/richtext/richtextbuffer.cpp:7145 ../src/common/stockitem.cpp:153
+#: ../src/stc/stc_i18n.cpp:21

 msgid "Delete"
 msgstr "删除"
 
 msgid "Delete"
 msgstr "删除"
 

-#: ../src/richtext/richtexttabspage.cpp:147
-#, fuzzy
+#: ../src/richtext/richtexttabspage.cpp:149

 msgid "Delete A&ll"
 msgid "Delete A&ll"

-msgstr "å\85¨é\83¨é\80\89æ\8b©(&A)"
+msgstr "å\88 é\99¤å\85¨é\83¨(&l)"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:735
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:783

 msgid "Delete Style"
 msgid "Delete Style"

-msgstr "删除项"
+msgstr "删除样式"

 
 

-#: ../src/richtext/richtextctrl.cpp:794
-#: ../src/richtext/richtextctrl.cpp:898
-#: ../src/richtext/richtextctrl.cpp:947
-#, fuzzy
+#: ../src/richtext/richtextctrl.cpp:1126 ../src/richtext/richtextctrl.cpp:1266
+#: ../src/richtext/richtextctrl.cpp:1340

 msgid "Delete Text"
 msgid "Delete Text"

-msgstr "删除项"
+msgstr "删除文字"

 
 #: ../src/generic/editlbox.cpp:275
 msgid "Delete item"
 msgstr "删除项"
 
 
 #: ../src/generic/editlbox.cpp:275
 msgid "Delete item"
 msgstr "删除项"
 

-#: ../src/common/stockitem.cpp:262
-#, fuzzy
+#: ../src/common/stockitem.cpp:261

 msgid "Delete selection"
 msgid "Delete selection"

-msgstr "选段"
+msgstr "删除选区"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:735
-#, fuzzy, c-format
+#: ../src/richtext/richtextstyledlg.cpp:783
+#, c-format

 msgid "Delete style %s?"
 msgid "Delete style %s?"

-msgstr "删除项"
+msgstr "删除样式 %s?"

 
 #: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."
 
 #: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."

-msgstr "已删除过期的锁文件 '%s'."
+msgstr "已删除过期的锁文件 '%s'。"

 
 #: ../src/common/module.cpp:125
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
 msgstr ""
 
 
 #: ../src/common/module.cpp:125
 #, c-format
 msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
 msgstr ""
 

-#: ../src/generic/dirctrlg.cpp:677
+#: ../src/common/stockitem.cpp:197
+msgid "Descending"
+msgstr "降序"
+
+#: ../src/generic/dirctrlg.cpp:618

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


@@ -2602,9 +2631,11 @@ msgstr ""
 msgid "Developers"
 msgstr ""
 
 msgid "Developers"
 msgstr ""
 

-#: ../src/msw/dialup.cpp:397
-msgid "Dial up functions are unavailable because the remote access service (RAS) is not installed on this machine. Please install it."
-msgstr "由于远程访问服务(RAS)没有安装在本机, 拨号功能不能使用. 请安装它."
+#: ../src/msw/dialup.cpp:394
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
+msgstr "由于远程访问服务(RAS)没有安装在本机，拨号功能无法使用。请安装它。"

 
 #: ../src/generic/tipdlg.cpp:231
 msgid "Did you know..."
 
 #: ../src/generic/tipdlg.cpp:231
 msgid "Did you know..."


@@ -2619,20 +2650,15 @@ msgstr ""
 msgid "Directories"
 msgstr "目录"
 
 msgid "Directories"
 msgstr "目录"
 

-#: ../src/common/filefn.cpp:1265
+#: ../src/common/filefn.cpp:1248

 #, c-format
 msgid "Directory '%s' couldn't be created"
 #, c-format
 msgid "Directory '%s' couldn't be created"

-msgstr "目录'%s'不能被创建"
+msgstr "无法创建目录 '%s'"

 
 

-#: ../src/common/filefn.cpp:1289
+#: ../src/common/filefn.cpp:1268

 #, fuzzy, c-format
 msgid "Directory '%s' couldn't be deleted"
 #, fuzzy, c-format
 msgid "Directory '%s' couldn't be deleted"

-msgstr "目录'%s'不能被创建"
-
-#: ../src/mgl/dirmgl.cpp:211
-#, c-format
-msgid "Directory '%s' doesn't exist!"
-msgstr "目录 '%s'不存在!"
+msgstr "目录'%s'无法被创建"

 
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"
 
 #: ../src/generic/dirdlgg.cpp:234
 msgid "Directory does not exist"


@@ -2640,14 +2666,16 @@ msgstr "目录不存在"
 
 #: ../src/generic/filectrlg.cpp:1402
 msgid "Directory doesn't exist."
 
 #: ../src/generic/filectrlg.cpp:1402
 msgid "Directory doesn't exist."

-msgstr "目录不存在."
+msgstr "目录不存在。"

 
 

-#: ../src/common/docview.cpp:407
+#: ../src/common/docview.cpp:457

 msgid "Discard changes and reload the last saved version?"
 msgstr ""
 
 #: ../src/html/helpwnd.cpp:510
 msgid "Discard changes and reload the last saved version?"
 msgstr ""
 
 #: ../src/html/helpwnd.cpp:510

-msgid "Display all index items that contain given substring. Search is case insensitive."
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."

 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 #: ../src/html/helpwnd.cpp:690
 msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
 #: ../src/html/helpwnd.cpp:690


@@ -2660,7 +2688,8 @@ msgstr ""
 
 #: ../src/msw/mimetype.cpp:708
 msgid ""
 
 #: ../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"


@@ -2672,7 +2701,7 @@ msgstr ""
 "新的值为 \n"
 "%s %1"
 
 "新的值为 \n"
 "%s %1"
 

-#: ../src/common/docview.cpp:483
+#: ../src/common/docview.cpp:533

 #, 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的修改?"


@@ -2685,90 +2714,144 @@ msgstr ""
 msgid "Documentation writers"
 msgstr ""
 
 msgid "Documentation writers"
 msgstr ""
 

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

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

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

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

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

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

+#: ../src/richtext/richtextborderspage.cpp:544
+#, fuzzy
+msgid "Dotted"
+msgstr "完成"
+
+#: ../src/richtext/richtextborderspage.cpp:546
+#, fuzzy
+msgid "Double"
+msgstr "完成"
+

 #: ../src/common/paper.cpp:178
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgstr "横向日本双明信片, 148 x 200 毫米"
 
 #: ../src/common/paper.cpp:178
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
 msgstr "横向日本双明信片, 148 x 200 毫米"
 

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

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

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

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

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

 #: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 #: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"

-msgstr "E 纸张, 34 x 44 英寸"
+msgstr "E 纸张，34 x 44 英寸"

 
 

-#: ../src/common/accelcmn.cpp:60
+#: ../src/common/accelcmn.cpp:62

 msgid "END"
 msgstr ""
 
 msgid "END"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:51
+#: ../src/common/accelcmn.cpp:53

 msgid "ENTER"
 msgstr ""
 
 msgid "ENTER"
 msgstr ""
 

-#: ../src/unix/fswatcher_inotify.cpp:336
+#: ../src/unix/fswatcher_inotify.cpp:335

 #, fuzzy
 msgid "EOF while reading from inotify descriptor"
 #, fuzzy
 msgid "EOF while reading from inotify descriptor"

-msgstr "不能从文件描述子 %d中读"
+msgstr "无法从文件描述子 %d中读"

 
 

-#: ../src/common/accelcmn.cpp:63
+#: ../src/common/accelcmn.cpp:65

 msgid "ESC"
 msgstr ""
 
 msgid "ESC"
 msgstr ""
 

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

 msgid "ESCAPE"
 msgstr ""
 
 msgid "ESCAPE"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:72
+#: ../src/common/accelcmn.cpp:74

 msgid "EXECUTE"
 msgstr ""
 
 msgid "EXECUTE"
 msgstr ""
 

+#: ../src/common/stockitem.cpp:155
+msgid "Edit"
+msgstr "编辑"
+

 #: ../src/generic/editlbox.cpp:273
 msgid "Edit item"
 msgstr "编辑项"
 
 #: ../src/generic/editlbox.cpp:273
 msgid "Edit item"
 msgstr "编辑项"
 

-#: ../src/generic/progdlgg.cpp:195
+#: ../src/richtext/richtextsizepage.cpp:257
+#: ../src/richtext/richtextsizepage.cpp:259
+#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:367
+msgid "Enable the height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:338
+#: ../src/richtext/richtextsizepage.cpp:340
+#, fuzzy
+msgid "Enable the maximum width value."
+msgstr "无法设定最大宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:311
+#: ../src/richtext/richtextsizepage.cpp:313
+msgid "Enable the minimum height value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:284
+#: ../src/richtext/richtextsizepage.cpp:286
+#, fuzzy
+msgid "Enable the minimum width value."
+msgstr "无法设定最小宽度。"
+
+#: ../src/richtext/richtextsizepage.cpp:230
+#: ../src/richtext/richtextsizepage.cpp:232
+msgid "Enable the width value."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:410
+#: ../src/richtext/richtextsizepage.cpp:412
+msgid "Enable vertical alignment."
+msgstr "启用垂直对齐。"
+
+#: ../src/richtext/richtextsizepage.cpp:452
+#: ../src/richtext/richtextsizepage.cpp:454
+msgid "Enable vertical offset."
+msgstr ""
+
+#: ../src/richtext/richtextbackgroundpage.cpp:133
+#: ../src/richtext/richtextbackgroundpage.cpp:135
+msgid "Enables a background colour."
+msgstr "启用背景颜色。"
+
+#: ../src/richtext/richtextstyledlg.cpp:935

 #, fuzzy
 #, fuzzy

-msgid "Elapsed time:"
-msgstr "用时: "
+msgid "Enter a box style name"
+msgstr "输入新样式名"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:568
+#: ../src/richtext/richtextstyledlg.cpp:607

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

-#: ../src/richtext/richtextstyledlg.cpp:771
+#: ../src/richtext/richtextstyledlg.cpp:821

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

-#: ../src/richtext/richtextstyledlg.cpp:844
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:894

 msgid "Enter a new style name"
 msgid "Enter a new style name"

-msgstr "字体风格."
-
-#: ../src/common/prntbase.cpp:1107
-#, c-format
-msgid "Enter a page number between %d and %d:"
-msgstr "输入页码范围(%d 至 %d):"
+msgstr "输入新样式名"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:616
+#: ../src/richtext/richtextstyledlg.cpp:655

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


@@ -2777,7 +2860,7 @@ msgstr ""
 msgid "Enter command to open file \"%s\":"
 msgstr "输入命令以打开文件 \"%s\":"
 
 msgid "Enter command to open file \"%s\":"
 msgstr "输入命令以打开文件 \"%s\":"
 

-#: ../src/generic/helpext.cpp:465
+#: ../src/generic/helpext.cpp:464

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


@@ -2787,28 +2870,22 @@ msgstr "邀请信, 220 x 220 毫米"
 
 #: ../src/common/config.cpp:474
 #, c-format
 
 #: ../src/common/config.cpp:474
 #, c-format

-msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
-
-#: ../src/generic/dirctrlg.cpp:721
-#: ../src/generic/dirctrlg.cpp:739
-#: ../src/generic/dirctrlg.cpp:750
-#: ../src/generic/dirdlgg.cpp:353
-#: ../src/generic/filectrlg.cpp:671
-#: ../src/generic/filectrlg.cpp:785
-#: ../src/generic/filectrlg.cpp:799
-#: ../src/generic/filectrlg.cpp:815
-#: ../src/generic/filectrlg.cpp:1371
-#: ../src/generic/filectrlg.cpp:1402
-#: ../src/gtk/filedlg.cpp:69
-#: ../src/gtk1/fontdlg.cpp:75
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'。"
+
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/dirctrlg.cpp:680
+#: ../src/generic/dirctrlg.cpp:691 ../src/generic/dirdlgg.cpp:353
+#: ../src/generic/filectrlg.cpp:671 ../src/generic/filectrlg.cpp:785
+#: ../src/generic/filectrlg.cpp:799 ../src/generic/filectrlg.cpp:815
+#: ../src/generic/filectrlg.cpp:1371 ../src/generic/filectrlg.cpp:1402
+#: ../src/gtk/filedlg.cpp:69 ../src/gtk1/fontdlg.cpp:75

 msgid "Error"
 msgstr "错误"
 
 #: ../src/unix/epolldispatcher.cpp:104
 msgid "Error"
 msgstr "错误"
 
 #: ../src/unix/epolldispatcher.cpp:104

-#, fuzzy

 msgid "Error closing epoll descriptor"
 msgid "Error closing epoll descriptor"

-msgstr "å\88\9b建ç\9b®å½\95错误"
+msgstr "å\85³é\97­ epoll æ\8f\8f述符æ\97¶å\8f\91ç\94\9f错误"

 
 #: ../src/unix/fswatcher_kqueue.cpp:115
 #, fuzzy
 
 #: ../src/unix/fswatcher_kqueue.cpp:115
 #, fuzzy


@@ -2819,98 +2896,97 @@ msgstr "创建目录错误"
 msgid "Error creating directory"
 msgstr "创建目录错误"
 
 msgid "Error creating directory"
 msgstr "创建目录错误"
 

-#: ../src/common/imagbmp.cpp:1030
+#: ../src/common/imagbmp.cpp:1056

 #, fuzzy
 msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 
 #, fuzzy
 msgid "Error in reading image DIB."
 msgstr "读图像DIB错误."
 

-#: ../src/propgrid/propgrid.cpp:6444
+#: ../src/propgrid/propgrid.cpp:6563

 #, c-format
 msgid "Error in resource: %s"
 msgstr ""
 
 #: ../src/common/fileconf.cpp:454
 msgid "Error reading config options."
 #, c-format
 msgid "Error in resource: %s"
 msgstr ""
 
 #: ../src/common/fileconf.cpp:454
 msgid "Error reading config options."

-msgstr "读配置选项错误."
+msgstr "读配置选项错误。"

 
 #: ../src/common/fileconf.cpp:1065
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
 
 #: ../src/common/fileconf.cpp:1065
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 

-#: ../src/gtk/print.cpp:652
-#, fuzzy
+#: ../src/gtk/print.cpp:669

 msgid "Error while printing: "
 msgid "Error while printing: "

-msgstr "等待信号量时出错"
+msgstr "打印时出错: "

 
 

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

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

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

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

-#: ../src/generic/progdlgg.cpp:202
-#, fuzzy
-msgid "Estimated time:"
-msgstr "预期时间: "
-
-#: ../src/unix/fswatcher_inotify.cpp:416
+#: ../src/unix/fswatcher_inotify.cpp:415

 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 (*.*)|*.*||"
+#, fuzzy
+msgid "Executable files (*.exe)|*.exe|"

 msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 
 msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 

-#: ../src/msw/utilsexc.cpp:848
+#: ../src/common/stockitem.cpp:156
+msgid "Execute"
+msgstr ""
+
+#: ../src/msw/utilsexc.cpp:904

 #, c-format
 msgid "Execution of command '%s' failed"
 #, c-format
 msgid "Execution of command '%s' failed"

-msgstr "命令 '%s'执行失败"
+msgstr "命令 '%s' 执行失败"

 
 

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

 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"

-msgstr "命令 '%s'执行失败, 错误信息: %ul"
+msgstr "命令 '%s' 执行失败, 错误信息: %ul"

 
 #: ../src/common/paper.cpp:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
 
 #: ../src/common/paper.cpp:107
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 

-#: ../src/msw/registry.cpp:1171
+#: ../src/msw/registry.cpp:1231

 #, c-format
 #, 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:193
+#: ../src/common/fmapbase.cpp:192

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

-#: ../src/html/chm.cpp:724
+#: ../src/html/chm.cpp:728

 #, c-format
 msgid "Extraction of '%s' into '%s' failed."
 #, c-format
 msgid "Extraction of '%s' into '%s' failed."

-msgstr "将 '%s'解压至 '%s'失败."
+msgstr "将 '%s' 解压至 '%s' 失败。"

 
 

-#: ../src/common/accelcmn.cpp:231
-#: ../src/common/accelcmn.cpp:303
+#: ../src/common/accelcmn.cpp:239 ../src/common/accelcmn.cpp:324

 msgid "F"
 msgstr ""
 
 msgid "F"
 msgstr ""
 

-#: ../src/propgrid/advprops.cpp:640
+#: ../src/propgrid/advprops.cpp:641

 #, fuzzy
 msgid "Face Name"
 msgstr "新名称"
 
 #: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
 #, fuzzy
 msgid "Face Name"
 msgstr "新名称"
 
 #: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."

-msgstr "访问锁文件失败."
+msgstr "访问锁文件失败。"

 
 #: ../src/unix/epolldispatcher.cpp:117
 
 #: ../src/unix/epolldispatcher.cpp:117

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

 msgid "Failed to add descriptor %d to epoll descriptor %d"
 msgid "Failed to add descriptor %d to epoll descriptor %d"

-msgstr "不能写到文件描述子 %d"
+msgstr "无法将描述符 %d 加到 epoll 描述符 %d"

 
 

-#: ../src/msw/dib.cpp:561
+#: ../src/msw/dib.cpp:551

 #, fuzzy, c-format
 msgid "Failed to allocate %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."
 #, fuzzy, c-format
 msgid "Failed to allocate %luKb of memory for bitmap data."
 msgstr "为位图数据分配 %luKb 内存失败."


@@ -2922,16 +2998,21 @@ msgstr "创建游标失败."
 
 #: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"
 
 #: ../src/unix/displayx11.cpp:289
 msgid "Failed to change video mode"

-msgstr "改变视频模式失败."
+msgstr "改变视频模式失败。"
+
+#: ../src/common/image.cpp:2943
+#, fuzzy, c-format
+msgid "Failed to check format of image file \"%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:223
+#: ../src/common/filename.cpp:222

 msgid "Failed to close file handle"
 msgid "Failed to close file handle"

-msgstr "关闭文件句柄失败."
+msgstr "关闭文件句柄失败"

 
 #: ../src/unix/snglinst.cpp:335
 #, c-format
 
 #: ../src/unix/snglinst.cpp:335
 #, c-format


@@ -2940,79 +3021,80 @@ msgstr "关闭锁文件 '%s'失败"
 
 #: ../src/msw/clipbrd.cpp:115
 msgid "Failed to close the clipboard."
 
 #: ../src/msw/clipbrd.cpp:115
 msgid "Failed to close the clipboard."

-msgstr "关闭剪贴板失败."
+msgstr "关闭剪贴板失败。"

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

-#: ../src/msw/dialup.cpp:826
+#: ../src/msw/dialup.cpp:819

 msgid "Failed to connect: missing username/password."
 msgid "Failed to connect: missing username/password."

-msgstr "连接失败: 缺少用户名/口令."
+msgstr "连接失败: 缺少用户名/口令。"

 
 

-#: ../src/msw/dialup.cpp:772
+#: ../src/msw/dialup.cpp:765

 msgid "Failed to connect: no ISP to dial."
 msgid "Failed to connect: no ISP to dial."

-msgstr "连接失败: 没有要拨号的ISP."
+msgstr "连接失败: 没有要拨号的 ISP。"

 
 #: ../src/common/textfile.cpp:201
 #, fuzzy, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "关闭文件句柄失败."
 
 
 #: ../src/common/textfile.cpp:201
 #, fuzzy, c-format
 msgid "Failed to convert file \"%s\" to Unicode."
 msgstr "关闭文件句柄失败."
 

-#: ../src/generic/logg.cpp:977
+#: ../src/generic/logg.cpp:978

 #, fuzzy
 msgid "Failed to copy dialog contents to the clipboard."
 msgstr "打开剪贴板失败."
 
 #, fuzzy
 msgid "Failed to copy dialog contents to the clipboard."
 msgstr "打开剪贴板失败."
 

-#: ../src/msw/registry.cpp:649
+#: ../src/msw/registry.cpp:692

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

-#: ../src/msw/registry.cpp:658
+#: ../src/msw/registry.cpp:701

 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."

-msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
+msgstr "把注册键内容从 '%s' 复制到 '%s' 失败。"

 
 

-#: ../src/common/filefn.cpp:1067
+#: ../src/common/filefn.cpp:1055

 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"

-msgstr "复制文件 '%s'至 '%s'失败"
+msgstr "复制文件 '%s' 至 '%s' 失败"

 
 

-#: ../src/msw/registry.cpp:636
+#: ../src/msw/registry.cpp:679

 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."

-msgstr "复制注册表子键 '%s'至 '%s'失败."
+msgstr "复制注册表子键 '%s' 至 '%s' 失败。"

 
 

-#: ../src/msw/dde.cpp:1071
+#: ../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:570
+#: ../src/msw/mdi.cpp:569

 msgid "Failed to create MDI parent frame."
 msgid "Failed to create MDI parent frame."

-msgstr "创建 MDI 父框架失败."
+msgstr "创建 MDI 父框架失败。"

 
 

-#: ../src/msw/statusbar.cpp:144
-msgid "Failed to create a status bar."
-msgstr "创建状态条失败."
-
-#: ../src/common/filename.cpp:988
+#: ../src/common/filename.cpp:1032

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

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

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

-#: ../src/msw/dde.cpp:444
+#: ../src/msw/ole/automtn.cpp:514
+#, fuzzy, c-format
+msgid "Failed to create an instance of \"%s\""
+msgstr "无法创建目录 \"%s\""
+
+#: ../src/msw/dde.cpp:443

 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"

-msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
+msgstr "创建到服务器 '%s' 的关于主题 '%s' 的连接失败"

 
 

-#: ../src/msw/cursor.cpp:214
+#: ../src/msw/cursor.cpp:213

 msgid "Failed to create cursor."
 msgid "Failed to create cursor."

-msgstr "创建游标失败."
+msgstr "创建游标失败。"

 
 #: ../src/common/debugrpt.cpp:208
 #, c-format
 
 #: ../src/common/debugrpt.cpp:208
 #, c-format


@@ -3025,7 +3107,7 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""

-"创建目录 '%s'失败\n"
+"创建目录 '%s' 失败\n"

 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:85
 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:85


@@ -3036,7 +3118,7 @@ msgstr "创建游标失败."
 #: ../src/msw/mimetype.cpp:199
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 #: ../src/msw/mimetype.cpp:199
 #, c-format
 msgid "Failed to create registry entry for '%s' files."

-msgstr "为 '%s'文件创建注册条目失败."
+msgstr "为 '%s' 文件创建注册条目失败。"

 
 #: ../src/msw/fdrepdlg.cpp:443
 #, c-format
 
 #: ../src/msw/fdrepdlg.cpp:443
 #, c-format


@@ -3048,7 +3130,7 @@ msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 msgid "Failed to create wake up pipe used by event loop."
 msgstr "创建状态条失败."
 
 msgid "Failed to create wake up pipe used by event loop."
 msgstr "创建状态条失败."
 

-#: ../src/html/winpars.cpp:738
+#: ../src/html/winpars.cpp:733

 #, 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文档失败"


@@ -3061,67 +3143,74 @@ msgstr "清空剪贴板失败"
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 
 msgid "Failed to enumerate video modes"
 msgstr "枚举视频模式失败"
 

-#: ../src/msw/dde.cpp:725
+#: ../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:658
-#: ../src/msw/dialup.cpp:893
+#: ../src/msw/dialup.cpp:651 ../src/msw/dialup.cpp:886

 #, c-format
 msgid "Failed to establish dialup connection: %s"
 #, c-format
 msgid "Failed to establish dialup connection: %s"

-msgstr "建立拨号连接: %s失败"
+msgstr "建立拨号连接失败: %s"

 
 

-#: ../src/unix/utilsunx.cpp:506
-#: ../src/unix/utilsunx.cpp:520
+#: ../src/unix/utilsunx.cpp:548 ../src/unix/utilsunx.cpp:562

 #, c-format
 msgid "Failed to execute '%s'\n"
 #, c-format
 msgid "Failed to execute '%s'\n"

-msgstr "执行 '%s'失败\n"
+msgstr "执行 '%s' 失败\n"

 
 

-#: ../src/common/debugrpt.cpp:698
+#: ../src/common/debugrpt.cpp:700

 msgid "Failed to execute curl, please install it in PATH."
 msgid "Failed to execute curl, please install it in PATH."

-msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+msgstr "无法执行curl，请在PATH变量所指的目录中安装curl。"

 
 

-#: ../src/common/regex.cpp:435
-#: ../src/common/regex.cpp:483
+#: ../src/msw/ole/automtn.cpp:497

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

+msgid "Failed to find CLSID of \"%s\""
+msgstr "从文件 \"%s\"读取元文件失败."
+
+#: ../src/common/regex.cpp:435 ../src/common/regex.cpp:483
+#, c-format

 msgid "Failed to find match for regular expression: %s"
 msgid "Failed to find match for regular expression: %s"

-msgstr "不能匹配 '%s' 于正则表达式: %s"
+msgstr "无法找到匹配的正则表达式: %s"

 
 

-#: ../src/msw/dialup.cpp:724
+#: ../src/msw/dialup.cpp:717

 #, c-format
 msgid "Failed to get ISP names: %s"
 #, c-format
 msgid "Failed to get ISP names: %s"

-msgstr "获取ISP名: %s失败"
+msgstr "获取 ISP 名失败: %s"
+
+#: ../src/msw/ole/automtn.cpp:566
+#, fuzzy, c-format
+msgid "Failed to get OLE automation interface for \"%s\""
+msgstr "无法创建目录 \"%s\""

 
 #: ../src/msw/clipbrd.cpp:745
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 
 
 #: ../src/msw/clipbrd.cpp:745
 msgid "Failed to get data from the clipboard"
 msgstr "从剪贴板获取数据失败"
 

-#: ../src/common/stopwatch.cpp:210
+#: ../src/common/time.cpp:263

 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 
 msgid "Failed to get the local system time"
 msgstr "获取本地系统时间失败"
 

-#: ../src/common/filefn.cpp:1482
+#: ../src/common/filefn.cpp:1452

 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 #: ../src/univ/theme.cpp:114
 msgid "Failed to initialize GUI: no built-in themes found."
 msgid "Failed to get the working directory"
 msgstr "获取工作目录失败"
 
 #: ../src/univ/theme.cpp:114
 msgid "Failed to initialize GUI: no built-in themes found."

-msgstr "不能初始化GUI: 找不到内嵌的主题(theme)."
+msgstr "无法初始化 GUI: 找不到内嵌的主题。"

 
 #: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."
 
 #: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."

-msgstr "初始化MS HTML帮助失败."
+msgstr "初始化MS HTML 帮助失败。"

 
 

-#: ../src/msw/glcanvas.cpp:882
+#: ../src/msw/glcanvas.cpp:893

 msgid "Failed to initialize OpenGL"
 msgid "Failed to initialize OpenGL"

-msgstr "不能初始化OpenGL"
+msgstr "无法初始化 OpenGL"

 
 

-#: ../src/msw/dialup.cpp:888
+#: ../src/msw/dialup.cpp:881

 #, fuzzy, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 
 #, fuzzy, c-format
 msgid "Failed to initiate dialup connection: %s"
 msgstr "终止拨号连接: %s失败"
 

-#: ../src/gtk/textctrl.cpp:1072
+#: ../src/gtk/textctrl.cpp:1100

 #, fuzzy
 msgid "Failed to insert text in the control."
 msgstr "获取工作目录失败"
 #, fuzzy
 msgid "Failed to insert text in the control."
 msgstr "获取工作目录失败"


@@ -3129,42 +3218,49 @@ msgstr "获取工作目录失败"
 #: ../src/unix/snglinst.cpp:242
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
 #: ../src/unix/snglinst.cpp:242
 #, c-format
 msgid "Failed to inspect the lock file '%s'"

-msgstr "检查锁文件 '%s'失败"
+msgstr "检查锁文件 '%s' 失败"

 
 #: ../src/unix/appunix.cpp:90
 #, fuzzy
 msgid "Failed to install signal handler"
 msgstr "关闭文件句柄失败."
 
 
 #: ../src/unix/appunix.cpp:90
 #, fuzzy
 msgid "Failed to install signal handler"
 msgstr "关闭文件句柄失败."
 

-#: ../src/unix/threadpsx.cpp:1001
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
+#: ../src/unix/threadpsx.cpp:1010
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr "合并线程失败，检测到潜在地内存丢失 - 请重新启动系统"

 
 

-#: ../src/msw/utils.cpp:734
+#: ../src/msw/utils.cpp:747

 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "终止进程 %d 失败"
 

-#: ../src/common/iconbndl.cpp:173
+#: ../src/common/iconbndl.cpp:183

 #, fuzzy, c-format
 msgid "Failed to load image %%d from file '%s'."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 
 #, fuzzy, c-format
 msgid "Failed to load image %%d from file '%s'."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 

-#: ../src/common/iconbndl.cpp:181
+#: ../src/common/iconbndl.cpp:191

 #, fuzzy, c-format
 msgid "Failed to load image %d from stream."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 
 #, fuzzy, c-format
 msgid "Failed to load image %d from stream."
 msgstr "读取图像 %d (从文件 '%s'中)失败."
 

+#: ../src/common/image.cpp:2251 ../src/common/image.cpp:2270
+#, fuzzy, c-format
+msgid "Failed to load image from file \"%s\"."
+msgstr "从文件 \"%s\"读取元文件失败."
+

 #: ../src/msw/enhmeta.cpp:98
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
 #: ../src/msw/enhmeta.cpp:98
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."

-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "从文件 \"%s\" 读取元文件失败。"

 
 #: ../src/msw/volume.cpp:328
 msgid "Failed to load mpr.dll."
 
 #: ../src/msw/volume.cpp:328
 msgid "Failed to load mpr.dll."

-msgstr "装载mpr.dll失败."
+msgstr "装载 mpr.dll 失败。"

 
 

-#: ../src/msw/utils.cpp:1102
+#: ../src/msw/utils.cpp:1128

 #, fuzzy, c-format
 msgid "Failed to load resource \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."
 #, fuzzy, c-format
 msgid "Failed to load resource \"%s\"."
 msgstr "从文件 \"%s\"读取元文件失败."


@@ -3172,9 +3268,9 @@ msgstr "从文件 \"%s\"读取元文件失败."
 #: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"
 #: ../src/common/dynlib.cpp:105
 #, c-format
 msgid "Failed to load shared library '%s'"

-msgstr "不能装载共享库 '%s'"
+msgstr "无法装载共享库 '%s'"

 
 

-#: ../src/msw/utils.cpp:1109
+#: ../src/msw/utils.cpp:1135

 #, fuzzy, c-format
 msgid "Failed to lock resource \"%s\"."
 msgstr "锁定锁文件 '%s'失败"
 #, fuzzy, c-format
 msgid "Failed to lock resource \"%s\"."
 msgstr "锁定锁文件 '%s'失败"


@@ -3182,28 +3278,28 @@ msgstr "锁定锁文件 '%s'失败"
 #: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 #: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"

-msgstr "锁定锁文件 '%s'失败"
+msgstr "锁定锁文件 '%s' 失败"

 
 #: ../src/unix/epolldispatcher.cpp:137
 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 
 
 #: ../src/unix/epolldispatcher.cpp:137
 #, c-format
 msgid "Failed to modify descriptor %d in epoll descriptor %d"
 msgstr ""
 

-#: ../src/common/filename.cpp:2510
+#: ../src/common/filename.cpp:2582

 #, c-format
 msgid "Failed to modify file times for '%s'"
 #, c-format
 msgid "Failed to modify file times for '%s'"

-msgstr "ä¿®æ\94¹æ\96\87件æ\97¶é\97´(为 '%s') 失败"
+msgstr "为 '%s' ä¿®æ\94¹æ\96\87件æ\97¶é\97´失败"

 
 #: ../src/common/selectdispatcher.cpp:253
 msgid "Failed to monitor I/O channels"
 msgstr ""
 
 
 #: ../src/common/selectdispatcher.cpp:253
 msgid "Failed to monitor I/O channels"
 msgstr ""
 

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

 #, 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:211
+#: ../src/common/filename.cpp:210

 #, 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) 失败"


@@ -3211,9 +3307,9 @@ msgstr "打开 '%s'(为 %s) 失败"
 #: ../src/html/chm.cpp:142
 #, c-format
 msgid "Failed to open CHM archive '%s'."
 #: ../src/html/chm.cpp:142
 #, c-format
 msgid "Failed to open CHM archive '%s'."

-msgstr "打开CHM存档 '%s'失败."
+msgstr "打开CHM存档 '%s' 失败。"

 
 

-#: ../src/common/utilscmn.cpp:1071
+#: ../src/common/utilscmn.cpp:1132

 #, 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) 失败"


@@ -3228,18 +3324,18 @@ msgstr "打开 '%s'(为 %s) 失败"
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 
 msgid "Failed to open display \"%s\"."
 msgstr "打开 '%s'(为 %s) 失败"
 

-#: ../src/common/filename.cpp:1023
+#: ../src/common/filename.cpp:1067

 msgid "Failed to open temporary file."
 msgid "Failed to open temporary file."

-msgstr "打开临时文件失败."
+msgstr "打开临时文件失败。"

 
 #: ../src/msw/clipbrd.cpp:94
 msgid "Failed to open the clipboard."
 
 #: ../src/msw/clipbrd.cpp:94
 msgid "Failed to open the clipboard."

-msgstr "打开剪贴板失败."
+msgstr "打开剪贴板失败。"

 
 

-#: ../src/common/translation.cpp:1008
-#, fuzzy, c-format
+#: ../src/common/translation.cpp:1014
+#, c-format

 msgid "Failed to parse Plural-Forms: '%s'"
 msgid "Failed to parse Plural-Forms: '%s'"

-msgstr "不能解析多表格: '%s'"
+msgstr "无法解析复数形式: '%s'"

 
 #: ../src/msw/clipbrd.cpp:645
 msgid "Failed to put data on the clipboard"
 
 #: ../src/msw/clipbrd.cpp:645
 msgid "Failed to put data on the clipboard"


@@ -3247,14 +3343,14 @@ msgstr "把数据放到剪贴板失败"
 
 #: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
 
 #: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."

-msgstr "从锁文件读取PID失败."
+msgstr "从锁文件读取 PID 失败。"

 
 #: ../src/common/fileconf.cpp:465
 #, fuzzy
 msgid "Failed to read config options."
 msgstr "读配置选项错误."
 
 
 #: ../src/common/fileconf.cpp:465
 #, fuzzy
 msgid "Failed to read config options."
 msgstr "读配置选项错误."
 

-#: ../src/common/docview.cpp:630
+#: ../src/common/docview.cpp:680

 #, 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\"读取元文件失败."


@@ -3264,159 +3360,164 @@ 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:139
+#: ../src/unix/evtloopunix.cpp:136

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

 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 
 msgid "Failed to redirect child process input/output"
 msgstr "重定向子过程输入/输出失败"
 

-#: ../src/msw/utilsexc.cpp:734
+#: ../src/msw/utilsexc.cpp:733

 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
 #: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgid "Failed to redirect the child process IO"
 msgstr "重定向子过程IO失败"
 
 #: ../src/msw/dde.cpp:294
 #, c-format
 msgid "Failed to register DDE server '%s'"

-msgstr "注册DDE服务器 '%s'失败"
+msgstr "注册DDE服务器 '%s' 失败"

 
 

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

 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."

-msgstr "回忆字符集 '%s'编码失败."
+msgstr "回忆字符集 '%s' 编码失败。"

 
 #: ../src/common/debugrpt.cpp:226
 #, c-format
 msgid "Failed to remove debug report file \"%s\""
 
 #: ../src/common/debugrpt.cpp:226
 #, c-format
 msgid "Failed to remove debug report file \"%s\""

-msgstr "不能删除调试报告文件 \"%s\""
+msgstr "无法删除调试报告文件 \"%s\""

 
 #: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
 
 #: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"

-msgstr "不能删除锁文件 '%s'"
+msgstr "无法删除锁文件 '%s'"

 
 #: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 
 #: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."

-msgstr "删除过期的锁文件 '%s'失败."
+msgstr "删除过期的锁文件 '%s' 失败。"

 
 

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

 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."

-msgstr "将注册值 '%s'改名到'%s'失败."
+msgstr "将注册值 '%s' 重命名为 '%s' 失败。"

 
 

-#: ../src/common/filefn.cpp:1180
+#: ../src/common/filefn.cpp:1165

 #, 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 ""
 
 msgstr ""
 

-#: ../src/msw/registry.cpp:591
+#: ../src/msw/registry.cpp:634

 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."

-msgstr "将注册键 '%s'改名到'%s'失败."
+msgstr "将注册键 '%s' 重命名为 '%s' 失败。"

 
 #: ../src/msw/clipbrd.cpp:499
 msgid "Failed to retrieve data from the clipboard."
 
 #: ../src/msw/clipbrd.cpp:499
 msgid "Failed to retrieve data from the clipboard."

-msgstr "从剪贴板检取数据失败."
+msgstr "从剪贴板检取数据失败。"

 
 

-#: ../src/common/filename.cpp:2604
+#: ../src/common/filename.cpp:2676

 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 #, c-format
 msgid "Failed to retrieve file times for '%s'"

-msgstr "æ£\80å\8f\96æ\96\87件æ\97¶é\97´(为 '%s')失败"
+msgstr "æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´失败"

 
 

-#: ../src/msw/dialup.cpp:491
+#: ../src/msw/dialup.cpp:488

 msgid "Failed to retrieve text of RAS error message"
 msgid "Failed to retrieve text of RAS error message"

-msgstr "æ£\80å\8f\96RAS错误消息正文失败"
+msgstr "æ\8f\90å\8f\96 RAS 错误消息正文失败"

 
 #: ../src/msw/clipbrd.cpp:782
 msgid "Failed to retrieve the supported clipboard formats"
 
 #: ../src/msw/clipbrd.cpp:782
 msgid "Failed to retrieve the supported clipboard formats"

-msgstr "æ£\80取支持的剪贴板格式失败"
+msgstr "æ\8f\90取支持的剪贴板格式失败"

 
 

-#: ../src/common/docview.cpp:601
+#: ../src/common/docview.cpp:651

 #, 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:339
+#: ../src/msw/dib.cpp:329

 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."

-msgstr "将位图图像保存至文件 \"%s\"失败."
+msgstr "将位图图像保存至文件 \"%s\" 失败。"

 
 

-#: ../src/msw/dde.cpp:766
+#: ../src/msw/dde.cpp:769

 msgid "Failed to send DDE advise notification"
 msgid "Failed to send DDE advise notification"

-msgstr "发送DDE advise 通知失败"
+msgstr "发送 DDE advise 通知失败"

 
 

-#: ../src/common/ftp.cpp:404
+#: ../src/common/ftp.cpp:407

 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."

-msgstr "设置FTP传输模式为 %s 时失败."
+msgstr "设置 FTP 传输模式为 %s 时失败。"

 
 #: ../src/msw/clipbrd.cpp:375
 msgid "Failed to set clipboard data."
 
 #: ../src/msw/clipbrd.cpp:375
 msgid "Failed to set clipboard data."

-msgstr "设置剪贴板数据失败"
+msgstr "设置剪贴板数据失败。"

 
 #: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
 
 #: ../src/unix/snglinst.cpp:182
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"

-msgstr "在锁文件 '%s'上设置许可权限时失败"
+msgstr "在锁文件 '%s' 上设置许可权限时失败"

 
 

-#: ../src/common/file.cpp:532
+#: ../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:1013
+#: ../src/gtk/textctrl.cpp:1041

 #, 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:1322
-#: ../src/unix/threadpsx.cpp:1332
+#: ../src/unix/threadpsx.cpp:1333 ../src/unix/threadpsx.cpp:1343

 #, c-format
 msgid "Failed to set thread priority %d."
 #, c-format
 msgid "Failed to set thread priority %d."

-msgstr "设置线程优先级 %d失败."
+msgstr "设置线程优先级 %d 失败。"
+
+#: ../src/unix/utilsunx.cpp:729
+msgid "Failed to set up non-blocking pipe, the program might hang."
+msgstr ""

 
 

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

 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 #, 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:96
+#: ../src/unix/evtloopunix.cpp:93

 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:1510
+#: ../src/unix/threadpsx.cpp:1525

 msgid "Failed to terminate a thread."
 msgid "Failed to terminate a thread."

-msgstr "终止线程失败"
+msgstr "终止线程失败。"

 
 

-#: ../src/msw/dde.cpp:744
+#: ../src/msw/dde.cpp:747

 msgid "Failed to terminate the advise loop with DDE server"
 msgid "Failed to terminate the advise loop with DDE server"

-msgstr "终止与DDE服务器的advise循环失败"
+msgstr "终止与 DDE 服务器的 advise 循环失败"

 
 

-#: ../src/msw/dialup.cpp:968
+#: ../src/msw/dialup.cpp:961

 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"

-msgstr "终止拨号连接: %s失败"
+msgstr "终止拨号连接失败: %s"

 
 

-#: ../src/common/filename.cpp:2525
+#: ../src/common/filename.cpp:2597

 #, c-format
 msgid "Failed to touch the file '%s'"
 #, c-format
 msgid "Failed to touch the file '%s'"

-msgstr "对文件 '%s'进行touch操作失败"
+msgstr "对文件 '%s' 进行 touch 操作时失败"

 
 #: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 
 #: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"

-msgstr "对锁文件 '%s'解锁失败"
+msgstr "对已锁文件 '%s' 解锁失败"

 
 #: ../src/msw/dde.cpp:315
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 
 #: ../src/msw/dde.cpp:315
 #, c-format
 msgid "Failed to unregister DDE server '%s'"

-msgstr "撤消DDE服务器 '%s'注册失败"
+msgstr "撤消 DDE 服务器 '%s' 注册失败"

 
 #: ../src/unix/epolldispatcher.cpp:156
 #, fuzzy, c-format
 
 #: ../src/unix/epolldispatcher.cpp:156
 #, fuzzy, c-format


@@ -3425,51 +3526,45 @@ msgstr "从剪贴板检取数据失败."
 
 #: ../src/common/fileconf.cpp:1038
 msgid "Failed to update user configuration file."
 
 #: ../src/common/fileconf.cpp:1038
 msgid "Failed to update user configuration file."

-msgstr "不能更新用户配置文件."
+msgstr "无法更新用户配置文件。"

 
 

-#: ../src/common/debugrpt.cpp:711
+#: ../src/common/debugrpt.cpp:713

 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."

-msgstr "上传调试报告失败 (错误号 %d)."
+msgstr "上传调试报告失败 (错误号 %d)。"

 
 #: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
 
 #: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"

-msgstr "写锁文件 '%s'失败"
+msgstr "写锁文件 '%s' 失败"

 
 

-#: ../src/propgrid/propgrid.cpp:172
-#, fuzzy
+#: ../src/propgrid/propgrid.cpp:173

 msgid "False"
 msgid "False"

-msgstr "文件"
+msgstr "False"

 
 

-#: ../src/propgrid/advprops.cpp:658
+#: ../src/propgrid/advprops.cpp:659

 #, fuzzy
 msgid "Family"
 msgstr "字体(&F):"
 
 #, fuzzy
 msgid "Family"
 msgstr "字体(&F):"
 

-#: ../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:618
+#: ../src/common/docview.cpp:668

 #, 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:595
+#: ../src/common/docview.cpp:645

 #, 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
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 #: ../src/gtk/filedlg.cpp:53
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"

-msgstr "文件 '%s' 已存在, 确实需要复写它?"
+msgstr "文件 '%s' 已存在，确实需要复写它?"

 
 #: ../src/os2/filedlg.cpp:308
 #, c-format
 
 #: ../src/os2/filedlg.cpp:308
 #, c-format


@@ -3477,29 +3572,37 @@ msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr ""

-"文件 '%s' 已存在.\n"
+"文件 '%s' 已存在。\n"

 "真的需要替换它?"
 
 "真的需要替换它?"
 

-#: ../src/richtext/richtextctrl.cpp:2137
-#: ../src/common/textcmn.cpp:775
-msgid "File couldn't be loaded."
+#: ../src/common/filefn.cpp:1204
+#, fuzzy, c-format
+msgid "File '%s' couldn't be removed"

 msgstr "文件不能被装载."
 
 msgstr "文件不能被装载."
 

-#: ../src/msw/filedlg.cpp:355
+#: ../src/common/filefn.cpp:1184
+#, fuzzy, c-format
+msgid "File '%s' couldn't be renamed '%s'"
+msgstr "文件不能被装载."
+
+#: ../src/richtext/richtextctrl.cpp:2665 ../src/common/textcmn.cpp:870
+msgid "File couldn't be loaded."
+msgstr "文件无法装载。"
+
+#: ../src/msw/filedlg.cpp:429

 #, fuzzy, c-format
 msgid "File dialog failed with error code %0lx."
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
 #, fuzzy, c-format
 msgid "File dialog failed with error code %0lx."
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 

-#: ../src/common/docview.cpp:1647
+#: ../src/common/docview.cpp:1752

 msgid "File error"
 msgstr "文件错误"
 
 msgid "File error"
 msgstr "文件错误"
 

-#: ../src/generic/dirctrlg.cpp:739
-#: ../src/generic/filectrlg.cpp:799
+#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filectrlg.cpp:799

 msgid "File name exists already."
 msgid "File name exists already."

-msgstr "文件名已存在"
+msgstr "文件名已存在。"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:414
+#: ../src/unix/fswatcher_inotify.cpp:413

 msgid "File system containing watched object was unmounted"
 msgstr ""
 
 msgid "File system containing watched object was unmounted"
 msgstr ""
 


@@ -3507,7 +3610,7 @@ msgstr ""
 msgid "Files"
 msgstr "文件"
 
 msgid "Files"
 msgstr "文件"
 

-#: ../src/common/filefn.cpp:1775
+#: ../src/common/filefn.cpp:1756

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


@@ -3516,60 +3619,77 @@ msgstr "文件 (%s)"
 msgid "Filter"
 msgstr "过滤器"
 
 msgid "Filter"
 msgstr "过滤器"
 

-#: ../src/html/helpwnd.cpp:498
+#: ../src/common/stockitem.cpp:159 ../src/html/helpwnd.cpp:498

 msgid "Find"
 msgstr "查找"
 
 msgid "Find"
 msgstr "查找"
 

-#: ../src/html/helpwnd.cpp:1214
+#: ../src/common/stockitem.cpp:160
+msgid "First"
+msgstr "最前"
+
+#: ../src/common/prntbase.cpp:1493
+msgid "First page"
+msgstr "第一页"
+
+#: ../src/html/helpwnd.cpp:1216

 msgid "Fixed font:"
 msgstr "固定字体:"
 
 msgid "Fixed font:"
 msgstr "固定字体:"
 

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

 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 

+#: ../src/richtext/richtextsizepage.cpp:181
+msgid "Floating"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:161
+msgid "Floppy"
+msgstr "软盘"
+

 #: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 
 #: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "对开纸, 8 1/2 x 13 英寸"
 

-#: ../src/richtext/richtextformatdlg.cpp:275
-#: ../src/osx/carbon/fontdlg.cpp:461
+#: ../src/richtext/richtextformatdlg.cpp:319 ../src/osx/carbon/fontdlg.cpp:471
+#: ../src/common/stockitem.cpp:195

 msgid "Font"
 msgstr ""
 
 msgid "Font"
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:190
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:197

 msgid "Font &weight:"
 msgid "Font &weight:"

-msgstr "字体粗细."
+msgstr "字体粗细(&w):"

 
 

-#: ../src/html/helpwnd.cpp:1215
+#: ../src/html/helpwnd.cpp:1217

 msgid "Font size:"
 msgstr "字体大小:"
 
 msgid "Font size:"
 msgstr "字体大小:"
 

-#: ../src/richtext/richtextfontpage.cpp:177
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:184

 msgid "Font st&yle:"
 msgid "Font st&yle:"

-msgstr "字体大小:"
+msgstr "字体样式(&y):"

 
 

-#: ../src/osx/carbon/fontdlg.cpp:503
-#, fuzzy
+#: ../src/osx/carbon/fontdlg.cpp:513

 msgid "Font:"
 msgid "Font:"

-msgstr "字体大小:"
+msgstr "字体:"

 
 #: ../src/dfb/fontmgr.cpp:199
 #, c-format
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr ""
 
 
 #: ../src/dfb/fontmgr.cpp:199
 #, c-format
 msgid "Fonts index file %s disappeared while loading fonts."
 msgstr ""
 

-#: ../src/unix/utilsunx.cpp:539
+#: ../src/unix/utilsunx.cpp:581

 msgid "Fork failed"
 msgstr "Fork 失败"
 
 msgid "Fork failed"
 msgstr "Fork 失败"
 

-#: ../src/common/xtixml.cpp:232
+#: ../src/common/stockitem.cpp:162
+msgid "Forward"
+msgstr "前进"
+
+#: ../src/common/xtixml.cpp:236

 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:890

 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"


@@ -3578,35 +3698,37 @@ msgstr "找到 %i 个匹配项"
 msgid "From:"
 msgstr "从:"
 
 msgid "From:"
 msgstr "从:"
 

-#: ../src/common/fmapbase.cpp:197
-msgid "GB-2312"
-msgstr ""
-
-#: ../src/common/imaggif.cpp:80
+#: ../src/common/imaggif.cpp:161

 msgid "GIF: Invalid gif index."
 msgid "GIF: Invalid gif index."

-msgstr "GIF: 无效的gif图像索引."
+msgstr "GIF: 无效的 gif 图像索引。"

 
 

-#: ../src/common/imaggif.cpp:70
+#: ../src/common/imaggif.cpp:151

 msgid "GIF: data stream seems to be truncated."
 msgid "GIF: data stream seems to be truncated."

-msgstr "GIF: 数据流似乎已被截断."
+msgstr "GIF: 数据流似乎已被截断。"

 
 

-#: ../src/common/imaggif.cpp:54
+#: ../src/common/imaggif.cpp:135

 msgid "GIF: error in GIF image format."
 msgid "GIF: error in GIF image format."

-msgstr "GIF: GIF文件格式错误."
+msgstr "GIF: GIF文件格式错误。"

 
 

-#: ../src/common/imaggif.cpp:57
+#: ../src/common/imaggif.cpp:138

 msgid "GIF: not enough memory."
 msgid "GIF: not enough memory."

-msgstr "GIF: 没有足够内存."
+msgstr "GIF: 没有足够内存。"

 
 

-#: ../src/common/imaggif.cpp:60
+#: ../src/common/imaggif.cpp:141

 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误!!!"
 

+#: ../src/gtk/window.cpp:4119
+msgid ""
+"GTK+ installed on this machine is too old to support screen compositing, "
+"please install GTK+ 2.12 or later."
+msgstr ""
+

 #: ../src/univ/themes/gtk.cpp:528
 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 
 #: ../src/univ/themes/gtk.cpp:528
 msgid "GTK+ theme"
 msgstr "GTK+ 主题"
 

-#: ../src/common/prntbase.cpp:242
+#: ../src/common/prntbase.cpp:244

 msgid "Generic PostScript"
 msgstr "普通PostScript"
 
 msgid "Generic PostScript"
 msgstr "普通PostScript"
 


@@ -3618,88 +3740,97 @@ 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:189
+msgid "GetProperty called w/o valid getter"
+msgstr "调用GetProperty时未带有效的getter"
+
+#: ../include/wx/xtiprop.h:267
+msgid "GetPropertyCollection called on a generic accessor"
+msgstr "在一个通用处理器上调用GetPropertyCollection"
+
+#: ../include/wx/xtiprop.h:207
+msgid "GetPropertyCollection called w/o valid collection getter"
+msgstr "调用GetPropertyCollection时未带有效的collection getter"
+

 #: ../src/html/helpwnd.cpp:671
 msgid "Go back"
 #: ../src/html/helpwnd.cpp:671
 msgid "Go back"

-msgstr "回退"
+msgstr "返回"

 
 #: ../src/html/helpwnd.cpp:672
 msgid "Go forward"
 
 #: ../src/html/helpwnd.cpp:672
 msgid "Go forward"

-msgstr "å\90\91å\89\8d"
+msgstr "å\89\8dè¿\9b"

 
 #: ../src/html/helpwnd.cpp:674
 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 
 
 #: ../src/html/helpwnd.cpp:674
 msgid "Go one level up in document hierarchy"
 msgstr "到上一级文档目录"
 

-#: ../src/generic/filedlgg.cpp:225
-#: ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/filedlgg.cpp:223 ../src/generic/dirdlgg.cpp:137

 msgid "Go to home directory"
 msgstr "进入home目录"
 
 msgid "Go to home directory"
 msgstr "进入home目录"
 

-#: ../src/generic/filedlgg.cpp:221
+#: ../src/generic/filedlgg.cpp:219

 msgid "Go to parent directory"
 msgstr "进入父目录"
 
 msgid "Go to parent directory"
 msgstr "进入父目录"
 

-#: ../src/common/prntbase.cpp:1112
-msgid "Goto Page"
-msgstr "跳转页面"
-

 #: ../src/generic/aboutdlgg.cpp:77
 msgid "Graphics art by "
 msgstr ""
 
 #: ../src/generic/aboutdlgg.cpp:77
 msgid "Graphics art by "
 msgstr ""
 

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

 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 

-#: ../src/common/zstream.cpp:142
-#: ../src/common/zstream.cpp:302
+#: ../src/richtext/richtextborderspage.cpp:547
+msgid "Groove"
+msgstr ""
+
+#: ../src/common/zstream.cpp:151 ../src/common/zstream.cpp:311

 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 
 msgid "Gzip not supported by this version of zlib"
 msgstr "此版本的zlib不支持Gzip"
 

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

 msgid "HELP"
 msgstr ""
 
 msgid "HELP"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:59
+#: ../src/common/accelcmn.cpp:61

 msgid "HOME"
 msgstr ""
 
 msgid "HOME"
 msgstr ""
 

-#: ../src/html/helpwnd.cpp:1556
+#: ../src/html/helpwnd.cpp:1558

 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 

-#: ../src/html/htmlwin.cpp:656
+#: ../src/html/htmlwin.cpp:655

 #, c-format
 msgid "HTML anchor %s does not exist."
 #, c-format
 msgid "HTML anchor %s does not exist."

-msgstr "HTML 锚 %s 不存在."
+msgstr "HTML 锚 %s 不存在。"

 
 

-#: ../src/html/helpwnd.cpp:1554
+#: ../src/html/helpwnd.cpp:1556

 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 

-#: ../src/html/htmprint.cpp:508
-msgid "HTML pagination algorithm generated more than the allowed maximum number of pages and it can't continue any longer!"
+#: ../src/common/stockitem.cpp:163
+msgid "Harddisk"

 msgstr ""
 
 msgstr ""
 

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

 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯来语 (ISO-8859-8)"
 

-#: ../src/html/helpdlg.cpp:67
-#: ../src/html/helpfrm.cpp:116
+#: ../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:1210

 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 
 msgid "Help Browser Options"
 msgstr "帮助浏览器选项"
 

-#: ../src/generic/helpext.cpp:460
-#: ../src/generic/helpext.cpp:461
+#: ../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:1540

 msgid "Help Printing"
 msgstr "帮助打印"
 
 msgid "Help Printing"
 msgstr "帮助打印"
 


@@ -3707,16 +3838,16 @@ msgstr "帮助打印"
 msgid "Help Topics"
 msgstr "帮助主题"
 
 msgid "Help Topics"
 msgstr "帮助主题"
 

-#: ../src/html/helpwnd.cpp:1555
+#: ../src/html/helpwnd.cpp:1557

 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 

-#: ../src/generic/helpext.cpp:273
+#: ../src/generic/helpext.cpp:272

 #, c-format
 msgid "Help directory \"%s\" not found."
 msgstr ""
 
 #, c-format
 msgid "Help directory \"%s\" not found."
 msgstr ""
 

-#: ../src/generic/helpext.cpp:281
+#: ../src/generic/helpext.cpp:280

 #, fuzzy, c-format
 msgid "Help file \"%s\" not found."
 msgstr "找不到域 '%s'的目录文件."
 #, fuzzy, c-format
 msgid "Help file \"%s\" not found."
 msgstr "找不到域 '%s'的目录文件."


@@ -3726,82 +3857,91 @@ msgstr "找不到域 '%s'的目录文件."
 msgid "Help: %s"
 msgstr "帮助: %s"
 
 msgid "Help: %s"
 msgstr "帮助: %s"
 

+#: ../src/osx/menu_osx.cpp:556
+#, fuzzy, c-format
+msgid "Hide %s"
+msgstr "帮助: %s"
+
+#: ../src/osx/menu_osx.cpp:558
+msgid "Hide Others"
+msgstr ""
+

 #: ../src/generic/infobar.cpp:139
 msgid "Hide this notification message."
 msgstr ""
 
 #: ../src/generic/infobar.cpp:139
 msgid "Hide this notification message."
 msgstr ""
 

-#: ../src/generic/dirdlgg.cpp:99
+#: ../src/generic/dirdlgg.cpp:99 ../src/common/stockitem.cpp:165

 msgid "Home"
 msgstr "Home"
 
 msgid "Home"
 msgstr "Home"
 

-#: ../src/generic/dirctrlg.cpp:675
+#: ../src/generic/dirctrlg.cpp:616

 msgid "Home directory"
 msgid "Home directory"

-msgstr "Home目录"
+msgstr "Home 目录"

 
 

-#: ../include/wx/filefn.h:191
-msgid "I64"
-msgstr "I64"
+#: ../src/richtext/richtextsizepage.cpp:205
+#: ../src/richtext/richtextsizepage.cpp:207
+msgid "How the object will float relative to the text."
+msgstr ""

 
 

-#: ../src/common/imagbmp.cpp:1045
+#: ../src/common/imagbmp.cpp:1071

 msgid "ICO: Error in reading mask DIB."
 msgid "ICO: Error in reading mask DIB."

-msgstr "ICO: 读掩码DIB错误."
-
-#: ../src/common/imagbmp.cpp:1161
-#: ../src/common/imagbmp.cpp:1222
-#: ../src/common/imagbmp.cpp:1233
-#: ../src/common/imagbmp.cpp:1246
-#: ../src/common/imagbmp.cpp:1292
-#: ../src/common/imagbmp.cpp:1304
-#: ../src/common/imagbmp.cpp:1315
+msgstr "ICO: 读掩码DIB错误。"
+
+#: ../src/common/imagbmp.cpp:1187 ../src/common/imagbmp.cpp:1248
+#: ../src/common/imagbmp.cpp:1259 ../src/common/imagbmp.cpp:1272
+#: ../src/common/imagbmp.cpp:1318 ../src/common/imagbmp.cpp:1330
+#: ../src/common/imagbmp.cpp:1341

 msgid "ICO: Error writing the image file!"
 msgid "ICO: Error writing the image file!"

-msgstr "ICO: 写图像文件错误."
+msgstr "ICO: 写图像文件错误!"

 
 

-#: ../src/common/imagbmp.cpp:1125
+#: ../src/common/imagbmp.cpp:1151

 msgid "ICO: Image too tall for an icon."
 msgid "ICO: Image too tall for an icon."

-msgstr "ICO: 图像高度超出范围, 不适合做图标."
+msgstr "ICO: 图像高度超出范围，不适合做图标。"

 
 

-#: ../src/common/imagbmp.cpp:1133
+#: ../src/common/imagbmp.cpp:1159

 msgid "ICO: Image too wide for an icon."
 msgid "ICO: Image too wide for an icon."

-msgstr "ICO: 图像宽度超出范围, 不适合做图标."
+msgstr "ICO: 图像宽度超出范围，不适合做图标。"

 
 

-#: ../src/common/imagbmp.cpp:1385
+#: ../src/common/imagbmp.cpp:1416

 msgid "ICO: Invalid icon index."
 msgid "ICO: Invalid icon index."

-msgstr "ICO: 无效的图标索引."
+msgstr "ICO: 无效的图标索引。"

 
 

-#: ../src/common/imagiff.cpp:766
+#: ../src/common/imagiff.cpp:760

 msgid "IFF: data stream seems to be truncated."
 msgid "IFF: data stream seems to be truncated."

-msgstr "IFF: 数据流似乎已被截断."
+msgstr "IFF: 数据流似乎已被截断。"

 
 

-#: ../src/common/imagiff.cpp:750
+#: ../src/common/imagiff.cpp:744

 msgid "IFF: error in IFF image format."
 msgid "IFF: error in IFF image format."

-msgstr "IFF: IFF文件格式错误."
+msgstr "IFF: IFF文件格式错误。"

 
 

-#: ../src/common/imagiff.cpp:753
+#: ../src/common/imagiff.cpp:747

 msgid "IFF: not enough memory."
 msgid "IFF: not enough memory."

-msgstr "IFF: 没有足够内存."
+msgstr "IFF: 没有足够内存。"

 
 

-#: ../src/common/imagiff.cpp:756
+#: ../src/common/imagiff.cpp:750

 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误!!!"
 
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 位置错误!!!"
 

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

 msgid "INS"
 msgstr ""
 
 msgid "INS"
 msgstr ""
 

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

 msgid "INSERT"
 msgstr ""
 
 msgid "INSERT"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:198
+#: ../src/common/fmapbase.cpp:194

 msgid "ISO-2022-JP"
 msgstr ""
 
 msgid "ISO-2022-JP"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:2377
+#: ../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


@@ -3810,140 +3950,165 @@ msgid ""
 "report, please enter it here and it will be joined to it:"
 msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"
 "report, please enter it here and it will be joined to it:"
 msgstr ""
 "如果您有任何与此错误报告有关的信息, \n"

-"请在此输入, 它将会被加到错误报告中:"
+"请在此输入，它将会被加到错误报告中:"

 
 #: ../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 ""

-"如果您想完全禁用调试报告, 请按\"取消\"按钮, \n"
-"但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
-"在可能的情况下, 请尽量选择让程序生成调试报告.\n"
+"如果您想完全禁用调试报告，请按\"取消\"按钮，\n"
+"但我们不建议这样做，因为调试报告有助于改进本程序。\n"
+"在可能的情况下，请尽量选择让程序生成调试报告。\n"

 
 

-#: ../src/msw/registry.cpp:1336
+#: ../src/msw/registry.cpp:1396

 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."

-msgstr "忽略值 \"%s\" (键 \"%s\")."
+msgstr "忽略值 \"%s\" (键 \"%s\")。"

 
 

-#: ../src/common/xtistrm.cpp:256
+#: ../src/common/xtistrm.cpp:300

 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"

-msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
+msgstr "非法的对象类 (非-wxEvtHandler) 作为事件源"
+
+#: ../src/common/xti.cpp:514
+msgid "Illegal Parameter Count for ConstructObject Method"
+msgstr "非法的针对 ConstructObject 方法的参数计数"
+
+#: ../src/common/xti.cpp:502
+msgid "Illegal Parameter Count for Create Method"
+msgstr "非法的针对 Create 方法的参数计数"

 
 

-#: ../src/generic/dirctrlg.cpp:721
-#: ../src/generic/filectrlg.cpp:785
+#: ../src/generic/dirctrlg.cpp:662 ../src/generic/filectrlg.cpp:785

 msgid "Illegal directory name."
 msgid "Illegal directory name."

-msgstr "不合法的目录名."
+msgstr "不合法的目录名。"

 
 #: ../src/generic/filectrlg.cpp:1370
 msgid "Illegal file specification."
 
 #: ../src/generic/filectrlg.cpp:1370
 msgid "Illegal file specification."

-msgstr "不合规范的文件描述."
+msgstr "不合规范的文件描述。"

 
 

-#: ../src/common/image.cpp:1979
+#: ../src/common/image.cpp:2054

 msgid "Image and mask have different sizes."
 msgid "Image and mask have different sizes."

-msgstr "图像和掩码的大小不一致."
+msgstr "图像和掩码的大小不一致。"

 
 

-#: ../src/common/image.cpp:2340
-#: ../src/common/image.cpp:2414
+#: ../src/common/image.cpp:2410

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

-msgid "Image file is not of type %ld."
+msgid "Image file is not of type %d."

 msgstr "图像文件的类型不是 %d."
 
 msgstr "图像文件的类型不是 %d."
 

-#: ../src/common/image.cpp:2437
+#: ../src/common/image.cpp:2540

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

-msgid "Image file is not of type %s."
+msgid "Image is not of type %s."

 msgstr "图像文件的类型不是 %d."
 
 msgstr "图像文件的类型不是 %d."
 

-#: ../src/msw/textctrl.cpp:466
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
+#: ../src/msw/textctrl.cpp:399
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+"无法创建富文本编辑器控件，使用简单文本编辑器控件代替。请重新安装 riched32.dll"

 
 #: ../src/unix/utilsunx.cpp:322
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 
 
 #: ../src/unix/utilsunx.cpp:322
 msgid "Impossible to get child process input"
 msgstr "不可能获得子过程的输入"
 

-#: ../src/common/filefn.cpp:1086
+#: ../src/common/filefn.cpp:1071

 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 #, c-format
 msgid "Impossible to get permissions for file '%s'"

-msgstr "不可能获得文件 '%s'的许可权限"
+msgstr "不可能获得文件 '%s' 的许可权限"

 
 

-#: ../src/common/filefn.cpp:1100
+#: ../src/common/filefn.cpp:1085

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

 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"

-msgstr "不可能设置文件 '%s'的许可权限"
+msgstr "不可能设置文件 '%s' 的许可权限"

 
 

-#: ../src/common/gifdecod.cpp:776
+#: ../src/common/gifdecod.cpp:819

 #, c-format
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr ""
 
 #, c-format
 msgid "Incorrect GIF frame size (%u, %d) for the frame #%u"
 msgstr ""
 

-#: ../src/common/stockitem.cpp:154
+#: ../src/msw/ole/automtn.cpp:606
+msgid "Incorrect number of arguments."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:166

 msgid "Indent"
 msgstr "缩进"
 
 msgid "Indent"
 msgstr "缩进"
 

-#: ../src/richtext/richtextformatdlg.cpp:281
+#: ../src/richtext/richtextformatdlg.cpp:325

 msgid "Indents && Spacing"
 msgstr ""
 
 msgid "Indents && Spacing"
 msgstr ""
 

-#: ../src/html/helpwnd.cpp:523
+#: ../src/common/stockitem.cpp:167 ../src/html/helpwnd.cpp:523

 msgid "Index"
 msgstr "索引"
 
 msgid "Index"
 msgstr "索引"
 

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

 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "印地安语 (ISO-8859-12)"
 

-#: ../src/common/init.cpp:262
+#: ../src/common/stockitem.cpp:168
+msgid "Info"
+msgstr "信息"
+
+#: ../src/common/init.cpp:261

 msgid "Initialization failed in post init, aborting."
 msgid "Initialization failed in post init, aborting."

-msgstr "在后初始化阶段出错, 退出..."
+msgstr "在后初始化阶段出错，退出..."

 
 

-#: ../src/richtext/richtextsymboldlg.cpp:471
-#, fuzzy
+#: ../src/richtext/richtextsymboldlg.cpp:469

 msgid "Insert"
 msgid "Insert"

-msgstr "缩进"
+msgstr "插入"

 
 

-#: ../src/richtext/richtextbuffer.cpp:5428
-#: ../src/richtext/richtextbuffer.cpp:6218
+#: ../src/richtext/richtextbuffer.cpp:6985
+#: ../src/richtext/richtextbuffer.cpp:7840

 msgid "Insert Image"
 msgstr ""
 
 msgid "Insert Image"
 msgstr ""
 

-#: ../src/richtext/richtextctrl.cpp:857
-#: ../src/richtext/richtextctrl.cpp:1051
-#: ../src/richtext/richtextbuffer.cpp:5274
-#: ../src/richtext/richtextbuffer.cpp:5317
-#: ../src/richtext/richtextbuffer.cpp:5355
+#: ../src/richtext/richtextbuffer.cpp:7029
+msgid "Insert Object"
+msgstr "插入对象"
+
+#: ../src/richtext/richtextctrl.cpp:1219 ../src/richtext/richtextctrl.cpp:1471
+#: ../src/richtext/richtextbuffer.cpp:6832
+#: ../src/richtext/richtextbuffer.cpp:6859
+#: ../src/richtext/richtextbuffer.cpp:6903

 msgid "Insert Text"
 msgstr ""
 
 msgid "Insert Text"
 msgstr ""
 

-#: ../src/common/xtistrm.cpp:700
-msgid "Internal error, illegal wxCustomTypeInfo"
-msgstr "整数错误, 非法的wxCustomTypeInfo"
+#: ../src/richtext/richtextindentspage.cpp:320
+#: ../src/richtext/richtextindentspage.cpp:322
+msgid "Inserts a page break before the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:549
+#, fuzzy
+msgid "Inset"
+msgstr "缩进"

 
 

-#: ../src/gtk/app.cpp:411
+#: ../src/gtk/app.cpp:428

 #, 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:284
+#: ../src/common/imagtiff.cpp:315

 msgid "Invalid TIFF image index."
 msgid "Invalid TIFF image index."

-msgstr "无效TIFF图像索引."
+msgstr "无效TIFF图像索引。"

 
 

-#: ../src/osx/carbon/dataview.cpp:1743
-#: ../src/osx/carbon/dataview.cpp:1835
+#: ../src/osx/carbon/dataview.cpp:1783 ../src/osx/carbon/dataview.cpp:1878

 msgid "Invalid data view item"
 msgstr ""
 
 msgid "Invalid data view item"
 msgstr ""
 

-#: ../src/common/appcmn.cpp:247
+#: ../src/common/appcmn.cpp:246

 #, c-format
 msgid "Invalid display mode specification '%s'."
 #, c-format
 msgid "Invalid display mode specification '%s'."

-msgstr "无效的显示模式 '%s'."
+msgstr "无效的显示模式 '%s'。"

 
 #: ../src/x11/app.cpp:122
 #, c-format
 
 #: ../src/x11/app.cpp:122
 #, c-format


@@ -3953,39 +4118,33 @@ msgstr "无效的几何规格 '%s'"
 #: ../src/unix/snglinst.cpp:307
 #, c-format
 msgid "Invalid lock file '%s'."
 #: ../src/unix/snglinst.cpp:307
 #, c-format
 msgid "Invalid lock file '%s'."

-msgstr "无效的锁文件 '%s'."
+msgstr "无效的锁文件 '%s'。"

 
 

-#: ../src/common/translation.cpp:949
+#: ../src/common/translation.cpp:955

 #, fuzzy
 msgid "Invalid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 
 #, fuzzy
 msgid "Invalid message catalog."
 msgstr "'%s' 不是有效的消息目录."
 

-#: ../src/common/xtistrm.cpp:361
-#: ../src/common/xtistrm.cpp:376
+#: ../src/common/xtistrm.cpp:410 ../src/common/xtistrm.cpp:425

 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"

-msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
+msgstr "无效的或空的对象 ID 传给 GetObjectClassInfo"

 
 

-#: ../src/common/xtistrm.cpp:391
+#: ../src/common/xtistrm.cpp:440

 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"

-msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
+msgstr "无效的或空的对象 ID 传给 HasObjectClassInfo"

 
 #: ../src/common/regex.cpp:314
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 
 
 #: ../src/common/regex.cpp:314
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "无效的正则表达式 '%s': %s"
 

-#: ../src/common/docview.cpp:1944
-#, fuzzy
-msgid "It has been removed from the most recently used files list."
+#: ../src/common/config.cpp:227
+#, c-format
+msgid "Invalid value %ld for a boolean key \"%s\" in config file."

 msgstr ""
 msgstr ""

-"文件 '%s' 不能打开.\n"
-"已从最近使用的文件列表(MRU)中移去."

 
 

-#: ../src/generic/fontdlgg.cpp:331
-#: ../src/richtext/richtextfontpage.cpp:283
-#: ../src/richtext/richtextfontpage.cpp:335
-#: ../src/richtext/richtextfontpage.cpp:600
-#: ../src/osx/carbon/fontdlg.cpp:535
+#: ../src/generic/fontdlgg.cpp:330 ../src/richtext/richtextfontpage.cpp:293
+#: ../src/osx/carbon/fontdlg.cpp:545 ../src/common/stockitem.cpp:169

 msgid "Italic"
 msgstr "斜体"
 
 msgid "Italic"
 msgstr "斜体"
 


@@ -3993,13 +4152,13 @@ msgstr "斜体"
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封, 110 x 230 毫米"
 
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封, 110 x 230 毫米"
 

-#: ../src/common/imagjpeg.cpp:255
+#: ../src/common/imagjpeg.cpp:256

 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgid "JPEG: Couldn't load - file is probably corrupted."

-msgstr "JPEG: 不能装入 - 文件也许已被破坏."
+msgstr "JPEG: 无法装入 - 文件也许已被破坏。"

 
 

-#: ../src/common/imagjpeg.cpp:427
+#: ../src/common/imagjpeg.cpp:435

 msgid "JPEG: Couldn't save image."
 msgid "JPEG: Couldn't save image."

-msgstr "JPEG: 不能保存图像."
+msgstr "JPEG: 无法保存图像。"

 
 #: ../src/common/paper.cpp:165
 msgid "Japanese Double Postcard 200 x 148 mm"
 
 #: ../src/common/paper.cpp:165
 msgid "Japanese Double Postcard 200 x 148 mm"


@@ -4053,145 +4212,162 @@ msgstr "日本明信片, 100 x 148 毫米"
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "横向日本明信片, 148 x 100 毫米"
 
 msgid "Japanese Postcard Rotated 148 x 100 mm"
 msgstr "横向日本明信片, 148 x 100 毫米"
 

-#: ../src/common/stockitem.cpp:160
+#: ../src/common/stockitem.cpp:170
+msgid "Jump to"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:172

 msgid "Justified"
 msgstr "分散对齐"
 
 msgid "Justified"
 msgstr "分散对齐"
 

-#: ../src/richtext/richtextindentspage.cpp:165
-#: ../src/richtext/richtextindentspage.cpp:167
-#: ../src/richtext/richtextliststylepage.cpp:343
+#: ../src/richtext/richtextindentspage.cpp:168
+#: ../src/richtext/richtextindentspage.cpp:170

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

+#: ../src/richtext/richtextliststylepage.cpp:347

 msgid "Justify text left and right."
 msgstr ""
 
 msgid "Justify text left and right."
 msgstr ""
 

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

 msgid "KOI8-R"
 msgstr "KOI8-R"
 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 

-#: ../src/common/fmapbase.cpp:165
+#: ../src/common/fmapbase.cpp:163

 msgid "KOI8-U"
 msgstr "KOI8-U"
 
 msgid "KOI8-U"
 msgstr "KOI8-U"
 

-#: ../src/common/accelcmn.cpp:247
-#: ../src/common/accelcmn.cpp:305
+#: ../src/common/accelcmn.cpp:255 ../src/common/accelcmn.cpp:326

 msgid "KP_"
 msgstr ""
 
 msgid "KP_"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:102
+#: ../src/common/accelcmn.cpp:104

 msgid "KP_ADD"
 msgstr ""
 
 msgid "KP_ADD"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:97
+#: ../src/common/accelcmn.cpp:99

 msgid "KP_BEGIN"
 msgstr ""
 
 msgid "KP_BEGIN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:105
+#: ../src/common/accelcmn.cpp:107

 msgid "KP_DECIMAL"
 msgstr ""
 
 msgid "KP_DECIMAL"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:99
+#: ../src/common/accelcmn.cpp:101

 msgid "KP_DELETE"
 msgstr ""
 
 msgid "KP_DELETE"
 msgstr ""
 

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

 msgid "KP_DIVIDE"
 msgstr ""
 
 msgid "KP_DIVIDE"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:91
+#: ../src/common/accelcmn.cpp:93

 msgid "KP_DOWN"
 msgstr ""
 
 msgid "KP_DOWN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:96
+#: ../src/common/accelcmn.cpp:98

 msgid "KP_END"
 msgstr ""
 
 msgid "KP_END"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:86
+#: ../src/common/accelcmn.cpp:88

 msgid "KP_ENTER"
 msgstr ""
 
 msgid "KP_ENTER"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:100
+#: ../src/common/accelcmn.cpp:102

 msgid "KP_EQUAL"
 msgstr ""
 
 msgid "KP_EQUAL"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:87
+#: ../src/common/accelcmn.cpp:89

 msgid "KP_HOME"
 msgstr ""
 
 msgid "KP_HOME"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:98
+#: ../src/common/accelcmn.cpp:100

 msgid "KP_INSERT"
 msgstr ""
 
 msgid "KP_INSERT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:88
+#: ../src/common/accelcmn.cpp:90

 msgid "KP_LEFT"
 msgstr ""
 
 msgid "KP_LEFT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:101
+#: ../src/common/accelcmn.cpp:103

 msgid "KP_MULTIPLY"
 msgstr ""
 
 msgid "KP_MULTIPLY"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:94
+#: ../src/common/accelcmn.cpp:96

 msgid "KP_NEXT"
 msgstr ""
 
 msgid "KP_NEXT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:95
+#: ../src/common/accelcmn.cpp:97

 msgid "KP_PAGEDOWN"
 msgstr ""
 
 msgid "KP_PAGEDOWN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:93
+#: ../src/common/accelcmn.cpp:95

 msgid "KP_PAGEUP"
 msgstr ""
 
 msgid "KP_PAGEUP"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:92
+#: ../src/common/accelcmn.cpp:94

 msgid "KP_PRIOR"
 msgstr ""
 
 msgid "KP_PRIOR"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:90
+#: ../src/common/accelcmn.cpp:92

 msgid "KP_RIGHT"
 msgstr ""
 
 msgid "KP_RIGHT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:103
+#: ../src/common/accelcmn.cpp:105

 msgid "KP_SEPARATOR"
 msgstr ""
 
 msgid "KP_SEPARATOR"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:84
+#: ../src/common/accelcmn.cpp:86

 msgid "KP_SPACE"
 msgstr ""
 
 msgid "KP_SPACE"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:104
+#: ../src/common/accelcmn.cpp:106

 msgid "KP_SUBTRACT"
 msgstr ""
 
 msgid "KP_SUBTRACT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:85
+#: ../src/common/accelcmn.cpp:87

 msgid "KP_TAB"
 msgstr ""
 
 msgid "KP_TAB"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:89
+#: ../src/common/accelcmn.cpp:91

 msgid "KP_UP"
 msgstr ""
 
 msgid "KP_UP"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:307
+#: ../src/richtext/richtextindentspage.cpp:295

 msgid "L&ine spacing:"
 msgstr ""
 
 msgid "L&ine spacing:"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:55
+#: ../src/common/accelcmn.cpp:57

 msgid "LEFT"
 msgstr ""
 
 msgid "LEFT"
 msgstr ""
 

-#: ../src/generic/prntdlgg.cpp:619
-#: ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:619 ../src/generic/prntdlgg.cpp:874

 msgid "Landscape"
 msgstr "横向"
 
 msgid "Landscape"
 msgstr "横向"
 

+#: ../src/common/stockitem.cpp:175
+msgid "Last"
+msgstr "最后"
+
+#: ../src/common/prntbase.cpp:1517
+msgid "Last page"
+msgstr "最后一页"
+
+#: ../src/common/log.cpp:312
+#, c-format
+msgid "Last repeated message (\"%s\", %lu time) wasn't output"
+msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
+msgstr[0] ""
+

 #: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 
 #: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "帐簿, 17 x 11 英寸"
 

-#: ../src/richtext/richtextliststylepage.cpp:248
-#: ../src/richtext/richtextliststylepage.cpp:251
-#: ../src/richtext/richtextliststylepage.cpp:252
-#: ../src/richtext/richtextbulletspage.cpp:196
-#: ../src/richtext/richtextbulletspage.cpp:199
+#: ../src/richtext/richtextliststylepage.cpp:250
+#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextliststylepage.cpp:254

 #: ../src/richtext/richtextbulletspage.cpp:200
 #: ../src/richtext/richtextbulletspage.cpp:200

+#: ../src/richtext/richtextbulletspage.cpp:203
+#: ../src/richtext/richtextbulletspage.cpp:204
+#: ../src/richtext/richtextsizepage.cpp:201

 msgid "Left"
 msgstr ""
 
 msgid "Left"
 msgstr ""
 


@@ -4204,10 +4380,10 @@ msgstr ""
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 

-#: ../src/richtext/richtextindentspage.cpp:151
-#: ../src/richtext/richtextindentspage.cpp:153
-#: ../src/richtext/richtextliststylepage.cpp:329
+#: ../src/richtext/richtextindentspage.cpp:154
+#: ../src/richtext/richtextindentspage.cpp:156

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

+#: ../src/richtext/richtextliststylepage.cpp:333

 msgid "Left-align text."
 msgstr ""
 
 msgid "Left-align text."
 msgstr ""
 


@@ -4251,294 +4427,320 @@ msgstr "信纸, 8 1/2 x 11 英寸"
 msgid "License"
 msgstr ""
 
 msgid "License"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:334
+#: ../src/generic/fontdlgg.cpp:333

 msgid "Light"
 msgstr "细"
 
 msgid "Light"
 msgstr "细"
 

-#: ../src/generic/helpext.cpp:300
+#: ../src/generic/helpext.cpp:299

 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
 msgstr ""
 
 #, c-format
 msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:453
+#: ../src/richtext/richtextliststylepage.cpp:445

 msgid "Line spacing:"
 msgstr ""
 
 msgid "Line spacing:"
 msgstr ""
 

-#: ../src/html/chm.cpp:837
+#: ../src/html/chm.cpp:841

 msgid "Link contained '//', converted to absolute link."
 msgid "Link contained '//', converted to absolute link."

-msgstr "链接包含 '//', 转换为绝对链接."
+msgstr "链接包含 '//'，转换为绝对链接."

 
 

-#: ../src/richtext/richtextformatdlg.cpp:300
+#: ../src/richtext/richtextformatdlg.cpp:344

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

-#: ../src/richtext/richtextstyles.cpp:907
+#: ../src/richtext/richtextstyles.cpp:1035

 msgid "List styles"
 msgstr ""
 
 msgid "List styles"
 msgstr ""
 

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

 msgid "Lists font sizes in points."
 msgstr ""
 
 msgid "Lists font sizes in points."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:147
-#: ../src/richtext/richtextfontpage.cpp:149
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:154
+#: ../src/richtext/richtextfontpage.cpp:156

 msgid "Lists the available fonts."
 msgid "Lists the available fonts."

-msgstr "对ä¸\8dèµ·, 没æ\9c\89æ\89\80é\9c\80æ\8a\80å·§!"
+msgstr "å\88\97å\87ºå\8f¯ç\94¨å­\97ä½\93ã\80\82"

 
 

-#: ../src/common/fldlgcmn.cpp:316
+#: ../src/common/fldlgcmn.cpp:326

 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 
 #, c-format
 msgid "Load %s file"
 msgstr "装入文件 %s "
 

-#: ../src/html/htmlwin.cpp:572
+#: ../src/html/htmlwin.cpp:571

 msgid "Loading : "
 msgstr "装载: "
 
 #: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."
 msgid "Loading : "
 msgstr "装载: "
 
 #: ../src/unix/snglinst.cpp:247
 #, c-format
 msgid "Lock file '%s' has incorrect owner."

-msgstr "锁文件 '%s' 没有正确的所有者."
+msgstr "锁文件 '%s' 没有正确的所有者。"

 
 #: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
 
 #: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."

-msgstr "锁文件 '%s' 没有正确的权限."
+msgstr "锁文件 '%s' 没有正确的权限。"

 
 

-#: ../src/generic/logg.cpp:590
+#: ../src/generic/logg.cpp:586

 #, c-format
 msgid "Log saved to the file '%s'."
 #, c-format
 msgid "Log saved to the file '%s'."

-msgstr "日志保存到文件 '%s'."
+msgstr "日志保存到文件 '%s'。"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:486
-#: ../src/richtext/richtextbulletspage.cpp:286
+#: ../src/richtext/richtextliststylepage.cpp:485
+#: ../src/richtext/richtextbulletspage.cpp:290

 msgid "Lower case letters"
 msgstr ""
 
 msgid "Lower case letters"
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:488
-#: ../src/richtext/richtextbulletspage.cpp:288
+#: ../src/richtext/richtextliststylepage.cpp:487
+#: ../src/richtext/richtextbulletspage.cpp:292

 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:431 ../src/gtk1/mdi.cpp:432

 msgid "MDI child"
 msgid "MDI child"

-msgstr "MDI子窗口"
+msgstr "MDI 子窗口"

 
 

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

 msgid "MENU"
 msgstr ""
 
 #: ../src/msw/helpchm.cpp:57
 msgid "MENU"
 msgstr ""
 
 #: ../src/msw/helpchm.cpp:57

-msgid "MS HTML Help functions are unavailable because the MS HTML Help library is not installed on this machine. Please install it."
-msgstr "MS HTML帮助功能不存在, 因为此机器上没有安装MS HTML帮助库. 请安装它."
+msgid ""
+"MS HTML Help functions are unavailable because the MS HTML Help library is "
+"not installed on this machine. Please install it."
+msgstr "MS HTML帮助功能不存在，因为此机器上没有安装 MS HTML 帮助库。请安装它。"

 
 

-#: ../src/univ/themes/win32.cpp:3778
+#: ../src/univ/themes/win32.cpp:3757

 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 

-#: ../src/common/fmapbase.cpp:204
+#: ../src/common/fmapbase.cpp:200

 msgid "MacArabic"
 msgstr ""
 
 msgid "MacArabic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:223
+#: ../src/common/fmapbase.cpp:219

 msgid "MacArmenian"
 msgstr ""
 
 msgid "MacArmenian"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:212
+#: ../src/common/fmapbase.cpp:208

 msgid "MacBengali"
 msgstr ""
 
 msgid "MacBengali"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:218
+#: ../src/common/fmapbase.cpp:214

 msgid "MacBurmese"
 msgstr ""
 
 msgid "MacBurmese"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:237
+#: ../src/common/fmapbase.cpp:233

 msgid "MacCeltic"
 msgstr ""
 
 msgid "MacCeltic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:228
+#: ../src/common/fmapbase.cpp:224

 msgid "MacCentralEurRoman"
 msgstr ""
 
 msgid "MacCentralEurRoman"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:224
+#: ../src/common/fmapbase.cpp:220

 msgid "MacChineseSimp"
 msgstr ""
 
 msgid "MacChineseSimp"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:202
+#: ../src/common/fmapbase.cpp:198

 msgid "MacChineseTrad"
 msgstr ""
 
 msgid "MacChineseTrad"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:234
+#: ../src/common/fmapbase.cpp:230

 msgid "MacCroatian"
 msgstr ""
 
 msgid "MacCroatian"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:207
+#: ../src/common/fmapbase.cpp:203

 msgid "MacCyrillic"
 msgstr ""
 
 msgid "MacCyrillic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:208
+#: ../src/common/fmapbase.cpp:204

 msgid "MacDevanagari"
 msgstr ""
 
 msgid "MacDevanagari"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:232
+#: ../src/common/fmapbase.cpp:228

 msgid "MacDingbats"
 msgstr ""
 
 msgid "MacDingbats"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:227
+#: ../src/common/fmapbase.cpp:223

 msgid "MacEthiopic"
 msgstr ""
 
 msgid "MacEthiopic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:230
+#: ../src/common/fmapbase.cpp:226

 msgid "MacExtArabic"
 msgstr ""
 
 msgid "MacExtArabic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:238
+#: ../src/common/fmapbase.cpp:234

 msgid "MacGaelic"
 msgstr ""
 
 msgid "MacGaelic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:222
+#: ../src/common/fmapbase.cpp:218

 msgid "MacGeorgian"
 msgstr ""
 
 msgid "MacGeorgian"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:206
+#: ../src/common/fmapbase.cpp:202

 msgid "MacGreek"
 msgstr ""
 
 msgid "MacGreek"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:210
+#: ../src/common/fmapbase.cpp:206

 msgid "MacGujarati"
 msgstr ""
 
 msgid "MacGujarati"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:209
+#: ../src/common/fmapbase.cpp:205

 msgid "MacGurmukhi"
 msgstr ""
 
 msgid "MacGurmukhi"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:205
+#: ../src/common/fmapbase.cpp:201

 msgid "MacHebrew"
 msgstr ""
 
 msgid "MacHebrew"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:235
+#: ../src/common/fmapbase.cpp:231

 msgid "MacIcelandic"
 msgstr ""
 
 msgid "MacIcelandic"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:201
+#: ../src/common/fmapbase.cpp:197

 msgid "MacJapanese"
 msgstr ""
 
 msgid "MacJapanese"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:215
+#: ../src/common/fmapbase.cpp:211

 msgid "MacKannada"
 msgstr ""
 
 msgid "MacKannada"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:239
+#: ../src/common/fmapbase.cpp:235

 msgid "MacKeyboardGlyphs"
 msgstr ""
 
 msgid "MacKeyboardGlyphs"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:219
+#: ../src/common/fmapbase.cpp:215

 msgid "MacKhmer"
 msgstr ""
 
 msgid "MacKhmer"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:203
+#: ../src/common/fmapbase.cpp:199

 msgid "MacKorean"
 msgstr ""
 
 msgid "MacKorean"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:221
+#: ../src/common/fmapbase.cpp:217

 msgid "MacLaotian"
 msgstr ""
 
 msgid "MacLaotian"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:216
+#: ../src/common/fmapbase.cpp:212

 msgid "MacMalayalam"
 msgstr ""
 
 msgid "MacMalayalam"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:226
+#: ../src/common/fmapbase.cpp:222

 msgid "MacMongolian"
 msgstr ""
 
 msgid "MacMongolian"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:211
+#: ../src/common/fmapbase.cpp:207

 msgid "MacOriya"
 msgstr ""
 
 msgid "MacOriya"
 msgstr ""
 

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

 #, fuzzy
 msgid "MacRoman"
 msgstr "罗马"
 
 #, fuzzy
 msgid "MacRoman"
 msgstr "罗马"
 

-#: ../src/common/fmapbase.cpp:236
+#: ../src/common/fmapbase.cpp:232

 #, fuzzy
 msgid "MacRomanian"
 msgstr "罗马"
 
 #, fuzzy
 msgid "MacRomanian"
 msgstr "罗马"
 

-#: ../src/common/fmapbase.cpp:217
+#: ../src/common/fmapbase.cpp:213

 #, fuzzy
 msgid "MacSinhalese"
 msgstr "区分大小写"
 
 #, fuzzy
 msgid "MacSinhalese"
 msgstr "区分大小写"
 

-#: ../src/common/fmapbase.cpp:231
+#: ../src/common/fmapbase.cpp:227

 #, fuzzy
 msgid "MacSymbol"
 msgstr "字体(&S):"
 
 #, fuzzy
 msgid "MacSymbol"
 msgstr "字体(&S):"
 

-#: ../src/common/fmapbase.cpp:213
+#: ../src/common/fmapbase.cpp:209

 msgid "MacTamil"
 msgstr ""
 
 msgid "MacTamil"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:214
+#: ../src/common/fmapbase.cpp:210

 msgid "MacTelugu"
 msgstr ""
 
 msgid "MacTelugu"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:220
+#: ../src/common/fmapbase.cpp:216

 msgid "MacThai"
 msgstr ""
 
 msgid "MacThai"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:225
+#: ../src/common/fmapbase.cpp:221

 msgid "MacTibetan"
 msgstr ""
 
 msgid "MacTibetan"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:233
+#: ../src/common/fmapbase.cpp:229

 msgid "MacTurkish"
 msgstr ""
 
 msgid "MacTurkish"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:229
+#: ../src/common/fmapbase.cpp:225

 msgid "MacVietnamese"
 msgstr ""
 
 msgid "MacVietnamese"
 msgstr ""
 

-#: ../src/propgrid/advprops.cpp:2012
+#: ../src/propgrid/advprops.cpp:2025

 #, fuzzy
 msgid "Make a selection:"
 msgstr "选段"
 
 #, fuzzy
 msgid "Make a selection:"
 msgstr "选段"
 

+#: ../src/richtext/richtextformatdlg.cpp:357
+#: ../src/richtext/richtextmarginspage.cpp:172
+msgid "Margins"
+msgstr ""
+

 #: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
 msgstr "区分大小写"
 
 #: ../src/generic/fdrepdlg.cpp:148
 msgid "Match case"
 msgstr "区分大小写"
 

+#: ../src/richtext/richtextsizepage.cpp:363
+#, fuzzy
+msgid "Max height:"
+msgstr "高度(&H):"
+
+#: ../src/richtext/richtextsizepage.cpp:336
+#, fuzzy
+msgid "Max width:"
+msgstr "替换为:"
+

 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "内存 VFS 已包含文件 '%s'!"
 

-#: ../src/msw/frame.cpp:425
+#: ../src/msw/frame.cpp:354

 msgid "Menu"
 msgstr "菜单"
 
 msgid "Menu"
 msgstr "菜单"
 

+#: ../src/common/msgout.cpp:125
+msgid "Message"
+msgstr "消息"
+

 #: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
 msgstr "金属主题"
 
 #: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
 msgstr "金属主题"
 

-#: ../src/univ/themes/win32.cpp:3776
+#: ../src/msw/ole/automtn.cpp:623
+msgid "Method or property not found."
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3755

 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 

-#: ../src/mgl/app.cpp:114
-#, c-format
-msgid "Mode %ix%i-%i not available."
-msgstr "显示模式 %ix%i-%i位色 不支持."
-
-#: ../src/osx/dataview_osx.cpp:594
+#: ../src/richtext/richtextsizepage.cpp:309

 #, fuzzy
 #, fuzzy

-msgid "Model pointer not initialized."
-msgstr "不能初始化显示."
+msgid "Min height:"
+msgstr "字体粗细(&w):"

 
 

-#: ../src/generic/fontdlgg.cpp:326
+#: ../src/richtext/richtextsizepage.cpp:282
+msgid "Min width:"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:639
+msgid "Missing a required parameter."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:325

 msgid "Modern"
 msgstr "现代"
 
 msgid "Modern"
 msgstr "现代"
 


@@ -4553,7 +4755,11 @@ msgstr "模块 \"%s\" 初始化失败"
 
 #: ../src/common/paper.cpp:133
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 
 #: ../src/common/paper.cpp:133
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"

-msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
+msgstr "7.75信封，3 7/8 x 7 1/2 英寸"
+
+#: ../src/msw/fswatcher.cpp:144
+msgid "Monitoring individual files for changes is not supported currently."
+msgstr ""

 
 #: ../src/generic/editlbox.cpp:277
 msgid "Move down"
 
 #: ../src/generic/editlbox.cpp:277
 msgid "Move down"


@@ -4563,7 +4769,21 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
 msgid "Move up"
 msgstr "上移"
 

-#: ../src/common/accelcmn.cpp:80
+#: ../src/richtext/richtextsizepage.cpp:487
+#: ../src/richtext/richtextsizepage.cpp:489
+msgid "Moves the object to the next paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:483
+msgid "Moves the object to the previous paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8265
+msgid "Multiple Cell Properties"
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:82

 msgid "NUM_LOCK"
 msgstr ""
 
 msgid "NUM_LOCK"
 msgstr ""
 


@@ -4571,29 +4791,43 @@ msgstr ""
 msgid "Name"
 msgstr "名称"
 
 msgid "Name"
 msgstr "名称"
 

-#: ../src/richtext/richtextstyledlg.cpp:217
+#: ../src/common/stockitem.cpp:176
+msgid "Network"
+msgstr "网络"
+
+#: ../src/common/stockitem.cpp:177
+msgid "New"
+msgstr "新建"
+
+#: ../src/richtext/richtextstyledlg.cpp:247
+#, fuzzy
+msgid "New &Box Style..."
+msgstr "新增样式"
+
+#: ../src/richtext/richtextstyledlg.cpp:229

 msgid "New &Character Style..."
 msgstr ""
 
 msgid "New &Character Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:229
+#: ../src/richtext/richtextstyledlg.cpp:241

 msgid "New &List Style..."
 msgstr ""
 
 msgid "New &List Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:223
+#: ../src/richtext/richtextstyledlg.cpp:235

 msgid "New &Paragraph Style..."
 msgstr ""
 
 msgid "New &Paragraph Style..."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:568
-#: ../src/richtext/richtextstyledlg.cpp:573
-#: ../src/richtext/richtextstyledlg.cpp:616
-#: ../src/richtext/richtextstyledlg.cpp:621
-#: ../src/richtext/richtextstyledlg.cpp:771
-#: ../src/richtext/richtextstyledlg.cpp:776
-#: ../src/richtext/richtextstyledlg.cpp:844
-#: ../src/richtext/richtextstyledlg.cpp:852
-#, fuzzy
+#: ../src/richtext/richtextstyledlg.cpp:607
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:655
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:821
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:894
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:935
+#: ../src/richtext/richtextstyledlg.cpp:940

 msgid "New Style"
 msgid "New Style"

-msgstr "新项目"
+msgstr "新增样式"

 
 #: ../src/generic/dirdlgg.cpp:103
 msgid "New directory"
 
 #: ../src/generic/dirdlgg.cpp:103
 msgid "New directory"


@@ -4603,10 +4837,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 "新名称"
 


@@ -4614,11 +4846,11 @@ msgstr "新名称"
 msgid "Next"
 msgstr "下一个"
 
 msgid "Next"
 msgstr "下一个"
 

-#: ../src/html/helpwnd.cpp:676
+#: ../src/common/prntbase.cpp:1512 ../src/html/helpwnd.cpp:676

 msgid "Next page"
 msgstr "下一页"
 
 msgid "Next page"
 msgstr "下一页"
 

-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:178 ../src/motif/msgdlg.cpp:194

 msgid "No"
 msgstr "否"
 
 msgid "No"
 msgstr "否"
 


@@ -4627,95 +4859,83 @@ 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:1745
+#: ../src/osx/carbon/dataview.cpp:1785

 msgid "No column existing."
 msgstr ""
 
 msgid "No column existing."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1635
+#: ../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:1384
+#: ../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:985
+#: ../src/common/utilscmn.cpp:1046

 msgid "No default application configured for HTML files."
 msgstr ""
 
 msgid "No default application configured for HTML files."
 msgstr ""
 

-#: ../src/generic/helpext.cpp:451
+#: ../src/generic/helpext.cpp:450

 msgid "No entries found."
 msgid "No entries found."

-msgstr "没找到条目"
+msgstr "没找到条目。"

 
 

-#: ../src/common/fontmap.cpp:419
+#: ../src/common/fontmap.cpp:420

 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
 #, 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 ""
 msgstr ""

-"编码 '%s' 的字体未找到, 无法显示文本.\n"
-"但发现另一替代编码 '%s'.\n"
-"是否使用该编码(否则您必须选择另外的编码)?"
+"编码 '%s' 的字体未找到，无法显示文本。\n"
+"但发现另一替代编码 '%s'。\n"
+"是否使用该编码 (否则您必须选择另外的编码)?"

 
 

-#: ../src/common/fontmap.cpp:424
+#: ../src/common/fontmap.cpp:425

 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 "Would you like to select a font to be used for this encoding\n"
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""

-"编码 '%s' 的字体未找到, 无法显示文本.\n"
+"编码 '%s' 的字体未找到，无法显示文本。\n"

 "请选择用于该编码的字体\n"
 "请选择用于该编码的字体\n"

-"(否则该编码的文本将不能正确显示)?"
+"(否则该编码的文本将无法正确显示)?"

 
 #: ../src/generic/animateg.cpp:143
 #, fuzzy
 msgid "No handler found for animation type."
 msgstr "没有找到图像类型处理器."
 
 
 #: ../src/generic/animateg.cpp:143
 #, fuzzy
 msgid "No handler found for animation type."
 msgstr "没有找到图像类型处理器."
 

-#: ../src/common/image.cpp:2322
-#: ../src/common/image.cpp:2399
+#: ../src/common/image.cpp:2392

 msgid "No handler found for image type."
 msgid "No handler found for image type."

-msgstr "没有找到图像类型处理器."
+msgstr "没有找到图像类型处理器。"

 
 

-#: ../src/common/image.cpp:2461
+#: ../src/common/image.cpp:2400 ../src/common/image.cpp:2511
+#: ../src/common/image.cpp:2564

 #, c-format
 msgid "No image handler for type %d defined."
 #, c-format
 msgid "No image handler for type %d defined."

-msgstr "没有类型 %d 的图像处理器."
-
-#: ../src/common/image.cpp:2330
-#: ../src/common/image.cpp:2408
-#, fuzzy, c-format
-msgid "No image handler for type %ld defined."
-msgstr "没有类型 %d 的图像处理器."
+msgstr "没有类型 %d 的图像处理器。"

 
 

-#: ../src/common/image.cpp:2431
-#: ../src/common/image.cpp:2475
+#: ../src/common/image.cpp:2534 ../src/common/image.cpp:2578

 #, c-format
 msgid "No image handler for type %s defined."
 #, c-format
 msgid "No image handler for type %s defined."

-msgstr "没有类型 %s的图像处理器."
+msgstr "没有类型 %s的图像处理器。"

 
 

-#: ../src/html/helpwnd.cpp:871
+#: ../src/html/helpwnd.cpp:873

 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 
 msgid "No matching page found yet"
 msgstr "还没有找到匹配页"
 

-#: ../src/osx/dataview_osx.cpp:381
-msgid "No model associated with control."
-msgstr ""
-
-#: ../src/osx/carbon/dataview.cpp:1637
-#: ../src/osx/carbon/dataview.cpp:1747
+#: ../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:1385
+#: ../src/osx/carbon/dataview.cpp:1425

 msgid "No renderer specified for column."
 msgstr ""
 
 msgid "No renderer specified for column."
 msgstr ""
 


@@ -4723,52 +4943,54 @@ msgstr ""
 msgid "No sound"
 msgstr "没有声音"
 
 msgid "No sound"
 msgstr "没有声音"
 

-#: ../src/common/image.cpp:1987
-#: ../src/common/image.cpp:2028
+#: ../src/common/image.cpp:2062 ../src/common/image.cpp:2103

 msgid "No unused colour in image being masked."
 msgid "No unused colour in image being masked."

-msgstr "图像中没有被掩码的未用颜色."
+msgstr "图像中没有被掩码的未用颜色。"

 
 

-#: ../src/common/image.cpp:2937
+#: ../src/common/image.cpp:3040

 msgid "No unused colour in image."
 msgid "No unused colour in image."

-msgstr "图像中没有未用的颜色."
+msgstr "图像中没有未用的颜色。"

 
 

-#: ../src/generic/helpext.cpp:308
+#: ../src/generic/helpext.cpp:307

 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
 msgstr ""
 
 #, c-format
 msgid "No valid mappings found in the file \"%s\"."
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:158
+#: ../src/richtext/richtextborderspage.cpp:542
+#: ../src/richtext/richtextsizepage.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:203
+#: ../src/richtext/richtextsizepage.cpp:204
+#, fuzzy
+msgid "None"
+msgstr "完成"
+
+#: ../src/common/fmapbase.cpp:156

 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 
 msgid "Nordic (ISO-8859-10)"
 msgstr "日尔曼语 (ISO-8859-10)"
 

-#: ../src/generic/fontdlgg.cpp:330
-#: ../src/generic/fontdlgg.cpp:333
-#: ../src/richtext/richtextindentspage.cpp:245
-#: ../src/richtext/richtextindentspage.cpp:255
-#: ../src/richtext/richtextindentspage.cpp:256
+#: ../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:1273

 msgid "Normal face<br>and <u>underlined</u>. "
 msgid "Normal face<br>and <u>underlined</u>. "

-msgstr "正常字体<br> 且 <u>带下划线</u>."
+msgstr "正常字体<br> 且 <u>带下划线</u>。"

 
 

-#: ../src/html/helpwnd.cpp:1213
+#: ../src/html/helpwnd.cpp:1215

 msgid "Normal font:"
 msgstr "正常字体:"
 
 msgid "Normal font:"
 msgstr "正常字体:"
 

-#: ../src/propgrid/props.cpp:791
+#: ../src/propgrid/props.cpp:888

 #, fuzzy, c-format
 msgid "Not %s"
 msgstr "关于(&A)"
 
 #, fuzzy, c-format
 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:288
+#: ../src/richtext/richtextfontpage.cpp:300

 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"
 #, fuzzy
 msgid "Not underlined"
 msgstr "下划线"


@@ -4778,38 +5000,47 @@ msgid "Note, 8 1/2 x 11 in"
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
 #: ../src/generic/notifmsgg.cpp:105
 msgstr "笔记簿, 8 1/2 x 11 英寸"
 
 #: ../src/generic/notifmsgg.cpp:105

-#, fuzzy

 msgid "Notice"
 msgid "Notice"

-msgstr "注意(&N):"
+msgstr "注意"

 
 #: ../src/osx/carbon/dataview.cpp:903
 
 #: ../src/osx/carbon/dataview.cpp:903

-#, fuzzy

 msgid "Number of columns could not be determined."
 msgid "Number of columns could not be determined."

-msgstr "æ\96\87件ä¸\8dè\83½è¢«è£\85è½½."
+msgstr "æ\97 æ³\95ç¡®å®\9aå\88\97æ\95°é\87\8fã\80\82"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:489
-#: ../src/richtext/richtextbulletspage.cpp:289
+#: ../src/richtext/richtextliststylepage.cpp:488
+#: ../src/richtext/richtextbulletspage.cpp:293

 msgid "Numbered outline"
 msgstr ""
 
 msgid "Numbered outline"
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:282
-#: ../src/msw/msgdlg.cpp:473
-#: ../src/msw/dialog.cpp:178
-#: ../src/gtk1/fontdlg.cpp:139
+#: ../src/richtext/richtextstyledlg.cpp:301 ../src/common/stockitem.cpp:179
+#: ../src/msw/msgdlg.cpp:489 ../src/msw/msgdlg.cpp:777
+#: ../src/msw/dialog.cpp:120 ../src/gtk1/fontdlg.cpp:139

 msgid "OK"
 msgstr "确认"
 
 msgid "OK"
 msgstr "确认"
 

-#: ../src/common/xtixml.cpp:260
+#: ../src/msw/ole/automtn.cpp:663
+#, c-format
+msgid "OLE Automation error in %s: %s"
+msgstr ""
+
+#: ../include/wx/richtext/richtextimagedlg.h:39
+#, fuzzy
+msgid "Object Properties"
+msgstr "属性(&P)"
+
+#: ../src/msw/ole/automtn.cpp:631
+msgid "Object implementation does not support named arguments."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:265

 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 

-#: ../src/common/docview.cpp:1631
-#: ../src/common/docview.cpp:1673
+#: ../src/common/docview.cpp:1736 ../src/common/docview.cpp:1778

 msgid "Open File"
 msgstr "打开文件"
 
 msgid "Open File"
 msgstr "打开文件"
 

-#: ../src/html/helpwnd.cpp:682
-#: ../src/html/helpwnd.cpp:1561
+#: ../src/html/helpwnd.cpp:682 ../src/html/helpwnd.cpp:1563

 msgid "Open HTML document"
 msgstr "打开HTML文档"
 
 msgid "Open HTML document"
 msgstr "打开HTML文档"
 


@@ -4818,64 +5049,75 @@ msgstr "打开HTML文档"
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 
 msgid "Open file \"%s\""
 msgstr "打开文件 \"%s\""
 

+#: ../src/common/stockitem.cpp:180
+msgid "Open..."
+msgstr "打开..."
+

 #: ../src/osx/carbon/glcanvas.cpp:49
 #, c-format
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr ""
 
 #: ../src/osx/carbon/glcanvas.cpp:49
 #, c-format
 msgid "OpenGL function \"%s\" failed: %s (error %d)"
 msgstr ""
 

-#: ../src/generic/dirctrlg.cpp:750
-#: ../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."
 msgid "Operation not permitted."

-msgstr "不允许的操作."
+msgstr "不允许的操作。"
+
+#: ../src/common/cmdline.cpp:728
+#, fuzzy, c-format
+msgid "Option '%s' can't be negated"
+msgstr "目录'%s'不能被创建"

 
 

-#: ../src/common/cmdline.cpp:829
+#: ../src/common/cmdline.cpp:892

 #, c-format
 msgid "Option '%s' requires a value."
 #, c-format
 msgid "Option '%s' requires a value."

-msgstr "选项 '%s' 需要值."
+msgstr "选项 '%s' 需要值。"

 
 

-#: ../src/common/cmdline.cpp:912
+#: ../src/common/cmdline.cpp:975

 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."

-msgstr "选项 '%s': '%s' 不能转成日期."
+msgstr "选项 '%s': '%s' 无法转成日期。"

 
 

-#: ../src/generic/dirdlgg.cpp:188
-#: ../src/generic/prntdlgg.cpp:624
+#: ../src/generic/dirdlgg.cpp:188 ../src/generic/prntdlgg.cpp:624

 msgid "Options"
 msgstr "选项"
 
 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 "方向"
 

-#: ../src/common/windowid.cpp:215
+#: ../src/common/windowid.cpp:260

 msgid "Out of window IDs.  Recommend shutting down application."
 msgstr ""
 
 msgid "Out of window IDs.  Recommend shutting down application."
 msgstr ""
 

-#: ../src/osx/dataview_osx.cpp:121
-#: ../src/osx/dataview_osx.cpp:202
-#, fuzzy
-msgid "Owner not initialized."
-msgstr "不能初始化显示."
+#: ../src/richtext/richtextborderspage.cpp:400
+#: ../src/richtext/richtextborderspage.cpp:533
+msgid "Outline"
+msgstr ""

 
 

-#: ../src/common/accelcmn.cpp:83
+#: ../src/richtext/richtextborderspage.cpp:550
+msgid "Outset"
+msgstr ""
+
+#: ../src/msw/ole/automtn.cpp:627
+msgid "Overflow while coercing argument values."
+msgstr ""
+
+#: ../src/common/accelcmn.cpp:85

 msgid "PAGEDOWN"
 msgstr ""
 
 msgid "PAGEDOWN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:82
+#: ../src/common/accelcmn.cpp:84

 msgid "PAGEUP"
 msgstr ""
 
 msgid "PAGEUP"
 msgstr ""
 

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

 msgid "PAUSE"
 msgstr ""
 
 msgid "PAUSE"
 msgstr ""
 

-#: ../src/common/imagpcx.cpp:458
-#: ../src/common/imagpcx.cpp:481
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:481

 msgid "PCX: couldn't allocate memory"
 msgid "PCX: couldn't allocate memory"

-msgstr "PCX: 不能分配内存"
+msgstr "PCX: 无法分配内存"

 
 #: ../src/common/imagpcx.cpp:457
 msgid "PCX: image format unsupported"
 
 #: ../src/common/imagpcx.cpp:457
 msgid "PCX: image format unsupported"


@@ -4887,10 +5129,9 @@ msgstr "PCX: 无效图像"
 
 #: ../src/common/imagpcx.cpp:443
 msgid "PCX: this is not a PCX file."
 
 #: ../src/common/imagpcx.cpp:443
 msgid "PCX: this is not a PCX file."

-msgstr "PCX: 不是PCX文件."
+msgstr "PCX: 不是PCX文件。"

 
 

-#: ../src/common/imagpcx.cpp:460
-#: ../src/common/imagpcx.cpp:482
+#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:482

 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知错误 !!!"
 


@@ -4898,27 +5139,26 @@ msgstr "PCX: 未知错误 !!!"
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 
 msgid "PCX: version number too low"
 msgstr "PCX: 版本号太小"
 

-#: ../src/common/accelcmn.cpp:54
+#: ../src/common/accelcmn.cpp:56

 msgid "PGDN"
 msgstr ""
 
 msgid "PGDN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:53
+#: ../src/common/accelcmn.cpp:55

 msgid "PGUP"
 msgstr ""
 
 #: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
 msgid "PGUP"
 msgstr ""
 
 #: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."

-msgstr "PNM: 不能分配内存."
+msgstr "PNM: 无法分配内存。"

 
 #: ../src/common/imagpnm.cpp:74
 msgid "PNM: File format is not recognized."
 
 #: ../src/common/imagpnm.cpp:74
 msgid "PNM: File format is not recognized."

-msgstr "PNM: 不能识别的文件格式."
+msgstr "PNM: 无法识别的文件格式。"

 
 

-#: ../src/common/imagpnm.cpp:113
-#: ../src/common/imagpnm.cpp:135
+#: ../src/common/imagpnm.cpp:113 ../src/common/imagpnm.cpp:135

 #: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."
 #: ../src/common/imagpnm.cpp:157
 msgid "PNM: File seems truncated."

-msgstr "PNM: 文件似乎已被截断."
+msgstr "PNM: 文件似乎已被截断。"

 
 #: ../src/common/paper.cpp:189
 msgid "PRC 16K 146 x 215 mm"
 
 #: ../src/common/paper.cpp:189
 msgid "PRC 16K 146 x 215 mm"


@@ -5024,25 +5264,30 @@ msgstr "中国标准信封9#, 229 x 324 毫米"
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgstr "中国标准信封9#(横向), 324 x 229 毫米"
 
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
 msgstr "中国标准信封9#(横向), 324 x 229 毫米"
 

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

 msgid "PRINT"
 msgstr ""
 
 msgid "PRINT"
 msgstr ""
 

-#: ../src/common/prntbase.cpp:1617
+#: ../src/richtext/richtextmarginspage.cpp:286
+#, fuzzy
+msgid "Padding"
+msgstr "正在读入"
+
+#: ../src/common/prntbase.cpp:2012

 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 
 #, c-format
 msgid "Page %d"
 msgstr "页 %d"
 

-#: ../src/common/prntbase.cpp:1615
+#: ../src/common/prntbase.cpp:2010

 #, 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:770

 msgid "Page Setup"
 msgstr "页面设置"
 
 msgid "Page Setup"
 msgstr "页面设置"
 

-#: ../src/common/prntbase.cpp:465
+#: ../src/generic/prntdlgg.cpp:834 ../src/common/prntbase.cpp:480

 #: ../src/gtk/gnome/gprint.cpp:706
 msgid "Page setup"
 msgstr "页面设置"
 #: ../src/gtk/gnome/gprint.cpp:706
 msgid "Page setup"
 msgstr "页面设置"


@@ -5051,57 +5296,35 @@ 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:905
+#: ../src/richtext/richtextstyles.cpp:1033

 msgid "Paragraph styles"
 msgstr ""
 
 msgid "Paragraph styles"
 msgstr ""
 

-#: ../src/osx/dataview_osx.cpp:201
-#, fuzzy
-msgid "Passed item is invalid."
-msgstr "'%s' 是无效的"
-
-#: ../src/common/xtistrm.cpp:421
+#: ../src/common/xtistrm.cpp:470

 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 
 msgid "Passing a already registered object to SetObject"
 msgstr "传递一个已注册的对象给SetObject"
 

-#: ../src/common/xtistrm.cpp:639
-msgid "Passing a already registered object to SetObjectName"
-msgstr "传递一个已注册的对象给SetObjectName"
-
-#: ../src/common/xtistrm.cpp:432
-#, fuzzy
-msgid "Passing an unknown object to GetObject"
-msgstr "传递一个未知对象给GetObject"
-
-#: ../src/common/xtistrm.cpp:652
+#: ../src/common/xtistrm.cpp:481

 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
 msgid "Passing an unkown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 

-#: ../src/richtext/richtextctrl.cpp:2472
-#: ../src/stc/scintilla/src/ScintillaBase.cxx:457
-#, fuzzy
+#: ../src/richtext/richtextctrl.cpp:3075 ../src/common/stockitem.cpp:181
+#: ../src/stc/stc_i18n.cpp:20

 msgid "Paste"
 msgid "Paste"

-msgstr "粘贴(&P)"
+msgstr "粘贴"

 
 

-#: ../src/common/stockitem.cpp:264
-#, fuzzy
+#: ../src/common/stockitem.cpp:263

 msgid "Paste selection"
 msgid "Paste selection"

-msgstr "选段"
+msgstr "粘贴选区"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:221
-#: ../src/richtext/richtextbulletspage.cpp:169
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextbulletspage.cpp:173

 msgid "Peri&od"
 msgstr ""
 
 msgid "Peri&od"
 msgstr ""
 


@@ -5109,6 +5332,11 @@ msgstr ""
 msgid "Permissions"
 msgstr "允许"
 
 msgid "Permissions"
 msgstr "允许"
 

+#: ../src/richtext/richtextbuffer.cpp:10251
+#, fuzzy
+msgid "Picture Properties"
+msgstr "属性(&P)"
+

 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
 msgstr "管道创建失败"
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
 msgstr "管道创建失败"


@@ -5125,106 +5353,98 @@ msgstr "请选择一个已存在的文件."
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 
 msgid "Please choose the page to display:"
 msgstr "请选择欲显示的页面:"
 

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

 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:443
+#: ../src/msw/listctrl.cpp:373

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""

-"请安装较新版本的comctl32.dll\n"
-"(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
-"否则此程序无法正确运行."
+"请安装较新版本的 comctl32.dll\n"
+"(至少需要4.70版，您现有的版本是 %d.%02d)，\n"
+"否则此程序无法正确运行。"

 
 

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

 msgid "Please select the columns to show and define their order:"
 msgstr ""
 
 msgid "Please select the columns to show and define their order:"
 msgstr ""
 

-#: ../src/common/prntbase.cpp:327
+#: ../src/common/prntbase.cpp:329

 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 
 msgid "Please wait while printing\n"
 msgstr "在打印时请等待\n"
 

-#: ../src/propgrid/advprops.cpp:631
+#: ../src/propgrid/advprops.cpp:632

 #, fuzzy
 msgid "Point Size"
 msgstr "字体大小(Point size)(&P):"
 
 #, fuzzy
 msgid "Point Size"
 msgstr "字体大小(Point size)(&P):"
 

-#: ../src/osx/carbon/dataview.cpp:1239
-#: ../src/osx/carbon/dataview.cpp:1290
-#: ../src/osx/carbon/dataview.cpp:1381
-#: ../src/osx/carbon/dataview.cpp:1404
-#: ../src/osx/carbon/dataview.cpp:1421
-#: ../src/osx/carbon/dataview.cpp:1438
-#: ../src/osx/carbon/dataview.cpp:1631
-#: ../src/osx/carbon/dataview.cpp:1740
-#: ../src/osx/carbon/dataview.cpp:1782
-#: ../src/osx/carbon/dataview.cpp:1832
-#: ../src/osx/carbon/dataview.cpp:1955
+#: ../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/dataview_osx.cpp:91
-msgid "Pointer to dataview control must not be NULL"
-msgstr ""
-
-#: ../src/osx/carbon/dataview.cpp:1240
-#: ../src/osx/carbon/dataview.cpp:1299
-#: ../src/osx/carbon/dataview.cpp:1382
-#: ../src/osx/carbon/dataview.cpp:1439
-#: ../src/osx/carbon/dataview.cpp:1632
-#: ../src/osx/carbon/dataview.cpp:1741
-#: ../src/osx/carbon/dataview.cpp:1783
-#: ../src/osx/carbon/dataview.cpp:1833
-#: ../src/osx/carbon/dataview.cpp:1956
+#: ../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/osx/dataview_osx.cpp:352
-#: ../src/osx/dataview_osx.cpp:378
-msgid "Pointer to native control must not be NULL."
-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:432
+#, fuzzy
+msgid "Position"
+msgstr "正在打印 "
+

 #: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"
 msgstr "PostScript文件"
 
 #: ../src/generic/prntdlgg.cpp:304
 msgid "PostScript file"
 msgstr "PostScript文件"
 

-#: ../src/generic/fontdlgg.cpp:457
-#: ../src/osx/carbon/fontdlg.cpp:564
-#: ../src/html/helpwnd.cpp:1230
+#: ../src/common/stockitem.cpp:182
+msgid "Preferences"
+msgstr "偏好设置"
+
+#: ../src/osx/menu_osx.cpp:550
+msgid "Preferences..."
+msgstr "偏好设置..."
+
+#: ../src/common/stockitem.cpp:183
+msgid "Preview..."
+msgstr "预览..."
+
+#: ../src/generic/fontdlgg.cpp:456 ../src/osx/carbon/fontdlg.cpp:574
+#: ../src/html/helpwnd.cpp:1232

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

-#: ../src/html/helpwnd.cpp:675
+#: ../src/common/prntbase.cpp:1498 ../src/html/helpwnd.cpp:675

 msgid "Previous page"
 msgstr "前页"
 
 msgid "Previous page"
 msgstr "前页"
 

-#: ../src/generic/prntdlgg.cpp:149
-#: ../src/generic/prntdlgg.cpp:163
-#: ../src/common/prntbase.cpp:407
-#: ../src/gtk/print.cpp:573
-#: ../src/gtk/print.cpp:586
-#: ../src/gtk/gnome/gprint.cpp:537
-#: ../src/gtk/gnome/gprint.cpp:549
+#: ../src/generic/prntdlgg.cpp:149 ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:422 ../src/common/prntbase.cpp:1486
+#: ../src/gtk/print.cpp:589 ../src/gtk/print.cpp:602
+#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549

 msgid "Print"
 msgstr "打印"
 
 msgid "Print"
 msgstr "打印"
 

-#: ../include/wx/prntbase.h:379
-#: ../src/common/docview.cpp:1146
+#: ../include/wx/prntbase.h:394 ../src/common/docview.cpp:1244

 msgid "Print Preview"
 msgstr "打印预览"
 
 msgid "Print Preview"
 msgstr "打印预览"
 

-#: ../src/common/prntbase.cpp:1558
-#: ../src/common/prntbase.cpp:1600
-#: ../src/common/prntbase.cpp:1608
+#: ../src/common/prntbase.cpp:1953 ../src/common/prntbase.cpp:1995
+#: ../src/common/prntbase.cpp:2003

 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 


@@ -5240,15 +5460,11 @@ msgstr "打印设置"
 msgid "Print in colour"
 msgstr "彩色打印"
 
 msgid "Print in colour"
 msgstr "彩色打印"
 

-#: ../src/common/stockitem.cpp:171
-msgid "Print previe&w"
-msgstr "打印预览(&w)"
-

 #: ../src/gtk/gnome/gprint.cpp:938
 msgid "Print preview"
 msgstr "打印预览"
 
 #: ../src/gtk/gnome/gprint.cpp:938
 msgid "Print preview"
 msgstr "打印预览"
 

-#: ../src/common/docview.cpp:1140
+#: ../src/common/docview.cpp:1238

 #, fuzzy
 msgid "Print preview creation failed."
 msgstr "管道创建失败"
 #, fuzzy
 msgid "Print preview creation failed."
 msgstr "管道创建失败"


@@ -5265,6 +5481,10 @@ msgstr "打印本页"
 msgid "Print to File"
 msgstr "打印到文件"
 
 msgid "Print to File"
 msgstr "打印到文件"
 

+#: ../src/common/stockitem.cpp:184
+msgid "Print..."
+msgstr "打印..."
+

 #: ../src/generic/prntdlgg.cpp:499
 msgid "Printer"
 msgstr "打印机"
 #: ../src/generic/prntdlgg.cpp:499
 msgid "Printer"
 msgstr "打印机"


@@ -5289,17 +5509,15 @@ msgstr "打印机..."
 msgid "Printer:"
 msgstr "打印机:"
 
 msgid "Printer:"
 msgstr "打印机:"
 

-#: ../src/html/htmprint.cpp:278
-#, fuzzy
+#: ../include/wx/richtext/richtextprint.h:164 ../src/html/htmprint.cpp:278

 msgid "Printing"
 msgstr "正在打印 "
 
 msgid "Printing"
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:324
-#: ../src/common/prntbase.cpp:546
+#: ../src/common/prntbase.cpp:326 ../src/common/prntbase.cpp:561

 msgid "Printing "
 msgstr "正在打印 "
 
 msgid "Printing "
 msgstr "正在打印 "
 

-#: ../src/common/prntbase.cpp:341
+#: ../src/common/prntbase.cpp:343

 msgid "Printing Error"
 msgstr "打印出错"
 
 msgid "Printing Error"
 msgstr "打印出错"
 


@@ -5312,80 +5530,99 @@ msgstr "正在打印页 %d..."
 msgid "Printing..."
 msgstr "打印..."
 
 msgid "Printing..."
 msgstr "打印..."
 

-#: ../include/wx/docview.h:932
-#: ../include/wx/prntbase.h:247
-#, fuzzy
+#: ../include/wx/richtext/richtextprint.h:110 ../include/wx/prntbase.h:262
+#: ../src/common/docview.cpp:2047

 msgid "Printout"
 msgstr "打印"
 
 msgid "Printout"
 msgstr "打印"
 

-#: ../src/common/debugrpt.cpp:554
+#: ../src/common/debugrpt.cpp:556

 #, c-format
 #, 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:2429
+#: ../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/stockitem.cpp:185
+msgid "Properties"
+msgstr "属性"
+

 #: ../src/propgrid/manager.cpp:238
 #: ../src/propgrid/manager.cpp:238

-#, fuzzy

 msgid "Property"
 msgid "Property"

-msgstr "属性(&P)"
+msgstr "属性"
+
+#: ../src/propgrid/propgrid.cpp:3145 ../src/propgrid/propgrid.cpp:3277
+msgid "Property Error"
+msgstr "属性错误"

 
 #: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 
 
 #: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "四开, 215 x 275 毫米"
 

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

 msgid "Question"
 msgstr "问题"
 
 msgid "Question"
 msgstr "问题"
 

-#: ../src/common/stockitem.cpp:265
-#, fuzzy
+#: ../src/common/stockitem.cpp:157
+msgid "Quit"
+msgstr "退出"
+
+#: ../src/osx/menu_osx.cpp:564
+#, fuzzy, c-format
+msgid "Quit %s"
+msgstr "退出"
+
+#: ../src/common/stockitem.cpp:264

 msgid "Quit this program"
 msgid "Quit this program"

-msgstr "æ\89\93å\8d°æ\9c¬é¡µ"
+msgstr "æ\8e¨å\87ºæ­¤ç¨\8båº\8f"

 
 

-#: ../src/common/accelcmn.cpp:52
+#: ../src/common/accelcmn.cpp:54

 msgid "RETURN"
 msgstr ""
 
 msgid "RETURN"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:56
+#: ../src/common/accelcmn.cpp:58

 msgid "RIGHT"
 msgstr ""
 
 msgid "RIGHT"
 msgstr ""
 

-#: ../src/common/ffile.cpp:114
-#: ../src/common/ffile.cpp:133
+#: ../src/common/accelcmn.cpp:318
+#, fuzzy
+msgid "RawCtrl+"
+msgstr "Ctrl+"
+
+#: ../src/common/ffile.cpp:114 ../src/common/ffile.cpp:133

 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "读文件 '%s'出错"
 

-#: ../src/common/prntbase.cpp:256
+#: ../src/common/prntbase.cpp:258

 msgid "Ready"
 msgstr "就绪"
 
 msgid "Ready"
 msgstr "就绪"
 

-#: ../src/stc/scintilla/src/ScintillaBase.cxx:453
+#: ../src/common/stockitem.cpp:186 ../src/stc/stc_i18n.cpp:17

 msgid "Redo"
 msgstr "恢复"
 
 msgid "Redo"
 msgstr "恢复"
 

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

 msgid "Redo last action"
 msgstr "恢复上一次操作"
 
 msgid "Redo last action"
 msgstr "恢复上一次操作"
 

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

 msgid "Refresh"
 msgstr "刷新"
 
 msgid "Refresh"
 msgstr "刷新"
 

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

 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "注册键 '%s' 已存在."
 

-#: ../src/msw/registry.cpp:552
+#: ../src/msw/registry.cpp:595

 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."

-msgstr "注册键 '%s' 不存在, 不能改名."
+msgstr "注册键 '%s' 不存在，无法改名。"

 
 

-#: ../src/msw/registry.cpp:684
+#: ../src/msw/registry.cpp:727

 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"


@@ -5396,27 +5633,21 @@ msgstr ""
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 
 "删除它将使系统进入不可用状态:\n"
 "操作终止."
 

-#: ../src/msw/registry.cpp:478
+#: ../src/msw/registry.cpp:521

 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "注册值 '%s' 已存在."
 

-#: ../src/richtext/richtextfontpage.cpp:282
-#: ../src/richtext/richtextfontpage.cpp:285
+#: ../src/richtext/richtextfontpage.cpp:292
+#: ../src/richtext/richtextfontpage.cpp:296

 msgid "Regular"
 msgstr ""
 
 msgid "Regular"
 msgstr ""
 

-#: ../src/generic/helpext.cpp:464
+#: ../src/generic/helpext.cpp:463

 msgid "Relevant entries:"
 msgstr "相关条目:"
 
 msgid "Relevant entries:"
 msgstr "相关条目:"
 

-#: ../src/generic/progdlgg.cpp:209
-#, fuzzy
-msgid "Remaining time:"
-msgstr "剩余时间 : "
-
-#: ../src/common/stockitem.cpp:176
-#: ../src/propgrid/props.cpp:2164
+#: ../src/common/stockitem.cpp:188

 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 


@@ -5429,20 +5660,20 @@ 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:1391
+#: ../src/osx/carbon/dataview.cpp:1431

 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 
 #, fuzzy
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 

-#: ../src/richtext/richtextbuffer.cpp:2900
+#: ../src/richtext/richtextbuffer.cpp:4091

 msgid "Renumber List"
 msgstr ""
 
 msgid "Renumber List"
 msgstr ""
 

-#: ../src/common/stockitem.cpp:177
+#: ../src/common/stockitem.cpp:189

 msgid "Rep&lace"
 msgstr "替换(&l)"
 
 msgid "Rep&lace"
 msgstr "替换(&l)"
 

-#: ../src/richtext/richtextctrl.cpp:2617
+#: ../src/richtext/richtextctrl.cpp:3234 ../src/common/stockitem.cpp:189

 #, fuzzy
 msgid "Replace"
 msgstr "替换(&R)"
 #, fuzzy
 msgid "Replace"
 msgstr "替换(&R)"


@@ -5451,7 +5682,7 @@ msgstr "替换(&R)"
 msgid "Replace &all"
 msgstr "全部替换(&a)"
 
 msgid "Replace &all"
 msgstr "全部替换(&a)"
 

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

 #, fuzzy
 msgid "Replace selection"
 msgstr "全部替换(&a)"
 #, fuzzy
 msgid "Replace selection"
 msgstr "全部替换(&a)"


@@ -5460,121 +5691,126 @@ msgstr "全部替换(&a)"
 msgid "Replace with:"
 msgstr "替换为:"
 
 msgid "Replace with:"
 msgstr "替换为:"
 

-#: ../src/common/valtext.cpp:152
+#: ../src/common/valtext.cpp:162

 msgid "Required information entry is empty."
 msgstr ""
 
 msgid "Required information entry is empty."
 msgstr ""
 

-#: ../src/common/translation.cpp:1726
+#: ../src/common/translation.cpp:1804

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

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

 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 
 msgid "Revert to Saved"
 msgstr "还原为上次保存的文件"
 

-#: ../src/richtext/richtextliststylepage.cpp:250
-#: ../src/richtext/richtextbulletspage.cpp:198
+#: ../src/richtext/richtextborderspage.cpp:548

 #, fuzzy
 #, fuzzy

-msgid "Right"
+msgid "Ridge"

 msgstr "细"
 
 msgstr "细"
 

+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextbulletspage.cpp:202
+#: ../src/richtext/richtextsizepage.cpp:202
+msgid "Right"
+msgstr "右"
+

 #: ../src/generic/prntdlgg.cpp:898
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
 #: ../src/generic/prntdlgg.cpp:898
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 

-#: ../src/richtext/richtextindentspage.cpp:158
-#: ../src/richtext/richtextindentspage.cpp:160
-#: ../src/richtext/richtextliststylepage.cpp:336
+#: ../src/richtext/richtextindentspage.cpp:161
+#: ../src/richtext/richtextindentspage.cpp:163

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

+#: ../src/richtext/richtextliststylepage.cpp:340

 msgid "Right-align text."
 msgstr ""
 
 msgid "Right-align text."
 msgstr ""
 

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

 msgid "Roman"
 msgstr "罗马"
 
 msgid "Roman"
 msgstr "罗马"
 

-#: ../src/richtext/richtextliststylepage.cpp:298
-#: ../src/richtext/richtextbulletspage.cpp:249
+#: ../src/richtext/richtextliststylepage.cpp:300
+#: ../src/richtext/richtextbulletspage.cpp:253

 msgid "S&tandard bullet name:"
 msgstr ""
 
 msgid "S&tandard bullet name:"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:81
+#: ../src/common/accelcmn.cpp:83

 msgid "SCROLL_LOCK"
 msgstr ""
 
 msgid "SCROLL_LOCK"
 msgstr ""
 

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

 msgid "SELECT"
 msgstr ""
 
 msgid "SELECT"
 msgstr ""
 

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

 msgid "SEPARATOR"
 msgstr ""
 
 msgid "SEPARATOR"
 msgstr ""
 

-#: ../src/common/fmapbase.cpp:196
-msgid "SHIFT-JIS"
-msgstr ""
-
-#: ../src/common/accelcmn.cpp:73
+#: ../src/common/accelcmn.cpp:75

 msgid "SNAPSHOT"
 msgstr ""
 
 msgid "SNAPSHOT"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:61
+#: ../src/common/accelcmn.cpp:63

 msgid "SPACE"
 msgstr ""
 
 msgid "SPACE"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:250
-#: ../src/common/accelcmn.cpp:307
+#: ../src/common/accelcmn.cpp:258 ../src/common/accelcmn.cpp:328

 msgid "SPECIAL"
 msgstr ""
 
 msgid "SPECIAL"
 msgstr ""
 

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

 msgid "SUBTRACT"
 msgstr ""
 
 msgid "SUBTRACT"
 msgstr ""
 

-#: ../src/common/sizer.cpp:2566
+#: ../src/common/stockitem.cpp:191 ../src/common/sizer.cpp:2577

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: ../src/common/fldlgcmn.cpp:318
+#: ../src/common/fldlgcmn.cpp:328

 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 
 #, c-format
 msgid "Save %s file"
 msgstr "保存文件 %s "
 

-#: ../src/common/stockitem.cpp:180
+#: ../src/generic/logg.cpp:520

 msgid "Save &As..."
 msgstr "另存为(&A)..."
 
 msgid "Save &As..."
 msgstr "另存为(&A)..."
 

-#: ../src/common/docview.cpp:315
+#: ../src/common/docview.cpp:362

 msgid "Save As"
 msgstr "另存为"
 
 msgid "Save As"
 msgstr "另存为"
 

-#: ../src/common/stockitem.cpp:269
+#: ../src/common/stockitem.cpp:192
+msgid "Save as"
+msgstr "另存为"
+
+#: ../src/common/stockitem.cpp:268

 #, fuzzy
 msgid "Save current document"
 msgstr "选择文档视图"
 
 #, fuzzy
 msgid "Save current document"
 msgstr "选择文档视图"
 

-#: ../src/common/stockitem.cpp:270
+#: ../src/common/stockitem.cpp:269

 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:520

 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 
 msgid "Save log contents to file"
 msgstr "把日志内容保存到文件"
 

-#: ../src/generic/fontdlgg.cpp:327
+#: ../src/generic/fontdlgg.cpp:326

 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/generic/srchctlg.cpp:362
-#: ../src/html/helpwnd.cpp:546
+#: ../src/generic/srchctlg.cpp:68 ../src/html/helpwnd.cpp:546

 #: ../src/html/helpwnd.cpp:561
 msgid "Search"
 msgstr "搜索"
 
 #: ../src/html/helpwnd.cpp:548
 #, fuzzy
 #: ../src/html/helpwnd.cpp:561
 msgid "Search"
 msgstr "搜索"
 
 #: ../src/html/helpwnd.cpp:548
 #, fuzzy

-msgid "Search contents of help book(s) for all occurrences of the text you typed above"
+msgid ""
+"Search contents of help book(s) for all occurrences of the text you typed "
+"above"

 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:161
 msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
 #: ../src/generic/fdrepdlg.cpp:161


@@ -5585,77 +5821,84 @@ msgstr "搜索方向"
 msgid "Search for:"
 msgstr "搜索:"
 
 msgid "Search for:"
 msgstr "搜索:"
 

-#: ../src/html/helpwnd.cpp:1060
+#: ../src/html/helpwnd.cpp:1062

 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 
 msgid "Search in all books"
 msgstr "搜索所有的书籍"
 

-#: ../src/html/helpwnd.cpp:870
+#: ../src/html/helpwnd.cpp:872

 msgid "Searching..."
 msgstr "搜索中..."
 
 msgid "Searching..."
 msgstr "搜索中..."
 

-#: ../src/generic/dirctrlg.cpp:597
+#: ../src/generic/dirctrlg.cpp:538

 msgid "Sections"
 msgstr "段"
 
 #: ../src/common/ffile.cpp:219
 #, c-format
 msgid "Seek error on file '%s'"
 msgid "Sections"
 msgstr "段"
 
 #: ../src/common/ffile.cpp:219
 #, c-format
 msgid "Seek error on file '%s'"

-msgstr "文件 '%s'定位错误"
+msgstr "文件 '%s' 定位错误"

 
 #: ../src/common/ffile.cpp:209
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
 
 #: ../src/common/ffile.cpp:209
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"

-msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
+msgstr "文件 '%s' 定位错误 (stdio 不支持大文件)"

 
 

-#: ../src/richtext/richtextctrl.cpp:301
-#: ../src/osx/textctrl_osx.cpp:592
-#: ../src/common/stockitem.cpp:181
-#: ../src/msw/textctrl.cpp:2179
+#: ../src/richtext/richtextctrl.cpp:330 ../src/osx/textctrl_osx.cpp:588
+#: ../src/common/stockitem.cpp:193 ../src/msw/textctrl.cpp:2227

 msgid "Select &All"
 msgstr "全部选择(&A)"
 
 msgid "Select &All"
 msgstr "全部选择(&A)"
 

-#: ../src/stc/scintilla/src/ScintillaBase.cxx:460
+#: ../src/common/stockitem.cpp:193 ../src/stc/stc_i18n.cpp:22

 msgid "Select All"
 msgstr "全部选择"
 
 msgid "Select All"
 msgstr "全部选择"
 

-#: ../src/common/docview.cpp:1753
+#: ../src/common/docview.cpp:1858

 msgid "Select a document template"
 msgstr "选择文档模板"
 
 msgid "Select a document template"
 msgstr "选择文档模板"
 

-#: ../src/common/docview.cpp:1827
+#: ../src/common/docview.cpp:1932

 msgid "Select a document view"
 msgstr "选择文档视图"
 
 msgid "Select a document view"
 msgstr "选择文档视图"
 

-#: ../src/richtext/richtextfontpage.cpp:195
-#: ../src/richtext/richtextfontpage.cpp:197
+#: ../src/richtext/richtextfontpage.cpp:202
+#: ../src/richtext/richtextfontpage.cpp:204

 msgid "Select regular or bold."
 msgstr ""
 
 msgid "Select regular or bold."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:182
-#: ../src/richtext/richtextfontpage.cpp:184
+#: ../src/richtext/richtextfontpage.cpp:189
+#: ../src/richtext/richtextfontpage.cpp:191

 msgid "Select regular or italic style."
 msgstr ""
 
 msgid "Select regular or italic style."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:208
-#: ../src/richtext/richtextfontpage.cpp:210
+#: ../src/richtext/richtextfontpage.cpp:215
+#: ../src/richtext/richtextfontpage.cpp:217

 msgid "Select underlining or no underlining."
 msgstr ""
 
 #: ../src/motif/filedlg.cpp:219
 msgid "Selection"
 msgid "Select underlining or no underlining."
 msgstr ""
 
 #: ../src/motif/filedlg.cpp:219
 msgid "Selection"

-msgstr "选段"
+msgstr "选区"

 
 

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

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

+#: ../src/richtext/richtextliststylepage.cpp:190

 msgid "Selects the list level to edit."
 msgstr ""
 
 msgid "Selects the list level to edit."
 msgstr ""
 

-#: ../src/common/cmdline.cpp:848
+#: ../src/common/cmdline.cpp:911

 #, c-format
 msgid "Separator expected after the option '%s'."
 #, c-format
 msgid "Separator expected after the option '%s'."

-msgstr "期望在选项 '%s'后存在分隔符."
+msgstr "期望在选项 '%s' 后存在分隔符。"

 
 

-#: ../src/common/filename.cpp:2461
+#: ../src/richtext/richtextbuffer.cpp:9221
+#, fuzzy
+msgid "Set Cell Style"
+msgstr "删除项"
+
+#: ../include/wx/xtiprop.h:180
+msgid "SetProperty called w/o valid setter"
+msgstr "调用 SetProperty 时未带有效的 setter"
+
+#: ../src/common/filename.cpp:2533

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


@@ -5663,11 +5906,11 @@ msgstr ""
 msgid "Setup..."
 msgstr "设置..."
 
 msgid "Setup..."
 msgstr "设置..."
 

-#: ../src/msw/dialup.cpp:567
+#: ../src/msw/dialup.cpp:564

 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "找到多个活动拨号连接, 随机选择一个."
 

-#: ../src/common/accelcmn.cpp:298
+#: ../src/common/accelcmn.cpp:315

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


@@ -5681,7 +5924,12 @@ msgstr "显示隐藏目录"
 msgid "Show &hidden files"
 msgstr "显示隐藏文件"
 
 msgid "Show &hidden files"
 msgstr "显示隐藏文件"
 

-#: ../src/common/stockitem.cpp:259
+#: ../src/osx/menu_osx.cpp:559
+#, fuzzy
+msgid "Show All"
+msgstr "全部显示"
+
+#: ../src/common/stockitem.cpp:258

 msgid "Show about dialog"
 msgstr ""
 
 msgid "Show about dialog"
 msgstr ""
 


@@ -5701,291 +5949,311 @@ msgstr "显示隐藏目录"
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 
 msgid "Show/hide navigation panel"
 msgstr "显示/隐藏 导航面板"
 

-#: ../src/richtext/richtextsymboldlg.cpp:415
-#: ../src/richtext/richtextsymboldlg.cpp:417
+#: ../src/richtext/richtextsymboldlg.cpp:418
+#: ../src/richtext/richtextsymboldlg.cpp:420

 msgid "Shows a Unicode subset."
 msgstr ""
 
 msgid "Shows a Unicode subset."
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:474
-#: ../src/richtext/richtextliststylepage.cpp:476
-#: ../src/richtext/richtextbulletspage.cpp:273
-#: ../src/richtext/richtextbulletspage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:473
+#: ../src/richtext/richtextliststylepage.cpp:475
+#: ../src/richtext/richtextbulletspage.cpp:277
+#: ../src/richtext/richtextbulletspage.cpp:279

 msgid "Shows a preview of the bullet settings."
 msgstr ""
 
 msgid "Shows a preview of the bullet settings."
 msgstr ""
 

-#: ../src/richtext/richtextfontpage.cpp:273
-#: ../src/richtext/richtextfontpage.cpp:275
+#: ../src/richtext/richtextfontpage.cpp:282
+#: ../src/richtext/richtextfontpage.cpp:284

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

-#: ../src/richtext/richtextindentspage.cpp:335
-#: ../src/richtext/richtextindentspage.cpp:337
+#: ../src/richtext/richtextindentspage.cpp:328
+#: ../src/richtext/richtextindentspage.cpp:330

 msgid "Shows a preview of the paragraph settings."
 msgstr ""
 
 msgid "Shows a preview of the paragraph settings."
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:462
-#: ../src/generic/fontdlgg.cpp:464
+#: ../src/generic/fontdlgg.cpp:461 ../src/generic/fontdlgg.cpp:463

 msgid "Shows the font preview."
 msgid "Shows the font preview."

-msgstr "显示字体预览."
+msgstr "显示字体预览。"

 
 #: ../src/univ/themes/mono.cpp:517
 msgid "Simple monochrome theme"
 msgstr ""
 
 
 #: ../src/univ/themes/mono.cpp:517
 msgid "Simple monochrome theme"
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:314
-#: ../src/richtext/richtextindentspage.cpp:325
-#: ../src/richtext/richtextindentspage.cpp:326
-#: ../src/richtext/richtextliststylepage.cpp:459
-#: ../src/richtext/richtextliststylepage.cpp:462
-#: ../src/richtext/richtextliststylepage.cpp:463
+#: ../src/richtext/richtextindentspage.cpp:300
+#: ../src/richtext/richtextliststylepage.cpp:450

 msgid "Single"
 msgstr ""
 
 msgid "Single"
 msgstr ""
 

-#: ../src/generic/filectrlg.cpp:454
+#: ../src/generic/filectrlg.cpp:454 ../src/richtext/richtextformatdlg.cpp:351
+#: ../src/richtext/richtextsizepage.cpp:213

 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:221
-#: ../src/generic/progdlgg.cpp:686
+#: ../src/generic/progdlgg.cpp:263 ../src/generic/progdlgg.cpp:774
+#: ../src/msw/progdlg.cpp:802

 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 

-#: ../src/generic/fontdlgg.cpp:332
+#: ../src/generic/fontdlgg.cpp:331

 msgid "Slant"
 msgstr "倾斜"
 
 msgid "Slant"
 msgstr "倾斜"
 

-#: ../src/common/docview.cpp:1649
+#: ../src/richtext/richtextborderspage.cpp:543
+#, fuzzy
+msgid "Solid"
+msgstr "粗体"
+
+#: ../src/common/docview.cpp:1754

 msgid "Sorry, could not open this file."
 msgid "Sorry, could not open this file."

-msgstr "对不起, 不能打开文件."
+msgstr "对不起，无法打开文件。"

 
 

-#: ../src/common/prntbase.cpp:1600
-#: ../src/common/prntbase.cpp:1608
+#: ../src/common/prntbase.cpp:1995 ../src/common/prntbase.cpp:2003

 msgid "Sorry, not enough memory to create a preview."
 msgid "Sorry, not enough memory to create a preview."

-msgstr "对不起, 没有足够内存创建预览."
+msgstr "对不起，没有足够内存创建预览。"

 
 

-#: ../src/richtext/richtextstyledlg.cpp:573
-#: ../src/richtext/richtextstyledlg.cpp:621
-#: ../src/richtext/richtextstyledlg.cpp:776
-#: ../src/richtext/richtextstyledlg.cpp:852
+#: ../src/richtext/richtextstyledlg.cpp:612
+#: ../src/richtext/richtextstyledlg.cpp:660
+#: ../src/richtext/richtextstyledlg.cpp:826
+#: ../src/richtext/richtextstyledlg.cpp:902
+#: ../src/richtext/richtextstyledlg.cpp:940

 msgid "Sorry, that name is taken. Please choose another."
 msgstr ""
 
 msgid "Sorry, that name is taken. Please choose another."
 msgstr ""
 

-#: ../src/common/docview.cpp:1672
+#: ../src/common/docview.cpp:1777

 msgid "Sorry, the format for this file is unknown."
 msgid "Sorry, the format for this file is unknown."

-msgstr "对不起, 此文件的格式未知."
+msgstr "对不起，此文件的格式未知。"

 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."

-msgstr "声音数据为不支持的格式."
+msgstr "声音数据为不支持的格式。"

 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."

-msgstr "声音文件 '%s'为不支持的格式."
+msgstr "声音文件 '%s' 为不支持的格式。"

 
 

-#: ../src/richtext/richtextliststylepage.cpp:469
+#: ../src/richtext/richtextliststylepage.cpp:468

 #, fuzzy
 msgid "Spacing"
 msgstr "搜索中..."
 
 #, fuzzy
 msgid "Spacing"
 msgstr "搜索中..."
 

-#: ../src/richtext/richtextliststylepage.cpp:492
-#: ../src/richtext/richtextbulletspage.cpp:292
+#: ../src/common/stockitem.cpp:198
+msgid "Spell Check"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:491
+#: ../src/richtext/richtextbulletspage.cpp:296

 msgid "Standard"
 msgstr ""
 
 #: ../src/common/paper.cpp:106
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgid "Standard"
 msgstr ""
 
 #: ../src/common/paper.cpp:106
 msgid "Statement, 5 1/2 x 8 1/2 in"

-msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
+msgstr "报表用纸，5 1/2 x 8 1/2 英寸"

 
 #: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"
 
 
 #: ../src/generic/prntdlgg.cpp:210
 msgid "Status:"
 msgstr "状态:"
 

-#: ../src/common/xtistrm.cpp:249
-msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr "不支持针对尚未形成流的对象的流委派"
+#: ../src/common/stockitem.cpp:199
+msgid "Stop"
+msgstr "停止"
+
+#: ../src/common/stockitem.cpp:200
+msgid "Strikethrough"
+msgstr ""

 
 

-#: ../src/msw/colour.cpp:35
+#: ../src/common/colourcmn.cpp:46

 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "字符串 - 颜色: 错误的颜色: %s"
 

-#: ../src/richtext/richtextformatdlg.cpp:269
-#: ../src/propgrid/advprops.cpp:647
+#: ../src/richtext/richtextformatdlg.cpp:313 ../src/propgrid/advprops.cpp:648

 msgid "Style"
 msgstr "样式"
 
 msgid "Style"
 msgstr "样式"
 

-#: ../include/wx/richtext/richtextstyledlg.h:45
+#: ../include/wx/richtext/richtextstyledlg.h:48

 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:263
+#: ../src/richtext/richtextfontpage.cpp:272

 #, fuzzy
 msgid "Subscrip&t"
 msgstr "Script"
 
 #, fuzzy
 msgid "Subscrip&t"
 msgstr "Script"
 

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

 #, fuzzy
 msgid "Supe&rscript"
 msgstr "Script"
 
 #: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"
 #, fuzzy
 msgid "Supe&rscript"
 msgstr "Script"
 
 #: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"

-msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"
+msgstr "SuperA/SuperA/A4 纸张，227 x 356 毫米"

 
 #: ../src/common/paper.cpp:153
 msgid "SuperB/SuperB/A3 305 x 487 mm"
 
 #: ../src/common/paper.cpp:153
 msgid "SuperB/SuperB/A3 305 x 487 mm"

-msgstr "SuperB/SuperB/A3 纸张, 305 x 487 毫米"
+msgstr "SuperB/SuperB/A3 纸张，305 x 487 毫米"

 
 

-#: ../src/generic/fontdlgg.cpp:328
+#: ../src/generic/fontdlgg.cpp:327

 msgid "Swiss"
 msgstr "瑞士"
 
 msgid "Swiss"
 msgstr "瑞士"
 

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

 msgid "Symbol"
 msgstr ""
 
 msgid "Symbol"
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:287
-#: ../src/richtext/richtextbulletspage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:289
+#: ../src/richtext/richtextbulletspage.cpp:241

 #, fuzzy
 msgid "Symbol &font:"
 msgstr "正常字体:"
 
 #, fuzzy
 msgid "Symbol &font:"
 msgstr "正常字体:"
 

-#: ../src/common/accelcmn.cpp:62
+#: ../src/common/accelcmn.cpp:64

 msgid "TAB"
 msgstr ""
 
 msgid "TAB"
 msgstr ""
 

-#: ../src/common/imagtiff.cpp:327
-#: ../src/common/imagtiff.cpp:340
-#: ../src/common/imagtiff.cpp:548
+#: ../src/common/imagtiff.cpp:373 ../src/common/imagtiff.cpp:386
+#: ../src/common/imagtiff.cpp:745

 msgid "TIFF: Couldn't allocate memory."
 msgid "TIFF: Couldn't allocate memory."

-msgstr "TIFF: 不能分配内存."
+msgstr "TIFF: 无法分配内存。"

 
 

-#: ../src/common/imagtiff.cpp:274
+#: ../src/common/imagtiff.cpp:305

 msgid "TIFF: Error loading image."
 msgid "TIFF: Error loading image."

-msgstr "TIFF: 装载图像错误."
+msgstr "TIFF: 装载图像错误。"

 
 

-#: ../src/common/imagtiff.cpp:356
+#: ../src/common/imagtiff.cpp:472

 msgid "TIFF: Error reading image."
 msgid "TIFF: Error reading image."

-msgstr "TIFF: 读图像错误."
+msgstr "TIFF: 读图像错误。"

 
 

-#: ../src/common/imagtiff.cpp:466
+#: ../src/common/imagtiff.cpp:612

 msgid "TIFF: Error saving image."
 msgid "TIFF: Error saving image."

-msgstr "TIFF: 保存图像错误."
+msgstr "TIFF: 保存图像错误。"

 
 

-#: ../src/common/imagtiff.cpp:596
+#: ../src/common/imagtiff.cpp:850

 msgid "TIFF: Error writing image."
 msgid "TIFF: Error writing image."

-msgstr "TIFF: 写图像错误."
+msgstr "TIFF: 写图像错误。"

 
 

-#: ../src/common/imagtiff.cpp:313
+#: ../src/common/imagtiff.cpp:359

 msgid "TIFF: Image size is abnormally big."
 msgstr ""
 
 msgid "TIFF: Image size is abnormally big."
 msgstr ""
 

+#: ../src/richtext/richtextbuffer.cpp:9362
+#, fuzzy
+msgid "Table Properties"
+msgstr "属性(&P)"
+

 #: ../src/common/paper.cpp:147
 msgid "Tabloid Extra 11.69 x 18 in"
 #: ../src/common/paper.cpp:147
 msgid "Tabloid Extra 11.69 x 18 in"

-msgstr "小报(特大), 11.69 x 18 英寸"
+msgstr "小报(特大)，11.69 x 18 英寸"

 
 #: ../src/common/paper.cpp:104
 msgid "Tabloid, 11 x 17 in"
 
 #: ../src/common/paper.cpp:104
 msgid "Tabloid, 11 x 17 in"

-msgstr "小报, 11 x 17 英寸"
+msgstr "小报，11 x 17 英寸"

 
 

-#: ../src/richtext/richtextformatdlg.cpp:287
+#: ../src/richtext/richtextformatdlg.cpp:331

 msgid "Tabs"
 msgstr ""
 
 msgid "Tabs"
 msgstr ""
 

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

 msgid "Teletype"
 msgstr "电传打字机"
 
 msgid "Teletype"
 msgstr "电传打字机"
 

-#: ../src/common/docview.cpp:1754
+#: ../src/common/docview.cpp:1859

 msgid "Templates"
 msgstr "模板"
 
 msgid "Templates"
 msgstr "模板"
 

-#: ../src/osx/carbon/dataview.cpp:2330
+#: ../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:159
+#: ../src/common/fmapbase.cpp:157

 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "泰语 (ISO-8859-11)"
 

-#: ../src/common/ftp.cpp:620
+#: ../src/common/ftp.cpp:623

 msgid "The FTP server doesn't support passive mode."
 msgid "The FTP server doesn't support passive mode."

-msgstr "FTP服务器不支持passive模式."
+msgstr "FTP服务器不支持 passive 模式。"

 
 

-#: ../src/common/ftp.cpp:606
+#: ../src/common/ftp.cpp:609

 msgid "The FTP server doesn't support the PORT command."
 msgid "The FTP server doesn't support the PORT command."

-msgstr "FTP服务器不支持PORT命令."
+msgstr "FTP服务器不支持 PORT 命令。"

 
 

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

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

-#: ../src/richtext/richtextbulletspage.cpp:161
-#: ../src/richtext/richtextbulletspage.cpp:163
+#: ../src/richtext/richtextliststylepage.cpp:218
+#: ../src/richtext/richtextbulletspage.cpp:165
+#: ../src/richtext/richtextbulletspage.cpp:167

 msgid "The available bullet styles."
 msgstr ""
 
 msgid "The available bullet styles."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:194
-#: ../src/richtext/richtextstyledlg.cpp:196
+#: ../src/richtext/richtextstyledlg.cpp:206
+#: ../src/richtext/richtextstyledlg.cpp:208

 #, fuzzy
 msgid "The available styles."
 msgstr "字体风格."
 
 #, fuzzy
 msgid "The available styles."
 msgstr "字体风格."
 

-#: ../src/richtext/richtextliststylepage.cpp:253
+#: ../src/richtext/richtextbackgroundpage.cpp:139
+#: ../src/richtext/richtextbackgroundpage.cpp:141
+#, fuzzy
+msgid "The background colour."
+msgstr "字体颜色."
+
+#: ../src/richtext/richtextmarginspage.cpp:268
+#: ../src/richtext/richtextmarginspage.cpp:270
+#, fuzzy
+msgid "The bottom margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:382
+#: ../src/richtext/richtextmarginspage.cpp:384
+#, fuzzy
+msgid "The bottom padding size."
+msgstr "字体大小(磅值)."
+

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

-#: ../src/richtext/richtextliststylepage.cpp:274
+#: ../src/richtext/richtextliststylepage.cpp:257

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

-#: ../src/richtext/richtextbulletspage.cpp:201
-#: ../src/richtext/richtextbulletspage.cpp:203
-#: ../src/richtext/richtextbulletspage.cpp:224
-#: ../src/richtext/richtextbulletspage.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:278
+#: ../src/richtext/richtextbulletspage.cpp:205
+#: ../src/richtext/richtextbulletspage.cpp:207
+#: ../src/richtext/richtextbulletspage.cpp:228
+#: ../src/richtext/richtextbulletspage.cpp:230

 msgid "The bullet character."
 msgstr ""
 
 msgid "The bullet character."
 msgstr ""
 

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

 msgid "The character code."
 msgstr ""
 
 msgid "The character code."
 msgstr ""
 

-#: ../src/common/fontmap.cpp:201
+#: ../src/common/fontmap.cpp:202

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 "another charset to replace it with or choose\n"
 "[Cancel] if it cannot be replaced"
 msgstr ""

-"未知字符集'%s'. 选择其它字符集\n"
-"代替它; 如果不能\n"
-"被替代则选择[取消] "
+"未知字符集 '%s'。选择其它字符集\n"
+"代替它，如果无法替代请选择 [取消] "

 
 #: ../src/msw/ole/dataobj.cpp:162
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 
 #: ../src/msw/ole/dataobj.cpp:162
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."

-msgstr "剪贴板格式 '%d' 不存在."
+msgstr "剪贴板格式 '%d' 不存在。"

 
 

-#: ../src/common/dobjcmn.cpp:125
-msgid "The data format for the GET-direction of the to be added data object already exists"
-msgstr ""
-
-#: ../src/common/dobjcmn.cpp:133
-msgid "The data format for the SET-direction of the to be added data object already exists"
-msgstr ""
-
-#: ../src/richtext/richtextstylepage.cpp:127

 #: ../src/richtext/richtextstylepage.cpp:129
 #: ../src/richtext/richtextstylepage.cpp:129

+#: ../src/richtext/richtextstylepage.cpp:131

 msgid "The default style for the next paragraph."
 msgstr ""
 
 msgid "The default style for the next paragraph."
 msgstr ""
 


@@ -5995,83 +6263,74 @@ msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""

-"目录 '%s'不存在\n"
-"现在创建?"
+"目录 '%s' 不存在\n"
+"是否现在创建?"

 
 #: ../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:1929
-#, fuzzy, c-format
-msgid "The file '%s' couldn't be opened."
-msgstr "文件不能被装载."
-
-#: ../src/common/docview.cpp:1933
-#, fuzzy, c-format
-msgid "The file '%s' doesn't exist and couldn't be opened."
+#: ../src/common/docview.cpp:1178
+#, c-format
+msgid ""
+"The file '%s' doesn't exist and couldn't be opened.\n"
+"It has been removed from the most recently used files list."

 msgstr ""
 msgstr ""

-"文件 '%s' 不存在,不能被打开.\n"
-"已从最近使用的文件列表(MRU)中移去."
+"文件 '%s' 不存在所以无法打开。\n"
+"已从最近使用的文件列表中移去。"

 
 

-#: ../src/richtext/richtextindentspage.cpp:224
-#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextindentspage.cpp:221
+#: ../src/richtext/richtextindentspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:395

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

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

 #, fuzzy
 msgid "The first line indent."
 msgstr "字体大小(磅值)."
 
 #, fuzzy
 msgid "The first line indent."
 msgstr "字体大小(磅值)."
 

-#: ../src/gtk/utilsgtk.cpp:492
+#: ../src/gtk/utilsgtk.cpp:475

 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:416
-#: ../src/generic/fontdlgg.cpp:418
+#: ../src/generic/fontdlgg.cpp:415 ../src/generic/fontdlgg.cpp:417

 msgid "The font colour."
 msgid "The font colour."

-msgstr "字体颜色."
+msgstr "字体颜色。"

 
 

-#: ../src/generic/fontdlgg.cpp:377
-#: ../src/generic/fontdlgg.cpp:379
+#: ../src/generic/fontdlgg.cpp:376 ../src/generic/fontdlgg.cpp:378

 msgid "The font family."
 msgid "The font family."

-msgstr "字体."
+msgstr "字体。"

 
 

-#: ../src/richtext/richtextsymboldlg.cpp:399
-#: ../src/richtext/richtextsymboldlg.cpp:401
+#: ../src/richtext/richtextsymboldlg.cpp:402
+#: ../src/richtext/richtextsymboldlg.cpp:404

 msgid "The font from which to take the symbol."
 msgstr ""
 
 msgid "The font from which to take the symbol."
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:429
-#: ../src/generic/fontdlgg.cpp:431
-#: ../src/generic/fontdlgg.cpp:436
-#: ../src/generic/fontdlgg.cpp:438
+#: ../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."
 msgid "The font point size."

-msgstr "字体大小(磅值)."
+msgstr "字体大小 (磅值)。"

 
 

-#: ../src/osx/carbon/fontdlg.cpp:517
-#: ../src/osx/carbon/fontdlg.cpp:519
+#: ../src/osx/carbon/fontdlg.cpp:527 ../src/osx/carbon/fontdlg.cpp:529

 #, fuzzy
 msgid "The font size in points."
 msgstr "字体大小(磅值)."
 
 #, fuzzy
 msgid "The font size in points."
 msgstr "字体大小(磅值)."
 

-#: ../src/generic/fontdlgg.cpp:388
-#: ../src/generic/fontdlgg.cpp:390
+#: ../src/generic/fontdlgg.cpp:387 ../src/generic/fontdlgg.cpp:389

 msgid "The font style."
 msgid "The font style."

-msgstr "字体风格."
+msgstr "字体风格。"

 
 

-#: ../src/generic/fontdlgg.cpp:399
-#: ../src/generic/fontdlgg.cpp:401
+#: ../src/generic/fontdlgg.cpp:398 ../src/generic/fontdlgg.cpp:400

 msgid "The font weight."
 msgid "The font weight."

-msgstr "字体粗细."
+msgstr "字体粗细。"

 
 

-#: ../src/common/docview.cpp:1335
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1439
+#, c-format

 msgid "The format of file '%s' couldn't be determined."
 msgid "The format of file '%s' couldn't be determined."

-msgstr "目录'%s'不能被创建"
+msgstr "无法确定文件 '%s' 格式。"

 
 #: ../src/richtext/richtextindentspage.cpp:212
 #: ../src/richtext/richtextindentspage.cpp:214
 
 #: ../src/richtext/richtextindentspage.cpp:212
 #: ../src/richtext/richtextindentspage.cpp:214


@@ -6081,158 +6340,266 @@ msgstr "目录'%s'不能被创建"
 msgid "The left indent."
 msgstr "字体粗细."
 
 msgid "The left indent."
 msgstr "字体粗细."
 

-#: ../src/richtext/richtextindentspage.cpp:327
-#: ../src/richtext/richtextindentspage.cpp:329
-#: ../src/richtext/richtextliststylepage.cpp:464
-#: ../src/richtext/richtextliststylepage.cpp:466
+#: ../src/richtext/richtextmarginspage.cpp:195
+#: ../src/richtext/richtextmarginspage.cpp:197
+#, fuzzy
+msgid "The left margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:309
+#: ../src/richtext/richtextmarginspage.cpp:311
+#, fuzzy
+msgid "The left padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextindentspage.cpp:313
+#: ../src/richtext/richtextindentspage.cpp:315
+#: ../src/richtext/richtextliststylepage.cpp:463
+#: ../src/richtext/richtextliststylepage.cpp:465

 msgid "The line spacing."
 msgstr ""
 
 msgid "The line spacing."
 msgstr ""
 

-#: ../src/richtext/richtextbulletspage.cpp:265
-#: ../src/richtext/richtextbulletspage.cpp:267
+#: ../src/richtext/richtextbulletspage.cpp:269
+#: ../src/richtext/richtextbulletspage.cpp:271

 msgid "The list item number."
 msgstr ""
 
 msgid "The list item number."
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:257
-#: ../src/richtext/richtextindentspage.cpp:259
+#: ../src/msw/ole/automtn.cpp:635
+msgid "The locale ID is unknown."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:266
+#: ../src/richtext/richtextsizepage.cpp:268
+#, fuzzy
+msgid "The object height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:376
+#, fuzzy
+msgid "The object maximum height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:347
+#: ../src/richtext/richtextsizepage.cpp:349
+#, fuzzy
+msgid "The object maximum width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:293
+#: ../src/richtext/richtextsizepage.cpp:295
+#, fuzzy
+msgid "The object minimum width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:320
+#: ../src/richtext/richtextsizepage.cpp:322
+#, fuzzy
+msgid "The object minmum height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:239
+#: ../src/richtext/richtextsizepage.cpp:241
+#, fuzzy
+msgid "The object width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextindentspage.cpp:252
+#: ../src/richtext/richtextindentspage.cpp:254

 #, fuzzy
 msgid "The outline level."
 msgstr "显示字体预览."
 
 #, fuzzy
 msgid "The outline level."
 msgstr "显示字体预览."
 

-#: ../src/common/filename.cpp:1441
-#, c-format
-msgid "The path '%s' contains too many \"..\"!"
-msgstr "路径 '%s' 包含了过多的\"..\"!"
-
-#: ../src/common/log.cpp:219
+#: ../src/common/log.cpp:284

 #, c-format
 #, c-format

-msgid "The previous message repeated once."
+msgid "The previous message repeated %lu time."

 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] ""

-msgstr[1] ""

 
 

-#: ../src/gtk/print.cpp:863
-#: ../src/gtk/print.cpp:1048
+#: ../src/common/log.cpp:277
+msgid "The previous message repeated once."
+msgstr ""
+
+#: ../src/gtk/print.cpp:922 ../src/gtk/print.cpp:1105

 msgid "The print dialog returned an error."
 msgstr ""
 
 msgid "The print dialog returned an error."
 msgstr ""
 

-#: ../src/richtext/richtextsymboldlg.cpp:456
-#: ../src/richtext/richtextsymboldlg.cpp:458
+#: ../src/richtext/richtextsymboldlg.cpp:459
+#: ../src/richtext/richtextsymboldlg.cpp:461

 msgid "The range to show."
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:319
 msgid ""
 msgid "The range to show."
 msgstr ""
 
 #: ../src/generic/dbgrptg.cpp:319
 msgid ""

-"The report contains the files listed below. If any of these files contain private information,\n"
+"The report contains the files listed below. If any of these files contain "
+"private information,\n"

 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""

-"报告包含了以下文件. 如果这些文件含有私人信息, \n"
-"请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
+"报告包含了以下文件。如果这些文件含有私人信息，\n"
+"请去掉选中相应的文件，未选中的文件就会从报告中删除。\n"

 
 

-#: ../src/common/cmdline.cpp:1013
+#: ../src/common/cmdline.cpp:1076

 #, c-format
 msgid "The required parameter '%s' was not specified."
 #, c-format
 msgid "The required parameter '%s' was not specified."

-msgstr "必须的参数 '%s' 没有指定."
+msgstr "必须的参数 '%s' 没有指定。"

 
 

-#: ../src/richtext/richtextindentspage.cpp:236
-#: ../src/richtext/richtextindentspage.cpp:238
-#: ../src/richtext/richtextliststylepage.cpp:408
-#: ../src/richtext/richtextliststylepage.cpp:410
+#: ../src/richtext/richtextindentspage.cpp:230
+#: ../src/richtext/richtextindentspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:404
+#: ../src/richtext/richtextliststylepage.cpp:406

 msgid "The right indent."
 msgstr ""
 
 msgid "The right indent."
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:304
-#: ../src/richtext/richtextliststylepage.cpp:448
-#: ../src/richtext/richtextliststylepage.cpp:450
+#: ../src/richtext/richtextmarginspage.cpp:220
+#: ../src/richtext/richtextmarginspage.cpp:222
+#, fuzzy
+msgid "The right margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:334
+#: ../src/richtext/richtextmarginspage.cpp:336
+#, fuzzy
+msgid "The right padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextindentspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:440
+#: ../src/richtext/richtextliststylepage.cpp:442

 msgid "The spacing after the paragraph."
 msgstr ""
 
 msgid "The spacing after the paragraph."
 msgstr ""
 

-#: ../src/richtext/richtextindentspage.cpp:291
-#: ../src/richtext/richtextindentspage.cpp:293
-#: ../src/richtext/richtextliststylepage.cpp:437
-#: ../src/richtext/richtextliststylepage.cpp:439
+#: ../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 ""
 
 msgid "The spacing before the paragraph."
 msgstr ""
 

-#: ../src/richtext/richtextstylepage.cpp:107

 #: ../src/richtext/richtextstylepage.cpp:109
 #: ../src/richtext/richtextstylepage.cpp:109

+#: ../src/richtext/richtextstylepage.cpp:111

 #, fuzzy
 msgid "The style name."
 msgstr "字体风格."
 
 #, fuzzy
 msgid "The style name."
 msgstr "字体风格."
 

-#: ../src/richtext/richtextstylepage.cpp:117

 #: ../src/richtext/richtextstylepage.cpp:119
 #: ../src/richtext/richtextstylepage.cpp:119

+#: ../src/richtext/richtextstylepage.cpp:121

 msgid "The style on which this style is based."
 msgstr ""
 
 msgid "The style on which this style is based."
 msgstr ""
 

-#: ../src/richtext/richtextstyledlg.cpp:206
-#: ../src/richtext/richtextstyledlg.cpp:208
+#: ../src/richtext/richtextstyledlg.cpp:218
+#: ../src/richtext/richtextstyledlg.cpp:220

 #, fuzzy
 msgid "The style preview."
 msgstr "显示字体预览."
 
 #, fuzzy
 msgid "The style preview."
 msgstr "显示字体预览."
 

-#: ../src/richtext/richtexttabspage.cpp:117
+#: ../src/msw/ole/automtn.cpp:651
+msgid "The system cannot find the file specified."
+msgstr ""
+

 #: ../src/richtext/richtexttabspage.cpp:119
 #: ../src/richtext/richtexttabspage.cpp:119

+#: ../src/richtext/richtexttabspage.cpp:121

 #, fuzzy
 msgid "The tab position."
 msgstr "字体大小(磅值)."
 
 #, fuzzy
 msgid "The tab position."
 msgstr "字体大小(磅值)."
 

-#: ../src/richtext/richtexttabspage.cpp:123
+#: ../src/richtext/richtexttabspage.cpp:125

 #, fuzzy
 msgid "The tab positions."
 msgstr "字体大小(磅值)."
 
 #, fuzzy
 msgid "The tab positions."
 msgstr "字体大小(磅值)."
 

-#: ../src/richtext/richtextctrl.cpp:2154
+#: ../src/richtext/richtextctrl.cpp:2682

 msgid "The text couldn't be saved."
 msgid "The text couldn't be saved."

-msgstr "文本不能被保存."
+msgstr "文本无法保存。"

 
 

-#: ../src/common/cmdline.cpp:991
+#: ../src/richtext/richtextmarginspage.cpp:243
+#: ../src/richtext/richtextmarginspage.cpp:245
+#, fuzzy
+msgid "The top margin size."
+msgstr "字体大小(磅值)."
+
+#: ../src/richtext/richtextmarginspage.cpp:357
+#: ../src/richtext/richtextmarginspage.cpp:359
+#, fuzzy
+msgid "The top padding size."
+msgstr "字体大小(磅值)."
+
+#: ../src/common/cmdline.cpp:1054

 #, c-format
 msgid "The value for the option '%s' must be specified."
 #, c-format
 msgid "The value for the option '%s' must be specified."

-msgstr "选项 '%s'的值必须被指定."
+msgstr "选项 '%s' 的值必须被指定。"

 
 

-#: ../src/msw/dialup.cpp:456
+#: ../src/msw/dialup.cpp:453

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

-msgid "The version of remote access service (RAS) installed on this machine is too old, please upgrade (the following required function is missing: %s)."
+msgid ""
+"The version of remote access service (RAS) installed on this machine is too "
+"old, please upgrade (the following required function is missing: %s)."

 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
 

-#: ../src/gtk/print.cpp:893
+#: ../src/richtext/richtextsizepage.cpp:459
+#: ../src/richtext/richtextsizepage.cpp:461
+msgid "The vertical offset relative to the paragraph."
+msgstr ""
+
+#: ../src/gtk/print.cpp:950

 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1301
+#: ../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:575
-#: ../src/html/htmprint.cpp:743
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机."
+#: ../src/richtext/richtextprint.cpp:608 ../src/html/htmprint.cpp:736
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机。"

 
 #: ../src/html/htmprint.cpp:256
 
 #: ../src/html/htmprint.cpp:256

-msgid "This document doesn't fit on the page horizontally and will be truncated when it is printed."
+msgid ""
+"This document doesn't fit on the page horizontally and will be truncated "
+"when it is printed."
+msgstr ""
+
+#: ../src/common/image.cpp:2517
+#, c-format
+msgid "This is not a %s."
+msgstr "这不是 %s。"
+
+#: ../src/common/wincmn.cpp:1584
+msgid "This platform does not support background transparency."
+msgstr ""
+
+#: ../src/gtk/window.cpp:4147
+msgid ""
+"This program was compiled with a too old version of GTK+, please rebuild "
+"with GTK+ 2.12 or newer."

 msgstr ""
 
 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy
 msgstr ""
 
 #: ../src/msw/datecontrols.cpp:60
 #, fuzzy

-msgid "This system doesn't support date controls, please upgrade your version of comctl32.dll"
+msgid ""
+"This system doesn't support date controls, please upgrade your version of "
+"comctl32.dll"

 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
 msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 

-#: ../src/msw/thread.cpp:1264
-msgid "Thread module initialization failed: cannot store value in thread local storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
+#: ../src/msw/thread.cpp:1288
+msgid ""
+"Thread module initialization failed: cannot store value in thread local "
+"storage"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中存放值"

 
 

-#: ../src/unix/threadpsx.cpp:1694
+#: ../src/unix/threadpsx.cpp:1714

 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:1252
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
+#: ../src/msw/thread.cpp:1276
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr "线程模块初始化失败: 无法在线程本地存储区中分配索引"

 
 

-#: ../src/unix/threadpsx.cpp:1205
+#: ../src/unix/threadpsx.cpp:1216

 msgid "Thread priority setting is ignored."
 msgid "Thread priority setting is ignored."

-msgstr "线程优先级设置被忽略."
+msgstr "线程优先级设置被忽略。"

 
 #: ../src/msw/mdi.cpp:165
 msgid "Tile &Horizontally"
 
 #: ../src/msw/mdi.cpp:165
 msgid "Tile &Horizontally"


@@ -6242,9 +6609,9 @@ msgstr "水平排布(&H)"
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 
 msgid "Tile &Vertically"
 msgstr "垂直排布(&V)"
 

-#: ../src/common/ftp.cpp:201
+#: ../src/common/ftp.cpp:205

 msgid "Timeout while waiting for FTP server to connect, try passive mode."
 msgid "Timeout while waiting for FTP server to connect, try passive mode."

-msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
+msgstr "等待FTP服务器连接时超时，请尝试用 passive 模式。"

 
 #: ../src/os2/timer.cpp:100
 msgid "Timer creation failed."
 
 #: ../src/os2/timer.cpp:100
 msgid "Timer creation failed."


@@ -6256,28 +6623,29 @@ msgstr "每日技巧"
 
 #: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"
 
 #: ../src/generic/tipdlg.cpp:155
 msgid "Tips not available, sorry!"

-msgstr "对不起, 没有所需技巧!"
-
-#: ../src/osx/dataview_osx.cpp:168
-#, fuzzy
-msgid "To be deleted item is invalid."
-msgstr "'%s' 是无效的"
+msgstr "对不起，没有所需技巧!"

 
 #: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 
 
 #: ../src/generic/prntdlgg.cpp:248
 msgid "To:"
 msgstr "到:"
 

-#: ../src/osx/carbon/dataview.cpp:2408
+#: ../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:5666
+#: ../src/richtext/richtextbuffer.cpp:7276

 msgid "Too many EndStyle calls!"
 msgstr ""
 
 msgid "Too many EndStyle calls!"
 msgstr ""
 

-#: ../src/common/imagpng.cpp:288
+#: ../src/common/imagpng.cpp:287

 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgid "Too many colours in PNG, the image may be slightly blurred."

-msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
+msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
+
+#: ../src/richtext/richtextsizepage.cpp:416
+#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:420 ../src/common/stockitem.cpp:201
+msgid "Top"
+msgstr "顶端"

 
 #: ../src/generic/prntdlgg.cpp:887
 msgid "Top margin (mm):"
 
 #: ../src/generic/prntdlgg.cpp:887
 msgid "Top margin (mm):"


@@ -6291,16 +6659,16 @@ msgstr ""
 msgid "Translators"
 msgstr ""
 
 msgid "Translators"
 msgstr ""
 

-#: ../src/propgrid/propgrid.cpp:173
+#: ../src/propgrid/propgrid.cpp:174

 msgid "True"
 msgstr ""
 
 msgid "True"
 msgstr ""
 

-#: ../src/common/fs_mem.cpp:232
+#: ../src/common/fs_mem.cpp:228

 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 #, 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:157
+#: ../src/common/fmapbase.cpp:155

 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 


@@ -6308,59 +6676,63 @@ msgstr "土耳其语 (ISO-8859-9)"
 msgid "Type"
 msgstr "类型"
 
 msgid "Type"
 msgstr "类型"
 

-#: ../src/richtext/richtextfontpage.cpp:141
-#: ../src/richtext/richtextfontpage.cpp:143
-#, fuzzy
+#: ../src/richtext/richtextfontpage.cpp:148
+#: ../src/richtext/richtextfontpage.cpp:150

 msgid "Type a font name."
 msgid "Type a font name."

-msgstr "字体."
+msgstr "输入字体名称。"

 
 

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

 msgid "Type a size in points."
 msgstr ""
 
 msgid "Type a size in points."
 msgstr ""
 

-#: ../src/common/xtixml.cpp:348
-#: ../src/common/xtixml.cpp:495
-#: ../src/common/xtistrm.cpp:277
+#: ../src/msw/ole/automtn.cpp:647
+#, c-format
+msgid "Type mismatch in argument %u."
+msgstr ""
+
+#: ../src/common/xtixml.cpp:357 ../src/common/xtixml.cpp:510
+#: ../src/common/xtistrm.cpp:323

 msgid "Type must have enum - long conversion"
 msgstr "必须进行 enum - long 的类型转换"
 
 #: ../src/propgrid/propgridiface.cpp:383
 #, c-format
 msgid "Type 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 ""
 
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:57
+#: ../src/common/accelcmn.cpp:59

 msgid "UP"
 msgstr ""
 
 #: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgid "UP"
 msgstr ""
 
 #: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"

-msgstr "美国标准复写簿, 14 7/8 x 11 英寸"
+msgstr "美国标准复写簿，14 7/8 x 11 英寸"

 
 

-#: ../src/common/fmapbase.cpp:194
-#, fuzzy
+#: ../src/common/fmapbase.cpp:193

 msgid "US-ASCII"
 msgid "US-ASCII"

-msgstr "ASCII"
+msgstr "US-ASCII"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:111
+#: ../src/unix/fswatcher_inotify.cpp:110

 msgid "Unable to add inotify watch"
 msgstr ""
 
 msgid "Unable to add inotify watch"
 msgstr ""
 

-#: ../src/unix/fswatcher_kqueue.cpp:138
+#: ../src/unix/fswatcher_kqueue.cpp:137

 msgid "Unable to add kqueue watch"
 msgstr ""
 
 msgid "Unable to add kqueue watch"
 msgstr ""
 

-#: ../include/wx/msw/private/fswatcher.h:144
+#: ../include/wx/msw/private/fswatcher.h:143

 msgid "Unable to associate handle with I/O completion port"
 msgstr ""
 
 msgid "Unable to associate handle with I/O completion port"
 msgstr ""
 

-#: ../include/wx/msw/private/fswatcher.h:127
+#: ../include/wx/msw/private/fswatcher.h:126

 #, fuzzy
 msgid "Unable to close I/O completion port handle"
 msgstr "关闭文件句柄失败."
 
 #, fuzzy
 msgid "Unable to close I/O completion port handle"
 msgstr "关闭文件句柄失败."
 

-#: ../src/unix/fswatcher_inotify.cpp:99
+#: ../src/unix/fswatcher_inotify.cpp:98

 #, fuzzy
 msgid "Unable to close inotify instance"
 msgstr "关闭文件句柄失败."
 #, fuzzy
 msgid "Unable to close inotify instance"
 msgstr "关闭文件句柄失败."


@@ -6371,11 +6743,11 @@ msgid "Unable to close path '%s'"
 msgstr "关闭锁文件 '%s'失败"
 
 #: ../include/wx/msw/private/fswatcher.h:49
 msgstr "关闭锁文件 '%s'失败"
 
 #: ../include/wx/msw/private/fswatcher.h:49

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

 msgid "Unable to close the handle for '%s'"
 msgid "Unable to close the handle for '%s'"

-msgstr "关闭文件句柄失败."
+msgstr "无法关闭 '%s' 的句柄。"

 
 

-#: ../include/wx/msw/private/fswatcher.h:200
+#: ../include/wx/msw/private/fswatcher.h:241

 #, fuzzy
 msgid "Unable to create I/O completion port"
 msgstr "创建游标失败."
 #, fuzzy
 msgid "Unable to create I/O completion port"
 msgstr "创建游标失败."


@@ -6395,99 +6767,97 @@ msgstr "创建 DDE 字符串失败"
 msgid "Unable to create kqueue instance"
 msgstr "创建 DDE 字符串失败"
 
 msgid "Unable to create kqueue instance"
 msgstr "创建 DDE 字符串失败"
 

-#: ../include/wx/msw/private/fswatcher.h:189
+#: ../include/wx/msw/private/fswatcher.h:230

 msgid "Unable to dequeue completion packet"
 msgstr ""
 
 msgid "Unable to dequeue completion packet"
 msgstr ""
 

-#: ../src/unix/fswatcher_kqueue.cpp:188
+#: ../src/unix/fswatcher_kqueue.cpp:187

 msgid "Unable to get events from kqueue"
 msgstr ""
 
 msgid "Unable to get events from kqueue"
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:1861
+#: ../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:421
+#: ../src/gtk/app.cpp:438

 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr ""
 
 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
 msgstr ""
 

-#: ../src/gtk/app.cpp:272
-#, fuzzy
+#: ../src/gtk/app.cpp:273

 msgid "Unable to initialize Hildon program"
 msgid "Unable to initialize Hildon program"

-msgstr "不能初始化OpenGL"
+msgstr "无法初始化 Hildon 程序"

 
 #: ../include/wx/unix/private/fswatcher_kqueue.h:58
 
 #: ../include/wx/unix/private/fswatcher_kqueue.h:58

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

 msgid "Unable to open path '%s'"
 msgid "Unable to open path '%s'"

-msgstr "æ\89\93å¼\80CHMå­\98æ¡£ '%s'失败."
+msgstr "æ\97 æ³\95æ\89\93å¼\80è·¯å¾\84 '%s'"

 
 

-#: ../src/html/htmlwin.cpp:558
+#: ../src/html/htmlwin.cpp:557

 #, c-format
 msgid "Unable to open requested HTML document: %s"
 #, c-format
 msgid "Unable to open requested HTML document: %s"

-msgstr "不能打开HTML文档: %s"
+msgstr "无法打开 HTML 文档: %s"

 
 #: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."
 
 #: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."

-msgstr "不能异步地播放声音."
+msgstr "无法异步地播放声音。"

 
 

-#: ../include/wx/msw/private/fswatcher.h:167
+#: ../include/wx/msw/private/fswatcher.h:208

 msgid "Unable to post completion status"
 msgstr ""
 
 msgid "Unable to post completion status"
 msgstr ""
 

-#: ../src/unix/fswatcher_inotify.cpp:331
-#, fuzzy
+#: ../src/unix/fswatcher_inotify.cpp:330

 msgid "Unable to read from inotify descriptor"
 msgid "Unable to read from inotify descriptor"

-msgstr "不能从文件描述子 %d中读"
+msgstr "无法读取 inotify 描述符"

 
 

-#: ../src/unix/fswatcher_inotify.cpp:134
+#: ../src/unix/fswatcher_inotify.cpp:133

 msgid "Unable to remove inotify watch"
 msgstr ""
 
 msgid "Unable to remove inotify watch"
 msgstr ""
 

-#: ../src/unix/fswatcher_kqueue.cpp:156
+#: ../src/unix/fswatcher_kqueue.cpp:155

 msgid "Unable to remove kqueue watch"
 msgstr ""
 
 msgid "Unable to remove kqueue watch"
 msgstr ""
 

-#: ../src/msw/fswatcher.cpp:146
-#, fuzzy, c-format
+#: ../src/msw/fswatcher.cpp:169
+#, c-format

 msgid "Unable to set up watch for '%s'"
 msgid "Unable to set up watch for '%s'"

-msgstr "对文件 '%s'进行touch操作失败"
+msgstr "无法为 '%s' 设定 watch"

 
 #: ../src/msw/fswatcher.cpp:92
 msgid "Unable to start IOCP worker thread"
 msgstr ""
 
 
 #: ../src/msw/fswatcher.cpp:92
 msgid "Unable to start IOCP worker thread"
 msgstr ""
 

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

 msgid "Undelete"
 msgstr "取消删除"
 
 msgid "Undelete"
 msgstr "取消删除"
 

-#: ../src/richtext/richtextfontpage.cpp:289
-#: ../src/richtext/richtextfontpage.cpp:361
-#: ../src/richtext/richtextfontpage.cpp:622
-#: ../src/osx/carbon/fontdlg.cpp:544
-#: ../src/propgrid/advprops.cpp:655
-#, fuzzy
+#: ../src/common/stockitem.cpp:203
+msgid "Underline"
+msgstr "下划线"
+
+#: ../src/richtext/richtextfontpage.cpp:301 ../src/osx/carbon/fontdlg.cpp:554
+#: ../src/propgrid/advprops.cpp:656

 msgid "Underlined"
 msgid "Underlined"

-msgstr "下划线(&U)"
+msgstr "下划线"

 
 

-#: ../src/stc/scintilla/src/ScintillaBase.cxx:452
+#: ../src/common/stockitem.cpp:204 ../src/stc/stc_i18n.cpp:16

 msgid "Undo"
 msgstr "撤销"
 
 msgid "Undo"
 msgstr "撤销"
 

-#: ../src/common/stockitem.cpp:267
+#: ../src/common/stockitem.cpp:266

 msgid "Undo last action"
 msgstr "撤销上一次操作"
 
 msgid "Undo last action"
 msgstr "撤销上一次操作"
 

-#: ../src/common/cmdline.cpp:796
-#, fuzzy, c-format
+#: ../src/common/cmdline.cpp:857
+#, c-format

 msgid "Unexpected characters following option '%s'."
 msgid "Unexpected characters following option '%s'."

-msgstr "意外参数 '%s'"
+msgstr "选项 '%s' 后有意外字符。"

 
 

-#: ../src/common/cmdline.cpp:954
+#: ../src/common/cmdline.cpp:1017

 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外参数 '%s'"
 

-#: ../include/wx/msw/private/fswatcher.h:150
+#: ../include/wx/msw/private/fswatcher.h:149

 msgid "Unexpectedly new I/O completion port was created"
 msgstr ""
 
 msgid "Unexpectedly new I/O completion port was created"
 msgstr ""
 


@@ -6496,70 +6866,197 @@ msgstr ""
 msgid "Ungraceful worker thread termination"
 msgstr "不能等候线程终止"
 
 msgid "Ungraceful worker thread termination"
 msgstr "不能等候线程终止"
 

-#: ../src/richtext/richtextsymboldlg.cpp:453
-#: ../src/richtext/richtextsymboldlg.cpp:454
-#: ../src/richtext/richtextsymboldlg.cpp:455
-msgid "Unicode"
-msgstr "Unicode编码"
+#: ../src/richtext/richtextsymboldlg.cpp:456
+#: ../src/richtext/richtextsymboldlg.cpp:457
+#: ../src/richtext/richtextsymboldlg.cpp:458
+msgid "Unicode"
+msgstr "Unicode 编码"
+
+#: ../src/common/fmapbase.cpp:182 ../src/common/fmapbase.cpp:188
+msgid "Unicode 16 bit (UTF-16)"
+msgstr "16位的 Unicode 编码 (UTF-16)"
+
+#: ../src/common/fmapbase.cpp:187
+msgid "Unicode 16 bit Big Endian (UTF-16BE)"
+msgstr "16位大字节序 Unicode 编码 (UTF-16BE)"
+
+#: ../src/common/fmapbase.cpp:183
+msgid "Unicode 16 bit Little Endian (UTF-16LE)"
+msgstr "16位小字节序 Unicode 编码 (UTF-16LE)"
+
+#: ../src/common/fmapbase.cpp:184 ../src/common/fmapbase.cpp:190
+msgid "Unicode 32 bit (UTF-32)"
+msgstr "32位的 Unicode 编码 (UTF-32)"
+
+#: ../src/common/fmapbase.cpp:189
+msgid "Unicode 32 bit Big Endian (UTF-32BE)"
+msgstr "32位大字节序 Unicode 编码 (UTF-32BE)"
+
+#: ../src/common/fmapbase.cpp:185
+msgid "Unicode 32 bit Little Endian (UTF-32LE)"
+msgstr "32位小字节序 Unicode 编码 (UTF-32LE)"
+
+#: ../src/common/fmapbase.cpp:179
+msgid "Unicode 7 bit (UTF-7)"
+msgstr "7位的 Unicode 编码 (UTF-7)"
+
+#: ../src/common/fmapbase.cpp:180
+msgid "Unicode 8 bit (UTF-8)"
+msgstr "8位的 Unicode 编码 (UTF-8)"
+
+#: ../src/common/stockitem.cpp:205
+msgid "Unindent"
+msgstr "取消缩进"
+
+#: ../src/richtext/richtextborderspage.cpp:373
+#: ../src/richtext/richtextborderspage.cpp:375
+msgid "Units for the bottom border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:278
+#: ../src/richtext/richtextmarginspage.cpp:280
+msgid "Units for the bottom margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:517
+#: ../src/richtext/richtextborderspage.cpp:519
+msgid "Units for the bottom outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:392
+#: ../src/richtext/richtextmarginspage.cpp:394
+msgid "Units for the bottom padding."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:283
+#: ../src/richtext/richtextborderspage.cpp:285
+msgid "Units for the left border width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:205
+#: ../src/richtext/richtextmarginspage.cpp:207
+msgid "Units for the left margin."
+msgstr ""
+
+#: ../src/richtext/richtextborderspage.cpp:427
+#: ../src/richtext/richtextborderspage.cpp:429
+msgid "Units for the left outline width."
+msgstr ""
+
+#: ../src/richtext/richtextmarginspage.cpp:319
+#: ../src/richtext/richtextmarginspage.cpp:321
+msgid "Units for the left padding."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:385
+#: ../src/richtext/richtextsizepage.cpp:387
+#, fuzzy
+msgid "Units for the maximum object height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:358
+#: ../src/richtext/richtextsizepage.cpp:360
+#, fuzzy
+msgid "Units for the maximum object width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:331
+#: ../src/richtext/richtextsizepage.cpp:333
+#, fuzzy
+msgid "Units for the minimum object height."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:304
+#: ../src/richtext/richtextsizepage.cpp:306
+#, fuzzy
+msgid "Units for the minimum object width."
+msgstr "字体粗细."
+
+#: ../src/richtext/richtextsizepage.cpp:277
+#: ../src/richtext/richtextsizepage.cpp:279
+msgid "Units for the object height."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:469
+#: ../src/richtext/richtextsizepage.cpp:471
+msgid "Units for the object offset."
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:250
+#: ../src/richtext/richtextsizepage.cpp:252
+msgid "Units for the object width."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:183
-#: ../src/common/fmapbase.cpp:189
-msgid "Unicode 16 bit (UTF-16)"
-msgstr "16位的Unicode编码 (UTF-16)"
+#: ../src/richtext/richtextborderspage.cpp:313
+#: ../src/richtext/richtextborderspage.cpp:315
+msgid "Units for the right border width."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:188
-msgid "Unicode 16 bit Big Endian (UTF-16BE)"
-msgstr "16位大字节序Unicode编码 (UTF-16BE)"
+#: ../src/richtext/richtextmarginspage.cpp:230
+#: ../src/richtext/richtextmarginspage.cpp:232
+msgid "Units for the right margin."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:184
-msgid "Unicode 16 bit Little Endian (UTF-16LE)"
-msgstr "16位小字节序Unicode编码 (UTF-16LE)"
+#: ../src/richtext/richtextborderspage.cpp:457
+#: ../src/richtext/richtextborderspage.cpp:459
+msgid "Units for the right outline width."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:185
-#: ../src/common/fmapbase.cpp:191
-msgid "Unicode 32 bit (UTF-32)"
-msgstr "32位的Unicode编码 (UTF-32)"
+#: ../src/richtext/richtextmarginspage.cpp:344
+#: ../src/richtext/richtextmarginspage.cpp:346
+msgid "Units for the right padding."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:190
-msgid "Unicode 32 bit Big Endian (UTF-32BE)"
-msgstr "32位大字节序Unicode编码 (UTF-32BE)"
+#: ../src/richtext/richtextborderspage.cpp:343
+#: ../src/richtext/richtextborderspage.cpp:345
+msgid "Units for the top border width."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:186
-msgid "Unicode 32 bit Little Endian (UTF-32LE)"
-msgstr "32位小字节序Unicode编码 (UTF-32LE)"
+#: ../src/richtext/richtextmarginspage.cpp:253
+#: ../src/richtext/richtextmarginspage.cpp:255
+#, fuzzy
+msgid "Units for the top margin."
+msgstr "不能等候线程终止."

 
 

-#: ../src/common/fmapbase.cpp:180
-msgid "Unicode 7 bit (UTF-7)"
-msgstr "7位的Unicode编码 (UTF-7)"
+#: ../src/richtext/richtextborderspage.cpp:487
+#: ../src/richtext/richtextborderspage.cpp:489
+msgid "Units for the top outline width."
+msgstr ""

 
 

-#: ../src/common/fmapbase.cpp:181
-msgid "Unicode 8 bit (UTF-8)"
-msgstr "8位的Unicode编码 (UTF-8)"
+#: ../src/richtext/richtextmarginspage.cpp:367
+#: ../src/richtext/richtextmarginspage.cpp:369
+msgid "Units for the top padding."
+msgstr ""

 
 

-#: ../src/generic/progdlgg.cpp:672
+#: ../src/generic/progdlgg.cpp:383 ../src/generic/progdlgg.cpp:656

 msgid "Unknown"
 msgstr "未知"
 
 msgid "Unknown"
 msgstr "未知"
 

-#: ../src/msw/dde.cpp:1175
+#: ../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"
 

-#: ../src/common/xtistrm.cpp:366
+#: ../src/common/xtistrm.cpp:415

 msgid "Unknown Object passed to GetObjectClassInfo"
 msgid "Unknown Object passed to GetObjectClassInfo"

-msgstr "未知的对象被传递给GetObjectClassInfo"
+msgstr "未知的对象传递给 GetObjectClassInfo"

 
 

-#: ../src/common/xtixml.cpp:321
+#: ../src/common/imagpng.cpp:615
+#, c-format
+msgid "Unknown PNG resolution unit %d"
+msgstr "未知 PNG 解析度单位 %d"
+
+#: ../src/common/xtixml.cpp:328

 #, c-format
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 
 #, c-format
 msgid "Unknown Property %s"
 msgstr "未知属性 %s"
 

-#: ../src/common/imagtiff.cpp:402
+#: ../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:1936
+#: ../src/osx/carbon/dataview.cpp:1979

 msgid "Unknown data format"
 msgstr "未知数据格式"
 
 msgid "Unknown data format"
 msgstr "未知数据格式"
 


@@ -6567,176 +7064,175 @@ msgstr "未知数据格式"
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 
 msgid "Unknown dynamic library error"
 msgstr "未知的动态库错误"
 

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

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知编码 (%d)"
 

-#: ../src/common/cmdline.cpp:697
+#: ../src/msw/ole/automtn.cpp:659
+#, c-format
+msgid "Unknown error %08x"
+msgstr "未知错误 %08x"
+
+#: ../src/msw/ole/automtn.cpp:618
+msgid "Unknown exception"
+msgstr "未知异常"
+
+#: ../src/common/image.cpp:2502
+msgid "Unknown image data format."
+msgstr "未知图像数据格式"
+
+#: ../src/common/cmdline.cpp:742

 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的长选项 '%s'"
 

-#: ../src/common/cmdline.cpp:707
-#: ../src/common/cmdline.cpp:729
+#: ../src/msw/ole/automtn.cpp:602
+msgid "Unknown name or named argument."
+msgstr "未知名称或者命名参数"
+
+#: ../src/common/cmdline.cpp:757 ../src/common/cmdline.cpp:779

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知选项 '%s'"
 

-#: ../src/common/mimecmn.cpp:225
+#: ../src/common/mimecmn.cpp:231

 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."

-msgstr "类型 %s中有不配套的'{'."
+msgstr "类型 %s 中有不配套的 '{'。"

 
 

-#: ../src/common/cmdproc.cpp:261
-#: ../src/common/cmdproc.cpp:287
-#: ../src/common/cmdproc.cpp:307
+#: ../src/common/cmdproc.cpp:263 ../src/common/cmdproc.cpp:289
+#: ../src/common/cmdproc.cpp:309

 msgid "Unnamed command"
 msgstr "未命名的命令"
 
 msgid "Unnamed command"
 msgstr "未命名的命令"
 

-#: ../src/propgrid/propgrid.cpp:391
-#, fuzzy
+#: ../src/propgrid/propgrid.cpp:399

 msgid "Unspecified"
 msgid "Unspecified"

-msgstr "分散对齐"
+msgstr "未指定"

 
 

-#: ../src/msw/clipbrd.cpp:269
-#: ../src/msw/clipbrd.cpp:441
+#: ../src/msw/clipbrd.cpp:269 ../src/msw/clipbrd.cpp:441

 msgid "Unsupported clipboard format."
 msgid "Unsupported clipboard format."

-msgstr "不支持的剪贴板格式."
+msgstr "不支持的剪贴板格式。"

 
 

-#: ../src/common/appcmn.cpp:230
+#: ../src/common/appcmn.cpp:229

 #, c-format
 msgid "Unsupported theme '%s'."
 #, c-format
 msgid "Unsupported theme '%s'."

-msgstr "不支持的主题 '%s'."
+msgstr "不支持的主题 '%s'。"

 
 

-#: ../src/generic/fdrepdlg.cpp:153
-#: ../src/propgrid/props.cpp:2167
+#: ../src/generic/fdrepdlg.cpp:153 ../src/common/stockitem.cpp:206

 msgid "Up"
 msgstr "向上"
 
 msgid "Up"
 msgstr "向上"
 

-#: ../src/propgrid/props.cpp:2161
-msgid "Update"
-msgstr "更新"
-
-#: ../src/richtext/richtextliststylepage.cpp:485
-#: ../src/richtext/richtextbulletspage.cpp:285
+#: ../src/richtext/richtextliststylepage.cpp:484
+#: ../src/richtext/richtextbulletspage.cpp:289

 msgid "Upper case letters"
 msgstr ""
 
 msgid "Upper case letters"
 msgstr ""
 

-#: ../src/richtext/richtextliststylepage.cpp:487
-#: ../src/richtext/richtextbulletspage.cpp:287
+#: ../src/richtext/richtextliststylepage.cpp:486
+#: ../src/richtext/richtextbulletspage.cpp:291

 msgid "Upper case roman numerals"
 msgstr ""
 
 msgid "Upper case roman numerals"
 msgstr ""
 

-#: ../src/common/cmdline.cpp:1085
+#: ../src/common/cmdline.cpp:1148

 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 

-#: ../src/richtext/richtextindentspage.cpp:179
-#: ../src/richtext/richtextindentspage.cpp:181
-#: ../src/richtext/richtextliststylepage.cpp:357
+#: ../src/richtext/richtextindentspage.cpp:182
+#: ../src/richtext/richtextindentspage.cpp:184

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

+#: ../src/richtext/richtextliststylepage.cpp:361

 msgid "Use the current alignment setting."
 msgstr ""
 
 msgid "Use the current alignment setting."
 msgstr ""
 

-#: ../src/osx/carbon/dataview.cpp:2613
-#: ../src/osx/carbon/dataview.cpp:2678
+#: ../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 ""
 

-#: ../src/common/valtext.cpp:165
+#: ../src/common/valtext.cpp:175

 msgid "Validation conflict"
 msgstr "验证冲突"
 
 #: ../src/propgrid/manager.cpp:239
 msgid "Value"
 msgid "Validation conflict"
 msgstr "验证冲突"
 
 #: ../src/propgrid/manager.cpp:239
 msgid "Value"

-msgstr ""
-
-#: ../src/propgrid/props.cpp:685
-#, c-format
-msgid "Value must be %f or higher"
-msgstr ""
-
-#: ../src/propgrid/props.cpp:702
-#, c-format
-msgid "Value must be %f or less"
-msgstr ""
+msgstr "值"

 
 

-#: ../src/propgrid/props.cpp:292
-#: ../src/propgrid/props.cpp:308
+#: ../src/propgrid/props.cpp:385

 #, c-format
 #, c-format

-msgid "Value must be %lld or higher"
+msgid "Value must be %s or higher."

 msgstr ""
 
 msgstr ""
 

-#: ../src/propgrid/props.cpp:493
+#: ../src/propgrid/props.cpp:412

 #, c-format
 #, c-format

-msgid "Value must be %llu or higher"
+msgid "Value must be %s or less."

 msgstr ""
 
 msgstr ""
 

-#: ../src/propgrid/props.cpp:505
+#: ../src/propgrid/props.cpp:389 ../src/propgrid/props.cpp:416

 #, c-format
 #, c-format

-msgid "Value must be %llu or less"
-msgstr ""
+msgid "Value must be between %s and %s."
+msgstr "数值必须在 %s 和 %s 之间。"

 
 #: ../src/generic/aboutdlgg.cpp:129
 msgid "Version "
 msgstr "版本"
 
 
 #: ../src/generic/aboutdlgg.cpp:129
 msgid "Version "
 msgstr "版本"
 

-#: ../src/generic/filedlgg.cpp:218
+#: ../src/richtext/richtextsizepage.cpp:450
+msgid "Vertical &Offset:"
+msgstr ""
+
+#: ../src/richtext/richtextsizepage.cpp:421
+#: ../src/richtext/richtextsizepage.cpp:423
+msgid "Vertical alignment."
+msgstr "垂直对齐。"
+
+#: ../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:1828
+#: ../src/common/docview.cpp:1933

 msgid "Views"
 msgstr "视图"
 
 msgid "Views"
 msgstr "视图"
 

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

 msgid "WINDOWS_LEFT"
 msgstr ""
 
 msgid "WINDOWS_LEFT"
 msgstr ""
 

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

 msgid "WINDOWS_MENU"
 msgstr ""
 
 msgid "WINDOWS_MENU"
 msgstr ""
 

-#: ../src/common/accelcmn.cpp:108
+#: ../src/common/accelcmn.cpp:110

 msgid "WINDOWS_RIGHT"
 msgstr ""
 
 #: ../src/unix/epolldispatcher.cpp:214
 msgid "WINDOWS_RIGHT"
 msgstr ""
 
 #: ../src/unix/epolldispatcher.cpp:214

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

 msgid "Waiting for IO on epoll descriptor %d failed"
 msgid "Waiting for IO on epoll descriptor %d failed"

-msgstr "等待子过程终止失败"
-
-#: ../src/html/htmprint.cpp:509
-msgid "Warning"
-msgstr "警告"
+msgstr "等待 epoll 描述符 %d 的 IO 时失败"

 
 

-#: ../src/common/log.cpp:408
+#: ../src/common/log.cpp:230

 msgid "Warning: "
 msgstr "警告: "
 
 msgid "Warning: "
 msgstr "警告: "
 

-#: ../src/propgrid/advprops.cpp:651
-#, fuzzy
+#: ../src/propgrid/advprops.cpp:652

 msgid "Weight"
 msgid "Weight"

-msgstr "字体粗细(&W):"
+msgstr "字体粗细"

 
 

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

 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 

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

 msgid "Western European with Euro (ISO-8859-15)"
 msgid "Western European with Euro (ISO-8859-15)"

-msgstr "西欧(带欧元符号) (ISO-8859-15)"
+msgstr "西欧带欧元符号 (ISO-8859-15)"

 
 

-#: ../src/generic/fontdlgg.cpp:448
-#: ../src/generic/fontdlgg.cpp:450
+#: ../src/generic/fontdlgg.cpp:447 ../src/generic/fontdlgg.cpp:449

 msgid "Whether the font is underlined."
 msgid "Whether the font is underlined."

-msgstr "字体是否为下划线."
+msgstr "字体是否为下划线。"

 
 #: ../src/generic/fdrepdlg.cpp:145
 msgid "Whole word"
 
 #: ../src/generic/fdrepdlg.cpp:145
 msgid "Whole word"


@@ -6748,129 +7244,141 @@ msgstr "仅为整字"
 
 #: ../src/univ/themes/win32.cpp:1105
 msgid "Win32 theme"
 
 #: ../src/univ/themes/win32.cpp:1105
 msgid "Win32 theme"

-msgstr "Win32主题(theme)"
+msgstr "Win32 主题"

 
 

-#: ../src/msw/utils.cpp:1202
+#: ../src/msw/utils.cpp:1228

 msgid "Win32s on Windows 3.1"
 msgid "Win32s on Windows 3.1"

-msgstr "Windows 3.1上的Win32s"
+msgstr "Windows 3.1 上的 Win32s"

 
 

-#: ../src/msw/utils.cpp:1252
-#, c-format
-msgid "Windows 2000 (build %lu"
-msgstr "Windows 2000 (build %lu"
+#: ../src/msw/utils.cpp:1278
+msgid "Windows 2000"
+msgstr "Windows 2000"
+
+#: ../src/msw/utils.cpp:1310
+msgid "Windows 7"
+msgstr "Windows 7"

 
 

-#: ../src/msw/utils.cpp:1216
+#: ../src/msw/utils.cpp:1242

 msgid "Windows 95"
 msgstr "Windows 95"
 
 msgid "Windows 95"
 msgstr "Windows 95"
 

-#: ../src/msw/utils.cpp:1212
+#: ../src/msw/utils.cpp:1238

 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 
 msgid "Windows 95 OSR2"
 msgstr "Windows 95 OSR2"
 

-#: ../src/msw/utils.cpp:1227
+#: ../src/msw/utils.cpp:1253

 msgid "Windows 98"
 msgstr "Windows 98"
 
 msgid "Windows 98"
 msgstr "Windows 98"
 

-#: ../src/msw/utils.cpp:1223
+#: ../src/msw/utils.cpp:1249

 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 
 msgid "Windows 98 SE"
 msgstr "Windows 98 SE"
 

-#: ../src/msw/utils.cpp:1234
+#: ../src/msw/utils.cpp:1260

 #, 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:177
+#: ../src/common/fmapbase.cpp:176

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows 阿拉伯语 (CP 1256)"
 

-#: ../src/common/fmapbase.cpp:178
+#: ../src/common/fmapbase.cpp:177

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows 波罗的海语 (CP 1257)"
 

-#: ../src/msw/utils.cpp:1196
-#, fuzzy, c-format
+#: ../src/msw/utils.cpp:1222
+#, c-format

 msgid "Windows CE (%d.%d)"
 msgid "Windows CE (%d.%d)"

-msgstr "Windows 9x (%d.%d)"
+msgstr "Windows CE (%d.%d)"

 
 

-#: ../src/common/fmapbase.cpp:171
+#: ../src/common/fmapbase.cpp:170

 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows 中欧 (CP 1250)"
 

-#: ../src/common/fmapbase.cpp:168
-msgid "Windows Chinese Simplified (CP 936)"
-msgstr "Windows 简体中文 (CP 936)"
+#: ../src/common/fmapbase.cpp:167
+msgid "Windows Chinese Simplified (CP 936) or GB-2312"
+msgstr "Windows 简体中文 (CP 936) 或 GB-2312"

 
 

-#: ../src/common/fmapbase.cpp:170
-msgid "Windows Chinese Traditional (CP 950)"
-msgstr "Windows 繁体中文 (CP 950)"
+#: ../src/common/fmapbase.cpp:169
+msgid "Windows Chinese Traditional (CP 950) or Big-5"
+msgstr "Windows 繁体中文 (CP 950) 或 Big-5"

 
 

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

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows 西里尔语 (CP 1251)"
 

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

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows 希腊语 (CP 1253)"
 

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

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows 希伯来语 (CP 1255)"
 

-#: ../src/common/fmapbase.cpp:167
-msgid "Windows Japanese (CP 932)"
-msgstr "Windows 日语 (CP 932)"
+#: ../src/common/fmapbase.cpp:166
+msgid "Windows Japanese (CP 932) or Shift-JIS"
+msgstr "Windows 日语 (CP 932) 或 Shift-JIS"

 
 

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

 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 
 msgid "Windows Korean (CP 949)"
 msgstr "Windows 韩语 (CP 949)"
 

-#: ../src/msw/utils.cpp:1231
+#: ../src/msw/utils.cpp:1257

 msgid "Windows ME"
 msgstr "Windows ME"
 
 msgid "Windows ME"
 msgstr "Windows ME"
 

-#: ../src/msw/utils.cpp:1286
+#: ../src/msw/utils.cpp:1318

 #, c-format
 #, c-format

-msgid "Windows NT %lu.%lu (build %lu"
-msgstr "Windows NT %lu.%lu (build %lu"
+msgid "Windows NT %lu.%lu"
+msgstr "Windows NT %lu.%lu"

 
 

-#: ../src/msw/utils.cpp:1262
-#, c-format
-msgid "Windows Server 2003 (build %lu"
-msgstr "Windows Server 2003 (build %lu"
+#: ../src/msw/utils.cpp:1287
+msgid "Windows Server 2003"
+msgstr "Windows Server 2003"

 
 

-#: ../src/common/fmapbase.cpp:166
+#: ../src/msw/utils.cpp:1303
+msgid "Windows Server 2008"
+msgstr "Windows Server 2008"
+
+#: ../src/msw/utils.cpp:1309
+msgid "Windows Server 2008 R2"
+msgstr "Windows Server 2008 R2"
+
+#: ../src/common/fmapbase.cpp:165

 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 
 msgid "Windows Thai (CP 874)"
 msgstr "Windows 泰国语 (CP 874)"
 

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

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows 土耳其语 (CP 1254)"
 

-#: ../src/msw/utils.cpp:1278
-#, fuzzy, c-format
-msgid "Windows Vista (build %lu"
-msgstr "Windows XP (build %lu"
+#: ../src/msw/utils.cpp:1304
+msgid "Windows Vista"
+msgstr "Windows Vista"

 
 

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

 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows 西欧 (CP 1252)"
 

-#: ../src/msw/utils.cpp:1269
-#, c-format
-msgid "Windows XP (build %lu"
-msgstr "Windows XP (build %lu"
+#: ../src/msw/utils.cpp:1293
+msgid "Windows XP"
+msgstr "Windows XP"

 
 

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

 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
+msgid "Windows/DOS OEM Cyrillic (CP 866)"
+msgstr "Windows/DOS OEM 西里尔语 (CP 866)"
+

 #: ../src/common/ffile.cpp:147
 #, c-format
 msgid "Write error on file '%s'"
 #: ../src/common/ffile.cpp:147
 #, c-format
 msgid "Write error on file '%s'"

-msgstr "写文件 '%s'错误"
+msgstr "写文件 '%s' 错误"

 
 

-#: ../src/xml/xml.cpp:745
+#: ../src/xml/xml.cpp:837

 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr "XML解析错误: '%s' 位于 行 %d"


@@ -6880,19 +7388,18 @@ msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 错误的象素数据!"
 
 #: ../src/common/xpmdecod.cpp:706
 msgstr "XPM: 错误的象素数据!"
 
 #: ../src/common/xpmdecod.cpp:706

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

 msgid "XPM: incorrect colour description in line %d"
 msgid "XPM: incorrect colour description in line %d"

-msgstr "XPM: 错误的颜色定义 '%s'!"
+msgstr "XPM: 在第 %d 行有错误的颜色描述"

 
 #: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"
 msgstr ""
 
 
 #: ../src/common/xpmdecod.cpp:681
 msgid "XPM: incorrect header format!"
 msgstr ""
 

-#: ../src/common/xpmdecod.cpp:717
-#: ../src/common/xpmdecod.cpp:726
-#, fuzzy, c-format
+#: ../src/common/xpmdecod.cpp:717 ../src/common/xpmdecod.cpp:726
+#, c-format

 msgid "XPM: malformed colour definition '%s' at line %d!"
 msgid "XPM: malformed colour definition '%s' at line %d!"

-msgstr "XPM: 错误的颜色定义 '%s'!"
+msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d!"

 
 #: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"
 
 #: ../src/common/xpmdecod.cpp:756
 msgid "XPM: no colors left to use for mask!"


@@ -6903,129 +7410,144 @@ msgstr ""
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 
 msgid "XPM: truncated image data at line %d!"
 msgstr ""
 

-#: ../src/motif/msgdlg.cpp:194
+#: ../src/common/stockitem.cpp:207 ../src/motif/msgdlg.cpp:194

 msgid "Yes"
 msgstr "是"
 
 #: ../src/osx/carbon/overlay.cpp:156
 msgid "Yes"
 msgstr "是"
 
 #: ../src/osx/carbon/overlay.cpp:156

-#, fuzzy

 msgid "You cannot Clear an overlay that is not inited"
 msgid "You cannot Clear an overlay that is not inited"

-msgstr "你不能向该项中加入新的目录."
+msgstr "你无法清除未初始化的 overlay。"

 
 

-#: ../src/osx/carbon/overlay.cpp:108
-#: ../src/dfb/overlay.cpp:62
+#: ../src/osx/carbon/overlay.cpp:108 ../src/dfb/overlay.cpp:62

 msgid "You cannot Init an overlay twice"
 msgstr ""
 
 #: ../src/generic/dirdlgg.cpp:317
 msgid "You cannot add a new directory to this section."
 msgid "You cannot Init an overlay twice"
 msgstr ""
 
 #: ../src/generic/dirdlgg.cpp:317
 msgid "You cannot add a new directory to this section."

-msgstr "你不能向该项中加入新的目录."
+msgstr "你无法向该项中加入新的目录。"

 
 

-#: ../src/common/stockitem.cpp:198
+#: ../src/propgrid/propgrid.cpp:3259
+msgid "You have entered invalid value. Press ESC to cancel editing."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:210

 msgid "Zoom &In"
 msgstr "放大(&I)"
 
 msgid "Zoom &In"
 msgstr "放大(&I)"
 

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

 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 
 msgid "Zoom &Out"
 msgstr "缩小(&O)"
 

-#: ../src/common/stockitem.cpp:197
+#: ../src/common/stockitem.cpp:210 ../src/common/prntbase.cpp:1539
+msgid "Zoom In"
+msgstr "放大"
+
+#: ../src/common/stockitem.cpp:211 ../src/common/prntbase.cpp:1525
+msgid "Zoom Out"
+msgstr "缩小"
+
+#: ../src/common/stockitem.cpp:209

 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 
 msgid "Zoom to &Fit"
 msgstr "缩放以适应窗口(&F)"
 

-#: ../src/msw/dde.cpp:1142
+#: ../src/common/stockitem.cpp:209
+msgid "Zoom to Fit"
+msgstr "缩放以适应窗口"
+
+#: ../src/msw/dde.cpp:1145

 msgid "a DDEML application has created a prolonged race condition."
 msgid "a DDEML application has created a prolonged race condition."

-msgstr "DDEML应用程序已创建延时race条件."
+msgstr "DDEML 应用程序已创建延时 race 条件."

 
 

-#: ../src/msw/dde.cpp:1130
+#: ../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 ""

-"没有调用DdeInitialize初始化函数就调用DDEML其它函数,\n"
+"没有调用 DdeInitialize 初始化函数就调用DDEML其它函数，\n"

 "或传给DDEML函数的是\n"
 "或传给DDEML函数的是\n"

-"无效的实例标识."
+"无效的实例标识。"

 
 

-#: ../src/msw/dde.cpp:1148
+#: ../src/msw/dde.cpp:1151

 msgid "a client's attempt to establish a conversation has failed."
 msgid "a client's attempt to establish a conversation has failed."

-msgstr "客户试图建立的会话已失败."
+msgstr "客户试图建立的会话已失败。"

 
 

-#: ../src/msw/dde.cpp:1145
+#: ../src/msw/dde.cpp:1148

 msgid "a memory allocation failed."
 msgid "a memory allocation failed."

-msgstr "内存分配失败."
+msgstr "内存分配失败。"

 
 

-#: ../src/msw/dde.cpp:1139
+#: ../src/msw/dde.cpp:1142

 msgid "a parameter failed to be validated by the DDEML."
 msgid "a parameter failed to be validated by the DDEML."

-msgstr "DDEML参数验证失败."
+msgstr "DDEML 参数验证失败。"

 
 

-#: ../src/msw/dde.cpp:1121
+#: ../src/msw/dde.cpp:1124

 msgid "a request for a synchronous advise transaction has timed out."
 msgid "a request for a synchronous advise transaction has timed out."

-msgstr "同步advise事务请求已超时."
+msgstr "同步 advise 事务请求超时。"

 
 

-#: ../src/msw/dde.cpp:1127
+#: ../src/msw/dde.cpp:1130

 msgid "a request for a synchronous data transaction has timed out."
 msgid "a request for a synchronous data transaction has timed out."

-msgstr "同步data事务请求已超时."
+msgstr "同步 data 事务请求超时。"

 
 

-#: ../src/msw/dde.cpp:1136
+#: ../src/msw/dde.cpp:1139

 msgid "a request for a synchronous execute transaction has timed out."
 msgid "a request for a synchronous execute transaction has timed out."

-msgstr "同步execute事务请求已超时."
+msgstr "同步 execute 事务请求超时。"

 
 

-#: ../src/msw/dde.cpp:1154
+#: ../src/msw/dde.cpp:1157

 msgid "a request for a synchronous poke transaction has timed out."
 msgid "a request for a synchronous poke transaction has timed out."

-msgstr "同步poke事务请求已超时."
+msgstr "同步 poke 事务请求超时。"

 
 

-#: ../src/msw/dde.cpp:1169
+#: ../src/msw/dde.cpp:1172

 msgid "a request to end an advise transaction has timed out."
 msgid "a request to end an advise transaction has timed out."

-msgstr "终止advise事务的请求已超时."
+msgstr "终止 advise 事务的请求超时。"

 
 

-#: ../src/msw/dde.cpp:1163
+#: ../src/msw/dde.cpp:1166

 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
 "服务器端事务试图处理\n"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
 "服务器端事务试图处理\n"

-"已被客户端终止的会话, 或服务器\n"
-"在完成事务前终止."
+"已被客户端终止的会话，或服务器\n"
+"在完成事务前终止。"

 
 

-#: ../src/msw/dde.cpp:1151
+#: ../src/msw/dde.cpp:1154

 msgid "a transaction failed."
 msgid "a transaction failed."

-msgstr "事务失败."
+msgstr "事务失败。"

 
 

-#: ../src/common/accelcmn.cpp:179
+#: ../src/common/accelcmn.cpp:185

 msgid "alt"
 msgstr "alt"
 
 msgid "alt"
 msgstr "alt"
 

-#: ../src/msw/dde.cpp:1133
+#: ../src/msw/dde.cpp:1136

 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""

-"初始化为APPCLASS_MONITOR的应用程序\n"
-"试图执行DDE事务,\n"
-"或初始化为APPCMD_CLIENTONLY的应用程序\n"
-"视图执行服务器事务."
+"初始化为 APPCLASS_MONITOR 的应用程序\n"
+"试图执行 DDE 事务，\n"
+"或初始化为 APPCMD_CLIENTONLY 的应用程序\n"
+"视图执行服务器事务。"

 
 

-#: ../src/msw/dde.cpp:1157
+#: ../src/msw/dde.cpp:1160

 msgid "an internal call to the PostMessage function has failed. "
 msgid "an internal call to the PostMessage function has failed. "

-msgstr "内部调用PostMessage失败. "
+msgstr "内部调用 PostMessage 失败。"

 
 

-#: ../src/msw/dde.cpp:1166
+#: ../src/msw/dde.cpp:1169

 msgid "an internal error has occurred in the DDEML."
 msgid "an internal error has occurred in the DDEML."

-msgstr "在DDEML中发生内部错误."
+msgstr "在 DDEML 中发生内部错误。"

 
 

-#: ../src/msw/dde.cpp:1172
+#: ../src/msw/dde.cpp:1175

 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""

-"传给DDEML函数的是无效的事务标识符.\n"
-"一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
-"回调函数事务标识符就不再有效."
+"传给 DDEML 函数的是无效的事务标识符。\n"
+"一旦应用程序从 XTYP_XACT_COMPLETE 回调函数返回，\n"
+"回调函数事务标识符就不再有效。"

 
 #: ../src/common/zipstrm.cpp:1273
 #, fuzzy
 
 #: ../src/common/zipstrm.cpp:1273
 #, fuzzy


@@ -7035,7 +7557,7 @@ msgstr "假定这是分段的zip文件"
 #: ../src/common/fileconf.cpp:1878
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 #: ../src/common/fileconf.cpp:1878
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."

-msgstr "忽略对只读键 '%s'的修改."
+msgstr "忽略对只读键 '%s' 的修改。"

 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"
 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"


@@ -7047,146 +7569,147 @@ msgstr "错误的签名"
 
 #: ../src/common/zipstrm.cpp:1716
 msgid "bad zipfile offset to entry"
 
 #: ../src/common/zipstrm.cpp:1716
 msgid "bad zipfile offset to entry"

-msgstr "zip文件中到条目的偏移值错误"
+msgstr "zip 文件中到条目的偏移值错误"

 
 

-#: ../src/common/ftp.cpp:405
+#: ../src/common/ftp.cpp:408

 msgid "binary"
 msgstr "二进制"
 
 msgid "binary"
 msgstr "二进制"
 

-#: ../src/common/fontcmn.cpp:848
+#: ../src/common/fontcmn.cpp:979

 msgid "bold"
 msgstr "粗体"
 
 #: ../src/os2/iniconf.cpp:464
 msgid "buffer is too small for Windows directory."
 msgid "bold"
 msgstr "粗体"
 
 #: ../src/os2/iniconf.cpp:464
 msgid "buffer is too small for Windows directory."

-msgstr "Windows目录的缓存太小."
+msgstr "Windows 目录的缓存太小。"
+
+#: ../src/msw/utils.cpp:1324
+#, c-format
+msgid "build %lu"
+msgstr "build %lu"

 
 #: ../src/common/ffile.cpp:80
 #, c-format
 msgid "can't close file '%s'"
 
 #: ../src/common/ffile.cpp:80
 #, c-format
 msgid "can't close file '%s'"

-msgstr "不能关闭文件 '%s'"
+msgstr "无法关闭文件 '%s'"

 
 

-#: ../src/common/file.cpp:261
+#: ../src/common/file.cpp:279

 #, c-format
 msgid "can't close file descriptor %d"
 #, c-format
 msgid "can't close file descriptor %d"

-msgstr "不能关闭文件描述子 %d"
+msgstr "无法关闭文件描述符 %d"

 
 

-#: ../src/common/file.cpp:560
+#: ../src/common/file.cpp:577

 #, c-format
 msgid "can't commit changes to file '%s'"
 #, c-format
 msgid "can't commit changes to file '%s'"

-msgstr "不能把修改提交给文件 '%s'"
+msgstr "无法把修改提交给文件 '%s'"

 
 

-#: ../src/common/file.cpp:195
+#: ../src/common/file.cpp:213

 #, c-format
 msgid "can't create file '%s'"
 #, c-format
 msgid "can't create file '%s'"

-msgstr "不能创建文件 '%s'"
+msgstr "无法创建文件 '%s'"

 
 #: ../src/common/fileconf.cpp:1177
 #, c-format
 msgid "can't delete user configuration file '%s'"
 
 #: ../src/common/fileconf.cpp:1177
 #, c-format
 msgid "can't delete user configuration file '%s'"

-msgstr "不能删除用户配置文件 '%s'"
+msgstr "无法删除用户配置文件 '%s'"

 
 

-#: ../src/common/file.cpp:463
+#: ../src/common/file.cpp:480

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"

-msgstr "不能确定是否已达文件 %d 的尾部"
+msgstr "无法确定是否已达描述符 %d 的尾部"

 
 

-#: ../src/msdos/utilsdos.cpp:311
-#: ../src/msdos/utilsdos.cpp:474
+#: ../src/msdos/utilsdos.cpp:311 ../src/msdos/utilsdos.cpp:476

 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"
 
 #: ../src/common/zipstrm.cpp:1491
 msgid "can't find central directory in zip"
 #, c-format
 msgid "can't execute '%s'"
 msgstr "执行 '%s'失败"
 
 #: ../src/common/zipstrm.cpp:1491
 msgid "can't find central directory in zip"

-msgstr "不能在zip文件中找到中央目录"
+msgstr "无法在 zip 文件中找到中央目录"

 
 

-#: ../src/common/file.cpp:433
+#: ../src/common/file.cpp:450

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 #, c-format
 msgid "can't find length of file on file descriptor %d"

-msgstr "不能获得文件描述子 %d的文件的长度"
+msgstr "无法获得文件描述符 %d 的文件长度"

 
 

-#: ../src/msw/utils.cpp:373
+#: ../src/msw/utils.cpp:376

 msgid "can't find user's HOME, using current directory."
 msgid "can't find user's HOME, using current directory."

-msgstr "找不到用户的HOME目录, 使用当前目录."
+msgstr "找不到用户的 HOME 目录，使用当前目录。"

 
 

-#: ../src/common/file.cpp:334
+#: ../src/common/file.cpp:351

 #, c-format
 msgid "can't flush file descriptor %d"
 #, c-format
 msgid "can't flush file descriptor %d"

-msgstr "不能刷新文件描述子 %d"
+msgstr "无法刷新文件描述符 %d"

 
 

-#: ../src/common/file.cpp:390
-#: ../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"
 #, c-format
 msgid "can't get seek position on file descriptor %d"

-msgstr "不能获得文件描述子 %d的指针位置"
+msgstr "无法获得文件描述符 %d 的指针位置"

 
 

-#: ../src/common/fontmap.cpp:323
+#: ../src/common/fontmap.cpp:324

 msgid "can't load any font, aborting"
 msgid "can't load any font, aborting"

-msgstr "不能装载任何字体, 正在中止"
+msgstr "无法装载任何字体，正在中止"

 
 

-#: ../src/common/file.cpp:247
-#: ../src/common/ffile.cpp:64
+#: ../src/common/file.cpp:265 ../src/common/ffile.cpp:64

 #, c-format
 msgid "can't open file '%s'"
 #, c-format
 msgid "can't open file '%s'"

-msgstr "不能打开文件 '%s'"
+msgstr "无法打开文件 '%s'"

 
 #: ../src/common/fileconf.cpp:352
 #, c-format
 msgid "can't open global configuration file '%s'."
 
 #: ../src/common/fileconf.cpp:352
 #, c-format
 msgid "can't open global configuration file '%s'."

-msgstr "不能打开全局配置文件 '%s'."
+msgstr "无法打开全局配置文件 '%s'。"

 
 #: ../src/common/fileconf.cpp:368
 #, c-format
 msgid "can't open user configuration file '%s'."
 
 #: ../src/common/fileconf.cpp:368
 #, c-format
 msgid "can't open user configuration file '%s'."

-msgstr "不能打开用户配置文件 '%s'."
+msgstr "无法打开用户配置文件 '%s'。"

 
 #: ../src/common/fileconf.cpp:1018
 msgid "can't open user configuration file."
 
 #: ../src/common/fileconf.cpp:1018
 msgid "can't open user configuration file."

-msgstr "不能打开用户配置文件."
+msgstr "无法打开用户配置文件。"

 
 #: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"
 
 #: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"

-msgstr "不能重新初始化zlib deflate(压缩)流."
+msgstr "无法重新初始化 zlib 压缩流。"

 
 #: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
 
 #: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"

-msgstr "不能重新初始化zlib inflate(解压)流."
+msgstr "无法重新初始化 zlib 解压流。"

 
 

-#: ../src/common/file.cpp:285
+#: ../src/common/file.cpp:303

 #, c-format
 msgid "can't read from file descriptor %d"
 #, c-format
 msgid "can't read from file descriptor %d"

-msgstr "不能从文件描述子 %d中读"
+msgstr "无法读取文件描述符 %d"

 
 

-#: ../src/common/file.cpp:555
+#: ../src/common/file.cpp:572

 #, c-format
 msgid "can't remove file '%s'"
 #, c-format
 msgid "can't remove file '%s'"

-msgstr "不能删除文件 '%s'"
+msgstr "无法删除文件 '%s'"

 
 

-#: ../src/common/file.cpp:572
+#: ../src/common/file.cpp:589

 #, c-format
 msgid "can't remove temporary file '%s'"
 #, c-format
 msgid "can't remove temporary file '%s'"

-msgstr "不能删除临时文件 '%s'"
+msgstr "无法删除临时文件 '%s'"

 
 

-#: ../src/common/file.cpp:376
-#: ../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"
 #, c-format
 msgid "can't seek on file descriptor %d"

-msgstr "不能定位文件描述子 %d"
+msgstr "无法定位文件描述符 %d"

 
 #: ../src/common/textfile.cpp:300
 #, c-format
 msgid "can't write buffer '%s' to disk."
 
 #: ../src/common/textfile.cpp:300
 #, c-format
 msgid "can't write buffer '%s' to disk."

-msgstr "不能把文件 '%s'写到磁盘."
+msgstr "无法把缓存区 '%s' 写到磁盘。"

 
 

-#: ../src/common/file.cpp:301
+#: ../src/common/file.cpp:319

 #, c-format
 msgid "can't write to file descriptor %d"
 #, c-format
 msgid "can't write to file descriptor %d"

-msgstr "不能写到文件描述子 %d"
+msgstr "无法写文件描述符 %d"

 
 #: ../src/common/fileconf.cpp:1032
 msgid "can't write user configuration file."
 
 #: ../src/common/fileconf.cpp:1032
 msgid "can't write user configuration file."

-msgstr "不能写用户配置文件."
+msgstr "无法写用户配置文件。"

 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"


@@ -7196,19 +7719,45 @@ msgstr "校验和错误"
 msgid "checksum failure reading tar header block"
 msgstr ""
 
 msgid "checksum failure reading tar header block"
 msgstr ""
 

+#: ../src/richtext/richtextborderspage.cpp:280
+#: ../src/richtext/richtextborderspage.cpp:310
+#: ../src/richtext/richtextborderspage.cpp:340
+#: ../src/richtext/richtextborderspage.cpp:370
+#: ../src/richtext/richtextborderspage.cpp:424
+#: ../src/richtext/richtextborderspage.cpp:454
+#: ../src/richtext/richtextborderspage.cpp:484
+#: ../src/richtext/richtextborderspage.cpp:514
+#: ../src/richtext/richtextmarginspage.cpp:202
+#: ../src/richtext/richtextmarginspage.cpp:227
+#: ../src/richtext/richtextmarginspage.cpp:250
+#: ../src/richtext/richtextmarginspage.cpp:275
+#: ../src/richtext/richtextmarginspage.cpp:316
+#: ../src/richtext/richtextmarginspage.cpp:341
+#: ../src/richtext/richtextmarginspage.cpp:364
+#: ../src/richtext/richtextmarginspage.cpp:389
+#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:273
+#: ../src/richtext/richtextsizepage.cpp:300
+#: ../src/richtext/richtextsizepage.cpp:327
+#: ../src/richtext/richtextsizepage.cpp:354
+#: ../src/richtext/richtextsizepage.cpp:381
+#: ../src/richtext/richtextsizepage.cpp:466
+msgid "cm"
+msgstr "厘米"
+

 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 
 #: ../src/common/regex.cpp:240
 msgid "conversion to 8-bit encoding failed"
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "压缩错误"
 
 #: ../src/common/regex.cpp:240
 msgid "conversion to 8-bit encoding failed"

-msgstr "不能转换为8-bit编码"
+msgstr "无法转换为 8 位编码"

 
 

-#: ../src/common/accelcmn.cpp:177
+#: ../src/common/accelcmn.cpp:183

 msgid "ctrl"
 msgstr "ctrl"
 
 msgid "ctrl"
 msgstr "ctrl"
 

-#: ../src/common/cmdline.cpp:1250
+#: ../src/common/cmdline.cpp:1316

 msgid "date"
 msgstr "日期"
 
 msgid "date"
 msgstr "日期"
 


@@ -7216,45 +7765,40 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解压缩错误"
 
 msgid "decompression error"
 msgstr "解压缩错误"
 

-#: ../src/richtext/richtextstyles.cpp:635
-#: ../src/common/fmapbase.cpp:812
+#: ../src/richtext/richtextstyles.cpp:759 ../src/common/fmapbase.cpp:807

 msgid "default"
 msgstr "缺省值"
 
 msgid "default"
 msgstr "缺省值"
 

-#: ../src/common/xtistrm.cpp:839
-msgid "delegate has no type info"
-msgstr "委派没有类型信息"
-
-#: ../src/common/cmdline.cpp:1246
+#: ../src/common/cmdline.cpp:1312

 msgid "double"
 msgstr ""
 
 msgid "double"
 msgstr ""
 

-#: ../src/common/debugrpt.cpp:532
+#: ../src/common/debugrpt.cpp:534

 msgid "dump of the process state (binary)"
 msgid "dump of the process state (binary)"

-msgstr "转储(dump)进程状态（二进制码）"
+msgstr "转储进程状态（二进制码）"

 
 

-#: ../src/common/datetimefmt.cpp:1781
+#: ../src/common/datetimefmt.cpp:1848

 msgid "eighteenth"
 msgstr "第十八"
 
 msgid "eighteenth"
 msgstr "第十八"
 

-#: ../src/common/datetimefmt.cpp:1771
+#: ../src/common/datetimefmt.cpp:1838

 msgid "eighth"
 msgstr "第八"
 
 msgid "eighth"
 msgstr "第八"
 

-#: ../src/common/datetimefmt.cpp:1774
+#: ../src/common/datetimefmt.cpp:1841

 msgid "eleventh"
 msgstr "第十一"
 
 #: ../src/common/fileconf.cpp:1864
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgid "eleventh"
 msgstr "第十一"
 
 #: ../src/common/fileconf.cpp:1864
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"

-msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
+msgstr "条目 '%s' 在组 '%s' 中已出现一次以上"

 
 #: ../src/html/chm.cpp:344
 msgid "error in data format"
 msgstr "文件格式错误"
 
 
 #: ../src/html/chm.cpp:344
 msgid "error in data format"
 msgstr "文件格式错误"
 

-#: ../src/msdos/utilsdos.cpp:413
+#: ../src/msdos/utilsdos.cpp:414

 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"


@@ -7265,82 +7809,81 @@ msgstr "打开文件出错"
 
 #: ../src/common/zipstrm.cpp:1577
 msgid "error reading zip central directory"
 
 #: ../src/common/zipstrm.cpp:1577
 msgid "error reading zip central directory"

-msgstr "读zip中央目录时出错"
+msgstr "读 zip 中央目录时出错"

 
 #: ../src/common/zipstrm.cpp:1668
 msgid "error reading zip local header"
 
 #: ../src/common/zipstrm.cpp:1668
 msgid "error reading zip local header"

-msgstr "读zip本地头时出错"
+msgstr "读 zip 本地头时出错"

 
 #: ../src/common/zipstrm.cpp:2397
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
 
 #: ../src/common/zipstrm.cpp:2397
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"

-msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
+msgstr "写zip条目 '%s' 时出错: crc 校验或长度错误"

 
 #: ../src/common/ffile.cpp:169
 #, c-format
 msgid "failed to flush the file '%s'"
 
 #: ../src/common/ffile.cpp:169
 #, c-format
 msgid "failed to flush the file '%s'"

-msgstr "刷新文件 '%s'失败"
+msgstr "刷新文件 '%s' 失败"

 
 

-#: ../src/common/datetimefmt.cpp:1778
+#: ../src/common/datetimefmt.cpp:1845

 msgid "fifteenth"
 msgstr "第十五"
 
 msgid "fifteenth"
 msgstr "第十五"
 

-#: ../src/common/datetimefmt.cpp:1768
+#: ../src/common/datetimefmt.cpp:1835

 msgid "fifth"
 msgstr "第五"
 
 #: ../src/common/fileconf.cpp:611
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgid "fifth"
 msgstr "第五"
 
 #: ../src/common/fileconf.cpp:611
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."

-msgstr "文件 '%s', 行 %d: 组头之后的 '%s' 被忽略."
+msgstr "文件 '%s'，行 %d: 组头之后的 '%s' 被忽略。"

 
 #: ../src/common/fileconf.cpp:640
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 
 #: ../src/common/fileconf.cpp:640
 #, c-format
 msgid "file '%s', line %d: '=' expected."

-msgstr "文件 '%s', 行 %d: 期待出现 '='."
+msgstr "文件 '%s'，行 %d: 期待出现 '='。"

 
 #: ../src/common/fileconf.cpp:663
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 
 #: ../src/common/fileconf.cpp:663
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."

-msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
+msgstr "文件 '%s'，行 %d: 键 '%s' 第一次出现在行 %d。"

 
 #: ../src/common/fileconf.cpp:653
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 
 #: ../src/common/fileconf.cpp:653
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."

-msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
+msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"

 
 #: ../src/common/fileconf.cpp:575
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 
 #: ../src/common/fileconf.cpp:575
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."

-msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
+msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"

 
 

-#: ../src/richtext/richtextbuffer.cpp:6041
+#: ../src/richtext/richtextbuffer.cpp:7651

 msgid "files"
 msgstr "文件"
 
 msgid "files"
 msgstr "文件"
 

-#: ../src/common/datetimefmt.cpp:1764
+#: ../src/common/datetimefmt.cpp:1831

 msgid "first"
 msgstr "第一"
 
 msgid "first"
 msgstr "第一"
 

-#: ../src/html/helpwnd.cpp:1260
+#: ../src/html/helpwnd.cpp:1262

 msgid "font size"
 msgstr "字体大小"
 
 msgid "font size"
 msgstr "字体大小"
 

-#: ../src/common/datetimefmt.cpp:1777
+#: ../src/common/datetimefmt.cpp:1844

 msgid "fourteenth"
 msgstr "第十四"
 
 msgid "fourteenth"
 msgstr "第十四"
 

-#: ../src/common/datetimefmt.cpp:1767
+#: ../src/common/datetimefmt.cpp:1834

 msgid "fourth"
 msgstr "第四"
 
 msgid "fourth"
 msgstr "第四"
 

-#: ../src/common/appbase.cpp:680
+#: ../src/common/appbase.cpp:679

 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 

-#: ../src/richtext/richtextbuffer.cpp:7469
-#: ../src/richtext/richtextbuffer.cpp:7506
-#: ../src/richtext/richtextbuffer.cpp:7574
+#: ../src/richtext/richtextbuffer.cpp:10527
+#: ../src/richtext/richtextbuffer.cpp:10637

 msgid "image"
 msgstr ""
 
 msgid "image"
 msgstr ""
 


@@ -7348,9 +7891,9 @@ msgstr ""
 msgid "incomplete header block in tar"
 msgstr ""
 
 msgid "incomplete header block in tar"
 msgstr ""
 

-#: ../src/common/xtixml.cpp:476
+#: ../src/common/xtixml.cpp:490

 msgid "incorrect event handler string, missing dot"
 msgid "incorrect event handler string, missing dot"

-msgstr "错误的时间句柄字符串, 缺少点号('.')"
+msgstr "错误的时间句柄字符串，缺少点号('.')"

 
 #: ../src/common/tarstrm.cpp:1382
 msgid "incorrect size given for tar entry"
 
 #: ../src/common/tarstrm.cpp:1382
 msgid "incorrect size given for tar entry"


@@ -7360,43 +7903,43 @@ msgstr ""
 msgid "invalid data in extended tar header"
 msgstr ""
 
 msgid "invalid data in extended tar header"
 msgstr ""
 

-#: ../src/generic/logg.cpp:1051
+#: ../src/generic/logg.cpp:1052

 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 #: ../src/common/zipstrm.cpp:1446
 msgid "invalid zip file"
 msgid "invalid message box return value"
 msgstr "消息框返回无效的值"
 
 #: ../src/common/zipstrm.cpp:1446
 msgid "invalid zip file"

-msgstr "无效的zip文件"
+msgstr "无效的 zip 文件"

 
 

-#: ../src/common/fontcmn.cpp:853
+#: ../src/common/fontcmn.cpp:984

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

-#: ../src/common/fontcmn.cpp:843
+#: ../src/common/fontcmn.cpp:974

 #, fuzzy
 msgid "light"
 msgstr "细"
 
 #, fuzzy
 msgid "light"
 msgstr "细"
 

-#: ../src/common/intl.cpp:297
+#: ../src/common/intl.cpp:296

 #, c-format
 msgid "locale '%s' cannot be set."
 #, c-format
 msgid "locale '%s' cannot be set."

-msgstr "不能设置语言(locale) '%s'."
+msgstr "无法设置地区为 '%s'。"

 
 

-#: ../src/common/datetimefmt.cpp:1917
+#: ../src/common/datetimefmt.cpp:1984

 msgid "midnight"
 msgstr "午夜"
 
 msgid "midnight"
 msgstr "午夜"
 

-#: ../src/common/datetimefmt.cpp:1782
+#: ../src/common/datetimefmt.cpp:1849

 msgid "nineteenth"
 msgstr "第十九"
 
 msgid "nineteenth"
 msgstr "第十九"
 

-#: ../src/common/datetimefmt.cpp:1772
+#: ../src/common/datetimefmt.cpp:1839

 msgid "ninth"
 msgstr "第九"
 
 msgid "ninth"
 msgstr "第九"
 

-#: ../src/msw/dde.cpp:1117
+#: ../src/msw/dde.cpp:1120

 msgid "no DDE error."
 msgid "no DDE error."

-msgstr "没有DDE错误."
+msgstr "没有 DDE 错误。"

 
 #: ../src/html/chm.cpp:328
 msgid "no error"
 
 #: ../src/html/chm.cpp:328
 msgid "no error"


@@ -7407,39 +7950,124 @@ msgstr "没有错误"
 msgid "no fonts found in %s, using builtin font"
 msgstr ""
 
 msgid "no fonts found in %s, using builtin font"
 msgstr ""
 

-#: ../src/html/helpdata.cpp:642
+#: ../src/html/helpdata.cpp:641

 msgid "noname"
 msgstr "未名"
 
 msgid "noname"
 msgstr "未名"
 

-#: ../src/common/datetimefmt.cpp:1916
+#: ../src/common/datetimefmt.cpp:1983

 msgid "noon"
 msgstr "中午"
 
 msgid "noon"
 msgstr "中午"
 

-#: ../src/richtext/richtextstyles.cpp:634
+#: ../src/richtext/richtextstyles.cpp:758

 msgid "normal"
 msgstr "正常"
 
 msgid "normal"
 msgstr "正常"
 

-#: ../src/gtk/print.cpp:1158
-#: ../src/gtk/print.cpp:1263
+#: ../src/gtk/print.cpp:1215 ../src/gtk/print.cpp:1320

 msgid "not implemented"
 msgstr ""
 
 msgid "not implemented"
 msgstr ""
 

-#: ../src/common/cmdline.cpp:1242
+#: ../src/common/cmdline.cpp:1308

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 

-#: ../src/common/xtixml.cpp:255
+#: ../src/common/xtixml.cpp:260

 msgid "objects cannot have XML Text Nodes"
 msgid "objects cannot have XML Text Nodes"

-msgstr "对象不能有XML 文本节点"
+msgstr "对象不能有 XML 文本节点"

 
 #: ../src/html/chm.cpp:340
 msgid "out of memory"
 msgstr "内存耗尽"
 
 
 #: ../src/html/chm.cpp:340
 msgid "out of memory"
 msgstr "内存耗尽"
 

-#: ../src/common/debugrpt.cpp:508
+#: ../src/richtext/richtextsizepage.cpp:247
+#: ../src/richtext/richtextsizepage.cpp:274
+#: ../src/richtext/richtextsizepage.cpp:301
+#: ../src/richtext/richtextsizepage.cpp:328
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:382
+msgid "percent"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:510

 msgid "process context description"
 msgstr "进程上下文描述"
 
 msgid "process context description"
 msgstr "进程上下文描述"
 

+#: ../src/richtext/richtextborderspage.cpp:279
+#: ../src/richtext/richtextborderspage.cpp:281
+#: ../src/richtext/richtextborderspage.cpp:282
+#: ../src/richtext/richtextborderspage.cpp:309
+#: ../src/richtext/richtextborderspage.cpp:311
+#: ../src/richtext/richtextborderspage.cpp:312
+#: ../src/richtext/richtextborderspage.cpp:339
+#: ../src/richtext/richtextborderspage.cpp:341
+#: ../src/richtext/richtextborderspage.cpp:342
+#: ../src/richtext/richtextborderspage.cpp:369
+#: ../src/richtext/richtextborderspage.cpp:371
+#: ../src/richtext/richtextborderspage.cpp:372
+#: ../src/richtext/richtextborderspage.cpp:423
+#: ../src/richtext/richtextborderspage.cpp:425
+#: ../src/richtext/richtextborderspage.cpp:426
+#: ../src/richtext/richtextborderspage.cpp:453
+#: ../src/richtext/richtextborderspage.cpp:455
+#: ../src/richtext/richtextborderspage.cpp:456
+#: ../src/richtext/richtextborderspage.cpp:483
+#: ../src/richtext/richtextborderspage.cpp:485
+#: ../src/richtext/richtextborderspage.cpp:486
+#: ../src/richtext/richtextborderspage.cpp:513
+#: ../src/richtext/richtextborderspage.cpp:515
+#: ../src/richtext/richtextborderspage.cpp:516
+#: ../src/richtext/richtextmarginspage.cpp:201
+#: ../src/richtext/richtextmarginspage.cpp:203
+#: ../src/richtext/richtextmarginspage.cpp:204
+#: ../src/richtext/richtextmarginspage.cpp:226
+#: ../src/richtext/richtextmarginspage.cpp:228
+#: ../src/richtext/richtextmarginspage.cpp:229
+#: ../src/richtext/richtextmarginspage.cpp:249
+#: ../src/richtext/richtextmarginspage.cpp:251
+#: ../src/richtext/richtextmarginspage.cpp:252
+#: ../src/richtext/richtextmarginspage.cpp:274
+#: ../src/richtext/richtextmarginspage.cpp:276
+#: ../src/richtext/richtextmarginspage.cpp:277
+#: ../src/richtext/richtextmarginspage.cpp:315
+#: ../src/richtext/richtextmarginspage.cpp:317
+#: ../src/richtext/richtextmarginspage.cpp:318
+#: ../src/richtext/richtextmarginspage.cpp:340
+#: ../src/richtext/richtextmarginspage.cpp:342
+#: ../src/richtext/richtextmarginspage.cpp:343
+#: ../src/richtext/richtextmarginspage.cpp:363
+#: ../src/richtext/richtextmarginspage.cpp:365
+#: ../src/richtext/richtextmarginspage.cpp:366
+#: ../src/richtext/richtextmarginspage.cpp:388
+#: ../src/richtext/richtextmarginspage.cpp:390
+#: ../src/richtext/richtextmarginspage.cpp:391
+#: ../src/richtext/richtextsizepage.cpp:245
+#: ../src/richtext/richtextsizepage.cpp:248
+#: ../src/richtext/richtextsizepage.cpp:249
+#: ../src/richtext/richtextsizepage.cpp:272
+#: ../src/richtext/richtextsizepage.cpp:275
+#: ../src/richtext/richtextsizepage.cpp:276
+#: ../src/richtext/richtextsizepage.cpp:299
+#: ../src/richtext/richtextsizepage.cpp:302
+#: ../src/richtext/richtextsizepage.cpp:303
+#: ../src/richtext/richtextsizepage.cpp:326
+#: ../src/richtext/richtextsizepage.cpp:329
+#: ../src/richtext/richtextsizepage.cpp:330
+#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:356
+#: ../src/richtext/richtextsizepage.cpp:357
+#: ../src/richtext/richtextsizepage.cpp:380
+#: ../src/richtext/richtextsizepage.cpp:383
+#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:465
+#: ../src/richtext/richtextsizepage.cpp:467
+#: ../src/richtext/richtextsizepage.cpp:468
+msgid "px"
+msgstr "像素"
+
+#: ../src/common/accelcmn.cpp:189
+#, fuzzy
+msgid "rawctrl"
+msgstr "ctrl"
+

 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "读取错误"


@@ -7447,18 +8075,18 @@ msgstr "读取错误"
 #: ../src/common/zipstrm.cpp:1883
 #, c-format
 msgid "reading zip stream (entry %s): bad crc"
 #: ../src/common/zipstrm.cpp:1883
 #, c-format
 msgid "reading zip stream (entry %s): bad crc"

-msgstr "读入zip流 (条目 %s): crc校验错误"
+msgstr "读入 zip 流 (条目 %s): crc校验错误"

 
 #: ../src/common/zipstrm.cpp:1878
 #, c-format
 msgid "reading zip stream (entry %s): bad length"
 
 #: ../src/common/zipstrm.cpp:1878
 #, c-format
 msgid "reading zip stream (entry %s): bad length"

-msgstr "读入zip流 (条目 %s): 长度错误"
+msgstr "读入 zip 流 (条目 %s): 长度错误"

 
 

-#: ../src/msw/dde.cpp:1160
+#: ../src/msw/dde.cpp:1163

 msgid "reentrancy problem."
 msgid "reentrancy problem."

-msgstr "重入问题."
+msgstr "重入问题。"

 
 

-#: ../src/common/datetimefmt.cpp:1765
+#: ../src/common/datetimefmt.cpp:1832

 msgid "second"
 msgstr "第二"
 
 msgid "second"
 msgstr "第二"
 


@@ -7466,90 +8094,96 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜索错误"
 
 msgid "seek error"
 msgstr "搜索错误"
 

-#: ../src/common/datetimefmt.cpp:1780
+#: ../src/common/datetimefmt.cpp:1847

 msgid "seventeenth"
 msgstr "第十七"
 
 msgid "seventeenth"
 msgstr "第十七"
 

-#: ../src/common/datetimefmt.cpp:1770
+#: ../src/common/datetimefmt.cpp:1837

 msgid "seventh"
 msgstr "第七"
 
 msgid "seventh"
 msgstr "第七"
 

-#: ../src/common/accelcmn.cpp:181
+#: ../src/common/accelcmn.cpp:187

 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appbase.cpp:670
+#: ../src/common/appbase.cpp:669

 msgid "show this help message"
 msgstr "显示帮助信息"
 
 msgid "show this help message"
 msgstr "显示帮助信息"
 

-#: ../src/common/datetimefmt.cpp:1779
+#: ../src/common/datetimefmt.cpp:1846

 msgid "sixteenth"
 msgstr "第十六"
 
 msgid "sixteenth"
 msgstr "第十六"
 

-#: ../src/common/datetimefmt.cpp:1769
+#: ../src/common/datetimefmt.cpp:1836

 msgid "sixth"
 msgstr "第六"
 
 msgid "sixth"
 msgstr "第六"
 

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

 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 

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

 msgid "specify the theme to use"
 msgid "specify the theme to use"

-msgstr "指定使用的主题(theme)"
+msgstr "指定使用的主题"

 
 

-#: ../src/richtext/richtextbuffer.cpp:6502
+#: ../src/richtext/richtextbuffer.cpp:8151

 msgid "standard/circle"
 msgstr ""
 
 msgid "standard/circle"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:6504
+#: ../src/richtext/richtextbuffer.cpp:8152
+msgid "standard/circle-outline"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:8154

 msgid "standard/diamond"
 msgstr ""
 
 msgid "standard/diamond"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:6503
+#: ../src/richtext/richtextbuffer.cpp:8153

 msgid "standard/square"
 msgstr ""
 
 msgid "standard/square"
 msgstr ""
 

-#: ../src/richtext/richtextbuffer.cpp:6505
+#: ../src/richtext/richtextbuffer.cpp:8155

 msgid "standard/triangle"
 msgstr ""
 
 #: ../src/common/zipstrm.cpp:1783
 msgid "stored file length not in Zip header"
 msgid "standard/triangle"
 msgstr ""
 
 #: ../src/common/zipstrm.cpp:1783
 msgid "stored file length not in Zip header"

-msgstr "Zip头没有已存文件的长度信息"
+msgstr "Zip 头没有已存文件的长度信息"

 
 

-#: ../src/common/cmdline.cpp:1238
+#: ../src/common/cmdline.cpp:1304

 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:1773
+#: ../src/common/datetimefmt.cpp:1840

 msgid "tenth"
 msgstr "第十"
 
 msgid "tenth"
 msgstr "第十"
 

-#: ../src/msw/dde.cpp:1124
+#: ../src/msw/dde.cpp:1127

 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."

-msgstr "对事件的响应导致DDE_FBUSY位被设置."
+msgstr "对事件的响应导致 DDE_FBUSY 位被设置。"

 
 

-#: ../src/common/datetimefmt.cpp:1766
+#: ../src/common/datetimefmt.cpp:1833

 msgid "third"
 msgstr "第三"
 
 msgid "third"
 msgstr "第三"
 

-#: ../src/common/datetimefmt.cpp:1776
+#: ../src/common/datetimefmt.cpp:1843

 msgid "thirteenth"
 msgstr "第十三"
 
 msgid "thirteenth"
 msgstr "第十三"
 

-#: ../src/common/datetimefmt.cpp:1571
+#: ../src/common/datetimefmt.cpp:1637

 msgid "today"
 msgstr "今天"
 
 msgid "today"
 msgstr "今天"
 

-#: ../src/common/datetimefmt.cpp:1573
+#: ../src/common/datetimefmt.cpp:1639

 msgid "tomorrow"
 msgstr "明天"
 
 msgid "tomorrow"
 msgstr "明天"
 


@@ -7562,16 +8196,15 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 
 msgid "translator-credits"
 msgstr ""
 

-#: ../src/common/datetimefmt.cpp:1775
+#: ../src/common/datetimefmt.cpp:1842

 msgid "twelfth"
 msgstr "第十二"
 
 msgid "twelfth"
 msgstr "第十二"
 

-#: ../src/common/datetimefmt.cpp:1783
+#: ../src/common/datetimefmt.cpp:1850

 msgid "twentieth"
 msgstr "第二十"
 
 msgid "twentieth"
 msgstr "第二十"
 

-#: ../src/common/fontcmn.cpp:668
-#: ../src/common/fontcmn.cpp:839
+#: ../src/common/fontcmn.cpp:790 ../src/common/fontcmn.cpp:966

 msgid "underlined"
 msgstr "下划线"
 
 msgid "underlined"
 msgstr "下划线"
 


@@ -7581,119 +8214,255 @@ msgid "unexpected \" at position %d in '%s'."
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 #: ../src/common/tarstrm.cpp:1046
 msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
 #: ../src/common/tarstrm.cpp:1046

-#, fuzzy

 msgid "unexpected end of file"
 msgid "unexpected end of file"

-msgstr "在解析资源时意外到达文件结尾."
+msgstr "意外到达文件结尾"

 
 

-#: ../src/generic/progdlgg.cpp:289
-#: ../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 "未知"
 

-#: ../src/common/xtixml.cpp:249
+#: ../src/common/xtixml.cpp:254

 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 
 #, c-format
 msgid "unknown class %s"
 msgstr "未知类 %s"
 

-#: ../src/common/regex.cpp:262
-#: ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:262 ../src/html/chm.cpp:352

 msgid "unknown error"
 msgstr "未知错误"
 
 msgid "unknown error"
 msgstr "未知错误"
 

-#: ../src/msw/dialup.cpp:494
+#: ../src/msw/dialup.cpp:491

 #, c-format
 msgid "unknown error (error code %08x)."
 #, c-format
 msgid "unknown error (error code %08x)."

-msgstr "未知错误(错误号 %08x)."
+msgstr "未知错误 (错误号 %08x)。"

 
 #: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 
 
 #: ../src/msw/wince/filefnwce.cpp:167
 msgid "unknown seek origin"
 msgstr "未知搜索原点"
 

-#: ../src/common/fmapbase.cpp:826
+#: ../src/common/fmapbase.cpp:821

 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 

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

 msgid "unnamed"
 msgstr "未命名"
 
 msgid "unnamed"
 msgstr "未命名"
 

-#: ../src/common/docview.cpp:1482
+#: ../src/common/docview.cpp:1587

 #, 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"
 msgid "unsupported Zip compression method"

-msgstr "不支持的Zip压缩方法"
+msgstr "不支持的 Zip 压缩方法"

 
 

-#: ../src/common/translation.cpp:1691
+#: ../src/common/translation.cpp:1724

 #, c-format
 msgid "using catalog '%s' from '%s'."
 #, c-format
 msgid "using catalog '%s' from '%s'."

-msgstr "使用目录 '%s' 从 '%s'."
+msgstr "使用目录 '%s' 从 '%s'。"

 
 #: ../src/html/chm.cpp:336
 msgid "write error"
 msgstr "写错误"
 
 
 #: ../src/html/chm.cpp:336
 msgid "write error"
 msgstr "写错误"
 

-#: ../src/common/stopwatch.cpp:268
+#: ../src/common/time.cpp:331

 msgid "wxGetTimeOfDay failed."
 msgid "wxGetTimeOfDay failed."

-msgstr "wxGetTimeOfDay 失败."
+msgstr "wxGetTimeOfDay 失败。"

 
 

-#: ../src/gtk/print.cpp:921
+#: ../src/gtk/print.cpp:978

 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr ""
 

-#: ../src/html/search.cpp:49
-msgid "wxSearchEngine::LookFor must be called before scanning!"
-msgstr ""
-
-#: ../src/osx/carbon/dataview.cpp:1264
+#: ../src/osx/carbon/dataview.cpp:1304

 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:908
 msgid "wxWidget control pointer is not a data view pointer"
 msgstr ""
 
 #: ../src/osx/carbon/dataview.cpp:908

-#, fuzzy

 msgid "wxWidget's control not initialized."
 msgid "wxWidget's control not initialized."

-msgstr "不能初始化显示."
+msgstr "wxWidgets 的控件未初始化。"

 
 #: ../src/motif/app.cpp:246
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 
 #: ../src/motif/app.cpp:246
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."

-msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
+msgstr "wxWidgets 无法为 '%s' 打开显示设备: 退出。"

 
 #: ../src/x11/app.cpp:165
 msgid "wxWidgets could not open display. Exiting."
 
 #: ../src/x11/app.cpp:165
 msgid "wxWidgets could not open display. Exiting."

-msgstr "wxWidgets 不能打开显示设备: 已经存在."
+msgstr "wxWidgets 无法打开显示设备。退出。"

 
 

-#: ../src/richtext/richtextsymboldlg.cpp:428
+#: ../src/richtext/richtextsymboldlg.cpp:431

 msgid "xxxx"
 msgstr "xxxx"
 
 msgid "xxxx"
 msgstr "xxxx"
 

-#: ../src/common/datetimefmt.cpp:1572
+#: ../src/common/datetimefmt.cpp:1638

 msgid "yesterday"
 msgstr "昨天"
 
 msgid "yesterday"
 msgstr "昨天"
 

-#: ../src/common/zstream.cpp:235
-#: ../src/common/zstream.cpp:413
+#: ../src/common/zstream.cpp:244 ../src/common/zstream.cpp:419

 #, c-format
 msgid "zlib error %d"
 #, c-format
 msgid "zlib error %d"

-msgstr "zlib错误 %d"
+msgstr "zlib 错误 %d"

 
 

-#: ../src/common/prntbase.cpp:1158
-msgid "|<<"
-msgstr "|<<"
-
-#: ../src/richtext/richtextliststylepage.cpp:498
-#: ../src/richtext/richtextbulletspage.cpp:298
+#: ../src/richtext/richtextliststylepage.cpp:497
+#: ../src/richtext/richtextbulletspage.cpp:302

 msgid "~"
 msgstr "~"
 
 msgid "~"
 msgstr "~"
 

-#~ msgid "%s message"
-#~ msgstr "%s 消息"
+#~ msgid "&Save..."
+#~ msgstr "保存(&S)..."
+
+#~ msgid "About "
+#~ msgstr "关于"
+
+#~ msgid "All files (*.*)|*"
+#~ msgstr "所有文件 (*.*)|*"
+
+#~ msgid "Cannot initialize SciTech MGL!"
+#~ msgstr "无法初始化 SciTech MGL!"
+
+#~ msgid "Cannot initialize display."
+#~ msgstr "无法初始化显示。"
+
+#~ msgid "Cannot start thread: error writing TLS"
+#~ msgstr "无法启动线程: 写 TLS 错误"
+
+#~ msgid "Close\tAlt-F4"
+#~ msgstr "关闭\tAlt-F4"
+
+#~ msgid "Couldn't create cursor."
+#~ msgstr "无法创建光标。"
+
+#~ msgid "Directory '%s' doesn't exist!"
+#~ msgstr "目录 '%s'不存在!"
+
+#~ msgid "File %s does not exist."
+#~ msgstr "文件 %s 不存在。"
+
+#~ msgid "Mode %ix%i-%i not available."
+#~ msgstr "显示模式 %ix%i-%i位色 不支持。"
+
+#~ msgid "Paper Size"
+#~ msgstr "纸张大小"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "&Goto..."
+#~ msgstr "跳转(&G)..."
+
+#~ msgid "<<"
+#~ msgstr "<<"
+
+#~ msgid ">>"
+#~ msgstr ">>"
+
+#~ msgid ">>|"
+#~ msgstr ">>|"
+
+#~ msgid "Can't check image format of file '%s': file does not exist."
+#~ msgstr "不能检查文件格式 '%s': 文件不存在."
+
+#~ msgid "Can't load image from file '%s': file does not exist."
+#~ msgstr "不能从文件 '%s'中装入图像: 文件不存在."
+
+#~ msgid "Cannot open file '%s'."
+#~ msgstr "不能打开文件 '%s'."
+
+#, fuzzy
+#~ msgid "Click to cancel this window."
+#~ msgstr "关闭此窗口"
+
+#, fuzzy
+#~ msgid "Click to confirm your selection."
+#~ msgstr "点击确认字体选择."
+
+#, fuzzy
+#~ msgid "Column could not be added to native control."
+#~ msgstr "文件不能被装载."
+
+#, fuzzy
+#~ msgid "Elapsed time:"
+#~ msgstr "用时: "
+
+#, fuzzy
+#~ msgid "Estimated time:"
+#~ msgstr "预期时间: "
+
+#~ msgid "Failed to create a status bar."
+#~ msgstr "创建状态条失败."
+
+#~ msgid "Goto Page"
+#~ msgstr "跳转页面"
+
+#~ msgid "I64"
+#~ msgstr "I64"
+
+#~ msgid "Internal error, illegal wxCustomTypeInfo"
+#~ msgstr "整数错误, 非法的wxCustomTypeInfo"
+
+#, fuzzy
+#~ msgid "Model pointer not initialized."
+#~ msgstr "不能初始化显示."
+
+#, fuzzy
+#~ msgid "No image handler for type %ld defined."
+#~ msgstr "没有类型 %d 的图像处理器."
+
+#, fuzzy
+#~ msgid "Owner not initialized."
+#~ msgstr "不能初始化显示."
+
+#, fuzzy
+#~ msgid "Passed item is invalid."
+#~ msgstr "'%s' 是无效的"
+
+#~ msgid "Passing a already registered object to SetObjectName"
+#~ msgstr "传递一个已注册的对象给SetObjectName"
+
+#, fuzzy
+#~ msgid "Passing an unknown object to GetObject"
+#~ msgstr "传递一个未知对象给GetObject"
+
+#~ msgid "Print previe&w"
+#~ msgstr "打印预览(&w)"
+
+#, fuzzy
+#~ msgid "Remaining time:"
+#~ msgstr "剩余时间 : "
+
+#~ msgid ""
+#~ "Streaming delegates for not already streamed objects not yet supported"
+#~ msgstr "不支持针对尚未形成流的对象的流委派"
+
+#, fuzzy
+#~ msgid "The file '%s' doesn't exist and couldn't be opened."
+#~ msgstr ""
+#~ "文件 '%s' 不存在,不能被打开.\n"
+#~ "已从最近使用的文件列表(MRU)中移去."
+
+#~ msgid "The path '%s' contains too many \"..\"!"
+#~ msgstr "路径 '%s' 包含了过多的\"..\"!"
+
+#, fuzzy
+#~ msgid "To be deleted item is invalid."
+#~ msgstr "'%s' 是无效的"
+
+#~ msgid "Update"
+#~ msgstr "更新"
+
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#~ msgid "Windows 2000 (build %lu"
+#~ msgstr "Windows 2000 (build %lu"
+
+#~ msgid "delegate has no type info"
+#~ msgstr "委派没有类型信息"
+
+#~ msgid "|<<"
+#~ msgstr "|<<"

 
 #~ msgid "Archive doesnt contain #SYSTEM file"
 #~ msgstr "存档里没有包含 #SYSTEM 文件"
 
 #~ msgid "Archive doesnt contain #SYSTEM file"
 #~ msgstr "存档里没有包含 #SYSTEM 文件"


@@ -7716,9 +8485,6 @@ msgstr "~"
 #~ msgid "Cannot parse dimension from '%s'."
 #~ msgstr "不能从 '%s'中解析尺寸."
 
 #~ msgid "Cannot parse dimension from '%s'."
 #~ msgstr "不能从 '%s'中解析尺寸."
 

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

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


@@ -7844,10 +8610,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)"
 


@@ -7867,12 +8629,6 @@ msgstr "~"
 #~ ", 在对资源进行语法分析时\n"
 #~ ", 期望如下关键字 static, #include 或 #define ."
 
 #~ ", 在对资源进行语法分析时\n"
 #~ ", 期望如下关键字 static, #include 或 #define ."
 

-#~ msgid "AddToPropertyCollection called on a generic accessor"
-#~ msgstr "在一个通用处理器上调用AddToPropertyCollection"
-
-#~ msgid "AddToPropertyCollection called w/o valid adder"
-#~ msgstr "调用AddToPropertyCollection时未带有效的adder"
-

 #~ msgid "Bitmap resource specification %s not found."
 #~ msgstr "找不到位图规格 %s."
 
 #~ msgid "Bitmap resource specification %s not found."
 #~ msgstr "找不到位图规格 %s."
 


@@ -7934,27 +8690,12 @@ msgstr "~"
 #~ msgid "Found "
 #~ msgstr "找到 "
 
 #~ msgid "Found "
 #~ msgstr "找到 "
 

-#~ msgid "GetProperty called w/o valid getter"
-#~ msgstr "调用GetProperty时未带有效的getter"
-
-#~ msgid "GetPropertyCollection called on a generic accessor"
-#~ msgstr "在一个通用处理器上调用GetPropertyCollection"
-
-#~ msgid "GetPropertyCollection called w/o valid collection getter"
-#~ msgstr "调用GetPropertyCollection时未带有效的collection getter"
-

 #~ msgid "Icon resource specification %s not found."
 #~ msgstr "没有找到图标资源规范 %s ."
 
 #~ msgid "Ill-formed resource file syntax."
 #~ msgstr "不良的资源文件语法."
 
 #~ msgid "Icon resource specification %s not found."
 #~ msgstr "没有找到图标资源规范 %s ."
 
 #~ msgid "Ill-formed resource file syntax."
 #~ msgstr "不良的资源文件语法."
 

-#~ msgid "Illegal Parameter Count for ConstructObject Method"
-#~ msgstr "非法的针对ConstructObject方法的参数计数"
-
-#~ msgid "Illegal Parameter Count for Create Method"
-#~ msgstr "非法的针对Create方法的参数计数"
-

 #~ msgid "Long Conversions not supported"
 #~ msgstr "不支持长转换"
 
 #~ msgid "Long Conversions not supported"
 #~ msgstr "不支持长转换"
 


@@ -7968,9 +8709,6 @@ msgstr "~"
 #~ msgid "Select all"
 #~ msgstr "全部选择(&A)"
 
 #~ msgid "Select all"
 #~ msgstr "全部选择(&A)"
 

-#~ msgid "SetProperty called w/o valid setter"
-#~ msgstr "调用SetProperty时未带有效的setter"
-

 #~ msgid "String conversions not supported"
 #~ msgstr "不支持字符串装换"
 
 #~ msgid "String conversions not supported"
 #~ msgstr "不支持字符串装换"
 


@@ -7995,9 +8733,6 @@ msgstr "~"
 #~ msgid "invalid eof() return value."
 #~ msgstr "无效的eof()返回值."
 
 #~ msgid "invalid eof() return value."
 #~ msgstr "无效的eof()返回值."
 

-#~ msgid "reading"
-#~ msgstr "正在读入"
-

 #~ msgid "unknown line terminator"
 #~ msgstr "未知行终止符"
 
 #~ msgid "unknown line terminator"
 #~ msgstr "未知行终止符"
 


@@ -8007,9 +8742,6 @@ msgstr "~"
 #~ msgid "."
 #~ msgstr "."
 
 #~ msgid "."
 #~ msgstr "."
 

-#~ msgid ".."
-#~ msgstr ".."
-

 #~ msgid "Cannot open URL '%s'"
 #~ msgstr "不能打开 URL '%s'"
 
 #~ msgid "Cannot open URL '%s'"
 #~ msgstr "不能打开 URL '%s'"