changes based on message #6 in my thread with Vaclav :)

[wxWidgets.git] / locale / zh_CN.po

diff --git a/locale/zh_CN.po b/locale/zh_CN.po
index ce1737cf3223e4eab216180b89dbf30804910498..e905263a92f2924b354784b499dc7a6c86c2feaa 100644 (file)
--- a/locale/zh_CN.po
+++ b/locale/zh_CN.po
@@ -1,347 +1,534 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-02-04 18:56+0100\n"
-"PO-Revision-Date: 2003-03-19 15:12+0800\n"
-"Last-Translator: PAL <pal.tw@yahoo.com.tw>\n"
-"Language-Team: wxWindows tranlators <wx-translators@wxwindows.org>\n"
+"POT-Creation-Date: 2004-10-13 04:17+0930\n"
+"PO-Revision-Date: 2000-11-09 16:09Öйú±ê׼ʱ¼ä\n"
+"Last-Translator: mrfx <mrfx@fm365.com>\n"
+"Language-Team: wxWidgets tranlators <wx-translators@wxwidgets.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8-bit\n"
 
-#: ../src/common/log.cpp:319
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
-msgstr " (錯誤 %ld: %s)"
+msgstr " (´íÎó %ld: %s)"
 
-#: ../src/common/docview.cpp:1325
+#: ../src/common/docview.cpp:1405
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:537
+#: ../src/html/htmprint.cpp:568
 msgid " Preview"
-msgstr "預覽"
+msgstr "Ô¤ÀÀ"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
-msgstr "#10 信封, 4 1/8 x 9 1/2 in"
+msgstr "#10 Envelope, 4 1/8 x 9 1/2 in"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:135
 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 in"
 
-#: ../src/common/paper.cpp:138
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
-msgstr "#12 信封, 4 3/4 x 11 in"
+msgstr "#12 ÐÅ·â, 4 3/4 x 11 in"
 
-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
-msgstr "#14 信封, 5 x 11 1/2 in"
+msgstr "#14 ÐÅ·â, 5 x 11 1/2 in"
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/paper.cpp:133
 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 in"
 
-#: ../src/html/helpfrm.cpp:867 ../src/html/helpfrm.cpp:868
-#: ../src/html/helpfrm.cpp:1505 ../src/html/helpfrm.cpp:1535
+#: ../contrib/src/deprecated/resource.cpp:1808
+#: ../contrib/src/deprecated/resource.cpp:1938
+#: ../contrib/src/deprecated/resource.cpp:3026
 #, c-format
-msgid "%i of %i"
-msgstr "%i / %i"
+msgid "#define %s must be an integer."
+msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
 
-#: ../src/generic/filedlgg.cpp:277
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
+msgid "%i of %i"
+msgstr "%i of %i"
+
+#: ../src/generic/filedlgg.cpp:281
+#, fuzzy, c-format
 msgid "%ld bytes"
-msgstr ""
+msgstr "×Ö½Ú"
 
 #: ../src/common/cmdline.cpp:825
 #, c-format
 msgid "%s (or %s)"
-msgstr ""
+msgstr "%s (»ò %s)"
 
-#: ../src/generic/logg.cpp:258
+#: ../src/generic/logg.cpp:260
 #, c-format
 msgid "%s Error"
-msgstr "%s 錯誤"
+msgstr "%s ´íÎó"
 
-#: ../src/generic/logg.cpp:266
+#: ../src/generic/logg.cpp:268
 #, c-format
 msgid "%s Information"
-msgstr "%s 資訊"
+msgstr "%s ÐÅÏ¢"
 
-#: ../src/generic/logg.cpp:262
+#: ../src/generic/logg.cpp:264
 #, c-format
 msgid "%s Warning"
-msgstr "%s 警告"
+msgstr "%s ¾¯¸æ"
+
+#: ../src/common/fldlgcmn.cpp:74
+#, fuzzy, c-format
+msgid "%s files (%s)|%s"
+msgstr "Îļþ (%s)|%s"
 
-#: ../src/common/msgout.cpp:188
+#: ../src/common/msgout.cpp:189
 #, c-format
 msgid "%s message"
-msgstr "%s 訊息"
+msgstr ""
 
-#: ../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:341 ../src/html/helpfrm.cpp:343
 msgid "&About..."
 msgstr ""
 
-#: ../src/msw/mdi.cpp:191
+#: ../src/common/stockitem.cpp:150
+msgid "&Actual Size"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:105
+msgid "&Apply"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:190
 msgid "&Arrange Icons"
-msgstr "排列圖示(&A)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:115
+#, fuzzy
+msgid "&Back"
+msgstr "·µ»Ø"
+
+#: ../src/common/stockitem.cpp:106
+#, fuzzy
+msgid "&Bold"
+msgstr "´ÖÌå"
 
-#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:401
+#: ../src/common/stockitem.cpp:107 ../src/generic/fontdlgg.cpp:350
+#: ../src/generic/fontdlgg.cpp:369 ../src/generic/wizard.cpp:418
+#, fuzzy
 msgid "&Cancel"
-msgstr "取消(&C)"
+msgstr "È¡Ïû"
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:186
 msgid "&Cascade"
-msgstr "串聯(&C)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:108
+#, fuzzy
+msgid "&Clear"
+msgstr "Çå³ý[&L]"
 
-#: ../src/common/prntbase.cpp:439 ../src/generic/logg.cpp:502
-#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
+#: ../src/common/prntbase.cpp:441 ../src/common/stockitem.cpp:109
+#: ../src/generic/logg.cpp:506 ../src/html/helpfrm.cpp:338
 msgid "&Close"
-msgstr "關閉(&C)"
+msgstr "¹Ø±Õ[&C]"
 
-#: ../src/msw/textctrl.cpp:2051
+#: ../src/common/stockitem.cpp:110 ../src/msw/textctrl.cpp:2053
 msgid "&Copy"
-msgstr "複製(&C)"
+msgstr ""
 
-#: ../src/msw/textctrl.cpp:2053
+#: ../src/common/stockitem.cpp:112 ../src/msw/textctrl.cpp:2055
+#, fuzzy
 msgid "&Delete"
-msgstr "刪除(&D)"
+msgstr "µç´«´ò×Ö»ú"
 
-#: ../src/generic/logg.cpp:704
+#: ../src/generic/logg.cpp:708
 msgid "&Details"
-msgstr "細節(&D)"
+msgstr "ϸ½Ú[&D]"
+
+#: ../src/common/stockitem.cpp:116
+#, fuzzy
+msgid "&Down"
+msgstr "Íê³É"
 
-#: ../src/generic/fdrepdlg.cpp:162
+#: ../src/html/helpfrm.cpp:345
+#, fuzzy
+msgid "&File"
+msgstr "´óС"
+
+#: ../src/common/stockitem.cpp:113
+#, fuzzy
 msgid "&Find"
-msgstr "尋找(&F)"
+msgstr "²éÕÒ"
 
-#: ../src/generic/wizard.cpp:580
+#: ../src/generic/wizard.cpp:606
 msgid "&Finish"
-msgstr "完成(&F)"
+msgstr "Íê³É[&F]"
+
+#: ../src/generic/fontdlgg.cpp:271
+#, fuzzy
+msgid "&Font family:"
+msgstr "×ÖÌå´óС:"
 
-#: ../src/common/prntbase.cpp:474
+#: ../src/common/stockitem.cpp:117
+#, fuzzy
+msgid "&Forward"
+msgstr "ÏòÇ°"
+
+#: ../src/common/prntbase.cpp:476
 msgid "&Goto..."
 msgstr ""
 
-#: ../src/generic/wizard.cpp:404
+#: ../src/common/stockitem.cpp:119 ../src/generic/wizard.cpp:414
+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:346
+#, fuzzy
 msgid "&Help"
-msgstr "說明(&H)"
+msgstr "°ïÖú"
+
+#: ../src/common/stockitem.cpp:120
+#, fuzzy
+msgid "&Home"
+msgstr "ÎҵļÒ"
+
+#: ../src/common/stockitem.cpp:122
+#, fuzzy
+msgid "&Index"
+msgstr "Ë÷Òý"
+
+#: ../src/common/stockitem.cpp:123
+#, fuzzy
+msgid "&Italic"
+msgstr "бÌå"
 
-#: ../src/generic/logg.cpp:503
+#: ../src/generic/logg.cpp:507
 msgid "&Log"
-msgstr "日誌(&L)"
+msgstr "ÈÕÖ¾[&L]"
 
-#: ../src/univ/themes/win32.cpp:4672
+#: ../src/univ/themes/win32.cpp:4701
 msgid "&Move"
-msgstr "移動(&M)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:128
+#, fuzzy
+msgid "&New"
+msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:192
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
+#, fuzzy
 msgid "&Next"
-msgstr "下一個(&N)"
+msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/generic/wizard.cpp:400 ../src/generic/wizard.cpp:582
+#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
 msgid "&Next >"
-msgstr "下一個(&N) >"
+msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/generic/tipdlg.cpp:218
+#: ../src/generic/tipdlg.cpp:238
 msgid "&Next Tip"
-msgstr "下一技巧(&N)"
+msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
+
+#: ../src/common/stockitem.cpp:129
+#, fuzzy
+msgid "&No"
+msgstr "·ñ"
+
+#: ../src/common/stockitem.cpp:130 ../src/generic/fontdlgg.cpp:355
+#: ../src/generic/fontdlgg.cpp:362
+#, fuzzy
+msgid "&OK"
+msgstr "È·ÈÏ"
+
+#: ../src/common/stockitem.cpp:131
+#, fuzzy
+msgid "&Open"
+msgstr "±£´æ[&S]..."
 
-#: ../src/html/helpfrm.cpp:269
+#: ../src/html/helpfrm.cpp:336
 #, fuzzy
 msgid "&Open..."
-msgstr "儲存...(&S)"
+msgstr "±£´æ[&S]..."
 
-#: ../src/msw/textctrl.cpp:2052
+#: ../src/common/stockitem.cpp:132 ../src/msw/textctrl.cpp:2054
+#, fuzzy
 msgid "&Paste"
-msgstr "貼上(&P)"
+msgstr "ÈÕÆÚ"
+
+#: ../src/generic/fontdlgg.cpp:315
+#, fuzzy
+msgid "&Point size:"
+msgstr "×ÖÌå´óС:"
+
+#: ../src/common/stockitem.cpp:133
+msgid "&Preferences"
+msgstr ""
 
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:193
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
+#, fuzzy
 msgid "&Previous"
-msgstr "前一個(&P)"
+msgstr "ǰҳ"
+
+#: ../src/common/stockitem.cpp:134
+#, fuzzy
+msgid "&Print"
+msgstr "´òÓ¡"
 
-#: ../src/common/prntbase.cpp:444
+#: ../src/common/prntbase.cpp:446
 #, fuzzy
 msgid "&Print..."
-msgstr "列印..."
+msgstr "´òÓ¡..."
+
+#: ../src/common/stockitem.cpp:136
+#, fuzzy
+msgid "&Properties"
+msgstr "ǰҳ"
+
+#: ../src/common/stockitem.cpp:137
+msgid "&Quit"
+msgstr ""
 
-#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
-#: ../src/msw/textctrl.cpp:2048
+#: ../src/common/cmdproc.cpp:287 ../src/common/cmdproc.cpp:294
+#: ../src/common/stockitem.cpp:138 ../src/msw/textctrl.cpp:2050
 msgid "&Redo"
-msgstr "重做(&R)"
+msgstr "Öظ´[&R]"
 
-#: ../src/common/cmdproc.cpp:281 ../src/common/cmdproc.cpp:301
+#: ../src/common/cmdproc.cpp:283 ../src/common/cmdproc.cpp:303
 msgid "&Redo "
-msgstr "重做(&R)"
+msgstr "Öظ´[&R]"
 
 #: ../src/generic/fdrepdlg.cpp:168
 msgid "&Replace"
-msgstr "置換(&R)"
+msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4671
+#: ../src/univ/themes/win32.cpp:4700
+#, fuzzy
 msgid "&Restore"
-msgstr "回存(&R)"
+msgstr "Öظ´[&R]"
 
-#: ../src/generic/logg.cpp:498 ../src/generic/logg.cpp:827
+#: ../src/common/stockitem.cpp:142
+#, fuzzy
+msgid "&Save"
+msgstr "±£´æ[&S]..."
+
+#: ../src/generic/logg.cpp:502
 msgid "&Save..."
-msgstr "儲存...(&S)"
+msgstr "±£´æ[&S]..."
 
-#: ../src/generic/tipdlg.cpp:215
+#: ../src/generic/tipdlg.cpp:233
 msgid "&Show tips at startup"
-msgstr "啟動時顯示小秘訣(&S)"
+msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
 
-#: ../src/univ/themes/win32.cpp:4674
+#: ../src/univ/themes/win32.cpp:4703
+#, fuzzy
 msgid "&Size"
-msgstr "大小(&S)"
+msgstr "´óС"
 
-#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2047
+#: ../src/common/stockitem.cpp:144
+#, fuzzy
+msgid "&Stop"
+msgstr "ÉèÖÃ"
+
+#: ../src/generic/fontdlgg.cpp:282
+msgid "&Style:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:146 ../src/generic/fontdlgg.cpp:326
+#, fuzzy
+msgid "&Underline"
+msgstr "Ï»®Ïß"
+
+#: ../src/common/cmdproc.cpp:265 ../src/common/stockitem.cpp:147
+#: ../src/msw/textctrl.cpp:2049
 msgid "&Undo"
-msgstr "回復(&U)"
+msgstr "»Ö¸´[&U]"
 
-#: ../src/common/cmdproc.cpp:257
+#: ../src/common/cmdproc.cpp:259
 msgid "&Undo "
-msgstr "回復(&U)"
+msgstr "»Ö¸´[&U]"
+
+#: ../src/common/stockitem.cpp:148
+#, fuzzy
+msgid "&Unindent"
+msgstr "µÚÊ®¾Å"
+
+#: ../src/common/stockitem.cpp:118
+msgid "&Up"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:293
+#, fuzzy
+msgid "&Weight:"
+msgstr "µÚ°Ë"
 
 #: ../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
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1384 ../src/msw/mdi.cpp:1391
+#: ../src/msw/mdi.cpp:1421
 msgid "&Window"
-msgstr "視窗(&W)"
+msgstr "´°¿Ú[&W]"
+
+#: ../src/common/stockitem.cpp:149
+#, fuzzy
+msgid "&Yes"
+msgstr "ÊÇ"
 
-#: ../src/common/config.cpp:414 ../src/msw/regconf.cpp:265
+#: ../src/common/config.cpp:407 ../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
 #, c-format
 msgid "'%s' is invalid"
-msgstr "'%s' 是無效的"
+msgstr "'%s' ÊÇÎÞЧµÄ"
 
 #: ../src/common/cmdline.cpp:743
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
-msgstr "'%s' 不是選項 '%s' 的正確數值。"
+msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
 
-#: ../src/common/intl.cpp:1140
+#: ../src/common/intl.cpp:1148
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' 不是有效的訊息記載檔。"
+msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."
 
-#: ../src/common/textbuf.cpp:245
-#, c-format
+#: ../src/common/textbuf.cpp:241
+#, fuzzy, c-format
 msgid "'%s' is probably a binary buffer."
-msgstr "'%s' 或許是個二進位緩衝區。"
+msgstr "'%s' »òÐíÊÇÒ»¸ö¶þ½øÖÆÎļþ."
 
 #: ../src/common/valtext.cpp:161
 #, c-format
 msgid "'%s' should be numeric."
-msgstr "'%s' 應該是數值。"
+msgstr "'%s' Ó¦¸ÃÊÇÒ»¸öÊýÖµ."
 
 #: ../src/common/valtext.cpp:143
 #, c-format
 msgid "'%s' should only contain ASCII characters."
-msgstr "'%s' 應只含有ASCII字元。"
+msgstr "'%s' Ó¦¸Ã½ö°üº¬ASCII×Ö·û."
 
 #: ../src/common/valtext.cpp:149
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
-msgstr "'%s' 應只含有字母字元。"
+msgstr "'%s' Ó¦½ö°üº¬×Öĸ×Ö·û."
 
 #: ../src/common/valtext.cpp:155
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
-msgstr "'%s' 應只含有字母或數字字元。"
+msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
 
-#: ../src/html/helpfrm.cpp:803
+#: ../src/html/helpfrm.cpp:953
 msgid "(Help)"
-msgstr "(說明)"
+msgstr "(°ïÖú)"
 
-#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:935
-#: ../src/html/helpfrm.cpp:1563
+#: ../src/html/helpfrm.cpp:415 ../src/html/helpfrm.cpp:1091
+#: ../src/html/helpfrm.cpp:1750
 msgid "(bookmarks)"
-msgstr "(書籤)"
+msgstr "(ÊéÇ©)"
 
-#: ../src/generic/dirctrlg.cpp:677 ../src/generic/filedlgg.cpp:707
-msgid "."
+#: ../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"
+"whilst parsing resource."
 msgstr ""
+", ÆÚÍû static, #include »ò #define\n"
+"ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
 
-#: ../src/generic/dirctrlg.cpp:678 ../src/generic/filedlgg.cpp:708
-msgid ".."
-msgstr ""
+#: ../src/generic/dirctrlg.cpp:634 ../src/generic/filedlgg.cpp:733
+msgid "."
+msgstr "."
 
-#: ../src/html/chm.cpp:561
-msgid "/#SYSTEM"
-msgstr ""
+#: ../src/generic/dirctrlg.cpp:635 ../src/generic/filedlgg.cpp:734
+msgid ".."
+msgstr ".."
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:130
 msgid "10 x 14 in"
-msgstr "10 x 14 英吋"
+msgstr "10 x 14 Ó¢´ç"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:131
 msgid "11 x 17 in"
-msgstr "11 x 17 英吋"
+msgstr "11 x 17 Ó¢´ç"
 
-#: ../src/common/paper.cpp:151
+#: ../src/common/paper.cpp:149
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
-msgstr "6 3/4 信封, 3 5/8 x 6 1/2 英吋"
+msgstr "6 3/4 ÐÅ·â, 3 5/8 x 6 1/2 Ó¢´ç"
 
-#: ../src/html/htmprint.cpp:291
+#: ../src/html/htmprint.cpp:307
 msgid ": file does not exist!"
-msgstr ": 檔案不存在！"
+msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/common/fontmap.cpp:184
+#: ../src/common/fontmap.cpp:186
 msgid ": unknown charset"
-msgstr ": 未知的字集"
+msgstr ": δ֪×Ö·û¼¯"
 
-#: ../src/common/fontmap.cpp:393
+#: ../src/common/fontmap.cpp:400
 msgid ": unknown encoding"
-msgstr ": 未知的編碼"
+msgstr ": δ֪±àÂë"
 
-#: ../src/generic/wizard.cpp:405
+#: ../src/generic/wizard.cpp:423
 msgid "< &Back"
-msgstr "< 返回(&B)"
+msgstr "< ·µ»Ø[&B]"
 
-#: ../src/common/prntbase.cpp:456
+#: ../src/common/prntbase.cpp:458
 msgid "<<"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:248 ../src/generic/filedlgg.cpp:271
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DIR>"
-msgstr "<目錄>"
+msgstr "<Ŀ¼>"
 
-#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
+#: ../src/generic/filedlgg.cpp:256 ../src/generic/filedlgg.cpp:279
 #, fuzzy
 msgid "<DRIVE>"
-msgstr "<目錄>"
+msgstr "<Ŀ¼>"
 
-#: ../src/generic/filedlgg.cpp:250 ../src/generic/filedlgg.cpp:273
+#: ../src/generic/filedlgg.cpp:254 ../src/generic/filedlgg.cpp:277
 msgid "<LINK>"
-msgstr "<連線>"
+msgstr "<Á¬½Ó>"
 
-#: ../src/html/helpfrm.cpp:1098
+#: ../src/html/helpfrm.cpp:1253
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1102
+#: ../src/html/helpfrm.cpp:1257
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1097
+#: ../src/html/helpfrm.cpp:1252
 msgid "<b>Bold face.</b> "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1096
+#: ../src/html/helpfrm.cpp:1251
 msgid "<i>Italic face.</i> "
 msgstr ""
 
-#: ../src/common/prntbase.cpp:462
+#: ../src/common/prntbase.cpp:464
 msgid ">>"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:468
+#: ../src/common/prntbase.cpp:470
 msgid ">>|"
 msgstr ""
 
@@ -349,819 +536,917 @@ msgstr ""
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr ""
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:123
 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:114
 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:124
 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:125
 msgid "A5 sheet, 148 x 210 mm"
-msgstr "A5 紙張, 148 x 210 毫米"
+msgstr "A5 Ö½ÕÅ, 148 x 210 ºÁÃ×"
 
-#: ../src/generic/fontdlgg.cpp:83
+#: ../src/generic/fontdlgg.cpp:85
 msgid "ABCDEFGabcdefg12345"
-msgstr ""
+msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "ASCII"
-msgstr "文字"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:104
+msgid "Add"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:358
+#: ../src/html/helpfrm.cpp:428
 msgid "Add current page to bookmarks"
-msgstr "把目前頁面加到書籤中"
+msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ"
 
 #: ../src/generic/colrdlgg.cpp:287
 msgid "Add to custom colours"
-msgstr "加到自訂色彩中"
+msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ"
 
-#: ../include/wx/xti.h:858
+#: ../include/wx/xti.h:899
 msgid "AddToPropertyCollection called on a generic accessor"
 msgstr ""
 
-#: ../include/wx/xti.h:806
+#: ../include/wx/xti.h:847
 msgid "AddToPropertyCollection called w/o valid adder"
 msgstr ""
 
 #: ../src/html/helpctrl.cpp:106
 #, c-format
 msgid "Adding book %s"
-msgstr "正在加入卷輯 %s"
+msgstr "ÕýÔÚÌí¼Ó¾í %s"
+
+#: ../src/common/stockitem.cpp:126
+msgid "Align Left"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:127
+#, fuzzy
+msgid "Align Right"
+msgstr "ÎçÒ¹"
 
-#: ../src/generic/prntdlgg.cpp:157
+#: ../src/generic/prntdlgg.cpp:155
 msgid "All"
-msgstr "所有"
+msgstr "ËùÓÐ"
 
-#: ../include/wx/defs.h:1986
+#: ../src/common/fldlgcmn.cpp:57
+#, fuzzy, c-format
+msgid "All files (%s)|%s"
+msgstr "ËùÓÐÎļþ (*)|*"
+
+#: ../include/wx/defs.h:2141
 msgid "All files (*)|*"
-msgstr "所有檔案 (*)|*"
+msgstr "ËùÓÐÎļþ (*)|*"
 
-#: ../src/html/helpfrm.cpp:1403
+#: ../src/html/helpfrm.cpp:1564
 #, fuzzy
 msgid "All files (*.*)|*"
-msgstr "所有檔案 (*)|*"
+msgstr "ËùÓÐÎļþ (*)|*"
 
-#: ../include/wx/defs.h:1983
+#: ../include/wx/defs.h:2138
 #, fuzzy
 msgid "All files (*.*)|*.*"
-msgstr "所有檔案 (*)|*"
+msgstr "ËùÓÐÎļþ (*)|*"
 
-#: ../src/common/xtistrm.cpp:383
+#: ../src/common/xtistrm.cpp:385
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr ""
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
-msgstr "已經撥接 ISP。"
+msgstr "ÒѾ­²¦½ÓISP."
 
-#: ../src/generic/logg.cpp:1118
+#: ../src/generic/logg.cpp:1113
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
-msgstr "把日誌加到檔案 '%s' 的尾端(選擇 [否] 將覆寫該檔案)？"
+msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
 
-#: ../src/common/fmapbase.cpp:107
+#: ../src/common/fmapbase.cpp:108
 msgid "Arabic (ISO-8859-6)"
-msgstr "阿拉伯語 (ISO-8859-6)"
+msgstr "°¢À­²®Óï (ISO-8859-6)"
+
+#: ../src/html/chm.cpp:564
+msgid "Archive doesnt contain #SYSTEM file"
+msgstr ""
 
-#: ../src/generic/filedlgg.cpp:428
+#: ../src/generic/filedlgg.cpp:433
 msgid "Attributes"
 msgstr ""
 
-#: ../src/common/paper.cpp:146
+#: ../src/common/paper.cpp:144
 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:126
 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:145
 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:127
 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:146
 msgid "B6 Envelope, 176 x 125 mm"
-msgstr "B6 信封, 176 x 125 毫米"
+msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
 
-#: ../src/common/imagbmp.cpp:470 ../src/common/imagbmp.cpp:486
+#: ../src/common/imagbmp.cpp:476 ../src/common/imagbmp.cpp:492
+#, fuzzy
 msgid "BMP: Couldn't allocate memory."
-msgstr "BMP: 無法配置記憶體。"
+msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
 
-#: ../src/common/imagbmp.cpp:88
+#: ../src/common/imagbmp.cpp:94
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: 無法儲存無效的圖像。"
+msgstr "BMP: ²»Äܱ£´æÎÞЧͼÏñ."
 
-#: ../src/common/imagbmp.cpp:292
+#: ../src/common/imagbmp.cpp:298
+#, fuzzy
 msgid "BMP: Couldn't write RGB color map."
-msgstr "BMP: 無法寫入 RGB 顏色對應表。"
+msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:424
+#: ../src/common/imagbmp.cpp:430
 msgid "BMP: Couldn't write data."
-msgstr "BMP: 無法寫入資料。"
+msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:197
+#: ../src/common/imagbmp.cpp:203
+#, fuzzy
 msgid "BMP: Couldn't write the file (Bitmap) header."
-msgstr "BMP: 無法寫入檔案標頭(Bitmap)。"
+msgstr "BMP: ²»ÄÜдÎļþÍ·."
 
-#: ../src/common/imagbmp.cpp:218
+#: ../src/common/imagbmp.cpp:224
+#, fuzzy
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
-msgstr "BMP: 無法寫入檔案標頭(BitmapInfo)。"
+msgstr "BMP: ²»ÄÜдÎļþÍ·."
 
-#: ../src/common/imagbmp.cpp:122
+#: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:227
-msgid "Backward"
-msgstr "前一頁"
-
-#: ../src/common/fmapbase.cpp:114
+#: ../src/common/fmapbase.cpp:115
 msgid "Baltic (ISO-8859-13)"
-msgstr "波羅的海語 (ISO-8859-13)"
+msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:106
 msgid "Baltic (old) (ISO-8859-4)"
-msgstr "波羅的海語 (舊的) (ISO-8859-4)"
+msgstr "²¨Â޵ĺ£Óï (¾ÉµÄ) (ISO-8859-4)"
 
-#: ../src/generic/fontdlgg.cpp:232
+#: ../contrib/src/deprecated/resource.cpp:2524
+#, c-format
+msgid "Bitmap resource specification %s not found."
+msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s."
+
+#: ../src/generic/fontdlgg.cpp:235
 msgid "Bold"
-msgstr "粗體"
+msgstr "´ÖÌå"
 
-#: ../src/generic/prntdlgg.cpp:663
+#: ../src/generic/prntdlgg.cpp:661
 msgid "Bottom margin (mm):"
-msgstr "底邊距(毫米)："
+msgstr "µ×±ß¾à (ºÁÃ×):"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:115
 msgid "C sheet, 17 x 22 in"
-msgstr "C 紙張, 17 x 22 英吋"
+msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
 
-#: ../src/generic/logg.cpp:500
+#: ../src/generic/logg.cpp:504
 msgid "C&lear"
-msgstr "清除(&L)"
+msgstr "Çå³ý[&L]"
 
-#: ../src/common/paper.cpp:142
+#: ../src/generic/fontdlgg.cpp:304
+msgid "C&olour:"
+msgstr ""
+
+#: ../src/common/paper.cpp:140
 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:141
 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:139
 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:142
 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:143
 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
-#, fuzzy
 msgid "CHM handler currently supports only local files!"
-msgstr "ZIP 處理常式目前只支援本機檔案！"
+msgstr ""
 
 #: ../src/os2/thread.cpp:121
 #, fuzzy
 msgid "Can not create mutex."
-msgstr "無法建立執行緒"
+msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
 
-#: ../src/common/filefn.cpp:1462
-#, c-format
+#: ../src/common/filefn.cpp:1255
+#, fuzzy, c-format
 msgid "Can not enumerate files '%s'"
-msgstr "無法列舉檔案 '%s'"
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/msw/dir.cpp:300 ../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
 msgid "Can not resume thread %lu"
-msgstr "無法恢復執行緒 %x"
+msgstr "²»Äָܻ´Ïß³Ì %x"
 
-#: ../src/mac/thread.cpp:477 ../src/msw/thread.cpp:821
+#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:830
 #, 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 "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤。"
+msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
 
 #: ../src/os2/thread.cpp:510
 #, fuzzy, c-format
 msgid "Can not suspend thread %lu"
-msgstr "無法暫停執行緒 %x"
+msgstr "²»ÄܹÒÆðÏß³Ì %x"
 
-#: ../src/mac/thread.cpp:453 ../src/msw/thread.cpp:806
+#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:815
 #, c-format
 msgid "Can not suspend thread %x"
-msgstr "無法暫停執行緒 %x"
+msgstr "²»ÄܹÒÆðÏß³Ì %x"
 
 #: ../src/msw/thread.cpp:728
 msgid "Can not wait for thread termination"
-msgstr "無法等候執行緒終結"
+msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
 
-#: ../src/common/cmdproc.cpp:259
+#: ../src/common/cmdproc.cpp:261
 msgid "Can't &Undo "
-msgstr "無法回復(&U)"
+msgstr "²»Äָܻ´[&U]"
 
-#: ../src/common/image.cpp:1441
+#: ../src/common/image.cpp:1481
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
-msgstr "無法檢查圖像檔格式 '%s'：檔案不存在。"
+msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."
 
-#: ../src/msw/registry.cpp:447
+#: ../src/msw/registry.cpp:439
 #, c-format
 msgid "Can't close registry key '%s'"
-msgstr "無法關閉登錄機碼 '%s'"
+msgstr "²»ÄܹرÕ×¢²á¼ü '%s'"
 
-#: ../src/msw/registry.cpp:519
+#: ../src/msw/registry.cpp:516
 #, c-format
 msgid "Can't copy values of unsupported type %d."
-msgstr "無法複製不支援類型 %d 的值。"
-
-#: ../src/msw/listctrl.cpp:413
-msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr "無法建立清單控件視窗, 檢查comctl32.dll是否已安裝。"
+msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
 
-#: ../src/msw/registry.cpp:428
+#: ../src/msw/registry.cpp:420
 #, c-format
 msgid "Can't create registry key '%s'"
-msgstr "無法建立登錄機碼 '%s'"
+msgstr "²»ÄÜ´´½¨×¢²á¼ü '%s'"
 
-#: ../src/mac/thread.cpp:430 ../src/msw/thread.cpp:593
+#: ../src/mac/carbon/thread.cpp:1100 ../src/mac/carbon/mpthread.cpp:911
+#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:593
 #: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
-msgstr "無法建立執行緒"
+msgstr "²»ÄÜ´´½¨½ø³Ì"
 
-#: ../src/msw/window.cpp:3080
-#, c-format
+#: ../src/msw/window.cpp:3145
+#, fuzzy, c-format
 msgid "Can't create window of class %s"
-msgstr "無法建立類別 '%s' 的視窗"
+msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#: ../src/msw/registry.cpp:689
+#: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Can't delete key '%s'"
-msgstr "無法刪除機碼 '%s'"
+msgstr "²»ÄÜɾ³ý¼ü '%s'"
 
 #: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
-msgstr "無法刪除 INI 檔 '%s'"
+msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
 
-#: ../src/msw/registry.cpp:717
+#: ../src/msw/registry.cpp:719
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
-msgstr "無法刪除機值 '%s' @ '%s'"
+msgstr "²»ÄÜɾ³ý¼üÖµ '%s'/ '%s'"
 
-#: ../src/msw/registry.cpp:728
-#, c-format
-msgid "Can't delete value of key '%s'"
-msgstr "無法刪除機碼 '%s'的值"
-
-#: ../src/msw/registry.cpp:1058
+#: ../src/msw/registry.cpp:1070
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
-msgstr "無法列舉機碼 '%s' 的子機碼"
+msgstr "²»ÄÜö¾Ù¼ü '%s'µÄ×Ó¼ü"
 
-#: ../src/msw/registry.cpp:1006
+#: ../src/msw/registry.cpp:1025
 #, c-format
 msgid "Can't enumerate values of key '%s'"
-msgstr "無法列舉機碼 '%s' 的值"
+msgstr "²»ÄÜö¾Ù¼ü '%s'µÄÖµ"
 
-#: ../src/common/ffile.cpp:212
+#: ../src/common/ffile.cpp:215
 #, c-format
 msgid "Can't find current position in file '%s'"
-msgstr "無法在檔案 '%s' 中找到目前位置"
+msgstr "²»ÄÜÔÚÎļþ'%s'ÖÐÕÒµ½µ±Ç°Î»ÖÃ"
 
-#: ../src/msw/registry.cpp:359
+#: ../src/msw/registry.cpp:356
 #, c-format
 msgid "Can't get info about registry key '%s'"
-msgstr "無法獲得登錄機碼 '%s' 的資訊"
+msgstr "²»ÄÜ»ñµÃ×¢²á¼ü '%s'µÄÐÅÏ¢"
 
-#: ../src/common/zstream.cpp:197
+#: ../src/common/zstream.cpp:237
 #, fuzzy
 msgid "Can't initialize zlib deflate stream."
-msgstr "無法初始化顯示畫面。"
+msgstr "²»Äܳõʼ»¯ OLE"
 
-#: ../src/common/zstream.cpp:88
+#: ../src/common/zstream.cpp:99
 #, fuzzy
 msgid "Can't initialize zlib inflate stream."
-msgstr "無法初始化顯示畫面。"
+msgstr "²»Äܳõʼ»¯ OLE"
 
-#: ../src/common/image.cpp:1028 ../src/common/image.cpp:1048
+#: ../src/common/image.cpp:1068 ../src/common/image.cpp:1088
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
-msgstr "無法從檔案 '%s' 中載入圖像：檔案不存在。"
+msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 
-#: ../src/msw/registry.cpp:394
+#: ../src/msw/registry.cpp:386
 #, c-format
 msgid "Can't open registry key '%s'"
-msgstr "無法開啟登錄機碼 '%s'"
+msgstr "²»ÄÜ´ò¿ª×¢²á¼ü '%s'"
 
-#: ../src/common/zstream.cpp:142
+#: ../src/common/zstream.cpp:166
 #, fuzzy, c-format
-msgid "Can't read from inflate stream: %s\n"
-msgstr "無法讀取檔案描述子 %d"
+msgid "Can't read from inflate stream: %s"
+msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 
-#: ../src/common/zstream.cpp:121
+#: ../src/common/zstream.cpp:159
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
 msgstr ""
 
-#: ../src/msw/registry.cpp:930
+#: ../src/msw/registry.cpp:959
 #, c-format
 msgid "Can't read value of '%s'"
-msgstr "無法讀取 '%s' 的值"
+msgstr "²»ÄܶÁ '%s'µÄÖµ"
 
-#: ../src/msw/registry.cpp:808 ../src/msw/registry.cpp:842
+#: ../src/msw/registry.cpp:792 ../src/msw/registry.cpp:823
+#: ../src/msw/registry.cpp:883
 #, c-format
 msgid "Can't read value of key '%s'"
-msgstr "無法讀取機碼 '%s' 的值"
+msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ"
 
-#: ../src/common/image.cpp:1070
-#, c-format
+#: ../src/common/image.cpp:1110
+#, fuzzy, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "無法儲存圖像到檔案 '%s' 中：未知的附檔名。"
+msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 
-#: ../src/generic/logg.cpp:562 ../src/generic/logg.cpp:994
+#: ../src/generic/logg.cpp:566 ../src/generic/logg.cpp:989
 msgid "Can't save log contents to file."
-msgstr "無法將日誌內容儲存到檔案中。"
+msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
 
 #: ../src/msw/thread.cpp:549 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
-msgstr "無法設定執行緒的優先等級"
+msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
 
-#: ../src/msw/registry.cpp:829 ../src/msw/registry.cpp:954
+#: ../src/msw/registry.cpp:810 ../src/msw/registry.cpp:852
+#: ../src/msw/registry.cpp:974
 #, c-format
 msgid "Can't set value of '%s'"
-msgstr "無法設定 '%s' 的值"
+msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
 
-#: ../src/common/zstream.cpp:276
+#: ../src/common/zstream.cpp:316
 #, fuzzy, c-format
-msgid "Can't write to deflate stream: %s\n"
-msgstr "無法寫到檔案描述子 %d"
-
-#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:977 ../src/generic/filedlgg.cpp:996
-#: ../src/generic/fontdlgg.cpp:255 ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:147 ../src/html/helpfrm.cpp:1066
-#: ../src/motif/msgdlg.cpp:182
+msgid "Can't write to deflate stream: %s"
+msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
+
+#: ../src/generic/choicdgg.cpp:284 ../src/generic/dirdlgg.cpp:116
+#: ../src/generic/numdlgg.cpp:131 ../src/generic/prntdlgg.cpp:453
+#: ../src/generic/progdlgg.cpp:215 ../src/generic/progdlgg.cpp:453
+#: ../src/generic/textdlgg.cpp:118 ../src/gtk/filedlg.cpp:168
+#: ../src/gtk/fontdlg.cpp:149 ../src/motif/msgdlg.cpp:185
+#: ../contrib/src/deprecated/proplist.cpp:518
 msgid "Cancel"
-msgstr "取消"
+msgstr "È¡Ïû"
 
-#: ../contrib/src/xrc/xmlres.cpp:987 ../contrib/src/xrc/xmlres.cpp:1028
+#: ../src/xrc/xmlres.cpp:1043 ../src/xrc/xmlres.cpp:1084
 msgid "Cannot convert dialog units: dialog unknown."
-msgstr "無法轉換對話窗單位：未知的對話窗。"
+msgstr ""
 
-#: ../src/common/strconv.cpp:1567
+#: ../src/common/strconv.cpp:2412
 #, fuzzy, c-format
 msgid "Cannot convert from the charset '%s'!"
-msgstr "無法轉換編碼 '%s'！"
+msgstr "λÖñàÂë (%d)"
 
-#: ../src/msw/dialup.cpp:497
+#: ../src/msw/dialup.cpp:509
 #, c-format
 msgid "Cannot find active dialup connection: %s"
-msgstr "找不到連線中的撥號連線: %s"
+msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:262
-#, c-format
+#: ../src/xrc/xmlres.cpp:264
+#, fuzzy, c-format
 msgid "Cannot find container for unknown control '%s'."
-msgstr "找不到未知控制元件所依附的容器： '%s'。"
+msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:1042
-#, c-format
+#: ../src/xrc/xmlres.cpp:1098
+#, fuzzy, c-format
 msgid "Cannot find font node '%s'."
-msgstr "找不到字型節點 '%s'。"
+msgstr "²»ÄÜ´ò¿ª URL '%s'"
 
-#: ../src/msw/dialup.cpp:811
+#: ../src/msw/dialup.cpp:814
 msgid "Cannot find the location of address book file"
-msgstr "找不到通訊錄的檔案位置。"
+msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
 
-#: ../src/unix/threadpsx.cpp:1100
+#: ../src/unix/threadpsx.cpp:1099
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
-msgstr "無法取得排程原則 %d 的優先等級範圍。"
+msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
 
-#: ../src/unix/utilsunx.cpp:724
+#: ../src/unix/utilsunx.cpp:747
 msgid "Cannot get the hostname"
-msgstr "無法獲得主機名稱。"
+msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
 
-#: ../src/unix/utilsunx.cpp:760
+#: ../src/unix/utilsunx.cpp:783
 msgid "Cannot get the official hostname"
-msgstr "無法獲得正式的主機名稱。"
+msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
 
-#: ../src/msw/dialup.cpp:905
+#: ../src/msw/dialup.cpp:908
 msgid "Cannot hang up - no active dialup connection."
-msgstr "無法掛斷—沒有連線中的撥號連線。"
+msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
 
-#: ../src/msw/app.cpp:290 ../src/msw/app.cpp:293
+#: ../src/msw/app.cpp:308 ../src/msw/app.cpp:311
 msgid "Cannot initialize OLE"
-msgstr "無法初始化 OLE"
+msgstr "²»Äܳõʼ»¯ OLE"
 
 #: ../src/mgl/app.cpp:292
+#, fuzzy
 msgid "Cannot initialize SciTech MGL!"
-msgstr "無法初始化 SciTech MGL！"
+msgstr "²»Äܳõʼ»¯ OLE"
 
 #: ../src/mgl/window.cpp:546
+#, fuzzy
 msgid "Cannot initialize display."
-msgstr "無法初始化顯示畫面。"
+msgstr "²»Äܳõʼ»¯ OLE"
 
 #: ../src/msw/volume.cpp:601
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot load icon from '%s'."
-msgstr "無法從 '%s' 中載入圖示。"
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../contrib/src/xrc/xmlres.cpp:382
-#, c-format
+#: ../src/xrc/xmlres.cpp:387
+#, fuzzy, 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
 #, 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
-#, c-format
+#: ../src/xrc/xmlres.cpp:355
+#, fuzzy, c-format
 msgid "Cannot open file '%s'."
-msgstr "無法開啟檔案 '%s'"
+msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
 
-#: ../src/generic/dcpsg.cpp:1795
+#: ../src/generic/dcpsg.cpp:1816
 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:1196
+#: ../src/common/intl.cpp:1204
 #, fuzzy, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "無法從 '%s' 解譯出大小。"
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:975
-#, c-format
+#: ../src/xrc/xmlres.cpp:1031
+#, fuzzy, c-format
 msgid "Cannot parse coordinates from '%s'."
-msgstr "無法從 '%s' 解譯出大小。"
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:1016
-#, c-format
+#: ../src/xrc/xmlres.cpp:1072
+#, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
-msgstr "無法從 '%s' 解譯出維度。"
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/html/helpfrm.cpp:1387
+#: ../src/html/helpfrm.cpp:1548
 msgid "Cannot print empty page."
-msgstr "無法列印空頁面。"
+msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
 
 #: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
-#, c-format
+#, fuzzy, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "無法從 '%s' 讀取型態名稱！"
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
-#: ../src/unix/threadpsx.cpp:1081
+#: ../src/unix/threadpsx.cpp:1080
 msgid "Cannot retrieve thread scheduling policy."
-msgstr "無法取得執行緒調度原則。"
+msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
 
 #: ../src/unix/threadpsx.cpp:728
 msgid "Cannot start thread: error writing TLS"
-msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤"
+msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
+
+#: ../src/mac/carbon/thread.cpp:1174 ../src/mac/carbon/mpthread.cpp:977
+#, fuzzy
+msgid "Cannot wait on thread to exit."
+msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
 
-#: ../src/html/helpfrm.cpp:441
+#: ../src/mac/carbon/thread.cpp:1082 ../src/mac/carbon/mpthread.cpp:893
+#, fuzzy
+msgid "Cant create the thread event queue"
+msgstr "²»ÄÜ´´½¨½ø³Ì"
+
+#: ../src/html/helpfrm.cpp:511
 msgid "Case sensitive"
-msgstr "區分大小寫"
+msgstr "´óСдÃô¸Ð"
 
-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:116
+#, fuzzy
 msgid "Celtic (ISO-8859-14)"
-msgstr "凱爾特語 (ISO-8859-14)"
+msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:103
+#: ../src/common/stockitem.cpp:124
+#, fuzzy
+msgid "Centered"
+msgstr "ÆäËü"
+
+#: ../src/common/fmapbase.cpp:104
+#, fuzzy
 msgid "Central European (ISO-8859-2)"
-msgstr "中歐 (ISO-8859-2)"
+msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
 
-#: ../src/msw/dialup.cpp:746
+#: ../src/msw/dialup.cpp:749
 msgid "Choose ISP to dial"
-msgstr "選擇 ISP 進行撥號"
+msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
 
-#: ../src/gtk/fontdlg.cpp:125
+#: ../src/generic/colrdlgg.cpp:146 ../src/gtk/colordlg.cpp:45
+#, fuzzy
+msgid "Choose colour"
+msgstr "Ñ¡Ôñ×ÖÌå"
+
+#: ../src/gtk/fontdlg.cpp:127
 msgid "Choose font"
-msgstr "選擇字型"
+msgstr "Ñ¡Ôñ×ÖÌå"
 
 #: ../src/generic/mdig.cpp:114
+#, fuzzy
 msgid "Cl&ose"
-msgstr "關閉(&o)"
+msgstr "¹Ø±Õ"
 
-#: ../src/generic/logg.cpp:500
+#: ../src/generic/logg.cpp:504
 msgid "Clear the log contents"
-msgstr "清除日誌內容"
+msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
+
+#: ../src/generic/fontdlgg.cpp:352 ../src/generic/fontdlgg.cpp:371
+msgid "Click to cancel the font selection."
+msgstr ""
 
-#: ../src/generic/progdlgg.cpp:358
+#: ../src/generic/fontdlgg.cpp:357 ../src/generic/fontdlgg.cpp:359
+#: ../src/generic/fontdlgg.cpp:364 ../src/generic/fontdlgg.cpp:366
+msgid "Click to confirm the font selection."
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:395 ../src/generic/progdlgg.cpp:400
+#: ../src/generic/tipdlg.cpp:230 ../src/generic/tipdlg.cpp:296
+#: ../contrib/src/deprecated/proplist.cpp:513
 msgid "Close"
-msgstr "關閉"
+msgstr "¹Ø±Õ"
 
-#: ../src/univ/themes/win32.cpp:4680
+#: ../src/univ/themes/win32.cpp:4709
 msgid "Close\tAlt-F4"
-msgstr "關閉視窗\tAlt-F4"
+msgstr ""
 
 #: ../src/generic/mdig.cpp:115
+#, fuzzy
 msgid "Close All"
-msgstr "全部關閉"
+msgstr "¹Ø±Õ"
 
-#: ../src/generic/logg.cpp:502
+#: ../src/generic/logg.cpp:506
 msgid "Close this window"
-msgstr "關閉視窗"
+msgstr "¹Ø±Õ´°¿Ú"
 
-#: ../src/html/helpfrm.cpp:1401
+#: ../src/html/helpfrm.cpp:1562
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:592
+#: ../src/generic/dirctrlg.cpp:548
+#, fuzzy
 msgid "Computer"
-msgstr "我的電腦"
+msgstr "¼ÆËã»ú"
 
-#: ../src/common/fileconf.cpp:934
+#: ../src/common/fileconf.cpp:929
 #, c-format
 msgid "Config entry name cannot start with '%c'."
-msgstr "組態項目名稱不能以 '%c' 開頭。"
+msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
 
-#: ../src/generic/filedlgg.cpp:1214 ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1250 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
-msgstr "確認"
+msgstr "È·ÈÏ"
 
-#: ../src/msw/mimetype.cpp:679
+#: ../src/msw/mimetype.cpp:677
 msgid "Confirm registry update"
-msgstr "確認登錄變更"
+msgstr ""
 
-#: ../src/html/htmlwin.cpp:361
+#: ../src/html/htmlwin.cpp:380
 msgid "Connecting..."
-msgstr "連線中..."
+msgstr "Á¬½Ó..."
 
-#: ../src/html/helpfrm.cpp:381
+#: ../src/html/helpfrm.cpp:453
 msgid "Contents"
-msgstr "目錄"
+msgstr "Ŀ¼"
 
-#: ../src/common/strconv.cpp:942
+#: ../src/common/strconv.cpp:951
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
-msgstr "無法轉換到字集 '%s'。"
+msgstr ""
 
-#: ../src/html/htmlwin.cpp:781
+#: ../src/html/htmlwin.cpp:818
 #, fuzzy, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "無法設定剪貼簿資料。"
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:188
 msgid "Copies:"
-msgstr "份數："
+msgstr "·Ý:"
 
 #: ../src/html/chm.cpp:689
 #, fuzzy, 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 ""
 
+#: ../contrib/src/deprecated/resource.cpp:1830
+#: ../contrib/src/deprecated/resource.cpp:1960
+#, c-format
+msgid "Could not find resource include file %s."
+msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
+
 #: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
-msgstr "找不到識別碼標籤"
+msgstr "ÕÒ²»µ½idµÄ±êÇ©"
 
-#: ../src/msw/textctrl.cpp:2632
+#: ../src/msw/textctrl.cpp:2636
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
-msgstr "無法載入 Rich Edit DLL '%s'"
+msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
 
 #: ../src/html/chm.cpp:445
 #, fuzzy, c-format
 msgid "Could not locate file '%s'."
-msgstr "無法開啟檔案 '%s'"
+msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
+
+#: ../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 ""
+"Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
+" or provide #define (see manual for caveats)"
 
-#: ../src/common/prntbase.cpp:810
+#: ../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:817
 msgid "Could not start document preview."
-msgstr "無法啟動文件預覽。"
+msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ."
 
-#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:245
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:237
 msgid "Could not start printing."
-msgstr "無法啟動列印。"
+msgstr "²»ÄÜÆô¶¯´òÓ¡."
 
-#: ../src/common/wincmn.cpp:1202
+#: ../src/common/wincmn.cpp:1421
 msgid "Could not transfer data to window"
-msgstr "無法轉移資料到視窗中。"
+msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
 
-#: ../src/os2/thread.cpp:154
+#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
+#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
 #, fuzzy
+msgid "Could not unlock mutex"
+msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
+
+#: ../src/os2/thread.cpp:154
 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/imaglist.cpp:157 ../src/msw/imaglist.cpp:175
+#: ../src/msw/imaglist.cpp:187
 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:98 ../src/os2/timer.cpp:118
 msgid "Couldn't create a timer"
-msgstr "無法建立計時器。"
+msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 
 #: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+#, fuzzy
 msgid "Couldn't create cursor."
-msgstr "無法建立游標。"
+msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 
-#: ../src/common/dynlib.cpp:388
+#: ../src/common/dynlib.cpp:387
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
-msgstr "在動態連結檔中找不到符號 '%s'。"
+msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
 
-#: ../src/mac/thread.cpp:507 ../src/msw/thread.cpp:847
+#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:856
 msgid "Couldn't get the current thread pointer"
-msgstr "無法取得目前執行緒指標。"
+msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "無法載入 PNG 圖像—檔案被破壞或是沒有足夠記憶體。"
+msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ."
 
-#: ../src/unix/sound.cpp:412
+#: ../src/unix/sound.cpp:472
 #, fuzzy, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "無法從 '%s' 中載入圖示。"
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/unix/sound_sdl.cpp:231
+#: ../src/unix/sound_sdl.cpp:230
 #, fuzzy, 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
-#, fuzzy
 msgid "Couldn't release a mutex"
-msgstr "無法建立計時器。"
+msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
 
-#: ../src/msw/listctrl.cpp:828
+#: ../src/msw/listctrl.cpp:735
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
-msgstr "無法取得清單控制元件中細項 %d 的資訊。"
+msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
 
 #: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
+#, fuzzy
 msgid "Couldn't save PNG image."
-msgstr "無法儲存 PNG 圖像。"
+msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 
-#: ../src/mac/thread.cpp:756 ../src/msw/thread.cpp:610
+#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
-msgstr "無法終止執行緒。"
+msgstr "²»ÄÜÖÕÖ¹Ïß³Ì"
 
 #: ../src/common/xtistrm.cpp:161
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:265
+#: ../src/generic/dirdlgg.cpp:311
 msgid "Create directory"
-msgstr "建立目錄"
+msgstr "´´½¨Ä¿Â¼"
 
-#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:931
+#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:960
 msgid "Create new directory"
-msgstr "建立新目錄"
+msgstr "´´½¨ÐÂĿ¼"
 
-#: ../src/msw/textctrl.cpp:2050
+#: ../src/common/stockitem.cpp:111 ../src/msw/textctrl.cpp:2052
 msgid "Cu&t"
-msgstr "剪下(&t)"
+msgstr ""
 
-#: ../src/generic/filedlgg.cpp:942
+#: ../src/generic/filedlgg.cpp:971
 msgid "Current directory:"
-msgstr "目前目錄："
+msgstr "µ±Ç°Ä¿Â¼:"
 
-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:107
+#, fuzzy
 msgid "Cyrillic (ISO-8859-5)"
-msgstr "斯拉夫語 (ISO-8859-5)"
+msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
-#: ../src/common/paper.cpp:118
+#: ../src/common/paper.cpp:116
 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:633
 msgid "DDE poke request failed"
-msgstr "「動態資料交換」資料傳送請求失敗"
+msgstr "DDE poke ÇëÇóʧ°Ü"
 
-#: ../src/common/imagbmp.cpp:914
+#: ../src/common/imagbmp.cpp:920
+#, fuzzy
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "DIB 標頭：編碼型態與色彩位元數不吻合。"
+msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
 
-#: ../src/common/imagbmp.cpp:876
+#: ../src/common/imagbmp.cpp:882
+#, fuzzy
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB 標頭：圖像高度大於 32767 個圖素。"
+msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:870
+#: ../src/common/imagbmp.cpp:876
+#, fuzzy
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB 標頭：圖像寬度大於 32767 個圖素。"
+msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:890
+#: ../src/common/imagbmp.cpp:896
+#, fuzzy
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "DIB 標頭：未知的色彩位元數。"
+msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
 
-#: ../src/common/imagbmp.cpp:900
+#: ../src/common/imagbmp.cpp:906
+#, fuzzy
 msgid "DIB Header: Unknown encoding in file."
-msgstr "DIB 標頭：未知的編碼型態。"
+msgstr "BMP: Îļþ±àÂëδ֪."
 
-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:138
 msgid "DL Envelope, 110 x 220 mm"
-msgstr "DL 信封, 110 x 220 毫米"
+msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
 
-#: ../src/generic/fontdlgg.cpp:222
+#: ../src/generic/fontdlgg.cpp:225
 msgid "Decorative"
-msgstr "修飾"
+msgstr "ÐÞÊÎ"
 
-#: ../src/common/fmapbase.cpp:660
+#: ../src/common/fmapbase.cpp:671
 msgid "Default encoding"
-msgstr "預設的編碼"
+msgstr ""
 
 #: ../contrib/src/gizmos/editlbox.cpp:163
 #, fuzzy
 msgid "Delete item"
-msgstr "刪除(&D)"
+msgstr "µç´«´ò×Ö»ú"
 
-#: ../src/unix/snglinst.cpp:269
-#, c-format
+#: ../src/unix/snglinst.cpp:300
+#, fuzzy, c-format
 msgid "Deleted stale lock file '%s'."
-msgstr "已刪除過時的鎖定檔案 '%s'。"
+msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
 
-#: ../src/msw/dialup.cpp:346
+#: ../src/msw/dialup.cpp:358
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
-msgstr "由於遠端存取服務（RAS）沒有安裝，撥號功能無法使用。請先安裝它。"
+msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:241
 msgid "Did you know..."
-msgstr "您知道嗎..."
+msgstr "ÄãÖªµÀ..."
 
-#: ../src/common/filefn.cpp:1352
+#: ../src/common/filefn.cpp:1145
 #, c-format
 msgid "Directory '%s' couldn't be created"
-msgstr "目錄 '%s' 無法建立"
+msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
 
 #: ../src/mgl/dirmgl.cpp:217
-#, c-format
+#, fuzzy, c-format
 msgid "Directory '%s' doesn't exist!"
-msgstr "目錄 '%s' 不存在！"
+msgstr "Ŀ¼²»´æÔÚ"
 
-#: ../src/generic/dirdlgg.cpp:190
+#: ../src/generic/dirdlgg.cpp:236
 msgid "Directory does not exist"
-msgstr "目錄不存在"
+msgstr "Ŀ¼²»´æÔÚ"
 
-#: ../src/generic/filedlgg.cpp:1191
+#: ../src/generic/filedlgg.cpp:1227
 #, fuzzy
 msgid "Directory doesn't exist."
-msgstr "目錄不存在"
+msgstr "Ŀ¼²»´æÔÚ"
 
-#: ../src/html/helpfrm.cpp:409
+#: ../src/html/helpfrm.cpp:480
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
-msgstr "顯示包含該字串的所有索引項目。搜尋不分大小寫。"
+msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
 
-#: ../src/html/helpfrm.cpp:583
+#: ../src/html/helpfrm.cpp:662
 msgid "Display options dialog"
-msgstr "顯示選項對話方塊"
+msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
 
-#: ../src/msw/mimetype.cpp:672
+#: ../src/msw/mimetype.cpp:670
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -1170,24 +1455,19 @@ msgid ""
 "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:446
 #, c-format
 msgid "Do you want to save changes to document %s?"
-msgstr "你想儲存對文件 %s 的修改？"
+msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"
 
-#: ../src/html/htmlwin.cpp:421
+#: ../src/html/htmlwin.cpp:445 ../src/msw/frame.cpp:198
 msgid "Done"
-msgstr "完成"
+msgstr "Íê³É"
 
-#: ../src/generic/progdlgg.cpp:370
+#: ../src/generic/progdlgg.cpp:412
 msgid "Done."
-msgstr "完成。"
+msgstr "Íê³É¡£"
 
 #: ../src/common/xtixml.cpp:271
 #, c-format
@@ -1195,2172 +1475,2454 @@ msgid "Doubly used id : %d"
 msgstr ""
 
 #: ../src/generic/fdrepdlg.cpp:151
+#, fuzzy
 msgid "Down"
-msgstr "下"
+msgstr "Íê³É"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:117
 msgid "E sheet, 34 x 44 in"
-msgstr "E 紙張, 34 x 44 英吋"
+msgstr "E Ö½ÕÅ, 34 x 44 Ó¢´ç"
 
 #: ../contrib/src/gizmos/editlbox.cpp:161
 msgid "Edit item"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../src/generic/progdlgg.cpp:186
 msgid "Elapsed time : "
-msgstr "歷時︰"
+msgstr "ÓÃʱ£º"
 
-#: ../src/common/prntbase.cpp:408
+#: ../src/common/prntbase.cpp:412
 #, c-format
 msgid "Enter a page number between %d and %d:"
 msgstr ""
 
 #: ../src/generic/helpext.cpp:442
 msgid "Entries found"
-msgstr "找到的項目"
+msgstr "ÕÒµ½µÄÌõÄ¿"
 
-#: ../src/common/config.cpp:366
+#: ../src/common/config.cpp:359
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
-msgstr "無法展開環境變數：'%c' 沒有出現在位置 %d @ '%s'。"
-
-#: ../src/generic/dirctrlg.cpp:683 ../src/generic/dirctrlg.cpp:701
-#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:711
-#: ../src/generic/filedlgg.cpp:725 ../src/generic/filedlgg.cpp:739
-#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1191
-#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
-#: ../src/gtk/fontdlg.cpp:76
+msgstr "»·¾³±äÁ¿À©Õ¹Ê§°Ü:  '%c' ûÓгöÏÖÔÚλÖà %d / '%s'."
+
+#: ../src/generic/dirctrlg.cpp:640 ../src/generic/dirctrlg.cpp:658
+#: ../src/generic/dirctrlg.cpp:669 ../src/generic/dirdlgg.cpp:346
+#: ../src/generic/filedlgg.cpp:625 ../src/generic/filedlgg.cpp:737
+#: ../src/generic/filedlgg.cpp:751 ../src/generic/filedlgg.cpp:765
+#: ../src/generic/filedlgg.cpp:1202 ../src/generic/filedlgg.cpp:1227
+#: ../src/generic/filedlgg.cpp:1257 ../src/gtk/filedlg.cpp:82
+#: ../src/gtk/fontdlg.cpp:78
 msgid "Error"
-msgstr "錯誤"
+msgstr "´íÎó"
 
-#: ../src/unix/utilsunx.cpp:1030 ../src/unix/utilsunx.cpp:1038
+#: ../src/unix/utilsunx.cpp:1053 ../src/unix/utilsunx.cpp:1061
 msgid "Error "
-msgstr "錯誤"
+msgstr "´íÎó"
 
-#: ../src/generic/dirdlgg.cpp:205
+#: ../src/generic/dirdlgg.cpp:251
 msgid "Error creating directory"
-msgstr "建立目錄錯誤"
+msgstr "´´½¨Ä¿Â¼´íÎó"
 
-#: ../src/common/imagbmp.cpp:923
+#: ../src/common/imagbmp.cpp:929
+#, fuzzy
 msgid "Error in reading image DIB ."
-msgstr "讀取圖像 DIB 時發生錯誤。"
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/fileconf.cpp:505
+#: ../src/common/fileconf.cpp:501
 #, fuzzy
 msgid "Error reading config options."
-msgstr "讀取圖像 DIB 時發生錯誤。"
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/log.cpp:478
+#: ../src/common/fileconf.cpp:1015
+#, fuzzy
+msgid "Error saving user configuration data."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#: ../src/mac/carbon/thread.cpp:672 ../src/mac/carbon/mpthread.cpp:482
+msgid "Error while waiting on semaphore"
+msgstr ""
+
+#: ../src/common/log.cpp:481
 msgid "Error: "
-msgstr "錯誤︰"
+msgstr "´íÎó£º"
 
-#: ../src/common/fmapbase.cpp:104
+#: ../src/common/fmapbase.cpp:105
 msgid "Esperanto (ISO-8859-3)"
-msgstr "世界語 (ISO-8859-3)"
+msgstr "Esperanto (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:194
 msgid "Estimated time : "
-msgstr "估計時間︰"
+msgstr "Ô¤ÆÚʱ¼ä£º"
 
-#: ../src/msw/utilsexc.cpp:735
+#: ../src/msw/utilsexc.cpp:751
 #, c-format
 msgid "Execution of command '%s' failed"
-msgstr "指令 '%s' 執行失敗"
+msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
 
-#: ../src/os2/utilsexc.cpp:171
+#: ../src/os2/utilsexc.cpp:169
 #, fuzzy, c-format
 msgid "Execution of command '%s' failed with error: %ul"
-msgstr "指令 '%s' 執行失敗"
+msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:122
 msgid "Executive, 7 1/4 x 10 1/2 in"
-msgstr "Executive, 7 1/4 x 10 1/2 英吋"
-
-#: ../src/common/fmapbase.cpp:139
+msgstr "Executive, 7 1/4 x 10 1/2 Ó¢´ç"
+
+#: ../contrib/src/deprecated/resource.cpp:1869
+#: ../contrib/src/deprecated/resource.cpp:1999
+#: ../contrib/src/deprecated/resource.cpp:3091
+msgid "Expected '*' whilst parsing resource."
+msgstr "½âÎö×ÊԴʱÆÚ´ý³öÏÖ '*' ."
+
+#: ../contrib/src/deprecated/resource.cpp:1886
+#: ../contrib/src/deprecated/resource.cpp:2015
+#: ../contrib/src/deprecated/resource.cpp:3108
+msgid "Expected '=' whilst parsing resource."
+msgstr "½âÎö×ÊԴʱÆÚ´ý '='."
+
+#: ../contrib/src/deprecated/resource.cpp:1855
+#: ../contrib/src/deprecated/resource.cpp:1985
+#: ../contrib/src/deprecated/resource.cpp:3077
+msgid "Expected 'char' whilst parsing resource."
+msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ."
+
+#: ../src/common/fmapbase.cpp:141
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr ""
 
 #: ../src/html/chm.cpp:696
 #, fuzzy, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "指令 '%s' 執行失敗"
+msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
 
-#: ../src/msw/dialup.cpp:840
+#: ../src/msw/dialup.cpp:843
 #, c-format
 msgid "Failed to %s dialup connection: %s"
-msgstr "%s 撥號連線失敗: %s"
+msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
-#: ../src/unix/snglinst.cpp:243
+#: ../src/unix/snglinst.cpp:274
 msgid "Failed to access lock file."
-msgstr "無法存取鎖定中的檔案。"
+msgstr ""
 
-#: ../src/msw/dib.cpp:460
+#: ../src/msw/dib.cpp:543
 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr ""
 
-#: ../src/unix/displayx11.cpp:262
+#: ../src/unix/displayx11.cpp:224
 #, fuzzy
 msgid "Failed to change video mode"
-msgstr "無法關閉檔案"
+msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
-#: ../src/common/filename.cpp:187
+#: ../src/common/filename.cpp:191
+#, fuzzy
 msgid "Failed to close file handle"
-msgstr "無法關閉檔案"
+msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
-#: ../src/unix/snglinst.cpp:308
-#, c-format
+#: ../src/unix/snglinst.cpp:339
+#, fuzzy, c-format
 msgid "Failed to close lock file '%s'"
-msgstr "無法關閉鎖定檔案 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #: ../src/msw/clipbrd.cpp:122
 msgid "Failed to close the clipboard."
-msgstr "無法關閉剪貼簿。"
+msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
-#: ../src/msw/dialup.cpp:780
+#: ../src/msw/dialup.cpp:783
 msgid "Failed to connect: missing username/password."
-msgstr "連線失敗：缺少使用者名稱或密碼。"
+msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
 
-#: ../src/msw/dialup.cpp:726
+#: ../src/msw/dialup.cpp:729
 msgid "Failed to connect: no ISP to dial."
-msgstr "連線失敗：沒有可撥號的 ISP。"
+msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
 
-#: ../src/msw/registry.cpp:623
+#: ../src/msw/registry.cpp:624
 #, c-format
 msgid "Failed to copy registry value '%s'"
-msgstr "無法複製登錄機值 '%s'"
+msgstr "¿½±´×¢²á¼üֵʧ°Ü '%s'"
 
-#: ../src/msw/registry.cpp:632
+#: ../src/msw/registry.cpp:633
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
-msgstr "無法複製登錄機碼 '%s' 的內容到 '%s'。"
+msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
 
-#: ../src/common/filefn.cpp:1192
-#, c-format
+#: ../src/common/filefn.cpp:989
+#, fuzzy, c-format
 msgid "Failed to copy the file '%s' to '%s'"
-msgstr "無法複製檔案 '%s' 到 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
+#: ../src/msw/registry.cpp:611
+#, fuzzy, c-format
+msgid "Failed to copy the registry subkey '%s' to '%s'."
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/dde.cpp:1004
+#: ../src/msw/dde.cpp:988
 msgid "Failed to create DDE string"
-msgstr "無法建立「動態資料交換」字串"
+msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
 
-#: ../src/msw/mdi.cpp:426
+#: ../src/msw/mdi.cpp:455
 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:733
+#: ../src/common/filename.cpp:742
+#, fuzzy
 msgid "Failed to create a temporary file name"
-msgstr "無法產生暫存檔的檔名"
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/msw/utilsexc.cpp:228
+#: ../src/msw/utilsexc.cpp:226
+#, fuzzy
 msgid "Failed to create an anonymous pipe"
-msgstr "無法建立匿名管道"
+msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 
-#: ../src/msw/dde.cpp:468
+#: ../src/msw/dde.cpp:450
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
-msgstr "無法建立連線到伺服器 '%s' 的主旨 '%s'"
+msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü"
 
-#: ../src/msw/cursor.cpp:197
+#: ../src/msw/cursor.cpp:198
 #, fuzzy
 msgid "Failed to create cursor."
-msgstr "無法建立狀態列。"
+msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 
-#: ../src/unix/mimetype.cpp:369
-#, c-format
+#: ../src/unix/mimetype.cpp:370
+#, fuzzy, c-format
 msgid "Failed to create directory %s/.gnome."
-msgstr "無法建立目錄 %s/.gnome。"
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/unix/mimetype.cpp:378
-#, c-format
+#: ../src/unix/mimetype.cpp:379
+#, fuzzy, c-format
 msgid "Failed to create directory %s/mime-info."
-msgstr "無法建立目錄 %s/mime-info。"
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/generic/dirdlgg.cpp:203
-#, c-format
+#: ../src/generic/dirdlgg.cpp:249
+#, fuzzy, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
-"無法建立目錄 '%s'\n"
-"(您是否有足夠的權限？)"
+"\n"
+"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
 
-#: ../src/msw/mimetype.cpp:196
-#, c-format
+#: ../src/msw/mimetype.cpp:193
+#, fuzzy, c-format
 msgid "Failed to create registry entry for '%s' files."
-msgstr "無法為 '%s' 檔案建立登錄項目。"
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/fdrepdlg.cpp:480
+#: ../src/msw/fdrepdlg.cpp:479
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
-msgstr "無法建立標準的「尋找/置換」對話窗 (錯誤碼 %d)"
+msgstr ""
 
-#: ../src/html/winpars.cpp:495
+#: ../src/html/winpars.cpp:519
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
-msgstr "無法以編碼 %s 顯示 HTML 文件"
+msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
 
-#: ../src/mac/clipbrd.cpp:185 ../src/msw/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:185 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
-msgstr "無法清空剪貼簿"
+msgstr "Çå¿Õ¼ôÌù°åʧ°Ü"
 
 #: ../src/unix/displayx11.cpp:201
 #, fuzzy
 msgid "Failed to enumerate video modes"
-msgstr "無法建立目錄 %s/.gnome。"
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/msw/dde.cpp:668
+#: ../src/msw/dde.cpp:652
 msgid "Failed to establish an advise loop with DDE server"
-msgstr "無法建立與「動態資料交換」伺服器溝通的連結"
+msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ­»·Ê§°Ü"
 
-#: ../src/msw/dialup.cpp:618
+#: ../src/msw/dialup.cpp:621
 #, c-format
 msgid "Failed to establish dialup connection: %s"
-msgstr "無法建立撥號連線：%s"
+msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
-#: ../src/unix/utilsunx.cpp:459 ../src/unix/utilsunx.cpp:475
+#: ../src/unix/utilsunx.cpp:480 ../src/unix/utilsunx.cpp:496
 #, c-format
 msgid "Failed to execute '%s'\n"
-msgstr "無法執行 '%s'\n"
+msgstr "Ö´ÐÐ '%s'ʧ°Ü\n"
 
-#: ../src/msw/dialup.cpp:678
+#: ../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:681
 #, c-format
 msgid "Failed to get ISP names: %s"
-msgstr "無法取得 ISP 名稱： %s"
+msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
 
-#: ../src/mac/clipbrd.cpp:134
+#: ../src/mac/carbon/clipbrd.cpp:134 ../src/mac/classic/clipbrd.cpp:134
+#, fuzzy
 msgid "Failed to get clipboard data."
-msgstr "無法取得剪貼簿資料。"
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
-#: ../src/msw/clipbrd.cpp:713
+#: ../src/msw/clipbrd.cpp:716
 msgid "Failed to get data from the clipboard"
-msgstr "無法從剪貼簿取得資料"
-
-#: ../src/common/stopwatch.cpp:238
-msgid "Failed to get the UTC system time."
-msgstr "無法取得系統的 UTC 時間。"
+msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
 
 #: ../src/common/stopwatch.cpp:189
 msgid "Failed to get the local system time"
-msgstr "無法取得系統的當地時間"
+msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
 
-#: ../src/common/filefn.cpp:1602
+#: ../src/common/filefn.cpp:1382
+#, fuzzy
 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 ""
 
 #: ../src/msw/helpchm.cpp:69
 msgid "Failed to initialize MS HTML Help."
-msgstr "無法初始化 MS HTML Help。"
+msgstr ""
 
-#: ../src/msw/glcanvas.cpp:741
+#: ../src/msw/glcanvas.cpp:793
+#, fuzzy
 msgid "Failed to initialize OpenGL"
-msgstr "無法初始化 OpenGL"
+msgstr "²»Äܳõʼ»¯ OLE"
+
+#: ../src/unix/snglinst.cpp:246
+#, fuzzy, c-format
+msgid "Failed to inspect the lock file '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #: ../src/unix/threadpsx.cpp:896
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
-msgstr "無法停止執行緒，偵測到潛在的記憶體流失 - 請重新啟動程式"
+msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³"
 
-#: ../src/msw/utils.cpp:723
-#, c-format
+#: ../src/msw/utils.cpp:684
+#, fuzzy, c-format
 msgid "Failed to kill process %d"
-msgstr "無法刪除程序 %d"
+msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
-#: ../src/common/iconbndl.cpp:68
-#, c-format
+#: ../src/common/iconbndl.cpp:72
+#, fuzzy, c-format
 msgid "Failed to load image %d from file '%s'."
-msgstr "無法載入圖像 %d—檔案 '%s'。"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #: ../src/msw/volume.cpp:312
+#, fuzzy
 msgid "Failed to load mpr.dll."
-msgstr "無法載入 mpr.dll"
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
-#: ../src/common/dynlib.cpp:287
+#: ../src/common/dynlib.cpp:286
 #, c-format
 msgid "Failed to load shared library '%s'"
-msgstr "無法載入共享函式庫 '%s'"
+msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 
-#: ../src/common/dynlib.cpp:216
-#, c-format
+#: ../src/common/dynlib.cpp:215
+#, fuzzy, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
-msgstr "無法載入共享函式庫 '%s'，發生 '%s' 錯誤"
+msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 
-#: ../src/unix/snglinst.cpp:192
-#, c-format
+#: ../src/unix/snglinst.cpp:203
+#, fuzzy, c-format
 msgid "Failed to lock the lock file '%s'"
-msgstr "無法鎖定檔案 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/regex.cpp:263
-#, c-format
+#: ../src/common/regex.cpp:300
+#, fuzzy, c-format
 msgid "Failed to match '%s' in regular expression: %s"
-msgstr "無法搜尋與正規運算式 '%s' 相符的字串：%s"
+msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
-#: ../src/common/filename.cpp:1848
-#, c-format
+#: ../src/common/filename.cpp:1884
+#, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
-msgstr "無法變更檔案 '%s' 的檔案日期"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filename.cpp:175
-#, c-format
+#: ../src/common/filename.cpp:179
+#, fuzzy, c-format
 msgid "Failed to open '%s' for %s"
-msgstr "無法開啟 '%s'—%s"
+msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
 #: ../src/html/chm.cpp:142
 #, fuzzy, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "無法開啟 '%s'—%s"
+msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:755
+#: ../src/common/filename.cpp:764
+#, fuzzy
 msgid "Failed to open temporary file."
-msgstr "無法開啟暫存檔。"
+msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
 #: ../src/msw/clipbrd.cpp:102
 msgid "Failed to open the clipboard."
-msgstr "無法開啟剪貼簿。"
+msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
-#: ../src/msw/clipbrd.cpp:616
+#: ../src/msw/clipbrd.cpp:619
 msgid "Failed to put data on the clipboard"
-msgstr "無法存放資料到剪貼簿。"
+msgstr "°ÑÊý¾Ý·Åµ½¼ôÌù°åʧ°Ü"
 
-#: ../src/unix/snglinst.cpp:252
+#: ../src/unix/snglinst.cpp:283
+#, fuzzy
 msgid "Failed to read PID from lock file."
-msgstr "無法從鎖定的檔案中讀出「程序識別碼」。"
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/unix/utilsunx.cpp:547
+#: ../src/unix/utilsunx.cpp:570
 msgid "Failed to redirect child process input/output"
-msgstr "重新轉向子過程輸入/輸出失敗"
+msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
-#: ../src/msw/utilsexc.cpp:635
+#: ../src/msw/utilsexc.cpp:651
+#, fuzzy
 msgid "Failed to redirect the child process IO"
-msgstr "無法轉向子程序的「輸入/輸出」"
+msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
-#: ../src/msw/dde.cpp:318
+#: ../src/msw/dde.cpp:300
 #, c-format
 msgid "Failed to register DDE server '%s'"
-msgstr "無法註冊「動態資料交換」伺服器 '%s'"
+msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
+
+#: ../src/msw/glcanvas.cpp:362
+#, fuzzy
+msgid "Failed to register OpenGL window class."
+msgstr "²»Äܳõʼ»¯ OLE"
 
-#: ../src/common/fontmap.cpp:230
+#: ../src/common/fontmap.cpp:232
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
-msgstr "無法記憶字集 '%s' 的編碼。"
+msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."
 
-#: ../src/unix/snglinst.cpp:296
-#, c-format
+#: ../src/unix/snglinst.cpp:327
+#, fuzzy, c-format
 msgid "Failed to remove lock file '%s'"
-msgstr "無法移除鎖定中的檔案 '%s'"
+msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
-#: ../src/unix/snglinst.cpp:262
-#, c-format
+#: ../src/unix/snglinst.cpp:293
+#, fuzzy, c-format
 msgid "Failed to remove stale lock file '%s'."
-msgstr "無法移除過時的鎖定檔案 '%s'。"
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/registry.cpp:469
+#: ../src/msw/registry.cpp:461
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
-msgstr "無法將登錄值 '%s' 更名為 '%s'。"
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/registry.cpp:569
+#: ../src/msw/registry.cpp:566
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
-msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/clipbrd.cpp:503
+#: ../src/msw/clipbrd.cpp:506
 msgid "Failed to retrieve data from the clipboard."
-msgstr "從剪貼簿獲取資料失敗。"
+msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:1938
-#, c-format
+#: ../src/common/filename.cpp:1974
+#, fuzzy, c-format
 msgid "Failed to retrieve file times for '%s'"
-msgstr "無法取得檔案 '%s' 的各項時間屬性"
+msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
-#: ../src/msw/dialup.cpp:442
+#: ../src/msw/dialup.cpp:454
 msgid "Failed to retrieve text of RAS error message"
-msgstr "無法取得 RAS 錯誤訊息的對應文字"
+msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
-#: ../src/msw/clipbrd.cpp:750
+#: ../src/msw/clipbrd.cpp:753
 msgid "Failed to retrieve the supported clipboard formats"
-msgstr "無法取得支援的剪貼簿格式"
+msgstr "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü"
 
-#: ../src/msw/dib.cpp:264
+#: ../src/msw/dib.cpp:345
 #, fuzzy, c-format
 msgid "Failed to save the bitmap image to file \"%s\"."
-msgstr "無法載入圖像 %d—檔案 '%s'。"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/msw/dde.cpp:713
+#: ../src/msw/dde.cpp:697
 msgid "Failed to send DDE advise notification"
-msgstr "無法傳送「動態資料交換」連結通知訊息"
+msgstr "·¢ËÍDDE advise ֪ͨʧ°Ü"
 
-#: ../src/common/ftp.cpp:368
-#, c-format
+#: ../src/common/ftp.cpp:384
+#, fuzzy, c-format
 msgid "Failed to set FTP transfer mode to %s."
-msgstr "無法設定檔案傳輸模式為%s。"
+msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
 
-#: ../src/msw/clipbrd.cpp:379
+#: ../src/msw/clipbrd.cpp:382
 msgid "Failed to set clipboard data."
-msgstr "無法設定剪貼簿資料。"
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+
+#: ../src/unix/snglinst.cpp:186
+#, fuzzy, c-format
+msgid "Failed to set permissions on lock file '%s'"
+msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/file.cpp:701
+#: ../src/common/file.cpp:528
+#, fuzzy
 msgid "Failed to set temporary file permissions"
-msgstr "無法設定暫存檔的存取權限"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/unix/threadpsx.cpp:1244 ../src/unix/threadpsx.cpp:1255
 #, 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' 存到「記憶體虛擬檔案系統」！"
+msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!"
 
-#: ../src/unix/threadpsx.cpp:1429
+#: ../src/mac/carbon/thread.cpp:1465 ../src/mac/carbon/mpthread.cpp:1273
+#: ../src/unix/threadpsx.cpp:1428
 msgid "Failed to terminate a thread."
-msgstr "無法終止執行緒。"
+msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü"
 
-#: ../src/msw/dde.cpp:687
+#: ../src/msw/dde.cpp:671
 msgid "Failed to terminate the advise loop with DDE server"
-msgstr "無法終止與「動態資料交換」伺服器溝通的連結"
+msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ­»·Ê§°Ü"
 
-#: ../src/msw/dialup.cpp:913
+#: ../src/msw/dialup.cpp:916
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
-msgstr "無法終止撥號連線：%s"
+msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
-#: ../src/common/filename.cpp:1863
-#, c-format
+#: ../src/common/filename.cpp:1899
+#, fuzzy, c-format
 msgid "Failed to touch the file '%s'"
-msgstr "無法更新檔案 '%s' 的修改時間"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/unix/snglinst.cpp:302
-#, c-format
+#: ../src/unix/snglinst.cpp:333
+#, fuzzy, c-format
 msgid "Failed to unlock lock file '%s'"
-msgstr "無法解除鎖定檔案 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/msw/dde.cpp:339
+#: ../src/msw/dde.cpp:321
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
-msgstr "無法撤銷「動態資料交換」伺服器 '%s' 的註冊"
+msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü"
+
+#: ../src/common/fileconf.cpp:990
+#, fuzzy
+msgid "Failed to update user configuration file."
+msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 
 #: ../src/unix/snglinst.cpp:173
-#, c-format
+#, fuzzy, c-format
 msgid "Failed to write to lock file '%s'"
-msgstr "無法寫入鎖定檔案 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/generic/logg.cpp:391
+#: ../src/generic/logg.cpp:393
 msgid "Fatal error"
-msgstr "致命的錯誤"
+msgstr "ÖÂÃü´íÎó"
 
-#: ../src/common/log.cpp:467
+#: ../src/common/log.cpp:470
 msgid "Fatal error: "
-msgstr "致命的錯誤︰"
+msgstr "ÖÂÃü´íÎó£º"
 
-#: ../src/html/helpfrm.cpp:276
+#: ../src/msw/wince/filedlgwce.cpp:120
+#, fuzzy
 msgid "File"
-msgstr ""
+msgstr "´óС"
 
 #: ../src/mgl/bitmap.cpp:544
-#, c-format
+#, fuzzy, c-format
 msgid "File %s does not exist."
-msgstr "檔案 '%s' 不存在。"
+msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/generic/filedlgg.cpp:1212 ../src/gtk/filedlg.cpp:71
+#: ../src/generic/filedlgg.cpp:1248 ../src/gtk/filedlg.cpp:71
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
-msgstr "檔案 '%s' 已存在，是否真要複寫？"
+msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 
-#: ../src/os2/filedlg.cpp:302
-#, c-format
+#: ../src/os2/filedlg.cpp:307
+#, fuzzy, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
-msgstr ""
-"檔案 '%s' 已存在，\n"
-"是否覆寫？"
+msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 
-#: ../src/common/textcmn.cpp:224
+#: ../src/common/textcmn.cpp:227
 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:553 ../src/common/docview.cpp:585
+#: ../src/common/docview.cpp:1582
 msgid "File error"
-msgstr "檔案錯誤"
+msgstr "Îļþ´íÎó"
 
-#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:725
+#: ../src/generic/dirctrlg.cpp:658 ../src/generic/filedlgg.cpp:751
 msgid "File name exists already."
-msgstr "檔案名稱已存在。"
+msgstr "ÎļþÃûÒÑ´æÔÚ"
 
-#: ../src/common/fldlgcmn.cpp:62 ../src/msw/filedlg.cpp:250
-#, c-format
-msgid "Files (%s)|%s"
-msgstr "檔案 (%s)|%s"
+#: ../src/common/filefn.cpp:1695
+#, fuzzy, c-format
+msgid "Files (%s)"
+msgstr "Îļþ (%s)|%s"
 
-#: ../src/html/helpfrm.cpp:397
+#: ../src/html/helpfrm.cpp:468
 msgid "Find"
-msgstr "尋找"
+msgstr "²éÕÒ"
 
-#: ../src/html/helpfrm.cpp:1040
+#: ../src/html/helpfrm.cpp:1196
 msgid "Fixed font:"
-msgstr "固定字型︰"
+msgstr "¹Ì¶¨×ÖÌ壺"
 
-#: ../src/html/helpfrm.cpp:1101
+#: ../src/html/helpfrm.cpp:1256
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr ""
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:128
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "Folio, 8 1/2 x 13 in"
 
-#: ../src/html/helpfrm.cpp:1041
+#: ../src/html/helpfrm.cpp:1197
 msgid "Font size:"
-msgstr "字型大小："
+msgstr "×ÖÌå´óС:"
 
-#: ../src/unix/utilsunx.cpp:496
+#: ../src/unix/utilsunx.cpp:517
 msgid "Fork failed"
-msgstr "建立執行緒失敗"
-
-#: ../src/common/dlgcmn.cpp:224
-msgid "Forward"
-msgstr "向前"
+msgstr "Fork ʧ°Ü"
 
 #: ../src/common/xtixml.cpp:235
 msgid "Forward hrefs are not supported"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:722
+#: ../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:863
 #, c-format
 msgid "Found %i matches"
-msgstr "找到 %i 個符合項目"
+msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
 
-#: ../src/generic/prntdlgg.cpp:181
+#: ../src/generic/prntdlgg.cpp:179
 msgid "From:"
-msgstr "從："
+msgstr "´Ó:"
 
 #: ../src/common/imaggif.cpp:100
+#, fuzzy
 msgid "GIF: Invalid gif index."
-msgstr "GIF: 無效的圖像索引。"
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
 #: ../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:632
 msgid "GTK+ theme"
-msgstr "GTK+ 主題"
+msgstr ""
 
-#: ../src/common/paper.cpp:154
+#: ../src/common/paper.cpp:152
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
-msgstr "德國法定複寫簿, 8 1/2 x 13 in"
+msgstr "µÂ¹ú·¨¶¨¸´Ð´²¾, 8 1/2 x 13 in"
 
-#: ../src/common/paper.cpp:153
+#: ../src/common/paper.cpp:151
 msgid "German Std Fanfold, 8 1/2 x 12 in"
-msgstr "德國家標準準複寫簿, 8 1/2 x 12 in"
+msgstr "µÂ¹ú±ê×¼¸´Ð´²¾, 8 1/2 x 12 in"
 
-#: ../include/wx/xti.h:802
+#: ../include/wx/xti.h:843
 msgid "GetProperty called w/o valid getter"
 msgstr ""
 
-#: ../include/wx/xti.h:862
+#: ../include/wx/xti.h:903
 msgid "GetPropertyCollection called on a generic accessor"
 msgstr ""
 
-#: ../include/wx/xti.h:810
+#: ../include/wx/xti.h:851
 msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr ""
 
-#: ../src/common/image.cpp:1499
-msgid "GetUnusedColour:: No Unused Color in image "
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:549
+#: ../src/html/helpfrm.cpp:628
 msgid "Go back"
-msgstr "退回"
+msgstr "»ØÍË"
 
-#: ../src/html/helpfrm.cpp:552
+#: ../src/html/helpfrm.cpp:631
 msgid "Go forward"
-msgstr "向前"
+msgstr "ÏòÇ°"
 
-#: ../src/html/helpfrm.cpp:557
+#: ../src/html/helpfrm.cpp:636
 msgid "Go one level up in document hierarchy"
-msgstr "到上一階文件層級"
+msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
 
-#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:921
+#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:950
 msgid "Go to home directory"
-msgstr "進入 home 目錄"
+msgstr "½øÈëhomeĿ¼"
 
-#: ../src/generic/filedlgg.cpp:913
+#: ../src/generic/filedlgg.cpp:942
 msgid "Go to parent directory"
-msgstr "進入父目錄"
+msgstr "½øÈ븸Ŀ¼"
 
-#: ../src/common/prntbase.cpp:413
+#: ../src/common/prntbase.cpp:417
 msgid "Goto Page"
-msgstr "前進頁面"
+msgstr ""
 
-#: ../src/common/fmapbase.cpp:108
+#: ../src/common/fmapbase.cpp:109
 msgid "Greek (ISO-8859-7)"
-msgstr "希臘語 (ISO-8859-7)"
+msgstr "Greek (ISO-8859-7)"
+
+#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+msgid "Gzip not supported by this version of zlib"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:1399
+#: ../src/html/helpfrm.cpp:1560
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:467
+#: ../src/html/htmlwin.cpp:492
 #, c-format
 msgid "HTML anchor %s does not exist."
-msgstr "HTML 錨 %s 不存在。"
+msgstr "HTML ê %s ²»´æÔÚ."
 
-#: ../src/html/helpfrm.cpp:1397
+#: ../src/html/helpfrm.cpp:1558
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/common/fmapbase.cpp:110
 msgid "Hebrew (ISO-8859-8)"
-msgstr "希伯來語 (ISO-8859-8)"
+msgstr "Hebrew (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254 ../src/html/helpfrm.cpp:277
-#: ../src/msw/mdi.cpp:1329
+#: ../src/generic/mdig.cpp:310 ../src/html/helpfrm.cpp:321
+#: ../src/msw/mdi.cpp:1380 ../contrib/src/deprecated/proplist.cpp:523
 msgid "Help"
-msgstr "說明"
+msgstr "°ïÖú"
 
-#: ../src/html/helpfrm.cpp:1034
+#: ../src/html/helpfrm.cpp:1190
 msgid "Help Browser Options"
-msgstr "說明瀏覽器選項"
+msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
 
 #: ../src/generic/helpext.cpp:441 ../src/generic/helpext.cpp:442
 msgid "Help Index"
-msgstr "說明索引"
+msgstr "°ïÖúË÷Òý"
 
-#: ../src/html/helpfrm.cpp:1385
+#: ../src/html/helpfrm.cpp:1546
 msgid "Help Printing"
-msgstr "說明列印"
+msgstr "°ïÖú´òÓ¡"
+
+#: ../src/html/helpfrm.cpp:791
+#, fuzzy
+msgid "Help Topics"
+msgstr "°ïÖú: %s"
 
-#: ../src/html/helpfrm.cpp:1398
+#: ../src/html/helpfrm.cpp:1559
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr ""
 
 #: ../src/html/helpctrl.cpp:55
 #, c-format
 msgid "Help: %s"
-msgstr "說明：%s"
+msgstr "°ïÖú: %s"
+
+#: ../src/generic/dirdlgg.cpp:107
+#, fuzzy
+msgid "Home"
+msgstr "ÎҵļÒ"
+
+#: ../include/wx/filefn.h:134
+msgid "I64"
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:936
+#: ../src/common/imagbmp.cpp:942
+#, fuzzy
 msgid "ICO: Error in reading mask DIB."
-msgstr "ICO: 讀取遮罩式 DIB 時發生錯誤。"
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/imagbmp.cpp:1042 ../src/common/imagbmp.cpp:1101
-#: ../src/common/imagbmp.cpp:1110 ../src/common/imagbmp.cpp:1121
-#: ../src/common/imagbmp.cpp:1165 ../src/common/imagbmp.cpp:1175
-#: ../src/common/imagbmp.cpp:1184
+#: ../src/common/imagbmp.cpp:1047 ../src/common/imagbmp.cpp:1106
+#: ../src/common/imagbmp.cpp:1115 ../src/common/imagbmp.cpp:1126
+#: ../src/common/imagbmp.cpp:1170 ../src/common/imagbmp.cpp:1180
+#: ../src/common/imagbmp.cpp:1189
+#, fuzzy
 msgid "ICO: Error writing the image file!"
-msgstr "ICO: 寫入圖像檔案時發生錯誤！"
+msgstr "TIFF:дͼÏñ´íÎó."
 
-#: ../src/common/imagbmp.cpp:1010
+#: ../src/common/imagbmp.cpp:1015
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: 圖像太高。"
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1021
 msgid "ICO: Image too wide for an icon."
-msgstr "ICO: 圖像太寬。"
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:1249
+#: ../src/common/imagbmp.cpp:1254
+#, fuzzy
 msgid "ICO: Invalid icon index."
-msgstr "ICO: 無效的圖示索引。"
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
 #: ../src/common/imagiff.cpp:771
+#, fuzzy
 msgid "IFF: data stream seems to be truncated."
-msgstr "IFF: 資料流似乎被截斷了。"
+msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
 
 #: ../src/common/imagiff.cpp:755
+#, fuzzy
 msgid "IFF: error in IFF image format."
-msgstr "IFF: IFF 圖像格式錯誤。"
+msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
 
 #: ../src/common/imagiff.cpp:758
+#, fuzzy
 msgid "IFF: not enough memory."
-msgstr "IFF: 記憶體不足。"
+msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
 
 #: ../src/common/imagiff.cpp:761
+#, fuzzy
 msgid "IFF: unknown error!!!"
-msgstr "IFF: 未知的錯誤！！！"
+msgstr "GIF: λÖôíÎó!!!"
+
+#: ../contrib/src/deprecated/resource.cpp:2673
+#: ../contrib/src/deprecated/resource.cpp:2684
+#, c-format
+msgid "Icon resource specification %s not found."
+msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
 
-#: ../src/common/xtistrm.cpp:258
+#: ../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 ""
 
-#: ../include/wx/xti.h:1606
+#: ../include/wx/xti.h:1647
 msgid "Illegal Parameter Count for ConstructObject Method"
 msgstr ""
 
-#: ../include/wx/xti.h:1679
+#: ../include/wx/xti.h:1720
 msgid "Illegal Parameter Count for Create Method"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:711
+#: ../src/generic/dirctrlg.cpp:640 ../src/generic/filedlgg.cpp:737
 msgid "Illegal directory name."
-msgstr "不合法的目錄名稱。"
+msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
 
-#: ../src/generic/filedlgg.cpp:1166
+#: ../src/generic/filedlgg.cpp:1202
 msgid "Illegal file specification."
-msgstr "不合規範的檔案描述。"
+msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
 #: ../src/common/image.cpp:900
-msgid "Image and Mask have different sizes"
-msgstr "圖像和遮罩的大小不一致"
+msgid "Image and mask have different sizes."
+msgstr ""
 
-#: ../src/common/image.cpp:1180
+#: ../src/common/image.cpp:1220
 #, c-format
 msgid "Image file is not of type %d."
-msgstr "圖像檔不是型態%d。"
+msgstr ""
 
-#: ../src/msw/textctrl.cpp:303
+#: ../src/msw/textctrl.cpp:302
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
-msgstr ""
-"無法建立 rich edit 控制元件，使用 simple text 控制元件代替。請重新安裝 "
-"riched32.dll"
+msgstr "²»ÄÜ´´½¨rich±à¼­¿Ø¼þ, ʹÓüòµ¥Îı¾¿Ø¼þ´úÌæ. ÇëÖØ×°riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:379
+#: ../src/unix/utilsunx.cpp:400
 msgid "Impossible to get child process input"
-msgstr "無法獲得子程序的輸入"
+msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1208
-#, c-format
+#: ../src/common/filefn.cpp:1005
+#, fuzzy, c-format
 msgid "Impossible to get permissions for file '%s'"
-msgstr "無法取得檔案 '%s' 的存取權限"
+msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1222
-#, c-format
+#: ../src/common/filefn.cpp:1019
+#, fuzzy, c-format
 msgid "Impossible to overwrite the file '%s'"
-msgstr "無法覆寫檔案 '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filefn.cpp:1273
+#: ../src/common/filefn.cpp:1063
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
-msgstr "無法設定檔案 '%s' 的存取權限 "
+msgstr ""
+
+#: ../src/common/stockitem.cpp:121
+#, fuzzy
+msgid "Indent"
+msgstr "Ë÷Òý"
 
-#: ../src/html/helpfrm.cpp:422
+#: ../src/html/helpfrm.cpp:493
 msgid "Index"
-msgstr "索引"
+msgstr "Ë÷Òý"
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/common/fmapbase.cpp:114
+#, fuzzy
 msgid "Indian (ISO-8859-12)"
-msgstr "印度語 (ISO-8859-12)"
+msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/common/xtistrm.cpp:702
+#: ../src/common/xtistrm.cpp:704
 msgid "Internal error, illegal wxCustomTypeInfo"
 msgstr ""
 
 #: ../src/common/imagtiff.cpp:211
 msgid "Invalid TIFF image index."
-msgstr "無效的 TIFF 圖像索引。"
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
-#: ../contrib/src/xrc/xmlres.cpp:389
+#: ../src/xrc/xmlres.cpp:394
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
-msgstr "無效的 XRC 資源 '%s'：沒有根節點 'resource'。"
+msgstr ""
 
-#: ../src/common/appcmn.cpp:239
-#, c-format
+#: ../src/common/appcmn.cpp:249
+#, fuzzy, c-format
 msgid "Invalid display mode specification '%s'."
-msgstr "無效的顯示模式規格 '%s'。"
+msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
 #: ../src/x11/app.cpp:128
-#, c-format
+#, fuzzy, c-format
 msgid "Invalid geometry specification '%s'"
-msgstr "無效的幾何規格 '%s'"
+msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
-#: ../src/unix/snglinst.cpp:280
-#, c-format
+#: ../src/unix/snglinst.cpp:311
+#, fuzzy, c-format
 msgid "Invalid lock file '%s'."
-msgstr "無效的鎖定檔案 '%s'。"
+msgstr "²»ÄܹرÕÎļþ '%s'"
 
-#: ../src/common/xtistrm.cpp:363 ../src/common/xtistrm.cpp:378
+#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:393
+#: ../src/common/xtistrm.cpp:395
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
 msgstr ""
 
-#: ../src/common/regex.cpp:182
+#: ../src/common/regex.cpp:210
 #, c-format
 msgid "Invalid regular expression '%s': %s"
-msgstr "無效的正規運算式 '%s'： %s"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Italic"
-msgstr "斜體"
+msgstr "бÌå"
 
-#: ../src/common/paper.cpp:149
+#: ../src/common/paper.cpp:147
 msgid "Italy Envelope, 110 x 230 mm"
-msgstr "意大利信封, 110 x 230 mm"
+msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm"
 
 #: ../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:117
-msgid "KOI8-R"
+#: ../src/common/stockitem.cpp:125
+msgid "Justified"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
+#: ../src/common/fmapbase.cpp:118
+msgid "KOI8-R"
+msgstr "KOI8-R"
+
+#: ../src/common/fmapbase.cpp:119
+#, fuzzy
+msgid "KOI8-U"
+msgstr "KOI8-R"
+
+#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:636
 msgid "Landscape"
-msgstr "橫向列印"
+msgstr "ºáÏò"
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:120
 msgid "Ledger, 17 x 11 in"
-msgstr "Ledger, 17 x 11 英吋"
+msgstr "Ledger, 17 x 11 Ó¢´ç"
 
-#: ../src/generic/prntdlgg.cpp:650
+#: ../src/generic/prntdlgg.cpp:648
 msgid "Left margin (mm):"
-msgstr "左邊距(毫米)："
+msgstr "×ó±ß¾à (ºÁÃ×):"
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:113
 msgid "Legal, 8 1/2 x 14 in"
-msgstr "Legal, 8 1/2 x 14 英吋"
+msgstr "Legal, 8 1/2 x 14 Ó¢´ç"
 
-#: ../src/common/paper.cpp:120
+#: ../src/common/paper.cpp:118
 msgid "Letter Small, 8 1/2 x 11 in"
-msgstr "Letter Small, 8 1/2 x 11 英吋"
+msgstr "Letter Small, 8 1/2 x 11 Ó¢´ç"
 
-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:112
 msgid "Letter, 8 1/2 x 11 in"
-msgstr "Letter, 8 1/2 x 11 英吋"
+msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/fontdlgg.cpp:234
 msgid "Light"
-msgstr "細體"
+msgstr "Çá"
 
 #: ../src/html/chm.cpp:806
 msgid "Link contained '//', converted to absolute link."
 msgstr ""
 
-#: ../src/common/fldlgcmn.cpp:274
+#: ../src/common/fldlgcmn.cpp:248
 #, c-format
 msgid "Load %s file"
-msgstr "載入檔案 %s "
+msgstr "×°ÈëÎļþ %s "
 
-#: ../src/html/htmlwin.cpp:389
+#: ../src/html/htmlwin.cpp:410
 msgid "Loading : "
-msgstr "載入中："
+msgstr "×°ÔØ:"
 
 #: ../src/common/imagpnm.cpp:72
 msgid "Loading Grey Ascii PNM image is not yet implemented."
-msgstr "載入灰階 Ascii PNM 圖像的功能尚未實作。"
+msgstr "×°Èë»Ò¶È Ascii PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
 
 #: ../src/common/imagpnm.cpp:75
 msgid "Loading Grey Raw PNM image is not yet implemented."
-msgstr "載入灰階 Raw PNM 圖像的功能尚未實作。"
+msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
+
+#: ../src/unix/snglinst.cpp:251
+#, c-format
+msgid "Lock file '%s' has incorrect owner."
+msgstr ""
 
-#: ../src/generic/logg.cpp:565
+#: ../src/unix/snglinst.cpp:256
+#, c-format
+msgid "Lock file '%s' has incorrect permissions."
+msgstr ""
+
+#: ../src/generic/logg.cpp:569
 #, c-format
 msgid "Log saved to the file '%s'."
-msgstr "儲存日誌到檔案 '%s'。"
+msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
 
-#: ../include/wx/xti.h:469 ../include/wx/xti.h:473
+#: ../include/wx/xti.h:500 ../include/wx/xti.h:504
 msgid "Long Conversions not supported"
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:442
+#: ../src/gtk/mdi.cpp:459
 msgid "MDI child"
-msgstr "MDI 子視窗"
+msgstr "MDI×Ó´°¿Ú"
+
+#: ../src/mac/carbon/thread.cpp:1635
+msgid "MP Thread Support is not available on this System"
+msgstr ""
 
 #: ../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 ""
-"由於 MS HTML Help 函示庫未安裝，導致 MS HTML Help 功能無法使用。請先安裝它。"
+msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
-#: ../src/univ/themes/win32.cpp:4678
+#: ../src/univ/themes/win32.cpp:4707
 msgid "Ma&ximize"
-msgstr "最大化(&x)"
+msgstr ""
 
-#: ../src/unix/mimetype.cpp:2518
+#: ../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
 msgid "Match case"
-msgstr "區分大小寫"
+msgstr ""
 
 #: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
-msgstr "「記憶體虛擬檔案系統」已包含檔案 '%s'！"
+msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!"
+
+#: ../src/msw/frame.cpp:346
+#, fuzzy
+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:4705
 msgid "Mi&nimize"
-msgstr "最小化(&n)"
+msgstr ""
 
-#: ../src/unix/mimetype.cpp:2134
+#: ../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 "模式 %ix%i-%i 無法使用"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Modern"
-msgstr "現代"
+msgstr "ÏÖ´ú"
 
-#: ../src/generic/filedlgg.cpp:422
+#: ../src/generic/filedlgg.cpp:427
 msgid "Modified"
 msgstr ""
 
-#: ../src/common/paper.cpp:150
+#: ../src/common/paper.cpp:148
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
 
-#: ../src/common/dlgcmn.cpp:233
+#: ../src/common/dlgcmn.cpp:242
 msgid "More..."
-msgstr "更多..."
+msgstr "¸ü¶à..."
 
 #: ../contrib/src/gizmos/editlbox.cpp:165
 msgid "Move down"
 msgstr ""
 
 #: ../contrib/src/gizmos/editlbox.cpp:164
-#, fuzzy
 msgid "Move up"
-msgstr "移動(&M)"
+msgstr ""
 
-#: ../src/generic/filedlgg.cpp:419
+#: ../src/generic/filedlgg.cpp:424
 msgid "Name"
-msgstr "名稱"
+msgstr "Ãû³Æ"
+
+#: ../src/generic/dirdlgg.cpp:111
+#, fuzzy
+msgid "New directory"
+msgstr "Ŀ¼"
 
 #: ../contrib/src/gizmos/editlbox.cpp:162
 msgid "New item"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:587 ../src/generic/filedlgg.cpp:596
+#: ../src/generic/dirdlgg.cpp:320 ../src/generic/dirdlgg.cpp:330
+#: ../src/generic/filedlgg.cpp:601 ../src/generic/filedlgg.cpp:610
 msgid "NewName"
-msgstr "新名稱"
+msgstr "ÐÂÃû"
+
+#: ../src/generic/tipdlg.cpp:295
+#, fuzzy
+msgid "Next"
+msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/html/helpfrm.cpp:563
+#: ../src/html/helpfrm.cpp:642
 msgid "Next page"
-msgstr "下一頁"
+msgstr "ÏÂÒ»Ò³"
 
-#: ../src/common/dlgcmn.cpp:213 ../src/mac/msgdlg.cpp:56
-#: ../src/mac/msgdlg.cpp:140 ../src/motif/msgdlg.cpp:182
+#: ../src/mac/carbon/msgdlg.cpp:56 ../src/mac/carbon/msgdlg.cpp:141
+#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
+#: ../src/motif/msgdlg.cpp:185
 msgid "No"
-msgstr "否"
+msgstr "·ñ"
+
+#: ../contrib/src/deprecated/resource.cpp:2495
+#: ../contrib/src/deprecated/resource.cpp:2649
+msgid "No XBM facility available!"
+msgstr "ûÓпÉÓÃXBM¹¤¾ß!"
 
-#: ../src/common/image.cpp:908
-msgid "No Unused Color in image being masked"
-msgstr "圖像中未使用的顏色沒有遮罩"
+#: ../contrib/src/deprecated/resource.cpp:2667
+msgid "No XPM icon facility available!"
+msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!"
 
 #: ../src/generic/helpext.cpp:436
 msgid "No entries found."
-msgstr "找不到任何項目"
+msgstr "ûÕÒµ½ÌõÄ¿"
 
-#: ../src/common/fontmap.cpp:401
-#, c-format
+#: ../src/common/fontmap.cpp:408
+#, fuzzy, 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)?"
 msgstr ""
-"編碼 '%s' 的字型未找到，無法顯示文字。\n"
-"但是另一種編碼 '%s' 可用。\n"
-"您要使用該編碼嗎(否則您必須選擇另一種)？"
+"±àÂë'%s'δ֪.\n"
+"Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
+"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
-#: ../src/common/fontmap.cpp:406
-#, c-format
+#: ../src/common/fontmap.cpp:413
+#, fuzzy, 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:602
+#: ../src/xrc/xmlres.cpp:611
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
-msgstr "找不到 XML 節點 '%s' 類別 '%s' 的處理常式！"
+msgstr ""
 
-#: ../src/common/image.cpp:1162 ../src/common/image.cpp:1205
+#: ../src/common/image.cpp:1202 ../src/common/image.cpp:1245
 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:1210 ../src/common/image.cpp:1253
+#: ../src/common/image.cpp:1287
 #, 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:1271 ../src/common/image.cpp:1303
 #, c-format
 msgid "No image handler for type %s defined."
-msgstr "沒有定義類型 %s 的圖像處理常式。"
+msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
 
-#: ../src/html/helpfrm.cpp:710
+#: ../src/html/helpfrm.cpp:846
 msgid "No matching page found yet"
-msgstr "尚未找到符合的頁面"
+msgstr "No matching page found yet"
 
 #: ../src/unix/sound.cpp:89
 #, fuzzy
 msgid "No sound"
-msgstr "找不到任何項目"
+msgstr "ûÕÒµ½ÌõÄ¿"
 
-#: ../src/common/fmapbase.cpp:111
+#: ../src/common/image.cpp:908 ../src/common/image.cpp:947
+msgid "No unused colour in image being masked."
+msgstr ""
+
+#: ../src/common/image.cpp:1539
+msgid "No unused colour in image."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:112
 msgid "Nordic (ISO-8859-10)"
-msgstr "北歐 (ISO-8859-10)"
+msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:230 ../src/generic/fontdlgg.cpp:233
 msgid "Normal"
-msgstr "正常"
+msgstr "Õý³£"
 
-#: ../src/html/helpfrm.cpp:1095
+#: ../src/html/helpfrm.cpp:1250
 msgid "Normal face<br>and <u>underlined</u>. "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1039
+#: ../src/html/helpfrm.cpp:1195
 msgid "Normal font:"
-msgstr "正常字型："
+msgstr "Normal font:"
 
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:132
 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:976 ../src/generic/filedlgg.cpp:987
-#: ../src/generic/fontdlgg.cpp:254 ../src/generic/logg.cpp:748
-#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:139 ../src/html/helpfrm.cpp:1064
+#: ../src/generic/logg.cpp:749 ../src/generic/prntdlgg.cpp:452
+#: ../src/gtk/filedlg.cpp:162 ../src/gtk/fontdlg.cpp:141
+#: ../src/msw/dialog.cpp:190 ../contrib/src/deprecated/proplist.cpp:506
 msgid "OK"
-msgstr "確認"
+msgstr "È·ÈÏ"
 
 #: ../src/common/xtixml.cpp:263
 msgid "Objects must have an id attribute"
 msgstr ""
 
-#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1277 ../src/common/docview.cpp:1605
 msgid "Open File"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:571 ../src/html/helpfrm.cpp:1404
+#: ../src/html/helpfrm.cpp:650 ../src/html/helpfrm.cpp:1565
 msgid "Open HTML document"
-msgstr "開啟 HTML 文件"
+msgstr "´ò¿ªHTMLÎĵµ"
 
-#: ../src/generic/dirctrlg.cpp:712 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:611 ../src/generic/filedlgg.cpp:739
+#: ../src/generic/dirctrlg.cpp:669 ../src/generic/dirdlgg.cpp:346
+#: ../src/generic/filedlgg.cpp:625 ../src/generic/filedlgg.cpp:765
 msgid "Operation not permitted."
-msgstr "不容許的操作。"
+msgstr "²»ÔÊÐíµÄ²Ù×÷."
 
 #: ../src/common/cmdline.cpp:676
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
-msgstr "選項 '%s' 必須有值，且有'='。"
+msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
 
 #: ../src/common/cmdline.cpp:696
 #, c-format
 msgid "Option '%s' requires a value."
-msgstr "選項 '%s' 必須有值。"
+msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
 
 #: ../src/common/cmdline.cpp:758
 #, 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:118 ../src/generic/prntdlgg.cpp:432
 msgid "Options"
-msgstr "選項"
+msgstr "Ñ¡Ïî"
 
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:637
 msgid "Orientation"
-msgstr "方位"
+msgstr "·½Ïò"
 
 #: ../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
 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
 msgid "PNM: Couldn't allocate memory."
-msgstr "PNM: 無法配置記憶體。"
+msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
 
 #: ../src/common/imagpnm.cpp:80
 msgid "PNM: File format is not recognized."
-msgstr "PNM: 檔案格式無法識別。"
+msgstr "PNM: ²»ÄÜʶ±ðµÄÎļþ¸ñʽ."
 
 #: ../src/common/imagpnm.cpp:112
 msgid "PNM: File seems truncated."
-msgstr "PNM: 檔案似乎被截斷了。"
+msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
 
-#: ../src/common/prntbase.cpp:832
+#: ../src/common/prntbase.cpp:839
 #, c-format
 msgid "Page %d"
-msgstr "第 %d 頁"
+msgstr "ҳ %d"
 
-#: ../src/common/prntbase.cpp:830
+#: ../src/common/prntbase.cpp:837
 #, c-format
 msgid "Page %d of %d"
-msgstr "%d / %d 頁"
+msgstr "ҳ %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:596
 msgid "Page Setup"
-msgstr "頁面設定"
+msgstr "Ò³ÃæÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:158
+#: ../src/generic/prntdlgg.cpp:156
 msgid "Pages"
-msgstr "頁"
+msgstr "ҳ"
 
-#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
-#: ../src/generic/prntdlgg.cpp:818
+#: ../src/generic/prntdlgg.cpp:543 ../src/generic/prntdlgg.cpp:623
+#: ../src/generic/prntdlgg.cpp:811
 msgid "Paper Size"
-msgstr "紙張大小"
+msgstr "Ö½ÕÅ´óС"
 
-#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
-#: ../src/generic/prntdlgg.cpp:813
+#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:610
+#: ../src/generic/prntdlgg.cpp:806
 msgid "Paper size"
-msgstr "紙張大小"
+msgstr "Ö½ÕÅ´óС"
 
-#: ../src/common/xtistrm.cpp:423
+#: ../src/common/xtistrm.cpp:425
 msgid "Passing a already registered object to SetObject"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:641
+#: ../src/common/xtistrm.cpp:643
 msgid "Passing a already registered object to SetObjectName"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:434 ../src/common/xtistrm.cpp:654
+#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
 msgid "Passing an unkown object to GetObject"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:425
+#: ../src/generic/filedlgg.cpp:430
 msgid "Permissions"
-msgstr "允許"
+msgstr "ÔÊÐí"
 
 #: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
-msgstr "無法建立管道"
+msgstr "¹ÜµÀ´´½¨Ê§°Ü"
 
-#: ../src/gtk/fontdlg.cpp:76
+#: ../src/gtk/fontdlg.cpp:78
 msgid "Please choose a valid font."
-msgstr "請選擇一個有效的字型。"
+msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
 
-#: ../src/generic/filedlgg.cpp:1221 ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1257 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
-msgstr "請選擇一個已存在的檔案。"
+msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
+
+#: ../src/html/helpfrm.cpp:790
+#, fuzzy
+msgid "Please choose the page to display:"
+msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
 
-#: ../src/msw/dialup.cpp:747
+#: ../src/msw/dialup.cpp:750
 msgid "Please choose which ISP do you want to connect to"
-msgstr "請選擇你想連線的 ISP"
+msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
 
-#: ../src/msw/listctrl.cpp:637
+#: ../src/msw/listctrl.cpp:434
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 "(at least version 4.70 is required but you have %d.%02d)\n"
 "or this program won't operate correctly."
 msgstr ""
-"請安裝較新版本的 comctl32.dll\n"
-"(最低需求 4.70 版，但目前是 %d.%02d)\n"
-")否則此程式將無法正常運作。"
 
 #: ../src/common/prntbase.cpp:112
 msgid "Please wait while printing\n"
-msgstr "列印中，請稍待\n"
+msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:635
 msgid "Portrait"
-msgstr "直向列印"
+msgstr "×ÝÏò"
 
-#: ../src/generic/prntdlgg.cpp:270
+#: ../src/generic/prntdlgg.cpp:268
 msgid "PostScript file"
-msgstr "PostScript 文件"
+msgstr "PostScriptÎļþ"
 
-#: ../src/html/helpfrm.cpp:1056
+#: ../src/generic/fontdlgg.cpp:335 ../src/html/helpfrm.cpp:1212
 msgid "Preview:"
-msgstr "預覽︰"
+msgstr "Ô¤ÀÀ£º"
 
-#: ../src/html/helpfrm.cpp:560
+#: ../src/html/helpfrm.cpp:639
 msgid "Previous page"
-msgstr "前一頁"
+msgstr "ǰҳ"
 
-#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:120
 msgid "Print"
-msgstr "列印"
+msgstr "´òÓ¡"
 
-#: ../src/common/docview.cpp:963
+#: ../src/common/docview.cpp:1043
 msgid "Print Preview"
-msgstr "預覽列印"
+msgstr "´òÓ¡Ô¤ÀÀ"
 
-#: ../src/common/prntbase.cpp:784 ../src/common/prntbase.cpp:810
+#: ../src/common/prntbase.cpp:791 ../src/common/prntbase.cpp:817
 msgid "Print Preview Failure"
-msgstr "預覽列印失敗"
+msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
 
-#: ../src/generic/prntdlgg.cpp:166
+#: ../src/generic/prntdlgg.cpp:164
 msgid "Print Range"
-msgstr "列印範圍"
+msgstr "´òÓ¡·¶Î§"
 
-#: ../src/generic/prntdlgg.cpp:408
+#: ../src/generic/prntdlgg.cpp:406
 msgid "Print Setup"
-msgstr "列印設定"
+msgstr "´òÓ¡ÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:442
+#: ../src/generic/prntdlgg.cpp:440
 msgid "Print in colour"
-msgstr "彩色列印"
+msgstr "²ÊÉ«´òÓ¡"
 
-#: ../src/generic/prntdlgg.cpp:444
+#: ../src/common/stockitem.cpp:135
+#, fuzzy
+msgid "Print previe&w"
+msgstr "´òÓ¡Ô¤ÀÀ"
+
+#: ../src/generic/prntdlgg.cpp:442
 msgid "Print spooling"
-msgstr "列印佇列中"
+msgstr "´òÓ¡¼ÙÍÑ»ú"
 
-#: ../src/html/helpfrm.cpp:577
+#: ../src/html/helpfrm.cpp:656
 msgid "Print this page"
-msgstr "列印本頁"
+msgstr "´òÓ¡±¾Ò³"
 
-#: ../src/generic/prntdlgg.cpp:144
+#: ../src/generic/prntdlgg.cpp:142
 msgid "Print to File"
-msgstr "列印到檔案"
+msgstr "´òÓ¡µ½Îļþ"
 
-#: ../src/generic/prntdlgg.cpp:446
+#: ../src/generic/prntdlgg.cpp:444
 msgid "Printer command:"
-msgstr "印表機指令："
+msgstr "´òÓ¡»úÃüÁî:"
 
-#: ../src/generic/prntdlgg.cpp:143
+#: ../src/generic/prntdlgg.cpp:141
 msgid "Printer options"
-msgstr "印表機選項"
+msgstr "´òÓ¡»úÑ¡Ïî"
 
-#: ../src/generic/prntdlgg.cpp:450
+#: ../src/generic/prntdlgg.cpp:448
 msgid "Printer options:"
-msgstr "印表機選項："
+msgstr "´òÓ¡»úÑ¡Ïî:"
 
-#: ../src/generic/prntdlgg.cpp:683
+#: ../src/generic/prntdlgg.cpp:681
 msgid "Printer..."
-msgstr "印表機..."
+msgstr "´òÓ¡»ú..."
 
 #: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154
+#, fuzzy
 msgid "Printing "
-msgstr "列印中"
+msgstr "´òÓ¡"
 
 #: ../src/common/prntbase.cpp:126
 msgid "Printing Error"
-msgstr "列印時發生錯誤"
+msgstr "´òÓ¡³ö´í"
 
 #: ../src/generic/printps.cpp:244
 #, c-format
 msgid "Printing page %d..."
-msgstr "正在列印第 %d 頁..."
+msgstr "ÕýÔÚ´òÓ¡Ò³ %d..."
 
 #: ../src/generic/printps.cpp:204
 msgid "Printing..."
-msgstr "列印中..."
+msgstr "´òÓ¡..."
 
-#: ../src/common/log.cpp:468
+#: ../src/common/log.cpp:471
 msgid "Program aborted."
-msgstr "程式異常終止。"
+msgstr "³ÌÐòÖÕÖ¹."
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:129
 msgid "Quarto, 215 x 275 mm"
-msgstr "四開, 215 x 275 mm"
+msgstr "ËÄ¿ª, 215 x 275 mm"
 
-#: ../src/generic/logg.cpp:1120
+#: ../src/generic/logg.cpp:1115
 msgid "Question"
-msgstr "問題"
+msgstr "ÎÊÌâ"
 
 #: ../src/common/ffile.cpp:111 ../src/common/ffile.cpp:132
 #, c-format
 msgid "Read error on file '%s'"
-msgstr "讀取檔案 '%s' 時發生錯誤"
+msgstr "¶ÁÎļþ '%s'³ö´í"
 
-#: ../contrib/src/xrc/xmlres.cpp:568
+#: ../src/xrc/xmlres.cpp:577
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
-msgstr "找不到 ref=\"%s\" 的參照物件節點！"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:139
+msgid "Refresh"
+msgstr ""
 
-#: ../src/msw/registry.cpp:561
+#: ../src/msw/registry.cpp:558
 #, c-format
 msgid "Registry key '%s' already exists."
-msgstr "登錄機碼 '%s' 已存在。"
+msgstr "×¢²á¼ü '%s' ÒÑ´æÔÚ."
 
-#: ../src/msw/registry.cpp:530
+#: ../src/msw/registry.cpp:527
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
-msgstr "登錄機碼 '%s' 不存在, 無法更名。"
+msgstr "×¢²á¼ü '%s' ²»´æÔÚ, ²»ÄܸÄÃû."
 
-#: ../src/msw/registry.cpp:657
+#: ../src/msw/registry.cpp:659
 #, 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:461
+#: ../src/msw/registry.cpp:453
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "登錄機值 '%s' 已存在."
+msgstr "×¢²áÖµ '%s' ÒÑ´æÔÚ."
 
 #: ../src/generic/helpext.cpp:441
 msgid "Relevant entries:"
-msgstr "相關項目："
+msgstr "Ïà¹ØÌõÄ¿:"
 
-#: ../src/generic/progdlgg.cpp:199
+#: ../src/generic/progdlgg.cpp:202
 msgid "Remaining time : "
-msgstr "剩餘時間： "
+msgstr "Ê£Óàʱ¼ä : "
+
+#: ../src/common/stockitem.cpp:140
+msgid "Remove"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:359
+#: ../src/html/helpfrm.cpp:429
 msgid "Remove current page from bookmarks"
-msgstr "從書籤中移除目前頁面"
+msgstr "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³"
 
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr ""
 
+#: ../src/common/stockitem.cpp:114
+#, fuzzy
+msgid "Rep&lace"
+msgstr "Ìæ»»Îļþ '%s'?"
+
 #: ../src/generic/fdrepdlg.cpp:171
+#, fuzzy
 msgid "Replace &all"
-msgstr "取代所有(&a)"
+msgstr "Ìæ»»Îļþ '%s'?"
 
 #: ../src/generic/fdrepdlg.cpp:123
 msgid "Replace with:"
-msgstr "置換："
+msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:408
+#: ../src/xrc/xmlres.cpp:413
 msgid "Resource files must have same version number!"
-msgstr "資源檔案的版本別必須一致！"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:141
+msgid "Revert to Saved"
+msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:662
+#: ../src/generic/prntdlgg.cpp:660
 msgid "Right margin (mm):"
-msgstr "右邊距(毫米)："
+msgstr "Óұ߾à (ºÁÃ×):"
 
-#: ../src/generic/fontdlgg.cpp:221
+#: ../src/generic/fontdlgg.cpp:224
 msgid "Roman"
-msgstr "羅馬"
+msgstr "ÂÞÂí"
 
-#: ../src/common/fldlgcmn.cpp:276
+#: ../src/common/fldlgcmn.cpp:250
 #, c-format
 msgid "Save %s file"
-msgstr "儲存檔案 %s "
+msgstr "±£´æÎļþ %s "
 
-#: ../src/common/docview.cpp:256
+#: ../src/common/stockitem.cpp:143
+#, fuzzy
+msgid "Save &As..."
+msgstr "±£´æ[&S]..."
+
+#: ../src/common/docview.cpp:287
 msgid "Save as"
-msgstr "另存為"
+msgstr "Áí´æΪ"
 
-#: ../src/generic/logg.cpp:498
+#: ../src/generic/logg.cpp:502
 msgid "Save log contents to file"
-msgstr "將日誌內容存到檔案中"
+msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
 
-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/generic/fontdlgg.cpp:227
 msgid "Script"
-msgstr "手寫"
+msgstr "Script"
 
-#: ../src/html/helpfrm.cpp:443 ../src/html/helpfrm.cpp:458
+#: ../src/html/helpfrm.cpp:513 ../src/html/helpfrm.cpp:528
 msgid "Search"
-msgstr "搜尋"
+msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:445
+#: ../src/html/helpfrm.cpp:515
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
-msgstr "搜尋說明文件內容，找出上述文字所有出現過的地方"
+msgstr "´Ó°ïÖúÄÚÈÝÖÐËÑË÷·ûºÏÄãÔÚÉÏÃæÊäÈëµÄÕýÎĵÄËùÓÐÌõÄ¿"
 
 #: ../src/generic/fdrepdlg.cpp:152
+#, fuzzy
 msgid "Search direction"
-msgstr "搜尋方向"
+msgstr "´´½¨Ä¿Â¼"
 
 #: ../src/generic/fdrepdlg.cpp:111
+#, fuzzy
 msgid "Search for:"
-msgstr "搜尋："
+msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:884
+#: ../src/html/helpfrm.cpp:1037
 msgid "Search in all books"
-msgstr "搜尋所有的書籍"
+msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
 
-#: ../src/html/helpfrm.cpp:709
+#: ../src/html/helpfrm.cpp:845
 msgid "Searching..."
-msgstr "搜尋中..."
+msgstr "ËÑË÷..."
 
-#: ../src/generic/dirctrlg.cpp:594
+#: ../src/generic/dirctrlg.cpp:550
 msgid "Sections"
-msgstr "段落"
+msgstr "¶Î"
 
 #: ../src/common/ffile.cpp:199
 #, c-format
 msgid "Seek error on file '%s'"
-msgstr "檔案 '%s' 定位錯誤"
+msgstr "Îļþ '%s'¶¨Î»´íÎó"
 
-#: ../src/msw/textctrl.cpp:2055
+#: ../src/msw/textctrl.cpp:2057
+#, fuzzy
 msgid "Select &All"
-msgstr "選擇全部(&A)"
+msgstr "Ñ¡ÔñÎļþ"
 
-#: ../src/common/docview.cpp:1605
+#: ../src/common/docview.cpp:1685
 msgid "Select a document template"
-msgstr "選擇文件範本"
+msgstr "Ñ¡ÔñÎĵµÄ£°å"
 
-#: ../src/common/docview.cpp:1682
+#: ../src/common/docview.cpp:1762
 msgid "Select a document view"
-msgstr "選擇文件視界"
+msgstr "Ñ¡ÔñÎĵµÊÓͼ"
 
-#: ../src/common/docview.cpp:1485
+#: ../src/common/docview.cpp:1565
 msgid "Select a file"
-msgstr "選擇檔案"
+msgstr "Ñ¡ÔñÎļþ"
 
 #: ../src/common/cmdline.cpp:713
 #, c-format
 msgid "Separator expected after the option '%s'."
-msgstr "在選項 '%s' 之後應有分隔字元。"
+msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
 
-#: ../include/wx/xti.h:798
+#: ../include/wx/xti.h:839
 msgid "SetProperty called w/o valid setter"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:230
+#: ../src/common/dlgcmn.cpp:239
 msgid "Setup"
-msgstr "設定"
+msgstr "ÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:147
 msgid "Setup..."
-msgstr "設定..."
+msgstr "ÉèÖÃ..."
 
-#: ../src/msw/dialup.cpp:518
+#: ../src/msw/dialup.cpp:530
 msgid "Several active dialup connections found, choosing one randomly."
-msgstr "多個撥號連線中，隨機選擇一個。"
+msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
 
-#: ../src/html/helpfrm.cpp:399
+#: ../src/html/helpfrm.cpp:470
 msgid "Show all"
-msgstr "顯示所有"
+msgstr "ÏÔʾËùÓÐ"
 
-#: ../src/html/helpfrm.cpp:410
+#: ../src/html/helpfrm.cpp:481
 msgid "Show all items in index"
-msgstr "以索引的方式顯示所有項目"
+msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
 
-#: ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
+#, fuzzy
 msgid "Show hidden directories"
-msgstr "顯示隱藏目錄"
+msgstr "ÏÔʾÒþ²ØÎļþ"
 
-#: ../src/generic/filedlgg.cpp:971 ../src/generic/filedlgg.cpp:993
+#: ../src/generic/filedlgg.cpp:1017
 msgid "Show hidden files"
-msgstr "顯示隱藏檔案"
+msgstr "ÏÔʾÒþ²ØÎļþ"
 
-#: ../src/html/helpfrm.cpp:544
+#: ../src/html/helpfrm.cpp:623
 msgid "Show/hide navigation panel"
-msgstr "顯示/隱藏遊覽面板"
+msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
 
-#: ../src/generic/filedlgg.cpp:420
+#: ../src/generic/fontdlgg.cpp:340 ../src/generic/fontdlgg.cpp:342
+msgid "Shows the font preview."
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:425
 msgid "Size"
-msgstr "大小"
+msgstr "´óС"
 
-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:232
 msgid "Slant"
-msgstr "傾斜"
+msgstr "Çãб"
 
-#: ../src/common/docview.cpp:326
+#: ../src/common/docview.cpp:563
 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:595 ../src/common/docview.cpp:608
+#: ../src/common/docview.cpp:1584
 msgid "Sorry, could not open this file."
-msgstr "對不起，無法開啟檔案。"
+msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
 
-#: ../src/common/docview.cpp:333
+#: ../src/common/docview.cpp:570
 msgid "Sorry, could not save this file."
-msgstr "對不起，無法儲存檔案。"
+msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
 
-#: ../src/common/prntbase.cpp:784
+#: ../src/common/prntbase.cpp:791
 msgid "Sorry, not enough memory to create a preview."
-msgstr "對不起，記憶體不足無法建立預覽。"
+msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
 
-#: ../src/common/docview.cpp:959
+#: ../src/common/docview.cpp:1039
 msgid "Sorry, print preview needs a printer to be installed."
 msgstr ""
 
-#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
+#: ../src/common/docview.cpp:1276 ../src/common/docview.cpp:1604
 #, fuzzy
 msgid "Sorry, the format for this file is unknown."
-msgstr "對不起，無法開啟檔案。"
+msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
 
-#: ../src/unix/sound.cpp:433
+#: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
 msgstr ""
 
-#: ../src/unix/sound.cpp:418
+#: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
 msgstr ""
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:121
 msgid "Statement, 5 1/2 x 8 1/2 in"
-msgstr "Statement, 5 1/2 x 8 1/2 英吋"
+msgstr "Statement, 5 1/2 x 8 1/2 in"
 
-#: ../src/generic/logg.cpp:615
+#: ../src/generic/logg.cpp:619
 msgid "Status: "
-msgstr "狀態︰"
+msgstr "״̬£º"
 
-#: ../src/common/xtistrm.cpp:251
+#: ../src/common/xtistrm.cpp:253
 msgid "Streaming delegates for not already streamed objects not yet supported"
 msgstr ""
 
 #: ../src/msw/colour.cpp:38
-#, fuzzy, c-format
+#, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
-msgstr "XRC 資源：不正確的顏色規格 '%s' 屬性 '%s'。"
+msgstr ""
 
-#: ../include/wx/xti.h:396 ../include/wx/xti.h:400
+#: ../include/wx/xti.h:427 ../include/wx/xti.h:431
 msgid "String conversions not supported"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:676
+#: ../src/xrc/xmlres.cpp:685
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
-msgstr "沒找到子類別 '%s' 予資源 '%s'，無法子類別化！"
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Swiss"
-msgstr "瑞士"
+msgstr "ÈðÊ¿"
 
 #: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
 #: ../src/common/imagtiff.cpp:354
 msgid "TIFF: Couldn't allocate memory."
-msgstr "TIFF: 無法配置記憶體。"
+msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ."
 
 #: ../src/common/imagtiff.cpp:203
 msgid "TIFF: Error loading image."
-msgstr "TIFF: 載入圖像錯誤。"
+msgstr "TIFF: ×°ÔØͼÏñ´íÎó."
 
 #: ../src/common/imagtiff.cpp:254
 msgid "TIFF: Error reading image."
-msgstr "TIFF: 讀取圖像錯誤。"
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
 #: ../src/common/imagtiff.cpp:331
 msgid "TIFF: Error saving image."
-msgstr "TIFF: 儲存圖像錯誤。"
+msgstr "TIFF: ±£´æͼÏñ´íÎó."
 
 #: ../src/common/imagtiff.cpp:378
 msgid "TIFF: Error writing image."
-msgstr "TIFF: 寫入圖像錯誤。"
+msgstr "TIFF:дͼÏñ´íÎó."
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:119
 msgid "Tabloid, 11 x 17 in"
-msgstr "Tabloid, 11 x 17 英吋"
+msgstr "Tabloid, 11 x 17 Ó¢´ç"
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Teletype"
-msgstr "電傳打字機"
+msgstr "µç´«´ò×Ö»ú"
 
-#: ../src/common/docview.cpp:1606
+#: ../src/common/docview.cpp:1686
 msgid "Templates"
-msgstr "範本"
+msgstr "Ä£°å"
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/fmapbase.cpp:113
 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 ""
 
-#: ../src/common/fontmap.cpp:188
+#: ../src/common/ftp.cpp:696
+msgid "The FTP server doesn't support the PORT command."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:190
 #, 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"
-"如果無法替換，則選擇[取消]"
+"δ֪ ×Ö·û¼¯'%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
-#, c-format
+#: ../src/generic/dirdlgg.cpp:234
+#, fuzzy, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
-"目錄 '%s' 不存在\n"
-"現在建立？"
+"\n"
+"²»´æÔÚ\n"
+"ÏÖÔÚ´´½¨?"
 
-#: ../src/common/docview.cpp:1859
+#: ../src/common/docview.cpp:1939
 #, fuzzy, 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"
-"已從「最近使用的檔案紀錄清單」中除名。"
+"Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
+"ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
 
-#: ../src/common/docview.cpp:1869
-#, c-format
+#: ../src/common/docview.cpp:1949
+#, fuzzy, 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"
-"已從「最近使用的檔案紀錄清單」中除名。"
+"Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
+"ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
+
+#: ../src/generic/fontdlgg.cpp:308 ../src/generic/fontdlgg.cpp:310
+msgid "The font colour."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:275 ../src/generic/fontdlgg.cpp:277
+msgid "The font family."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:319 ../src/generic/fontdlgg.cpp:321
+#, fuzzy
+msgid "The font point size."
+msgstr "×ÖÌå´óС:"
+
+#: ../src/generic/fontdlgg.cpp:286 ../src/generic/fontdlgg.cpp:288
+msgid "The font style."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:297 ../src/generic/fontdlgg.cpp:299
+msgid "The font weight."
+msgstr ""
 
-#: ../src/common/filename.cpp:931
+#: ../src/common/filename.cpp:940
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
-msgstr "路徑 '%s' 包含太多的 \"..\"！"
+msgstr ""
 
 #: ../src/common/cmdline.cpp:857
 #, c-format
 msgid "The required parameter '%s' was not specified."
-msgstr "必要的參數 '%s' 沒有指定。"
+msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
 
-#: ../src/common/textcmn.cpp:255
+#: ../src/common/textcmn.cpp:258
 msgid "The text couldn't be saved."
-msgstr "文字無法儲存。"
+msgstr "Îı¾²»Äܱ»±£´æ¡£"
 
 #: ../src/common/cmdline.cpp:836
 #, c-format
 msgid "The value for the option '%s' must be specified."
-msgstr "選項 '%s' 的值必須指定。"
+msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
 
-#: ../src/msw/dialup.cpp:406
+#: ../src/msw/dialup.cpp:418
 #, c-format
 msgid ""
 "The version of remote access service (RAS) installed on this machine is "
 "tooold, please upgrade (the following required function is missing: %s)."
-msgstr "遠端存取服務 (RAS) 的版本太舊，請更新它 (缺少必要的函式：%s)。"
+msgstr "°²×°ÔÚ±¾»úµÄÔ¶³Ì·ÃÎÊ·þÎñ(RAS)Ì«¾É, Çë¸üÐÂËü (ÏÂÁбØÐëµÃº¯Êýȱʧ: %s)."
 
-#: ../src/html/htmprint.cpp:580
+#: ../src/html/htmprint.cpp:611
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
-msgstr "頁面設定時有問題：你必須設定預設印表機。"
+msgstr ""
 
-#: ../src/msw/thread.cpp:1197
+#: ../src/msw/thread.cpp:1210
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
-msgstr "執行緒模組初始化失敗：無法存值到「執行緒內部儲存區」"
+msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ"
 
-#: ../src/unix/threadpsx.cpp:1600
+#: ../src/unix/threadpsx.cpp:1596
 msgid "Thread module initialization failed: failed to create thread key"
-msgstr "執行緒模組初始化失敗：無法建立執行緒機碼"
+msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
 
-#: ../src/msw/thread.cpp:1185
+#: ../src/msw/thread.cpp:1198
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
-msgstr "執行緒模組初始化失敗：無法在「執行緒內部儲存區」中配置索引"
+msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
 
-#: ../src/unix/threadpsx.cpp:1108
+#: ../src/unix/threadpsx.cpp:1107
 msgid "Thread priority setting is ignored."
-msgstr "忽略執行緒的優先等級設定。"
+msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
 
-#: ../src/msw/mdi.cpp:188
+#: ../src/msw/mdi.cpp:187
 msgid "Tile &Horizontally"
-msgstr "水平鋪列(&H)"
+msgstr ""
 
-#: ../src/msw/mdi.cpp:189
+#: ../src/msw/mdi.cpp:188
 msgid "Tile &Vertically"
-msgstr "垂直鋪列(&V)"
+msgstr ""
+
+#: ../src/common/ftp.cpp:635
+msgid "Timeout while waiting for FTP server to connect, try passive mode."
+msgstr ""
 
-#: ../src/msw/timer.cpp:111
+#: ../src/msw/timer.cpp:108
 #, fuzzy
 msgid "Timer creation failed."
-msgstr "無法建立管道"
+msgstr "¹ÜµÀ´´½¨Ê§°Ü"
 
-#: ../src/generic/tipdlg.cpp:205
+#: ../src/generic/tipdlg.cpp:219
 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:183
 msgid "To:"
-msgstr "到："
+msgstr "µ½:"
 
 #: ../src/common/imagpng.cpp:304
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:651
+#: ../src/generic/prntdlgg.cpp:649
 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 "嘗試從「記憶體虛擬檔案系統」中移除檔案 '%s'，但它並未被載入！"
+msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
 
 #: ../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:110
+#: ../src/common/fmapbase.cpp:111
 msgid "Turkish (ISO-8859-9)"
-msgstr "土耳其語 (ISO-8859-9)"
+msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:421
+#: ../src/generic/filedlgg.cpp:426
 #, fuzzy
 msgid "Type"
-msgstr "電傳打字機"
+msgstr "µç´«´ò×Ö»ú"
 
-#: ../src/common/xtistrm.cpp:279 ../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 ""
 
-#: ../src/common/paper.cpp:152
+#: ../src/common/paper.cpp:150
 msgid "US Std Fanfold, 14 7/8 x 11 in"
-msgstr "US 標準複寫簿, 14 7/8 x 11 英吋"
+msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç"
 
-#: ../src/html/htmlwin.cpp:377
+#: ../src/html/htmlwin.cpp:397
 #, c-format
 msgid "Unable to open requested HTML document: %s"
-msgstr "無法開啟 HTML 文件： %s"
+msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
 
-#: ../src/unix/sound.cpp:323
+#: ../src/unix/sound.cpp:376
 msgid "Unable to play sound asynchronously."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:250
-msgid "Underline"
-msgstr "底線"
+#: ../src/common/stockitem.cpp:145
+#, fuzzy
+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 whilst parsing resource."
+msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
 
 #: ../src/common/cmdline.cpp:800
 #, c-format
 msgid "Unexpected parameter '%s'"
-msgstr "意外參數 '%s'"
+msgstr "ÒâÍâ²ÎÊý '%s'"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:135
 msgid "Unicode 16 bit (UTF-16)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:136
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:135
+#: ../src/common/fmapbase.cpp:137
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:138
 msgid "Unicode 32 bit (UTF-32)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/common/fmapbase.cpp:139
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:140
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:133
 msgid "Unicode 7 bit (UTF-7)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:134
 msgid "Unicode 8 bit (UTF-8)"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1108
+#: ../src/msw/dde.cpp:1092
 #, c-format
 msgid "Unknown DDE error %08x"
-msgstr "未知的「動態資料交換」錯誤 %08x"
+msgstr "δ֪ DDE ´íÎó %08x"
 
-#: ../src/common/xtistrm.cpp:368
+#: ../src/common/xtistrm.cpp:370
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:674
+#: ../src/common/fmapbase.cpp:685
 #, c-format
 msgid "Unknown encoding (%d)"
-msgstr "未知的編碼 (%d)"
+msgstr "λÖñàÂë (%d)"
 
-#: ../src/unix/mimetype.cpp:2187
+#: ../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
 #, c-format
 msgid "Unknown long option '%s'"
-msgstr "未知的長選項 '%s'"
+msgstr "δ֪longÑ¡Ïî '%s'"
 
 #: ../src/common/cmdline.cpp:582 ../src/common/cmdline.cpp:603
 #, c-format
 msgid "Unknown option '%s'"
-msgstr "未知的選項 '%s'"
+msgstr "δ֪ѡÏî '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:746
+#: ../src/xrc/xmlres.cpp:757
 msgid "Unknown style flag "
-msgstr "未知的樣式旗標"
+msgstr ""
 
 #: ../src/common/xtixml.cpp:324
 #, fuzzy, c-format
 msgid "Unkown Property %s"
-msgstr "未知的選項 '%s'"
+msgstr "δ֪ѡÏî '%s'"
 
 #: ../src/common/mimecmn.cpp:161
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
-msgstr "mime 類型 %s 中有不成對的'{'。"
+msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
 
-#: ../src/common/cmdproc.cpp:254 ../src/common/cmdproc.cpp:280
-#: ../src/common/cmdproc.cpp:300
+#: ../src/common/cmdproc.cpp:256 ../src/common/cmdproc.cpp:282
+#: ../src/common/cmdproc.cpp:302
 msgid "Unnamed command"
-msgstr "未命名的指令"
+msgstr "δÃüÃûµÄÃüÁî"
 
-#: ../src/mac/clipbrd.cpp:64 ../src/msw/clipbrd.cpp:273
-#: ../src/msw/clipbrd.cpp:445
-msgid "Unsupported clipboard format."
-msgstr "不支援的剪貼簿格式。"
+#: ../contrib/src/deprecated/resource.cpp:2367
+#, c-format
+msgid "Unrecognized style %s whilst parsing resource."
+msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s."
 
-#: ../src/common/gzstream.cpp:139
-#, fuzzy
-msgid "Unsupported flag in Gzip header"
-msgstr "不支援的剪貼簿格式。"
+#: ../src/mac/carbon/clipbrd.cpp:64 ../src/mac/classic/clipbrd.cpp:64
+#: ../src/msw/clipbrd.cpp:276 ../src/msw/clipbrd.cpp:448
+msgid "Unsupported clipboard format."
+msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
 
-#: ../src/common/appcmn.cpp:222
+#: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."
-msgstr "不支援的主題 '%s'。"
+msgstr ""
 
 #: ../src/generic/fdrepdlg.cpp:151
 msgid "Up"
-msgstr "上"
+msgstr ""
 
 #: ../src/common/cmdline.cpp:927
 #, c-format
 msgid "Usage: %s"
-msgstr "使用方式：%s"
+msgstr "Ó÷¨: %s"
 
 #: ../src/common/valtext.cpp:185
 msgid "Validation conflict"
-msgstr "驗證衝突"
+msgstr "ÑéÖ¤³åÍ»"
 
 #: ../contrib/src/mmedia/vidbase.cpp:65
 msgid "Video Output"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:904
+#: ../src/generic/filedlgg.cpp:933
 msgid "View files as a detailed view"
-msgstr "按詳細資料檢視檔案"
+msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
 
-#: ../src/generic/filedlgg.cpp:897
+#: ../src/generic/filedlgg.cpp:926
 msgid "View files as a list view"
-msgstr "按清單檢視檔案"
+msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
 
-#: ../src/common/docview.cpp:1683
+#: ../src/common/docview.cpp:1763
 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:443
 msgid "Warning"
-msgstr "警告"
+msgstr "¾¯¸æ"
 
-#: ../src/common/log.cpp:482
+#: ../src/common/log.cpp:485
 msgid "Warning: "
-msgstr "警告："
+msgstr "¾¯¸æ:"
 
-#: ../src/html/htmlpars.cpp:390
+#: ../src/html/htmlpars.cpp:395
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
-msgstr "警告：試圖從空堆疊中移除 HTML 標籤處理常式。"
+msgstr "¾¯¸æ: ÊÓͼ´Ó¿ÕÕ»ÖÐÒÆÈ¥HTML±êÇ©´¦ÀíÆ÷."
 
-#: ../src/common/fmapbase.cpp:102
+#: ../src/common/fmapbase.cpp:103
+#, fuzzy
 msgid "Western European (ISO-8859-1)"
-msgstr "西歐 (ISO-8859-1)"
+msgstr "West European (ISO-8859-1/Latin 1)"
 
-#: ../src/common/fmapbase.cpp:116
+#: ../src/common/fmapbase.cpp:117
+#, fuzzy
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "西歐 with Euro (ISO-8859-15)"
+msgstr "West European new (ISO-8859-15/Latin 0)"
+
+#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+msgid "Whether the font is underlined."
+msgstr ""
 
 #: ../src/generic/fdrepdlg.cpp:143
+#, fuzzy
 msgid "Whole word"
-msgstr "完整的字"
+msgstr "½öΪÕû×Ö"
 
-#: ../src/html/helpfrm.cpp:442
+#: ../src/html/helpfrm.cpp:512
 msgid "Whole words only"
-msgstr "只限完整的字"
+msgstr "½öΪÕû×Ö"
 
-#: ../src/univ/themes/win32.cpp:1182
+#: ../src/univ/themes/win32.cpp:1183
 msgid "Win32 theme"
-msgstr "Win32 主題"
-
-#: ../src/msw/utils.cpp:981
-msgid "Win32s on Windows 3.1"
 msgstr ""
 
-#: ../src/msw/utils.cpp:1013
-msgid "Windows 3.1"
-msgstr ""
+#: ../src/msw/utils.cpp:936
+msgid "Win32s on Windows 3.1"
+msgstr "Win32s on Windows 3.1"
 
-#: ../src/msw/utils.cpp:985
+#: ../src/msw/utils.cpp:940
 #, c-format
 msgid "Windows 9%c"
-msgstr ""
+msgstr "Windows 9%c"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Arabic (CP 1256)"
-msgstr ""
+msgstr "Windows Arabic (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Baltic (CP 1257)"
-msgstr ""
+msgstr "Windows Baltic (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:124
+#, fuzzy
 msgid "Windows Central European (CP 1250)"
-msgstr ""
+msgstr "Windows Ï£²®À´ (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:119
+#: ../src/common/fmapbase.cpp:121
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:121
+#: ../src/common/fmapbase.cpp:123
+#, fuzzy
 msgid "Windows Chinese Traditional (CP 950)"
-msgstr ""
+msgstr "Windows Latin 1 (CP 1252)"
 
-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:125
 msgid "Windows Cyrillic (CP 1251)"
-msgstr ""
+msgstr "Windows Cyrillic (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Greek (CP 1253)"
-msgstr ""
+msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Hebrew (CP 1255)"
-msgstr ""
+msgstr "Windows Ï£²®À´ (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:118
+#: ../src/common/fmapbase.cpp:120
+#, fuzzy
 msgid "Windows Japanese (CP 932)"
-msgstr ""
+msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:120
+#: ../src/common/fmapbase.cpp:122
+#, fuzzy
 msgid "Windows Korean (CP 949)"
-msgstr ""
+msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:126
+#: ../src/common/fmapbase.cpp:128
 msgid "Windows Turkish (CP 1254)"
-msgstr ""
+msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:124
+#: ../src/common/fmapbase.cpp:126
+#, fuzzy
 msgid "Windows Western European (CP 1252)"
-msgstr ""
+msgstr "Windows Latin 1 (CP 1252)"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:132
 msgid "Windows/DOS OEM (CP 437)"
-msgstr ""
+msgstr "Windows/DOS OEM (CP 437)"
 
 #: ../src/common/ffile.cpp:146
 #, c-format
 msgid "Write error on file '%s'"
-msgstr "寫入檔案 '%s' 時發生錯誤"
+msgstr "дÎļþ '%s'´íÎó"
 
-#: ../src/xml/xml.cpp:548
+#: ../src/xml/xml.cpp:549
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "XML 解譯錯誤：'%s' 在第 %d 行"
+msgstr ""
 
-#: ../src/common/xpmdecod.cpp:777
+#: ../src/common/xpmdecod.cpp:776
 msgid "XPM: Malformed pixel data!"
-msgstr "XPM: 不正常的圖素資料！"
+msgstr ""
 
-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:722
+#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:721
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
-msgstr "XPM: 不正常的顏色定義 '%s'！"
+msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:504
-#, c-format
+#: ../src/xrc/xmlres.cpp:513
+#, fuzzy, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
-msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
+msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
 
-#: ../contrib/src/xrc/xmlres.cpp:885 ../contrib/src/xrc/xmlres.cpp:897
+#: ../src/xrc/xmlres.cpp:941 ../src/xrc/xmlres.cpp:953
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
-msgstr "XRC 資源：無法從 '%s' 建立點像圖。"
+msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:845
+#: ../src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
-msgstr "XRC 資源：不正確的顏色規格 '%s' 屬性 '%s'。"
+msgstr ""
 
-#: ../src/common/dlgcmn.cpp:208 ../src/mac/msgdlg.cpp:57
-#: ../src/mac/msgdlg.cpp:139 ../src/motif/msgdlg.cpp:182
+#: ../src/mac/carbon/msgdlg.cpp:57 ../src/mac/carbon/msgdlg.cpp:140
+#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
+#: ../src/motif/msgdlg.cpp:185
 msgid "Yes"
-msgstr "是"
+msgstr "ÊÇ"
 
-#: ../src/generic/dirdlgg.cpp:264
+#: ../src/generic/dirdlgg.cpp:310
 msgid "You cannot add a new directory to this section."
-msgstr "您不能在這區段加入新的目錄。"
+msgstr "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼."
 
-#: ../src/common/fs_zip.cpp:88 ../src/common/fs_zip.cpp:138
+#: ../src/common/fs_zip.cpp:84 ../src/common/fs_zip.cpp:134
 msgid "ZIP handler currently supports only local files!"
-msgstr "ZIP 處理常式目前只支援本機檔案！"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:152
+msgid "Zoom &In"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:153
+msgid "Zoom &Out"
+msgstr ""
 
-#: ../src/common/docview.cpp:2043
+#: ../src/common/stockitem.cpp:151
+msgid "Zoom to &Fit"
+msgstr ""
+
+#: ../src/common/docview.cpp:2123
 msgid "[EMPTY]"
-msgstr "[空]"
+msgstr "[¿Õ]"
 
-#: ../src/msw/dde.cpp:1075
+#: ../src/msw/dde.cpp:1059
 msgid "a DDEML application has created a prolonged race condition."
-msgstr "DDEML 應用程式已建立延長的競賽環境。"
+msgstr "DDEMLÓ¦ÓóÌÐòÒÑ´´½¨ÑÓʱraceÌõ¼þ."
 
-#: ../src/msw/dde.cpp:1063
+#: ../src/msw/dde.cpp:1047
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
 "or an invalid instance identifier\n"
 "was passed to a DDEML function."
 msgstr ""
-"在呼叫 DDEML 其它函式之前，未事先呼叫 DdeInitialize 函式，\n"
-"或傳給 DDEML 函式的是\n"
-"一個無效的實體物件識別。"
+"ûÓе÷ÓÃDdeInitialize³õʼ»¯º¯Êý¾Íµ÷ÓÃDDEMLÆäËüº¯Êý,\n"
+"»ò´«¸øDDEMLº¯ÊýµÄÊÇ\n"
+"ÎÞЧµÄʵÀý±êʶ."
 
-#: ../src/msw/dde.cpp:1081
+#: ../src/msw/dde.cpp:1065
 msgid "a client's attempt to establish a conversation has failed."
-msgstr "用戶端嘗試建立會話失敗。"
+msgstr "¿Í»§ÊÔͼ½¨Á¢µÄ»á»°ÒÑʧ°Ü."
 
-#: ../src/msw/dde.cpp:1078
+#: ../src/msw/dde.cpp:1062
 msgid "a memory allocation failed."
-msgstr "記憶體配置失敗。"
+msgstr "ÄÚ´æ·ÖÅäʧ°Ü."
 
-#: ../src/msw/dde.cpp:1072
+#: ../src/msw/dde.cpp:1056
 msgid "a parameter failed to be validated by the DDEML."
-msgstr "DDEML 參數驗證失敗。"
+msgstr "DDEML²ÎÊýÑé֤ʧ°Ü."
 
-#: ../src/msw/dde.cpp:1054
+#: ../src/msw/dde.cpp:1038
 msgid "a request for a synchronous advise transaction has timed out."
-msgstr "同步「連結協同活動」請求已逾時。"
+msgstr "ͬ²½adviseÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1060
+#: ../src/msw/dde.cpp:1044
 msgid "a request for a synchronous data transaction has timed out."
-msgstr "同步「資料協同活動」請求已逾時。"
+msgstr "ͬ²½dataÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1069
+#: ../src/msw/dde.cpp:1053
 msgid "a request for a synchronous execute transaction has timed out."
-msgstr "同步「執行協同活動」請求已逾時。"
+msgstr "ͬ²½executeÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1087
+#: ../src/msw/dde.cpp:1071
 msgid "a request for a synchronous poke transaction has timed out."
-msgstr "同步「資料傳送協同活動」請求已逾時。"
+msgstr "ͬ²½pokeÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1102
+#: ../src/msw/dde.cpp:1086
 msgid "a request to end an advise transaction has timed out."
-msgstr "終止「連結協同活動」的請求已逾時。"
+msgstr "ÖÕÖ¹½¨ÒéÊÂÎñµÄÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1096
+#: ../src/msw/dde.cpp:1080
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
-"啟動伺服器端協同活動的對話\n"
-"被用戶端終止，或伺服器\n"
-"在完成交涉前終止。"
+"·þÎñÆ÷¶ËÊÂÎñÊÓͼ´¦Àí\n"
+"Òѱ»¿Í»§¶ËÖÕÖ¹µÄ»á»°, »ò·þÎñÆ÷\n"
+"ÔÚÍê³ÉÊÂÎñÇ°ÖÕÖ¹."
 
-#: ../src/msw/dde.cpp:1084
+#: ../src/msw/dde.cpp:1068
 msgid "a transaction failed."
-msgstr "協同活動失敗。"
+msgstr "ÊÂÎñʧ°Ü."
 
-#: ../src/common/menucmn.cpp:108
+#: ../src/common/menucmn.cpp:114
 msgid "alt"
-msgstr ""
+msgstr "alt"
 
-#: ../src/msw/dde.cpp:1066
+#: ../src/msw/dde.cpp:1050
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
 "or an application initialized as APPCMD_CLIENTONLY has \n"
 "attempted to perform server transactions."
 msgstr ""
-"初始化為 APPCLASS_MONITOR 的應用程式\n"
-"試圖執行「動態資料交換」協同活動，\n"
-"或初始化為 APPCMD_CLIENTONLY 的應用程式\n"
-"試圖執行伺服器的協同活動。"
+"³õʼ»¯ÎªAPPCLASS_MONITORµÄÓ¦ÓóÌÐò\n"
+"ÊÔͼִÐÐDDEÊÂÎñ,\n"
+"»ò³õʼ»¯ÎªAPPCMD_CLIENTONLYµÄÓ¦ÓóÌÐò\n"
+"ÊÓͼִÐзþÎñÆ÷ÊÂÎñ."
 
-#: ../src/msw/dde.cpp:1090
+#: ../src/msw/dde.cpp:1074
 msgid "an internal call to the PostMessage function has failed. "
-msgstr "內部呼叫 PostMessage 失敗。"
+msgstr "ÄÚ²¿µ÷ÓÃPostMessageʧ°Ü. "
 
-#: ../src/msw/dde.cpp:1099
+#: ../src/msw/dde.cpp:1083
 msgid "an internal error has occurred in the DDEML."
-msgstr "DDEML 發生內部錯誤。"
+msgstr "ÔÚDDEMLÖз¢ÉúÄÚ²¿´íÎó."
 
-#: ../src/msw/dde.cpp:1105
+#: ../src/msw/dde.cpp:1089
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
-"傳給 DDEML 函式的是無效的協同活動識別。\n"
-"一旦應用程式從 XTYP_XACT_COMPLETE 回調函式返回，\n"
-"該回調函式的協同活動識別就不再有效。"
+"´«¸øDDEMLº¯ÊýµÄÊÇÎÞЧµÄÊÂÎñ±êʶ·û.\n"
+"Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
+"»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
 
-#: ../src/common/fileconf.cpp:1815
+#: ../src/common/fileconf.cpp:1804
 #, 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"
@@ -3370,132 +3932,139 @@ msgstr ""
 msgid "bad signature"
 msgstr ""
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "binary"
-msgstr "二進位"
+msgstr ""
 
-#: ../src/common/fontcmn.cpp:533
+#: ../src/common/fontcmn.cpp:645
+#, fuzzy
 msgid "bold"
-msgstr "粗體"
+msgstr "´ÖÌå"
 
-#: ../src/common/fontcmn.cpp:457
+#: ../src/common/fontcmn.cpp:569
+#, fuzzy
 msgid "bold "
-msgstr "粗體"
+msgstr "´ÖÌå"
 
 #: ../src/common/ffile.cpp:79
 #, c-format
 msgid "can't close file '%s'"
-msgstr "無法關閉檔案 '%s'"
+msgstr "²»ÄܹرÕÎļþ '%s'"
 
-#: ../src/common/file.cpp:371
+#: ../src/common/file.cpp:285
 #, c-format
 msgid "can't close file descriptor %d"
-msgstr "無法關閉檔案描述子 %d"
+msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
 
-#: ../src/common/file.cpp:729
+#: ../src/common/file.cpp:556
 #, c-format
 msgid "can't commit changes to file '%s'"
-msgstr "無法將修改反映到檔案 '%s'"
+msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
 
-#: ../src/common/file.cpp:252
+#: ../src/common/file.cpp:216
 #, c-format
 msgid "can't create file '%s'"
-msgstr "無法建立檔案 '%s'"
+msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#: ../src/common/fileconf.cpp:1106
+#: ../src/common/fileconf.cpp:1123
 #, c-format
 msgid "can't delete user configuration file '%s'"
-msgstr "無法刪除使用者組態檔案 '%s'"
+msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
 
-#: ../src/common/file.cpp:631
+#: ../src/common/file.cpp:459
 #, 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/common/file.cpp:425
 #, c-format
 msgid "can't find length of file on file descriptor %d"
-msgstr "無法獲得檔案描述子 %d 的檔案的長度"
+msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
 
-#: ../src/msw/utils.cpp:371
+#: ../src/msw/utils.cpp:363
 msgid "can't find user's HOME, using current directory."
-msgstr "找不到使用者目錄 HOME，使用目前目錄。"
+msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
 
-#: ../src/common/file.cpp:450
+#: ../src/common/file.cpp:338
 #, 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:397 ../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:305
+#: ../src/common/fontmap.cpp:312
 msgid "can't load any font, aborting"
-msgstr "無法載入任何字型，活動中止"
+msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
 
-#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:352
+#: ../src/common/ffile.cpp:63 ../src/common/file.cpp:270
 #, c-format
 msgid "can't open file '%s'"
-msgstr "無法開啟檔案 '%s'"
+msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
 
-#: ../src/common/fileconf.cpp:407
+#: ../src/common/fileconf.cpp:401
 #, c-format
 msgid "can't open global configuration file '%s'."
-msgstr "無法開啟全局組態檔案 '%s'。"
+msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:422
+#: ../src/common/fileconf.cpp:416
 #, c-format
 msgid "can't open user configuration file '%s'."
-msgstr "無法開啟使用者組態檔案 '%s'。"
+msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:972
 msgid "can't open user configuration file."
-msgstr "無法開啟使用者組態檔案。"
+msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 
-#: ../src/common/dynlib.cpp:445
+#: ../src/common/dynlib.cpp:444
 msgid "can't query for GUI plugins name in console applications"
 msgstr ""
 
-#: ../src/common/file.cpp:404
+#: ../src/common/file.cpp:308
 #, c-format
 msgid "can't read from file descriptor %d"
-msgstr "無法讀取檔案描述子 %d"
+msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 
-#: ../src/common/file.cpp:724
+#: ../src/common/file.cpp:551
 #, c-format
 msgid "can't remove file '%s'"
-msgstr "無法移除檔案 '%s'"
+msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
-#: ../src/common/file.cpp:740
+#: ../src/common/file.cpp:567
 #, 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:383 ../src/msw/wince/filefnwce.cpp:189
 #, c-format
 msgid "can't seek on file descriptor %d"
-msgstr "無法定位檔案描述子 %d"
+msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
+
+#: ../src/common/file.cpp:378
+#, fuzzy, c-format
+msgid "can't seek on file descriptor %d, large files support is not enabled."
+msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
 
 #: ../src/common/textfile.cpp:196
-#, c-format
+#, fuzzy, c-format
 msgid "can't write buffer '%s' to disk."
-msgstr "無法將暫存區 '%s' 寫到磁碟。"
+msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
 
-#: ../src/common/file.cpp:433
+#: ../src/common/file.cpp:323
 #, c-format
 msgid "can't write to file descriptor %d"
-msgstr "無法寫到檔案描述子 %d"
+msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
 
-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:983
 msgid "can't write user configuration file."
-msgstr "無法寫使用者組態檔案。"
+msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
 
-#: ../src/common/intl.cpp:1102
+#: ../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"
@@ -3505,199 +4074,199 @@ msgstr ""
 msgid "compression error"
 msgstr ""
 
-#: ../src/common/menucmn.cpp:106
-msgid "ctrl"
+#: ../src/common/regex.cpp:141
+msgid "conversion to 8-bit encoding failed"
 msgstr ""
 
+#: ../src/common/menucmn.cpp:112
+msgid "ctrl"
+msgstr "ctrl"
+
 #: ../src/common/cmdline.cpp:1067
 msgid "date"
-msgstr "日期"
+msgstr "ÈÕÆÚ"
 
 #: ../src/html/chm.cpp:350
 msgid "decompression error"
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:684
+#: ../src/common/fmapbase.cpp:695 ../src/common/fmapbase.cpp:727
+#, fuzzy
 msgid "default"
-msgstr ""
+msgstr "alt"
 
-#: ../src/common/xtistrm.cpp:841
+#: ../src/common/xtistrm.cpp:843
 msgid "delegate has no type info"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3483
+#: ../src/common/datetime.cpp:3574
 msgid "eighteenth"
-msgstr "第十八"
+msgstr "µÚÊ®°Ë"
 
-#: ../src/common/datetime.cpp:3473
+#: ../src/common/datetime.cpp:3564
 msgid "eighth"
-msgstr "第八"
+msgstr "µÚ°Ë"
 
-#: ../src/common/datetime.cpp:3476
+#: ../src/common/datetime.cpp:3567
 msgid "eleventh"
-msgstr "第十一"
+msgstr "µÚʮһ"
 
-#: ../src/common/strconv.cpp:1573
+#: ../src/common/strconv.cpp:2418
 #, fuzzy, c-format
 msgid "encoding %s"
-msgstr "未知的編碼 (%d)"
+msgstr "λÖñàÂë (%d)"
 
-#: ../src/common/fileconf.cpp:1801
+#: ../src/common/fileconf.cpp:1790
 #, 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 "IFF: IFF 圖像格式錯誤。"
+msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
 
 #: ../src/html/chm.cpp:332
 #, fuzzy
 msgid "error opening file"
-msgstr "讀取檔案 '%s' 時發生錯誤"
+msgstr "¶ÁÎļþ '%s'³ö´í"
 
-#: ../src/msw/dialup.cpp:841
+#: ../src/msw/dialup.cpp:844
 msgid "establish"
-msgstr "建立"
+msgstr "½¨Á¢"
 
 #: ../src/common/ffile.cpp:160
 #, c-format
 msgid "failed to flush the file '%s'"
-msgstr "重新整理檔案 '%s' 失敗"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/datetime.cpp:3480
+#: ../src/common/datetime.cpp:3571
 msgid "fifteenth"
-msgstr "第十五"
+msgstr "µÚÊ®Îå"
 
-#: ../src/common/datetime.cpp:3470
+#: ../src/common/datetime.cpp:3561
 msgid "fifth"
-msgstr "第五"
+msgstr "µÚÎå"
 
-#: ../src/common/fileconf.cpp:658
+#: ../src/common/fileconf.cpp:655
 #, 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:684
 #, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "檔案 '%s' 第 %d 行：應有 '='。"
+msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
 
-#: ../src/common/fileconf.cpp:710
+#: ../src/common/fileconf.cpp:707
 #, 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:697
 #, 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:619
 #, 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:3557
 msgid "first"
-msgstr "第一"
+msgstr "µÚÒ»"
 
-#: ../src/html/helpfrm.cpp:1084
+#: ../src/html/helpfrm.cpp:1239
 #, fuzzy
 msgid "font size"
-msgstr "字型大小："
+msgstr "×ÖÌå´óС:"
 
-#: ../src/common/datetime.cpp:3479
+#: ../src/common/datetime.cpp:3570
 msgid "fourteenth"
-msgstr "第十四"
+msgstr "µÚÊ®ËÄ"
 
-#: ../src/common/datetime.cpp:3469
+#: ../src/common/datetime.cpp:3560
 msgid "fourth"
-msgstr "第四"
+msgstr "µÚËÄ"
 
-#: ../src/common/appbase.cpp:320
+#: ../src/common/appbase.cpp:348
 msgid "generate verbose log messages"
-msgstr "產生冗長的記錄訊息"
-
-#: ../src/common/stopwatch.cpp:234
-msgid "gmtime() failed"
-msgstr "gmtime() 失敗"
+msgstr ""
 
 #: ../src/common/xtixml.cpp:479
 msgid "incorrect event handler string, missing dot"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:841
+#: ../src/msw/dialup.cpp:844
 msgid "initiate"
-msgstr "初始化"
+msgstr "³õʼ»¯"
 
-#: ../src/common/file.cpp:635
+#: ../src/common/file.cpp:463
 msgid "invalid eof() return value."
-msgstr "無效的 eof() 傳回值。"
+msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
 
-#: ../src/generic/logg.cpp:1134
+#: ../src/generic/logg.cpp:1129
 msgid "invalid message box return value"
-msgstr "訊息盒傳回無效的值"
+msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
 
-#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
+#, fuzzy
 msgid "italic"
-msgstr "斜體"
+msgstr "бÌå"
 
-#: ../src/common/fontcmn.cpp:529
+#: ../src/common/fontcmn.cpp:641
+#, fuzzy
 msgid "light"
-msgstr "細體"
+msgstr "Çá"
 
-#: ../src/common/fontcmn.cpp:453
+#: ../src/common/fontcmn.cpp:565
+#, fuzzy
 msgid "light "
-msgstr "細體"
+msgstr "Çá"
 
-#: ../src/common/intl.cpp:1427
+#: ../src/common/intl.cpp:1454
 #, c-format
 msgid "locale '%s' can not be set."
-msgstr "無法設定地區為 '%s'。"
+msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
 
-#: ../src/common/intl.cpp:1097
+#: ../src/common/intl.cpp:1105
 #, 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:3721
 msgid "midnight"
-msgstr "午夜"
-
-#: ../src/common/stopwatch.cpp:230
-msgid "mktime() failed"
-msgstr ""
+msgstr "ÎçÒ¹"
 
-#: ../src/common/datetime.cpp:3484
+#: ../src/common/datetime.cpp:3575
 msgid "nineteenth"
-msgstr "第十九"
+msgstr "µÚÊ®¾Å"
 
-#: ../src/common/datetime.cpp:3474
+#: ../src/common/datetime.cpp:3565
 msgid "ninth"
-msgstr "第九"
+msgstr "µÚ¾Å"
 
-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1034
 msgid "no DDE error."
-msgstr "沒有「動態資料交換」錯誤。"
+msgstr "ûÓÐDDE´íÎó"
 
 #: ../src/html/chm.cpp:328
 #, fuzzy
 msgid "no error"
-msgstr "未知的錯誤！！！"
+msgstr "GIF: λÖôíÎó!!!"
 
-#: ../src/html/helpdata.cpp:603
+#: ../src/html/helpdata.cpp:662
 msgid "noname"
-msgstr "未命名"
+msgstr "δÃû"
 
-#: ../src/common/datetime.cpp:3629
+#: ../src/common/datetime.cpp:3720
 msgid "noon"
-msgstr "中午"
+msgstr "ÖÐÎç"
 
 #: ../src/common/cmdline.cpp:1063
 msgid "num"
-msgstr "數字"
+msgstr "num"
 
 #: ../src/common/xtixml.cpp:258
 msgid "objects cannot have XML Text Nodes"
@@ -3706,338 +4275,512 @@ msgstr ""
 #: ../src/html/chm.cpp:340
 #, fuzzy
 msgid "out of memory"
-msgstr "GIF: 記憶體不足。"
+msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
 
 #: ../src/html/chm.cpp:334
 #, fuzzy
 msgid "read error"
-msgstr "檔案錯誤"
+msgstr "Îļþ´íÎó"
 
-#: ../src/common/filename.cpp:177
+#: ../src/common/filename.cpp:181
 msgid "reading"
-msgstr "讀取中"
-
-#: ../src/common/gzstream.cpp:180
-msgid "reading Gzip stream: bad crc"
-msgstr ""
-
-#: ../src/common/gzstream.cpp:182
-msgid "reading Gzip stream: incorrect length"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1093
+#: ../src/msw/dde.cpp:1077
 msgid "reentrancy problem."
-msgstr "重複進入問題。"
+msgstr "ÖØÈëÎÊÌâ"
 
-#: ../src/common/datetime.cpp:3467
+#: ../src/common/datetime.cpp:3558
 msgid "second"
-msgstr "第二"
+msgstr "µÚ¶þ"
 
 #: ../src/html/chm.cpp:338
 #, fuzzy
 msgid "seek error"
-msgstr "檔案錯誤"
+msgstr "Îļþ´íÎó"
 
-#: ../src/common/datetime.cpp:3482
+#: ../src/common/datetime.cpp:3573
 msgid "seventeenth"
-msgstr "第十七"
+msgstr "µÚÊ®Æß"
 
-#: ../src/common/datetime.cpp:3472
+#: ../src/common/datetime.cpp:3563
 msgid "seventh"
-msgstr "第七"
+msgstr "µÚÆß"
 
-#: ../src/common/menucmn.cpp:110
+#: ../src/common/menucmn.cpp:116
 msgid "shift"
-msgstr ""
+msgstr "shift"
 
-#: ../src/common/appbase.cpp:310
+#: ../src/common/appbase.cpp:338
 msgid "show this help message"
-msgstr "顯示這個說明訊息"
+msgstr ""
 
-#: ../src/common/datetime.cpp:3481
+#: ../src/common/datetime.cpp:3572
 msgid "sixteenth"
-msgstr "第十六"
+msgstr "µÚÊ®Áù"
 
-#: ../src/common/datetime.cpp:3471
+#: ../src/common/datetime.cpp:3562
 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 "設定顯示模式 (例如 640x480-16)"
+msgstr ""
 
-#: ../src/common/appcmn.cpp:179
+#: ../src/common/appcmn.cpp:189
 msgid "specify the theme to use"
-msgstr "設定主題"
+msgstr ""
 
 #: ../src/common/cmdline.cpp:1059
 msgid "str"
-msgstr "字串"
+msgstr "str"
 
-#: ../src/common/datetime.cpp:3475
+#: ../src/common/datetime.cpp:3566
 msgid "tenth"
-msgstr "第十"
+msgstr "µÚÊ®"
 
-#: ../src/msw/dde.cpp:1057
+#: ../src/msw/dde.cpp:1041
 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:3559
 msgid "third"
-msgstr "第三"
+msgstr "µÚÈý"
 
-#: ../src/common/datetime.cpp:3478
+#: ../src/common/datetime.cpp:3569
 msgid "thirteenth"
-msgstr "第十三"
+msgstr "µÚÊ®Èý"
 
 #: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3301
+#: ../src/common/datetime.cpp:3386
 msgid "today"
-msgstr "今天"
+msgstr "½ñÌì"
 
-#: ../src/common/datetime.cpp:3303
+#: ../src/common/datetime.cpp:3388
 msgid "tomorrow"
-msgstr "明天"
+msgstr "Ã÷Ìì"
 
-#: ../src/common/datetime.cpp:3477
+#: ../src/common/datetime.cpp:3568
 msgid "twelfth"
-msgstr "第十二"
+msgstr "µÚÊ®¶þ"
 
-#: ../src/common/datetime.cpp:3485
+#: ../src/common/datetime.cpp:3576
 msgid "twentieth"
-msgstr "第二十"
+msgstr "µÚ¶þÊ®"
 
-#: ../src/common/fontcmn.cpp:525
+#: ../src/common/fontcmn.cpp:637
+#, fuzzy
 msgid "underlined"
-msgstr "底線"
+msgstr "Ï»®Ïß"
 
-#: ../src/common/fontcmn.cpp:440
+#: ../src/common/fontcmn.cpp:552
+#, fuzzy
 msgid "underlined "
-msgstr "底線"
+msgstr "Ï»®Ïß"
 
-#: ../src/common/fileconf.cpp:1935
+#: ../src/common/fileconf.cpp:1914
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
-msgstr "不應有 \" 在位置 %d @ '%s'。"
+msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
 
-#: ../src/generic/progdlgg.cpp:282
+#: ../src/generic/progdlgg.cpp:277
 msgid "unknown"
-msgstr "未知的"
+msgstr "δ֪"
 
 #: ../src/common/xtixml.cpp:252
 #, fuzzy, c-format
 msgid "unknown class %s"
-msgstr ": 未知的字集"
+msgstr ": δ֪×Ö·û¼¯"
 
-#: ../src/common/regex.cpp:151 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#, fuzzy
 msgid "unknown error"
-msgstr "未知的錯誤！！！"
+msgstr "GIF: λÖôíÎó!!!"
 
-#: ../src/msw/dialup.cpp:445
+#: ../src/msw/dialup.cpp:457
 #, c-format
 msgid "unknown error (error code %08x)."
-msgstr "未知的錯誤(錯誤碼 %08x)。"
+msgstr "δ֪´íÎó(´íÎóºÅ %08x)."
 
-#: ../src/common/textbuf.cpp:229
+#: ../src/common/textbuf.cpp:225
+#, fuzzy
 msgid "unknown line terminator"
-msgstr "未知的斷行字元"
+msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/file.cpp:474 ../src/common/file.cpp:501
+#: ../src/common/file.cpp:361 ../src/msw/wince/filefnwce.cpp:170
 msgid "unknown seek origin"
-msgstr "未知的搜尋基準點"
+msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/fmapbase.cpp:698
+#: ../src/common/fmapbase.cpp:709
 #, c-format
 msgid "unknown-%d"
-msgstr "未知-%d"
+msgstr "δ֪-%d"
 
-#: ../src/common/docview.cpp:432
+#: ../src/common/docview.cpp:412
 msgid "unnamed"
-msgstr "未命名"
+msgstr "unnamed"
 
-#: ../src/common/docview.cpp:1307
+#: ../src/common/docview.cpp:1387
 #, c-format
 msgid "unnamed%d"
-msgstr "未命名-%d"
-
-#: ../src/common/gzstream.cpp:147
-msgid "unsupported compression method in Gzip stream"
-msgstr ""
+msgstr "unnamed%d"
 
-#: ../src/common/intl.cpp:1107
+#: ../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:177
+#: ../src/common/filename.cpp:181
+#, fuzzy
 msgid "writing"
-msgstr "寫入中"
+msgstr "´òÓ¡"
 
-#: ../src/common/stopwatch.cpp:279
+#: ../src/common/stopwatch.cpp:235
 msgid "wxGetTimeOfDay failed."
-msgstr ""
+msgstr "wxGetTimeOfDay ʧ°Ü."
 
-#: ../src/common/socket.cpp:395 ../src/common/socket.cpp:449
+#: ../src/common/socket.cpp:414 ../src/common/socket.cpp:468
+#: ../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:965 ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
-msgstr "wxSocket: 未知的事件！"
+msgstr "wxSocket: δ֪ʼþ!."
 
-#: ../src/motif/app.cpp:204
+#: ../src/motif/app.cpp:210
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
-msgstr "wxWindows 無法為 '%s' 開啟顯示設備：已經存在。"
+msgid "wxWidgets could not open display for '%s': exiting."
+msgstr "wxWidgets ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
 #: ../src/x11/app.cpp:176
-msgid "wxWindows could not open display. Exiting."
-msgstr "wxWindows 無法開啟顯示設備。程式結束中。"
+#, fuzzy
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
-#: ../src/common/datetime.cpp:3302
+#: ../src/common/datetime.cpp:3387
 msgid "yesterday"
-msgstr "昨天"
+msgstr "×òÌì"
 
-#: ../src/common/zstream.cpp:141 ../src/common/zstream.cpp:275
+#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
 #, fuzzy, c-format
 msgid "zlib error %d"
-msgstr " (錯誤 %ld: %s)"
+msgstr " (´íÎó %ld: %s)"
 
-#: ../src/common/prntbase.cpp:450
+#: ../src/common/prntbase.cpp:452
 msgid "|<<"
 msgstr ""
 
-#~ msgid "#define %s must be an integer."
-#~ msgstr "#所定義的 %s 必須是整數。"
+#~ msgid "Backward"
+#~ msgstr "Ïòºó"
 
-#~ msgid "%s not a bitmap resource specification."
-#~ msgstr "%s 不是點陣圖資源。"
+#~ 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'µÄÖµ"
+
+#~ 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 "%s not an icon resource specification."
-#~ msgstr "%s 不是圖示資源。"
+#~ msgid "gmtime() failed"
+#~ msgstr "gmtime() ʧ°Ü"
 
-#~ msgid "%s: ill-formed resource file syntax."
-#~ msgstr "%s: 不良的資源檔案語法。"
+#~ msgid "mktime() failed"
+#~ msgstr "mktime()ʧ°Ü"
+
+#, fuzzy
+#~ msgid "%d...%d"
+#~ msgstr ".."
 
+#, fuzzy
 #~ msgid ""
-#~ ", expected static, #include or #define\n"
-#~ "whilst parsing resource."
+#~ "<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 ""
-#~ "，解譯資源時，應有\n"
-#~ "static、#include 或 #define。"
-
-#~ msgid "Bitmap resource specification %s not found."
-#~ msgstr "找不到點陣圖資源描述 %s。"
+#~ "<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>"
 
+#, fuzzy
 #~ msgid "Can't create dialog using memory template"
-#~ msgstr "無法使用記憶體樣版建立對話窗 '%s'"
+#~ msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
+#, fuzzy
 #~ msgid "Can't create dialog using template '%ul'"
-#~ msgstr "無法使用樣版建立對話窗 '%s'"
+#~ msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#~ msgid "Could not find resource include file %s."
-#~ msgstr "找不到資源引入檔 %s。"
+#~ msgid "Date"
+#~ msgstr "ÈÕÆÚ"
 
-#~ msgid ""
-#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
-#~ "instead\n"
-#~ " or provide #define (see manual for caveats)"
-#~ msgstr ""
-#~ "無法解析控制元件的類別或識別碼 '%s'。以(非零)的整數代替\n"
-#~ "或是提供 #define (參照 caveats 手冊)"
+#, fuzzy
+#~ msgid "Did you forget to include wx/os2/wx.rc in your resources?"
+#~ msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
+
+#, fuzzy
+#~ msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
+#~ msgstr "´´½¨Ä¿Â¼Ê§°Ü"
+
+#~ msgid "Fatal error: exiting"
+#~ msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
 
 #~ msgid ""
-#~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-#~ "or provide #define (see manual for caveats)"
+#~ "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*."
+#~ "htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*."
+#~ "*)|*"
 #~ msgstr ""
-#~ "無法解析選單識別碼 '%s'。以(非零)整數代替\n"
-#~ "或提供 #define (參照 caveats 手冊)"
+#~ "HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ï"
+#~ "ÖúÊé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*"
 
-#~ msgid "Date"
-#~ msgstr "日期"
+#, fuzzy
+#~ msgid "Load file"
+#~ msgstr "×°ÈëÎļþ %s "
 
-#~ msgid "Did you forget to include wx/os2/wx.rc in your resources?"
-#~ msgstr "你是否忘了將 wx/msw/wx.rc 引入資源檔中？"
+#, fuzzy
+#~ msgid "Save file"
+#~ msgstr "±£´æÎļþ %s "
 
-#~ msgid "Expected '*' whilst parsing resource."
-#~ msgstr "解析資源時應有 '*'。"
+#~ msgid "Time"
+#~ msgstr "ʱ¼ä"
 
-#~ msgid "Expected '=' whilst parsing resource."
-#~ msgstr "解析資源時應有 '='。"
+#~ msgid "<DIR> "
+#~ msgstr "<Ŀ¼> "
 
-#~ msgid "Expected 'char' whilst parsing resource."
-#~ msgstr "解析資源時應有 'char'。"
+#~ msgid "<LINK> "
+#~ msgstr "<Á¬½Ó>"
 
-#~ msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
-#~ msgstr "無法建立對話窗。不正確的 DLGTEMPLATE？"
+#, fuzzy
+#~ msgid "DIB Header: Cannot deal with 4bit encoded yet."
+#~ msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
 
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "找不到 XBM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadBitmapData？"
+#, fuzzy
+#~ msgid "Help : %s"
+#~ msgstr "°ïÖú: %s"
 
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadIconData?"
-#~ msgstr ""
-#~ "找不到 XBM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadIconData？"
+#, fuzzy
+#~ msgid "Search!"
+#~ msgstr "ËÑË÷"
 
-#~ msgid ""
-#~ "Failed to find XPM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "找不到 XPM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadBitmapData？"
+#~ msgid "large"
+#~ msgstr "´ó"
 
-#~ msgid "Fatal error: exiting"
-#~ msgstr "致命的錯誤︰已存在"
+#~ msgid "medium"
+#~ msgstr "ÖÐ"
 
-#~ msgid "Found "
-#~ msgstr "找到"
+#~ msgid "small"
+#~ 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 "very large"
+#~ msgstr "·Ç³£´ó"
 
-#~ msgid "Icon resource specification %s not found."
-#~ msgstr "找不到圖示資源規格%s。"
+#~ msgid "very small"
+#~ msgstr "·Ç³£Ð¡"
 
-#~ msgid "Ill-formed resource file syntax."
-#~ msgstr "不良的資源檔案語法。"
+#~ msgid "Can not create mutex"
+#~ msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
 
-#~ msgid "Load file"
-#~ msgstr "載入檔案"
+#~ msgid "Can't create the inter-process read pipe"
+#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ"
 
-#~ msgid "No XBM facility available!"
-#~ msgstr "XBM 類型無法使用！"
+#~ msgid "Can't create the inter-process write pipe"
+#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
 
-#~ msgid "No XPM icon facility available!"
-#~ msgstr "XPM 圖示類型無法使用！"
+#~ msgid "Font"
+#~ msgstr "×ÖÌå"
 
-#~ msgid "Save file"
-#~ msgstr "儲存檔案"
+#~ msgid "PostScript"
+#~ msgstr "PostScript"
 
-#~ msgid "Time"
-#~ msgstr "時間"
+#~ 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 "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 "New..."
+#~ msgstr "´´½¨..."
+
+#~ msgid "Please wait..."
+#~ msgstr "ÇëµÈ´ý..."
+
+#~ msgid "Temporary"
+#~ msgstr "ÁÙʱµÄ"
+
+#~ msgid "The Computer"
+#~ msgstr "¼ÆËã»ú"
+
+#~ msgid "User"
+#~ msgstr "Óû§"
+
+#~ msgid "User Local"
+#~ msgstr "±¾µØÓû§"
+
+#~ msgid "Variables"
+#~ msgstr "±äÁ¿"
+
+#~ msgid "Window"
+#~ msgstr "´°¿Ú"
+
+#, fuzzy
+#~ msgid "Unknown digit value"
+#~ msgstr "λÖñàÂë (%d)"
+
+#~ msgid "Replace file '%s'?"
+#~ msgstr "Ìæ»»Îļþ '%s'?"
+
+#~ msgid "wxWidgets: error finding temporary file name.\n"
+#~ msgstr "wxWidgets: ²éѯÁÙʱÎļþÃûʱ³ö´í.\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."
+#~ 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 "Unexpected end of file whilst parsing resource."
-#~ msgstr "在解譯資源時，遇到不預期的檔案結尾。"
+#~ msgid "No XPM facility available!"
+#~ msgstr "ûÓпÉÓõÄXPMÉ豸!"
 
-#~ msgid "Unrecognized style %s whilst parsing resource."
-#~ msgstr "解譯資源時遇到無法識別的樣式 %s。"
+#~ msgid "Cyrillic (Latin 5)"
+#~ msgstr "˹À­·òÓï (Latin 5)"