also scroll vertically if necessary in MoveToItem() when the control is in a non...

[wxWidgets.git] / locale / zh_TW.po

diff --git a/locale/zh_TW.po b/locale/zh_TW.po
index 4aaddaad6645f140f54b9da7bf1962c39aae1ecc..f582ae309c4c1643ef82d972c695c3c5527ee358 100644 (file)
--- a/locale/zh_TW.po
+++ b/locale/zh_TW.po
@@ -1,1339 +1,1926 @@
+# Traditional Chinese Messages for wxWidgets
+# Copyright (C) 2005 Free Software Foundation, Inc.
+# This file is distributed under the same license as the wxWidgets package.
+# PAL <lyh37@ntu.edu.tw>
+# Wei-Lun Chao <chaoweilun@pcmail.com.tw>, 2005
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: wxWidgets-2.5.1\n"
+"Project-Id-Version: wxWidgets 2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
-"PO-Revision-Date: 2004-05-08 16:34+0800\n"
-"Last-Translator: PAL <lyh37@ntu.edu.tw>\n"
+"POT-Creation-Date: 2006-10-29 14:59+0100\n"
+"PO-Revision-Date: 2005-12-20 16:34+0800\n"
+"Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.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-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:575
 #, c-format
 msgid "\t%s: %s\n"
-msgstr ""
+msgstr "\t%s: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:578
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
 msgstr ""
+"\n"
+"請將報告傳送給程式維護人員, 謝謝!\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:216 ../src/richtext/richtextstyledlg.cpp:203
+#: ../src/richtext/richtextstyledlg.cpp:215
 msgid " "
-msgstr ""
+msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:313
 msgid "              Thank you and we're sorry for the inconvenience!\n"
-msgstr ""
+msgstr "              謝謝, 我們對您遇到的不便表示抱歉!\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:245
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (錯誤 %ld: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1429
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:570
+#: ../src/common/strconv.cpp:3063 ../src/common/strconv.cpp:3071
+#, fuzzy
+msgid " Couldn't create the UnicodeConverter"
+msgstr "無法建立計時器。"
+
+#: ../src/html/htmprint.cpp:579 ../src/richtext/richtextprint.cpp:535
 msgid " Preview"
 msgstr "預覽"
 
-#: ../src/common/paper.cpp:124
+#: ../src/msw/aboutdlg.cpp:52
+msgid " Version "
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:619
+#, fuzzy
+msgid " bold"
+msgstr "粗體"
+
+#: ../src/common/fontcmn.cpp:635
+#, fuzzy
+msgid " italic"
+msgstr "斜體"
+
+#: ../src/common/fontcmn.cpp:615
+#, fuzzy
+msgid " light"
+msgstr "細體"
+
+#: ../src/common/paper.cpp:119
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 信封，4 1/8 x 9 1/2 英吋"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:120
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "#11 信封，4 1/2 x 10 3/8 英吋"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:121
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "#12 信封，4 3/4 x 11 英吋"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:122
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "#14 信封，5 x 11 1/2 英吋"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:118
 msgid "#9 Envelope, 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
+#: ../contrib/src/deprecated/resource.cpp:3036
 #, c-format
 msgid "#define %s must be an integer."
+msgstr "#所定義的 %s 必須是整數。"
+
+#: ../src/common/filename.cpp:2345
+#, c-format
+msgid "%.*f GB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2343
+#, c-format
+msgid "%.*f MB"
+msgstr ""
+
+#: ../src/common/filename.cpp:2347
+#, c-format
+msgid "%.*f TB"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/common/filename.cpp:2341
+#, c-format
+msgid "%.*f kB"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1021 ../src/html/helpwnd.cpp:1023
+#: ../src/html/helpwnd.cpp:1655 ../src/html/helpwnd.cpp:1693
 #, c-format
 msgid "%i of %i"
 msgstr "%i / %i"
 
-#: ../src/generic/filedlgg.cpp:288
-#, c-format
-msgid "%ld bytes"
-msgstr "%ld 位元組"
+#: ../src/generic/filedlgg.cpp:360
+#, fuzzy, c-format
+msgid "%ld byte"
+msgid_plural "%ld bytes"
+msgstr[0] "%ld 位元組"
 
-#: ../src/common/cmdline.cpp:851
+#: ../src/common/cmdline.cpp:870
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (或 %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/common/filename.cpp:2339
+#, c-format
+msgid "%s B"
+msgstr ""
+
+#: ../src/generic/logg.cpp:260
 #, c-format
 msgid "%s Error"
 msgstr "%s錯誤"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:268
 #, c-format
 msgid "%s Information"
 msgstr "%s資訊"
 
-#: ../src/generic/logg.cpp:265
+#: ../src/generic/logg.cpp:264
 #, c-format
 msgid "%s Warning"
 msgstr "%s警告"
 
-#: ../src/common/fldlgcmn.cpp:81
+#: ../src/common/tarstrm.cpp:1235
+#, c-format
+msgid "%s did not fit the tar header for entry '%s'"
+msgstr ""
+
+#: ../src/common/fldlgcmn.cpp:93
 #, c-format
 msgid "%s files (%s)|%s"
 msgstr "'%s' 檔 (%s)|%s"
 
-#: ../src/common/msgout.cpp:229
+#: ../src/common/msgout.cpp:217
 #, c-format
 msgid "%s message"
 msgstr "%s訊息"
 
-#: ../contrib/src/deprecated/resource.cpp:2390
+#: ../contrib/src/deprecated/resource.cpp:2400
 #, c-format
 msgid "%s not a bitmap resource specification."
-msgstr ""
+msgstr "%s 不是點陣圖資源。"
 
-#: ../contrib/src/deprecated/resource.cpp:2544
+#: ../contrib/src/deprecated/resource.cpp:2554
 #, c-format
 msgid "%s not an icon resource specification."
-msgstr ""
+msgstr "%s 不是圖示資源。"
 
 #: ../contrib/src/deprecated/resource.cpp:1901
 #: ../contrib/src/deprecated/resource.cpp:2030
-#: ../contrib/src/deprecated/resource.cpp:3123
+#: ../contrib/src/deprecated/resource.cpp:3133
 #, c-format
 msgid "%s: ill-formed resource file syntax."
-msgstr ""
+msgstr "%s: 不良資源檔案語法。"
+
+#: ../src/common/stockitem.cpp:110
+#, fuzzy
+msgid "&About"
+msgstr "關於(&A)..."
 
-#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+#: ../src/html/helpfrm.cpp:122 ../src/html/helpfrm.cpp:124
 msgid "&About..."
-msgstr "關於...(&A)"
+msgstr "關於(&A)..."
 
-#: ../src/common/stockitem.cpp:153
+#: ../src/common/stockitem.cpp:160
 msgid "&Actual Size"
-msgstr ""
+msgstr "實際大小(&A)"
+
+#: ../src/richtext/richtextindentspage.cpp:135
+#: ../src/richtext/richtextliststylepage.cpp:319
+#, fuzzy
+msgid "&Alignment"
+msgstr "靠左對齊"
 
-#: ../src/common/stockitem.cpp:108
+#: ../src/common/stockitem.cpp:112
 msgid "&Apply"
-msgstr ""
+msgstr "套用(&A)"
+
+#: ../src/richtext/richtextstyledlg.cpp:238
+#, fuzzy
+msgid "&Apply Style"
+msgstr "套用(&A)"
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:175
 msgid "&Arrange Icons"
 msgstr "排列圖示(&A)"
 
-#: ../src/common/stockitem.cpp:118
-#, fuzzy
+#: ../src/common/stockitem.cpp:124
 msgid "&Back"
-msgstr "《 返回(&B)"
+msgstr "回傳(&B)"
 
-#: ../src/common/stockitem.cpp:109
-#, fuzzy
+#: ../src/richtext/richtextstylepage.cpp:112
+msgid "&Based on:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:113
 msgid "&Bold"
-msgstr "粗體"
+msgstr "粗體(&B)"
+
+#: ../src/richtext/richtextbulletspage.cpp:155
+#: ../src/richtext/richtextliststylepage.cpp:209
+msgid "&Bullet style:"
+msgstr ""
 
-#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
-#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:422
+#: ../src/common/stockitem.cpp:114 ../src/generic/fontdlgg.cpp:377
+#: ../src/generic/fontdlgg.cpp:396 ../src/generic/wizard.cpp:451
+#: ../src/mac/carbon/fontdlg.cpp:525
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: ../src/msw/mdi.cpp:183
+#: ../src/msw/mdi.cpp:171
 msgid "&Cascade"
 msgstr "梯狀排列(&C)"
 
-#: ../src/common/stockitem.cpp:111
-#, fuzzy
+#: ../src/richtext/richtextsymboldlg.cpp:438
+msgid "&Character code:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:115
 msgid "&Clear"
-msgstr "清除(&L)"
+msgstr "清除(&C)"
 
-#: ../src/common/prntbase.cpp:875 ../src/common/stockitem.cpp:112
-#: ../src/generic/logg.cpp:509 ../src/html/helpfrm.cpp:354
+#: ../src/common/prntbase.cpp:1101 ../src/common/stockitem.cpp:116
+#: ../src/generic/logg.cpp:510 ../src/html/helpfrm.cpp:119
+#: ../src/html/helpdlg.cpp:91
 msgid "&Close"
 msgstr "關閉(&C)"
 
-#: ../src/common/stockitem.cpp:113 ../src/mac/carbon/textctrl.cpp:1074
-#: ../src/msw/textctrl.cpp:2064
+#: ../src/richtext/richtextfontpage.cpp:201
+#, fuzzy
+msgid "&Colour:"
+msgstr "顏色(&O):"
+
+#: ../src/common/stockitem.cpp:117 ../src/mac/carbon/textctrl.cpp:1118
+#: ../src/msw/textctrl.cpp:2210 ../src/richtext/richtextctrl.cpp:2424
 msgid "&Copy"
 msgstr "複製(&C)"
 
-#: ../src/generic/dbgrptg.cpp:320
+#: ../src/generic/dbgrptg.cpp:321
 msgid "&Debug report preview:"
-msgstr ""
+msgstr "除錯報告預覽(&D): "
 
-#: ../src/common/stockitem.cpp:115 ../src/mac/carbon/textctrl.cpp:1076
-#: ../src/msw/textctrl.cpp:2066
+#: ../src/common/stockitem.cpp:119 ../src/mac/carbon/textctrl.cpp:1120
+#: ../src/msw/textctrl.cpp:2212 ../src/richtext/richtextctrl.cpp:2426
+#: ../src/richtext/richtexttabspage.cpp:142
 msgid "&Delete"
 msgstr "刪除(&D)"
 
-#: ../src/generic/logg.cpp:717
+#: ../src/richtext/richtextstyledlg.cpp:256
+#, fuzzy
+msgid "&Delete Style..."
+msgstr "刪除項目"
+
+#: ../src/generic/logg.cpp:718
 msgid "&Details"
 msgstr "細節(&D)"
 
-#: ../src/common/stockitem.cpp:119
-#, fuzzy
+#: ../src/common/stockitem.cpp:125
 msgid "&Down"
-msgstr "下"
+msgstr "向下(&D)"
+
+#: ../src/common/stockitem.cpp:120
+msgid "&Edit"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:250
+#, fuzzy
+msgid "&Edit Style..."
+msgstr "編輯項目"
 
-#: ../src/html/helpfrm.cpp:361
+#: ../src/common/stockitem.cpp:122 ../src/html/helpfrm.cpp:126
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: ../src/common/stockitem.cpp:116
+#: ../src/common/stockitem.cpp:121
 msgid "&Find"
 msgstr "尋找(&F)"
 
-#: ../src/generic/wizard.cpp:634
+#: ../src/generic/wizard.cpp:646
 msgid "&Finish"
 msgstr "完成(&F)"
 
-#: ../src/generic/fontdlgg.cpp:273
-#, fuzzy
+#: ../src/generic/fontdlgg.cpp:278
 msgid "&Font family:"
-msgstr "字型大小："
+msgstr "字型(&F):"
 
-#: ../src/common/stockitem.cpp:120
+#: ../src/richtext/richtextliststylepage.cpp:193
+msgid "&Font for Level..."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:122
+#: ../src/richtext/richtextsymboldlg.cpp:399
 #, fuzzy
+msgid "&Font:"
+msgstr "字型(&F):"
+
+#: ../src/common/stockitem.cpp:126
 msgid "&Forward"
-msgstr "向前"
+msgstr "向前(&F)"
+
+#: ../src/richtext/richtextsymboldlg.cpp:450
+#, fuzzy
+msgid "&From:"
+msgstr "從："
 
-#: ../src/common/prntbase.cpp:910
+#: ../src/common/prntbase.cpp:1147
 msgid "&Goto..."
-msgstr "移到...(&G)"
+msgstr "移到(&G)..."
 
-#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:418
-#: ../src/generic/wizard.cpp:425 ../src/html/helpfrm.cpp:362
+#: ../src/common/stockitem.cpp:128 ../src/generic/wizard.cpp:447
+#: ../src/generic/wizard.cpp:454 ../src/html/helpfrm.cpp:127
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: ../src/common/stockitem.cpp:123
-#, fuzzy
+#: ../src/common/stockitem.cpp:129
 msgid "&Home"
-msgstr "移動(&M)"
+msgstr "首頁(&H)"
 
-#: ../src/common/stockitem.cpp:125
+#: ../src/richtext/richtextindentspage.cpp:191
+#: ../src/richtext/richtextliststylepage.cpp:372
+msgid "&Indentation (tenths of a mm)"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:174
+#: ../src/richtext/richtextliststylepage.cpp:356
 #, fuzzy
+msgid "&Indeterminate"
+msgstr "底線(&U)"
+
+#: ../src/common/stockitem.cpp:131
 msgid "&Index"
-msgstr "索引"
+msgstr "索引(&I)"
 
-#: ../src/common/stockitem.cpp:126
-#, fuzzy
+#: ../src/common/stockitem.cpp:132
 msgid "&Italic"
-msgstr "斜體"
+msgstr "斜體(&I)"
 
-#: ../src/generic/logg.cpp:510
+#: ../src/richtext/richtextindentspage.cpp:160
+#: ../src/richtext/richtextliststylepage.cpp:342
+#, fuzzy
+msgid "&Justified"
+msgstr "分散對齊"
+
+#: ../src/richtext/richtextindentspage.cpp:146
+#: ../src/richtext/richtextliststylepage.cpp:328
+msgid "&Left"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:202
+#: ../src/richtext/richtextliststylepage.cpp:381
+msgid "&Left:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:182
+msgid "&List level:"
+msgstr ""
+
+#: ../src/generic/logg.cpp:511
 msgid "&Log"
 msgstr "日誌(&L)"
 
-#: ../src/univ/themes/win32.cpp:4923
+#: ../src/univ/themes/win32.cpp:3734
 msgid "&Move"
 msgstr "移動(&M)"
 
-#: ../src/common/stockitem.cpp:131
-#, fuzzy
+#: ../src/common/stockitem.cpp:137 ../src/richtext/richtexttabspage.cpp:136
 msgid "&New"
-msgstr "下一個(&N)"
+msgstr "新增(&N)"
 
-#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:188
+#: ../src/generic/mdig.cpp:118 ../src/aui/tabmdi.cpp:107
+#: ../src/msw/mdi.cpp:176
 msgid "&Next"
 msgstr "下一個(&N)"
 
-#: ../src/generic/wizard.cpp:421 ../src/generic/wizard.cpp:636
+#: ../src/generic/wizard.cpp:450 ../src/generic/wizard.cpp:646
 msgid "&Next >"
 msgstr "下一個(&N) 》"
 
-#: ../src/generic/tipdlg.cpp:243
+#: ../src/generic/tipdlg.cpp:239
 msgid "&Next Tip"
 msgstr "下一技巧(&N)"
 
-#: ../src/common/stockitem.cpp:132
+#: ../src/richtext/richtextstylepage.cpp:122
 #, fuzzy
+msgid "&Next style:"
+msgstr "下一個(&N) 》"
+
+#: ../src/common/stockitem.cpp:138
 msgid "&No"
-msgstr "否"
+msgstr "否(&N)"
 
-#: ../src/generic/dbgrptg.cpp:342
-#, fuzzy
+#: ../src/generic/dbgrptg.cpp:343
 msgid "&Notes:"
-msgstr "否"
+msgstr "注意(&N):"
 
-#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
-#: ../src/generic/fontdlgg.cpp:375
-#, fuzzy
+#: ../src/richtext/richtextbulletspage.cpp:261
+msgid "&Number:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:139 ../src/generic/fontdlgg.cpp:382
+#: ../src/generic/fontdlgg.cpp:389 ../src/mac/carbon/fontdlg.cpp:531
 msgid "&OK"
-msgstr "確認"
+msgstr "確認(&O)"
 
-#: ../src/common/stockitem.cpp:134
-#, fuzzy
+#: ../src/common/stockitem.cpp:140
 msgid "&Open"
-msgstr "開啟...(&O)"
+msgstr "開啟(&O)"
 
-#: ../src/html/helpfrm.cpp:352
+#: ../src/html/helpfrm.cpp:117
 msgid "&Open..."
-msgstr "開啟...(&O)"
+msgstr "開啟(&O)..."
 
-#: ../src/common/stockitem.cpp:135 ../src/mac/carbon/textctrl.cpp:1075
-#: ../src/msw/textctrl.cpp:2065
+#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1119
+#: ../src/msw/textctrl.cpp:2211 ../src/richtext/richtextctrl.cpp:2425
 msgid "&Paste"
 msgstr "貼上(&P)"
 
-#: ../src/generic/fontdlgg.cpp:324
-#, fuzzy
+#: ../src/generic/fontdlgg.cpp:329
 msgid "&Point size:"
-msgstr "字型大小："
+msgstr "字型大小(Point size)(&P):"
 
-#: ../src/common/stockitem.cpp:136
-msgid "&Preferences"
+#: ../src/richtext/richtexttabspage.cpp:113
+msgid "&Position (tenths of a mm):"
 msgstr ""
 
-#: ../src/generic/mdig.cpp:119 ../src/msw/mdi.cpp:189
+#: ../src/common/stockitem.cpp:142
+msgid "&Preferences"
+msgstr "偏好設定"
+
+#: ../src/generic/mdig.cpp:119 ../src/aui/tabmdi.cpp:108
+#: ../src/msw/mdi.cpp:177
 msgid "&Previous"
 msgstr "前一個(&P)"
 
-#: ../src/common/stockitem.cpp:137
-#, fuzzy
+#: ../src/common/stockitem.cpp:143
 msgid "&Print"
-msgstr "列印"
+msgstr "列印(&P)"
 
-#: ../src/common/prntbase.cpp:880
+#: ../src/common/prntbase.cpp:1106
 msgid "&Print..."
-msgstr "列印...(&P)"
+msgstr "列印(&P)..."
 
-#: ../src/common/stockitem.cpp:139
-#, fuzzy
+#: ../src/common/stockitem.cpp:145
 msgid "&Properties"
-msgstr "å\89\8dä¸\80å\80\8b(&P)"
+msgstr "屬æ\80§(&P)"
 
-#: ../src/common/stockitem.cpp:140
+#: ../src/common/stockitem.cpp:146
 msgid "&Quit"
-msgstr ""
+msgstr "離開(&Q)"
 
-#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
-#: ../src/common/stockitem.cpp:141 ../src/mac/carbon/textctrl.cpp:1071
-#: ../src/msw/textctrl.cpp:2061
+#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:295
+#: ../src/common/stockitem.cpp:147 ../src/mac/carbon/textctrl.cpp:1115
+#: ../src/msw/textctrl.cpp:2207 ../src/richtext/richtextctrl.cpp:2421
 msgid "&Redo"
 msgstr "重做(&R)"
 
-#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
+#: ../src/common/cmdproc.cpp:284 ../src/common/cmdproc.cpp:304
 msgid "&Redo "
 msgstr "重做(&R)"
 
-#: ../src/generic/fdrepdlg.cpp:185
+#: ../src/richtext/richtextstyledlg.cpp:244
+msgid "&Rename Style..."
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:178
 msgid "&Replace"
 msgstr "置換(&R)"
 
-#: ../src/univ/themes/win32.cpp:4922
+#: ../src/richtext/richtextstyledlg.cpp:274
+msgid "&Restart numbering"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:3733
 msgid "&Restore"
 msgstr "回存(&R)"
 
-#: ../src/common/stockitem.cpp:145
+#: ../src/richtext/richtextindentspage.cpp:153
+#: ../src/richtext/richtextliststylepage.cpp:335
+#, fuzzy
+msgid "&Right"
+msgstr "細體"
+
+#: ../src/richtext/richtextindentspage.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:403
 #, fuzzy
+msgid "&Right:"
+msgstr "字型粗細(&W):"
+
+#: ../src/common/stockitem.cpp:151
 msgid "&Save"
-msgstr "儲存...(&S)"
+msgstr "儲存(&S)"
 
-#: ../src/generic/logg.cpp:505
+#: ../src/generic/logg.cpp:506
 msgid "&Save..."
-msgstr "儲存...(&S)"
+msgstr "儲存(&S)..."
 
-#: ../src/generic/tipdlg.cpp:238
+#: ../src/generic/tipdlg.cpp:234
 msgid "&Show tips at startup"
 msgstr "啟動時顯示小秘訣(&S)"
 
-#: ../src/univ/themes/win32.cpp:4925
+#: ../src/univ/themes/win32.cpp:3736
 msgid "&Size"
 msgstr "大小(&S)"
 
-#: ../src/common/stockitem.cpp:147
+#: ../src/richtext/richtextfontpage.cpp:140
 #, fuzzy
+msgid "&Size:"
+msgstr "大小(&S)"
+
+#: ../src/richtext/richtextindentspage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:423
+msgid "&Spacing (tenths of a mm)"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:154
 msgid "&Stop"
-msgstr "設定"
+msgstr "停止(&S)"
 
-#: ../src/generic/fontdlgg.cpp:284
+#: ../src/generic/fontdlgg.cpp:289 ../src/richtext/richtextstylepage.cpp:103
 msgid "&Style:"
+msgstr "字型(&S):"
+
+#: ../src/richtext/richtextstyledlg.cpp:191
+#, fuzzy
+msgid "&Styles:"
+msgstr "字型(&S):"
+
+#: ../src/richtext/richtextsymboldlg.cpp:412
+msgid "&Subset:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+#: ../src/richtext/richtextbulletspage.cpp:216
+#: ../src/richtext/richtextliststylepage.cpp:268
 #, fuzzy
+msgid "&Symbol:"
+msgstr "字型(&S):"
+
+#: ../src/common/stockitem.cpp:156 ../src/generic/fontdlgg.cpp:351
 msgid "&Underline"
-msgstr "底線"
+msgstr "底線(&U)"
+
+#: ../src/richtext/richtextfontpage.cpp:188
+#, fuzzy
+msgid "&Underlining:"
+msgstr "底線(&U)"
 
-#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
-#: ../src/mac/carbon/textctrl.cpp:1070 ../src/msw/textctrl.cpp:2060
+#: ../src/common/cmdproc.cpp:266 ../src/common/stockitem.cpp:157
+#: ../src/mac/carbon/textctrl.cpp:1114 ../src/msw/textctrl.cpp:2206
+#: ../src/richtext/richtextctrl.cpp:2420
 msgid "&Undo"
 msgstr "回復(&U)"
 
-#: ../src/common/cmdproc.cpp:264
+#: ../src/common/cmdproc.cpp:260
 msgid "&Undo "
 msgstr "回復(&U)"
 
-#: ../src/common/stockitem.cpp:151
-#, fuzzy
+#: ../src/common/stockitem.cpp:158
 msgid "&Unindent"
-msgstr "第十九"
+msgstr "取消縮排(&U)"
 
-#: ../src/common/stockitem.cpp:121
-#, fuzzy
+#: ../src/common/stockitem.cpp:127
 msgid "&Up"
-msgstr "上"
+msgstr "向上(&U)"
 
-#: ../src/generic/fontdlgg.cpp:295
-#, fuzzy
+#: ../src/generic/fontdlgg.cpp:300
 msgid "&Weight:"
-msgstr "第八"
+msgstr "字型粗細(&W):"
 
 #: ../src/generic/mdig.cpp:298 ../src/generic/mdig.cpp:314
-#: ../src/generic/mdig.cpp:318 ../src/msw/mdi.cpp:1410 ../src/msw/mdi.cpp:1417
-#: ../src/msw/mdi.cpp:1447
+#: ../src/generic/mdig.cpp:318 ../src/aui/tabmdi.cpp:272
+#: ../src/aui/tabmdi.cpp:288 ../src/aui/tabmdi.cpp:290 ../src/msw/mdi.cpp:1417
+#: ../src/msw/mdi.cpp:1424 ../src/msw/mdi.cpp:1454
 msgid "&Window"
 msgstr "視窗(&W)"
 
-#: ../src/common/stockitem.cpp:152
-#, fuzzy
+#: ../src/common/stockitem.cpp:159
 msgid "&Yes"
-msgstr "是"
+msgstr "是(&Y)"
 
-#: ../src/common/config.cpp:433 ../src/msw/regconf.cpp:258
+#: ../src/common/config.cpp:451 ../src/msw/regconf.cpp:253
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' 有額外的 '..'，忽略之。"
 
-#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
-#: ../src/common/valtext.cpp:168
+#: ../src/common/valtext.cpp:128 ../src/common/valtext.cpp:158
+#: ../src/common/valtext.cpp:164
 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' 是無效的"
 
-#: ../src/common/cmdline.cpp:769
+#: ../src/common/cmdline.cpp:786
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' 不是選項 '%s' 的正確數值。"
 
-#: ../src/common/intl.cpp:1147
+#: ../src/common/intl.cpp:1194
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' 不是有效的訊息登錄檔。"
 
-#: ../src/common/textbuf.cpp:246
+#: ../src/common/textbuf.cpp:245
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' 或許是個二進位緩衝區。"
 
-#: ../src/common/valtext.cpp:157
+#: ../src/common/valtext.cpp:153
 #, c-format
 msgid "'%s' should be numeric."
 msgstr "'%s' 應該是數值。"
 
-#: ../src/common/valtext.cpp:139
+#: ../src/common/valtext.cpp:135
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr "'%s' 應只含有 ASCII 字元。"
 
-#: ../src/common/valtext.cpp:145
+#: ../src/common/valtext.cpp:141
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr "'%s' 應只含有字母字元。"
 
-#: ../src/common/valtext.cpp:151
+#: ../src/common/valtext.cpp:147
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' 應只含有字母或數字字元。"
 
-#: ../src/html/helpfrm.cpp:976
+#: ../src/richtext/richtextbulletspage.cpp:175
+#: ../src/richtext/richtextliststylepage.cpp:228
+msgid "(*)"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:638 ../src/html/helpwnd.cpp:956
 msgid "(Help)"
 msgstr "(說明)"
 
-#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
-#: ../src/html/helpfrm.cpp:1764
+#: ../src/richtext/richtextbulletspage.cpp:280
+#: ../src/richtext/richtextliststylepage.cpp:485
+msgid "(None)"
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:525
+#, fuzzy
+msgid "(Normal text)"
+msgstr "正常字型："
+
+#: ../src/html/helpwnd.cpp:408 ../src/html/helpwnd.cpp:1092
+#: ../src/html/helpwnd.cpp:1720
 msgid "(bookmarks)"
 msgstr "(書籤)"
 
-#: ../src/common/debugrpt.cpp:559
-msgid "*** A debug report has been generated\n"
+#: ../src/richtext/richtextformatdlg.cpp:584
+#, fuzzy
+msgid "(none)"
+msgstr "未命名"
+
+#: ../src/richtext/richtextbulletspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:496
+msgid "*"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:562
-msgid "*** And includes the following files:\n"
+#: ../src/richtext/richtextbulletspage.cpp:182
+#: ../src/richtext/richtextliststylepage.cpp:235
+msgid "*)"
 msgstr ""
 
-#: ../src/common/debugrpt.cpp:560
+#: ../src/common/debugrpt.cpp:565
+msgid "*** A debug report has been generated\n"
+msgstr "*** 產生了一份除錯報告\n"
+
+#: ../src/common/debugrpt.cpp:568
+msgid "*** And includes the following files:\n"
+msgstr "*** 且包含以下檔案:\n"
+
+#: ../src/common/debugrpt.cpp:566
 #, c-format
 msgid "*** It can be found in \"%s\"\n"
+msgstr "*** 可在此找到: \"%s\"\n"
+
+#: ../src/richtext/richtextbulletspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:499
+msgid "+"
 msgstr ""
 
 #: ../contrib/src/deprecated/resource.cpp:1840
 #: ../contrib/src/deprecated/resource.cpp:1970
-#: ../contrib/src/deprecated/resource.cpp:3062
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3072
 msgid ""
 ", expected static, #include or #define\n"
 "while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr ""
+", 在對資源進行語法分析時\n"
+", 期望如下關鍵字 static, #include 或 #define。"
 
-#: ../src/generic/dirctrlg.cpp:683 ../src/generic/filedlgg.cpp:740
-msgid "."
-msgstr "."
+#: ../src/richtext/richtextbulletspage.cpp:292
+#: ../src/richtext/richtextliststylepage.cpp:497
+msgid "-"
+msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:684 ../src/generic/filedlgg.cpp:741
-msgid ".."
-msgstr ".."
+#: ../src/richtext/richtextindentspage.cpp:290
+#: ../src/richtext/richtextliststylepage.cpp:461
+msgid "1.5"
+msgstr ""
 
-#: ../src/common/paper.cpp:147
-#, fuzzy
+#: ../src/common/paper.cpp:142
 msgid "10 x 11 in"
-msgstr "10 x 14 英吋"
+msgstr "10 x 11 英吋"
 
-#: ../src/common/paper.cpp:120
+#: ../src/common/paper.cpp:115
 msgid "10 x 14 in"
 msgstr "10 x 14 英吋"
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:116
 msgid "11 x 17 in"
 msgstr "11 x 17 英吋"
 
-#: ../src/common/paper.cpp:191
-#, fuzzy
+#: ../src/common/paper.cpp:186
 msgid "12 x 11 in"
-msgstr "10 x 14 英吋"
+msgstr "12 x 11 英吋"
 
-#: ../src/common/paper.cpp:148
-#, fuzzy
+#: ../src/common/paper.cpp:143
 msgid "15 x 11 in"
-msgstr "10 x 14 英吋"
+msgstr "15 x 11 英吋"
 
-#: ../src/common/paper.cpp:139
+#: ../src/richtext/richtextindentspage.cpp:291
+#: ../src/richtext/richtextliststylepage.cpp:462
+msgid "2"
+msgstr ""
+
+#: ../src/common/paper.cpp:134
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr "6 3/4 信封，3 5/8 x 6 1/2 英吋"
 
-#: ../src/common/paper.cpp:146
-#, fuzzy
+#: ../src/common/paper.cpp:141
 msgid "9 x 11 in"
-msgstr "11 x 17 英吋"
+msgstr "9 x 11 英吋"
 
-#: ../src/html/htmprint.cpp:309
+#: ../src/html/htmprint.cpp:303
 msgid ": file does not exist!"
 msgstr ": 檔案不存在！"
 
-#: ../src/common/fontmap.cpp:200
+#: ../src/common/fontmap.cpp:197
 msgid ": unknown charset"
 msgstr ": 未知的字集"
 
-#: ../src/common/fontmap.cpp:414
+#: ../src/common/fontmap.cpp:411
 msgid ": unknown encoding"
 msgstr ": 未知的編碼"
 
-#: ../src/generic/wizard.cpp:427
+#: ../src/generic/wizard.cpp:456
 msgid "< &Back"
 msgstr "《 返回(&B)"
 
-#: ../src/common/prntbase.cpp:892
+#: ../src/common/prntbase.cpp:1129
 msgid "<<"
 msgstr "<<"
 
-#: ../src/generic/filedlgg.cpp:259 ../src/generic/filedlgg.cpp:282
+#: ../src/mac/carbon/fontdlg.cpp:545 ../src/mac/carbon/fontdlg.cpp:752
+#: ../src/mac/carbon/fontdlg.cpp:772
+#, fuzzy
+msgid "<Any Decorative>"
+msgstr "修飾"
+
+#: ../src/mac/carbon/fontdlg.cpp:546 ../src/mac/carbon/fontdlg.cpp:754
+#: ../src/mac/carbon/fontdlg.cpp:774
+#, fuzzy
+msgid "<Any Modern>"
+msgstr "現代"
+
+#: ../src/mac/carbon/fontdlg.cpp:544 ../src/mac/carbon/fontdlg.cpp:750
+#: ../src/mac/carbon/fontdlg.cpp:770
+#, fuzzy
+msgid "<Any Roman>"
+msgstr "羅馬"
+
+#: ../src/mac/carbon/fontdlg.cpp:547 ../src/mac/carbon/fontdlg.cpp:756
+#: ../src/mac/carbon/fontdlg.cpp:776
+#, fuzzy
+msgid "<Any Script>"
+msgstr "手寫"
+
+#: ../src/mac/carbon/fontdlg.cpp:548 ../src/mac/carbon/fontdlg.cpp:761
+#: ../src/mac/carbon/fontdlg.cpp:780
+#, fuzzy
+msgid "<Any Swiss>"
+msgstr "瑞士"
+
+#: ../src/mac/carbon/fontdlg.cpp:549 ../src/mac/carbon/fontdlg.cpp:758
+#: ../src/mac/carbon/fontdlg.cpp:778
+#, fuzzy
+msgid "<Any Teletype>"
+msgstr "電傳打字機"
+
+#: ../src/mac/carbon/fontdlg.cpp:543
+msgid "<Any>"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:331 ../src/generic/filedlgg.cpp:354
 msgid "<DIR>"
 msgstr "<目錄>"
 
-#: ../src/generic/filedlgg.cpp:263 ../src/generic/filedlgg.cpp:286
+#: ../src/generic/filedlgg.cpp:335 ../src/generic/filedlgg.cpp:358
 msgid "<DRIVE>"
 msgstr "<磁碟機>"
 
-#: ../src/generic/filedlgg.cpp:261 ../src/generic/filedlgg.cpp:284
+#: ../src/generic/filedlgg.cpp:333 ../src/generic/filedlgg.cpp:356
 msgid "<LINK>"
 msgstr "<連結>"
 
-#: ../src/html/helpfrm.cpp:1276
+#: ../src/html/helpwnd.cpp:1248
 msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr "<b><i>粗斜體</i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1280
+#: ../src/html/helpwnd.cpp:1252
 msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
-msgstr "<b><i>粗斜 <u>下劃線</u></i></b><br>"
+msgstr "<b><i>粗斜 <u>加底線</u></i></b><br>"
 
-#: ../src/html/helpfrm.cpp:1275
+#: ../src/html/helpwnd.cpp:1247
 msgid "<b>Bold face.</b> "
 msgstr "<b>粗體。</b> "
 
-#: ../src/html/helpfrm.cpp:1274
+#: ../src/html/helpwnd.cpp:1246
 msgid "<i>Italic face.</i> "
 msgstr "<i>斜體。</i> "
 
-#: ../src/common/prntbase.cpp:898
+#: ../src/richtext/richtextbulletspage.cpp:293
+#: ../src/richtext/richtextliststylepage.cpp:498
+#, fuzzy
+msgid ">"
+msgstr ">>"
+
+#: ../src/common/prntbase.cpp:1135
 msgid ">>"
 msgstr ">>"
 
-#: ../src/common/prntbase.cpp:904
+#: ../src/common/prntbase.cpp:1141
 msgid ">>|"
 msgstr ">>|"
 
-#: ../src/generic/dbgrptg.cpp:304
+#: ../src/generic/dbgrptg.cpp:305
 msgid "A debug report has been generated in the directory\n"
-msgstr ""
+msgstr "產生了一份除錯報告, 位於目錄\n"
 
-#: ../src/common/xtixml.cpp:409
+#: ../src/common/xtixml.cpp:406
 msgid "A non empty collection must consist of 'element' nodes"
 msgstr "非空集合必須包含 'element' 節點"
 
-#: ../src/common/paper.cpp:166
-msgid "A2 420 x 594 mm"
+#: ../src/richtext/richtextbulletspage.cpp:254
+#: ../src/richtext/richtextbulletspage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:304
+#: ../src/richtext/richtextliststylepage.cpp:306
+msgid "A standard bullet name."
 msgstr ""
 
-#: ../src/common/paper.cpp:163
-#, fuzzy
+#: ../src/common/paper.cpp:161
+msgid "A2 420 x 594 mm"
+msgstr "A2 420 x 594 公釐"
+
+#: ../src/common/paper.cpp:158
 msgid "A3 Extra 322 x 445 mm"
-msgstr "C3 信封，324 x 458 毫米"
+msgstr "A3 加長 322 x 445 公釐"
 
-#: ../src/common/paper.cpp:168
-#, fuzzy
+#: ../src/common/paper.cpp:163
 msgid "A3 Extra Transverse 322 x 445 mm"
-msgstr "C3 信封，324 x 458 毫米"
+msgstr "A3 加長橫向 322 x 445 公釐"
 
-#: ../src/common/paper.cpp:177
-#, fuzzy
+#: ../src/common/paper.cpp:172
 msgid "A3 Rotated 420 x 297 mm"
-msgstr "A4 印刷紙，210 x 297 毫米"
+msgstr "A3 轉向 420 x 297 公釐"
 
-#: ../src/common/paper.cpp:167
-#, fuzzy
+#: ../src/common/paper.cpp:162
 msgid "A3 Transverse 297 x 420 mm"
-msgstr "A3 印刷紙，297 x 420 毫米"
+msgstr "A3 轉向 297 x 420 公釐"
 
-#: ../src/common/paper.cpp:113
+#: ../src/common/paper.cpp:108
 msgid "A3 sheet, 297 x 420 mm"
-msgstr "A3 印刷紙，297 x 420 毫米"
+msgstr "A3 印刷紙，297 x 420 公釐"
 
-#: ../src/common/paper.cpp:153
+#: ../src/common/paper.cpp:148
 msgid "A4 Extra 9.27 x 12.69 in"
-msgstr ""
+msgstr "A4 加長 9.27 x 12.69 英吋"
 
-#: ../src/common/paper.cpp:160
-#, fuzzy
+#: ../src/common/paper.cpp:155
 msgid "A4 Plus 210 x 330 mm"
-msgstr "A4 å\8d°å\88·ç´\99ï¼\8c210 x 297 毫米"
+msgstr "A4 å¢\9e大 210 x 330 å\85¬é\87\90"
 
-#: ../src/common/paper.cpp:178
-#, fuzzy
+#: ../src/common/paper.cpp:173
 msgid "A4 Rotated 297 x 210 mm"
-msgstr "A3 印刷紙，297 x 420 毫米"
+msgstr "A3 轉向 297 x 210 公釐"
 
-#: ../src/common/paper.cpp:155
-#, fuzzy
+#: ../src/common/paper.cpp:150
 msgid "A4 Transverse 210 x 297 mm"
-msgstr "A4 印刷紙，210 x 297 毫米"
+msgstr "A4 橫向 210 x 297 公釐"
 
-#: ../src/common/paper.cpp:104
+#: ../src/common/paper.cpp:99
 msgid "A4 sheet, 210 x 297 mm"
-msgstr "A4 印刷紙，210 x 297 毫米"
+msgstr "A4 印刷紙，210 x 297 公釐"
 
-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:109
 msgid "A4 small sheet, 210 x 297 mm"
-msgstr "A4 印刷小紙張，210 x 297 毫米"
+msgstr "A4 印刷小紙張，210 x 297 公釐"
 
-#: ../src/common/paper.cpp:164
-#, fuzzy
+#: ../src/common/paper.cpp:159
 msgid "A5 Extra 174 x 235 mm"
-msgstr "A5 å\8d°å\88·ç´\99ï¼\8c148 x 210 毫米"
+msgstr "A5 å\8a é\95· 174 x 235 å\85¬é\87\90"
 
-#: ../src/common/paper.cpp:179
+#: ../src/common/paper.cpp:174
 msgid "A5 Rotated 210 x 148 mm"
-msgstr ""
+msgstr "A5 轉向 210 x 148 公釐"
 
-#: ../src/common/paper.cpp:161
-#, fuzzy
+#: ../src/common/paper.cpp:156
 msgid "A5 Transverse 148 x 210 mm"
-msgstr "A5 印刷紙，148 x 210 毫米"
+msgstr "A5 橫向 148 x 210 公釐"
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:110
 msgid "A5 sheet, 148 x 210 mm"
-msgstr "A5 印刷紙，148 x 210 毫米"
+msgstr "A5 印刷紙，148 x 210 公釐"
 
-#: ../src/common/paper.cpp:171
-#, fuzzy
+#: ../src/common/paper.cpp:166
 msgid "A6 105 x 148 mm"
-msgstr "10 x 14 英吋"
+msgstr "A6 105 x 148 公釐"
 
-#: ../src/common/paper.cpp:184
-#, fuzzy
+#: ../src/common/paper.cpp:179
 msgid "A6 Rotated 148 x 105 mm"
-msgstr "A5 印刷紙，148 x 210 毫米"
+msgstr "A6 轉向 148 x 105 公釐"
 
-#: ../src/generic/fontdlgg.cpp:87
+#: ../src/generic/fontdlgg.cpp:87 ../src/mac/carbon/fontdlg.cpp:276
+#: ../src/richtext/richtextformatdlg.cpp:401
 msgid "ABCDEFGabcdefg12345"
-msgstr "心想事成 AaBbCcYyZz"
+msgstr "ABCDEFGabcdefg12345"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/menucmn.cpp:94
+msgid "ADD"
+msgstr ""
+
+#: ../src/common/ftp.cpp:381 ../src/richtext/richtextsymboldlg.cpp:457
+#: ../src/richtext/richtextsymboldlg.cpp:460
+#: ../src/richtext/richtextsymboldlg.cpp:461
 msgid "ASCII"
-msgstr "文字"
+msgstr "ASCII"
+
+#: ../src/generic/aboutdlgg.cpp:105
+#, fuzzy
+msgid "About "
+msgstr "關於(&A)..."
 
-#: ../src/common/stockitem.cpp:107
+#: ../src/common/stockitem.cpp:111
 msgid "Add"
-msgstr ""
+msgstr "加入"
 
-#: ../src/html/helpfrm.cpp:444
+#: ../src/html/helpwnd.cpp:421
 msgid "Add current page to bookmarks"
 msgstr "把目前頁面加到書籤中"
 
-#: ../src/generic/colrdlgg.cpp:299
+#: ../src/generic/colrdlgg.cpp:291
 msgid "Add to custom colours"
-msgstr "加到自訂色彩中"
+msgstr "加到自訂顏色中"
 
-#: ../include/wx/xti.h:902
+#: ../include/wx/xti.h:898
 msgid "AddToPropertyCollection called on a generic accessor"
-msgstr ""
+msgstr "在一個通用處理器上呼叫AddToPropertyCollection"
 
-#: ../include/wx/xti.h:849
+#: ../include/wx/xti.h:845
 msgid "AddToPropertyCollection called w/o valid adder"
-msgstr ""
+msgstr "呼叫AddToPropertyCollection時未帶有效的adder"
 
-#: ../src/html/helpctrl.cpp:106
+#: ../src/html/helpctrl.cpp:138
 #, c-format
 msgid "Adding book %s"
 msgstr "正在加入卷輯 %s"
 
-#: ../src/common/stockitem.cpp:129
-msgid "Align Left"
+#: ../src/richtext/richtextindentspage.cpp:271
+#: ../src/richtext/richtextliststylepage.cpp:443
+msgid "After a paragraph:"
 msgstr ""
 
-#: ../src/common/stockitem.cpp:130
-#, fuzzy
+#: ../src/common/stockitem.cpp:135
+msgid "Align Left"
+msgstr "靠左對齊"
+
+#: ../src/common/stockitem.cpp:136
 msgid "Align Right"
-msgstr "午夜"
+msgstr "靠右對齊"
 
-#: ../src/generic/prntdlgg.cpp:209
+#: ../src/generic/prntdlgg.cpp:210
 msgid "All"
 msgstr "所有"
 
-#: ../src/common/fldlgcmn.cpp:64
+#: ../src/common/fldlgcmn.cpp:76
 #, c-format
 msgid "All files (%s)|%s"
 msgstr "所有檔案 (%s)|%s"
 
-#: ../include/wx/defs.h:2302
+#: ../include/wx/defs.h:2332
 msgid "All files (*)|*"
 msgstr "所有檔案 (*)|*"
 
-#: ../src/html/helpfrm.cpp:1578
+#: ../src/html/helpwnd.cpp:1530
 msgid "All files (*.*)|*"
 msgstr "所有檔案 (*.*)|*"
 
-#: ../include/wx/defs.h:2299
+#: ../include/wx/defs.h:2329
 msgid "All files (*.*)|*.*"
 msgstr "所有檔案 (*.*)|*.*"
 
-#: ../src/common/xtistrm.cpp:385
+#: ../src/richtext/richtextstyles.cpp:751
+msgid "All styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:381
 msgid "Already Registered Object passed to SetObjectClassInfo"
 msgstr "傳入已註冊的物件給 SetObjectClassInfo"
 
-#: ../src/unix/dialup.cpp:362
+#: ../src/unix/dialup.cpp:356
 msgid "Already dialling ISP."
 msgstr "已經撥接 ISP。"
 
-#: ../src/generic/logg.cpp:1163
+#: ../src/common/menucmn.cpp:314
+msgid "Alt-"
+msgstr ""
+
+#: ../src/generic/animateg.cpp:163
+#, fuzzy, c-format
+msgid "Animation file is not of type %ld."
+msgstr "影像檔不是型態%d。"
+
+#: ../src/generic/logg.cpp:1164
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "把日誌加到檔案 '%s' 的尾端(選擇 [否] 將覆寫該檔案)？"
 
-#: ../src/common/fmapbase.cpp:109
+#: ../src/richtext/richtextbulletspage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:486
+msgid "Arabic"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:111
 msgid "Arabic (ISO-8859-6)"
 msgstr "阿拉伯語 (ISO-8859-6)"
 
 #: ../src/html/chm.cpp:564
 msgid "Archive doesnt contain #SYSTEM file"
-msgstr ""
+msgstr "存檔裡沒有包含 #SYSTEM 檔案"
 
-#: ../src/generic/filedlgg.cpp:440
+#: ../src/generic/filedlgg.cpp:515
 msgid "Attributes"
 msgstr "屬性"
 
-#: ../src/common/paper.cpp:144
-#, fuzzy
+#: ../src/richtext/richtextbulletspage.cpp:242
+#: ../src/richtext/richtextbulletspage.cpp:244
+#: ../src/richtext/richtextliststylepage.cpp:294
+msgid "Available fonts."
+msgstr ""
+
+#: ../src/common/paper.cpp:139
 msgid "B4 (ISO) 250 x 353 mm"
-msgstr "B4 印刷紙，250 x 354 毫米"
+msgstr "B4 (ISO) 250 x 353 公釐"
 
-#: ../src/common/paper.cpp:180
+#: ../src/common/paper.cpp:175
 msgid "B4 (JIS) Rotated 364 x 257 mm"
-msgstr ""
+msgstr "B4 (JIS) 轉向 364 x 257 公釐"
 
-#: ../src/common/paper.cpp:134
+#: ../src/common/paper.cpp:129
 msgid "B4 Envelope, 250 x 353 mm"
-msgstr "B4 信封，250 x 353 毫米"
+msgstr "B4 信封，250 x 353 公釐"
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:111
 msgid "B4 sheet, 250 x 354 mm"
-msgstr "B4 印刷紙，250 x 354 毫米"
+msgstr "B4 印刷紙，250 x 354 公釐"
 
-#: ../src/common/paper.cpp:165
+#: ../src/common/paper.cpp:160
 msgid "B5 (ISO) Extra 201 x 276 mm"
-msgstr ""
+msgstr "B5 (ISO) 加長 201 x 276 公釐"
 
-#: ../src/common/paper.cpp:181
+#: ../src/common/paper.cpp:176
 msgid "B5 (JIS) Rotated 257 x 182 mm"
-msgstr ""
+msgstr "B5 (JIS) 轉向 257 x 182 公釐"
 
-#: ../src/common/paper.cpp:162
-#, fuzzy
+#: ../src/common/paper.cpp:157
 msgid "B5 (JIS) Transverse 182 x 257 mm"
-msgstr "B5 印刷紙，182 x 257 毫米"
+msgstr "B5 (JIS) 橫向 182 x 257 公釐"
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/paper.cpp:130
 msgid "B5 Envelope, 176 x 250 mm"
-msgstr "B5 信封，176 x 250 毫米"
+msgstr "B5 信封，176 x 250 公釐"
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:112
 msgid "B5 sheet, 182 x 257 millimeter"
-msgstr "B5 印刷紙，182 x 257 毫米"
+msgstr "B5 印刷紙，182 x 257 公釐"
 
-#: ../src/common/paper.cpp:189
+#: ../src/common/paper.cpp:184
 msgid "B6 (JIS) 128 x 182 mm"
-msgstr ""
+msgstr "B6 (JIS) 128 x 182 公釐"
 
-#: ../src/common/paper.cpp:190
+#: ../src/common/paper.cpp:185
 msgid "B6 (JIS) Rotated 182 x 128 mm"
-msgstr ""
+msgstr "B6 (JIS) 轉向 182 x 128 公釐"
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:131
 msgid "B6 Envelope, 176 x 125 mm"
-msgstr "B6 信封，176 x 125 毫米"
+msgstr "B6 信封，176 x 125 公釐"
+
+#: ../src/common/menucmn.cpp:67
+msgid "BACK"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:152
+msgid "BIG5"
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
+#: ../src/common/imagbmp.cpp:474 ../src/common/imagbmp.cpp:490
 msgid "BMP: Couldn't allocate memory."
 msgstr "BMP: 無法配置記憶體。"
 
-#: ../src/common/imagbmp.cpp:94
+#: ../src/common/imagbmp.cpp:91
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: 無法儲存無效的影像。"
 
-#: ../src/common/imagbmp.cpp:298
+#: ../src/common/imagbmp.cpp:295
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: 無法寫入 RGB 顏色對應表。"
 
-#: ../src/common/imagbmp.cpp:431
+#: ../src/common/imagbmp.cpp:428
 msgid "BMP: Couldn't write data."
 msgstr "BMP: 無法寫入資料。"
 
-#: ../src/common/imagbmp.cpp:203
+#: ../src/common/imagbmp.cpp:200
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: 無法寫入檔案標頭(Bitmap)。"
 
-#: ../src/common/imagbmp.cpp:224
+#: ../src/common/imagbmp.cpp:221
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: 無法寫入檔案標頭(BitmapInfo)。"
 
-#: ../src/common/imagbmp.cpp:128
+#: ../src/common/imagbmp.cpp:125
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr "BMP: wxImage 沒有自己的 wxPalette。"
 
-#: ../src/common/fmapbase.cpp:116
+#: ../src/mac/carbon/fontdlg.cpp:343 ../src/richtext/richtextformatdlg.cpp:481
+msgid "Background colour"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:118
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語 (ISO-8859-13)"
 
-#: ../src/common/fmapbase.cpp:107
+#: ../src/common/fmapbase.cpp:109
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "波羅的海語 (舊的) (ISO-8859-4)"
 
-#: ../contrib/src/deprecated/resource.cpp:2524
-#, fuzzy, c-format
+#: ../src/richtext/richtextindentspage.cpp:259
+#: ../src/richtext/richtextliststylepage.cpp:432
+msgid "Before a paragraph:"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:288
+#: ../src/richtext/richtextliststylepage.cpp:493
+msgid "Bitmap"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2534
+#, c-format
 msgid "Bitmap resource specification %s not found."
-msgstr "æ²\92æ\9c\89æ\89¾å\88° XRC è³\87æº\90 '%s' (é¡\9eå\88¥ '%s')ï¼\81"
+msgstr "æ\89¾ä¸\8då\88°é»\9eé\99£å\9c\96è¦\8fæ ¼ %sã\80\82"
 
-#: ../src/generic/fontdlgg.cpp:237
+#: ../src/generic/fontdlgg.cpp:240 ../src/mac/carbon/fontdlg.cpp:477
+#: ../src/richtext/richtextfontpage.cpp:226
+#: ../src/richtext/richtextfontpage.cpp:297
+#: ../src/richtext/richtextfontpage.cpp:457
 msgid "Bold"
 msgstr "粗體"
 
-#: ../src/generic/prntdlgg.cpp:892
+#: ../src/generic/prntdlgg.cpp:887
 msgid "Bottom margin (mm):"
-msgstr "底邊距(毫米)："
+msgstr "底邊距(公釐)："
 
-#: ../src/common/paper.cpp:105
+#: ../src/richtext/richtextbulletspage.cpp:191
+#: ../src/richtext/richtextliststylepage.cpp:244
+msgid "Bullet &Alignment:"
+msgstr ""
+
+#: ../src/richtext/richtextliststylepage.cpp:309
+msgid "Bullet style"
+msgstr ""
+
+#: ../src/richtext/richtextformatdlg.cpp:290
+msgid "Bullets"
+msgstr ""
+
+#: ../src/common/paper.cpp:100
 msgid "C sheet, 17 x 22 in"
 msgstr "C 印刷紙, 17 x 22 英吋"
 
-#: ../src/generic/logg.cpp:507
+#: ../src/generic/logg.cpp:508
 msgid "C&lear"
 msgstr "清除(&L)"
 
-#: ../src/generic/fontdlgg.cpp:308
+#: ../src/generic/fontdlgg.cpp:313
 msgid "C&olour:"
-msgstr ""
+msgstr "顏色(&O):"
 
-#: ../src/common/paper.cpp:130
+#: ../src/common/paper.cpp:125
 msgid "C3 Envelope, 324 x 458 mm"
-msgstr "C3 信封，324 x 458 毫米"
+msgstr "C3 信封，324 x 458 公釐"
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:126
 msgid "C4 Envelope, 229 x 324 mm"
-msgstr "C4 信封，229 x 324 毫米"
+msgstr "C4 信封，229 x 324 公釐"
 
-#: ../src/common/paper.cpp:129
+#: ../src/common/paper.cpp:124
 msgid "C5 Envelope, 162 x 229 mm"
-msgstr "C5 信封，162 x 229 毫米"
+msgstr "C5 信封，162 x 229 公釐"
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:127
 msgid "C6 Envelope, 114 x 162 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "C6 信封，114 x 162 公釐"
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:128
 msgid "C65 Envelope, 114 x 229 mm"
-msgstr "C65 信封, 114 x 229 毫米"
+msgstr "C65 信封, 114 x 229 公釐"
+
+#: ../src/common/menucmn.cpp:84
+msgid "CANCEL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:88
+msgid "CAPITAL"
+msgstr ""
 
 #: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
 msgid "CHM handler currently supports only local files!"
 msgstr "CHM 處理常式目前只支援本機檔案！"
 
-#: ../src/os2/thread.cpp:117
+#: ../src/common/menucmn.cpp:85
+msgid "CLEAR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:129
+msgid "COMMAND"
+msgstr ""
+
+#: ../src/os2/thread.cpp:116
 msgid "Can not create mutex."
 msgstr "無法建立 mutex。"
 
-#: ../src/common/filefn.cpp:1297
+#: ../src/common/filefn.cpp:1345
 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "無法列舉檔案 '%s'"
 
-#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
+#: ../src/msw/dir.cpp:201 ../src/unix/dir.cpp:228
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "無法列舉目錄 '%s' 中的檔案"
 
-#: ../src/os2/thread.cpp:519
+#: ../src/os2/thread.cpp:516
 #, c-format
 msgid "Can not resume thread %lu"
 msgstr "無法恢復執行緒 %lu"
 
-#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:827
+#: ../src/mac/classic/thread.cpp:487 ../src/msw/thread.cpp:868
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "無法恢復執行緒 %x"
 
-#: ../src/msw/thread.cpp:498
+#: ../src/msw/thread.cpp:515
 msgid "Can not start thread: error writing TLS."
 msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤。"
 
-#: ../src/os2/thread.cpp:505
+#: ../src/os2/thread.cpp:502
 #, c-format
 msgid "Can not suspend thread %lu"
 msgstr "無法暫停執行緒 %lu"
 
-#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:812
+#: ../src/mac/classic/thread.cpp:460 ../src/msw/thread.cpp:853
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "無法暫停執行緒 %x"
 
-#: ../src/msw/thread.cpp:725
+#: ../src/msw/thread.cpp:772
 msgid "Can not wait for thread termination"
 msgstr "無法等候執行緒終結"
 
-#: ../src/common/cmdproc.cpp:266
+#: ../src/common/cmdproc.cpp:262
 msgid "Can't &Undo "
 msgstr "無法回復(&U)"
 
-#: ../src/common/image.cpp:1939
+#: ../src/common/image.cpp:2624
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "無法檢查影像檔格式 '%s'：檔案不存在。"
 
-#: ../src/msw/registry.cpp:442
+#: ../src/msw/registry.cpp:437
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr "無法關閉登錄機碼 '%s'"
 
-#: ../src/msw/registry.cpp:518
+#: ../src/msw/registry.cpp:513
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr "無法複製不支援類型 %d 的值。"
 
-#: ../src/msw/registry.cpp:423
+#: ../src/msw/registry.cpp:418
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr "無法建立登錄機碼 '%s'"
 
-#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
-#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
-#: ../src/os2/thread.cpp:486
+#: ../src/mac/carbon/mpthread.cpp:906 ../src/mac/classic/thread.cpp:435
+#: ../src/msw/thread.cpp:641 ../src/os2/thread.cpp:483
 msgid "Can't create thread"
 msgstr "無法建立執行緒"
 
-#: ../src/msw/window.cpp:3130
+#: ../src/msw/window.cpp:3397
 #, c-format
 msgid "Can't create window of class %s"
 msgstr "無法建立類別 '%s' 的視窗"
 
-#: ../src/msw/registry.cpp:694
+#: ../src/msw/registry.cpp:689
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr "無法刪除機碼 '%s'"
 
-#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:458
+#: ../src/msw/iniconf.cpp:435 ../src/os2/iniconf.cpp:466
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "無法刪除 INI 檔 '%s'"
 
-#: ../src/msw/registry.cpp:722
+#: ../src/msw/registry.cpp:717
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr "無法刪除機值 '%s' @ '%s'"
 
-#: ../src/msw/registry.cpp:1071
+#: ../src/msw/registry.cpp:1066
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr "無法列舉機碼 '%s' 的子機碼"
 
-#: ../src/msw/registry.cpp:1026
+#: ../src/msw/registry.cpp:1021
 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr "無法列舉機碼 '%s' 的值"
 
-#: ../src/msw/registry.cpp:1288
-#, fuzzy, c-format
+#: ../src/msw/registry.cpp:1283
+#, c-format
 msgid "Can't export value of unsupported type %d."
-msgstr "無法複製不支援類型 %d 的值。"
+msgstr "無法匯出不支援類型 %d 的值。"
 
 #: ../src/common/ffile.cpp:238
 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr "無法在檔案 '%s' 中找到目前位置"
 
-#: ../src/msw/registry.cpp:351
+#: ../src/msw/registry.cpp:346
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "無法取得登錄機碼 '%s' 的資訊"
 
-#: ../src/common/zstream.cpp:237
+#: ../src/common/zstream.cpp:330
 msgid "Can't initialize zlib deflate stream."
 msgstr "無法初始化 zlib 壓縮資料流。"
 
-#: ../src/common/zstream.cpp:99
+#: ../src/common/zstream.cpp:176
 msgid "Can't initialize zlib inflate stream."
 msgstr "無法初始化 zlib 解壓資料流。"
 
-#: ../src/common/image.cpp:1367 ../src/common/image.cpp:1387
+#: ../src/common/image.cpp:2015 ../src/common/image.cpp:2037
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "無法從檔案 '%s' 中載入影像：檔案不存在。"
 
-#: ../src/msw/registry.cpp:387
+#: ../src/msw/registry.cpp:382
 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr "無法開啟登錄機碼 '%s'"
 
-#: ../src/common/zstream.cpp:166
+#: ../src/common/zstream.cpp:246
 #, c-format
 msgid "Can't read from inflate stream: %s"
 msgstr "無法讀取解壓資料流：%s"
 
-#: ../src/common/zstream.cpp:159
+#: ../src/common/zstream.cpp:239
 msgid "Can't read inflate stream: unexpected EOF in underlying stream."
-msgstr "無法讀取解壓資料流：資料流中有不預期的結尾"
+msgstr "無法讀取解壓資料流：資料流中有不預期的結尾。"
 
-#: ../src/msw/registry.cpp:960
+#: ../src/msw/registry.cpp:955
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr "無法讀取 '%s' 的值"
 
-#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:825
-#: ../src/msw/registry.cpp:885
+#: ../src/msw/registry.cpp:790 ../src/msw/registry.cpp:820
+#: ../src/msw/registry.cpp:880
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr "無法讀取機碼 '%s' 的值"
 
-#: ../src/common/image.cpp:1409
+#: ../src/common/image.cpp:2059
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "無法儲存影像到檔案 '%s' 中：未知的附檔名。"
 
-#: ../src/generic/logg.cpp:569 ../src/generic/logg.cpp:1020
+#: ../src/generic/logg.cpp:570 ../src/generic/logg.cpp:1021
 msgid "Can't save log contents to file."
 msgstr "無法將日誌內容儲存到檔案中。"
 
-#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:469
+#: ../src/msw/thread.cpp:597 ../src/os2/thread.cpp:466
 msgid "Can't set thread priority"
 msgstr "無法設定執行緒的優先等級"
 
-#: ../src/msw/registry.cpp:812 ../src/msw/registry.cpp:854
-#: ../src/msw/registry.cpp:975
+#: ../src/msw/registry.cpp:807 ../src/msw/registry.cpp:849
+#: ../src/msw/registry.cpp:970
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr "無法設定 '%s' 的值"
 
-#: ../src/common/zstream.cpp:316
+#: ../src/common/zstream.cpp:414
 #, c-format
 msgid "Can't write to deflate stream: %s"
 msgstr "無法寫入壓縮資料流：%s"
 
-#: ../src/generic/choicdgg.cpp:291 ../src/generic/dirdlgg.cpp:114
-#: ../src/generic/numdlgg.cpp:136 ../src/generic/textdlgg.cpp:120
-#: ../src/gtk/fontdlg.cpp:155 ../src/motif/msgdlg.cpp:204
-#: ../contrib/src/deprecated/proplist.cpp:518
+#: ../src/generic/dirdlgg.cpp:105 ../src/html/htmlhelp.cpp:434
+#: ../src/mac/carbon/msgdlg.cpp:66 ../src/motif/msgdlg.cpp:204
+#: ../src/richtext/richtextstyledlg.cpp:290 ../src/gtk1/fontdlg.cpp:145
+#: ../contrib/src/deprecated/proplist.cpp:514
 msgid "Cancel"
 msgstr "取消"
 
-#: ../src/xrc/xmlres.cpp:1188 ../src/xrc/xmlres.cpp:1236
+#: ../src/xrc/xmlres.cpp:1270 ../src/xrc/xmlres.cpp:1318
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr "無法轉換對話窗單位：未知的對話窗。"
 
-#: ../src/common/strconv.cpp:2665
+#: ../src/common/strconv.cpp:3482
 #, c-format
 msgid "Cannot convert from the charset '%s'!"
 msgstr "無法轉換字集 '%s'！"
 
-#: ../src/msw/dialup.cpp:546
+#: ../src/msw/dialup.cpp:547
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "找不到連線中的撥號連線：%s"
 
-#: ../src/xrc/xmlres.cpp:330
+#: ../src/xrc/xmlres.cpp:347
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "找不到未知控制元件所依附的容器： '%s'。"
 
-#: ../src/xrc/xmlres.cpp:1271
+#: ../src/xrc/xmlres.cpp:1353
 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr "找不到字型節點 '%s'。"
 
-#: ../src/msw/dialup.cpp:851
+#: ../src/msw/dialup.cpp:852
 msgid "Cannot find the location of address book file"
 msgstr "找不到通訊錄的檔案位置。"
 
-#: ../src/unix/threadpsx.cpp:1100
+#: ../src/unix/threadpsx.cpp:1128
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "無法取得排程原則 %d 的優先等級範圍。"
 
-#: ../src/unix/utilsunx.cpp:775
+#: ../src/unix/utilsunx.cpp:802
 msgid "Cannot get the hostname"
 msgstr "無法取得主機名稱。"
 
-#: ../src/unix/utilsunx.cpp:811
+#: ../src/unix/utilsunx.cpp:838
 msgid "Cannot get the official hostname"
 msgstr "無法取得正式的主機名稱。"
 
-#: ../src/msw/dialup.cpp:945
+#: ../src/msw/dialup.cpp:946
 msgid "Cannot hang up - no active dialup connection."
 msgstr "無法掛斷—沒有連線中的撥號連線。"
 
-#: ../include/wx/msw/ole/oleutils.h:47
+#: ../include/wx/msw/ole/oleutils.h:46
 msgid "Cannot initialize OLE"
 msgstr "無法初始化 OLE"
 
-#: ../src/mgl/app.cpp:286
+#: ../src/mgl/app.cpp:282
 msgid "Cannot initialize SciTech MGL!"
 msgstr "無法初始化 SciTech MGL！"
 
-#: ../src/mgl/window.cpp:546
+#: ../src/mgl/window.cpp:547
 msgid "Cannot initialize display."
 msgstr "無法初始化顯示畫面。"
 
-#: ../src/msw/volume.cpp:601
+#: ../src/msw/volume.cpp:600
 #, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "無法從 '%s' 中載入圖示。"
 
-#: ../src/xrc/xmlres.cpp:453
+#: ../src/xrc/xmlres.cpp:478
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "無法從檔案 '%s' 中載入資源。"
 
-#: ../src/html/htmlfilt.cpp:164
+#: ../src/html/htmlfilt.cpp:158
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "無法開啟 HTML 文件：%s"
 
-#: ../src/html/helpdata.cpp:672
+#: ../src/html/helpdata.cpp:665
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "無法開啟 HTML 說明書：%s"
 
-#: ../src/generic/helpext.cpp:123
-#, c-format
-msgid "Cannot open URL '%s'"
-msgstr "無法開啟 URL '%s'"
-
-#: ../src/html/helpdata.cpp:312
+#: ../src/html/helpdata.cpp:305
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "無法開啟目錄檔案： %s"
 
-#: ../src/xrc/xmlres.cpp:421
+#: ../src/xrc/xmlres.cpp:442
 #, c-format
 msgid "Cannot open file '%s'."
-msgstr "無法開啟檔案 '%s'"
+msgstr "無法開啟檔案 '%s'。"
 
-#: ../src/generic/dcpsg.cpp:1569
+#: ../src/generic/dcpsg.cpp:1583
 msgid "Cannot open file for PostScript printing!"
 msgstr "無法開啟檔案進行 PostScript 列印！"
 
-#: ../src/html/helpdata.cpp:326
+#: ../src/html/helpdata.cpp:319
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "無法開啟索引檔： %s"
 
-#: ../src/common/intl.cpp:1203
+#: ../src/common/intl.cpp:1250
 #, c-format
 msgid "Cannot parse Plural-Forms:'%s'"
-msgstr "無法解譯 Plural-Forms：'%s'"
+msgstr "無法解析 Plural-Forms：'%s'"
 
-#: ../src/xrc/xmlres.cpp:1172
+#: ../src/xrc/xmlres.cpp:1254
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
-msgstr "無法從 '%s' 解譯出大小。"
+msgstr "無法從 '%s' 解析出大小。"
 
-#: ../src/xrc/xmlres.cpp:1220
+#: ../src/xrc/xmlres.cpp:1302
 #, c-format
 msgid "Cannot parse dimension from '%s'."
-msgstr "無法從 '%s' 解譯出維度。"
+msgstr "無法從 '%s' 解析出維度。"
 
-#: ../src/html/helpfrm.cpp:1562
+#: ../src/html/helpwnd.cpp:1514
 msgid "Cannot print empty page."
 msgstr "無法列印空頁面。"
 
-#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
+#: ../src/msw/volume.cpp:158 ../src/msw/volume.cpp:490
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "無法從 '%s' 讀取類型名稱！"
 
-#: ../src/unix/threadpsx.cpp:1081
+#: ../src/unix/threadpsx.cpp:1109
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "無法取得執行緒排程原則。"
 
-#: ../src/unix/threadpsx.cpp:729
+#: ../src/unix/threadpsx.cpp:732
 msgid "Cannot start thread: error writing TLS"
 msgstr "無法啟動執行緒：寫入「執行緒內部儲存區」時發生錯誤"
 
-#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:972
 msgid "Cannot wait for thread termination."
-msgstr "無法等候執行緒終結"
+msgstr "不能等候執行緒終止。"
 
-#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:888
 msgid "Cant create the thread event queue"
-msgstr "無法建立執行緒"
+msgstr "不能建立執行緒事件佇列"
 
-#: ../src/html/helpfrm.cpp:534
+#: ../src/html/helpwnd.cpp:511
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
-#: ../src/common/fmapbase.cpp:117
+#: ../src/common/fmapbase.cpp:119
 msgid "Celtic (ISO-8859-14)"
 msgstr "凱爾特語 (ISO-8859-14)"
 
-#: ../src/common/stockitem.cpp:127
+#: ../src/richtext/richtextindentspage.cpp:167
+#: ../src/richtext/richtextliststylepage.cpp:349
+#, fuzzy
+msgid "Cen&tred"
+msgstr "置中對齊"
+
+#: ../src/common/stockitem.cpp:133
 msgid "Centered"
-msgstr ""
+msgstr "置中對齊"
 
-#: ../src/common/fmapbase.cpp:105
+#: ../src/common/fmapbase.cpp:107
 msgid "Central European (ISO-8859-2)"
 msgstr "中歐語系 (ISO-8859-2)"
 
-#: ../src/msw/dialup.cpp:786
+#: ../src/richtext/richtextbulletspage.cpp:196
+#: ../src/richtext/richtextliststylepage.cpp:249
+#, fuzzy
+msgid "Centre"
+msgstr "置中對齊"
+
+#: ../src/richtext/richtextindentspage.cpp:169
+#: ../src/richtext/richtextindentspage.cpp:171
+#: ../src/richtext/richtextliststylepage.cpp:351
+#: ../src/richtext/richtextliststylepage.cpp:353
+#, fuzzy
+msgid "Centre text."
+msgstr "無法建立 mutex。"
+
+#: ../src/richtext/richtextbulletspage.cpp:229
+#: ../src/richtext/richtextliststylepage.cpp:280
+#, fuzzy
+msgid "Ch&oose..."
+msgstr "移到(&G)..."
+
+#: ../src/richtext/richtextbuffer.cpp:2573
+msgid "Change List Style"
+msgstr ""
+
+#: ../src/richtext/richtextbuffer.cpp:1608
+msgid "Change Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:753
+msgid "Character styles"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:170
+#: ../src/richtext/richtextbulletspage.cpp:172
+#: ../src/richtext/richtextliststylepage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:225
+msgid "Check to add a period after the bullet."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:184
+#: ../src/richtext/richtextbulletspage.cpp:186
+#: ../src/richtext/richtextliststylepage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:239
+msgid "Check to add a right parenthesis."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:177
+#: ../src/richtext/richtextbulletspage.cpp:179
+#: ../src/richtext/richtextliststylepage.cpp:230
+#: ../src/richtext/richtextliststylepage.cpp:232
+msgid "Check to enclose the bullet in parentheses."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:479 ../src/mac/carbon/fontdlg.cpp:481
+#, fuzzy
+msgid "Check to make the font bold."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/mac/carbon/fontdlg.cpp:486 ../src/mac/carbon/fontdlg.cpp:488
+#, fuzzy
+msgid "Check to make the font italic."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/mac/carbon/fontdlg.cpp:495 ../src/mac/carbon/fontdlg.cpp:497
+#, fuzzy
+msgid "Check to make the font underlined."
+msgstr "字型是否加底線。"
+
+#: ../src/richtext/richtextstyledlg.cpp:276
+#: ../src/richtext/richtextstyledlg.cpp:278
+msgid "Check to restart numbering."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:787
 msgid "Choose ISP to dial"
 msgstr "選擇 ISP 進行撥號"
 
-#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
-#: ../src/palmos/colordlg.cpp:79
-#, fuzzy
+#: ../src/generic/colrdlgg.cpp:144 ../src/gtk/colordlg.cpp:41
+#: ../src/palmos/colordlg.cpp:74
 msgid "Choose colour"
-msgstr "選擇字型"
+msgstr "選擇顏色"
 
-#: ../src/gtk/fontdlg.cpp:133
+#: ../src/gtk/fontdlg.cpp:107 ../src/gtk1/fontdlg.cpp:126
 msgid "Choose font"
 msgstr "選擇字型"
 
-#: ../src/generic/mdig.cpp:115
+#: ../src/common/module.cpp:78
+#, c-format
+msgid "Circular dependency involving module \"%s\" detected."
+msgstr ""
+
+#: ../src/generic/mdig.cpp:115 ../src/aui/tabmdi.cpp:104
 msgid "Cl&ose"
-msgstr "關閉(&o)"
+msgstr "關閉(&O)"
 
-#: ../src/generic/logg.cpp:507
+#: ../src/generic/logg.cpp:508
 msgid "Clear the log contents"
 msgstr "清除日誌內容"
 
-#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
-msgid "Click to cancel the font selection."
+#: ../src/richtext/richtextstyledlg.cpp:239
+#: ../src/richtext/richtextstyledlg.cpp:241
+#, fuzzy
+msgid "Click to apply the selected style."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextbulletspage.cpp:230
+#: ../src/richtext/richtextbulletspage.cpp:232
+#: ../src/richtext/richtextliststylepage.cpp:281
+#: ../src/richtext/richtextliststylepage.cpp:283
+msgid "Click to browse for a symbol."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
-#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+#: ../src/mac/carbon/fontdlg.cpp:526 ../src/mac/carbon/fontdlg.cpp:528
+#, fuzzy
+msgid "Click to cancel changes to the font."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/generic/fontdlgg.cpp:379 ../src/generic/fontdlgg.cpp:398
+msgid "Click to cancel the font selection."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:291
+#: ../src/richtext/richtextstyledlg.cpp:293
+#, fuzzy
+msgid "Click to cancel this window."
+msgstr "關閉視窗"
+
+#: ../src/mac/carbon/fontdlg.cpp:507 ../src/mac/carbon/fontdlg.cpp:509
+#, fuzzy
+msgid "Click to change the font colour."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextfontpage.cpp:205
+#: ../src/richtext/richtextfontpage.cpp:207
+#, fuzzy
+msgid "Click to change the text colour."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextliststylepage.cpp:194
+#: ../src/richtext/richtextliststylepage.cpp:196
+#, fuzzy
+msgid "Click to choose the font for this level."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:266
+#: ../src/richtext/richtextstyledlg.cpp:268
+#, fuzzy
+msgid "Click to close this window."
+msgstr "關閉視窗"
+
+#: ../src/mac/carbon/fontdlg.cpp:533 ../src/mac/carbon/fontdlg.cpp:535
+#, fuzzy
+msgid "Click to confirm changes to the font."
+msgstr "點擊確認字型選擇。"
+
+#: ../src/generic/fontdlgg.cpp:384 ../src/generic/fontdlgg.cpp:386
+#: ../src/generic/fontdlgg.cpp:391 ../src/generic/fontdlgg.cpp:393
 msgid "Click to confirm the font selection."
+msgstr "點擊確認字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:285
+#: ../src/richtext/richtextstyledlg.cpp:287
+#, fuzzy
+msgid "Click to confirm your selection."
+msgstr "點擊確認字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:219
+#: ../src/richtext/richtextstyledlg.cpp:221
+msgid "Click to create a new character style."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:231
+#: ../src/richtext/richtextstyledlg.cpp:233
+#, fuzzy
+msgid "Click to create a new list style."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:225
+#: ../src/richtext/richtextstyledlg.cpp:227
+msgid "Click to create a new paragraph style."
 msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:92 ../src/generic/progdlgg.cpp:629
-#: ../src/generic/progdlgg.cpp:634 ../contrib/src/deprecated/proplist.cpp:513
+#: ../src/richtext/richtexttabspage.cpp:137
+#: ../src/richtext/richtexttabspage.cpp:139
+#, fuzzy
+msgid "Click to create a new tab position."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtexttabspage.cpp:149
+#: ../src/richtext/richtexttabspage.cpp:151
+#, fuzzy
+msgid "Click to delete all tab positions."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:257
+#: ../src/richtext/richtextstyledlg.cpp:259
+#, fuzzy
+msgid "Click to delete the selected style."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtexttabspage.cpp:143
+#: ../src/richtext/richtexttabspage.cpp:145
+#, fuzzy
+msgid "Click to delete the selected tab position."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:251
+#: ../src/richtext/richtextstyledlg.cpp:253
+#, fuzzy
+msgid "Click to edit the selected style."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/richtext/richtextstyledlg.cpp:245
+#: ../src/richtext/richtextstyledlg.cpp:247
+#, fuzzy
+msgid "Click to rename the selected style."
+msgstr "點擊取消字型選擇。"
+
+#: ../src/generic/dbgrptg.cpp:93 ../src/generic/progdlgg.cpp:658
+#: ../src/generic/progdlgg.cpp:663 ../src/richtext/richtextsymboldlg.cpp:482
+#: ../src/richtext/richtextsymboldlg.cpp:496
+#: ../src/richtext/richtextstyledlg.cpp:264
+#: ../contrib/src/deprecated/proplist.cpp:509
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/univ/themes/win32.cpp:4931
+#: ../src/univ/themes/win32.cpp:3742
 msgid "Close\tAlt-F4"
 msgstr "關閉視窗\tAlt-F4"
 
-#: ../src/generic/mdig.cpp:116
+#: ../src/generic/mdig.cpp:116 ../src/aui/tabmdi.cpp:105
 msgid "Close All"
 msgstr "全部關閉"
 
-#: ../src/generic/logg.cpp:509
+#: ../src/common/stockitem.cpp:211
+msgid "Close current document"
+msgstr ""
+
+#: ../src/generic/logg.cpp:510
 msgid "Close this window"
 msgstr "關閉視窗"
 
-#: ../src/html/helpfrm.cpp:1576
-msgid "Compressed HTML Help file (*.chm)|*.chm|"
-msgstr "壓縮超文件說明檔 (*.chm)|*.chm|"
+#: ../src/richtext/richtextsymboldlg.cpp:483
+#: ../src/richtext/richtextsymboldlg.cpp:485
+#: ../src/richtext/richtextsymboldlg.cpp:497
+#: ../src/richtext/richtextsymboldlg.cpp:499
+msgid "Closes the dialog without inserting a symbol."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:503
+#, fuzzy
+msgid "Colour:"
+msgstr "顏色(&O):"
+
+#: ../src/html/helpwnd.cpp:1528
+msgid "Compressed HTML Help file (*.chm)|*.chm|"
+msgstr "壓縮超文件說明檔 (*.chm)|*.chm|"
 
-#: ../src/generic/dirctrlg.cpp:590
+#: ../src/generic/dirctrlg.cpp:606
 msgid "Computer"
 msgstr "我的電腦"
 
-#: ../src/common/fileconf.cpp:962
+#: ../src/common/fileconf.cpp:996
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "組態項目名稱不能以 '%c' 開頭。"
 
-#: ../src/generic/filedlgg.cpp:1318 ../src/gtk/filedlg.cpp:67
+#: ../src/generic/filedlgg.cpp:1466 ../src/gtk/filedlg.cpp:61
 msgid "Confirm"
 msgstr "確認"
 
-#: ../src/msw/mimetype.cpp:678
+#: ../src/msw/mimetype.cpp:674
 msgid "Confirm registry update"
 msgstr "確認登錄變更"
 
-#: ../src/html/htmlwin.cpp:386
+#: ../src/html/htmlwin.cpp:491
 msgid "Connecting..."
 msgstr "連線中..."
 
-#: ../src/html/helpfrm.cpp:476
+#: ../src/html/htmlhelp.cpp:565 ../src/html/helpwnd.cpp:453
 msgid "Contents"
 msgstr "目錄"
 
-#: ../src/common/strconv.cpp:1416
+#: ../src/common/strconv.cpp:1732
 #, c-format
 msgid "Conversion to charset '%s' doesn't work."
 msgstr "無法轉換到字集 '%s'。"
 
-#: ../src/html/htmlwin.cpp:824
+#: ../src/html/htmlwin.cpp:914
 #, c-format
 msgid "Copied to clipboard:\"%s\""
 msgstr "複製到剪貼簿：\"%s\""
 
-#: ../src/generic/prntdlgg.cpp:242
+#: ../src/generic/prntdlgg.cpp:243
 msgid "Copies:"
 msgstr "份數："
 
+#: ../src/common/stockitem.cpp:203
+#, fuzzy
+msgid "Copy selection"
+msgstr "選取項目"
+
 #: ../src/html/chm.cpp:703
 #, c-format
 msgid "Could not create temporary file '%s'"
@@ -1346,11 +1933,11 @@ msgstr "無法將 %s 解至 %s 中： %s"
 
 #: ../contrib/src/deprecated/resource.cpp:1830
 #: ../contrib/src/deprecated/resource.cpp:1960
-#, fuzzy, c-format
+#, c-format
 msgid "Could not find resource include file %s."
-msgstr "找不到檔案 '%s'。"
+msgstr "找不到資源包含檔案 %s。"
 
-#: ../src/generic/tabg.cpp:1048
+#: ../src/generic/tabg.cpp:1049
 msgid "Could not find tab for id"
 msgstr "找不到識別碼標籤"
 
@@ -1365,6 +1952,8 @@ msgid ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
 " or provide #define (see manual for caveats)"
 msgstr ""
+"不能解析控制項類別或是id '%s'. 用(非零)整數代替\n"
+"或 提供 #define (詳細資訊見手冊)"
 
 #: ../contrib/src/deprecated/resource.cpp:1278
 #, c-format
@@ -1372,231 +1961,322 @@ msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 "or provide #define (see manual for caveats)"
 msgstr ""
+"不能解析選單id '%s'. 用(非零)整數代替\n"
+"或 提供 #define (詳細資訊見手冊)"
 
-#: ../src/common/prntbase.cpp:1272
+#: ../src/common/prntbase.cpp:1520
 msgid "Could not start document preview."
 msgstr "無法啟動文件預覽。"
 
-#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:763
-#: ../src/msw/printwin.cpp:235
+#: ../src/generic/printps.cpp:181 ../src/gtk/gnome/gprint.cpp:773
+#: ../src/msw/printwin.cpp:230
 msgid "Could not start printing."
 msgstr "無法啟動列印。"
 
-#: ../src/common/wincmn.cpp:1498
+#: ../src/common/wincmn.cpp:1398
 msgid "Could not transfer data to window"
 msgstr "無法轉移資料到視窗中。"
 
-#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
-#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
-#, fuzzy
+#: ../src/mac/carbon/mpthread.cpp:222 ../src/mac/carbon/mpthread.cpp:301
 msgid "Could not unlock mutex"
-msgstr "無法釋放 mutex。"
+msgstr "無法解鎖 mutex。"
 
-#: ../src/os2/thread.cpp:150
+#: ../src/os2/thread.cpp:149
 msgid "Couldn't acquire a mutex lock"
 msgstr "無法鎖定 mutex。"
 
-#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
-#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
-#: ../src/msw/imaglist.cpp:188
+#: ../src/msw/dragimag.cpp:156 ../src/msw/dragimag.cpp:196
+#: ../src/msw/imaglist.cpp:147 ../src/msw/imaglist.cpp:165
+#: ../src/msw/imaglist.cpp:177
 msgid "Couldn't add an image to the image list."
 msgstr "無法把影像加到影像清單。"
 
-#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
+#: ../src/msw/timer.cpp:101 ../src/os2/timer.cpp:144
 msgid "Couldn't create a timer"
 msgstr "無法建立計時器。"
 
-#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+#: ../src/mgl/cursor.cpp:132 ../src/mgl/cursor.cpp:163
 msgid "Couldn't create cursor."
 msgstr "無法建立游標。"
 
+#: ../src/mac/carbon/overlay.cpp:113
+#, fuzzy
+msgid "Couldn't create the overlay window"
+msgstr "無法建立計時器。"
+
+#: ../src/mac/carbon/overlay.cpp:157
+#, fuzzy
+msgid "Couldn't end the context on the overlay window"
+msgstr "無法取得目前執行緒指標。"
+
 #: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "在動態連結檔中找不到符號 '%s'。"
 
-#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:853
+#: ../src/mac/classic/thread.cpp:517 ../src/msw/thread.cpp:894
 msgid "Couldn't get the current thread pointer"
 msgstr "無法取得目前執行緒指標。"
 
-#: ../src/common/imagpng.cpp:596
+#: ../src/mac/carbon/overlay.cpp:119
+#, fuzzy
+msgid "Couldn't init the context on the overlay window"
+msgstr "無法取得目前執行緒指標。"
+
+#: ../src/common/imagpng.cpp:621
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "無法載入 PNG 影像—檔案被破壞或是沒有足夠記憶體。"
 
-#: ../src/unix/sound.cpp:472
+#: ../src/unix/sound.cpp:471
 #, c-format
 msgid "Couldn't load sound data from '%s'."
 msgstr "無法從 '%s' 中載入聲音資料。"
 
-#: ../src/unix/sound_sdl.cpp:230
+#: ../src/unix/sound_sdl.cpp:228
 #, c-format
 msgid "Couldn't open audio: %s"
 msgstr "無法開啟聲音檔： '%s'"
 
-#: ../src/msw/ole/dataobj.cpp:147
+#: ../src/msw/ole/dataobj.cpp:143
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr "無法註冊剪貼簿格式 '%s'。"
 
-#: ../src/os2/thread.cpp:167
+#: ../src/os2/thread.cpp:166
 msgid "Couldn't release a mutex"
 msgstr "無法釋放 mutex。"
 
-#: ../src/msw/listctrl.cpp:745
+#: ../src/msw/listctrl.cpp:716
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "無法取得清單控制元件中細項 %d 的資訊。"
 
-#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
-#: ../src/common/imagpng.cpp:659
+#: ../src/common/imagpng.cpp:670 ../src/common/imagpng.cpp:679
+#: ../src/common/imagpng.cpp:687
 msgid "Couldn't save PNG image."
 msgstr "無法儲存 PNG 影像。"
 
-#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
+#: ../src/mac/classic/thread.cpp:775 ../src/msw/thread.cpp:658
 msgid "Couldn't terminate thread"
 msgstr "無法終止執行緒。"
 
-#: ../src/common/xtistrm.cpp:161
+#: ../src/common/xtistrm.cpp:157
 msgid "Create Parameter not found in declared RTTI Parameters"
 msgstr "宣告的 RTTI 參數中沒發現建立的參數"
 
-#: ../src/generic/dirdlgg.cpp:307
+#: ../src/generic/dirdlgg.cpp:315
 msgid "Create directory"
 msgstr "建立目錄"
 
-#: ../src/generic/dirdlgg.cpp:140 ../src/generic/filedlgg.cpp:999
+#: ../src/generic/dirdlgg.cpp:129 ../src/generic/filedlgg.cpp:1088
 msgid "Create new directory"
 msgstr "建立新目錄"
 
-#: ../src/common/stockitem.cpp:114 ../src/mac/carbon/textctrl.cpp:1073
-#: ../src/msw/textctrl.cpp:2063
+#: ../src/common/menucmn.cpp:316
+#, fuzzy
+msgid "Ctrl-"
+msgstr "ctrl"
+
+#: ../src/common/stockitem.cpp:118 ../src/mac/carbon/textctrl.cpp:1117
+#: ../src/msw/textctrl.cpp:2209 ../src/richtext/richtextctrl.cpp:2423
 msgid "Cu&t"
-msgstr "剪下(&t)"
+msgstr "剪下(&T)"
 
-#: ../src/generic/filedlgg.cpp:1010
+#: ../src/generic/filedlgg.cpp:1099
 msgid "Current directory:"
 msgstr "目前目錄："
 
-#: ../src/common/fmapbase.cpp:108
+#: ../src/common/stockitem.cpp:204
+#, fuzzy
+msgid "Cut selection"
+msgstr "選取項目"
+
+#: ../src/common/fmapbase.cpp:110
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫語 (ISO-8859-5)"
 
-#: ../src/common/paper.cpp:106
+#: ../src/common/paper.cpp:101
 msgid "D sheet, 22 x 34 in"
 msgstr "D 印刷紙，22 x 34 英吋"
 
-#: ../src/msw/dde.cpp:631
+#: ../src/msw/dde.cpp:627
 msgid "DDE poke request failed"
 msgstr "「動態資料交換」資料傳送請求失敗"
 
-#: ../src/common/imagbmp.cpp:921
+#: ../src/common/menucmn.cpp:97
+msgid "DECIMAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:65
+msgid "DEL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:66
+msgid "DELETE"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:918
 msgid "DIB Header: Encoding doesn't match bitdepth."
-msgstr "DIB 標頭：編碼型態與色彩位元數不吻合。"
+msgstr "DIB 標頭：編碼型態與顏色位元數不吻合。"
 
-#: ../src/common/imagbmp.cpp:883
+#: ../src/common/imagbmp.cpp:880
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "DIB 標頭：影像高度大於 32767 個圖素。"
 
-#: ../src/common/imagbmp.cpp:877
+#: ../src/common/imagbmp.cpp:874
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "DIB 標頭：影像寬度大於 32767 個圖素。"
 
-#: ../src/common/imagbmp.cpp:897
+#: ../src/common/imagbmp.cpp:894
 msgid "DIB Header: Unknown bitdepth in file."
-msgstr "DIB 標頭：未知的色彩位元數。"
+msgstr "DIB 標頭：未知的顏色位元數。"
 
-#: ../src/common/imagbmp.cpp:907
+#: ../src/common/imagbmp.cpp:904
 msgid "DIB Header: Unknown encoding in file."
 msgstr "DIB 標頭：未知的編碼型態。"
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/menucmn.cpp:98
+#, fuzzy
+msgid "DIVIDE"
+msgstr "<磁碟機>"
+
+#: ../src/common/paper.cpp:123
 msgid "DL Envelope, 110 x 220 mm"
-msgstr "DL 信封，110 x 220 毫米"
+msgstr "DL 信封，110 x 220 公釐"
+
+#: ../src/common/menucmn.cpp:77
+msgid "DOWN"
+msgstr ""
 
-#: ../src/generic/dbgrptg.cpp:295
+#: ../src/generic/dbgrptg.cpp:296
 #, c-format
 msgid "Debug report \"%s\""
-msgstr ""
+msgstr "除錯報告 \"%s\""
 
-#: ../src/common/debugrpt.cpp:203
-#, fuzzy
+#: ../src/common/debugrpt.cpp:209
 msgid "Debug report couldn't be created."
-msgstr "ç\9b®é\8c\84 '%s' ç\84¡æ³\95建ç«\8b"
+msgstr "ç\84¡æ³\95建ç«\8bé\99¤é\8c¯å ±å\91\8aã\80\82"
 
-#: ../src/common/debugrpt.cpp:539
+#: ../src/common/debugrpt.cpp:545
 msgid "Debug report generation has failed."
-msgstr ""
+msgstr "無法產生除錯報告。"
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:230
 msgid "Decorative"
 msgstr "修飾"
 
-#: ../src/common/fmapbase.cpp:681
+#: ../src/common/fmapbase.cpp:657
 msgid "Default encoding"
 msgstr "預設的編碼"
 
-#: ../src/generic/prntdlgg.cpp:506
-#, fuzzy
+#: ../src/generic/prntdlgg.cpp:504
 msgid "Default printer"
-msgstr "預設的編碼"
+msgstr "預設的印表機"
+
+#: ../src/richtext/richtextbuffer.cpp:4827
+#, fuzzy
+msgid "Delete"
+msgstr "刪除(&D)"
+
+#: ../src/richtext/richtexttabspage.cpp:148
+#, fuzzy
+msgid "Delete A&ll"
+msgstr "選擇全部(&A)"
+
+#: ../src/richtext/richtextstyledlg.cpp:736
+#, fuzzy
+msgid "Delete Style"
+msgstr "刪除項目"
 
-#: ../contrib/src/gizmos/editlbox.cpp:160
+#: ../src/richtext/richtextctrl.cpp:560 ../src/richtext/richtextctrl.cpp:589
+#, fuzzy
+msgid "Delete Text"
+msgstr "刪除項目"
+
+#: ../contrib/src/gizmos/editlbox.cpp:156
 msgid "Delete item"
 msgstr "刪除項目"
 
-#: ../src/unix/snglinst.cpp:300
+#: ../src/common/stockitem.cpp:205
+#, fuzzy
+msgid "Delete selection"
+msgstr "選取項目"
+
+#: ../src/richtext/richtextstyledlg.cpp:736
+#, fuzzy, c-format
+msgid "Delete style %s?"
+msgstr "刪除項目"
+
+#: ../src/unix/snglinst.cpp:296
 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "已刪除過時的鎖定檔案 '%s'。"
 
-#: ../src/generic/dirctrlg.cpp:656
+#: ../src/common/module.cpp:124
+#, c-format
+msgid "Dependency \"%s\" of module \"%s\" doesn't exist."
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:672
 msgid "Desktop"
+msgstr "桌面"
+
+#: ../src/generic/aboutdlgg.cpp:70
+msgid "Developed by "
 msgstr ""
 
-#: ../src/msw/dialup.cpp:395
+#: ../src/msw/dialup.cpp:396
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr "由於遠端存取服務（RAS）沒有安裝，撥號功能無法使用。請先安裝它。"
 
-#: ../src/generic/tipdlg.cpp:246
+#: ../src/generic/tipdlg.cpp:242
 msgid "Did you know..."
 msgstr "您知道嗎..."
 
-#: ../src/motif/filedlg.cpp:225
-#, fuzzy
+#: ../src/dfb/wrapdfb.cpp:59
+#, c-format
+msgid "DirectFB error %d occured."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:222
 msgid "Directories"
-msgstr "修飾"
+msgstr "目錄"
 
-#: ../src/common/filefn.cpp:1177
+#: ../src/common/filefn.cpp:1219
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "目錄 '%s' 無法建立"
 
-#: ../src/mgl/dirmgl.cpp:217
+#: ../src/mgl/dirmgl.cpp:211
 #, c-format
 msgid "Directory '%s' doesn't exist!"
 msgstr "目錄 '%s' 不存在！"
 
-#: ../src/generic/dirdlgg.cpp:226
+#: ../src/generic/dirdlgg.cpp:231
 msgid "Directory does not exist"
 msgstr "目錄不存在"
 
-#: ../src/generic/filedlgg.cpp:1295
+#: ../src/generic/filedlgg.cpp:1444
 msgid "Directory doesn't exist."
 msgstr "目錄不存在。"
 
-#: ../src/html/helpfrm.cpp:503
+#: ../src/html/helpwnd.cpp:480
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "顯示包含該字串的所有索引項目。搜尋不分大小寫。"
 
-#: ../src/html/helpfrm.cpp:685
+#: ../src/html/helpwnd.cpp:671
 msgid "Display options dialog"
 msgstr "顯示選項對話方塊"
 
-#: ../src/msw/mimetype.cpp:671
+#: ../src/html/helpwnd.cpp:335
+msgid "Displays help as you browse the books on the left."
+msgstr ""
+
+#: ../src/msw/mimetype.cpp:667
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -1611,166 +2291,193 @@ msgstr ""
 "新的值是\n"
 "%s %1"
 
-#: ../src/common/docview.cpp:464
+#: ../src/common/docview.cpp:459
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "您想儲存文件 %s 的修改？"
 
-#: ../src/common/sizer.cpp:1839
-msgid "Don't Save"
+#: ../src/generic/aboutdlgg.cpp:73
+msgid "Documentation by "
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
+#: ../src/common/sizer.cpp:2019
+msgid "Don't Save"
+msgstr "不儲存"
+
+#: ../src/html/htmlwin.cpp:556 ../src/msw/frame.cpp:195
 msgid "Done"
 msgstr "完成"
 
-#: ../src/generic/progdlgg.cpp:433
+#: ../src/generic/progdlgg.cpp:424
 msgid "Done."
 msgstr "完成。"
 
-#: ../src/common/paper.cpp:183
+#: ../src/common/paper.cpp:178
 msgid "Double Japanese Postcard Rotated 148 x 200 mm"
-msgstr ""
+msgstr "雙倍日式明信片轉向 148 x 200 mm"
 
-#: ../src/common/xtixml.cpp:271
+#: ../src/common/xtixml.cpp:268
 #, c-format
 msgid "Doubly used id : %d"
 msgstr "id 重複：%d"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:151
 msgid "Down"
 msgstr "下"
 
-#: ../src/common/paper.cpp:107
+#: ../src/common/paper.cpp:102
 msgid "E sheet, 34 x 44 in"
 msgstr "E 紙張, 34 x 44 英吋"
 
-#: ../contrib/src/gizmos/editlbox.cpp:158
+#: ../src/common/menucmn.cpp:79
+msgid "END"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:70
+msgid "ENTER"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:82
+msgid "ESC"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:83
+msgid "ESCAPE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:91
+msgid "EXECUTE"
+msgstr ""
+
+#: ../contrib/src/gizmos/editlbox.cpp:154
 msgid "Edit item"
 msgstr "編輯項目"
 
-#: ../src/generic/progdlgg.cpp:194
+#: ../src/generic/progdlgg.cpp:190
 msgid "Elapsed time : "
 msgstr "歷時︰"
 
-#: ../src/common/prntbase.cpp:846
+#: ../src/richtext/richtextstyledlg.cpp:570
+msgid "Enter a character style name"
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:772
+msgid "Enter a list style name"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1072
 #, c-format
 msgid "Enter a page number between %d and %d:"
 msgstr "輸入介於 %d 到 %d 的頁碼"
 
-#: ../src/generic/dbgrptg.cpp:169
-#, fuzzy, c-format
+#: ../src/richtext/richtextstyledlg.cpp:618
+msgid "Enter a paragraph style name"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:170
+#, c-format
 msgid "Enter command to open file \"%s\":"
-msgstr "無法開啟檔案 '%s'"
+msgstr "輸入命令以開啟檔案 \"%s\":"
 
-#: ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:462
 msgid "Entries found"
 msgstr "找到的項目"
 
-#: ../src/common/paper.cpp:149
-#, fuzzy
+#: ../src/common/paper.cpp:144
 msgid "Envelope Invite 220 x 220 mm"
-msgstr "DL 信封，110 x 220 毫米"
+msgstr "邀請信封 220 x 220 公釐"
 
-#: ../src/common/config.cpp:384
-#, fuzzy, c-format
+#: ../src/common/config.cpp:402
+#, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %u in '%s'."
-msgstr "ç\84¡æ³\95å±\95é\96\8bç\92°å¢\83è®\8aæ\95¸ï¼\9a'%c' æ²\92æ\9c\89å\87ºç\8f¾å\9c¨ä½\8dç½® %d @ '%s'。"
-
-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/dirctrlg.cpp:707
-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:744
-#: ../src/generic/filedlgg.cpp:758 ../src/generic/filedlgg.cpp:772
-#: ../src/generic/filedlgg.cpp:1269 ../src/generic/filedlgg.cpp:1295
-#: ../src/generic/filedlgg.cpp:1325 ../src/gtk/fontdlg.cpp:81
+msgstr "ç\92°å¢\83è®\8aæ\95¸æ\93´å\85\85失æ\95\97:  '%c' æ²\92æ\9c\89å\87ºç\8f¾å\9c¨ä½\8dç½® %u / '%s'。"
+
+#: ../src/generic/dirctrlg.cpp:708 ../src/generic/dirctrlg.cpp:726
+#: ../src/generic/dirctrlg.cpp:737 ../src/generic/dirdlgg.cpp:350
+#: ../src/generic/filedlgg.cpp:712 ../src/generic/filedlgg.cpp:830
+#: ../src/generic/filedlgg.cpp:844 ../src/generic/filedlgg.cpp:862
+#: ../src/generic/filedlgg.cpp:1416 ../src/generic/filedlgg.cpp:1444
+#: ../src/generic/filedlgg.cpp:1472 ../src/gtk1/fontdlg.cpp:75
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/msdos/utilsdos.cpp:213 ../src/unix/utilsunx.cpp:1090
-#: ../src/unix/utilsunx.cpp:1098
-msgid "Error "
-msgstr "錯誤"
-
-#: ../src/generic/dirdlgg.cpp:241
+#: ../src/generic/dirdlgg.cpp:249
 msgid "Error creating directory"
 msgstr "建立目錄錯誤"
 
-#: ../src/common/imagbmp.cpp:930
-msgid "Error in reading image DIB ."
+#: ../src/common/imagbmp.cpp:927
+#, fuzzy
+msgid "Error in reading image DIB."
 msgstr "讀取影像 DIB 時發生錯誤。"
 
 #: ../src/common/fileconf.cpp:504
 msgid "Error reading config options."
 msgstr "讀取設定選項時發生錯誤。"
 
-#: ../src/common/fileconf.cpp:1050
-#, fuzzy
+#: ../src/common/fileconf.cpp:1084
 msgid "Error saving user configuration data."
-msgstr "讀取設定選項時發生錯誤。"
+msgstr "儲存使用者配置資料錯誤。"
 
-#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+#: ../src/mac/carbon/mpthread.cpp:477
 msgid "Error while waiting on semaphore"
-msgstr ""
+msgstr "等待信號量時發生錯誤"
 
-#: ../src/common/log.cpp:476
+#: ../src/common/log.cpp:441
 msgid "Error: "
 msgstr "錯誤︰"
 
-#: ../src/common/fmapbase.cpp:106
+#: ../src/common/fmapbase.cpp:108
 msgid "Esperanto (ISO-8859-3)"
 msgstr "世界語 (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:202
+#: ../src/generic/progdlgg.cpp:198
 msgid "Estimated time : "
 msgstr "估計時間︰"
 
-#: ../src/generic/dbgrptg.cpp:229
+#: ../src/generic/dbgrptg.cpp:230
 msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
-msgstr ""
+msgstr "可執行檔案 (*.exe)|*.exe|所有檔案 (*.*)|*.*||"
 
-#: ../src/msw/utilsexc.cpp:753
+#: ../src/msw/utilsexc.cpp:765
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "指令 '%s' 執行失敗"
 
-#: ../src/os2/utilsexc.cpp:165
+#: ../src/os2/utilsexc.cpp:163
 #, c-format
 msgid "Execution of command '%s' failed with error: %ul"
 msgstr "指令 '%s' 執行失敗，錯誤碼：%ul"
 
-#: ../src/common/paper.cpp:112
+#: ../src/common/paper.cpp:107
 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
+#: ../contrib/src/deprecated/resource.cpp:3101
 msgid "Expected '*' while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr "解析資源時原本期望為 '*'。"
 
 #: ../contrib/src/deprecated/resource.cpp:1886
 #: ../contrib/src/deprecated/resource.cpp:2015
-#: ../contrib/src/deprecated/resource.cpp:3108
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3118
 msgid "Expected '=' while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr "解析資源時原本期望為 '='。"
 
 #: ../contrib/src/deprecated/resource.cpp:1855
 #: ../contrib/src/deprecated/resource.cpp:1985
-#: ../contrib/src/deprecated/resource.cpp:3077
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3087
 msgid "Expected 'char' while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr "解析資源時原本期望為 'char'。"
 
-#: ../src/msw/registry.cpp:1140
+#: ../src/msw/registry.cpp:1135
 #, c-format
 msgid ""
 "Exporting registry key: file \"%s\" already exists and won't be overwritten."
-msgstr ""
+msgstr "導出註冊鍵: 檔案 \"%s\"已經存在, 無法覆寫。"
 
-#: ../src/common/fmapbase.cpp:143
+#: ../src/common/fmapbase.cpp:150
 msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 msgstr "延伸的 Unix 日本頁碼 (EUC-JP)"
 
@@ -1779,12 +2486,16 @@ msgstr "延伸的 Unix 日本頁碼 (EUC-JP)"
 msgid "Extraction of '%s' into '%s' failed."
 msgstr "無法將 '%s' 解開至 '%s' 中。"
 
-#: ../src/msw/dialup.cpp:880
+#: ../src/common/menucmn.cpp:251 ../src/common/menucmn.cpp:325
+msgid "F"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:881
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "%s 撥號連線失敗：%s"
 
-#: ../src/unix/snglinst.cpp:274
+#: ../src/unix/snglinst.cpp:270
 msgid "Failed to access lock file."
 msgstr "無法存取鎖定檔。"
 
@@ -1793,101 +2504,101 @@ msgstr "無法存取鎖定檔。"
 msgid "Failed to allocated %luKb of memory for bitmap data."
 msgstr "無法配置 %luKb 的記憶體存放點陣圖資料。"
 
-#: ../src/unix/displayx11.cpp:224
+#: ../src/unix/displayx11.cpp:226
 msgid "Failed to change video mode"
 msgstr "變更顯示模式失敗"
 
-#: ../src/common/debugrpt.cpp:237
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:243
+#, c-format
 msgid "Failed to clean up debug report directory \"%s\""
-msgstr "無法建立目錄 %s/.gnome。"
+msgstr "無法清除除錯報告目錄 \"%s\""
 
-#: ../src/common/filename.cpp:191
+#: ../src/common/filename.cpp:190
 msgid "Failed to close file handle"
 msgstr "無法關閉檔案"
 
-#: ../src/unix/snglinst.cpp:339
+#: ../src/unix/snglinst.cpp:335
 #, c-format
 msgid "Failed to close lock file '%s'"
 msgstr "無法關閉鎖定檔案 '%s'"
 
-#: ../src/msw/clipbrd.cpp:119
+#: ../src/msw/clipbrd.cpp:113
 msgid "Failed to close the clipboard."
 msgstr "無法關閉剪貼簿。"
 
-#: ../src/msw/dialup.cpp:820
+#: ../src/x11/utils.cpp:264
+#, fuzzy, c-format
+msgid "Failed to close the display \"%s\""
+msgstr "無法關閉剪貼簿。"
+
+#: ../src/msw/dialup.cpp:821
 msgid "Failed to connect: missing username/password."
 msgstr "連線失敗：缺少使用者名稱或密碼。"
 
-#: ../src/msw/dialup.cpp:766
+#: ../src/msw/dialup.cpp:767
 msgid "Failed to connect: no ISP to dial."
 msgstr "連線失敗：沒有可撥號的 ISP。"
 
-#: ../src/msw/registry.cpp:626
+#: ../src/common/textfile.cpp:135
+#, fuzzy
+msgid "Failed to convert file contents to Unicode."
+msgstr "無法關閉檔案"
+
+#: ../src/msw/registry.cpp:621
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr "無法複製登錄機值 '%s'"
 
-#: ../src/msw/registry.cpp:635
+#: ../src/msw/registry.cpp:630
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "無法複製登錄機碼 '%s' 的內容到 '%s'。"
 
-#: ../src/common/filefn.cpp:1003
+#: ../src/common/filefn.cpp:1034
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "無法複製檔案 '%s' 到 '%s'"
 
-#: ../src/msw/registry.cpp:613
-#, fuzzy, c-format
+#: ../src/msw/registry.cpp:608
+#, c-format
 msgid "Failed to copy the registry subkey '%s' to '%s'."
-msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
+msgstr "複製註冊表子鍵 '%s'至 '%s'失敗。"
 
-#: ../src/msw/dde.cpp:989
+#: ../src/msw/dde.cpp:984
 msgid "Failed to create DDE string"
 msgstr "無法建立「動態資料交換」字串"
 
-#: ../src/msw/mdi.cpp:473
+#: ../src/msw/mdi.cpp:463
 msgid "Failed to create MDI parent frame."
 msgstr "無法建立 MDI 主框架。"
 
-#: ../src/msw/statbr95.cpp:112
+#: ../src/msw/statbr95.cpp:108
 msgid "Failed to create a status bar."
 msgstr "無法建立狀態列。"
 
-#: ../src/common/filename.cpp:766
+#: ../src/common/filename.cpp:822
 msgid "Failed to create a temporary file name"
 msgstr "無法產生暫存檔的檔名"
 
-#: ../src/msw/utilsexc.cpp:227
+#: ../src/msw/utilsexc.cpp:225
 msgid "Failed to create an anonymous pipe"
 msgstr "無法建立匿名管道"
 
-#: ../src/msw/dde.cpp:447
+#: ../src/msw/dde.cpp:442
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "無法建立連線到伺服器 '%s' 的主旨 '%s'"
 
-#: ../src/msw/cursor.cpp:218
+#: ../src/msw/cursor.cpp:215
 msgid "Failed to create cursor."
 msgstr "無法建立游標。"
 
-#: ../src/common/debugrpt.cpp:202
-#, fuzzy, c-format
-msgid "Failed to create directory \"%s\""
-msgstr "無法建立目錄 %s/.gnome。"
-
-#: ../src/unix/mimetype.cpp:370
+#: ../src/common/debugrpt.cpp:208
 #, c-format
-msgid "Failed to create directory %s/.gnome."
-msgstr "無法建立目錄 %s/.gnome。"
-
-#: ../src/unix/mimetype.cpp:379
-#, c-format
-msgid "Failed to create directory %s/mime-info."
-msgstr "無法建立目錄 %s/mime-info。"
+msgid "Failed to create directory \"%s\""
+msgstr "無法建立目錄 \"%s\""
 
-#: ../src/generic/dirdlgg.cpp:239
+#: ../src/generic/dirdlgg.cpp:247
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
@@ -1896,35 +2607,34 @@ msgstr ""
 "無法建立目錄 '%s'\n"
 "(您是否有足夠的權限？)"
 
-#: ../src/msw/mimetype.cpp:193
+#: ../src/msw/mimetype.cpp:189
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 msgstr "無法為 '%s' 檔案建立登錄項目。"
 
-#: ../src/msw/fdrepdlg.cpp:474
+#: ../src/msw/fdrepdlg.cpp:472
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr "無法建立標準的「尋找/置換」對話窗 (錯誤碼 %d)"
 
-#: ../src/html/winpars.cpp:549
+#: ../src/html/winpars.cpp:587
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "無法以編碼 %s 顯示 HTML 文件"
 
-#: ../src/mac/carbon/clipbrd.cpp:194 ../src/mac/classic/clipbrd.cpp:185
-#: ../src/msw/clipbrd.cpp:131
+#: ../src/mac/classic/clipbrd.cpp:187 ../src/msw/clipbrd.cpp:125
 msgid "Failed to empty the clipboard."
 msgstr "無法清空剪貼簿。"
 
-#: ../src/unix/displayx11.cpp:201
+#: ../src/unix/displayx11.cpp:203
 msgid "Failed to enumerate video modes"
 msgstr "無法列舉顯示模式"
 
-#: ../src/msw/dde.cpp:650
+#: ../src/msw/dde.cpp:646
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "無法建立與「動態資料交換」伺服器溝通的連結"
 
-#: ../src/msw/dialup.cpp:658
+#: ../src/msw/dialup.cpp:659
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "無法建立撥號連線：%s"
@@ -1934,11 +2644,11 @@ msgstr "無法建立撥號連線：%s"
 msgid "Failed to execute '%s'\n"
 msgstr "無法執行 '%s'\n"
 
-#: ../src/common/debugrpt.cpp:666
+#: ../src/common/debugrpt.cpp:672
 msgid "Failed to execute curl, please install it in PATH."
-msgstr ""
+msgstr "無法執行curl, 請在PATH變數所指的目錄中安裝curl。"
 
-#: ../contrib/src/deprecated/resource.cpp:2489
+#: ../contrib/src/deprecated/resource.cpp:2499
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
@@ -1947,7 +2657,7 @@ msgstr ""
 "找不到 XBM 資源 %s。\n"
 "忘記使用 wxResourceLoadBitmapData？"
 
-#: ../contrib/src/deprecated/resource.cpp:2643
+#: ../contrib/src/deprecated/resource.cpp:2653
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
@@ -1956,7 +2666,7 @@ msgstr ""
 "找不到 XBM 資源 %s。\n"
 "忘記使用 wxResourceLoadIconData？"
 
-#: ../contrib/src/deprecated/resource.cpp:2504
+#: ../contrib/src/deprecated/resource.cpp:2514
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
@@ -1965,68 +2675,78 @@ msgstr ""
 "找不到 XPM 資源 %s。\n"
 "忘記使用 wxResourceLoadBitmapData？"
 
-#: ../src/msw/dialup.cpp:718
+#: ../src/common/regex.cpp:425 ../src/common/regex.cpp:473
+#, fuzzy, c-format
+msgid "Failed to find match for regular expression: %s"
+msgstr "無法搜尋與正規運算式 '%s' 相符的字串：%s"
+
+#: ../src/msw/dialup.cpp:719
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "無法取得 ISP 名稱：%s"
 
-#: ../src/mac/carbon/clipbrd.cpp:143 ../src/mac/classic/clipbrd.cpp:134
+#: ../src/mac/classic/clipbrd.cpp:136
 msgid "Failed to get clipboard data."
 msgstr "無法取得剪貼簿資料。"
 
-#: ../src/msw/clipbrd.cpp:723
+#: ../src/msw/clipbrd.cpp:731
 msgid "Failed to get data from the clipboard"
 msgstr "無法從剪貼簿取得資料"
 
-#: ../src/common/stopwatch.cpp:233
+#: ../src/common/stopwatch.cpp:231
 msgid "Failed to get the local system time"
 msgstr "無法取得系統的當地時間"
 
-#: ../src/common/filefn.cpp:1430
+#: ../src/common/filefn.cpp:1478
 msgid "Failed to get the working directory"
 msgstr "無法取得工作目錄"
 
-#: ../src/univ/theme.cpp:122
+#: ../src/univ/theme.cpp:114
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr "無法初始化圖形使用者介面：沒有找到內建的主題。"
 
-#: ../src/msw/helpchm.cpp:69
+#: ../src/msw/helpchm.cpp:64
 msgid "Failed to initialize MS HTML Help."
 msgstr "無法初始化 MS HTML Help。"
 
-#: ../src/msw/glcanvas.cpp:809
+#: ../src/msw/glcanvas.cpp:653
 msgid "Failed to initialize OpenGL"
 msgstr "無法初始化 OpenGL"
 
-#: ../src/unix/snglinst.cpp:246
-#, fuzzy, c-format
+#: ../src/gtk/textctrl.cpp:1006
+#, fuzzy
+msgid "Failed to insert text in the control."
+msgstr "無法取得工作目錄"
+
+#: ../src/unix/snglinst.cpp:242
+#, c-format
 msgid "Failed to inspect the lock file '%s'"
-msgstr "無法鎖定檔案 '%s'"
+msgstr "檢查上鎖檔案 '%s'失敗"
 
-#: ../src/unix/threadpsx.cpp:897
+#: ../src/unix/threadpsx.cpp:910
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "無法停止執行緒，偵測到潛在的記憶體流失 - 請重新啟動程式"
 
-#: ../src/msw/utils.cpp:703
+#: ../src/msw/utils.cpp:725
 #, c-format
 msgid "Failed to kill process %d"
 msgstr "無法刪除程序 %d"
 
-#: ../src/common/iconbndl.cpp:72
+#: ../src/common/iconbndl.cpp:66
 #, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "無法載入影像 %d—檔案 '%s'。"
 
-#: ../src/msw/enhmeta.cpp:84
-#, fuzzy, c-format
+#: ../src/msw/enhmeta.cpp:80
+#, c-format
 msgid "Failed to load metafile from file \"%s\"."
-msgstr "無法載入影像 %d—檔案 '%s'。"
+msgstr "從檔案 \"%s\"讀取元檔案失敗。"
 
-#: ../src/msw/volume.cpp:312
+#: ../src/msw/volume.cpp:310
 msgid "Failed to load mpr.dll."
-msgstr "無法載入 mpr.dll"
+msgstr "無法載入 mpr.dll。"
 
 #: ../src/common/dynlib.cpp:133
 #, c-format
@@ -2038,22 +2758,17 @@ msgstr "無法載入共享函式庫 '%s'"
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "無法載入共享函式庫 '%s'，發生 '%s' 錯誤"
 
-#: ../src/unix/snglinst.cpp:203
+#: ../src/unix/snglinst.cpp:199
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr "無法鎖定檔案 '%s'"
 
-#: ../src/common/regex.cpp:300
-#, c-format
-msgid "Failed to match '%s' in regular expression: %s"
-msgstr "無法搜尋與正規運算式 '%s' 相符的字串：%s"
-
-#: ../src/common/filename.cpp:1918
+#: ../src/common/filename.cpp:2183
 #, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "無法變更檔案 '%s' 的檔案日期"
 
-#: ../src/common/filename.cpp:179
+#: ../src/common/filename.cpp:178
 #, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "無法開啟 '%s'—%s"
@@ -2063,19 +2778,24 @@ msgstr "無法開啟 '%s'—%s"
 msgid "Failed to open CHM archive '%s'."
 msgstr "無法開啟 '%s' CHM 檔。"
 
-#: ../src/common/filename.cpp:788
+#: ../src/x11/utils.cpp:280
+#, fuzzy, c-format
+msgid "Failed to open display \"%s\"."
+msgstr "無法開啟 '%s'—%s"
+
+#: ../src/common/filename.cpp:857
 msgid "Failed to open temporary file."
 msgstr "無法開啟暫存檔。"
 
-#: ../src/msw/clipbrd.cpp:99
+#: ../src/msw/clipbrd.cpp:93
 msgid "Failed to open the clipboard."
 msgstr "無法開啟剪貼簿。"
 
-#: ../src/msw/clipbrd.cpp:626
+#: ../src/msw/clipbrd.cpp:634
 msgid "Failed to put data on the clipboard"
 msgstr "無法存放資料到剪貼簿。"
 
-#: ../src/unix/snglinst.cpp:283
+#: ../src/unix/snglinst.cpp:279
 msgid "Failed to read PID from lock file."
 msgstr "無法從鎖定的檔案中讀出「程序識別碼」。"
 
@@ -2083,64 +2803,70 @@ msgstr "無法從鎖定的檔案中讀出「程序識別碼」。"
 msgid "Failed to redirect child process input/output"
 msgstr "無法轉向子程序的「輸入/輸出」"
 
-#: ../src/msw/utilsexc.cpp:653
+#: ../src/msw/utilsexc.cpp:651
 msgid "Failed to redirect the child process IO"
 msgstr "無法轉向子程序的「輸入/輸出」"
 
-#: ../src/msw/dde.cpp:297
+#: ../src/msw/dde.cpp:292
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "無法註冊「動態資料交換」伺服器 '%s'"
 
-#: ../src/msw/glcanvas.cpp:363
-#, fuzzy
+#: ../src/msw/glcanvas.cpp:331
 msgid "Failed to register OpenGL window class."
-msgstr "無法初始化 OpenGL"
+msgstr "不能註冊 OpenGL視窗類別。"
 
-#: ../src/common/fontmap.cpp:246
+#: ../src/common/fontmap.cpp:243
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "無法記憶字集 '%s' 的編碼。"
 
-#: ../src/common/debugrpt.cpp:220
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:226
+#, c-format
 msgid "Failed to remove debug report file \"%s\""
-msgstr "無法移除鎖定中的檔案 '%s'"
+msgstr "不能刪除除錯報告檔案 \"%s\""
 
-#: ../src/unix/snglinst.cpp:327
+#: ../src/unix/snglinst.cpp:323
 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "無法移除鎖定中的檔案 '%s'"
 
-#: ../src/unix/snglinst.cpp:293
+#: ../src/unix/snglinst.cpp:289
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr "無法移除過時的鎖定檔案 '%s'。"
 
-#: ../src/msw/registry.cpp:464
+#: ../src/msw/registry.cpp:459
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr "無法將登錄值 '%s' 更名為 '%s'。"
 
-#: ../src/msw/registry.cpp:568
+#: ../src/common/filefn.cpp:1137
+#, c-format
+msgid ""
+"Failed to rename the file '%s' to '%s' because the destination file already "
+"exists."
+msgstr ""
+
+#: ../src/msw/registry.cpp:563
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "無法將登錄機碼 '%s' 更名為 '%s'。"
 
-#: ../src/msw/clipbrd.cpp:503
+#: ../src/msw/clipbrd.cpp:497
 msgid "Failed to retrieve data from the clipboard."
 msgstr "無法從剪貼簿取得資料。"
 
-#: ../src/common/filename.cpp:2011
+#: ../src/common/filename.cpp:2276
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "無法取得檔案 '%s' 的各項時間屬性"
 
-#: ../src/msw/dialup.cpp:491
+#: ../src/msw/dialup.cpp:492
 msgid "Failed to retrieve text of RAS error message"
 msgstr "無法取得 RAS 錯誤訊息的對應文字"
 
-#: ../src/msw/clipbrd.cpp:760
+#: ../src/msw/clipbrd.cpp:768
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "無法取得支援的剪貼簿格式"
 
@@ -2149,106 +2875,108 @@ msgstr "無法取得支援的剪貼簿格式"
 msgid "Failed to save the bitmap image to file \"%s\"."
 msgstr "無法儲存點陣圖至 \"%s\" 檔案中。"
 
-#: ../src/msw/dde.cpp:695
+#: ../src/msw/dde.cpp:692
 msgid "Failed to send DDE advise notification"
 msgstr "無法傳送「動態資料交換」連結通知訊息"
 
-#: ../src/common/ftp.cpp:384
+#: ../src/common/ftp.cpp:380
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "無法設定檔案傳輸模式為%s。"
 
-#: ../src/msw/clipbrd.cpp:379
+#: ../src/msw/clipbrd.cpp:373
 msgid "Failed to set clipboard data."
 msgstr "無法設定剪貼簿資料。"
 
-#: ../src/unix/snglinst.cpp:186
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:182
+#, c-format
 msgid "Failed to set permissions on lock file '%s'"
-msgstr "無法設定檔案 '%s' 的存取權限 "
+msgstr "在上鎖檔案 '%s'上設定許可權限時失敗"
 
-#: ../src/common/file.cpp:523
+#: ../src/common/file.cpp:517
 msgid "Failed to set temporary file permissions"
 msgstr "無法設定暫存檔的存取權限"
 
-#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
+#: ../src/gtk/textctrl.cpp:948
+#, fuzzy
+msgid "Failed to set text in the text control."
+msgstr "無法取得工作目錄"
+
+#: ../src/unix/threadpsx.cpp:1253 ../src/unix/threadpsx.cpp:1263
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "無法設定執行緒的優先等級為%d。"
 
-#: ../src/common/fs_mem.cpp:231
+#: ../src/common/fs_mem.cpp:219
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "無法將影像 '%s' 存到「記憶體虛擬檔案系統」！"
 
-#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
-#: ../src/unix/threadpsx.cpp:1429
+#: ../src/mac/carbon/mpthread.cpp:1268 ../src/unix/threadpsx.cpp:1436
 msgid "Failed to terminate a thread."
 msgstr "無法終止執行緒。"
 
-#: ../src/msw/dde.cpp:669
+#: ../src/msw/dde.cpp:665
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "無法終止與「動態資料交換」伺服器溝通的連結"
 
-#: ../src/msw/dialup.cpp:955
+#: ../src/msw/dialup.cpp:956
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "無法終止撥號連線：%s"
 
-#: ../src/common/filename.cpp:1933
+#: ../src/common/filename.cpp:2198
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "無法更新檔案 '%s' 的修改時間"
 
-#: ../src/unix/snglinst.cpp:333
+#: ../src/unix/snglinst.cpp:329
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr "無法解除鎖定檔案 '%s'"
 
-#: ../src/msw/dde.cpp:318
+#: ../src/msw/dde.cpp:313
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "無法撤銷「動態資料交換」伺服器 '%s' 的註冊"
 
-#: ../src/common/fileconf.cpp:1023
-#, fuzzy
+#: ../src/common/fileconf.cpp:1057
 msgid "Failed to update user configuration file."
-msgstr "無法開啟使用者組態檔案。"
+msgstr "不能更新使用者配置檔案。"
 
-#: ../src/common/debugrpt.cpp:679
-#, fuzzy, c-format
+#: ../src/common/debugrpt.cpp:685
+#, c-format
 msgid "Failed to upload the debug report (error code %d)."
-msgstr "無法建立標準的「尋找/置換」對話窗 (錯誤碼 %d)"
+msgstr "上傳除錯報告失敗 (錯誤代號 %d)。"
 
-#: ../src/unix/snglinst.cpp:173
+#: ../src/unix/snglinst.cpp:169
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "無法寫入鎖定檔案 '%s'"
 
-#: ../src/generic/logg.cpp:394
+#: ../src/generic/logg.cpp:395
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../src/common/log.cpp:465
+#: ../src/common/log.cpp:430
 msgid "Fatal error: "
 msgstr "致命的錯誤︰"
 
-#: ../src/msw/wince/filedlgwce.cpp:120
-#, fuzzy
+#: ../src/msw/wince/filedlgwce.cpp:119
 msgid "File"
-msgstr "檔案(&F)"
+msgstr "檔案"
 
-#: ../src/mgl/bitmap.cpp:544
+#: ../src/mgl/bitmap.cpp:422
 #, c-format
 msgid "File %s does not exist."
 msgstr "檔案 '%s' 不存在。"
 
-#: ../src/generic/filedlgg.cpp:1316 ../src/gtk/filedlg.cpp:64
+#: ../src/generic/filedlgg.cpp:1464 ../src/gtk/filedlg.cpp:58
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "檔案 '%s' 已存在，是否真要覆寫？"
 
-#: ../src/os2/filedlg.cpp:310
+#: ../src/os2/filedlg.cpp:312
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
@@ -2257,318 +2985,398 @@ msgstr ""
 "檔案 '%s' 已存在，\n"
 "是否覆寫？"
 
-#: ../src/common/textcmn.cpp:215
+#: ../src/common/textcmn.cpp:218 ../src/richtext/richtextctrl.cpp:1764
 msgid "File couldn't be loaded."
 msgstr "檔案無法載入。"
 
-#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:1596
+#: ../src/common/docview.cpp:566 ../src/common/docview.cpp:1606
 msgid "File error"
 msgstr "檔案錯誤"
 
-#: ../src/generic/dirctrlg.cpp:707 ../src/generic/filedlgg.cpp:758
+#: ../src/generic/dirctrlg.cpp:726 ../src/generic/filedlgg.cpp:844
 msgid "File name exists already."
 msgstr "檔案名稱已存在。"
 
-#: ../src/motif/filedlg.cpp:226
-#, fuzzy
+#: ../src/motif/filedlg.cpp:223
 msgid "Files"
-msgstr "檔案(&F)"
+msgstr "檔案"
 
-#: ../src/common/filefn.cpp:1746
-#, fuzzy, c-format
+#: ../src/common/filefn.cpp:1775
+#, c-format
 msgid "Files (%s)"
-msgstr "檔案 (%s)|%s"
+msgstr "檔案 (%s)"
 
-#: ../src/motif/filedlg.cpp:224
-#, fuzzy
+#: ../src/motif/filedlg.cpp:221
 msgid "Filter"
-msgstr "檔案(&F)"
+msgstr "過濾器"
 
-#: ../src/html/helpfrm.cpp:491
+#: ../src/html/helpwnd.cpp:468
 msgid "Find"
 msgstr "尋找"
 
-#: ../src/html/helpfrm.cpp:1219
+#: ../src/html/helpwnd.cpp:1191
 msgid "Fixed font:"
 msgstr "固定字型︰"
 
-#: ../src/html/helpfrm.cpp:1279
+#: ../src/html/helpwnd.cpp:1251
 msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr "固定大小字體。<br> <b>粗體</b> <i>斜體</i> "
 
-#: ../src/common/paper.cpp:118
+#: ../src/common/paper.cpp:113
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "對開紙，8 1/2 x 13 英吋"
 
-#: ../src/html/helpfrm.cpp:1220
+#: ../src/mac/carbon/fontdlg.cpp:410 ../src/richtext/richtextformatdlg.cpp:272
+msgid "Font"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:175
+#, fuzzy
+msgid "Font &weight:"
+msgstr "字型粗細。"
+
+#: ../src/html/helpwnd.cpp:1192
 msgid "Font size:"
 msgstr "字型大小："
 
+#: ../src/richtext/richtextfontpage.cpp:162
+#, fuzzy
+msgid "Font st&yle:"
+msgstr "字型大小："
+
+#: ../src/mac/carbon/fontdlg.cpp:452
+#, fuzzy
+msgid "Font:"
+msgstr "字型大小："
+
 #: ../src/unix/utilsunx.cpp:545
 msgid "Fork failed"
 msgstr "建立執行緒失敗"
 
-#: ../src/common/xtixml.cpp:235
+#: ../include/wx/richtext/richtextformatdlg.h:121
+#: ../include/wx/richtext/richtextformatdlg.h:133
+msgid "Formatting"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:232
 msgid "Forward hrefs are not supported"
 msgstr "不支援往前參照的超連結"
 
 #: ../contrib/src/deprecated/resource.cpp:1838
 #: ../contrib/src/deprecated/resource.cpp:1968
-#: ../contrib/src/deprecated/resource.cpp:3060
-#, fuzzy
+#: ../contrib/src/deprecated/resource.cpp:3070
 msgid "Found "
-msgstr "尋找"
+msgstr "找到 "
 
-#: ../src/html/helpfrm.cpp:886
+#: ../src/html/htmlhelp.cpp:460 ../src/html/helpwnd.cpp:867
 #, c-format
 msgid "Found %i matches"
 msgstr "找到 %i 個符合項目"
 
-#: ../src/generic/prntdlgg.cpp:233
+#: ../src/generic/prntdlgg.cpp:234
 msgid "From:"
 msgstr "從："
 
-#: ../src/common/imaggif.cpp:100
+#: ../src/common/fmapbase.cpp:154
+msgid "GB-2312"
+msgstr ""
+
+#: ../src/common/imaggif.cpp:80
 msgid "GIF: Invalid gif index."
 msgstr "GIF: 無效的影像索引。"
 
-#: ../src/common/imaggif.cpp:75
+#: ../src/common/imaggif.cpp:70
 msgid "GIF: data stream seems to be truncated."
 msgstr "GIF: 資料流似乎被截斷了。"
 
-#: ../src/common/imaggif.cpp:59
+#: ../src/common/imaggif.cpp:54
 msgid "GIF: error in GIF image format."
 msgstr "GIF: GIF 影像格式錯誤。"
 
-#: ../src/common/imaggif.cpp:62
+#: ../src/common/imaggif.cpp:57
 msgid "GIF: not enough memory."
 msgstr "GIF: 記憶體不足。"
 
-#: ../src/common/imaggif.cpp:65
+#: ../src/common/imaggif.cpp:60
 msgid "GIF: unknown error!!!"
 msgstr "GIF: 未知的錯誤！！！"
 
-#: ../src/univ/themes/gtk.cpp:634
+#: ../src/univ/themes/gtk.cpp:530
 msgid "GTK+ theme"
 msgstr "GTK+ 主題"
 
-#: ../src/common/prntbase.cpp:228
-#, fuzzy
+#: ../src/common/prntbase.cpp:237
 msgid "Generic PostScript"
-msgstr "PostScript 文件"
+msgstr "普通PostScript"
 
-#: ../src/common/paper.cpp:142
+#: ../src/common/paper.cpp:137
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr "德國法定複寫簿, 8 1/2 x 13 in"
 
-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:136
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "德國家標準準複寫簿, 8 1/2 x 12 in"
 
-#: ../include/wx/xti.h:845
+#: ../include/wx/xti.h:841
 msgid "GetProperty called w/o valid getter"
-msgstr ""
+msgstr "呼叫GetProperty時未帶有效的getter"
 
-#: ../include/wx/xti.h:906
+#: ../include/wx/xti.h:902
 msgid "GetPropertyCollection called on a generic accessor"
-msgstr ""
+msgstr "在一個通用處理器上呼叫GetPropertyCollection"
 
-#: ../include/wx/xti.h:853
+#: ../include/wx/xti.h:849
 msgid "GetPropertyCollection called w/o valid collection getter"
-msgstr ""
+msgstr "呼叫GetPropertyCollection時未帶有效的collection getter"
 
-#: ../src/html/helpfrm.cpp:651
+#: ../src/html/helpwnd.cpp:637
 msgid "Go back"
 msgstr "退回"
 
-#: ../src/html/helpfrm.cpp:654
+#: ../src/html/htmlhelp.cpp:541
+msgid "Go back to the previous HTML page"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:640
 msgid "Go forward"
 msgstr "向前"
 
-#: ../src/html/helpfrm.cpp:659
+#: ../src/html/htmlhelp.cpp:543
+msgid "Go forward to the next HTML page"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:645
 msgid "Go one level up in document hierarchy"
 msgstr "到上一階文件層級"
 
-#: ../src/generic/dirdlgg.cpp:145 ../src/generic/filedlgg.cpp:989
+#: ../src/generic/dirdlgg.cpp:134 ../src/generic/filedlgg.cpp:1078
 msgid "Go to home directory"
 msgstr "進入使用者目錄"
 
-#: ../src/generic/filedlgg.cpp:981
+#: ../src/generic/filedlgg.cpp:1070
 msgid "Go to parent directory"
 msgstr "進入父目錄"
 
-#: ../src/common/prntbase.cpp:851
+#: ../src/common/prntbase.cpp:1077
 msgid "Goto Page"
 msgstr "前進頁面"
 
-#: ../src/common/fmapbase.cpp:110
+#: ../src/generic/aboutdlgg.cpp:76
+msgid "Graphics art by "
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:112
 msgid "Greek (ISO-8859-7)"
 msgstr "希臘語 (ISO-8859-7)"
 
-#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+#: ../src/common/zstream.cpp:149 ../src/common/zstream.cpp:302
 msgid "Gzip not supported by this version of zlib"
 msgstr "這一版的 zib 不支援 Gzip"
 
-#: ../src/html/helpfrm.cpp:1574
+#: ../src/common/menucmn.cpp:93
+msgid "HELP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:78
+msgid "HOME"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:1526
 msgid "HTML Help Project (*.hhp)|*.hhp|"
 msgstr "超文件說明檔專案 (*.hhp)|*.hhp|"
 
-#: ../src/html/htmlwin.cpp:498
+#: ../src/html/htmlwin.cpp:603
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML 錨 %s 不存在。"
 
-#: ../src/html/helpfrm.cpp:1572
+#: ../src/html/helpwnd.cpp:1524
 msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr "超文件檔 (*.html;*.htm)|*.html;*.htm|"
 
-#: ../src/common/fmapbase.cpp:111
+#: ../src/html/htmprint.cpp:379
+msgid ""
+"HTML pagination algorithm generated more than the allowed maximum number of "
+"pages and it can continue any longer!"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:113
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希伯來語 (ISO-8859-8)"
 
-#: ../src/html/helpfrm.cpp:337 ../contrib/src/deprecated/proplist.cpp:523
+#: ../src/html/helpfrm.cpp:96 ../src/html/helpdlg.cpp:67
+#: ../contrib/src/deprecated/proplist.cpp:519
 msgid "Help"
 msgstr "說明"
 
-#: ../src/html/helpfrm.cpp:1213
+#: ../src/html/htmlhelp.cpp:87
+#, fuzzy, c-format
+msgid "Help : %s"
+msgstr "說明：%s"
+
+#: ../src/html/helpwnd.cpp:1185
 msgid "Help Browser Options"
 msgstr "說明瀏覽器選項"
 
-#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
+#: ../src/generic/helpext.cpp:461 ../src/generic/helpext.cpp:462
 msgid "Help Index"
 msgstr "說明索引"
 
-#: ../src/html/helpfrm.cpp:1560
+#: ../src/html/helpwnd.cpp:1512
 msgid "Help Printing"
 msgstr "說明列印"
 
-#: ../src/html/helpfrm.cpp:814
-#, fuzzy
+#: ../src/html/helpwnd.cpp:796
 msgid "Help Topics"
-msgstr "說æ\98\8eï¼\9a%s"
+msgstr "è¼\94å\8a©ä¸»é¡\8c"
 
-#: ../src/html/helpfrm.cpp:1573
+#: ../src/html/helpwnd.cpp:1525
 msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
 msgstr "說明書 (*.htb)|*.htb|說明書 (*.zip)|*.zip|"
 
-#: ../src/html/helpctrl.cpp:55
+#: ../src/generic/helpext.cpp:274
 #, c-format
-msgid "Help: %s"
-msgstr "說明：%s"
+msgid "Help directory \"%s\" not found."
+msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:105
-#, fuzzy
+#: ../src/generic/helpext.cpp:282
+#, fuzzy, c-format
+msgid "Help file \"%s\" not found."
+msgstr "找不到 '%s' 領域的記載檔。"
+
+#: ../src/html/helpctrl.cpp:51
+#, c-format
+msgid "Help: %s"
+msgstr "說明：%s"
+
+#: ../src/generic/dirdlgg.cpp:96
 msgid "Home"
-msgstr "未命名"
+msgstr "Home"
 
-#: ../src/generic/dirctrlg.cpp:654
-#, fuzzy
+#: ../src/generic/dirctrlg.cpp:670
 msgid "Home directory"
-msgstr "建立目錄"
+msgstr "Home目錄"
 
-#: ../include/wx/filefn.h:145
+#: ../include/wx/filefn.h:141
 msgid "I64"
-msgstr ""
+msgstr "I64"
 
-#: ../src/common/imagbmp.cpp:943
+#: ../src/common/imagbmp.cpp:940
 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:1045 ../src/common/imagbmp.cpp:1104
+#: ../src/common/imagbmp.cpp:1113 ../src/common/imagbmp.cpp:1124
+#: ../src/common/imagbmp.cpp:1168 ../src/common/imagbmp.cpp:1178
+#: ../src/common/imagbmp.cpp:1187
 msgid "ICO: Error writing the image file!"
 msgstr "ICO: 寫入影像檔時發生錯誤！"
 
-#: ../src/common/imagbmp.cpp:1016
+#: ../src/common/imagbmp.cpp:1013
 msgid "ICO: Image too tall for an icon."
 msgstr "ICO: 影像太高。"
 
-#: ../src/common/imagbmp.cpp:1022
+#: ../src/common/imagbmp.cpp:1019
 msgid "ICO: Image too wide for an icon."
 msgstr "ICO: 影像太寬。"
 
-#: ../src/common/imagbmp.cpp:1255
+#: ../src/common/imagbmp.cpp:1252
 msgid "ICO: Invalid icon index."
 msgstr "ICO: 無效的圖示索引。"
 
-#: ../src/common/imagiff.cpp:771
+#: ../src/common/imagiff.cpp:766
 msgid "IFF: data stream seems to be truncated."
 msgstr "IFF: 資料流似乎被截斷了。"
 
-#: ../src/common/imagiff.cpp:755
+#: ../src/common/imagiff.cpp:750
 msgid "IFF: error in IFF image format."
 msgstr "IFF: IFF 影像格式錯誤。"
 
-#: ../src/common/imagiff.cpp:758
+#: ../src/common/imagiff.cpp:753
 msgid "IFF: not enough memory."
 msgstr "IFF: 記憶體不足。"
 
-#: ../src/common/imagiff.cpp:761
+#: ../src/common/imagiff.cpp:756
 msgid "IFF: unknown error!!!"
 msgstr "IFF: 未知的錯誤！！！"
 
-#: ../contrib/src/deprecated/resource.cpp:2673
-#: ../contrib/src/deprecated/resource.cpp:2684
-#, fuzzy, c-format
+#: ../src/common/menucmn.cpp:68
+msgid "INS"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:69
+msgid "INSERT"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2683
+#: ../contrib/src/deprecated/resource.cpp:2694
+#, c-format
 msgid "Icon resource specification %s not found."
-msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
+msgstr "沒有找到圖示資源規範 %s。"
 
-#: ../src/generic/dbgrptg.cpp:344
+#: ../src/generic/dbgrptg.cpp:345
 msgid ""
 "If you have any additional information pertaining to this bug\n"
 "report, please enter it here and it will be joined to it:"
 msgstr ""
+"如果您有任何與此錯誤報告有關的資訊, \n"
+"請在此輸入, 它將會被加到錯誤報告中:"
 
-#: ../src/generic/dbgrptg.cpp:310
+#: ../src/generic/dbgrptg.cpp:311
 msgid ""
 "If you wish to suppress this debug report completely, please choose the "
 "\"Cancel\" button,\n"
 "but be warned that it may hinder improving the program, so if\n"
 "at all possible please do continue with the report generation.\n"
 msgstr ""
+"如果您想完全停用除錯報告, 請依\"取消\"按鈕, \n"
+"但我們不建議這樣做, 因為除錯報告有助於加強本程式.\n"
+"在可能的情況下, 請盡量選擇讓程式產生除錯報告.\n"
 
-#: ../src/msw/registry.cpp:1304
+#: ../src/msw/registry.cpp:1299
 #, c-format
 msgid "Ignoring value \"%s\" of the key \"%s\"."
-msgstr ""
+msgstr "忽略值 \"%s\" (鍵 \"%s\")。"
 
-#: ../contrib/src/deprecated/resource.cpp:271
+#: ../contrib/src/deprecated/resource.cpp:266
 msgid "Ill-formed resource file syntax."
-msgstr ""
+msgstr "不良的資源檔案語法。"
 
-#: ../src/common/xtistrm.cpp:260
+#: ../src/common/xtistrm.cpp:256
 msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
-msgstr ""
+msgstr "非法的物件類別(非-wxEvtHandler)做為事件來源"
 
-#: ../include/wx/xti.h:1650
+#: ../include/wx/xti.h:1668
 msgid "Illegal Parameter Count for ConstructObject Method"
-msgstr ""
+msgstr "非法的針對ConstructObject方法的參數計數"
 
-#: ../include/wx/xti.h:1723
+#: ../include/wx/xti.h:1742
 msgid "Illegal Parameter Count for Create Method"
-msgstr ""
+msgstr "非法的針對Create方法的參數計數"
 
-#: ../src/generic/dirctrlg.cpp:689 ../src/generic/filedlgg.cpp:744
+#: ../src/generic/dirctrlg.cpp:708 ../src/generic/filedlgg.cpp:830
 msgid "Illegal directory name."
 msgstr "不合法的目錄名稱。"
 
-#: ../src/generic/filedlgg.cpp:1269
+#: ../src/generic/filedlgg.cpp:1416
 msgid "Illegal file specification."
 msgstr "不合規範的檔案描述。"
 
-#: ../src/common/image.cpp:1192
-#, fuzzy
+#: ../src/common/image.cpp:1830
 msgid "Image and mask have different sizes."
-msgstr "å½±å\83\8få\92\8cé\81®ç½©ç\9a\84大å°\8fä¸\8dä¸\80è\87´"
+msgstr "å\9c\96å\83\8få\92\8cé\81®ç½©ç\9a\84大å°\8fä¸\8dä¸\80è\87´ã\80\82"
 
-#: ../src/common/image.cpp:1523
-#, c-format
-msgid "Image file is not of type %d."
+#: ../src/common/image.cpp:2176 ../src/common/image.cpp:2216
+#, fuzzy, c-format
+msgid "Image file is not of type %ld."
+msgstr "影像檔不是型態%d。"
+
+#: ../src/common/image.cpp:2240
+#, fuzzy, c-format
+msgid "Image file is not of type %s."
 msgstr "影像檔不是型態%d。"
 
-#: ../src/msw/textctrl.cpp:361
+#: ../src/msw/textctrl.cpp:454
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
@@ -2576,380 +3384,591 @@ msgstr ""
 "無法建立 rich edit 控制元件，使用 simple text 控制元件代替。請重新安裝 "
 "riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:428
+#: ../src/unix/utilsunx.cpp:434
 msgid "Impossible to get child process input"
 msgstr "無法取得子程序的輸入"
 
-#: ../src/common/filefn.cpp:1022
+#: ../src/common/filefn.cpp:1053
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "無法取得檔案 '%s' 的存取權限"
 
-#: ../src/common/filefn.cpp:1036
+#: ../src/common/filefn.cpp:1067
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "無法覆寫檔案 '%s'"
 
-#: ../src/common/filefn.cpp:1080
+#: ../src/common/filefn.cpp:1111
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr "無法設定檔案 '%s' 的存取權限 "
 
-#: ../src/common/stockitem.cpp:124
-#, fuzzy
+#: ../src/common/stockitem.cpp:130
 msgid "Indent"
-msgstr "ç´¢å¼\95"
+msgstr "縮æ\8e\92"
 
-#: ../src/html/helpfrm.cpp:516
+#: ../src/richtext/richtextformatdlg.cpp:278
+msgid "Indents && Spacing"
+msgstr ""
+
+#: ../src/html/htmlhelp.cpp:578 ../src/html/helpwnd.cpp:493
 msgid "Index"
 msgstr "索引"
 
-#: ../src/common/fmapbase.cpp:115
+#: ../src/common/fmapbase.cpp:117
 msgid "Indian (ISO-8859-12)"
 msgstr "印度語 (ISO-8859-12)"
 
 #: ../src/common/init.cpp:232
 msgid "Initialization failed in post init, aborting."
+msgstr "安裝後續的啟始失效，忽略。"
+
+#: ../src/richtext/richtextsymboldlg.cpp:475
+#: ../src/richtext/richtextsymboldlg.cpp:502
+#, fuzzy
+msgid "Insert"
+msgstr "縮排"
+
+#: ../src/richtext/richtextbuffer.cpp:4724
+#: ../src/richtext/richtextbuffer.cpp:5503
+msgid "Insert Image"
 msgstr ""
 
-#: ../src/common/xtistrm.cpp:704
-msgid "Internal error, illegal wxCustomTypeInfo"
+#: ../src/richtext/richtextbuffer.cpp:4600
+#: ../src/richtext/richtextbuffer.cpp:4644
+#: ../src/richtext/richtextbuffer.cpp:4686
+#: ../src/richtext/richtextctrl.cpp:532 ../src/richtext/richtextctrl.cpp:748
+msgid "Insert Text"
+msgstr ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:477
+#: ../src/richtext/richtextsymboldlg.cpp:479
+#: ../src/richtext/richtextsymboldlg.cpp:504
+#: ../src/richtext/richtextsymboldlg.cpp:506
+msgid "Inserts the chosen symbol."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:227
+#: ../src/common/xtistrm.cpp:700
+msgid "Internal error, illegal wxCustomTypeInfo"
+msgstr "整數錯誤, 非法的wxCustomTypeInfo"
+
+#: ../src/common/imagtiff.cpp:256
 msgid "Invalid TIFF image index."
 msgstr "無效的 TIFF 影像索引。"
 
-#: ../src/xrc/xmlres.cpp:460
+#: ../src/xrc/xmlres.cpp:485
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr "無效的 XRC 資源 '%s'：沒有根節點 'resource'。"
 
-#: ../src/common/appcmn.cpp:249
+#: ../src/common/appcmn.cpp:277
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "無效的顯示模式規格 '%s'。"
 
-#: ../src/x11/app.cpp:128
+#: ../src/x11/app.cpp:127
 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "無效的幾何規格 '%s'"
 
-#: ../src/unix/snglinst.cpp:311
+#: ../src/unix/snglinst.cpp:307
 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr "無效的鎖定檔案 '%s'。"
 
-#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+#: ../src/common/xtistrm.cpp:361 ../src/common/xtistrm.cpp:376
 msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
-msgstr ""
+msgstr "無效的或空的物件ID被傳給GetObjectClassInfo"
 
-#: ../src/common/xtistrm.cpp:395
+#: ../src/common/xtistrm.cpp:391
 msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
-msgstr ""
+msgstr "無效的或空的物件ID被傳給HasObjectClassInfo"
 
-#: ../src/common/regex.cpp:210
+#: ../src/common/regex.cpp:304
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr "無效的正規運算式 '%s'： %s"
 
-#: ../src/generic/fontdlgg.cpp:233
+#: ../src/generic/fontdlgg.cpp:236 ../src/mac/carbon/fontdlg.cpp:484
+#: ../src/richtext/richtextfontpage.cpp:223
+#: ../src/richtext/richtextfontpage.cpp:281
+#: ../src/richtext/richtextfontpage.cpp:446
 msgid "Italic"
 msgstr "斜體"
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:132
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "意大利信封，110 x 230 mm"
 
-#: ../src/common/imagjpeg.cpp:225
+#: ../src/common/imagjpeg.cpp:245
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: 無法載入 - 檔案也許已損壞。"
 
-#: ../src/common/imagjpeg.cpp:339
+#: ../src/common/imagjpeg.cpp:388
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: 無法儲存影像。"
 
-#: ../src/common/paper.cpp:170
+#: ../src/common/paper.cpp:165
 msgid "Japanese Double Postcard 200 x 148 mm"
-msgstr ""
+msgstr "日式雙倍明信片 200 x 148 公釐"
 
-#: ../src/common/paper.cpp:174
+#: ../src/common/paper.cpp:169
 msgid "Japanese Envelope Chou #3"
-msgstr ""
+msgstr "日式信封 Chou #3"
 
-#: ../src/common/paper.cpp:187
+#: ../src/common/paper.cpp:182
 msgid "Japanese Envelope Chou #3 Rotated"
-msgstr ""
+msgstr "日式信封 Chou #3 轉向"
 
-#: ../src/common/paper.cpp:175
+#: ../src/common/paper.cpp:170
 msgid "Japanese Envelope Chou #4"
-msgstr ""
+msgstr "日式信封 Chou #4"
 
-#: ../src/common/paper.cpp:188
+#: ../src/common/paper.cpp:183
 msgid "Japanese Envelope Chou #4 Rotated"
-msgstr ""
+msgstr "日式信封 Chou #4 轉向"
 
-#: ../src/common/paper.cpp:172
+#: ../src/common/paper.cpp:167
 msgid "Japanese Envelope Kaku #2"
-msgstr ""
+msgstr "日式信封 Kaku #2"
 
-#: ../src/common/paper.cpp:185
+#: ../src/common/paper.cpp:180
 msgid "Japanese Envelope Kaku #2 Rotated"
-msgstr ""
+msgstr "日式信封 Kaku #2 轉向"
 
-#: ../src/common/paper.cpp:173
+#: ../src/common/paper.cpp:168
 msgid "Japanese Envelope Kaku #3"
-msgstr ""
+msgstr "日式信封 Kaku #3"
 
-#: ../src/common/paper.cpp:186
+#: ../src/common/paper.cpp:181
 msgid "Japanese Envelope Kaku #3 Rotated"
-msgstr ""
+msgstr "日式信封 Kaku #3 轉向"
 
-#: ../src/common/paper.cpp:192
+#: ../src/common/paper.cpp:187
 msgid "Japanese Envelope You #4"
-msgstr ""
+msgstr "日式信封 You #4"
 
-#: ../src/common/paper.cpp:193
+#: ../src/common/paper.cpp:188
 msgid "Japanese Envelope You #4 Rotated"
-msgstr ""
+msgstr "日式信封 You #4 轉向"
 
-#: ../src/common/paper.cpp:145
+#: ../src/common/paper.cpp:140
 msgid "Japanese Postcard 100 x 148 mm"
-msgstr ""
+msgstr "日式明信片 100 x 148 公釐"
 
-#: ../src/common/paper.cpp:182
+#: ../src/common/paper.cpp:177
 msgid "Japanese Postcard Rotated 148 x 100 mm"
-msgstr ""
+msgstr "日式明信片轉向 148 x 100 公釐"
 
-#: ../src/common/stockitem.cpp:128
+#: ../src/common/stockitem.cpp:134
 msgid "Justified"
+msgstr "分散對齊"
+
+#: ../src/richtext/richtextindentspage.cpp:162
+#: ../src/richtext/richtextindentspage.cpp:164
+#: ../src/richtext/richtextliststylepage.cpp:344
+#: ../src/richtext/richtextliststylepage.cpp:346
+msgid "Justify text left and right."
 msgstr ""
 
-#: ../src/common/fmapbase.cpp:119
+#: ../src/common/fmapbase.cpp:121
 msgid "KOI8-R"
-msgstr ""
+msgstr "KOI8-R"
 
-#: ../src/common/fmapbase.cpp:120
+#: ../src/common/fmapbase.cpp:122
 msgid "KOI8-U"
+msgstr "KOI8-U"
+
+#: ../src/common/menucmn.cpp:267 ../src/common/menucmn.cpp:327
+msgid "KP_"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:121
+msgid "KP_ADD"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:116
+msgid "KP_BEGIN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:124
+msgid "KP_DECIMAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:118
+msgid "KP_DELETE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:125
+msgid "KP_DIVIDE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:110
+msgid "KP_DOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:115
+msgid "KP_END"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:105
+msgid "KP_ENTER"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:119
+msgid "KP_EQUAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:106
+msgid "KP_HOME"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:117
+msgid "KP_INSERT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:107
+msgid "KP_LEFT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:120
+msgid "KP_MULTIPLY"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:113
+msgid "KP_NEXT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:114
+msgid "KP_PAGEDOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:112
+msgid "KP_PAGEUP"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
+#: ../src/common/menucmn.cpp:111
+msgid "KP_PRIOR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:109
+msgid "KP_RIGHT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:122
+msgid "KP_SEPARATOR"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:103
+msgid "KP_SPACE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:123
+msgid "KP_SUBTRACT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:104
+msgid "KP_TAB"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:108
+msgid "KP_UP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:74
+msgid "LEFT"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:607 ../src/generic/prntdlgg.cpp:862
 msgid "Landscape"
 msgstr "橫向列印"
 
-#: ../src/common/paper.cpp:110
+#: ../src/common/paper.cpp:105
 msgid "Ledger, 17 x 11 in"
 msgstr "橫板紙，17 x 11 英吋"
 
-#: ../src/generic/prntdlgg.cpp:879
+#: ../src/richtext/richtextbulletspage.cpp:195
+#: ../src/richtext/richtextbulletspage.cpp:199
+#: ../src/richtext/richtextbulletspage.cpp:200
+#: ../src/richtext/richtextliststylepage.cpp:248
+#: ../src/richtext/richtextliststylepage.cpp:252
+#: ../src/richtext/richtextliststylepage.cpp:253
+msgid "Left"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:392
+msgid "Left (&first line):"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:874
 msgid "Left margin (mm):"
-msgstr "左邊距(毫米)："
+msgstr "左邊距(公釐)："
 
-#: ../src/common/paper.cpp:151
-#, fuzzy
+#: ../src/richtext/richtextindentspage.cpp:148
+#: ../src/richtext/richtextindentspage.cpp:150
+#: ../src/richtext/richtextliststylepage.cpp:330
+#: ../src/richtext/richtextliststylepage.cpp:332
+msgid "Left-align text."
+msgstr ""
+
+#: ../src/common/paper.cpp:146
 msgid "Legal Extra 9 1/2 x 15 in"
-msgstr "狀紙，8 1/2 x 14 英吋"
+msgstr "狀紙加長 9 1/2 x 15 英吋"
 
-#: ../src/common/paper.cpp:103
+#: ../src/common/paper.cpp:98
 msgid "Legal, 8 1/2 x 14 in"
 msgstr "狀紙，8 1/2 x 14 英吋"
 
-#: ../src/common/paper.cpp:150
-#, fuzzy
+#: ../src/common/paper.cpp:145
 msgid "Letter Extra 9 1/2 x 12 in"
-msgstr "信紙，8 1/2 x 11 英吋"
+msgstr "信紙加長 9 1/2 x 12 英吋"
 
-#: ../src/common/paper.cpp:156
+#: ../src/common/paper.cpp:151
 msgid "Letter Extra Transverse 9.275 x 12 in"
-msgstr ""
+msgstr "信紙加長橫向 9.275 x 12 英吋"
 
-#: ../src/common/paper.cpp:159
-#, fuzzy
+#: ../src/common/paper.cpp:154
 msgid "Letter Plus 8 1/2 x 12.69 in"
-msgstr "信紙，8 1/2 x 11 英吋"
+msgstr "信紙增大 8 1/2 x 12.69 英吋"
 
-#: ../src/common/paper.cpp:176
-#, fuzzy
+#: ../src/common/paper.cpp:171
 msgid "Letter Rotated 11 x 8 1/2 in"
-msgstr "信紙，8 1/2 x 11 英吋"
+msgstr "信紙轉向，11 x 8 1/2 英吋"
 
-#: ../src/common/paper.cpp:108
+#: ../src/common/paper.cpp:103
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr "小信紙，8 1/2 x 11 英吋"
 
-#: ../src/common/paper.cpp:154
-#, fuzzy
+#: ../src/common/paper.cpp:149
 msgid "Letter Transverse 8 1/2 x 11 in"
-msgstr "信紙，8 1/2 x 11 英吋"
+msgstr "信紙橫向 8 1/2 x 11 英吋"
 
-#: ../src/common/paper.cpp:102
+#: ../src/common/paper.cpp:97
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "信紙，8 1/2 x 11 英吋"
 
-#: ../src/generic/fontdlgg.cpp:236
+#: ../src/generic/fontdlgg.cpp:239
 msgid "Light"
 msgstr "細體"
 
+#: ../src/generic/helpext.cpp:301
+#, c-format
+msgid "Line %lu of map file \"%s\" has invalid syntax, skipped."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:454
+msgid "Line spacing:"
+msgstr ""
+
 #: ../src/html/chm.cpp:820
 msgid "Link contained '//', converted to absolute link."
+msgstr "連結包含 '//'，轉換為絕對連結。"
+
+#: ../src/richtext/richtextformatdlg.cpp:296
+msgid "List Style"
+msgstr ""
+
+#: ../src/richtext/richtextstyles.cpp:754
+msgid "List styles"
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:151
+#: ../src/richtext/richtextfontpage.cpp:153
+msgid "Lists font sizes in points."
 msgstr ""
 
-#: ../src/common/fldlgcmn.cpp:257
+#: ../src/richtext/richtextfontpage.cpp:132
+#: ../src/richtext/richtextfontpage.cpp:134
+#, fuzzy
+msgid "Lists the available fonts."
+msgstr "對不起，無法取得小秘訣！"
+
+#: ../src/common/fldlgcmn.cpp:269
 #, c-format
 msgid "Load %s file"
 msgstr "載入檔案 %s "
 
-#: ../src/html/htmlwin.cpp:416
+#: ../src/html/htmlwin.cpp:521
 msgid "Loading : "
 msgstr "載入中："
 
-#: ../src/unix/snglinst.cpp:251
-#, fuzzy, c-format
+#: ../src/unix/snglinst.cpp:247
+#, c-format
 msgid "Lock file '%s' has incorrect owner."
-msgstr "'%s' 音效檔案格式不支援"
+msgstr "上鎖檔案 '%s' 沒有正確的所有者。"
 
-#: ../src/unix/snglinst.cpp:256
+#: ../src/unix/snglinst.cpp:252
 #, c-format
 msgid "Lock file '%s' has incorrect permissions."
-msgstr ""
+msgstr "上鎖檔案 '%s' 沒有正確的權限。"
 
-#: ../src/generic/logg.cpp:572
+#: ../src/generic/logg.cpp:573
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "儲存日誌到檔案 '%s'。"
 
-#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
+#: ../include/wx/xti.h:497 ../include/wx/xti.h:501
 msgid "Long Conversions not supported"
+msgstr "不支援長轉換"
+
+#: ../src/richtext/richtextbulletspage.cpp:283
+#: ../src/richtext/richtextliststylepage.cpp:488
+msgid "Lower case letters"
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:465
+#: ../src/richtext/richtextbulletspage.cpp:285
+#: ../src/richtext/richtextliststylepage.cpp:490
+msgid "Lower case roman numerals"
+msgstr ""
+
+#: ../src/gtk/mdi.cpp:466 ../src/gtk1/mdi.cpp:462
 msgid "MDI child"
 msgstr "MDI 子視窗"
 
-#: ../src/mac/carbon/thread.cpp:1635
-msgid "MP Thread Support is not available on this System"
+#: ../src/common/menucmn.cpp:86
+msgid "MENU"
 msgstr ""
 
-#: ../src/msw/helpchm.cpp:60
+#: ../src/msw/helpchm.cpp:57
 msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
 "not installed on this machine. Please install it."
 msgstr ""
 "由於 MS HTML Help 函示庫未安裝，導致 MS HTML Help 功能無法使用。請先安裝它。"
 
-#: ../src/univ/themes/win32.cpp:4929
+#: ../src/univ/themes/win32.cpp:3740
 msgid "Ma&ximize"
-msgstr "最大化(&x)"
+msgstr "最大化(&X)"
 
-#: ../src/unix/mimetype.cpp:2671
-#, c-format
-msgid "Mailcap file %s, line %d: incomplete entry ignored."
-msgstr "Mailcap 檔案 %s 第 %d 行：忽略不完整的項目。"
-
-#: ../src/generic/fdrepdlg.cpp:153
+#: ../src/generic/fdrepdlg.cpp:146
 msgid "Match case"
 msgstr "區分大小寫"
 
-#: ../src/common/fs_mem.cpp:176
+#: ../src/common/fs_mem.cpp:164
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "「記憶體虛擬檔案系統」已包含檔案 '%s'！"
 
-#: ../src/msw/frame.cpp:374
-#, fuzzy
+#: ../src/msw/frame.cpp:366
 msgid "Menu"
-msgstr "現代"
+msgstr "選單"
 
-#: ../src/univ/themes/metal.cpp:174
+#: ../src/univ/themes/metal.cpp:169
 msgid "Metal theme"
 msgstr "金屬主題"
 
-#: ../src/univ/themes/win32.cpp:4927
+#: ../src/univ/themes/win32.cpp:3738
 msgid "Mi&nimize"
-msgstr "最小化(&n)"
+msgstr "最小化(&N)"
 
-#: ../src/unix/mimetype.cpp:2292
-#, c-format
-msgid "Mime.types file %s, line %d: unterminated quoted string."
-msgstr "Mime.類型文件 %s 第 %d 行：字串沒有結尾的引號。"
-
-#: ../src/mgl/app.cpp:165
+#: ../src/mgl/app.cpp:161
 #, c-format
 msgid "Mode %ix%i-%i not available."
-msgstr "模式 %ix%i-%i 無法使用"
+msgstr "模式 %ix%i-%i 無法使用。"
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Modern"
 msgstr "現代"
 
-#: ../src/generic/filedlgg.cpp:434
+#: ../src/generic/filedlgg.cpp:509
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../src/common/module.cpp:77
+#: ../src/common/module.cpp:133
 #, c-format
 msgid "Module \"%s\" initialization failed"
-msgstr ""
+msgstr "模組 \"%s\" 初始時失敗"
 
-#: ../src/common/paper.cpp:138
+#: ../src/common/paper.cpp:133
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "御用信封，3 7/8 x 7 1/2 英吋"
 
-#: ../contrib/src/gizmos/editlbox.cpp:162
+#: ../contrib/src/gizmos/editlbox.cpp:158
 msgid "Move down"
 msgstr "下移"
 
-#: ../contrib/src/gizmos/editlbox.cpp:161
+#: ../contrib/src/gizmos/editlbox.cpp:157
 msgid "Move up"
 msgstr "上移"
 
-#: ../src/generic/filedlgg.cpp:431
+#: ../src/common/menucmn.cpp:99
+msgid "NUM_LOCK"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:506
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/generic/dirdlgg.cpp:109
+#: ../src/richtext/richtextstyledlg.cpp:218
+msgid "New &Character Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:230
+msgid "New &List Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:224
+msgid "New &Paragraph Style..."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:570
+#: ../src/richtext/richtextstyledlg.cpp:575
+#: ../src/richtext/richtextstyledlg.cpp:618
+#: ../src/richtext/richtextstyledlg.cpp:623
+#: ../src/richtext/richtextstyledlg.cpp:772
+#: ../src/richtext/richtextstyledlg.cpp:777
 #, fuzzy
+msgid "New Style"
+msgstr "新增項目"
+
+#: ../src/generic/dirdlgg.cpp:100
 msgid "New directory"
-msgstr "建立目錄"
+msgstr "新目錄"
 
-#: ../contrib/src/gizmos/editlbox.cpp:159
+#: ../contrib/src/gizmos/editlbox.cpp:155
 msgid "New item"
 msgstr "新增項目"
 
-#: ../src/generic/dirdlgg.cpp:316 ../src/generic/dirdlgg.cpp:326
-#: ../src/generic/filedlgg.cpp:608 ../src/generic/filedlgg.cpp:617
+#: ../src/generic/dirdlgg.cpp:324 ../src/generic/dirdlgg.cpp:334
+#: ../src/generic/filedlgg.cpp:688 ../src/generic/filedlgg.cpp:697
 msgid "NewName"
 msgstr "新名稱"
 
-#: ../src/generic/tipdlg.cpp:305
-#, fuzzy
+#: ../src/generic/tipdlg.cpp:301
 msgid "Next"
-msgstr "下一個(&N)"
+msgstr "下一個"
 
-#: ../src/html/helpfrm.cpp:665
+#: ../src/html/helpwnd.cpp:651
 msgid "Next page"
 msgstr "下一頁"
 
-#: ../src/mac/carbon/msgdlg.cpp:58 ../src/mac/carbon/msgdlg.cpp:143
-#: ../src/mac/classic/msgdlg.cpp:56 ../src/mac/classic/msgdlg.cpp:140
-#: ../src/motif/msgdlg.cpp:204
+#: ../src/mac/carbon/msgdlg.cpp:63 ../src/mac/carbon/msgdlg.cpp:119
+#: ../src/mac/carbon/msgdlg.cpp:203 ../src/mac/classic/msgdlg.cpp:59
+#: ../src/mac/classic/msgdlg.cpp:143 ../src/motif/msgdlg.cpp:204
 msgid "No"
 msgstr "否"
 
-#: ../contrib/src/deprecated/resource.cpp:2495
-#: ../contrib/src/deprecated/resource.cpp:2649
+#: ../contrib/src/deprecated/resource.cpp:2505
+#: ../contrib/src/deprecated/resource.cpp:2659
 msgid "No XBM facility available!"
-msgstr ""
+msgstr "沒有可用XBM工具!"
 
-#: ../contrib/src/deprecated/resource.cpp:2667
+#: ../contrib/src/deprecated/resource.cpp:2677
 msgid "No XPM icon facility available!"
-msgstr ""
+msgstr "沒有可用的XPM圖示裝置!"
+
+#: ../src/generic/animateg.cpp:156
+#, fuzzy, c-format
+msgid "No animation handler for type %ld defined."
+msgstr "沒有定義類型 %d 的影像處理常式。"
 
-#: ../src/generic/helpext.cpp:437
+#: ../src/generic/helpext.cpp:452
 msgid "No entries found."
-msgstr "找不到任何項目"
+msgstr "找不到任何項目。"
 
-#: ../src/common/fontmap.cpp:422
+#: ../src/common/fontmap.cpp:419
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -2961,7 +3980,7 @@ msgstr ""
 "但是另一種編碼 '%s' 可用。\n"
 "您要使用該編碼嗎(否則您必須選擇另一種)？"
 
-#: ../src/common/fontmap.cpp:427
+#: ../src/common/fontmap.cpp:424
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
@@ -2972,321 +3991,368 @@ msgstr ""
 "您要選擇對應這個編碼的字型嗎\n"
 "(否則此種編碼的文字將無法正確顯示)？"
 
-#: ../src/xrc/xmlres.cpp:677
+#: ../src/xrc/xmlres.cpp:715
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr "找不到 XML 節點 '%s' 類別 '%s' 的處理常式！"
 
-#: ../src/common/image.cpp:1505 ../src/common/image.cpp:1548
+#: ../src/generic/animateg.cpp:144
+#, fuzzy
+msgid "No handler found for animation type."
+msgstr "沒有找到影像類型處理常式。"
+
+#: ../src/common/image.cpp:2158 ../src/common/image.cpp:2201
 msgid "No handler found for image type."
 msgstr "沒有找到影像類型處理常式。"
 
-#: ../src/common/image.cpp:1513 ../src/common/image.cpp:1556
-#: ../src/common/image.cpp:1589
+#: ../src/common/image.cpp:2254
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "沒有定義類型 %d 的影像處理常式。"
 
-#: ../src/common/image.cpp:1574 ../src/common/image.cpp:1604
+#: ../src/common/image.cpp:2166 ../src/common/image.cpp:2209
+#, fuzzy, c-format
+msgid "No image handler for type %ld defined."
+msgstr "沒有定義類型 %d 的影像處理常式。"
+
+#: ../src/common/image.cpp:2233 ../src/common/image.cpp:2269
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "沒有定義類型 %s 的影像處理常式。"
 
-#: ../src/html/helpfrm.cpp:869
+#: ../src/html/htmlhelp.cpp:436 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:850
 msgid "No matching page found yet"
 msgstr "尚未找到符合的頁面"
 
-#: ../src/unix/sound.cpp:89
+#: ../src/unix/sound.cpp:82
 msgid "No sound"
 msgstr "沒有聲音"
 
-#: ../src/common/image.cpp:1200 ../src/common/image.cpp:1239
-#, fuzzy
+#: ../src/common/image.cpp:1838 ../src/common/image.cpp:1879
 msgid "No unused colour in image being masked."
-msgstr "å½±å\83\8f中æ\9cªä½¿ç\94¨ç\9a\84é¡\8fè\89²æ²\92æ\9c\89é\81®ç½©"
+msgstr "å\9c\96å\83\8f中æ²\92æ\9c\89被é\81®ç½©ç\9a\84æ\9cªç\94¨é¡\8fè\89²ã\80\82"
 
-#: ../src/common/image.cpp:1997
-#, fuzzy
+#: ../src/common/image.cpp:2682
 msgid "No unused colour in image."
-msgstr "å½±å\83\8f中æ\9cªä½¿ç\94¨ç\9a\84é¡\8fè\89²æ²\92æ\9c\89é\81®ç½©"
+msgstr "å\9c\96å\83\8f中æ²\92æ\9c\89æ\9cªç\94¨ç\9a\84é¡\8fè\89²ã\80\82"
 
-#: ../src/common/fmapbase.cpp:113
+#: ../src/generic/helpext.cpp:309
+#, c-format
+msgid "No valid mappings found in the file \"%s\"."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:115
 msgid "Nordic (ISO-8859-10)"
 msgstr "北歐語系 (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
+#: ../src/generic/fontdlgg.cpp:235 ../src/generic/fontdlgg.cpp:238
 msgid "Normal"
 msgstr "正常"
 
-#: ../src/html/helpfrm.cpp:1273
+#: ../src/html/helpwnd.cpp:1245
 msgid "Normal face<br>and <u>underlined</u>. "
-msgstr "正常字體<br>且 <u>下劃線</u>. "
+msgstr "正常字體<br>且 <u>加底線</u>。 "
 
-#: ../src/html/helpfrm.cpp:1218
+#: ../src/html/helpwnd.cpp:1190
 msgid "Normal font:"
 msgstr "正常字型："
 
-#: ../src/common/paper.cpp:122
+#: ../src/richtext/richtextfontpage.cpp:228
+#, fuzzy
+msgid "Not underlined"
+msgstr "加底線"
+
+#: ../src/common/paper.cpp:117
 msgid "Note, 8 1/2 x 11 in"
 msgstr "筆記簿，8 1/2 x 11 英吋"
 
-#: ../src/gtk/fontdlg.cpp:147 ../src/msw/dialog.cpp:194
-#: ../contrib/src/deprecated/proplist.cpp:506
+#: ../src/richtext/richtextbulletspage.cpp:286
+#: ../src/richtext/richtextliststylepage.cpp:491
+msgid "Numbered outline"
+msgstr ""
+
+#: ../src/mac/carbon/msgdlg.cpp:65 ../src/msw/dialog.cpp:180
+#: ../src/richtext/richtextstyledlg.cpp:283 ../src/gtk1/fontdlg.cpp:139
+#: ../contrib/src/deprecated/proplist.cpp:502
 msgid "OK"
 msgstr "確認"
 
-#: ../src/common/xtixml.cpp:263
+#: ../src/common/xtixml.cpp:260
 msgid "Objects must have an id attribute"
 msgstr "物件必須有 id 屬性"
 
-#: ../src/common/docview.cpp:1269 ../src/common/docview.cpp:1619
+#: ../src/common/docview.cpp:1279 ../src/common/docview.cpp:1629
+#: ../src/common/docview.cpp:1589
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
+#: ../src/html/helpwnd.cpp:659 ../src/html/helpwnd.cpp:1531
 msgid "Open HTML document"
 msgstr "開啟 HTML 文件"
 
-#: ../src/generic/dbgrptg.cpp:158
-#, fuzzy, c-format
+#: ../src/generic/dbgrptg.cpp:159
+#, c-format
 msgid "Open file \"%s\""
-msgstr "開啟檔案"
+msgstr "開啟檔案 \"%s\""
 
-#: ../src/generic/dirctrlg.cpp:718 ../src/generic/dirdlgg.cpp:342
-#: ../src/generic/filedlgg.cpp:632 ../src/generic/filedlgg.cpp:772
+#: ../src/generic/dirctrlg.cpp:737 ../src/generic/dirdlgg.cpp:350
+#: ../src/generic/filedlgg.cpp:712 ../src/generic/filedlgg.cpp:862
 msgid "Operation not permitted."
 msgstr "不容許的操作。"
 
-#: ../src/common/cmdline.cpp:702
+#: ../src/common/cmdline.cpp:716
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "選項 '%s' 必須有值，且有'='。"
 
-#: ../src/common/cmdline.cpp:722
+#: ../src/common/cmdline.cpp:737
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "選項 '%s' 必須有值。"
 
-#: ../src/common/cmdline.cpp:784
+#: ../src/common/cmdline.cpp:802
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "選項 '%s'：'%s' 無法轉換成日期。"
 
-#: ../src/generic/dirdlgg.cpp:116 ../src/generic/prntdlgg.cpp:614
+#: ../src/generic/dirdlgg.cpp:185 ../src/generic/prntdlgg.cpp:612
 msgid "Options"
 msgstr "選項"
 
-#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
+#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:863
 msgid "Orientation"
 msgstr "方位"
 
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
+#: ../src/common/menucmn.cpp:102
+msgid "PAGEDOWN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:101
+msgid "PAGEUP"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:87
+msgid "PAUSE"
+msgstr ""
+
+#: ../src/common/imagpcx.cpp:456 ../src/common/imagpcx.cpp:479
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: 無法配置記憶體"
 
-#: ../src/common/imagpcx.cpp:461
+#: ../src/common/imagpcx.cpp:455
 msgid "PCX: image format unsupported"
 msgstr "PCX: 影像格式不支援"
 
-#: ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:478
 msgid "PCX: invalid image"
 msgstr "PCX: 無效的影像"
 
-#: ../src/common/imagpcx.cpp:448
+#: ../src/common/imagpcx.cpp:442
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: 不是 PCX 檔案。"
 
-#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
+#: ../src/common/imagpcx.cpp:458 ../src/common/imagpcx.cpp:480
 msgid "PCX: unknown error !!!"
 msgstr "PCX: 未知的錯誤！！！"
 
-#: ../src/common/imagpcx.cpp:463
+#: ../src/common/imagpcx.cpp:457
 msgid "PCX: version number too low"
 msgstr "PCX: 版本編號太低"
 
-#: ../src/common/imagpnm.cpp:92
+#: ../src/common/menucmn.cpp:73
+msgid "PGDN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:72
+msgid "PGUP"
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:88
 msgid "PNM: Couldn't allocate memory."
 msgstr "PNM: 無法配置記憶體。"
 
-#: ../src/common/imagpnm.cpp:76
+#: ../src/common/imagpnm.cpp:72
 msgid "PNM: File format is not recognized."
 msgstr "PNM: 檔案格式無法識別。"
 
-#: ../src/common/imagpnm.cpp:108 ../src/common/imagpnm.cpp:125
-#: ../src/common/imagpnm.cpp:142
+#: ../src/common/imagpnm.cpp:104 ../src/common/imagpnm.cpp:121
+#: ../src/common/imagpnm.cpp:138
 msgid "PNM: File seems truncated."
 msgstr "PNM: 檔案似乎被截斷了。"
 
-#: ../src/common/paper.cpp:194
+#: ../src/common/paper.cpp:189
 msgid "PRC 16K 146 x 215 mm"
-msgstr ""
+msgstr "中式 16開 146 x 215 公釐"
 
-#: ../src/common/paper.cpp:207
+#: ../src/common/paper.cpp:202
 msgid "PRC 16K Rotated"
-msgstr ""
+msgstr "中式 16開 轉向"
 
-#: ../src/common/paper.cpp:195
+#: ../src/common/paper.cpp:190
 msgid "PRC 32K 97 x 151 mm"
-msgstr ""
+msgstr "中式 32開 97 x 151 公釐"
 
-#: ../src/common/paper.cpp:208
+#: ../src/common/paper.cpp:203
 msgid "PRC 32K Rotated"
-msgstr ""
+msgstr "中式 32開 轉向"
 
-#: ../src/common/paper.cpp:196
+#: ../src/common/paper.cpp:191
 msgid "PRC 32K(Big) 97 x 151 mm"
-msgstr ""
+msgstr "中式 32開(大) 97 x 151 公釐"
 
-#: ../src/common/paper.cpp:209
+#: ../src/common/paper.cpp:204
 msgid "PRC 32K(Big) Rotated"
-msgstr ""
+msgstr "中式 32開(大) 轉向"
 
-#: ../src/common/paper.cpp:197
-#, fuzzy
+#: ../src/common/paper.cpp:192
 msgid "PRC Envelope #1 102 x 165 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #1 102 x 165 公釐"
 
-#: ../src/common/paper.cpp:210
-#, fuzzy
+#: ../src/common/paper.cpp:205
 msgid "PRC Envelope #1 Rotated 165 x 102 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #1 轉向 165 x 102 公釐"
 
-#: ../src/common/paper.cpp:206
-#, fuzzy
+#: ../src/common/paper.cpp:201
 msgid "PRC Envelope #10 324 x 458 mm"
-msgstr "C3 信封，324 x 458 毫米"
+msgstr "中式信封 #10 324 x 458 公釐"
 
-#: ../src/common/paper.cpp:219
-#, fuzzy
-msgid "PRC Envelope #10 Rotated 458 x 324 m"
-msgstr "C4 信封，229 x 324 毫米"
+#: ../src/common/paper.cpp:214
+msgid "PRC Envelope #10 Rotated 458 x 324 mm"
+msgstr "中式信封 #10 轉向 458 x 324 公釐"
 
-#: ../src/common/paper.cpp:198
-#, fuzzy
+#: ../src/common/paper.cpp:193
 msgid "PRC Envelope #2 102 x 176 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #2 102 x 176 公釐"
 
-#: ../src/common/paper.cpp:211
-#, fuzzy
+#: ../src/common/paper.cpp:206
 msgid "PRC Envelope #2 Rotated 176 x 102 mm"
-msgstr "B6 信封，176 x 125 毫米"
+msgstr "中式信封 #2 轉向 176 x 102 公釐"
 
-#: ../src/common/paper.cpp:199
-#, fuzzy
+#: ../src/common/paper.cpp:194
 msgid "PRC Envelope #3 125 x 176 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #3 125 x 176 公釐"
 
-#: ../src/common/paper.cpp:212
-#, fuzzy
+#: ../src/common/paper.cpp:207
 msgid "PRC Envelope #3 Rotated 176 x 125 mm"
-msgstr "B6 信封，176 x 125 毫米"
+msgstr "中式信封 #3 轉向 176 x 125 公釐"
 
-#: ../src/common/paper.cpp:200
-#, fuzzy
+#: ../src/common/paper.cpp:195
 msgid "PRC Envelope #4 110 x 208 mm"
-msgstr "DL 信封，110 x 220 毫米"
+msgstr "中式信封 #4 110 x 208 公釐"
 
-#: ../src/common/paper.cpp:213
-#, fuzzy
+#: ../src/common/paper.cpp:208
 msgid "PRC Envelope #4 Rotated 208 x 110 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #4 轉向 208 x 110 公釐"
 
-#: ../src/common/paper.cpp:201
-#, fuzzy
+#: ../src/common/paper.cpp:196
 msgid "PRC Envelope #5 110 x 220 mm"
-msgstr "DL 信封，110 x 220 毫米"
+msgstr "中式信封 #5 110 x 220 公釐"
 
-#: ../src/common/paper.cpp:214
-#, fuzzy
+#: ../src/common/paper.cpp:209
 msgid "PRC Envelope #5 Rotated 220 x 110 mm"
-msgstr "C4 信封，229 x 324 毫米"
+msgstr "中式信封 #5 轉向 220 x 110 公釐"
 
-#: ../src/common/paper.cpp:202
-#, fuzzy
+#: ../src/common/paper.cpp:197
 msgid "PRC Envelope #6 120 x 230 mm"
-msgstr "C5 信封，162 x 229 毫米"
+msgstr "中式信封 #6 120 x 230 公釐"
 
-#: ../src/common/paper.cpp:215
-#, fuzzy
+#: ../src/common/paper.cpp:210
 msgid "PRC Envelope #6 Rotated 230 x 120 mm"
-msgstr "C5 信封，162 x 229 毫米"
+msgstr "中式信封 #6 轉向 230 x 120 公釐"
 
-#: ../src/common/paper.cpp:203
-#, fuzzy
+#: ../src/common/paper.cpp:198
 msgid "PRC Envelope #7 160 x 230 mm"
-msgstr "B5 信封，176 x 250 毫米"
+msgstr "中式信封 #7 160 x 230 公釐"
 
-#: ../src/common/paper.cpp:216
-#, fuzzy
+#: ../src/common/paper.cpp:211
 msgid "PRC Envelope #7 Rotated 230 x 160 mm"
-msgstr "C6 信封，114 x 162 毫米"
+msgstr "中式信封 #7 轉向 230 x 160 公釐"
 
-#: ../src/common/paper.cpp:204
-#, fuzzy
+#: ../src/common/paper.cpp:199
 msgid "PRC Envelope #8 120 x 309 mm"
-msgstr "C5 信封，162 x 229 毫米"
+msgstr "中式信封 #8 120 x 309 公釐"
 
-#: ../src/common/paper.cpp:217
-#, fuzzy
+#: ../src/common/paper.cpp:212
 msgid "PRC Envelope #8 Rotated 309 x 120 mm"
-msgstr "C4 信封，229 x 324 毫米"
+msgstr "中式信封 #8 轉向 309 x 120 公釐"
 
-#: ../src/common/paper.cpp:205
-#, fuzzy
+#: ../src/common/paper.cpp:200
 msgid "PRC Envelope #9 229 x 324 mm"
-msgstr "C4 信封，229 x 324 毫米"
+msgstr "中式信封 #9 229 x 324 公釐"
 
-#: ../src/common/paper.cpp:218
-#, fuzzy
+#: ../src/common/paper.cpp:213
 msgid "PRC Envelope #9 Rotated 324 x 229 mm"
-msgstr "C5 信封，162 x 229 毫米"
+msgstr "中式信封 #9 轉向 324 x 229 公釐"
 
-#: ../src/common/prntbase.cpp:1294
+#: ../src/common/menucmn.cpp:90
+msgid "PRINT"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1542
 #, c-format
 msgid "Page %d"
 msgstr "第 %d 頁"
 
-#: ../src/common/prntbase.cpp:1292
+#: ../src/common/prntbase.cpp:1540
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d 頁"
 
-#: ../src/generic/prntdlgg.cpp:827
+#: ../src/generic/prntdlgg.cpp:822
 msgid "Page Setup"
 msgstr "頁面設定"
 
-#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:540
-#, fuzzy
+#: ../src/common/prntbase.cpp:460 ../src/gtk/gnome/gprint.cpp:548
 msgid "Page setup"
 msgstr "頁面設定"
 
-#: ../src/generic/prntdlgg.cpp:210
+#: ../src/generic/prntdlgg.cpp:211
 msgid "Pages"
 msgstr "頁"
 
-#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
-#: ../src/generic/prntdlgg.cpp:1056
+#: ../src/generic/prntdlgg.cpp:795 ../src/generic/prntdlgg.cpp:849
+#: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper Size"
 msgstr "紙張大小"
 
-#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
-#: ../src/generic/prntdlgg.cpp:1051
+#: ../src/generic/prntdlgg.cpp:596 ../src/generic/prntdlgg.cpp:836
+#: ../src/generic/prntdlgg.cpp:1046
 msgid "Paper size"
 msgstr "紙張大小"
 
-#: ../src/common/xtistrm.cpp:425
+#: ../src/richtext/richtextstyles.cpp:752
+msgid "Paragraph styles"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:421
 msgid "Passing a already registered object to SetObject"
 msgstr "傳入已註冊的物件給 SetObject"
 
-#: ../src/common/xtistrm.cpp:643
+#: ../src/common/xtistrm.cpp:639
 msgid "Passing a already registered object to SetObjectName"
 msgstr "傳入已註冊的物件給 SetObjectName"
 
-#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+#: ../src/common/xtistrm.cpp:432 ../src/common/xtistrm.cpp:652
 msgid "Passing an unkown object to GetObject"
 msgstr "傳入一個未知物件給 GetObject"
 
-#: ../src/generic/filedlgg.cpp:437
+#: ../src/richtext/richtextctrl.cpp:2077
+#, fuzzy
+msgid "Paste"
+msgstr "貼上(&P)"
+
+#: ../src/common/stockitem.cpp:207
+#, fuzzy
+msgid "Paste selection"
+msgstr "選取項目"
+
+#: ../src/richtext/richtextbulletspage.cpp:168
+#: ../src/richtext/richtextliststylepage.cpp:221
+msgid "Peri&od"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:512
 msgid "Permissions"
 msgstr "允許"
 
@@ -3294,24 +4360,23 @@ msgstr "允許"
 msgid "Pipe creation failed"
 msgstr "無法建立管道"
 
-#: ../src/gtk/fontdlg.cpp:81
+#: ../src/gtk1/fontdlg.cpp:75
 msgid "Please choose a valid font."
 msgstr "請選擇一個有效的字型。"
 
-#: ../src/generic/filedlgg.cpp:1325
+#: ../src/generic/filedlgg.cpp:1472
 msgid "Please choose an existing file."
 msgstr "請選擇一個已存在的檔案。"
 
-#: ../src/html/helpfrm.cpp:813
-#, fuzzy
+#: ../src/html/helpwnd.cpp:795
 msgid "Please choose the page to display:"
-msgstr "請選擇一個已存在的檔案。"
+msgstr "請選擇慾顯示的頁面:"
 
-#: ../src/msw/dialup.cpp:787
+#: ../src/msw/dialup.cpp:788
 msgid "Please choose which ISP do you want to connect to"
 msgstr "請選擇你想連線的 ISP"
 
-#: ../src/msw/listctrl.cpp:444
+#: ../src/msw/listctrl.cpp:415
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
@@ -3322,165 +4387,182 @@ msgstr ""
 "(最低需求 4.70 版，但目前是 %d.%02d)\n"
 "否則此程式將無法正常運作。"
 
-#: ../src/common/prntbase.cpp:313
+#: ../src/common/prntbase.cpp:322
 msgid "Please wait while printing\n"
 msgstr "列印中，請稍待\n"
 
-#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
+#: ../src/generic/prntdlgg.cpp:606 ../src/generic/prntdlgg.cpp:861
 msgid "Portrait"
 msgstr "直向列印"
 
-#: ../src/generic/prntdlgg.cpp:296
+#: ../src/generic/prntdlgg.cpp:294
 msgid "PostScript file"
 msgstr "PostScript 文件"
 
-#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
+#: ../src/html/htmlhelp.cpp:509
+msgid "Preparing help window..."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:362 ../src/html/helpwnd.cpp:1207
+#: ../src/mac/carbon/fontdlg.cpp:513
 msgid "Preview:"
 msgstr "預覽︰"
 
-#: ../src/html/helpfrm.cpp:662
+#: ../src/html/helpwnd.cpp:648
 msgid "Previous page"
 msgstr "前一頁"
 
-#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
-#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:395
-#: ../src/gtk/gnome/gprint.cpp:407
+#: ../src/common/prntbase.cpp:402 ../src/generic/prntdlgg.cpp:139
+#: ../src/generic/prntdlgg.cpp:152 ../src/gtk/gnome/gprint.cpp:403
+#: ../src/gtk/gnome/gprint.cpp:415
 msgid "Print"
 msgstr "列印"
 
-#: ../src/common/docview.cpp:1032
+#: ../src/common/docview.cpp:1042
 msgid "Print Preview"
 msgstr "預覽列印"
 
-#: ../src/common/prntbase.cpp:1246 ../src/common/prntbase.cpp:1272
+#: ../src/common/prntbase.cpp:1494 ../src/common/prntbase.cpp:1520
 msgid "Print Preview Failure"
 msgstr "預覽列印失敗"
 
-#: ../src/generic/prntdlgg.cpp:218
+#: ../src/generic/prntdlgg.cpp:219
 msgid "Print Range"
 msgstr "列印範圍"
 
-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:443
 msgid "Print Setup"
 msgstr "列印設定"
 
-#: ../src/generic/prntdlgg.cpp:617
+#: ../src/generic/prntdlgg.cpp:615
 msgid "Print in colour"
 msgstr "彩色列印"
 
-#: ../src/common/stockitem.cpp:138
-#, fuzzy
+#: ../src/common/stockitem.cpp:144
 msgid "Print previe&w"
-msgstr "預覽列印"
+msgstr "預覽列印(&W)"
 
-#: ../src/gtk/gnome/gprint.cpp:785
-#, fuzzy
+#: ../src/gtk/gnome/gprint.cpp:795
 msgid "Print preview"
 msgstr "預覽列印"
 
-#: ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:624
 msgid "Print spooling"
 msgstr "列印佇列中"
 
-#: ../src/html/helpfrm.cpp:679
+#: ../src/html/helpwnd.cpp:665
 msgid "Print this page"
 msgstr "列印本頁"
 
-#: ../src/generic/prntdlgg.cpp:179
+#: ../src/generic/prntdlgg.cpp:180
 msgid "Print to File"
 msgstr "列印到檔案"
 
-#: ../src/generic/prntdlgg.cpp:489
-#, fuzzy
+#: ../src/generic/prntdlgg.cpp:487
 msgid "Printer"
-msgstr "å\88\97å\8d°"
+msgstr "å\8d°è¡¨æ©\9f"
 
-#: ../src/generic/prntdlgg.cpp:629
+#: ../src/generic/prntdlgg.cpp:627
 msgid "Printer command:"
 msgstr "印表機指令："
 
-#: ../src/generic/prntdlgg.cpp:174
+#: ../src/generic/prntdlgg.cpp:175
 msgid "Printer options"
 msgstr "印表機選項"
 
-#: ../src/generic/prntdlgg.cpp:641
+#: ../src/generic/prntdlgg.cpp:639
 msgid "Printer options:"
 msgstr "印表機選項："
 
-#: ../src/generic/prntdlgg.cpp:915
+#: ../src/generic/prntdlgg.cpp:910
 msgid "Printer..."
 msgstr "印表機..."
 
-#: ../src/generic/prntdlgg.cpp:190
-#, fuzzy
+#: ../src/generic/prntdlgg.cpp:191
 msgid "Printer:"
-msgstr "印表機..."
+msgstr "印表機:"
 
-#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
+#: ../src/common/prntbase.cpp:319 ../src/common/prntbase.cpp:540
 msgid "Printing "
 msgstr "列印中"
 
-#: ../src/common/prntbase.cpp:327
+#: ../src/common/prntbase.cpp:336
 msgid "Printing Error"
 msgstr "列印時發生錯¯誤"
 
-#: ../src/generic/printps.cpp:208
+#: ../src/generic/printps.cpp:204
 #, c-format
 msgid "Printing page %d..."
 msgstr "正在列印第 %d 頁..."
 
-#: ../src/generic/printps.cpp:168
+#: ../src/generic/printps.cpp:164
 msgid "Printing..."
 msgstr "列印中..."
 
-#: ../src/common/debugrpt.cpp:546
+#: ../src/common/debugrpt.cpp:552
 #, c-format
 msgid ""
 "Processing debug report has failed, leaving the files in \"%s\" directory."
-msgstr ""
+msgstr "處理除錯報告失敗, 檔案被儲存在目錄 \"%s\" 中。"
 
-#: ../src/common/log.cpp:466
+#: ../src/common/log.cpp:431
 msgid "Program aborted."
 msgstr "程式異常終止。"
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:114
 msgid "Quarto, 215 x 275 mm"
 msgstr "四開，215 x 275 mm"
 
-#: ../src/generic/logg.cpp:1165
+#: ../src/generic/logg.cpp:1166
 msgid "Question"
 msgstr "問題"
 
+#: ../src/common/stockitem.cpp:208
+#, fuzzy
+msgid "Quit this program"
+msgstr "列印本頁"
+
+#: ../src/common/menucmn.cpp:71
+msgid "RETURN"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:75
+msgid "RIGHT"
+msgstr ""
+
 #: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
 msgstr "讀取檔案 '%s' 時發生錯誤"
 
-#: ../src/common/prntbase.cpp:242
-#, fuzzy
+#: ../src/common/prntbase.cpp:251
 msgid "Ready"
-msgstr "重做(&R)"
+msgstr "就緒"
+
+#: ../src/common/stockitem.cpp:209
+msgid "Redo last action"
+msgstr ""
 
-#: ../src/xrc/xmlres.cpp:643
+#: ../src/xrc/xmlres.cpp:681
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr "找不到 ref=\"%s\" 的參照物件節點！"
 
-#: ../src/common/stockitem.cpp:142
+#: ../src/common/stockitem.cpp:148
 msgid "Refresh"
-msgstr ""
+msgstr "重新整理"
 
-#: ../src/msw/registry.cpp:560
+#: ../src/msw/registry.cpp:555
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr "登錄機碼 '%s' 已存在。"
 
-#: ../src/msw/registry.cpp:529
+#: ../src/msw/registry.cpp:524
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr "登錄機碼 '%s' 不存在, 無法更名。"
 
-#: ../src/msw/registry.cpp:661
+#: ../src/msw/registry.cpp:656
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -3491,24 +4573,29 @@ msgstr ""
 "刪除它會使系統處於無法使用的狀態：\n"
 "操作中斷。"
 
-#: ../src/msw/registry.cpp:456
+#: ../src/msw/registry.cpp:451
 #, c-format
 msgid "Registry value '%s' already exists."
-msgstr "登錄機值 '%s' 已存在."
+msgstr "登錄機值 '%s' 已存在。"
+
+#: ../src/richtext/richtextfontpage.cpp:222
+#: ../src/richtext/richtextfontpage.cpp:225
+msgid "Regular"
+msgstr ""
 
-#: ../src/generic/helpext.cpp:442
+#: ../src/generic/helpext.cpp:461
 msgid "Relevant entries:"
 msgstr "相關項目："
 
-#: ../src/generic/progdlgg.cpp:210
+#: ../src/generic/progdlgg.cpp:206
 msgid "Remaining time : "
 msgstr "剩餘時間： "
 
-#: ../src/common/stockitem.cpp:143
+#: ../src/common/stockitem.cpp:149
 msgid "Remove"
-msgstr ""
+msgstr "移除"
 
-#: ../src/html/helpfrm.cpp:445
+#: ../src/html/helpwnd.cpp:422
 msgid "Remove current page from bookmarks"
 msgstr "從書籤中移除目前頁面"
 
@@ -3517,89 +4604,166 @@ msgstr "從書籤中移除目前頁面"
 msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
 msgstr "Renderer \"%s\" %d.%d 版本不完整。而且無法載入。"
 
-#: ../src/common/stockitem.cpp:117
-#, fuzzy
+#: ../src/richtext/richtextbuffer.cpp:2732
+msgid "Renumber List"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:123
 msgid "Rep&lace"
+msgstr "替換(&L)"
+
+#: ../src/richtext/richtextctrl.cpp:2206
+#, fuzzy
+msgid "Replace"
 msgstr "置換(&R)"
 
-#: ../src/generic/fdrepdlg.cpp:188
+#: ../src/generic/fdrepdlg.cpp:181
 msgid "Replace &all"
-msgstr "取代所有(&a)"
+msgstr "取代所有(&A)"
 
-#: ../src/generic/fdrepdlg.cpp:130
+#: ../src/common/stockitem.cpp:206
+#, fuzzy
+msgid "Replace selection"
+msgstr "取代所有(&A)"
+
+#: ../src/generic/fdrepdlg.cpp:123
 msgid "Replace with:"
 msgstr "置換："
 
-#: ../src/xrc/xmlres.cpp:479
+#: ../src/xrc/xmlres.cpp:504
 msgid "Resource files must have same version number!"
 msgstr "資源檔案的版本別必須一致！"
 
-#: ../src/common/stockitem.cpp:144
+#: ../src/common/stockitem.cpp:150
 msgid "Revert to Saved"
-msgstr ""
+msgstr "還原為上次儲存的檔案"
 
-#: ../src/generic/prntdlgg.cpp:891
+#: ../src/richtext/richtextbulletspage.cpp:197
+#: ../src/richtext/richtextliststylepage.cpp:250
+#, fuzzy
+msgid "Right"
+msgstr "細體"
+
+#: ../src/generic/prntdlgg.cpp:886
 msgid "Right margin (mm):"
-msgstr "右邊距(毫米)："
+msgstr "右邊距(公釐)："
+
+#: ../src/richtext/richtextindentspage.cpp:155
+#: ../src/richtext/richtextindentspage.cpp:157
+#: ../src/richtext/richtextliststylepage.cpp:337
+#: ../src/richtext/richtextliststylepage.cpp:339
+msgid "Right-align text."
+msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Roman"
 msgstr "羅馬"
 
-#: ../src/common/sizer.cpp:1838
-#, fuzzy
+#: ../src/richtext/richtextbulletspage.cpp:249
+#: ../src/richtext/richtextliststylepage.cpp:299
+msgid "S&tandard bullet name:"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:100
+msgid "SCROLL_LOCK"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:89
+msgid "SELECT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:95
+msgid "SEPARATOR"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:153
+msgid "SHIFT-JIS"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:92
+msgid "SNAPSHOT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:80
+msgid "SPACE"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:270 ../src/common/menucmn.cpp:329
+msgid "SPECIAL"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:96
+msgid "SUBTRACT"
+msgstr ""
+
+#: ../src/common/sizer.cpp:2018
 msgid "Save"
-msgstr "儲存...(&S)"
+msgstr "儲存"
 
-#: ../src/common/fldlgcmn.cpp:259
+#: ../src/common/fldlgcmn.cpp:271
 #, c-format
 msgid "Save %s file"
 msgstr "儲存檔案 %s "
 
-#: ../src/common/stockitem.cpp:146
-#, fuzzy
+#: ../src/common/stockitem.cpp:152
 msgid "Save &As..."
-msgstr "å\84²å­\98...(&S)"
+msgstr "å\8f¦å­\98ç\82º(&A)..."
 
-#: ../src/common/docview.cpp:305
-msgid "Save as"
+#: ../src/common/docview.cpp:300
+msgid "Save As"
 msgstr "另存為"
 
-#: ../src/generic/logg.cpp:505
+#: ../src/common/stockitem.cpp:212
+#, fuzzy
+msgid "Save current document"
+msgstr "選擇文件視界"
+
+#: ../src/common/stockitem.cpp:213
+msgid "Save current document with a different filename"
+msgstr ""
+
+#: ../src/generic/logg.cpp:506
 msgid "Save log contents to file"
 msgstr "將日誌內容存到檔案中"
 
-#: ../src/generic/fontdlgg.cpp:229
+#: ../src/generic/fontdlgg.cpp:232
 msgid "Script"
 msgstr "手寫"
 
-#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
+#: ../src/html/htmlhelp.cpp:610 ../src/html/helpwnd.cpp:513
+#: ../src/html/helpwnd.cpp:528
 msgid "Search"
 msgstr "搜尋"
 
-#: ../src/html/helpfrm.cpp:538
+#: ../src/html/helpwnd.cpp:515
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr "搜尋說明文件內容，找出上述文字所有出現過的地方"
 
-#: ../src/generic/fdrepdlg.cpp:166
+#: ../src/generic/fdrepdlg.cpp:159
 msgid "Search direction"
 msgstr "搜尋方向"
 
-#: ../src/generic/fdrepdlg.cpp:118
+#: ../src/generic/fdrepdlg.cpp:111
 msgid "Search for:"
 msgstr "搜尋："
 
-#: ../src/html/helpfrm.cpp:1060
+#: ../src/html/helpwnd.cpp:1039
 msgid "Search in all books"
 msgstr "搜尋所有的書籍"
 
-#: ../src/html/helpfrm.cpp:868
+#: ../src/html/htmlhelp.cpp:593
+#, fuzzy
+msgid "Search!"
+msgstr "搜尋"
+
+#: ../src/html/htmlhelp.cpp:383 ../src/html/htmlhelp.cpp:441
+#: ../src/html/helpwnd.cpp:849
 msgid "Searching..."
 msgstr "搜尋中..."
 
-#: ../src/generic/dirctrlg.cpp:592
+#: ../src/generic/dirctrlg.cpp:608
 msgid "Sections"
 msgstr "段落"
 
@@ -3611,220 +4775,383 @@ msgstr "檔案 '%s' 定位錯誤"
 #: ../src/common/ffile.cpp:212
 #, c-format
 msgid "Seek error on file '%s' (large files not supported by stdio)"
-msgstr ""
+msgstr "檔案 '%s'定位錯誤 (stdio不支援大檔案)"
 
-#: ../src/mac/carbon/textctrl.cpp:1078 ../src/msw/textctrl.cpp:2068
+#: ../src/mac/carbon/textctrl.cpp:1122 ../src/msw/textctrl.cpp:2214
+#: ../src/richtext/richtextctrl.cpp:2428
 msgid "Select &All"
 msgstr "選擇全部(&A)"
 
-#: ../src/common/docview.cpp:1699
+#: ../src/common/docview.cpp:1709
 msgid "Select a document template"
 msgstr "選擇文件範本"
 
-#: ../src/common/docview.cpp:1776
+#: ../src/common/docview.cpp:1786
 msgid "Select a document view"
 msgstr "選擇文件視界"
 
-#: ../src/common/docview.cpp:1579
-msgid "Select a file"
-msgstr "選擇檔案"
-
-#: ../src/motif/filedlg.cpp:226
+#: ../src/common/stockitem.cpp:153
 #, fuzzy
+msgid "Select all"
+msgstr "選擇全部(&A)"
+
+#: ../src/richtext/richtextfontpage.cpp:180
+#: ../src/richtext/richtextfontpage.cpp:182
+msgid "Select regular or bold."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:167
+#: ../src/richtext/richtextfontpage.cpp:169
+msgid "Select regular or italic style."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:193
+#: ../src/richtext/richtextfontpage.cpp:195
+msgid "Select underlining or no underlining."
+msgstr ""
+
+#: ../src/motif/filedlg.cpp:223
 msgid "Selection"
-msgstr "段落"
+msgstr "選取項目"
+
+#: ../src/richtext/richtextliststylepage.cpp:186
+#: ../src/richtext/richtextliststylepage.cpp:188
+msgid "Selects the list level to edit."
+msgstr ""
 
-#: ../src/common/cmdline.cpp:739
+#: ../src/common/cmdline.cpp:755
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "在選項 '%s' 之後應有分隔字元。"
 
-#: ../include/wx/xti.h:841
+#: ../include/wx/xti.h:837
 msgid "SetProperty called w/o valid setter"
-msgstr ""
+msgstr "呼叫SetProperty時未帶有效的setter"
 
-#: ../src/generic/prntdlgg.cpp:182
+#: ../src/generic/prntdlgg.cpp:183
 msgid "Setup..."
 msgstr "設定..."
 
-#: ../src/msw/dialup.cpp:567
+#: ../src/msw/dialup.cpp:568
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "多個撥號連線中，隨機選擇一個。"
 
-#: ../src/html/helpfrm.cpp:493
+#: ../src/common/menucmn.cpp:318
+#, fuzzy
+msgid "Shift-"
+msgstr "shift"
+
+#: ../src/generic/dirdlgg.cpp:168
+#, fuzzy
+msgid "Show &hidden directories"
+msgstr "顯示隱藏目錄"
+
+#: ../src/generic/filedlgg.cpp:1157
+#, fuzzy
+msgid "Show &hidden files"
+msgstr "顯示隱藏檔案"
+
+#: ../src/common/stockitem.cpp:202
+msgid "Show about dialog"
+msgstr ""
+
+#: ../src/html/helpwnd.cpp:470
 msgid "Show all"
 msgstr "顯示所有"
 
-#: ../src/html/helpfrm.cpp:504
+#: ../src/html/helpwnd.cpp:481
 msgid "Show all items in index"
 msgstr "以索引的方式顯示所有項目"
 
-#: ../src/generic/dirdlgg.cpp:112 ../src/generic/dirdlgg.cpp:175
+#: ../src/generic/dirdlgg.cpp:103
 msgid "Show hidden directories"
 msgstr "顯示隱藏目錄"
 
-#: ../src/generic/filedlgg.cpp:1056
-msgid "Show hidden files"
-msgstr "顯示隱藏檔案"
-
-#: ../src/html/helpfrm.cpp:646
+#: ../src/html/htmlhelp.cpp:538 ../src/html/helpwnd.cpp:632
 msgid "Show/hide navigation panel"
 msgstr "顯示/隱藏遊覽面板"
 
-#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+#: ../src/richtext/richtextsymboldlg.cpp:420
+#: ../src/richtext/richtextsymboldlg.cpp:422
+msgid "Shows a Unicode subset."
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:273
+#: ../src/richtext/richtextbulletspage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:476
+#: ../src/richtext/richtextliststylepage.cpp:478
+msgid "Shows a preview of the bullet settings."
+msgstr ""
+
+#: ../src/richtext/richtextfontpage.cpp:213
+#: ../src/richtext/richtextfontpage.cpp:215
+msgid "Shows a preview of the font settings."
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:517 ../src/mac/carbon/fontdlg.cpp:519
+msgid "Shows a preview of the font."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:303
+#: ../src/richtext/richtextindentspage.cpp:305
+msgid "Shows a preview of the paragraph settings."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:367 ../src/generic/fontdlgg.cpp:369
 msgid "Shows the font preview."
+msgstr "顯示字型預覽。"
+
+#: ../src/univ/themes/mono.cpp:509
+msgid "Simple monochrome theme"
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:289
+#: ../src/richtext/richtextindentspage.cpp:293
+#: ../src/richtext/richtextindentspage.cpp:294
+#: ../src/richtext/richtextliststylepage.cpp:460
+#: ../src/richtext/richtextliststylepage.cpp:464
+#: ../src/richtext/richtextliststylepage.cpp:465
+msgid "Single"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:432
+#: ../src/generic/filedlgg.cpp:507
 msgid "Size"
 msgstr "大小"
 
-#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
-#: ../src/generic/progdlgg.cpp:598
+#: ../src/mac/carbon/fontdlg.cpp:462
 #, fuzzy
+msgid "Size:"
+msgstr "大小"
+
+#: ../src/generic/progdlgg.cpp:218 ../src/generic/progdlgg.cpp:236
+#: ../src/generic/progdlgg.cpp:627
 msgid "Skip"
-msgstr "手寫"
+msgstr "略過"
 
-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:237
 msgid "Slant"
 msgstr "傾斜"
 
-#: ../src/common/docview.cpp:581
+#: ../src/common/docview.cpp:576
 msgid "Sorry, could not open this file for saving."
 msgstr "對不起，無法開啟檔案以便儲存。"
 
-#: ../src/common/docview.cpp:617 ../src/common/docview.cpp:1598
+#: ../src/common/docview.cpp:612 ../src/common/docview.cpp:1608
 msgid "Sorry, could not open this file."
 msgstr "對不起，無法開啟檔案。"
 
-#: ../src/common/docview.cpp:588
+#: ../src/common/docview.cpp:583
 msgid "Sorry, could not save this file."
 msgstr "對不起，無法儲存檔案。"
 
-#: ../src/common/prntbase.cpp:1246
+#: ../contrib/src/fl/controlbar.cpp:384
+msgid ""
+"Sorry, docking is not supported for ports other than wxMSW, wxMac and wxGTK"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:1494
 msgid "Sorry, not enough memory to create a preview."
 msgstr "對不起，記憶體不足無法建立預覽。"
 
-#: ../src/common/docview.cpp:1028
+#: ../src/common/docview.cpp:1038
 msgid "Sorry, print preview needs a printer to be installed."
-msgstr "抱歉，預覽列印必須安裝印表機"
+msgstr "抱歉，預覽列印必須安裝印表機。"
 
-#: ../src/common/docview.cpp:1268 ../src/common/docview.cpp:1618
+#: ../src/richtext/richtextstyledlg.cpp:575
+#: ../src/richtext/richtextstyledlg.cpp:623
+#: ../src/richtext/richtextstyledlg.cpp:777
+msgid "Sorry, that name is taken. Please choose another."
+msgstr ""
+
+#: ../src/common/docview.cpp:1278 ../src/common/docview.cpp:1628
 msgid "Sorry, the format for this file is unknown."
 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 "'%s' 音效檔案格式不支援"
+msgstr "'%s' 音效檔案格式不支援。"
 
-#: ../src/common/paper.cpp:111
+#: ../src/richtext/richtextliststylepage.cpp:471
+#, fuzzy
+msgid "Spacing"
+msgstr "搜尋中..."
+
+#: ../src/richtext/richtextbulletspage.cpp:289
+#: ../src/richtext/richtextliststylepage.cpp:494
+msgid "Standard"
+msgstr ""
+
+#: ../src/common/paper.cpp:106
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "結算單, 5 1/2 x 8 1/2 英吋"
 
-#: ../src/generic/prntdlgg.cpp:198
-#, fuzzy
+#: ../src/generic/prntdlgg.cpp:199
 msgid "Status:"
-msgstr "狀態︰"
+msgstr "狀態:"
 
-#: ../src/generic/logg.cpp:622
+#: ../src/generic/logg.cpp:623
 msgid "Status: "
 msgstr "狀態︰"
 
-#: ../src/common/xtistrm.cpp:253
+#: ../src/common/xtistrm.cpp:249
 msgid "Streaming delegates for not already streamed objects not yet supported"
-msgstr ""
+msgstr "對於沒有串流化的物件使用委託串流功能尚未被支援"
 
-#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#: ../src/msw/colour.cpp:35
 #, c-format
 msgid "String To Colour : Incorrect colour specification : %s"
 msgstr "顏色名稱：不正確的顏色規格：%s。"
 
-#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+#: ../include/wx/xti.h:424 ../include/wx/xti.h:428
 msgid "String conversions not supported"
 msgstr "不支援字串轉換"
 
-#: ../src/xrc/xmlres.cpp:750
+#: ../src/richtext/richtextformatdlg.cpp:266
+#, fuzzy
+msgid "Style"
+msgstr "字型(&S):"
+
+#: ../include/wx/richtext/richtextstyledlg.h:42
+msgid "Style Organiser"
+msgstr ""
+
+#: ../src/mac/carbon/fontdlg.cpp:471
+#, fuzzy
+msgid "Style:"
+msgstr "字型(&S):"
+
+#: ../src/xrc/xmlres.cpp:788
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr "沒找到子類別 '%s' 予資源 '%s'，無法子類別化！"
 
-#: ../src/common/paper.cpp:157
+#: ../src/common/paper.cpp:152
 msgid "SuperA/SuperA/A4 227 x 356 mm"
-msgstr ""
+msgstr "SuperA/SuperA/A4 227 x 356 公釐"
 
-#: ../src/common/paper.cpp:158
+#: ../src/common/paper.cpp:153
 msgid "SuperB/SuperB/A3 305 x 487 mm"
-msgstr ""
+msgstr "SuperB/SuperB/A3 305 x 487 公釐"
 
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:233
 msgid "Swiss"
 msgstr "瑞士"
 
-#: ../src/common/imagtiff.cpp:165
-msgid "TIFF library error."
+#: ../src/richtext/richtextbulletspage.cpp:287
+#: ../src/richtext/richtextliststylepage.cpp:492
+msgid "Symbol"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:149
-msgid "TIFF library warning."
+#: ../src/richtext/richtextbulletspage.cpp:237
+#: ../src/richtext/richtextliststylepage.cpp:288
+#, fuzzy
+msgid "Symbol &font:"
+msgstr "正常字型："
+
+#: ../include/wx/richtext/richtextsymboldlg.h:44
+msgid "Symbols"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:81
+msgid "TAB"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:248 ../src/common/imagtiff.cpp:259
-#: ../src/common/imagtiff.cpp:399
+#: ../src/common/imagtiff.cpp:194
+msgid "TIFF library error."
+msgstr "TIFF 函式庫錯誤。"
+
+#: ../src/common/imagtiff.cpp:178
+msgid "TIFF library warning."
+msgstr "TIFF 函式庫錯誤"
+
+#: ../src/common/imagtiff.cpp:277 ../src/common/imagtiff.cpp:288
+#: ../src/common/imagtiff.cpp:434
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: 無法配置記憶體。"
 
-#: ../src/common/imagtiff.cpp:219
+#: ../src/common/imagtiff.cpp:248
 msgid "TIFF: Error loading image."
 msgstr "TIFF: 載入影像錯誤。"
 
-#: ../src/common/imagtiff.cpp:270
+#: ../src/common/imagtiff.cpp:299
 msgid "TIFF: Error reading image."
 msgstr "TIFF: 讀取影像錯誤。"
 
-#: ../src/common/imagtiff.cpp:347
+#: ../src/common/imagtiff.cpp:376
 msgid "TIFF: Error saving image."
 msgstr "TIFF: 儲存影像錯誤。"
 
-#: ../src/common/imagtiff.cpp:445
+#: ../src/common/imagtiff.cpp:480
 msgid "TIFF: Error writing image."
 msgstr "TIFF: 寫入影像錯誤。"
 
-#: ../src/common/paper.cpp:152
-#, fuzzy
+#: ../src/common/paper.cpp:147
 msgid "Tabloid Extra 11.69 x 18 in"
-msgstr "小報紙, 11 x 17 英吋"
+msgstr "小報加長 11.69 x 18 英吋"
 
-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:104
 msgid "Tabloid, 11 x 17 in"
-msgstr "小報紙, 11 x 17 英吋"
+msgstr "小報, 11 x 17 英吋"
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/richtext/richtextformatdlg.cpp:284
+msgid "Tabs"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:234
 msgid "Teletype"
 msgstr "電傳打字機"
 
-#: ../src/common/docview.cpp:1700
+#: ../src/common/docview.cpp:1710
 msgid "Templates"
 msgstr "範本"
 
-#: ../src/common/fmapbase.cpp:114
+#: ../src/common/fmapbase.cpp:116
 msgid "Thai (ISO-8859-11)"
 msgstr "泰語 (ISO-8859-11)"
 
-#: ../src/common/ftp.cpp:708
+#: ../src/common/ftp.cpp:704
 msgid "The FTP server doesn't support passive mode."
 msgstr "檔案傳輸伺服器不支援被動模式。"
 
-#: ../src/common/ftp.cpp:696
-#, fuzzy
+#: ../src/common/ftp.cpp:692
 msgid "The FTP server doesn't support the PORT command."
-msgstr "檔案傳輸伺服器不支援被動模式。"
+msgstr "FTP伺服器不支援PORT命令。"
+
+#: ../src/richtext/richtextbulletspage.cpp:160
+#: ../src/richtext/richtextbulletspage.cpp:162
+#: ../src/richtext/richtextliststylepage.cpp:214
+#: ../src/richtext/richtextliststylepage.cpp:216
+msgid "The available bullet styles."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:195
+#: ../src/richtext/richtextstyledlg.cpp:197
+#, fuzzy
+msgid "The available styles."
+msgstr "字型風格。"
+
+#: ../src/richtext/richtextbulletspage.cpp:201
+#: ../src/richtext/richtextbulletspage.cpp:203
+#: ../src/richtext/richtextbulletspage.cpp:224
+#: ../src/richtext/richtextbulletspage.cpp:226
+#: ../src/richtext/richtextliststylepage.cpp:254
+#: ../src/richtext/richtextliststylepage.cpp:256
+#: ../src/richtext/richtextliststylepage.cpp:275
+#: ../src/richtext/richtextliststylepage.cpp:277
+msgid "The bullet character."
+msgstr ""
 
-#: ../src/common/fontmap.cpp:204
+#: ../src/richtext/richtextsymboldlg.cpp:442
+#: ../src/richtext/richtextsymboldlg.cpp:444
+msgid "The character code."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:201
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -3834,12 +5161,17 @@ msgstr ""
 "未知的字集 '%s'。選擇其它字集替換，\n"
 "如果無法替換，則選擇[取消]"
 
-#: ../src/msw/ole/dataobj.cpp:164
+#: ../src/msw/ole/dataobj.cpp:160
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "剪貼簿格式 '%d' 不存在。"
 
-#: ../src/generic/dirdlgg.cpp:224
+#: ../src/richtext/richtextstylepage.cpp:127
+#: ../src/richtext/richtextstylepage.cpp:129
+msgid "The default style for the next paragraph."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:229
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
@@ -3848,7 +5180,7 @@ msgstr ""
 "目錄 '%s' 不存在\n"
 "現在建立？"
 
-#: ../src/common/docview.cpp:1949
+#: ../src/common/docview.cpp:1977
 #, c-format
 msgid ""
 "The file '%s' couldn't be opened.\n"
@@ -3857,7 +5189,7 @@ msgstr ""
 "檔案 '%s' 無法開啟.\n"
 "已從「最近使用的檔案歷史清單」中除名。"
 
-#: ../src/common/docview.cpp:1959
+#: ../src/common/docview.cpp:1987
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
@@ -3866,167 +5198,312 @@ msgstr ""
 "檔案 '%s' 不存在，無法開啟.\n"
 "已從「最近使用的檔案紀錄清單」中除名。"
 
-#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+#: ../src/richtext/richtextindentspage.cpp:221
+#: ../src/richtext/richtextindentspage.cpp:223
+#: ../src/richtext/richtextliststylepage.cpp:398
+#: ../src/richtext/richtextliststylepage.cpp:400
+#, fuzzy
+msgid "The first line indent."
+msgstr "字點大小。"
+
+#: ../src/generic/fontdlgg.cpp:321 ../src/generic/fontdlgg.cpp:323
 msgid "The font colour."
-msgstr ""
+msgstr "字型顏色。"
 
-#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+#: ../src/generic/fontdlgg.cpp:282 ../src/generic/fontdlgg.cpp:284
 msgid "The font family."
+msgstr "字型。"
+
+#: ../src/richtext/richtextsymboldlg.cpp:404
+#: ../src/richtext/richtextsymboldlg.cpp:406
+msgid "The font from which to take the symbol."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+#: ../src/generic/fontdlgg.cpp:334 ../src/generic/fontdlgg.cpp:336
+#: ../src/generic/fontdlgg.cpp:341 ../src/generic/fontdlgg.cpp:343
+msgid "The font point size."
+msgstr "字點大小。"
+
+#: ../src/mac/carbon/fontdlg.cpp:466 ../src/mac/carbon/fontdlg.cpp:468
+#, fuzzy
+msgid "The font size in points."
+msgstr "字點大小。"
+
+#: ../src/generic/fontdlgg.cpp:293 ../src/generic/fontdlgg.cpp:295
+msgid "The font style."
+msgstr "字型風格。"
+
+#: ../src/generic/fontdlgg.cpp:304 ../src/generic/fontdlgg.cpp:306
+msgid "The font weight."
+msgstr "字型粗細。"
+
+#: ../src/richtext/richtextindentspage.cpp:209
+#: ../src/richtext/richtextindentspage.cpp:211
+#: ../src/richtext/richtextliststylepage.cpp:387
+#: ../src/richtext/richtextliststylepage.cpp:389
 #, fuzzy
-msgid "The font point size."
-msgstr "字型大小"
+msgid "The left indent."
+msgstr "字型粗細。"
 
-#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
-msgid "The font style."
+#: ../src/richtext/richtextindentspage.cpp:295
+#: ../src/richtext/richtextindentspage.cpp:297
+#: ../src/richtext/richtextliststylepage.cpp:466
+#: ../src/richtext/richtextliststylepage.cpp:468
+msgid "The line spacing."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
-msgid "The font weight."
+#: ../src/richtext/richtextbulletspage.cpp:265
+#: ../src/richtext/richtextbulletspage.cpp:267
+msgid "The list item number."
 msgstr ""
 
-#: ../src/common/filename.cpp:966
+#: ../src/common/filename.cpp:1224
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr "路徑 '%s' 包含太多的 \"..\"！"
 
-#: ../src/generic/dbgrptg.cpp:308
+#: ../src/common/log.cpp:291
+#, c-format
+msgid "The previous message repeated once."
+msgid_plural "The previous message repeated %lu times."
+msgstr[0] ""
+
+#: ../src/richtext/richtextsymboldlg.cpp:462
+#: ../src/richtext/richtextsymboldlg.cpp:464
+msgid "The range to show."
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:309
 msgid ""
 "The report contains the files listed below. If any of these files contain "
 "private information,\n"
 "please uncheck them and they will be removed from the report.\n"
 msgstr ""
+"報告包含了以下檔案. 如果這些檔案含有私人資訊, \n"
+"請去掉選取相對的檔案, 未選取的檔案就會從報告中刪除.\n"
 
-#: ../src/common/cmdline.cpp:883
+#: ../src/common/cmdline.cpp:903
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "必要的參數 '%s' 沒有指定。"
 
-#: ../src/common/textcmn.cpp:246
+#: ../src/richtext/richtextindentspage.cpp:233
+#: ../src/richtext/richtextindentspage.cpp:235
+#: ../src/richtext/richtextliststylepage.cpp:409
+#: ../src/richtext/richtextliststylepage.cpp:411
+msgid "The right indent."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:279
+#: ../src/richtext/richtextliststylepage.cpp:449
+#: ../src/richtext/richtextliststylepage.cpp:451
+msgid "The spacing after the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextindentspage.cpp:266
+#: ../src/richtext/richtextindentspage.cpp:268
+#: ../src/richtext/richtextliststylepage.cpp:438
+#: ../src/richtext/richtextliststylepage.cpp:440
+msgid "The spacing before the paragraph."
+msgstr ""
+
+#: ../src/richtext/richtextstylepage.cpp:107
+#: ../src/richtext/richtextstylepage.cpp:109
+#, fuzzy
+msgid "The style name."
+msgstr "字型風格。"
+
+#: ../src/richtext/richtextstylepage.cpp:117
+#: ../src/richtext/richtextstylepage.cpp:119
+msgid "The style on which this style is based."
+msgstr ""
+
+#: ../src/richtext/richtextstyledlg.cpp:207
+#: ../src/richtext/richtextstyledlg.cpp:209
+#, fuzzy
+msgid "The style preview."
+msgstr "顯示字型預覽。"
+
+#: ../src/richtext/richtexttabspage.cpp:117
+#: ../src/richtext/richtexttabspage.cpp:119
+#, fuzzy
+msgid "The tab position."
+msgstr "字點大小。"
+
+#: ../src/richtext/richtexttabspage.cpp:123
+#, fuzzy
+msgid "The tab positions."
+msgstr "字點大小。"
+
+#: ../src/common/textcmn.cpp:254 ../src/richtext/richtextctrl.cpp:1781
 msgid "The text couldn't be saved."
 msgstr "文字無法儲存。"
 
-#: ../src/common/cmdline.cpp:862
+#: ../src/common/cmdline.cpp:881
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "選項 '%s' 的值必須指定。"
 
-#: ../src/msw/dialup.cpp:455
+#: ../src/msw/dialup.cpp:456
 #, 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:601
+#: ../src/html/htmprint.cpp:610 ../src/richtext/richtextprint.cpp:561
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr "頁面設定時有問題：你必須設定預設印表機。"
 
-#: ../src/msw/datectrl.cpp:109
+#: ../src/msw/datectrl.cpp:110
 msgid ""
 "This system doesn't support date picker control, please upgrade your version "
 "of comctl32.dll"
-msgstr ""
+msgstr "本系統不支援日期獲取控制, 請升級您的comctl32.dll"
 
-#: ../src/msw/thread.cpp:1206
+#: ../src/msw/thread.cpp:1247
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "執行緒模組初始化失敗：無法存值到「執行緒內部儲存區」"
 
-#: ../src/unix/threadpsx.cpp:1603
+#: ../src/unix/threadpsx.cpp:1618
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "執行緒模組初始化失敗：無法建立執行緒機碼"
 
-#: ../src/msw/thread.cpp:1194
+#: ../src/msw/thread.cpp:1235
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "執行緒模組初始化失敗：無法在「執行緒內部儲存區」中配置索引"
 
-#: ../src/unix/threadpsx.cpp:1108
+#: ../src/unix/threadpsx.cpp:1136
 msgid "Thread priority setting is ignored."
 msgstr "忽略執行緒的優先等級設定。"
 
-#: ../src/msw/mdi.cpp:184
+#: ../src/msw/mdi.cpp:172
 msgid "Tile &Horizontally"
 msgstr "水平鋪列(&H)"
 
-#: ../src/msw/mdi.cpp:185
+#: ../src/msw/mdi.cpp:173
 msgid "Tile &Vertically"
 msgstr "垂直鋪列(&V)"
 
-#: ../src/common/ftp.cpp:635
-#, fuzzy
+#: ../src/common/ftp.cpp:631
 msgid "Timeout while waiting for FTP server to connect, try passive mode."
-msgstr "檔案傳輸伺服器不支援被動模式。"
+msgstr "等待FTP伺服器連線時逾時，請嘗試用passive模式。"
 
-#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+#: ../src/msw/timer.cpp:111 ../src/os2/timer.cpp:130
 msgid "Timer creation failed."
 msgstr "計時器建立失敗。"
 
-#: ../src/generic/tipdlg.cpp:220
+#: ../src/generic/tipdlg.cpp:218
 msgid "Tip of the Day"
 msgstr "每日小秘訣"
 
-#: ../src/generic/tipdlg.cpp:157
+#: ../src/generic/tipdlg.cpp:153
 msgid "Tips not available, sorry!"
 msgstr "對不起，無法取得小秘訣！"
 
-#: ../src/generic/prntdlgg.cpp:237
+#: ../src/generic/prntdlgg.cpp:238
 msgid "To:"
 msgstr "到："
 
-#: ../src/common/imagpng.cpp:292
+#: ../src/richtext/richtextbuffer.cpp:4953
+msgid "Too many EndStyle calls!"
+msgstr ""
+
+#: ../src/common/imagpng.cpp:294
 msgid "Too many colours in PNG, the image may be slightly blurred."
 msgstr "太多顏色在 PNG 中，影像可能有點模糊。"
 
-#: ../src/generic/prntdlgg.cpp:880
+#: ../src/generic/prntdlgg.cpp:875
 msgid "Top margin (mm):"
-msgstr "上版邊(毫米)："
+msgstr "上版邊(公釐)："
+
+#: ../src/generic/aboutdlgg.cpp:79
+msgid "Translations by "
+msgstr ""
 
-#: ../src/common/fs_mem.cpp:205
+#: ../src/common/fs_mem.cpp:193
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "嘗試從「記憶體虛擬檔案系統」中移除檔案 '%s'，但它並未被載入！"
 
-#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
+#: ../src/common/sckaddr.cpp:144 ../src/common/sckaddr.cpp:247
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "嘗試解析 NULL 主機名：放棄"
 
-#: ../src/common/fmapbase.cpp:112
+#: ../src/common/fmapbase.cpp:114
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其語 (ISO-8859-9)"
 
-#: ../src/generic/filedlgg.cpp:433
+#: ../src/generic/filedlgg.cpp:508
 msgid "Type"
 msgstr "類型"
 
-#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
-#: ../src/common/xtixml.cpp:498
+#: ../src/richtext/richtextfontpage.cpp:126
+#: ../src/richtext/richtextfontpage.cpp:128
+#, fuzzy
+msgid "Type a font name."
+msgstr "字型。"
+
+#: ../src/richtext/richtextfontpage.cpp:144
+#: ../src/richtext/richtextfontpage.cpp:146
+msgid "Type a size in points."
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:277 ../src/common/xtixml.cpp:348
+#: ../src/common/xtixml.cpp:495
 msgid "Type must have enum - long conversion"
+msgstr "必須進行 enum - long 的類型轉換"
+
+#: ../src/common/menucmn.cpp:76
+msgid "UP"
 msgstr ""
 
-#: ../src/common/paper.cpp:140
+#: ../src/common/paper.cpp:135
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "美國標準複寫簿, 14 7/8 x 11 英吋"
 
-#: ../src/html/htmlwin.cpp:403
+#: ../src/common/fmapbase.cpp:151
+#, fuzzy
+msgid "US-ASCII"
+msgstr "ASCII"
+
+#: ../src/common/strconv.cpp:2771 ../src/common/strconv.cpp:2775
+msgid "Unable to create TextEncodingConverter"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:508
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "無法開啟 HTML 文件： %s"
 
-#: ../src/unix/sound.cpp:376
+#: ../src/unix/sound.cpp:369
 msgid "Unable to play sound asynchronously."
-msgstr "無法非同步播放音效"
+msgstr "無法非同步播放音效。"
 
-#: ../src/common/stockitem.cpp:148
-#, fuzzy
+#: ../src/common/stockitem.cpp:155
 msgid "Undelete"
-msgstr "底線"
+msgstr "取消刪除"
+
+#: ../src/mac/carbon/fontdlg.cpp:493 ../src/richtext/richtextfontpage.cpp:229
+#: ../src/richtext/richtextfontpage.cpp:313
+#: ../src/richtext/richtextfontpage.cpp:468
+#, fuzzy
+msgid "Underlined"
+msgstr "底線(&U)"
+
+#: ../src/common/stockitem.cpp:210
+msgid "Undo last action"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:691
+#, fuzzy, c-format
+msgid "Unexpected characters following option '%s'."
+msgstr "意外參數 '%s'"
 
 #: ../contrib/src/deprecated/resource.cpp:1848
 #: ../contrib/src/deprecated/resource.cpp:1862
@@ -4036,294 +5513,327 @@ msgstr "底線"
 #: ../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
+#: ../contrib/src/deprecated/resource.cpp:3080
+#: ../contrib/src/deprecated/resource.cpp:3094
+#: ../contrib/src/deprecated/resource.cpp:3111
+#: ../contrib/src/deprecated/resource.cpp:3125
 msgid "Unexpected end of file while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr "解析資源時遇到意外的檔案結尾。"
 
-#: ../src/common/cmdline.cpp:826
+#: ../src/common/cmdline.cpp:844
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "意外參數 '%s'"
 
-#: ../src/common/fmapbase.cpp:137
+#: ../src/richtext/richtextsymboldlg.cpp:458
+#, fuzzy
+msgid "Unicode"
+msgstr "取消縮排(&U)"
+
+#: ../src/common/fmapbase.cpp:140 ../src/common/fmapbase.cpp:146
 msgid "Unicode 16 bit (UTF-16)"
 msgstr "十六位元統一碼(UTF-16)"
 
-#: ../src/common/fmapbase.cpp:138
+#: ../src/common/fmapbase.cpp:145
 msgid "Unicode 16 bit Big Endian (UTF-16BE)"
 msgstr "十六位元統一碼(UTF-16BE)"
 
-#: ../src/common/fmapbase.cpp:139
+#: ../src/common/fmapbase.cpp:141
 msgid "Unicode 16 bit Little Endian (UTF-16LE)"
 msgstr "十六位元統一碼(UTF-16LE)"
 
-#: ../src/common/fmapbase.cpp:140
+#: ../src/common/fmapbase.cpp:142 ../src/common/fmapbase.cpp:148
 msgid "Unicode 32 bit (UTF-32)"
 msgstr "三十二位元統一碼(UTF-32)"
 
-#: ../src/common/fmapbase.cpp:141
+#: ../src/common/fmapbase.cpp:147
 msgid "Unicode 32 bit Big Endian (UTF-32BE)"
 msgstr "三十二位元統一碼(UTF-32BE)"
 
-#: ../src/common/fmapbase.cpp:142
+#: ../src/common/fmapbase.cpp:143
 msgid "Unicode 32 bit Little Endian (UTF-32LE)"
 msgstr "三十二位元統一碼(UTF-32LE)"
 
-#: ../src/common/fmapbase.cpp:135
+#: ../src/common/fmapbase.cpp:137
 msgid "Unicode 7 bit (UTF-7)"
 msgstr "七位元統一碼(UTF-7)"
 
-#: ../src/common/fmapbase.cpp:136
+#: ../src/common/fmapbase.cpp:138
 msgid "Unicode 8 bit (UTF-8)"
 msgstr "八位元統一碼(UTF-7)"
 
-#: ../src/msw/dde.cpp:1093
+#: ../src/generic/progdlgg.cpp:613
+#, fuzzy
+msgid "Unknown"
+msgstr "未知的"
+
+#: ../src/msw/dde.cpp:1088
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "未知的「動態資料交換」錯誤 %08x"
 
-#: ../src/common/xtistrm.cpp:370
+#: ../src/common/xtistrm.cpp:366
 msgid "Unknown Object passed to GetObjectClassInfo"
 msgstr "傳給 GetObjectClassInfo 未知的物件"
 
-#: ../src/unix/dlunix.cpp:275
+#: ../src/unix/dlunix.cpp:281
 msgid "Unknown dynamic library error"
-msgstr ""
+msgstr "不明的動態函式庫錯誤"
 
-#: ../src/common/fmapbase.cpp:695
+#: ../src/common/fmapbase.cpp:671
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "未知的編碼 (%d)"
 
-#: ../src/unix/mimetype.cpp:2344
-#, c-format
-msgid "Unknown field in file %s, line %d: '%s'."
-msgstr "檔案 %s 第 %d 行有未知欄位：'%s'。"
-
-#: ../src/common/cmdline.cpp:599
+#: ../src/common/cmdline.cpp:598
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "未知的長選項 '%s'"
 
-#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
+#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:630
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "未知的選項 '%s'"
 
-#: ../src/xrc/xmlres.cpp:823
+#: ../src/xrc/xmlres.cpp:865
 msgid "Unknown style flag "
 msgstr "未知的樣式旗標"
 
-#: ../src/common/xtixml.cpp:324
+#: ../src/common/xtixml.cpp:321
 #, c-format
 msgid "Unkown Property %s"
 msgstr "未知的屬性 %s"
 
-#: ../src/common/mimecmn.cpp:163
+#: ../src/common/mimecmn.cpp:169
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "mime 類型 %s 中有不成對的'{'。"
 
-#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
-#: ../src/common/cmdproc.cpp:307
+#: ../src/common/cmdproc.cpp:257 ../src/common/cmdproc.cpp:283
+#: ../src/common/cmdproc.cpp:303
 msgid "Unnamed command"
 msgstr "未命名的指令"
 
-#: ../contrib/src/deprecated/resource.cpp:2367
-#, fuzzy, c-format
+#: ../contrib/src/deprecated/resource.cpp:2377
+#, c-format
 msgid "Unrecognized style %s while parsing resource."
-msgstr "解譯資源時遇到無法識別的樣式 %s。"
+msgstr "解析資源時遇到無法識別的樣式 %s。"
 
-#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
-#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
+#: ../src/mac/classic/clipbrd.cpp:66 ../src/msw/clipbrd.cpp:267
+#: ../src/msw/clipbrd.cpp:439
 msgid "Unsupported clipboard format."
 msgstr "不支援的剪貼簿格式。"
 
-#: ../src/common/appcmn.cpp:232
+#: ../src/common/appcmn.cpp:260
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr "不支援的主題 '%s'。"
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:151
 msgid "Up"
 msgstr "上"
 
-#: ../src/common/cmdline.cpp:954
+#: ../src/richtext/richtextbulletspage.cpp:282
+#: ../src/richtext/richtextliststylepage.cpp:487
+msgid "Upper case letters"
+msgstr ""
+
+#: ../src/richtext/richtextbulletspage.cpp:284
+#: ../src/richtext/richtextliststylepage.cpp:489
+msgid "Upper case roman numerals"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:975
 #, c-format
 msgid "Usage: %s"
 msgstr "使用方式：%s"
 
-#: ../src/common/valtext.cpp:181
+#: ../src/richtext/richtextindentspage.cpp:176
+#: ../src/richtext/richtextindentspage.cpp:178
+#: ../src/richtext/richtextliststylepage.cpp:358
+#: ../src/richtext/richtextliststylepage.cpp:360
+msgid "Use the current alignment setting."
+msgstr ""
+
+#: ../src/common/valtext.cpp:177
 msgid "Validation conflict"
 msgstr "驗證衝突"
 
-#: ../contrib/src/mmedia/vidbase.cpp:65
+#: ../contrib/src/mmedia/vidbase.cpp:62
 msgid "Video Output"
 msgstr "影像輸出"
 
-#: ../src/generic/filedlgg.cpp:972
+#: ../src/generic/filedlgg.cpp:1061
 msgid "View files as a detailed view"
 msgstr "按詳細資料檢視檔案"
 
-#: ../src/generic/filedlgg.cpp:965
+#: ../src/generic/filedlgg.cpp:1054
 msgid "View files as a list view"
 msgstr "按清單檢視檔案"
 
-#: ../src/common/docview.cpp:1777
+#: ../src/common/docview.cpp:1787
 msgid "Views"
 msgstr "視界"
 
+#: ../src/common/menucmn.cpp:126
+msgid "WINDOWS_LEFT"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:128
+msgid "WINDOWS_MENU"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:127
+msgid "WINDOWS_RIGHT"
+msgstr ""
+
 #: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
 msgstr "等待子程序終止失敗"
 
-#: ../src/common/docview.cpp:461
+#: ../src/common/docview.cpp:456 ../src/html/htmprint.cpp:380
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/common/log.cpp:480
+#: ../src/common/log.cpp:445
 msgid "Warning: "
 msgstr "警告："
 
-#: ../src/html/htmlpars.cpp:391
+#: ../src/html/htmlpars.cpp:385
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "警告：試圖從空堆疊中移除 HTML 標籤處理常式。"
 
-#: ../src/common/fmapbase.cpp:104
+#: ../src/common/fmapbase.cpp:106
 msgid "Western European (ISO-8859-1)"
 msgstr "西歐語系 (ISO-8859-1)"
 
-#: ../src/common/fmapbase.cpp:118
+#: ../src/common/fmapbase.cpp:120
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "西歐與歐洲 (ISO-8859-15)"
 
-#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
 msgid "Whether the font is underlined."
-msgstr ""
+msgstr "字型是否加底線。"
 
-#: ../src/generic/fdrepdlg.cpp:150
+#: ../src/generic/fdrepdlg.cpp:143
 msgid "Whole word"
 msgstr "完整的字"
 
-#: ../src/html/helpfrm.cpp:535
+#: ../src/html/helpwnd.cpp:512
 msgid "Whole words only"
 msgstr "只限完整的字"
 
-#: ../src/univ/themes/win32.cpp:1235
+#: ../src/univ/themes/win32.cpp:1058
 msgid "Win32 theme"
 msgstr "Win32 主題"
 
-#: ../src/msw/utils.cpp:1063
+#: ../src/msw/utils.cpp:1080
 msgid "Win32s on Windows 3.1"
-msgstr ""
+msgstr "Windows 3.1上的Win32s"
 
-#: ../src/msw/utils.cpp:1112
+#: ../src/msw/utils.cpp:1129
 #, c-format
 msgid "Windows 2000 (build %lu"
-msgstr ""
+msgstr "Windows 2000 (build %lu"
 
-#: ../src/msw/utils.cpp:1077
-#, fuzzy
+#: ../src/msw/utils.cpp:1094
 msgid "Windows 95"
-msgstr "視窗(&W)"
+msgstr "Windows 95"
 
-#: ../src/msw/utils.cpp:1073
+#: ../src/msw/utils.cpp:1090
 msgid "Windows 95 OSR2"
-msgstr ""
+msgstr "Windows 95 OSR2"
 
-#: ../src/msw/utils.cpp:1088
-#, fuzzy
+#: ../src/msw/utils.cpp:1105
 msgid "Windows 98"
-msgstr "視窗(&W)"
+msgstr "Windows 98"
 
-#: ../src/msw/utils.cpp:1084
-#, fuzzy
+#: ../src/msw/utils.cpp:1101
 msgid "Windows 98 SE"
-msgstr "視窗(&W)"
+msgstr "Windows 98 SE"
 
-#: ../src/msw/utils.cpp:1095
+#: ../src/msw/utils.cpp:1112
 #, c-format
 msgid "Windows 9x (%d.%d)"
-msgstr ""
+msgstr "Windows 9x (%d.%d)"
 
-#: ../src/common/fmapbase.cpp:132
+#: ../src/common/fmapbase.cpp:134
 msgid "Windows Arabic (CP 1256)"
 msgstr "視窗 阿拉伯文 (CP 1256)"
 
-#: ../src/common/fmapbase.cpp:133
+#: ../src/common/fmapbase.cpp:135
 msgid "Windows Baltic (CP 1257)"
 msgstr "視窗 波羅的海文 (CP 1257)"
 
-#: ../src/common/fmapbase.cpp:126
+#: ../src/msw/utils.cpp:1074
+#, fuzzy, c-format
+msgid "Windows CE (%d.%d)"
+msgstr "Windows 9x (%d.%d)"
+
+#: ../src/common/fmapbase.cpp:128
 msgid "Windows Central European (CP 1250)"
 msgstr "視窗 中歐語系 (CP 1250)"
 
-#: ../src/common/fmapbase.cpp:123
+#: ../src/common/fmapbase.cpp:125
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr "視窗 中文(簡體) (CP 936)"
 
-#: ../src/common/fmapbase.cpp:125
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "視窗 中文(繁體) (CP 950)"
 
-#: ../src/common/fmapbase.cpp:127
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "視窗 斯拉夫文 (CP 1251)"
 
-#: ../src/common/fmapbase.cpp:129
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Greek (CP 1253)"
 msgstr "視窗 希臘文 (CP 1253)"
 
-#: ../src/common/fmapbase.cpp:131
+#: ../src/common/fmapbase.cpp:133
 msgid "Windows Hebrew (CP 1255)"
 msgstr "視窗 希伯來文 (CP 1255)"
 
-#: ../src/common/fmapbase.cpp:122
+#: ../src/common/fmapbase.cpp:124
 msgid "Windows Japanese (CP 932)"
 msgstr "視窗 日文 (CP 932)"
 
-#: ../src/common/fmapbase.cpp:124
+#: ../src/common/fmapbase.cpp:126
 msgid "Windows Korean (CP 949)"
 msgstr "視窗 韓文 (CP 949)"
 
-#: ../src/msw/utils.cpp:1092
-#, fuzzy
+#: ../src/msw/utils.cpp:1109
 msgid "Windows ME"
-msgstr "視窗(&W)"
+msgstr "Windows ME"
 
-#: ../src/msw/utils.cpp:1127
+#: ../src/msw/utils.cpp:1144
 #, c-format
 msgid "Windows NT %lu.%lu (build %lu"
-msgstr ""
+msgstr "Windows NT %lu.%lu (build %lu"
 
-#: ../src/msw/utils.cpp:1120
+#: ../src/msw/utils.cpp:1137
 #, c-format
 msgid "Windows Server 2003 (build %lu"
-msgstr ""
+msgstr "Windows Server 2003 (build %lu"
 
-#: ../src/common/fmapbase.cpp:121
-#, fuzzy
+#: ../src/common/fmapbase.cpp:123
 msgid "Windows Thai (CP 874)"
-msgstr "è¦\96çª\97 æ³¢ç¾\85ç\9a\84æµ·æ\96\87 (CP 1257)"
+msgstr "è¦\96çª\97 æ³°æ\96\87 (CP 874)"
 
-#: ../src/common/fmapbase.cpp:130
+#: ../src/common/fmapbase.cpp:132
 msgid "Windows Turkish (CP 1254)"
 msgstr "視窗 土耳其文 (CP 1254)"
 
-#: ../src/common/fmapbase.cpp:128
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Western European (CP 1252)"
 msgstr "視窗 西歐語系 (CP 1252)"
 
-#: ../src/msw/utils.cpp:1116
+#: ../src/msw/utils.cpp:1133
 #, c-format
 msgid "Windows XP (build %lu"
-msgstr ""
+msgstr "Windows XP (build %lu"
 
-#: ../src/common/fmapbase.cpp:134
+#: ../src/common/fmapbase.cpp:136
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "視窗/磁碟作業系統 製造商 (CP 437)"
 
@@ -4332,66 +5842,94 @@ msgstr "視窗/磁碟作業系統 製造商 (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "寫入檔案 '%s' 時發生錯誤"
 
-#: ../src/xml/xml.cpp:562
+#: ../src/xml/xml.cpp:658
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
-msgstr "XML 解譯錯誤：'%s' 在第 %d 行"
+msgstr "XML 解析錯誤：'%s' 在第 %d 列"
 
-#: ../src/common/xpmdecod.cpp:774
+#: ../src/common/xpmdecod.cpp:794
 msgid "XPM: Malformed pixel data!"
 msgstr "XPM: 不正常的圖素資料！"
 
-#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
-#, c-format
-msgid "XPM: malformed colour definition '%s'!"
+#: ../src/common/xpmdecod.cpp:709
+#, fuzzy, c-format
+msgid "XPM: incorrect colour description in line %d"
+msgstr "XPM: 不正常的顏色定義 '%s'！"
+
+#: ../src/common/xpmdecod.cpp:682
+msgid "XPM: incorrect header format!"
+msgstr ""
+
+#: ../src/common/xpmdecod.cpp:720 ../src/common/xpmdecod.cpp:729
+#, fuzzy, c-format
+msgid "XPM: malformed colour definition '%s' at line %d!"
 msgstr "XPM: 不正常的顏色定義 '%s'！"
 
-#: ../src/xrc/xmlres.cpp:579
+#: ../src/common/xpmdecod.cpp:781
+#, c-format
+msgid "XPM: truncated image data at line %d!"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:606
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "沒有找到 XRC 資源 '%s' (類別 '%s')！"
 
-#: ../src/xrc/xmlres.cpp:1080 ../src/xrc/xmlres.cpp:1092
+#: ../src/xrc/xmlres.cpp:1154 ../src/xrc/xmlres.cpp:1166
+#, fuzzy, c-format
+msgid "XRC resource: Cannot create animation from '%s'."
+msgstr "XRC 資源：無法從 '%s' 建立點像圖。"
+
+#: ../src/xrc/xmlres.cpp:1122 ../src/xrc/xmlres.cpp:1134
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr "XRC 資源：無法從 '%s' 建立點像圖。"
 
-#: ../src/xrc/xmlres.cpp:1036
+#: ../src/xrc/xmlres.cpp:1080
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr "XRC 資源：不正確的顏色規格 '%s' 屬性 '%s'。"
 
-#: ../src/mac/carbon/msgdlg.cpp:59 ../src/mac/carbon/msgdlg.cpp:142
-#: ../src/mac/classic/msgdlg.cpp:57 ../src/mac/classic/msgdlg.cpp:139
-#: ../src/motif/msgdlg.cpp:204
+#: ../src/mac/carbon/msgdlg.cpp:64 ../src/mac/carbon/msgdlg.cpp:120
+#: ../src/mac/carbon/msgdlg.cpp:202 ../src/mac/classic/msgdlg.cpp:60
+#: ../src/mac/classic/msgdlg.cpp:142 ../src/motif/msgdlg.cpp:204
 msgid "Yes"
 msgstr "是"
 
-#: ../src/generic/dirdlgg.cpp:306
+#: ../src/mac/carbon/overlay.cpp:146
+#, fuzzy
+msgid "You cannot Clear an overlay that is not inited"
+msgstr "您不能在這區段加入新的目錄。"
+
+#: ../src/mac/carbon/overlay.cpp:104 ../src/dfb/overlay.cpp:55
+msgid "You cannot Init an overlay twice"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:314
 msgid "You cannot add a new directory to this section."
 msgstr "您不能在這區段加入新的目錄。"
 
-#: ../src/common/stockitem.cpp:155
+#: ../src/common/stockitem.cpp:162
 msgid "Zoom &In"
-msgstr ""
+msgstr "放大(&I)"
 
-#: ../src/common/stockitem.cpp:156
+#: ../src/common/stockitem.cpp:163
 msgid "Zoom &Out"
-msgstr ""
+msgstr "縮小(&O)"
 
-#: ../src/common/stockitem.cpp:154
+#: ../src/common/stockitem.cpp:161
 msgid "Zoom to &Fit"
-msgstr ""
+msgstr "縮放以適應視窗(&F)"
 
-#: ../src/common/docview.cpp:2133
+#: ../src/common/docview.cpp:2161
 msgid "[EMPTY]"
 msgstr "[空]"
 
-#: ../src/msw/dde.cpp:1060
+#: ../src/msw/dde.cpp:1055
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEML 應用程式已建立延長的競賽環境。"
 
-#: ../src/msw/dde.cpp:1048
+#: ../src/msw/dde.cpp:1043
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -4402,39 +5940,39 @@ msgstr ""
 "或傳給 DDEML 函式的是\n"
 "一個無效的實體物件識別。"
 
-#: ../src/msw/dde.cpp:1066
+#: ../src/msw/dde.cpp:1061
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "用戶端嘗試建立會話失敗。"
 
-#: ../src/msw/dde.cpp:1063
+#: ../src/msw/dde.cpp:1058
 msgid "a memory allocation failed."
 msgstr "記憶體配置失敗。"
 
-#: ../src/msw/dde.cpp:1057
+#: ../src/msw/dde.cpp:1052
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML 參數驗證失敗。"
 
-#: ../src/msw/dde.cpp:1039
+#: ../src/msw/dde.cpp:1034
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "同步「連結協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1045
+#: ../src/msw/dde.cpp:1040
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "同步「資料協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1054
+#: ../src/msw/dde.cpp:1049
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "同步「執行協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1072
+#: ../src/msw/dde.cpp:1067
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "同步「資料傳送協同活動」請求已逾時。"
 
-#: ../src/msw/dde.cpp:1087
+#: ../src/msw/dde.cpp:1082
 msgid "a request to end an advise transaction has timed out."
 msgstr "終止「連結協同活動」的請求已逾時。"
 
-#: ../src/msw/dde.cpp:1081
+#: ../src/msw/dde.cpp:1076
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
@@ -4444,15 +5982,15 @@ msgstr ""
 "被用戶端終止，或伺服器\n"
 "在完成交涉前終止。"
 
-#: ../src/msw/dde.cpp:1069
+#: ../src/msw/dde.cpp:1064
 msgid "a transaction failed."
 msgstr "協同活動失敗。"
 
-#: ../src/common/menucmn.cpp:114
+#: ../src/common/menucmn.cpp:199
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:1051
+#: ../src/msw/dde.cpp:1046
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -4464,15 +6002,15 @@ msgstr ""
 "或初始化為 APPCMD_CLIENTONLY 的應用程式\n"
 "試圖執行伺服器的協同活動。"
 
-#: ../src/msw/dde.cpp:1075
+#: ../src/msw/dde.cpp:1070
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "內部呼叫 PostMessage 失敗。"
 
-#: ../src/msw/dde.cpp:1084
+#: ../src/msw/dde.cpp:1079
 msgid "an internal error has occurred in the DDEML."
 msgstr "DDEML 發生內部錯誤。"
 
-#: ../src/msw/dde.cpp:1090
+#: ../src/msw/dde.cpp:1085
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
@@ -4482,11 +6020,11 @@ msgstr ""
 "一旦應用程式從 XTYP_XACT_COMPLETE 回調函式返回，\n"
 "該回調函式的協同活動識別就不再有效。"
 
-#: ../src/common/zipstrm.cpp:1330
+#: ../src/common/zipstrm.cpp:1272
 msgid "assuming this is a multi-part zip concatenated"
-msgstr ""
+msgstr "假設這是一個多重部份 zip 的結合確"
 
-#: ../src/common/fileconf.cpp:1847
+#: ../src/common/fileconf.cpp:1880
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "忽略對不可變更機碼 '%s' 的修改。"
@@ -4499,157 +6037,146 @@ msgstr "含式傳入錯誤的引數"
 msgid "bad signature"
 msgstr "錯誤的簽名"
 
-#: ../src/common/zipstrm.cpp:1580
+#: ../src/common/zipstrm.cpp:1712
 msgid "bad zipfile offset to entry"
-msgstr ""
+msgstr "zip檔案中到條目的偏移值錯誤"
 
-#: ../src/common/ftp.cpp:385
+#: ../src/common/ftp.cpp:381
 msgid "binary"
 msgstr "二進位"
 
-#: ../src/common/fontcmn.cpp:646
+#: ../src/common/fontcmn.cpp:696
 msgid "bold"
 msgstr "粗體"
 
-#: ../src/common/fontcmn.cpp:570
-msgid "bold "
-msgstr "粗體"
-
-#: ../src/os2/iniconf.cpp:451
+#: ../src/os2/iniconf.cpp:458
 msgid "buffer is too small for Windows directory."
-msgstr ""
+msgstr "對於 Windows 目錄而言，緩衝區太小"
 
 #: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
 msgstr "無法關閉檔案 '%s'"
 
-#: ../src/common/file.cpp:286
+#: ../src/common/file.cpp:279
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "無法關閉檔案描述子 %d"
 
-#: ../src/common/file.cpp:551
+#: ../src/common/file.cpp:545
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "無法將修改反映到檔案 '%s'"
 
-#: ../src/common/file.cpp:217
+#: ../src/common/file.cpp:213
 #, c-format
 msgid "can't create file '%s'"
 msgstr "無法建立檔案 '%s'"
 
-#: ../src/common/fileconf.cpp:1159
+#: ../src/common/fileconf.cpp:1195
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "無法刪除使用者組態檔案 '%s'"
 
-#: ../src/common/file.cpp:457
+#: ../src/common/file.cpp:451
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "無法確定是否已達檔案 %d 的尾部"
 
-#: ../src/msdos/utilsdos.cpp:307 ../src/msdos/utilsdos.cpp:466
-#, fuzzy, c-format
+#: ../src/msdos/utilsdos.cpp:299 ../src/msdos/utilsdos.cpp:458
+#, c-format
 msgid "can't execute '%s'"
-msgstr "無法執行 '%s'\n"
+msgstr "無法執行 '%s'"
 
-#: ../src/common/zipstrm.cpp:1357
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1487
 msgid "can't find central directory in zip"
-msgstr "無法在檔案 '%s' 中找到目前位置"
+msgstr "無法在 zip 檔中找到中心目錄"
 
-#: ../src/common/file.cpp:427
+#: ../src/common/file.cpp:421
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "無法獲得檔案描述子 %d 的檔案的長度"
 
-#: ../src/msw/utils.cpp:380
+#: ../src/msw/utils.cpp:394
 msgid "can't find user's HOME, using current directory."
 msgstr "找不到使用者目錄，使用目前目錄。"
 
-#: ../src/common/file.cpp:341
+#: ../src/common/file.cpp:337
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "無法重新整理檔案描述子 %d"
 
-#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
+#: ../src/common/file.cpp:393 ../src/msw/wince/filefnwce.cpp:198
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "無法獲得檔案描述子 %d 的指標位置"
 
-#: ../src/common/fontmap.cpp:326
+#: ../src/common/fontmap.cpp:323
 msgid "can't load any font, aborting"
 msgstr "無法載入任何字型，活動中止"
 
-#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
+#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:265
 #, c-format
 msgid "can't open file '%s'"
 msgstr "無法開啟檔案 '%s'"
 
-#: ../src/common/fileconf.cpp:404
+#: ../src/common/fileconf.cpp:403
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "無法開啟全局組態檔案 '%s'。"
 
-#: ../src/common/fileconf.cpp:419
+#: ../src/common/fileconf.cpp:418
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "無法開啟使用者組態檔案 '%s'。"
 
-#: ../src/common/fileconf.cpp:1005
+#: ../src/common/fileconf.cpp:1039
 msgid "can't open user configuration file."
 msgstr "無法開啟使用者組態檔案。"
 
-#: ../src/common/dynlib.cpp:253
-msgid "can't query for GUI plugins name in console applications"
-msgstr "無法在命令列程式查詢視窗介面的外掛程式名稱"
-
-#: ../src/common/zipstrm.cpp:436
-#, fuzzy
+#: ../src/common/zipstrm.cpp:528
 msgid "can't re-initialize zlib deflate stream"
-msgstr "無法初始化 zlib 壓縮資料流。"
+msgstr "不能重新初始化zlib deflate(壓縮)流"
 
-#: ../src/common/zipstrm.cpp:461
-#, fuzzy
+#: ../src/common/zipstrm.cpp:553
 msgid "can't re-initialize zlib inflate stream"
-msgstr "無法初始化 zlib 解壓資料流。"
+msgstr "不能重新初始化zlib inflate(解壓)流"
 
-#: ../src/common/file.cpp:310
+#: ../src/common/file.cpp:303
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "無法讀取檔案描述子 %d"
 
-#: ../src/common/file.cpp:546
+#: ../src/common/file.cpp:540
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "無法移除檔案 '%s'"
 
-#: ../src/common/file.cpp:562
+#: ../src/common/file.cpp:556
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "無法刪除暫時檔案 '%s'"
 
-#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
+#: ../src/common/file.cpp:379 ../src/msw/wince/filefnwce.cpp:185
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "無法定位檔案描述子 %d"
 
-#: ../src/common/textfile.cpp:196
+#: ../src/common/textfile.cpp:233
 #, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "無法將暫存區 '%s' 寫到磁碟。"
 
-#: ../src/common/file.cpp:326
+#: ../src/common/file.cpp:319
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "無法寫到檔案描述子 %d"
 
-#: ../src/common/fileconf.cpp:1016
+#: ../src/common/fileconf.cpp:1050
 msgid "can't write user configuration file."
 msgstr "無法寫使用者組態檔案。"
 
-#: ../src/common/intl.cpp:1110
+#: ../src/common/intl.cpp:1152
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "找不到 '%s' 領域的記載檔。"
@@ -4658,19 +6185,23 @@ msgstr "找不到 '%s' 領域的記載檔。"
 msgid "checksum error"
 msgstr "總和檢查碼錯誤"
 
+#: ../src/common/tarstrm.cpp:744
+msgid "checksum failure reading tar header block"
+msgstr ""
+
 #: ../src/html/chm.cpp:348
 msgid "compression error"
 msgstr "壓縮失敗"
 
-#: ../src/common/regex.cpp:141
+#: ../src/common/regex.cpp:235
 msgid "conversion to 8-bit encoding failed"
 msgstr "無法轉換成八位元編碼"
 
-#: ../src/common/menucmn.cpp:112
+#: ../src/common/menucmn.cpp:197
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:1094
+#: ../src/common/cmdline.cpp:1115
 msgid "date"
 msgstr "日期"
 
@@ -4678,36 +6209,36 @@ msgstr "日期"
 msgid "decompression error"
 msgstr "解壓縮失敗"
 
-#: ../src/common/fmapbase.cpp:705 ../src/common/fmapbase.cpp:737
+#: ../src/common/fmapbase.cpp:681
 msgid "default"
 msgstr "預設值"
 
-#: ../src/common/xtistrm.cpp:843
+#: ../src/common/xtistrm.cpp:839
 msgid "delegate has no type info"
 msgstr "delegate 沒有類型資訊"
 
-#: ../src/common/debugrpt.cpp:524
+#: ../src/common/debugrpt.cpp:530
 msgid "dump of the process state (binary)"
-msgstr ""
+msgstr "傾印(dump)程序狀態（二進位碼）"
 
-#: ../src/common/datetime.cpp:3882
+#: ../src/common/datetime.cpp:3936
 msgid "eighteenth"
 msgstr "第十八"
 
-#: ../src/common/datetime.cpp:3872
+#: ../src/common/datetime.cpp:3926
 msgid "eighth"
 msgstr "第八"
 
-#: ../src/common/datetime.cpp:3875
+#: ../src/common/datetime.cpp:3929
 msgid "eleventh"
 msgstr "第十一"
 
-#: ../src/common/strconv.cpp:2671
-#, c-format
-msgid "encoding %s"
+#: ../src/common/strconv.cpp:3488
+#, fuzzy, c-format
+msgid "encoding %i"
 msgstr "編碼 %s"
 
-#: ../src/common/fileconf.cpp:1833
+#: ../src/common/fileconf.cpp:1866
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "項目 '%s' 在 '%s' 群中已出現一次以上"
@@ -4716,30 +6247,29 @@ msgstr "項目 '%s' 在 '%s' 群中已出現一次以上"
 msgid "error in data format"
 msgstr "資料格式錯誤。"
 
-#: ../src/msdos/utilsdos.cpp:407
-#, fuzzy, c-format
+#: ../src/msdos/utilsdos.cpp:399
+#, c-format
 msgid "error opening '%s'"
-msgstr "檔案開啟失敗"
+msgstr "開啟 '%s' 失敗"
 
 #: ../src/html/chm.cpp:332
 msgid "error opening file"
 msgstr "檔案開啟失敗"
 
-#: ../src/common/zipstrm.cpp:1442
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1573
 msgid "error reading zip central directory"
-msgstr "建立目錄錯誤"
+msgstr "讀取 zip 中心目錄發生錯誤"
 
-#: ../src/common/zipstrm.cpp:1520
+#: ../src/common/zipstrm.cpp:1664
 msgid "error reading zip local header"
-msgstr ""
+msgstr "讀取 zip 本地表頭時發生錯誤"
 
-#: ../src/common/zipstrm.cpp:2236
+#: ../src/common/zipstrm.cpp:2383
 #, c-format
 msgid "error writing zip entry '%s': bad crc or length"
-msgstr ""
+msgstr "寫入 zip 條目 '%s' 時發生錯誤：不當的 crc 或長度"
 
-#: ../src/msw/dialup.cpp:881
+#: ../src/msw/dialup.cpp:882
 msgid "establish"
 msgstr "建立"
 
@@ -4748,115 +6278,133 @@ msgstr "建立"
 msgid "failed to flush the file '%s'"
 msgstr "重新整理檔案 '%s' 失敗"
 
-#: ../src/common/datetime.cpp:3879
+#: ../src/common/datetime.cpp:3933
 msgid "fifteenth"
 msgstr "第十五"
 
-#: ../src/common/datetime.cpp:3869
+#: ../src/common/datetime.cpp:3923
 msgid "fifth"
 msgstr "第五"
 
-#: ../src/common/fileconf.cpp:664
+#: ../src/common/fileconf.cpp:666
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
-msgstr "檔案 '%s' 第 %d 行：忽略位於群組標頭之後的 '%s' 。"
+msgstr "檔案 '%s' 第 %d 列：忽略位於群組標頭之後的 '%s' 。"
 
-#: ../src/common/fileconf.cpp:693
+#: ../src/common/fileconf.cpp:695
 #, c-format
 msgid "file '%s', line %d: '=' expected."
-msgstr "檔案 '%s' 第 %d 行：應有 '='。"
+msgstr "檔案 '%s' 第 %d 列：應有 '='。"
 
-#: ../src/common/fileconf.cpp:716
+#: ../src/common/fileconf.cpp:718
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
-msgstr "檔案 '%s', 第 %d 行：機碼 '%s' 第一次出現在第 %d 行。"
+msgstr "檔案 '%s', 第 %d 列：機碼 '%s' 第一次出現在第 %d 列。"
 
-#: ../src/common/fileconf.cpp:706
+#: ../src/common/fileconf.cpp:708
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "檔案 '%s' 第 %d 行：忽略對不可變更機碼 '%s' 的值。"
+msgstr "檔案 '%s' 第 %d 列：忽略對不可變更機碼 '%s' 的值。"
 
-#: ../src/common/fileconf.cpp:628
+#: ../src/common/fileconf.cpp:630
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
-msgstr "檔案 '%s'： 不應有字元 %c 存在於第 %d 行中"
+msgstr "檔案 '%s'： 不應有字元 %c 存在於第 %d 列中。"
+
+#: ../src/richtext/richtextbuffer.cpp:5342
+#, fuzzy
+msgid "files"
+msgstr "檔案"
 
-#: ../src/common/datetime.cpp:3865
+#: ../src/common/datetime.cpp:3919
 msgid "first"
 msgstr "第一"
 
-#: ../src/html/helpfrm.cpp:1262
+#: ../src/html/helpwnd.cpp:1234
 msgid "font size"
 msgstr "字型大小"
 
-#: ../src/common/datetime.cpp:3878
+#: ../src/common/datetime.cpp:3932
 msgid "fourteenth"
 msgstr "第十四"
 
-#: ../src/common/datetime.cpp:3868
+#: ../src/common/datetime.cpp:3922
 msgid "fourth"
 msgstr "第四"
 
-#: ../src/common/appbase.cpp:367
+#: ../src/common/appbase.cpp:369
 msgid "generate verbose log messages"
 msgstr "產生冗長的記錄訊息"
 
-#: ../src/common/xtixml.cpp:479
+#: ../src/richtext/richtextbuffer.cpp:7480
+#: ../src/richtext/richtextbuffer.cpp:7520
+#: ../src/richtext/richtextbuffer.cpp:7591
+msgid "image"
+msgstr ""
+
+#: ../src/common/tarstrm.cpp:721
+msgid "incomplete header block in tar"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:476
 msgid "incorrect event handler string, missing dot"
 msgstr "不正確的事件處理常式字串，缺少小點"
 
-#: ../src/msw/dialup.cpp:881
+#: ../src/common/tarstrm.cpp:1297
+msgid "incorrect size given for tar entry"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:882
 msgid "initiate"
 msgstr "初始化"
 
-#: ../src/common/file.cpp:459
+#: ../src/common/tarstrm.cpp:917
+msgid "invalid data in extended tar header"
+msgstr ""
+
+#: ../src/common/file.cpp:453
 msgid "invalid eof() return value."
 msgstr "無效的 eof() 傳回值。"
 
-#: ../src/generic/logg.cpp:1179
+#: ../src/generic/logg.cpp:1180
 msgid "invalid message box return value"
 msgstr "訊息盒傳回無效的值"
 
-#: ../src/common/zipstrm.cpp:1306
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1444
 msgid "invalid zip file"
-msgstr "無效的鎖定檔案 '%s'。"
+msgstr "無效的zip檔案"
 
-#: ../src/common/fontcmn.cpp:586 ../src/common/fontcmn.cpp:650
+#: ../src/common/fontcmn.cpp:701
 msgid "italic"
 msgstr "斜體"
 
-#: ../src/common/fontcmn.cpp:642
+#: ../src/common/fontcmn.cpp:691
 msgid "light"
 msgstr "細體"
 
-#: ../src/common/fontcmn.cpp:566
-msgid "light "
-msgstr "細體"
-
-#: ../src/common/intl.cpp:1456
+#: ../src/common/intl.cpp:1568
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "無法設定地區為 '%s'。"
 
-#: ../src/common/intl.cpp:1103
+#: ../src/common/intl.cpp:1143
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "尋找記載檔 '%s' @ '%s'。"
 
-#: ../src/common/datetime.cpp:4029
+#: ../src/common/datetime.cpp:4088
 msgid "midnight"
 msgstr "午夜"
 
-#: ../src/common/datetime.cpp:3883
+#: ../src/common/datetime.cpp:3937
 msgid "nineteenth"
 msgstr "第十九"
 
-#: ../src/common/datetime.cpp:3873
+#: ../src/common/datetime.cpp:3927
 msgid "ninth"
 msgstr "第九"
 
-#: ../src/msw/dde.cpp:1035
+#: ../src/msw/dde.cpp:1030
 msgid "no DDE error."
 msgstr "沒有「動態資料交換」錯誤。"
 
@@ -4864,19 +6412,19 @@ msgstr "沒有「動態資料交換」錯誤。"
 msgid "no error"
 msgstr "沒有任何錯誤"
 
-#: ../src/html/helpdata.cpp:662
+#: ../src/html/helpdata.cpp:655 ../src/html/htmlhelp.cpp:201
 msgid "noname"
 msgstr "未命名"
 
-#: ../src/common/datetime.cpp:4028
+#: ../src/common/datetime.cpp:4087
 msgid "noon"
 msgstr "中午"
 
-#: ../src/common/cmdline.cpp:1090
+#: ../src/common/cmdline.cpp:1111
 msgid "num"
 msgstr "數字"
 
-#: ../src/common/xtixml.cpp:258
+#: ../src/common/xtixml.cpp:255
 msgid "objects cannot have XML Text Nodes"
 msgstr "物件不能有 XML 文字子節點"
 
@@ -4884,33 +6432,33 @@ msgstr "物件不能有 XML 文字子節點"
 msgid "out of memory"
 msgstr "記憶體不足。"
 
-#: ../src/common/debugrpt.cpp:500
+#: ../src/common/debugrpt.cpp:506
 msgid "process context description"
-msgstr ""
+msgstr "程序上下文描述"
 
 #: ../src/html/chm.cpp:334
 msgid "read error"
 msgstr "讀取失敗"
 
-#: ../src/common/filename.cpp:181
+#: ../src/common/filename.cpp:180
 msgid "reading"
 msgstr "讀取中"
 
-#: ../src/common/zipstrm.cpp:1743
+#: ../src/common/zipstrm.cpp:1876
 #, c-format
 msgid "reading zip stream (entry %s): bad crc"
-msgstr ""
+msgstr "讀取 zip 串流 (條目 %s): 不良的 crc"
 
-#: ../src/common/zipstrm.cpp:1740
+#: ../src/common/zipstrm.cpp:1873
 #, c-format
 msgid "reading zip stream (entry %s): bad length"
-msgstr ""
+msgstr "讀取 zip 串流 (條目 %s): 不良的長度"
 
-#: ../src/msw/dde.cpp:1078
+#: ../src/msw/dde.cpp:1073
 msgid "reentrancy problem."
 msgstr "重複進入問題。"
 
-#: ../src/common/datetime.cpp:3866
+#: ../src/common/datetime.cpp:3920
 msgid "second"
 msgstr "第二"
 
@@ -4918,146 +6466,151 @@ msgstr "第二"
 msgid "seek error"
 msgstr "搜尋失敗"
 
-#: ../src/common/datetime.cpp:3881
+#: ../src/common/datetime.cpp:3935
 msgid "seventeenth"
 msgstr "第十七"
 
-#: ../src/common/datetime.cpp:3871
+#: ../src/common/datetime.cpp:3925
 msgid "seventh"
 msgstr "第七"
 
-#: ../src/common/menucmn.cpp:116
+#: ../src/common/menucmn.cpp:201
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appbase.cpp:357
+#: ../src/common/appbase.cpp:359
 msgid "show this help message"
 msgstr "顯示這個說明訊息"
 
-#: ../src/common/datetime.cpp:3880
+#: ../src/common/datetime.cpp:3934
 msgid "sixteenth"
 msgstr "第十六"
 
-#: ../src/common/datetime.cpp:3870
+#: ../src/common/datetime.cpp:3924
 msgid "sixth"
 msgstr "第六"
 
-#: ../src/common/appcmn.cpp:203
+#: ../src/common/appcmn.cpp:231
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr "設定顯示模式 (例如 640x480-16)"
 
-#: ../src/common/appcmn.cpp:189
+#: ../src/common/appcmn.cpp:217
 msgid "specify the theme to use"
 msgstr "設定主題"
 
-#: ../src/common/zipstrm.cpp:1646
+#: ../src/common/zipstrm.cpp:1779
 msgid "stored file length not in Zip header"
-msgstr ""
+msgstr "Zip頭沒有已存檔案的長度資訊"
 
-#: ../src/common/cmdline.cpp:1086
+#: ../src/common/cmdline.cpp:1107
 msgid "str"
 msgstr "字串"
 
-#: ../src/common/datetime.cpp:3874
+#: ../src/common/tarstrm.cpp:927 ../src/common/tarstrm.cpp:949
+#: ../src/common/tarstrm.cpp:1417 ../src/common/tarstrm.cpp:1439
+msgid "tar entry not open"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3928
 msgid "tenth"
 msgstr "第十"
 
-#: ../src/msw/dde.cpp:1042
+#: ../src/msw/dde.cpp:1037
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "協同活動的回應，設定了 DDE_FBUSY 位元。"
 
-#: ../src/common/datetime.cpp:3867
+#: ../src/common/datetime.cpp:3921
 msgid "third"
 msgstr "第三"
 
-#: ../src/common/datetime.cpp:3877
+#: ../src/common/datetime.cpp:3931
 msgid "thirteenth"
 msgstr "第十三"
 
-#: ../src/common/imagtiff.cpp:145 ../src/common/imagtiff.cpp:161
+#: ../src/common/imagtiff.cpp:174 ../src/common/imagtiff.cpp:190
 #, c-format
 msgid "tiff module: %s"
 msgstr "tiff 模組：%s"
 
-#: ../src/common/datetime.cpp:3694
+#: ../src/common/datetime.cpp:3746
 msgid "today"
 msgstr "今天"
 
-#: ../src/common/datetime.cpp:3696
+#: ../src/common/datetime.cpp:3748
 msgid "tomorrow"
 msgstr "明天"
 
-#: ../src/common/datetime.cpp:3876
+#: ../src/gtk/aboutdlg.cpp:153
+msgid "translator-credits"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3930
 msgid "twelfth"
 msgstr "第十二"
 
-#: ../src/common/datetime.cpp:3884
+#: ../src/common/datetime.cpp:3938
 msgid "twentieth"
 msgstr "第二十"
 
-#: ../src/common/fontcmn.cpp:638
+#: ../src/common/fontcmn.cpp:602 ../src/common/fontcmn.cpp:687
 msgid "underlined"
-msgstr "底線"
+msgstr "å\8a åº\95ç·\9a"
 
-#: ../src/common/fontcmn.cpp:553
-msgid "underlined "
-msgstr "底線"
-
-#: ../src/common/fileconf.cpp:1960
+#: ../src/common/fileconf.cpp:1993
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "不應有 \" 在位置 %d @ '%s'。"
 
-#: ../src/generic/progdlgg.cpp:307
+#: ../src/common/tarstrm.cpp:968
+#, fuzzy
+msgid "unexpected end of file"
+msgstr "解析資源時遇到意外的檔案結尾。"
+
+#: ../src/common/tarstrm.cpp:351 ../src/generic/progdlgg.cpp:303
 msgid "unknown"
 msgstr "未知的"
 
-#: ../src/common/xtixml.cpp:252
+#: ../src/common/xtixml.cpp:249
 #, c-format
 msgid "unknown class %s"
 msgstr "未知的類別 %s"
 
-#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
+#: ../src/common/regex.cpp:257 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr "未知的錯誤！！！"
 
-#: ../src/msw/dialup.cpp:494
+#: ../src/msw/dialup.cpp:495
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "未知的錯誤(錯誤碼 %08x)。"
 
-#: ../src/common/textbuf.cpp:230
+#: ../src/common/textbuf.cpp:229
 msgid "unknown line terminator"
-msgstr "未知的斷行字元"
+msgstr "未知的斷列字元"
 
-#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
+#: ../src/common/file.cpp:361 ../src/msw/wince/filefnwce.cpp:166
 msgid "unknown seek origin"
 msgstr "未知的搜尋基準點"
 
-#: ../src/common/fmapbase.cpp:719
+#: ../src/common/fmapbase.cpp:695
 #, c-format
 msgid "unknown-%d"
 msgstr "未知-%d"
 
-#: ../src/common/docview.cpp:430
+#: ../src/common/docview.cpp:425
 msgid "unnamed"
 msgstr "未命名"
 
-#: ../src/common/docview.cpp:1401
+#: ../src/common/docview.cpp:1411
 #, c-format
 msgid "unnamed%d"
 msgstr "未命名-%d"
 
-#: ../src/common/zipstrm.cpp:1660 ../src/common/zipstrm.cpp:2030
-#, fuzzy
+#: ../src/common/zipstrm.cpp:1793 ../src/common/zipstrm.cpp:2174
 msgid "unsupported Zip compression method"
-msgstr "Gzip 資料流不支援的壓縮方法"
-
-#: ../src/common/zipstrm.cpp:1142
-msgid "unsupported zip archive"
-msgstr ""
+msgstr "不支援的Zip壓縮方法"
 
-#: ../src/common/intl.cpp:1115
+#: ../src/common/intl.cpp:1158
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "使用記載檔 '%s' — '%s'。"
@@ -5066,86 +6619,123 @@ msgstr "使用記載檔 '%s' — '%s'。"
 msgid "write error"
 msgstr "寫入失敗"
 
-#: ../src/common/filename.cpp:181
+#: ../src/common/filename.cpp:180
 msgid "writing"
 msgstr "寫入中"
 
-#: ../src/common/stopwatch.cpp:291
+#: ../src/common/stopwatch.cpp:289
 msgid "wxGetTimeOfDay failed."
-msgstr "wxGetTimeOfDay 失敗"
+msgstr "wxGetTimeOfDay 失敗。"
+
+#: ../include/wx/richtext/richtextbulletspage.h:39
+msgid "wxRichTextBulletsPage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextfontpage.h:38
+#: ../include/wx/richtext/richtextindentspage.h:37
+#: ../include/wx/richtext/richtexttabspage.h:35
+msgid "wxRichTextFontPage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextliststylepage.h:31
+msgid "wxRichTextListStylePage"
+msgstr ""
+
+#: ../include/wx/richtext/richtextstylepage.h:21
+msgid "wxRichTextStylePage"
+msgstr ""
+
+#: ../src/html/search.cpp:49
+msgid "wxSearchEngine::LookFor must be called before scanning!"
+msgstr ""
 
-#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
-#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
+#: ../src/common/socket.cpp:412 ../src/common/socket.cpp:466
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsg 中無效的簽名。"
 
-#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
+#: ../src/common/socket.cpp:993
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: 未知的事件！"
 
-#: ../src/motif/app.cpp:214
+#: ../src/motif/app.cpp:278
 #, c-format
 msgid "wxWidgets could not open display for '%s': exiting."
 msgstr "wxWidgets 無法為 '%s' 開啟顯示設備：已經存在。"
 
-#: ../src/x11/app.cpp:176
+#: ../src/x11/app.cpp:170
 msgid "wxWidgets could not open display. Exiting."
 msgstr "wxWidgets 無法開啟顯示設備。程式結束中。"
 
-#: ../src/common/datetime.cpp:3695
+#: ../src/richtext/richtextsymboldlg.cpp:433
+msgid "xxxx"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3747
 msgid "yesterday"
 msgstr "昨天"
 
-#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#: ../src/common/zstream.cpp:245 ../src/common/zstream.cpp:413
 #, c-format
 msgid "zlib error %d"
 msgstr "zlib 錯誤碼 %d"
 
-#: ../src/common/prntbase.cpp:886
+#: ../src/common/prntbase.cpp:1123
 msgid "|<<"
 msgstr "|<<"
 
-#, fuzzy
-#~ msgid ""
-#~ "Failed to get stack backtrace:\n"
-#~ "%s"
-#~ msgstr "無法取得 ISP 名稱：%s"
+#: ../src/richtext/richtextbulletspage.cpp:295
+#: ../src/richtext/richtextliststylepage.cpp:500
+msgid "~"
+msgstr ""
 
-#~ msgid "Loading Grey Ascii PNM image is not yet implemented."
-#~ msgstr "載入灰階 ASCII PNM 影像的功能尚未實作。"
+#~ msgid "."
+#~ msgstr "."
 
-#~ msgid "Loading Grey Raw PNM image is not yet implemented."
-#~ msgstr "載入灰階 Raw PNM 影像的功能尚未實作。"
+#~ msgid ".."
+#~ msgstr ".."
 
-#, fuzzy
-#~ msgid "Cannot wait on thread to exit."
-#~ msgstr "無法等候執行緒終結"
+#~ msgid "Cannot open URL '%s'"
+#~ msgstr "無法開啟 URL '%s'"
 
-#~ msgid "Could not load Rich Edit DLL '%s'"
-#~ msgstr "無法載入 Rich Edit DLL '%s'"
+#~ msgid "Error "
+#~ msgstr "錯誤"
 
-#~ msgid "ZIP handler currently supports only local files!"
-#~ msgstr "ZIP 處理常式目前只支援本機檔案！"
+#~ msgid "Failed to create directory %s/.gnome."
+#~ msgstr "無法建立目錄 %s/.gnome。"
 
-#, fuzzy
-#~ msgid ""
-#~ "can't seek on file descriptor %d, large files support is not enabled."
-#~ msgstr "無法定位檔案描述子 %d"
+#~ msgid "Failed to create directory %s/mime-info."
+#~ msgstr "無法建立目錄 %s/mime-info。"
+
+#~ msgid "MP Thread Support is not available on this System"
+#~ msgstr "此系統不提供MP執行緒支援。"
+
+#~ msgid "Mailcap file %s, line %d: incomplete entry ignored."
+#~ msgstr "Mailcap 檔案 %s 第 %d 列：忽略不完整的項目。"
+
+#~ msgid "Mime.types file %s, line %d: unterminated quoted string."
+#~ msgstr "Mime.類型文件 %s 第 %d 列：字串沒有結尾的引號。"
 
-#~ msgid "More..."
-#~ msgstr "æ\9b´å¤\9a..."
+#~ msgid "Unknown field in file %s, line %d: '%s'."
+#~ msgstr "æª\94æ¡\88 %s 第 %d å\88\97æ\9c\89æ\9cªç\9f¥æ¬\84ä½\8dï¼\9a'%s'ã\80\82"
 
-#~ msgid "Setup"
-#~ msgstr "設定"
+#~ msgid "bold "
+#~ msgstr "粗體"
 
-#~ msgid "/#SYSTEM"
-#~ msgstr "/#SYSTEM"
+#~ msgid "can't query for GUI plugins name in console applications"
+#~ msgstr "無法在命令列程式查詢視窗介面的外掛程式名稱"
 
-#~ msgid "Backward"
-#~ msgstr "前一頁"
+#~ msgid "light "
+#~ msgstr "細體"
 
-#~ msgid "Can't open file '%s'"
-#~ msgstr "無法開啟檔案 '%s'"
+#~ msgid "underlined "
+#~ msgstr "加底線 "
 
-#~ msgid "GetUnusedColour:: No Unused Color in image "
-#~ msgstr "GetUnusedColour:: 影像中沒有未使用的顏色"
+#~ msgid "unsupported zip archive"
+#~ msgstr "不支援的zip存檔"
+
+#~ msgid ""
+#~ "Failed to get stack backtrace:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "不能獲取堆疊的回溯路徑:\n"
+#~ " %s"