Cast 4th parameter of getsockopt to char* and of setsockopt to const char*

[wxWidgets.git] / locale / zh_TW.po

diff --git a/locale/zh_TW.po b/locale/zh_TW.po
index b250df3be13887aac2adc9dca87cd2a7350515ac..c74fec8c9fab478f5bf2d0983dec7cc2ab32c906 100644 (file)
--- a/locale/zh_TW.po
+++ b/locale/zh_TW.po
@@ -1,115 +1,163 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWindows-2.5.1\n"
+"Project-Id-Version: wxWidgets-2.5.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-07 14:03+0200\n"
-"PO-Revision-Date: 2003-03-26 06:04+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: 2004-05-08 16:34+0800\n"
+"Last-Translator: PAL <lyh37@ntu.edu.tw>\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"
 
-#: ../src/common/log.cpp:319
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (錯誤 %ld: %s)"
 
-#: ../src/common/docview.cpp:1325
+#: ../src/common/docview.cpp:1405
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:544
+#: ../src/html/htmprint.cpp:568
 msgid " Preview"
 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 信封，4 1/8 x 9 1/2 英吋"
 
-#: ../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 英吋"
 
-#: ../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 英吋"
 
-#: ../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 英吋"
 
-#: ../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 英吋"
+
+#: ../contrib/src/deprecated/resource.cpp:1808
+#: ../contrib/src/deprecated/resource.cpp:1938
+#: ../contrib/src/deprecated/resource.cpp:3026
+#, c-format
+msgid "#define %s must be an integer."
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:876 ../src/html/helpfrm.cpp:877
-#: ../src/html/helpfrm.cpp:1514 ../src/html/helpfrm.cpp:1544
+#: ../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 / %i"
 
-#: ../src/generic/filedlgg.cpp:280
+#: ../src/generic/filedlgg.cpp:281
 #, c-format
 msgid "%ld bytes"
-msgstr ""
+msgstr "%ld 位元組"
 
 #: ../src/common/cmdline.cpp:825
 #, c-format
 msgid "%s (or %s)"
-msgstr ""
+msgstr "%s (或 %s)"
 
 #: ../src/generic/logg.cpp:260
 #, c-format
 msgid "%s Error"
-msgstr "%s 錯誤"
+msgstr "%s錯誤"
 
 #: ../src/generic/logg.cpp:268
 #, c-format
 msgid "%s Information"
-msgstr "%s 資訊"
+msgstr "%s資訊"
 
 #: ../src/generic/logg.cpp:264
 #, c-format
 msgid "%s Warning"
-msgstr "%s 警告"
+msgstr "%s警告"
 
 #: ../src/common/fldlgcmn.cpp:74
-#, fuzzy, c-format
+#, c-format
 msgid "%s files (%s)|%s"
-msgstr "檔案 (%s)|%s"
+msgstr "'%s' 檔 (%s)|%s"
 
-#: ../src/common/msgout.cpp:188
+#: ../src/common/msgout.cpp:189
 #, c-format
 msgid "%s message"
-msgstr "%s 訊息"
+msgstr "%s訊息"
+
+#: ../contrib/src/deprecated/resource.cpp:2390
+#, c-format
+msgid "%s not a bitmap resource specification."
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2544
+#, c-format
+msgid "%s not an icon resource specification."
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:274
+#: ../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 ""
+
+#: ../src/html/helpfrm.cpp:341 ../src/html/helpfrm.cpp:343
 msgid "&About..."
+msgstr "關於...(&A)"
+
+#: ../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)"
 
-#: ../src/generic/fdrepdlg.cpp:164 ../src/generic/wizard.cpp:403
+#: ../src/common/stockitem.cpp:115
+#, fuzzy
+msgid "&Back"
+msgstr "《 返回(&B)"
+
+#: ../src/common/stockitem.cpp:106
+#, fuzzy
+msgid "&Bold"
+msgstr "粗體"
+
+#: ../src/common/stockitem.cpp:107 ../src/generic/fontdlgg.cpp:350
+#: ../src/generic/fontdlgg.cpp:369 ../src/generic/wizard.cpp:418
 msgid "&Cancel"
 msgstr "取消(&C)"
 
 #: ../src/msw/mdi.cpp:186
 msgid "&Cascade"
-msgstr "串聯(&C)"
+msgstr "梯狀排列(&C)"
 
-#: ../src/common/prntbase.cpp:441 ../src/generic/logg.cpp:506
-#: ../src/generic/tipdlg.cpp:213 ../src/html/helpfrm.cpp:271
+#: ../src/common/stockitem.cpp:108
+#, fuzzy
+msgid "&Clear"
+msgstr "清除(&L)"
+
+#: ../src/common/prntbase.cpp:441 ../src/common/stockitem.cpp:109
+#: ../src/generic/logg.cpp:506 ../src/html/helpfrm.cpp:338
 msgid "&Close"
 msgstr "關閉(&C)"
 
-#: ../src/msw/textctrl.cpp:2035
+#: ../src/common/stockitem.cpp:110 ../src/msw/textctrl.cpp:2053
 msgid "&Copy"
 msgstr "複製(&C)"
 
-#: ../src/msw/textctrl.cpp:2037
+#: ../src/common/stockitem.cpp:112 ../src/msw/textctrl.cpp:2055
 msgid "&Delete"
 msgstr "刪除(&D)"
 
@@ -117,71 +165,143 @@ msgstr "刪除(&D)"
 msgid "&Details"
 msgstr "細節(&D)"
 
-#: ../src/html/helpfrm.cpp:276
+#: ../src/common/stockitem.cpp:116
 #, fuzzy
+msgid "&Down"
+msgstr "下"
+
+#: ../src/html/helpfrm.cpp:345
 msgid "&File"
-msgstr "大小(&S)"
+msgstr "檔案(&F)"
 
-#: ../src/generic/fdrepdlg.cpp:162
+#: ../src/common/stockitem.cpp:113
 msgid "&Find"
 msgstr "尋找(&F)"
 
-#: ../src/generic/wizard.cpp:584
+#: ../src/generic/wizard.cpp:606
 msgid "&Finish"
 msgstr "完成(&F)"
 
+#: ../src/generic/fontdlgg.cpp:271
+#, fuzzy
+msgid "&Font family:"
+msgstr "字型大小："
+
+#: ../src/common/stockitem.cpp:117
+#, fuzzy
+msgid "&Forward"
+msgstr "向前"
+
 #: ../src/common/prntbase.cpp:476
 msgid "&Goto..."
-msgstr ""
+msgstr "移到...(&G)"
 
-#: ../src/generic/wizard.cpp:406 ../src/html/helpfrm.cpp:277
+#: ../src/common/stockitem.cpp:119 ../src/generic/wizard.cpp:414
+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:346
 msgid "&Help"
 msgstr "說明(&H)"
 
+#: ../src/common/stockitem.cpp:120
+#, fuzzy
+msgid "&Home"
+msgstr "移動(&M)"
+
+#: ../src/common/stockitem.cpp:122
+#, fuzzy
+msgid "&Index"
+msgstr "索引"
+
+#: ../src/common/stockitem.cpp:123
+#, fuzzy
+msgid "&Italic"
+msgstr "斜體"
+
 #: ../src/generic/logg.cpp:507
 msgid "&Log"
 msgstr "日誌(&L)"
 
-#: ../src/univ/themes/win32.cpp:4672
+#: ../src/univ/themes/win32.cpp:4701
 msgid "&Move"
 msgstr "移動(&M)"
 
+#: ../src/common/stockitem.cpp:128
+#, fuzzy
+msgid "&New"
+msgstr "下一個(&N)"
+
 #: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
 msgid "&Next"
 msgstr "下一個(&N)"
 
-#: ../src/generic/wizard.cpp:402 ../src/generic/wizard.cpp:586
+#: ../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)"
 
-#: ../src/html/helpfrm.cpp:269
+#: ../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 "開啟...(&O)"
+
+#: ../src/html/helpfrm.cpp:336
 msgid "&Open..."
-msgstr "儲存...(&S)"
+msgstr "開啟...(&O)"
 
-#: ../src/msw/textctrl.cpp:2036
+#: ../src/common/stockitem.cpp:132 ../src/msw/textctrl.cpp:2054
 msgid "&Paste"
 msgstr "貼上(&P)"
 
+#: ../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:192
 msgid "&Previous"
 msgstr "前一個(&P)"
 
-#: ../src/common/prntbase.cpp:446
+#: ../src/common/stockitem.cpp:134
 #, fuzzy
+msgid "&Print"
+msgstr "列印"
+
+#: ../src/common/prntbase.cpp:446
 msgid "&Print..."
-msgstr "列印..."
+msgstr "列印...(&P)"
 
-#: ../src/common/cmdproc.cpp:285 ../src/common/cmdproc.cpp:292
-#: ../src/msw/textctrl.cpp:2032
+#: ../src/common/stockitem.cpp:136
+#, fuzzy
+msgid "&Properties"
+msgstr "前一個(&P)"
+
+#: ../src/common/stockitem.cpp:137
+msgid "&Quit"
+msgstr ""
+
+#: ../src/common/cmdproc.cpp:287 ../src/common/cmdproc.cpp:294
+#: ../src/common/stockitem.cpp:138 ../src/msw/textctrl.cpp:2050
 msgid "&Redo"
 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)"
 
@@ -189,37 +309,77 @@ msgstr "重做(&R)"
 msgid "&Replace"
 msgstr "置換(&R)"
 
-#: ../src/univ/themes/win32.cpp:4671
+#: ../src/univ/themes/win32.cpp:4700
 msgid "&Restore"
 msgstr "回存(&R)"
 
-#: ../src/generic/logg.cpp:502 ../src/generic/logg.cpp:829
+#: ../src/common/stockitem.cpp:142
+#, fuzzy
+msgid "&Save"
+msgstr "儲存...(&S)"
+
+#: ../src/generic/logg.cpp:502
 msgid "&Save..."
 msgstr "儲存...(&S)"
 
-#: ../src/generic/tipdlg.cpp:215
+#: ../src/generic/tipdlg.cpp:233
 msgid "&Show tips at startup"
 msgstr "啟動時顯示小秘訣(&S)"
 
-#: ../src/univ/themes/win32.cpp:4674
+#: ../src/univ/themes/win32.cpp:4703
 msgid "&Size"
 msgstr "大小(&S)"
 
-#: ../src/common/cmdproc.cpp:263 ../src/msw/textctrl.cpp:2031
+#: ../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)"
 
-#: ../src/common/cmdproc.cpp:257
+#: ../src/common/cmdproc.cpp:259
 msgid "&Undo "
 msgstr "回復(&U)"
 
+#: ../src/common/stockitem.cpp:148
+#, fuzzy
+msgid "&Unindent"
+msgstr "第十九"
+
+#: ../src/common/stockitem.cpp:118
+#, fuzzy
+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)"
 
-#: ../src/common/config.cpp:410 ../src/msw/regconf.cpp:263
+#: ../src/common/stockitem.cpp:149
+#, fuzzy
+msgid "&Yes"
+msgstr "是"
+
+#: ../src/common/config.cpp:407 ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有額外的 '..'，忽略之。"
@@ -235,12 +395,12 @@ msgstr "'%s' 是無效的"
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是選項 '%s' 的正確數值。"
 
-#: ../src/common/intl.cpp:1146
+#: ../src/common/intl.cpp:1148
 #, c-format
 msgid "'%s' is not a valid message catalog."
-msgstr "'%s' 不是有效的訊息記載檔。"
+msgstr "'%s' 不是有效的訊息登錄檔。"
 
-#: ../src/common/textbuf.cpp:245
+#: ../src/common/textbuf.cpp:241
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或許是個二進位緩衝區。"
@@ -253,7 +413,7 @@ 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
@@ -265,125 +425,133 @@ msgstr "'%s' 應只含有字母字元。"
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 應只含有字母或數字字元。"
 
-#: ../src/html/helpfrm.cpp:812
+#: ../src/html/helpfrm.cpp:953
 msgid "(Help)"
 msgstr "(說明)"
 
-#: ../src/html/helpfrm.cpp:345 ../src/html/helpfrm.cpp:944
-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpfrm.cpp:415 ../src/html/helpfrm.cpp:1091
+#: ../src/html/helpfrm.cpp:1750
 msgid "(bookmarks)"
 msgstr "(書籤)"
 
-#: ../src/generic/dirctrlg.cpp:679 ../src/generic/filedlgg.cpp:732
+#: ../contrib/src/deprecated/resource.cpp:1840
+#: ../contrib/src/deprecated/resource.cpp:1970
+#: ../contrib/src/deprecated/resource.cpp:3062
+#, fuzzy
+msgid ""
+", expected static, #include or #define\n"
+"whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
+#: ../src/generic/dirctrlg.cpp:634 ../src/generic/filedlgg.cpp:733
 msgid "."
-msgstr ""
+msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:680 ../src/generic/filedlgg.cpp:733
+#: ../src/generic/dirctrlg.cpp:635 ../src/generic/filedlgg.cpp:734
 msgid ".."
-msgstr ""
+msgstr ".."
 
-#: ../src/html/chm.cpp:561
-msgid "/#SYSTEM"
-msgstr ""
-
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:130
 msgid "10 x 14 in"
 msgstr "10 x 14 英吋"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:131
 msgid "11 x 17 in"
 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 ": 檔案不存在！"
 
-#: ../src/common/fontmap.cpp:185
+#: ../src/common/fontmap.cpp:186
 msgid ": unknown charset"
 msgstr ": 未知的字集"
 
-#: ../src/common/fontmap.cpp:394
+#: ../src/common/fontmap.cpp:400
 msgid ": unknown encoding"
 msgstr ": 未知的編碼"
 
-#: ../src/generic/wizard.cpp:407
+#: ../src/generic/wizard.cpp:423
 msgid "< &Back"
-msgstr "< 返回(&B)"
+msgstr "《 返回(&B)"
 
 #: ../src/common/prntbase.cpp:458
 msgid "<<"
-msgstr ""
+msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:251 ../src/generic/filedlgg.cpp:274
+#: ../src/generic/filedlgg.cpp:252 ../src/generic/filedlgg.cpp:275
 msgid "<DIR>"
 msgstr "<目錄>"
 
-#: ../src/generic/filedlgg.cpp:255 ../src/generic/filedlgg.cpp:278
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:256 ../src/generic/filedlgg.cpp:279
 msgid "<DRIVE>"
-msgstr "<ç\9b®é\8c\84>"
+msgstr "<ç£\81ç¢\9fæ©\9f>"
 
-#: ../src/generic/filedlgg.cpp:253 ../src/generic/filedlgg.cpp:276
+#: ../src/generic/filedlgg.cpp:254 ../src/generic/filedlgg.cpp:277
 msgid "<LINK>"
-msgstr "<é\80£ç·\9a>"
+msgstr "<é\80£çµ\90>"
 
-#: ../src/html/helpfrm.cpp:1107
+#: ../src/html/helpfrm.cpp:1253
 msgid "<b><i>Bold italic face.</i></b><br>"
-msgstr ""
+msgstr "<b><i>粗斜體</i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1111
+#: ../src/html/helpfrm.cpp:1257
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
-msgstr ""
+msgstr "<b><i>粗斜 <u>下劃線</u></i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1106
+#: ../src/html/helpfrm.cpp:1252
 msgid "<b>Bold face.</b> "
-msgstr ""
+msgstr "<b>粗體。</b> "
 
-#: ../src/html/helpfrm.cpp:1105
+#: ../src/html/helpfrm.cpp:1251
 msgid "<i>Italic face.</i> "
-msgstr ""
+msgstr "<i>斜體。</i> "
 
 #: ../src/common/prntbase.cpp:464
 msgid ">>"
-msgstr ""
+msgstr ">>"
 
 #: ../src/common/prntbase.cpp:470
 msgid ">>|"
-msgstr ""
+msgstr ">>|"
 
 #: ../src/common/xtixml.cpp:409
 msgid "A non empty collection must consist of 'element' nodes"
-msgstr ""
+msgstr "非空集合必須包含 'element' 節點"
 
-#: ../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 å°\8fç´\99å¼µ, 210 x 297 毫米"
+msgstr "A4 å\8d°å\88·å°\8fç´\99å¼µï¼\8c210 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:84
+#: ../src/generic/fontdlgg.cpp:85
 msgid "ABCDEFGabcdefg12345"
-msgstr ""
+msgstr "心想事成 AaBbCcYyZz"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "ASCII"
 msgstr "文字"
 
-#: ../src/html/helpfrm.cpp:358
+#: ../src/common/stockitem.cpp:104
+msgid "Add"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:428
 msgid "Add current page to bookmarks"
 msgstr "把目前頁面加到書籤中"
 
@@ -404,38 +572,45 @@ msgstr ""
 msgid "Adding book %s"
 msgstr "正在加入卷輯 %s"
 
-#: ../src/generic/prntdlgg.cpp:157
+#: ../src/common/stockitem.cpp:126
+msgid "Align Left"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:127
+#, fuzzy
+msgid "Align Right"
+msgstr "午夜"
+
+#: ../src/generic/prntdlgg.cpp:155
 msgid "All"
 msgstr "所有"
 
 #: ../src/common/fldlgcmn.cpp:57
-#, fuzzy, c-format
+#, c-format
 msgid "All files (%s)|%s"
-msgstr "所有檔案 (*)|*"
+msgstr "所有檔案 (%s)|%s"
 
-#: ../include/wx/defs.h:1975
+#: ../include/wx/defs.h:2141
 msgid "All files (*)|*"
 msgstr "所有檔案 (*)|*"
 
-#: ../src/html/helpfrm.cpp:1412
-#, fuzzy
+#: ../src/html/helpfrm.cpp:1564
 msgid "All files (*.*)|*"
-msgstr "所有檔案 (*)|*"
+msgstr "所有檔案 (*.*)|*"
 
-#: ../include/wx/defs.h:1972
-#, fuzzy
+#: ../include/wx/defs.h:2138
 msgid "All files (*.*)|*.*"
-msgstr "所有檔案 (*)|*"
+msgstr "所有檔案 (*.*)|*.*"
 
 #: ../src/common/xtistrm.cpp:385
 msgid "Already Registered Object passed to SetObjectClassInfo"
-msgstr ""
+msgstr "傳入已註冊的物件給 SetObjectClassInfo"
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr "已經撥接 ISP。"
 
-#: ../src/generic/logg.cpp:1116
+#: ../src/generic/logg.cpp:1113
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "把日誌加到檔案 '%s' 的尾端(選擇 [否] 將覆寫該檔案)？"
@@ -444,29 +619,33 @@ msgstr "把日誌加到檔案 '%s' 的尾端(選擇 [否] 將覆寫該檔案)？
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯語 (ISO-8859-6)"
 
-#: ../src/generic/filedlgg.cpp:432
-msgid "Attributes"
+#: ../src/html/chm.cpp:564
+msgid "Archive doesnt contain #SYSTEM file"
 msgstr ""
 
-#: ../src/common/paper.cpp:146
+#: ../src/generic/filedlgg.cpp:433
+msgid "Attributes"
+msgstr "屬性"
+
+#: ../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:476 ../src/common/imagbmp.cpp:492
 msgid "BMP: Couldn't allocate memory."
@@ -474,7 +653,7 @@ msgstr "BMP: 無法配置記憶體。"
 
 #: ../src/common/imagbmp.cpp:94
 msgid "BMP: Couldn't save invalid image."
-msgstr "BMP: ç\84¡æ³\95å\84²å­\98ç\84¡æ\95\88ç\9a\84å\9c\96像。"
+msgstr "BMP: ç\84¡æ³\95å\84²å­\98ç\84¡æ\95\88ç\9a\84å½±像。"
 
 #: ../src/common/imagbmp.cpp:298
 msgid "BMP: Couldn't write RGB color map."
@@ -494,11 +673,7 @@ msgstr "BMP: 無法寫入檔案標頭(BitmapInfo)。"
 
 #: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
-msgstr ""
-
-#: ../src/common/dlgcmn.cpp:227
-msgid "Backward"
-msgstr "前一頁"
+msgstr "BMP: wxImage 沒有自己的 wxPalette。"
 
 #: ../src/common/fmapbase.cpp:115
 msgid "Baltic (ISO-8859-13)"
@@ -508,53 +683,60 @@ msgstr "波羅的海語 (ISO-8859-13)"
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "波羅的海語 (舊的) (ISO-8859-4)"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../contrib/src/deprecated/resource.cpp:2524
+#, fuzzy, c-format
+msgid "Bitmap resource specification %s not found."
+msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
+
+#: ../src/generic/fontdlgg.cpp:235
 msgid "Bold"
 msgstr "粗體"
 
-#: ../src/generic/prntdlgg.cpp:663
+#: ../src/generic/prntdlgg.cpp:661
 msgid "Bottom margin (mm):"
 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:504
 msgid "C&lear"
 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 毫米"
 
 #: ../src/html/chm.cpp:783 ../src/html/chm.cpp:842
-#, fuzzy
 msgid "CHM handler currently supports only local files!"
-msgstr "ZIP 處理常式目前只支援本機檔案！"
+msgstr "CHM 處理常式目前只支援本機檔案！"
 
 #: ../src/os2/thread.cpp:121
-#, fuzzy
 msgid "Can not create mutex."
-msgstr "無法建立執行緒"
+msgstr "無法建立 mutex。"
 
-#: ../src/common/filefn.cpp:1469
+#: ../src/common/filefn.cpp:1255
 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "無法列舉檔案 '%s'"
@@ -565,11 +747,11 @@ msgid "Can not enumerate files in directory '%s'"
 msgstr "無法列舉目錄 '%s' 中的檔案"
 
 #: ../src/os2/thread.cpp:523
-#, fuzzy, c-format
+#, c-format
 msgid "Can not resume thread %lu"
-msgstr "無法恢復執行緒 %x"
+msgstr "無法恢復執行緒 %lu"
 
-#: ../src/msw/thread.cpp:830
+#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:830
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "無法恢復執行緒 %x"
@@ -579,11 +761,11 @@ msgid "Can not start thread: error writing TLS."
 msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤。"
 
 #: ../src/os2/thread.cpp:510
-#, fuzzy, c-format
+#, c-format
 msgid "Can not suspend thread %lu"
-msgstr "無法暫停執行緒 %x"
+msgstr "無法暫停執行緒 %lu"
 
-#: ../src/msw/thread.cpp:815
+#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:815
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "無法暫停執行緒 %x"
@@ -592,40 +774,42 @@ msgstr "無法暫停執行緒 %x"
 msgid "Can not wait for thread termination"
 msgstr "無法等候執行緒終結"
 
-#: ../src/common/cmdproc.cpp:259
+#: ../src/common/cmdproc.cpp:261
 msgid "Can't &Undo "
 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 "ç\84¡æ³\95檢æ\9f¥å\9c\96像檔格式 '%s'：檔案不存在。"
+msgstr "ç\84¡æ³\95檢æ\9f¥å½±像檔格式 '%s'：檔案不存在。"
 
-#: ../src/msw/registry.cpp:438
+#: ../src/msw/registry.cpp:439
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr "無法關閉登錄機碼 '%s'"
 
-#: ../src/msw/registry.cpp:510
+#: ../src/msw/registry.cpp:516
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr "無法複製不支援類型 %d 的值。"
 
-#: ../src/msw/registry.cpp:419
+#: ../src/msw/registry.cpp:420
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "無法建立登錄機碼 '%s'"
 
-#: ../src/msw/thread.cpp:593 ../src/os2/thread.cpp:491
+#: ../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 "無法建立執行緒"
 
-#: ../src/msw/window.cpp:3155
+#: ../src/msw/window.cpp:3145
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "無法建立類別 '%s' 的視窗"
 
-#: ../src/msw/registry.cpp:680
+#: ../src/msw/registry.cpp:692
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr "無法刪除機碼 '%s'"
@@ -635,17 +819,17 @@ msgstr "無法刪除機碼 '%s'"
 msgid "Can't delete the INI file '%s'"
 msgstr "無法刪除 INI 檔 '%s'"
 
-#: ../src/msw/registry.cpp:707
+#: ../src/msw/registry.cpp:719
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "無法刪除機值 '%s' @ '%s'"
 
-#: ../src/msw/registry.cpp:1001
+#: ../src/msw/registry.cpp:1070
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr "無法列舉機碼 '%s' 的子機碼"
 
-#: ../src/msw/registry.cpp:956
+#: ../src/msw/registry.cpp:1025
 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr "無法列舉機碼 '%s' 的值"
@@ -655,56 +839,55 @@ msgstr "無法列舉機碼 '%s' 的值"
 msgid "Can't find current position in file '%s'"
 msgstr "無法在檔案 '%s' 中找到目前位置"
 
-#: ../src/msw/registry.cpp:355
+#: ../src/msw/registry.cpp:356
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "無法取得登錄機碼 '%s' 的資訊"
 
 #: ../src/common/zstream.cpp:237
-#, fuzzy
 msgid "Can't initialize zlib deflate stream."
-msgstr "無法初始化顯示畫面。"
+msgstr "無法初始化 zlib 壓縮資料流。"
 
 #: ../src/common/zstream.cpp:99
-#, fuzzy
 msgid "Can't initialize zlib inflate stream."
-msgstr "無法初始化顯示畫面。"
+msgstr "無法初始化 zlib 解壓資料流。"
 
-#: ../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 "ç\84¡æ³\95å¾\9eæª\94æ¡\88 '%s' 中è¼\89å\85¥å\9c\96像：檔案不存在。"
+msgstr "ç\84¡æ³\95å¾\9eæª\94æ¡\88 '%s' 中è¼\89å\85¥å½±像：檔案不存在。"
 
-#: ../src/msw/registry.cpp:385
+#: ../src/msw/registry.cpp:386
 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr "無法開啟登錄機碼 '%s'"
 
 #: ../src/common/zstream.cpp:166
-#, fuzzy, c-format
+#, c-format
 msgid "Can't read from inflate stream: %s"
-msgstr "無法讀取檔案描述子 %d"
+msgstr "無法讀取解壓資料流：%s"
 
 #: ../src/common/zstream.cpp:159
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr ""
+msgstr "無法讀取解壓資料流：資料流中有不預期的結尾"
 
-#: ../src/msw/registry.cpp:890
+#: ../src/msw/registry.cpp:959
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "無法讀取 '%s' 的值"
 
-#: ../src/msw/registry.cpp:780 ../src/msw/registry.cpp:811
+#: ../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' 的值"
 
-#: ../src/common/image.cpp:1070
+#: ../src/common/image.cpp:1110
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
-msgstr "ç\84¡æ³\95å\84²å­\98å\9c\96像到檔案 '%s' 中：未知的附檔名。"
+msgstr "ç\84¡æ³\95å\84²å­\98å½±像到檔案 '%s' 中：未知的附檔名。"
 
-#: ../src/generic/logg.cpp:566 ../src/generic/logg.cpp:992
+#: ../src/generic/logg.cpp:566 ../src/generic/logg.cpp:989
 msgid "Can't save log contents to file."
 msgstr "無法將日誌內容儲存到檔案中。"
 
@@ -712,50 +895,51 @@ msgstr "無法將日誌內容儲存到檔案中。"
 msgid "Can't set thread priority"
 msgstr "無法設定執行緒的優先等級"
 
-#: ../src/msw/registry.cpp:798 ../src/msw/registry.cpp:905
+#: ../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' 的值"
 
 #: ../src/common/zstream.cpp:316
-#, fuzzy, c-format
+#, c-format
 msgid "Can't write to deflate stream: %s"
-msgstr "ç\84¡æ³\95寫å\88°æª\94æ¡\88æ\8f\8fè¿°å­\90 %d"
-
-#: ../src/common/dlgcmn.cpp:240 ../src/generic/dirdlgg.cpp:155
-#: ../src/generic/filedlgg.cpp:996 ../src/generic/filedlgg.cpp:1015
-#: ../src/generic/fontdlgg.cpp:254 ../src/generic/prntdlgg.cpp:455
-#: ../src/generic/progdlgg.cpp:211 ../src/gtk/filedlg.cpp:168
-#: ../src/gtk/fontdlg.cpp:149 ../src/html/helpfrm.cpp:1075
-#: ../src/motif/msgdlg.cpp:185
+msgstr "ç\84¡æ³\95寫å\85¥å£\93縮è³\87æ\96\99æµ\81ï¼\9a%s"
+
+#: ../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 "取消"
 
-#: ../contrib/src/xrc/xmlres.cpp:1012 ../contrib/src/xrc/xmlres.cpp:1053
+#: ../src/xrc/xmlres.cpp:1043 ../src/xrc/xmlres.cpp:1084
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "無法轉換對話窗單位：未知的對話窗。"
 
-#: ../src/common/strconv.cpp:1686
-#, fuzzy, c-format
+#: ../src/common/strconv.cpp:2412
+#, c-format
 msgid "Cannot convert from the charset '%s'!"
-msgstr "無法轉換編碼 '%s'！"
+msgstr "無法轉換字集 '%s'！"
 
-#: ../src/msw/dialup.cpp:510
+#: ../src/msw/dialup.cpp:509
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到連線中的撥號連線：%s"
 
-#: ../contrib/src/xrc/xmlres.cpp:262
+#: ../src/xrc/xmlres.cpp:264
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到未知控制元件所依附的容器： '%s'。"
 
-#: ../contrib/src/xrc/xmlres.cpp:1067
+#: ../src/xrc/xmlres.cpp:1098
 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr "找不到字型節點 '%s'。"
 
-#: ../src/msw/dialup.cpp:815
+#: ../src/msw/dialup.cpp:814
 msgid "Cannot find the location of address book file"
 msgstr "找不到通訊錄的檔案位置。"
 
@@ -764,19 +948,19 @@ msgstr "找不到通訊錄的檔案位置。"
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "無法取得排程原則 %d 的優先等級範圍。"
 
-#: ../src/unix/utilsunx.cpp:727
+#: ../src/unix/utilsunx.cpp:747
 msgid "Cannot get the hostname"
 msgstr "無法取得主機名稱。"
 
-#: ../src/unix/utilsunx.cpp:763
+#: ../src/unix/utilsunx.cpp:783
 msgid "Cannot get the official hostname"
 msgstr "無法取得正式的主機名稱。"
 
-#: ../src/msw/dialup.cpp:909
+#: ../src/msw/dialup.cpp:908
 msgid "Cannot hang up - no active dialup connection."
 msgstr "無法掛斷—沒有連線中的撥號連線。"
 
-#: ../src/msw/app.cpp:307 ../src/msw/app.cpp:310
+#: ../src/msw/app.cpp:308 ../src/msw/app.cpp:311
 msgid "Cannot initialize OLE"
 msgstr "無法初始化 OLE"
 
@@ -793,7 +977,7 @@ msgstr "無法初始化顯示畫面。"
 msgid "Cannot load icon from '%s'."
 msgstr "無法從 '%s' 中載入圖示。"
 
-#: ../contrib/src/xrc/xmlres.cpp:382
+#: ../src/xrc/xmlres.cpp:387
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "無法從檔案 '%s' 中載入資源。"
@@ -803,7 +987,7 @@ msgstr "無法從檔案 '%s' 中載入資源。"
 msgid "Cannot open HTML document: %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"
@@ -813,58 +997,68 @@ msgstr "無法開啟 HTML 說明書：%s"
 msgid "Cannot open 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"
 
-#: ../contrib/src/xrc/xmlres.cpp:353
+#: ../src/xrc/xmlres.cpp:355
 #, c-format
 msgid "Cannot open file '%s'."
 msgstr "無法開啟檔案 '%s'"
 
-#: ../src/generic/dcpsg.cpp:1798
+#: ../src/generic/dcpsg.cpp:1816
 msgid "Cannot open file for PostScript printing!"
 msgstr "無法開啟檔案進行 PostScript 列印！"
 
-#: ../src/html/helpdata.cpp:299
+#: ../src/html/helpdata.cpp:326
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "無法開啟索引檔： %s"
 
-#: ../src/common/intl.cpp:1202
-#, fuzzy, c-format
+#: ../src/common/intl.cpp:1204
+#, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "無法從 '%s' 解譯出大小。"
+msgstr "無法解譯 Plural-Forms：'%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:1000
+#: ../src/xrc/xmlres.cpp:1031
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "無法從 '%s' 解譯出大小。"
 
-#: ../contrib/src/xrc/xmlres.cpp:1041
+#: ../src/xrc/xmlres.cpp:1072
 #, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "無法從 '%s' 解譯出維度。"
 
-#: ../src/html/helpfrm.cpp:1396
+#: ../src/html/helpfrm.cpp:1548
 msgid "Cannot print empty page."
 msgstr "無法列印空頁面。"
 
 #: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
 #, c-format
 msgid "Cannot read typename from '%s'!"
-msgstr "無法從 '%s' 讀取å\9e\8bæ\85\8bå\90\8d稱ï¼\81"
+msgstr "無法從 '%s' 讀取é¡\9eå\9e\8bå\90\8d稱ï¼\81"
 
 #: ../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 "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤"
 
-#: ../src/html/helpfrm.cpp:443
+#: ../src/mac/carbon/thread.cpp:1174 ../src/mac/carbon/mpthread.cpp:977
+#, fuzzy
+msgid "Cannot wait on thread to exit."
+msgstr "無法等候執行緒終結"
+
+#: ../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 "區分大小寫"
 
@@ -872,14 +1066,23 @@ msgstr "區分大小寫"
 msgid "Celtic (ISO-8859-14)"
 msgstr "凱爾特語 (ISO-8859-14)"
 
+#: ../src/common/stockitem.cpp:124
+msgid "Centered"
+msgstr ""
+
 #: ../src/common/fmapbase.cpp:104
 msgid "Central European (ISO-8859-2)"
-msgstr "中歐 (ISO-8859-2)"
+msgstr "中歐語系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:750
+#: ../src/msw/dialup.cpp:749
 msgid "Choose ISP to dial"
 msgstr "選擇 ISP 進行撥號"
 
+#: ../src/generic/colrdlgg.cpp:146 ../src/gtk/colordlg.cpp:45
+#, fuzzy
+msgid "Choose colour"
+msgstr "選擇字型"
+
 #: ../src/gtk/fontdlg.cpp:127
 msgid "Choose font"
 msgstr "選擇字型"
@@ -892,11 +1095,22 @@ msgstr "關閉(&o)"
 msgid "Clear the log contents"
 msgstr "清除日誌內容"
 
-#: ../src/generic/progdlgg.cpp:353
+#: ../src/generic/fontdlgg.cpp:352 ../src/generic/fontdlgg.cpp:371
+msgid "Click to cancel the font selection."
+msgstr ""
+
+#: ../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 "關閉"
 
-#: ../src/univ/themes/win32.cpp:4680
+#: ../src/univ/themes/win32.cpp:4709
 msgid "Close\tAlt-F4"
 msgstr "關閉視窗\tAlt-F4"
 
@@ -908,20 +1122,20 @@ msgstr "全部關閉"
 msgid "Close this window"
 msgstr "關閉視窗"
 
-#: ../src/html/helpfrm.cpp:1410
+#: ../src/html/helpfrm.cpp:1562
 msgid "Compressed HTML Help file (*.chm)|*.chm|"
-msgstr ""
+msgstr "壓縮超文件說明檔 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:594
+#: ../src/generic/dirctrlg.cpp:548
 msgid "Computer"
 msgstr "我的電腦"
 
-#: ../src/common/fileconf.cpp:934
+#: ../src/common/fileconf.cpp:929
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "組態項目名稱不能以 '%c' 開頭。"
 
-#: ../src/generic/filedlgg.cpp:1245 ../src/gtk/filedlg.cpp:74
+#: ../src/generic/filedlgg.cpp:1250 ../src/gtk/filedlg.cpp:74
 msgid "Confirm"
 msgstr "確認"
 
@@ -929,76 +1143,101 @@ msgstr "確認"
 msgid "Confirm registry update"
 msgstr "確認登錄變更"
 
-#: ../src/html/htmlwin.cpp:362
+#: ../src/html/htmlwin.cpp:380
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: ../src/html/helpfrm.cpp:383
+#: ../src/html/helpfrm.cpp:453
 msgid "Contents"
 msgstr "目錄"
 
-#: ../src/common/strconv.cpp:947
+#: ../src/common/strconv.cpp:951
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "無法轉換到字集 '%s'。"
 
-#: ../src/html/htmlwin.cpp:782
-#, fuzzy, c-format
+#: ../src/html/htmlwin.cpp:818
+#, c-format
 msgid "Copied to clipboard:\"%s\""
-msgstr "無法設定剪貼簿資料。"
+msgstr "複製到剪貼簿：\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:188
 msgid "Copies:"
 msgstr "份數："
 
 #: ../src/html/chm.cpp:689
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create temporary file '%s'"
-msgstr "ç\84¡æ³\95å\88ªé\99¤æ\9a«æ\99\82æª\94æ¡\88 '%s'"
+msgstr "ç\84¡æ³\95建ç«\8bæ\9a«å­\98æª\94 '%s'"
 
 #: ../src/html/chm.cpp:274
 #, c-format
 msgid "Could not extract %s into %s: %s"
-msgstr ""
+msgstr "無法將 %s 解至 %s 中： %s"
+
+#: ../contrib/src/deprecated/resource.cpp:1830
+#: ../contrib/src/deprecated/resource.cpp:1960
+#, fuzzy, 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 "找不到識別碼標籤"
 
-#: ../src/msw/textctrl.cpp:2616
+#: ../src/msw/textctrl.cpp:2636
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr "無法載入 Rich Edit DLL '%s'"
 
 #: ../src/html/chm.cpp:445
-#, fuzzy, c-format
+#, c-format
 msgid "Could not locate file '%s'."
-msgstr "無法開啟檔案 '%s'"
+msgstr "找不到檔案 '%s'。"
 
-#: ../src/common/prntbase.cpp:823
+#: ../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 ""
+
+#: ../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 ""
+
+#: ../src/common/prntbase.cpp:817
 msgid "Could not start document preview."
 msgstr "無法啟動文件預覽。"
 
-#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:242
+#: ../src/generic/printps.cpp:221 ../src/msw/printwin.cpp:237
 msgid "Could not start printing."
 msgstr "無法啟動列印。"
 
-#: ../src/common/wincmn.cpp:1368
+#: ../src/common/wincmn.cpp:1421
 msgid "Could not transfer data to window"
 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 "無法釋放 mutex。"
+
+#: ../src/os2/thread.cpp:154
 msgid "Couldn't acquire a mutex lock"
-msgstr "無法建立計時器。"
+msgstr "無法鎖定 mutex。"
 
 #: ../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 "ç\84¡æ³\95æ\8a\8aå\9c\96å\83\8få\8a å\88°å\9c\96像清單。"
+msgstr "ç\84¡æ³\95æ\8a\8aå½±å\83\8få\8a å\88°å½±像清單。"
 
-#: ../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 "無法建立計時器。"
 
@@ -1006,28 +1245,28 @@ msgstr "無法建立計時器。"
 msgid "Couldn't create cursor."
 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'。"
 
-#: ../src/msw/thread.cpp:856
+#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:856
 msgid "Couldn't get the current thread pointer"
 msgstr "無法取得目前執行緒指標。"
 
 #: ../src/common/imagpng.cpp:607
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
-msgstr "ç\84¡æ³\95è¼\89å\85¥ PNG å\9c\96像—檔案被破壞或是沒有足夠記憶體。"
+msgstr "ç\84¡æ³\95è¼\89å\85¥ PNG å½±像—檔案被破壞或是沒有足夠記憶體。"
 
 #: ../src/unix/sound.cpp:472
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't load sound data from '%s'."
-msgstr "無法從 '%s' 中載入圖示。"
+msgstr "無法從 '%s' 中載入聲音資料。"
 
 #: ../src/unix/sound_sdl.cpp:230
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't open audio: %s"
-msgstr "無法開啟檔案 '%s'"
+msgstr "無法開啟聲音檔： '%s'"
 
 #: ../src/msw/ole/dataobj.cpp:147
 #, c-format
@@ -1035,11 +1274,10 @@ msgid "Couldn't register clipboard format '%s'."
 msgstr "無法註冊剪貼簿格式 '%s'。"
 
 #: ../src/os2/thread.cpp:171
-#, fuzzy
 msgid "Couldn't release a mutex"
-msgstr "無法建立計時器。"
+msgstr "無法釋放 mutex。"
 
-#: ../src/msw/listctrl.cpp:731
+#: ../src/msw/listctrl.cpp:735
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "無法取得清單控制元件中細項 %d 的資訊。"
@@ -1047,29 +1285,29 @@ msgstr "無法取得清單控制元件中細項 %d 的資訊。"
 #: ../src/common/imagpng.cpp:647 ../src/common/imagpng.cpp:658
 #: ../src/common/imagpng.cpp:666
 msgid "Couldn't save PNG image."
-msgstr "ç\84¡æ³\95å\84²å­\98 PNG å\9c\96像。"
+msgstr "ç\84¡æ³\95å\84²å­\98 PNG å½±像。"
 
-#: ../src/msw/thread.cpp:610
+#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:610
 msgid "Couldn't terminate thread"
 msgstr "無法終止執行緒。"
 
 #: ../src/common/xtistrm.cpp:161
 msgid "Create Parameter not found in declared RTTI Parameters"
-msgstr ""
+msgstr "宣告的 RTTI 參數中沒發現建立的參數"
 
-#: ../src/generic/dirdlgg.cpp:265
+#: ../src/generic/dirdlgg.cpp:311
 msgid "Create directory"
 msgstr "建立目錄"
 
-#: ../src/generic/dirdlgg.cpp:105 ../src/generic/filedlgg.cpp:955
+#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:960
 msgid "Create new directory"
 msgstr "建立新目錄"
 
-#: ../src/msw/textctrl.cpp:2034
+#: ../src/common/stockitem.cpp:111 ../src/msw/textctrl.cpp:2052
 msgid "Cu&t"
 msgstr "剪下(&t)"
 
-#: ../src/generic/filedlgg.cpp:966
+#: ../src/generic/filedlgg.cpp:971
 msgid "Current directory:"
 msgstr "目前目錄："
 
@@ -1077,11 +1315,11 @@ msgstr "目前目錄："
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: ../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 "「動態資料交換」資料傳送請求失敗"
 
@@ -1091,11 +1329,11 @@ msgstr "DIB 標頭：編碼型態與色彩位元數不吻合。"
 
 #: ../src/common/imagbmp.cpp:882
 msgid "DIB Header: Image height > 32767 pixels for file."
-msgstr "DIB æ¨\99é ­ï¼\9aå\9c\96像高度大於 32767 個圖素。"
+msgstr "DIB æ¨\99é ­ï¼\9aå½±像高度大於 32767 個圖素。"
 
 #: ../src/common/imagbmp.cpp:876
 msgid "DIB Header: Image width > 32767 pixels for file."
-msgstr "DIB æ¨\99é ­ï¼\9aå\9c\96像寬度大於 32767 個圖素。"
+msgstr "DIB æ¨\99é ­ï¼\9aå½±像寬度大於 32767 個圖素。"
 
 #: ../src/common/imagbmp.cpp:896
 msgid "DIB Header: Unknown bitdepth in file."
@@ -1105,39 +1343,38 @@ msgstr "DIB 標頭：未知的色彩位元數。"
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB 標頭：未知的編碼型態。"
 
-#: ../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:221
+#: ../src/generic/fontdlgg.cpp:225
 msgid "Decorative"
 msgstr "修飾"
 
-#: ../src/common/fmapbase.cpp:666
+#: ../src/common/fmapbase.cpp:671
 msgid "Default encoding"
 msgstr "預設的編碼"
 
 #: ../contrib/src/gizmos/editlbox.cpp:163
-#, fuzzy
 msgid "Delete item"
-msgstr "刪除(&D)"
+msgstr "刪除項目"
 
-#: ../src/unix/snglinst.cpp:269
+#: ../src/unix/snglinst.cpp:300
 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "已刪除過時的鎖定檔案 '%s'。"
 
-#: ../src/msw/dialup.cpp:359
+#: ../src/msw/dialup.cpp:358
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr "由於遠端存取服務（RAS）沒有安裝，撥號功能無法使用。請先安裝它。"
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:241
 msgid "Did you know..."
 msgstr "您知道嗎..."
 
-#: ../src/common/filefn.cpp:1359
+#: ../src/common/filefn.cpp:1145
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目錄 '%s' 無法建立"
@@ -1147,22 +1384,21 @@ msgstr "目錄 '%s' 無法建立"
 msgid "Directory '%s' doesn't exist!"
 msgstr "目錄 '%s' 不存在！"
 
-#: ../src/generic/dirdlgg.cpp:190
+#: ../src/generic/dirdlgg.cpp:236
 msgid "Directory does not exist"
 msgstr "目錄不存在"
 
-#: ../src/generic/filedlgg.cpp:1222
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:1227
 msgid "Directory doesn't exist."
-msgstr "目錄不存在"
+msgstr "目錄不存在。"
 
-#: ../src/html/helpfrm.cpp:411
+#: ../src/html/helpfrm.cpp:480
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "顯示包含該字串的所有索引項目。搜尋不分大小寫。"
 
-#: ../src/html/helpfrm.cpp:592
+#: ../src/html/helpfrm.cpp:662
 msgid "Display options dialog"
 msgstr "顯示選項對話方塊"
 
@@ -1181,83 +1417,91 @@ msgstr ""
 "新的值是\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 的修改？"
 
-#: ../src/html/htmlwin.cpp:422
+#: ../src/html/htmlwin.cpp:445 ../src/msw/frame.cpp:198
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:365
+#: ../src/generic/progdlgg.cpp:412
 msgid "Done."
 msgstr "完成。"
 
 #: ../src/common/xtixml.cpp:271
 #, c-format
 msgid "Doubly used id : %d"
-msgstr ""
+msgstr "id 重複：%d"
 
 #: ../src/generic/fdrepdlg.cpp:151
 msgid "Down"
 msgstr "下"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:117
 msgid "E sheet, 34 x 44 in"
 msgstr "E 紙張, 34 x 44 英吋"
 
 #: ../contrib/src/gizmos/editlbox.cpp:161
 msgid "Edit item"
-msgstr ""
+msgstr "編輯項目"
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../src/generic/progdlgg.cpp:186
 msgid "Elapsed time : "
 msgstr "歷時︰"
 
 #: ../src/common/prntbase.cpp:412
 #, c-format
 msgid "Enter a page number between %d and %d:"
-msgstr ""
+msgstr "輸入介於 %d 到 %d 的頁碼"
 
 #: ../src/generic/helpext.cpp:442
 msgid "Entries found"
 msgstr "找到的項目"
 
-#: ../src/common/config.cpp:362
+#: ../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:685 ../src/generic/dirctrlg.cpp:703
-#: ../src/generic/dirctrlg.cpp:714 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:624 ../src/generic/filedlgg.cpp:736
-#: ../src/generic/filedlgg.cpp:750 ../src/generic/filedlgg.cpp:764
-#: ../src/generic/filedlgg.cpp:1197 ../src/generic/filedlgg.cpp:1222
-#: ../src/generic/filedlgg.cpp:1252 ../src/gtk/filedlg.cpp:82
+#: ../src/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 "錯誤"
 
-#: ../src/unix/utilsunx.cpp:1033 ../src/unix/utilsunx.cpp:1041
+#: ../src/unix/utilsunx.cpp:1053 ../src/unix/utilsunx.cpp:1061
 msgid "Error "
 msgstr "錯誤"
 
-#: ../src/generic/dirdlgg.cpp:205
+#: ../src/generic/dirdlgg.cpp:251
 msgid "Error creating directory"
 msgstr "建立目錄錯誤"
 
 #: ../src/common/imagbmp.cpp:929
 msgid "Error in reading image DIB ."
-msgstr "è®\80å\8f\96å\9c\96像 DIB 時發生錯誤。"
+msgstr "è®\80å\8f\96å½±像 DIB 時發生錯誤。"
 
-#: ../src/common/fileconf.cpp:505
-#, fuzzy
+#: ../src/common/fileconf.cpp:501
 msgid "Error reading config options."
-msgstr "讀取圖像 DIB 時發生錯誤。"
+msgstr "讀取設定選項時發生錯誤。"
+
+#: ../src/common/fileconf.cpp:1015
+#, fuzzy
+msgid "Error saving user configuration data."
+msgstr "讀取設定選項時發生錯誤。"
+
+#: ../src/mac/carbon/thread.cpp:672 ../src/mac/carbon/mpthread.cpp:482
+msgid "Error while waiting on semaphore"
+msgstr ""
 
-#: ../src/common/log.cpp:478
+#: ../src/common/log.cpp:481
 msgid "Error: "
 msgstr "錯誤︰"
 
@@ -1265,57 +1509,77 @@ msgstr "錯誤︰"
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界語 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:194
 msgid "Estimated time : "
 msgstr "估計時間︰"
 
-#: ../src/msw/utilsexc.cpp:733
+#: ../src/msw/utilsexc.cpp:751
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "指令 '%s' 執行失敗"
 
 #: ../src/os2/utilsexc.cpp:169
-#, fuzzy, c-format
+#, c-format
 msgid "Execution of command '%s' failed with error: %ul"
-msgstr "指令 '%s' 執行失敗"
+msgstr "指令 '%s' 執行失敗，錯誤碼：%ul"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:122
 msgid "Executive, 7 1/4 x 10 1/2 in"
 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
+#, fuzzy
+msgid "Expected '*' whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
+#: ../contrib/src/deprecated/resource.cpp:1886
+#: ../contrib/src/deprecated/resource.cpp:2015
+#: ../contrib/src/deprecated/resource.cpp:3108
+#, fuzzy
+msgid "Expected '=' whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
+#: ../contrib/src/deprecated/resource.cpp:1855
+#: ../contrib/src/deprecated/resource.cpp:1985
+#: ../contrib/src/deprecated/resource.cpp:3077
+#, fuzzy
+msgid "Expected 'char' whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
 #: ../src/common/fmapbase.cpp:141
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "延伸的 Unix 日本頁碼 (EUC-JP)"
 
 #: ../src/html/chm.cpp:696
-#, fuzzy, c-format
+#, c-format
 msgid "Extraction of '%s' into '%s' failed."
-msgstr "指令 '%s' 執行失敗"
+msgstr "無法將 '%s' 解開至 '%s' 中。"
 
-#: ../src/msw/dialup.cpp:844
+#: ../src/msw/dialup.cpp:843
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "%s 撥號連線失敗：%s"
 
-#: ../src/unix/snglinst.cpp:243
+#: ../src/unix/snglinst.cpp:274
 msgid "Failed to access lock file."
 msgstr "無法存取鎖定檔。"
 
-#: ../src/msw/dib.cpp:528
+#: ../src/msw/dib.cpp:543
 #, c-format
 msgid "Failed to allocated %luKb of memory for bitmap data."
-msgstr ""
+msgstr "無法配置 %luKb 的記憶體存放點陣圖資料。"
 
-#: ../src/unix/displayx11.cpp:262
-#, fuzzy
+#: ../src/unix/displayx11.cpp:224
 msgid "Failed to change video mode"
-msgstr "無法關閉檔案"
+msgstr "變更顯示模式失敗"
 
-#: ../src/common/filename.cpp:188
+#: ../src/common/filename.cpp:191
 msgid "Failed to close file handle"
 msgstr "無法關閉檔案"
 
-#: ../src/unix/snglinst.cpp:308
+#: ../src/unix/snglinst.cpp:339
 #, c-format
 msgid "Failed to close lock file '%s'"
 msgstr "無法關閉鎖定檔案 '%s'"
@@ -1324,34 +1588,39 @@ msgstr "無法關閉鎖定檔案 '%s'"
 msgid "Failed to close the clipboard."
 msgstr "無法關閉剪貼簿。"
 
-#: ../src/msw/dialup.cpp:784
+#: ../src/msw/dialup.cpp:783
 msgid "Failed to connect: missing username/password."
 msgstr "連線失敗：缺少使用者名稱或密碼。"
 
-#: ../src/msw/dialup.cpp:730
+#: ../src/msw/dialup.cpp:729
 msgid "Failed to connect: no ISP to dial."
 msgstr "連線失敗：沒有可撥號的 ISP。"
 
-#: ../src/msw/registry.cpp:614
+#: ../src/msw/registry.cpp:624
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "無法複製登錄機值 '%s'"
 
-#: ../src/msw/registry.cpp:623
+#: ../src/msw/registry.cpp:633
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "無法複製登錄機碼 '%s' 的內容到 '%s'。"
 
-#: ../src/common/filefn.cpp:1197
+#: ../src/common/filefn.cpp:989
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "無法複製檔案 '%s' 到 '%s'"
 
-#: ../src/msw/dde.cpp:1004
+#: ../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:988
 msgid "Failed to create DDE string"
 msgstr "無法建立「動態資料交換」字串"
 
-#: ../src/msw/mdi.cpp:425
+#: ../src/msw/mdi.cpp:455
 msgid "Failed to create MDI parent frame."
 msgstr "無法建立 MDI 主框架。"
 
@@ -1359,7 +1628,7 @@ msgstr "無法建立 MDI 主框架。"
 msgid "Failed to create a status bar."
 msgstr "無法建立狀態列。"
 
-#: ../src/common/filename.cpp:728
+#: ../src/common/filename.cpp:742
 msgid "Failed to create a temporary file name"
 msgstr "無法產生暫存檔的檔名"
 
@@ -1367,15 +1636,14 @@ msgstr "無法產生暫存檔的檔名"
 msgid "Failed to create an anonymous pipe"
 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'"
 
 #: ../src/msw/cursor.cpp:198
-#, fuzzy
 msgid "Failed to create cursor."
-msgstr "無法建立狀態列。"
+msgstr "無法建立游標。"
 
 #: ../src/unix/mimetype.cpp:370
 #, c-format
@@ -1387,7 +1655,7 @@ msgstr "無法建立目錄 %s/.gnome。"
 msgid "Failed to create directory %s/mime-info."
 msgstr "無法建立目錄 %s/mime-info。"
 
-#: ../src/generic/dirdlgg.cpp:203
+#: ../src/generic/dirdlgg.cpp:249
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
@@ -1406,39 +1674,70 @@ msgstr "無法為 '%s' 檔案建立登錄項目。"
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "無法建立標準的「尋找/置換」對話窗 (錯誤碼 %d)"
 
-#: ../src/html/winpars.cpp:495
+#: ../src/html/winpars.cpp:519
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "無法以編碼 %s 顯示 HTML 文件"
 
+#: ../src/mac/carbon/clipbrd.cpp:185 ../src/mac/classic/clipbrd.cpp:185
 #: ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "無法清空剪貼簿。"
 
 #: ../src/unix/displayx11.cpp:201
-#, fuzzy
 msgid "Failed to enumerate video modes"
-msgstr "ç\84¡æ³\95建ç«\8bç\9b®é\8c\84 %s/.gnomeã\80\82"
+msgstr "ç\84¡æ³\95å\88\97è\88\89顯示模å¼\8f"
 
-#: ../src/msw/dde.cpp:668
+#: ../src/msw/dde.cpp:652
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "無法建立與「動態資料交換」伺服器溝通的連結"
 
-#: ../src/msw/dialup.cpp:622
+#: ../src/msw/dialup.cpp:621
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "無法建立撥號連線：%s"
 
-#: ../src/unix/utilsunx.cpp:460 ../src/unix/utilsunx.cpp:476
+#: ../src/unix/utilsunx.cpp:480 ../src/unix/utilsunx.cpp:496
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "無法執行 '%s'\n"
 
-#: ../src/msw/dialup.cpp:682
+#: ../contrib/src/deprecated/resource.cpp:2489
+#, c-format
+msgid ""
+"Failed to find XBM resource %s.\n"
+"Forgot to use wxResourceLoadBitmapData?"
+msgstr ""
+"找不到 XBM 資源 %s。\n"
+"忘記使用 wxResourceLoadBitmapData？"
+
+#: ../contrib/src/deprecated/resource.cpp:2643
+#, c-format
+msgid ""
+"Failed to find XBM resource %s.\n"
+"Forgot to use wxResourceLoadIconData?"
+msgstr ""
+"找不到 XBM 資源 %s。\n"
+"忘記使用 wxResourceLoadIconData？"
+
+#: ../contrib/src/deprecated/resource.cpp:2504
+#, c-format
+msgid ""
+"Failed to find XPM resource %s.\n"
+"Forgot to use wxResourceLoadBitmapData?"
+msgstr ""
+"找不到 XPM 資源 %s。\n"
+"忘記使用 wxResourceLoadBitmapData？"
+
+#: ../src/msw/dialup.cpp:681
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "無法取得 ISP 名稱：%s"
 
+#: ../src/mac/carbon/clipbrd.cpp:134 ../src/mac/classic/clipbrd.cpp:134
+msgid "Failed to get clipboard data."
+msgstr "無法取得剪貼簿資料。"
+
 #: ../src/msw/clipbrd.cpp:716
 msgid "Failed to get data from the clipboard"
 msgstr "無法從剪貼簿取得資料"
@@ -1447,7 +1746,7 @@ msgstr "無法從剪貼簿取得資料"
 msgid "Failed to get the local system time"
 msgstr "無法取得系統的當地時間"
 
-#: ../src/common/filefn.cpp:1609
+#: ../src/common/filefn.cpp:1382
 msgid "Failed to get the working directory"
 msgstr "無法取得工作目錄"
 
@@ -1459,17 +1758,22 @@ msgstr "無法初始化圖形使用者介面：沒有找到內建的主題。"
 msgid "Failed to initialize MS HTML Help."
 msgstr "無法初始化 MS HTML Help。"
 
-#: ../src/msw/glcanvas.cpp:741
+#: ../src/msw/glcanvas.cpp:793
 msgid "Failed to initialize OpenGL"
 msgstr "無法初始化 OpenGL"
 
+#: ../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 "無法停止執行緒，偵測到潛在的記憶體流失 - 請重新啟動程式"
 
-#: ../src/msw/utils.cpp:693
+#: ../src/msw/utils.cpp:684
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "無法刪除程序 %d"
@@ -1477,23 +1781,23 @@ msgstr "無法刪除程序 %d"
 #: ../src/common/iconbndl.cpp:72
 #, c-format
 msgid "Failed to load image %d from file '%s'."
-msgstr "ç\84¡æ³\95è¼\89å\85¥å\9c\96像 %d—檔案 '%s'。"
+msgstr "ç\84¡æ³\95è¼\89å\85¥å½±像 %d—檔案 '%s'。"
 
 #: ../src/msw/volume.cpp:312
 msgid "Failed to load mpr.dll."
 msgstr "無法載入 mpr.dll"
 
-#: ../src/common/dynlib.cpp:287
+#: ../src/common/dynlib.cpp:286
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "無法載入共享函式庫 '%s'"
 
-#: ../src/common/dynlib.cpp:216
+#: ../src/common/dynlib.cpp:215
 #, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "無法載入共享函式庫 '%s'，發生 '%s' 錯誤"
 
-#: ../src/unix/snglinst.cpp:192
+#: ../src/unix/snglinst.cpp:203
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr "無法鎖定檔案 '%s'"
@@ -1503,22 +1807,22 @@ msgstr "無法鎖定檔案 '%s'"
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "無法搜尋與正規運算式 '%s' 相符的字串：%s"
 
-#: ../src/common/filename.cpp:1844
+#: ../src/common/filename.cpp:1884
 #, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "無法變更檔案 '%s' 的檔案日期"
 
-#: ../src/common/filename.cpp:176
+#: ../src/common/filename.cpp:179
 #, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "無法開啟 '%s'—%s"
 
 #: ../src/html/chm.cpp:142
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to open CHM archive '%s'."
-msgstr "無法開啟 '%s'—%s"
+msgstr "無法開啟 '%s' CHM 檔。"
 
-#: ../src/common/filename.cpp:750
+#: ../src/common/filename.cpp:764
 msgid "Failed to open temporary file."
 msgstr "無法開啟暫存檔。"
 
@@ -1530,44 +1834,49 @@ msgstr "無法開啟剪貼簿。"
 msgid "Failed to put data on the clipboard"
 msgstr "無法存放資料到剪貼簿。"
 
-#: ../src/unix/snglinst.cpp:252
+#: ../src/unix/snglinst.cpp:283
 msgid "Failed to read PID from lock file."
 msgstr "無法從鎖定的檔案中讀出「程序識別碼」。"
 
-#: ../src/unix/utilsunx.cpp:550
+#: ../src/unix/utilsunx.cpp:570
 msgid "Failed to redirect child process input/output"
 msgstr "無法轉向子程序的「輸入/輸出」"
 
-#: ../src/msw/utilsexc.cpp:633
+#: ../src/msw/utilsexc.cpp:651
 msgid "Failed to redirect the child process IO"
 msgstr "無法轉向子程序的「輸入/輸出」"
 
-#: ../src/msw/dde.cpp:318
+#: ../src/msw/dde.cpp:300
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "無法註冊「動態資料交換」伺服器 '%s'"
 
-#: ../src/common/fontmap.cpp:231
+#: ../src/msw/glcanvas.cpp:362
+#, fuzzy
+msgid "Failed to register OpenGL window class."
+msgstr "無法初始化 OpenGL"
+
+#: ../src/common/fontmap.cpp:232
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "無法記憶字集 '%s' 的編碼。"
 
-#: ../src/unix/snglinst.cpp:296
+#: ../src/unix/snglinst.cpp:327
 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "無法移除鎖定中的檔案 '%s'"
 
-#: ../src/unix/snglinst.cpp:262
+#: ../src/unix/snglinst.cpp:293
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr "無法移除過時的鎖定檔案 '%s'。"
 
-#: ../src/msw/registry.cpp:460
+#: ../src/msw/registry.cpp:461
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "無法將登錄值 '%s' 更名為 '%s'。"
 
-#: ../src/msw/registry.cpp:560
+#: ../src/msw/registry.cpp:566
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
@@ -1576,12 +1885,12 @@ msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
 msgid "Failed to retrieve data from the clipboard."
 msgstr "無法從剪貼簿取得資料。"
 
-#: ../src/common/filename.cpp:1934
+#: ../src/common/filename.cpp:1974
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "無法取得檔案 '%s' 的各項時間屬性"
 
-#: ../src/msw/dialup.cpp:455
+#: ../src/msw/dialup.cpp:454
 msgid "Failed to retrieve text of RAS error message"
 msgstr "無法取得 RAS 錯誤訊息的對應文字"
 
@@ -1589,16 +1898,16 @@ msgstr "無法取得 RAS 錯誤訊息的對應文字"
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "無法取得支援的剪貼簿格式"
 
-#: ../src/msw/dib.cpp:330
-#, fuzzy, c-format
+#: ../src/msw/dib.cpp:345
+#, 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 "無法傳送「動態資料交換」連結通知訊息"
 
-#: ../src/common/ftp.cpp:368
+#: ../src/common/ftp.cpp:384
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "無法設定檔案傳輸模式為%s。"
@@ -1607,7 +1916,12 @@ msgstr "無法設定檔案傳輸模式為%s。"
 msgid "Failed to set clipboard data."
 msgstr "無法設定剪貼簿資料。"
 
-#: ../src/common/file.cpp:701
+#: ../src/unix/snglinst.cpp:186
+#, fuzzy, c-format
+msgid "Failed to set permissions on lock file '%s'"
+msgstr "無法設定檔案 '%s' 的存取權限 "
+
+#: ../src/common/file.cpp:528
 msgid "Failed to set temporary file permissions"
 msgstr "無法設定暫存檔的存取權限"
 
@@ -1616,39 +1930,45 @@ msgstr "無法設定暫存檔的存取權限"
 msgid "Failed to set thread priority %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 "ç\84¡æ³\95å°\87å\9c\96像 '%s' 存到「記憶體虛擬檔案系統」！"
+msgstr "ç\84¡æ³\95å°\87å½±像 '%s' 存到「記憶體虛擬檔案系統」！"
 
+#: ../src/mac/carbon/thread.cpp:1465 ../src/mac/carbon/mpthread.cpp:1273
 #: ../src/unix/threadpsx.cpp:1428
 msgid "Failed to terminate a thread."
 msgstr "無法終止執行緒。"
 
-#: ../src/msw/dde.cpp:687
+#: ../src/msw/dde.cpp:671
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "無法終止與「動態資料交換」伺服器溝通的連結"
 
-#: ../src/msw/dialup.cpp:917
+#: ../src/msw/dialup.cpp:916
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "無法終止撥號連線：%s"
 
-#: ../src/common/filename.cpp:1859
+#: ../src/common/filename.cpp:1899
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "無法更新檔案 '%s' 的修改時間"
 
-#: ../src/unix/snglinst.cpp:302
+#: ../src/unix/snglinst.cpp:333
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr "無法解除鎖定檔案 '%s'"
 
-#: ../src/msw/dde.cpp:339
+#: ../src/msw/dde.cpp:321
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "無法撤銷「動態資料交換」伺服器 '%s' 的註冊"
 
+#: ../src/common/fileconf.cpp:990
+#, fuzzy
+msgid "Failed to update user configuration file."
+msgstr "無法開啟使用者組態檔案。"
+
 #: ../src/unix/snglinst.cpp:173
 #, c-format
 msgid "Failed to write to lock file '%s'"
@@ -1658,21 +1978,26 @@ msgstr "無法寫入鎖定檔案 '%s'"
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../src/common/log.cpp:467
+#: ../src/common/log.cpp:470
 msgid "Fatal error: "
 msgstr "致命的錯誤︰"
 
+#: ../src/msw/wince/filedlgwce.cpp:120
+#, fuzzy
+msgid "File"
+msgstr "檔案(&F)"
+
 #: ../src/mgl/bitmap.cpp:544
 #, c-format
 msgid "File %s does not exist."
 msgstr "檔案 '%s' 不存在。"
 
-#: ../src/generic/filedlgg.cpp:1243 ../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 "æª\94æ¡\88 '%s' å·²å­\98å\9c¨ï¼\8cæ\98¯å\90¦ç\9c\9fè¦\81è¤\87寫？"
+msgstr "æª\94æ¡\88 '%s' å·²å­\98å\9c¨ï¼\8cæ\98¯å\90¦ç\9c\9fè¦\81è¦\86寫？"
 
-#: ../src/os2/filedlg.cpp:302
+#: ../src/os2/filedlg.cpp:307
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -1681,68 +2006,71 @@ msgstr ""
 "檔案 '%s' 已存在，\n"
 "是否覆寫？"
 
-#: ../src/common/textcmn.cpp:224
+#: ../src/common/textcmn.cpp:227
 msgid "File couldn't be loaded."
 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 "檔案錯誤"
 
-#: ../src/generic/dirctrlg.cpp:703 ../src/generic/filedlgg.cpp:750
+#: ../src/generic/dirctrlg.cpp:658 ../src/generic/filedlgg.cpp:751
 msgid "File name exists already."
 msgstr "檔案名稱已存在。"
 
-#: ../src/msw/filedlg.cpp:250
-#, c-format
-msgid "Files (%s)|%s"
+#: ../src/common/filefn.cpp:1695
+#, fuzzy, c-format
+msgid "Files (%s)"
 msgstr "檔案 (%s)|%s"
 
-#: ../src/html/helpfrm.cpp:399
+#: ../src/html/helpfrm.cpp:468
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/html/helpfrm.cpp:1049
+#: ../src/html/helpfrm.cpp:1196
 msgid "Fixed font:"
 msgstr "固定字型︰"
 
-#: ../src/html/helpfrm.cpp:1110
+#: ../src/html/helpfrm.cpp:1256
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
-msgstr ""
+msgstr "固定大小字體。<br> <b>粗體</b> <i>斜體</i> "
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:128
 msgid "Folio, 8 1/2 x 13 in"
-msgstr "Folio, 8 1/2 x 13 in"
+msgstr "對開紙，8 1/2 x 13 英吋"
 
-#: ../src/html/helpfrm.cpp:1050
+#: ../src/html/helpfrm.cpp:1197
 msgid "Font size:"
 msgstr "字型大小："
 
-#: ../src/unix/utilsunx.cpp:497
+#: ../src/unix/utilsunx.cpp:517
 msgid "Fork failed"
 msgstr "建立執行緒失敗"
 
-#: ../src/common/dlgcmn.cpp:224
-msgid "Forward"
-msgstr "向前"
-
 #: ../src/common/xtixml.cpp:235
 msgid "Forward hrefs are not supported"
-msgstr ""
+msgstr "不支援往前參照的超連結"
+
+#: ../contrib/src/deprecated/resource.cpp:1838
+#: ../contrib/src/deprecated/resource.cpp:1968
+#: ../contrib/src/deprecated/resource.cpp:3060
+#, fuzzy
+msgid "Found "
+msgstr "尋找"
 
-#: ../src/html/helpfrm.cpp:731
+#: ../src/html/helpfrm.cpp:863
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 個符合項目"
 
-#: ../src/generic/prntdlgg.cpp:181
+#: ../src/generic/prntdlgg.cpp:179
 msgid "From:"
 msgstr "從："
 
 #: ../src/common/imaggif.cpp:100
 msgid "GIF: Invalid gif index."
-msgstr "GIF: ç\84¡æ\95\88ç\9a\84å\9c\96像索引。"
+msgstr "GIF: ç\84¡æ\95\88ç\9a\84å½±像索引。"
 
 #: ../src/common/imaggif.cpp:75
 msgid "GIF: data stream seems to be truncated."
@@ -1750,7 +2078,7 @@ msgstr "GIF: 資料流似乎被截斷了。"
 
 #: ../src/common/imaggif.cpp:59
 msgid "GIF: error in GIF image format."
-msgstr "GIF: GIF å\9c\96像格式錯誤。"
+msgstr "GIF: GIF å½±像格式錯誤。"
 
 #: ../src/common/imaggif.cpp:62
 msgid "GIF: not enough memory."
@@ -1760,15 +2088,15 @@ msgstr "GIF: 記憶體不足。"
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 未知的錯誤！！！"
 
-#: ../src/univ/themes/gtk.cpp:631
+#: ../src/univ/themes/gtk.cpp:632
 msgid "GTK+ theme"
 msgstr "GTK+ 主題"
 
-#: ../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"
 
-#: ../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"
 
@@ -1784,27 +2112,23 @@ msgstr ""
 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:558
+#: ../src/html/helpfrm.cpp:628
 msgid "Go back"
 msgstr "退回"
 
-#: ../src/html/helpfrm.cpp:561
+#: ../src/html/helpfrm.cpp:631
 msgid "Go forward"
 msgstr "向前"
 
-#: ../src/html/helpfrm.cpp:566
+#: ../src/html/helpfrm.cpp:636
 msgid "Go one level up in document hierarchy"
 msgstr "到上一階文件層級"
 
-#: ../src/generic/dirdlgg.cpp:110 ../src/generic/filedlgg.cpp:945
+#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:950
 msgid "Go to home directory"
-msgstr "進入 home 目錄"
+msgstr "進入使用者目錄"
 
-#: ../src/generic/filedlgg.cpp:937
+#: ../src/generic/filedlgg.cpp:942
 msgid "Go to parent directory"
 msgstr "進入父目錄"
 
@@ -1818,31 +2142,31 @@ msgstr "希臘語 (ISO-8859-7)"
 
 #: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
 msgid "Gzip not supported by this version of zlib"
-msgstr ""
+msgstr "這一版的 zib 不支援 Gzip"
 
-#: ../src/html/helpfrm.cpp:1408
+#: ../src/html/helpfrm.cpp:1560
 msgid "HTML Help Project (*.hhp)|*.hhp|"
-msgstr ""
+msgstr "超文件說明檔專案 (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:468
+#: ../src/html/htmlwin.cpp:492
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 錨 %s 不存在。"
 
-#: ../src/html/helpfrm.cpp:1406
+#: ../src/html/helpfrm.cpp:1558
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
-msgstr ""
+msgstr "超文件檔 (*.html;*.htm)|*.html;*.htm|"
 
 #: ../src/common/fmapbase.cpp:110
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:236 ../src/generic/mdig.cpp:310
-#: ../src/html/helpfrm.cpp:254 ../src/msw/mdi.cpp:1329
+#: ../src/generic/mdig.cpp:310 ../src/html/helpfrm.cpp:321
+#: ../src/msw/mdi.cpp:1380 ../contrib/src/deprecated/proplist.cpp:523
 msgid "Help"
 msgstr "說明"
 
-#: ../src/html/helpfrm.cpp:1043
+#: ../src/html/helpfrm.cpp:1190
 msgid "Help Browser Options"
 msgstr "說明瀏覽器選項"
 
@@ -1850,39 +2174,53 @@ msgstr "說明瀏覽器選項"
 msgid "Help Index"
 msgstr "說明索引"
 
-#: ../src/html/helpfrm.cpp:1394
+#: ../src/html/helpfrm.cpp:1546
 msgid "Help Printing"
 msgstr "說明列印"
 
-#: ../src/html/helpfrm.cpp:1407
+#: ../src/html/helpfrm.cpp:791
+#, fuzzy
+msgid "Help Topics"
+msgstr "說明：%s"
+
+#: ../src/html/helpfrm.cpp:1559
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
-msgstr ""
+msgstr "說明書 (*.htb)|*.htb|說明書 (*.zip)|*.zip|"
 
 #: ../src/html/helpctrl.cpp:55
 #, c-format
 msgid "Help: %s"
 msgstr "說明：%s"
 
+#: ../src/generic/dirdlgg.cpp:107
+#, fuzzy
+msgid "Home"
+msgstr "未命名"
+
+#: ../include/wx/filefn.h:134
+msgid "I64"
+msgstr ""
+
 #: ../src/common/imagbmp.cpp:942
 msgid "ICO: Error in reading mask DIB."
 msgstr "ICO: 讀取遮罩式 DIB 時發生錯誤。"
 
-#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
-#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
-#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
-#: ../src/common/imagbmp.cpp:1190
+#: ../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
 msgid "ICO: Error writing the image file!"
-msgstr "ICO: 寫å\85¥å\9c\96å\83\8fæª\94æ¡\88時發生錯誤！"
+msgstr "ICO: 寫å\85¥å½±å\83\8fæª\94時發生錯誤！"
 
-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1015
 msgid "ICO: Image too tall for an icon."
-msgstr "ICO: å\9c\96像太高。"
+msgstr "ICO: å½±像太高。"
 
-#: ../src/common/imagbmp.cpp:1022
+#: ../src/common/imagbmp.cpp:1021
 msgid "ICO: Image too wide for an icon."
-msgstr "ICO: å\9c\96像太寬。"
+msgstr "ICO: å½±像太寬。"
 
-#: ../src/common/imagbmp.cpp:1255
+#: ../src/common/imagbmp.cpp:1254
 msgid "ICO: Invalid icon index."
 msgstr "ICO: 無效的圖示索引。"
 
@@ -1892,7 +2230,7 @@ msgstr "IFF: 資料流似乎被截斷了。"
 
 #: ../src/common/imagiff.cpp:755
 msgid "IFF: error in IFF image format."
-msgstr "IFF: IFF å\9c\96像格式錯誤。"
+msgstr "IFF: IFF å½±像格式錯誤。"
 
 #: ../src/common/imagiff.cpp:758
 msgid "IFF: not enough memory."
@@ -1902,6 +2240,16 @@ msgstr "IFF: 記憶體不足。"
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 未知的錯誤！！！"
 
+#: ../contrib/src/deprecated/resource.cpp:2673
+#: ../contrib/src/deprecated/resource.cpp:2684
+#, fuzzy, c-format
+msgid "Icon resource specification %s not found."
+msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
+
+#: ../contrib/src/deprecated/resource.cpp:271
+msgid "Ill-formed resource file syntax."
+msgstr ""
+
 #: ../src/common/xtistrm.cpp:260
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
 msgstr ""
@@ -1914,24 +2262,25 @@ msgstr ""
 msgid "Illegal Parameter Count for Create Method"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:685 ../src/generic/filedlgg.cpp:736
+#: ../src/generic/dirctrlg.cpp:640 ../src/generic/filedlgg.cpp:737
 msgid "Illegal directory name."
 msgstr "不合法的目錄名稱。"
 
-#: ../src/generic/filedlgg.cpp:1197
+#: ../src/generic/filedlgg.cpp:1202
 msgid "Illegal file specification."
 msgstr "不合規範的檔案描述。"
 
 #: ../src/common/image.cpp:900
-msgid "Image and Mask have different sizes"
-msgstr "圖像和遮罩的大小不一致"
+#, fuzzy
+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 "å\9c\96像檔不是型態%d。"
+msgstr "å½±像檔不是型態%d。"
 
-#: ../src/msw/textctrl.cpp:305
+#: ../src/msw/textctrl.cpp:302
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
@@ -1939,26 +2288,31 @@ msgstr ""
 "無法建立 rich edit 控制元件，使用 simple text 控制元件代替。請重新安裝 "
 "riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:380
+#: ../src/unix/utilsunx.cpp:400
 msgid "Impossible to get child process input"
 msgstr "無法取得子程序的輸入"
 
-#: ../src/common/filefn.cpp:1213
+#: ../src/common/filefn.cpp:1005
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "無法取得檔案 '%s' 的存取權限"
 
-#: ../src/common/filefn.cpp:1227
+#: ../src/common/filefn.cpp:1019
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "無法覆寫檔案 '%s'"
 
-#: ../src/common/filefn.cpp:1278
+#: ../src/common/filefn.cpp:1063
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "無法設定檔案 '%s' 的存取權限 "
 
-#: ../src/html/helpfrm.cpp:424
+#: ../src/common/stockitem.cpp:121
+#, fuzzy
+msgid "Indent"
+msgstr "索引"
+
+#: ../src/html/helpfrm.cpp:493
 msgid "Index"
 msgstr "索引"
 
@@ -1972,14 +2326,14 @@ msgstr ""
 
 #: ../src/common/imagtiff.cpp:211
 msgid "Invalid TIFF image index."
-msgstr "ç\84¡æ\95\88ç\9a\84 TIFF å\9c\96像索引。"
+msgstr "ç\84¡æ\95\88ç\9a\84 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'。"
 
-#: ../src/common/appcmn.cpp:239
+#: ../src/common/appcmn.cpp:249
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "無效的顯示模式規格 '%s'。"
@@ -1989,7 +2343,7 @@ msgstr "無效的顯示模式規格 '%s'。"
 msgid "Invalid geometry specification '%s'"
 msgstr "無效的幾何規格 '%s'"
 
-#: ../src/unix/snglinst.cpp:280
+#: ../src/unix/snglinst.cpp:311
 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "無效的鎖定檔案 '%s'。"
@@ -2007,21 +2361,25 @@ msgstr ""
 msgid "Invalid regular expression '%s': %s"
 msgstr "無效的正規運算式 '%s'： %s"
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Italic"
 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/stockitem.cpp:125
+msgid "Justified"
+msgstr ""
 
 #: ../src/common/fmapbase.cpp:118
 msgid "KOI8-R"
@@ -2031,31 +2389,31 @@ msgstr ""
 msgid "KOI8-U"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:636
 msgid "Landscape"
 msgstr "橫向列印"
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:120
 msgid "Ledger, 17 x 11 in"
-msgstr "Ledger, 17 x 11 英吋"
+msgstr "橫板紙，17 x 11 英吋"
 
-#: ../src/generic/prntdlgg.cpp:650
+#: ../src/generic/prntdlgg.cpp:648
 msgid "Left margin (mm):"
 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 "狀紙，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 "小信紙，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 "信紙，8 1/2 x 11 英吋"
 
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:234
 msgid "Light"
 msgstr "細體"
 
@@ -2063,22 +2421,32 @@ msgstr "細體"
 msgid "Link contained '//', converted to absolute link."
 msgstr ""
 
-#: ../src/common/fldlgcmn.cpp:290
+#: ../src/common/fldlgcmn.cpp:248
 #, c-format
 msgid "Load %s file"
 msgstr "載入檔案 %s "
 
-#: ../src/html/htmlwin.cpp:390
+#: ../src/html/htmlwin.cpp:410
 msgid "Loading : "
 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
+#, fuzzy, c-format
+msgid "Lock file '%s' has incorrect owner."
+msgstr "'%s' 音效檔案格式不支援"
+
+#: ../src/unix/snglinst.cpp:256
+#, c-format
+msgid "Lock file '%s' has incorrect permissions."
+msgstr ""
 
 #: ../src/generic/logg.cpp:569
 #, c-format
@@ -2089,10 +2457,14 @@ msgstr "儲存日誌到檔案 '%s'。"
 msgid "Long Conversions not supported"
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:442
+#: ../src/gtk/mdi.cpp:459
 msgid "MDI child"
 msgstr "MDI 子視窗"
 
+#: ../src/mac/carbon/thread.cpp:1635
+msgid "MP Thread Support is not available on this System"
+msgstr ""
+
 #: ../src/msw/helpchm.cpp:60
 msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
@@ -2100,7 +2472,7 @@ msgid ""
 msgstr ""
 "由於 MS HTML Help 函示庫未安裝，導致 MS HTML Help 功能無法使用。請先安裝它。"
 
-#: ../src/univ/themes/win32.cpp:4678
+#: ../src/univ/themes/win32.cpp:4707
 msgid "Ma&ximize"
 msgstr "最大化(&x)"
 
@@ -2118,11 +2490,16 @@ msgstr "區分大小寫"
 msgid "Memory VFS already contains file '%s'!"
 msgstr "「記憶體虛擬檔案系統」已包含檔案 '%s'！"
 
+#: ../src/msw/frame.cpp:346
+#, fuzzy
+msgid "Menu"
+msgstr "現代"
+
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"
 msgstr "金屬主題"
 
-#: ../src/univ/themes/win32.cpp:4676
+#: ../src/univ/themes/win32.cpp:4705
 msgid "Mi&nimize"
 msgstr "最小化(&n)"
 
@@ -2136,61 +2513,77 @@ msgstr "Mime.類型文件 %s 第 %d 行：字串沒有結尾的引號。"
 msgid "Mode %ix%i-%i not available."
 msgstr "模式 %ix%i-%i 無法使用"
 
-#: ../src/generic/fontdlgg.cpp:222
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Modern"
 msgstr "現代"
 
-#: ../src/generic/filedlgg.cpp:426
+#: ../src/generic/filedlgg.cpp:427
 msgid "Modified"
-msgstr ""
+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"
+msgstr "御用信封，3 7/8 x 7 1/2 英吋"
 
-#: ../src/common/dlgcmn.cpp:233
+#: ../src/common/dlgcmn.cpp:242
 msgid "More..."
 msgstr "更多..."
 
 #: ../contrib/src/gizmos/editlbox.cpp:165
 msgid "Move down"
-msgstr ""
+msgstr "下移"
 
 #: ../contrib/src/gizmos/editlbox.cpp:164
-#, fuzzy
 msgid "Move up"
-msgstr "移動(&M)"
+msgstr "上移"
 
-#: ../src/generic/filedlgg.cpp:423
+#: ../src/generic/filedlgg.cpp:424
 msgid "Name"
 msgstr "名稱"
 
+#: ../src/generic/dirdlgg.cpp:111
+#, fuzzy
+msgid "New directory"
+msgstr "建立目錄"
+
 #: ../contrib/src/gizmos/editlbox.cpp:162
 msgid "New item"
-msgstr ""
+msgstr "新增項目"
 
-#: ../src/generic/dirdlgg.cpp:274 ../src/generic/dirdlgg.cpp:284
-#: ../src/generic/filedlgg.cpp:600 ../src/generic/filedlgg.cpp:609
+#: ../src/generic/dirdlgg.cpp:320 ../src/generic/dirdlgg.cpp:330
+#: ../src/generic/filedlgg.cpp:601 ../src/generic/filedlgg.cpp:610
 msgid "NewName"
 msgstr "新名稱"
 
-#: ../src/html/helpfrm.cpp:572
+#: ../src/generic/tipdlg.cpp:295
+#, fuzzy
+msgid "Next"
+msgstr "下一個(&N)"
+
+#: ../src/html/helpfrm.cpp:642
 msgid "Next page"
 msgstr "下一頁"
 
-#: ../src/common/dlgcmn.cpp:213 ../src/motif/msgdlg.cpp:185
+#: ../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 "否"
 
-#: ../src/common/image.cpp:908
-msgid "No Unused Color in image being masked"
-msgstr "圖像中未使用的顏色沒有遮罩"
+#: ../contrib/src/deprecated/resource.cpp:2495
+#: ../contrib/src/deprecated/resource.cpp:2649
+msgid "No XBM facility available!"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2667
+msgid "No XPM icon facility available!"
+msgstr ""
 
 #: ../src/generic/helpext.cpp:436
 msgid "No entries found."
 msgstr "找不到任何項目"
 
-#: ../src/common/fontmap.cpp:402
+#: ../src/common/fontmap.cpp:408
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -2202,7 +2595,7 @@ msgstr ""
 "但是另一種編碼 '%s' 可用。\n"
 "您要使用該編碼嗎(否則您必須選擇另一種)？"
 
-#: ../src/common/fontmap.cpp:407
+#: ../src/common/fontmap.cpp:413
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
@@ -2213,77 +2606,84 @@ msgstr ""
 "您要選擇對應這個編碼的字型嗎\n"
 "(否則此種編碼的文字將無法正確顯示)？"
 
-#: ../contrib/src/xrc/xmlres.cpp:606
+#: ../src/xrc/xmlres.cpp:611
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "找不到 XML 節點 '%s' 類別 '%s' 的處理常式！"
 
-#: ../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 "æ²\92æ\9c\89æ\89¾å\88°å\9c\96像類型處理常式。"
+msgstr "æ²\92æ\9c\89æ\89¾å\88°å½±像類型處理常式。"
 
-#: ../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 "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %d ç\9a\84å\9c\96像處理常式。"
+msgstr "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %d ç\9a\84å½±像處理常式。"
 
-#: ../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 "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %s ç\9a\84å\9c\96像處理常式。"
+msgstr "æ²\92æ\9c\89å®\9a義é¡\9eå\9e\8b %s ç\9a\84å½±像處理常式。"
 
-#: ../src/html/helpfrm.cpp:719
+#: ../src/html/helpfrm.cpp:846
 msgid "No matching page found yet"
 msgstr "尚未找到符合的頁面"
 
 #: ../src/unix/sound.cpp:89
-#, fuzzy
 msgid "No sound"
-msgstr "找不到任何項目"
+msgstr "沒有聲音"
+
+#: ../src/common/image.cpp:908 ../src/common/image.cpp:947
+#, fuzzy
+msgid "No unused colour in image being masked."
+msgstr "影像中未使用的顏色沒有遮罩"
+
+#: ../src/common/image.cpp:1539
+#, fuzzy
+msgid "No unused colour in image."
+msgstr "影像中未使用的顏色沒有遮罩"
 
 #: ../src/common/fmapbase.cpp:112
 msgid "Nordic (ISO-8859-10)"
-msgstr "北歐 (ISO-8859-10)"
+msgstr "北歐語系 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:226 ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:230 ../src/generic/fontdlgg.cpp:233
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:1104
+#: ../src/html/helpfrm.cpp:1250
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr ""
+msgstr "正常字體<br>且 <u>下劃線</u>. "
 
-#: ../src/html/helpfrm.cpp:1048
+#: ../src/html/helpfrm.cpp:1195
 msgid "Normal font:"
 msgstr "正常字型："
 
-#: ../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:995 ../src/generic/filedlgg.cpp:1006
-#: ../src/generic/fontdlgg.cpp:253 ../src/generic/logg.cpp:752
-#: ../src/generic/prntdlgg.cpp:454 ../src/gtk/filedlg.cpp:162
-#: ../src/gtk/fontdlg.cpp:141 ../src/html/helpfrm.cpp:1073
+#: ../src/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 "確認"
 
 #: ../src/common/xtixml.cpp:263
 msgid "Objects must have an id attribute"
-msgstr ""
+msgstr "物件必須有 id 屬性"
 
-#: ../src/common/docview.cpp:1197 ../src/common/docview.cpp:1525
+#: ../src/common/docview.cpp:1277 ../src/common/docview.cpp:1605
 msgid "Open File"
-msgstr ""
+msgstr "開啟檔案"
 
-#: ../src/html/helpfrm.cpp:580 ../src/html/helpfrm.cpp:1413
+#: ../src/html/helpfrm.cpp:650 ../src/html/helpfrm.cpp:1565
 msgid "Open HTML document"
 msgstr "開啟 HTML 文件"
 
-#: ../src/generic/dirctrlg.cpp:714 ../src/generic/dirdlgg.cpp:300
-#: ../src/generic/filedlgg.cpp:624 ../src/generic/filedlgg.cpp:764
+#: ../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 "不容許的操作。"
 
@@ -2302,11 +2702,11 @@ msgstr "選項 '%s' 必須有值。"
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "選項 '%s'：'%s' 無法轉換成日期。"
 
-#: ../src/generic/prntdlgg.cpp:434
+#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:432
 msgid "Options"
 msgstr "選項"
 
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:639
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:637
 msgid "Orientation"
 msgstr "方位"
 
@@ -2316,11 +2716,11 @@ msgstr "PCX: 無法配置記憶體"
 
 #: ../src/common/imagpcx.cpp:461
 msgid "PCX: image format unsupported"
-msgstr "PCX: å\9c\96像格式不支援"
+msgstr "PCX: å½±像格式不支援"
 
 #: ../src/common/imagpcx.cpp:484
 msgid "PCX: invalid image"
-msgstr "PCX: ç\84¡æ\95\88ç\9a\84å\9c\96像"
+msgstr "PCX: ç\84¡æ\95\88ç\9a\84å½±像"
 
 #: ../src/common/imagpcx.cpp:448
 msgid "PCX: this is not a PCX file."
@@ -2332,7 +2732,7 @@ 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."
@@ -2346,47 +2746,47 @@ msgstr "PNM: 檔案格式無法識別。"
 msgid "PNM: File seems truncated."
 msgstr "PNM: 檔案似乎被截斷了。"
 
-#: ../src/common/prntbase.cpp:845
+#: ../src/common/prntbase.cpp:839
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
-#: ../src/common/prntbase.cpp:843
+#: ../src/common/prntbase.cpp:837
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d 頁"
 
-#: ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:596
 msgid "Page Setup"
 msgstr "頁面設定"
 
-#: ../src/generic/prntdlgg.cpp:158
+#: ../src/generic/prntdlgg.cpp:156
 msgid "Pages"
 msgstr "頁"
 
-#: ../src/generic/prntdlgg.cpp:545 ../src/generic/prntdlgg.cpp:625
-#: ../src/generic/prntdlgg.cpp:813
+#: ../src/generic/prntdlgg.cpp:543 ../src/generic/prntdlgg.cpp:623
+#: ../src/generic/prntdlgg.cpp:811
 msgid "Paper Size"
 msgstr "紙張大小"
 
-#: ../src/generic/prntdlgg.cpp:420 ../src/generic/prntdlgg.cpp:612
-#: ../src/generic/prntdlgg.cpp:808
+#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:610
+#: ../src/generic/prntdlgg.cpp:806
 msgid "Paper size"
 msgstr "紙張大小"
 
 #: ../src/common/xtistrm.cpp:425
 msgid "Passing a already registered object to SetObject"
-msgstr ""
+msgstr "傳入已註冊的物件給 SetObject"
 
 #: ../src/common/xtistrm.cpp:643
 msgid "Passing a already registered object to SetObjectName"
-msgstr ""
+msgstr "傳入已註冊的物件給 SetObjectName"
 
 #: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
 msgid "Passing an unkown object to GetObject"
-msgstr ""
+msgstr "傳入一個未知物件給 GetObject"
 
-#: ../src/generic/filedlgg.cpp:429
+#: ../src/generic/filedlgg.cpp:430
 msgid "Permissions"
 msgstr "允許"
 
@@ -2398,15 +2798,20 @@ msgstr "無法建立管道"
 msgid "Please choose a valid font."
 msgstr "請選擇一個有效的字型。"
 
-#: ../src/generic/filedlgg.cpp:1252 ../src/gtk/filedlg.cpp:82
+#: ../src/generic/filedlgg.cpp:1257 ../src/gtk/filedlg.cpp:82
 msgid "Please choose an existing file."
 msgstr "請選擇一個已存在的檔案。"
 
-#: ../src/msw/dialup.cpp:751
+#: ../src/html/helpfrm.cpp:790
+#, fuzzy
+msgid "Please choose the page to display:"
+msgstr "請選擇一個已存在的檔案。"
+
+#: ../src/msw/dialup.cpp:750
 msgid "Please choose which ISP do you want to connect to"
 msgstr "請選擇你想連線的 ISP"
 
-#: ../src/msw/listctrl.cpp:432
+#: ../src/msw/listctrl.cpp:434
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
@@ -2415,77 +2820,82 @@ msgid ""
 msgstr ""
 "請安裝較新版本的 comctl32.dll\n"
 "(最低需求 4.70 版，但目前是 %d.%02d)\n"
-")否則此程式將無法正常運作。"
+"否則此程式將無法正常運作。"
 
 #: ../src/common/prntbase.cpp:112
 msgid "Please wait while printing\n"
 msgstr "列印中，請稍待\n"
 
-#: ../src/generic/prntdlgg.cpp:427 ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:635
 msgid "Portrait"
 msgstr "直向列印"
 
-#: ../src/generic/prntdlgg.cpp:270
+#: ../src/generic/prntdlgg.cpp:268
 msgid "PostScript file"
 msgstr "PostScript 文件"
 
-#: ../src/html/helpfrm.cpp:1065
+#: ../src/generic/fontdlgg.cpp:335 ../src/html/helpfrm.cpp:1212
 msgid "Preview:"
 msgstr "預覽︰"
 
-#: ../src/html/helpfrm.cpp:569
+#: ../src/html/helpfrm.cpp:639
 msgid "Previous page"
 msgstr "前一頁"
 
-#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:121
+#: ../src/generic/prntdlgg.cpp:107 ../src/generic/prntdlgg.cpp:120
 msgid "Print"
 msgstr "列印"
 
-#: ../src/common/docview.cpp:963
+#: ../src/common/docview.cpp:1043
 msgid "Print Preview"
 msgstr "預覽列印"
 
-#: ../src/common/prntbase.cpp:797 ../src/common/prntbase.cpp:823
+#: ../src/common/prntbase.cpp:791 ../src/common/prntbase.cpp:817
 msgid "Print Preview Failure"
 msgstr "預覽列印失敗"
 
-#: ../src/generic/prntdlgg.cpp:166
+#: ../src/generic/prntdlgg.cpp:164
 msgid "Print Range"
 msgstr "列印範圍"
 
-#: ../src/generic/prntdlgg.cpp:408
+#: ../src/generic/prntdlgg.cpp:406
 msgid "Print Setup"
 msgstr "列印設定"
 
-#: ../src/generic/prntdlgg.cpp:442
+#: ../src/generic/prntdlgg.cpp:440
 msgid "Print in colour"
 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 "列印佇列中"
 
-#: ../src/html/helpfrm.cpp:586
+#: ../src/html/helpfrm.cpp:656
 msgid "Print this page"
 msgstr "列印本頁"
 
-#: ../src/generic/prntdlgg.cpp:144
+#: ../src/generic/prntdlgg.cpp:142
 msgid "Print to File"
 msgstr "列印到檔案"
 
-#: ../src/generic/prntdlgg.cpp:446
+#: ../src/generic/prntdlgg.cpp:444
 msgid "Printer command:"
 msgstr "印表機指令："
 
-#: ../src/generic/prntdlgg.cpp:143
+#: ../src/generic/prntdlgg.cpp:141
 msgid "Printer options"
 msgstr "印表機選項"
 
-#: ../src/generic/prntdlgg.cpp:450
+#: ../src/generic/prntdlgg.cpp:448
 msgid "Printer options:"
 msgstr "印表機選項："
 
-#: ../src/generic/prntdlgg.cpp:683
+#: ../src/generic/prntdlgg.cpp:681
 msgid "Printer..."
 msgstr "印表機..."
 
@@ -2495,7 +2905,7 @@ msgstr "列印中"
 
 #: ../src/common/prntbase.cpp:126
 msgid "Printing Error"
-msgstr "列印時發生錯誤"
+msgstr "列印時發生錯¯誤"
 
 #: ../src/generic/printps.cpp:244
 #, c-format
@@ -2506,15 +2916,15 @@ msgstr "正在列印第 %d 頁..."
 msgid "Printing..."
 msgstr "列印中..."
 
-#: ../src/common/log.cpp:468
+#: ../src/common/log.cpp:471
 msgid "Program aborted."
 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:1118
+#: ../src/generic/logg.cpp:1115
 msgid "Question"
 msgstr "問題"
 
@@ -2523,22 +2933,26 @@ msgstr "問題"
 msgid "Read error on file '%s'"
 msgstr "讀取檔案 '%s' 時發生錯誤"
 
-#: ../contrib/src/xrc/xmlres.cpp:572
+#: ../src/xrc/xmlres.cpp:577
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "找不到 ref=\"%s\" 的參照物件節點！"
 
-#: ../src/msw/registry.cpp:552
+#: ../src/common/stockitem.cpp:139
+msgid "Refresh"
+msgstr ""
+
+#: ../src/msw/registry.cpp:558
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "登錄機碼 '%s' 已存在。"
 
-#: ../src/msw/registry.cpp:521
+#: ../src/msw/registry.cpp:527
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "登錄機碼 '%s' 不存在, 無法更名。"
 
-#: ../src/msw/registry.cpp:648
+#: ../src/msw/registry.cpp:659
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -2549,7 +2963,7 @@ msgstr ""
 "刪除它會使系統處於無法使用的狀態：\n"
 "操作中斷。"
 
-#: ../src/msw/registry.cpp:452
+#: ../src/msw/registry.cpp:453
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr "登錄機值 '%s' 已存在."
@@ -2558,18 +2972,27 @@ msgstr "登錄機值 '%s' 已存在."
 msgid "Relevant entries:"
 msgstr "相關項目："
 
-#: ../src/generic/progdlgg.cpp:199
+#: ../src/generic/progdlgg.cpp:202
 msgid "Remaining time : "
 msgstr "剩餘時間： "
 
-#: ../src/html/helpfrm.cpp:359
+#: ../src/common/stockitem.cpp:140
+msgid "Remove"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:429
 msgid "Remove current page from bookmarks"
 msgstr "從書籤中移除目前頁面"
 
 #: ../src/common/rendcmn.cpp:193
 #, c-format
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
-msgstr ""
+msgstr "Renderer \"%s\" %d.%d 版本不完整。而且無法載入。"
+
+#: ../src/common/stockitem.cpp:114
+#, fuzzy
+msgid "Rep&lace"
+msgstr "置換(&R)"
 
 #: ../src/generic/fdrepdlg.cpp:171
 msgid "Replace &all"
@@ -2579,24 +3002,33 @@ msgstr "取代所有(&a)"
 msgid "Replace with:"
 msgstr "置換："
 
-#: ../contrib/src/xrc/xmlres.cpp:408
+#: ../src/xrc/xmlres.cpp:413
 msgid "Resource files must have same version number!"
 msgstr "資源檔案的版本別必須一致！"
 
-#: ../src/generic/prntdlgg.cpp:662
+#: ../src/common/stockitem.cpp:141
+msgid "Revert to Saved"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:660
 msgid "Right margin (mm):"
 msgstr "右邊距(毫米)："
 
-#: ../src/generic/fontdlgg.cpp:220
+#: ../src/generic/fontdlgg.cpp:224
 msgid "Roman"
 msgstr "羅馬"
 
-#: ../src/common/fldlgcmn.cpp:292
+#: ../src/common/fldlgcmn.cpp:250
 #, c-format
 msgid "Save %s file"
 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 "另存為"
 
@@ -2604,15 +3036,15 @@ msgstr "另存為"
 msgid "Save log contents to file"
 msgstr "將日誌內容存到檔案中"
 
-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:227
 msgid "Script"
 msgstr "手寫"
 
-#: ../src/html/helpfrm.cpp:445 ../src/html/helpfrm.cpp:460
+#: ../src/html/helpfrm.cpp:513 ../src/html/helpfrm.cpp:528
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/html/helpfrm.cpp:447
+#: ../src/html/helpfrm.cpp:515
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
@@ -2626,15 +3058,15 @@ msgstr "搜尋方向"
 msgid "Search for:"
 msgstr "搜尋："
 
-#: ../src/html/helpfrm.cpp:893
+#: ../src/html/helpfrm.cpp:1037
 msgid "Search in all books"
 msgstr "搜尋所有的書籍"
 
-#: ../src/html/helpfrm.cpp:718
+#: ../src/html/helpfrm.cpp:845
 msgid "Searching..."
 msgstr "搜尋中..."
 
-#: ../src/generic/dirctrlg.cpp:596
+#: ../src/generic/dirctrlg.cpp:550
 msgid "Sections"
 msgstr "段落"
 
@@ -2643,19 +3075,19 @@ msgstr "段落"
 msgid "Seek error on file '%s'"
 msgstr "檔案 '%s' 定位錯誤"
 
-#: ../src/msw/textctrl.cpp:2039
+#: ../src/msw/textctrl.cpp:2057
 msgid "Select &All"
 msgstr "選擇全部(&A)"
 
-#: ../src/common/docview.cpp:1605
+#: ../src/common/docview.cpp:1685
 msgid "Select a document template"
 msgstr "選擇文件範本"
 
-#: ../src/common/docview.cpp:1682
+#: ../src/common/docview.cpp:1762
 msgid "Select a document view"
 msgstr "選擇文件視界"
 
-#: ../src/common/docview.cpp:1485
+#: ../src/common/docview.cpp:1565
 msgid "Select a file"
 msgstr "選擇檔案"
 
@@ -2668,84 +3100,87 @@ msgstr "在選項 '%s' 之後應有分隔字元。"
 msgid "SetProperty called w/o valid setter"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:230
+#: ../src/common/dlgcmn.cpp:239
 msgid "Setup"
 msgstr "設定"
 
-#: ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:147
 msgid "Setup..."
 msgstr "設定..."
 
-#: ../src/msw/dialup.cpp:531
+#: ../src/msw/dialup.cpp:530
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "多個撥號連線中，隨機選擇一個。"
 
-#: ../src/html/helpfrm.cpp:401
+#: ../src/html/helpfrm.cpp:470
 msgid "Show all"
 msgstr "顯示所有"
 
-#: ../src/html/helpfrm.cpp:412
+#: ../src/html/helpfrm.cpp:481
 msgid "Show all items in index"
 msgstr "以索引的方式顯示所有項目"
 
-#: ../src/generic/dirdlgg.cpp:137
+#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
 msgid "Show hidden directories"
 msgstr "顯示隱藏目錄"
 
-#: ../src/generic/filedlgg.cpp:1012
+#: ../src/generic/filedlgg.cpp:1017
 msgid "Show hidden files"
 msgstr "顯示隱藏檔案"
 
-#: ../src/html/helpfrm.cpp:553
+#: ../src/html/helpfrm.cpp:623
 msgid "Show/hide navigation panel"
 msgstr "顯示/隱藏遊覽面板"
 
-#: ../src/generic/filedlgg.cpp:424
+#: ../src/generic/fontdlgg.cpp:340 ../src/generic/fontdlgg.cpp:342
+msgid "Shows the font preview."
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:425
 msgid "Size"
 msgstr "大小"
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:232
 msgid "Slant"
 msgstr "傾斜"
 
-#: ../src/common/docview.cpp:326
+#: ../src/common/docview.cpp:563
 msgid "Sorry, could not open this file for saving."
 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 "對不起，無法開啟檔案。"
 
-#: ../src/common/docview.cpp:333
+#: ../src/common/docview.cpp:570
 msgid "Sorry, could not save this file."
 msgstr "對不起，無法儲存檔案。"
 
-#: ../src/common/prntbase.cpp:797
+#: ../src/common/prntbase.cpp:791
 msgid "Sorry, not enough memory to create a preview."
 msgstr "對不起，記憶體不足無法建立預覽。"
 
-#: ../src/common/docview.cpp:959
+#: ../src/common/docview.cpp:1039
 msgid "Sorry, print preview needs a printer to be installed."
-msgstr ""
+msgstr "抱歉，預覽列印必須安裝印表機"
 
-#: ../src/common/docview.cpp:1196 ../src/common/docview.cpp:1524
-#, fuzzy
+#: ../src/common/docview.cpp:1276 ../src/common/docview.cpp:1604
 msgid "Sorry, the format for this file is unknown."
-msgstr "對不起，無法開啟檔案。"
+msgstr "對不起，這個檔案格式是未知的。"
 
 #: ../src/unix/sound.cpp:493
 msgid "Sound data are in unsupported format."
-msgstr ""
+msgstr "音效資料格式不支援"
 
 #: ../src/unix/sound.cpp:478
 #, c-format
 msgid "Sound file '%s' is in unsupported format."
-msgstr ""
+msgstr "'%s' 音效檔案格式不支援"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:121
 msgid "Statement, 5 1/2 x 8 1/2 in"
-msgstr "Statement, 5 1/2 x 8 1/2 英吋"
+msgstr "結算單, 5 1/2 x 8 1/2 英吋"
 
 #: ../src/generic/logg.cpp:619
 msgid "Status: "
@@ -2756,20 +3191,20 @@ 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 "顏色名稱：不正確的顏色規格：%s。"
 
 #: ../include/wx/xti.h:427 ../include/wx/xti.h:431
 msgid "String conversions not supported"
-msgstr ""
+msgstr "不支援字串轉換"
 
-#: ../contrib/src/xrc/xmlres.cpp:680
+#: ../src/xrc/xmlres.cpp:685
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "沒找到子類別 '%s' 予資源 '%s'，無法子類別化！"
 
-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Swiss"
 msgstr "瑞士"
 
@@ -2780,29 +3215,29 @@ msgstr "TIFF: 無法配置記憶體。"
 
 #: ../src/common/imagtiff.cpp:203
 msgid "TIFF: Error loading image."
-msgstr "TIFF: è¼\89å\85¥å\9c\96像錯誤。"
+msgstr "TIFF: è¼\89å\85¥å½±像錯誤。"
 
 #: ../src/common/imagtiff.cpp:254
 msgid "TIFF: Error reading image."
-msgstr "TIFF: è®\80å\8f\96å\9c\96像錯誤。"
+msgstr "TIFF: è®\80å\8f\96å½±像錯誤。"
 
 #: ../src/common/imagtiff.cpp:331
 msgid "TIFF: Error saving image."
-msgstr "TIFF: å\84²å­\98å\9c\96像錯誤。"
+msgstr "TIFF: å\84²å­\98å½±像錯誤。"
 
 #: ../src/common/imagtiff.cpp:378
 msgid "TIFF: Error writing image."
-msgstr "TIFF: 寫å\85¥å\9c\96像錯誤。"
+msgstr "TIFF: 寫å\85¥å½±像錯誤。"
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:119
 msgid "Tabloid, 11 x 17 in"
-msgstr "Tabloid, 11 x 17 英吋"
+msgstr "小報紙, 11 x 17 英吋"
 
-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Teletype"
 msgstr "電傳打字機"
 
-#: ../src/common/docview.cpp:1606
+#: ../src/common/docview.cpp:1686
 msgid "Templates"
 msgstr "範本"
 
@@ -2810,11 +3245,16 @@ msgstr "範本"
 msgid "Thai (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 "檔案傳輸伺服器不支援被動模式。"
 
-#: ../src/common/fontmap.cpp:189
+#: ../src/common/ftp.cpp:696
+#, fuzzy
+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"
@@ -2829,7 +3269,7 @@ msgstr ""
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪貼簿格式 '%d' 不存在。"
 
-#: ../src/generic/dirdlgg.cpp:188
+#: ../src/generic/dirdlgg.cpp:234
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
@@ -2838,16 +3278,16 @@ msgstr ""
 "目錄 '%s' 不存在\n"
 "現在建立？"
 
-#: ../src/common/docview.cpp:1859
-#, fuzzy, c-format
+#: ../src/common/docview.cpp:1939
+#, 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"
+"已從「最近使用的檔案歷史清單」中除名。"
 
-#: ../src/common/docview.cpp:1869
+#: ../src/common/docview.cpp:1949
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
@@ -2856,7 +3296,28 @@ msgstr ""
 "檔案 '%s' 不存在，無法開啟.\n"
 "已從「最近使用的檔案紀錄清單」中除名。"
 
-#: ../src/common/filename.cpp:926
+#: ../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:940
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路徑 '%s' 包含太多的 \"..\"！"
@@ -2866,7 +3327,7 @@ msgstr "路徑 '%s' 包含太多的 \"..\"！"
 msgid "The required parameter '%s' was not specified."
 msgstr "必要的參數 '%s' 沒有指定。"
 
-#: ../src/common/textcmn.cpp:255
+#: ../src/common/textcmn.cpp:258
 msgid "The text couldn't be saved."
 msgstr "文字無法儲存。"
 
@@ -2875,19 +3336,19 @@ msgstr "文字無法儲存。"
 msgid "The value for the option '%s' must be specified."
 msgstr "選項 '%s' 的值必須指定。"
 
-#: ../src/msw/dialup.cpp:419
+#: ../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)。"
 
-#: ../src/html/htmprint.cpp:587
+#: ../src/html/htmprint.cpp:611
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "頁面設定時有問題：你必須設定預設印表機。"
 
-#: ../src/msw/thread.cpp:1207
+#: ../src/msw/thread.cpp:1210
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
@@ -2897,7 +3358,7 @@ msgstr "執行緒模組初始化失敗：無法存值到「執行緒內部儲存
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "執行緒模組初始化失敗：無法建立執行緒機碼"
 
-#: ../src/msw/thread.cpp:1195
+#: ../src/msw/thread.cpp:1198
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
@@ -2915,28 +3376,32 @@ msgstr "水平鋪列(&H)"
 msgid "Tile &Vertically"
 msgstr "垂直鋪列(&V)"
 
-#: ../src/msw/timer.cpp:111
+#: ../src/common/ftp.cpp:635
 #, fuzzy
+msgid "Timeout while waiting for FTP server to connect, try passive mode."
+msgstr "檔案傳輸伺服器不支援被動模式。"
+
+#: ../src/msw/timer.cpp:108
 msgid "Timer creation failed."
-msgstr "無法建立管道"
+msgstr "計時器建立失敗。"
 
-#: ../src/generic/tipdlg.cpp:205
+#: ../src/generic/tipdlg.cpp:219
 msgid "Tip of the Day"
 msgstr "每日小秘訣"
 
-#: ../src/generic/tipdlg.cpp:143
+#: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"
 msgstr "對不起，無法取得小秘訣！"
 
-#: ../src/generic/prntdlgg.cpp:185
+#: ../src/generic/prntdlgg.cpp:183
 msgid "To:"
 msgstr "到："
 
 #: ../src/common/imagpng.cpp:304
 msgid "Too many colours in PNG, the image may be slightly blurred."
-msgstr ""
+msgstr "太多顏色在 PNG 中，影像可能有點模糊。"
 
-#: ../src/generic/prntdlgg.cpp:651
+#: ../src/generic/prntdlgg.cpp:649
 msgid "Top margin (mm):"
 msgstr "上版邊(毫米)："
 
@@ -2953,33 +3418,49 @@ msgstr "嘗試解析 NULL 主機名：放棄"
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:425
-#, fuzzy
+#: ../src/generic/filedlgg.cpp:426
 msgid "Type"
-msgstr "é\9b»å\82³æ\89\93å­\97æ©\9f"
+msgstr "é¡\9eå\9e\8b"
 
 #: ../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 "美國標準複寫簿, 14 7/8 x 11 英吋"
 
-#: ../src/html/htmlwin.cpp:378
+#: ../src/html/htmlwin.cpp:397
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "無法開啟 HTML 文件： %s"
 
 #: ../src/unix/sound.cpp:376
 msgid "Unable to play sound asynchronously."
-msgstr ""
+msgstr "無法非同步播放音效"
 
-#: ../src/generic/fontdlgg.cpp:249
-msgid "Underline"
+#: ../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
+#, fuzzy
+msgid "Unexpected end of file whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
 #: ../src/common/cmdline.cpp:800
 #, c-format
 msgid "Unexpected parameter '%s'"
@@ -2987,46 +3468,46 @@ msgstr "意外參數 '%s'"
 
 #: ../src/common/fmapbase.cpp:135
 msgid "Unicode 16 bit (UTF-16)"
-msgstr ""
+msgstr "十六位元統一碼(UTF-16)"
 
 #: ../src/common/fmapbase.cpp:136
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
-msgstr ""
+msgstr "十六位元統一碼(UTF-16BE)"
 
 #: ../src/common/fmapbase.cpp:137
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
-msgstr ""
+msgstr "十六位元統一碼(UTF-16LE)"
 
 #: ../src/common/fmapbase.cpp:138
 msgid "Unicode 32 bit (UTF-32)"
-msgstr ""
+msgstr "三十二位元統一碼(UTF-32)"
 
 #: ../src/common/fmapbase.cpp:139
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
-msgstr ""
+msgstr "三十二位元統一碼(UTF-32BE)"
 
 #: ../src/common/fmapbase.cpp:140
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
-msgstr ""
+msgstr "三十二位元統一碼(UTF-32LE)"
 
 #: ../src/common/fmapbase.cpp:133
 msgid "Unicode 7 bit (UTF-7)"
-msgstr ""
+msgstr "七位元統一碼(UTF-7)"
 
 #: ../src/common/fmapbase.cpp:134
 msgid "Unicode 8 bit (UTF-8)"
-msgstr ""
+msgstr "八位元統一碼(UTF-7)"
 
-#: ../src/msw/dde.cpp:1108
+#: ../src/msw/dde.cpp:1092
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知的「動態資料交換」錯誤 %08x"
 
 #: ../src/common/xtistrm.cpp:370
 msgid "Unknown Object passed to GetObjectClassInfo"
-msgstr ""
+msgstr "傳給 GetObjectClassInfo 未知的物件"
 
-#: ../src/common/fmapbase.cpp:680
+#: ../src/common/fmapbase.cpp:685
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知的編碼 (%d)"
@@ -3046,30 +3527,36 @@ msgstr "未知的長選項 '%s'"
 msgid "Unknown option '%s'"
 msgstr "未知的選項 '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:750
+#: ../src/xrc/xmlres.cpp:757
 msgid "Unknown style flag "
 msgstr "未知的樣式旗標"
 
 #: ../src/common/xtixml.cpp:324
-#, fuzzy, c-format
+#, 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 中有不成對的'{'。"
 
-#: ../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 "未命名的指令"
 
+#: ../contrib/src/deprecated/resource.cpp:2367
+#, c-format
+msgid "Unrecognized style %s whilst parsing resource."
+msgstr "解譯資源時遇到無法識別的樣式 %s。"
+
+#: ../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'。"
@@ -3089,17 +3576,17 @@ msgstr "驗證衝突"
 
 #: ../contrib/src/mmedia/vidbase.cpp:65
 msgid "Video Output"
-msgstr ""
+msgstr "影像輸出"
 
-#: ../src/generic/filedlgg.cpp:928
+#: ../src/generic/filedlgg.cpp:933
 msgid "View files as a detailed view"
 msgstr "按詳細資料檢視檔案"
 
-#: ../src/generic/filedlgg.cpp:921
+#: ../src/generic/filedlgg.cpp:926
 msgid "View files as a list view"
 msgstr "按清單檢視檔案"
 
-#: ../src/common/docview.cpp:1683
+#: ../src/common/docview.cpp:1763
 msgid "Views"
 msgstr "視界"
 
@@ -3107,105 +3594,109 @@ msgstr "視界"
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子程序終止失敗"
 
-#: ../src/common/docview.cpp:463
+#: ../src/common/docview.cpp:443
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/common/log.cpp:482
+#: ../src/common/log.cpp:485
 msgid "Warning: "
 msgstr "警告："
 
-#: ../src/html/htmlpars.cpp:393
+#: ../src/html/htmlpars.cpp:395
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告：試圖從空堆疊中移除 HTML 標籤處理常式。"
 
 #: ../src/common/fmapbase.cpp:103
 msgid "Western European (ISO-8859-1)"
-msgstr "西歐 (ISO-8859-1)"
+msgstr "西歐語系 (ISO-8859-1)"
 
 #: ../src/common/fmapbase.cpp:117
 msgid "Western European with Euro (ISO-8859-15)"
-msgstr "西歐 with Euro (ISO-8859-15)"
+msgstr "西歐與歐洲 (ISO-8859-15)"
+
+#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+msgid "Whether the font is underlined."
+msgstr ""
 
 #: ../src/generic/fdrepdlg.cpp:143
 msgid "Whole word"
 msgstr "完整的字"
 
-#: ../src/html/helpfrm.cpp:444
+#: ../src/html/helpfrm.cpp:512
 msgid "Whole words only"
 msgstr "只限完整的字"
 
-#: ../src/univ/themes/win32.cpp:1182
+#: ../src/univ/themes/win32.cpp:1183
 msgid "Win32 theme"
 msgstr "Win32 主題"
 
-#: ../src/msw/utils.cpp:944
+#: ../src/msw/utils.cpp:936
 msgid "Win32s on Windows 3.1"
 msgstr ""
 
-#: ../src/msw/utils.cpp:948
+#: ../src/msw/utils.cpp:940
 #, c-format
 msgid "Windows 9%c"
 msgstr ""
 
 #: ../src/common/fmapbase.cpp:130
 msgid "Windows Arabic (CP 1256)"
-msgstr ""
+msgstr "視窗 阿拉伯文 (CP 1256)"
 
 #: ../src/common/fmapbase.cpp:131
 msgid "Windows Baltic (CP 1257)"
-msgstr ""
+msgstr "視窗 波羅的海文 (CP 1257)"
 
 #: ../src/common/fmapbase.cpp:124
 msgid "Windows Central European (CP 1250)"
-msgstr ""
+msgstr "視窗 中歐語系 (CP 1250)"
 
 #: ../src/common/fmapbase.cpp:121
 msgid "Windows Chinese Simplified (CP 936)"
-msgstr ""
+msgstr "視窗 中文(簡體) (CP 936)"
 
 #: ../src/common/fmapbase.cpp:123
 msgid "Windows Chinese Traditional (CP 950)"
-msgstr ""
+msgstr "視窗 中文(繁體) (CP 950)"
 
 #: ../src/common/fmapbase.cpp:125
 msgid "Windows Cyrillic (CP 1251)"
-msgstr ""
+msgstr "視窗 斯拉夫文 (CP 1251)"
 
 #: ../src/common/fmapbase.cpp:127
 msgid "Windows Greek (CP 1253)"
-msgstr ""
+msgstr "視窗 希臘文 (CP 1253)"
 
 #: ../src/common/fmapbase.cpp:129
 msgid "Windows Hebrew (CP 1255)"
-msgstr ""
+msgstr "視窗 希伯來文 (CP 1255)"
 
 #: ../src/common/fmapbase.cpp:120
 msgid "Windows Japanese (CP 932)"
-msgstr ""
+msgstr "視窗 日文 (CP 932)"
 
 #: ../src/common/fmapbase.cpp:122
 msgid "Windows Korean (CP 949)"
-msgstr ""
+msgstr "視窗 韓文 (CP 949)"
 
 #: ../src/common/fmapbase.cpp:128
 msgid "Windows Turkish (CP 1254)"
-msgstr ""
+msgstr "視窗 土耳其文 (CP 1254)"
 
 #: ../src/common/fmapbase.cpp:126
 msgid "Windows Western European (CP 1252)"
-msgstr ""
+msgstr "視窗 西歐語系 (CP 1252)"
 
 #: ../src/common/fmapbase.cpp:132
 msgid "Windows/DOS OEM (CP 437)"
-msgstr ""
+msgstr "視窗/磁碟作業系統 製造商 (CP 437)"
 
 #: ../src/common/ffile.cpp:146
 #, c-format
 msgid "Write error on file '%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 行"
@@ -3219,42 +3710,56 @@ msgstr "XPM: 不正常的圖素資料！"
 msgid "XPM: malformed colour definition '%s'!"
 msgstr "XPM: 不正常的顏色定義 '%s'！"
 
-#: ../contrib/src/xrc/xmlres.cpp:508
+#: ../src/xrc/xmlres.cpp:513
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
 
-#: ../contrib/src/xrc/xmlres.cpp:910 ../contrib/src/xrc/xmlres.cpp:922
+#: ../src/xrc/xmlres.cpp:941 ../src/xrc/xmlres.cpp:953
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC 資源：無法從 '%s' 建立點像圖。"
 
-#: ../contrib/src/xrc/xmlres.cpp:870
+#: ../src/xrc/xmlres.cpp:897
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC 資源：不正確的顏色規格 '%s' 屬性 '%s'。"
 
-#: ../src/common/dlgcmn.cpp:208 ../src/motif/msgdlg.cpp:185
+#: ../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 "是"
 
-#: ../src/generic/dirdlgg.cpp:264
+#: ../src/generic/dirdlgg.cpp:310
 msgid "You cannot add a new directory to this section."
 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 處理常式目前只支援本機檔案！"
 
-#: ../src/common/docview.cpp:2043
+#: ../src/common/stockitem.cpp:152
+msgid "Zoom &In"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:153
+msgid "Zoom &Out"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:151
+msgid "Zoom to &Fit"
+msgstr ""
+
+#: ../src/common/docview.cpp:2123
 msgid "[EMPTY]"
 msgstr "[空]"
 
-#: ../src/msw/dde.cpp:1075
+#: ../src/msw/dde.cpp:1059
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 應用程式已建立延長的競賽環境。"
 
-#: ../src/msw/dde.cpp:1063
+#: ../src/msw/dde.cpp:1047
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -3265,39 +3770,39 @@ msgstr ""
 "或傳給 DDEML 函式的是\n"
 "一個無效的實體物件識別。"
 
-#: ../src/msw/dde.cpp:1081
+#: ../src/msw/dde.cpp:1065
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "用戶端嘗試建立會話失敗。"
 
-#: ../src/msw/dde.cpp:1078
+#: ../src/msw/dde.cpp:1062
 msgid "a memory allocation failed."
 msgstr "記憶體配置失敗。"
 
-#: ../src/msw/dde.cpp:1072
+#: ../src/msw/dde.cpp:1056
 msgid "a parameter failed to be validated by the 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 "同步「連結協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1060
+#: ../src/msw/dde.cpp:1044
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步「資料協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1069
+#: ../src/msw/dde.cpp:1053
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步「執行協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1087
+#: ../src/msw/dde.cpp:1071
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步「資料傳送協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1102
+#: ../src/msw/dde.cpp:1086
 msgid "a request to end an advise transaction has timed out."
 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"
@@ -3307,15 +3812,15 @@ msgstr ""
 "被用戶端終止，或伺服器\n"
 "在完成交涉前終止。"
 
-#: ../src/msw/dde.cpp:1084
+#: ../src/msw/dde.cpp:1068
 msgid "a transaction failed."
 msgstr "協同活動失敗。"
 
 #: ../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"
@@ -3327,15 +3832,15 @@ msgstr ""
 "或初始化為 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 失敗。"
 
-#: ../src/msw/dde.cpp:1099
+#: ../src/msw/dde.cpp:1083
 msgid "an internal error has occurred in the 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"
@@ -3345,28 +3850,28 @@ msgstr ""
 "一旦應用程式從 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' 的修改。"
 
 #: ../src/html/chm.cpp:330
 msgid "bad arguments to library function"
-msgstr ""
+msgstr "含式傳入錯誤的引數"
 
 #: ../src/html/chm.cpp:342
 msgid "bad signature"
-msgstr ""
+msgstr "錯誤的簽名"
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "binary"
 msgstr "二進位"
 
-#: ../src/common/fontcmn.cpp:533
+#: ../src/common/fontcmn.cpp:645
 msgid "bold"
 msgstr "粗體"
 
-#: ../src/common/fontcmn.cpp:457
+#: ../src/common/fontcmn.cpp:569
 msgid "bold "
 msgstr "粗體"
 
@@ -3375,131 +3880,136 @@ msgstr "粗體"
 msgid "can't close file '%s'"
 msgstr "無法關閉檔案 '%s'"
 
-#: ../src/common/file.cpp:371
+#: ../src/common/file.cpp:285
 #, c-format
 msgid "can't close file descriptor %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'"
 
-#: ../src/common/file.cpp:252
+#: ../src/common/file.cpp:216
 #, c-format
 msgid "can't create file '%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'"
 
-#: ../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 的尾部"
 
-#: ../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 的檔案的長度"
 
-#: ../src/msw/utils.cpp:368
+#: ../src/msw/utils.cpp:363
 msgid "can't find user's HOME, using current directory."
-msgstr "找不到使用者目錄 HOME，使用目前目錄。"
+msgstr "找不到使用者目錄，使用目前目錄。"
 
-#: ../src/common/file.cpp:450
+#: ../src/common/file.cpp:338
 #, c-format
 msgid "can't flush file descriptor %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 的指標位置"
 
-#: ../src/common/fontmap.cpp:306
+#: ../src/common/fontmap.cpp:312
 msgid "can't load any font, aborting"
 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'"
 
-#: ../src/common/fileconf.cpp:407
+#: ../src/common/fileconf.cpp:401
 #, c-format
 msgid "can't open global configuration file '%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'。"
 
-#: ../src/common/fileconf.cpp:981
+#: ../src/common/fileconf.cpp:972
 msgid "can't open user configuration file."
 msgstr "無法開啟使用者組態檔案。"
 
-#: ../src/common/dynlib.cpp:445
+#: ../src/common/dynlib.cpp:444
 msgid "can't query for GUI plugins name in console applications"
-msgstr ""
+msgstr "無法在命令列程式查詢視窗介面的外掛程式名稱"
 
-#: ../src/common/file.cpp:404
+#: ../src/common/file.cpp:308
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "無法讀取檔案描述子 %d"
 
-#: ../src/common/file.cpp:724
+#: ../src/common/file.cpp:551
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "無法移除檔案 '%s'"
 
-#: ../src/common/file.cpp:740
+#: ../src/common/file.cpp:567
 #, c-format
 msgid "can't remove temporary file '%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"
 
+#: ../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
 msgid "can't write buffer '%s' to disk."
 msgstr "無法將暫存區 '%s' 寫到磁碟。"
 
-#: ../src/common/file.cpp:433
+#: ../src/common/file.cpp:323
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "無法寫到檔案描述子 %d"
 
-#: ../src/common/fileconf.cpp:992
+#: ../src/common/fileconf.cpp:983
 msgid "can't write user configuration file."
 msgstr "無法寫使用者組態檔案。"
 
-#: ../src/common/intl.cpp:1108
+#: ../src/common/intl.cpp:1110
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到 '%s' 領域的記載檔。"
 
 #: ../src/html/chm.cpp:346
 msgid "checksum error"
-msgstr ""
+msgstr "總和檢查碼錯誤"
 
 #: ../src/html/chm.cpp:348
 msgid "compression error"
-msgstr ""
+msgstr "壓縮失敗"
 
 #: ../src/common/regex.cpp:141
 msgid "conversion to 8-bit encoding failed"
-msgstr ""
+msgstr "無法轉換成八位元編碼"
 
 #: ../src/common/menucmn.cpp:112
 msgid "ctrl"
-msgstr ""
+msgstr "ctrl"
 
 #: ../src/common/cmdline.cpp:1067
 msgid "date"
@@ -3507,49 +4017,47 @@ msgstr "日期"
 
 #: ../src/html/chm.cpp:350
 msgid "decompression error"
-msgstr ""
+msgstr "解壓縮失敗"
 
-#: ../src/common/fmapbase.cpp:690 ../src/common/fmapbase.cpp:722
+#: ../src/common/fmapbase.cpp:695 ../src/common/fmapbase.cpp:727
 msgid "default"
-msgstr ""
+msgstr "預設值"
 
 #: ../src/common/xtistrm.cpp:843
 msgid "delegate has no type info"
-msgstr ""
+msgstr "delegate 沒有類型資訊"
 
-#: ../src/common/datetime.cpp:3483
+#: ../src/common/datetime.cpp:3574
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3473
+#: ../src/common/datetime.cpp:3564
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetime.cpp:3476
+#: ../src/common/datetime.cpp:3567
 msgid "eleventh"
 msgstr "第十一"
 
-#: ../src/common/strconv.cpp:1692
-#, fuzzy, c-format
+#: ../src/common/strconv.cpp:2418
+#, c-format
 msgid "encoding %s"
-msgstr "未知的編碼 (%d)"
+msgstr "編碼 %s"
 
-#: ../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' 群中已出現一次以上"
 
 #: ../src/html/chm.cpp:344
-#, fuzzy
 msgid "error in data format"
-msgstr "IFF: IFF 圖像格式錯誤。"
+msgstr "資料格式錯誤。"
 
 #: ../src/html/chm.cpp:332
-#, fuzzy
 msgid "error opening file"
-msgstr "讀取檔案 '%s' 時發生錯誤"
+msgstr "檔案開啟失敗"
 
-#: ../src/msw/dialup.cpp:845
+#: ../src/msw/dialup.cpp:844
 msgid "establish"
 msgstr "建立"
 
@@ -3558,124 +4066,122 @@ msgstr "建立"
 msgid "failed to flush the file '%s'"
 msgstr "重新整理檔案 '%s' 失敗"
 
-#: ../src/common/datetime.cpp:3480
+#: ../src/common/datetime.cpp:3571
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3470
+#: ../src/common/datetime.cpp:3561
 msgid "fifth"
 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' 。"
 
-#: ../src/common/fileconf.cpp:687
+#: ../src/common/fileconf.cpp:684
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 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 行。"
 
-#: ../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' 的值。"
 
-#: ../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 行中"
 
-#: ../src/common/datetime.cpp:3466
+#: ../src/common/datetime.cpp:3557
 msgid "first"
 msgstr "第一"
 
-#: ../src/html/helpfrm.cpp:1093
-#, fuzzy
+#: ../src/html/helpfrm.cpp:1239
 msgid "font size"
-msgstr "字型大小："
+msgstr "字型大小"
 
-#: ../src/common/datetime.cpp:3479
+#: ../src/common/datetime.cpp:3570
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3469
+#: ../src/common/datetime.cpp:3560
 msgid "fourth"
 msgstr "第四"
 
-#: ../src/common/appbase.cpp:342
+#: ../src/common/appbase.cpp:348
 msgid "generate verbose log messages"
 msgstr "產生冗長的記錄訊息"
 
 #: ../src/common/xtixml.cpp:479
 msgid "incorrect event handler string, missing dot"
-msgstr ""
+msgstr "不正確的事件處理常式字串，缺少小點"
 
-#: ../src/msw/dialup.cpp:845
+#: ../src/msw/dialup.cpp:844
 msgid "initiate"
 msgstr "初始化"
 
-#: ../src/common/file.cpp:635
+#: ../src/common/file.cpp:463
 msgid "invalid eof() return value."
 msgstr "無效的 eof() 傳回值。"
 
-#: ../src/generic/logg.cpp:1132
+#: ../src/generic/logg.cpp:1129
 msgid "invalid message box return value"
 msgstr "訊息盒傳回無效的值"
 
-#: ../src/common/fontcmn.cpp:473 ../src/common/fontcmn.cpp:537
+#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
 msgid "italic"
 msgstr "斜體"
 
-#: ../src/common/fontcmn.cpp:529
+#: ../src/common/fontcmn.cpp:641
 msgid "light"
 msgstr "細體"
 
-#: ../src/common/fontcmn.cpp:453
+#: ../src/common/fontcmn.cpp:565
 msgid "light "
 msgstr "細體"
 
-#: ../src/common/intl.cpp:1435
+#: ../src/common/intl.cpp:1454
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "無法設定地區為 '%s'。"
 
-#: ../src/common/intl.cpp:1103
+#: ../src/common/intl.cpp:1105
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "尋找記載檔 '%s' @ '%s'。"
 
-#: ../src/common/datetime.cpp:3630
+#: ../src/common/datetime.cpp:3721
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/datetime.cpp:3484
+#: ../src/common/datetime.cpp:3575
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3474
+#: ../src/common/datetime.cpp:3565
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:1050
+#: ../src/msw/dde.cpp:1034
 msgid "no DDE error."
 msgstr "沒有「動態資料交換」錯誤。"
 
 #: ../src/html/chm.cpp:328
-#, fuzzy
 msgid "no error"
-msgstr "æ\9cªç\9f¥ç\9a\84é\8c¯èª¤ï¼\81ï¼\81ï¼\81"
+msgstr "æ²\92æ\9c\89ä»»ä½\95é\8c¯èª¤"
 
-#: ../src/html/helpdata.cpp:603
+#: ../src/html/helpdata.cpp:662
 msgid "noname"
 msgstr "未命名"
 
-#: ../src/common/datetime.cpp:3629
+#: ../src/common/datetime.cpp:3720
 msgid "noon"
 msgstr "中午"
 
@@ -3685,64 +4191,61 @@ msgstr "數字"
 
 #: ../src/common/xtixml.cpp:258
 msgid "objects cannot have XML Text Nodes"
-msgstr ""
+msgstr "物件不能有 XML 文字子節點"
 
 #: ../src/html/chm.cpp:340
-#, fuzzy
 msgid "out of memory"
-msgstr "GIF: 記憶體不足。"
+msgstr "記憶體不足。"
 
 #: ../src/html/chm.cpp:334
-#, fuzzy
 msgid "read error"
-msgstr "檔案錯誤"
+msgstr "讀取失敗"
 
-#: ../src/common/filename.cpp:178
+#: ../src/common/filename.cpp:181
 msgid "reading"
 msgstr "讀取中"
 
-#: ../src/msw/dde.cpp:1093
+#: ../src/msw/dde.cpp:1077
 msgid "reentrancy problem."
 msgstr "重複進入問題。"
 
-#: ../src/common/datetime.cpp:3467
+#: ../src/common/datetime.cpp:3558
 msgid "second"
 msgstr "第二"
 
 #: ../src/html/chm.cpp:338
-#, fuzzy
 msgid "seek error"
-msgstr "æª\94æ¡\88é\8c¯èª¤"
+msgstr "æ\90\9cå°\8b失æ\95\97"
 
-#: ../src/common/datetime.cpp:3482
+#: ../src/common/datetime.cpp:3573
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3472
+#: ../src/common/datetime.cpp:3563
 msgid "seventh"
 msgstr "第七"
 
 #: ../src/common/menucmn.cpp:116
 msgid "shift"
-msgstr ""
+msgstr "shift"
 
-#: ../src/common/appbase.cpp:332
+#: ../src/common/appbase.cpp:338
 msgid "show this help message"
 msgstr "顯示這個說明訊息"
 
-#: ../src/common/datetime.cpp:3481
+#: ../src/common/datetime.cpp:3572
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3471
+#: ../src/common/datetime.cpp:3562
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:193
+#: ../src/common/appcmn.cpp:203
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "設定顯示模式 (例如 640x480-16)"
 
-#: ../src/common/appcmn.cpp:179
+#: ../src/common/appcmn.cpp:189
 msgid "specify the theme to use"
 msgstr "設定主題"
 
@@ -3750,52 +4253,52 @@ msgstr "設定主題"
 msgid "str"
 msgstr "字串"
 
-#: ../src/common/datetime.cpp:3475
+#: ../src/common/datetime.cpp:3566
 msgid "tenth"
 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 位元。"
 
-#: ../src/common/datetime.cpp:3468
+#: ../src/common/datetime.cpp:3559
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetime.cpp:3478
+#: ../src/common/datetime.cpp:3569
 msgid "thirteenth"
 msgstr "第十三"
 
 #: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
 #, c-format
 msgid "tiff module: %s"
-msgstr ""
+msgstr "tiff 模組：%s"
 
-#: ../src/common/datetime.cpp:3301
+#: ../src/common/datetime.cpp:3386
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetime.cpp:3303
+#: ../src/common/datetime.cpp:3388
 msgid "tomorrow"
 msgstr "明天"
 
-#: ../src/common/datetime.cpp:3477
+#: ../src/common/datetime.cpp:3568
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3485
+#: ../src/common/datetime.cpp:3576
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:525
+#: ../src/common/fontcmn.cpp:637
 msgid "underlined"
 msgstr "底線"
 
-#: ../src/common/fontcmn.cpp:440
+#: ../src/common/fontcmn.cpp:552
 msgid "underlined "
 msgstr "底線"
 
-#: ../src/common/fileconf.cpp:1935
+#: ../src/common/fileconf.cpp:1914
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "不應有 \" 在位置 %d @ '%s'。"
@@ -3805,231 +4308,100 @@ msgid "unknown"
 msgstr "未知的"
 
 #: ../src/common/xtixml.cpp:252
-#, fuzzy, c-format
+#, c-format
 msgid "unknown class %s"
-msgstr ": 未知的字集"
+msgstr "未知的類別 %s"
 
 #: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "未知的錯誤！！！"
 
-#: ../src/msw/dialup.cpp:458
+#: ../src/msw/dialup.cpp:457
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知的錯誤(錯誤碼 %08x)。"
 
-#: ../src/common/textbuf.cpp:229
+#: ../src/common/textbuf.cpp:225
 msgid "unknown line terminator"
 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 "未知的搜尋基準點"
 
-#: ../src/common/fmapbase.cpp:704
+#: ../src/common/fmapbase.cpp:709
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:432
+#: ../src/common/docview.cpp:412
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1307
+#: ../src/common/docview.cpp:1387
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名-%d"
 
-#: ../src/common/intl.cpp:1113
+#: ../src/common/intl.cpp:1115
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用記載檔 '%s' — '%s'。"
 
 #: ../src/html/chm.cpp:336
-#, fuzzy
 msgid "write error"
-msgstr "檔案錯誤"
+msgstr "寫入失敗"
 
-#: ../src/common/filename.cpp:178
+#: ../src/common/filename.cpp:181
 msgid "writing"
 msgstr "寫入中"
 
 #: ../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 中無效的簽名。"
 
-#: ../src/common/socket.cpp:945
+#: ../src/common/socket.cpp:965 ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知的事件！"
 
-#: ../src/motif/app.cpp:207
+#: ../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 無法開啟顯示設備。程式結束中。"
+msgid "wxWidgets could not open display. Exiting."
+msgstr "wxWidgets 無法開啟顯示設備。程式結束中。"
 
-#: ../src/common/datetime.cpp:3302
+#: ../src/common/datetime.cpp:3387
 msgid "yesterday"
 msgstr "昨天"
 
 #: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
-#, fuzzy, c-format
+#, c-format
 msgid "zlib error %d"
-msgstr " (錯誤 %ld: %s)"
+msgstr "zlib 錯誤碼 %d"
 
 #: ../src/common/prntbase.cpp:452
 msgid "|<<"
-msgstr ""
-
-#~ msgid ""
-#~ "Can't create list control window, check that comctl32.dll is installed."
-#~ msgstr "無法建立清單控件視窗, 檢查comctl32.dll是否已安裝。"
-
-#~ msgid "Can't delete value of key '%s'"
-#~ msgstr "無法刪除機碼 '%s'的值"
-
-#~ msgid "Failed to get clipboard data."
-#~ msgstr "無法取得剪貼簿資料。"
-
-#~ msgid "Failed to get the UTC system time."
-#~ msgstr "無法取得系統的 UTC 時間。"
-
-#, fuzzy
-#~ msgid "Unsupported flag in Gzip header"
-#~ msgstr "不支援的剪貼簿格式。"
-
-#~ msgid "gmtime() failed"
-#~ msgstr "gmtime() 失敗"
-
-#~ msgid "#define %s must be an integer."
-#~ msgstr "#所定義的 %s 必須是整數。"
-
-#~ msgid "%s not a bitmap resource specification."
-#~ msgstr "%s 不是點陣圖資源。"
-
-#~ msgid "%s not an icon resource specification."
-#~ msgstr "%s 不是圖示資源。"
-
-#~ msgid "%s: ill-formed resource file syntax."
-#~ msgstr "%s: 不良的資源檔案語法。"
-
-#~ msgid ""
-#~ ", expected static, #include or #define\n"
-#~ "whilst parsing resource."
-#~ msgstr ""
-#~ "，解譯資源時，應有\n"
-#~ "static、#include 或 #define。"
-
-#~ msgid "Bitmap resource specification %s not found."
-#~ msgstr "找不到點陣圖資源描述 %s。"
-
-#~ msgid "Can't create dialog using memory template"
-#~ msgstr "無法使用記憶體樣版建立對話窗 '%s'"
-
-#~ msgid "Can't create dialog using template '%ul'"
-#~ msgstr "無法使用樣版建立對話窗 '%s'"
-
-#~ msgid "Could not find resource include file %s."
-#~ msgstr "找不到資源引入檔 %s。"
-
-#~ msgid ""
-#~ "Could not resolve control class or id '%s'. Use (non-zero) integer "
-#~ "instead\n"
-#~ " or provide #define (see manual for caveats)"
-#~ msgstr ""
-#~ "無法解析控制元件的類別或識別碼 '%s'。以(非零)的整數代替\n"
-#~ "或是提供 #define (參照 caveats 手冊)"
-
-#~ msgid ""
-#~ "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
-#~ "or provide #define (see manual for caveats)"
-#~ msgstr ""
-#~ "無法解析選單識別碼 '%s'。以(非零)整數代替\n"
-#~ "或提供 #define (參照 caveats 手冊)"
-
-#~ msgid "Date"
-#~ msgstr "日期"
-
-#~ msgid "Did you forget to include wx/os2/wx.rc in your resources?"
-#~ msgstr "你是否忘了將 wx/msw/wx.rc 引入資源檔中？"
-
-#~ msgid "Expected '*' whilst parsing resource."
-#~ msgstr "解譯資源時應有 '*'。"
-
-#~ msgid "Expected '=' whilst parsing resource."
-#~ msgstr "解譯資源時應有 '='。"
-
-#~ msgid "Expected 'char' whilst parsing resource."
-#~ msgstr "解譯資源時應有 'char'。"
-
-#~ msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
-#~ msgstr "無法建立對話窗。不正確的 DLGTEMPLATE？"
-
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "找不到 XBM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadBitmapData？"
-
-#~ msgid ""
-#~ "Failed to find XBM resource %s.\n"
-#~ "Forgot to use wxResourceLoadIconData?"
-#~ msgstr ""
-#~ "找不到 XBM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadIconData？"
-
-#~ msgid ""
-#~ "Failed to find XPM resource %s.\n"
-#~ "Forgot to use wxResourceLoadBitmapData?"
-#~ msgstr ""
-#~ "找不到 XPM 資源 %s。\n"
-#~ "忘記使用 wxResourceLoadBitmapData？"
-
-#~ msgid "Fatal error: exiting"
-#~ msgstr "致命的錯誤︰已存在"
-
-#~ msgid "Found "
-#~ msgstr "找到"
-
-#~ msgid ""
-#~ "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*."
-#~ "htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*."
-#~ "*)|*"
-#~ msgstr ""
-#~ "HTML 文件 (*.htm)|*.htm|HTML 文件 (*.html)|*.html|說明書 (*.htb)|*.htb|說"
-#~ "明書 (*.zip)|*.zip|HTML 說明專案 (*.hhp)|*.hhp|所有檔案 (*.*)|*"
-
-#~ msgid "Icon resource specification %s not found."
-#~ msgstr "找不到圖示資源規格%s。"
-
-#~ msgid "Ill-formed resource file syntax."
-#~ msgstr "不良的資源檔案語法。"
-
-#~ msgid "Load file"
-#~ msgstr "載入檔案"
+msgstr "|<<"
 
-#~ msgid "No XBM facility available!"
-#~ msgstr "XBM 類型無法使用！"
+#~ msgid "/#SYSTEM"
+#~ msgstr "/#SYSTEM"
 
-#~ msgid "No XPM icon facility available!"
-#~ msgstr "XPM 圖示類型無法使用！"
-
-#~ msgid "Save file"
-#~ msgstr "儲存檔案"
+#~ msgid "Backward"
+#~ msgstr "前一頁"
 
-#~ msgid "Time"
-#~ msgstr "時間"
+#~ msgid "Can't open file '%s'"
+#~ msgstr "無法開啟檔案 '%s'"
 
-#~ msgid "Unexpected end of file whilst parsing resource."
-#~ msgstr "在解譯資源時，遇到不預期的檔案結尾。"
+#~ msgid "GetUnusedColour:: No Unused Color in image "
+#~ msgstr "GetUnusedColour:: 影像中沒有未使用的顏色"
 
-#~ msgid "Unrecognized style %s whilst parsing resource."
-#~ msgstr "解譯資源時遇到無法識別的樣式 %s。"
+#~ msgid "unsupported compression method in Gzip stream"
+#~ msgstr "Gzip 資料流不支援的壓縮方法"