update for 2.6.1 from Dennis Prochko

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index a8f56b26358a47f1cffa63935b15a832f4b0f21e..3ab87fa779fcdf6a5bb0bc5537bfba1a922ae68f 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,3660 +1,4674 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
-"POT-Creation-Date: 2002-12-12 11:59+0100\n"
-"PO-Revision-Date: 2003-03-19 15:12+0800\n"
-"Last-Translator: PAL <pal.tw@yahoo.com.tw>\n"
-"Language-Team: wxWindows tranlators <wx-translators@wxwindows.org>\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
+"PO-Revision-Date: 2005-02-18 23:12中国标准时间\n"
+"Last-Translator: Liu XiaoXi <liouxiao@hotmail.com>\n"
+"Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Report-Msgid-Bugs-To: \n"
+"Previous-Translator: mrfx <mrfx@fm365.com>\n"
 
-#: ../src/common/log.cpp:304
+#: ../src/common/debugrpt.cpp:547
+#, c-format
+msgid "\t%s: %s\n"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:550
+msgid ""
+"\n"
+"Please send this report to the program maintainer, thank you!\n"
+msgstr ""
+"\n"
+"请将报告发送给程序维护人员, 谢谢!\n"
+
+#: ../src/palmos/utils.cpp:205
+msgid " "
+msgstr " "
+
+#: ../src/generic/dbgrptg.cpp:293
+msgid "              Thank you and we're sorry for the inconvenience!\n"
+msgstr "              谢谢, 我们对您遇到的不便表示抱歉!\n"
+
+#: ../src/common/log.cpp:321
 #, c-format
 msgid " (error %ld: %s)"
-msgstr " (é\8c¯èª¤ %ld: %s)"
+msgstr " (é\94\99误 %ld: %s)"
 
-#: ../src/common/docview.cpp:1242
+#: ../src/common/docview.cpp:1432
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:497
+#: ../src/html/htmprint.cpp:570
 msgid " Preview"
-msgstr "預覽"
+msgstr " 预览"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:131
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
-msgstr "#10 信封, 4 1/8 x 9 1/2 in"
+msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:132
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
-msgstr "#11 信封, 4 1/2 x 10 3/8 in"
+msgstr "#11 信封, 4 1/2 x 10 3/8 英寸"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:133
 msgid "#12 Envelope, 4 3/4 x 11 in"
-msgstr "#12 信封, 4 3/4 x 11 in"
+msgstr "#12 信封, 4 3/4 x 11 英寸"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:134
 msgid "#14 Envelope, 5 x 11 1/2 in"
-msgstr "#14 信封, 5 x 11 1/2 in"
+msgstr "#14 信封, 5 x 11 1/2 英寸"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:130
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
-msgstr "#9 信封, 3 7/8 x 8 7/8 in"
+msgstr "#9 信封, 3 7/8 x 8 7/8 英寸"
 
-#: ../src/common/resourc2.cpp:265
-#: ../src/common/resourc2.cpp:1326
-#: ../src/common/resource.cpp:1784
-#: ../src/common/resource.cpp:1914
-#: ../src/common/resource.cpp:2994
+#: ../contrib/src/deprecated/resource.cpp:1808
+#: ../contrib/src/deprecated/resource.cpp:1938
+#: ../contrib/src/deprecated/resource.cpp:3026
 #, c-format
 msgid "#define %s must be an integer."
-msgstr "#所定義的 %s 必須是整數。"
-
-#: ../src/common/prntbase.cpp:375
-#, c-format
-msgid "%d"
-msgstr ""
-
-#: ../src/common/prntbase.cpp:373
-#, c-format
-msgid "%d...%d"
-msgstr ""
+msgstr "#所定义的 %s 必须是整数."
 
-#: ../src/html/helpfrm.cpp:777
-#: ../src/html/helpfrm.cpp:778
-#: ../src/html/helpfrm.cpp:1404
-#: ../src/html/helpfrm.cpp:1434
+#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
+#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 
-#: ../src/common/cmdline.cpp:814
+#: ../src/generic/filedlgg.cpp:295
+#, c-format
+msgid "%ld bytes"
+msgstr "%ld 字节"
+
+#: ../src/common/cmdline.cpp:851
 #, c-format
 msgid "%s (or %s)"
-msgstr ""
+msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:246
+#: ../src/generic/logg.cpp:266
 #, c-format
 msgid "%s Error"
-msgstr "%s é\8c¯èª¤"
+msgstr "%s é\94\99误"
 
-#: ../src/generic/logg.cpp:254
+#: ../src/generic/logg.cpp:274
 #, c-format
 msgid "%s Information"
-msgstr "%s 資訊"
+msgstr "%s 信息"
 
-#: ../src/generic/logg.cpp:250
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Warning"
 msgstr "%s 警告"
 
-#: ../src/common/msgout.cpp:108
+#: ../src/common/fldlgcmn.cpp:81
+#, c-format
+msgid "%s files (%s)|%s"
+msgstr "%s 文件 (%s)|%s"
+
+#: ../src/common/msgout.cpp:189
 #, c-format
 msgid "%s message"
-msgstr "%s 訊息"
+msgstr "%s 消息"
 
-#: ../src/common/resourc2.cpp:709
-#: ../src/common/resource.cpp:2366
+#: ../contrib/src/deprecated/resource.cpp:2390
 #, c-format
 msgid "%s not a bitmap resource specification."
-msgstr "%s 不是點陣圖資源。"
+msgstr "%s 不是位图资源."
 
-#: ../src/common/resourc2.cpp:860
-#: ../src/common/resource.cpp:2520
+#: ../contrib/src/deprecated/resource.cpp:2544
 #, c-format
 msgid "%s not an icon resource specification."
-msgstr "%s ä¸\8dæ\98¯å\9c\96示è³\87æº\90ã\80\82"
+msgstr "%s ä¸\8dæ\98¯å\9b¾æ \87èµ\84æº\90."
 
-#: ../src/common/resourc2.cpp:357
-#: ../src/common/resourc2.cpp:1422
-#: ../src/common/resource.cpp:1877
-#: ../src/common/resource.cpp:2006
-#: ../src/common/resource.cpp:3091
+#: ../contrib/src/deprecated/resource.cpp:1901
+#: ../contrib/src/deprecated/resource.cpp:2030
+#: ../contrib/src/deprecated/resource.cpp:3123
 #, c-format
 msgid "%s: ill-formed resource file syntax."
-msgstr "%s: 不良的資源檔案語法。"
+msgstr "%s: 不良资源文件语法."
 
-#: ../src/msw/mdi.cpp:192
+#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+msgid "&About..."
+msgstr "关于(&A)"
+
+#: ../src/common/stockitem.cpp:153
+msgid "&Actual Size"
+msgstr "实际大小(&A)"
+
+#: ../src/common/stockitem.cpp:108
+msgid "&Apply"
+msgstr "应用(&A)"
+
+#: ../src/msw/mdi.cpp:190
 msgid "&Arrange Icons"
-msgstr "排列圖示(&A)"
+msgstr "重排图标(&A)"
+
+#: ../src/common/stockitem.cpp:118
+msgid "&Back"
+msgstr "返回(&B)"
 
-#: ../src/generic/fdrepdlg.cpp:170
-#: ../src/generic/wizard.cpp:271
+#: ../src/common/stockitem.cpp:109
+msgid "&Bold"
+msgstr "粗体(&B)"
+
+#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
+#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:418
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:186
 msgid "&Cascade"
-msgstr "串聯(&C)"
+msgstr "层叠(&C)"
 
-#: ../src/generic/logg.cpp:491
-#: ../src/generic/tipdlg.cpp:210
+#: ../src/common/stockitem.cpp:111
+msgid "&Clear"
+msgstr "清除(&C)"
+
+#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354
 msgid "&Close"
-msgstr "關閉(&C)"
+msgstr "关闭(&C)"
 
-#: ../src/msw/textctrl.cpp:1681
+#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065
 msgid "&Copy"
-msgstr "複製(&C)"
+msgstr "复制(&C)"
+
+#: ../src/generic/dbgrptg.cpp:301
+msgid "&Debug report preview:"
+msgstr "调试报告预览(&D): "
 
-#: ../src/msw/textctrl.cpp:1683
+#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067
 msgid "&Delete"
-msgstr "å\88ª除(&D)"
+msgstr "å\88 除(&D)"
 
-#: ../src/generic/logg.cpp:695
+#: ../src/generic/logg.cpp:718
 msgid "&Details"
-msgstr "ç´°ç¯\80(&D)"
+msgstr "ç»\86è\8a\82(&D)"
 
-#: ../src/generic/fdrepdlg.cpp:168
+#: ../src/common/stockitem.cpp:119
+msgid "&Down"
+msgstr "向下(&D)"
+
+#: ../src/html/helpfrm.cpp:361
+msgid "&File"
+msgstr "文件(&F)"
+
+#: ../src/common/stockitem.cpp:116
 msgid "&Find"
-msgstr "尋找(&F)"
+msgstr "查找(&F)"
 
-#: ../src/generic/wizard.cpp:412
+#: ../src/generic/wizard.cpp:606
 msgid "&Finish"
 msgstr "完成(&F)"
 
-#: ../src/generic/wizard.cpp:258
+#: ../src/generic/fontdlgg.cpp:273
+msgid "&Font family:"
+msgstr "字体(&F):"
+
+#: ../src/common/stockitem.cpp:120
+msgid "&Forward"
+msgstr "向前(&F)"
+
+#: ../src/common/prntbase.cpp:863
+msgid "&Goto..."
+msgstr "跳转(&G)..."
+
+#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362
 msgid "&Help"
-msgstr "說明(&H)"
+msgstr "帮助(&H)"
 
-#: ../src/generic/logg.cpp:492
+#: ../src/common/stockitem.cpp:123
+#, fuzzy
+msgid "&Home"
+msgstr "Home(&H)"
+
+#: ../src/common/stockitem.cpp:125
+msgid "&Index"
+msgstr "索引(&I)"
+
+#: ../src/common/stockitem.cpp:126
+msgid "&Italic"
+msgstr "斜体(&I)"
+
+#: ../src/generic/logg.cpp:513
 msgid "&Log"
-msgstr "日誌(&L)"
+msgstr "日志(&L)"
 
-#: ../src/univ/themes/win32.cpp:4541
+#: ../src/univ/themes/win32.cpp:4817
 msgid "&Move"
-msgstr "移å\8b\95(&M)"
+msgstr "移å\8a¨(&M)"
 
-#: ../src/generic/mdig.cpp:115
-#: ../src/msw/mdi.cpp:193
+#: ../src/common/stockitem.cpp:131
+msgid "&New"
+msgstr "新建(&N)"
+
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
 msgid "&Next"
-msgstr "下一個(&N)"
+msgstr "下一个(&N)"
 
-#: ../src/generic/wizard.cpp:268
-#: ../src/generic/wizard.cpp:414
+#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
 msgid "&Next >"
-msgstr "下一個(&N) >"
+msgstr "下一个(&N) >"
 
-#: ../src/generic/tipdlg.cpp:215
+#: ../src/generic/tipdlg.cpp:243
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
-#: ../src/msw/textctrl.cpp:1682
+#: ../src/common/stockitem.cpp:132
+msgid "&No"
+msgstr "否(&N)"
+
+#: ../src/generic/dbgrptg.cpp:323
+msgid "&Notes:"
+msgstr "注意(&N):"
+
+#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
+#: ../src/generic/fontdlgg.cpp:375
+msgid "&OK"
+msgstr "确认(&O)"
+
+#: ../src/common/stockitem.cpp:134
+msgid "&Open"
+msgstr "打开(&O)"
+
+#: ../src/html/helpfrm.cpp:352
+msgid "&Open..."
+msgstr "打开(&O)..."
+
+#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066
 msgid "&Paste"
-msgstr "貼上(&P)"
+msgstr "粘贴(&P)"
 
-#: ../src/generic/mdig.cpp:116
-#: ../src/msw/mdi.cpp:194
+#: ../src/generic/fontdlgg.cpp:324
+msgid "&Point size:"
+msgstr "字体大小(Point size)(&P):"
+
+#: ../src/common/stockitem.cpp:136
+msgid "&Preferences"
+msgstr "偏好设置"
+
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
 msgid "&Previous"
-msgstr "前一個(&P)"
+msgstr "前页(&P)"
+
+#: ../src/common/stockitem.cpp:137
+msgid "&Print"
+msgstr "打印(&P)"
+
+#: ../src/common/prntbase.cpp:833
+msgid "&Print..."
+msgstr "打印(&P)..."
 
-#: ../src/common/cmdproc.cpp:261
-#: ../src/common/cmdproc.cpp:272
-#: ../src/msw/textctrl.cpp:1678
+#: ../src/common/stockitem.cpp:139
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: ../src/common/stockitem.cpp:140
+msgid "&Quit"
+msgstr "退出(&Q)"
+
+#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062
 msgid "&Redo"
-msgstr "é\87\8då\81\9a(&R)"
+msgstr "é\87\8då¤\8d(&R)"
 
-#: ../src/common/cmdproc.cpp:255
-#: ../src/common/cmdproc.cpp:282
+#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
 msgid "&Redo "
-msgstr "é\87\8då\81\9a(&R)"
+msgstr "é\87\8då¤\8d(&R) "
 
-#: ../src/generic/fdrepdlg.cpp:174
+#: ../src/generic/fdrepdlg.cpp:185
 msgid "&Replace"
-msgstr "置換(&R)"
+msgstr "替换(&R)"
 
-#: ../src/univ/themes/win32.cpp:4540
+#: ../src/univ/themes/win32.cpp:4816
 msgid "&Restore"
-msgstr "回存(&R)"
+msgstr "复原(&R)"
+
+#: ../src/common/stockitem.cpp:145
+msgid "&Save"
+msgstr "保存(&S)"
 
-#: ../src/generic/logg.cpp:487
-#: ../src/generic/logg.cpp:818
+#: ../src/generic/logg.cpp:508
 msgid "&Save..."
-msgstr "儲存...(&S)"
+msgstr "保存(&S)..."
 
-#: ../src/generic/tipdlg.cpp:212
+#: ../src/generic/tipdlg.cpp:238
 msgid "&Show tips at startup"
-msgstr "å\95\9få\8b\95æ\99\82顯示å°\8fç§\98訣(&S)"
+msgstr "å\90¯å\8a¨æ\97¶æ\98¾ç¤ºæ\8a\80å·§(&S)"
 
-#: ../src/univ/themes/win32.cpp:4543
+#: ../src/univ/themes/win32.cpp:4819
 msgid "&Size"
 msgstr "大小(&S)"
 
-#: ../src/common/cmdproc.cpp:267
-#: ../src/msw/textctrl.cpp:1677
+#: ../src/common/stockitem.cpp:147
+msgid "&Stop"
+msgstr "停止(&S)"
+
+#: ../src/generic/fontdlgg.cpp:284
+msgid "&Style:"
+msgstr "字体(&S):"
+
+#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+msgid "&Underline"
+msgstr "下划线(&U)"
+
+#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
+#: ../src/msw/textctrl.cpp:2061
 msgid "&Undo"
-msgstr "回復(&U)"
+msgstr "恢复(&U)"
 
-#: ../src/common/cmdproc.cpp:241
+#: ../src/common/cmdproc.cpp:264
 msgid "&Undo "
-msgstr "回復(&U)"
-
-#: ../src/generic/mdig.cpp:295
-#: ../src/generic/mdig.cpp:311
-#: ../src/generic/mdig.cpp:315
-#: ../src/msw/mdi.cpp:1328
-#: ../src/msw/mdi.cpp:1335
-#: ../src/msw/mdi.cpp:1365
+msgstr "恢复(&U) "
+
+#: ../src/common/stockitem.cpp:151
+msgid "&Unindent"
+msgstr "取消缩进(&U)"
+
+#: ../src/common/stockitem.cpp:121
+msgid "&Up"
+msgstr "向上(&U)"
+
+#: ../src/generic/fontdlgg.cpp:295
+msgid "&Weight:"
+msgstr "字体粗细(&W):"
+
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
+#: ../src/msw/mdi.cpp:1424
 msgid "&Window"
-msgstr "視窗(&W)"
+msgstr "窗口(&W)"
 
-#: ../src/common/config.cpp:410
-#: ../src/msw/regconf.cpp:264
+#: ../src/common/stockitem.cpp:152
+msgid "&Yes"
+msgstr "是(&Y)"
+
+#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "'%s' æ\9c\89é¡\8då¤\96ç\9a\84 '..'ï¼\8c忽ç\95¥ä¹\8bã\80\82"
+msgstr "'%s' æ\9c\89é¢\9då¤\96ç\9a\84 '..', 忽ç\95¥ä¹\8b."
 
-#: ../src/common/valtext.cpp:147
-#: ../src/common/valtext.cpp:177
-#: ../src/common/valtext.cpp:183
+#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
+#: ../src/common/valtext.cpp:168
 #, c-format
 msgid "'%s' is invalid"
-msgstr "'%s' 是無效的"
+msgstr "'%s' 是无效的"
 
-#: ../src/common/cmdline.cpp:734
+#: ../src/common/cmdline.cpp:769
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "'%s' 不是選項 '%s' 的正確數值。"
+msgstr "'%s' 不是匹配选项 '%s'的正确数字值."
 
-#: ../src/common/intl.cpp:402
+#: ../src/common/intl.cpp:1146
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' 不是有效的訊息記載檔。"
+msgstr "'%s' 不是有效的消息目录."
 
-#: ../src/common/textbuf.cpp:245
+#: ../src/common/textbuf.cpp:246
 #, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' æ\88\96許æ\98¯å\80\8bäº\8cé\80²ä½\8dç·©è¡\9då\8d\80ã\80\82"
+msgstr "'%s' æ\88\96许æ\98¯ä¸\80个äº\8cè¿\9bå\88¶æ\96\87件."
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:157
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' 應該是數值。"
+msgstr "'%s' 应该是一个数值."
 
-#: ../src/common/valtext.cpp:154
+#: ../src/common/valtext.cpp:139
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' 應只含有ASCII字元。"
+msgstr "'%s' 应该仅包含ASCII字符."
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:145
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' 應只含有字母字元。"
+msgstr "'%s' 应仅包含字母字符."
 
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:151
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' 應只含有字母或數字字元。"
+msgstr "'%s' 应仅包含字母或数字字符."
 
-#: ../src/html/helpfrm.cpp:714
+#: ../src/html/helpfrm.cpp:976
 msgid "(Help)"
-msgstr "(說明)"
+msgstr "(帮助)"
 
-#: ../src/html/helpfrm.cpp:315
-#: ../src/html/helpfrm.cpp:845
-#: ../src/html/helpfrm.cpp:1461
+#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:1764
 msgid "(bookmarks)"
-msgstr "(書籤)"
-
-#: ../src/common/resourc2.cpp:297
-#: ../src/common/resourc2.cpp:1362
-#: ../src/common/resource.cpp:1816
-#: ../src/common/resource.cpp:1946
-#: ../src/common/resource.cpp:3030
-msgid ", expected static, #include or #define\n"
-"whilst parsing resource."
-msgstr "，解譯資源時，應有\n"
-"static、#include 或 #define。"
-
-#: ../src/generic/dirctrlg.cpp:700
-#: ../src/generic/filedlgg.cpp:938
-msgid "."
+msgstr "(书签)"
+
+#: ../src/common/debugrpt.cpp:537
+msgid "*** A debug report has been generated\n"
+msgstr "*** 生成了一份调试报告\n"
+
+#: ../src/common/debugrpt.cpp:540
+msgid "*** And includes the following files:\n"
+msgstr "*** 且包含以下文件:\n"
+
+#: ../src/common/debugrpt.cpp:538
+#, c-format
+msgid "*** It can be found in \"%s\"\n"
+msgstr "*** 可在此找到: \"%s\"\n"
+
+#: ../contrib/src/deprecated/resource.cpp:1840
+#: ../contrib/src/deprecated/resource.cpp:1970
+#: ../contrib/src/deprecated/resource.cpp:3062
+msgid ""
+", expected static, #include or #define\n"
+"while parsing resource."
 msgstr ""
+", 在对资源进行语法分析时\n"
+", 期望如下关键字 static, #include 或 #define ."
 
-#: ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/filedlgg.cpp:939
+#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747
+msgid "."
+msgstr "."
+
+#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748
 msgid ".."
-msgstr ""
+msgstr ".."
 
-#: ../src/common/paper.cpp:120
+#: ../src/common/paper.cpp:127
 msgid "10 x 14 in"
-msgstr "10 x 14 è\8b±å\90\8b"
+msgstr "10 x 14 è\8b±å¯¸"
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:128
 msgid "11 x 17 in"
-msgstr "11 x 17 è\8b±å\90\8b"
+msgstr "11 x 17 è\8b±å¯¸"
 
-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:146
 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/html/htmprint.cpp:279
+#: ../src/html/htmprint.cpp:309
 msgid ": file does not exist!"
-msgstr ": æª\94æ¡\88ä¸\8då­\98å\9c¨ï¼\81"
+msgstr ": æ\96\87件ä¸\8då­\98å\9c¨!"
 
-#: ../src/common/fontmap.cpp:670
+#: ../src/common/fontmap.cpp:200
 msgid ": unknown charset"
-msgstr ": 未知的字集"
+msgstr ": 未知字符集"
 
-#: ../src/common/fontmap.cpp:898
+#: ../src/common/fontmap.cpp:414
 msgid ": unknown encoding"
-msgstr ": æ\9cªç\9f¥ç\9a\84編碼"
+msgstr ": æ\9cªç\9f¥ç¼\96ç \81"
 
-#: ../src/generic/wizard.cpp:263
+#: ../src/generic/wizard.cpp:423
 msgid "< &Back"
 msgstr "< 返回(&B)"
 
-#: ../src/generic/filedlgg.cpp:534
+#: ../src/common/prntbase.cpp:845
+msgid "<<"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289
 msgid "<DIR>"
-msgstr "<目錄>"
+msgstr "<目录>"
 
-#: ../src/generic/filedlgg.cpp:536
+#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293
+msgid "<DRIVE>"
+msgstr "<盘符>"
+
+#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291
 msgid "<LINK>"
-msgstr "<連線>"
+msgstr "<连接>"
+
+#: ../src/html/helpfrm.cpp:1276
+msgid "<b><i>Bold italic face.</i></b><br>"
+msgstr "<b><i>粗斜体.</i></b><br>"
+
+#: ../src/html/helpfrm.cpp:1280
+msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
+msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
+
+#: ../src/html/helpfrm.cpp:1275
+msgid "<b>Bold face.</b> "
+msgstr "<b>粗体.</b> "
+
+#: ../src/html/helpfrm.cpp:1274
+msgid "<i>Italic face.</i> "
+msgstr "<i>斜体.</i> "
 
-#: ../src/html/helpfrm.cpp:994
-msgid "<html><body><table><tr><td>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> <b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font><br><td><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> <b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size -2</font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</font></tt></table></body></html>"
+#: ../src/common/prntbase.cpp:851
+msgid ">>"
 msgstr ""
 
-#: ../src/common/paper.cpp:113
+#: ../src/common/prntbase.cpp:857
+msgid ">>|"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:285
+msgid "A debug report has been generated in the directory\n"
+msgstr "产生了一份调试报告, 位于目录\n"
+
+#: ../src/common/xtixml.cpp:409
+msgid "A non empty collection must consist of 'element' nodes"
+msgstr "非空集合必须包含元素('element')节点"
+
+#: ../src/common/paper.cpp:120
 msgid "A3 sheet, 297 x 420 mm"
-msgstr "A3 ç´\99å¼µ, 297 x 420 毫米"
+msgstr "A3 çº¸å¼ , 297 x 420 毫米"
 
-#: ../src/common/paper.cpp:104
+#: ../src/common/paper.cpp:111
 msgid "A4 sheet, 210 x 297 mm"
-msgstr "A4 ç´\99å¼µ, 210 x 297 毫米"
+msgstr "A4 çº¸å¼ , 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:121
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 å°\8fç´\99å¼µ, 210 x 297 毫米"
+msgstr "A4 å°\8fçº¸å¼ , 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:122
 msgid "A5 sheet, 148 x 210 mm"
-msgstr "A5 ç´\99å¼µ, 148 x 210 毫米"
+msgstr "A5 çº¸å¼ , 148 x 210 毫米"
 
-#: ../src/generic/fontdlgg.cpp:83
+#: ../src/generic/fontdlgg.cpp:87
 msgid "ABCDEFGabcdefg12345"
-msgstr ""
+msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "ASCII"
-msgstr "文字"
+msgstr "ASCII"
 
-#: ../src/html/helpfrm.cpp:328
+#: ../src/common/stockitem.cpp:107
+msgid "Add"
+msgstr "加入"
+
+#: ../src/html/helpfrm.cpp:444
 msgid "Add current page to bookmarks"
-msgstr "把目前頁面加到書籤中"
+msgstr "把当前页加到书签中"
 
-#: ../src/generic/colrdlgg.cpp:287
+#: ../src/generic/colrdlgg.cpp:297
 msgid "Add to custom colours"
-msgstr "加到自訂色彩中"
+msgstr "加到自定义颜色中"
+
+#: ../include/wx/xti.h:902
+msgid "AddToPropertyCollection called on a generic accessor"
+msgstr "在一个通用处理器上调用AddToPropertyCollection"
 
-#: ../src/html/helpctrl.cpp:100
+#: ../include/wx/xti.h:849
+msgid "AddToPropertyCollection called w/o valid adder"
+msgstr "调用AddToPropertyCollection时未带有效的adder"
+
+#: ../src/html/helpctrl.cpp:106
 #, c-format
 msgid "Adding book %s"
-msgstr "正在加入卷輯 %s"
+msgstr "正在添加卷 %s"
+
+#: ../src/common/stockitem.cpp:129
+msgid "Align Left"
+msgstr "左对齐"
+
+#: ../src/common/stockitem.cpp:130
+msgid "Align Right"
+msgstr "右对齐"
 
-#: ../src/generic/prntdlgg.cpp:160
+#: ../src/generic/prntdlgg.cpp:209
 msgid "All"
 msgstr "所有"
 
-#: ../src/generic/filedlgg.cpp:1062
+#: ../src/common/fldlgcmn.cpp:64
+#, c-format
+msgid "All files (%s)|%s"
+msgstr "所有文件 (%s)|%s"
+
+#: ../include/wx/defs.h:2229
 msgid "All files (*)|*"
-msgstr "所有檔案 (*)|*"
+msgstr "所有文件 (*)|*"
+
+#: ../src/html/helpfrm.cpp:1578
+msgid "All files (*.*)|*"
+msgstr "所有文件 (*)|*"
+
+#: ../include/wx/defs.h:2226
+msgid "All files (*.*)|*.*"
+msgstr "所有文件 (*)|*"
+
+#: ../src/common/xtistrm.cpp:385
+msgid "Already Registered Object passed to SetObjectClassInfo"
+msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
-msgstr "å·²ç¶\93æ\92¥æ\8e¥ ISPã\80\82"
+msgstr "å·²ç»\8fæ\8b¨æ\8e¥ISP."
 
-#: ../src/generic/logg.cpp:1109
+#: ../src/generic/logg.cpp:1164
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "把日誌加到檔案 '%s' 的尾端(選擇 [否] 將覆寫該檔案)？"
+msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
 
-#: ../src/common/fontmap.cpp:118
+#: ../src/common/fmapbase.cpp:108
 msgid "Arabic (ISO-8859-6)"
-msgstr "é\98¿æ\8b\89伯èª\9e (ISO-8859-6)"
+msgstr "é\98¿æ\8b\89伯语 (ISO-8859-6)"
 
-#: ../src/common/paper.cpp:134
+#: ../src/html/chm.cpp:564
+msgid "Archive doesnt contain #SYSTEM file"
+msgstr "存档里没有包含 #SYSTEM 文件"
+
+#: ../src/generic/filedlgg.cpp:447
+msgid "Attributes"
+msgstr "属性(Attributes)"
+
+#: ../src/common/paper.cpp:141
 msgid "B4 Envelope, 250 x 353 mm"
 msgstr "B4 信封, 250 x 353 毫米"
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:123
 msgid "B4 sheet, 250 x 354 mm"
-msgstr "B4 信封, 250 x 354 毫米"
+msgstr "B4 纸张, 250 x 354 毫米"
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/paper.cpp:142
 msgid "B5 Envelope, 176 x 250 mm"
 msgstr "B5 信封, 176 x 250 毫米"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:124
 msgid "B5 sheet, 182 x 257 millimeter"
-msgstr "B5 信封, 182 x 257 毫米"
+msgstr "B5 纸张, 182 x 257 毫米"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:143
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 信封, 176 x 125 毫米"
 
-#: ../src/common/imagbmp.cpp:468
-#: ../src/common/imagbmp.cpp:484
+#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
 msgid "BMP: Couldn't allocate memory."
-msgstr "BMP: 無法配置記憶體。"
+msgstr "BMP: 不能分配内存."
 
-#: ../src/common/imagbmp.cpp:86
+#: ../src/common/imagbmp.cpp:94
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: 無法儲存無效的圖像。"
+msgstr "BMP: 不能保存无效图像."
 
-#: ../src/common/imagbmp.cpp:290
+#: ../src/common/imagbmp.cpp:298
 msgid "BMP: Couldn't write RGB color map."
-msgstr "BMP: 無法寫入 RGB 顏色對應表。"
+msgstr "BMP: 不能写RGB色彩表."
 
-#: ../src/common/imagbmp.cpp:422
+#: ../src/common/imagbmp.cpp:431
 msgid "BMP: Couldn't write data."
-msgstr "BMP: 無法寫入資料。"
+msgstr "BMP: 不能写数据."
 
-#: ../src/common/imagbmp.cpp:195
+#: ../src/common/imagbmp.cpp:203
 msgid "BMP: Couldn't write the file (Bitmap) header."
-msgstr "BMP: 無法寫入檔案標頭(Bitmap)。"
+msgstr "BMP: 不能写文件头(Bitmap)."
 
-#: ../src/common/imagbmp.cpp:216
+#: ../src/common/imagbmp.cpp:224
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
-msgstr "BMP: 無法寫入檔案標頭(BitmapInfo)。"
+msgstr "BMP: 不能写文件头(BitmapInfo)."
 
-#: ../src/common/imagbmp.cpp:120
+#: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
-msgstr ""
-
-#: ../src/common/dlgcmn.cpp:233
-msgid "Backward"
-msgstr "前一頁"
+msgstr "BMP: wxImage没有我们的wxPalette."
 
-#: ../src/common/fontmap.cpp:125
+#: ../src/common/fmapbase.cpp:115
 msgid "Baltic (ISO-8859-13)"
-msgstr "æ³¢ç¾\85ç\9a\84æµ·èª\9e (ISO-8859-13)"
+msgstr "æ³¢ç½\97ç\9a\84海语 (ISO-8859-13)"
 
-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fmapbase.cpp:106
 msgid "Baltic (old) (ISO-8859-4)"
-msgstr "æ³¢ç¾\85ç\9a\84æµ·èª\9e (è\88\8a的) (ISO-8859-4)"
+msgstr "æ³¢ç½\97ç\9a\84海语 (æ\97§的) (ISO-8859-4)"
 
-#: ../src/common/resourc2.cpp:840
-#: ../src/common/resource.cpp:2500
+#: ../contrib/src/deprecated/resource.cpp:2524
 #, c-format
 msgid "Bitmap resource specification %s not found."
-msgstr "找不到點陣圖資源描述 %s。"
+msgstr "找不到位图规格 %s."
 
-#: ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:237
 msgid "Bold"
-msgstr "粗體"
+msgstr "粗体"
 
-#: ../src/generic/prntdlgg.cpp:645
+#: ../src/generic/prntdlgg.cpp:892
 msgid "Bottom margin (mm):"
-msgstr "底邊距(毫米)："
+msgstr "底边距 (毫米):"
 
-#: ../src/common/paper.cpp:105
+#: ../src/common/paper.cpp:112
 msgid "C sheet, 17 x 22 in"
-msgstr "C ç´\99å¼µ, 17 x 22 è\8b±å\90\8b"
+msgstr "C çº¸å¼ , 17 x 22 è\8b±å¯¸"
 
-#: ../src/generic/logg.cpp:489
+#: ../src/generic/logg.cpp:510
 msgid "C&lear"
 msgstr "清除(&L)"
 
-#: ../src/common/paper.cpp:130
+#: ../src/generic/fontdlgg.cpp:308
+msgid "C&olour:"
+msgstr "颜色(&o):"
+
+#: ../src/common/paper.cpp:137
 msgid "C3 Envelope, 324 x 458 mm"
 msgstr "C3 信封, 324 x 458 毫米"
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:138
 msgid "C4 Envelope, 229 x 324 mm"
 msgstr "C4 信封, 229 x 324 毫米"
 
-#: ../src/common/paper.cpp:129
+#: ../src/common/paper.cpp:136
 msgid "C5 Envelope, 162 x 229 mm"
 msgstr "C5 信封, 162 x 229 毫米"
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:139
 msgid "C6 Envelope, 114 x 162 mm"
 msgstr "C6 信封, 114 x 162 毫米"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:140
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 信封, 114 x 229 毫米"
 
-#: ../src/common/filefn.cpp:1383
+#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
+msgid "CHM handler currently supports only local files!"
+msgstr "CHM处理程序目前只支持本地文件!"
+
+#: ../src/os2/thread.cpp:121
+#, fuzzy
+msgid "Can not create mutex."
+msgstr "不能创建互斥对象."
+
+#: ../src/common/filefn.cpp:1290
 #, c-format
 msgid "Can not enumerate files '%s'"
-msgstr "無法列舉檔案 '%s'"
+msgstr "不能枚举文件 '%s'"
 
-#: ../src/msw/dir.cpp:296
-#: ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
-msgstr "無法列舉目錄 '%s' 中的檔案"
+msgstr "不能枚举目录 '%s'中的文件"
 
-#: ../src/mac/thread.cpp:472
-#: ../src/msw/thread.cpp:685
+#: ../src/os2/thread.cpp:523
+#, c-format
+msgid "Can not resume thread %lu"
+msgstr "不能恢复线程 %lu"
+
+#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:824
 #, c-format
 msgid "Can not resume thread %x"
-msgstr "無法恢復執行緒 %x"
+msgstr "不能恢复线程 %x"
 
-#: ../src/msw/thread.cpp:559
+#: ../src/msw/thread.cpp:498
 msgid "Can not start thread: error writing TLS."
-msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤。"
+msgstr "不能启动线程: 写TLS出错."
 
-#: ../src/mac/thread.cpp:448
-#: ../src/msw/thread.cpp:670
+#: ../src/os2/thread.cpp:510
+#, c-format
+msgid "Can not suspend thread %lu"
+msgstr "不能挂起线程 %lu"
+
+#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:809
 #, c-format
 msgid "Can not suspend thread %x"
-msgstr "無法暫停執行緒 %x"
+msgstr "不能挂起线程 %x"
 
-#: ../src/msw/thread.cpp:1016
+#: ../src/msw/thread.cpp:722
 msgid "Can not wait for thread termination"
-msgstr "無法等候執行緒終結"
+msgstr "不能等候线程终止"
 
-#: ../src/common/cmdproc.cpp:243
+#: ../src/common/cmdproc.cpp:266
 msgid "Can't &Undo "
-msgstr "無法回復(&U)"
+msgstr "不能恢复(&U)"
 
-#: ../src/common/image.cpp:1315
+#: ../src/common/image.cpp:1763
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "無法檢查圖像檔格式 '%s'：檔案不存在。"
+msgstr "不能检查文件格式 '%s': 文件不存在."
 
-#: ../src/msw/registry.cpp:421
+#: ../src/msw/registry.cpp:434
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "無法關閉登錄機碼 '%s'"
+msgstr "不能关闭注册键 '%s'"
 
-#: ../src/msw/registry.cpp:493
+#: ../src/msw/registry.cpp:510
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "無法複製不支援類型 %d 的值。"
-
-#: ../src/msw/toplevel.cpp:315
-msgid "Can't create dialog using memory template"
-msgstr "無法使用記憶體樣版建立對話窗 '%s'"
-
-#: ../src/os2/toplevel.cpp:369
-#, c-format
-msgid "Can't create dialog using template '%ul'"
-msgstr "無法使用樣版建立對話窗 '%s'"
-
-#: ../src/msw/listctrl.cpp:334
-msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "無法建立清單控件視窗, 檢查comctl32.dll是否已安裝。"
+msgstr "不能复制不支持的类型 %d 的值."
 
-#: ../src/msw/registry.cpp:402
+#: ../src/msw/registry.cpp:415
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "無法建立登錄機碼 '%s'"
+msgstr "不能创建注册键 '%s'"
 
-#: ../src/mac/thread.cpp:427
-#: ../src/msw/thread.cpp:652
+#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
+#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
+#: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
-msgstr "無法建立執行緒"
+msgstr "不能创建进程"
 
-#: ../src/msw/window.cpp:3062
+#: ../src/msw/window.cpp:3077
 #, c-format
 msgid "Can't create window of class %s"
-msgstr "無法建立類別 '%s' 的視窗"
+msgstr "不能创建类 '%s' 的窗口"
 
-#: ../src/msw/registry.cpp:661
+#: ../src/msw/registry.cpp:686
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "無法刪除機碼 '%s'"
+msgstr "不能删除键 '%s'"
 
-#: ../src/msw/iniconf.cpp:445
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "無法刪除 INI 檔 '%s'"
+msgstr "不能删除 INI 文件 '%s'"
 
-#: ../src/msw/registry.cpp:686
+#: ../src/msw/registry.cpp:713
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "無法刪除機值 '%s' @ '%s'"
-
-#: ../src/msw/registry.cpp:697
-#, c-format
-msgid "Can't delete value of key '%s'"
-msgstr "無法刪除機碼 '%s'的值"
+msgstr "不能删除键值 '%s'/ '%s'"
 
-#: ../src/msw/registry.cpp:1025
+#: ../src/msw/registry.cpp:1061
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "無法列舉機碼 '%s' 的子機碼"
+msgstr "不能枚举键 '%s'的子键"
 
-#: ../src/msw/registry.cpp:980
+#: ../src/msw/registry.cpp:1016
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "無法列舉機碼 '%s' 的值"
+msgstr "不能枚举键 '%s'的值"
 
-#: ../src/common/ffile.cpp:226
+#: ../src/msw/registry.cpp:1267
+#, fuzzy, c-format
+msgid "Can't export value of unsupported type %d."
+msgstr "不能导出不支持的类型 %d 的值."
+
+#: ../src/common/ffile.cpp:238
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "無法在檔案 '%s' 中找到目前位置"
+msgstr "不能在文件'%s'中找到当前位置"
 
 #: ../src/msw/registry.cpp:351
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "無法獲得登錄機碼 '%s' 的資訊"
+msgstr "不能获得注册键 '%s'的信息"
+
+#: ../src/common/zstream.cpp:237
+msgid "Can't initialize zlib deflate stream."
+msgstr "不能初始化zlib deflate(压缩)流."
+
+#: ../src/common/zstream.cpp:99
+msgid "Can't initialize zlib inflate stream."
+msgstr "不能初始化zlib inflate(解压)流."
 
-#: ../src/common/image.cpp:913
-#: ../src/common/image.cpp:933
+#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
-msgstr "無法從檔案 '%s' 中載入圖像：檔案不存在。"
+msgstr "不能从文件 '%s'中装入图像: 文件不存在."
 
-#: ../src/msw/dib.cpp:434
+#: ../src/msw/registry.cpp:381
 #, c-format
-msgid "Can't open file '%s'"
-msgstr "無法開啟檔案 '%s'"
+msgid "Can't open registry key '%s'"
+msgstr "不能打开注册键 '%s'"
 
-#: ../src/msw/registry.cpp:377
+#: ../src/common/zstream.cpp:166
 #, c-format
-msgid "Can't open registry key '%s'"
-msgstr "無法開啟登錄機碼 '%s'"
+msgid "Can't read from inflate stream: %s"
+msgstr "不能从解压流 %s 中读"
 
-#: ../src/msw/registry.cpp:904
+#: ../src/common/zstream.cpp:159
+msgid "Can't read inflate stream: unexpected EOF in underlying stream."
+msgstr "不能读解压流: 流内有异常的EOF."
+
+#: ../src/msw/registry.cpp:950
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "無法讀取 '%s' 的值"
+msgstr "不能读 '%s'的值"
 
-#: ../src/msw/registry.cpp:777
-#: ../src/msw/registry.cpp:816
+#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
+#: ../src/msw/registry.cpp:876
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "無法讀取機碼 '%s' 的值"
+msgstr "不能读键 '%s'的值"
 
-#: ../src/common/image.cpp:955
+#: ../src/common/image.cpp:1386
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "無法儲存圖像到檔案 '%s' 中：未知的附檔名。"
+msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
 
-#: ../src/generic/logg.cpp:551
-#: ../src/generic/logg.cpp:985
+#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021
 msgid "Can't save log contents to file."
-msgstr "無法將日誌內容儲存到檔案中。"
+msgstr "不能把日志内容保存到文件."
 
-#: ../src/msw/thread.cpp:611
+#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
-msgstr "無法設定執行緒的優先等級"
+msgstr "不能设置线程优先级"
 
-#: ../src/msw/registry.cpp:802
-#: ../src/msw/registry.cpp:928
+#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
+#: ../src/msw/registry.cpp:965
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "無法設定 '%s' 的值"
-
-#: ../src/common/dlgcmn.cpp:246
-#: ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:1181
-#: ../src/generic/filedlgg.cpp:1200
-#: ../src/generic/fontdlgg.cpp:255
-#: ../src/generic/prntdlgg.cpp:453
-#: ../src/generic/progdlgg.cpp:211
-#: ../src/generic/proplist.cpp:511
-#: ../src/gtk/filedlg.cpp:173
-#: ../src/gtk/fontdlg.cpp:144
-#: ../src/html/helpfrm.cpp:976
-#: ../src/motif/msgdlg.cpp:182
+msgstr "不能设置 '%s'的值"
+
+#: ../src/common/zstream.cpp:316
+#, c-format
+msgid "Can't write to deflate stream: %s"
+msgstr "不能写到压缩流: %s"
+
+#: ../contrib/src/deprecated/proplist.cpp:518 ../src/generic/choicdgg.cpp:291
+#: ../src/generic/dirdlgg.cpp:116 ../src/generic/numdlgg.cpp:136
+#: ../src/generic/textdlgg.cpp:120 ../src/gtk/fontdlg.cpp:155
+#: ../src/motif/msgdlg.cpp:187
 msgid "Cancel"
 msgstr "取消"
 
-#: ../contrib/src/xrc/xmlres.cpp:969
-#: ../contrib/src/xrc/xmlres.cpp:1010
+#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175
 msgid "Cannot convert dialog units: dialog unknown."
-msgstr "無法轉換對話窗單位：未知的對話窗。"
+msgstr "不能转换对话单元: 未知的对话."
 
-#: ../src/common/strconv.cpp:963
+#: ../src/common/strconv.cpp:2665
 #, c-format
-msgid "Cannot convert from encoding '%s'!"
-msgstr "無法轉換編碼 '%s'！"
+msgid "Cannot convert from the charset '%s'!"
+msgstr "不能从字符集 '%s' 转换!"
 
-#: ../src/msw/dialup.cpp:499
+#: ../src/msw/dialup.cpp:509
 #, c-format
 msgid "Cannot find active dialup connection: %s"
-msgstr "找不到連線中的撥號連線: %s"
+msgstr "找不到活动的拨号连接: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:243
+#: ../src/xrc/xmlres.cpp:269
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
-msgstr "找不到未知控制元件所依附的容器： '%s'。"
+msgstr "找不到可以对应于未知控件 '%s' 的容器."
 
-#: ../contrib/src/xrc/xmlres.cpp:1024
+#: ../src/xrc/xmlres.cpp:1210
 #, c-format
 msgid "Cannot find font node '%s'."
-msgstr "找不到字型節點 '%s'。"
+msgstr "找不到字体节点 '%s'."
 
-#: ../src/msw/dialup.cpp:813
+#: ../src/msw/dialup.cpp:814
 msgid "Cannot find the location of address book file"
-msgstr "找不到通訊錄的檔案位置。"
+msgstr "找不到地址簿文件的位置"
 
-#: ../src/unix/threadpsx.cpp:1096
+#: ../src/unix/threadpsx.cpp:1100
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "無法取得排程原則 %d 的優先等級範圍。"
+msgstr "不能获得调度策略 %d 的优先级范围."
 
-#: ../src/unix/utilsunx.cpp:865
+#: ../src/unix/utilsunx.cpp:758
 msgid "Cannot get the hostname"
-msgstr "無法獲得主機名稱。"
+msgstr "不能获得主机名"
 
-#: ../src/unix/utilsunx.cpp:901
+#: ../src/unix/utilsunx.cpp:794
 msgid "Cannot get the official hostname"
-msgstr "無法獲得正式的主機名稱。"
+msgstr "不能获得正式的主机名"
 
-#: ../src/msw/dialup.cpp:907
+#: ../src/msw/dialup.cpp:908
 msgid "Cannot hang up - no active dialup connection."
-msgstr "無法掛斷—沒有連線中的撥號連線。"
+msgstr "不能挂起 - 没有活动的拨号连接."
 
-#: ../src/msw/app.cpp:250
+#: ../include/wx/msw/ole/oleutils.h:47
 msgid "Cannot initialize OLE"
-msgstr "無法初始化 OLE"
+msgstr "不能初始化 OLE"
 
-#: ../src/mgl/app.cpp:414
+#: ../src/mgl/app.cpp:292
 msgid "Cannot initialize SciTech MGL!"
-msgstr "無法初始化 SciTech MGL！"
+msgstr "不能初始化 SciTech MGL!"
 
-#: ../src/mgl/window.cpp:547
+#: ../src/mgl/window.cpp:546
 msgid "Cannot initialize display."
-msgstr "無法初始化顯示畫面。"
+msgstr "不能初始化显示."
 
-#: ../src/msw/volume.cpp:634
+#: ../src/msw/volume.cpp:601
 #, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "無法從 '%s' 中載入圖示。"
+msgstr "不能从 '%s'中读取图标."
 
-#: ../contrib/src/xrc/xmlres.cpp:356
+#: ../src/xrc/xmlres.cpp:392
 #, c-format
 msgid "Cannot load resources from file '%s'."
-msgstr "無法從檔案 '%s' 中載入資源。"
+msgstr "不能从文件 '%s'中读取资源."
 
 #: ../src/html/htmlfilt.cpp:164
 #, c-format
 msgid "Cannot open HTML document: %s"
-msgstr "無法開啟 HTML 文件： %s"
+msgstr "不能打开 HTML 文档: %s"
 
-#: ../src/html/helpdata.cpp:584
+#: ../src/html/helpdata.cpp:672
 #, c-format
 msgid "Cannot open HTML help book: %s"
-msgstr "無法開啟 HTML 說明書： %s"
+msgstr "不能打开 HTML 帮助: %s"
 
-#: ../src/generic/helpext.cpp:100
+#: ../src/generic/helpext.cpp:123
 #, c-format
 msgid "Cannot open URL '%s'"
-msgstr "無法開啟 URL '%s'"
+msgstr "不能打开 URL '%s'"
 
-#: ../src/html/helpdata.cpp:277
+#: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "無法開啟目錄檔案： %s"
+msgstr "不能打开目录文件: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:330
+#: ../src/xrc/xmlres.cpp:360
 #, c-format
 msgid "Cannot open file '%s'."
-msgstr "無法開啟檔案 '%s'"
+msgstr "不能打开文件 '%s'."
 
-#: ../src/generic/dcpsg.cpp:1719
+#: ../src/generic/dcpsg.cpp:1568
 msgid "Cannot open file for PostScript printing!"
-msgstr "無法開啟檔案進行 PostScript 列印！"
+msgstr "不能打开文件进行PostScript打印!"
 
-#: ../src/html/helpdata.cpp:292
+#: ../src/html/helpdata.cpp:326
 #, c-format
 msgid "Cannot open index file: %s"
-msgstr "無法開啟索引檔： %s"
+msgstr "不能打开索引文件: %s"
+
+#: ../src/common/intl.cpp:1202
+#, fuzzy, c-format
+msgid "Cannot parse Plural-Forms:'%s'"
+msgstr "不能粘贴复数: '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:957
+#: ../src/xrc/xmlres.cpp:1111
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
-msgstr "無法從 '%s' 解譯出大小。"
+msgstr "不能从 '%s'中粘贴坐标."
 
-#: ../contrib/src/xrc/xmlres.cpp:998
-#, c-format
+#: ../src/xrc/xmlres.cpp:1159
+#, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
-msgstr "無法從 '%s' 解譯出維度。"
+msgstr "不能从 '%s'中粘贴维数."
 
-#: ../src/html/helpfrm.cpp:1293
+#: ../src/html/helpfrm.cpp:1562
 msgid "Cannot print empty page."
-msgstr "無法列印空頁面。"
+msgstr "不能打印空页面."
 
-#: ../src/msw/volume.cpp:195
-#: ../src/msw/volume.cpp:526
+#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "無法從 '%s' 讀取型態名稱！"
+msgstr "不能从 '%s'中读取类型名称."
 
-#: ../src/unix/threadpsx.cpp:1077
+#: ../src/unix/threadpsx.cpp:1081
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "無法取得執行緒調度原則。"
+msgstr "不能找回线程调度策略."
 
-#: ../src/unix/threadpsx.cpp:710
+#: ../src/unix/threadpsx.cpp:729
 msgid "Cannot start thread: error writing TLS"
-msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤"
+msgstr "不能启动线程: 写TLS错误"
+
+#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
+msgid "Cannot wait for thread termination."
+msgstr "不能等候线程终止."
+
+#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
+msgid "Cant create the thread event queue"
+msgstr "不能创建线程事件队列"
 
-#: ../src/html/helpfrm.cpp:411
+#: ../src/html/helpfrm.cpp:534
 msgid "Case sensitive"
-msgstr "å\8d\80å\88\86大å°\8f寫"
+msgstr "大å°\8få\86\99æ\95\8fæ\84\9f"
 
-#: ../src/common/fontmap.cpp:126
+#: ../src/common/fmapbase.cpp:116
 msgid "Celtic (ISO-8859-14)"
-msgstr "å\87±ç\88¾ç\89¹èª\9e (ISO-8859-14)"
+msgstr "å\87¯å°\94ç\89¹è¯­ (ISO-8859-14)"
 
-#: ../src/common/fontmap.cpp:114
+#: ../src/common/stockitem.cpp:127
+msgid "Centered"
+msgstr "居中"
+
+#: ../src/common/fmapbase.cpp:104
 msgid "Central European (ISO-8859-2)"
-msgstr "中æ­\90 (ISO-8859-2)"
+msgstr "中欧语系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:748
+#: ../src/msw/dialup.cpp:749
 msgid "Choose ISP to dial"
-msgstr "é\81¸æ\93\87 ISP é\80²è¡\8cæ\92¥è\99\9f"
+msgstr "é\80\89æ\8b©ISPè¿\9bè¡\8cæ\8b¨å\8f·"
 
-#: ../src/gtk/fontdlg.cpp:122
+#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
+#: ../src/palmos/colordlg.cpp:76
+msgid "Choose colour"
+msgstr "选择颜色"
+
+#: ../src/gtk/fontdlg.cpp:133
 msgid "Choose font"
-msgstr "é\81¸æ\93\87å­\97å\9e\8b"
+msgstr "é\80\89æ\8b©å­\97ä½\93"
 
-#: ../src/generic/mdig.cpp:112
+#: ../src/generic/mdig.cpp:114
 msgid "Cl&ose"
-msgstr "關閉(&o)"
+msgstr "关闭(&o)"
 
-#: ../src/generic/logg.cpp:489
+#: ../src/generic/logg.cpp:510
 msgid "Clear the log contents"
-msgstr "清除日誌內容"
+msgstr "清除日志内容"
+
+#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
+msgid "Click to cancel the font selection."
+msgstr "点击取消字体选择."
 
-#: ../src/common/prntbase.cpp:428
-#: ../src/generic/progdlgg.cpp:358
-#: ../src/generic/proplist.cpp:506
+#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
+#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+msgid "Click to confirm the font selection."
+msgstr "点击确认字体选择."
+
+#: ../contrib/src/deprecated/proplist.cpp:513 ../src/generic/dbgrptg.cpp:88
+#: ../src/generic/progdlgg.cpp:629 ../src/generic/progdlgg.cpp:634
 msgid "Close"
-msgstr "關閉"
+msgstr "关闭"
 
-#: ../src/univ/themes/win32.cpp:4549
+#: ../src/univ/themes/win32.cpp:4825
 msgid "Close\tAlt-F4"
-msgstr "關閉視窗\tAlt-F4"
+msgstr "关闭\tAlt-F4"
 
-#: ../src/generic/mdig.cpp:113
+#: ../src/generic/mdig.cpp:115
 msgid "Close All"
-msgstr "全部關閉"
+msgstr "全部关闭"
 
-#: ../src/generic/logg.cpp:491
+#: ../src/generic/logg.cpp:512
 msgid "Close this window"
-msgstr "關閉視窗"
+msgstr "关闭此窗口"
+
+#: ../src/html/helpfrm.cpp:1576
+msgid "Compressed HTML Help file (*.chm)|*.chm|"
+msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:549
+#: ../src/generic/dirctrlg.cpp:582
 msgid "Computer"
-msgstr "我的電腦"
+msgstr "计算机"
 
-#: ../src/common/fileconf.cpp:902
+#: ../src/common/fileconf.cpp:938
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "組態項目名稱不能以 '%c' 開頭。"
+msgstr "配置条目名不能以 '%c'开头."
 
-#: ../src/generic/filedlgg.cpp:1411
-#: ../src/gtk/filedlg.cpp:72
+#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64
 msgid "Confirm"
-msgstr "確èª\8d"
+msgstr "确认"
 
-#: ../src/msw/mimetype.cpp:689
+#: ../src/msw/mimetype.cpp:677
 msgid "Confirm registry update"
-msgstr "確èª\8dç\99»é\8c\84è®\8aæ\9b´"
+msgstr "确认æ\9b´æ\96°æ³¨å\86\8c表"
 
-#: ../src/html/htmlwin.cpp:262
+#: ../src/html/htmlwin.cpp:386
 msgid "Connecting..."
-msgstr "連線中..."
+msgstr "连接..."
 
-#: ../src/html/helpfrm.cpp:351
+#: ../src/html/helpfrm.cpp:476
 msgid "Contents"
-msgstr "目錄"
+msgstr "目录"
 
-#: ../src/common/strconv.cpp:616
+#: ../src/common/strconv.cpp:1428
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "無法轉換到字集 '%s'。"
+msgstr "不能进行到字符集 '%s'的变换."
+
+#: ../src/html/htmlwin.cpp:824
+#, c-format
+msgid "Copied to clipboard:\"%s\""
+msgstr "已复制到剪贴板:\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:193
+#: ../src/generic/prntdlgg.cpp:242
 msgid "Copies:"
-msgstr "份æ\95¸ï¼\9a"
+msgstr "份æ\95°:"
 
-#: ../src/common/resourc2.cpp:287
-#: ../src/common/resource.cpp:1806
-#: ../src/common/resource.cpp:1936
+#: ../src/html/chm.cpp:703
+#, c-format
+msgid "Could not create temporary file '%s'"
+msgstr "不能创建临时文件 '%s'"
+
+#: ../src/html/chm.cpp:274
+#, c-format
+msgid "Could not extract %s into %s: %s"
+msgstr "不能将 %s解开至 %s: %s"
+
+#: ../contrib/src/deprecated/resource.cpp:1830
+#: ../contrib/src/deprecated/resource.cpp:1960
 #, c-format
 msgid "Could not find resource include file %s."
-msgstr "æ\89¾ä¸\8då\88°è³\87æº\90å¼\95å\85¥æª\94 %sã\80\82"
+msgstr "æ\89¾ä¸\8då\88°èµ\84æº\90å\8c\85å\90«æ\96\87件 %s."
 
-#: ../src/generic/tabg.cpp:1044
+#: ../src/generic/tabg.cpp:1048
 msgid "Could not find tab for id"
-msgstr "找不到識別碼標籤"
+msgstr "找不到id的标签"
 
-#: ../src/msw/textctrl.cpp:2050
+#: ../src/html/chm.cpp:445
 #, c-format
-msgid "Could not load Rich Edit DLL '%s'"
-msgstr "無法載入 Rich Edit DLL '%s'"
+msgid "Could not locate file '%s'."
+msgstr "找不到文件 '%s'"
 
-#: ../src/common/resource.cpp:802
+#: ../contrib/src/deprecated/resource.cpp:829
 #, c-format
-msgid "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
+msgid ""
+"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
 " or provide #define (see manual for caveats)"
-msgstr "無法解析控制元件的類別或識別碼 '%s'。以(非零)的整數代替\n"
-"或是提供 #define (參照 caveats 手冊)"
+msgstr ""
+"不能解析控件类或者id '%s'. 用(非零)整数代替\n"
+"或 提供 #define (详细信息见手册)"
 
-#: ../src/common/resource.cpp:1251
+#: ../contrib/src/deprecated/resource.cpp:1278
 #, c-format
-msgid "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
+msgid ""
+"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 "or provide #define (see manual for caveats)"
-msgstr "無法解析選單識別碼 '%s'。以(非零)整數代替\n"
-"或提供 #define (參照 caveats 手冊)"
+msgstr ""
+"不能解析菜单id '%s'. 用(非零)整数代替\n"
+"或 提供 #define (详细信息见手册)"
 
-#: ../src/common/prntbase.cpp:805
+#: ../src/common/prntbase.cpp:1225
 msgid "Could not start document preview."
-msgstr "無法啟動文件預覽。"
+msgstr "不能启动文档预览."
 
-#: ../src/generic/printps.cpp:198
-#: ../src/msw/printwin.cpp:252
+#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
+#: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
-msgstr "無法啟動列印。"
+msgstr "不能启动打印."
 
-#: ../src/common/wincmn.cpp:1167
+#: ../src/common/wincmn.cpp:1488
 msgid "Could not transfer data to window"
-msgstr "無法轉移資料到視窗中。"
+msgstr "不能把数据转到窗口"
+
+#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
+#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
+#, fuzzy
+msgid "Could not unlock mutex"
+msgstr "不能释放互斥体"
+
+#: ../src/os2/thread.cpp:154
+msgid "Couldn't acquire a mutex lock"
+msgstr "不能得到互斥锁"
 
-#: ../src/msw/dragimag.cpp:158
-#: ../src/msw/dragimag.cpp:194
-#: ../src/msw/imaglist.cpp:152
-#: ../src/msw/imaglist.cpp:174
-#: ../src/msw/imaglist.cpp:187
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
+#: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
-msgstr "無法把圖像加到圖像清單。"
+msgstr "不能把图像加到图象列表."
 
-#: ../src/msw/timer.cpp:103
+#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
 msgid "Couldn't create a timer"
-msgstr "無法建立計時器。"
+msgstr "不能创建计时器"
 
-#: ../src/mgl/cursor.cpp:135
-#: ../src/mgl/cursor.cpp:166
+#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
 msgid "Couldn't create cursor."
-msgstr "無法建立游標。"
+msgstr "不能创建游标"
 
-#: ../src/common/dynlib.cpp:347
-#: ../src/common/dynload.cpp:299
+#: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "å\9c¨å\8b\95æ\85\8bé\80£çµ\90æª\94中æ\89¾ä¸\8då\88°ç¬¦è\99\9f '%s'ã\80\82"
+msgstr "å\9c¨å\8a¨æ\80\81è¿\9eæ\8e¥åº\93中æ\89¾ä¸\8då\88°ç¬¦å\8f·'%s'"
 
-#: ../src/mac/thread.cpp:502
-#: ../src/msw/thread.cpp:711
+#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:850
 msgid "Couldn't get the current thread pointer"
-msgstr "無法取得目前執行緒指標。"
+msgstr "不能获得当前线程指针"
 
-#: ../src/common/imagpng.cpp:302
+#: ../src/common/imagpng.cpp:596
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "無法載入 PNG 圖像—檔案被破壞或是沒有足夠記憶體。"
+msgstr "不能装入PNG图像 - 文件被破坏 或 没有足够内存."
+
+#: ../src/unix/sound.cpp:472
+#, c-format
+msgid "Couldn't load sound data from '%s'."
+msgstr "不能从 '%s'中的读取声音数据."
+
+#: ../src/unix/sound_sdl.cpp:230
+#, c-format
+msgid "Couldn't open audio: %s"
+msgstr "不能打开音频: %s"
 
 #: ../src/msw/ole/dataobj.cpp:147
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "無法註冊剪貼簿格式 '%s'。"
+msgstr "不能注册剪贴板格式 '%s'."
 
-#: ../src/msw/listctrl.cpp:737
+#: ../src/os2/thread.cpp:171
+msgid "Couldn't release a mutex"
+msgstr "不能释放互斥体"
+
+#: ../src/msw/listctrl.cpp:735
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
-msgstr "無法取得清單控制元件中細項 %d 的資訊。"
+msgstr "不能获得列表控件的项 %d信息."
 
-#: ../src/common/imagpng.cpp:338
-#: ../src/common/imagpng.cpp:349
-#: ../src/common/imagpng.cpp:357
+#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
+#: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
-msgstr "無法儲存 PNG 圖像。"
+msgstr "不能保存PNG图像."
 
-#: ../src/mac/thread.cpp:749
-#: ../src/msw/thread.cpp:1091
+#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
 msgid "Couldn't terminate thread"
-msgstr "無法終止執行緒。"
+msgstr "不能终止线程"
+
+#: ../src/common/xtistrm.cpp:161
+msgid "Create Parameter not found in declared RTTI Parameters"
+msgstr "在声明的RTTI参数里找不到创建参数"
 
-#: ../src/generic/dirdlgg.cpp:263
+#: ../src/generic/dirdlgg.cpp:309
 msgid "Create directory"
-msgstr "建ç«\8bç\9b®é\8c\84"
+msgstr "å\88\9b建ç\9b®å½\95"
 
-#: ../src/generic/dirdlgg.cpp:103
-#: ../src/generic/filedlgg.cpp:1132
+#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:1007
 msgid "Create new directory"
-msgstr "建ç«\8bæ\96°ç\9b®é\8c\84"
+msgstr "å\88\9b建æ\96°ç\9b®å½\95"
 
-#: ../src/msw/textctrl.cpp:1680
+#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064
 msgid "Cu&t"
-msgstr "剪下(&t)"
+msgstr "剪切(&t)"
 
-#: ../src/generic/filedlgg.cpp:1143
+#: ../src/generic/filedlgg.cpp:1018
 msgid "Current directory:"
-msgstr "目前目錄："
+msgstr "当前目录:"
 
-#: ../src/common/fontmap.cpp:117
+#: ../src/common/fmapbase.cpp:107
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "斯拉夫語 (ISO-8859-5)"
+msgstr "西里尔语 (ISO-8859-5)"
 
-#: ../src/common/paper.cpp:106
+#: ../src/common/paper.cpp:113
 msgid "D sheet, 22 x 34 in"
-msgstr "D ç´\99å¼µ, 22 x 34 è\8b±å\90\8b"
+msgstr "D çº¸å¼ , 22 x 34 è\8b±å¯¸"
 
-#: ../src/msw/dde.cpp:594
+#: ../src/msw/dde.cpp:633
 msgid "DDE poke request failed"
-msgstr "「動態資料交換」資料傳送請求失敗"
+msgstr "DDE poke 请求失败"
 
-#: ../src/common/imagbmp.cpp:917
+#: ../src/common/imagbmp.cpp:921
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "DIB 標頭：編碼型態與色彩位元數不吻合。"
+msgstr "DIB头: 编码不能匹配颜色位数."
 
-#: ../src/common/imagbmp.cpp:879
+#: ../src/common/imagbmp.cpp:883
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB 標頭：圖像高度大於 32767 個圖素。"
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:873
+#: ../src/common/imagbmp.cpp:877
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB 標頭：圖像寬度大於 32767 個圖素。"
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:893
+#: ../src/common/imagbmp.cpp:897
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "DIB 標頭：未知的色彩位元數。"
+msgstr "DIB头: 文件中颜色位数未知."
 
-#: ../src/common/imagbmp.cpp:903
+#: ../src/common/imagbmp.cpp:907
 msgid "DIB Header: Unknown encoding in file."
-msgstr "DIB 標頭：未知的編碼型態。"
+msgstr "DIB头: 文件编码未知."
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:135
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL 信封, 110 x 220 毫米"
 
-#: ../src/generic/filedlgg.cpp:705
-msgid "Date"
-msgstr "日期"
+#: ../src/generic/dbgrptg.cpp:276
+#, c-format
+msgid "Debug report \"%s\""
+msgstr "调试报告 \"%s\""
+
+#: ../src/common/debugrpt.cpp:203
+msgid "Debug report couldn't be created."
+msgstr "无法创建调试报告."
 
-#: ../src/generic/fontdlgg.cpp:222
+#: ../src/common/debugrpt.cpp:517
+msgid "Debug report generation has failed."
+msgstr "无法生成调试报告."
+
+#: ../src/generic/fontdlgg.cpp:227
 msgid "Decorative"
-msgstr "修飾"
+msgstr "修饰"
 
-#: ../src/common/fontmap.cpp:392
+#: ../src/common/fmapbase.cpp:674
 msgid "Default encoding"
-msgstr "預設的編碼"
+msgstr "缺省编码"
 
-#: ../src/unix/snglinst.cpp:269
+#: ../src/generic/prntdlgg.cpp:506
+msgid "Default printer"
+msgstr "缺省的打印机"
+
+#: ../contrib/src/gizmos/editlbox.cpp:160
+msgid "Delete item"
+msgstr "删除项"
+
+#: ../src/unix/snglinst.cpp:300
 #, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "å·²å\88ªé\99¤é\81\8eæ\99\82ç\9a\84é\8e\96å®\9aæª\94æ¡\88 '%s'ã\80\82"
+msgstr "å·²å\88 é\99¤è¿\87æ\9c\9fç\9a\84é\94\81æ\96\87件 '%s'."
 
-#: ../src/msw/dialup.cpp:348
-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/dirctrlg.cpp:648
+msgid "Desktop"
+msgstr "桌面"
 
-#: ../src/os2/toplevel.cpp:367
-msgid "Did you forget to include wx/os2/wx.rc in your resources?"
-msgstr "你是否忘了將 wx/msw/wx.rc 引入資源檔中？"
+#: ../src/msw/dialup.cpp:358
+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:217
+#: ../src/generic/tipdlg.cpp:246
 msgid "Did you know..."
-msgstr "您知道嗎..."
+msgstr "你知道吗..."
 
-#: ../src/common/filefn.cpp:1279
+#: ../src/common/filefn.cpp:1172
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "目錄 '%s' 無法建立"
+msgstr "目录'%s'不能被创建"
 
 #: ../src/mgl/dirmgl.cpp:217
 #, c-format
 msgid "Directory '%s' doesn't exist!"
-msgstr "目錄 '%s' 不存在！"
+msgstr "目录 '%s'不存在!"
 
-#: ../src/generic/dirdlgg.cpp:188
+#: ../src/generic/dirdlgg.cpp:228
 msgid "Directory does not exist"
-msgstr "目錄不存在"
+msgstr "目录不存在"
 
-#: ../src/html/helpfrm.cpp:379
-msgid "Display all index items that contain given substring. Search is case insensitive."
-msgstr "顯示包含該字串的所有索引項目。搜尋不分大小寫。"
+#: ../src/generic/filedlgg.cpp:1300
+msgid "Directory doesn't exist."
+msgstr "目录不存在."
+
+#: ../src/html/helpfrm.cpp:503
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
-#: ../src/html/helpfrm.cpp:545
+#: ../src/html/helpfrm.cpp:685
 msgid "Display options dialog"
-msgstr "顯示選項對話方塊"
+msgstr "显示选项对话框"
 
-#: ../src/msw/mimetype.cpp:682
+#: ../src/msw/mimetype.cpp:670
+#, c-format
 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"
 "%s %1"
 msgstr ""
-"æ\82¨è¦\81æ\94¹è®\8aç\94¨ä»¥%sé\99\84æª\94å\90\8dç\82º \"%s\" æª\94æ¡\88ç\9a\84å\91½ä»¤å\97\8e？\n"
-"目前的值是\n"
-"%s，\n"
-"新的值是\n"
+"æ\98¯å\90¦è¦\81è¦\86ç\9b\96ç\94¨äº\8e%sæ\96\87件(æ\89©å±\95å\90\8d为\"%s\")ç\9a\84å\91½ä»¤？\n"
+"当前值为 \n"
+"%s, \n"
+"新的值为 \n"
 "%s %1"
 
-#: ../src/common/docview.cpp:441
+#: ../src/common/docview.cpp:464
 #, c-format
 msgid "Do you want to save changes to document %s?"
-msgstr "你想儲存對文件 %s 的修改？"
+msgstr "你想保存对文档%s的修改?"
 
-#: ../src/html/htmlwin.cpp:314
+#: ../src/common/sizer.cpp:1842
+msgid "Don't Save"
+msgstr "不保存"
+
+#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:370
+#: ../src/generic/progdlgg.cpp:433
 msgid "Done."
-msgstr "完成。"
+msgstr "完成."
+
+#: ../src/common/xtixml.cpp:271
+#, c-format
+msgid "Doubly used id : %d"
+msgstr "重复使用的id : %d"
 
-#: ../src/generic/fdrepdlg.cpp:157
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Down"
-msgstr "下"
+msgstr "向下"
 
-#: ../src/common/paper.cpp:107
+#: ../src/common/paper.cpp:114
 msgid "E sheet, 34 x 44 in"
-msgstr "E ç´\99å¼µ, 34 x 44 è\8b±å\90\8b"
+msgstr "E çº¸å¼ , 34 x 44 è\8b±å¯¸"
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../contrib/src/gizmos/editlbox.cpp:158
+msgid "Edit item"
+msgstr "编辑项"
+
+#: ../src/generic/progdlgg.cpp:194
 msgid "Elapsed time : "
-msgstr "歷時︰"
+msgstr "用时: "
+
+#: ../src/common/prntbase.cpp:799
+#, c-format
+msgid "Enter a page number between %d and %d:"
+msgstr "输入页码范围(%d 至 %d):"
+
+#: ../src/generic/dbgrptg.cpp:158
+#, c-format
+msgid "Enter command to open file \"%s\":"
+msgstr "输入命令以打开文件 \"%s\":"
 
-#: ../src/generic/helphtml.cpp:335
+#: ../src/generic/helpext.cpp:443
 msgid "Entries found"
-msgstr "找到的項目"
-
-#: ../src/common/config.cpp:362
-#, c-format
-msgid "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "無法展開環境變數：'%c' 沒有出現在位置 %d @ '%s'。"
-
-#: ../src/generic/dirctrlg.cpp:704
-#: ../src/generic/dirctrlg.cpp:722
-#: ../src/generic/dirctrlg.cpp:733
-#: ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:841
-#: ../src/generic/filedlgg.cpp:942
-#: ../src/generic/filedlgg.cpp:956
-#: ../src/generic/filedlgg.cpp:969
-#: ../src/generic/filedlgg.cpp:1365
-#: ../src/generic/filedlgg.cpp:1418
-#: ../src/gtk/filedlg.cpp:80
-#: ../src/gtk/fontdlg.cpp:71
+msgstr "找到的条目"
+
+#: ../src/common/config.cpp:383
+#, c-format
+msgid ""
+"Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
+
+#: ../src/generic/dirctrlg.cpp:681 ../src/generic/dirctrlg.cpp:699
+#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
+#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:751
+#: ../src/generic/filedlgg.cpp:765 ../src/generic/filedlgg.cpp:779
+#: ../src/generic/filedlgg.cpp:1275 ../src/generic/filedlgg.cpp:1300
+#: ../src/generic/filedlgg.cpp:1330 ../src/gtk/fontdlg.cpp:81
 msgid "Error"
-msgstr "é\8c¯èª¤"
+msgstr "é\94\99误"
 
-#: ../src/unix/utilsunx.cpp:1193
-#: ../src/unix/utilsunx.cpp:1201
+#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
 msgid "Error "
-msgstr "é\8c¯èª¤"
+msgstr "é\94\99误 "
 
-#: ../src/generic/dirdlgg.cpp:203
+#: ../src/generic/dirdlgg.cpp:243
 msgid "Error creating directory"
-msgstr "建ç«\8bç\9b®é\8c\84é\8c¯èª¤"
+msgstr "å\88\9b建ç\9b®å½\95é\94\99误"
 
-#: ../src/common/imagbmp.cpp:926
+#: ../src/common/imagbmp.cpp:930
 msgid "Error in reading image DIB ."
-msgstr "讀取圖像 DIB 時發生錯誤。"
+msgstr "读图像DIB错误."
+
+#: ../src/common/fileconf.cpp:504
+msgid "Error reading config options."
+msgstr "读配置选项错误."
+
+#: ../src/common/fileconf.cpp:1026
+msgid "Error saving user configuration data."
+msgstr "保存用户配置数据错误."
 
-#: ../src/common/log.cpp:460
+#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+msgid "Error while waiting on semaphore"
+msgstr "等待信号量时出错"
+
+#: ../src/common/log.cpp:476
 msgid "Error: "
-msgstr "é\8c¯èª¤ï¸°"
+msgstr "é\94\99误: "
 
-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fmapbase.cpp:105
 msgid "Esperanto (ISO-8859-3)"
-msgstr "ä¸\96ç\95\8cèª\9e (ISO-8859-3)"
+msgstr "ä¸\96ç\95\8c语 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:202
 msgid "Estimated time : "
-msgstr "估計時間︰"
+msgstr "预期时间: "
+
+#: ../src/generic/dbgrptg.cpp:211
+msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
+msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
 
-#: ../src/msw/utilsexc.cpp:702
+#: ../src/msw/utilsexc.cpp:753
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "指令 '%s' 執行失敗"
+msgstr "命令 '%s'执行失败"
 
-#: ../src/common/paper.cpp:112
+#: ../src/os2/utilsexc.cpp:169
+#, c-format
+msgid "Execution of command '%s' failed with error: %ul"
+msgstr "命令 '%s'执行失败, 错误信息: %ul"
+
+#: ../src/common/paper.cpp:119
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "Executive, 7 1/4 x 10 1/2 英吋"
-
-#: ../src/common/resourc2.cpp:326
-#: ../src/common/resourc2.cpp:1391
-#: ../src/common/resource.cpp:1845
-#: ../src/common/resource.cpp:1975
-#: ../src/common/resource.cpp:3059
-msgid "Expected '*' whilst parsing resource."
-msgstr "解析資源時應有 '*'。"
-
-#: ../src/common/resourc2.cpp:342
-#: ../src/common/resourc2.cpp:1407
-#: ../src/common/resource.cpp:1862
-#: ../src/common/resource.cpp:1991
-#: ../src/common/resource.cpp:3076
-msgid "Expected '=' whilst parsing resource."
-msgstr "解析資源時應有 '='。"
-
-#: ../src/common/resourc2.cpp:312
-#: ../src/common/resourc2.cpp:1377
-#: ../src/common/resource.cpp:1831
-#: ../src/common/resource.cpp:1961
-#: ../src/common/resource.cpp:3045
-msgid "Expected 'char' whilst parsing resource."
-msgstr "解析資源時應有 'char'。"
-
-#: ../src/common/fontmap.cpp:144
+msgstr "实用纸张, 7 1/4 x 10 1/2 英寸"
+
+#: ../contrib/src/deprecated/resource.cpp:1869
+#: ../contrib/src/deprecated/resource.cpp:1999
+#: ../contrib/src/deprecated/resource.cpp:3091
+#, fuzzy
+msgid "Expected '*' while parsing resource."
+msgstr "解析资源时期待出现 '*' ."
+
+#: ../contrib/src/deprecated/resource.cpp:1886
+#: ../contrib/src/deprecated/resource.cpp:2015
+#: ../contrib/src/deprecated/resource.cpp:3108
+#, fuzzy
+msgid "Expected '=' while parsing resource."
+msgstr "解析资源时期待 '='."
+
+#: ../contrib/src/deprecated/resource.cpp:1855
+#: ../contrib/src/deprecated/resource.cpp:1985
+#: ../contrib/src/deprecated/resource.cpp:3077
+#, fuzzy
+msgid "Expected 'char' while parsing resource."
+msgstr "解析资源时期待 'char' ."
+
+#: ../src/msw/registry.cpp:1125
+#, c-format
+msgid ""
+"Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
+
+#: ../src/common/fmapbase.cpp:141
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-msgstr ""
+msgstr "扩展的日本语Unix代码页 (EUC-JP)"
+
+#: ../src/html/chm.cpp:710
+#, c-format
+msgid "Extraction of '%s' into '%s' failed."
+msgstr "将 '%s'解压至 '%s'失败."
 
-#: ../src/msw/dialup.cpp:842
+#: ../src/msw/dialup.cpp:843
 #, c-format
 msgid "Failed to %s dialup connection: %s"
-msgstr "%s 撥號連線失敗: %s"
+msgstr "到 %s 的拨号连接失败: %s"
 
-#: ../src/unix/snglinst.cpp:243
+#: ../src/unix/snglinst.cpp:274
 msgid "Failed to access lock file."
-msgstr "無法存取鎖定中的檔案。"
+msgstr "访问锁文件失败."
+
+#: ../src/msw/dib.cpp:543
+#, c-format
+msgid "Failed to allocated %luKb of memory for bitmap data."
+msgstr "为位图数据分配 %luKb 内存失败."
+
+#: ../src/unix/displayx11.cpp:224
+msgid "Failed to change video mode"
+msgstr "改变视频模式失败."
 
-#: ../src/common/filename.cpp:176
+#: ../src/common/debugrpt.cpp:237
+#, c-format
+msgid "Failed to clean up debug report directory \"%s\""
+msgstr "无法清除调试报告目录 \"%s\""
+
+#: ../src/common/filename.cpp:191
 msgid "Failed to close file handle"
-msgstr "無法關閉檔案"
+msgstr "关闭文件句柄失败."
 
-#: ../src/unix/snglinst.cpp:308
+#: ../src/unix/snglinst.cpp:339
 #, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "無法關閉鎖定檔案 '%s'"
+msgstr "关闭锁文件 '%s'失败"
 
-#: ../src/msw/clipbrd.cpp:127
+#: ../src/msw/clipbrd.cpp:119
 msgid "Failed to close the clipboard."
-msgstr "無法關閉剪貼簿。"
+msgstr "关闭剪贴板失败."
 
-#: ../src/msw/dialup.cpp:782
+#: ../src/msw/dialup.cpp:783
 msgid "Failed to connect: missing username/password."
-msgstr "連線失敗：缺少使用者名稱或密碼。"
+msgstr "连接失败: 缺少用户名/口令."
 
-#: ../src/msw/dialup.cpp:728
+#: ../src/msw/dialup.cpp:729
 msgid "Failed to connect: no ISP to dial."
-msgstr "連線失敗：沒有可撥號的 ISP。"
+msgstr "连接失败: 没有要拨号的ISP."
 
-#: ../src/msw/registry.cpp:597
+#: ../src/msw/registry.cpp:618
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "無法複製登錄機值 '%s'"
+msgstr "复制注册键值失败 '%s'"
 
-#: ../src/msw/registry.cpp:606
+#: ../src/msw/registry.cpp:627
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "無法複製登錄機碼 '%s' 的內容到 '%s'。"
+msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 
-#: ../src/common/filefn.cpp:1131
+#: ../src/common/filefn.cpp:1008
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "無法複製檔案 '%s' 到 '%s'"
+msgstr "复制文件 '%s'至 '%s'失败"
 
-#: ../src/msw/dde.cpp:948
+#: ../src/msw/registry.cpp:605
+#, c-format
+msgid "Failed to copy the registry subkey '%s' to '%s'."
+msgstr "复制注册表子键 '%s'至 '%s'失败."
+
+#: ../src/msw/dde.cpp:988
 msgid "Failed to create DDE string"
-msgstr "無法建立「動態資料交換」字串"
+msgstr "创建 DDE 字符串失败"
 
-#: ../src/msw/mdi.cpp:425
+#: ../src/msw/mdi.cpp:459
 msgid "Failed to create MDI parent frame."
-msgstr "無法建立 MDI 主框架。"
+msgstr "创建 MDI 父框架失败."
 
-#: ../src/msw/statbr95.cpp:110
+#: ../src/msw/statbr95.cpp:112
 msgid "Failed to create a status bar."
-msgstr "無法建立狀態列。"
+msgstr "创建状态条失败."
 
-#: ../src/common/filename.cpp:721
+#: ../src/common/filename.cpp:766
 msgid "Failed to create a temporary file name"
-msgstr "無法產生暫存檔的檔名"
+msgstr "创建临时文件名失败"
 
-#: ../src/msw/utilsexc.cpp:197
+#: ../src/msw/utilsexc.cpp:227
 msgid "Failed to create an anonymous pipe"
-msgstr "無法建立匿名管道"
+msgstr "创建匿名管道失败"
 
-#: ../src/msw/dde.cpp:412
+#: ../src/msw/dde.cpp:450
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "無法建立連線到伺服器 '%s' 的主旨 '%s'"
+msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 
-#: ../src/msw/toplevel.cpp:313
-msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
-msgstr "無法建立對話窗。不正確的 DLGTEMPLATE？"
+#: ../src/msw/cursor.cpp:216
+msgid "Failed to create cursor."
+msgstr "创建游标失败."
 
-#: ../src/unix/mimetype.cpp:372
+#: ../src/common/debugrpt.cpp:202
+#, c-format
+msgid "Failed to create directory \"%s\""
+msgstr "无法创建目录 \"%s\""
+
+#: ../src/unix/mimetype.cpp:370
 #, c-format
 msgid "Failed to create directory %s/.gnome."
-msgstr "無法建立目錄 %s/.gnome。"
+msgstr "创建目录 %s/.gnome 失败."
 
-#: ../src/unix/mimetype.cpp:381
+#: ../src/unix/mimetype.cpp:379
 #, c-format
 msgid "Failed to create directory %s/mime-info."
-msgstr "無法建立目錄 %s/mime-info。"
+msgstr "创建目录 %s/.mime-info 失败."
 
-#: ../src/generic/dirdlgg.cpp:201
+#: ../src/generic/dirdlgg.cpp:241
 #, c-format
-msgid "Failed to create directory '%s'\n"
+msgid ""
+"Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
-msgstr "無法建立目錄 '%s'\n"
-"(您是否有足夠的權限？)"
+msgstr ""
+"创建目录 '%s'失败\n"
+"(您是否有所需的权限?)"
 
-#: ../src/msw/mimetype.cpp:168
+#: ../src/msw/mimetype.cpp:193
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "無法為 '%s' 檔案建立登錄項目。"
+msgstr "为 '%s'文件创建注册条目失败."
 
-#: ../src/msw/fdrepdlg.cpp:442
+#: ../src/msw/fdrepdlg.cpp:474
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "無法建立標準的「尋找/置換」對話窗 (錯誤碼 %d)"
+msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 
-#: ../src/html/winpars.cpp:468
+#: ../src/html/winpars.cpp:549
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
-msgstr "無法以編碼 %s 顯示 HTML 文件"
+msgstr "按编码 %s 显示HTML文档失败"
 
-#: ../src/mac/clipbrd.cpp:168
-#: ../src/msw/clipbrd.cpp:139
+#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
-msgstr "無法清空剪貼簿"
+msgstr "清空剪贴板失败"
+
+#: ../src/unix/displayx11.cpp:201
+msgid "Failed to enumerate video modes"
+msgstr "枚举视频模式失败"
 
-#: ../src/msw/dde.cpp:613
+#: ../src/msw/dde.cpp:652
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "無法建立與「動態資料交換」伺服器溝通的連結"
+msgstr "在DDE服务器建立advise循环失败"
 
-#: ../src/msw/dialup.cpp:620
+#: ../src/msw/dialup.cpp:621
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "無法建立撥號連線：%s"
+msgstr "建立拨号连接: %s失败"
 
-#: ../src/unix/utilsunx.cpp:540
-#: ../src/unix/utilsunx.cpp:557
+#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "無法執行 '%s'\n"
+msgstr "执行 '%s'失败\n"
 
-#: ../src/common/resourc2.cpp:808
-#: ../src/common/resource.cpp:2465
+#: ../src/common/debugrpt.cpp:652
+msgid "Failed to execute curl, please install it in PATH."
+msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
+
+#: ../contrib/src/deprecated/resource.cpp:2489
 #, c-format
-msgid "Failed to find XBM resource %s.\n"
+msgid ""
+"Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
-msgstr "找不到 XBM 資源 %s。\n"
-"忘記使用 wxResourceLoadBitmapData？"
+msgstr ""
+"查找XBM资源 %s失败.\n"
+"没有使用wxResourceLoadBitmapData?"
 
-#: ../src/common/resourc2.cpp:959
-#: ../src/common/resource.cpp:2619
+#: ../contrib/src/deprecated/resource.cpp:2643
 #, c-format
-msgid "Failed to find XBM resource %s.\n"
+msgid ""
+"Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadIconData?"
-msgstr "找不到 XBM 資源 %s。\n"
-"忘記使用 wxResourceLoadIconData？"
+msgstr ""
+"查找XBM资源%s失败.\n"
+"没有使用wxResourceLoadIconData?"
 
-#: ../src/common/resourc2.cpp:823
-#: ../src/common/resource.cpp:2480
+#: ../contrib/src/deprecated/resource.cpp:2504
 #, c-format
-msgid "Failed to find XPM resource %s.\n"
+msgid ""
+"Failed to find XPM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
-msgstr "找不到 XPM 資源 %s。\n"
-"忘記使用 wxResourceLoadBitmapData？"
+msgstr ""
+"查找XPM资源 %s失败.\n"
+"没有使用wxResourceLoadBitmapData?"
 
-#: ../src/msw/dialup.cpp:680
+#: ../src/msw/dialup.cpp:681
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "無法取得 ISP 名稱： %s"
+msgstr "获取ISP名: %s失败"
 
-#: ../src/mac/clipbrd.cpp:119
+#: ../src/mac/carbon/clipbrd.cpp:138 ../src/mac/classic/clipbrd.cpp:134
 msgid "Failed to get clipboard data."
-msgstr "無法取得剪貼簿資料。"
+msgstr "获取剪贴板数据失败."
 
-#: ../src/msw/clipbrd.cpp:712
+#: ../src/msw/clipbrd.cpp:723
 msgid "Failed to get data from the clipboard"
-msgstr "無法從剪貼簿取得資料"
+msgstr "从剪贴板获取数据失败"
 
-#: ../src/common/timercmn.cpp:294
-msgid "Failed to get the UTC system time."
-msgstr "無法取得系統的 UTC 時間。"
+#: ../src/msw/stackwalk.cpp:221
+#, c-format
+msgid ""
+"Failed to get stack backtrace:\n"
+"%s"
+msgstr ""
+"不能获取堆栈的回溯路径:\n"
+" %s"
 
-#: ../src/common/timercmn.cpp:245
+#: ../src/common/stopwatch.cpp:223
 msgid "Failed to get the local system time"
-msgstr "無法取得系統的當地時間"
+msgstr "获取本地系统时间失败"
 
-#: ../src/common/filefn.cpp:1512
+#: ../src/common/filefn.cpp:1423
 msgid "Failed to get the working directory"
-msgstr "無法取得工作目錄"
+msgstr "获取工作目录失败"
 
 #: ../src/univ/theme.cpp:122
 msgid "Failed to initialize GUI: no built-in themes found."
-msgstr "無法初始化圖形使用者介面： 沒有找到內建的主題。"
+msgstr "不能初始化GUI: 找不到内嵌的主题(theme)."
 
 #: ../src/msw/helpchm.cpp:69
 msgid "Failed to initialize MS HTML Help."
-msgstr "無法初始化 MS HTML Help。"
+msgstr "初始化MS HTML帮助失败."
 
-#: ../src/msw/glcanvas.cpp:729
+#: ../src/msw/glcanvas.cpp:808
 msgid "Failed to initialize OpenGL"
-msgstr "無法初始化 OpenGL"
+msgstr "不能初始化OpenGL"
 
-#: ../src/unix/threadpsx.cpp:887
-msgid "Failed to join a thread, potential memory leak detected - please restart the program"
-msgstr "無法停止執行緒，偵測到潛在的記憶體流失 - 請重新啟動程式"
+#: ../src/unix/snglinst.cpp:246
+#, c-format
+msgid "Failed to inspect the lock file '%s'"
+msgstr "检查锁文件 '%s'失败"
+
+#: ../src/unix/threadpsx.cpp:897
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr "合并线程失败, 检测到潜在地内存丢失 - 请重新启动系统"
 
-#: ../src/msw/utils.cpp:723
+#: ../src/msw/utils.cpp:702
 #, c-format
 msgid "Failed to kill process %d"
-msgstr "ç\84¡æ³\95å\88ªé\99¤ç¨\8båº\8f %d"
+msgstr "ç»\88æ­¢è¿\9bç¨\8b %d 失败"
 
-#: ../src/common/iconbndl.cpp:66
+#: ../src/common/iconbndl.cpp:72
 #, c-format
 msgid "Failed to load image %d from file '%s'."
-msgstr "無法載入圖像 %d—檔案 '%s'。"
+msgstr "读取图像 %d (从文件 '%s'中)失败."
+
+#: ../src/msw/enhmeta.cpp:84
+#, c-format
+msgid "Failed to load metafile from file \"%s\"."
+msgstr "从文件 \"%s\"读取元文件失败."
 
-#: ../src/msw/volume.cpp:347
+#: ../src/msw/volume.cpp:312
 msgid "Failed to load mpr.dll."
-msgstr "無法載入 mpr.dll"
+msgstr "装载mpr.dll失败."
 
-#: ../src/common/dynlib.cpp:274
-#: ../src/common/dynload.cpp:198
+#: ../src/common/dynlib.cpp:133
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "無法載入共享函式庫 '%s'"
+msgstr "不能装载共享库 '%s'"
 
-#: ../src/common/dynlib.cpp:256
-#: ../src/common/dynload.cpp:127
+#: ../src/common/dynlib.cpp:115
 #, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
-msgstr "無法載入共享函式庫 '%s'，發生 '%s' 錯誤"
+msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
 
-#: ../src/unix/snglinst.cpp:192
+#: ../src/unix/snglinst.cpp:203
 #, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "無法鎖定檔案 '%s'"
+msgstr "锁定锁文件 '%s'失败"
 
-#: ../src/common/regex.cpp:251
+#: ../src/common/regex.cpp:300
 #, c-format
 msgid "Failed to match '%s' in regular expression: %s"
-msgstr "無法搜尋與正規運算式 '%s' 相符的字串：%s"
+msgstr "不能匹配 '%s' 于正则表达式: %s"
 
-#: ../src/common/filename.cpp:1667
-#, c-format
+#: ../src/common/filename.cpp:1917
+#, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "無法變更檔案 '%s' 的檔案日期"
+msgstr "修改文件时间(为 '%s') 失败"
 
-#: ../src/common/filename.cpp:164
+#: ../src/common/filename.cpp:179
 #, c-format
 msgid "Failed to open '%s' for %s"
-msgstr "無法開啟 '%s'—%s"
+msgstr "打开 '%s'(为 %s) 失败"
+
+#: ../src/html/chm.cpp:142
+#, c-format
+msgid "Failed to open CHM archive '%s'."
+msgstr "打开CHM存档 '%s'失败."
 
-#: ../src/common/filename.cpp:743
+#: ../src/common/filename.cpp:788
 msgid "Failed to open temporary file."
-msgstr "無法開啟暫存檔。"
+msgstr "打开临时文件失败."
 
-#: ../src/msw/clipbrd.cpp:107
+#: ../src/msw/clipbrd.cpp:99
 msgid "Failed to open the clipboard."
-msgstr "無法開啟剪貼簿。"
+msgstr "打开剪贴板失败."
 
-#: ../src/msw/clipbrd.cpp:616
+#: ../src/msw/clipbrd.cpp:626
 msgid "Failed to put data on the clipboard"
-msgstr "無法存放資料到剪貼簿。"
+msgstr "把数据放到剪贴板失败"
 
-#: ../src/unix/snglinst.cpp:252
+#: ../src/unix/snglinst.cpp:283
 msgid "Failed to read PID from lock file."
-msgstr "無法從鎖定的檔案中讀出「程序識別碼」。"
+msgstr "从锁文件读取PID失败."
 
-#: ../src/unix/utilsunx.cpp:635
+#: ../src/unix/utilsunx.cpp:581
 msgid "Failed to redirect child process input/output"
-msgstr "重新轉向子過程輸入/輸出失敗"
+msgstr "重定向子过程输入/输出失败"
 
-#: ../src/msw/utilsexc.cpp:605
+#: ../src/msw/utilsexc.cpp:653
 msgid "Failed to redirect the child process IO"
-msgstr "無法轉向子程序的「輸入/輸出」"
+msgstr "重定向子过程IO失败"
 
-#: ../src/msw/dde.cpp:295
+#: ../src/msw/dde.cpp:300
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "無法註冊「動態資料交換」伺服器 '%s'"
+msgstr "注册DDE服务器 '%s'失败"
+
+#: ../src/msw/glcanvas.cpp:368
+msgid "Failed to register OpenGL window class."
+msgstr "不能注册 OpenGL窗口类."
 
-#: ../src/common/fontmap.cpp:715
+#: ../src/common/fontmap.cpp:246
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "無法記憶字集 '%s' 的編碼。"
+msgstr "回忆字符集 '%s'编码失败."
 
-#: ../src/unix/snglinst.cpp:296
+#: ../src/common/debugrpt.cpp:220
+#, c-format
+msgid "Failed to remove debug report file \"%s\""
+msgstr "不能删除调试报告文件 \"%s\""
+
+#: ../src/unix/snglinst.cpp:327
 #, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "無法移除鎖定中的檔案 '%s'"
+msgstr "不能删除锁文件 '%s'"
 
-#: ../src/unix/snglinst.cpp:262
+#: ../src/unix/snglinst.cpp:293
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "無法移除過時的鎖定檔案 '%s'。"
+msgstr "删除过期的锁文件 '%s'失败."
 
-#: ../src/msw/registry.cpp:443
+#: ../src/msw/registry.cpp:456
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "無法將登錄值 '%s' 更名為 '%s'。"
+msgstr "将注册值 '%s'改名到'%s'失败."
 
-#: ../src/msw/registry.cpp:543
+#: ../src/msw/registry.cpp:560
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
+msgstr "将注册键 '%s'改名到'%s'失败."
 
-#: ../src/msw/clipbrd.cpp:505
+#: ../src/msw/clipbrd.cpp:503
 msgid "Failed to retrieve data from the clipboard."
-msgstr "從剪貼簿獲取資料失敗。"
+msgstr "从剪贴板检取数据失败."
 
-#: ../src/common/filename.cpp:1757
+#: ../src/common/filename.cpp:2007
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "無法取得檔案 '%s' 的各項時間屬性"
+msgstr "检取文件时间(为 '%s')失败"
 
-#: ../src/msw/dialup.cpp:444
+#: ../src/msw/dialup.cpp:454
 msgid "Failed to retrieve text of RAS error message"
-msgstr "無法取得 RAS 錯誤訊息的對應文字"
+msgstr "检取RAS错误消息正文失败"
 
-#: ../src/msw/clipbrd.cpp:742
+#: ../src/msw/clipbrd.cpp:760
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "無法取得支援的剪貼簿格式"
+msgstr "检取支持的剪贴板格式失败"
 
-#: ../src/msw/dde.cpp:658
+#: ../src/msw/dib.cpp:345
+#, c-format
+msgid "Failed to save the bitmap image to file \"%s\"."
+msgstr "将位图图像保存至文件 \"%s\"失败."
+
+#: ../src/msw/dde.cpp:697
 msgid "Failed to send DDE advise notification"
-msgstr "無法傳送「動態資料交換」連結通知訊息"
+msgstr "发送DDE advise 通知失败"
 
-#: ../src/common/ftp.cpp:368
+#: ../src/common/ftp.cpp:384
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "無法設定檔案傳輸模式為%s。"
+msgstr "设置FTP传输模式为 %s 时失败."
 
 #: ../src/msw/clipbrd.cpp:379
 msgid "Failed to set clipboard data."
-msgstr "無法設定剪貼簿資料。"
+msgstr "设置剪贴板数据失败"
+
+#: ../src/unix/snglinst.cpp:186
+#, c-format
+msgid "Failed to set permissions on lock file '%s'"
+msgstr "在锁文件 '%s'上设置许可权限时失败"
 
-#: ../src/common/file.cpp:526
+#: ../src/common/file.cpp:523
 msgid "Failed to set temporary file permissions"
-msgstr "無法設定暫存檔的存取權限"
+msgstr "设置临时文件的许可权限时失败"
 
-#: ../src/unix/threadpsx.cpp:1241
-#: ../src/unix/threadpsx.cpp:1252
+#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
 #, c-format
 msgid "Failed to set thread priority %d."
-msgstr "無法設定執行緒的優先等級為%d。"
+msgstr "设置线程优先级 %d失败."
 
-#: ../src/common/fs_mem.cpp:167
+#: ../src/common/fs_mem.cpp:231
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "無法將圖像 '%s' 存到「記憶體虛擬檔案系統」！"
+msgstr "将图像'%s'存到内存VFS失败!"
 
-#: ../src/unix/threadpsx.cpp:1425
+#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
+#: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
-msgstr "ç\84¡æ³\95çµ\82æ­¢å\9f·è¡\8cç·\92ã\80\82"
+msgstr "ç»\88止线ç¨\8b失败"
 
-#: ../src/msw/dde.cpp:632
+#: ../src/msw/dde.cpp:671
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "ç\84¡æ³\95çµ\82æ­¢è\88\87ã\80\8cå\8b\95æ\85\8bè³\87æ\96\99交æ\8f\9bã\80\8d伺æ\9c\8då\99¨æº\9dé\80\9aç\9a\84é\80£çµ\90"
+msgstr "ç»\88æ­¢ä¸\8eDDEæ\9c\8då\8a¡å\99¨ç\9a\84advise循ç\8e¯å¤±è´¥"
 
-#: ../src/msw/dialup.cpp:915
+#: ../src/msw/dialup.cpp:916
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "ç\84¡æ³\95çµ\82æ­¢æ\92¥è\99\9fé\80£ç·\9aï¼\9a%s"
+msgstr "ç»\88æ­¢æ\8b¨å\8f·è¿\9eæ\8e¥: %s失败"
 
-#: ../src/common/filename.cpp:1682
+#: ../src/common/filename.cpp:1932
 #, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "無法更新檔案 '%s' 的修改時間"
+msgstr "对文件 '%s'进行touch操作失败"
 
-#: ../src/unix/snglinst.cpp:302
+#: ../src/unix/snglinst.cpp:333
 #, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "無法解除鎖定檔案 '%s'"
+msgstr "对锁文件 '%s'解锁失败"
 
-#: ../src/msw/dde.cpp:311
+#: ../src/msw/dde.cpp:321
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "無法撤銷「動態資料交換」伺服器 '%s' 的註冊"
+msgstr "撤消DDE服务器 '%s'注册失败"
+
+#: ../src/common/fileconf.cpp:999
+msgid "Failed to update user configuration file."
+msgstr "不能更新用户配置文件."
+
+#: ../src/common/debugrpt.cpp:665
+#, c-format
+msgid "Failed to upload the debug report (error code %d)."
+msgstr "上传调试报告失败 (错误号 %d)."
 
 #: ../src/unix/snglinst.cpp:173
 #, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "無法寫入鎖定檔案 '%s'"
+msgstr "写锁文件 '%s'失败"
 
-#: ../src/generic/logg.cpp:379
+#: ../src/generic/logg.cpp:399
 msgid "Fatal error"
-msgstr "致命的錯誤"
+msgstr "致命错误"
 
-#: ../src/common/log.cpp:453
+#: ../src/common/log.cpp:465
 msgid "Fatal error: "
-msgstr "致命的錯誤︰"
+msgstr "致命错误: "
 
-#: ../src/mac/app.cpp:1284
-#: ../src/msw/app.cpp:1290
-msgid "Fatal error: exiting"
-msgstr "致命的錯誤︰已存在"
+#: ../src/msw/wince/filedlgwce.cpp:120
+msgid "File"
+msgstr "文件"
 
 #: ../src/mgl/bitmap.cpp:544
 #, c-format
 msgid "File %s does not exist."
-msgstr "æª\94æ¡\88 '%s' ä¸\8då­\98å\9c¨ã\80\82"
+msgstr "æ\96\87件 %sä¸\8då­\98å\9c¨."
 
-#: ../src/generic/filedlgg.cpp:1408
-#: ../src/gtk/filedlg.cpp:69
+#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "æª\94æ¡\88 '%s' å·²å­\98å\9c¨ï¼\8cæ\98¯å\90¦ç\9c\9fè¦\81è¤\87寫ï¼\9f"
+msgstr "æ\96\87件 '%s' å·²å­\98å\9c¨, ç¡®å®\9eé\9c\80è¦\81å¤\8då\86\99å®\83?"
 
-#: ../src/msw/filedlg.cpp:518
+#: ../src/os2/filedlg.cpp:307
 #, c-format
-msgid "File '%s' already exists.\n"
+msgid ""
+"File '%s' already exists.\n"
 "Do you want to replace it?"
-msgstr "檔案 '%s' 已存在，\n"
-"是否覆寫？"
+msgstr ""
+"文件 '%s' 已存在.\n"
+"真的需要替换它?"
 
-#: ../src/common/textcmn.cpp:158
+#: ../src/common/textcmn.cpp:215
 msgid "File couldn't be loaded."
-msgstr "æª\94æ¡\88ç\84¡æ³\95è¼\89å\85¥ã\80\82"
+msgstr "æ\96\87件ä¸\8dè\83½è¢«è£\85è½½."
 
-#: ../src/common/docview.cpp:295
-#: ../src/common/docview.cpp:332
-#: ../src/common/docview.cpp:1424
+#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
+#: ../src/common/docview.cpp:1609
 msgid "File error"
-msgstr "æª\94æ¡\88é\8c¯èª¤"
+msgstr "æ\96\87件é\94\99误"
 
-#: ../src/generic/dirctrlg.cpp:722
-#: ../src/generic/filedlgg.cpp:956
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765
 msgid "File name exists already."
-msgstr "æª\94æ¡\88å\90\8d稱已å­\98å\9c¨ã\80\82"
+msgstr "æ\96\87件å\90\8då·²å­\98å\9c¨"
 
-#: ../src/msw/filedlg.cpp:366
+#: ../src/common/filefn.cpp:1739
 #, c-format
-msgid "Files (%s)|%s"
-msgstr "æª\94æ¡\88 (%s)|%s"
+msgid "Files (%s)"
+msgstr "æ\96\87件 (%s)"
 
-#: ../src/html/helpfrm.cpp:367
+#: ../src/html/helpfrm.cpp:491
 msgid "Find"
-msgstr "尋找"
+msgstr "查找"
 
-#: ../src/html/helpfrm.cpp:950
+#: ../src/html/helpfrm.cpp:1219
 msgid "Fixed font:"
-msgstr "固定字型︰"
+msgstr "固定字体:"
 
-#: ../src/common/paper.cpp:118
+#: ../src/html/helpfrm.cpp:1279
+msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
+msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
+
+#: ../src/common/paper.cpp:125
 msgid "Folio, 8 1/2 x 13 in"
-msgstr "Folio, 8 1/2 x 13 in"
+msgstr "对开纸, 8 1/2 x 13 英寸"
 
-#: ../src/html/helpfrm.cpp:951
+#: ../src/html/helpfrm.cpp:1220
 msgid "Font size:"
-msgstr "字型大小："
+msgstr "字体大小:"
 
-#: ../src/unix/utilsunx.cpp:578
+#: ../src/unix/utilsunx.cpp:528
 msgid "Fork failed"
-msgstr "建立執行緒失敗"
+msgstr "Fork 失败"
 
-#: ../src/common/dlgcmn.cpp:230
-msgid "Forward"
-msgstr "向前"
+#: ../src/common/xtixml.cpp:235
+msgid "Forward hrefs are not supported"
+msgstr "不支持传递hrefs"
 
-#: ../src/common/resourc2.cpp:295
-#: ../src/common/resourc2.cpp:1360
-#: ../src/common/resource.cpp:1814
-#: ../src/common/resource.cpp:1944
-#: ../src/common/resource.cpp:3028
+#: ../contrib/src/deprecated/resource.cpp:1838
+#: ../contrib/src/deprecated/resource.cpp:1968
+#: ../contrib/src/deprecated/resource.cpp:3060
 msgid "Found "
-msgstr "找到"
+msgstr "找到 "
 
-#: ../src/html/helpfrm.cpp:666
+#: ../src/html/helpfrm.cpp:886
 #, c-format
 msgid "Found %i matches"
-msgstr "找到 %i 個符合項目"
+msgstr "找到 %i 个匹配项"
 
-#: ../src/generic/prntdlgg.cpp:184
+#: ../src/generic/prntdlgg.cpp:233
 msgid "From:"
-msgstr "從："
+msgstr "从:"
 
 #: ../src/common/imaggif.cpp:100
 msgid "GIF: Invalid gif index."
-msgstr "GIF: 無效的圖像索引。"
+msgstr "GIF: 无效的gif图像索引."
 
 #: ../src/common/imaggif.cpp:75
 msgid "GIF: data stream seems to be truncated."
-msgstr "GIF: 資料流似乎被截斷了。"
+msgstr "GIF: 数据流似乎已被截断."
 
 #: ../src/common/imaggif.cpp:59
 msgid "GIF: error in GIF image format."
-msgstr "GIF: GIF 圖像格式錯誤。"
+msgstr "GIF: GIF文件格式错误."
 
 #: ../src/common/imaggif.cpp:62
 msgid "GIF: not enough memory."
-msgstr "GIF: 記憶體不足。"
+msgstr "GIF: 没有足够内存."
 
 #: ../src/common/imaggif.cpp:65
 msgid "GIF: unknown error!!!"
-msgstr "GIF: 未知的錯誤！！！"
+msgstr "GIF: 位置错误!!!"
 
-#: ../src/univ/themes/gtk.cpp:623
+#: ../src/univ/themes/gtk.cpp:634
 msgid "GTK+ theme"
-msgstr "GTK+ 主題"
+msgstr "GTK+主题(theme)"
 
-#: ../src/common/paper.cpp:142
+#: ../src/common/prntbase.cpp:228
+msgid "Generic PostScript"
+msgstr "普通PostScript"
+
+#: ../src/common/paper.cpp:149
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
-msgstr "å¾·å\9c\8bæ³\95å®\9aè¤\87寫簿, 8 1/2 x 13 in"
+msgstr "å¾·å\9b½æ³\95å®\9aå¤\8då\86\99ç°¿, 8 1/2 x 13 è\8b±å¯¸"
 
-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:148
 msgid "German Std Fanfold, 8 1/2 x 12 in"
-msgstr "å¾·å\9c\8b家æ¨\99æº\96æº\96è¤\87寫簿, 8 1/2 x 12 in"
+msgstr "å¾·å\9b½æ \87å\87\86å¤\8då\86\99ç°¿, 8 1/2 x 12 è\8b±å¯¸"
 
-#: ../src/common/image.cpp:762
-msgid "GetUnusedColour:: No Unused Color in image "
-msgstr ""
+#: ../include/wx/xti.h:845
+msgid "GetProperty called w/o valid getter"
+msgstr "调用GetProperty时未带有效的getter"
 
-#: ../src/html/helpfrm.cpp:511
+#: ../include/wx/xti.h:906
+msgid "GetPropertyCollection called on a generic accessor"
+msgstr "在一个通用处理器上调用GetPropertyCollection"
+
+#: ../include/wx/xti.h:853
+msgid "GetPropertyCollection called w/o valid collection getter"
+msgstr "调用GetPropertyCollection时未带有效的collection getter"
+
+#: ../src/html/helpfrm.cpp:651
 msgid "Go back"
-msgstr "退回"
+msgstr "回退"
 
-#: ../src/html/helpfrm.cpp:514
+#: ../src/html/helpfrm.cpp:654
 msgid "Go forward"
 msgstr "向前"
 
-#: ../src/html/helpfrm.cpp:519
+#: ../src/html/helpfrm.cpp:659
 msgid "Go one level up in document hierarchy"
-msgstr "å\88°ä¸\8aä¸\80é\9a\8eæ\96\87件層ç´\9a"
+msgstr "å\9c¨æ\96\87æ¡£å±\82次中ä¸\8aå\8d\87ä¸\80级"
 
-#: ../src/generic/dirdlgg.cpp:108
-#: ../src/generic/filedlgg.cpp:1121
+#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:997
 msgid "Go to home directory"
-msgstr "進入 home 目錄"
+msgstr "进入home目录"
 
-#: ../src/generic/filedlgg.cpp:1113
+#: ../src/generic/filedlgg.cpp:989
 msgid "Go to parent directory"
-msgstr "進入父目錄"
+msgstr "进入父目录"
 
-#: ../src/common/prntbase.cpp:378
+#: ../src/common/prntbase.cpp:804
 msgid "Goto Page"
-msgstr "前進頁面"
+msgstr "跳转页面"
 
-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fmapbase.cpp:109
 msgid "Greek (ISO-8859-7)"
-msgstr "希臘語 (ISO-8859-7)"
+msgstr "希腊语 (ISO-8859-7)"
+
+#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+msgid "Gzip not supported by this version of zlib"
+msgstr "此版本的zlib不支持Gzip"
 
-#: ../src/html/htmlwin.cpp:354
+#: ../src/html/helpfrm.cpp:1574
+msgid "HTML Help Project (*.hhp)|*.hhp|"
+msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
+
+#: ../src/html/htmlwin.cpp:498
 #, c-format
 msgid "HTML anchor %s does not exist."
-msgstr "HTML é\8c¨ %s ä¸\8då­\98å\9c¨ã\80\82"
+msgstr "HTML é\94\9a %s ä¸\8då­\98å\9c¨."
 
-#: ../src/html/helpfrm.cpp:1307
-msgid "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"
-msgstr "HTML 文件 (*.htm)|*.htm|HTML 文件 (*.html)|*.html|說明書 (*.htb)|*.htb|說明書 (*.zip)|*.zip|HTML 說明專案 (*.hhp)|*.hhp|所有檔案 (*.*)|*"
+#: ../src/html/helpfrm.cpp:1572
+msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
+msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fmapbase.cpp:110
 msgid "Hebrew (ISO-8859-8)"
-msgstr "希伯來語 (ISO-8859-8)"
+msgstr "希伯来语 (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:242
-#: ../src/generic/mdig.cpp:308
-#: ../src/generic/proplist.cpp:516
-#: ../src/html/helpfrm.cpp:245
-#: ../src/msw/mdi.cpp:1324
+#: ../contrib/src/deprecated/proplist.cpp:523 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:337 ../src/msw/mdi.cpp:1383
 msgid "Help"
-msgstr "說明"
+msgstr "帮助"
 
-#: ../src/html/helpfrm.cpp:944
+#: ../src/html/helpfrm.cpp:1213
 msgid "Help Browser Options"
-msgstr "說明瀏覽器選項"
+msgstr "帮助浏览器选项"
 
-#: ../src/generic/helphtml.cpp:334
-#: ../src/generic/helphtml.cpp:335
+#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
 msgid "Help Index"
-msgstr "說明索引"
+msgstr "帮助索引"
 
-#: ../src/html/helpfrm.cpp:1291
+#: ../src/html/helpfrm.cpp:1560
 msgid "Help Printing"
-msgstr "說明列印"
+msgstr "帮助打印"
+
+#: ../src/html/helpfrm.cpp:814
+msgid "Help Topics"
+msgstr "帮助主题"
 
-#: ../src/html/helpctrl.cpp:49
+#: ../src/html/helpfrm.cpp:1573
+msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
+msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
+
+#: ../src/html/helpctrl.cpp:55
 #, c-format
 msgid "Help: %s"
-msgstr "說明：%s"
+msgstr "帮助: %s"
+
+#: ../src/generic/dirdlgg.cpp:107
+msgid "Home"
+msgstr "Home"
+
+#: ../src/generic/dirctrlg.cpp:646
+msgid "Home directory"
+msgstr "Home目录"
+
+#: ../include/wx/filefn.h:142
+msgid "I64"
+msgstr "I64"
 
-#: ../src/common/imagbmp.cpp:939
+#: ../src/common/imagbmp.cpp:943
 msgid "ICO: Error in reading mask DIB."
-msgstr "ICO: 讀取遮罩式 DIB 時發生錯誤。"
-
-#: ../src/common/imagbmp.cpp:1041
-#: ../src/common/imagbmp.cpp:1100
-#: ../src/common/imagbmp.cpp:1109
-#: ../src/common/imagbmp.cpp:1120
-#: ../src/common/imagbmp.cpp:1164
-#: ../src/common/imagbmp.cpp:1174
-#: ../src/common/imagbmp.cpp:1183
+msgstr "ICO: 读掩码DIB错误."
+
+#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
+#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
+#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
+#: ../src/common/imagbmp.cpp:1190
 msgid "ICO: Error writing the image file!"
-msgstr "ICO: 寫å\85¥å\9c\96å\83\8fæª\94æ¡\88æ\99\82ç\99¼ç\94\9fé\8c¯èª¤ï¼\81"
+msgstr "ICO: å\86\99å\9b¾å\83\8fæ\96\87件é\94\99误."
 
-#: ../src/common/imagbmp.cpp:1009
+#: ../src/common/imagbmp.cpp:1016
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: å\9c\96å\83\8f太é«\98ã\80\82"
+msgstr "ICO: å\9b¾å\83\8fé«\98度è¶\85å\87ºè\8c\83å\9b´, ä¸\8dé\80\82å\90\88å\81\9aå\9b¾æ \87."
 
-#: ../src/common/imagbmp.cpp:1015
+#: ../src/common/imagbmp.cpp:1022
 msgid "ICO: Image too wide for an icon."
-msgstr "ICO: å\9c\96å\83\8f太寬ã\80\82"
+msgstr "ICO: å\9b¾å\83\8f宽度è¶\85å\87ºè\8c\83å\9b´, ä¸\8dé\80\82å\90\88å\81\9aå\9b¾æ \87."
 
-#: ../src/common/imagbmp.cpp:1248
+#: ../src/common/imagbmp.cpp:1255
 msgid "ICO: Invalid icon index."
-msgstr "ICO: 無效的圖示索引。"
+msgstr "ICO: 无效的图标索引."
 
-#: ../src/common/imagiff.cpp:767
+#: ../src/common/imagiff.cpp:771
 msgid "IFF: data stream seems to be truncated."
-msgstr "IFF: 資料流似乎被截斷了。"
+msgstr "IFF: 数据流似乎已被截断."
 
-#: ../src/common/imagiff.cpp:751
+#: ../src/common/imagiff.cpp:755
 msgid "IFF: error in IFF image format."
-msgstr "IFF: IFF 圖像格式錯誤。"
+msgstr "IFF: IFF文件格式错误."
 
-#: ../src/common/imagiff.cpp:754
+#: ../src/common/imagiff.cpp:758
 msgid "IFF: not enough memory."
-msgstr "IFF: 記憶體不足。"
+msgstr "IFF: 没有足够内存."
 
-#: ../src/common/imagiff.cpp:757
+#: ../src/common/imagiff.cpp:761
 msgid "IFF: unknown error!!!"
-msgstr "IFF: 未知的錯誤！！！"
+msgstr "IFF: 位置错误!!!"
 
-#: ../src/common/resourc2.cpp:989
-#: ../src/common/resourc2.cpp:1000
-#: ../src/common/resource.cpp:2649
-#: ../src/common/resource.cpp:2660
+#: ../contrib/src/deprecated/resource.cpp:2673
+#: ../contrib/src/deprecated/resource.cpp:2684
 #, c-format
 msgid "Icon resource specification %s not found."
-msgstr "找不到圖示資源規格%s。"
+msgstr "没有找到图标资源规范 %s ."
+
+#: ../src/generic/dbgrptg.cpp:325
+msgid ""
+"If you have any additional information pertaining to this bug\n"
+"report, please enter it here and it will be joined to it:"
+msgstr ""
+"如果您有任何与此错误报告有关的信息, \n"
+"请在此输入, 它将会被加到错误报告中:"
+
+#: ../src/generic/dbgrptg.cpp:291
+msgid ""
+"If you wish to suppress this debug report completely, please choose the "
+"\"Cancel\" button,\n"
+"but be warned that it may hinder improving the program, so if\n"
+"at all possible please do continue with the report generation.\n"
+msgstr ""
+"如果您想完全禁用调试报告, 请按"
+"\"取消\"按钮, \n"
+"但我们不建议这样做, 因为调试报告有助于改进本程序.\n"
+"在可能的情况下, 请尽量选择让程序生成调试报告.\n"
+
+#: ../src/msw/registry.cpp:1281
+#, c-format
+msgid "Ignoring value \"%s\" of the key \"%s\"."
+msgstr "忽略值 \"%s\" (键 \"%s\")."
 
-#: ../src/common/resource.cpp:250
+#: ../contrib/src/deprecated/resource.cpp:271
 msgid "Ill-formed resource file syntax."
-msgstr "ä¸\8dè\89¯ç\9a\84è³\87æº\90æª\94æ¡\88èª\9eæ³\95ã\80\82"
+msgstr "ä¸\8dè\89¯ç\9a\84èµ\84æº\90æ\96\87件语æ³\95."
 
-#: ../src/generic/dirctrlg.cpp:704
-#: ../src/generic/filedlgg.cpp:942
+#: ../src/common/xtistrm.cpp:260
+msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
+msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
+
+#: ../include/wx/xti.h:1650
+msgid "Illegal Parameter Count for ConstructObject Method"
+msgstr "非法的针对ConstructObject方法的参数计数"
+
+#: ../include/wx/xti.h:1723
+msgid "Illegal Parameter Count for Create Method"
+msgstr "非法的针对Create方法的参数计数"
+
+#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751
 msgid "Illegal directory name."
-msgstr "不合法的目錄名稱。"
+msgstr "不合法的目录名."
 
-#: ../src/generic/filedlgg.cpp:1365
+#: ../src/generic/filedlgg.cpp:1275
 msgid "Illegal file specification."
-msgstr "ä¸\8då\90\88è¦\8fç¯\84ç\9a\84æª\94æ¡\88æ\8f\8fè¿°ã\80\82"
+msgstr "ä¸\8då\90\88è§\84è\8c\83ç\9a\84æ\96\87件æ\8f\8fè¿°."
 
-#: ../src/common/image.cpp:785
-msgid "Image and Mask have different sizes"
-msgstr "å\9c\96å\83\8få\92\8cé\81®ç½©ç\9a\84大å°\8fä¸\8dä¸\80è\87´"
+#: ../src/common/image.cpp:1169
+msgid "Image and mask have different sizes."
+msgstr "å\9b¾å\83\8få\92\8cæ\8e©ç \81ç\9a\84大å°\8fä¸\8dä¸\80è\87´."
 
-#: ../src/common/image.cpp:1067
+#: ../src/common/image.cpp:1500
 #, c-format
 msgid "Image file is not of type %d."
-msgstr "å\9c\96å\83\8fæª\94ä¸\8dæ\98¯å\9e\8bæ\85\8b%dã\80\82"
+msgstr "å\9b¾å\83\8fæ\96\87件ç\9a\84ç±»å\9e\8bä¸\8dæ\98¯ %d."
 
-#: ../src/msw/textctrl.cpp:270
-msgid "Impossible to create a rich edit control, using simple text control instead. Please reinstall riched32.dll"
-msgstr "無法建立 rich edit 控制元件，使用 simple text 控制元件代替。請重新安裝 riched32.dll"
+#: ../src/msw/textctrl.cpp:361
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr "不能创建rich编辑控件, 使用简单文本控件代替. 请重装riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:390
+#: ../src/unix/utilsunx.cpp:411
 msgid "Impossible to get child process input"
-msgstr "無法獲得子程序的輸入"
+msgstr "不可能获得子过程的输入"
 
-#: ../src/common/filefn.cpp:1147
+#: ../src/common/filefn.cpp:1027
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "無法取得檔案 '%s' 的存取權限"
+msgstr "不可能获得文件 '%s'的许可权限"
 
-#: ../src/common/filefn.cpp:1161
+#: ../src/common/filefn.cpp:1041
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "無法覆寫檔案 '%s'"
+msgstr "不可能复写文件 '%s'"
 
-#: ../src/common/filefn.cpp:1212
+#: ../src/common/filefn.cpp:1085
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "無法設定檔案 '%s' 的存取權限 "
+msgstr "不可能设置文件 '%s'的许可权限"
 
-#: ../src/html/helpfrm.cpp:392
+#: ../src/common/stockitem.cpp:124
+msgid "Indent"
+msgstr "缩进"
+
+#: ../src/html/helpfrm.cpp:516
 msgid "Index"
 msgstr "索引"
 
-#: ../src/common/fontmap.cpp:124
+#: ../src/common/fmapbase.cpp:114
+#, fuzzy
 msgid "Indian (ISO-8859-12)"
-msgstr "印度語 (ISO-8859-12)"
+msgstr "印地安语 (ISO-8859-12)"
+
+#: ../src/common/xtistrm.cpp:704
+msgid "Internal error, illegal wxCustomTypeInfo"
+msgstr "整数错误, 非法的wxCustomTypeInfo"
 
-#: ../src/common/imagtiff.cpp:183
+#: ../src/common/imagtiff.cpp:211
 msgid "Invalid TIFF image index."
-msgstr "無效的 TIFF 圖像索引。"
+msgstr "无效TIFF图像索引."
 
-#: ../contrib/src/xrc/xmlres.cpp:362
+#: ../src/xrc/xmlres.cpp:399
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr "無效的 XRC 資源 '%s'：沒有根節點 'resource'。"
+msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
 
-#: ../src/common/appcmn.cpp:398
+#: ../src/common/appcmn.cpp:249
 #, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "無效的顯示模式規格 '%s'。"
+msgstr "无效的显示模式 '%s'."
 
-#: ../src/x11/app.cpp:218
+#: ../src/x11/app.cpp:128
 #, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "無效的幾何規格 '%s'"
+msgstr "无效的几何规格 '%s'"
 
-#: ../src/unix/snglinst.cpp:280
+#: ../src/unix/snglinst.cpp:311
 #, c-format
 msgid "Invalid lock file '%s'."
-msgstr "無效的鎖定檔案 '%s'。"
+msgstr "无效的锁文件 '%s'."
+
+#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
+msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
+
+#: ../src/common/xtistrm.cpp:395
+msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
+msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
 
-#: ../src/common/regex.cpp:173
+#: ../src/common/regex.cpp:210
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr "無效的正規運算式 '%s'： %s"
+msgstr "无效的正则表达式 '%s': %s"
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:233
 msgid "Italic"
-msgstr "斜體"
+msgstr "斜体"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:144
 msgid "Italy Envelope, 110 x 230 mm"
-msgstr "意大利信封, 110 x 230 mm"
+msgstr "意大利信封, 110 x 230 毫米"
 
-#: ../src/common/imagjpeg.cpp:222
+#: ../src/common/imagjpeg.cpp:225
 msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: 無法載入 - 檔案也許已被破壞。"
+msgstr "JPEG: 不能装入 - 文件也许已被破坏."
 
-#: ../src/common/imagjpeg.cpp:336
+#: ../src/common/imagjpeg.cpp:339
 msgid "JPEG: Couldn't save image."
-msgstr "JPEG: 無法儲存圖像。"
+msgstr "JPEG: 不能保存图像."
 
-#: ../src/common/fontmap.cpp:128
+#: ../src/common/stockitem.cpp:128
+msgid "Justified"
+msgstr "分散对齐"
+
+#: ../src/common/fmapbase.cpp:118
 msgid "KOI8-R"
-msgstr ""
+msgstr "KOI8-R"
 
-#: ../src/generic/prntdlgg.cpp:426
-#: ../src/generic/prntdlgg.cpp:620
+#: ../src/common/fmapbase.cpp:119
+msgid "KOI8-U"
+msgstr "KOI8-U"
+
+#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
 msgid "Landscape"
-msgstr "æ©«å\90\91å\88\97å\8d°"
+msgstr "横å\90\91"
 
-#: ../src/common/paper.cpp:110
+#: ../src/common/paper.cpp:117
 msgid "Ledger, 17 x 11 in"
-msgstr "Ledger, 17 x 11 英吋"
+msgstr "帐簿, 17 x 11 英寸"
 
-#: ../src/generic/prntdlgg.cpp:632
+#: ../src/generic/prntdlgg.cpp:879
 msgid "Left margin (mm):"
-msgstr "左邊距(毫米)："
+msgstr "左边距 (毫米):"
 
-#: ../src/common/paper.cpp:103
+#: ../src/common/paper.cpp:110
 msgid "Legal, 8 1/2 x 14 in"
-msgstr "Legal, 8 1/2 x 14 英吋"
+msgstr "标准法律纸张, 8 1/2 x 14 英寸"
 
-#: ../src/common/paper.cpp:108
+#: ../src/common/paper.cpp:115
 msgid "Letter Small, 8 1/2 x 11 in"
-msgstr "Letter Small, 8 1/2 x 11 英吋"
+msgstr "信纸(小), 8 1/2 x 11 英寸"
 
-#: ../src/common/paper.cpp:102
+#: ../src/common/paper.cpp:109
 msgid "Letter, 8 1/2 x 11 in"
-msgstr "Letter, 8 1/2 x 11 英吋"
+msgstr "信纸, 8 1/2 x 11 英寸"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/fontdlgg.cpp:236
 msgid "Light"
-msgstr "細體"
+msgstr "细"
+
+#: ../src/html/chm.cpp:820
+msgid "Link contained '//', converted to absolute link."
+msgstr "链接包含 '//', 转换为绝对链接."
 
-#: ../src/generic/filedlgg.cpp:1623
-#: ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357
-#: ../src/msw/filedlg.cpp:555
+#: ../src/common/fldlgcmn.cpp:257
 #, c-format
 msgid "Load %s file"
-msgstr "è¼\89å\85¥æª\94æ¡\88 %s "
+msgstr "è£\85å\85¥æ\96\87件 %s "
 
-#: ../src/generic/filedlgg.cpp:1625
-msgid "Load file"
-msgstr "載入檔案"
-
-#: ../src/html/htmlwin.cpp:282
+#: ../src/html/htmlwin.cpp:416
 msgid "Loading : "
-msgstr "è¼\89å\85¥ä¸­ï¼\9a"
+msgstr "è£\85è½½: "
 
 #: ../src/common/imagpnm.cpp:72
 msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "è¼\89å\85¥ç\81°é\9a\8e Ascii PNM å\9c\96å\83\8fç\9a\84å\8a\9fè\83½å°\9aæ\9cªå¯¦ä½\9cã\80\82"
+msgstr "è£\85å\85¥ç\81°åº¦ Ascii PNMå\9b¾å\83\8få\8a\9fè\83½è¿\98没æ\9c\89å®\9eç\8e°."
 
 #: ../src/common/imagpnm.cpp:75
 msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "載入灰階 Raw PNM 圖像的功能尚未實作。"
+msgstr "装入灰度 Raw PNM图像功能还没有实现."
+
+#: ../src/unix/snglinst.cpp:251
+#, c-format
+msgid "Lock file '%s' has incorrect owner."
+msgstr "锁文件 '%s' 没有正确的所有者."
+
+#: ../src/unix/snglinst.cpp:256
+#, c-format
+msgid "Lock file '%s' has incorrect permissions."
+msgstr "锁文件 '%s' 没有正确的权限."
 
-#: ../src/generic/logg.cpp:554
+#: ../src/generic/logg.cpp:575
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "儲存日誌到檔案 '%s'。"
+msgstr "日志保存到文件 '%s'."
+
+#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
+msgid "Long Conversions not supported"
+msgstr "不支持长转换"
 
-#: ../src/gtk/mdi.cpp:433
+#: ../src/gtk/mdi.cpp:465
 msgid "MDI child"
-msgstr "MDI 子視窗"
+msgstr "MDI子窗口"
+
+#: ../src/mac/carbon/thread.cpp:1635
+msgid "MP Thread Support is not available on this System"
+msgstr "此系统不提供MP线程支持."
 
 #: ../src/msw/helpchm.cpp:60
-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 Help 函示庫未安裝，導致 MS HTML Help 功能無法使用。請先安裝它。"
+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:4547
+#: ../src/univ/themes/win32.cpp:4823
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
-#: ../src/unix/mimetype.cpp:2497
+#: ../src/unix/mimetype.cpp:2671
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
-msgstr "Mailcap æª\94æ¡\88 %s 第 %d è¡\8cï¼\9a忽ç\95¥ä¸\8då®\8cæ\95´ç\9a\84é \85ç\9b®ã\80\82"
+msgstr "Mailcap æ\96\87件 %s, è¡\8c %d: ä¸\8då®\8cæ\95´æ\9d¡ç\9b®è¢«å¿½ç\95¥."
 
-#: ../src/generic/fdrepdlg.cpp:152
+#: ../src/generic/fdrepdlg.cpp:153
 msgid "Match case"
-msgstr "å\8d\80å\88\86大å°\8f寫"
+msgstr "大å°\8få\86\99å\8c¹é\85\8d"
 
-#: ../src/common/fs_mem.cpp:144
+#: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "「記憶體虛擬檔案系統」已包含檔案 '%s'！"
+msgstr "内存 VFS 已包含文件 '%s'!"
+
+#: ../src/msw/frame.cpp:374
+msgid "Menu"
+msgstr "菜单"
 
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"
-msgstr "é\87\91屬主é¡\8c"
+msgstr "é\87\91å±\9e主é¢\98(theme)"
 
-#: ../src/univ/themes/win32.cpp:4545
+#: ../src/univ/themes/win32.cpp:4821
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
-#: ../src/unix/mimetype.cpp:2118
+#: ../src/unix/mimetype.cpp:2292
 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
-msgstr "Mime.類型文件 %s 第 %d 行：字串沒有結尾的引號。"
+msgstr "Mime.类型文件 %s, 行 %d: 没有结束符号的引用字符串."
 
-#: ../src/mgl/app.cpp:173
+#: ../src/mgl/app.cpp:165
 #, c-format
 msgid "Mode %ix%i-%i not available."
-msgstr "模å¼\8f %ix%i-%i ç\84¡æ³\95使ç\94¨"
+msgstr "æ\98¾ç¤ºæ¨¡å¼\8f %ix%i-%iä½\8dè\89² ä¸\8dæ\94¯æ\8c\81."
 
-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Modern"
-msgstr "ç\8f¾代"
+msgstr "ç\8e°代"
 
-#: ../src/common/paper.cpp:138
+#: ../src/generic/filedlgg.cpp:441
+msgid "Modified"
+msgstr "修正的"
+
+#: ../src/common/paper.cpp:145
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
-msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
+msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
 
-#: ../src/common/dlgcmn.cpp:239
-msgid "More..."
-msgstr "更多..."
+#: ../contrib/src/gizmos/editlbox.cpp:162
+msgid "Move down"
+msgstr "下移"
 
-#: ../src/generic/filedlgg.cpp:703
+#: ../contrib/src/gizmos/editlbox.cpp:161
+msgid "Move up"
+msgstr "上移"
+
+#: ../src/generic/filedlgg.cpp:438
 msgid "Name"
-msgstr "名稱"
+msgstr "名称"
+
+#: ../src/generic/dirdlgg.cpp:111
+msgid "New directory"
+msgstr "新目录"
 
-#: ../src/generic/dirdlgg.cpp:272
-#: ../src/generic/dirdlgg.cpp:282
-#: ../src/generic/filedlgg.cpp:817
-#: ../src/generic/filedlgg.cpp:826
+#: ../contrib/src/gizmos/editlbox.cpp:159
+msgid "New item"
+msgstr "新项目"
+
+#: ../src/generic/dirdlgg.cpp:318 ../src/generic/dirdlgg.cpp:328
+#: ../src/generic/filedlgg.cpp:615 ../src/generic/filedlgg.cpp:624
 msgid "NewName"
-msgstr "新名稱"
+msgstr "新名"
+
+#: ../src/generic/tipdlg.cpp:305
+msgid "Next"
+msgstr "下一个"
 
-#: ../src/html/helpfrm.cpp:525
+#: ../src/html/helpfrm.cpp:665
 msgid "Next page"
-msgstr "ä¸\8bä¸\80é \81"
+msgstr "ä¸\8bä¸\80页"
 
-#: ../src/common/dlgcmn.cpp:219
-#: ../src/mac/msgdlg.cpp:78
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/mac/carbon/msgdlg.cpp:60 ../src/mac/carbon/msgdlg.cpp:145
+#: ../src/mac/classic/msgdlg.cpp:58 ../src/mac/classic/msgdlg.cpp:142
+#: ../src/motif/msgdlg.cpp:187
 msgid "No"
 msgstr "否"
 
-#: ../src/common/image.cpp:793
-msgid "No Unused Color in image being masked"
-msgstr "圖像中未使用的顏色沒有遮罩"
-
-#: ../src/common/resourc2.cpp:814
-#: ../src/common/resourc2.cpp:965
-#: ../src/common/resource.cpp:2471
-#: ../src/common/resource.cpp:2625
+#: ../contrib/src/deprecated/resource.cpp:2495
+#: ../contrib/src/deprecated/resource.cpp:2649
 msgid "No XBM facility available!"
-msgstr "XBM 類型無法使用！"
+msgstr "没有可用XBM工具!"
 
-#: ../src/common/resourc2.cpp:983
-#: ../src/common/resource.cpp:2643
+#: ../contrib/src/deprecated/resource.cpp:2667
 msgid "No XPM icon facility available!"
-msgstr "XPM 圖示類型無法使用！"
+msgstr "没有可用的XPM图标设备!"
 
-#: ../src/generic/helphtml.cpp:329
+#: ../src/generic/helpext.cpp:437
 msgid "No entries found."
-msgstr "æ\89¾ä¸\8då\88°ä»»ä½\95é \85目"
+msgstr "没æ\89¾å\88°æ\9d¡目"
 
-#: ../src/common/fontmap.cpp:906
+#: ../src/common/fontmap.cpp:422
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 "but an alternative encoding '%s' is available.\n"
-"Do you want to use this encoding (otherwise you will have to choose another one)?"
+"Do you want to use this encoding (otherwise you will have to choose another "
+"one)?"
 msgstr ""
-"編碼 '%s' 的字型未找到，無法顯示文字。\n"
-"但是另一種編碼 '%s' 可用。\n"
-"æ\82¨è¦\81使ç\94¨è©²ç·¨ç¢¼å\97\8e(å\90¦å\89\87æ\82¨å¿\85é \88é\81¸æ\93\87å\8f¦ä¸\80種)ï¼\9f"
+"在编码 '%s' 中未找到显示文本所用的字体,\n"
+"但发现另一替代编码 '%s'.\n"
+"æ\98¯å\90¦ä½¿ç\94¨è¯¥ç¼\96ç \81(å\90¦å\88\99æ\82¨å¿\85é¡»é\80\89æ\8b©å\8f¦å¤\96ç\9a\84ç¼\96ç \81)?"
 
-#: ../src/common/fontmap.cpp:911
+#: ../src/common/fontmap.cpp:427
 #, 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"
-"您要選擇對應這個編碼的字型嗎\n"
-"(å\90¦å\89\87此種編碼ç\9a\84æ\96\87å­\97å°\87ç\84¡æ³\95正確顯示)ï¼\9f"
+"在编码 '%s' 中未找到显示文本所用的字体.\n"
+"选择用于该编码的字体\n"
+"(å\90¦å\88\99该ç¼\96ç \81ç\9a\84æ\96\87æ\9c¬å°\86ä¸\8dè\83½æ­£ç¡®æ\98¾ç¤º)?"
 
-#: ../contrib/src/xrc/xmlres.cpp:557
+#: ../src/xrc/xmlres.cpp:616
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
-msgstr "æ\89¾ä¸\8då\88° XML ç¯\80é»\9e '%s' é¡\9eå\88¥ '%s' ç\9a\84è\99\95ç\90\86常å¼\8fï¼\81"
+msgstr "没æ\9c\89æ\89¾å\88°XMLè\8a\82ç\82¹ '%s', ç±» '%s' ç\9a\84å¤\84ç\90\86å\99¨!"
 
-#: ../src/common/image.cpp:1049
-#: ../src/common/image.cpp:1092
+#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525
 msgid "No handler found for image type."
-msgstr "æ²\92æ\9c\89æ\89¾å\88°å\9c\96å\83\8fé¡\9eå\9e\8bè\99\95ç\90\86常å¼\8fã\80\82"
+msgstr "没æ\9c\89æ\89¾å\88°å\9b¾å\83\8fç±»å\9e\8bå¤\84ç\90\86å\99¨."
 
-#: ../src/common/image.cpp:1057
-#: ../src/common/image.cpp:1100
-#: ../src/common/image.cpp:1134
+#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
+#: ../src/common/image.cpp:1566
 #, c-format
 msgid "No image handler for type %d defined."
-msgstr "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %d ç\9a\84å\9c\96å\83\8fè\99\95ç\90\86常å¼\8fã\80\82"
+msgstr "没æ\9c\89ç±»å\9e\8b %d ç\9a\84å\9b¾å\83\8få¤\84ç\90\86å\99¨."
 
-#: ../src/common/image.cpp:1118
-#: ../src/common/image.cpp:1150
+#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581
 #, c-format
 msgid "No image handler for type %s defined."
-msgstr "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %s ç\9a\84å\9c\96å\83\8fè\99\95ç\90\86常å¼\8fã\80\82"
+msgstr "没æ\9c\89ç±»å\9e\8b %sç\9a\84å\9b¾å\83\8få¤\84ç\90\86å\99¨."
 
-#: ../src/html/helpfrm.cpp:655
+#: ../src/html/helpfrm.cpp:869
 msgid "No matching page found yet"
-msgstr "尚未找到符合的頁面"
+msgstr "还没有找到匹配页"
+
+#: ../src/unix/sound.cpp:89
+msgid "No sound"
+msgstr "没有声音"
+
+#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216
+msgid "No unused colour in image being masked."
+msgstr "图像中没有被掩码的未用颜色."
+
+#: ../src/common/image.cpp:1821
+msgid "No unused colour in image."
+msgstr "图像中没有未用的颜色."
 
-#: ../src/common/fontmap.cpp:122
+#: ../src/common/fmapbase.cpp:112
 msgid "Nordic (ISO-8859-10)"
-msgstr "北歐 (ISO-8859-10)"
+msgstr "日尔曼语 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:949
+#: ../src/html/helpfrm.cpp:1273
+msgid "Normal face<br>and <u>underlined</u>. "
+msgstr "正常字体<br> 且 <u>带下划线</u>."
+
+#: ../src/html/helpfrm.cpp:1218
 msgid "Normal font:"
-msgstr "正常字型："
+msgstr "正常字体:"
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:129
 msgid "Note, 8 1/2 x 11 in"
-msgstr "筆記簿, 8 1/2 x 11 英吋"
-
-#: ../src/common/dlgcmn.cpp:225
-#: ../src/generic/dirdlgg.cpp:151
-#: ../src/generic/filedlgg.cpp:1180
-#: ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/fontdlgg.cpp:254
-#: ../src/generic/logg.cpp:739
-#: ../src/generic/prntdlgg.cpp:452
-#: ../src/generic/proplist.cpp:499
-#: ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:136
-#: ../src/html/helpfrm.cpp:974
+msgstr "笔记簿, 8 1/2 x 11 英寸"
+
+#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:193
 msgid "OK"
-msgstr "確認"
+msgstr "确认"
+
+#: ../src/common/xtixml.cpp:263
+msgid "Objects must have an id attribute"
+msgstr "对象必须有一个id属性(attribute)"
+
+#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632
+msgid "Open File"
+msgstr "打开文件"
 
-#: ../src/html/helpfrm.cpp:533
-#: ../src/html/helpfrm.cpp:1302
+#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
 msgid "Open HTML document"
-msgstr "開啟 HTML 文件"
+msgstr "打开HTML文档"
 
-#: ../src/generic/dirctrlg.cpp:733
-#: ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:841
-#: ../src/generic/filedlgg.cpp:969
+#: ../src/generic/dbgrptg.cpp:147
+#, c-format
+msgid "Open file \"%s\""
+msgstr "打开文件 \"%s\""
+
+#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
+#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:779
 msgid "Operation not permitted."
-msgstr "ä¸\8d容許ç\9a\84æ\93\8dä½\9cã\80\82"
+msgstr "ä¸\8då\85\81许ç\9a\84æ\93\8dä½\9c."
 
-#: ../src/common/cmdline.cpp:667
+#: ../src/common/cmdline.cpp:702
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
-msgstr "é\81¸é \85 '%s' å¿\85é \88æ\9c\89å\80¼ï¼\8cä¸\94æ\9c\89'='ã\80\82"
+msgstr "é\80\89项 '%s' è¦\81æ±\82ä¸\80个å\80¼, æ\9c\9fæ\9c\9b '='."
 
-#: ../src/common/cmdline.cpp:687
+#: ../src/common/cmdline.cpp:722
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "é\81¸é \85 '%s' å¿\85é \88æ\9c\89å\80¼ã\80\82"
+msgstr "é\80\89项 '%s' é\9c\80è¦\81å\80¼."
 
-#: ../src/common/cmdline.cpp:748
+#: ../src/common/cmdline.cpp:784
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "é\81¸é \85 '%s'ï¼\9a'%s' ç\84¡æ³\95è½\89æ\8f\9bæ\88\90æ\97¥æ\9c\9fã\80\82"
+msgstr "é\80\89项 '%s': '%s' ä¸\8dè\83½è½¬æ\88\90æ\97¥æ\9c\9f."
 
-#: ../src/generic/prntdlgg.cpp:432
+#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614
 msgid "Options"
-msgstr "é\81¸é \85"
+msgstr "é\80\89项"
 
-#: ../src/generic/prntdlgg.cpp:428
-#: ../src/generic/prntdlgg.cpp:621
+#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
 msgid "Orientation"
-msgstr "方位"
+msgstr "方向"
 
-#: ../src/common/imagpcx.cpp:455
-#: ../src/common/imagpcx.cpp:478
+#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
 msgid "PCX: couldn't allocate memory"
-msgstr "PCX: 無法配置記憶體"
+msgstr "PCX: 不能分配内存"
 
-#: ../src/common/imagpcx.cpp:454
+#: ../src/common/imagpcx.cpp:461
 msgid "PCX: image format unsupported"
-msgstr "PCX: å\9c\96å\83\8fæ ¼å¼\8fä¸\8dæ\94¯æ\8f´"
+msgstr "PCX: å\9b¾å\83\8fæ ¼å¼\8fä¸\8dæ\94¯æ\8c\81"
 
-#: ../src/common/imagpcx.cpp:477
+#: ../src/common/imagpcx.cpp:484
 msgid "PCX: invalid image"
-msgstr "PCX: 無效的圖像"
+msgstr "PCX: 无效图像"
 
-#: ../src/common/imagpcx.cpp:441
+#: ../src/common/imagpcx.cpp:448
 msgid "PCX: this is not a PCX file."
-msgstr "PCX: 不是 PCX 檔案。"
+msgstr "PCX: 不是PCX文件."
 
-#: ../src/common/imagpcx.cpp:457
-#: ../src/common/imagpcx.cpp:479
+#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
 msgid "PCX: unknown error !!!"
-msgstr "PCX: 未知的錯誤！！！"
+msgstr "PCX: 未知错误 !!!"
 
-#: ../src/common/imagpcx.cpp:456
+#: ../src/common/imagpcx.cpp:463
 msgid "PCX: version number too low"
-msgstr "PCX: ç\89\88æ\9c¬å\88¥å¤ªä½\8e"
+msgstr "PCX: ç\89\88æ\9c¬å\8f·å¤ªå°\8f"
 
 #: ../src/common/imagpnm.cpp:96
 msgid "PNM: Couldn't allocate memory."
-msgstr "PNM: 無法配置記憶體。"
+msgstr "PNM: 不能分配内存."
 
 #: ../src/common/imagpnm.cpp:80
 msgid "PNM: File format is not recognized."
-msgstr "PNM: 檔案格式無法識別。"
+msgstr "PNM: 不能识别的文件格式."
 
 #: ../src/common/imagpnm.cpp:112
 msgid "PNM: File seems truncated."
-msgstr "PNM: æª\94æ¡\88ä¼¼ä¹\8e被æ\88ªæ\96·äº\86ã\80\82"
+msgstr "PNM: æ\96\87件似ä¹\8e已被æ\88ªæ\96­."
 
-#: ../src/common/prntbase.cpp:826
+#: ../src/common/prntbase.cpp:1247
 #, c-format
 msgid "Page %d"
-msgstr "第 %d 頁"
+msgstr "页 %d"
 
-#: ../src/common/prntbase.cpp:824
+#: ../src/common/prntbase.cpp:1245
 #, c-format
 msgid "Page %d of %d"
-msgstr "%d / %d 頁"
+msgstr "页 %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:587
+#: ../src/generic/prntdlgg.cpp:827
 msgid "Page Setup"
-msgstr "é \81é\9d¢è¨­å®\9a"
+msgstr "页é\9d¢è®¾ç½®"
 
-#: ../src/generic/prntdlgg.cpp:161
+#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533
+msgid "Page setup"
+msgstr "页面设置"
+
+#: ../src/generic/prntdlgg.cpp:210
 msgid "Pages"
-msgstr "é \81"
+msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:538
-#: ../src/generic/prntdlgg.cpp:609
-#: ../src/generic/prntdlgg.cpp:794
+#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
-msgstr "ç´\99å¼µ大小"
+msgstr "çº¸å¼ 大小"
 
-#: ../src/generic/prntdlgg.cpp:418
-#: ../src/generic/prntdlgg.cpp:598
-#: ../src/generic/prntdlgg.cpp:790
+#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
+#: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper size"
-msgstr "紙張大小"
+msgstr "纸张大小"
+
+#: ../src/common/xtistrm.cpp:425
+msgid "Passing a already registered object to SetObject"
+msgstr "传递一个已注册的对象给SetObject"
 
-#: ../src/generic/filedlgg.cpp:708
+#: ../src/common/xtistrm.cpp:643
+msgid "Passing a already registered object to SetObjectName"
+msgstr "传递一个已注册的对象给SetObjectName"
+
+#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+msgid "Passing an unkown object to GetObject"
+msgstr "传递一个未知对象给GetObject"
+
+#: ../src/generic/filedlgg.cpp:444
 msgid "Permissions"
-msgstr "å\85\81許"
+msgstr "å\85\81许"
 
-#: ../src/unix/utilsunx.cpp:441
+#: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
-msgstr "ç\84¡æ³\95建ç«\8b管é\81\93"
+msgstr "管é\81\93å\88\9b建失败"
 
-#: ../src/gtk/fontdlg.cpp:71
+#: ../src/gtk/fontdlg.cpp:81
 msgid "Please choose a valid font."
-msgstr "è«\8bé\81¸æ\93\87ä¸\80å\80\8bæ\9c\89æ\95\88ç\9a\84å­\97å\9e\8bã\80\82"
+msgstr "请é\80\89æ\8b©ä¸\80个æ\9c\89æ\95\88ç\9a\84å­\97ä½\93."
 
-#: ../src/generic/filedlgg.cpp:1418
-#: ../src/gtk/filedlg.cpp:80
+#: ../src/generic/filedlgg.cpp:1330
 msgid "Please choose an existing file."
-msgstr "è«\8bé\81¸æ\93\87ä¸\80å\80\8bå·²å­\98å\9c¨ç\9a\84æª\94æ¡\88ã\80\82"
+msgstr "请é\80\89æ\8b©ä¸\80个已å­\98å\9c¨ç\9a\84æ\96\87件."
 
-#: ../src/msw/dialup.cpp:749
+#: ../src/html/helpfrm.cpp:813
+msgid "Please choose the page to display:"
+msgstr "请选择欲显示的页面:"
+
+#: ../src/msw/dialup.cpp:750
 msgid "Please choose which ISP do you want to connect to"
-msgstr "è«\8bé\81¸æ\93\87ä½ æ\83³é\80£ç·\9aç\9a\84 ISP"
+msgstr "请é\80\89æ\8b©ä½ æ\83³è¿\9eæ\8e¥ç\9a\84ISP"
 
-#: ../src/msw/listctrl.cpp:550
+#: ../src/msw/listctrl.cpp:434
 #, 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 ""
-"è«\8bå®\89è£\9dè¼\83æ\96°ç\89\88æ\9c¬ç\9a\84 comctl32.dll\n"
-"(最低需求 4.70 版，但目前是 %d.%02d)\n"
-")否則此程式將無法正常運作。"
+"请å®\89è£\85ä¸\80个æ\96°ç\89\88æ\9c¬ç\9a\84comctl32.dll\n"
+"(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
+"否则此程序无法正确运行."
 
-#: ../src/common/prntbase.cpp:111
+#: ../src/common/prntbase.cpp:313
 msgid "Please wait while printing\n"
-msgstr "å\88\97å\8d°ä¸­ï¼\8cè«\8bç¨\8d待\n"
+msgstr "å\9c¨æ\89\93å\8d°æ\97¶è¯·ç­\89待\n"
 
-#: ../src/generic/prntdlgg.cpp:425
-#: ../src/generic/prntdlgg.cpp:619
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
 msgid "Portrait"
-msgstr "ç\9b´å\90\91å\88\97å\8d°"
+msgstr "纵å\90\91"
 
-#: ../src/generic/prntdlgg.cpp:268
+#: ../src/generic/prntdlgg.cpp:296
 msgid "PostScript file"
-msgstr "PostScript 文件"
+msgstr "PostScript文件"
 
-#: ../src/html/helpfrm.cpp:966
+#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
 msgid "Preview:"
-msgstr "é \90覽︰"
+msgstr "é¢\84è§\88:"
 
-#: ../src/html/helpfrm.cpp:522
+#: ../src/html/helpfrm.cpp:662
 msgid "Previous page"
-msgstr "前一頁"
+msgstr "前页"
 
-#: ../src/generic/prntdlgg.cpp:110
-#: ../src/generic/prntdlgg.cpp:124
+#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
+#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
+#: ../src/gtk/gnome/gprint.cpp:400
 msgid "Print"
-msgstr "列印"
+msgstr "打印"
 
-#: ../src/common/docview.cpp:925
+#: ../src/common/docview.cpp:1045
 msgid "Print Preview"
-msgstr "預覽列印"
+msgstr "打印预览"
 
-#: ../src/common/prntbase.cpp:781
-#: ../src/common/prntbase.cpp:805
+#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225
 msgid "Print Preview Failure"
-msgstr "預覽列印失敗"
+msgstr "打印预览失败"
 
-#: ../src/generic/prntdlgg.cpp:169
+#: ../src/generic/prntdlgg.cpp:218
 msgid "Print Range"
-msgstr "列印範圍"
+msgstr "打印范围"
 
-#: ../src/generic/prntdlgg.cpp:406
+#: ../src/generic/prntdlgg.cpp:445
 msgid "Print Setup"
-msgstr "列印設定"
+msgstr "打印设置"
 
-#: ../src/generic/prntdlgg.cpp:440
+#: ../src/generic/prntdlgg.cpp:617
 msgid "Print in colour"
-msgstr "彩色列印"
+msgstr "彩色打印"
 
-#: ../src/generic/prntdlgg.cpp:442
+#: ../src/common/stockitem.cpp:138
+msgid "Print previe&w"
+msgstr "打印预览(&w)"
+
+#: ../src/gtk/gnome/gprint.cpp:778
+msgid "Print preview"
+msgstr "打印预览"
+
+#: ../src/generic/prntdlgg.cpp:626
 msgid "Print spooling"
-msgstr "列印佇列中"
+msgstr "打印假脱机"
 
-#: ../src/html/helpfrm.cpp:539
+#: ../src/html/helpfrm.cpp:679
 msgid "Print this page"
-msgstr "列印本頁"
+msgstr "打印本页"
 
-#: ../src/generic/prntdlgg.cpp:147
+#: ../src/generic/prntdlgg.cpp:179
 msgid "Print to File"
-msgstr "列印到檔案"
+msgstr "打印到文件"
 
-#: ../src/common/prntbase.cpp:435
-msgid "Print..."
-msgstr "列印..."
+#: ../src/generic/prntdlgg.cpp:489
+msgid "Printer"
+msgstr "打印机"
 
-#: ../src/generic/prntdlgg.cpp:444
+#: ../src/generic/prntdlgg.cpp:629
 msgid "Printer command:"
-msgstr "印表機指令："
+msgstr "打印机命令:"
 
-#: ../src/generic/prntdlgg.cpp:146
+#: ../src/generic/prntdlgg.cpp:174
 msgid "Printer options"
-msgstr "印表機選項"
+msgstr "打印机选项"
 
-#: ../src/generic/prntdlgg.cpp:448
+#: ../src/generic/prntdlgg.cpp:641
 msgid "Printer options:"
-msgstr "印表機選項："
+msgstr "打印机选项:"
 
-#: ../src/generic/prntdlgg.cpp:665
+#: ../src/generic/prntdlgg.cpp:915
 msgid "Printer..."
-msgstr "印表機..."
+msgstr "打印机..."
 
-#: ../src/common/prntbase.cpp:108
-#: ../src/common/prntbase.cpp:153
+#: ../src/generic/prntdlgg.cpp:190
+msgid "Printer:"
+msgstr "打印机:"
+
+#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
 msgid "Printing "
-msgstr "列印中"
+msgstr "正在打印 "
 
-#: ../src/common/prntbase.cpp:125
+#: ../src/common/prntbase.cpp:327
 msgid "Printing Error"
-msgstr "列印時發生錯誤"
+msgstr "打印出错"
 
-#: ../src/generic/printps.cpp:221
+#: ../src/generic/printps.cpp:208
 #, c-format
 msgid "Printing page %d..."
-msgstr "正在列印第 %d 頁..."
+msgstr "正在打印页 %d..."
 
-#: ../src/generic/printps.cpp:181
+#: ../src/generic/printps.cpp:168
 msgid "Printing..."
-msgstr "列印中..."
+msgstr "打印..."
+
+#: ../src/common/debugrpt.cpp:524
+#, c-format
+msgid ""
+"Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr ""
+"处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
-#: ../src/common/log.cpp:454
+#: ../src/common/log.cpp:466
 msgid "Program aborted."
-msgstr "ç¨\8bå¼\8fç\95°å¸¸çµ\82æ­¢ã\80\82"
+msgstr "ç¨\8båº\8fç»\88æ­¢."
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:126
 msgid "Quarto, 215 x 275 mm"
-msgstr "四開, 215 x 275 mm"
+msgstr "四开, 215 x 275 毫米"
 
-#: ../src/generic/logg.cpp:1111
+#: ../src/generic/logg.cpp:1166
 msgid "Question"
-msgstr "問題"
+msgstr "问题"
 
-#: ../src/common/ffile.cpp:125
-#: ../src/common/ffile.cpp:146
+#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "讀取檔案 '%s' 時發生錯誤"
+msgstr "读文件 '%s'出错"
+
+#: ../src/common/prntbase.cpp:242
+msgid "Ready"
+msgstr "就绪"
 
-#: ../contrib/src/xrc/xmlres.cpp:532
+#: ../src/xrc/xmlres.cpp:582
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
-msgstr "找不到 ref=\"%s\" 的參照物件節點！"
+msgstr "ref=\"%s\"的引用对象节点不存在!"
 
-#: ../src/msw/registry.cpp:535
+#: ../src/common/stockitem.cpp:142
+msgid "Refresh"
+msgstr "刷新"
+
+#: ../src/msw/registry.cpp:552
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "登錄機碼 '%s' 已存在。"
+msgstr "注册键 '%s' 已存在."
 
-#: ../src/msw/registry.cpp:504
+#: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "登錄機碼 '%s' 不存在, 無法更名。"
+msgstr "注册键 '%s' 不存在, 不能改名."
 
-#: ../src/msw/registry.cpp:631
+#: ../src/msw/registry.cpp:653
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
 "deleting it will leave your system in unusable state:\n"
 "operation aborted."
 msgstr ""
-"正常ç\9a\84系統æ\93\8dä½\9cé\9c\80è¦\81ç\99»é\8c\84æ©\9f碼 '%s'ï¼\8c\n"
-"å\88ªé\99¤å®\83æ\9c\83使系統è\99\95æ\96¼ç\84¡æ³\95使ç\94¨ç\9a\84ç\8b\80æ\85\8bï¼\9a\n"
-"操作中斷。"
+"正常ç\9a\84ç³»ç»\9fæ\93\8dä½\9cé\9c\80è¦\81注å\86\8cé\94® '%s',\n"
+"å\88 é\99¤å®\83å°\86使系ç»\9fè¿\9bå\85¥ä¸\8då\8f¯ç\94¨ç\8a¶æ\80\81:\n"
+"操作终止."
 
-#: ../src/msw/registry.cpp:435
+#: ../src/msw/registry.cpp:448
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "登錄機值 '%s' 已存在."
+msgstr "注册值 '%s' 已存在."
 
-#: ../src/generic/helphtml.cpp:334
+#: ../src/generic/helpext.cpp:442
 msgid "Relevant entries:"
-msgstr "相關項目："
+msgstr "相关条目:"
 
-#: ../src/generic/progdlgg.cpp:199
+#: ../src/generic/progdlgg.cpp:210
 msgid "Remaining time : "
-msgstr "剩餘時間： "
+msgstr "剩余时间 : "
+
+#: ../src/common/stockitem.cpp:143
+msgid "Remove"
+msgstr "移除"
 
-#: ../src/html/helpfrm.cpp:329
+#: ../src/html/helpfrm.cpp:445
 msgid "Remove current page from bookmarks"
-msgstr "從書籤中移除目前頁面"
+msgstr "从书签中移去当前页"
 
-#: ../src/generic/fdrepdlg.cpp:177
+#: ../src/common/rendcmn.cpp:193
+#, c-format
+msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
+msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
+
+#: ../src/common/stockitem.cpp:117
+msgid "Rep&lace"
+msgstr "替换(&l)"
+
+#: ../src/generic/fdrepdlg.cpp:188
 msgid "Replace &all"
-msgstr "å\8f\96代æ\89\80æ\9c\89(&a)"
+msgstr "å\85¨é\83¨æ\9b¿æ\8d¢(&a)"
 
-#: ../src/generic/fdrepdlg.cpp:129
+#: ../src/generic/fdrepdlg.cpp:130
 msgid "Replace with:"
-msgstr "置換："
+msgstr "替换为:"
 
-#: ../contrib/src/xrc/xmlres.cpp:379
+#: ../src/xrc/xmlres.cpp:418
 msgid "Resource files must have same version number!"
-msgstr "資源檔案的版本別必須一致！"
+msgstr "资源文件必须有相同的版本号!"
+
+#: ../src/common/stockitem.cpp:144
+msgid "Revert to Saved"
+msgstr "还原为上次保存的文件"
 
-#: ../src/generic/prntdlgg.cpp:644
+#: ../src/generic/prntdlgg.cpp:891
 msgid "Right margin (mm):"
-msgstr "右邊距(毫米)："
+msgstr "右边距 (毫米):"
 
-#: ../src/generic/fontdlgg.cpp:221
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Roman"
-msgstr "羅馬"
+msgstr "罗马"
+
+#: ../src/common/sizer.cpp:1841
+msgid "Save"
+msgstr "保存"
 
-#: ../src/generic/filedlgg.cpp:1638
-#: ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359
-#: ../src/msw/filedlg.cpp:557
+#: ../src/common/fldlgcmn.cpp:259
 #, c-format
 msgid "Save %s file"
-msgstr "儲存檔案 %s "
+msgstr "保存文件 %s "
 
-#: ../src/common/docview.cpp:248
-msgid "Save as"
-msgstr "另存為"
+#: ../src/common/stockitem.cpp:146
+msgid "Save &As..."
+msgstr "另存为(&A)..."
 
-#: ../src/generic/filedlgg.cpp:1640
-msgid "Save file"
-msgstr "å\84²å­\98æª\94æ¡\88"
+#: ../src/common/docview.cpp:305
+msgid "Save as"
+msgstr "å\8f¦å­\98为"
 
-#: ../src/generic/logg.cpp:487
+#: ../src/generic/logg.cpp:508
 msgid "Save log contents to file"
-msgstr "將日誌內容存到檔案中"
+msgstr "把日志内容保存到文件"
 
-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Script"
-msgstr "手寫"
+msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:413
-#: ../src/html/helpfrm.cpp:428
+#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
 msgid "Search"
-msgstr "搜尋"
+msgstr "搜索"
 
-#: ../src/html/helpfrm.cpp:415
-msgid "Search contents of help book(s) for all occurences of the text you typed above"
-msgstr "搜尋說明文件內容，找出上述文字所有出現過的地方"
+#: ../src/html/helpfrm.cpp:538
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr "从帮助内容中搜索符合你在上面输入的正文的所有条目"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:166
 msgid "Search direction"
-msgstr "搜尋方向"
+msgstr "搜索目录"
 
-#: ../src/generic/fdrepdlg.cpp:117
+#: ../src/generic/fdrepdlg.cpp:118
 msgid "Search for:"
-msgstr "搜尋："
+msgstr "搜索:"
 
-#: ../src/html/helpfrm.cpp:794
+#: ../src/html/helpfrm.cpp:1060
 msgid "Search in all books"
-msgstr "搜尋所有的書籍"
+msgstr "在索引书中搜索"
 
-#: ../src/html/helpfrm.cpp:655
+#: ../src/html/helpfrm.cpp:868
 msgid "Searching..."
-msgstr "搜尋中..."
+msgstr "搜索..."
 
-#: ../src/generic/dirctrlg.cpp:551
+#: ../src/generic/dirctrlg.cpp:584
 msgid "Sections"
-msgstr "段落"
+msgstr "段"
 
-#: ../src/common/ffile.cpp:213
+#: ../src/common/ffile.cpp:222
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "æª\94æ¡\88 '%s' å®\9aä½\8dé\8c¯èª¤"
+msgstr "æ\96\87件 '%s'å®\9aä½\8dé\94\99误"
 
-#: ../src/msw/textctrl.cpp:1685
+#: ../src/common/ffile.cpp:212
+#, c-format
+msgid "Seek error on file '%s' (large files not supported by stdio)"
+msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
+
+#: ../src/msw/textctrl.cpp:2069
 msgid "Select &All"
-msgstr "é\81¸æ\93\87å\85¨é\83¨(&A)"
+msgstr "é\80\89æ\8b©æ\89\80æ\9c\89(&A)"
 
-#: ../src/common/docview.cpp:1540
+#: ../src/common/docview.cpp:1712
 msgid "Select a document template"
-msgstr "é\81¸æ\93\87æ\96\87件ç¯\84æ\9c¬"
+msgstr "é\80\89æ\8b©æ\96\87档模æ\9d¿"
 
-#: ../src/common/docview.cpp:1616
+#: ../src/common/docview.cpp:1789
 msgid "Select a document view"
-msgstr "é\81¸æ\93\87æ\96\87件è¦\96ç\95\8c"
+msgstr "é\80\89æ\8b©æ\96\87æ¡£è§\86å\9b¾"
 
-#: ../src/common/docview.cpp:1407
-#: ../src/common/docview.cpp:1458
+#: ../src/common/docview.cpp:1592
 msgid "Select a file"
-msgstr "é\81¸æ\93\87æª\94æ¡\88"
+msgstr "é\80\89æ\8b©æ\96\87件"
 
-#: ../src/common/cmdline.cpp:704
+#: ../src/common/cmdline.cpp:739
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "在選項 '%s' 之後應有分隔字元。"
+msgstr "期望在选项 '%s'后存在分隔符."
 
-#: ../src/common/dlgcmn.cpp:236
-msgid "Setup"
-msgstr "設å®\9a"
+#: ../include/wx/xti.h:841
+msgid "SetProperty called w/o valid setter"
+msgstr "è°\83ç\94¨SetPropertyæ\97¶æ\9cªå¸¦æ\9c\89æ\95\88ç\9a\84setter"
 
-#: ../src/generic/prntdlgg.cpp:152
+#: ../src/generic/prntdlgg.cpp:182
 msgid "Setup..."
-msgstr "設å®\9a..."
+msgstr "设置..."
 
-#: ../src/msw/dialup.cpp:520
+#: ../src/msw/dialup.cpp:530
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "多個撥號連線中，隨機選擇一個。"
+msgstr "找到多个活动拨号连接, 随机选择一个."
 
-#: ../src/html/helpfrm.cpp:369
+#: ../src/html/helpfrm.cpp:493
 msgid "Show all"
-msgstr "顯示所有"
+msgstr "显示所有"
 
-#: ../src/html/helpfrm.cpp:380
+#: ../src/html/helpfrm.cpp:504
 msgid "Show all items in index"
-msgstr "以索引的方式顯示所有項目"
+msgstr "把所有项目显示为索引"
 
-#: ../src/generic/dirdlgg.cpp:135
+#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
 msgid "Show hidden directories"
-msgstr "顯示隱藏目錄"
+msgstr "显示隐藏目录"
 
-#: ../src/generic/filedlgg.cpp:1175
-#: ../src/generic/filedlgg.cpp:1197
+#: ../src/generic/filedlgg.cpp:1064
 msgid "Show hidden files"
-msgstr "顯示隱藏檔案"
+msgstr "显示隐藏文件"
 
-#: ../src/html/helpfrm.cpp:506
+#: ../src/html/helpfrm.cpp:646
 msgid "Show/hide navigation panel"
-msgstr "顯示/隱藏遊覽面板"
+msgstr "显示/隐藏 导航面板"
 
-#: ../src/generic/filedlgg.cpp:704
+#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+msgid "Shows the font preview."
+msgstr "显示字体预览."
+
+#: ../src/generic/filedlgg.cpp:439
 msgid "Size"
 msgstr "大小"
 
-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
+#: ../src/generic/progdlgg.cpp:598
+msgid "Skip"
+msgstr "跳过"
+
+#: ../src/generic/fontdlgg.cpp:234
 msgid "Slant"
-msgstr "å\82¾æ\96\9c"
+msgstr "å\80¾æ\96\9c"
 
-#: ../src/common/docview.cpp:305
+#: ../src/common/docview.cpp:581
 msgid "Sorry, could not open this file for saving."
-msgstr "å°\8dä¸\8dèµ·ï¼\8cç\84¡æ³\95é\96\8bå\95\9fæª\94æ¡\88以便å\84²å­\98ã\80\82"
+msgstr "对ä¸\8dèµ·, ä¸\8dè\83½æ\89\93å¼\80æ\96\87件ä¾\9bä¿\9då­\98."
 
-#: ../src/common/docview.cpp:342
-#: ../src/common/docview.cpp:355
-#: ../src/common/docview.cpp:1426
+#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
+#: ../src/common/docview.cpp:1611
 msgid "Sorry, could not open this file."
-msgstr "å°\8dä¸\8dèµ·ï¼\8cç\84¡æ³\95é\96\8bå\95\9fæª\94æ¡\88ã\80\82"
+msgstr "对ä¸\8dèµ·, ä¸\8dè\83½æ\89\93å¼\80æ\96\87件."
 
-#: ../src/common/docview.cpp:312
+#: ../src/common/docview.cpp:588
 msgid "Sorry, could not save this file."
-msgstr "å°\8dä¸\8dèµ·ï¼\8cç\84¡æ³\95å\84²å­\98æª\94æ¡\88ã\80\82"
+msgstr "对ä¸\8dèµ·, ä¸\8dè\83½ä¿\9då­\98æ\96\87件."
 
-#: ../src/common/prntbase.cpp:781
+#: ../src/common/prntbase.cpp:1199
 msgid "Sorry, not enough memory to create a preview."
-msgstr "å°\8dä¸\8dèµ·ï¼\8cè¨\98æ\86¶é«\94ä¸\8d足ç\84¡æ³\95建ç«\8bé \90覽ã\80\82"
+msgstr "对ä¸\8dèµ·, 没æ\9c\89足å¤\9få\86\85å­\98å\88\9b建é¢\84è§\88."
 
-#: ../src/common/paper.cpp:111
+#: ../src/common/docview.cpp:1041
+msgid "Sorry, print preview needs a printer to be installed."
+msgstr "对不起, 需要先安装打印机才能创建打印预览."
+
+#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631
+msgid "Sorry, the format for this file is unknown."
+msgstr "对不起, 此文件的格式未知."
+
+#: ../src/unix/sound.cpp:493
+msgid "Sound data are in unsupported format."
+msgstr "声音数据为不支持的格式."
+
+#: ../src/unix/sound.cpp:478
+#, c-format
+msgid "Sound file '%s' is in unsupported format."
+msgstr "声音文件 '%s'为不支持的格式."
+
+#: ../src/common/paper.cpp:118
 msgid "Statement, 5 1/2 x 8 1/2 in"
-msgstr "Statement, 5 1/2 x 8 1/2 英吋"
+msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
+
+#: ../src/generic/prntdlgg.cpp:198
+msgid "Status:"
+msgstr "状态:"
 
-#: ../src/generic/logg.cpp:604
+#: ../src/generic/logg.cpp:625
 msgid "Status: "
-msgstr "狀態︰"
+msgstr "状态: "
+
+#: ../src/common/xtistrm.cpp:253
+#, fuzzy
+msgid "Streaming delegates for not already streamed objects not yet supported"
+msgstr "不支持针对尚未形成流的对象的流委派"
+
+#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#, c-format
+msgid "String To Colour : Incorrect colour specification : %s"
+msgstr "字符串 - 颜色: 错误的颜色: %s"
+
+#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+msgid "String conversions not supported"
+msgstr "不支持字符串装换"
 
-#: ../contrib/src/xrc/xmlres.cpp:632
+#: ../src/xrc/xmlres.cpp:689
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "沒找到子類別 '%s' 予資源 '%s'，無法子類別化！"
+msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
 
-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:230
 msgid "Swiss"
 msgstr "瑞士"
 
-#: ../src/common/imagtiff.cpp:204
-#: ../src/common/imagtiff.cpp:215
-#: ../src/common/imagtiff.cpp:326
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:383
 msgid "TIFF: Couldn't allocate memory."
-msgstr "TIFF: 無法配置記憶體。"
+msgstr "TIFF: 不能分配内存."
 
-#: ../src/common/imagtiff.cpp:175
+#: ../src/common/imagtiff.cpp:203
 msgid "TIFF: Error loading image."
-msgstr "TIFF: è¼\89å\85¥å\9c\96å\83\8fé\8c¯èª¤ã\80\82"
+msgstr "TIFF: è£\85è½½å\9b¾å\83\8fé\94\99误."
 
-#: ../src/common/imagtiff.cpp:226
+#: ../src/common/imagtiff.cpp:254
 msgid "TIFF: Error reading image."
-msgstr "TIFF: è®\80å\8f\96å\9c\96å\83\8fé\8c¯èª¤ã\80\82"
+msgstr "TIFF: 读å\9b¾å\83\8fé\94\99误."
 
-#: ../src/common/imagtiff.cpp:303
+#: ../src/common/imagtiff.cpp:331
 msgid "TIFF: Error saving image."
-msgstr "TIFF: 儲存圖像錯誤。"
+msgstr "TIFF: 保存图像错误."
 
-#: ../src/common/imagtiff.cpp:350
+#: ../src/common/imagtiff.cpp:434
 msgid "TIFF: Error writing image."
-msgstr "TIFF: 寫å\85¥å\9c\96å\83\8fé\8c¯èª¤ã\80\82"
+msgstr "TIFF: å\86\99å\9b¾å\83\8fé\94\99误."
 
-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:116
 msgid "Tabloid, 11 x 17 in"
-msgstr "Tabloid, 11 x 17 英吋"
+msgstr "小报, 11 x 17 英寸"
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Teletype"
-msgstr "電傳打字機"
+msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1541
+#: ../src/common/docview.cpp:1713
 msgid "Templates"
-msgstr "範本"
+msgstr "模板"
 
-#: ../src/common/fontmap.cpp:123
+#: ../src/common/fmapbase.cpp:113
 msgid "Thai (ISO-8859-11)"
-msgstr "æ³°èª\9e (ISO-8859-11)"
+msgstr "泰语 (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:569
+#: ../src/common/ftp.cpp:708
 msgid "The FTP server doesn't support passive mode."
-msgstr "檔案傳輸伺服器不支援被動模式。"
+msgstr "FTP服务器不支持passive模式."
+
+#: ../src/common/ftp.cpp:696
+msgid "The FTP server doesn't support the PORT command."
+msgstr "FTP服务器不支持PORT命令."
 
-#: ../src/common/fontmap.cpp:674
+#: ../src/common/fontmap.cpp:204
 #, 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"
-"如果無法替換，則選擇[取消]"
+msgstr ""
+"未知字符集'%s'. 选择其它字符集\n"
+"代替它; 如果不能\n"
+"被替代则选择[取消] "
 
-#: ../src/msw/ole/dataobj.cpp:165
+#: ../src/msw/ole/dataobj.cpp:164
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "å\89ªè²¼ç°¿æ ¼å¼\8f '%d' ä¸\8då­\98å\9c¨ã\80\82"
+msgstr "å\89ªè´´æ\9d¿æ ¼å¼\8f '%d' ä¸\8då­\98å\9c¨."
 
-#: ../src/generic/dirdlgg.cpp:186
+#: ../src/generic/dirdlgg.cpp:226
 #, c-format
-msgid "The directory '%s' does not exist\n"
+msgid ""
+"The directory '%s' does not exist\n"
 "Create it now?"
-msgstr "目錄 '%s' 不存在\n"
-"現在建立？"
+msgstr ""
+"目录 '%s'不存在\n"
+"现在创建?"
+
+#: ../src/common/docview.cpp:1962
+#, c-format
+msgid ""
+"The file '%s' couldn't be opened.\n"
+"It has been removed from the most recently used files list."
+msgstr ""
+"文件 '%s' 不能打开.\n"
+"已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/common/docview.cpp:1804
+#: ../src/common/docview.cpp:1972
 #, c-format
-msgid "The file '%s' doesn't exist and couldn't be opened.\n"
+msgid ""
+"The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
-msgstr "檔案 '%s' 不存在，無法開啟.\n"
-"已從「最近使用的檔案紀錄清單」中除名。"
+msgstr ""
+"文件 '%s' 不存在,不能被打开.\n"
+"已从最近使用的文件列表(MRU)中移去."
+
+#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+msgid "The font colour."
+msgstr "字体颜色."
+
+#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+msgid "The font family."
+msgstr "字体."
 
-#: ../src/common/filename.cpp:900
+#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+msgid "The font point size."
+msgstr "字体大小(磅值)."
+
+#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+msgid "The font style."
+msgstr "字体风格."
+
+#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+msgid "The font weight."
+msgstr "字体粗细."
+
+#: ../src/common/filename.cpp:966
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
-msgstr "路徑 '%s' 包含太多的 \"..\"！"
+msgstr "路径 '%s' 包含了过多的\"..\"!"
+
+#: ../src/generic/dbgrptg.cpp:289
+msgid ""
+"The report contains the files listed below. If any of these files contain "
+"private information,\n"
+"please uncheck them and they will be removed from the report.\n"
+msgstr ""
+"报告包含了以下文件. 如果这些文件含有"
+"私人信息, \n"
+"请去掉选中相应的文件, 未选中的文件就会从报告中删除.\n"
 
-#: ../src/common/cmdline.cpp:846
+#: ../src/common/cmdline.cpp:883
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "必要的參數 '%s' 沒有指定。"
+msgstr "必须的参数 '%s' 没有指定."
 
-#: ../src/common/textcmn.cpp:187
+#: ../src/common/textcmn.cpp:246
 msgid "The text couldn't be saved."
-msgstr "文字無法儲存。"
+msgstr "文本不能被保存."
 
-#: ../src/common/cmdline.cpp:825
+#: ../src/common/cmdline.cpp:862
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "é\81¸é \85 '%s' ç\9a\84å\80¼å¿\85é \88æ\8c\87å®\9aã\80\82"
+msgstr "é\80\89项 '%s'ç\9a\84å\80¼å¿\85须被æ\8c\87å®\9a."
 
-#: ../src/msw/dialup.cpp:408
+#: ../src/msw/dialup.cpp:418
 #, c-format
-msgid "The version of remote access service (RAS) installed on this machine is tooold, please upgrade (the following required function is missing: %s)."
-msgstr "遠端存取服務 (RAS) 的版本太舊，請更新它 (缺少必要的函式：%s)。"
+msgid ""
+"The version of remote access service (RAS) installed on this machine is "
+"tooold, please upgrade (the following required function is missing: %s)."
+msgstr "安装在本机的远程访问服务(RAS)太旧, 请更新它 (下列必须的函数缺失: %s)."
+
+#: ../src/html/htmprint.cpp:601
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr "在页面建立时发生问题: 您可能需要设置一台缺省打印机."
 
-#: ../src/html/htmprint.cpp:540
-msgid "There was a problem during page setup: you may need to set a default printer."
-msgstr "頁面設定時有問題：你必須設定預設印表機。"
+#: ../src/msw/datectrl.cpp:109
+msgid ""
+"This system doesn't support date picker control, please upgrade your version "
+"of comctl32.dll"
+msgstr "本系统不支持日期获取控制, 请升级您的comctl32.dll"
 
-#: ../src/msw/thread.cpp:1214
-msgid "Thread module initialization failed: can not store value in thread local storage"
-msgstr "執行緒模組初始化失敗：無法存值到「執行緒內部儲存區」"
+#: ../src/msw/thread.cpp:1204
+msgid ""
+"Thread module initialization failed: can not store value in thread local "
+"storage"
+msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
 
-#: ../src/unix/threadpsx.cpp:1596
+#: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "執行緒模組初始化失敗：無法建立執行緒機碼"
+msgstr "线程模块初始化失败: 创建线程键失败"
 
-#: ../src/msw/thread.cpp:1202
-msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
-msgstr "執行緒模組初始化失敗：無法在「執行緒內部儲存區」中配置索引"
+#: ../src/msw/thread.cpp:1192
+msgid ""
+"Thread module initialization failed: impossible to allocate index in thread "
+"local storage"
+msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
-#: ../src/unix/threadpsx.cpp:1104
+#: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
-msgstr "忽略執行緒的優先等級設定。"
+msgstr "线程优先级设置被忽略."
 
-#: ../src/msw/mdi.cpp:189
+#: ../src/msw/mdi.cpp:187
 msgid "Tile &Horizontally"
-msgstr "水平鋪列(&H)"
+msgstr "水平排布(&H)"
 
-#: ../src/msw/mdi.cpp:190
+#: ../src/msw/mdi.cpp:188
 msgid "Tile &Vertically"
-msgstr "垂直鋪列(&V)"
+msgstr "垂直排布(&V)"
 
-#: ../src/generic/filedlgg.cpp:706
-msgid "Time"
-msgstr "時間"
+#: ../src/common/ftp.cpp:635
+msgid "Timeout while waiting for FTP server to connect, try passive mode."
+msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
 
-#: ../src/generic/tipdlg.cpp:202
+#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+msgid "Timer creation failed."
+msgstr "计时器创建失败"
+
+#: ../src/generic/tipdlg.cpp:220
 msgid "Tip of the Day"
-msgstr "每日小秘訣"
+msgstr "每日技巧"
 
-#: ../src/generic/tipdlg.cpp:140
+#: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"
-msgstr "å°\8dä¸\8dèµ·ï¼\8cç\84¡æ³\95å\8f\96å¾\97å°\8fç§\98訣ï¼\81"
+msgstr "对ä¸\8dèµ·, 没æ\9c\89æ\89\80é\9c\80æ\8a\80å·§!"
 
-#: ../src/generic/prntdlgg.cpp:188
+#: ../src/generic/prntdlgg.cpp:237
 msgid "To:"
-msgstr "到："
+msgstr "到:"
+
+#: ../src/common/imagpng.cpp:292
+msgid "Too many colours in PNG, the image may be slightly blurred."
+msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 
-#: ../src/generic/prntdlgg.cpp:633
+#: ../src/generic/prntdlgg.cpp:880
 msgid "Top margin (mm):"
-msgstr "上版邊(毫米)："
+msgstr "上页边距 (毫米):"
 
-#: ../src/common/fs_mem.cpp:202
+#: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "嘗試從「記憶體虛擬檔案系統」中移除檔案 '%s'，但它並未被載入！"
+msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 
-#: ../src/common/sckaddr.cpp:126
+#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
 msgid "Trying to solve a NULL hostname: giving up"
-msgstr "嘗試解析 NULL 主機名：放棄"
+msgstr "试图解决 NULL 主机名: 放弃"
 
-#: ../src/common/fontmap.cpp:121
+#: ../src/common/fmapbase.cpp:111
 msgid "Turkish (ISO-8859-9)"
-msgstr "å\9c\9fè\80³å\85¶èª\9e (ISO-8859-9)"
+msgstr "å\9c\9fè\80³å\85¶è¯­ (ISO-8859-9)"
 
-#: ../src/common/paper.cpp:140
+#: ../src/generic/filedlgg.cpp:440
+msgid "Type"
+msgstr "类型"
+
+#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
+#: ../src/common/xtixml.cpp:498
+msgid "Type must have enum - long conversion"
+msgstr "必须进行 enum - long 的类型转换"
+
+#: ../src/common/paper.cpp:147
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US æ¨\99æº\96è¤\87寫簿, 14 7/8 x 11 è\8b±å\90\8b"
+msgstr "US æ \87å\87\86å¤\8då\86\99ç°¿, 14 7/8 x 11 è\8b±å¯¸"
 
-#: ../src/html/htmlwin.cpp:270
+#: ../src/html/htmlwin.cpp:403
 #, c-format
 msgid "Unable to open requested HTML document: %s"
-msgstr "無法開啟 HTML 文件： %s"
-
-#: ../src/generic/fontdlgg.cpp:250
-msgid "Underline"
-msgstr "底線"
-
-#: ../src/common/resourc2.cpp:305
-#: ../src/common/resourc2.cpp:319
-#: ../src/common/resourc2.cpp:335
-#: ../src/common/resourc2.cpp:349
-#: ../src/common/resourc2.cpp:1370
-#: ../src/common/resourc2.cpp:1384
-#: ../src/common/resourc2.cpp:1400
-#: ../src/common/resourc2.cpp:1414
-#: ../src/common/resource.cpp:1824
-#: ../src/common/resource.cpp:1838
-#: ../src/common/resource.cpp:1855
-#: ../src/common/resource.cpp:1869
-#: ../src/common/resource.cpp:1954
-#: ../src/common/resource.cpp:1968
-#: ../src/common/resource.cpp:1984
-#: ../src/common/resource.cpp:1998
-#: ../src/common/resource.cpp:3038
-#: ../src/common/resource.cpp:3052
-#: ../src/common/resource.cpp:3069
-#: ../src/common/resource.cpp:3083
-msgid "Unexpected end of file whilst parsing resource."
-msgstr "在解譯資源時，遇到不預期的檔案結尾。"
-
-#: ../src/common/cmdline.cpp:789
+msgstr "不能打开HTML文档: %s"
+
+#: ../src/unix/sound.cpp:376
+msgid "Unable to play sound asynchronously."
+msgstr "不能异步地播放声音."
+
+#: ../src/common/stockitem.cpp:148
+msgid "Undelete"
+msgstr "取消删除"
+
+#: ../contrib/src/deprecated/resource.cpp:1848
+#: ../contrib/src/deprecated/resource.cpp:1862
+#: ../contrib/src/deprecated/resource.cpp:1879
+#: ../contrib/src/deprecated/resource.cpp:1893
+#: ../contrib/src/deprecated/resource.cpp:1978
+#: ../contrib/src/deprecated/resource.cpp:1992
+#: ../contrib/src/deprecated/resource.cpp:2008
+#: ../contrib/src/deprecated/resource.cpp:2022
+#: ../contrib/src/deprecated/resource.cpp:3070
+#: ../contrib/src/deprecated/resource.cpp:3084
+#: ../contrib/src/deprecated/resource.cpp:3101
+#: ../contrib/src/deprecated/resource.cpp:3115
+#, fuzzy
+msgid "Unexpected end of file while parsing resource."
+msgstr "在解析资源时意外到达文件结尾."
+
+#: ../src/common/cmdline.cpp:826
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "意外參數 '%s'"
+msgstr "意外参数 '%s'"
+
+#: ../src/common/fmapbase.cpp:135
+msgid "Unicode 16 bit (UTF-16)"
+msgstr "16位的Unicode编码 (UTF-16)"
 
-#: ../src/common/fontmap.cpp:142
+#: ../src/common/fmapbase.cpp:136
+msgid "Unicode 16 bit Big Endian (UTF-16BE)"
+msgstr "16位大字节序Unicode编码 (UTF-16BE)"
+
+#: ../src/common/fmapbase.cpp:137
+msgid "Unicode 16 bit Little Endian (UTF-16LE)"
+msgstr "16位小字节序Unicode编码 (UTF-16LE)"
+
+#: ../src/common/fmapbase.cpp:138
+msgid "Unicode 32 bit (UTF-32)"
+msgstr "32位的Unicode编码 (UTF-32)"
+
+#: ../src/common/fmapbase.cpp:139
+msgid "Unicode 32 bit Big Endian (UTF-32BE)"
+msgstr "32位大字节序Unicode编码 (UTF-32BE)"
+
+#: ../src/common/fmapbase.cpp:140
+msgid "Unicode 32 bit Little Endian (UTF-32LE)"
+msgstr "32位小字节序Unicode编码 (UTF-32LE)"
+
+#: ../src/common/fmapbase.cpp:133
 msgid "Unicode 7 bit (UTF-7)"
-msgstr ""
+msgstr "7位的Unicode编码 (UTF-7)"
 
-#: ../src/common/fontmap.cpp:143
+#: ../src/common/fmapbase.cpp:134
 msgid "Unicode 8 bit (UTF-8)"
-msgstr ""
+msgstr "8位的Unicode编码 (UTF-8)"
 
-#: ../src/msw/dde.cpp:1044
+#: ../src/msw/dde.cpp:1092
 #, c-format
 msgid "Unknown DDE error %08x"
-msgstr "未知的「動態資料交換」錯誤 %08x"
+msgstr "未知 DDE 错误 %08x"
 
-#: ../src/common/fontmap.cpp:406
+#: ../src/common/xtistrm.cpp:370
+msgid "Unknown Object passed to GetObjectClassInfo"
+msgstr "未知的对象被传递给GetObjectClassInfo"
+
+#: ../src/unix/dlunix.cpp:275
+msgid "Unknown dynamic library error"
+msgstr "未知的动态库错误"
+
+#: ../src/common/fmapbase.cpp:688
 #, c-format
 msgid "Unknown encoding (%d)"
-msgstr "æ\9cªç\9f¥ç\9a\84編碼 (%d)"
+msgstr "æ\9cªç\9f¥ç¼\96ç \81 (%d)"
 
-#: ../src/unix/mimetype.cpp:2165
+#: ../src/unix/mimetype.cpp:2344
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
-msgstr "檔案 %s 第 %d 行有未知欄位：'%s'。"
+msgstr "在文件 %s, 行 %d是未知字段: '%s'."
 
-#: ../src/common/cmdline.cpp:565
-#, c-format
+#: ../src/common/cmdline.cpp:599
+#, fuzzy, c-format
 msgid "Unknown long option '%s'"
-msgstr "æ\9cªç\9f¥ç\9a\84é\95·é\81¸é \85 '%s'"
+msgstr "æ\9cªç\9f¥ç\9a\84é\95¿é\80\89项 '%s'"
 
-#: ../src/common/cmdline.cpp:574
-#: ../src/common/cmdline.cpp:595
+#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "未知的選項 '%s'"
+msgstr "未知选项 '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:701
+#: ../src/xrc/xmlres.cpp:762
 msgid "Unknown style flag "
-msgstr "未知的樣式旗標"
+msgstr "未知的风格标志 "
+
+#: ../src/common/xtixml.cpp:324
+#, fuzzy, c-format
+msgid "Unkown Property %s"
+msgstr "未知属性 %s"
 
-#: ../src/common/mimecmn.cpp:167
+#: ../src/common/mimecmn.cpp:161
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "mime 類型 %s 中有不成對的'{'。"
+msgstr "类型 %s中有不配套的'{'."
 
-#: ../src/common/cmdproc.cpp:238
-#: ../src/common/cmdproc.cpp:254
-#: ../src/common/cmdproc.cpp:281
+#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
-msgstr "未命名的指令"
+msgstr "未命名的命令"
 
-#: ../src/common/resourc2.cpp:687
-#: ../src/common/resource.cpp:2343
-#, c-format
-msgid "Unrecognized style %s whilst parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+#: ../contrib/src/deprecated/resource.cpp:2367
+#, fuzzy, c-format
+msgid "Unrecognized style %s while parsing resource."
+msgstr "解析资源时遇到无法识别的风格 %s."
 
-#: ../src/mac/clipbrd.cpp:59
-#: ../src/msw/clipbrd.cpp:273
-#: ../src/msw/clipbrd.cpp:447
+#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
+#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
-msgstr "ä¸\8dæ\94¯æ\8f´ç\9a\84å\89ªè²¼ç°¿æ ¼å¼\8fã\80\82"
+msgstr "ä¸\8dæ\94¯æ\8c\81ç\9a\84å\89ªè´´æ\9d¿æ ¼å¼\8f."
 
-#: ../src/common/appcmn.cpp:380
+#: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "ä¸\8dæ\94¯æ\8f´ç\9a\84主é¡\8c '%s'ã\80\82"
+msgstr "ä¸\8dæ\94¯æ\8c\81ç\9a\84主é¢\98(theme) '%s'."
 
-#: ../src/generic/fdrepdlg.cpp:157
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Up"
-msgstr "上"
+msgstr "向上"
 
-#: ../src/common/cmdline.cpp:916
+#: ../src/common/cmdline.cpp:953
 #, c-format
 msgid "Usage: %s"
-msgstr "使用方式：%s"
+msgstr "用法: %s"
 
-#: ../src/common/valtext.cpp:196
+#: ../src/common/valtext.cpp:181
 msgid "Validation conflict"
-msgstr "é©\97è­\89è¡\9d突"
+msgstr "éª\8cè¯\81å\86²突"
 
-#: ../src/generic/filedlgg.cpp:1103
+#: ../contrib/src/mmedia/vidbase.cpp:65
+msgid "Video Output"
+msgstr "视频输出"
+
+#: ../src/generic/filedlgg.cpp:980
 msgid "View files as a detailed view"
-msgstr "æ\8c\89詳細è³\87æ\96\99檢è¦\96æª\94æ¡\88"
+msgstr "æ\8c\89详ç»\86è§\86å\9b¾è§\82ç\9c\8bæ\96\87件"
 
-#: ../src/generic/filedlgg.cpp:1096
+#: ../src/generic/filedlgg.cpp:973
 msgid "View files as a list view"
-msgstr "按清單檢視檔案"
+msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1617
+#: ../src/common/docview.cpp:1790
 msgid "Views"
-msgstr "è¦\96ç\95\8c"
+msgstr "è§\86å\9b¾"
 
-#: ../src/unix/utilsunx.cpp:758
+#: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
-msgstr "等待子程序終止失敗"
+msgstr "等待子过程终止失败"
 
-#: ../src/common/docview.cpp:438
-#: ../src/common/resource.cpp:124
+#: ../src/common/docview.cpp:461
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/common/log.cpp:464
+#: ../src/common/log.cpp:480
 msgid "Warning: "
-msgstr "警告："
+msgstr "警告: "
 
-#: ../src/html/htmlpars.cpp:362
+#: ../src/html/htmlpars.cpp:395
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "警告：試圖從空堆疊中移除 HTML 標籤處理常式。"
+msgstr "警告: 试图从空栈中移去HTML标签处理器."
 
-#: ../src/common/fontmap.cpp:113
+#: ../src/common/fmapbase.cpp:103
 msgid "Western European (ISO-8859-1)"
-msgstr "西æ­\90 (ISO-8859-1)"
+msgstr "西欧 (ISO-8859-1)"
 
-#: ../src/common/fontmap.cpp:127
+#: ../src/common/fmapbase.cpp:117
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "西æ­\90 with Euro (ISO-8859-15)"
+msgstr "西欧(带欧å\85\83符å\8f·) (ISO-8859-15)"
 
-#: ../src/generic/fdrepdlg.cpp:149
+#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+msgid "Whether the font is underlined."
+msgstr "字体是否为下划线."
+
+#: ../src/generic/fdrepdlg.cpp:150
 msgid "Whole word"
-msgstr "完整的字"
+msgstr "整字"
 
-#: ../src/html/helpfrm.cpp:412
+#: ../src/html/helpfrm.cpp:535
 msgid "Whole words only"
-msgstr "只限完整的字"
+msgstr "仅为整字"
 
-#: ../src/univ/themes/win32.cpp:1168
+#: ../src/univ/themes/win32.cpp:1235
 msgid "Win32 theme"
-msgstr "Win32 主題"
+msgstr "Win32主题(theme)"
 
-#: ../src/msw/utils.cpp:983
+#: ../src/msw/utils.cpp:1096
 msgid "Win32s on Windows 3.1"
-msgstr ""
+msgstr "Windows 3.1上的Win32s"
 
-#: ../src/msw/utils.cpp:1015
-msgid "Windows 3.1"
-msgstr ""
+#: ../src/msw/utils.cpp:1145
+#, c-format
+msgid "Windows 2000 (build %lu"
+msgstr "Windows 2000 (build %lu"
+
+#: ../src/msw/utils.cpp:1110
+msgid "Windows 95"
+msgstr "Windows 95"
+
+#: ../src/msw/utils.cpp:1106
+msgid "Windows 95 OSR2"
+msgstr "Windows 95 OSR2"
+
+#: ../src/msw/utils.cpp:1121
+msgid "Windows 98"
+msgstr "Windows 98"
+
+#: ../src/msw/utils.cpp:1117
+msgid "Windows 98 SE"
+msgstr "Windows 98 SE"
 
-#: ../src/msw/utils.cpp:987
+#: ../src/msw/utils.cpp:1128
 #, c-format
-msgid "Windows 9%c"
-msgstr ""
+msgid "Windows 9x (%d.%d)"
+msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fontmap.cpp:139
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Arabic (CP 1256)"
-msgstr ""
+msgstr "Windows 阿拉伯语 (CP 1256)"
 
-#: ../src/common/fontmap.cpp:140
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Baltic (CP 1257)"
-msgstr ""
+msgstr "Windows 波罗的海语 (CP 1257)"
 
-#: ../src/common/fontmap.cpp:133
+#: ../src/common/fmapbase.cpp:124
 msgid "Windows Central European (CP 1250)"
-msgstr ""
+msgstr "Windows 中欧 (CP 1250)"
 
-#: ../src/common/fontmap.cpp:130
+#: ../src/common/fmapbase.cpp:121
 msgid "Windows Chinese Simplified (CP 936)"
-msgstr ""
+msgstr "Windows 简体中文 (CP 936)"
 
-#: ../src/common/fontmap.cpp:132
+#: ../src/common/fmapbase.cpp:123
 msgid "Windows Chinese Traditional (CP 950)"
-msgstr ""
+msgstr "Windows 繁体中文 (CP 950)"
 
-#: ../src/common/fontmap.cpp:134
+#: ../src/common/fmapbase.cpp:125
 msgid "Windows Cyrillic (CP 1251)"
-msgstr ""
+msgstr "Windows 西里尔语 (CP 1251)"
 
-#: ../src/common/fontmap.cpp:136
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Greek (CP 1253)"
-msgstr ""
+msgstr "Windows 希腊语 (CP 1253)"
 
-#: ../src/common/fontmap.cpp:138
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Hebrew (CP 1255)"
-msgstr ""
+msgstr "Windows 希伯来语 (CP 1255)"
 
-#: ../src/common/fontmap.cpp:129
+#: ../src/common/fmapbase.cpp:120
 msgid "Windows Japanese (CP 932)"
-msgstr ""
+msgstr "Windows 日语 (CP 932)"
 
-#: ../src/common/fontmap.cpp:131
+#: ../src/common/fmapbase.cpp:122
 msgid "Windows Korean (CP 949)"
-msgstr ""
+msgstr "Windows 韩语 (CP 949)"
+
+#: ../src/msw/utils.cpp:1125
+msgid "Windows ME"
+msgstr "Windows ME"
+
+#: ../src/msw/utils.cpp:1160
+#, c-format
+msgid "Windows NT %lu.%lu (build %lu"
+msgstr "Windows NT %lu.%lu (build %lu"
+
+#: ../src/msw/utils.cpp:1153
+#, c-format
+msgid "Windows Server 2003 (build %lu"
+msgstr "Windows Server 2003 (build %lu"
 
-#: ../src/common/fontmap.cpp:137
+#: ../src/common/fmapbase.cpp:128
 msgid "Windows Turkish (CP 1254)"
-msgstr ""
+msgstr "Windows 土耳其语 (CP 1254)"
 
-#: ../src/common/fontmap.cpp:135
+#: ../src/common/fmapbase.cpp:126
 msgid "Windows Western European (CP 1252)"
-msgstr ""
+msgstr "Windows 西欧 (CP 1252)"
+
+#: ../src/msw/utils.cpp:1149
+#, c-format
+msgid "Windows XP (build %lu"
+msgstr "Windows XP (build %lu"
 
-#: ../src/common/fontmap.cpp:141
+#: ../src/common/fmapbase.cpp:132
 msgid "Windows/DOS OEM (CP 437)"
-msgstr ""
+msgstr "Windows/DOS OEM (CP 437)"
 
-#: ../src/common/ffile.cpp:160
+#: ../src/common/ffile.cpp:158
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "寫å\85¥æª\94æ¡\88 '%s' æ\99\82ç\99¼ç\94\9fé\8c¯èª¤"
+msgstr "å\86\99æ\96\87件 '%s'é\94\99误"
 
-#: ../contrib/src/xrc/xml.cpp:530
+#: ../src/xml/xml.cpp:562
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "XML 解譯錯誤：'%s' 在第 %d 行"
+msgstr "XML解析错误: '%s' 位于 行 %d"
 
-#: ../src/common/xpmdecod.cpp:759
+#: ../src/common/xpmdecod.cpp:774
 msgid "XPM: Malformed pixel data!"
-msgstr "XPM: 不正常的圖素資料！"
+msgstr "XPM: 错误的象素数据!"
 
-#: ../src/common/xpmdecod.cpp:709
-#: ../src/common/xpmdecod.cpp:718
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
-msgstr "XPM: 不正常的顏色定義 '%s'！"
+msgstr "XPM: 错误的颜色定义 '%s'!"
 
-#: ../contrib/src/xrc/xmlres.cpp:470
+#: ../src/xrc/xmlres.cpp:518
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
-msgstr "æ²\92æ\9c\89æ\89¾å\88° XRC è³\87æº\90 '%s' (é¡\9eå\88¥ '%s')ï¼\81"
+msgstr "没æ\9c\89æ\89¾å\88°XRCèµ\84æº\90 '%s' ï¼\88ç±» '%s')!"
 
-#: ../contrib/src/xrc/xmlres.cpp:861
-#: ../contrib/src/xrc/xmlres.cpp:872
+#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
-msgstr "XRC 資源：無法從 '%s' 建立點像圖。"
+msgstr "XRC资源: 不能从 '%s'创建位图."
 
-#: ../contrib/src/xrc/xmlres.cpp:821
+#: ../src/xrc/xmlres.cpp:975
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
-msgstr "XRC 資源：不正確的顏色規格 '%s' 屬性 '%s'。"
+msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 
-#: ../src/common/dlgcmn.cpp:214
-#: ../src/mac/msgdlg.cpp:77
-#: ../src/motif/msgdlg.cpp:182
+#: ../src/mac/carbon/msgdlg.cpp:61 ../src/mac/carbon/msgdlg.cpp:144
+#: ../src/mac/classic/msgdlg.cpp:59 ../src/mac/classic/msgdlg.cpp:141
+#: ../src/motif/msgdlg.cpp:187
 msgid "Yes"
 msgstr "是"
 
-#: ../src/generic/dirdlgg.cpp:262
+#: ../src/generic/dirdlgg.cpp:308
 msgid "You cannot add a new directory to this section."
-msgstr "您不能在這區段加入新的目錄。"
+msgstr "你不能向该项中加入新的目录."
+
+#: ../src/common/stockitem.cpp:155
+msgid "Zoom &In"
+msgstr "放大(&I)"
 
-#: ../src/common/fs_zip.cpp:86
-#: ../src/common/fs_zip.cpp:125
-msgid "ZIP handler currently supports only local files!"
-msgstr "ZIP 處理常式目前只支援本機檔案！"
+#: ../src/common/stockitem.cpp:156
+msgid "Zoom &Out"
+msgstr "缩小(&O)"
 
-#: ../src/common/docview.cpp:1953
+#: ../src/common/stockitem.cpp:154
+msgid "Zoom to &Fit"
+msgstr "缩放以适应窗口(&F)"
+
+#: ../src/common/docview.cpp:2146
 msgid "[EMPTY]"
 msgstr "[空]"
 
-#: ../src/msw/dde.cpp:1011
+#: ../src/msw/dde.cpp:1059
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "DDEML 應用程式已建立延長的競賽環境。"
+msgstr "DDEML应用程序已创建延时race条件."
 
-#: ../src/msw/dde.cpp:999
+#: ../src/msw/dde.cpp:1047
 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 ""
-"在呼叫 DDEML 其它函式之前，未事先呼叫 DdeInitialize 函式，\n"
-"或傳給 DDEML 函式的是\n"
-"一個無效的實體物件識別。"
+"没有调用DdeInitialize初始化函数就调用DDEML其它函数,\n"
+"或传给DDEML函数的是\n"
+"无效的实例标识."
 
-#: ../src/msw/dde.cpp:1017
+#: ../src/msw/dde.cpp:1065
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "用戶端嘗試建立會話失敗。"
+msgstr "客户试图建立的会话已失败."
 
-#: ../src/msw/dde.cpp:1014
+#: ../src/msw/dde.cpp:1062
 msgid "a memory allocation failed."
-msgstr "記憶體配置失敗。"
+msgstr "内存分配失败."
 
-#: ../src/msw/dde.cpp:1008
+#: ../src/msw/dde.cpp:1056
 msgid "a parameter failed to be validated by the DDEML."
-msgstr "DDEML 參數驗證失敗。"
+msgstr "DDEML参数验证失败."
 
-#: ../src/msw/dde.cpp:990
+#: ../src/msw/dde.cpp:1038
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "同步「連結協同活動」請求已逾時。"
+msgstr "同步advise事务请求已超时."
 
-#: ../src/msw/dde.cpp:996
+#: ../src/msw/dde.cpp:1044
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "同步「資料協同活動」請求已逾時。"
+msgstr "同步data事务请求已超时."
 
-#: ../src/msw/dde.cpp:1005
+#: ../src/msw/dde.cpp:1053
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "同步「執行協同活動」請求已逾時。"
+msgstr "同步execute事务请求已超时."
 
-#: ../src/msw/dde.cpp:1023
+#: ../src/msw/dde.cpp:1071
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "同步「資料傳送協同活動」請求已逾時。"
+msgstr "同步poke事务请求已超时."
 
-#: ../src/msw/dde.cpp:1038
+#: ../src/msw/dde.cpp:1086
 msgid "a request to end an advise transaction has timed out."
-msgstr "çµ\82æ­¢ã\80\8cé\80£çµ\90å\8d\94å\90\8cæ´»å\8b\95ã\80\8dç\9a\84è«\8bæ±\82å·²é\80¾æ\99\82ã\80\82"
+msgstr "ç»\88æ­¢adviseäº\8bå\8a¡ç\9a\84请æ±\82å·²è¶\85æ\97¶."
 
-#: ../src/msw/dde.cpp:1032
+#: ../src/msw/dde.cpp:1080
 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"
-"å\9c¨å®\8cæ\88\90交æ¶\89å\89\8dçµ\82æ­¢ã\80\82"
+"服务器端事务试图处理\n"
+"已被客户端终止的会话, 或服务器\n"
+"å\9c¨å®\8cæ\88\90äº\8bå\8a¡å\89\8dç»\88æ­¢."
 
-#: ../src/msw/dde.cpp:1020
+#: ../src/msw/dde.cpp:1068
 msgid "a transaction failed."
-msgstr "協同活動失敗。"
+msgstr "事务失败."
 
-#: ../src/common/menucmn.cpp:99
+#: ../src/common/menucmn.cpp:114
 msgid "alt"
-msgstr ""
+msgstr "alt"
 
-#: ../src/msw/dde.cpp:1002
+#: ../src/msw/dde.cpp:1050
 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 ""
-"初始化ç\82º APPCLASS_MONITOR ç\9a\84æ\87\89ç\94¨ç¨\8bå¼\8f\n"
-"試å\9c\96å\9f·è¡\8cã\80\8cå\8b\95æ\85\8bè³\87æ\96\99交æ\8f\9bã\80\8då\8d\94å\90\8cæ´»å\8b\95ï¼\8c\n"
-"或初始化ç\82º APPCMD_CLIENTONLY ç\9a\84æ\87\89ç\94¨ç¨\8bå¼\8f\n"
-"試å\9c\96å\9f·è¡\8c伺æ\9c\8då\99¨ç\9a\84å\8d\94å\90\8cæ´»å\8b\95ã\80\82"
+"初始化为APPCLASS_MONITORç\9a\84åº\94ç\94¨ç¨\8båº\8f\n"
+"è¯\95å\9b¾æ\89§è¡\8cDDEäº\8bå\8a¡,\n"
+"或初始化为APPCMD_CLIENTONLYç\9a\84åº\94ç\94¨ç¨\8båº\8f\n"
+"è§\86å\9b¾æ\89§è¡\8cæ\9c\8då\8a¡å\99¨äº\8bå\8a¡."
 
-#: ../src/msw/dde.cpp:1026
+#: ../src/msw/dde.cpp:1074
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "å\85§é\83¨å\91¼å\8f« PostMessage 失æ\95\97ã\80\82"
+msgstr "å\86\85é\83¨è°\83ç\94¨PostMessage失败. "
 
-#: ../src/msw/dde.cpp:1035
+#: ../src/msw/dde.cpp:1083
 msgid "an internal error has occurred in the DDEML."
-msgstr "DDEML 發生內部錯誤。"
+msgstr "在DDEML中发生内部错误."
 
-#: ../src/msw/dde.cpp:1041
+#: ../src/msw/dde.cpp:1089
 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/fileconf.cpp:1767
+#: ../src/common/zipstrm.cpp:1331
+#, fuzzy
+msgid "assuming this is a multi-part zip concatenated"
+msgstr "假定这是分段的zip文件"
+
+#: ../src/common/fileconf.cpp:1819
 #, 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"
+msgstr "库函数参数错误"
+
+#: ../src/html/chm.cpp:342
+msgid "bad signature"
+msgstr "错误的签名"
+
+#: ../src/common/zipstrm.cpp:1581
+msgid "bad zipfile offset to entry"
+msgstr "zip文件中到条目的偏移值错误"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "binary"
-msgstr "二進位"
+msgstr "二进制"
 
-#: ../src/common/fontcmn.cpp:548
+#: ../src/common/fontcmn.cpp:645
 msgid "bold"
-msgstr "粗體"
+msgstr "粗体"
 
-#: ../src/common/fontcmn.cpp:472
+#: ../src/common/fontcmn.cpp:569
 msgid "bold "
-msgstr "粗體"
+msgstr "粗体 "
 
-#: ../src/common/ffile.cpp:93
+#: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
-msgstr "無法關閉檔案 '%s'"
+msgstr "不能关闭文件 '%s'"
 
-#: ../src/common/file.cpp:275
+#: ../src/common/file.cpp:286
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "無法關閉檔案描述子 %d"
+msgstr "不能关闭文件描述子 %d"
 
-#: ../src/common/file.cpp:553
+#: ../src/common/file.cpp:551
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "無法將修改反映到檔案 '%s'"
+msgstr "不能把修改提交给文件 '%s'"
 
-#: ../src/common/file.cpp:215
+#: ../src/common/file.cpp:217
 #, c-format
 msgid "can't create file '%s'"
-msgstr "無法建立檔案 '%s'"
+msgstr "不能创建文件 '%s'"
 
-#: ../src/common/fileconf.cpp:1078
+#: ../src/common/fileconf.cpp:1134
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "無法刪除使用者組態檔案 '%s'"
+msgstr "不能删除用户配置文件 '%s'"
 
-#: ../src/common/file.cpp:458
+#: ../src/common/file.cpp:457
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr "無法確定是否已達檔案 %d 的尾部"
+msgstr "不能确定是否已达文件 %d 的尾部"
 
-#: ../src/common/file.cpp:424
+#: ../src/common/zipstrm.cpp:1358
+#, fuzzy
+msgid "can't find central directory in zip"
+msgstr "不能在zip文件中找到中央目录"
+
+#: ../src/common/file.cpp:427
 #, c-format
 msgid "can't find length of file on file descriptor %d"
-msgstr "無法獲得檔案描述子 %d 的檔案的長度"
+msgstr "不能获得文件描述子 %d的文件的长度"
 
-#: ../src/msw/utils.cpp:369
+#: ../src/msw/utils.cpp:376
 msgid "can't find user's HOME, using current directory."
-msgstr "找不到使用者目錄 HOME，使用目前目錄。"
+msgstr "找不到用户的HOME目录, 使用当前目录."
 
-#: ../src/common/file.cpp:338
+#: ../src/common/file.cpp:341
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "無法重新整理檔案描述子 %d"
+msgstr "不能刷新文件描述子 %d"
 
-#: ../src/common/file.cpp:392
+#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
 #, c-format
 msgid "can't get seek position on file descriptor %d"
-msgstr "無法獲得檔案描述子 %d 的指標位置"
+msgstr "不能获得文件描述子 %d的指针位置"
 
-#: ../src/common/fontmap.cpp:807
+#: ../src/common/fontmap.cpp:326
 msgid "can't load any font, aborting"
-msgstr "無法載入任何字型，活動中止"
+msgstr "不能装载任何字体, 正在中止"
 
-#: ../src/common/ffile.cpp:77
-#: ../src/common/file.cpp:261
+#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
 #, c-format
 msgid "can't open file '%s'"
-msgstr "無法開啟檔案 '%s'"
+msgstr "不能打开文件 '%s'"
 
-#: ../src/common/fileconf.cpp:397
+#: ../src/common/fileconf.cpp:404
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "無法開啟全局組態檔案 '%s'。"
+msgstr "不能打开全局配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:416
+#: ../src/common/fileconf.cpp:419
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "無法開啟使用者組態檔案 '%s'。"
+msgstr "不能打开用户配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:949
+#: ../src/common/fileconf.cpp:981
 msgid "can't open user configuration file."
-msgstr "無法開啟使用者組態檔案。"
+msgstr "不能打开用户配置文件."
+
+#: ../src/common/dynlib.cpp:253
+msgid "can't query for GUI plugins name in console applications"
+msgstr "无法在控制台程序里查询GUI插件"
+
+#: ../src/common/zipstrm.cpp:436
+msgid "can't re-initialize zlib deflate stream"
+msgstr "不能重新初始化zlib deflate(压缩)流."
+
+#: ../src/common/zipstrm.cpp:461
+msgid "can't re-initialize zlib inflate stream"
+msgstr "不能重新初始化zlib inflate(解压)流."
 
-#: ../src/common/file.cpp:301
+#: ../src/common/file.cpp:310
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "無法讀取檔案描述子 %d"
+msgstr "不能从文件描述子 %d中读"
 
-#: ../src/common/file.cpp:548
+#: ../src/common/file.cpp:546
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "無法移除檔案 '%s'"
+msgstr "不能删除文件 '%s'"
 
-#: ../src/common/file.cpp:564
+#: ../src/common/file.cpp:562
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "無法刪除暫時檔案 '%s'"
+msgstr "不能删除临时文件 '%s'"
 
-#: ../src/common/file.cpp:378
+#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
 #, c-format
 msgid "can't seek on file descriptor %d"
-msgstr "無法定位檔案描述子 %d"
+msgstr "不能定位文件描述子 %d"
 
 #: ../src/common/textfile.cpp:196
 #, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "無法將暫存區 '%s' 寫到磁碟。"
+msgstr "不能把文件 '%s'写到磁盘."
 
-#: ../src/common/file.cpp:323
+#: ../src/common/file.cpp:326
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "無法寫到檔案描述子 %d"
+msgstr "不能写到文件描述子 %d"
 
-#: ../src/common/fileconf.cpp:965
+#: ../src/common/fileconf.cpp:992
 msgid "can't write user configuration file."
-msgstr "無法寫使用者組態檔案。"
+msgstr "不能写用户配置文件."
 
-#: ../src/common/intl.cpp:364
+#: ../src/common/intl.cpp:1109
 #, c-format
 msgid "catalog file for domain '%s' not found."
-msgstr "找不到 '%s' 領域的記載檔。"
+msgstr "找不到域 '%s'的目录文件."
 
-#: ../src/common/menucmn.cpp:97
+#: ../src/html/chm.cpp:346
+msgid "checksum error"
+msgstr "校验和错误"
+
+#: ../src/html/chm.cpp:348
+msgid "compression error"
+msgstr "压缩错误"
+
+#: ../src/common/regex.cpp:141
+msgid "conversion to 8-bit encoding failed"
+msgstr "不能转换为8-bit编码"
+
+#: ../src/common/menucmn.cpp:112
 msgid "ctrl"
-msgstr ""
+msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1056
+#: ../src/common/cmdline.cpp:1093
 msgid "date"
 msgstr "日期"
 
-#: ../src/common/fontmap.cpp:416
+#: ../src/html/chm.cpp:350
+msgid "decompression error"
+msgstr "解压缩错误"
+
+#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730
 msgid "default"
-msgstr ""
+msgstr "缺省值"
+
+#: ../src/common/xtistrm.cpp:843
+msgid "delegate has no type info"
+msgstr "委派没有类型信息"
+
+#: ../src/common/debugrpt.cpp:502
+msgid "dump of the process state (binary)"
+msgstr "转储(dump)进程状态（二进制码）"
 
-#: ../src/common/datetime.cpp:3363
+#: ../src/common/datetime.cpp:3779
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3353
+#: ../src/common/datetime.cpp:3769
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetime.cpp:3356
+#: ../src/common/datetime.cpp:3772
 msgid "eleventh"
 msgstr "第十一"
 
-#: ../src/common/fileconf.cpp:1753
+#: ../src/common/strconv.cpp:2671
+#, c-format
+msgid "encoding %s"
+msgstr "编码 %s"
+
+#: ../src/common/fileconf.cpp:1805
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "項目 '%s' 在 '%s' 群中已出現一次以上"
+msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 
-#: ../src/msw/dialup.cpp:843
+#: ../src/html/chm.cpp:344
+msgid "error in data format"
+msgstr "文件格式错误"
+
+#: ../src/html/chm.cpp:332
+msgid "error opening file"
+msgstr "打开文件出错"
+
+#: ../src/common/zipstrm.cpp:1443
+#, fuzzy
+msgid "error reading zip central directory"
+msgstr "读zip中央目录时出错"
+
+#: ../src/common/zipstrm.cpp:1521
+msgid "error reading zip local header"
+msgstr "读zip本地头时出错"
+
+#: ../src/common/zipstrm.cpp:2237
+#, fuzzy, c-format
+msgid "error writing zip entry '%s': bad crc or length"
+msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
+
+#: ../src/msw/dialup.cpp:844
 msgid "establish"
 msgstr "建立"
 
-#: ../src/common/ffile.cpp:174
+#: ../src/common/ffile.cpp:172
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "重新整理檔案 '%s' 失敗"
+msgstr "刷新文件 '%s'失败"
 
-#: ../src/common/datetime.cpp:3360
+#: ../src/common/datetime.cpp:3776
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3350
+#: ../src/common/datetime.cpp:3766
 msgid "fifth"
 msgstr "第五"
 
-#: ../src/common/fileconf.cpp:626
-#, c-format
+#: ../src/common/fileconf.cpp:664
+#, fuzzy, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "æª\94æ¡\88 '%s' 第 %d è¡\8cï¼\9a忽ç\95¥ä½\8dæ\96¼ç¾¤çµ\84æ¨\99é ­ä¹\8bå¾\8cç\9a\84 '%s' ã\80\82"
+msgstr "æ\96\87件 '%s', è¡\8c %d: '%s' ç»\84头å\90\8e被忽ç\95¥."
 
-#: ../src/common/fileconf.cpp:655
-#, c-format
+#: ../src/common/fileconf.cpp:693
+#, fuzzy, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "æª\94æ¡\88 '%s' 第 %d è¡\8cï¼\9aæ\87\89æ\9c\89 '='ã\80\82"
+msgstr "æ\96\87件 '%s', è¡\8c %d: æ\9c\9fæ\9c\9b '='."
 
-#: ../src/common/fileconf.cpp:681
+#: ../src/common/fileconf.cpp:716
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "æª\94æ¡\88 '%s', 第 %d è¡\8cï¼\9aæ©\9f碼 '%s' 第ä¸\80次å\87ºç\8f¾å\9c¨ç¬¬ %d è¡\8cã\80\82"
+msgstr "æ\96\87件 '%s', è¡\8c %d: é\94® '%s' 第ä¸\80次å\87ºç\8e°å\9c¨è¡\8c %d."
 
-#: ../src/common/fileconf.cpp:671
+#: ../src/common/fileconf.cpp:706
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "æª\94æ¡\88 '%s' 第 %d è¡\8cï¼\9a忽ç\95¥å°\8dä¸\8då\8f¯è®\8aæ\9b´æ©\9f碼 '%s' ç\9a\84å\80¼ã\80\82"
+msgstr "æ\96\87件 '%s', è¡\8c %d: 忽ç\95¥ä¸\8dè\83½ä¿®æ\94¹é\94® '%s'ç\9a\84å\80¼."
 
-#: ../src/common/fileconf.cpp:594
+#: ../src/common/fileconf.cpp:628
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "æª\94æ¡\88 '%s'ï¼\9a ä¸\8dæ\87\89æ\9c\89å­\97å\85\83 %c å­\98å\9c¨æ\96¼ç¬¬ %d è¡\8c中"
+msgstr "æ\96\87件 '%s': é\9d\9eé¢\84æ\9c\9fç\9a\84å­\97符 %c å­\98å\9c¨äº\8eè¡\8c %d.中"
 
-#: ../src/common/datetime.cpp:3346
+#: ../src/common/datetime.cpp:3762
 msgid "first"
 msgstr "第一"
 
-#: ../src/common/datetime.cpp:3359
+#: ../src/html/helpfrm.cpp:1262
+msgid "font size"
+msgstr "字体大小"
+
+#: ../src/common/datetime.cpp:3775
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3349
+#: ../src/common/datetime.cpp:3765
 msgid "fourth"
 msgstr "第四"
 
-#: ../src/common/appcmn.cpp:319
+#: ../src/common/appbase.cpp:361
 msgid "generate verbose log messages"
-msgstr "產生冗長的記錄訊息"
-
-#: ../src/common/timercmn.cpp:290
-msgid "gmtime() failed"
-msgstr "gmtime() 失敗"
+msgstr "生成详细的日志信息"
 
-#: ../src/mac/scrolbar.cpp:143
-#, c-format
-msgid "illegal scrollbar selector %d"
-msgstr ""
+#: ../src/common/xtixml.cpp:479
+msgid "incorrect event handler string, missing dot"
+msgstr "错误的时间句柄字符串, 缺少点号('.')"
 
-#: ../src/msw/dialup.cpp:843
+#: ../src/msw/dialup.cpp:844
 msgid "initiate"
 msgstr "初始化"
 
-#: ../src/common/file.cpp:462
+#: ../src/common/file.cpp:459
 msgid "invalid eof() return value."
-msgstr "無效的 eof() 傳回值。"
+msgstr "无效的eof()返回值."
 
-#: ../src/generic/logg.cpp:1125
+#: ../src/generic/logg.cpp:1180
 msgid "invalid message box return value"
-msgstr "訊息盒傳回無效的值"
+msgstr "消息框返回无效的值"
 
-#: ../src/common/fontcmn.cpp:488
-#: ../src/common/fontcmn.cpp:552
+#: ../src/common/zipstrm.cpp:1307
+msgid "invalid zip file"
+msgstr "无效的zip文件"
+
+#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
 msgid "italic"
-msgstr "斜體"
+msgstr "斜体"
 
-#: ../src/common/fontcmn.cpp:544
+#: ../src/common/fontcmn.cpp:641
+#, fuzzy
 msgid "light"
-msgstr "ç´°é«\94"
+msgstr "ç»\86"
 
-#: ../src/common/fontcmn.cpp:468
+#: ../src/common/fontcmn.cpp:565
+#, fuzzy
 msgid "light "
-msgstr "ç´°é«\94"
+msgstr "ç»\86 "
 
-#: ../src/common/intl.cpp:615
-#, c-format
+#: ../src/common/intl.cpp:1455
+#, fuzzy, c-format
 msgid "locale '%s' can not be set."
-msgstr "無法設定地區為 '%s'。"
+msgstr "不能设置现场(locale) '%s'."
 
-#: ../src/common/intl.cpp:359
+#: ../src/common/intl.cpp:1102
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
-msgstr "尋找記載檔 '%s' @ '%s'。"
+msgstr "查找目录 '%s' 在路径 '%s'下."
 
-#: ../src/common/datetime.cpp:3511
+#: ../src/common/datetime.cpp:3926
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/timercmn.cpp:286
-msgid "mktime() failed"
-msgstr ""
-
-#: ../src/common/datetime.cpp:3364
+#: ../src/common/datetime.cpp:3780
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3354
+#: ../src/common/datetime.cpp:3770
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:986
+#: ../src/msw/dde.cpp:1034
 msgid "no DDE error."
-msgstr "æ²\92æ\9c\89ã\80\8cå\8b\95æ\85\8bè³\87æ\96\99交æ\8f\9bã\80\8dé\8c¯èª¤ã\80\82"
+msgstr "没æ\9c\89DDEé\94\99误."
 
-#: ../src/html/helpdata.cpp:574
+#: ../src/html/chm.cpp:328
+msgid "no error"
+msgstr "没有错误"
+
+#: ../src/html/helpdata.cpp:662
 msgid "noname"
-msgstr "æ\9cªå\91½å\90\8d"
+msgstr "未名"
 
-#: ../src/common/datetime.cpp:3510
+#: ../src/common/datetime.cpp:3925
 msgid "noon"
 msgstr "中午"
 
-#: ../src/common/cmdline.cpp:1052
+#: ../src/common/cmdline.cpp:1089
 msgid "num"
-msgstr "數字"
+msgstr "num"
+
+#: ../src/common/xtixml.cpp:258
+msgid "objects cannot have XML Text Nodes"
+msgstr "对象不能有XML 文本节点"
+
+#: ../src/html/chm.cpp:340
+msgid "out of memory"
+msgstr "内存耗尽"
 
-#: ../src/common/filename.cpp:166
+#: ../src/common/debugrpt.cpp:478
+msgid "process context description"
+msgstr "进程上下文描述"
+
+#: ../src/html/chm.cpp:334
+msgid "read error"
+msgstr "读取错误"
+
+#: ../src/common/filename.cpp:181
 msgid "reading"
-msgstr "讀取中"
+msgstr "正在读入"
+
+#: ../src/common/zipstrm.cpp:1744
+#, fuzzy, c-format
+msgid "reading zip stream (entry %s): bad crc"
+msgstr "读入zip流 (条目 %s): crc校验错误"
+
+#: ../src/common/zipstrm.cpp:1741
+#, fuzzy, c-format
+msgid "reading zip stream (entry %s): bad length"
+msgstr "读入zip流 (条目 %s): 长度错误"
 
-#: ../src/msw/dde.cpp:1029
+#: ../src/msw/dde.cpp:1077
 msgid "reentrancy problem."
-msgstr "重複進入問題。"
+msgstr "重入问题."
 
-#: ../src/common/datetime.cpp:3347
+#: ../src/common/datetime.cpp:3763
 msgid "second"
 msgstr "第二"
 
-#: ../src/common/datetime.cpp:3362
+#: ../src/html/chm.cpp:338
+msgid "seek error"
+msgstr "搜索错误"
+
+#: ../src/common/datetime.cpp:3778
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3352
+#: ../src/common/datetime.cpp:3768
 msgid "seventh"
 msgstr "第七"
 
-#: ../src/common/menucmn.cpp:101
+#: ../src/common/menucmn.cpp:116
 msgid "shift"
-msgstr ""
+msgstr "shift"
 
-#: ../src/common/appcmn.cpp:309
+#: ../src/common/appbase.cpp:351
 msgid "show this help message"
-msgstr "顯示這個說明訊息"
+msgstr "显示帮助信息"
 
-#: ../src/common/datetime.cpp:3361
+#: ../src/common/datetime.cpp:3777
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3351
+#: ../src/common/datetime.cpp:3767
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:344
+#: ../src/common/appcmn.cpp:203
 msgid "specify display mode to use (e.g. 640x480-16)"
-msgstr "設定顯示模式 (例如 640x480-16)"
+msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
-#: ../src/common/appcmn.cpp:330
+#: ../src/common/appcmn.cpp:189
 msgid "specify the theme to use"
-msgstr "設定主題"
+msgstr "指定使用的主题(theme)"
 
-#: ../src/common/cmdline.cpp:1048
+#: ../src/common/zipstrm.cpp:1647
+msgid "stored file length not in Zip header"
+msgstr "Zip头没有已存文件的长度信息"
+
+#: ../src/common/cmdline.cpp:1085
 msgid "str"
-msgstr "字串"
+msgstr "str"
 
-#: ../src/common/datetime.cpp:3355
+#: ../src/common/datetime.cpp:3771
 msgid "tenth"
 msgstr "第十"
 
-#: ../src/msw/dde.cpp:993
+#: ../src/msw/dde.cpp:1041
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "å\8d\94å\90\8cæ´»å\8b\95ç\9a\84å\9b\9eæ\87\89ï¼\8c設å®\9aäº\86 DDE_FBUSY ä½\8då\85\83ã\80\82"
+msgstr "对äº\8b件ç\9a\84å\93\8dåº\94导è\87´DDE_FBUSYä½\8d被设置."
 
-#: ../src/common/datetime.cpp:3348
+#: ../src/common/datetime.cpp:3764
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetime.cpp:3358
+#: ../src/common/datetime.cpp:3774
 msgid "thirteenth"
 msgstr "第十三"
 
-#: ../src/common/datetime.cpp:3190
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
+#, c-format
+msgid "tiff module: %s"
+msgstr "tiff 模块: %s"
+
+#: ../src/common/datetime.cpp:3591
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetime.cpp:3192
+#: ../src/common/datetime.cpp:3593
 msgid "tomorrow"
 msgstr "明天"
 
-#: ../src/common/datetime.cpp:3357
+#: ../src/common/datetime.cpp:3773
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3365
+#: ../src/common/datetime.cpp:3781
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:540
+#: ../src/common/fontcmn.cpp:637
 msgid "underlined"
-msgstr "底線"
+msgstr "下划线"
 
-#: ../src/common/fontcmn.cpp:455
+#: ../src/common/fontcmn.cpp:552
 msgid "underlined "
-msgstr "底線"
+msgstr "下划线 "
 
-#: ../src/common/fileconf.cpp:1887
-#, c-format
+#: ../src/common/fileconf.cpp:1932
+#, fuzzy, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "ä¸\8dæ\87\89æ\9c\89 \" å\9c¨ä½\8dç½® %d @ '%s'ã\80\82"
+msgstr "ä¾\8bå¤\96ç\9a\84 \" å\9c¨ä½\8dç½® %d (ä½\8däº\8e '%s')."
 
-#: ../src/generic/progdlgg.cpp:282
+#: ../src/generic/progdlgg.cpp:307
 msgid "unknown"
-msgstr "未知的"
+msgstr "未知"
 
-#: ../src/common/regex.cpp:144
+#: ../src/common/xtixml.cpp:252
+#, c-format
+msgid "unknown class %s"
+msgstr "未知类 %s"
+
+#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
 msgid "unknown error"
-msgstr "未知的錯誤！！！"
+msgstr "未知错误"
 
-#: ../src/msw/dialup.cpp:447
+#: ../src/msw/dialup.cpp:457
 #, c-format
 msgid "unknown error (error code %08x)."
-msgstr "未知的錯誤(錯誤碼 %08x)。"
+msgstr "未知错误(错误号 %08x)."
 
-#: ../src/common/textbuf.cpp:229
+#: ../src/common/textbuf.cpp:230
 msgid "unknown line terminator"
-msgstr "未知的斷行字元"
+msgstr "未知行终止符"
 
-#: ../src/common/file.cpp:361
+#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
 msgid "unknown seek origin"
-msgstr "未知的搜尋基準點"
+msgstr "未知搜索原点"
 
-#: ../src/common/fontmap.cpp:430
+#: ../src/common/fmapbase.cpp:712
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:407
+#: ../src/common/docview.cpp:430
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1224
+#: ../src/common/docview.cpp:1414
 #, c-format
 msgid "unnamed%d"
-msgstr "未命名-%d"
+msgstr "未命名 %d"
 
-#: ../src/common/intl.cpp:369
-#, c-format
-msgid "using catalog '%s' from '%s'."
-msgstr "使用記載檔 '%s' — '%s'。"
+#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031
+msgid "unsupported Zip compression method"
+msgstr "不支持的Zip压缩方法"
 
-#: ../src/common/filename.cpp:166
-msgid "writing"
-msgstr "寫入中"
+#: ../src/common/zipstrm.cpp:1142
+msgid "unsupported zip archive"
+msgstr "不支持的zip存档"
 
-#: ../src/common/dynlib.cpp:336
+#: ../src/common/intl.cpp:1114
 #, c-format
-msgid "wxDllLoader failed to GetSymbol '%s'"
-msgstr ""
+msgid "using catalog '%s' from '%s'."
+msgstr "使用目录 '%s' 从 '%s'."
 
-#: ../src/common/dynload.cpp:282
-#, c-format
-msgid "wxDynamicLibrary failed to GetSymbol '%s'"
-msgstr ""
+#: ../src/html/chm.cpp:336
+msgid "write error"
+msgstr "写错误"
+
+#: ../src/common/filename.cpp:181
+msgid "writing"
+msgstr "正在写入"
 
-#: ../src/common/timercmn.cpp:335
+#: ../src/common/stopwatch.cpp:281
 msgid "wxGetTimeOfDay failed."
-msgstr ""
+msgstr "wxGetTimeOfDay 失败."
 
-#: ../src/common/socket.cpp:394
-#: ../src/common/socket.cpp:448
+#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
+#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
 msgid "wxSocket: invalid signature in ReadMsg."
-msgstr "wxSocket: ReadMsg 中無效的簽名。"
+msgstr "wxSocket: ReadMsg中无效的签名."
 
-#: ../src/common/socket.cpp:975
+#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
-msgstr "wxSocket: 未知的事件！"
+msgstr "wxSocket: 未知事件!."
 
-#: ../src/motif/app.cpp:586
+#: ../src/motif/app.cpp:210
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows 無法為 '%s' 開啟顯示設備：已經存在。"
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets 不能为 '%s' 打开显示设备: 已经存在."
 
-#: ../src/x11/app.cpp:245
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows 無法開啟顯示設備。程式結束中。"
+#: ../src/x11/app.cpp:176
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets 不能打开显示设备: 已经存在."
 
-#: ../src/common/datetime.cpp:3191
+#: ../src/common/datetime.cpp:3592
 msgid "yesterday"
 msgstr "昨天"
 
+#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#, c-format
+msgid "zlib error %d"
+msgstr "zlib错误 %d"
+
+#: ../src/common/prntbase.cpp:839
+msgid "|<<"
+msgstr ""
+