Add more checks for Intel compiler.

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 578beedb7e332fd8bb515cbf718bca3f9e86d9e1..b8898776f03511c1f41bff9abb875c45fbb4adb2 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: wxWidgets 3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-23 18:18+0200\n"
-"PO-Revision-Date: 2012-12-31 12:24+0800\n"
-"Last-Translator: William Jiang <williamroot777@qq.com>\n"
+"POT-Creation-Date: 2013-10-01 19:04+0200\n"
+"PO-Revision-Date: 2013-09-27 10:30-0800\n"
+"Last-Translator: Jiawei Huang <hjiawei@gmail.com>\n"
 "Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../src/common/debugrpt.cpp:591
 msgid ""
@@ -38,11 +38,11 @@ msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              谢谢，我们对您遇到的不便表示抱歉！\n"
 
 #: ../src/common/prntbase.cpp:546
-#, fuzzy, c-format
+#, c-format
 msgid " (copy %d of %d)"
-msgstr "页 %d / %d"
+msgstr "(复制 %d / %d)"
 
-#: ../src/common/log.cpp:427
+#: ../src/common/log.cpp:425
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (错误 %ld: %s)"
@@ -52,7 +52,7 @@ msgstr " (错误 %ld: %s)"
 msgid " (in module \"%s\")"
 msgstr " (于模块: \"%s\")"
 
-#: ../src/common/docview.cpp:1625
+#: ../src/common/docview.cpp:1624
 msgid " - "
 msgstr " - "
 
@@ -129,9 +129,9 @@ msgid "%s Information"
 msgstr "%s 信息"
 
 #: ../src/generic/preferencesg.cpp:110
-#, fuzzy, c-format
+#, c-format
 msgid "%s Preferences"
-msgstr "偏好设置"
+msgstr "%s 偏好设置"
 
 #: ../src/generic/logg.cpp:234
 #, c-format
@@ -210,12 +210,12 @@ msgstr "底端(&B)"
 #: ../src/richtext/richtextborderspage.cpp:503
 #: ../src/richtext/richtextmarginspage.cpp:260
 #: ../src/richtext/richtextmarginspage.cpp:374
-#: ../src/richtext/richtextsizepage.cpp:634
-#: ../src/richtext/richtextsizepage.cpp:641
+#: ../src/richtext/richtextsizepage.cpp:637
+#: ../src/richtext/richtextsizepage.cpp:644
 msgid "&Bottom:"
 msgstr "底端(&B):"
 
-#: ../include/wx/richtext/richtextbuffer.h:3523
+#: ../include/wx/richtext/richtextbuffer.h:3530
 #, fuzzy
 msgid "&Box"
 msgstr "粗体(&B)"
@@ -239,7 +239,7 @@ msgstr "取消(&C)"
 msgid "&Cascade"
 msgstr "层叠(&C)"
 
-#: ../include/wx/richtext/richtextbuffer.h:5578
+#: ../include/wx/richtext/richtextbuffer.h:5587
 #, fuzzy
 msgid "&Cell"
 msgstr "取消(&C)"
@@ -337,7 +337,7 @@ msgstr "完成(&F)"
 msgid "&First"
 msgstr "最前(&F)"
 
-#: ../src/richtext/richtextsizepage.cpp:241
+#: ../src/richtext/richtextsizepage.cpp:244
 msgid "&Floating mode:"
 msgstr "浮动模式(&F):"
 
@@ -374,8 +374,8 @@ msgstr "从(&F):"
 msgid "&Harddisk"
 msgstr "硬盘(&H)"
 
-#: ../src/richtext/richtextsizepage.cpp:348
-#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:351
+#: ../src/richtext/richtextsizepage.cpp:358
 msgid "&Height:"
 msgstr "高度(&H):"
 
@@ -440,8 +440,8 @@ msgstr "左(&L)"
 #: ../src/richtext/richtextliststylepage.cpp:381
 #: ../src/richtext/richtextmarginspage.cpp:187
 #: ../src/richtext/richtextmarginspage.cpp:301
-#: ../src/richtext/richtextsizepage.cpp:529
-#: ../src/richtext/richtextsizepage.cpp:536
+#: ../src/richtext/richtextsizepage.cpp:532
+#: ../src/richtext/richtextsizepage.cpp:539
 msgid "&Left:"
 msgstr "左(&L):"
 
@@ -457,7 +457,7 @@ msgstr "日志(&L)"
 msgid "&Move"
 msgstr "移动(&M)"
 
-#: ../src/richtext/richtextsizepage.cpp:669
+#: ../src/richtext/richtextsizepage.cpp:672
 msgid "&Move the object to:"
 msgstr "移动对象至(&M):"
 
@@ -478,7 +478,7 @@ msgstr "下一个(&N)"
 msgid "&Next >"
 msgstr "下一个(&N) >"
 
-#: ../src/richtext/richtextsizepage.cpp:678
+#: ../src/richtext/richtextsizepage.cpp:681
 msgid "&Next Paragraph"
 msgstr "下一段落(&N)"
 
@@ -525,7 +525,7 @@ msgstr "断页符号(&P)"
 msgid "&Paste"
 msgstr "粘贴(&P)"
 
-#: ../include/wx/richtext/richtextbuffer.h:4648
+#: ../include/wx/richtext/richtextbuffer.h:4655
 msgid "&Picture"
 msgstr "图片(&P)"
 
@@ -537,7 +537,7 @@ msgstr "字体大小(&P):"
 msgid "&Position (tenths of a mm):"
 msgstr "位置(&P) (十分之一毫米)"
 
-#: ../src/richtext/richtextsizepage.cpp:511
+#: ../src/richtext/richtextsizepage.cpp:514
 msgid "&Position mode:"
 msgstr "位置(&P)"
 
@@ -550,7 +550,7 @@ msgstr "偏好设置(&P)"
 msgid "&Previous"
 msgstr "前页(&P)"
 
-#: ../src/richtext/richtextsizepage.cpp:672
+#: ../src/richtext/richtextsizepage.cpp:675
 msgid "&Previous Paragraph"
 msgstr "前一段落(&P)"
 
@@ -558,7 +558,7 @@ msgstr "前一段落(&P)"
 msgid "&Print..."
 msgstr "打印(&P)..."
 
-#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4922
+#: ../src/richtext/richtextctrl.cpp:332 ../src/richtext/richtextctrl.cpp:4945
 #: ../src/common/stockitem.cpp:184
 msgid "&Properties"
 msgstr "属性(&P)"
@@ -604,8 +604,8 @@ msgstr "右(&R)"
 #: ../src/richtext/richtextliststylepage.cpp:399
 #: ../src/richtext/richtextmarginspage.cpp:212
 #: ../src/richtext/richtextmarginspage.cpp:326
-#: ../src/richtext/richtextsizepage.cpp:599
-#: ../src/richtext/richtextsizepage.cpp:606
+#: ../src/richtext/richtextsizepage.cpp:602
+#: ../src/richtext/richtextsizepage.cpp:609
 msgid "&Right:"
 msgstr "右(&R):"
 
@@ -671,7 +671,7 @@ msgstr "子集(&S):"
 msgid "&Symbol:"
 msgstr "符号(&S):"
 
-#: ../include/wx/richtext/richtextbuffer.h:5668
+#: ../include/wx/richtext/richtextbuffer.h:5679
 msgid "&Table"
 msgstr "表格(&T)"
 
@@ -683,8 +683,8 @@ msgstr "顶端(&T)"
 #: ../src/richtext/richtextborderspage.cpp:473
 #: ../src/richtext/richtextmarginspage.cpp:235
 #: ../src/richtext/richtextmarginspage.cpp:349
-#: ../src/richtext/richtextsizepage.cpp:564
-#: ../src/richtext/richtextsizepage.cpp:571
+#: ../src/richtext/richtextsizepage.cpp:567
+#: ../src/richtext/richtextsizepage.cpp:574
 msgid "&Top:"
 msgstr "顶端(&T):"
 
@@ -714,7 +714,7 @@ msgstr "取消缩进(&U)"
 msgid "&Up"
 msgstr "向上(&U)"
 
-#: ../src/richtext/richtextsizepage.cpp:275
+#: ../src/richtext/richtextsizepage.cpp:278
 msgid "&Vertical alignment:"
 msgstr "垂直对齐(&V)"
 
@@ -726,8 +726,8 @@ msgstr "查看(&V)..."
 msgid "&Weight:"
 msgstr "字体粗细(&W):"
 
-#: ../src/richtext/richtextsizepage.cpp:314
-#: ../src/richtext/richtextsizepage.cpp:321
+#: ../src/richtext/richtextsizepage.cpp:317
+#: ../src/richtext/richtextsizepage.cpp:324
 msgid "&Width:"
 msgstr "宽度(&W):"
 
@@ -821,7 +821,7 @@ msgstr "(书签)"
 #: ../src/richtext/richtextindentspage.cpp:287
 #: ../src/richtext/richtextindentspage.cpp:311
 #: ../src/richtext/richtextindentspage.cpp:326
-#: ../src/richtext/richtextformatdlg.cpp:829
+#: ../src/richtext/richtextformatdlg.cpp:831
 #: ../src/richtext/richtextfontpage.cpp:331
 #: ../src/richtext/richtextfontpage.cpp:335
 #: ../src/richtext/richtextfontpage.cpp:339
@@ -1141,7 +1141,7 @@ msgstr "关于"
 msgid "About %s"
 msgstr "关于 %s"
 
-#: ../src/richtext/richtextsizepage.cpp:517
+#: ../src/richtext/richtextsizepage.cpp:520
 msgid "Absolute"
 msgstr ""
 
@@ -1153,18 +1153,20 @@ msgstr "实际大小"
 msgid "Add"
 msgstr "加入"
 
-#: ../src/richtext/richtextbuffer.cpp:10648
-msgid "Add column"
-msgstr ""
+#: ../src/richtext/richtextbuffer.cpp:10751
+#, fuzzy
+msgid "Add Column"
+msgstr "添加列"
+
+#: ../src/richtext/richtextbuffer.cpp:10688
+#, fuzzy
+msgid "Add Row"
+msgstr "添加行"
 
 #: ../src/html/helpwnd.cpp:439
 msgid "Add current page to bookmarks"
 msgstr "把当前页加到书签中"
 
-#: ../src/richtext/richtextbuffer.cpp:10590
-msgid "Add row"
-msgstr ""
-
 #: ../src/generic/colrdlgg.cpp:283
 msgid "Add to custom colours"
 msgstr "加到自定义颜色中"
@@ -1184,15 +1186,15 @@ msgstr "正在添加卷 %s"
 
 #: ../src/osx/carbon/dataview.cpp:1933
 msgid "Adding flavor TEXT failed"
-msgstr ""
+msgstr "添加风格 TEXT 失败"
 
 #: ../src/osx/carbon/dataview.cpp:1954
 msgid "Adding flavor utxt failed"
-msgstr ""
+msgstr "添加风格 utxt 失败"
 
 #: ../src/common/preferencescmn.cpp:41
 msgid "Advanced"
-msgstr ""
+msgstr "高级"
 
 #: ../src/richtext/richtextliststylepage.cpp:435
 msgid "After a paragraph:"
@@ -1206,11 +1208,11 @@ msgstr "左对齐"
 msgid "Align Right"
 msgstr "右对齐"
 
-#: ../src/richtext/richtextsizepage.cpp:263
+#: ../src/richtext/richtextsizepage.cpp:266
 msgid "Alignment"
 msgstr "对齐"
 
-#: ../src/generic/prntdlgg.cpp:220
+#: ../src/generic/prntdlgg.cpp:215
 msgid "All"
 msgstr "所有"
 
@@ -1219,11 +1221,11 @@ msgstr "所有"
 msgid "All files (%s)|%s"
 msgstr "所有文件 (%s)|%s"
 
-#: ../include/wx/defs.h:2884
+#: ../include/wx/defs.h:2922
 msgid "All files (*)|*"
 msgstr "所有文件 (*)|*"
 
-#: ../include/wx/defs.h:2881
+#: ../include/wx/defs.h:2919
 msgid "All files (*.*)|*.*"
 msgstr "所有文件 (*.*)|*.*"
 
@@ -1239,7 +1241,7 @@ msgstr "字母顺序模式"
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "传递已注册对象给 SetObjectClassInfo"
 
-#: ../src/unix/dialup.cpp:354
+#: ../src/unix/dialup.cpp:353
 msgid "Already dialling ISP."
 msgstr "已经拨接 ISP 。"
 
@@ -1436,15 +1438,15 @@ msgstr "边框"
 msgid "Borders"
 msgstr "边框"
 
-#: ../src/richtext/richtextsizepage.cpp:285 ../src/common/stockitem.cpp:144
+#: ../src/richtext/richtextsizepage.cpp:288 ../src/common/stockitem.cpp:144
 msgid "Bottom"
 msgstr "底端"
 
-#: ../src/generic/prntdlgg.cpp:898
+#: ../src/generic/prntdlgg.cpp:893
 msgid "Bottom margin (mm):"
 msgstr "底边距 (毫米):"
 
-#: ../src/richtext/richtextbuffer.cpp:8861
+#: ../src/richtext/richtextbuffer.cpp:8919
 msgid "Box Properties"
 msgstr "方块属性"
 
@@ -1554,9 +1556,9 @@ msgstr "无法创建注册键 '%s'"
 
 #: ../src/msw/thread.cpp:696 ../src/os2/thread.cpp:494
 msgid "Can't create thread"
-msgstr "无法创建进程"
+msgstr "无法创建线程"
 
-#: ../src/msw/window.cpp:3783
+#: ../src/msw/window.cpp:3793
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "无法创建窗口类 %s"
@@ -1682,7 +1684,7 @@ msgstr "无法创建互斥子。"
 msgid "Cannot create new column's ID. Probably max. number of columns reached."
 msgstr "无法建立新的列 ID。可能已达到列数量的上限。"
 
-#: ../src/common/filefn.cpp:1335
+#: ../src/common/filefn.cpp:1336
 #, c-format
 msgid "Cannot enumerate files '%s'"
 msgstr "无法枚举文件 '%s'"
@@ -1695,27 +1697,27 @@ msgstr "无法枚举目录 '%s' 中的文件"
 #: ../src/msw/dialup.cpp:542
 #, c-format
 msgid "Cannot find active dialup connection: %s"
-msgstr "æ\89¾ä¸\8d到活动的拨号连接: %s"
+msgstr "æ\97 æ³\95æ\89¾到活动的拨号连接: %s"
 
 #: ../src/msw/dialup.cpp:848
 msgid "Cannot find the location of address book file"
-msgstr "æ\89¾ä¸\8d到地址簿文件的位置"
+msgstr "æ\97 æ³\95æ\89¾到地址簿文件的位置"
 
 #: ../src/msw/ole/automtn.cpp:562
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot get an active instance of \"%s\""
-msgstr "æ\89¾ä¸\8då\88°æ´»å\8a¨ç\9a\84æ\8b¨å\8f·è¿\9eæ\8e¥: %s"
+msgstr "æ\97 æ³\95è\8e·å¾\97 \"%s\" ç\9a\84æ´»å\8a¨å®\9eä½\93"
 
 #: ../src/unix/threadpsx.cpp:1030
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "无法获得调度策略 %d 的优先级范围。"
 
-#: ../src/unix/utilsunx.cpp:983
+#: ../src/unix/utilsunx.cpp:988
 msgid "Cannot get the hostname"
 msgstr "无法获得主机名"
 
-#: ../src/unix/utilsunx.cpp:1019
+#: ../src/unix/utilsunx.cpp:1024
 msgid "Cannot get the official hostname"
 msgstr "无法获得正式的主机名"
 
@@ -1751,7 +1753,7 @@ msgstr "无法从文件 '%s' 中载入资源。"
 msgid "Cannot open HTML document: %s"
 msgstr "无法打开 HTML 文档: %s"
 
-#: ../src/html/helpdata.cpp:664
+#: ../src/html/helpdata.cpp:665
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "无法打开 HTML 帮助: %s"
@@ -1790,9 +1792,9 @@ msgid "Cannot resume thread %lu"
 msgstr "无法恢复线程 %lu"
 
 #: ../src/msw/thread.cpp:923
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot resume thread %lx"
-msgstr "无法恢复线程 %x"
+msgstr "无法恢复线程 %lx"
 
 #: ../src/unix/threadpsx.cpp:1011
 msgid "Cannot retrieve thread scheduling policy."
@@ -1813,9 +1815,9 @@ msgid "Cannot suspend thread %lu"
 msgstr "无法挂起线程 %lu"
 
 #: ../src/msw/thread.cpp:907
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot suspend thread %lx"
-msgstr "无法挂起线程 %x"
+msgstr "无法挂起线程 %lx"
 
 #: ../src/msw/thread.cpp:830
 msgid "Cannot wait for thread termination"
@@ -1829,7 +1831,7 @@ msgstr "大小写敏感"
 msgid "Categorized Mode"
 msgstr "分类模式"
 
-#: ../src/richtext/richtextbuffer.cpp:9273
+#: ../src/richtext/richtextbuffer.cpp:9347
 msgid "Cell Properties"
 msgstr "单元格属性"
 
@@ -1862,7 +1864,7 @@ msgstr "居中"
 msgid "Centre text."
 msgstr "文字居中。"
 
-#: ../src/richtext/richtextsizepage.cpp:284
+#: ../src/richtext/richtextsizepage.cpp:287
 msgid "Centred"
 msgstr "居中"
 
@@ -1871,19 +1873,20 @@ msgstr "居中"
 msgid "Ch&oose..."
 msgstr "选择(&o)..."
 
-#: ../src/richtext/richtextbuffer.cpp:4029
+#: ../src/richtext/richtextbuffer.cpp:4041
 msgid "Change List Style"
 msgstr "更改列表样式"
 
-#: ../src/richtext/richtextbuffer.cpp:3380
+#: ../src/richtext/richtextbuffer.cpp:3392
 msgid "Change Object Style"
 msgstr "更改对象样式"
 
-#: ../src/richtext/richtextbuffer.cpp:3646
+#: ../src/richtext/richtextbuffer.cpp:3658
+#: ../src/richtext/richtextbuffer.cpp:7749
 msgid "Change Properties"
 msgstr "修改属性"
 
-#: ../src/richtext/richtextbuffer.cpp:3197
+#: ../src/richtext/richtextbuffer.cpp:3209
 msgid "Change Style"
 msgstr "更改样式"
 
@@ -2129,7 +2132,7 @@ msgstr "关闭此窗口"
 msgid "Color"
 msgstr "颜色"
 
-#: ../src/richtext/richtextformatdlg.cpp:723
+#: ../src/richtext/richtextformatdlg.cpp:725
 msgid "Colour"
 msgstr "颜色"
 
@@ -2174,7 +2177,7 @@ msgstr "命令行参数 %d 无法被转化成Unicode编码，其将被忽略。"
 msgid "Common dialog failed with error code %0lx."
 msgstr "公共对话框错误，错误码 %0lx。"
 
-#: ../src/gtk/window.cpp:4284
+#: ../src/gtk/window.cpp:4306
 msgid ""
 "Compositing not supported by this system, please enable it in your Window "
 "Manager."
@@ -2223,7 +2226,7 @@ msgstr "转换"
 msgid "Copied to clipboard:\"%s\""
 msgstr "已复制到剪贴板:\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:252
+#: ../src/generic/prntdlgg.cpp:247
 msgid "Copies:"
 msgstr "份数:"
 
@@ -2304,7 +2307,7 @@ msgstr "无法设定对齐。"
 msgid "Could not set column width."
 msgstr "无法启动文档预览。"
 
-#: ../src/common/filefn.cpp:1568
+#: ../src/common/filefn.cpp:1569
 msgid "Could not set current working directory"
 msgstr "无法设置当前工作目录"
 
@@ -2333,11 +2336,11 @@ msgid "Could not start document preview."
 msgstr "无法启动文档预览。"
 
 #: ../src/generic/printps.cpp:178 ../src/msw/printwin.cpp:210
-#: ../src/gtk/print.cpp:1086 ../src/gtk/gnome/gprint.cpp:922
+#: ../src/gtk/print.cpp:1077
 msgid "Could not start printing."
 msgstr "无法启动打印。"
 
-#: ../src/common/wincmn.cpp:2114
+#: ../src/common/wincmn.cpp:2131
 msgid "Could not transfer data to window"
 msgstr "无法把数据转到窗口"
 
@@ -2356,11 +2359,10 @@ msgid "Couldn't create a timer"
 msgstr "无法创建计时器"
 
 #: ../src/osx/carbon/overlay.cpp:122
-#, fuzzy
 msgid "Couldn't create the overlay window"
-msgstr "无法创建计时器"
+msgstr "无法创建 overlay 窗口"
 
-#: ../src/common/translation.cpp:2024
+#: ../src/common/translation.cpp:2015
 #, fuzzy
 msgid "Couldn't enumerate translations"
 msgstr "无法终止线程"
@@ -2370,9 +2372,9 @@ msgstr "无法终止线程"
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在动态连接库中找不到符号 '%s'"
 
-#: ../src/gtk/print.cpp:2023
+#: ../src/gtk/print.cpp:2014
 msgid "Couldn't get hatch style from wxBrush."
-msgstr ""
+msgstr "无法从 wxBrush 获取阴影样式。"
 
 #: ../src/msw/thread.cpp:950
 msgid "Couldn't get the current thread pointer"
@@ -2398,9 +2400,8 @@ msgid "Couldn't load sound data from '%s'."
 msgstr "无法从 '%s' 中的读取声音数据。"
 
 #: ../src/msw/dirdlg.cpp:441
-#, fuzzy
 msgid "Couldn't obtain folder name"
-msgstr "无法创建计时器"
+msgstr "无法获取文件夹名称"
 
 #: ../src/unix/sound_sdl.cpp:229
 #, c-format
@@ -2431,9 +2432,9 @@ msgid "Couldn't terminate thread"
 msgstr "无法终止线程"
 
 #: ../src/common/xtistrm.cpp:170
-#, fuzzy, c-format
+#, c-format
 msgid "Create Parameter %s not found in declared RTTI Parameters"
-msgstr "在声明的RTTI参数里找不到创建参数"
+msgstr "在声明的 RTTI 参数里找不到创建参数 %s"
 
 #: ../src/generic/dirdlgg.cpp:317
 msgid "Create directory"
@@ -2456,7 +2457,7 @@ msgstr "剪切(&t)"
 msgid "Current directory:"
 msgstr "当前目录:"
 
-#: ../src/gtk/print.cpp:768
+#: ../src/gtk/print.cpp:759
 msgid "Custom size"
 msgstr "自定义大小"
 
@@ -2565,11 +2566,11 @@ msgstr "缺省编码"
 msgid "Default font"
 msgstr "缺省字体"
 
-#: ../src/generic/prntdlgg.cpp:515
+#: ../src/generic/prntdlgg.cpp:510
 msgid "Default printer"
 msgstr "缺省的打印机"
 
-#: ../src/richtext/richtextbuffer.cpp:7793 ../src/common/stockitem.cpp:152
+#: ../src/richtext/richtextbuffer.cpp:7841 ../src/common/stockitem.cpp:152
 #: ../src/stc/stc_i18n.cpp:20
 msgid "Delete"
 msgstr "删除"
@@ -2578,6 +2579,16 @@ msgstr "删除"
 msgid "Delete A&ll"
 msgstr "删除全部(&l)"
 
+#: ../src/richtext/richtextbuffer.cpp:10637
+#, fuzzy
+msgid "Delete Column"
+msgstr "删除列"
+
+#: ../src/richtext/richtextbuffer.cpp:10587
+#, fuzzy
+msgid "Delete Row"
+msgstr "删除行"
+
 #: ../src/richtext/richtextstyledlg.cpp:779
 msgid "Delete Style"
 msgstr "删除样式"
@@ -2586,20 +2597,10 @@ msgstr "删除样式"
 msgid "Delete Text"
 msgstr "删除文字"
 
-#: ../src/richtext/richtextbuffer.cpp:10540
-#, fuzzy
-msgid "Delete column"
-msgstr "删除选区"
-
 #: ../src/generic/editlbox.cpp:274
 msgid "Delete item"
 msgstr "删除项"
 
-#: ../src/richtext/richtextbuffer.cpp:10472
-#, fuzzy
-msgid "Delete row"
-msgstr "删除"
-
 #: ../src/common/stockitem.cpp:260
 msgid "Delete selection"
 msgstr "删除选区"
@@ -2654,15 +2655,15 @@ msgstr "DirectFB错误 %d 发生。"
 msgid "Directories"
 msgstr "目录"
 
-#: ../src/common/filefn.cpp:1250
+#: ../src/common/filefn.cpp:1251
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "无法创建目录 '%s'"
 
-#: ../src/common/filefn.cpp:1270
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1271
+#, c-format
 msgid "Directory '%s' couldn't be deleted"
-msgstr "ç\9b®å½\95'%s'æ\97 æ³\95被å\88\9b建"
+msgstr "ç\9b®å½\95'%s'æ\97 æ³\95被å\88 é\99¤"
 
 #: ../src/generic/dirdlgg.cpp:233
 msgid "Directory does not exist"
@@ -2706,9 +2707,9 @@ msgstr ""
 "%s %1"
 
 #: ../src/common/docview.cpp:531
-#, fuzzy, c-format
+#, c-format
 msgid "Do you want to save changes to %s?"
-msgstr "你想保存对文档%s的修改?"
+msgstr "你想保存对文档 %s 的修改吗?"
 
 #: ../src/common/prntbase.cpp:525
 msgid "Document:"
@@ -2798,41 +2799,38 @@ msgid "Edit item"
 msgstr "编辑项"
 
 #: ../include/wx/generic/progdlgg.h:84
-#, fuzzy
 msgid "Elapsed time:"
 msgstr "用时: "
 
-#: ../src/richtext/richtextsizepage.cpp:350
-#: ../src/richtext/richtextsizepage.cpp:352
-#: ../src/richtext/richtextsizepage.cpp:462
-#: ../src/richtext/richtextsizepage.cpp:464
+#: ../src/richtext/richtextsizepage.cpp:353
+#: ../src/richtext/richtextsizepage.cpp:355
+#: ../src/richtext/richtextsizepage.cpp:465
+#: ../src/richtext/richtextsizepage.cpp:467
 msgid "Enable the height value."
 msgstr "启用高度值。"
 
-#: ../src/richtext/richtextsizepage.cpp:435
-#: ../src/richtext/richtextsizepage.cpp:437
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:438
+#: ../src/richtext/richtextsizepage.cpp:440
 msgid "Enable the maximum width value."
-msgstr "无法设定最大宽度。"
+msgstr "启用最大宽度值。"
 
-#: ../src/richtext/richtextsizepage.cpp:408
-#: ../src/richtext/richtextsizepage.cpp:410
+#: ../src/richtext/richtextsizepage.cpp:411
+#: ../src/richtext/richtextsizepage.cpp:413
 msgid "Enable the minimum height value."
 msgstr "启用最小高度值。"
 
-#: ../src/richtext/richtextsizepage.cpp:381
-#: ../src/richtext/richtextsizepage.cpp:383
-#, fuzzy
+#: ../src/richtext/richtextsizepage.cpp:384
+#: ../src/richtext/richtextsizepage.cpp:386
 msgid "Enable the minimum width value."
-msgstr "无法设定最小宽度。"
+msgstr "启用最小宽度值。"
 
-#: ../src/richtext/richtextsizepage.cpp:316
-#: ../src/richtext/richtextsizepage.cpp:318
+#: ../src/richtext/richtextsizepage.cpp:319
+#: ../src/richtext/richtextsizepage.cpp:321
 msgid "Enable the width value."
 msgstr "启用宽度值。"
 
-#: ../src/richtext/richtextsizepage.cpp:277
-#: ../src/richtext/richtextsizepage.cpp:279
+#: ../src/richtext/richtextsizepage.cpp:280
+#: ../src/richtext/richtextsizepage.cpp:282
 msgid "Enable vertical alignment."
 msgstr "启用垂直对齐。"
 
@@ -2842,9 +2840,8 @@ msgid "Enables a background colour."
 msgstr "启用背景颜色。"
 
 #: ../src/richtext/richtextstyledlg.cpp:931
-#, fuzzy
 msgid "Enter a box style name"
-msgstr "è¾\93å\85¥æ\96°æ ·å¼\8få\90\8d"
+msgstr "è¾\93å\85¥æ\96\87å­\97æ\96¹å\9d\97æ ·å¼\8få\90\8d称"
 
 #: ../src/richtext/richtextstyledlg.cpp:603
 msgid "Enter a character style name"
@@ -2895,18 +2892,16 @@ msgid "Error closing epoll descriptor"
 msgstr "关闭 epoll 描述符时发生错误"
 
 #: ../src/unix/fswatcher_kqueue.cpp:114
-#, fuzzy
 msgid "Error closing kqueue instance"
-msgstr "å\88\9b建ç\9b®å½\95错误"
+msgstr "å\85³é\97­ kqueue å®\9eä¾\8bæ\97¶å\8f\91ç\94\9f错误"
 
 #: ../src/generic/dirdlgg.cpp:251
 msgid "Error creating directory"
 msgstr "创建目录错误"
 
 #: ../src/common/imagbmp.cpp:1103
-#, fuzzy
 msgid "Error in reading image DIB."
-msgstr "读å\9b¾å\83\8fDIBé\94\99误."
+msgstr "读å\8f\96å\9b¾å\83\8f DIB é\94\99误ã\80\82"
 
 #: ../src/propgrid/propgrid.cpp:6563
 #, c-format
@@ -2921,11 +2916,11 @@ msgstr "读配置选项错误。"
 msgid "Error saving user configuration data."
 msgstr "保存用户配置数据错误."
 
-#: ../src/gtk/print.cpp:680
+#: ../src/gtk/print.cpp:671
 msgid "Error while printing: "
 msgstr "打印时出错: "
 
-#: ../src/common/log.cpp:225
+#: ../src/common/log.cpp:223
 msgid "Error: "
 msgstr "错误: "
 
@@ -2934,9 +2929,8 @@ msgid "Esperanto (ISO-8859-3)"
 msgstr "世界语 (ISO-8859-3)"
 
 #: ../include/wx/generic/progdlgg.h:85
-#, fuzzy
 msgid "Estimated time:"
-msgstr "预期时间: "
+msgstr "预期时间:"
 
 #: ../src/unix/fswatcher_inotify.cpp:639
 msgid "Event queue overflowed"
@@ -2984,13 +2978,12 @@ msgid "F"
 msgstr "F"
 
 #: ../src/propgrid/advprops.cpp:640
-#, fuzzy
 msgid "Face Name"
-msgstr "新名称"
+msgstr "字体名称"
 
 #: ../src/unix/snglinst.cpp:269
 msgid "Failed to access lock file."
-msgstr "访问锁文件失败。"
+msgstr "无法访问锁文件。"
 
 #: ../src/unix/epolldispatcher.cpp:116
 #, c-format
@@ -3000,7 +2993,7 @@ msgstr "无法将描述符 %d 加到 epoll 描述符 %d"
 #: ../src/msw/dib.cpp:548
 #, c-format
 msgid "Failed to allocate %luKb of memory for bitmap data."
-msgstr "为位图数据分配 %luKb 内存失败。"
+msgstr "无法为位图数据分配 %luKb 内存。"
 
 #: ../src/common/glcmn.cpp:87
 msgid "Failed to allocate colour for OpenGL"
@@ -3008,7 +3001,7 @@ msgstr "无法为 OpenGL 分配颜色"
 
 #: ../src/unix/displayx11.cpp:288
 msgid "Failed to change video mode"
-msgstr "æ\94¹å\8f\98è§\86é¢\91模å¼\8f失败。"
+msgstr "æ\97 æ³\95æ\94¹å\8f\98è§\86é¢\91模å¼\8f。"
 
 #: ../src/common/image.cpp:3139
 #, c-format
@@ -3022,21 +3015,21 @@ msgstr "无法清除调试报告目录 \"%s\""
 
 #: ../src/common/filename.cpp:211
 msgid "Failed to close file handle"
-msgstr "关闭文件句柄失败"
+msgstr "无法关闭文件句柄"
 
 #: ../src/unix/snglinst.cpp:334
 #, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "关闭锁文件 '%s'失败"
+msgstr "无法关闭锁文件 '%s'"
 
 #: ../src/msw/clipbrd.cpp:115
 msgid "Failed to close the clipboard."
-msgstr "关闭剪贴板失败。"
+msgstr "无法关闭剪贴板。"
 
 #: ../src/x11/utils.cpp:204
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to close the display \"%s\""
-msgstr "关闭剪贴板失败."
+msgstr "无法关闭显示 \"%s\""
 
 #: ../src/msw/dialup.cpp:818
 msgid "Failed to connect: missing username/password."
@@ -3058,38 +3051,38 @@ msgstr "无法将对话框内容复制到剪贴板。"
 #: ../src/msw/registry.cpp:691
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "复制注册键值失败 '%s'"
+msgstr "无法复制注册键值 '%s'"
 
 #: ../src/msw/registry.cpp:700
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "æ\8a\8a注å\86\8cé\94®å\86\85容ä»\8e '%s' å¤\8då\88¶å\88° '%s' 失败。"
+msgstr "æ\97 æ³\95æ\8a\8a注å\86\8cé\94®å\86\85容ä»\8e '%s' å¤\8då\88¶å\88° '%s'。"
 
 #: ../src/common/filefn.cpp:1058
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "复制文件 '%s' 至 '%s' 失败"
+msgstr "无法复制文件 '%s' 至 '%s'"
 
 #: ../src/msw/registry.cpp:678
 #, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "复制注册表子键 '%s' 至 '%s' 失败。"
+msgstr "无法复制注册表子键 '%s' 至 '%s'。"
 
 #: ../src/msw/dde.cpp:1073
 msgid "Failed to create DDE string"
-msgstr "创建 DDE 字符串失败"
+msgstr "无法创建 DDE 字符串"
 
 #: ../src/msw/mdi.cpp:590
 msgid "Failed to create MDI parent frame."
-msgstr "创建 MDI 父框架失败。"
+msgstr "无法创建 MDI 父框架。"
 
 #: ../src/common/filename.cpp:1080
 msgid "Failed to create a temporary file name"
-msgstr "创建临时文件名失败"
+msgstr "无法创建临时文件名"
 
 #: ../src/msw/utilsexc.cpp:235
 msgid "Failed to create an anonymous pipe"
-msgstr "创建匿名管道失败"
+msgstr "无法创建匿名管道"
 
 #: ../src/msw/ole/automtn.cpp:522
 #, c-format
@@ -3099,11 +3092,11 @@ msgstr "无法创建实例 \"%s\""
 #: ../src/msw/dde.cpp:442
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "å\88\9b建å\88°æ\9c\8då\8a¡å\99¨ '%s' ç\9a\84å\85³äº\8e主é¢\98 '%s' ç\9a\84è¿\9eæ\8e¥å¤±è´¥"
+msgstr "æ\97 æ³\95å\88\9b建å\88°æ\9c\8då\8a¡å\99¨ '%s' å\85³äº\8e主é¢\98 '%s' ç\9a\84è¿\9eæ\8e¥"
 
 #: ../src/msw/cursor.cpp:212
 msgid "Failed to create cursor."
-msgstr "创建游标失败。"
+msgstr "无法创建游标。"
 
 #: ../src/common/debugrpt.cpp:209
 #, c-format
@@ -3116,7 +3109,7 @@ msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"创建目录 '%s' 失败\n"
+"无法创建目录 '%s'\n"
 "(您是否有所需的权限?)"
 
 #: ../src/unix/epolldispatcher.cpp:84
@@ -3126,12 +3119,12 @@ msgstr "无法创建 epoll 描述符"
 #: ../src/msw/mimetype.cpp:198
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "为 '%s' 文件创建注册条目失败。"
+msgstr "无法为 '%s' 文件创建注册条目。"
 
 #: ../src/msw/fdrepdlg.cpp:442
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
+msgstr "无法创建标准\"查找/替换\"对话框 (错误号 %d)"
 
 #: ../src/unix/wakeuppipe.cpp:52
 #, fuzzy
@@ -3141,29 +3134,29 @@ msgstr "创建状态条失败."
 #: ../src/html/winpars.cpp:739
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
-msgstr "æ\8c\89ç¼\96ç \81 %s æ\98¾ç¤ºHTMLæ\96\87档失败"
+msgstr "æ\97 æ³\95æ\8c\89ç¼\96ç \81 %s æ\98¾ç¤º HTML æ\96\87æ¡£"
 
 #: ../src/msw/clipbrd.cpp:127
 msgid "Failed to empty the clipboard."
-msgstr "æ¸\85空å\89ªè´´æ\9d¿å¤±è´¥"
+msgstr "æ\97 æ³\95æ¸\85空å\89ªè´´æ\9d¿"
 
 #: ../src/unix/displayx11.cpp:265
 msgid "Failed to enumerate video modes"
-msgstr "æ\9e\9a举è§\86é¢\91模å¼\8f失败"
+msgstr "æ\97 æ³\95æ\9e\9a举è§\86é¢\91模å¼\8f"
 
 #: ../src/msw/dde.cpp:727
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "在DDE服务器建立advise循环失败"
+msgstr "无法在 DDE 服务器建立 advise 循环"
 
 #: ../src/msw/dialup.cpp:650 ../src/msw/dialup.cpp:884
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "建ç«\8bæ\8b¨å\8f·è¿\9eæ\8e¥å¤±è´¥: %s"
+msgstr "æ\97 æ³\95建ç«\8bæ\8b¨å\8f·è¿\9eæ\8e¥: %s"
 
 #: ../src/unix/utilsunx.cpp:617
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "æ\89§è¡\8c '%s' 失败\n"
+msgstr "æ\97 æ³\95æ\89§è¡\8c '%s'\n"
 
 #: ../src/common/debugrpt.cpp:725
 msgid "Failed to execute curl, please install it in PATH."
@@ -3182,7 +3175,7 @@ msgstr "无法找到匹配的正则表达式: %s"
 #: ../src/msw/dialup.cpp:716
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "获取 ISP 名失败: %s"
+msgstr "无法获取 ISP 名称: %s"
 
 #: ../src/msw/ole/automtn.cpp:574
 #, fuzzy, c-format
@@ -3191,15 +3184,15 @@ msgstr "无法创建目录 \"%s\""
 
 #: ../src/msw/clipbrd.cpp:747
 msgid "Failed to get data from the clipboard"
-msgstr "从剪贴板获取数据失败"
+msgstr "无法从剪贴板获取数据"
 
 #: ../src/common/time.cpp:249
 msgid "Failed to get the local system time"
-msgstr "获取本地系统时间失败"
+msgstr "无法获取本地系统时间"
 
-#: ../src/common/filefn.cpp:1452
+#: ../src/common/filefn.cpp:1453
 msgid "Failed to get the working directory"
-msgstr "获取工作目录失败"
+msgstr "无法获取工作目录"
 
 #: ../src/univ/theme.cpp:113
 msgid "Failed to initialize GUI: no built-in themes found."
@@ -3207,7 +3200,7 @@ msgstr "无法初始化 GUI: 找不到内嵌的主题。"
 
 #: ../src/msw/helpchm.cpp:63
 msgid "Failed to initialize MS HTML Help."
-msgstr "初始化MS HTML 帮助失败。"
+msgstr "无法初始化 MS HTML 帮助。"
 
 #: ../src/msw/glcanvas.cpp:892
 msgid "Failed to initialize OpenGL"
@@ -3225,33 +3218,32 @@ msgstr "无法在控件中插入文字。"
 #: ../src/unix/snglinst.cpp:241
 #, c-format
 msgid "Failed to inspect the lock file '%s'"
-msgstr "æ£\80æ\9f¥é\94\81æ\96\87件 '%s' 失败"
+msgstr "æ\97 æ³\95æ£\80æ\9f¥é\94\81æ\96\87件 '%s'"
 
 #: ../src/unix/appunix.cpp:182
-#, fuzzy
 msgid "Failed to install signal handler"
-msgstr "关闭文件句柄失败."
+msgstr "无法安装信号句柄"
 
 #: ../src/unix/threadpsx.cpp:1162
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
-msgstr "合并线程失败，检测到潜在地内存丢失 - 请重新启动系统"
+msgstr "无法合并线程，检测到潜在地内存丢失 - 请重新启动系统"
 
 #: ../src/msw/utils.cpp:745
 #, c-format
 msgid "Failed to kill process %d"
-msgstr "终止进程 %d 失败"
+msgstr "无法终止进程 %d"
 
 #: ../src/common/image.cpp:2365
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load bitmap \"%s\" from resources."
-msgstr "无法从数据流中载入图像 %d。"
+msgstr "无法从资源中载入图像 \"%s\"。"
 
 #: ../src/common/image.cpp:2374
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load icon \"%s\" from resources."
-msgstr "无法从数据流中载入图像 %d。"
+msgstr "无法从资源中载入图标 \"%s\"。"
 
 #: ../src/common/iconbndl.cpp:182
 #, c-format
@@ -3264,23 +3256,23 @@ msgid "Failed to load image %d from stream."
 msgstr "无法从数据流中载入图像 %d。"
 
 #: ../src/common/image.cpp:2450 ../src/common/image.cpp:2469
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load image from file \"%s\"."
-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法从文件 \"%s\" 中读取图像。"
 
 #: ../src/msw/enhmeta.cpp:97
 #, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "从文件 \"%s\" 读取元文件失败。"
+msgstr "无法从文件 \"%s\" 读取元文件。"
 
 #: ../src/msw/volume.cpp:327
 msgid "Failed to load mpr.dll."
-msgstr "装载 mpr.dll 失败。"
+msgstr "无法装载 mpr.dll。"
 
 #: ../src/msw/utils.cpp:1120
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load resource \"%s\"."
-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法载入资源 \"%s\"。"
 
 #: ../src/common/dynlib.cpp:100
 #, c-format
@@ -3288,14 +3280,14 @@ msgid "Failed to load shared library '%s'"
 msgstr "无法装载共享库 '%s'"
 
 #: ../src/msw/utils.cpp:1127
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to lock resource \"%s\"."
-msgstr "锁定锁文件 '%s'失败"
+msgstr "无法锁定资源 \"%s\"。"
 
 #: ../src/unix/snglinst.cpp:198
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "锁定锁文件 '%s' 失败"
+msgstr "无法锁定锁文件 '%s'"
 
 #: ../src/unix/epolldispatcher.cpp:136
 #, c-format
@@ -3305,31 +3297,31 @@ msgstr "无法修改描述符 %d (于epoll描述符 %d)"
 #: ../src/common/filename.cpp:2681
 #, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "为 '%s' 修改文件时间失败"
+msgstr "无法为 '%s' 修改文件时间"
 
 #: ../src/common/selectdispatcher.cpp:252
 msgid "Failed to monitor I/O channels"
 msgstr "无法检测I/O通道"
 
 #: ../src/common/filename.cpp:194
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open '%s' for reading"
-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95读å\8f\96æ\96\87件 '%s'"
 
 #: ../src/common/filename.cpp:199
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open '%s' for writing"
-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95å\86\99å\85¥æ\96\87件 '%s'"
 
 #: ../src/html/chm.cpp:141
 #, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "æ\89\93å¼\80CHMå­\98æ¡£ '%s' 失败。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80 CHM å­\98æ¡£ '%s'。"
 
 #: ../src/common/utilscmn.cpp:1135
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open URL \"%s\" in default browser."
-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\97 æ³\95å\9c¨é»\98认æµ\8fè§\88å\99¨ä¸­æ\89\93å¼\80 URL \"%s\"ã\80\82"
 
 #: ../include/wx/msw/private/fswatcher.h:92
 #, fuzzy, c-format
@@ -3343,11 +3335,11 @@ msgstr "打开 '%s'(为 %s) 失败"
 
 #: ../src/common/filename.cpp:1115
 msgid "Failed to open temporary file."
-msgstr "æ\89\93å¼\80临æ\97¶æ\96\87件失败。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80临æ\97¶æ\96\87件。"
 
 #: ../src/msw/clipbrd.cpp:94
 msgid "Failed to open the clipboard."
-msgstr "æ\89\93å¼\80å\89ªè´´æ\9d¿å¤±è´¥。"
+msgstr "æ\97 æ³\95æ\89\93å¼\80å\89ªè´´æ\9d¿。"
 
 #: ../src/common/translation.cpp:1170
 #, c-format
@@ -3361,26 +3353,24 @@ msgstr "打开 '%s'(为 %s) 失败"
 
 #: ../src/msw/clipbrd.cpp:647
 msgid "Failed to put data on the clipboard"
-msgstr "æ\8a\8aæ\95°æ\8d®æ\94¾å\88°å\89ªè´´æ\9d¿å¤±è´¥"
+msgstr "æ\97 æ³\95æ\8a\8aæ\95°æ\8d®æ\94¾å\88°å\89ªè´´æ\9d¿"
 
 #: ../src/unix/snglinst.cpp:278
 msgid "Failed to read PID from lock file."
-msgstr "从锁文件读取 PID 失败。"
+msgstr "无法从锁文件读取 PID。"
 
 #: ../src/common/fileconf.cpp:464
-#, fuzzy
 msgid "Failed to read config options."
-msgstr "读配置选项错误."
+msgstr "无法读配置选项。"
 
 #: ../src/common/docview.cpp:678
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read document from the file \"%s\"."
-msgstr "从文件 \"%s\"读取元文件失败."
+msgstr "无法从文件 \"%s\" 中读取文档。"
 
 #: ../src/dfb/evtloop.cpp:98
-#, fuzzy
 msgid "Failed to read event from DirectFB pipe"
-msgstr "从锁文件读取PID失败."
+msgstr "无法从 DirectFB 管道中读取事件"
 
 #: ../src/unix/wakeuppipe.cpp:120
 #, fuzzy
@@ -3389,21 +3379,21 @@ msgstr "从锁文件读取PID失败."
 
 #: ../src/unix/utilsunx.cpp:685
 msgid "Failed to redirect child process input/output"
-msgstr "重定向子过程输入/输出失败"
+msgstr "无法重定向子过程输入/输出"
 
 #: ../src/msw/utilsexc.cpp:697
 msgid "Failed to redirect the child process IO"
-msgstr "重定向子过程IO失败"
+msgstr "无法重定向子过程 IO"
 
 #: ../src/msw/dde.cpp:293
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "注å\86\8cDDEæ\9c\8då\8a¡å\99¨ '%s' 失败"
+msgstr "æ\97 æ³\95注å\86\8c DDE æ\9c\8då\8a¡å\99¨ '%s'"
 
 #: ../src/common/fontmap.cpp:245
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "回忆字符集 '%s' 编码失败。"
+msgstr "无法记忆字符集 '%s' 的编码。"
 
 #: ../src/common/debugrpt.cpp:227
 #, c-format
@@ -3418,12 +3408,12 @@ msgstr "无法删除锁文件 '%s'"
 #: ../src/unix/snglinst.cpp:288
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "删除过期的锁文件 '%s' 失败。"
+msgstr "无法删除过期的锁文件 '%s'。"
 
 #: ../src/msw/registry.cpp:528
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "将注册值 '%s' 重命名为 '%s' 失败。"
+msgstr "无法将注册值 '%s' 重命名为 '%s'。"
 
 #: ../src/common/filefn.cpp:1168
 #, c-format
@@ -3435,24 +3425,24 @@ msgstr "无法将文件'%s' 重命名为 '%s'，因为目标文件已存在。"
 #: ../src/msw/registry.cpp:633
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "将注册键 '%s' 重命名为 '%s' 失败。"
+msgstr "无法将注册键 '%s' 重命名为 '%s'。"
 
 #: ../src/msw/clipbrd.cpp:497
 msgid "Failed to retrieve data from the clipboard."
-msgstr "从剪贴板检取数据失败。"
+msgstr "无法从剪贴板检取数据。"
 
 #: ../src/common/filename.cpp:2777
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´å¤±è´¥"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96 '%s' æ\96\87件æ\97¶é\97´"
 
 #: ../src/msw/dialup.cpp:487
 msgid "Failed to retrieve text of RAS error message"
-msgstr "æ\8f\90å\8f\96 RAS é\94\99误æ¶\88æ\81¯æ­£æ\96\87失败"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96 RAS é\94\99误æ¶\88æ\81¯æ­£æ\96\87"
 
 #: ../src/msw/clipbrd.cpp:784
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "æ\8f\90å\8f\96æ\94¯æ\8c\81ç\9a\84å\89ªè´´æ\9d¿æ ¼å¼\8f失败"
+msgstr "æ\97 æ³\95æ\8f\90å\8f\96æ\94¯æ\8c\81ç\9a\84å\89ªè´´æ\9d¿æ ¼å¼\8f"
 
 #: ../src/common/docview.cpp:649
 #, fuzzy, c-format
@@ -3462,34 +3452,33 @@ msgstr "将位图图像保存至文件 \"%s\"失败."
 #: ../src/msw/dib.cpp:326
 #, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "将位图图像保存至文件 \"%s\" 失败。"
+msgstr "无法将位图图像保存至文件 \"%s\"。"
 
 #: ../src/msw/dde.cpp:768
 msgid "Failed to send DDE advise notification"
-msgstr "å\8f\91é\80\81 DDE advise é\80\9aç\9f¥å¤±è´¥"
+msgstr "æ\97 æ³\95å\8f\91é\80\81 DDE advise é\80\9aç\9f¥"
 
 #: ../src/common/ftp.cpp:404
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "设置 FTP 传输模式为 %s 时失败。"
+msgstr "无法设置 FTP 传输模式为 %s。"
 
 #: ../src/msw/clipbrd.cpp:373
 msgid "Failed to set clipboard data."
-msgstr "设置剪贴板数据失败。"
+msgstr "无法设置剪贴板数据。"
 
 #: ../src/unix/snglinst.cpp:181
 #, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "在锁文件 '%s' 上设置许可权限时失败"
+msgstr "无法在锁文件 '%s' 上设置许可权限"
 
 #: ../src/unix/utilsunx.cpp:674
-#, fuzzy
 msgid "Failed to set process priority"
-msgstr "设置线程优先级 %d 失败。"
+msgstr "无法设置线程优先级"
 
 #: ../src/common/file.cpp:576
 msgid "Failed to set temporary file permissions"
-msgstr "设置临时文件的许可权限时失败"
+msgstr "无法设置临时文件的许可权限"
 
 #: ../src/gtk/textctrl.cpp:1058
 #, fuzzy
@@ -3504,7 +3493,7 @@ msgstr "设置线程优先级 %d 失败。"
 #: ../src/unix/threadpsx.cpp:1377 ../src/unix/threadpsx.cpp:1387
 #, c-format
 msgid "Failed to set thread priority %d."
-msgstr "设置线程优先级 %d 失败。"
+msgstr "无法设置线程优先级 %d。"
 
 #: ../src/unix/utilsunx.cpp:791
 msgid "Failed to set up non-blocking pipe, the program might hang."
@@ -3513,7 +3502,7 @@ msgstr "无法设置非闭塞通道，程序可能挂起。"
 #: ../src/common/fs_mem.cpp:261
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "将图像 '%s' 存到内存 VFS 失败！"
+msgstr "无法将图像 '%s' 存到内存 VFS！"
 
 #: ../src/dfb/evtloop.cpp:170
 msgid "Failed to switch DirectFB pipe to non-blocking mode"
@@ -3525,16 +3514,16 @@ msgstr "无法将唤醒管道切换至非闭塞模式"
 
 #: ../src/unix/threadpsx.cpp:1569
 msgid "Failed to terminate a thread."
-msgstr "终止线程失败。"
+msgstr "无法终止线程。"
 
 #: ../src/msw/dde.cpp:746
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "终止与 DDE 服务器的 advise 循环失败"
+msgstr "无法终止与 DDE 服务器的 advise 循环"
 
 #: ../src/msw/dialup.cpp:959
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "ç»\88æ­¢æ\8b¨å\8f·è¿\9eæ\8e¥å¤±è´¥: %s"
+msgstr "æ\97 æ³\95ç»\88æ­¢æ\8b¨å\8f·è¿\9eæ\8e¥: %s"
 
 #: ../src/common/filename.cpp:2696
 #, c-format
@@ -3544,12 +3533,12 @@ msgstr "对文件 '%s' 进行 touch 操作时失败"
 #: ../src/unix/snglinst.cpp:328
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "对已锁文件 '%s' 解锁失败"
+msgstr "无法对已锁文件 '%s' 解锁"
 
 #: ../src/msw/dde.cpp:314
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "æ\92¤æ¶\88 DDE æ\9c\8då\8a¡å\99¨ '%s' 注å\86\8c失败"
+msgstr "æ\97 æ³\95æ\92¤æ¶\88 DDE æ\9c\8då\8a¡å\99¨ '%s' ç\9a\84注å\86\8c"
 
 #: ../src/unix/epolldispatcher.cpp:155
 #, fuzzy, c-format
@@ -3563,12 +3552,12 @@ msgstr "无法更新用户配置文件。"
 #: ../src/common/debugrpt.cpp:738
 #, c-format
 msgid "Failed to upload the debug report (error code %d)."
-msgstr "上传调试报告失败 (错误号 %d)。"
+msgstr "无法上传调试报告 (错误号 %d)。"
 
 #: ../src/unix/snglinst.cpp:168
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "写锁文件 '%s' 失败"
+msgstr "无法写入锁文件 '%s'"
 
 #: ../src/propgrid/propgrid.cpp:172
 msgid "False"
@@ -3584,14 +3573,14 @@ msgid "File"
 msgstr "文件"
 
 #: ../src/common/docview.cpp:666
-#, fuzzy, c-format
+#, c-format
 msgid "File \"%s\" could not be opened for reading."
-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\96\87件 \"%s\" æ\97 æ³\95å¼\80å\90¯ä¸ºè¯»å\8f\96模å¼\8fã\80\82"
 
 #: ../src/common/docview.cpp:643
-#, fuzzy, c-format
+#, c-format
 msgid "File \"%s\" could not be opened for writing."
-msgstr "æ\89\93å¼\80 '%s'(为 %s) 失败"
+msgstr "æ\96\87件 \"%s\" æ\97 æ³\95å¼\80å\90¯ä¸ºå\86\99å\85¥æ¨¡å¼\8fã\80\82"
 
 #: ../src/gtk/filedlg.cpp:56
 #, c-format
@@ -3607,15 +3596,15 @@ msgstr ""
 "文件 '%s' 已存在。\n"
 "真的需要替换它?"
 
-#: ../src/common/filefn.cpp:1206
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1207
+#, c-format
 msgid "File '%s' couldn't be removed"
-msgstr "文件不能被装载."
+msgstr "文件 '%s' 无法被移除"
 
 #: ../src/common/filefn.cpp:1187
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' couldn't be renamed '%s'"
-msgstr "文件不能被装载."
+msgstr "文件 '%s' 无法重命名为 '%s'"
 
 #: ../src/richtext/richtextctrl.cpp:2688 ../src/common/textcmn.cpp:921
 msgid "File couldn't be loaded."
@@ -3626,7 +3615,7 @@ msgstr "文件无法装载。"
 msgid "File dialog failed with error code %0lx."
 msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
-#: ../src/common/docview.cpp:1772
+#: ../src/common/docview.cpp:1771
 msgid "File error"
 msgstr "文件错误"
 
@@ -3638,7 +3627,7 @@ msgstr "文件名已存在。"
 msgid "Files"
 msgstr "文件"
 
-#: ../src/common/filefn.cpp:1760
+#: ../src/common/filefn.cpp:1761
 #, c-format
 msgid "Files (%s)"
 msgstr "文件 (%s)"
@@ -3659,7 +3648,7 @@ msgstr "最前"
 msgid "First page"
 msgstr "第一页"
 
-#: ../src/richtext/richtextsizepage.cpp:518
+#: ../src/richtext/richtextsizepage.cpp:521
 msgid "Fixed"
 msgstr "固定"
 
@@ -3671,7 +3660,7 @@ msgstr "固定字体:"
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
-#: ../src/richtext/richtextsizepage.cpp:226
+#: ../src/richtext/richtextsizepage.cpp:229
 msgid "Floating"
 msgstr "浮动"
 
@@ -3726,7 +3715,7 @@ msgstr "不支持传递hrefs"
 msgid "Found %i matches"
 msgstr "找到 %i 个匹配项"
 
-#: ../src/generic/prntdlgg.cpp:243
+#: ../src/generic/prntdlgg.cpp:238
 msgid "From:"
 msgstr "从:"
 
@@ -3750,7 +3739,7 @@ msgstr "GIF: 没有足够内存。"
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 位置错误！！！"
 
-#: ../src/gtk/window.cpp:4266
+#: ../src/gtk/window.cpp:4288
 msgid ""
 "GTK+ installed on this machine is too old to support screen compositing, "
 "please install GTK+ 2.12 or later."
@@ -3762,7 +3751,7 @@ msgstr "GTK+ 主题"
 
 #: ../src/common/preferencescmn.cpp:39
 msgid "General"
-msgstr ""
+msgstr "通用"
 
 #: ../src/common/prntbase.cpp:243
 msgid "Generic PostScript"
@@ -3885,9 +3874,9 @@ msgid "Help directory \"%s\" not found."
 msgstr "找不到帮助目录 \"%s\"。"
 
 #: ../src/generic/helpext.cpp:279
-#, fuzzy, c-format
+#, c-format
 msgid "Help file \"%s\" not found."
-msgstr "æ\89¾ä¸\8då\88°å\9f\9f '%s'ç\9a\84ç\9b®å½\95æ\96\87件."
+msgstr "æ\89¾ä¸\8då\88°å¸®å\8a©æ\96\87件 \"%s\"ã\80\82"
 
 #: ../src/html/helpctrl.cpp:63
 #, c-format
@@ -3915,8 +3904,8 @@ msgstr "Home"
 msgid "Home directory"
 msgstr "Home 目录"
 
-#: ../src/richtext/richtextsizepage.cpp:250
-#: ../src/richtext/richtextsizepage.cpp:252
+#: ../src/richtext/richtextsizepage.cpp:253
+#: ../src/richtext/richtextsizepage.cpp:255
 msgid "How the object will float relative to the text."
 msgstr "对象怎样浮动与文本有关。"
 
@@ -4030,14 +4019,14 @@ msgid "Image and mask have different sizes."
 msgstr "图像和掩码的大小不一致。"
 
 #: ../src/common/image.cpp:2609
-#, fuzzy, c-format
+#, c-format
 msgid "Image file is not of type %d."
-msgstr "图像文件的类型不是 %d."
+msgstr "图像文件的类型不是 %d。"
 
 #: ../src/common/image.cpp:2739
-#, fuzzy, c-format
+#, c-format
 msgid "Image is not of type %s."
-msgstr "图像文件的类型不是 %d."
+msgstr "图像的类型不是 %s。"
 
 #: ../src/msw/textctrl.cpp:399
 msgid ""
@@ -4102,24 +4091,24 @@ msgstr "在后初始化阶段出错，退出..."
 msgid "Insert"
 msgstr "插入"
 
-#: ../src/richtext/richtextbuffer.cpp:7672
+#: ../src/richtext/richtextbuffer.cpp:7687
 #, fuzzy
 msgid "Insert Field"
 msgstr "插入"
 
-#: ../src/richtext/richtextbuffer.cpp:7583
-#: ../src/richtext/richtextbuffer.cpp:8493
+#: ../src/richtext/richtextbuffer.cpp:7598
+#: ../src/richtext/richtextbuffer.cpp:8551
 msgid "Insert Image"
 msgstr "插入图片"
 
-#: ../src/richtext/richtextbuffer.cpp:7630
+#: ../src/richtext/richtextbuffer.cpp:7645
 msgid "Insert Object"
 msgstr "插入对象"
 
 #: ../src/richtext/richtextctrl.cpp:1172 ../src/richtext/richtextctrl.cpp:1362
-#: ../src/richtext/richtextbuffer.cpp:7428
-#: ../src/richtext/richtextbuffer.cpp:7455
-#: ../src/richtext/richtextbuffer.cpp:7499
+#: ../src/richtext/richtextbuffer.cpp:7440
+#: ../src/richtext/richtextbuffer.cpp:7470
+#: ../src/richtext/richtextbuffer.cpp:7514
 msgid "Insert Text"
 msgstr "插入文本"
 
@@ -4146,7 +4135,7 @@ msgstr "无效TIFF图像索引。"
 msgid "Invalid data view item"
 msgstr "无效的数据视图项"
 
-#: ../src/common/appcmn.cpp:245
+#: ../src/common/appcmn.cpp:266
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "无效的显示模式 '%s'。"
@@ -4159,7 +4148,7 @@ msgstr "无效的几何规格 '%s'"
 #: ../src/unix/fswatcher_inotify.cpp:298
 #, c-format
 msgid "Invalid inotify event for \"%s\""
-msgstr ""
+msgstr "无效的 \"%s\" inotify 事件"
 
 #: ../src/unix/snglinst.cpp:306
 #, c-format
@@ -4167,9 +4156,8 @@ msgid "Invalid lock file '%s'."
 msgstr "无效的锁文件 '%s'。"
 
 #: ../src/common/translation.cpp:1111
-#, fuzzy
 msgid "Invalid message catalog."
-msgstr "'%s' 不是有效的消息目录."
+msgstr "无效的消息目录。"
 
 #: ../src/common/xtistrm.cpp:409 ../src/common/xtistrm.cpp:424
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
@@ -4385,7 +4373,7 @@ msgstr "行距(&I):"
 msgid "LEFT"
 msgstr "LEFT"
 
-#: ../src/generic/prntdlgg.cpp:618 ../src/generic/prntdlgg.cpp:873
+#: ../src/generic/prntdlgg.cpp:613 ../src/generic/prntdlgg.cpp:868
 msgid "Landscape"
 msgstr "横向"
 
@@ -4397,7 +4385,7 @@ msgstr "最后"
 msgid "Last page"
 msgstr "最后一页"
 
-#: ../src/common/log.cpp:311
+#: ../src/common/log.cpp:309
 #, c-format
 msgid "Last repeated message (\"%s\", %lu time) wasn't output"
 msgid_plural "Last repeated message (\"%s\", %lu times) wasn't output"
@@ -4413,7 +4401,7 @@ msgstr "帐簿, 17 x 11 英寸"
 #: ../src/richtext/richtextbulletspage.cpp:199
 #: ../src/richtext/richtextbulletspage.cpp:202
 #: ../src/richtext/richtextbulletspage.cpp:203
-#: ../src/richtext/richtextsizepage.cpp:246
+#: ../src/richtext/richtextsizepage.cpp:249
 msgid "Left"
 msgstr "左"
 
@@ -4422,7 +4410,7 @@ msgstr "左"
 msgid "Left (&first line):"
 msgstr "左(第一行)(&F):"
 
-#: ../src/generic/prntdlgg.cpp:885
+#: ../src/generic/prntdlgg.cpp:880
 msgid "Left margin (mm):"
 msgstr "左边距 (毫米):"
 
@@ -4720,10 +4708,9 @@ msgstr "MacTurkish"
 msgid "MacVietnamese"
 msgstr "MacVietnamese"
 
-#: ../src/propgrid/advprops.cpp:2024
-#, fuzzy
+#: ../src/propgrid/advprops.cpp:2031
 msgid "Make a selection:"
-msgstr "选段"
+msgstr "请选择:"
 
 #: ../src/richtext/richtextformatdlg.cpp:362
 #: ../src/richtext/richtextmarginspage.cpp:172
@@ -4734,11 +4721,11 @@ msgstr "边距"
 msgid "Match case"
 msgstr "区分大小写"
 
-#: ../src/richtext/richtextsizepage.cpp:460
+#: ../src/richtext/richtextsizepage.cpp:463
 msgid "Max height:"
 msgstr "最达高度:"
 
-#: ../src/richtext/richtextsizepage.cpp:433
+#: ../src/richtext/richtextsizepage.cpp:436
 msgid "Max width:"
 msgstr "最大宽度:"
 
@@ -4772,11 +4759,11 @@ msgstr "找不到方法或属性。"
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
-#: ../src/richtext/richtextsizepage.cpp:406
+#: ../src/richtext/richtextsizepage.cpp:409
 msgid "Min height:"
 msgstr "最小高度:"
 
-#: ../src/richtext/richtextsizepage.cpp:379
+#: ../src/richtext/richtextsizepage.cpp:382
 msgid "Min width:"
 msgstr "最小宽度: "
 
@@ -4813,17 +4800,17 @@ msgstr "下移"
 msgid "Move up"
 msgstr "上移"
 
-#: ../src/richtext/richtextsizepage.cpp:679
-#: ../src/richtext/richtextsizepage.cpp:681
+#: ../src/richtext/richtextsizepage.cpp:682
+#: ../src/richtext/richtextsizepage.cpp:684
 msgid "Moves the object to the next paragraph."
 msgstr "将对象移至下一段落"
 
-#: ../src/richtext/richtextsizepage.cpp:673
-#: ../src/richtext/richtextsizepage.cpp:675
+#: ../src/richtext/richtextsizepage.cpp:676
+#: ../src/richtext/richtextsizepage.cpp:678
 msgid "Moves the object to the previous paragraph."
 msgstr "将对象移至前一段落"
 
-#: ../src/richtext/richtextbuffer.cpp:9271
+#: ../src/richtext/richtextbuffer.cpp:9345
 msgid "Multiple Cell Properties"
 msgstr "多重单元属性"
 
@@ -4952,9 +4939,8 @@ msgstr ""
 "(否则该编码的文本将无法正确显示)?"
 
 #: ../src/generic/animateg.cpp:142
-#, fuzzy
 msgid "No handler found for animation type."
-msgstr "没æ\9c\89æ\89¾å\88°å\9b¾å\83\8fç±»å\9e\8bå¤\84ç\90\86å\99¨."
+msgstr "没æ\9c\89æ\89¾å\88°å\8a¨ç\94»ç±»å\9e\8bå¤\84ç\90\86å\99¨ã\80\82"
 
 #: ../src/common/image.cpp:2591
 msgid "No handler found for image type."
@@ -5001,8 +4987,8 @@ msgid "No valid mappings found in the file \"%s\"."
 msgstr "文件 \"%s\" 中无效映射"
 
 #: ../src/richtext/richtextborderspage.cpp:542
-#: ../src/richtext/richtextsizepage.cpp:245
-#: ../src/richtext/richtextsizepage.cpp:249
+#: ../src/richtext/richtextsizepage.cpp:248
+#: ../src/richtext/richtextsizepage.cpp:252
 msgid "None"
 msgstr "无"
 
@@ -5023,9 +5009,9 @@ msgid "Normal font:"
 msgstr "正常字体:"
 
 #: ../src/propgrid/props.cpp:887
-#, fuzzy, c-format
+#, c-format
 msgid "Not %s"
-msgstr "关于(&A)"
+msgstr "非 %s"
 
 #: ../include/wx/filename.h:586 ../include/wx/filename.h:591
 msgid "Not available"
@@ -5055,7 +5041,7 @@ msgstr "大纲标号"
 
 #: ../include/wx/msgdlg.h:273 ../src/richtext/richtextstyledlg.cpp:297
 #: ../src/common/stockitem.cpp:178 ../src/msw/msgdlg.cpp:489
-#: ../src/msw/msgdlg.cpp:795 ../src/msw/dialog.cpp:120
+#: ../src/msw/msgdlg.cpp:799 ../src/msw/dialog.cpp:120
 #: ../src/gtk1/fontdlg.cpp:138
 msgid "OK"
 msgstr "确认"
@@ -5077,7 +5063,7 @@ msgstr "对象实现不支持命名参数"
 msgid "Objects must have an id attribute"
 msgstr "对象必须有一个id属性"
 
-#: ../src/common/docview.cpp:1756 ../src/common/docview.cpp:1798
+#: ../src/common/docview.cpp:1755 ../src/common/docview.cpp:1797
 msgid "Open File"
 msgstr "打开文件"
 
@@ -5119,11 +5105,11 @@ msgstr "选项 '%s' 需要值。"
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "选项 '%s': '%s' 无法转成日期。"
 
-#: ../src/generic/dirdlgg.cpp:187 ../src/generic/prntdlgg.cpp:623
+#: ../src/generic/dirdlgg.cpp:187 ../src/generic/prntdlgg.cpp:618
 msgid "Options"
 msgstr "选项"
 
-#: ../src/generic/prntdlgg.cpp:620 ../src/generic/prntdlgg.cpp:874
+#: ../src/generic/prntdlgg.cpp:615 ../src/generic/prntdlgg.cpp:869
 msgid "Orientation"
 msgstr "方向"
 
@@ -5324,22 +5310,21 @@ msgstr "页 %d"
 msgid "Page %d of %d"
 msgstr "页 %d / %d"
 
-#: ../src/gtk/print.cpp:783
+#: ../src/gtk/print.cpp:774
 msgid "Page Setup"
 msgstr "页面设置"
 
-#: ../src/generic/prntdlgg.cpp:833 ../src/common/prntbase.cpp:467
-#: ../src/gtk/gnome/gprint.cpp:710
+#: ../src/generic/prntdlgg.cpp:828 ../src/common/prntbase.cpp:467
 msgid "Page setup"
 msgstr "页面设置"
 
-#: ../src/generic/prntdlgg.cpp:221
+#: ../src/generic/prntdlgg.cpp:216
 msgid "Pages"
 msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:806
-#: ../src/generic/prntdlgg.cpp:847 ../src/generic/prntdlgg.cpp:860
-#: ../src/generic/prntdlgg.cpp:1057 ../src/generic/prntdlgg.cpp:1062
+#: ../src/generic/prntdlgg.cpp:602 ../src/generic/prntdlgg.cpp:801
+#: ../src/generic/prntdlgg.cpp:842 ../src/generic/prntdlgg.cpp:855
+#: ../src/generic/prntdlgg.cpp:1052 ../src/generic/prntdlgg.cpp:1057
 msgid "Paper size"
 msgstr "纸张大小"
 
@@ -5356,7 +5341,7 @@ msgstr "传递一个已注册的对象给SetObject"
 msgid "Passing an unknown object to GetObject"
 msgstr "传递一个未知对象给GetObject"
 
-#: ../src/richtext/richtextctrl.cpp:3103 ../src/common/stockitem.cpp:180
+#: ../src/richtext/richtextctrl.cpp:3117 ../src/common/stockitem.cpp:180
 #: ../src/stc/stc_i18n.cpp:19
 msgid "Paste"
 msgstr "粘贴"
@@ -5374,7 +5359,7 @@ msgstr ""
 msgid "Permissions"
 msgstr "允许"
 
-#: ../src/richtext/richtextbuffer.cpp:11745
+#: ../src/richtext/richtextbuffer.cpp:11942
 msgid "Picture Properties"
 msgstr "图片属性"
 
@@ -5438,15 +5423,15 @@ msgstr "数据视图控制指针设定错误"
 msgid "Pointer to model not set correctly."
 msgstr "模型指针设定错误"
 
-#: ../src/generic/prntdlgg.cpp:617 ../src/generic/prntdlgg.cpp:872
+#: ../src/generic/prntdlgg.cpp:612 ../src/generic/prntdlgg.cpp:867
 msgid "Portrait"
 msgstr "纵向"
 
-#: ../src/richtext/richtextsizepage.cpp:493
+#: ../src/richtext/richtextsizepage.cpp:496
 msgid "Position"
 msgstr "位置"
 
-#: ../src/generic/prntdlgg.cpp:303
+#: ../src/generic/prntdlgg.cpp:298
 msgid "PostScript file"
 msgstr "PostScript文件"
 
@@ -5471,10 +5456,9 @@ msgstr "预览:"
 msgid "Previous page"
 msgstr "前页"
 
-#: ../src/generic/prntdlgg.cpp:148 ../src/generic/prntdlgg.cpp:162
+#: ../src/generic/prntdlgg.cpp:143 ../src/generic/prntdlgg.cpp:157
 #: ../src/common/prntbase.cpp:409 ../src/common/prntbase.cpp:1511
-#: ../src/gtk/print.cpp:593 ../src/gtk/print.cpp:606
-#: ../src/gtk/gnome/gprint.cpp:537 ../src/gtk/gnome/gprint.cpp:549
+#: ../src/gtk/print.cpp:584 ../src/gtk/print.cpp:597
 msgid "Print"
 msgstr "打印"
 
@@ -5487,15 +5471,15 @@ msgstr "打印预览"
 msgid "Print Preview Failure"
 msgstr "打印预览失败"
 
-#: ../src/generic/prntdlgg.cpp:229
+#: ../src/generic/prntdlgg.cpp:224
 msgid "Print Range"
 msgstr "打印范围"
 
-#: ../src/generic/prntdlgg.cpp:454
+#: ../src/generic/prntdlgg.cpp:449
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:621
 msgid "Print in colour"
 msgstr "彩色打印"
 
@@ -5503,10 +5487,6 @@ msgstr "彩色打印"
 msgid "Print previe&w..."
 msgstr "打印预览(&W)..."
 
-#: ../src/gtk/gnome/gprint.cpp:944
-msgid "Print preview"
-msgstr "打印预览"
-
 #: ../src/common/docview.cpp:1244
 msgid "Print preview creation failed."
 msgstr "打印预览创建失败"
@@ -5515,7 +5495,7 @@ msgstr "打印预览创建失败"
 msgid "Print preview..."
 msgstr "打印预览..."
 
-#: ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/prntdlgg.cpp:630
 msgid "Print spooling"
 msgstr "打印假脱机"
 
@@ -5523,7 +5503,7 @@ msgstr "打印假脱机"
 msgid "Print this page"
 msgstr "打印本页"
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:185
 msgid "Print to File"
 msgstr "打印到文件"
 
@@ -5531,27 +5511,27 @@ msgstr "打印到文件"
 msgid "Print..."
 msgstr "打印..."
 
-#: ../src/generic/prntdlgg.cpp:498
+#: ../src/generic/prntdlgg.cpp:493
 msgid "Printer"
 msgstr "打印机"
 
-#: ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:633
 msgid "Printer command:"
 msgstr "打印机命令:"
 
-#: ../src/generic/prntdlgg.cpp:185
+#: ../src/generic/prntdlgg.cpp:180
 msgid "Printer options"
 msgstr "打印机选项"
 
-#: ../src/generic/prntdlgg.cpp:650
+#: ../src/generic/prntdlgg.cpp:645
 msgid "Printer options:"
 msgstr "打印机选项:"
 
-#: ../src/generic/prntdlgg.cpp:921
+#: ../src/generic/prntdlgg.cpp:916
 msgid "Printer..."
 msgstr "打印机..."
 
-#: ../src/generic/prntdlgg.cpp:201
+#: ../src/generic/prntdlgg.cpp:196
 msgid "Printer:"
 msgstr "打印机:"
 
@@ -5583,7 +5563,7 @@ msgid "Printing..."
 msgstr "打印..."
 
 #: ../include/wx/richtext/richtextprint.h:109 ../include/wx/prntbase.h:263
-#: ../src/common/docview.cpp:2125
+#: ../src/common/docview.cpp:2124
 msgid "Printout"
 msgstr "打印"
 
@@ -5599,7 +5579,7 @@ msgstr "程序渲染器无法渲染该值；类型为:"
 
 #: ../src/common/prntbase.cpp:528
 msgid "Progress:"
-msgstr ""
+msgstr "进度:"
 
 #: ../src/common/stockitem.cpp:184
 msgid "Properties"
@@ -5643,9 +5623,8 @@ msgid "RIGHT"
 msgstr "RIGHT"
 
 #: ../src/common/accelcmn.cpp:327
-#, fuzzy
 msgid "RawCtrl+"
-msgstr "Ctrl+"
+msgstr "RawCtrl+"
 
 #: ../src/common/ffile.cpp:113 ../src/common/ffile.cpp:134
 #, c-format
@@ -5699,7 +5678,7 @@ msgstr "注册值 '%s' 已存在."
 msgid "Regular"
 msgstr "一般"
 
-#: ../src/richtext/richtextsizepage.cpp:516
+#: ../src/richtext/richtextsizepage.cpp:519
 #, fuzzy
 msgid "Relative"
 msgstr "修饰"
@@ -5709,9 +5688,8 @@ msgid "Relevant entries:"
 msgstr "相关条目:"
 
 #: ../include/wx/generic/progdlgg.h:86
-#, fuzzy
 msgid "Remaining time:"
-msgstr "剩余时间 : "
+msgstr "剩余时间:"
 
 #: ../src/common/stockitem.cpp:187
 msgid "Remove"
@@ -5736,7 +5714,7 @@ msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 msgid "Rendering failed."
 msgstr "计时器创建失败"
 
-#: ../src/richtext/richtextbuffer.cpp:4202
+#: ../src/richtext/richtextbuffer.cpp:4214
 msgid "Renumber List"
 msgstr "重编号列表"
 
@@ -5744,7 +5722,7 @@ msgstr "重编号列表"
 msgid "Rep&lace"
 msgstr "替换(&l)"
 
-#: ../src/richtext/richtextctrl.cpp:3263 ../src/common/stockitem.cpp:188
+#: ../src/richtext/richtextctrl.cpp:3277 ../src/common/stockitem.cpp:188
 msgid "Replace"
 msgstr "替换"
 
@@ -5765,7 +5743,7 @@ msgstr "替换为:"
 msgid "Required information entry is empty."
 msgstr "所需的项目信息为空"
 
-#: ../src/common/translation.cpp:1975
+#: ../src/common/translation.cpp:1966
 #, fuzzy, c-format
 msgid "Resource '%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的消息目录."
@@ -5781,11 +5759,11 @@ msgstr "细"
 
 #: ../src/richtext/richtextliststylepage.cpp:251
 #: ../src/richtext/richtextbulletspage.cpp:201
-#: ../src/richtext/richtextsizepage.cpp:247
+#: ../src/richtext/richtextsizepage.cpp:250
 msgid "Right"
 msgstr "右"
 
-#: ../src/generic/prntdlgg.cpp:897
+#: ../src/generic/prntdlgg.cpp:892
 msgid "Right margin (mm):"
 msgstr "右边距 (毫米):"
 
@@ -5920,11 +5898,11 @@ msgstr "全部选择(&A)"
 msgid "Select All"
 msgstr "全部选择"
 
-#: ../src/common/docview.cpp:1878
+#: ../src/common/docview.cpp:1877
 msgid "Select a document template"
 msgstr "选择文档模板"
 
-#: ../src/common/docview.cpp:1952
+#: ../src/common/docview.cpp:1951
 msgid "Select a document view"
 msgstr "选择文档视图"
 
@@ -5957,7 +5935,7 @@ msgstr "选择并辨析列表层级"
 msgid "Separator expected after the option '%s'."
 msgstr "期望在选项 '%s' 后存在分隔符。"
 
-#: ../src/richtext/richtextbuffer.cpp:10397
+#: ../src/richtext/richtextbuffer.cpp:10513
 msgid "Set Cell Style"
 msgstr "设置单元格样式"
 
@@ -5969,7 +5947,7 @@ msgstr "调用 SetProperty 时未带有效的 setter"
 msgid "Setting directory access times is not supported under this OS version"
 msgstr "当前操作系统不支持目录访问次数设定"
 
-#: ../src/generic/prntdlgg.cpp:193
+#: ../src/generic/prntdlgg.cpp:188
 msgid "Setup..."
 msgstr "设置..."
 
@@ -6053,7 +6031,7 @@ msgid "Single"
 msgstr ""
 
 #: ../src/generic/filectrlg.cpp:460 ../src/richtext/richtextformatdlg.cpp:356
-#: ../src/richtext/richtextsizepage.cpp:296
+#: ../src/richtext/richtextsizepage.cpp:299
 msgid "Size"
 msgstr "大小"
 
@@ -6079,7 +6057,7 @@ msgstr "大写(&P)"
 msgid "Solid"
 msgstr "实线"
 
-#: ../src/common/docview.cpp:1774
+#: ../src/common/docview.cpp:1773
 msgid "Sorry, could not open this file."
 msgstr "对不起，无法打开文件。"
 
@@ -6095,7 +6073,7 @@ msgstr "对不起，没有足够内存创建预览。"
 msgid "Sorry, that name is taken. Please choose another."
 msgstr "抱歉，名字已被使用。请选择其他名字。"
 
-#: ../src/common/docview.cpp:1797
+#: ../src/common/docview.cpp:1796
 msgid "Sorry, the format for this file is unknown."
 msgstr "对不起，此文件的格式未知。"
 
@@ -6125,12 +6103,12 @@ msgstr "标准"
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "报表用纸，5 1/2 x 8 1/2 英寸"
 
-#: ../src/richtext/richtextsizepage.cpp:515
-#: ../src/richtext/richtextsizepage.cpp:520
+#: ../src/richtext/richtextsizepage.cpp:518
+#: ../src/richtext/richtextsizepage.cpp:523
 msgid "Static"
 msgstr "状态:"
 
-#: ../src/generic/prntdlgg.cpp:209
+#: ../src/generic/prntdlgg.cpp:204
 msgid "Status:"
 msgstr "状态:"
 
@@ -6190,7 +6168,6 @@ msgid "Symbol &font:"
 msgstr "符号样式(&F)"
 
 #: ../include/wx/richtext/richtextsymboldlg.h:47
-#, fuzzy
 msgid "Symbols"
 msgstr "符号"
 
@@ -6223,7 +6200,7 @@ msgstr "TIFF: 写图像错误。"
 msgid "TIFF: Image size is abnormally big."
 msgstr "TIFF: 图像大小过大。"
 
-#: ../src/richtext/richtextbuffer.cpp:10687
+#: ../src/richtext/richtextbuffer.cpp:10794
 msgid "Table Properties"
 msgstr "表格属性"
 
@@ -6243,7 +6220,7 @@ msgstr "标签"
 msgid "Teletype"
 msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1879
+#: ../src/common/docview.cpp:1878
 msgid "Templates"
 msgstr "模板"
 
@@ -6290,10 +6267,10 @@ msgstr "底边距"
 msgid "The bottom padding size."
 msgstr "底内衬大小"
 
-#: ../src/richtext/richtextsizepage.cpp:636
-#: ../src/richtext/richtextsizepage.cpp:638
-#: ../src/richtext/richtextsizepage.cpp:650
-#: ../src/richtext/richtextsizepage.cpp:652
+#: ../src/richtext/richtextsizepage.cpp:639
+#: ../src/richtext/richtextsizepage.cpp:641
+#: ../src/richtext/richtextsizepage.cpp:653
+#: ../src/richtext/richtextsizepage.cpp:655
 msgid "The bottom position."
 msgstr "底部位置"
 
@@ -6431,10 +6408,10 @@ msgstr "左边距大小"
 msgid "The left padding size."
 msgstr "左内衬大小"
 
-#: ../src/richtext/richtextsizepage.cpp:531
-#: ../src/richtext/richtextsizepage.cpp:533
-#: ../src/richtext/richtextsizepage.cpp:545
-#: ../src/richtext/richtextsizepage.cpp:547
+#: ../src/richtext/richtextsizepage.cpp:534
+#: ../src/richtext/richtextsizepage.cpp:536
+#: ../src/richtext/richtextsizepage.cpp:548
+#: ../src/richtext/richtextsizepage.cpp:550
 msgid "The left position."
 msgstr "左位置"
 
@@ -6454,33 +6431,33 @@ msgstr "列表编号"
 msgid "The locale ID is unknown."
 msgstr "区域ID未知"
 
-#: ../src/richtext/richtextsizepage.cpp:363
-#: ../src/richtext/richtextsizepage.cpp:365
+#: ../src/richtext/richtextsizepage.cpp:366
+#: ../src/richtext/richtextsizepage.cpp:368
 msgid "The object height."
 msgstr "对象高度。"
 
-#: ../src/richtext/richtextsizepage.cpp:471
-#: ../src/richtext/richtextsizepage.cpp:473
+#: ../src/richtext/richtextsizepage.cpp:474
+#: ../src/richtext/richtextsizepage.cpp:476
 msgid "The object maximum height."
 msgstr "对象最大高度。"
 
-#: ../src/richtext/richtextsizepage.cpp:444
-#: ../src/richtext/richtextsizepage.cpp:446
+#: ../src/richtext/richtextsizepage.cpp:447
+#: ../src/richtext/richtextsizepage.cpp:449
 msgid "The object maximum width."
 msgstr "对象最大宽度。"
 
-#: ../src/richtext/richtextsizepage.cpp:417
-#: ../src/richtext/richtextsizepage.cpp:419
+#: ../src/richtext/richtextsizepage.cpp:420
+#: ../src/richtext/richtextsizepage.cpp:422
 msgid "The object minimum height."
 msgstr "对象最小高度"
 
-#: ../src/richtext/richtextsizepage.cpp:390
-#: ../src/richtext/richtextsizepage.cpp:392
+#: ../src/richtext/richtextsizepage.cpp:393
+#: ../src/richtext/richtextsizepage.cpp:395
 msgid "The object minimum width."
 msgstr "对象最小宽度。"
 
-#: ../src/richtext/richtextsizepage.cpp:329
-#: ../src/richtext/richtextsizepage.cpp:331
+#: ../src/richtext/richtextsizepage.cpp:332
+#: ../src/richtext/richtextsizepage.cpp:334
 msgid "The object width."
 msgstr "对象宽度。"
 
@@ -6489,17 +6466,17 @@ msgstr "对象宽度。"
 msgid "The outline level."
 msgstr "大纲层级"
 
-#: ../src/common/log.cpp:283
+#: ../src/common/log.cpp:281
 #, c-format
 msgid "The previous message repeated %lu time."
 msgid_plural "The previous message repeated %lu times."
 msgstr[0] "前一消息重复 %lu 次"
 
-#: ../src/common/log.cpp:276
+#: ../src/common/log.cpp:274
 msgid "The previous message repeated once."
 msgstr "前一消息重复一次"
 
-#: ../src/gtk/print.cpp:940 ../src/gtk/print.cpp:1123
+#: ../src/gtk/print.cpp:931 ../src/gtk/print.cpp:1114
 msgid "The print dialog returned an error."
 msgstr "打印对话返回错误"
 
@@ -6539,10 +6516,10 @@ msgstr "右边距大小。"
 msgid "The right padding size."
 msgstr "右内衬"
 
-#: ../src/richtext/richtextsizepage.cpp:601
-#: ../src/richtext/richtextsizepage.cpp:603
-#: ../src/richtext/richtextsizepage.cpp:615
-#: ../src/richtext/richtextsizepage.cpp:617
+#: ../src/richtext/richtextsizepage.cpp:604
+#: ../src/richtext/richtextsizepage.cpp:606
+#: ../src/richtext/richtextsizepage.cpp:618
+#: ../src/richtext/richtextsizepage.cpp:620
 msgid "The right position."
 msgstr "又位置"
 
@@ -6601,10 +6578,10 @@ msgstr "上边距大小。"
 msgid "The top padding size."
 msgstr "上内衬大小"
 
-#: ../src/richtext/richtextsizepage.cpp:566
-#: ../src/richtext/richtextsizepage.cpp:568
-#: ../src/richtext/richtextsizepage.cpp:580
-#: ../src/richtext/richtextsizepage.cpp:582
+#: ../src/richtext/richtextsizepage.cpp:569
+#: ../src/richtext/richtextsizepage.cpp:571
+#: ../src/richtext/richtextsizepage.cpp:583
+#: ../src/richtext/richtextsizepage.cpp:585
 msgid "The top position."
 msgstr "顶部位置。"
 
@@ -6620,7 +6597,7 @@ msgid ""
 "old, please upgrade (the following required function is missing: %s)."
 msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (缺少下列必要的函数: %s)."
 
-#: ../src/gtk/print.cpp:968
+#: ../src/gtk/print.cpp:959
 msgid "The wxGtkPrinterDC cannot be used."
 msgstr "wxGtkPrinterDC无法使用"
 
@@ -6644,11 +6621,11 @@ msgstr "该文档的水平尺寸不符合页面，若打印将会被截断。"
 msgid "This is not a %s."
 msgstr "这不是 %s。"
 
-#: ../src/common/wincmn.cpp:1647
+#: ../src/common/wincmn.cpp:1653
 msgid "This platform does not support background transparency."
 msgstr "该平台不支持背景透明度"
 
-#: ../src/gtk/window.cpp:4295
+#: ../src/gtk/window.cpp:4317
 msgid ""
 "This program was compiled with a too old version of GTK+, please rebuild "
 "with GTK+ 2.12 or newer."
@@ -6704,7 +6681,7 @@ msgstr "每日技巧"
 msgid "Tips not available, sorry!"
 msgstr "对不起，没有所需的提示！"
 
-#: ../src/generic/prntdlgg.cpp:247
+#: ../src/generic/prntdlgg.cpp:242
 msgid "To:"
 msgstr "到:"
 
@@ -6712,7 +6689,7 @@ msgstr "到:"
 msgid "Toggle renderer cannot render value; value type: "
 msgstr "切换渲染器无法渲染该；类型为:"
 
-#: ../src/richtext/richtextbuffer.cpp:7925
+#: ../src/richtext/richtextbuffer.cpp:7983
 msgid "Too many EndStyle calls!"
 msgstr "呼叫EndStyle太多次！"
 
@@ -6720,12 +6697,12 @@ msgstr "呼叫EndStyle太多次！"
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "PNG中的颜色数过多，图像可能会有点模糊。"
 
-#: ../src/richtext/richtextsizepage.cpp:283
-#: ../src/richtext/richtextsizepage.cpp:287 ../src/common/stockitem.cpp:200
+#: ../src/richtext/richtextsizepage.cpp:286
+#: ../src/richtext/richtextsizepage.cpp:290 ../src/common/stockitem.cpp:200
 msgid "Top"
 msgstr "顶端"
 
-#: ../src/generic/prntdlgg.cpp:886
+#: ../src/generic/prntdlgg.cpp:881
 msgid "Top margin (mm):"
 msgstr "上页边距 (毫米):"
 
@@ -6803,12 +6780,11 @@ msgstr "无法添加 kqueue watch"
 
 #: ../include/wx/msw/private/fswatcher.h:142
 msgid "Unable to associate handle with I/O completion port"
-msgstr ""
+msgstr "无法将句柄与 I/O 完成端口相关联"
 
 #: ../include/wx/msw/private/fswatcher.h:125
-#, fuzzy
 msgid "Unable to close I/O completion port handle"
-msgstr "关闭文件句柄失败."
+msgstr "无法关闭 I/O 完成口的句柄"
 
 #: ../src/unix/fswatcher_inotify.cpp:97
 msgid "Unable to close inotify instance"
@@ -6825,14 +6801,12 @@ msgid "Unable to close the handle for '%s'"
 msgstr "无法关闭 '%s' 的句柄。"
 
 #: ../include/wx/msw/private/fswatcher.h:240
-#, fuzzy
 msgid "Unable to create I/O completion port"
-msgstr "创建游标失败."
+msgstr "无法创建 I/O 完成口"
 
 #: ../src/msw/fswatcher.cpp:84
-#, fuzzy
 msgid "Unable to create IOCP worker thread"
-msgstr "创建 MDI 父框架失败."
+msgstr "无法创建 IOCP 工作线程"
 
 #: ../src/unix/fswatcher_inotify.cpp:74
 msgid "Unable to create inotify instance"
@@ -6844,15 +6818,15 @@ msgstr "无法创建 kqueue 实例"
 
 #: ../include/wx/msw/private/fswatcher.h:229
 msgid "Unable to dequeue completion packet"
-msgstr ""
+msgstr "无法移出完成封包"
 
 #: ../src/unix/fswatcher_kqueue.cpp:185
 msgid "Unable to get events from kqueue"
-msgstr ""
+msgstr "无法从 kqueue 中获取事件"
 
 #: ../src/osx/carbon/dataview.cpp:1903
 msgid "Unable to handle native drag&drop data"
-msgstr ""
+msgstr "无法处理原生的拖放数据"
 
 #: ../src/gtk/app.cpp:439
 msgid "Unable to initialize GTK+, is DISPLAY set properly?"
@@ -6878,7 +6852,7 @@ msgstr "无法异步地播放声音。"
 
 #: ../include/wx/msw/private/fswatcher.h:207
 msgid "Unable to post completion status"
-msgstr ""
+msgstr "无法贴上完成状态"
 
 #: ../src/unix/fswatcher_inotify.cpp:530
 msgid "Unable to read from inotify descriptor"
@@ -7007,8 +6981,8 @@ msgstr "下轮廓单位"
 msgid "Units for the bottom padding."
 msgstr "下内衬单位"
 
-#: ../src/richtext/richtextsizepage.cpp:661
-#: ../src/richtext/richtextsizepage.cpp:663
+#: ../src/richtext/richtextsizepage.cpp:664
+#: ../src/richtext/richtextsizepage.cpp:666
 msgid "Units for the bottom position."
 msgstr "下位置单位"
 
@@ -7032,38 +7006,38 @@ msgstr "左轮廓单位"
 msgid "Units for the left padding."
 msgstr "左内衬单位"
 
-#: ../src/richtext/richtextsizepage.cpp:556
-#: ../src/richtext/richtextsizepage.cpp:558
+#: ../src/richtext/richtextsizepage.cpp:559
+#: ../src/richtext/richtextsizepage.cpp:561
 msgid "Units for the left position."
 msgstr "左位置单位"
 
-#: ../src/richtext/richtextsizepage.cpp:482
-#: ../src/richtext/richtextsizepage.cpp:484
+#: ../src/richtext/richtextsizepage.cpp:485
+#: ../src/richtext/richtextsizepage.cpp:487
 msgid "Units for the maximum object height."
 msgstr "最大对象高度单位。"
 
-#: ../src/richtext/richtextsizepage.cpp:455
-#: ../src/richtext/richtextsizepage.cpp:457
+#: ../src/richtext/richtextsizepage.cpp:458
+#: ../src/richtext/richtextsizepage.cpp:460
 msgid "Units for the maximum object width."
 msgstr "最大对象宽度单位。"
 
-#: ../src/richtext/richtextsizepage.cpp:428
-#: ../src/richtext/richtextsizepage.cpp:430
+#: ../src/richtext/richtextsizepage.cpp:431
+#: ../src/richtext/richtextsizepage.cpp:433
 msgid "Units for the minimum object height."
 msgstr "最小对象高度单位。"
 
-#: ../src/richtext/richtextsizepage.cpp:401
-#: ../src/richtext/richtextsizepage.cpp:403
+#: ../src/richtext/richtextsizepage.cpp:404
+#: ../src/richtext/richtextsizepage.cpp:406
 msgid "Units for the minimum object width."
 msgstr "最小对象宽度单位。"
 
-#: ../src/richtext/richtextsizepage.cpp:374
-#: ../src/richtext/richtextsizepage.cpp:376
+#: ../src/richtext/richtextsizepage.cpp:377
+#: ../src/richtext/richtextsizepage.cpp:379
 msgid "Units for the object height."
 msgstr "对象高度单位"
 
-#: ../src/richtext/richtextsizepage.cpp:340
-#: ../src/richtext/richtextsizepage.cpp:342
+#: ../src/richtext/richtextsizepage.cpp:343
+#: ../src/richtext/richtextsizepage.cpp:345
 msgid "Units for the object width."
 msgstr "对象宽度单位"
 
@@ -7087,8 +7061,8 @@ msgstr "右轮廓单位"
 msgid "Units for the right padding."
 msgstr "右内衬单位"
 
-#: ../src/richtext/richtextsizepage.cpp:626
-#: ../src/richtext/richtextsizepage.cpp:628
+#: ../src/richtext/richtextsizepage.cpp:629
+#: ../src/richtext/richtextsizepage.cpp:631
 msgid "Units for the right position."
 msgstr "右位置单位"
 
@@ -7112,8 +7086,8 @@ msgstr "上轮廓单位"
 msgid "Units for the top padding."
 msgstr "上内衬单位"
 
-#: ../src/richtext/richtextsizepage.cpp:591
-#: ../src/richtext/richtextsizepage.cpp:593
+#: ../src/richtext/richtextsizepage.cpp:594
+#: ../src/richtext/richtextsizepage.cpp:596
 msgid "Units for the top position."
 msgstr "上位置单位"
 
@@ -7143,7 +7117,7 @@ msgstr "未知属性 %s"
 #: ../src/common/imagtiff.cpp:532
 #, c-format
 msgid "Unknown TIFF resolution unit %d ignored"
-msgstr ""
+msgstr "未知 TIFF 解析度单位 %d，忽略之"
 
 #: ../src/osx/carbon/dataview.cpp:1978
 msgid "Unknown data format"
@@ -7203,7 +7177,7 @@ msgstr "未指定"
 msgid "Unsupported clipboard format."
 msgstr "不支持的剪贴板格式。"
 
-#: ../src/common/appcmn.cpp:228
+#: ../src/common/appcmn.cpp:249
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr "不支持的主题 '%s'。"
@@ -7220,7 +7194,7 @@ msgstr "大写字母"
 #: ../src/richtext/richtextliststylepage.cpp:485
 #: ../src/richtext/richtextbulletspage.cpp:290
 msgid "Upper case roman numerals"
-msgstr ""
+msgstr "大写罗马数字"
 
 #: ../src/common/cmdline.cpp:1155
 #, c-format
@@ -7232,7 +7206,7 @@ msgstr "用法: %s"
 #: ../src/richtext/richtextliststylepage.cpp:358
 #: ../src/richtext/richtextliststylepage.cpp:360
 msgid "Use the current alignment setting."
-msgstr ""
+msgstr "使用当前的对齐设置。"
 
 #: ../src/osx/carbon/dataview.cpp:2658 ../src/osx/carbon/dataview.cpp:2723
 msgid "Valid pointer to native data view control does not exist"
@@ -7265,8 +7239,8 @@ msgstr "数值必须在 %s 和 %s 之间。"
 msgid "Version "
 msgstr "版本"
 
-#: ../src/richtext/richtextsizepage.cpp:288
-#: ../src/richtext/richtextsizepage.cpp:290
+#: ../src/richtext/richtextsizepage.cpp:291
+#: ../src/richtext/richtextsizepage.cpp:293
 msgid "Vertical alignment."
 msgstr "垂直对齐。"
 
@@ -7278,7 +7252,7 @@ msgstr "按详细视图观看文件"
 msgid "View files as a list view"
 msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1953
+#: ../src/common/docview.cpp:1952
 msgid "Views"
 msgstr "视图"
 
@@ -7299,7 +7273,7 @@ msgstr "WINDOWS_RIGHT"
 msgid "Waiting for IO on epoll descriptor %d failed"
 msgstr "等待 epoll 描述符 %d 的 IO 时失败"
 
-#: ../src/common/log.cpp:229
+#: ../src/common/log.cpp:227
 msgid "Warning: "
 msgstr "警告: "
 
@@ -7474,7 +7448,7 @@ msgstr "写文件 '%s' 错误"
 #: ../src/xml/xml.cpp:844
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "XML解析错误: '%s' 位于 行 %d"
+msgstr "XML 解析错误: '%s'，位于行 %d"
 
 #: ../src/common/xpmdecod.cpp:796
 msgid "XPM: Malformed pixel data!"
@@ -7496,12 +7470,12 @@ msgstr "XPM: 错误的颜色定义 '%s'，位于行 %d！"
 
 #: ../src/common/xpmdecod.cpp:755
 msgid "XPM: no colors left to use for mask!"
-msgstr ""
+msgstr "XPM: 没有剩下可供选择的掩码颜色！"
 
 #: ../src/common/xpmdecod.cpp:782
 #, c-format
 msgid "XPM: truncated image data at line %d!"
-msgstr ""
+msgstr "XPM: 图像数据被截断，位于行 %d！"
 
 #: ../include/wx/msgdlg.h:271 ../src/common/stockitem.cpp:206
 #: ../src/motif/msgdlg.cpp:196
@@ -7514,7 +7488,7 @@ msgstr "你无法清除未初始化的 overlay。"
 
 #: ../src/osx/carbon/overlay.cpp:107 ../src/dfb/overlay.cpp:61
 msgid "You cannot Init an overlay twice"
-msgstr "你不能初始化overlay两次"
+msgstr "你不能初始化 overlay 两次"
 
 #: ../src/generic/dirdlgg.cpp:316
 msgid "You cannot add a new directory to this section."
@@ -7828,16 +7802,16 @@ msgstr "读取tar头部块发生校验和错误"
 #: ../src/richtext/richtextmarginspage.cpp:341
 #: ../src/richtext/richtextmarginspage.cpp:364
 #: ../src/richtext/richtextmarginspage.cpp:389
-#: ../src/richtext/richtextsizepage.cpp:336
-#: ../src/richtext/richtextsizepage.cpp:370
-#: ../src/richtext/richtextsizepage.cpp:397
-#: ../src/richtext/richtextsizepage.cpp:424
-#: ../src/richtext/richtextsizepage.cpp:451
-#: ../src/richtext/richtextsizepage.cpp:478
-#: ../src/richtext/richtextsizepage.cpp:552
-#: ../src/richtext/richtextsizepage.cpp:587
-#: ../src/richtext/richtextsizepage.cpp:622
-#: ../src/richtext/richtextsizepage.cpp:657
+#: ../src/richtext/richtextsizepage.cpp:339
+#: ../src/richtext/richtextsizepage.cpp:373
+#: ../src/richtext/richtextsizepage.cpp:400
+#: ../src/richtext/richtextsizepage.cpp:427
+#: ../src/richtext/richtextsizepage.cpp:454
+#: ../src/richtext/richtextsizepage.cpp:481
+#: ../src/richtext/richtextsizepage.cpp:555
+#: ../src/richtext/richtextsizepage.cpp:590
+#: ../src/richtext/richtextsizepage.cpp:625
+#: ../src/richtext/richtextsizepage.cpp:660
 msgid "cm"
 msgstr "厘米"
 
@@ -7954,7 +7928,7 @@ msgstr "文件 '%s'，行 %d: 忽略不可变键 '%s' 的值。"
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d。"
 
-#: ../src/richtext/richtextbuffer.cpp:8300
+#: ../src/richtext/richtextbuffer.cpp:8358
 msgid "files"
 msgstr "文件"
 
@@ -7978,8 +7952,8 @@ msgstr "第四"
 msgid "generate verbose log messages"
 msgstr "生成详细的日志信息"
 
-#: ../src/richtext/richtextbuffer.cpp:12015
-#: ../src/richtext/richtextbuffer.cpp:12125
+#: ../src/richtext/richtextbuffer.cpp:12212
+#: ../src/richtext/richtextbuffer.cpp:12322
 msgid "image"
 msgstr "图片"
 
@@ -8045,7 +8019,7 @@ msgstr "没有错误"
 msgid "no fonts found in %s, using builtin font"
 msgstr "%s中字体为找到，将使用内置字体"
 
-#: ../src/html/helpdata.cpp:654
+#: ../src/html/helpdata.cpp:655
 msgid "noname"
 msgstr "未名"
 
@@ -8057,7 +8031,7 @@ msgstr "中午"
 msgid "normal"
 msgstr "正常"
 
-#: ../src/gtk/print.cpp:1227 ../src/gtk/print.cpp:1332
+#: ../src/gtk/print.cpp:1218 ../src/gtk/print.cpp:1323
 msgid "not implemented"
 msgstr "为实现"
 
@@ -8073,16 +8047,16 @@ msgstr "对象不能有 XML 文本节点"
 msgid "out of memory"
 msgstr "内存耗尽"
 
-#: ../src/richtext/richtextsizepage.cpp:337
-#: ../src/richtext/richtextsizepage.cpp:371
-#: ../src/richtext/richtextsizepage.cpp:398
-#: ../src/richtext/richtextsizepage.cpp:425
-#: ../src/richtext/richtextsizepage.cpp:452
-#: ../src/richtext/richtextsizepage.cpp:479
-#: ../src/richtext/richtextsizepage.cpp:553
-#: ../src/richtext/richtextsizepage.cpp:588
-#: ../src/richtext/richtextsizepage.cpp:623
-#: ../src/richtext/richtextsizepage.cpp:658
+#: ../src/richtext/richtextsizepage.cpp:340
+#: ../src/richtext/richtextsizepage.cpp:374
+#: ../src/richtext/richtextsizepage.cpp:401
+#: ../src/richtext/richtextsizepage.cpp:428
+#: ../src/richtext/richtextsizepage.cpp:455
+#: ../src/richtext/richtextsizepage.cpp:482
+#: ../src/richtext/richtextsizepage.cpp:556
+#: ../src/richtext/richtextsizepage.cpp:591
+#: ../src/richtext/richtextsizepage.cpp:626
+#: ../src/richtext/richtextsizepage.cpp:661
 msgid "percent"
 msgstr "百分比"
 
@@ -8093,7 +8067,7 @@ msgstr "进程上下文描述"
 #: ../src/richtext/richtextfontpage.cpp:186
 #: ../src/richtext/richtextfontpage.cpp:189
 msgid "pt"
-msgstr ""
+msgstr "点"
 
 #: ../src/richtext/richtextfontpage.cpp:187
 #: ../src/richtext/richtextborderspage.cpp:279
@@ -8144,43 +8118,42 @@ msgstr ""
 #: ../src/richtext/richtextmarginspage.cpp:388
 #: ../src/richtext/richtextmarginspage.cpp:390
 #: ../src/richtext/richtextmarginspage.cpp:391
-#: ../src/richtext/richtextsizepage.cpp:335
 #: ../src/richtext/richtextsizepage.cpp:338
-#: ../src/richtext/richtextsizepage.cpp:339
-#: ../src/richtext/richtextsizepage.cpp:369
+#: ../src/richtext/richtextsizepage.cpp:341
+#: ../src/richtext/richtextsizepage.cpp:342
 #: ../src/richtext/richtextsizepage.cpp:372
-#: ../src/richtext/richtextsizepage.cpp:373
-#: ../src/richtext/richtextsizepage.cpp:396
+#: ../src/richtext/richtextsizepage.cpp:375
+#: ../src/richtext/richtextsizepage.cpp:376
 #: ../src/richtext/richtextsizepage.cpp:399
-#: ../src/richtext/richtextsizepage.cpp:400
-#: ../src/richtext/richtextsizepage.cpp:423
+#: ../src/richtext/richtextsizepage.cpp:402
+#: ../src/richtext/richtextsizepage.cpp:403
 #: ../src/richtext/richtextsizepage.cpp:426
-#: ../src/richtext/richtextsizepage.cpp:427
-#: ../src/richtext/richtextsizepage.cpp:450
+#: ../src/richtext/richtextsizepage.cpp:429
+#: ../src/richtext/richtextsizepage.cpp:430
 #: ../src/richtext/richtextsizepage.cpp:453
-#: ../src/richtext/richtextsizepage.cpp:454
-#: ../src/richtext/richtextsizepage.cpp:477
+#: ../src/richtext/richtextsizepage.cpp:456
+#: ../src/richtext/richtextsizepage.cpp:457
 #: ../src/richtext/richtextsizepage.cpp:480
-#: ../src/richtext/richtextsizepage.cpp:481
-#: ../src/richtext/richtextsizepage.cpp:551
+#: ../src/richtext/richtextsizepage.cpp:483
+#: ../src/richtext/richtextsizepage.cpp:484
 #: ../src/richtext/richtextsizepage.cpp:554
-#: ../src/richtext/richtextsizepage.cpp:555
-#: ../src/richtext/richtextsizepage.cpp:586
+#: ../src/richtext/richtextsizepage.cpp:557
+#: ../src/richtext/richtextsizepage.cpp:558
 #: ../src/richtext/richtextsizepage.cpp:589
-#: ../src/richtext/richtextsizepage.cpp:590
-#: ../src/richtext/richtextsizepage.cpp:621
+#: ../src/richtext/richtextsizepage.cpp:592
+#: ../src/richtext/richtextsizepage.cpp:593
 #: ../src/richtext/richtextsizepage.cpp:624
-#: ../src/richtext/richtextsizepage.cpp:625
-#: ../src/richtext/richtextsizepage.cpp:656
+#: ../src/richtext/richtextsizepage.cpp:627
+#: ../src/richtext/richtextsizepage.cpp:628
 #: ../src/richtext/richtextsizepage.cpp:659
-#: ../src/richtext/richtextsizepage.cpp:660
+#: ../src/richtext/richtextsizepage.cpp:662
+#: ../src/richtext/richtextsizepage.cpp:663
 msgid "px"
 msgstr "像素"
 
 #: ../src/common/accelcmn.cpp:188
-#, fuzzy
 msgid "rawctrl"
-msgstr "ctrl"
+msgstr "rawctrl"
 
 #: ../src/html/chm.cpp:333
 msgid "read error"
@@ -8232,31 +8205,31 @@ msgstr "第十六"
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:206
+#: ../src/common/appcmn.cpp:227
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
-#: ../src/common/appcmn.cpp:192
+#: ../src/common/appcmn.cpp:213
 msgid "specify the theme to use"
 msgstr "指定使用的主题"
 
-#: ../src/richtext/richtextbuffer.cpp:8818
+#: ../src/richtext/richtextbuffer.cpp:8876
 msgid "standard/circle"
 msgstr "标准/圆形"
 
-#: ../src/richtext/richtextbuffer.cpp:8819
+#: ../src/richtext/richtextbuffer.cpp:8877
 msgid "standard/circle-outline"
 msgstr "标准/圆框"
 
-#: ../src/richtext/richtextbuffer.cpp:8821
+#: ../src/richtext/richtextbuffer.cpp:8879
 msgid "standard/diamond"
 msgstr "标准/菱形"
 
-#: ../src/richtext/richtextbuffer.cpp:8820
+#: ../src/richtext/richtextbuffer.cpp:8878
 msgid "standard/square"
 msgstr "标准/方形"
 
-#: ../src/richtext/richtextbuffer.cpp:8822
+#: ../src/richtext/richtextbuffer.cpp:8880
 msgid "standard/triangle"
 msgstr "标准/三角形"
 
@@ -8363,7 +8336,7 @@ msgstr "未知-%d"
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1607
+#: ../src/common/docview.cpp:1606
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名 %d"
@@ -8372,7 +8345,7 @@ msgstr "未命名 %d"
 msgid "unsupported Zip compression method"
 msgstr "不支持的 Zip 压缩方法"
 
-#: ../src/common/translation.cpp:1892
+#: ../src/common/translation.cpp:1883
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用目录 '%s' 从 '%s'。"
@@ -8385,7 +8358,7 @@ msgstr "写错误"
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay 失败。"
 
-#: ../src/gtk/print.cpp:996
+#: ../src/gtk/print.cpp:987
 msgid "wxPrintout::GetPageInfo gives a null maxPage."
 msgstr "wxPrintout::GetPageInfo给出无效maxPage"
 
@@ -8424,6 +8397,9 @@ msgstr "zlib 错误 %d"
 msgid "~"
 msgstr "~"
 
+#~ msgid "Print preview"
+#~ msgstr "打印预览"
+
 #~ msgid "'"
 #~ msgstr "'"