PRIOR/NEXT build fixes.

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index 50009457feaad4bff1721906dc323d8e27005d05..ce66d1b74d174538c55671be9b929317e24327a3 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,4362 +1,5158 @@
+# Simplified Chinese Messages for wxWidgets
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the wxWidgets package.
+# mrfx <mrfx@fm365.com>
+# Liu Xiao Xi <liouxiao@hotmail.com>, 2005
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.2\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-07 14:03+0200\n"
-"PO-Revision-Date: 2000-11-09 16:09Öйú±ê׼ʱ¼ä\n"
-"Last-Translator: mrfx <mrfx@fm365.com>\n"
-"Language-Team: wxWindows tranlators <wx-translators@wxwindows.org>\n"
+"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"PO-Revision-Date: 2005-12-21 10:38+0800\n"
+"Last-Translator: Liu Xiao Xi <liouxiao@hotmail.com>\n"
+"Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/common/log.cpp:319
+#: ../src/common/debugrpt.cpp:569
+#, c-format
+msgid "\t%s: %s\n"
+msgstr "\t%s: %s\n"
+
+#: ../src/common/debugrpt.cpp:572
+msgid ""
+"\n"
+"Please send this report to the program maintainer, thank you!\n"
+msgstr ""
+"\n"
+"请将报告发送给程序维护人员, 谢谢!\n"
+
+#: ../src/palmos/utils.cpp:206
+msgid " "
+msgstr " "
+
+#: ../src/generic/dbgrptg.cpp:312
+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 " (´íÎó %ld: %s)"
+msgstr " (错误 %ld: %s)"
 
-#: ../src/common/docview.cpp:1325
+#: ../src/common/docview.cpp:1419
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:544
+#: ../src/html/htmprint.cpp:570
 msgid " Preview"
-msgstr "Ô¤ÀÀ"
+msgstr " 预览"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:124
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
-msgstr "#10 Envelope, 4 1/8 x 9 1/2 in"
+msgstr "#10 信封, 4 1/8 x 9 1/2 英寸"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:125
 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:138
+#: ../src/common/paper.cpp:126
 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:139
+#: ../src/common/paper.cpp:127
 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:135
+#: ../src/common/paper.cpp:123
 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 英寸"
+
+#: ../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/html/helpfrm.cpp:876 ../src/html/helpfrm.cpp:877
-#: ../src/html/helpfrm.cpp:1514 ../src/html/helpfrm.cpp:1544
+#: ../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 of %i"
+msgstr "%i / %i"
 
-#: ../src/generic/filedlgg.cpp:280
-#, fuzzy, c-format
+#: ../src/generic/filedlgg.cpp:288
+#, c-format
 msgid "%ld bytes"
-msgstr "×Ö½Ú"
+msgstr "%ld 字节"
 
-#: ../src/common/cmdline.cpp:825
+#: ../src/common/cmdline.cpp:851
 #, c-format
 msgid "%s (or %s)"
-msgstr "%s (»ò %s)"
+msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:260
+#: ../src/generic/logg.cpp:261
 #, c-format
 msgid "%s Error"
-msgstr "%s ´íÎó"
+msgstr "%s 错误"
 
-#: ../src/generic/logg.cpp:268
+#: ../src/generic/logg.cpp:269
 #, c-format
 msgid "%s Information"
-msgstr "%s ÐÅÏ¢"
+msgstr "%s 信息"
 
-#: ../src/generic/logg.cpp:264
+#: ../src/generic/logg.cpp:265
 #, c-format
 msgid "%s Warning"
-msgstr "%s ¾¯¸æ"
+msgstr "%s 警告"
 
-#: ../src/common/fldlgcmn.cpp:74
-#, fuzzy, c-format
+#: ../src/common/fldlgcmn.cpp:81
+#, c-format
 msgid "%s files (%s)|%s"
-msgstr "Îļþ (%s)|%s"
+msgstr "%s 文件 (%s)|%s"
 
-#: ../src/common/msgout.cpp:188
+#: ../src/common/msgout.cpp:229
 #, c-format
 msgid "%s message"
-msgstr ""
+msgstr "%s 消息"
 
-#: ../src/html/helpfrm.cpp:274
+#: ../contrib/src/deprecated/resource.cpp:2390
+#, c-format
+msgid "%s not a bitmap resource specification."
+msgstr "%s 不是位图资源."
+
+#: ../contrib/src/deprecated/resource.cpp:2544
+#, c-format
+msgid "%s not an icon resource specification."
+msgstr "%s 不是图标资源."
+
+#: ../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: 不良资源文件语法."
+
+#: ../src/html/helpfrm.cpp:357
+#: ../src/html/helpfrm.cpp:359
 msgid "&About..."
-msgstr ""
+msgstr "关于(&A)"
 
-#: ../src/msw/mdi.cpp:190
+#: ../src/common/stockitem.cpp:153
+msgid "&Actual Size"
+msgstr "实际大小(&A)"
+
+#: ../src/common/stockitem.cpp:108
+msgid "&Apply"
+msgstr "应用(&A)"
+
+#: ../src/msw/mdi.cpp:187
 msgid "&Arrange Icons"
-msgstr ""
+msgstr "重排图标(&A)"
 
-#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:403
-#, fuzzy
+#: ../src/common/stockitem.cpp:118
+msgid "&Back"
+msgstr "返回(&B)"
+
+#: ../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:422
 msgid "&Cancel"
-msgstr "È¡Ïû"
+msgstr "取消(&C)"
 
-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:183
 msgid "&Cascade"
-msgstr ""
+msgstr "层叠(&C)"
 
-#: ../src/common/prntbase.cpp:441 ../src/generic/logg.cpp:506
-#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
+#: ../src/common/stockitem.cpp:111
+msgid "&Clear"
+msgstr "清除(&C)"
+
+#: ../src/common/prntbase.cpp:875
+#: ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:509
+#: ../src/html/helpfrm.cpp:354
 msgid "&Close"
-msgstr "¹Ø±Õ[&C]"
+msgstr "关闭(&C)"
 
-#: ../src/msw/textctrl.cpp:2035
+#: ../src/common/stockitem.cpp:113
+#: ../src/mac/carbon/textctrl.cpp:1074
+#: ../src/msw/textctrl.cpp:2064
 msgid "&Copy"
-msgstr ""
+msgstr "复制(&C)"
 
-#: ../src/msw/textctrl.cpp:2037
-#, fuzzy
+#: ../src/generic/dbgrptg.cpp:320
+msgid "&Debug report preview:"
+msgstr "调试报告预览(&D): "
+
+#: ../src/common/stockitem.cpp:115
+#: ../src/mac/carbon/textctrl.cpp:1076
+#: ../src/msw/textctrl.cpp:2066
 msgid "&Delete"
-msgstr "µç´«´ò×Ö»ú"
+msgstr "删除(&D)"
 
-#: ../src/generic/logg.cpp:708
+#: ../src/generic/logg.cpp:717
 msgid "&Details"
-msgstr "ϸ½Ú[&D]"
+msgstr "细节(&D)"
 
-#: ../src/html/helpfrm.cpp:276
-#, fuzzy
+#: ../src/common/stockitem.cpp:119
+msgid "&Down"
+msgstr "向下(&D)"
+
+#: ../src/html/helpfrm.cpp:361
 msgid "&File"
-msgstr "´óС"
+msgstr "文件(&F)"
 
-#: ../src/generic/fdrepdlg.cpp:162
-#, fuzzy
+#: ../src/common/stockitem.cpp:116
 msgid "&Find"
-msgstr "²éÕÒ"
+msgstr "查找(&F)"
 
-#: ../src/generic/wizard.cpp:584
+#: ../src/generic/wizard.cpp:634
 msgid "&Finish"
-msgstr "Íê³É[&F]"
+msgstr "完成(&F)"
+
+#: ../src/generic/fontdlgg.cpp:273
+msgid "&Font family:"
+msgstr "字体(&F):"
 
-#: ../src/common/prntbase.cpp:476
+#: ../src/common/stockitem.cpp:120
+msgid "&Forward"
+msgstr "向前(&F)"
+
+#: ../src/common/prntbase.cpp:910
 msgid "&Goto..."
-msgstr ""
+msgstr "跳转(&G)..."
 
-#: ../src/generic/wizard.cpp:406 ../src/html/helpfrm.cpp:277
-#, fuzzy
+#: ../src/common/stockitem.cpp:122
+#: ../src/generic/wizard.cpp:418
+#: ../src/generic/wizard.cpp:425
+#: ../src/html/helpfrm.cpp:362
 msgid "&Help"
-msgstr "°ïÖú"
+msgstr "帮助(&H)"
 
-#: ../src/generic/logg.cpp:507
+#: ../src/common/stockitem.cpp:123
+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:510
 msgid "&Log"
-msgstr "ÈÕÖ¾[&L]"
+msgstr "日志(&L)"
 
-#: ../src/univ/themes/win32.cpp:4672
+#: ../src/univ/themes/win32.cpp:4923
 msgid "&Move"
-msgstr ""
+msgstr "移动(&M)"
 
-#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
-#, fuzzy
+#: ../src/common/stockitem.cpp:131
+msgid "&New"
+msgstr "新建(&N)"
+
+#: ../src/generic/mdig.cpp:118
+#: ../src/msw/mdi.cpp:188
 msgid "&Next"
-msgstr "ÏÂÒ»¸ö[&N] >"
+msgstr "下一个(&N)"
 
-#: ../src/generic/wizard.cpp:402 ../src/generic/wizard.cpp:586
+#: ../src/generic/wizard.cpp:421
+#: ../src/generic/wizard.cpp:636
 msgid "&Next >"
-msgstr "ÏÂÒ»¸ö[&N] >"
+msgstr "下一个(&N) >"
 
-#: ../src/generic/tipdlg.cpp:218
+#: ../src/generic/tipdlg.cpp:243
 msgid "&Next Tip"
-msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
+msgstr "下一技巧(&N)"
 
-#: ../src/html/helpfrm.cpp:269
-#, fuzzy
+#: ../src/common/stockitem.cpp:132
+msgid "&No"
+msgstr "否(&N)"
+
+#: ../src/generic/dbgrptg.cpp:342
+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 "±£´æ[&S]..."
+msgstr "打开(&O)..."
 
-#: ../src/msw/textctrl.cpp:2036
-#, fuzzy
+#: ../src/common/stockitem.cpp:135
+#: ../src/mac/carbon/textctrl.cpp:1075
+#: ../src/msw/textctrl.cpp:2065
 msgid "&Paste"
-msgstr "ÈÕÆÚ"
+msgstr "粘贴(&P)"
 
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
-#, fuzzy
+#: ../src/generic/fontdlgg.cpp:324
+msgid "&Point size:"
+msgstr "字体大小(Point size)(&P):"
+
+#: ../src/common/stockitem.cpp:136
+msgid "&Preferences"
+msgstr "偏好设置(&P)"
+
+#: ../src/generic/mdig.cpp:119
+#: ../src/msw/mdi.cpp:189
 msgid "&Previous"
-msgstr "ǰҳ"
+msgstr "前页(&P)"
 
-#: ../src/common/prntbase.cpp:446
-#, fuzzy
+#: ../src/common/stockitem.cpp:137
+msgid "&Print"
+msgstr "打印(&P)"
+
+#: ../src/common/prntbase.cpp:880
 msgid "&Print..."
-msgstr "´òÓ¡..."
+msgstr "打印(&P)..."
+
+#: ../src/common/stockitem.cpp:139
+msgid "&Properties"
+msgstr "属性(&P)"
+
+#: ../src/common/stockitem.cpp:140
+msgid "&Quit"
+msgstr "退出(&Q)"
 
-#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
-#: ../src/msw/textctrl.cpp:2032
+#: ../src/common/cmdproc.cpp:292
+#: ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141
+#: ../src/mac/carbon/textctrl.cpp:1071
+#: ../src/msw/textctrl.cpp:2061
 msgid "&Redo"
-msgstr "Öظ´[&R]"
+msgstr "重复(&R)"
 
-#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:288
+#: ../src/common/cmdproc.cpp:308
 msgid "&Redo "
-msgstr "Öظ´[&R]"
+msgstr "重复(&R) "
 
-#: ../src/generic/fdrepdlg.cpp:168
+#: ../src/generic/fdrepdlg.cpp:185
 msgid "&Replace"
-msgstr ""
+msgstr "替换(&R)"
 
-#: ../src/univ/themes/win32.cpp:4671
-#, fuzzy
+#: ../src/univ/themes/win32.cpp:4922
 msgid "&Restore"
-msgstr "Öظ´[&R]"
+msgstr "复原(&R)"
 
-#: ../src/generic/logg.cpp:502 ../src/generic/logg.cpp:829
+#: ../src/common/stockitem.cpp:145
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: ../src/generic/logg.cpp:505
 msgid "&Save..."
-msgstr "±£´æ[&S]..."
+msgstr "保存(&S)..."
 
-#: ../src/generic/tipdlg.cpp:215
+#: ../src/generic/tipdlg.cpp:238
 msgid "&Show tips at startup"
-msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
+msgstr "启动时显示技巧(&S)"
 
-#: ../src/univ/themes/win32.cpp:4674
-#, fuzzy
+#: ../src/univ/themes/win32.cpp:4925
 msgid "&Size"
-msgstr "´óС"
+msgstr "大小(&S)"
 
-#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2031
+#: ../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/mac/carbon/textctrl.cpp:1070
+#: ../src/msw/textctrl.cpp:2060
 msgid "&Undo"
-msgstr "»Ö¸´[&U]"
+msgstr "恢复(&U)"
 
-#: ../src/common/cmdproc.cpp:257
+#: ../src/common/cmdproc.cpp:264
 msgid "&Undo "
-msgstr "»Ö¸´[&U]"
-
-#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
-#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1333 ../src/msw/mdi.cpp:1340
-#: ../src/msw/mdi.cpp:1370
+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:298
+#: ../src/generic/mdig.cpp:314
+#: ../src/generic/mdig.cpp:318
+#: ../src/msw/mdi.cpp:1410
+#: ../src/msw/mdi.cpp:1417
+#: ../src/msw/mdi.cpp:1447
 msgid "&Window"
-msgstr "´°¿Ú[&W]"
+msgstr "窗口(&W)"
 
-#: ../src/common/config.cpp:410 ../src/msw/regconf.cpp:263
+#: ../src/common/stockitem.cpp:152
+msgid "&Yes"
+msgstr "是(&Y)"
+
+#: ../src/common/config.cpp:433
+#: ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
-msgstr "'%s' ÓжîÍâµÄ '..', ºöÂÔÖ®."
+msgstr "'%s' 有额外的 '..', 忽略之."
 
-#: ../src/common/valtext.cpp:136 ../src/common/valtext.cpp:166
-#: ../src/common/valtext.cpp:172
+#: ../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:743
+#: ../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:1146
+#: ../src/common/intl.cpp:1147
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."
+msgstr "'%s' 不是有效的消息目录."
 
-#: ../src/common/textbuf.cpp:245
-#, fuzzy, c-format
+#: ../src/common/textbuf.cpp:246
+#, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' »òÐíÊÇÒ»¸ö¶þ½øÖÆÎļþ."
+msgstr "'%s' 或许是一个二进制文件."
 
-#: ../src/common/valtext.cpp:161
+#: ../src/common/valtext.cpp:157
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' Ó¦¸ÃÊÇÒ»¸öÊýÖµ."
+msgstr "'%s' 应该是一个数值."
 
-#: ../src/common/valtext.cpp:143
+#: ../src/common/valtext.cpp:139
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' Ó¦¸Ã½ö°üº¬ASCII×Ö·û."
+msgstr "'%s' 应该仅包含ASCII字符."
 
-#: ../src/common/valtext.cpp:149
+#: ../src/common/valtext.cpp:145
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' Ó¦½ö°üº¬×Öĸ×Ö·û."
+msgstr "'%s' 应仅包含字母字符."
 
-#: ../src/common/valtext.cpp:155
+#: ../src/common/valtext.cpp:151
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
+msgstr "'%s' 应仅包含字母或数字字符."
 
-#: ../src/html/helpfrm.cpp:812
+#: ../src/html/helpfrm.cpp:976
 msgid "(Help)"
-msgstr "(°ïÖú)"
+msgstr "(帮助)"
 
-#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:944
-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpfrm.cpp:431
+#: ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:1764
 msgid "(bookmarks)"
-msgstr "(ÊéÇ©)"
+msgstr "(书签)"
+
+#: ../src/common/debugrpt.cpp:559
+msgid "*** A debug report has been generated\n"
+msgstr "*** 生成了一份调试报告\n"
+
+#: ../src/common/debugrpt.cpp:562
+msgid "*** And includes the following files:\n"
+msgstr "*** 且包含以下文件:\n"
+
+#: ../src/common/debugrpt.cpp:560
+#, 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:679 ../src/generic/filedlgg.cpp:732
+#: ../src/generic/dirctrlg.cpp:683
+#: ../src/generic/filedlgg.cpp:740
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filedlgg.cpp:733
+#: ../src/generic/dirctrlg.cpp:684
+#: ../src/generic/filedlgg.cpp:741
 msgid ".."
 msgstr ".."
 
-#: ../src/html/chm.cpp:561
-msgid "/#SYSTEM"
-msgstr ""
+#: ../src/common/paper.cpp:147
+msgid "10 x 11 in"
+msgstr "10 x 11 英寸"
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:120
 msgid "10 x 14 in"
-msgstr "10 x 14 Ó¢´ç"
+msgstr "10 x 14 英寸"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:121
 msgid "11 x 17 in"
-msgstr "11 x 17 Ó¢´ç"
+msgstr "11 x 17 英寸"
 
-#: ../src/common/paper.cpp:151
+#: ../src/common/paper.cpp:191
+msgid "12 x 11 in"
+msgstr "12 x 11 英寸"
+
+#: ../src/common/paper.cpp:148
+msgid "15 x 11 in"
+msgstr "15 x 11 英寸"
+
+#: ../src/common/paper.cpp:139
 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/common/paper.cpp:146
+msgid "9 x 11 in"
+msgstr "9 x 11 英寸"
 
-#: ../src/html/htmprint.cpp:291
+#: ../src/html/htmprint.cpp:309
 msgid ": file does not exist!"
-msgstr ": Îļþ²»´æÔÚ!"
+msgstr ": 文件不存在!"
 
-#: ../src/common/fontmap.cpp:185
+#: ../src/common/fontmap.cpp:200
 msgid ": unknown charset"
-msgstr ": δ֪×Ö·û¼¯"
+msgstr ": 未知字符集"
 
-#: ../src/common/fontmap.cpp:394
+#: ../src/common/fontmap.cpp:414
 msgid ": unknown encoding"
-msgstr ": δ֪±àÂë"
+msgstr ": 未知编码"
 
-#: ../src/generic/wizard.cpp:407
+#: ../src/generic/wizard.cpp:427
 msgid "< &Back"
-msgstr "< ·µ»Ø[&B]"
+msgstr "< 返回(&B)"
 
-#: ../src/common/prntbase.cpp:458
+#: ../src/common/prntbase.cpp:892
 msgid "<<"
-msgstr ""
+msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:251 ../src/generic/filedlgg.cpp:274
+#: ../src/generic/filedlgg.cpp:259
+#: ../src/generic/filedlgg.cpp:282
 msgid "<DIR>"
-msgstr "<Ŀ¼>"
+msgstr "<目录>"
 
-#: ../src/generic/filedlgg.cpp:255 ../src/generic/filedlgg.cpp:278
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:263
+#: ../src/generic/filedlgg.cpp:286
 msgid "<DRIVE>"
-msgstr "<Ŀ¼>"
+msgstr "<盘符>"
 
-#: ../src/generic/filedlgg.cpp:253 ../src/generic/filedlgg.cpp:276
+#: ../src/generic/filedlgg.cpp:261
+#: ../src/generic/filedlgg.cpp:284
 msgid "<LINK>"
-msgstr "<Á¬½Ó>"
+msgstr "<连接>"
 
-#: ../src/html/helpfrm.cpp:1107
+#: ../src/html/helpfrm.cpp:1276
 msgid "<b><i>Bold italic face.</i></b><br>"
-msgstr ""
+msgstr "<b><i>粗斜体.</i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1111
+#: ../src/html/helpfrm.cpp:1280
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
-msgstr ""
+msgstr "<b><i>粗斜体 <u>加下划线</u></i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1106
+#: ../src/html/helpfrm.cpp:1275
 msgid "<b>Bold face.</b> "
-msgstr ""
+msgstr "<b>粗体.</b> "
 
-#: ../src/html/helpfrm.cpp:1105
+#: ../src/html/helpfrm.cpp:1274
 msgid "<i>Italic face.</i> "
-msgstr ""
+msgstr "<i>斜体.</i> "
 
-#: ../src/common/prntbase.cpp:464
+#: ../src/common/prntbase.cpp:898
 msgid ">>"
-msgstr ""
+msgstr ">>"
 
-#: ../src/common/prntbase.cpp:470
+#: ../src/common/prntbase.cpp:904
 msgid ">>|"
-msgstr ""
+msgstr ">>|"
+
+#: ../src/generic/dbgrptg.cpp:304
+msgid "A debug report has been generated in the directory\n"
+msgstr "产生了一份调试报告, 位于目录\n"
 
 #: ../src/common/xtixml.cpp:409
+#, fuzzy
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr ""
+msgstr "非空集合必须包含元素('element')节点"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:166
+msgid "A2 420 x 594 mm"
+msgstr "A2 纸张, 420 x 594 毫米"
+
+#: ../src/common/paper.cpp:163
+msgid "A3 Extra 322 x 445 mm"
+msgstr "特大 A3 纸张, 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:168
+msgid "A3 Extra Transverse 322 x 445 mm"
+msgstr "特大 A3 纸张(横排), 322 x 445 毫米"
+
+#: ../src/common/paper.cpp:177
+msgid "A3 Rotated 420 x 297 mm"
+msgstr "横向 A3 纸张, 420 x 297 毫米"
+
+#: ../src/common/paper.cpp:167
+msgid "A3 Transverse 297 x 420 mm"
+msgstr "A3 纸张(横排), 297 x 420 毫米"
+
+#: ../src/common/paper.cpp:113
 msgid "A3 sheet, 297 x 420 mm"
-msgstr "A3 Ö½ÕÅ, 297 x 420 ºÁÃ×"
+msgstr "A3 纸张, 297 x 420 毫米"
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:153
+msgid "A4 Extra 9.27 x 12.69 in"
+msgstr "特大 A4 纸张, 9.27 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:160
+msgid "A4 Plus 210 x 330 mm"
+msgstr "加大 A4 纸张, 210 x 330 毫米"
+
+#: ../src/common/paper.cpp:178
+msgid "A4 Rotated 297 x 210 mm"
+msgstr "横向 A4 纸张, 297 x 210 毫米"
+
+#: ../src/common/paper.cpp:155
+msgid "A4 Transverse 210 x 297 mm"
+msgstr "A4 纸张(横排), 210 x 297 毫米"
+
+#: ../src/common/paper.cpp:104
 msgid "A4 sheet, 210 x 297 mm"
-msgstr "A4 Ö½ÕÅ, 210 x 297 ºÁÃ×"
+msgstr "A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:114
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 СֽÕÅ, 210 x 297 ºÁÃ×"
+msgstr "小 A4 纸张, 210 x 297 毫米"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:164
+msgid "A5 Extra 174 x 235 mm"
+msgstr "特大 A5 纸张, 174 x 235 毫米"
+
+#: ../src/common/paper.cpp:179
+msgid "A5 Rotated 210 x 148 mm"
+msgstr "横向 A5 纸张, 210 x 148 毫米"
+
+#: ../src/common/paper.cpp:161
+msgid "A5 Transverse 148 x 210 mm"
+msgstr "A5 纸张(横排), 148 x 210 毫米"
+
+#: ../src/common/paper.cpp:115
 msgid "A5 sheet, 148 x 210 mm"
-msgstr "A5 Ö½ÕÅ, 148 x 210 ºÁÃ×"
+msgstr "A5 纸张, 148 x 210 毫米"
+
+#: ../src/common/paper.cpp:171
+msgid "A6 105 x 148 mm"
+msgstr "A6 纸张, 105 x 148 毫米"
 
-#: ../src/generic/fontdlgg.cpp:84
+#: ../src/common/paper.cpp:184
+msgid "A6 Rotated 148 x 105 mm"
+msgstr "横向 A5 纸张, 148 x 105 毫米"
+
+#: ../src/generic/fontdlgg.cpp:87
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
-#: ../src/html/helpfrm.cpp:358
+#: ../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:299
 msgid "Add to custom colours"
-msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ"
+msgstr "加到自定义颜色中"
 
-#: ../include/wx/xti.h:899
+#: ../include/wx/xti.h:902
 msgid "AddToPropertyCollection called on a generic accessor"
-msgstr ""
+msgstr "在一个通用处理器上调用AddToPropertyCollection"
 
-#: ../include/wx/xti.h:847
+#: ../include/wx/xti.h:849
 msgid "AddToPropertyCollection called w/o valid adder"
-msgstr ""
+msgstr "调用AddToPropertyCollection时未带有效的adder"
 
 #: ../src/html/helpctrl.cpp:106
 #, c-format
 msgid "Adding book %s"
-msgstr "ÕýÔÚÌí¼Ó¾í %s"
+msgstr "正在添加卷 %s"
 
-#: ../src/generic/prntdlgg.cpp:157
+#: ../src/common/stockitem.cpp:129
+msgid "Align Left"
+msgstr "左对齐"
+
+#: ../src/common/stockitem.cpp:130
+msgid "Align Right"
+msgstr "右对齐"
+
+#: ../src/generic/prntdlgg.cpp:209
 msgid "All"
-msgstr "ËùÓÐ"
+msgstr "所有"
 
-#: ../src/common/fldlgcmn.cpp:57
-#, fuzzy, c-format
+#: ../src/common/fldlgcmn.cpp:64
+#, c-format
 msgid "All files (%s)|%s"
-msgstr "ËùÓÐÎļþ (*)|*"
+msgstr "所有文件 (%s)|%s"
 
-#: ../include/wx/defs.h:1975
+#: ../include/wx/defs.h:2302
 msgid "All files (*)|*"
-msgstr "ËùÓÐÎļþ (*)|*"
+msgstr "所有文件 (*)|*"
 
-#: ../src/html/helpfrm.cpp:1412
-#, fuzzy
+#: ../src/html/helpfrm.cpp:1578
 msgid "All files (*.*)|*"
-msgstr "ËùÓÐÎļþ (*)|*"
+msgstr "所有文件 (*)|*"
 
-#: ../include/wx/defs.h:1972
-#, fuzzy
+#: ../include/wx/defs.h:2299
 msgid "All files (*.*)|*.*"
-msgstr "ËùÓÐÎļþ (*)|*"
+msgstr "所有文件 (*)|*"
 
 #: ../src/common/xtistrm.cpp:385
 msgid "Already Registered Object passed to SetObjectClassInfo"
-msgstr ""
+msgstr "传递已注册对象(Registered Object)给SetObjectClassInfo"
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
-msgstr "ÒѾ­²¦½ÓISP."
+msgstr "已经拨接ISP."
 
-#: ../src/generic/logg.cpp:1116
+#: ../src/generic/logg.cpp:1163
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
+msgstr "把日志添加到文件 '%s' (选择 [否] 将覆写该文件)?"
 
-#: ../src/common/fmapbase.cpp:108
+#: ../src/common/fmapbase.cpp:109
 msgid "Arabic (ISO-8859-6)"
-msgstr "°¢À­²®Óï (ISO-8859-6)"
+msgstr "阿拉伯语 (ISO-8859-6)"
 
-#: ../src/generic/filedlgg.cpp:432
+#: ../src/html/chm.cpp:564
+msgid "Archive doesnt contain #SYSTEM file"
+msgstr "存档里没有包含 #SYSTEM 文件"
+
+#: ../src/generic/filedlgg.cpp:440
 msgid "Attributes"
-msgstr ""
+msgstr "属性(Attributes)"
 
-#: ../src/common/paper.cpp:146
+#: ../src/common/paper.cpp:144
+msgid "B4 (ISO) 250 x 353 mm"
+msgstr "B4 纸张(ISO), 250 x 353 毫米"
+
+#: ../src/common/paper.cpp:180
+msgid "B4 (JIS) Rotated 364 x 257 mm"
+msgstr "横向 B4 纸张(JIS), 364 x 257 毫米"
+
+#: ../src/common/paper.cpp:134
 msgid "B4 Envelope, 250 x 353 mm"
-msgstr "B4 ÐÅ·â, 250 x 353 ºÁÃ×"
+msgstr "B4 信封, 250 x 353 毫米"
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:116
 msgid "B4 sheet, 250 x 354 mm"
-msgstr "B4 ÐÅ·â, 250 x 354 ºÁÃ×"
+msgstr "B4 纸张, 250 x 354 毫米"
 
-#: ../src/common/paper.cpp:147
+#: ../src/common/paper.cpp:165
+msgid "B5 (ISO) Extra 201 x 276 mm"
+msgstr "特大 B4 纸张(JIS), 201 x 276 毫米"
+
+#: ../src/common/paper.cpp:181
+msgid "B5 (JIS) Rotated 257 x 182 mm"
+msgstr "横向 B5 纸张(JIS), 257 x 182 毫米"
+
+#: ../src/common/paper.cpp:162
+msgid "B5 (JIS) Transverse 182 x 257 mm"
+msgstr "B5 纸张 (JIS, 横排), 182 x 257 毫米"
+
+#: ../src/common/paper.cpp:135
 msgid "B5 Envelope, 176 x 250 mm"
-msgstr "B5 ÐÅ·â, 176 x 250 ºÁÃ×"
+msgstr "B5 信封, 176 x 250 毫米"
 
-#: ../src/common/paper.cpp:129
+#: ../src/common/paper.cpp:117
 msgid "B5 sheet, 182 x 257 millimeter"
-msgstr "B5 ÐÅ·â, 182 x 257 ºÁÃ×"
+msgstr "B5 纸张, 182 x 257 毫米"
 
-#: ../src/common/paper.cpp:148
+#: ../src/common/paper.cpp:189
+msgid "B6 (JIS) 128 x 182 mm"
+msgstr "B6 纸张(JIS), 128 x 182 毫米"
+
+#: ../src/common/paper.cpp:190
+msgid "B6 (JIS) Rotated 182 x 128 mm"
+msgstr "横向 B6 纸张(JIS), 182 x 128 毫米"
+
+#: ../src/common/paper.cpp:136
 msgid "B6 Envelope, 176 x 125 mm"
-msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
+msgstr "B6 信封, 176 x 125 毫米"
 
-#: ../src/common/imagbmp.cpp:476 ../src/common/imagbmp.cpp:492
-#, fuzzy
+#: ../src/common/imagbmp.cpp:477
+#: ../src/common/imagbmp.cpp:493
 msgid "BMP: Couldn't allocate memory."
-msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
+msgstr "BMP: 不能分配内存."
 
 #: ../src/common/imagbmp.cpp:94
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: ²»Äܱ£´æÎÞЧͼÏñ."
+msgstr "BMP: 不能保存无效图像."
 
 #: ../src/common/imagbmp.cpp:298
-#, fuzzy
 msgid "BMP: Couldn't write RGB color map."
-msgstr "BMP: ²»ÄÜдÊý¾Ý."
+msgstr "BMP: 不能写RGB色彩表."
 
-#: ../src/common/imagbmp.cpp:430
+#: ../src/common/imagbmp.cpp:431
 msgid "BMP: Couldn't write data."
-msgstr "BMP: ²»ÄÜдÊý¾Ý."
+msgstr "BMP: 不能写数据."
 
 #: ../src/common/imagbmp.cpp:203
-#, fuzzy
 msgid "BMP: Couldn't write the file (Bitmap) header."
-msgstr "BMP: ²»ÄÜдÎļþÍ·."
+msgstr "BMP: 不能写文件头(Bitmap)."
 
 #: ../src/common/imagbmp.cpp:224
-#, fuzzy
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
-msgstr "BMP: ²»ÄÜдÎļþÍ·."
+msgstr "BMP: 不能写文件头(BitmapInfo)."
 
 #: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
-msgstr ""
+msgstr "BMP: wxImage没有自己的wxPalette."
 
-#: ../src/common/dlgcmn.cpp:227
-msgid "Backward"
-msgstr "Ïòºó"
-
-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:116
 msgid "Baltic (ISO-8859-13)"
-msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
+msgstr "波罗的海语 (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:107
 msgid "Baltic (old) (ISO-8859-4)"
-msgstr "²¨Â޵ĺ£Óï (¾ÉµÄ) (ISO-8859-4)"
+msgstr "波罗的海语 (旧的) (ISO-8859-4)"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../contrib/src/deprecated/resource.cpp:2524
+#, c-format
+msgid "Bitmap resource specification %s not found."
+msgstr "找不到位图规格 %s."
+
+#: ../src/generic/fontdlgg.cpp:237
 msgid "Bold"
-msgstr "´ÖÌå"
+msgstr "粗体"
 
-#: ../src/generic/prntdlgg.cpp:663
+#: ../src/generic/prntdlgg.cpp:892
 msgid "Bottom margin (mm):"
-msgstr "µ×±ß¾à (ºÁÃ×):"
+msgstr "底边距 (毫米):"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:105
 msgid "C sheet, 17 x 22 in"
-msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
+msgstr "C 纸张, 17 x 22 英寸"
 
-#: ../src/generic/logg.cpp:504
+#: ../src/generic/logg.cpp:507
 msgid "C&lear"
-msgstr "Çå³ý[&L]"
+msgstr "清除(&L)"
 
-#: ../src/common/paper.cpp:142
+#: ../src/generic/fontdlgg.cpp:308
+msgid "C&olour:"
+msgstr "颜色(&o):"
+
+#: ../src/common/paper.cpp:130
 msgid "C3 Envelope, 324 x 458 mm"
-msgstr "C3 ÐÅ·â, 324 x 458 ºÁÃ×"
+msgstr "C3 信封, 324 x 458 毫米"
 
-#: ../src/common/paper.cpp:143
+#: ../src/common/paper.cpp:131
 msgid "C4 Envelope, 229 x 324 mm"
-msgstr "C4 ÐÅ·â, 229 x 324 ºÁÃ×"
+msgstr "C4 信封, 229 x 324 毫米"
 
-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:129
 msgid "C5 Envelope, 162 x 229 mm"
-msgstr "C5 ÐÅ·â, 162 x 229 ºÁÃ×"
+msgstr "C5 信封, 162 x 229 毫米"
 
-#: ../src/common/paper.cpp:144
+#: ../src/common/paper.cpp:132
 msgid "C6 Envelope, 114 x 162 mm"
-msgstr "C6 ÐÅ·â, 114 x 162 ºÁÃ×"
+msgstr "C6 信封, 114 x 162 毫米"
 
-#: ../src/common/paper.cpp:145
+#: ../src/common/paper.cpp:133
 msgid "C65 Envelope, 114 x 229 mm"
-msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×"
+msgstr "C65 信封, 114 x 229 毫米"
 
-#: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
+#: ../src/html/chm.cpp:797
+#: ../src/html/chm.cpp:856
 msgid "CHM handler currently supports only local files!"
-msgstr ""
+msgstr "CHM处理程序目前只支持本地文件!"
 
-#: ../src/os2/thread.cpp:121
-#, fuzzy
+#: ../src/os2/thread.cpp:117
 msgid "Can not create mutex."
-msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
+msgstr "不能创建互斥对象."
 
-#: ../src/common/filefn.cpp:1469
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1297
+#, c-format
 msgid "Can not enumerate files '%s'"
-msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+msgstr "不能枚举文件 '%s'"
 
-#: ../src/msw/dir.cpp:205 ../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/os2/thread.cpp:523
-#, fuzzy, c-format
+#: ../src/os2/thread.cpp:519
+#, c-format
 msgid "Can not resume thread %lu"
-msgstr "²»Äָܻ´Ïß³Ì %x"
+msgstr "不能恢复线程 %lu"
 
-#: ../src/msw/thread.cpp:830
+#: ../src/mac/classic/thread.cpp:491
+#: ../src/msw/thread.cpp:827
 #, c-format
 msgid "Can not resume thread %x"
-msgstr "²»Äָܻ´Ïß³Ì %x"
+msgstr "不能恢复线程 %x"
 
 #: ../src/msw/thread.cpp:498
 msgid "Can not start thread: error writing TLS."
-msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
+msgstr "不能启动线程: 写TLS出错."
 
-#: ../src/os2/thread.cpp:510
-#, fuzzy, c-format
+#: ../src/os2/thread.cpp:505
+#, c-format
 msgid "Can not suspend thread %lu"
-msgstr "²»ÄܹÒÆðÏß³Ì %x"
+msgstr "不能挂起线程 %lu"
 
-#: ../src/msw/thread.cpp:815
+#: ../src/mac/classic/thread.cpp:464
+#: ../src/msw/thread.cpp:812
 #, c-format
 msgid "Can not suspend thread %x"
-msgstr "²»ÄܹÒÆðÏß³Ì %x"
+msgstr "不能挂起线程 %x"
 
-#: ../src/msw/thread.cpp:728
+#: ../src/msw/thread.cpp:725
 msgid "Can not wait for thread termination"
-msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
+msgstr "不能等候线程终止"
 
-#: ../src/common/cmdproc.cpp:259
+#: ../src/common/cmdproc.cpp:266
 msgid "Can't &Undo "
-msgstr "²»Äָܻ´[&U]"
+msgstr "不能恢复(&U)"
 
-#: ../src/common/image.cpp:1441
+#: ../src/common/image.cpp:1939
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."
+msgstr "不能检查文件格式 '%s': 文件不存在."
 
-#: ../src/msw/registry.cpp:438
+#: ../src/msw/registry.cpp:442
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "²»ÄܹرÕ×¢²á¼ü '%s'"
+msgstr "不能关闭注册键 '%s'"
 
-#: ../src/msw/registry.cpp:510
+#: ../src/msw/registry.cpp:518
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
+msgstr "不能复制不支持的类型 %d 的值."
 
-#: ../src/msw/registry.cpp:419
+#: ../src/msw/registry.cpp:423
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "²»ÄÜ´´½¨×¢²á¼ü '%s'"
+msgstr "不能创建注册键 '%s'"
 
-#: ../src/msw/thread.cpp:593 ../src/os2/thread.cpp:491
+#: ../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:486
 msgid "Can't create thread"
-msgstr "²»ÄÜ´´½¨½ø³Ì"
+msgstr "不能创建进程"
 
-#: ../src/msw/window.cpp:3155
-#, fuzzy, c-format
+#: ../src/msw/window.cpp:3130
+#, c-format
 msgid "Can't create window of class %s"
-msgstr "²»ÄÜ´´½¨Îļþ '%s'"
+msgstr "不能创建类 '%s' 的窗口"
 
-#: ../src/msw/registry.cpp:680
+#: ../src/msw/registry.cpp:694
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "²»ÄÜɾ³ý¼ü '%s'"
+msgstr "不能删除键 '%s'"
 
-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
+#: ../src/msw/iniconf.cpp:444
+#: ../src/os2/iniconf.cpp:458
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
+msgstr "不能删除 INI 文件 '%s'"
 
-#: ../src/msw/registry.cpp:707
+#: ../src/msw/registry.cpp:722
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "²»ÄÜɾ³ý¼üÖµ '%s'/ '%s'"
+msgstr "不能删除键值 '%s'/ '%s'"
 
-#: ../src/msw/registry.cpp:1001
+#: ../src/msw/registry.cpp:1071
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "²»ÄÜö¾Ù¼ü '%s'µÄ×Ó¼ü"
+msgstr "不能枚举键 '%s'的子键"
 
-#: ../src/msw/registry.cpp:956
+#: ../src/msw/registry.cpp:1026
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "²»ÄÜö¾Ù¼ü '%s'µÄÖµ"
+msgstr "不能枚举键 '%s'的值"
 
-#: ../src/common/ffile.cpp:215
+#: ../src/msw/registry.cpp:1288
+#, 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:355
+#: ../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
-#, fuzzy
 msgid "Can't initialize zlib deflate stream."
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化zlib deflate(压缩)流."
 
 #: ../src/common/zstream.cpp:99
-#, fuzzy
 msgid "Can't initialize zlib inflate stream."
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化zlib inflate(解压)流."
 
-#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1367
+#: ../src/common/image.cpp:1387
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
-msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
+msgstr "不能从文件 '%s'中装入图像: 文件不存在."
 
-#: ../src/msw/registry.cpp:385
+#: ../src/msw/registry.cpp:387
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "²»ÄÜ´ò¿ª×¢²á¼ü '%s'"
+msgstr "不能打开注册键 '%s'"
 
 #: ../src/common/zstream.cpp:166
-#, fuzzy, c-format
+#, c-format
 msgid "Can't read from inflate stream: %s"
-msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
+msgstr "不能从解压流 %s 中读"
 
 #: ../src/common/zstream.cpp:159
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr ""
+msgstr "不能读解压流: 流内有异常的EOF."
 
-#: ../src/msw/registry.cpp:890
+#: ../src/msw/registry.cpp:960
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "²»ÄܶÁ '%s'µÄÖµ"
+msgstr "不能读 '%s'的值"
 
-#: ../src/msw/registry.cpp:780 ../src/msw/registry.cpp:811
+#: ../src/msw/registry.cpp:795
+#: ../src/msw/registry.cpp:825
+#: ../src/msw/registry.cpp:885
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ"
+msgstr "不能读键 '%s'的值"
 
-#: ../src/common/image.cpp:1070
-#, fuzzy, c-format
+#: ../src/common/image.cpp:1409
+#, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
+msgstr "不能从将图像保存至文件 '%s'中: 无法识别的扩展名."
 
-#: ../src/generic/logg.cpp:566 ../src/generic/logg.cpp:992
+#: ../src/generic/logg.cpp:569
+#: ../src/generic/logg.cpp:1020
 msgid "Can't save log contents to file."
-msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
+msgstr "不能把日志内容保存到文件."
 
-#: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
+#: ../src/msw/thread.cpp:550
+#: ../src/os2/thread.cpp:469
 msgid "Can't set thread priority"
-msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
+msgstr "不能设置线程优先级"
 
-#: ../src/msw/registry.cpp:798 ../src/msw/registry.cpp:905
+#: ../src/msw/registry.cpp:812
+#: ../src/msw/registry.cpp:854
+#: ../src/msw/registry.cpp:975
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
+msgstr "不能设置 '%s'的值"
 
 #: ../src/common/zstream.cpp:316
-#, fuzzy, c-format
+#, c-format
 msgid "Can't write to deflate stream: %s"
-msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
-
-#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:996 ../src/generic/filedlgg.cpp:1015
-#: ../src/generic/fontdlgg.cpp:254 ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:149 ../src/html/helpfrm.cpp:1075
-#: ../src/motif/msgdlg.cpp:185
+msgstr "不能写到压缩流: %s"
+
+#: ../src/generic/choicdgg.cpp:291
+#: ../src/generic/dirdlgg.cpp:114
+#: ../src/generic/numdlgg.cpp:136
+#: ../src/generic/textdlgg.cpp:120
+#: ../src/gtk/fontdlg.cpp:155
+#: ../src/motif/msgdlg.cpp:204
+#: ../contrib/src/deprecated/proplist.cpp:518
 msgid "Cancel"
-msgstr "È¡Ïû"
+msgstr "取消"
 
-#: ../contrib/src/xrc/xmlres.cpp:1012 ../contrib/src/xrc/xmlres.cpp:1053
+#: ../src/xrc/xmlres.cpp:1188
+#: ../src/xrc/xmlres.cpp:1236
 msgid "Cannot convert dialog units: dialog unknown."
-msgstr ""
+msgstr "不能转换对话框单元: 未知的对话框."
 
-#: ../src/common/strconv.cpp:1686
-#, fuzzy, c-format
+#: ../src/common/strconv.cpp:2665
+#, c-format
 msgid "Cannot convert from the charset '%s'!"
-msgstr "λÖñàÂë (%d)"
+msgstr "不能从字符集 '%s' 转换!"
 
-#: ../src/msw/dialup.cpp:510
+#: ../src/msw/dialup.cpp:546
 #, c-format
 msgid "Cannot find active dialup connection: %s"
-msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
+msgstr "找不到活动的拨号连接: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:262
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:330
+#, c-format
 msgid "Cannot find container for unknown control '%s'."
-msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
+msgstr "找不到可以对应于未知控件 '%s' 的容器."
 
-#: ../contrib/src/xrc/xmlres.cpp:1067
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:1271
+#, c-format
 msgid "Cannot find font node '%s'."
-msgstr "²»ÄÜ´ò¿ª URL '%s'"
+msgstr "找不到字体节点 '%s'."
 
-#: ../src/msw/dialup.cpp:815
+#: ../src/msw/dialup.cpp:851
 msgid "Cannot find the location of address book file"
-msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
+msgstr "找不到地址簿文件的位置"
 
-#: ../src/unix/threadpsx.cpp:1099
+#: ../src/unix/threadpsx.cpp:1100
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
+msgstr "不能获得调度策略 %d 的优先级范围."
 
-#: ../src/unix/utilsunx.cpp:727
+#: ../src/unix/utilsunx.cpp:775
 msgid "Cannot get the hostname"
-msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
+msgstr "不能获得主机名"
 
-#: ../src/unix/utilsunx.cpp:763
+#: ../src/unix/utilsunx.cpp:811
 msgid "Cannot get the official hostname"
-msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
+msgstr "不能获得正式的主机名"
 
-#: ../src/msw/dialup.cpp:909
+#: ../src/msw/dialup.cpp:945
 msgid "Cannot hang up - no active dialup connection."
-msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
+msgstr "不能挂断 - 没有活动的拨号连接."
 
-#: ../src/msw/app.cpp:307 ../src/msw/app.cpp:310
+#: ../include/wx/msw/ole/oleutils.h:47
 msgid "Cannot initialize OLE"
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化 OLE"
 
-#: ../src/mgl/app.cpp:292
-#, fuzzy
+#: ../src/mgl/app.cpp:286
 msgid "Cannot initialize SciTech MGL!"
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化 SciTech MGL!"
 
 #: ../src/mgl/window.cpp:546
-#, fuzzy
 msgid "Cannot initialize display."
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化显示."
 
 #: ../src/msw/volume.cpp:601
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+msgstr "不能从 '%s'中读取图标."
 
-#: ../contrib/src/xrc/xmlres.cpp:382
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:453
+#, 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:613
+#: ../src/html/helpdata.cpp:672
 #, c-format
 msgid "Cannot open HTML help book: %s"
-msgstr "²»ÄÜ´ò¿ª HTML °ïÖú: %s"
+msgstr "不能打开 HTML 帮助: %s"
 
-#: ../src/generic/helpext.cpp:122
+#: ../src/generic/helpext.cpp:123
 #, c-format
 msgid "Cannot open URL '%s'"
-msgstr "²»ÄÜ´ò¿ª URL '%s'"
+msgstr "不能打开 URL '%s'"
 
-#: ../src/html/helpdata.cpp:284
+#: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open contents file: %s"
-msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+msgstr "不能打开目录文件: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:353
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:421
+#, c-format
 msgid "Cannot open file '%s'."
-msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
+msgstr "不能打开文件 '%s'."
 
-#: ../src/generic/dcpsg.cpp:1798
+#: ../src/generic/dcpsg.cpp:1569
 msgid "Cannot open file for PostScript printing!"
-msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!"
+msgstr "不能打开文件进行PostScript打印!"
 
-#: ../src/html/helpdata.cpp:299
+#: ../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
+#: ../src/common/intl.cpp:1203
+#, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+msgstr "不能解析多表格: '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:1000
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:1172
+#, c-format
 msgid "Cannot parse coordinates from '%s'."
-msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+msgstr "不能从 '%s'中粘贴坐标."
 
-#: ../contrib/src/xrc/xmlres.cpp:1041
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:1220
+#, c-format
 msgid "Cannot parse dimension from '%s'."
-msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+msgstr "不能从 '%s'中解析尺寸."
 
-#: ../src/html/helpfrm.cpp:1396
+#: ../src/html/helpfrm.cpp:1562
 msgid "Cannot print empty page."
-msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
+msgstr "不能打印空页面."
 
-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
-#, fuzzy, c-format
+#: ../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:1080
+#: ../src/unix/threadpsx.cpp:1081
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
+msgstr "不能找回线程调度策略."
 
-#: ../src/unix/threadpsx.cpp:728
+#: ../src/unix/threadpsx.cpp:729
 msgid "Cannot start thread: error writing TLS"
-msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
+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:443
+#: ../src/html/helpfrm.cpp:534
 msgid "Case sensitive"
-msgstr "´óСдÃô¸Ð"
+msgstr "大小写敏感"
 
-#: ../src/common/fmapbase.cpp:116
-#, fuzzy
+#: ../src/common/fmapbase.cpp:117
 msgid "Celtic (ISO-8859-14)"
-msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
+msgstr "凯尔特语 (ISO-8859-14)"
 
-#: ../src/common/fmapbase.cpp:104
-#, fuzzy
+#: ../src/common/stockitem.cpp:127
+msgid "Centered"
+msgstr "居中"
+
+#: ../src/common/fmapbase.cpp:105
 msgid "Central European (ISO-8859-2)"
-msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
+msgstr "中欧语系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:750
+#: ../src/msw/dialup.cpp:786
 msgid "Choose ISP to dial"
-msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
+msgstr "选择ISP进行拨号"
+
+#: ../src/generic/colrdlgg.cpp:151
+#: ../src/gtk/colordlg.cpp:45
+#: ../src/palmos/colordlg.cpp:79
+msgid "Choose colour"
+msgstr "选择颜色"
 
-#: ../src/gtk/fontdlg.cpp:127
+#: ../src/gtk/fontdlg.cpp:133
 msgid "Choose font"
-msgstr "Ñ¡Ôñ×ÖÌå"
+msgstr "选择字体"
 
-#: ../src/generic/mdig.cpp:114
-#, fuzzy
+#: ../src/generic/mdig.cpp:115
 msgid "Cl&ose"
-msgstr "¹Ø±Õ"
+msgstr "关闭(&o)"
 
-#: ../src/generic/logg.cpp:504
+#: ../src/generic/logg.cpp:507
 msgid "Clear the log contents"
-msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
-
-#: ../src/generic/progdlgg.cpp:353
+msgstr "清除日志内容"
+
+#: ../src/generic/fontdlgg.cpp:365
+#: ../src/generic/fontdlgg.cpp:384
+msgid "Click to cancel the font selection."
+msgstr "点击取消字体选择."
+
+#: ../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 "点击确认字体选择."
+
+#: ../src/generic/dbgrptg.cpp:92
+#: ../src/generic/progdlgg.cpp:629
+#: ../src/generic/progdlgg.cpp:634
+#: ../contrib/src/deprecated/proplist.cpp:513
 msgid "Close"
-msgstr "¹Ø±Õ"
+msgstr "关闭"
 
-#: ../src/univ/themes/win32.cpp:4680
+#: ../src/univ/themes/win32.cpp:4931
 msgid "Close\tAlt-F4"
-msgstr ""
+msgstr "关闭\tAlt-F4"
 
-#: ../src/generic/mdig.cpp:115
-#, fuzzy
+#: ../src/generic/mdig.cpp:116
 msgid "Close All"
-msgstr "¹Ø±Õ"
+msgstr "全部关闭"
 
-#: ../src/generic/logg.cpp:506
+#: ../src/generic/logg.cpp:509
 msgid "Close this window"
-msgstr "¹Ø±Õ´°¿Ú"
+msgstr "关闭此窗口"
 
-#: ../src/html/helpfrm.cpp:1410
+#: ../src/html/helpfrm.cpp:1576
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
-msgstr ""
+msgstr "压缩的HTML帮助文件 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:594
-#, fuzzy
+#: ../src/generic/dirctrlg.cpp:590
 msgid "Computer"
-msgstr "¼ÆËã»ú"
+msgstr "计算机"
 
-#: ../src/common/fileconf.cpp:934
+#: ../src/common/fileconf.cpp:962
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
+msgstr "配置条目名不能以 '%c'开头."
 
-#: ../src/generic/filedlgg.cpp:1245 ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1318
+#: ../src/gtk/filedlg.cpp:67
 msgid "Confirm"
-msgstr "È·ÈÏ"
+msgstr "确认"
 
-#: ../src/msw/mimetype.cpp:677
+#: ../src/msw/mimetype.cpp:678
 msgid "Confirm registry update"
-msgstr ""
+msgstr "确认更新注册表"
 
-#: ../src/html/htmlwin.cpp:362
+#: ../src/html/htmlwin.cpp:386
 msgid "Connecting..."
-msgstr "Á¬½Ó..."
+msgstr "连接..."
 
-#: ../src/html/helpfrm.cpp:383
+#: ../src/html/helpfrm.cpp:476
 msgid "Contents"
-msgstr "Ŀ¼"
+msgstr "目录"
 
-#: ../src/common/strconv.cpp:947
+#: ../src/common/strconv.cpp:1416
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr ""
+msgstr "不能进行到字符集 '%s'的变换."
 
-#: ../src/html/htmlwin.cpp:782
-#, fuzzy, c-format
+#: ../src/html/htmlwin.cpp:824
+#, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+msgstr "已复制到剪贴板:\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:242
 msgid "Copies:"
-msgstr "·Ý:"
+msgstr "份数:"
 
-#: ../src/html/chm.cpp:689
-#, fuzzy, c-format
+#: ../src/html/chm.cpp:703
+#, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
+msgstr "不能创建临时文件 '%s'"
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
-msgstr ""
-
-#: ../src/generic/tabg.cpp:1049
-msgid "Could not find tab for id"
-msgstr "ÕÒ²»µ½idµÄ±êÇ©"
+msgstr "不能将 %s解开至 %s: %s"
 
-#: ../src/msw/textctrl.cpp:2616
+#: ../contrib/src/deprecated/resource.cpp:1830
+#: ../contrib/src/deprecated/resource.cpp:1960
 #, c-format
-msgid "Could not load Rich Edit DLL '%s'"
-msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
+msgid "Could not find resource include file %s."
+msgstr "找不到资源包含文件 %s."
+
+#: ../src/generic/tabg.cpp:1048
+msgid "Could not find tab for id"
+msgstr "找不到id的标签"
 
 #: ../src/html/chm.cpp:445
-#, fuzzy, c-format
+#, c-format
 msgid "Could not locate file '%s'."
-msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
+msgstr "找不到文件 '%s'"
 
-#: ../src/common/prntbase.cpp:823
-msgid "Could not start document preview."
-msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ."
+#: ../contrib/src/deprecated/resource.cpp:829
+#, c-format
+msgid ""
+"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
+" or provide #define (see manual for caveats)"
+msgstr ""
+"不能解析控件类或者id '%s'. 用(非零)整数代替\n"
+"或 提供 #define (详细信息见手册)"
 
-#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:242
+#: ../contrib/src/deprecated/resource.cpp:1278
+#, c-format
+msgid ""
+"Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
+"or provide #define (see manual for caveats)"
+msgstr ""
+"不能解析菜单id '%s'. 用(非零)整数代替\n"
+"或 提供 #define (详细信息见手册)"
+
+#: ../src/common/prntbase.cpp:1272
+msgid "Could not start document preview."
+msgstr "不能启动文档预览."
+
+#: ../src/generic/printps.cpp:185
+#: ../src/gtk/gnome/gprint.cpp:763
+#: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
-msgstr "²»ÄÜÆô¶¯´òÓ¡."
+msgstr "不能启动打印."
 
-#: ../src/common/wincmn.cpp:1368
+#: ../src/common/wincmn.cpp:1498
 msgid "Could not transfer data to window"
-msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
+msgstr "不能把数据转到窗口"
 
-#: ../src/os2/thread.cpp:154
+#: ../src/mac/carbon/mpthread.cpp:227
+#: ../src/mac/carbon/mpthread.cpp:306
+#: ../src/mac/carbon/thread.cpp:414
+#: ../src/mac/carbon/thread.cpp:495
+msgid "Could not unlock mutex"
+msgstr "不能释放互斥体"
+
+#: ../src/os2/thread.cpp:150
 msgid "Couldn't acquire a mutex lock"
-msgstr "²»Äܵõ½»¥³âÌåËø"
+msgstr "不能得到互斥锁"
 
-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:156 ../src/msw/imaglist.cpp:174
-#: ../src/msw/imaglist.cpp:186
+#: ../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:101 ../src/os2/timer.cpp:118
+#: ../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
-#, fuzzy
+#: ../src/mgl/cursor.cpp:135
+#: ../src/mgl/cursor.cpp:166
 msgid "Couldn't create cursor."
-msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
+msgstr "不能创建游标"
 
-#: ../src/common/dynlib.cpp:388
+#: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
+msgstr "在动态连接库中找不到符号'%s'"
 
-#: ../src/msw/thread.cpp:856
+#: ../src/mac/classic/thread.cpp:521
+#: ../src/msw/thread.cpp:853
 msgid "Couldn't get the current thread pointer"
-msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
+msgstr "不能获得当前线程指针"
 
-#: ../src/common/imagpng.cpp:607
+#: ../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
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+msgstr "不能从 '%s'中的读取声音数据."
 
 #: ../src/unix/sound_sdl.cpp:230
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't open audio: %s"
-msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
+msgstr "不能打开音频: %s"
 
 #: ../src/msw/ole/dataobj.cpp:147
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
-msgstr "²»ÄÜ×¢²á¼ôÌù°å¸ñʽ '%s'."
+msgstr "不能注册剪贴板格式 '%s'."
 
-#: ../src/os2/thread.cpp:171
+#: ../src/os2/thread.cpp:167
 msgid "Couldn't release a mutex"
-msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
+msgstr "不能释放互斥体"
 
-#: ../src/msw/listctrl.cpp:731
+#: ../src/msw/listctrl.cpp:745
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
-msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
+msgstr "不能获得列表控件的项 %d信息."
 
-#: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
-#: ../src/common/imagpng.cpp:666
-#, fuzzy
+#: ../src/common/imagpng.cpp:642
+#: ../src/common/imagpng.cpp:651
+#: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
-msgstr "JPEG: ²»Äܱ£´æͼÏñ."
+msgstr "不能保存PNG图像."
 
-#: ../src/msw/thread.cpp:610
+#: ../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 ""
+msgstr "在声明的RTTI参数里找不到创建参数"
 
-#: ../src/generic/dirdlgg.cpp:265
+#: ../src/generic/dirdlgg.cpp:307
 msgid "Create directory"
-msgstr "´´½¨Ä¿Â¼"
+msgstr "创建目录"
 
-#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:955
+#: ../src/generic/dirdlgg.cpp:140
+#: ../src/generic/filedlgg.cpp:999
 msgid "Create new directory"
-msgstr "´´½¨ÐÂĿ¼"
+msgstr "创建新目录"
 
-#: ../src/msw/textctrl.cpp:2034
+#: ../src/common/stockitem.cpp:114
+#: ../src/mac/carbon/textctrl.cpp:1073
+#: ../src/msw/textctrl.cpp:2063
 msgid "Cu&t"
-msgstr ""
+msgstr "剪切(&t)"
 
-#: ../src/generic/filedlgg.cpp:966
+#: ../src/generic/filedlgg.cpp:1010
 msgid "Current directory:"
-msgstr "µ±Ç°Ä¿Â¼:"
+msgstr "当前目录:"
 
-#: ../src/common/fmapbase.cpp:107
-#, fuzzy
+#: ../src/common/fmapbase.cpp:108
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
+msgstr "西里尔语 (ISO-8859-5)"
 
-#: ../src/common/paper.cpp:118
+#: ../src/common/paper.cpp:106
 msgid "D sheet, 22 x 34 in"
-msgstr "D Ö½ÕÅ, 22 x 34 Ó¢´ç"
+msgstr "D 纸张, 22 x 34 英寸"
 
-#: ../src/msw/dde.cpp:649
+#: ../src/msw/dde.cpp:631
 msgid "DDE poke request failed"
-msgstr "DDE poke ÇëÇóʧ°Ü"
+msgstr "DDE poke 请求失败"
 
-#: ../src/common/imagbmp.cpp:920
-#, fuzzy
+#: ../src/common/imagbmp.cpp:921
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
+msgstr "DIB头: 编码不能匹配颜色位数."
 
-#: ../src/common/imagbmp.cpp:882
-#, fuzzy
+#: ../src/common/imagbmp.cpp:883
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
+msgstr "DIB头: 对于文件, 图像高度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:876
-#, fuzzy
+#: ../src/common/imagbmp.cpp:877
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
+msgstr "DIB头: 对于文件, 图像宽度 > 32767 象素."
 
-#: ../src/common/imagbmp.cpp:896
-#, fuzzy
+#: ../src/common/imagbmp.cpp:897
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
+msgstr "DIB头: 文件中颜色位数未知."
 
-#: ../src/common/imagbmp.cpp:906
-#, fuzzy
+#: ../src/common/imagbmp.cpp:907
 msgid "DIB Header: Unknown encoding in file."
-msgstr "BMP: Îļþ±àÂëδ֪."
+msgstr "DIB头: 文件编码未知."
 
-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:128
 msgid "DL Envelope, 110 x 220 mm"
-msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
+msgstr "DL 信封, 110 x 220 毫米"
 
-#: ../src/generic/fontdlgg.cpp:221
+#: ../src/generic/dbgrptg.cpp:295
+#, c-format
+msgid "Debug report \"%s\""
+msgstr "调试报告 \"%s\""
+
+#: ../src/common/debugrpt.cpp:203
+msgid "Debug report couldn't be created."
+msgstr "无法创建调试报告."
+
+#: ../src/common/debugrpt.cpp:539
+msgid "Debug report generation has failed."
+msgstr "无法生成调试报告."
+
+#: ../src/generic/fontdlgg.cpp:227
 msgid "Decorative"
-msgstr "ÐÞÊÎ"
+msgstr "修饰"
 
-#: ../src/common/fmapbase.cpp:666
+#: ../src/common/fmapbase.cpp:681
 msgid "Default encoding"
-msgstr ""
+msgstr "缺省编码"
 
-#: ../contrib/src/gizmos/editlbox.cpp:163
-#, fuzzy
+#: ../src/generic/prntdlgg.cpp:506
+msgid "Default printer"
+msgstr "缺省的打印机"
+
+#: ../contrib/src/gizmos/editlbox.cpp:160
 msgid "Delete item"
-msgstr "µç´«´ò×Ö»ú"
+msgstr "删除项"
 
-#: ../src/unix/snglinst.cpp:269
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:300
+#, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
+msgstr "已删除过期的锁文件 '%s'."
 
-#: ../src/msw/dialup.cpp:359
-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:656
+msgid "Desktop"
+msgstr "桌面"
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/msw/dialup.cpp:395
+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:246
 msgid "Did you know..."
-msgstr "ÄãÖªµÀ..."
+msgstr "你知道吗..."
 
-#: ../src/common/filefn.cpp:1359
+#: ../src/motif/filedlg.cpp:225
+msgid "Directories"
+msgstr "目录"
+
+#: ../src/common/filefn.cpp:1177
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
+msgstr "目录'%s'不能被创建"
 
 #: ../src/mgl/dirmgl.cpp:217
-#, fuzzy, c-format
+#, c-format
 msgid "Directory '%s' doesn't exist!"
-msgstr "Ŀ¼²»´æÔÚ"
+msgstr "目录 '%s'不存在!"
 
-#: ../src/generic/dirdlgg.cpp:190
+#: ../src/generic/dirdlgg.cpp:226
 msgid "Directory does not exist"
-msgstr "Ŀ¼²»´æÔÚ"
+msgstr "目录不存在"
 
-#: ../src/generic/filedlgg.cpp:1222
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:1295
 msgid "Directory doesn't exist."
-msgstr "Ŀ¼²»´æÔÚ"
+msgstr "目录不存在."
 
-#: ../src/html/helpfrm.cpp:411
-msgid ""
-"Display all index items that contain given substring. Search is case "
-"insensitive."
-msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
+#: ../src/html/helpfrm.cpp:503
+msgid "Display all index items that contain given substring. Search is case insensitive."
+msgstr "显示包含给定子串的所有索引项. 搜索是大小写无关的."
 
-#: ../src/html/helpfrm.cpp:592
+#: ../src/html/helpfrm.cpp:685
 msgid "Display options dialog"
-msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
+msgstr "显示选项对话框"
 
-#: ../src/msw/mimetype.cpp:670
+#: ../src/msw/mimetype.cpp:671
 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 ""
+"是否要覆盖用于%s文件(扩展名为\"%s\")的命令？\n"
+"当前值为 \n"
+"%s, \n"
+"新的值为 \n"
+"%s %1"
 
-#: ../src/common/docview.cpp:466
+#: ../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:422
+#: ../src/common/sizer.cpp:1839
+msgid "Don't Save"
+msgstr "不保存"
+
+#: ../src/html/htmlwin.cpp:451
+#: ../src/msw/frame.cpp:211
 msgid "Done"
-msgstr "Íê³É"
+msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:365
+#: ../src/generic/progdlgg.cpp:433
 msgid "Done."
-msgstr "Íê³É¡£"
+msgstr "完成."
+
+#: ../src/common/paper.cpp:183
+msgid "Double Japanese Postcard Rotated 148 x 200 mm"
+msgstr "横向日本双明信片, 148 x 200 毫米"
 
 #: ../src/common/xtixml.cpp:271
 #, c-format
 msgid "Doubly used id : %d"
-msgstr ""
+msgstr "重复使用的id : %d"
 
-#: ../src/generic/fdrepdlg.cpp:151
-#, fuzzy
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Down"
-msgstr "Íê³É"
+msgstr "向下"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:107
 msgid "E sheet, 34 x 44 in"
-msgstr "E Ö½ÕÅ, 34 x 44 Ó¢´ç"
+msgstr "E 纸张, 34 x 44 英寸"
 
-#: ../contrib/src/gizmos/editlbox.cpp:161
+#: ../contrib/src/gizmos/editlbox.cpp:158
 msgid "Edit item"
-msgstr ""
+msgstr "编辑项"
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../src/generic/progdlgg.cpp:194
 msgid "Elapsed time : "
-msgstr "ÓÃʱ£º"
+msgstr "用时: "
 
-#: ../src/common/prntbase.cpp:412
+#: ../src/common/prntbase.cpp:846
 #, c-format
 msgid "Enter a page number between %d and %d:"
-msgstr ""
+msgstr "输入页码范围(%d 至 %d):"
 
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/dbgrptg.cpp:169
+#, c-format
+msgid "Enter command to open file \"%s\":"
+msgstr "输入命令以打开文件 \"%s\":"
+
+#: ../src/generic/helpext.cpp:443
 msgid "Entries found"
-msgstr "ÕÒµ½µÄÌõÄ¿"
+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:685 ../src/generic/dirctrlg.cpp:703
-#: ../src/generic/dirctrlg.cpp:714 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:624 ../src/generic/filedlgg.cpp:736
-#: ../src/generic/filedlgg.cpp:750 ../src/generic/filedlgg.cpp:764
-#: ../src/generic/filedlgg.cpp:1197 ../src/generic/filedlgg.cpp:1222
-#: ../src/generic/filedlgg.cpp:1252 ../src/gtk/filedlg.cpp:82
-#: ../src/gtk/fontdlg.cpp:78
+#: ../src/common/paper.cpp:149
+msgid "Envelope Invite 220 x 220 mm"
+msgstr "邀请信, 220 x 220 毫米"
+
+#: ../src/common/config.cpp:384
+#, c-format
+msgid "Environment variables expansion failed: missing '%c' at position %u in '%s'."
+msgstr "环境变量扩展失败:  '%c' 没有出现在位置 %u / '%s'."
+
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:744
+#: ../src/generic/filedlgg.cpp:758
+#: ../src/generic/filedlgg.cpp:772
+#: ../src/generic/filedlgg.cpp:1269
+#: ../src/generic/filedlgg.cpp:1295
+#: ../src/generic/filedlgg.cpp:1325
+#: ../src/gtk/fontdlg.cpp:81
 msgid "Error"
-msgstr "´íÎó"
+msgstr "错误"
 
-#: ../src/unix/utilsunx.cpp:1033 ../src/unix/utilsunx.cpp:1041
+#: ../src/msdos/utilsdos.cpp:213
+#: ../src/unix/utilsunx.cpp:1090
+#: ../src/unix/utilsunx.cpp:1098
 msgid "Error "
-msgstr "´íÎó"
+msgstr "错误 "
 
-#: ../src/generic/dirdlgg.cpp:205
+#: ../src/generic/dirdlgg.cpp:241
 msgid "Error creating directory"
-msgstr "´´½¨Ä¿Â¼´íÎó"
+msgstr "创建目录错误"
 
-#: ../src/common/imagbmp.cpp:929
-#, fuzzy
+#: ../src/common/imagbmp.cpp:930
 msgid "Error in reading image DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgstr "读图像DIB错误."
 
-#: ../src/common/fileconf.cpp:505
-#, fuzzy
+#: ../src/common/fileconf.cpp:504
 msgid "Error reading config options."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgstr "读配置选项错误."
+
+#: ../src/common/fileconf.cpp:1050
+msgid "Error saving user configuration data."
+msgstr "保存用户配置数据错误."
+
+#: ../src/mac/carbon/mpthread.cpp:482
+#: ../src/mac/carbon/thread.cpp:672
+msgid "Error while waiting on semaphore"
+msgstr "等待信号量时出错"
 
-#: ../src/common/log.cpp:478
+#: ../src/common/log.cpp:476
 msgid "Error: "
-msgstr "´íÎó£º"
+msgstr "错误: "
 
-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:106
 msgid "Esperanto (ISO-8859-3)"
-msgstr "Esperanto (ISO-8859-3)"
+msgstr "世界语 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:202
 msgid "Estimated time : "
-msgstr "Ô¤ÆÚʱ¼ä£º"
+msgstr "预期时间: "
 
-#: ../src/msw/utilsexc.cpp:733
+#: ../src/generic/dbgrptg.cpp:229
+msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
+msgstr "可执行文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||"
+
+#: ../src/msw/utilsexc.cpp:753
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
+msgstr "命令 '%s'执行失败"
 
-#: ../src/os2/utilsexc.cpp:169
-#, fuzzy, c-format
+#: ../src/os2/utilsexc.cpp:165
+#, c-format
 msgid "Execution of command '%s' failed with error: %ul"
-msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
+msgstr "命令 '%s'执行失败, 错误信息: %ul"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:112
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "Executive, 7 1/4 x 10 1/2 Ó¢´ç"
+msgstr "实用纸张(Executive), 7 1/4 x 10 1/2 英寸"
 
-#: ../src/common/fmapbase.cpp:141
+#: ../contrib/src/deprecated/resource.cpp:1869
+#: ../contrib/src/deprecated/resource.cpp:1999
+#: ../contrib/src/deprecated/resource.cpp:3091
+msgid "Expected '*' while parsing resource."
+msgstr "解析资源时期待出现 '*' ."
+
+#: ../contrib/src/deprecated/resource.cpp:1886
+#: ../contrib/src/deprecated/resource.cpp:2015
+#: ../contrib/src/deprecated/resource.cpp:3108
+msgid "Expected '=' while parsing resource."
+msgstr "解析资源时期待出现 '='."
+
+#: ../contrib/src/deprecated/resource.cpp:1855
+#: ../contrib/src/deprecated/resource.cpp:1985
+#: ../contrib/src/deprecated/resource.cpp:3077
+msgid "Expected 'char' while parsing resource."
+msgstr "解析资源时期待遇到 'char' ."
+
+#: ../src/msw/registry.cpp:1140
+#, c-format
+msgid "Exporting registry key: file \"%s\" already exists and won't be overwritten."
+msgstr "导出注册键: 文件 \"%s\"已经存在, 无法覆盖."
+
+#: ../src/common/fmapbase.cpp:143
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
-msgstr ""
+msgstr "扩展的日本语Unix代码页 (EUC-JP)"
 
-#: ../src/html/chm.cpp:696
-#, fuzzy, c-format
+#: ../src/html/chm.cpp:710
+#, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
+msgstr "将 '%s'解压至 '%s'失败."
 
-#: ../src/msw/dialup.cpp:844
+#: ../src/msw/dialup.cpp:880
 #, 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:528
+#: ../src/msw/dib.cpp:563
 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
-msgstr ""
+msgstr "为位图数据分配 %luKb 内存失败."
 
-#: ../src/unix/displayx11.cpp:262
-#, fuzzy
+#: ../src/unix/displayx11.cpp:224
 msgid "Failed to change video mode"
-msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
+msgstr "改变视频模式失败."
 
-#: ../src/common/filename.cpp:188
-#, fuzzy
+#: ../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
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:339
+#, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "关闭锁文件 '%s'失败"
 
-#: ../src/msw/clipbrd.cpp:122
+#: ../src/msw/clipbrd.cpp:119
 msgid "Failed to close the clipboard."
-msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
+msgstr "关闭剪贴板失败."
 
-#: ../src/msw/dialup.cpp:784
+#: ../src/msw/dialup.cpp:820
 msgid "Failed to connect: missing username/password."
-msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
+msgstr "连接失败: 缺少用户名/口令."
 
-#: ../src/msw/dialup.cpp:730
+#: ../src/msw/dialup.cpp:766
 msgid "Failed to connect: no ISP to dial."
-msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
+msgstr "连接失败: 没有要拨号的ISP."
 
-#: ../src/msw/registry.cpp:614
+#: ../src/msw/registry.cpp:626
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "¿½±´×¢²á¼üֵʧ°Ü '%s'"
+msgstr "复制注册键值失败 '%s'"
 
-#: ../src/msw/registry.cpp:623
+#: ../src/msw/registry.cpp:635
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
+msgstr "把注册键内容从 '%s' 复制到 '%s'失败."
 
-#: ../src/common/filefn.cpp:1197
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1003
+#, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "复制文件 '%s'至 '%s'失败"
+
+#: ../src/msw/registry.cpp:613
+#, c-format
+msgid "Failed to copy the registry subkey '%s' to '%s'."
+msgstr "复制注册表子键 '%s'至 '%s'失败."
 
-#: ../src/msw/dde.cpp:1004
+#: ../src/msw/dde.cpp:989
 msgid "Failed to create DDE string"
-msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
+msgstr "创建 DDE 字符串失败"
 
-#: ../src/msw/mdi.cpp:425
+#: ../src/msw/mdi.cpp:473
 msgid "Failed to create MDI parent frame."
-msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+msgstr "创建 MDI 父框架失败."
 
 #: ../src/msw/statbr95.cpp:112
 msgid "Failed to create a status bar."
-msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
+msgstr "创建状态条失败."
 
-#: ../src/common/filename.cpp:728
-#, fuzzy
+#: ../src/common/filename.cpp:766
 msgid "Failed to create a temporary file name"
-msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+msgstr "创建临时文件名失败"
 
-#: ../src/msw/utilsexc.cpp:226
-#, fuzzy
+#: ../src/msw/utilsexc.cpp:227
 msgid "Failed to create an anonymous pipe"
-msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
+msgstr "创建匿名管道失败"
 
-#: ../src/msw/dde.cpp:468
+#: ../src/msw/dde.cpp:447
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü"
+msgstr "创建到服务器 '%s'的关于主题'%s'的连接失败"
 
-#: ../src/msw/cursor.cpp:198
-#, fuzzy
+#: ../src/msw/cursor.cpp:218
 msgid "Failed to create cursor."
-msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
+msgstr "创建游标失败."
+
+#: ../src/common/debugrpt.cpp:202
+#, c-format
+msgid "Failed to create directory \"%s\""
+msgstr "无法创建目录 \"%s\""
 
 #: ../src/unix/mimetype.cpp:370
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create directory %s/.gnome."
-msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+msgstr "创建目录 %s/.gnome 失败."
 
 #: ../src/unix/mimetype.cpp:379
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create directory %s/mime-info."
-msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+msgstr "创建目录 %s/.mime-info 失败."
 
-#: ../src/generic/dirdlgg.cpp:203
-#, fuzzy, c-format
+#: ../src/generic/dirdlgg.cpp:239
+#, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"\n"
-"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
+"创建目录 '%s'失败\n"
+"(您是否有所需的权限?)"
 
 #: ../src/msw/mimetype.cpp:193
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+msgstr "为 '%s'文件创建注册条目失败."
 
-#: ../src/msw/fdrepdlg.cpp:479
+#: ../src/msw/fdrepdlg.cpp:474
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr ""
+msgstr "创建标准\"查找/替换\"对话框失败 (错误号 %d)"
 
-#: ../src/html/winpars.cpp:495
+#: ../src/html/winpars.cpp:549
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
-msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
+msgstr "按编码 %s 显示HTML文档失败"
 
-#: ../src/msw/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:194
+#: ../src/mac/classic/clipbrd.cpp:185
+#: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
-msgstr "Çå¿Õ¼ôÌù°åʧ°Ü"
+msgstr "清空剪贴板失败"
 
 #: ../src/unix/displayx11.cpp:201
-#, fuzzy
 msgid "Failed to enumerate video modes"
-msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+msgstr "枚举视频模式失败"
 
-#: ../src/msw/dde.cpp:668
+#: ../src/msw/dde.cpp:650
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ­»·Ê§°Ü"
+msgstr "在DDE服务器建立advise循环失败"
 
-#: ../src/msw/dialup.cpp:622
+#: ../src/msw/dialup.cpp:658
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
+msgstr "建立拨号连接: %s失败"
 
-#: ../src/unix/utilsunx.cpp:460 ../src/unix/utilsunx.cpp:476
+#: ../src/unix/utilsunx.cpp:508
+#: ../src/unix/utilsunx.cpp:524
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "Ö´ÐÐ '%s'ʧ°Ü\n"
+msgstr "执行 '%s'失败\n"
+
+#: ../src/common/debugrpt.cpp:666
+msgid "Failed to execute curl, please install it in PATH."
+msgstr "无法执行curl, 请在PATH变量所指的目录中安装curl."
 
-#: ../src/msw/dialup.cpp:682
+#: ../contrib/src/deprecated/resource.cpp:2489
+#, c-format
+msgid ""
+"Failed to find XBM resource %s.\n"
+"Forgot to use wxResourceLoadBitmapData?"
+msgstr ""
+"查找XBM资源 %s失败.\n"
+"没有使用wxResourceLoadBitmapData?"
+
+#: ../contrib/src/deprecated/resource.cpp:2643
+#, c-format
+msgid ""
+"Failed to find XBM resource %s.\n"
+"Forgot to use wxResourceLoadIconData?"
+msgstr ""
+"查找XBM资源%s失败.\n"
+"没有使用wxResourceLoadIconData?"
+
+#: ../contrib/src/deprecated/resource.cpp:2504
+#, c-format
+msgid ""
+"Failed to find XPM resource %s.\n"
+"Forgot to use wxResourceLoadBitmapData?"
+msgstr ""
+"查找XPM资源 %s失败.\n"
+"没有使用wxResourceLoadBitmapData?"
+
+#: ../src/msw/dialup.cpp:718
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
+msgstr "获取ISP名: %s失败"
 
-#: ../src/msw/clipbrd.cpp:716
+#: ../src/mac/carbon/clipbrd.cpp:143
+#: ../src/mac/classic/clipbrd.cpp:134
+msgid "Failed to get clipboard data."
+msgstr "获取剪贴板数据失败."
+
+#: ../src/msw/clipbrd.cpp:723
 msgid "Failed to get data from the clipboard"
-msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
+msgstr "从剪贴板获取数据失败"
 
-#: ../src/common/stopwatch.cpp:189
+#: ../src/common/stopwatch.cpp:233
 msgid "Failed to get the local system time"
-msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
+msgstr "获取本地系统时间失败"
 
-#: ../src/common/filefn.cpp:1609
-#, fuzzy
+#: ../src/common/filefn.cpp:1430
 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 ""
+msgstr "初始化MS HTML帮助失败."
 
-#: ../src/msw/glcanvas.cpp:741
-#, fuzzy
+#: ../src/msw/glcanvas.cpp:809
 msgid "Failed to initialize OpenGL"
-msgstr "²»Äܳõʼ»¯ OLE"
+msgstr "不能初始化OpenGL"
 
-#: ../src/unix/threadpsx.cpp:896
-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:693
-#, fuzzy, c-format
+#: ../src/msw/utils.cpp:703
+#, c-format
 msgid "Failed to kill process %d"
-msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
+msgstr "终止进程 %d 失败"
 
 #: ../src/common/iconbndl.cpp:72
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load image %d from file '%s'."
-msgstr "Ë¢ÐÂÎļþ '%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:312
-#, fuzzy
 msgid "Failed to load mpr.dll."
-msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+msgstr "装载mpr.dll失败."
 
-#: ../src/common/dynlib.cpp:287
+#: ../src/common/dynlib.cpp:133
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
+msgstr "不能装载共享库 '%s'"
 
-#: ../src/common/dynlib.cpp:216
-#, fuzzy, c-format
+#: ../src/common/dynlib.cpp:115
+#, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
-msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
+msgstr "不能装载共享库 '%s'. 错误信息: '%s'"
 
-#: ../src/unix/snglinst.cpp:192
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:203
+#, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "锁定锁文件 '%s'失败"
 
 #: ../src/common/regex.cpp:300
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to match '%s' in regular expression: %s"
-msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
+msgstr "不能匹配 '%s' 于正则表达式: %s"
 
-#: ../src/common/filename.cpp:1844
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:1918
+#, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "修改文件时间(为 '%s') 失败"
 
-#: ../src/common/filename.cpp:176
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:179
+#, c-format
 msgid "Failed to open '%s' for %s"
-msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
+msgstr "打开 '%s'(为 %s) 失败"
 
 #: ../src/html/chm.cpp:142
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
+msgstr "打开CHM存档 '%s'失败."
 
-#: ../src/common/filename.cpp:750
-#, fuzzy
+#: ../src/common/filename.cpp:788
 msgid "Failed to open temporary file."
-msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
+msgstr "打开临时文件失败."
 
-#: ../src/msw/clipbrd.cpp:102
+#: ../src/msw/clipbrd.cpp:99
 msgid "Failed to open the clipboard."
-msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
+msgstr "打开剪贴板失败."
 
-#: ../src/msw/clipbrd.cpp:619
+#: ../src/msw/clipbrd.cpp:626
 msgid "Failed to put data on the clipboard"
-msgstr "°ÑÊý¾Ý·Åµ½¼ôÌù°åʧ°Ü"
+msgstr "把数据放到剪贴板失败"
 
-#: ../src/unix/snglinst.cpp:252
-#, fuzzy
+#: ../src/unix/snglinst.cpp:283
 msgid "Failed to read PID from lock file."
-msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+msgstr "从锁文件读取PID失败."
 
-#: ../src/unix/utilsunx.cpp:550
+#: ../src/unix/utilsunx.cpp:598
 msgid "Failed to redirect child process input/output"
-msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
+msgstr "重定向子过程输入/输出失败"
 
-#: ../src/msw/utilsexc.cpp:633
-#, fuzzy
+#: ../src/msw/utilsexc.cpp:653
 msgid "Failed to redirect the child process IO"
-msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
+msgstr "重定向子过程IO失败"
 
-#: ../src/msw/dde.cpp:318
+#: ../src/msw/dde.cpp:297
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
+msgstr "注册DDE服务器 '%s'失败"
+
+#: ../src/msw/glcanvas.cpp:363
+msgid "Failed to register OpenGL window class."
+msgstr "不能注册 OpenGL窗口类."
 
-#: ../src/common/fontmap.cpp:231
+#: ../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
-#, fuzzy, c-format
+#: ../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
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:293
+#, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+msgstr "删除过期的锁文件 '%s'失败."
 
-#: ../src/msw/registry.cpp:460
+#: ../src/msw/registry.cpp:464
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+msgstr "将注册值 '%s'改名到'%s'失败."
 
-#: ../src/msw/registry.cpp:560
+#: ../src/msw/registry.cpp:568
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+msgstr "将注册键 '%s'改名到'%s'失败."
 
-#: ../src/msw/clipbrd.cpp:506
+#: ../src/msw/clipbrd.cpp:503
 msgid "Failed to retrieve data from the clipboard."
-msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
+msgstr "从剪贴板检取数据失败."
 
-#: ../src/common/filename.cpp:1934
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:2011
+#, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
+msgstr "检取文件时间(为 '%s')失败"
 
-#: ../src/msw/dialup.cpp:455
+#: ../src/msw/dialup.cpp:491
 msgid "Failed to retrieve text of RAS error message"
-msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
+msgstr "检取RAS错误消息正文失败"
 
-#: ../src/msw/clipbrd.cpp:753
+#: ../src/msw/clipbrd.cpp:760
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü"
+msgstr "检取支持的剪贴板格式失败"
 
-#: ../src/msw/dib.cpp:330
-#, fuzzy, c-format
+#: ../src/msw/dib.cpp:341
+#, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "将位图图像保存至文件 \"%s\"失败."
 
-#: ../src/msw/dde.cpp:713
+#: ../src/msw/dde.cpp:695
 msgid "Failed to send DDE advise notification"
-msgstr "·¢ËÍDDE advise ֪ͨʧ°Ü"
+msgstr "发送DDE advise 通知失败"
 
-#: ../src/common/ftp.cpp:368
-#, fuzzy, c-format
+#: ../src/common/ftp.cpp:384
+#, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
+msgstr "设置FTP传输模式为 %s 时失败."
 
-#: ../src/msw/clipbrd.cpp:382
+#: ../src/msw/clipbrd.cpp:379
 msgid "Failed to set clipboard data."
-msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+msgstr "设置剪贴板数据失败"
 
-#: ../src/common/file.cpp:701
-#, fuzzy
+#: ../src/unix/snglinst.cpp:186
+#, c-format
+msgid "Failed to set permissions on lock file '%s'"
+msgstr "在锁文件 '%s'上设置许可权限时失败"
+
+#: ../src/common/file.cpp:523
 msgid "Failed to set temporary file permissions"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "设置临时文件的许可权限时失败"
 
-#: ../src/unix/threadpsx.cpp:1244 ../src/unix/threadpsx.cpp:1255
+#: ../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:229
+#: ../src/common/fs_mem.cpp:231
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
-msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!"
+msgstr "将图像'%s'存到内存VFS失败!"
 
-#: ../src/unix/threadpsx.cpp:1428
+#: ../src/mac/carbon/mpthread.cpp:1273
+#: ../src/mac/carbon/thread.cpp:1465
+#: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
-msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü"
+msgstr "终止线程失败"
 
-#: ../src/msw/dde.cpp:687
+#: ../src/msw/dde.cpp:669
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ­»·Ê§°Ü"
+msgstr "终止与DDE服务器的advise循环失败"
 
-#: ../src/msw/dialup.cpp:917
+#: ../src/msw/dialup.cpp:955
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
+msgstr "终止拨号连接: %s失败"
 
-#: ../src/common/filename.cpp:1859
-#, fuzzy, c-format
+#: ../src/common/filename.cpp:1933
+#, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "对文件 '%s'进行touch操作失败"
 
-#: ../src/unix/snglinst.cpp:302
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:333
+#, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "对锁文件 '%s'解锁失败"
 
-#: ../src/msw/dde.cpp:339
+#: ../src/msw/dde.cpp:318
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü"
+msgstr "撤消DDE服务器 '%s'注册失败"
+
+#: ../src/common/fileconf.cpp:1023
+msgid "Failed to update user configuration file."
+msgstr "不能更新用户配置文件."
+
+#: ../src/common/debugrpt.cpp:679
+#, c-format
+msgid "Failed to upload the debug report (error code %d)."
+msgstr "上传调试报告失败 (错误号 %d)."
 
 #: ../src/unix/snglinst.cpp:173
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "写锁文件 '%s'失败"
 
-#: ../src/generic/logg.cpp:393
+#: ../src/generic/logg.cpp:394
 msgid "Fatal error"
-msgstr "ÖÂÃü´íÎó"
+msgstr "致命错误"
 
-#: ../src/common/log.cpp:467
+#: ../src/common/log.cpp:465
 msgid "Fatal error: "
-msgstr "ÖÂÃü´íÎó£º"
+msgstr "致命错误: "
+
+#: ../src/msw/wince/filedlgwce.cpp:120
+msgid "File"
+msgstr "文件"
 
 #: ../src/mgl/bitmap.cpp:544
-#, fuzzy, c-format
+#, c-format
 msgid "File %s does not exist."
-msgstr ": Îļþ²»´æÔÚ!"
+msgstr "文件 %s不存在."
 
-#: ../src/generic/filedlgg.cpp:1243 ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1316
+#: ../src/gtk/filedlg.cpp:64
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
+msgstr "文件 '%s' 已存在, 确实需要复写它?"
 
-#: ../src/os2/filedlg.cpp:302
-#, fuzzy, c-format
+#: ../src/os2/filedlg.cpp:310
+#, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
-msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
+msgstr ""
+"文件 '%s' 已存在.\n"
+"真的需要替换它?"
 
-#: ../src/common/textcmn.cpp:224
+#: ../src/common/textcmn.cpp:215
 msgid "File couldn't be loaded."
-msgstr "Îļþ²»Äܱ»×°ÔØ"
+msgstr "文件不能被装载."
 
-#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:357
-#: ../src/common/docview.cpp:1502
+#: ../src/common/docview.cpp:571
+#: ../src/common/docview.cpp:1596
 msgid "File error"
-msgstr "Îļþ´íÎó"
+msgstr "文件错误"
 
-#: ../src/generic/dirctrlg.cpp:703 ../src/generic/filedlgg.cpp:750
+#: ../src/generic/dirctrlg.cpp:707
+#: ../src/generic/filedlgg.cpp:758
 msgid "File name exists already."
-msgstr "ÎļþÃûÒÑ´æÔÚ"
+msgstr "文件名已存在"
+
+#: ../src/motif/filedlg.cpp:226
+msgid "Files"
+msgstr "文件"
 
-#: ../src/msw/filedlg.cpp:250
+#: ../src/common/filefn.cpp:1746
 #, c-format
-msgid "Files (%s)|%s"
-msgstr "Îļþ (%s)|%s"
+msgid "Files (%s)"
+msgstr "文件 (%s)"
 
-#: ../src/html/helpfrm.cpp:399
+#: ../src/motif/filedlg.cpp:224
+msgid "Filter"
+msgstr "过滤器"
+
+#: ../src/html/helpfrm.cpp:491
 msgid "Find"
-msgstr "²éÕÒ"
+msgstr "查找"
 
-#: ../src/html/helpfrm.cpp:1049
+#: ../src/html/helpfrm.cpp:1219
 msgid "Fixed font:"
-msgstr "¹Ì¶¨×ÖÌ壺"
+msgstr "固定字体:"
 
-#: ../src/html/helpfrm.cpp:1110
+#: ../src/html/helpfrm.cpp:1279
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
-msgstr ""
+msgstr "固定字体. <br> <b>粗体</b> <i>斜体</i> "
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:118
 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:1050
+#: ../src/html/helpfrm.cpp:1220
 msgid "Font size:"
-msgstr "×ÖÌå´óС:"
+msgstr "字体大小:"
 
-#: ../src/unix/utilsunx.cpp:497
+#: ../src/unix/utilsunx.cpp:545
 msgid "Fork failed"
-msgstr "Fork ʧ°Ü"
-
-#: ../src/common/dlgcmn.cpp:224
-msgid "Forward"
-msgstr "ÏòÇ°"
+msgstr "Fork 失败"
 
 #: ../src/common/xtixml.cpp:235
 msgid "Forward hrefs are not supported"
-msgstr ""
+msgstr "不支持传递hrefs"
 
-#: ../src/html/helpfrm.cpp:731
+#: ../contrib/src/deprecated/resource.cpp:1838
+#: ../contrib/src/deprecated/resource.cpp:1968
+#: ../contrib/src/deprecated/resource.cpp:3060
+msgid "Found "
+msgstr "找到 "
+
+#: ../src/html/helpfrm.cpp:886
 #, c-format
 msgid "Found %i matches"
-msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
+msgstr "找到 %i 个匹配项"
 
-#: ../src/generic/prntdlgg.cpp:181
+#: ../src/generic/prntdlgg.cpp:233
 msgid "From:"
-msgstr "´Ó:"
+msgstr "从:"
 
 #: ../src/common/imaggif.cpp:100
-#, fuzzy
 msgid "GIF: Invalid gif index."
-msgstr "ÎÞЧTIFFͼÏñË÷Òý."
+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:631
+#: ../src/univ/themes/gtk.cpp:634
 msgid "GTK+ theme"
-msgstr ""
+msgstr "GTK+ 主题"
 
-#: ../src/common/paper.cpp:154
+#: ../src/common/prntbase.cpp:228
+msgid "Generic PostScript"
+msgstr "普通PostScript"
+
+#: ../src/common/paper.cpp:142
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
-msgstr "µÂ¹ú·¨¶¨¸´Ð´²¾, 8 1/2 x 13 in"
+msgstr "德国法定复写簿, 8 1/2 x 13 英寸"
 
-#: ../src/common/paper.cpp:153
+#: ../src/common/paper.cpp:141
 msgid "German Std Fanfold, 8 1/2 x 12 in"
-msgstr "µÂ¹ú±ê×¼¸´Ð´²¾, 8 1/2 x 12 in"
+msgstr "德国标准复写簿, 8 1/2 x 12 英寸"
 
-#: ../include/wx/xti.h:843
+#: ../include/wx/xti.h:845
 msgid "GetProperty called w/o valid getter"
-msgstr ""
+msgstr "调用GetProperty时未带有效的getter"
 
-#: ../include/wx/xti.h:903
+#: ../include/wx/xti.h:906
 msgid "GetPropertyCollection called on a generic accessor"
-msgstr ""
+msgstr "在一个通用处理器上调用GetPropertyCollection"
 
-#: ../include/wx/xti.h:851
+#: ../include/wx/xti.h:853
 msgid "GetPropertyCollection called w/o valid collection getter"
-msgstr ""
-
-#: ../src/common/image.cpp:1499
-msgid "GetUnusedColour:: No Unused Color in image "
-msgstr ""
+msgstr "调用GetPropertyCollection时未带有效的collection getter"
 
-#: ../src/html/helpfrm.cpp:558
+#: ../src/html/helpfrm.cpp:651
 msgid "Go back"
-msgstr "»ØÍË"
+msgstr "回退"
 
-#: ../src/html/helpfrm.cpp:561
+#: ../src/html/helpfrm.cpp:654
 msgid "Go forward"
-msgstr "ÏòÇ°"
+msgstr "向前"
 
-#: ../src/html/helpfrm.cpp:566
+#: ../src/html/helpfrm.cpp:659
 msgid "Go one level up in document hierarchy"
-msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
+msgstr "到上一级文档目录"
 
-#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:945
+#: ../src/generic/dirdlgg.cpp:145
+#: ../src/generic/filedlgg.cpp:989
 msgid "Go to home directory"
-msgstr "½øÈëhomeĿ¼"
+msgstr "进入home目录"
 
-#: ../src/generic/filedlgg.cpp:937
+#: ../src/generic/filedlgg.cpp:981
 msgid "Go to parent directory"
-msgstr "½øÈ븸Ŀ¼"
+msgstr "进入父目录"
 
-#: ../src/common/prntbase.cpp:417
+#: ../src/common/prntbase.cpp:851
 msgid "Goto Page"
-msgstr ""
+msgstr "跳转页面"
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/common/fmapbase.cpp:110
 msgid "Greek (ISO-8859-7)"
-msgstr "Greek (ISO-8859-7)"
+msgstr "希腊语 (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/common/zstream.cpp:72
+#: ../src/common/zstream.cpp:209
 msgid "Gzip not supported by this version of zlib"
-msgstr ""
+msgstr "此版本的zlib不支持Gzip"
 
-#: ../src/html/helpfrm.cpp:1408
+#: ../src/html/helpfrm.cpp:1574
 msgid "HTML Help Project (*.hhp)|*.hhp|"
-msgstr ""
+msgstr "HTML 帮助的工程文件 (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:468
+#: ../src/html/htmlwin.cpp:498
 #, c-format
 msgid "HTML anchor %s does not exist."
-msgstr "HTML ê %s ²»´æÔÚ."
+msgstr "HTML 锚 %s 不存在."
 
-#: ../src/html/helpfrm.cpp:1406
+#: ../src/html/helpfrm.cpp:1572
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
-msgstr ""
+msgstr "HTML文件 (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/common/fmapbase.cpp:110
+#: ../src/common/fmapbase.cpp:111
 msgid "Hebrew (ISO-8859-8)"
-msgstr "Hebrew (ISO-8859-8)"
+msgstr "希伯来语 (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254 ../src/msw/mdi.cpp:1329
+#: ../src/html/helpfrm.cpp:337
+#: ../contrib/src/deprecated/proplist.cpp:523
 msgid "Help"
-msgstr "°ïÖú"
+msgstr "帮助"
 
-#: ../src/html/helpfrm.cpp:1043
+#: ../src/html/helpfrm.cpp:1213
 msgid "Help Browser Options"
-msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
+msgstr "帮助浏览器选项"
 
-#: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:443
 msgid "Help Index"
-msgstr "°ïÖúË÷Òý"
+msgstr "帮助索引"
 
-#: ../src/html/helpfrm.cpp:1394
+#: ../src/html/helpfrm.cpp:1560
 msgid "Help Printing"
-msgstr "°ïÖú´òÓ¡"
+msgstr "帮助打印"
+
+#: ../src/html/helpfrm.cpp:814
+msgid "Help Topics"
+msgstr "帮助主题"
 
-#: ../src/html/helpfrm.cpp:1407
+#: ../src/html/helpfrm.cpp:1573
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
-msgstr ""
+msgstr "帮助书 (*.htb)|*.htb|帮助书 (*.zip)|*.zip|"
 
 #: ../src/html/helpctrl.cpp:55
 #, c-format
 msgid "Help: %s"
-msgstr "°ïÖú: %s"
+msgstr "帮助: %s"
 
-#: ../src/common/imagbmp.cpp:942
-#, fuzzy
-msgid "ICO: Error in reading mask DIB."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+#: ../src/generic/dirdlgg.cpp:105
+msgid "Home"
+msgstr "Home"
+
+#: ../src/generic/dirctrlg.cpp:654
+msgid "Home directory"
+msgstr "Home目录"
 
-#: ../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
+#: ../include/wx/filefn.h:145
+msgid "I64"
+msgstr "I64"
+
+#: ../src/common/imagbmp.cpp:943
+msgid "ICO: Error in reading mask DIB."
+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
-#, fuzzy
 msgid "ICO: Error writing the image file!"
-msgstr "TIFF:дͼÏñ´íÎó."
+msgstr "ICO: 写图像文件错误."
 
 #: ../src/common/imagbmp.cpp:1016
 msgid "ICO: Image too tall for an icon."
-msgstr ""
+msgstr "ICO: 图像高度超出范围, 不适合做图标."
 
 #: ../src/common/imagbmp.cpp:1022
 msgid "ICO: Image too wide for an icon."
-msgstr ""
+msgstr "ICO: 图像宽度超出范围, 不适合做图标."
 
 #: ../src/common/imagbmp.cpp:1255
-#, fuzzy
 msgid "ICO: Invalid icon index."
-msgstr "ÎÞЧTIFFͼÏñË÷Òý."
+msgstr "ICO: 无效的图标索引."
 
 #: ../src/common/imagiff.cpp:771
-#, fuzzy
 msgid "IFF: data stream seems to be truncated."
-msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
+msgstr "IFF: 数据流似乎已被截断."
 
 #: ../src/common/imagiff.cpp:755
-#, fuzzy
 msgid "IFF: error in IFF image format."
-msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
+msgstr "IFF: IFF文件格式错误."
 
 #: ../src/common/imagiff.cpp:758
-#, fuzzy
 msgid "IFF: not enough memory."
-msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
+msgstr "IFF: 没有足够内存."
 
 #: ../src/common/imagiff.cpp:761
-#, fuzzy
 msgid "IFF: unknown error!!!"
-msgstr "GIF: λÖôíÎó!!!"
+msgstr "IFF: 位置错误!!!"
+
+#: ../contrib/src/deprecated/resource.cpp:2673
+#: ../contrib/src/deprecated/resource.cpp:2684
+#, c-format
+msgid "Icon resource specification %s not found."
+msgstr "没有找到图标资源规范 %s ."
+
+#: ../src/generic/dbgrptg.cpp:344
+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:310
+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:1304
+#, c-format
+msgid "Ignoring value \"%s\" of the key \"%s\"."
+msgstr "忽略值 \"%s\" (键 \"%s\")."
+
+#: ../contrib/src/deprecated/resource.cpp:271
+msgid "Ill-formed resource file syntax."
+msgstr "不良的资源文件语法."
 
 #: ../src/common/xtistrm.cpp:260
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
-msgstr ""
+msgstr "非法的对象类(非-wxEvtHandler)作为事件源"
 
-#: ../include/wx/xti.h:1647
+#: ../include/wx/xti.h:1650
 msgid "Illegal Parameter Count for ConstructObject Method"
-msgstr ""
+msgstr "非法的针对ConstructObject方法的参数计数"
 
-#: ../include/wx/xti.h:1720
+#: ../include/wx/xti.h:1723
 msgid "Illegal Parameter Count for Create Method"
-msgstr ""
+msgstr "非法的针对Create方法的参数计数"
 
-#: ../src/generic/dirctrlg.cpp:685 ../src/generic/filedlgg.cpp:736
+#: ../src/generic/dirctrlg.cpp:689
+#: ../src/generic/filedlgg.cpp:744
 msgid "Illegal directory name."
-msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
+msgstr "不合法的目录名."
 
-#: ../src/generic/filedlgg.cpp:1197
+#: ../src/generic/filedlgg.cpp:1269
 msgid "Illegal file specification."
-msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
+msgstr "不合规范的文件描述."
 
-#: ../src/common/image.cpp:900
-msgid "Image and Mask have different sizes"
-msgstr ""
+#: ../src/common/image.cpp:1192
+msgid "Image and mask have different sizes."
+msgstr "图像和掩码的大小不一致."
 
-#: ../src/common/image.cpp:1180
+#: ../src/common/image.cpp:1523
 #, c-format
 msgid "Image file is not of type %d."
-msgstr ""
+msgstr "图像文件的类型不是 %d."
 
-#: ../src/msw/textctrl.cpp:305
-msgid ""
-"Impossible to create a rich edit control, using simple text control instead. "
-"Please reinstall riched32.dll"
-msgstr "²»ÄÜ´´½¨rich±à¼­¿Ø¼þ, ʹÓüòµ¥Îı¾¿Ø¼þ´úÌæ. ÇëÖØ×°riched32.dll"
+#: ../src/msw/textctrl.cpp: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:380
+#: ../src/unix/utilsunx.cpp:428
 msgid "Impossible to get child process input"
-msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
+msgstr "不可能获得子过程的输入"
 
-#: ../src/common/filefn.cpp:1213
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1022
+#, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
+msgstr "不可能获得文件 '%s'的许可权限"
 
-#: ../src/common/filefn.cpp:1227
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1036
+#, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "不可能复写文件 '%s'"
 
-#: ../src/common/filefn.cpp:1278
+#: ../src/common/filefn.cpp:1080
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr ""
+msgstr "不可能设置文件 '%s'的许可权限"
 
-#: ../src/html/helpfrm.cpp:424
+#: ../src/common/stockitem.cpp:124
+msgid "Indent"
+msgstr "缩进"
+
+#: ../src/html/helpfrm.cpp:516
 msgid "Index"
-msgstr "Ë÷Òý"
+msgstr "索引"
 
-#: ../src/common/fmapbase.cpp:114
+#: ../src/common/fmapbase.cpp:115
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
-msgstr "Nordic (ISO-8859-10)"
+msgstr "印地安语 (ISO-8859-12)"
+
+#: ../src/common/init.cpp:232
+msgid "Initialization failed in post init, aborting."
+msgstr "在后初始化阶段出错, 退出..."
 
 #: ../src/common/xtistrm.cpp:704
 msgid "Internal error, illegal wxCustomTypeInfo"
-msgstr ""
+msgstr "整数错误, 非法的wxCustomTypeInfo"
 
-#: ../src/common/imagtiff.cpp:211
+#: ../src/common/imagtiff.cpp:227
 msgid "Invalid TIFF image index."
-msgstr "ÎÞЧTIFFͼÏñË÷Òý."
+msgstr "无效TIFF图像索引."
 
-#: ../contrib/src/xrc/xmlres.cpp:389
+#: ../src/xrc/xmlres.cpp:460
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr ""
+msgstr "无效的XRC资源 '%s': 根节点'resource'不存在."
 
-#: ../src/common/appcmn.cpp:239
-#, fuzzy, c-format
+#: ../src/common/appcmn.cpp:249
+#, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
+msgstr "无效的显示模式 '%s'."
 
 #: ../src/x11/app.cpp:128
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
+msgstr "无效的几何规格 '%s'"
 
-#: ../src/unix/snglinst.cpp:280
-#, fuzzy, c-format
+#: ../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
+#: ../src/common/xtistrm.cpp:365
+#: ../src/common/xtistrm.cpp:380
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
-msgstr ""
+msgstr "无效的或空的对象ID被传给GetObjectClassInfo"
 
 #: ../src/common/xtistrm.cpp:395
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
-msgstr ""
+msgstr "无效的或空的对象ID被传给HasObjectClassInfo"
 
 #: ../src/common/regex.cpp:210
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr ""
+msgstr "无效的正则表达式 '%s': %s"
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:233
 msgid "Italic"
-msgstr "бÌå"
+msgstr "斜体"
 
-#: ../src/common/paper.cpp:149
+#: ../src/common/paper.cpp:137
 msgid "Italy Envelope, 110 x 230 mm"
-msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm"
+msgstr "意大利信封, 110 x 230 毫米"
 
 #: ../src/common/imagjpeg.cpp:225
 msgid "JPEG: Couldn't load - file is probably corrupted."
-msgstr "JPEG: ²»ÄÜ×°Èë - ÎļþÒ²ÐíÒѱ»ÆÆ»µ."
+msgstr "JPEG: 不能装入 - 文件也许已被破坏."
 
 #: ../src/common/imagjpeg.cpp:339
 msgid "JPEG: Couldn't save image."
-msgstr "JPEG: ²»Äܱ£´æͼÏñ."
+msgstr "JPEG: 不能保存图像."
 
-#: ../src/common/fmapbase.cpp:118
-msgid "KOI8-R"
-msgstr "KOI8-R"
+#: ../src/common/paper.cpp:170
+msgid "Japanese Double Postcard 200 x 148 mm"
+msgstr "日本双明信片, 200 x 148 毫米"
 
-#: ../src/common/fmapbase.cpp:119
-#, fuzzy
-msgid "KOI8-U"
-msgstr "KOI8-R"
+#: ../src/common/paper.cpp:174
+msgid "Japanese Envelope Chou #3"
+msgstr "日本 Chou 3 信封"
 
-#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
-msgid "Landscape"
-msgstr "ºáÏò"
+#: ../src/common/paper.cpp:187
+msgid "Japanese Envelope Chou #3 Rotated"
+msgstr "日本 Chou 3 信封(横向)"
 
-#: ../src/common/paper.cpp:122
-msgid "Ledger, 17 x 11 in"
-msgstr "Ledger, 17 x 11 Ó¢´ç"
+#: ../src/common/paper.cpp:175
+msgid "Japanese Envelope Chou #4"
+msgstr "日本 Chou 4 信封"
 
-#: ../src/generic/prntdlgg.cpp:650
-msgid "Left margin (mm):"
-msgstr "×ó±ß¾à (ºÁÃ×):"
+#: ../src/common/paper.cpp:188
+msgid "Japanese Envelope Chou #4 Rotated"
+msgstr "日本 Chou 4 信封(横向)"
 
-#: ../src/common/paper.cpp:115
-msgid "Legal, 8 1/2 x 14 in"
-msgstr "Legal, 8 1/2 x 14 Ó¢´ç"
+#: ../src/common/paper.cpp:172
+msgid "Japanese Envelope Kaku #2"
+msgstr "日本 Kaku 2 信封"
 
-#: ../src/common/paper.cpp:120
-msgid "Letter Small, 8 1/2 x 11 in"
-msgstr "Letter Small, 8 1/2 x 11 Ó¢´ç"
+#: ../src/common/paper.cpp:185
+msgid "Japanese Envelope Kaku #2 Rotated"
+msgstr "日本 Kaku 2 信封(横向)"
 
-#: ../src/common/paper.cpp:114
-msgid "Letter, 8 1/2 x 11 in"
-msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
+#: ../src/common/paper.cpp:173
+msgid "Japanese Envelope Kaku #3"
+msgstr "日本 Kaku 3 信封"
 
-#: ../src/generic/fontdlgg.cpp:230
-msgid "Light"
-msgstr "Çá"
+#: ../src/common/paper.cpp:186
+msgid "Japanese Envelope Kaku #3 Rotated"
+msgstr "日本 Kaku 3 信封(横向)"
 
-#: ../src/html/chm.cpp:806
-msgid "Link contained '//', converted to absolute link."
-msgstr ""
+#: ../src/common/paper.cpp:192
+msgid "Japanese Envelope You #4"
+msgstr "日本 You 4 信封"
 
-#: ../src/common/fldlgcmn.cpp:290
+#: ../src/common/paper.cpp:193
+msgid "Japanese Envelope You #4 Rotated"
+msgstr "日本 You 4 信封(横向)"
+
+#: ../src/common/paper.cpp:145
+msgid "Japanese Postcard 100 x 148 mm"
+msgstr "日本明信片, 100 x 148 毫米"
+
+#: ../src/common/paper.cpp:182
+msgid "Japanese Postcard Rotated 148 x 100 mm"
+msgstr "横向日本明信片, 148 x 100 毫米"
+
+#: ../src/common/stockitem.cpp:128
+msgid "Justified"
+msgstr "分散对齐"
+
+#: ../src/common/fmapbase.cpp:119
+msgid "KOI8-R"
+msgstr "KOI8-R"
+
+#: ../src/common/fmapbase.cpp:120
+msgid "KOI8-U"
+msgstr "KOI8-U"
+
+#: ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:867
+msgid "Landscape"
+msgstr "横向"
+
+#: ../src/common/paper.cpp:110
+msgid "Ledger, 17 x 11 in"
+msgstr "帐簿, 17 x 11 英寸"
+
+#: ../src/generic/prntdlgg.cpp:879
+msgid "Left margin (mm):"
+msgstr "左边距 (毫米):"
+
+#: ../src/common/paper.cpp:151
+msgid "Legal Extra 9 1/2 x 15 in"
+msgstr "特大法律纸张, 9 1/2 x 15 英寸"
+
+#: ../src/common/paper.cpp:103
+msgid "Legal, 8 1/2 x 14 in"
+msgstr "标准法律纸张, 8 1/2 x 14 英寸"
+
+#: ../src/common/paper.cpp:150
+msgid "Letter Extra 9 1/2 x 12 in"
+msgstr "特大信纸, 9 1/2 x 12 英寸"
+
+#: ../src/common/paper.cpp:156
+msgid "Letter Extra Transverse 9.275 x 12 in"
+msgstr "特大信纸(横排), 9.275 x 12 英寸"
+
+#: ../src/common/paper.cpp:159
+msgid "Letter Plus 8 1/2 x 12.69 in"
+msgstr "加大信纸, 8 1/2 x 12.69 英寸"
+
+#: ../src/common/paper.cpp:176
+msgid "Letter Rotated 11 x 8 1/2 in"
+msgstr "横向信纸, 11 x 8 1/2 英寸"
+
+#: ../src/common/paper.cpp:108
+msgid "Letter Small, 8 1/2 x 11 in"
+msgstr "信纸(小), 8 1/2 x 11 英寸"
+
+#: ../src/common/paper.cpp:154
+msgid "Letter Transverse 8 1/2 x 11 in"
+msgstr "信纸(横排), 8 1/2 x 11 英寸"
+
+#: ../src/common/paper.cpp:102
+msgid "Letter, 8 1/2 x 11 in"
+msgstr "信纸, 8 1/2 x 11 英寸"
+
+#: ../src/generic/fontdlgg.cpp:236
+msgid "Light"
+msgstr "细"
+
+#: ../src/html/chm.cpp:820
+msgid "Link contained '//', converted to absolute link."
+msgstr "链接包含 '//', 转换为绝对链接."
+
+#: ../src/common/fldlgcmn.cpp:257
 #, c-format
 msgid "Load %s file"
-msgstr "×°ÈëÎļþ %s "
+msgstr "装入文件 %s "
 
-#: ../src/html/htmlwin.cpp:390
+#: ../src/html/htmlwin.cpp:416
 msgid "Loading : "
-msgstr "×°ÔØ:"
+msgstr "装载: "
 
-#: ../src/common/imagpnm.cpp:72
-msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "×°Èë»Ò¶È Ascii PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
+#: ../src/unix/snglinst.cpp:251
+#, c-format
+msgid "Lock file '%s' has incorrect owner."
+msgstr "锁文件 '%s' 没有正确的所有者."
 
-#: ../src/common/imagpnm.cpp:75
-msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
+#: ../src/unix/snglinst.cpp:256
+#, c-format
+msgid "Lock file '%s' has incorrect permissions."
+msgstr "锁文件 '%s' 没有正确的权限."
 
-#: ../src/generic/logg.cpp:569
+#: ../src/generic/logg.cpp:572
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
+msgstr "日志保存到文件 '%s'."
 
-#: ../include/wx/xti.h:500 ../include/wx/xti.h:504
+#: ../include/wx/xti.h:501
+#: ../include/wx/xti.h:505
 msgid "Long Conversions not supported"
-msgstr ""
+msgstr "不支持长转换"
 
-#: ../src/gtk/mdi.cpp:442
+#: ../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
-#, fuzzy
-msgid ""
-"MS HTML Help functions are unavailable because the MS HTML Help library is "
-"not installed on this machine. Please install it."
-msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
+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:4678
+#: ../src/univ/themes/win32.cpp:4929
 msgid "Ma&ximize"
-msgstr ""
+msgstr "最大化(&x)"
 
 #: ../src/unix/mimetype.cpp:2671
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
-msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ."
+msgstr "Mailcap 文件 %s, 行 %d: 不完整条目被忽略."
 
-#: ../src/generic/fdrepdlg.cpp:146
+#: ../src/generic/fdrepdlg.cpp:153
 msgid "Match case"
-msgstr ""
+msgstr "区分大小写"
 
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!"
+msgstr "内存 VFS 已包含文件 '%s'!"
+
+#: ../src/msw/frame.cpp:374
+msgid "Menu"
+msgstr "菜单"
 
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"
-msgstr ""
+msgstr "金属主题"
 
-#: ../src/univ/themes/win32.cpp:4676
+#: ../src/univ/themes/win32.cpp:4927
 msgid "Mi&nimize"
-msgstr ""
+msgstr "最小化(&n)"
 
 #: ../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:165
 #, c-format
 msgid "Mode %ix%i-%i not available."
-msgstr ""
+msgstr "显示模式 %ix%i-%i位色 不支持."
 
-#: ../src/generic/fontdlgg.cpp:222
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Modern"
-msgstr "ÏÖ´ú"
+msgstr "现代"
 
-#: ../src/generic/filedlgg.cpp:426
+#: ../src/generic/filedlgg.cpp:434
 msgid "Modified"
-msgstr ""
+msgstr "修改日期"
 
-#: ../src/common/paper.cpp:150
-msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
-msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
+#: ../src/common/module.cpp:77
+#, c-format
+msgid "Module \"%s\" initialization failed"
+msgstr "模块 \"%s\" 初始化失败"
 
-#: ../src/common/dlgcmn.cpp:233
-msgid "More..."
-msgstr "¸ü¶à..."
+#: ../src/common/paper.cpp:138
+msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
+msgstr "7.75信封, 3 7/8 x 7 1/2 英寸"
 
-#: ../contrib/src/gizmos/editlbox.cpp:165
+#: ../contrib/src/gizmos/editlbox.cpp:162
 msgid "Move down"
-msgstr ""
+msgstr "下移"
 
-#: ../contrib/src/gizmos/editlbox.cpp:164
+#: ../contrib/src/gizmos/editlbox.cpp:161
 msgid "Move up"
-msgstr ""
+msgstr "上移"
 
-#: ../src/generic/filedlgg.cpp:423
+#: ../src/generic/filedlgg.cpp:431
 msgid "Name"
-msgstr "Ãû³Æ"
+msgstr "名称"
 
-#: ../contrib/src/gizmos/editlbox.cpp:162
+#: ../src/generic/dirdlgg.cpp:109
+msgid "New directory"
+msgstr "新目录"
+
+#: ../contrib/src/gizmos/editlbox.cpp:159
 msgid "New item"
-msgstr ""
+msgstr "新项目"
 
-#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:600 ../src/generic/filedlgg.cpp:609
+#: ../src/generic/dirdlgg.cpp:316
+#: ../src/generic/dirdlgg.cpp:326
+#: ../src/generic/filedlgg.cpp:608
+#: ../src/generic/filedlgg.cpp:617
 msgid "NewName"
-msgstr "ÐÂÃû"
+msgstr "新名称"
 
-#: ../src/html/helpfrm.cpp:572
+#: ../src/generic/tipdlg.cpp:305
+msgid "Next"
+msgstr "下一个"
+
+#: ../src/html/helpfrm.cpp:665
 msgid "Next page"
-msgstr "ÏÂÒ»Ò³"
+msgstr "下一页"
 
-#: ../src/common/dlgcmn.cpp:213 ../src/motif/msgdlg.cpp:185
+#: ../src/mac/carbon/msgdlg.cpp:58
+#: ../src/mac/carbon/msgdlg.cpp:143
+#: ../src/mac/classic/msgdlg.cpp:56
+#: ../src/mac/classic/msgdlg.cpp:140
+#: ../src/motif/msgdlg.cpp:204
 msgid "No"
-msgstr "·ñ"
+msgstr "否"
 
-#: ../src/common/image.cpp:908
-msgid "No Unused Color in image being masked"
-msgstr ""
+#: ../contrib/src/deprecated/resource.cpp:2495
+#: ../contrib/src/deprecated/resource.cpp:2649
+msgid "No XBM facility available!"
+msgstr "没有可用的XBM工具!"
 
-#: ../src/generic/helpext.cpp:436
+#: ../contrib/src/deprecated/resource.cpp:2667
+msgid "No XPM icon facility available!"
+msgstr "没有可用的XPM图标设备!"
+
+#: ../src/generic/helpext.cpp:437
 msgid "No entries found."
-msgstr "ûÕÒµ½ÌõÄ¿"
+msgstr "没找到条目"
 
-#: ../src/common/fontmap.cpp:402
-#, fuzzy, c-format
+#: ../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"
-"Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
-"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"
+"但发现另一替代编码 '%s'.\n"
+"是否使用该编码(否则您必须选择另外的编码)?"
 
-#: ../src/common/fontmap.cpp:407
-#, fuzzy, c-format
+#: ../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"
-"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
+"编码 '%s' 的字体未找到, 无法显示文本.\n"
+"请选择用于该编码的字体\n"
+"(否则该编码的文本将不能正确显示)?"
 
-#: ../contrib/src/xrc/xmlres.cpp:606
+#: ../src/xrc/xmlres.cpp:677
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
-msgstr ""
+msgstr "没有找到XML节点 '%s', 类 '%s' 的处理器!"
 
-#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1505
+#: ../src/common/image.cpp:1548
 msgid "No handler found for image type."
-msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
+msgstr "没有找到图像类型处理器."
 
-#: ../src/common/image.cpp:1170 ../src/common/image.cpp:1213
-#: ../src/common/image.cpp:1247
+#: ../src/common/image.cpp:1513
+#: ../src/common/image.cpp:1556
+#: ../src/common/image.cpp:1589
 #, c-format
 msgid "No image handler for type %d defined."
-msgstr "ûÓÐÀàÐÍ %d µÄͼÏñ´¦ÀíÆ÷."
+msgstr "没有类型 %d 的图像处理器."
 
-#: ../src/common/image.cpp:1231 ../src/common/image.cpp:1263
+#: ../src/common/image.cpp:1574
+#: ../src/common/image.cpp:1604
 #, c-format
 msgid "No image handler for type %s defined."
-msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
+msgstr "没有类型 %s的图像处理器."
 
-#: ../src/html/helpfrm.cpp:719
+#: ../src/html/helpfrm.cpp:869
 msgid "No matching page found yet"
-msgstr "No matching page found yet"
+msgstr "还没有找到匹配页"
 
 #: ../src/unix/sound.cpp:89
-#, fuzzy
 msgid "No sound"
-msgstr "ûÕÒµ½ÌõÄ¿"
+msgstr "没有声音"
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/image.cpp:1200
+#: ../src/common/image.cpp:1239
+msgid "No unused colour in image being masked."
+msgstr "图像中没有被掩码的未用颜色."
+
+#: ../src/common/image.cpp:1997
+msgid "No unused colour in image."
+msgstr "图像中没有未用的颜色."
+
+#: ../src/common/fmapbase.cpp:113
 msgid "Nordic (ISO-8859-10)"
-msgstr "Nordic (ISO-8859-10)"
+msgstr "日尔曼语 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:226 ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:235
 msgid "Normal"
-msgstr "Õý³£"
+msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:1104
+#: ../src/html/helpfrm.cpp:1273
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr ""
+msgstr "正常字体<br> 且 <u>带下划线</u>."
 
-#: ../src/html/helpfrm.cpp:1048
+#: ../src/html/helpfrm.cpp:1218
 msgid "Normal font:"
-msgstr "Normal font:"
+msgstr "正常字体:"
 
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:122
 msgid "Note, 8 1/2 x 11 in"
-msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç"
+msgstr "笔记簿, 8 1/2 x 11 英寸"
 
-#: ../src/common/dlgcmn.cpp:219 ../src/generic/dirdlgg.cpp:153
-#: ../src/generic/filedlgg.cpp:995 ../src/generic/filedlgg.cpp:1006
-#: ../src/generic/fontdlgg.cpp:253 ../src/generic/logg.cpp:752
-#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:141 ../src/html/helpfrm.cpp:1073
+#: ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:194
+#: ../contrib/src/deprecated/proplist.cpp:506
 msgid "OK"
-msgstr "È·ÈÏ"
+msgstr "确认"
 
 #: ../src/common/xtixml.cpp:263
 msgid "Objects must have an id attribute"
-msgstr ""
+msgstr "对象必须有一个id属性"
 
-#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1269
+#: ../src/common/docview.cpp:1619
 msgid "Open File"
-msgstr ""
+msgstr "打开文件"
 
-#: ../src/html/helpfrm.cpp:580 ../src/html/helpfrm.cpp:1413
+#: ../src/html/helpfrm.cpp:673
+#: ../src/html/helpfrm.cpp:1579
 msgid "Open HTML document"
-msgstr "´ò¿ªHTMLÎĵµ"
+msgstr "打开HTML文档"
 
-#: ../src/generic/dirctrlg.cpp:714 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:624 ../src/generic/filedlgg.cpp:764
+#: ../src/generic/dbgrptg.cpp:158
+#, c-format
+msgid "Open file \"%s\""
+msgstr "打开文件 \"%s\""
+
+#: ../src/generic/dirctrlg.cpp:718
+#: ../src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:632
+#: ../src/generic/filedlgg.cpp:772
 msgid "Operation not permitted."
-msgstr "²»ÔÊÐíµÄ²Ù×÷."
+msgstr "不允许的操作."
 
-#: ../src/common/cmdline.cpp:676
+#: ../src/common/cmdline.cpp:702
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
-msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
+msgstr "选项 '%s' 要求一个值, 期望 '='."
 
-#: ../src/common/cmdline.cpp:696
+#: ../src/common/cmdline.cpp:722
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
+msgstr "选项 '%s' 需要值."
 
-#: ../src/common/cmdline.cpp:758
+#: ../src/common/cmdline.cpp:784
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
-msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
+msgstr "选项 '%s': '%s' 不能转成日期."
 
-#: ../src/generic/prntdlgg.cpp:434
+#: ../src/generic/dirdlgg.cpp:116
+#: ../src/generic/prntdlgg.cpp:614
 msgid "Options"
-msgstr "Ñ¡Ïî"
+msgstr "选项"
 
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:611
+#: ../src/generic/prntdlgg.cpp:868
 msgid "Orientation"
-msgstr "·½Ïò"
+msgstr "方向"
 
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/imagpcx.cpp:462
+#: ../src/common/imagpcx.cpp:485
 msgid "PCX: couldn't allocate memory"
-msgstr "PCX: ²»ÄÜ·ÖÅäÄÚ´æ"
+msgstr "PCX: 不能分配内存"
 
 #: ../src/common/imagpcx.cpp:461
 msgid "PCX: image format unsupported"
-msgstr "PCX: ͼÏñ¸ñʽ²»Ö§³Ö"
+msgstr "PCX: 图像格式不支持"
 
 #: ../src/common/imagpcx.cpp:484
 msgid "PCX: invalid image"
-msgstr "PCX: ÎÞЧͼÏñ"
+msgstr "PCX: 无效图像"
 
 #: ../src/common/imagpcx.cpp:448
 msgid "PCX: this is not a PCX file."
-msgstr "PCX: ²»ÊÇPCXÎļþ."
+msgstr "PCX: 不是PCX文件."
 
-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:464
+#: ../src/common/imagpcx.cpp:486
 msgid "PCX: unknown error !!!"
-msgstr "PCX: δ֪´íÎó !!!"
+msgstr "PCX: 未知错误 !!!"
 
 #: ../src/common/imagpcx.cpp:463
 msgid "PCX: version number too low"
-msgstr "PCX: °æ±¾ºÅ̫С"
+msgstr "PCX: 版本号太小"
 
-#: ../src/common/imagpnm.cpp:96
+#: ../src/common/imagpnm.cpp:92
 msgid "PNM: Couldn't allocate memory."
-msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
+msgstr "PNM: 不能分配内存."
 
-#: ../src/common/imagpnm.cpp:80
+#: ../src/common/imagpnm.cpp:76
 msgid "PNM: File format is not recognized."
-msgstr "PNM: ²»ÄÜʶ±ðµÄÎļþ¸ñʽ."
+msgstr "PNM: 不能识别的文件格式."
 
-#: ../src/common/imagpnm.cpp:112
+#: ../src/common/imagpnm.cpp:108
+#: ../src/common/imagpnm.cpp:125
+#: ../src/common/imagpnm.cpp:142
 msgid "PNM: File seems truncated."
-msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
+msgstr "PNM: 文件似乎已被截断."
+
+#: ../src/common/paper.cpp:194
+msgid "PRC 16K 146 x 215 mm"
+msgstr "中国 16开 纸, 146 x 215 毫米"
+
+#: ../src/common/paper.cpp:207
+msgid "PRC 16K Rotated"
+msgstr "中国 16开 纸张(横向)"
+
+#: ../src/common/paper.cpp:195
+msgid "PRC 32K 97 x 151 mm"
+msgstr "中国 32开 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:208
+msgid "PRC 32K Rotated"
+msgstr "中国 32开 纸张(横向)"
+
+#: ../src/common/paper.cpp:196
+msgid "PRC 32K(Big) 97 x 151 mm"
+msgstr "中国 32开(大) 纸, 97 x 151 毫米"
+
+#: ../src/common/paper.cpp:209
+msgid "PRC 32K(Big) Rotated"
+msgstr "中国 32开(大) 纸张(横向)"
+
+#: ../src/common/paper.cpp:197
+msgid "PRC Envelope #1 102 x 165 mm"
+msgstr "中国标准信封1#, 102 x 165 毫米"
+
+#: ../src/common/paper.cpp:210
+msgid "PRC Envelope #1 Rotated 165 x 102 mm"
+msgstr "中国标准信封1#(横向), 165 x 102 毫米"
+
+#: ../src/common/paper.cpp:206
+msgid "PRC Envelope #10 324 x 458 mm"
+msgstr "中国标准信封10#, 324 x 458 毫米"
+
+#: ../src/common/paper.cpp:219
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中国标准信封10#(横向), 458 x 324 毫米"
+
+#: ../src/common/paper.cpp:198
+msgid "PRC Envelope #2 102 x 176 mm"
+msgstr "中国标准信封2#, 102 x 176 毫米"
+
+#: ../src/common/paper.cpp:211
+msgid "PRC Envelope #2 Rotated 176 x 102 mm"
+msgstr "中国标准信封2#(横向), 176 x 102 毫米"
+
+#: ../src/common/paper.cpp:199
+msgid "PRC Envelope #3 125 x 176 mm"
+msgstr "中国标准信封3#, 125 x 176 毫米"
+
+#: ../src/common/paper.cpp:212
+msgid "PRC Envelope #3 Rotated 176 x 125 mm"
+msgstr "中国标准信封3#(横向), 176 x 125 毫米"
 
-#: ../src/common/prntbase.cpp:845
+#: ../src/common/paper.cpp:200
+msgid "PRC Envelope #4 110 x 208 mm"
+msgstr "中国标准信封4#, 110 x 208 毫米"
+
+#: ../src/common/paper.cpp:213
+msgid "PRC Envelope #4 Rotated 208 x 110 mm"
+msgstr "中国标准信封4#(横向), 208 x 110 毫米"
+
+#: ../src/common/paper.cpp:201
+msgid "PRC Envelope #5 110 x 220 mm"
+msgstr "中国标准信封5#, 110 x 220 毫米"
+
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #5 Rotated 220 x 110 mm"
+msgstr "中国标准信封5#(横向), 220 x 110 毫米"
+
+#: ../src/common/paper.cpp:202
+msgid "PRC Envelope #6 120 x 230 mm"
+msgstr "中国标准信封6#, 120 x 230 毫米"
+
+#: ../src/common/paper.cpp:215
+msgid "PRC Envelope #6 Rotated 230 x 120 mm"
+msgstr "中国标准信封6#(横向), 230 x 120 毫米"
+
+#: ../src/common/paper.cpp:203
+msgid "PRC Envelope #7 160 x 230 mm"
+msgstr "中国标准信封7#, 160 x 230 毫米"
+
+#: ../src/common/paper.cpp:216
+msgid "PRC Envelope #7 Rotated 230 x 160 mm"
+msgstr "中国标准信封7#(横向), 230 x 160 毫米"
+
+#: ../src/common/paper.cpp:204
+msgid "PRC Envelope #8 120 x 309 mm"
+msgstr "中国标准信封8#, 120 x 309 毫米"
+
+#: ../src/common/paper.cpp:217
+msgid "PRC Envelope #8 Rotated 309 x 120 mm"
+msgstr "中国标准信封8#(横向), 309 x 120 毫米"
+
+#: ../src/common/paper.cpp:205
+msgid "PRC Envelope #9 229 x 324 mm"
+msgstr "中国标准信封9#, 229 x 324 毫米"
+
+#: ../src/common/paper.cpp:218
+msgid "PRC Envelope #9 Rotated 324 x 229 mm"
+msgstr "中国标准信封9#(横向), 324 x 229 毫米"
+
+#: ../src/common/prntbase.cpp:1294
 #, c-format
 msgid "Page %d"
-msgstr "ҳ %d"
+msgstr "页 %d"
 
-#: ../src/common/prntbase.cpp:843
+#: ../src/common/prntbase.cpp:1292
 #, c-format
 msgid "Page %d of %d"
-msgstr "ҳ %d / %d"
+msgstr "页 %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:827
 msgid "Page Setup"
-msgstr "Ò³ÃæÉèÖÃ"
+msgstr "页面设置"
+
+#: ../src/common/prntbase.cpp:451
+#: ../src/gtk/gnome/gprint.cpp:540
+msgid "Page setup"
+msgstr "页面设置"
 
-#: ../src/generic/prntdlgg.cpp:158
+#: ../src/generic/prntdlgg.cpp:210
 msgid "Pages"
-msgstr "ҳ"
+msgstr "页"
 
-#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
-#: ../src/generic/prntdlgg.cpp:813
+#: ../src/generic/prntdlgg.cpp:800
+#: ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
-msgstr "Ö½ÕÅ´óС"
+msgstr "纸张大小"
 
-#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
-#: ../src/generic/prntdlgg.cpp:808
+#: ../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 ""
+msgstr "传递一个已注册的对象给SetObject"
 
 #: ../src/common/xtistrm.cpp:643
 msgid "Passing a already registered object to SetObjectName"
-msgstr ""
+msgstr "传递一个已注册的对象给SetObjectName"
 
-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+#: ../src/common/xtistrm.cpp:436
+#: ../src/common/xtistrm.cpp:656
 msgid "Passing an unkown object to GetObject"
-msgstr ""
+msgstr "传递一个未知对象给GetObject"
 
-#: ../src/generic/filedlgg.cpp:429
+#: ../src/generic/filedlgg.cpp:437
 msgid "Permissions"
-msgstr "ÔÊÐí"
+msgstr "允许"
 
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
-msgstr "¹ÜµÀ´´½¨Ê§°Ü"
+msgstr "管道创建失败"
 
-#: ../src/gtk/fontdlg.cpp:78
+#: ../src/gtk/fontdlg.cpp:81
 msgid "Please choose a valid font."
-msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
+msgstr "请选择一个有效的字体."
 
-#: ../src/generic/filedlgg.cpp:1252 ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1325
 msgid "Please choose an existing file."
-msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
+msgstr "请选择一个已存在的文件."
 
-#: ../src/msw/dialup.cpp:751
+#: ../src/html/helpfrm.cpp:813
+msgid "Please choose the page to display:"
+msgstr "请选择欲显示的页面:"
+
+#: ../src/msw/dialup.cpp:787
 msgid "Please choose which ISP do you want to connect to"
-msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
+msgstr "请选择你想连接的ISP"
 
-#: ../src/msw/listctrl.cpp:432
+#: ../src/msw/listctrl.cpp:444
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
+"请安装较新版本的comctl32.dll\n"
+"(至少需要4.70版, 您现有的版本是 %d.%02d),\n"
+"否则此程序无法正确运行."
 
-#: ../src/common/prntbase.cpp:112
+#: ../src/common/prntbase.cpp:313
 msgid "Please wait while printing\n"
-msgstr ""
+msgstr "在打印时请等待\n"
 
-#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:608
+#: ../src/generic/prntdlgg.cpp:866
 msgid "Portrait"
-msgstr "×ÝÏò"
+msgstr "纵向"
 
-#: ../src/generic/prntdlgg.cpp:270
+#: ../src/generic/prntdlgg.cpp:296
 msgid "PostScript file"
-msgstr "PostScriptÎļþ"
+msgstr "PostScript文件"
 
-#: ../src/html/helpfrm.cpp:1065
+#: ../src/generic/fontdlgg.cpp:348
+#: ../src/html/helpfrm.cpp:1235
 msgid "Preview:"
-msgstr "Ô¤ÀÀ£º"
+msgstr "预览:"
 
-#: ../src/html/helpfrm.cpp:569
+#: ../src/html/helpfrm.cpp:662
 msgid "Previous page"
-msgstr "ǰҳ"
+msgstr "前页"
 
-#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
+#: ../src/common/prntbase.cpp:393
+#: ../src/generic/prntdlgg.cpp:138
+#: ../src/generic/prntdlgg.cpp:151
+#: ../src/gtk/gnome/gprint.cpp:395
+#: ../src/gtk/gnome/gprint.cpp:407
 msgid "Print"
-msgstr "´òÓ¡"
+msgstr "打印"
 
-#: ../src/common/docview.cpp:963
+#: ../src/common/docview.cpp:1032
 msgid "Print Preview"
-msgstr "´òÓ¡Ô¤ÀÀ"
+msgstr "打印预览"
 
-#: ../src/common/prntbase.cpp:797 ../src/common/prntbase.cpp:823
+#: ../src/common/prntbase.cpp:1246
+#: ../src/common/prntbase.cpp:1272
 msgid "Print Preview Failure"
-msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
+msgstr "打印预览失败"
 
-#: ../src/generic/prntdlgg.cpp:166
+#: ../src/generic/prntdlgg.cpp:218
 msgid "Print Range"
-msgstr "´òÓ¡·¶Î§"
+msgstr "打印范围"
 
-#: ../src/generic/prntdlgg.cpp:408
+#: ../src/generic/prntdlgg.cpp:445
 msgid "Print Setup"
-msgstr "´òÓ¡ÉèÖÃ"
+msgstr "打印设置"
 
-#: ../src/generic/prntdlgg.cpp:442
+#: ../src/generic/prntdlgg.cpp:617
 msgid "Print in colour"
-msgstr "²ÊÉ«´òÓ¡"
+msgstr "彩色打印"
 
-#: ../src/generic/prntdlgg.cpp:444
+#: ../src/common/stockitem.cpp:138
+msgid "Print previe&w"
+msgstr "打印预览(&w)"
+
+#: ../src/gtk/gnome/gprint.cpp:785
+msgid "Print preview"
+msgstr "打印预览"
+
+#: ../src/generic/prntdlgg.cpp:626
 msgid "Print spooling"
-msgstr "´òÓ¡¼ÙÍÑ»ú"
+msgstr "打印假脱机"
 
-#: ../src/html/helpfrm.cpp:586
+#: ../src/html/helpfrm.cpp:679
 msgid "Print this page"
-msgstr "´òÓ¡±¾Ò³"
+msgstr "打印本页"
 
-#: ../src/generic/prntdlgg.cpp:144
+#: ../src/generic/prntdlgg.cpp:179
 msgid "Print to File"
-msgstr "´òÓ¡µ½Îļþ"
+msgstr "打印到文件"
 
-#: ../src/generic/prntdlgg.cpp:446
+#: ../src/generic/prntdlgg.cpp:489
+msgid "Printer"
+msgstr "打印机"
+
+#: ../src/generic/prntdlgg.cpp:629
 msgid "Printer command:"
-msgstr "´òÓ¡»úÃüÁî:"
+msgstr "打印机命令:"
 
-#: ../src/generic/prntdlgg.cpp:143
+#: ../src/generic/prntdlgg.cpp:174
 msgid "Printer options"
-msgstr "´òÓ¡»úÑ¡Ïî"
+msgstr "打印机选项"
 
-#: ../src/generic/prntdlgg.cpp:450
+#: ../src/generic/prntdlgg.cpp:641
 msgid "Printer options:"
-msgstr "´òÓ¡»úÑ¡Ïî:"
+msgstr "打印机选项:"
 
-#: ../src/generic/prntdlgg.cpp:683
+#: ../src/generic/prntdlgg.cpp:915
 msgid "Printer..."
-msgstr "´òÓ¡»ú..."
+msgstr "打印机..."
 
-#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
-#, fuzzy
+#: ../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:126
+#: ../src/common/prntbase.cpp:327
 msgid "Printing Error"
-msgstr "´òÓ¡³ö´í"
+msgstr "打印出错"
 
-#: ../src/generic/printps.cpp:244
+#: ../src/generic/printps.cpp:208
 #, c-format
 msgid "Printing page %d..."
-msgstr "ÕýÔÚ´òÓ¡Ò³ %d..."
+msgstr "正在打印页 %d..."
 
-#: ../src/generic/printps.cpp:204
+#: ../src/generic/printps.cpp:168
 msgid "Printing..."
-msgstr "´òÓ¡..."
+msgstr "打印..."
+
+#: ../src/common/debugrpt.cpp:546
+#, c-format
+msgid "Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr "处理调试报告失败, 文件被保存在目录 \"%s\" 中."
 
-#: ../src/common/log.cpp:468
+#: ../src/common/log.cpp:466
 msgid "Program aborted."
-msgstr "³ÌÐòÖÕÖ¹."
+msgstr "程序终止."
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:119
 msgid "Quarto, 215 x 275 mm"
-msgstr "ËÄ¿ª, 215 x 275 mm"
+msgstr "四开, 215 x 275 毫米"
 
-#: ../src/generic/logg.cpp:1118
+#: ../src/generic/logg.cpp:1165
 msgid "Question"
-msgstr "ÎÊÌâ"
+msgstr "问题"
 
-#: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
+#: ../src/common/ffile.cpp:125
+#: ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "¶ÁÎļþ '%s'³ö´í"
+msgstr "读文件 '%s'出错"
 
-#: ../contrib/src/xrc/xmlres.cpp:572
+#: ../src/common/prntbase.cpp:242
+msgid "Ready"
+msgstr "就绪"
+
+#: ../src/xrc/xmlres.cpp:643
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
-msgstr ""
+msgstr "ref=\"%s\"的引用对象节点不存在!"
 
-#: ../src/msw/registry.cpp:552
+#: ../src/common/stockitem.cpp:142
+msgid "Refresh"
+msgstr "刷新"
+
+#: ../src/msw/registry.cpp:560
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "×¢²á¼ü '%s' ÒÑ´æÔÚ."
+msgstr "注册键 '%s' 已存在."
 
-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:529
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "×¢²á¼ü '%s' ²»´æÔÚ, ²»ÄܸÄÃû."
+msgstr "注册键 '%s' 不存在, 不能改名."
 
-#: ../src/msw/registry.cpp:648
+#: ../src/msw/registry.cpp:661
 #, 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 ""
-"Õý¹æϵͳ²Ù×÷ÐèҪע²á¼ü '%s',\n"
-"ɾ³ýËü½«Ê¹ÏµÍ³½øÈë²»¿ÉÓÃ״̬:\n"
-"²Ù×÷ÖÕÖ¹."
+"正常的系统操作需要注册键 '%s',\n"
+"删除它将使系统进入不可用状态:\n"
+"操作终止."
 
-#: ../src/msw/registry.cpp:452
+#: ../src/msw/registry.cpp:456
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "×¢²áÖµ '%s' ÒÑ´æÔÚ."
+msgstr "注册值 '%s' 已存在."
 
-#: ../src/generic/helpext.cpp:441
+#: ../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/html/helpfrm.cpp:359
+#: ../src/common/stockitem.cpp:143
+msgid "Remove"
+msgstr "移除"
+
+#: ../src/html/helpfrm.cpp:445
 msgid "Remove current page from bookmarks"
-msgstr "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³"
+msgstr "从书签中移去当前页"
 
-#: ../src/common/rendcmn.cpp:193
+#: ../src/common/rendcmn.cpp:196
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr ""
+msgstr "渲染器(renderer) \"%s\"的版本 %d.%d不兼容, 无法加载."
 
-#: ../src/generic/fdrepdlg.cpp:171
-#, fuzzy
+#: ../src/common/stockitem.cpp:117
+msgid "Rep&lace"
+msgstr "替换(&l)"
+
+#: ../src/generic/fdrepdlg.cpp:188
 msgid "Replace &all"
-msgstr "Ìæ»»Îļþ '%s'?"
+msgstr "全部替换(&a)"
 
-#: ../src/generic/fdrepdlg.cpp:123
+#: ../src/generic/fdrepdlg.cpp:130
 msgid "Replace with:"
-msgstr ""
+msgstr "替换为:"
 
-#: ../contrib/src/xrc/xmlres.cpp:408
+#: ../src/xrc/xmlres.cpp:479
 msgid "Resource files must have same version number!"
-msgstr ""
+msgstr "资源文件必须有相同的版本号!"
 
-#: ../src/generic/prntdlgg.cpp:662
+#: ../src/common/stockitem.cpp:144
+msgid "Revert to Saved"
+msgstr "还原为上次保存的文件"
+
+#: ../src/generic/prntdlgg.cpp:891
 msgid "Right margin (mm):"
-msgstr "Óұ߾à (ºÁÃ×):"
+msgstr "右边距 (毫米):"
 
-#: ../src/generic/fontdlgg.cpp:220
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Roman"
-msgstr "ÂÞÂí"
+msgstr "罗马"
+
+#: ../src/common/sizer.cpp:1838
+msgid "Save"
+msgstr "保存"
 
-#: ../src/common/fldlgcmn.cpp:292
+#: ../src/common/fldlgcmn.cpp:259
 #, c-format
 msgid "Save %s file"
-msgstr "±£´æÎļþ %s "
+msgstr "保存文件 %s "
 
-#: ../src/common/docview.cpp:256
+#: ../src/common/stockitem.cpp:146
+msgid "Save &As..."
+msgstr "另存为(&A)..."
+
+#: ../src/common/docview.cpp:305
 msgid "Save as"
-msgstr "Áí´æΪ"
+msgstr "另存为"
 
-#: ../src/generic/logg.cpp:502
+#: ../src/generic/logg.cpp:505
 msgid "Save log contents to file"
-msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
+msgstr "把日志内容保存到文件"
 
-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Script"
 msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:445 ../src/html/helpfrm.cpp:460
+#: ../src/html/helpfrm.cpp:536
+#: ../src/html/helpfrm.cpp:551
 msgid "Search"
-msgstr "ËÑË÷"
+msgstr "搜索"
 
-#: ../src/html/helpfrm.cpp:447
-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:152
-#, fuzzy
+#: ../src/generic/fdrepdlg.cpp:166
 msgid "Search direction"
-msgstr "´´½¨Ä¿Â¼"
+msgstr "搜索方向"
 
-#: ../src/generic/fdrepdlg.cpp:111
-#, fuzzy
+#: ../src/generic/fdrepdlg.cpp:118
 msgid "Search for:"
-msgstr "ËÑË÷"
+msgstr "搜索:"
 
-#: ../src/html/helpfrm.cpp:893
+#: ../src/html/helpfrm.cpp:1060
 msgid "Search in all books"
-msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
+msgstr "搜索所有的书籍"
 
-#: ../src/html/helpfrm.cpp:718
+#: ../src/html/helpfrm.cpp:868
 msgid "Searching..."
-msgstr "ËÑË÷..."
+msgstr "搜索中..."
 
-#: ../src/generic/dirctrlg.cpp:596
+#: ../src/generic/dirctrlg.cpp:592
 msgid "Sections"
-msgstr "¶Î"
+msgstr "段"
 
-#: ../src/common/ffile.cpp:199
+#: ../src/common/ffile.cpp:222
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "Îļþ '%s'¶¨Î»´íÎó"
+msgstr "文件 '%s'定位错误"
 
-#: ../src/msw/textctrl.cpp:2039
-#, fuzzy
+#: ../src/common/ffile.cpp:212
+#, c-format
+msgid "Seek error on file '%s' (large files not supported by stdio)"
+msgstr "文件 '%s'定位错误 (stdio不支持大文件)"
+
+#: ../src/mac/carbon/textctrl.cpp:1078
+#: ../src/msw/textctrl.cpp:2068
 msgid "Select &All"
-msgstr "Ñ¡ÔñÎļþ"
+msgstr "全部选择(&A)"
 
-#: ../src/common/docview.cpp:1605
+#: ../src/common/docview.cpp:1699
 msgid "Select a document template"
-msgstr "Ñ¡ÔñÎĵµÄ£°å"
+msgstr "选择文档模板"
 
-#: ../src/common/docview.cpp:1682
+#: ../src/common/docview.cpp:1776
 msgid "Select a document view"
-msgstr "Ñ¡ÔñÎĵµÊÓͼ"
+msgstr "选择文档视图"
 
-#: ../src/common/docview.cpp:1485
+#: ../src/common/docview.cpp:1579
 msgid "Select a file"
-msgstr "Ñ¡ÔñÎļþ"
+msgstr "选择文件"
+
+#: ../src/motif/filedlg.cpp:226
+msgid "Selection"
+msgstr "选段"
 
-#: ../src/common/cmdline.cpp:713
+#: ../src/common/cmdline.cpp:739
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
+msgstr "期望在选项 '%s'后存在分隔符."
 
-#: ../include/wx/xti.h:839
+#: ../include/wx/xti.h:841
 msgid "SetProperty called w/o valid setter"
-msgstr ""
-
-#: ../src/common/dlgcmn.cpp:230
-msgid "Setup"
-msgstr "ÉèÖÃ"
+msgstr "调用SetProperty时未带有效的setter"
 
-#: ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:182
 msgid "Setup..."
-msgstr "ÉèÖÃ..."
+msgstr "设置..."
 
-#: ../src/msw/dialup.cpp:531
+#: ../src/msw/dialup.cpp:567
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
+msgstr "找到多个活动拨号连接, 随机选择一个."
 
-#: ../src/html/helpfrm.cpp:401
+#: ../src/html/helpfrm.cpp:493
 msgid "Show all"
-msgstr "ÏÔʾËùÓÐ"
+msgstr "全部显示"
 
-#: ../src/html/helpfrm.cpp:412
+#: ../src/html/helpfrm.cpp:504
 msgid "Show all items in index"
-msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
+msgstr "以索引方式显示所有项目"
 
-#: ../src/generic/dirdlgg.cpp:137
-#, fuzzy
+#: ../src/generic/dirdlgg.cpp:112
+#: ../src/generic/dirdlgg.cpp:175
 msgid "Show hidden directories"
-msgstr "ÏÔʾÒþ²ØÎļþ"
+msgstr "显示隐藏目录"
 
-#: ../src/generic/filedlgg.cpp:1012
+#: ../src/generic/filedlgg.cpp:1056
 msgid "Show hidden files"
-msgstr "ÏÔʾÒþ²ØÎļþ"
+msgstr "显示隐藏文件"
 
-#: ../src/html/helpfrm.cpp:553
+#: ../src/html/helpfrm.cpp:646
 msgid "Show/hide navigation panel"
-msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
+msgstr "显示/隐藏 导航面板"
+
+#: ../src/generic/fontdlgg.cpp:353
+#: ../src/generic/fontdlgg.cpp:355
+msgid "Shows the font preview."
+msgstr "显示字体预览."
 
-#: ../src/generic/filedlgg.cpp:424
+#: ../src/generic/filedlgg.cpp:432
 msgid "Size"
-msgstr "´óС"
+msgstr "大小"
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../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 "Çãб"
+msgstr "倾斜"
 
-#: ../src/common/docview.cpp:326
+#: ../src/common/docview.cpp:581
 msgid "Sorry, could not open this file for saving."
-msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþÒԱ㱣´æ¡£"
+msgstr "对不起, 不能打开文件供保存."
 
-#: ../src/common/docview.cpp:367 ../src/common/docview.cpp:380
-#: ../src/common/docview.cpp:1504
+#: ../src/common/docview.cpp:617
+#: ../src/common/docview.cpp:1598
 msgid "Sorry, could not open this file."
-msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
+msgstr "对不起, 不能打开文件."
 
-#: ../src/common/docview.cpp:333
+#: ../src/common/docview.cpp:588
 msgid "Sorry, could not save this file."
-msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
+msgstr "对不起, 不能保存文件."
 
-#: ../src/common/prntbase.cpp:797
+#: ../src/common/prntbase.cpp:1246
 msgid "Sorry, not enough memory to create a preview."
-msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
+msgstr "对不起, 没有足够内存创建预览."
 
-#: ../src/common/docview.cpp:959
+#: ../src/common/docview.cpp:1028
 msgid "Sorry, print preview needs a printer to be installed."
-msgstr ""
+msgstr "对不起, 需要先安装打印机才能创建打印预览."
 
-#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
-#, fuzzy
+#: ../src/common/docview.cpp:1268
+#: ../src/common/docview.cpp:1618
 msgid "Sorry, the format for this file is unknown."
-msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
+msgstr "对不起, 此文件的格式未知."
 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
-msgstr ""
+msgstr "声音数据为不支持的格式."
 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr ""
+msgstr "声音文件 '%s'为不支持的格式."
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:111
 msgid "Statement, 5 1/2 x 8 1/2 in"
-msgstr "Statement, 5 1/2 x 8 1/2 in"
+msgstr "报表用纸, 5 1/2 x 8 1/2 英寸"
 
-#: ../src/generic/logg.cpp:619
+#: ../src/generic/prntdlgg.cpp:198
+msgid "Status:"
+msgstr "状态:"
+
+#: ../src/generic/logg.cpp:622
 msgid "Status: "
-msgstr "״̬£º"
+msgstr "状态: "
 
 #: ../src/common/xtistrm.cpp:253
 msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr ""
+msgstr "不支持针对尚未形成流的对象的流委派"
 
 #: ../src/msw/colour.cpp:38
+#: ../src/palmos/colour.cpp:38
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
-msgstr ""
+msgstr "字符串 - 颜色: 错误的颜色: %s"
 
-#: ../include/wx/xti.h:427 ../include/wx/xti.h:431
+#: ../include/wx/xti.h:428
+#: ../include/wx/xti.h:432
 msgid "String conversions not supported"
-msgstr ""
+msgstr "不支持字符串装换"
 
-#: ../contrib/src/xrc/xmlres.cpp:680
+#: ../src/xrc/xmlres.cpp:750
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr ""
+msgstr "子类 '%s' 在资源 '%s'中不存在, 无法子类化!"
+
+#: ../src/common/paper.cpp:157
+msgid "SuperA/SuperA/A4 227 x 356 mm"
+msgstr "SuperA/SuperA/A4 纸张, 227 x 356 毫米"
 
-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/common/paper.cpp:158
+msgid "SuperB/SuperB/A3 305 x 487 mm"
+msgstr "SuperB/SuperB/A3 纸张, 305 x 487 毫米"
+
+#: ../src/generic/fontdlgg.cpp:230
 msgid "Swiss"
-msgstr "ÈðÊ¿"
+msgstr "瑞士"
 
-#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
-#: ../src/common/imagtiff.cpp:354
+#: ../src/common/imagtiff.cpp:165
+msgid "TIFF library error."
+msgstr "TIFF库错误."
+
+#: ../src/common/imagtiff.cpp:149
+msgid "TIFF library warning."
+msgstr "TIFF库警告."
+
+#: ../src/common/imagtiff.cpp:248
+#: ../src/common/imagtiff.cpp:259
+#: ../src/common/imagtiff.cpp:399
 msgid "TIFF: Couldn't allocate memory."
-msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ."
+msgstr "TIFF: 不能分配内存."
 
-#: ../src/common/imagtiff.cpp:203
+#: ../src/common/imagtiff.cpp:219
 msgid "TIFF: Error loading image."
-msgstr "TIFF: ×°ÔØͼÏñ´íÎó."
+msgstr "TIFF: 装载图像错误."
 
-#: ../src/common/imagtiff.cpp:254
+#: ../src/common/imagtiff.cpp:270
 msgid "TIFF: Error reading image."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgstr "TIFF: 读图像错误."
 
-#: ../src/common/imagtiff.cpp:331
+#: ../src/common/imagtiff.cpp:347
 msgid "TIFF: Error saving image."
-msgstr "TIFF: ±£´æͼÏñ´íÎó."
+msgstr "TIFF: 保存图像错误."
 
-#: ../src/common/imagtiff.cpp:378
+#: ../src/common/imagtiff.cpp:445
 msgid "TIFF: Error writing image."
-msgstr "TIFF:дͼÏñ´íÎó."
+msgstr "TIFF: 写图像错误."
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:152
+msgid "Tabloid Extra 11.69 x 18 in"
+msgstr "小报(特大), 11.69 x 18 英寸"
+
+#: ../src/common/paper.cpp:109
 msgid "Tabloid, 11 x 17 in"
-msgstr "Tabloid, 11 x 17 Ó¢´ç"
+msgstr "小报, 11 x 17 英寸"
 
-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Teletype"
-msgstr "µç´«´ò×Ö»ú"
+msgstr "电传打字机"
 
-#: ../src/common/docview.cpp:1606
+#: ../src/common/docview.cpp:1700
 msgid "Templates"
-msgstr "Ä£°å"
+msgstr "模板"
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/common/fmapbase.cpp:114
 msgid "Thai (ISO-8859-11)"
-msgstr "Ì©Óï (ISO-8859-11)"
+msgstr "泰语 (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:573
+#: ../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:189
+#: ../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"
-"´úÌæËü£¬»ò£¬Èç¹û²»ÄÜ\n"
-"±»Ìæ´úÑ¡Ôñ[È¡Ïû] "
+"未知字符集'%s'. 选择其它字符集\n"
+"代替它; 如果不能\n"
+"被替代则选择[取消] "
 
 #: ../src/msw/ole/dataobj.cpp:164
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
-msgstr "¼ôÌù°å¸ñʽ '%d' ²»´æÔÚ."
+msgstr "剪贴板格式 '%d' 不存在."
 
-#: ../src/generic/dirdlgg.cpp:188
-#, fuzzy, c-format
+#: ../src/generic/dirdlgg.cpp:224
+#, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"\n"
-"²»´æÔÚ\n"
-"ÏÖÔÚ´´½¨?"
+"目录 '%s'不存在\n"
+"现在创建?"
 
-#: ../src/common/docview.cpp:1859
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1949
+#, 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ÎļþÁбíÖÐÒÆÈ¥."
+"文件 '%s' 不能打开.\n"
+"已从最近使用的文件列表(MRU)中移去."
 
-#: ../src/common/docview.cpp:1869
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1959
+#, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
 msgstr ""
-"Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
-"ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
+"文件 '%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:926
+#: ../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' 包含了过多的\"..\"!"
+
+#: ../src/generic/dbgrptg.cpp:308
+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:857
+#: ../src/common/cmdline.cpp:883
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
+msgstr "必须的参数 '%s' 没有指定."
 
-#: ../src/common/textcmn.cpp:255
+#: ../src/common/textcmn.cpp:246
 msgid "The text couldn't be saved."
-msgstr "Îı¾²»Äܱ»±£´æ¡£"
+msgstr "文本不能被保存."
 
-#: ../src/common/cmdline.cpp:836
+#: ../src/common/cmdline.cpp:862
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
+msgstr "选项 '%s'的值必须被指定."
 
-#: ../src/msw/dialup.cpp:419
+#: ../src/msw/dialup.cpp:455
 #, 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:587
-msgid ""
-"There was a problem during page setup: you may need to set a default printer."
-msgstr ""
+#: ../src/html/htmprint.cpp:601
+msgid "There was a problem during page setup: you may need to set a default printer."
+msgstr "在页面建立时发生问题: 您可能需要设置一台默认的打印机."
 
-#: ../src/msw/thread.cpp:1207
-msgid ""
-"Thread module initialization failed: can not store value in thread local "
-"storage"
-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/unix/threadpsx.cpp:1596
+#: ../src/msw/thread.cpp:1206
+msgid "Thread module initialization failed: can not store value in thread local storage"
+msgstr "线程模块初始化失败: 不能在线程本地存储区中存放值"
+
+#: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
+msgstr "线程模块初始化失败: 创建线程键失败"
 
-#: ../src/msw/thread.cpp:1195
-msgid ""
-"Thread module initialization failed: impossible to allocate index in thread "
-"local storage"
-msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
+#: ../src/msw/thread.cpp:1194
+msgid "Thread module initialization failed: impossible to allocate index in thread local storage"
+msgstr "线程模块初始化失败: 不能在线程本地存储区中分配索引"
 
-#: ../src/unix/threadpsx.cpp:1107
+#: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
-msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
+msgstr "线程优先级设置被忽略."
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:184
 msgid "Tile &Horizontally"
-msgstr ""
+msgstr "水平排布(&H)"
 
-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:185
 msgid "Tile &Vertically"
-msgstr ""
+msgstr "垂直排布(&V)"
 
-#: ../src/msw/timer.cpp:111
-#, fuzzy
+#: ../src/common/ftp.cpp:635
+msgid "Timeout while waiting for FTP server to connect, try passive mode."
+msgstr "等待FTP服务器连接时超时, 请尝试用passive模式."
+
+#: ../src/msw/timer.cpp:116
+#: ../src/os2/timer.cpp:141
 msgid "Timer creation failed."
-msgstr "¹ÜµÀ´´½¨Ê§°Ü"
+msgstr "计时器创建失败"
 
-#: ../src/generic/tipdlg.cpp:205
+#: ../src/generic/tipdlg.cpp:220
 msgid "Tip of the Day"
-msgstr "ÿÈÕ¼¼ÇÉ"
+msgstr "每日技巧"
 
-#: ../src/generic/tipdlg.cpp:143
+#: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"
-msgstr "¶Ô²»Æð£¬Ã»ÓÐËùÐè¼¼ÇÉ!"
+msgstr "对不起, 没有所需技巧!"
 
-#: ../src/generic/prntdlgg.cpp:185
+#: ../src/generic/prntdlgg.cpp:237
 msgid "To:"
-msgstr "µ½:"
+msgstr "到:"
 
-#: ../src/common/imagpng.cpp:304
+#: ../src/common/imagpng.cpp:292
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr ""
+msgstr "PNG中的颜色数过多, 图像可能会有点模糊."
 
-#: ../src/generic/prntdlgg.cpp:651
+#: ../src/generic/prntdlgg.cpp:880
 msgid "Top margin (mm):"
-msgstr "ÉÏÒ³±ß¾à (ºÁÃ×):"
+msgstr "上页边距 (毫米):"
 
 #: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
-msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
+msgstr "试图从内存VFS中移去文件'%s', 但它并没有被装入内存!"
 
-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
+#: ../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/fmapbase.cpp:111
+#: ../src/common/fmapbase.cpp:112
 msgid "Turkish (ISO-8859-9)"
-msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
+msgstr "土耳其语 (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:425
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:433
 msgid "Type"
-msgstr "µç´«´ò×Ö»ú"
+msgstr "类型"
 
-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
+#: ../src/common/xtistrm.cpp:281
+#: ../src/common/xtixml.cpp:351
 #: ../src/common/xtixml.cpp:498
 msgid "Type must have enum - long conversion"
-msgstr ""
+msgstr "必须进行 enum - long 的类型转换"
 
-#: ../src/common/paper.cpp:152
+#: ../src/common/paper.cpp:140
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç"
+msgstr "美国标准复写簿, 14 7/8 x 11 英寸"
 
-#: ../src/html/htmlwin.cpp:378
+#: ../src/html/htmlwin.cpp:403
 #, c-format
 msgid "Unable to open requested HTML document: %s"
-msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
+msgstr "不能打开HTML文档: %s"
 
 #: ../src/unix/sound.cpp:376
 msgid "Unable to play sound asynchronously."
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:249
-msgid "Underline"
-msgstr "Ï»®Ïß"
-
-#: ../src/common/cmdline.cpp:800
+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
+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
+#: ../src/common/fmapbase.cpp:137
 msgid "Unicode 16 bit (UTF-16)"
-msgstr ""
+msgstr "16位的Unicode编码 (UTF-16)"
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:138
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
-msgstr ""
+msgstr "16位大字节序Unicode编码 (UTF-16BE)"
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:139
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
-msgstr ""
+msgstr "16位小字节序Unicode编码 (UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:140
 msgid "Unicode 32 bit (UTF-32)"
-msgstr ""
+msgstr "32位的Unicode编码 (UTF-32)"
 
-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:141
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
-msgstr ""
+msgstr "32位大字节序Unicode编码 (UTF-32BE)"
 
-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:142
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
-msgstr ""
+msgstr "32位小字节序Unicode编码 (UTF-32LE)"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:135
 msgid "Unicode 7 bit (UTF-7)"
-msgstr ""
+msgstr "7位的Unicode编码 (UTF-7)"
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:136
 msgid "Unicode 8 bit (UTF-8)"
-msgstr ""
+msgstr "8位的Unicode编码 (UTF-8)"
 
-#: ../src/msw/dde.cpp:1108
+#: ../src/msw/dde.cpp:1093
 #, c-format
 msgid "Unknown DDE error %08x"
-msgstr "δ֪ DDE ´íÎó %08x"
+msgstr "未知 DDE 错误 %08x"
 
 #: ../src/common/xtistrm.cpp:370
 msgid "Unknown Object passed to GetObjectClassInfo"
-msgstr ""
+msgstr "未知的对象被传递给GetObjectClassInfo"
 
-#: ../src/common/fmapbase.cpp:680
+#: ../src/unix/dlunix.cpp:275
+msgid "Unknown dynamic library error"
+msgstr "未知的动态库错误"
+
+#: ../src/common/fmapbase.cpp:695
 #, c-format
 msgid "Unknown encoding (%d)"
-msgstr "λÖñàÂë (%d)"
+msgstr "未知编码 (%d)"
 
 #: ../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:573
+#: ../src/common/cmdline.cpp:599
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "δ֪longÑ¡Ïî '%s'"
+msgstr "未知的长选项 '%s'"
 
-#: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
+#: ../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:750
+#: ../src/xrc/xmlres.cpp:823
 msgid "Unknown style flag "
-msgstr ""
+msgstr "未知的风格标志 "
 
 #: ../src/common/xtixml.cpp:324
-#, fuzzy, c-format
+#, c-format
 msgid "Unkown Property %s"
-msgstr "δ֪ѡÏî '%s'"
+msgstr "未知属性 %s"
 
-#: ../src/common/mimecmn.cpp:161
+#: ../src/common/mimecmn.cpp:163
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
+msgstr "类型 %s中有不配套的'{'."
 
-#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
-#: ../src/common/cmdproc.cpp:300
+#: ../src/common/cmdproc.cpp:261
+#: ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
-msgstr "δÃüÃûµÄÃüÁî"
+msgstr "未命名的命令"
+
+#: ../contrib/src/deprecated/resource.cpp:2367
+#, c-format
+msgid "Unrecognized style %s while parsing resource."
+msgstr "解析资源时遇到无法识别的风格 %s."
 
-#: ../src/msw/clipbrd.cpp:276 ../src/msw/clipbrd.cpp:448
+#: ../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 "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
+msgstr "不支持的剪贴板格式."
 
-#: ../src/common/appcmn.cpp:222
+#: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr ""
+msgstr "不支持的主题 '%s'."
 
-#: ../src/generic/fdrepdlg.cpp:151
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Up"
-msgstr ""
+msgstr "向上"
 
-#: ../src/common/cmdline.cpp:927
+#: ../src/common/cmdline.cpp:954
 #, c-format
 msgid "Usage: %s"
-msgstr "Ó÷¨: %s"
+msgstr "用法: %s"
 
-#: ../src/common/valtext.cpp:185
+#: ../src/common/valtext.cpp:181
 msgid "Validation conflict"
-msgstr "ÑéÖ¤³åÍ»"
+msgstr "验证冲突"
 
 #: ../contrib/src/mmedia/vidbase.cpp:65
 msgid "Video Output"
-msgstr ""
+msgstr "视频输出"
 
-#: ../src/generic/filedlgg.cpp:928
+#: ../src/generic/filedlgg.cpp:972
 msgid "View files as a detailed view"
-msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
+msgstr "按详细视图观看文件"
 
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/filedlgg.cpp:965
 msgid "View files as a list view"
-msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
+msgstr "按列表视图观看文件"
 
-#: ../src/common/docview.cpp:1683
+#: ../src/common/docview.cpp:1777
 msgid "Views"
-msgstr "ÊÓͼ"
+msgstr "视图"
 
 #: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
-msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü"
+msgstr "等待子过程终止失败"
 
-#: ../src/common/docview.cpp:463
+#: ../src/common/docview.cpp:461
 msgid "Warning"
-msgstr "¾¯¸æ"
+msgstr "警告"
 
-#: ../src/common/log.cpp:482
+#: ../src/common/log.cpp:480
 msgid "Warning: "
-msgstr "¾¯¸æ:"
+msgstr "警告: "
 
-#: ../src/html/htmlpars.cpp:393
+#: ../src/html/htmlpars.cpp:391
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "¾¯¸æ: ÊÓͼ´Ó¿ÕÕ»ÖÐÒÆÈ¥HTML±êÇ©´¦ÀíÆ÷."
+msgstr "警告: 试图从空栈中移去HTML标签处理器."
 
-#: ../src/common/fmapbase.cpp:103
-#, fuzzy
+#: ../src/common/fmapbase.cpp:104
 msgid "Western European (ISO-8859-1)"
-msgstr "West European (ISO-8859-1/Latin 1)"
+msgstr "西欧 (ISO-8859-1)"
 
-#: ../src/common/fmapbase.cpp:117
-#, fuzzy
+#: ../src/common/fmapbase.cpp:118
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "West European new (ISO-8859-15/Latin 0)"
+msgstr "西欧(带欧元符号) (ISO-8859-15)"
 
-#: ../src/generic/fdrepdlg.cpp:143
-#, fuzzy
+#: ../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:444
+#: ../src/html/helpfrm.cpp:535
 msgid "Whole words only"
-msgstr "½öΪÕû×Ö"
+msgstr "仅为整字"
 
-#: ../src/univ/themes/win32.cpp:1182
+#: ../src/univ/themes/win32.cpp:1235
 msgid "Win32 theme"
-msgstr ""
+msgstr "Win32主题(theme)"
 
-#: ../src/msw/utils.cpp:944
+#: ../src/msw/utils.cpp:1063
 msgid "Win32s on Windows 3.1"
-msgstr "Win32s on Windows 3.1"
+msgstr "Windows 3.1上的Win32s"
 
-#: ../src/msw/utils.cpp:948
+#: ../src/msw/utils.cpp:1112
 #, c-format
-msgid "Windows 9%c"
-msgstr "Windows 9%c"
+msgid "Windows 2000 (build %lu"
+msgstr "Windows 2000 (build %lu"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/msw/utils.cpp:1077
+msgid "Windows 95"
+msgstr "Windows 95"
+
+#: ../src/msw/utils.cpp:1073
+msgid "Windows 95 OSR2"
+msgstr "Windows 95 OSR2"
+
+#: ../src/msw/utils.cpp:1088
+msgid "Windows 98"
+msgstr "Windows 98"
+
+#: ../src/msw/utils.cpp:1084
+msgid "Windows 98 SE"
+msgstr "Windows 98 SE"
+
+#: ../src/msw/utils.cpp:1095
+#, c-format
+msgid "Windows 9x (%d.%d)"
+msgstr "Windows 9x (%d.%d)"
+
+#: ../src/common/fmapbase.cpp:132
 msgid "Windows Arabic (CP 1256)"
-msgstr "Windows Arabic (CP 1256)"
+msgstr "Windows 阿拉伯语 (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:133
 msgid "Windows Baltic (CP 1257)"
-msgstr "Windows Baltic (CP 1257)"
+msgstr "Windows 波罗的海语 (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:124
-#, fuzzy
+#: ../src/common/fmapbase.cpp:126
 msgid "Windows Central European (CP 1250)"
-msgstr "Windows Ï£²®À´ (CP 1255)"
+msgstr "Windows 中欧 (CP 1250)"
 
-#: ../src/common/fmapbase.cpp:121
+#: ../src/common/fmapbase.cpp:123
 msgid "Windows Chinese Simplified (CP 936)"
-msgstr ""
+msgstr "Windows 简体中文 (CP 936)"
 
-#: ../src/common/fmapbase.cpp:123
-#, fuzzy
+#: ../src/common/fmapbase.cpp:125
 msgid "Windows Chinese Traditional (CP 950)"
-msgstr "Windows Latin 1 (CP 1252)"
+msgstr "Windows 繁体中文 (CP 950)"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Cyrillic (CP 1251)"
-msgstr "Windows Cyrillic (CP 1251)"
+msgstr "Windows 西里尔语 (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Greek (CP 1253)"
-msgstr "Windows Greek (CP 1253)"
+msgstr "Windows 希腊语 (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Hebrew (CP 1255)"
-msgstr "Windows Ï£²®À´ (CP 1255)"
+msgstr "Windows 希伯来语 (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:120
-#, fuzzy
+#: ../src/common/fmapbase.cpp:122
 msgid "Windows Japanese (CP 932)"
-msgstr "Windows Greek (CP 1253)"
+msgstr "Windows 日语 (CP 932)"
 
-#: ../src/common/fmapbase.cpp:122
-#, fuzzy
+#: ../src/common/fmapbase.cpp:124
 msgid "Windows Korean (CP 949)"
-msgstr "Windows Greek (CP 1253)"
+msgstr "Windows 韩语 (CP 949)"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/msw/utils.cpp:1092
+msgid "Windows ME"
+msgstr "Windows ME"
+
+#: ../src/msw/utils.cpp:1127
+#, c-format
+msgid "Windows NT %lu.%lu (build %lu"
+msgstr "Windows NT %lu.%lu (build %lu"
+
+#: ../src/msw/utils.cpp:1120
+#, c-format
+msgid "Windows Server 2003 (build %lu"
+msgstr "Windows Server 2003 (build %lu"
+
+#: ../src/common/fmapbase.cpp:121
+msgid "Windows Thai (CP 874)"
+msgstr "Windows 泰国语 (CP 874)"
+
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Turkish (CP 1254)"
-msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
+msgstr "Windows 土耳其语 (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:126
-#, fuzzy
+#: ../src/common/fmapbase.cpp:128
 msgid "Windows Western European (CP 1252)"
-msgstr "Windows Latin 1 (CP 1252)"
+msgstr "Windows 西欧 (CP 1252)"
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/msw/utils.cpp:1116
+#, c-format
+msgid "Windows XP (build %lu"
+msgstr "Windows XP (build %lu"
+
+#: ../src/common/fmapbase.cpp:134
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
-#: ../src/common/ffile.cpp:146
+#: ../src/common/ffile.cpp:158
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "дÎļþ '%s'´íÎó"
+msgstr "写文件 '%s'错误"
 
-#: ../src/xml/xml.cpp:548
+#: ../src/xml/xml.cpp:562
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr ""
+msgstr "XML解析错误: '%s' 位于 行 %d"
 
-#: ../src/common/xpmdecod.cpp:776
+#: ../src/common/xpmdecod.cpp:774
 msgid "XPM: Malformed pixel data!"
-msgstr ""
+msgstr "XPM: 错误的象素数据!"
 
-#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:721
+#: ../src/common/xpmdecod.cpp:712
+#: ../src/common/xpmdecod.cpp:721
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
-msgstr ""
+msgstr "XPM: 错误的颜色定义 '%s'!"
 
-#: ../contrib/src/xrc/xmlres.cpp:508
-#, fuzzy, c-format
+#: ../src/xrc/xmlres.cpp:579
+#, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
-msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
+msgstr "没有找到XRC资源 '%s' （类 '%s')!"
 
-#: ../contrib/src/xrc/xmlres.cpp:910 ../contrib/src/xrc/xmlres.cpp:922
+#: ../src/xrc/xmlres.cpp:1080
+#: ../src/xrc/xmlres.cpp:1092
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
-msgstr ""
+msgstr "XRC资源: 不能从 '%s'创建位图."
 
-#: ../contrib/src/xrc/xmlres.cpp:870
+#: ../src/xrc/xmlres.cpp:1036
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
-msgstr ""
+msgstr "XRC资源: 错误的颜色 '%s' 对于 属性 '%s'."
 
-#: ../src/common/dlgcmn.cpp:208 ../src/motif/msgdlg.cpp:185
+#: ../src/mac/carbon/msgdlg.cpp:59
+#: ../src/mac/carbon/msgdlg.cpp:142
+#: ../src/mac/classic/msgdlg.cpp:57
+#: ../src/mac/classic/msgdlg.cpp:139
+#: ../src/motif/msgdlg.cpp:204
 msgid "Yes"
-msgstr "ÊÇ"
+msgstr "是"
 
-#: ../src/generic/dirdlgg.cpp:264
+#: ../src/generic/dirdlgg.cpp:306
 msgid "You cannot add a new directory to this section."
-msgstr "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼."
+msgstr "你不能向该项中加入新的目录."
 
-#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
-msgid "ZIP handler currently supports only local files!"
-msgstr ""
+#: ../src/common/stockitem.cpp:155
+msgid "Zoom &In"
+msgstr "放大(&I)"
 
-#: ../src/common/docview.cpp:2043
+#: ../src/common/stockitem.cpp:156
+msgid "Zoom &Out"
+msgstr "缩小(&O)"
+
+#: ../src/common/stockitem.cpp:154
+msgid "Zoom to &Fit"
+msgstr "缩放以适应窗口(&F)"
+
+#: ../src/common/docview.cpp:2133
 msgid "[EMPTY]"
-msgstr "[¿Õ]"
+msgstr "[空]"
 
-#: ../src/msw/dde.cpp:1075
+#: ../src/msw/dde.cpp:1060
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "DDEMLÓ¦ÓóÌÐòÒÑ´´½¨ÑÓʱraceÌõ¼þ."
+msgstr "DDEML应用程序已创建延时race条件."
 
-#: ../src/msw/dde.cpp:1063
+#: ../src/msw/dde.cpp:1048
 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 ""
-"ûÓе÷ÓÃDdeInitialize³õʼ»¯º¯Êý¾Íµ÷ÓÃDDEMLÆäËüº¯Êý,\n"
-"»ò´«¸øDDEMLº¯ÊýµÄÊÇ\n"
-"ÎÞЧµÄʵÀý±êʶ."
+"没有调用DdeInitialize初始化函数就调用DDEML其它函数,\n"
+"或传给DDEML函数的是\n"
+"无效的实例标识."
 
-#: ../src/msw/dde.cpp:1081
+#: ../src/msw/dde.cpp:1066
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "¿Í»§ÊÔͼ½¨Á¢µÄ»á»°ÒÑʧ°Ü."
+msgstr "客户试图建立的会话已失败."
 
-#: ../src/msw/dde.cpp:1078
+#: ../src/msw/dde.cpp:1063
 msgid "a memory allocation failed."
-msgstr "ÄÚ´æ·ÖÅäʧ°Ü."
+msgstr "内存分配失败."
 
-#: ../src/msw/dde.cpp:1072
+#: ../src/msw/dde.cpp:1057
 msgid "a parameter failed to be validated by the DDEML."
-msgstr "DDEML²ÎÊýÑé֤ʧ°Ü."
+msgstr "DDEML参数验证失败."
 
-#: ../src/msw/dde.cpp:1054
+#: ../src/msw/dde.cpp:1039
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "ͬ²½adviseÊÂÎñÇëÇóÒѳ¬Ê±."
+msgstr "同步advise事务请求已超时."
 
-#: ../src/msw/dde.cpp:1060
+#: ../src/msw/dde.cpp:1045
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "ͬ²½dataÊÂÎñÇëÇóÒѳ¬Ê±."
+msgstr "同步data事务请求已超时."
 
-#: ../src/msw/dde.cpp:1069
+#: ../src/msw/dde.cpp:1054
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "ͬ²½executeÊÂÎñÇëÇóÒѳ¬Ê±."
+msgstr "同步execute事务请求已超时."
 
-#: ../src/msw/dde.cpp:1087
+#: ../src/msw/dde.cpp:1072
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "ͬ²½pokeÊÂÎñÇëÇóÒѳ¬Ê±."
+msgstr "同步poke事务请求已超时."
 
-#: ../src/msw/dde.cpp:1102
+#: ../src/msw/dde.cpp:1087
 msgid "a request to end an advise transaction has timed out."
-msgstr "ÖÕÖ¹½¨ÒéÊÂÎñµÄÇëÇóÒѳ¬Ê±."
+msgstr "终止advise事务的请求已超时."
 
-#: ../src/msw/dde.cpp:1096
+#: ../src/msw/dde.cpp:1081
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
-"·þÎñÆ÷¶ËÊÂÎñÊÓͼ´¦Àí\n"
-"Òѱ»¿Í»§¶ËÖÕÖ¹µÄ»á»°, »ò·þÎñÆ÷\n"
-"ÔÚÍê³ÉÊÂÎñÇ°ÖÕÖ¹."
+"服务器端事务试图处理\n"
+"已被客户端终止的会话, 或服务器\n"
+"在完成事务前终止."
 
-#: ../src/msw/dde.cpp:1084
+#: ../src/msw/dde.cpp:1069
 msgid "a transaction failed."
-msgstr "ÊÂÎñʧ°Ü."
+msgstr "事务失败."
 
 #: ../src/common/menucmn.cpp:114
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1066
+#: ../src/msw/dde.cpp:1051
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""
-"³õʼ»¯ÎªAPPCLASS_MONITORµÄÓ¦ÓóÌÐò\n"
-"ÊÔͼִÐÐDDEÊÂÎñ,\n"
-"»ò³õʼ»¯ÎªAPPCMD_CLIENTONLYµÄÓ¦ÓóÌÐò\n"
-"ÊÓͼִÐзþÎñÆ÷ÊÂÎñ."
+"初始化为APPCLASS_MONITOR的应用程序\n"
+"试图执行DDE事务,\n"
+"或初始化为APPCMD_CLIENTONLY的应用程序\n"
+"视图执行服务器事务."
 
-#: ../src/msw/dde.cpp:1090
+#: ../src/msw/dde.cpp:1075
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "ÄÚ²¿µ÷ÓÃPostMessageʧ°Ü. "
+msgstr "内部调用PostMessage失败. "
 
-#: ../src/msw/dde.cpp:1099
+#: ../src/msw/dde.cpp:1084
 msgid "an internal error has occurred in the DDEML."
-msgstr "ÔÚDDEMLÖз¢ÉúÄÚ²¿´íÎó."
+msgstr "在DDEML中发生内部错误."
 
-#: ../src/msw/dde.cpp:1105
+#: ../src/msw/dde.cpp:1090
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
-"´«¸øDDEMLº¯ÊýµÄÊÇÎÞЧµÄÊÂÎñ±êʶ·û.\n"
-"Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
-"»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
+"传给DDEML函数的是无效的事务标识符.\n"
+"一旦应用程序从XTYP_XACT_COMPLETE回调函数返回,\n"
+"回调函数事务标识符就不再有效."
+
+#: ../src/common/zipstrm.cpp:1330
+#, fuzzy
+msgid "assuming this is a multi-part zip concatenated"
+msgstr "假定这是分段的zip文件"
 
-#: ../src/common/fileconf.cpp:1815
+#: ../src/common/fileconf.cpp:1847
 #, 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 ""
+msgstr "库函数参数错误"
 
 #: ../src/html/chm.cpp:342
 msgid "bad signature"
-msgstr ""
+msgstr "错误的签名"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/zipstrm.cpp:1580
+msgid "bad zipfile offset to entry"
+msgstr "zip文件中到条目的偏移值错误"
+
+#: ../src/common/ftp.cpp:385
 msgid "binary"
-msgstr ""
+msgstr "二进制"
 
-#: ../src/common/fontcmn.cpp:533
-#, fuzzy
+#: ../src/common/fontcmn.cpp:646
 msgid "bold"
-msgstr "´ÖÌå"
+msgstr "粗体"
 
-#: ../src/common/fontcmn.cpp:457
-#, fuzzy
+#: ../src/common/fontcmn.cpp:570
 msgid "bold "
-msgstr "´ÖÌå"
+msgstr "粗体 "
 
-#: ../src/common/ffile.cpp:79
+#: ../src/os2/iniconf.cpp:451
+#, fuzzy
+msgid "buffer is too small for Windows directory."
+msgstr "Windows目录的缓存太小."
+
+#: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
-msgstr "²»ÄܹرÕÎļþ '%s'"
+msgstr "不能关闭文件 '%s'"
 
-#: ../src/common/file.cpp:371
+#: ../src/common/file.cpp:286
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
+msgstr "不能关闭文件描述子 %d"
 
-#: ../src/common/file.cpp:729
+#: ../src/common/file.cpp:551
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
+msgstr "不能把修改提交给文件 '%s'"
 
-#: ../src/common/file.cpp:252
+#: ../src/common/file.cpp:217
 #, c-format
 msgid "can't create file '%s'"
-msgstr "²»ÄÜ´´½¨Îļþ '%s'"
+msgstr "不能创建文件 '%s'"
 
-#: ../src/common/fileconf.cpp:1106
+#: ../src/common/fileconf.cpp:1159
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
+msgstr "不能删除用户配置文件 '%s'"
 
-#: ../src/common/file.cpp:631
+#: ../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:585
+#: ../src/msdos/utilsdos.cpp:307
+#: ../src/msdos/utilsdos.cpp:466
+#, c-format
+msgid "can't execute '%s'"
+msgstr "执行 '%s'失败"
+
+#: ../src/common/zipstrm.cpp:1357
+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:368
+#: ../src/msw/utils.cpp:380
 msgid "can't find user's HOME, using current directory."
-msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
+msgstr "找不到用户的HOME目录, 使用当前目录."
 
-#: ../src/common/file.cpp:450
+#: ../src/common/file.cpp:341
 #, c-format
 msgid "can't flush file descriptor %d"
-msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
+msgstr "不能刷新文件描述子 %d"
 
-#: ../src/common/file.cpp:535 ../src/common/file.cpp:543
+#: ../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:306
+#: ../src/common/fontmap.cpp:326
 msgid "can't load any font, aborting"
-msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
+msgstr "不能装载任何字体, 正在中止"
 
-#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
+#: ../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:407
+#: ../src/common/fileconf.cpp:404
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
+msgstr "不能打开全局配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:422
+#: ../src/common/fileconf.cpp:419
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
+msgstr "不能打开用户配置文件 '%s'."
 
-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:1005
 msgid "can't open user configuration file."
-msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
+msgstr "不能打开用户配置文件."
 
-#: ../src/common/dynlib.cpp:445
+#: ../src/common/dynlib.cpp:253
 msgid "can't query for GUI plugins name in console applications"
-msgstr ""
+msgstr "无法在控制台程序里查询GUI插件"
+
+#: ../src/common/zipstrm.cpp:436
+msgid "can't re-initialize zlib deflate stream"
+msgstr "不能重新初始化zlib deflate(压缩)流."
 
-#: ../src/common/file.cpp:404
+#: ../src/common/zipstrm.cpp:461
+msgid "can't re-initialize zlib inflate stream"
+msgstr "不能重新初始化zlib inflate(解压)流."
+
+#: ../src/common/file.cpp:310
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
+msgstr "不能从文件描述子 %d中读"
 
-#: ../src/common/file.cpp:724
+#: ../src/common/file.cpp:546
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "²»ÄÜɾ³ýÎļþ '%s'"
+msgstr "不能删除文件 '%s'"
 
-#: ../src/common/file.cpp:740
+#: ../src/common/file.cpp:562
 #, c-format
 msgid "can't remove temporary file '%s'"
-msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
+msgstr "不能删除临时文件 '%s'"
 
-#: ../src/common/file.cpp:492 ../src/common/file.cpp:518
+#: ../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
-#, fuzzy, c-format
+#, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
+msgstr "不能把文件 '%s'写到磁盘."
 
-#: ../src/common/file.cpp:433
+#: ../src/common/file.cpp:326
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
+msgstr "不能写到文件描述子 %d"
 
-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:1016
 msgid "can't write user configuration file."
-msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
+msgstr "不能写用户配置文件."
 
-#: ../src/common/intl.cpp:1108
+#: ../src/common/intl.cpp:1110
 #, c-format
 msgid "catalog file for domain '%s' not found."
-msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ."
+msgstr "找不到域 '%s'的目录文件."
 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
-msgstr ""
+msgstr "校验和错误"
 
 #: ../src/html/chm.cpp:348
 msgid "compression error"
-msgstr ""
+msgstr "压缩错误"
 
 #: ../src/common/regex.cpp:141
 msgid "conversion to 8-bit encoding failed"
-msgstr ""
+msgstr "不能转换为8-bit编码"
 
 #: ../src/common/menucmn.cpp:112
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1067
+#: ../src/common/cmdline.cpp:1094
 msgid "date"
-msgstr "ÈÕÆÚ"
+msgstr "日期"
 
 #: ../src/html/chm.cpp:350
 msgid "decompression error"
-msgstr ""
+msgstr "解压缩错误"
 
-#: ../src/common/fmapbase.cpp:690 ../src/common/fmapbase.cpp:722
-#, fuzzy
+#: ../src/common/fmapbase.cpp:705
+#: ../src/common/fmapbase.cpp:737
 msgid "default"
-msgstr "alt"
+msgstr "缺省值"
 
 #: ../src/common/xtistrm.cpp:843
 msgid "delegate has no type info"
-msgstr ""
+msgstr "委派没有类型信息"
+
+#: ../src/common/debugrpt.cpp:524
+msgid "dump of the process state (binary)"
+msgstr "转储(dump)进程状态（二进制码）"
 
-#: ../src/common/datetime.cpp:3483
+#: ../src/common/datetime.cpp:3882
 msgid "eighteenth"
-msgstr "µÚÊ®°Ë"
+msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3473
+#: ../src/common/datetime.cpp:3872
 msgid "eighth"
-msgstr "µÚ°Ë"
+msgstr "第八"
 
-#: ../src/common/datetime.cpp:3476
+#: ../src/common/datetime.cpp:3875
 msgid "eleventh"
-msgstr "µÚʮһ"
+msgstr "第十一"
 
-#: ../src/common/strconv.cpp:1692
-#, fuzzy, c-format
+#: ../src/common/strconv.cpp:2671
+#, c-format
 msgid "encoding %s"
-msgstr "λÖñàÂë (%d)"
+msgstr "编码 %s"
 
-#: ../src/common/fileconf.cpp:1801
+#: ../src/common/fileconf.cpp:1833
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
-msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
+msgstr "条目 '%s' 在组 '%s'中已出现一次以上"
 
 #: ../src/html/chm.cpp:344
-#, fuzzy
 msgid "error in data format"
-msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
+msgstr "文件格式错误"
+
+#: ../src/msdos/utilsdos.cpp:407
+#, c-format
+msgid "error opening '%s'"
+msgstr "打开 '%s' 出错"
 
 #: ../src/html/chm.cpp:332
-#, fuzzy
 msgid "error opening file"
-msgstr "¶ÁÎļþ '%s'³ö´í"
+msgstr "打开文件出错"
+
+#: ../src/common/zipstrm.cpp:1442
+msgid "error reading zip central directory"
+msgstr "读zip中央目录时出错"
+
+#: ../src/common/zipstrm.cpp:1520
+msgid "error reading zip local header"
+msgstr "读zip本地头时出错"
+
+#: ../src/common/zipstrm.cpp:2236
+#, c-format
+msgid "error writing zip entry '%s': bad crc or length"
+msgstr "写zip条目 '%s'时出错: crc校验或长度错误"
 
-#: ../src/msw/dialup.cpp:845
+#: ../src/msw/dialup.cpp:881
 msgid "establish"
-msgstr "½¨Á¢"
+msgstr "建立"
 
-#: ../src/common/ffile.cpp:160
+#: ../src/common/ffile.cpp:172
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+msgstr "刷新文件 '%s'失败"
 
-#: ../src/common/datetime.cpp:3480
+#: ../src/common/datetime.cpp:3879
 msgid "fifteenth"
-msgstr "µÚÊ®Îå"
+msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3470
+#: ../src/common/datetime.cpp:3869
 msgid "fifth"
-msgstr "µÚÎå"
+msgstr "第五"
 
-#: ../src/common/fileconf.cpp:658
+#: ../src/common/fileconf.cpp:664
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
+msgstr "文件 '%s', 行 %d: 组头之后的 '%s' 被忽略."
 
-#: ../src/common/fileconf.cpp:687
+#: ../src/common/fileconf.cpp:693
 #, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
+msgstr "文件 '%s', 行 %d: 期待出现 '='."
 
-#: ../src/common/fileconf.cpp:710
+#: ../src/common/fileconf.cpp:716
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "Îļþ '%s', ÐÐ %d: ¼ü '%s' µÚÒ»´Î³öÏÖÔÚÐÐ %d."
+msgstr "文件 '%s', 行 %d: 键 '%s' 第一次出现在行 %d."
 
-#: ../src/common/fileconf.cpp:700
+#: ../src/common/fileconf.cpp:706
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
+msgstr "文件 '%s', 行 %d: 忽略不能修改键 '%s'的值."
 
-#: ../src/common/fileconf.cpp:622
+#: ../src/common/fileconf.cpp:628
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
+msgstr "文件 '%s': 非预期的字符 %c 存在于行 %d.中"
 
-#: ../src/common/datetime.cpp:3466
+#: ../src/common/datetime.cpp:3865
 msgid "first"
-msgstr "µÚÒ»"
+msgstr "第一"
 
-#: ../src/html/helpfrm.cpp:1093
-#, fuzzy
+#: ../src/html/helpfrm.cpp:1262
 msgid "font size"
-msgstr "×ÖÌå´óС:"
+msgstr "字体大小"
 
-#: ../src/common/datetime.cpp:3479
+#: ../src/common/datetime.cpp:3878
 msgid "fourteenth"
-msgstr "µÚÊ®ËÄ"
+msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3469
+#: ../src/common/datetime.cpp:3868
 msgid "fourth"
-msgstr "µÚËÄ"
+msgstr "第四"
 
-#: ../src/common/appbase.cpp:342
+#: ../src/common/appbase.cpp:367
 msgid "generate verbose log messages"
-msgstr ""
+msgstr "生成详细的日志信息"
 
 #: ../src/common/xtixml.cpp:479
 msgid "incorrect event handler string, missing dot"
-msgstr ""
+msgstr "错误的时间句柄字符串, 缺少点号('.')"
 
-#: ../src/msw/dialup.cpp:845
+#: ../src/msw/dialup.cpp:881
 msgid "initiate"
-msgstr "³õʼ»¯"
+msgstr "初始化"
 
-#: ../src/common/file.cpp:635
+#: ../src/common/file.cpp:459
 msgid "invalid eof() return value."
-msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
+msgstr "无效的eof()返回值."
 
-#: ../src/generic/logg.cpp:1132
+#: ../src/generic/logg.cpp:1179
 msgid "invalid message box return value"
-msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
+msgstr "消息框返回无效的值"
 
-#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1306
+msgid "invalid zip file"
+msgstr "无效的zip文件"
+
+#: ../src/common/fontcmn.cpp:586
+#: ../src/common/fontcmn.cpp:650
 msgid "italic"
-msgstr "бÌå"
+msgstr "斜体"
 
-#: ../src/common/fontcmn.cpp:529
+#: ../src/common/fontcmn.cpp:642
 #, fuzzy
 msgid "light"
-msgstr "Çá"
+msgstr "细"
 
-#: ../src/common/fontcmn.cpp:453
+#: ../src/common/fontcmn.cpp:566
 #, fuzzy
 msgid "light "
-msgstr "Çá"
+msgstr "细 "
 
-#: ../src/common/intl.cpp:1435
+#: ../src/common/intl.cpp:1456
 #, c-format
 msgid "locale '%s' can not be set."
-msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
+msgstr "不能设置语言(locale) '%s'."
 
 #: ../src/common/intl.cpp:1103
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
-msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
+msgstr "查找目录 '%s' 在路径 '%s'下."
 
-#: ../src/common/datetime.cpp:3630
+#: ../src/common/datetime.cpp:4029
 msgid "midnight"
-msgstr "ÎçÒ¹"
+msgstr "午夜"
 
-#: ../src/common/datetime.cpp:3484
+#: ../src/common/datetime.cpp:3883
 msgid "nineteenth"
-msgstr "µÚÊ®¾Å"
+msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3474
+#: ../src/common/datetime.cpp:3873
 msgid "ninth"
-msgstr "µÚ¾Å"
+msgstr "第九"
 
-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1035
 msgid "no DDE error."
-msgstr "ûÓÐDDE´íÎó"
+msgstr "没有DDE错误."
 
 #: ../src/html/chm.cpp:328
-#, fuzzy
 msgid "no error"
-msgstr "GIF: λÖôíÎó!!!"
+msgstr "没有错误"
 
-#: ../src/html/helpdata.cpp:603
+#: ../src/html/helpdata.cpp:662
 msgid "noname"
-msgstr "δÃû"
+msgstr "未名"
 
-#: ../src/common/datetime.cpp:3629
+#: ../src/common/datetime.cpp:4028
 msgid "noon"
-msgstr "ÖÐÎç"
+msgstr "中午"
 
-#: ../src/common/cmdline.cpp:1063
+#: ../src/common/cmdline.cpp:1090
 msgid "num"
 msgstr "num"
 
 #: ../src/common/xtixml.cpp:258
 msgid "objects cannot have XML Text Nodes"
-msgstr ""
+msgstr "对象不能有XML 文本节点"
 
 #: ../src/html/chm.cpp:340
-#, fuzzy
 msgid "out of memory"
-msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
+msgstr "内存耗尽"
+
+#: ../src/common/debugrpt.cpp:500
+msgid "process context description"
+msgstr "进程上下文描述"
 
 #: ../src/html/chm.cpp:334
-#, fuzzy
 msgid "read error"
-msgstr "Îļþ´íÎó"
+msgstr "读取错误"
 
-#: ../src/common/filename.cpp:178
+#: ../src/common/filename.cpp:181
 msgid "reading"
-msgstr ""
+msgstr "正在读入"
 
-#: ../src/msw/dde.cpp:1093
+#: ../src/common/zipstrm.cpp:1743
+#, c-format
+msgid "reading zip stream (entry %s): bad crc"
+msgstr "读入zip流 (条目 %s): crc校验错误"
+
+#: ../src/common/zipstrm.cpp:1740
+#, c-format
+msgid "reading zip stream (entry %s): bad length"
+msgstr "读入zip流 (条目 %s): 长度错误"
+
+#: ../src/msw/dde.cpp:1078
 msgid "reentrancy problem."
-msgstr "ÖØÈëÎÊÌâ"
+msgstr "重入问题."
 
-#: ../src/common/datetime.cpp:3467
+#: ../src/common/datetime.cpp:3866
 msgid "second"
-msgstr "µÚ¶þ"
+msgstr "第二"
 
 #: ../src/html/chm.cpp:338
-#, fuzzy
 msgid "seek error"
-msgstr "Îļþ´íÎó"
+msgstr "搜索错误"
 
-#: ../src/common/datetime.cpp:3482
+#: ../src/common/datetime.cpp:3881
 msgid "seventeenth"
-msgstr "µÚÊ®Æß"
+msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3472
+#: ../src/common/datetime.cpp:3871
 msgid "seventh"
-msgstr "µÚÆß"
+msgstr "第七"
 
 #: ../src/common/menucmn.cpp:116
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appbase.cpp:332
+#: ../src/common/appbase.cpp:357
 msgid "show this help message"
-msgstr ""
+msgstr "显示帮助信息"
 
-#: ../src/common/datetime.cpp:3481
+#: ../src/common/datetime.cpp:3880
 msgid "sixteenth"
-msgstr "µÚÊ®Áù"
+msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3471
+#: ../src/common/datetime.cpp:3870
 msgid "sixth"
-msgstr "µÚÁù"
+msgstr "第六"
 
-#: ../src/common/appcmn.cpp:193
+#: ../src/common/appcmn.cpp:203
 msgid "specify display mode to use (e.g. 640x480-16)"
-msgstr ""
+msgstr "指定使用的显示模式 (例如: 640x480-16位色)"
 
-#: ../src/common/appcmn.cpp:179
+#: ../src/common/appcmn.cpp:189
 msgid "specify the theme to use"
-msgstr ""
+msgstr "指定使用的主题(theme)"
+
+#: ../src/common/zipstrm.cpp:1646
+msgid "stored file length not in Zip header"
+msgstr "Zip头没有已存文件的长度信息"
 
-#: ../src/common/cmdline.cpp:1059
+#: ../src/common/cmdline.cpp:1086
 msgid "str"
 msgstr "str"
 
-#: ../src/common/datetime.cpp:3475
+#: ../src/common/datetime.cpp:3874
 msgid "tenth"
-msgstr "µÚÊ®"
+msgstr "第十"
 
-#: ../src/msw/dde.cpp:1057
+#: ../src/msw/dde.cpp:1042
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
-msgstr "¶ÔʼþµÄÏìÓ¦µ¼ÖÂDDE_FBUSYλ±»ÉèÖÃ."
+msgstr "对事件的响应导致DDE_FBUSY位被设置."
 
-#: ../src/common/datetime.cpp:3468
+#: ../src/common/datetime.cpp:3867
 msgid "third"
-msgstr "µÚÈý"
+msgstr "第三"
 
-#: ../src/common/datetime.cpp:3478
+#: ../src/common/datetime.cpp:3877
 msgid "thirteenth"
-msgstr "µÚÊ®Èý"
+msgstr "第十三"
 
-#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
+#: ../src/common/imagtiff.cpp:145
+#: ../src/common/imagtiff.cpp:161
 #, c-format
 msgid "tiff module: %s"
-msgstr ""
+msgstr "tiff 模块: %s"
 
-#: ../src/common/datetime.cpp:3301
+#: ../src/common/datetime.cpp:3694
 msgid "today"
-msgstr "½ñÌì"
+msgstr "今天"
 
-#: ../src/common/datetime.cpp:3303
+#: ../src/common/datetime.cpp:3696
 msgid "tomorrow"
-msgstr "Ã÷Ìì"
+msgstr "明天"
 
-#: ../src/common/datetime.cpp:3477
+#: ../src/common/datetime.cpp:3876
 msgid "twelfth"
-msgstr "µÚÊ®¶þ"
+msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3485
+#: ../src/common/datetime.cpp:3884
 msgid "twentieth"
-msgstr "µÚ¶þÊ®"
+msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:525
-#, fuzzy
+#: ../src/common/fontcmn.cpp:638
 msgid "underlined"
-msgstr "Ï»®Ïß"
+msgstr "下划线"
 
-#: ../src/common/fontcmn.cpp:440
-#, fuzzy
+#: ../src/common/fontcmn.cpp:553
 msgid "underlined "
-msgstr "Ï»®Ïß"
+msgstr "下划线 "
 
-#: ../src/common/fileconf.cpp:1935
+#: ../src/common/fileconf.cpp:1960
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
+msgstr "例外的 \" 在位置 %d (位于 '%s')."
 
-#: ../src/generic/progdlgg.cpp:277
+#: ../src/generic/progdlgg.cpp:307
 msgid "unknown"
-msgstr "δ֪"
+msgstr "未知"
 
 #: ../src/common/xtixml.cpp:252
-#, fuzzy, c-format
+#, c-format
 msgid "unknown class %s"
-msgstr ": δ֪×Ö·û¼¯"
+msgstr "未知类 %s"
 
-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
-#, fuzzy
+#: ../src/common/regex.cpp:163
+#: ../src/html/chm.cpp:352
 msgid "unknown error"
-msgstr "GIF: λÖôíÎó!!!"
+msgstr "未知错误"
 
-#: ../src/msw/dialup.cpp:458
+#: ../src/msw/dialup.cpp:494
 #, c-format
 msgid "unknown error (error code %08x)."
-msgstr "δ֪´íÎó(´íÎóºÅ %08x)."
+msgstr "未知错误(错误号 %08x)."
 
-#: ../src/common/textbuf.cpp:229
-#, fuzzy
+#: ../src/common/textbuf.cpp:230
 msgid "unknown line terminator"
-msgstr "δ֪ËÑË÷Ô­µã"
+msgstr "未知行终止符"
 
-#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
+#: ../src/common/file.cpp:367
+#: ../src/msw/wince/filefnwce.cpp:170
 msgid "unknown seek origin"
-msgstr "δ֪ËÑË÷Ô­µã"
+msgstr "未知搜索原点"
 
-#: ../src/common/fmapbase.cpp:704
+#: ../src/common/fmapbase.cpp:719
 #, c-format
 msgid "unknown-%d"
-msgstr "δ֪-%d"
+msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:432
+#: ../src/common/docview.cpp:430
 msgid "unnamed"
-msgstr "unnamed"
+msgstr "未命名"
 
-#: ../src/common/docview.cpp:1307
+#: ../src/common/docview.cpp:1401
 #, c-format
 msgid "unnamed%d"
-msgstr "unnamed%d"
+msgstr "未命名 %d"
+
+#: ../src/common/zipstrm.cpp:1660
+#: ../src/common/zipstrm.cpp:2030
+msgid "unsupported Zip compression method"
+msgstr "不支持的Zip压缩方法"
+
+#: ../src/common/zipstrm.cpp:1142
+msgid "unsupported zip archive"
+msgstr "不支持的zip存档"
 
-#: ../src/common/intl.cpp:1113
+#: ../src/common/intl.cpp:1115
 #, c-format
 msgid "using catalog '%s' from '%s'."
-msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
+msgstr "使用目录 '%s' 从 '%s'."
 
 #: ../src/html/chm.cpp:336
-#, fuzzy
 msgid "write error"
-msgstr "Îļþ´íÎó"
+msgstr "写错误"
 
-#: ../src/common/filename.cpp:178
-#, fuzzy
+#: ../src/common/filename.cpp:181
 msgid "writing"
-msgstr "´òÓ¡"
+msgstr "正在写入"
 
-#: ../src/common/stopwatch.cpp:235
+#: ../src/common/stopwatch.cpp:291
 msgid "wxGetTimeOfDay failed."
-msgstr "wxGetTimeOfDay ʧ°Ü."
+msgstr "wxGetTimeOfDay 失败."
 
-#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
+#: ../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:945
+#: ../src/common/socket.cpp:966
+#: ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
-msgstr "wxSocket: δ֪ʼþ!."
+msgstr "wxSocket: 未知事件!."
 
-#: ../src/motif/app.cpp:207
+#: ../src/motif/app.cpp:214
 #, 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:176
-#, fuzzy
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets 不能打开显示设备: 已经存在."
 
-#: ../src/common/datetime.cpp:3302
+#: ../src/common/datetime.cpp:3695
 msgid "yesterday"
-msgstr "×òÌì"
+msgstr "昨天"
 
-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
-#, fuzzy, c-format
+#: ../src/common/zstream.cpp:165
+#: ../src/common/zstream.cpp:315
+#, c-format
 msgid "zlib error %d"
-msgstr " (´íÎó %ld: %s)"
+msgstr "zlib错误 %d"
 
-#: ../src/common/prntbase.cpp:452
+#: ../src/common/prntbase.cpp:886
 msgid "|<<"
-msgstr ""
-
-#~ msgid ""
-#~ "Can't create list control window, check that comctl32.dll is installed."
-#~ msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°."
-
-#~ msgid "Can't delete value of key '%s'"
-#~ msgstr "²»ÄÜɾ³ý¼ü '%s'µÄÖµ"
-
-#, fuzzy
-#~ msgid "Failed to get clipboard data."
-#~ msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
-
-#~ msgid "Failed to get the UTC system time."
-#~ msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü."
-
-#, fuzzy
-#~ msgid "Unsupported flag in Gzip header"
-#~ msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
-
-#~ msgid "Windows 3.1"
-#~ msgstr "Windows 3.1"
-
-#~ msgid "gmtime() failed"
-#~ msgstr "gmtime() ʧ°Ü"
-
-#~ msgid "mktime() failed"
-#~ msgstr "mktime()ʧ°Ü"
-
-#~ msgid "#define %s must be an integer."
-#~ msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
-
-#, fuzzy
-#~ msgid "%d...%d"
-#~ msgstr ".."
-
-#~ msgid "%s not a bitmap resource specification."
-#~ msgstr "%s ²»ÊÇλͼ×ÊÔ´."
-
-#~ msgid "%s not an icon resource specification."
-#~ msgstr "%s ²»ÊÇͼ±ê×ÊÔ´."
-
-#~ msgid "%s: ill-formed resource file syntax."
-#~ msgstr "%s: ²»Á¼×ÊÔ´ÎļþÓï·¨."
-
-#~ msgid ""
-#~ ", expected static, #include or #define\n"
-#~ "whilst parsing resource."
-#~ msgstr ""
-#~ ", ÆÚÍû static, #include »ò #define\n"
-#~ "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
-
-#, fuzzy
-#~ 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>"
-#~ msgstr ""
-#~ "<html><body>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><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></body></html>"
-
-#~ msgid "Bitmap resource specification %s not found."
-#~ msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s."
-
-#, fuzzy
-#~ msgid "Can't create dialog using memory template"
-#~ msgstr "²»ÄÜ´´½¨Îļþ '%s'"
-
-#, fuzzy
-#~ msgid "Can't create dialog using template '%ul'"
-#~ msgstr "²»ÄÜ´´½¨Îļþ '%s'"
-
-#~ msgid "Could not find resource include file %s."
-#~ msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
-
-#~ msgid ""
-#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
-#~ "instead\n"
-#~ " or provide #define (see manual for caveats)"
-#~ msgstr ""
-#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
-#~ "instead\n"
-#~ " or provide #define (see manual for caveats)"
-
-#~ msgid ""
-#~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-#~ "or provide #define (see manual for caveats)"
-#~ msgstr ""
-#~ "²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n"
-#~ "»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)"
-
-#~ msgid "Date"
-#~ msgstr "ÈÕÆÚ"
-
-#, fuzzy
-#~ msgid "Did you forget to include wx/os2/wx.rc in your resources?"
-#~ msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
-
-#~ msgid "Expected '*' whilst parsing resource."
-#~ msgstr "½âÎö×ÊԴʱÆÚ´ý³öÏÖ '*' ."
-
-#~ msgid "Expected '=' whilst parsing resource."
-#~ msgstr "½âÎö×ÊԴʱÆÚ´ý '='."
-
-#~ msgid "Expected 'char' whilst parsing resource."
-#~ msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ."
-
-#, fuzzy
-#~ msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
-#~ msgstr "´´½¨Ä¿Â¼Ê§°Ü"
-
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "²éÕÒXBM×ÊÔ´ %sʧ°Ü.\n"
-#~ "ûÓÐʹÓÃwxResourceLoadBitmapData?"
-
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadIconData?"
-#~ msgstr ""
-#~ "²éÕÒXBM×ÊÔ´%sʧ°Ü.\n"
-#~ "ûÓÐʹÓÃwxResourceLoadIconData?"
-
-#~ msgid ""
-#~ "Failed to find XPM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n"
-#~ "ûÓÐʹÓÃwxResourceLoadBitmapData?"
-
-#~ msgid "Fatal error: exiting"
-#~ msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
-
-#~ msgid "Found "
-#~ msgstr "ÕÒµ½"
-
-#~ 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|ËùÓÐÎļþ (*.*)|*"
-
-#~ msgid "Icon resource specification %s not found."
-#~ msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
-
-#~ msgid "Ill-formed resource file syntax."
-#~ msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
-
-#, fuzzy
-#~ msgid "Load file"
-#~ msgstr "×°ÈëÎļþ %s "
-
-#~ msgid "No XBM facility available!"
-#~ msgstr "ûÓпÉÓÃXBM¹¤¾ß!"
-
-#~ msgid "No XPM icon facility available!"
-#~ msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!"
-
-#, fuzzy
-#~ msgid "Save file"
-#~ msgstr "±£´æÎļþ %s "
-
-#~ msgid "Time"
-#~ msgstr "ʱ¼ä"
-
-#~ msgid "Unexpected end of file whilst parsing resource."
-#~ msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
-
-#~ msgid "Unrecognized style %s whilst parsing resource."
-#~ msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s."
-
-#~ msgid "<DIR> "
-#~ msgstr "<Ŀ¼> "
-
-#~ msgid "<LINK> "
-#~ msgstr "<Á¬½Ó>"
-
-#, fuzzy
-#~ msgid "DIB Header: Cannot deal with 4bit encoded yet."
-#~ msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
-
-#, fuzzy
-#~ msgid "Help : %s"
-#~ msgstr "°ïÖú: %s"
-
-#, fuzzy
-#~ msgid "Search!"
-#~ msgstr "ËÑË÷"
+msgstr "|<<"
 
-#~ msgid "large"
-#~ msgstr "´ó"
-
-#~ msgid "medium"
-#~ msgstr "ÖÐ"
-
-#~ msgid "small"
-#~ msgstr "С"
-
-#~ msgid "very large"
-#~ msgstr "·Ç³£´ó"
-
-#~ msgid "very small"
-#~ msgstr "·Ç³£Ð¡"
-
-#~ msgid "Can not create mutex"
-#~ msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
-
-#~ msgid "Can't create the inter-process read pipe"
-#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ"
-
-#~ msgid "Can't create the inter-process write pipe"
-#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
-
-#~ msgid "Font"
-#~ msgstr "×ÖÌå"
-
-#~ msgid "PostScript"
-#~ msgstr "PostScript"
-
-#~ msgid "PostScript:"
-#~ msgstr "PostScript:"
-
-#~ msgid "Preview Only"
-#~ msgstr "½öÔ¤ÀÀ"
-
-#~ msgid "Printer Command: "
-#~ msgstr "´òÓ¡»úÃüÁî: "
-
-#~ msgid "Printer Options: "
-#~ msgstr "´òÓ¡»úÑ¡Ïî:"
-
-#~ msgid "Printer Settings"
-#~ msgstr "´òÓ¡»úÉèÖÃ"
-
-#~ msgid "Send to Printer"
-#~ msgstr "·¢µ½´òÓ¡»ú"
-
-#, fuzzy
-#~ msgid "SetPixelFormat failed."
-#~ msgstr "¹ÜµÀ´´½¨Ê§°Ü"
-
-#~ msgid "X Scaling"
-#~ msgstr "XËõ·Å"
-
-#~ msgid "X Translation"
-#~ msgstr "XƽÒÆ"
-
-#~ msgid "Y Scaling"
-#~ msgstr "YËõ·Å"
-
-#~ msgid "Y Translation"
-#~ msgstr "YƽÒÆ"
-
-#, fuzzy
-#~ msgid "Fatal Error"
-#~ msgstr "ÖÂÃü´íÎó"
-
-#, fuzzy
-#~ msgid "Fatal error: %s\n"
-#~ msgstr "ÖÂÃü´íÎó£º"
-
-#~ msgid "Back"
-#~ msgstr "·µ»Ø"
-
-#~ msgid "Can not create event object."
-#~ msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
-
-#~ msgid "Can't find the serialization object '%s' for the object '%s'."
-#~ msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'."
-
-#~ msgid "Can't load wxSerial dynamic library."
-#~ msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
-
-#~ msgid "Connection to wxHelp timed out in %d seconds"
-#~ msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
-
-#~ msgid "Etcetera"
-#~ msgstr "ÆäËü"
-
-#, fuzzy
-#~ msgid "ICO: Error calculating size of DIB ."
-#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error calculating size of Mask DIB ."
-#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error calculating size of XOR DIB ."
-#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error writing ICONDIR header."
-#~ msgstr "TIFF:дͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error writing ICONDIRENTRY header."
-#~ msgstr "TIFF:дͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error writing Mask DIB ."
-#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-
-#, fuzzy
-#~ msgid "ICO: Error writing XOR DIB ."
-#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-
-#~ msgid "Incorrect version of HTML help book"
-#~ msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
-
-#, fuzzy
-#~ msgid "Loading DIB : Couldn't allocate memory."
-#~ msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
-
-#~ msgid "Mounted Devices"
-#~ msgstr "¹ÒÔØÉ豸"
-
-#~ msgid "My Harddisk"
-#~ msgstr "ÎÒµÄÓ²ÅÌ"
-
-#~ msgid "My Home"
-#~ msgstr "ÎҵļÒ"
-
-#~ msgid "New..."
-#~ msgstr "´´½¨..."
-
-#~ msgid "Please wait..."
-#~ msgstr "ÇëµÈ´ý..."
-
-#~ msgid "Temporary"
-#~ msgstr "ÁÙʱµÄ"
-
-#~ msgid "The Computer"
-#~ msgstr "¼ÆËã»ú"
-
-#~ msgid "The directory "
-#~ msgstr "Ŀ¼"
-
-#~ msgid "User"
-#~ msgstr "Óû§"
-
-#~ msgid "User Local"
-#~ msgstr "±¾µØÓû§"
-
-#~ msgid "Variables"
-#~ msgstr "±äÁ¿"
-
-#~ msgid "Window"
-#~ msgstr "´°¿Ú"
-
-#, fuzzy
-#~ msgid "centered"
-#~ msgstr "ÆäËü"
-
-#, fuzzy
-#~ msgid "Unknown digit value"
-#~ msgstr "λÖñàÂë (%d)"
-
-#~ msgid "Replace file '%s'?"
-#~ msgstr "Ìæ»»Îļþ '%s'?"
-
-#~ msgid "wxWindows: error finding temporary file name.\n"
-#~ msgstr "wxWindows: ²éѯÁÙʱÎļþÃûʱ³ö´í.\n"
-
-#~ msgid ""
-#~ "Can't create window of class %s!\n"
-#~ "Possible Windows 3.x compatibility problem?"
-#~ msgstr ""
-#~ "²»ÄÜ´´½¨Àà %s´°¿Ú!\n"
-#~ "Ò²ÐíÊÇ Windows 3.x ¼æÈÝÎÊÌâm?"
-
-#, fuzzy
 #~ msgid ""
-#~ "Can't find dummy dialog template!\n"
-#~ "Check resource include path for finding wx.rc."
+#~ "Failed to get stack backtrace:\n"
+#~ "%s"
 #~ msgstr ""
-#~ "ÕÒ²»µ½ÐéÄâ¶Ô»°¿òÄ£°å!\n"
-#~ "¼ì²é×ÊÔ´Îļþ°üº¬Â·¾¶ÒÔÕÒµ½wx.rc."
-
-#, fuzzy
-#~ msgid "Couldn't change the state of event object."
-#~ msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
-
-#~ msgid "Couldn't launch DDE server '%s'."
-#~ msgstr "²»ÄÜÆô¶¯DDE·þÎñÆ÷ '%s'."
-
-#~ msgid "No XPM facility available!"
-#~ msgstr "ûÓпÉÓõÄXPMÉ豸!"
+#~ "不能获取堆栈的回溯路径:\n"
+#~ " %s"
+#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
+#~ msgstr "装入灰度 Ascii PNM图像功能还没有实现."
+#~ msgid "Loading Grey Raw PNM image is not yet implemented."
+#~ msgstr "装入灰度 Raw PNM图像功能还没有实现."
 
-#~ msgid "Cyrillic (Latin 5)"
-#~ msgstr "˹À­·òÓï (Latin 5)"