fixed loading of icons from MIME types

[wxWidgets.git] / locale / zh.po

diff --git a/locale/zh.po b/locale/zh.po
index ad5b8d3f4f81134a732176fd904f19024420c6b2..deee12efa4e50f5ed3450d1cb4cbae14d51295c4 100644 (file)
--- a/locale/zh.po
+++ b/locale/zh.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.2.2\n"
-"POT-Creation-Date: 2001-12-17 16:47+0100\n"
+"POT-Creation-Date: 2002-12-12 11:59+0100\n"
 "PO-Revision-Date: 2000-11-09 16:09Öйú±ê׼ʱ¼ä\n"
 "Last-Translator: mrfx <mrfx@fm365.com>\n"
 "Language-Team: wxWindows tranlators <wx-translators@wxwindows.org>\n"
@@ -9,41 +9,19 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: ../src/generic/dirctrlg.cpp:1303 ../src/generic/dirdlgg.cpp:544
-msgid ""
-"\n"
-"(Do you have the required permissions?)"
-msgstr ""
-"\n"
-"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
-
-#: ../src/generic/dirctrlg.cpp:1290 ../src/generic/dirdlgg.cpp:531
-msgid ""
-"\n"
-"does not exist\n"
-"Create it now?"
-msgstr ""
-"\n"
-"²»´æÔÚ\n"
-"ÏÖÔÚ´´½¨?"
-
-#: ../src/common/log.cpp:241
+#: ../src/common/log.cpp:304
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (´íÎó %ld: %s)"
 
-#: ../src/common/docview.cpp:1205
+#: ../src/common/docview.cpp:1242
 msgid " - "
 msgstr " - "
 
-#: ../src/html/htmprint.cpp:507
+#: ../src/html/htmprint.cpp:497
 msgid " Preview"
 msgstr "Ô¤ÀÀ"
 
-#: ../src/generic/filedlgg.cpp:439
-msgid " bytes "
-msgstr "×Ö½Ú"
-
 #: ../src/common/paper.cpp:124
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "#10 Envelope, 4 1/8 x 9 1/2 in"
@@ -65,73 +43,97 @@ msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "#9 ÐÅ·â, 3 7/8 x 8 7/8 in"
 
 #: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1326
-#: ../src/common/resource.cpp:1777 ../src/common/resource.cpp:1907
-#: ../src/common/resource.cpp:2983
+#: ../src/common/resource.cpp:1784 ../src/common/resource.cpp:1914
+#: ../src/common/resource.cpp:2994
 #, c-format
 msgid "#define %s must be an integer."
 msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
 
-#: ../src/html/helpfrm.cpp:854 ../src/html/helpfrm.cpp:855
-#: ../src/html/helpfrm.cpp:1447 ../src/html/helpfrm.cpp:1477
+#: ../src/common/prntbase.cpp:375
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:373
+#, fuzzy, c-format
+msgid "%d...%d"
+msgstr ".."
+
+#: ../src/html/helpfrm.cpp:777 ../src/html/helpfrm.cpp:778
+#: ../src/html/helpfrm.cpp:1404 ../src/html/helpfrm.cpp:1434
 #, c-format
 msgid "%i of %i"
 msgstr "%i of %i"
 
-#: ../src/common/cmdline.cpp:772
+#: ../src/common/cmdline.cpp:814
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (»ò %s)"
 
-#: ../src/generic/logg.cpp:233
+#: ../src/generic/logg.cpp:246
 #, c-format
 msgid "%s Error"
 msgstr "%s ´íÎó"
 
-#: ../src/generic/logg.cpp:241
+#: ../src/generic/logg.cpp:254
 #, c-format
 msgid "%s Information"
 msgstr "%s ÐÅÏ¢"
 
-#: ../src/generic/logg.cpp:237
+#: ../src/generic/logg.cpp:250
 #, c-format
 msgid "%s Warning"
 msgstr "%s ¾¯¸æ"
 
-#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2359
+#: ../src/common/msgout.cpp:108
+#, c-format
+msgid "%s message"
+msgstr ""
+
+#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2366
 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr "%s ²»ÊÇλͼ×ÊÔ´."
 
-#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2509
+#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2520
 #, c-format
 msgid "%s not an icon resource specification."
 msgstr "%s ²»ÊÇͼ±ê×ÊÔ´."
 
 #: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1422
-#: ../src/common/resource.cpp:1870 ../src/common/resource.cpp:1999
-#: ../src/common/resource.cpp:3080
+#: ../src/common/resource.cpp:1877 ../src/common/resource.cpp:2006
+#: ../src/common/resource.cpp:3091
 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: ²»Á¼×ÊÔ´ÎļþÓï·¨."
 
-#: ../src/msw/mdi.cpp:181
+#: ../src/msw/mdi.cpp:192
 msgid "&Arrange Icons"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:239
+#: ../src/generic/wizard.cpp:271 ../src/generic/fdrepdlg.cpp:170
 #, fuzzy
 msgid "&Cancel"
 msgstr "È¡Ïû"
 
-#: ../src/msw/mdi.cpp:177
+#: ../src/msw/mdi.cpp:188
 msgid "&Cascade"
 msgstr ""
 
-#: ../src/generic/logg.cpp:475 ../src/generic/tipdlg.cpp:170
+#: ../src/generic/tipdlg.cpp:210 ../src/generic/logg.cpp:491
 msgid "&Close"
 msgstr "¹Ø±Õ[&C]"
 
-#: ../src/generic/logg.cpp:679
+#: ../src/msw/textctrl.cpp:1681
+msgid "&Copy"
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:1683
+#, fuzzy
+msgid "&Delete"
+msgstr "µç´«´ò×Ö»ú"
+
+#: ../src/generic/logg.cpp:695
 msgid "&Details"
 msgstr "ϸ½Ú[&D]"
 
@@ -140,37 +142,52 @@ msgstr "ϸ
 msgid "&Find"
 msgstr "²éÕÒ"
 
-#: ../src/generic/wizard.cpp:355
+#: ../src/generic/wizard.cpp:412
 msgid "&Finish"
 msgstr "Íê³É[&F]"
 
-#: ../src/generic/wizard.cpp:228
+#: ../src/generic/wizard.cpp:258
 #, fuzzy
 msgid "&Help"
 msgstr "°ïÖú"
 
-#: ../src/generic/logg.cpp:476
+#: ../src/generic/logg.cpp:492
 msgid "&Log"
 msgstr "ÈÕÖ¾[&L]"
 
-#: ../src/msw/mdi.cpp:182
+#: ../src/univ/themes/win32.cpp:4541
+msgid "&Move"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:193 ../src/generic/mdig.cpp:115
 #, fuzzy
 msgid "&Next"
 msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/generic/wizard.cpp:236 ../src/generic/wizard.cpp:357
+#: ../src/generic/wizard.cpp:268 ../src/generic/wizard.cpp:414
 msgid "&Next >"
 msgstr "ÏÂÒ»¸ö[&N] >"
 
-#: ../src/generic/tipdlg.cpp:175
+#: ../src/generic/tipdlg.cpp:215
 msgid "&Next Tip"
 msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
 
-#: ../src/common/cmdproc.cpp:248 ../src/common/cmdproc.cpp:259
+#: ../src/msw/textctrl.cpp:1682
+#, fuzzy
+msgid "&Paste"
+msgstr "ÈÕÆÚ"
+
+#: ../src/msw/mdi.cpp:194 ../src/generic/mdig.cpp:116
+#, fuzzy
+msgid "&Previous"
+msgstr "ǰҳ"
+
+#: ../src/msw/textctrl.cpp:1678 ../src/common/cmdproc.cpp:261
+#: ../src/common/cmdproc.cpp:272
 msgid "&Redo"
 msgstr "Öظ´[&R]"
 
-#: ../src/common/cmdproc.cpp:242 ../src/common/cmdproc.cpp:269
+#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:282
 msgid "&Redo "
 msgstr "Öظ´[&R]"
 
@@ -178,42 +195,55 @@ msgstr "
 msgid "&Replace"
 msgstr ""
 
-#: ../src/generic/logg.cpp:471 ../src/generic/logg.cpp:765
+#: ../src/univ/themes/win32.cpp:4540
+#, fuzzy
+msgid "&Restore"
+msgstr "Öظ´[&R]"
+
+#: ../src/generic/logg.cpp:487 ../src/generic/logg.cpp:818
 msgid "&Save..."
 msgstr "±£´æ[&S]..."
 
-#: ../src/generic/tipdlg.cpp:172
+#: ../src/generic/tipdlg.cpp:212
 msgid "&Show tips at startup"
 msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
 
-#: ../src/common/cmdproc.cpp:254
+#: ../src/univ/themes/win32.cpp:4543
+#, fuzzy
+msgid "&Size"
+msgstr "´óС"
+
+#: ../src/msw/textctrl.cpp:1677 ../src/common/cmdproc.cpp:267
 msgid "&Undo"
 msgstr "»Ö¸´[&U]"
 
-#: ../src/common/cmdproc.cpp:229
+#: ../src/common/cmdproc.cpp:241
 msgid "&Undo "
 msgstr "»Ö¸´[&U]"
 
-#: ../src/msw/mdi.cpp:1308 ../src/msw/mdi.cpp:1315 ../src/msw/window.cpp:2700
+#: ../src/msw/mdi.cpp:1328 ../src/msw/mdi.cpp:1335 ../src/msw/mdi.cpp:1365
+#: ../src/generic/mdig.cpp:295 ../src/generic/mdig.cpp:311
+#: ../src/generic/mdig.cpp:315
 msgid "&Window"
 msgstr "´°¿Ú[&W]"
 
-#: ../src/common/config.cpp:394 ../src/msw/regconf.cpp:264
+#: ../src/msw/regconf.cpp:264 ../src/common/config.cpp:410
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ÓжîÍâµÄ '..', ºöÂÔÖ®."
 
-#: ../src/common/valtext.cpp:140
+#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
+#: ../src/common/valtext.cpp:183
 #, c-format
 msgid "'%s' is invalid"
 msgstr "'%s' ÊÇÎÞЧµÄ"
 
-#: ../src/common/cmdline.cpp:694
+#: ../src/common/cmdline.cpp:734
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
 
-#: ../src/common/intl.cpp:436
+#: ../src/common/intl.cpp:402
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."
@@ -223,38 +253,38 @@ msgstr "'%s' 
 msgid "'%s' is probably a binary buffer."
 msgstr "'%s' »òÐíÊÇÒ»¸ö¶þ½øÖÆÎļþ."
 
-#: ../src/common/valtext.cpp:178
+#: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' should be numeric."
 msgstr "'%s' Ó¦¸ÃÊÇÒ»¸öÊýÖµ."
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:154
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr "'%s' Ó¦¸Ã½ö°üº¬ASCII×Ö·û."
 
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:160
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr "'%s' Ó¦½ö°üº¬×Öĸ×Ö·û."
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:166
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
 
-#: ../src/html/helpfrm.cpp:773
+#: ../src/html/helpfrm.cpp:714
 msgid "(Help)"
 msgstr "(°ïÖú)"
 
-#: ../src/html/helpfrm.cpp:336 ../src/html/helpfrm.cpp:922
-#: ../src/html/helpfrm.cpp:1504
+#: ../src/html/helpfrm.cpp:315 ../src/html/helpfrm.cpp:845
+#: ../src/html/helpfrm.cpp:1461
 msgid "(bookmarks)"
 msgstr "(ÊéÇ©)"
 
 #: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1362
-#: ../src/common/resource.cpp:1809 ../src/common/resource.cpp:1939
-#: ../src/common/resource.cpp:3019
+#: ../src/common/resource.cpp:1816 ../src/common/resource.cpp:1946
+#: ../src/common/resource.cpp:3030
 msgid ""
 ", expected static, #include or #define\n"
 "whilst parsing resource."
@@ -262,13 +292,11 @@ msgstr ""
 ", ÆÚÍû static, #include »ò #define\n"
 "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
 
-#: ../src/generic/dirctrlg.cpp:644 ../src/generic/dirdlgg.cpp:263
-#: ../src/generic/filedlgg.cpp:833
+#: ../src/generic/dirctrlg.cpp:700 ../src/generic/filedlgg.cpp:938
 msgid "."
 msgstr "."
 
-#: ../src/generic/dirctrlg.cpp:645 ../src/generic/dirdlgg.cpp:264
-#: ../src/generic/filedlgg.cpp:834
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:939
 msgid ".."
 msgstr ".."
 
@@ -284,51 +312,44 @@ msgstr "11 x 17 Ӣ
 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/html/htmprint.cpp:281
+#: ../src/html/htmprint.cpp:279
 msgid ": file does not exist!"
 msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/common/fontmap.cpp:606
+#: ../src/common/fontmap.cpp:670
 msgid ": unknown charset"
 msgstr ": δ֪×Ö·û¼¯"
 
-#: ../src/common/fontmap.cpp:837
+#: ../src/common/fontmap.cpp:898
 msgid ": unknown encoding"
 msgstr ": δ֪±àÂë"
 
-#: ../src/generic/wizard.cpp:233
+#: ../src/generic/wizard.cpp:263
 msgid "< &Back"
 msgstr "< ·µ»Ø[&B]"
 
-#: ../src/generic/filedlgg.cpp:467
+#: ../src/generic/filedlgg.cpp:534
 msgid "<DIR>"
 msgstr "<Ŀ¼>"
 
-#: ../src/generic/filedlgg.cpp:434
-msgid "<DIR> "
-msgstr "<Ŀ¼> "
-
-#: ../src/generic/filedlgg.cpp:468
+#: ../src/generic/filedlgg.cpp:536
 msgid "<LINK>"
 msgstr "<Á¬½Ó>"
 
-#: ../src/generic/filedlgg.cpp:435
-msgid "<LINK> "
-msgstr "<Á¬½Ó>"
-
-#: ../src/html/helpfrm.cpp:1071
+#: ../src/html/helpfrm.cpp:994
+#, fuzzy
 msgid ""
-"<html><body>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
-"<b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size "
-"-2</font><br><font size=-1>font size -1</font><br><font size=+0>font size "
-"+0</font><br><font size=+1>font size +1</font><br><font size=+2>font size "
-"+2</font><br><font size=+3>font size +3</font><br><font size=+4>font size "
-"+4</font><br><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "
-"<b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size -2</"
-"font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</"
-"font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</"
-"font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</"
-"font></tt></body></html>"
+"<html><body><table><tr><td>Normal face<br>(and <u>underlined</u>. <i>Italic "
+"face.</i> <b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-"
+"2>font size -2</font><br><font size=-1>font size -1</font><br><font size="
+"+0>font size +0</font><br><font size=+1>font size +1</font><br><font size="
+"+2>font size +2</font><br><font size=+3>font size +3</font><br><font size="
+"+4>font size +4</font><br><td><p><tt>Fixed size face.<br> <b>bold</b> "
+"<i>italic</i> <b><i>bold italic <u>underlined</u></i></b><br><font size=-"
+"2>font size -2</font><br><font size=-1>font size -1</font><br><font size="
+"+0>font size +0</font><br><font size=+1>font size +1</font><br><font size="
+"+2>font size +2</font><br><font size=+3>font size +3</font><br><font size="
+"+4>font size +4</font></tt></table></body></html>"
 msgstr ""
 "<html><body>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
 "<b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size "
@@ -346,7 +367,7 @@ msgstr ""
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 Ö½ÕÅ, 297 x 420 ºÁÃ×"
 
-#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2545
+#: ../src/common/paper.cpp:104
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 Ö½ÕÅ, 210 x 297 ºÁÃ×"
 
@@ -358,7 +379,7 @@ msgstr "A4 Сֽ
 msgid "A5 sheet, 148 x 210 mm"
 msgstr "A5 Ö½ÕÅ, 148 x 210 ºÁÃ×"
 
-#: ../src/generic/fontdlgg.cpp:327
+#: ../src/generic/fontdlgg.cpp:83
 msgid "ABCDEFGabcdefg12345"
 msgstr "ABCDEFGabcdefg12345"
 
@@ -366,42 +387,37 @@ msgstr "ABCDEFGabcdefg12345"
 msgid "ASCII"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:330
+#: ../src/html/helpfrm.cpp:328
 msgid "Add current page to bookmarks"
 msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ"
 
-#: ../src/generic/colrdlgg.cpp:273
+#: ../src/generic/colrdlgg.cpp:287
 msgid "Add to custom colours"
 msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ"
 
-#: ../src/html/helpctrl.cpp:90
+#: ../src/html/helpctrl.cpp:100
 #, c-format
 msgid "Adding book %s"
 msgstr "ÕýÔÚÌí¼Ó¾í %s"
 
-#: ../src/generic/prntdlgg.cpp:161
+#: ../src/generic/prntdlgg.cpp:160
 msgid "All"
 msgstr "ËùÓÐ"
 
-#: ../include/wx/defs.h:1626 ../src/generic/filedlgg.cpp:950
+#: ../src/generic/filedlgg.cpp:1062
 msgid "All files (*)|*"
 msgstr "ËùÓÐÎļþ (*)|*"
 
-#: ../include/wx/defs.h:1623
-#, fuzzy
-msgid "All files (*.*)|*.*"
-msgstr "ËùÓÐÎļþ (*)|*"
-
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr "ÒѾ­²¦½ÓISP."
 
-#: ../src/generic/logg.cpp:1020
+#: ../src/generic/logg.cpp:1109
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
 
-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fontmap.cpp:118
 msgid "Arabic (ISO-8859-6)"
 msgstr "°¢À­²®Óï (ISO-8859-6)"
 
@@ -425,59 +441,60 @@ msgstr "B5 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
 
-#: ../src/common/imagbmp.cpp:277
+#: ../src/common/imagbmp.cpp:468 ../src/common/imagbmp.cpp:484
+#, fuzzy
+msgid "BMP: Couldn't allocate memory."
+msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
+
+#: ../src/common/imagbmp.cpp:86
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: ²»Äܱ£´æÎÞЧͼÏñ."
 
-#: ../src/common/imagbmp.cpp:481
+#: ../src/common/imagbmp.cpp:290
 #, fuzzy
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:613
+#: ../src/common/imagbmp.cpp:422
 msgid "BMP: Couldn't write data."
 msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:386
+#: ../src/common/imagbmp.cpp:195
 #, fuzzy
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: ²»ÄÜдÎļþÍ·."
 
-#: ../src/common/imagbmp.cpp:407
+#: ../src/common/imagbmp.cpp:216
 #, fuzzy
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr "BMP: ²»ÄÜдÎļþÍ·."
 
-#: ../src/common/imagbmp.cpp:311
-msgid "BMP: wImage doesn't have own wxPalette."
+#: ../src/common/imagbmp.cpp:120
+msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 
-#: ../src/generic/helpwxht.cpp:157
-msgid "Back"
-msgstr "·µ»Ø"
-
-#: ../src/common/dlgcmn.cpp:176
+#: ../src/common/dlgcmn.cpp:233
 msgid "Backward"
 msgstr "Ïòºó"
 
-#: ../src/common/fontmap.cpp:123
+#: ../src/common/fontmap.cpp:125
 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
-#: ../src/common/fontmap.cpp:114
+#: ../src/common/fontmap.cpp:116
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "²¨Â޵ĺ£Óï (¾ÉµÄ) (ISO-8859-4)"
 
-#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2489
+#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2500
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s."
 
-#: ../src/generic/fontdlgg.cpp:219
+#: ../src/generic/fontdlgg.cpp:232
 msgid "Bold"
 msgstr "´ÖÌå"
 
-#: ../src/generic/prntdlgg.cpp:660
+#: ../src/generic/prntdlgg.cpp:645
 msgid "Bottom margin (mm):"
 msgstr "µ×±ß¾à (ºÁÃ×):"
 
@@ -485,7 +502,7 @@ msgstr "
 msgid "C sheet, 17 x 22 in"
 msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
 
-#: ../src/generic/logg.cpp:473
+#: ../src/generic/logg.cpp:489
 msgid "C&lear"
 msgstr "Çå³ý[&L]"
 
@@ -509,47 +526,39 @@ msgstr "C6 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×"
 
-#: ../src/msw/thread.cpp:243
-msgid "Can not create event object."
-msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
-
-#: ../src/msw/thread.cpp:145
-msgid "Can not create mutex"
-msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
-
-#: ../src/common/filefn.cpp:1324
+#: ../src/common/filefn.cpp:1383
 #, fuzzy, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/mgl/dir.cpp:202 ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:224
+#: ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/mac/thread.cpp:439 ../src/msw/thread.cpp:583
+#: ../src/mac/thread.cpp:472 ../src/msw/thread.cpp:685
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "²»Äָܻ´Ïß³Ì %x"
 
-#: ../src/msw/thread.cpp:461
+#: ../src/msw/thread.cpp:559
 msgid "Can not start thread: error writing TLS."
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
 
-#: ../src/mac/thread.cpp:415 ../src/msw/thread.cpp:568
+#: ../src/mac/thread.cpp:448 ../src/msw/thread.cpp:670
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "²»ÄܹÒÆðÏß³Ì %x"
 
-#: ../src/msw/thread.cpp:902
+#: ../src/msw/thread.cpp:1016
 msgid "Can not wait for thread termination"
 msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
 
-#: ../src/common/cmdproc.cpp:231
+#: ../src/common/cmdproc.cpp:243
 msgid "Can't &Undo "
 msgstr "²»Äָܻ´[&U]"
 
-#: ../src/common/image.cpp:1207
+#: ../src/common/image.cpp:1315
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."
@@ -564,12 +573,17 @@ msgstr "
 msgid "Can't copy values of unsupported type %d."
 msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
 
-#: ../src/msw/toplevel.cpp:223
+#: ../src/msw/toplevel.cpp:315
+#, fuzzy
+msgid "Can't create dialog using memory template"
+msgstr "²»ÄÜ´´½¨Îļþ '%s'"
+
+#: ../src/os2/toplevel.cpp:369
 #, fuzzy, c-format
-msgid "Can't create dialog using template '%s'"
+msgid "Can't create dialog using template '%ul'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#: ../src/msw/listctrl.cpp:270
+#: ../src/msw/listctrl.cpp:334
 msgid "Can't create list control window, check that comctl32.dll is installed."
 msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°."
 
@@ -578,19 +592,11 @@ msgstr "
 msgid "Can't create registry key '%s'"
 msgstr "²»ÄÜ´´½¨×¢²á¼ü '%s'"
 
-#: ../src/msw/utilsexc.cpp:485
-msgid "Can't create the inter-process read pipe"
-msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ"
-
-#: ../src/msw/utilsexc.cpp:497
-msgid "Can't create the inter-process write pipe"
-msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
-
-#: ../src/mac/thread.cpp:394 ../src/msw/thread.cpp:550
+#: ../src/mac/thread.cpp:427 ../src/msw/thread.cpp:652
 msgid "Can't create thread"
 msgstr "²»ÄÜ´´½¨½ø³Ì"
 
-#: ../src/msw/window.cpp:2855
+#: ../src/msw/window.cpp:3062
 #, fuzzy, c-format
 msgid "Can't create window of class %s"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
@@ -600,7 +606,7 @@ msgstr "
 msgid "Can't delete key '%s'"
 msgstr "²»ÄÜɾ³ý¼ü '%s'"
 
-#: ../src/msw/iniconf.cpp:447
+#: ../src/msw/iniconf.cpp:445
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
@@ -630,25 +636,16 @@ msgstr "
 msgid "Can't find current position in file '%s'"
 msgstr "²»ÄÜÔÚÎļþ'%s'ÖÐÕÒµ½µ±Ç°Î»ÖÃ"
 
-#: ../src/common/object.cpp:335 ../src/common/object.cpp:360
-#, c-format
-msgid "Can't find the serialization object '%s' for the object '%s'."
-msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'."
-
 #: ../src/msw/registry.cpp:351
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr "²»ÄÜ»ñµÃ×¢²á¼ü '%s'µÄÐÅÏ¢"
 
-#: ../src/common/image.cpp:904 ../src/common/image.cpp:924
+#: ../src/common/image.cpp:913 ../src/common/image.cpp:933
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 
-#: ../src/common/object.cpp:328
-msgid "Can't load wxSerial dynamic library."
-msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
-
 #: ../src/msw/dib.cpp:434
 #, c-format
 msgid "Can't open file '%s'"
@@ -669,11 +666,16 @@ msgstr "
 msgid "Can't read value of key '%s'"
 msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ"
 
-#: ../src/generic/logg.cpp:535 ../src/generic/logg.cpp:930
+#: ../src/common/image.cpp:955
+#, fuzzy, c-format
+msgid "Can't save image to file '%s': unknown extension."
+msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
+
+#: ../src/generic/logg.cpp:551 ../src/generic/logg.cpp:985
 msgid "Can't save log contents to file."
 msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
 
-#: ../src/msw/thread.cpp:513
+#: ../src/msw/thread.cpp:611
 msgid "Can't set thread priority"
 msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
 
@@ -682,211 +684,231 @@ msgstr "
 msgid "Can't set value of '%s'"
 msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
 
-#: ../src/common/dlgcmn.cpp:189 ../src/common/prntbase.cpp:109
-#: ../src/generic/dcpsg.cpp:2269 ../src/generic/dirctrlg.cpp:1249
-#: ../src/generic/dirdlgg.cpp:418 ../src/generic/filedlgg.cpp:1041
-#: ../src/generic/fontdlgg.cpp:259 ../src/generic/prntdlgg.cpp:466
-#: ../src/generic/progdlgg.cpp:206 ../src/generic/proplist.cpp:525
-#: ../src/gtk/filedlg.cpp:173 ../src/gtk/fontdlg.cpp:178
-#: ../src/html/helpfrm.cpp:1053 ../src/motif/msgdlg.cpp:180
+#: ../src/gtk/fontdlg.cpp:144 ../src/gtk/filedlg.cpp:173
+#: ../src/html/helpfrm.cpp:976 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:246 ../src/generic/fontdlgg.cpp:255
+#: ../src/generic/proplist.cpp:511 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/progdlgg.cpp:211 ../src/generic/filedlgg.cpp:1181
+#: ../src/generic/filedlgg.cpp:1200 ../src/generic/prntdlgg.cpp:453
 msgid "Cancel"
 msgstr "È¡Ïû"
 
-#: ../contrib/src/xrc/xmlres.cpp:726 ../contrib/src/xrc/xmlres.cpp:767
+#: ../contrib/src/xrc/xmlres.cpp:969 ../contrib/src/xrc/xmlres.cpp:1010
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr ""
 
-#: ../contrib/src/xrc/xml.cpp:372
-msgid "Cannot find XML I/O handler capable of loading this format."
-msgstr ""
-
-#: ../contrib/src/xrc/xml.cpp:398
-msgid "Cannot find XML I/O handler capable of saving in this format."
-msgstr ""
+#: ../src/common/strconv.cpp:963
+#, fuzzy, c-format
+msgid "Cannot convert from encoding '%s'!"
+msgstr "λÖñàÂë (%d)"
 
-#: ../src/msw/dialup.cpp:525
+#: ../src/msw/dialup.cpp:499
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:206
+#: ../contrib/src/xrc/xmlres.cpp:243
 #, fuzzy, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:781
+#: ../contrib/src/xrc/xmlres.cpp:1024
 #, fuzzy, c-format
 msgid "Cannot find font node '%s'."
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 
-#: ../src/msw/dialup.cpp:839
+#: ../src/msw/dialup.cpp:813
 msgid "Cannot find the location of address book file"
 msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
 
-#: ../src/unix/threadpsx.cpp:976
+#: ../src/unix/threadpsx.cpp:1096
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
 
-#: ../src/unix/utilsunx.cpp:863
+#: ../src/unix/utilsunx.cpp:865
 msgid "Cannot get the hostname"
 msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
 
-#: ../src/unix/utilsunx.cpp:899
+#: ../src/unix/utilsunx.cpp:901
 msgid "Cannot get the official hostname"
 msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
 
-#: ../src/msw/dialup.cpp:940
+#: ../src/msw/dialup.cpp:907
 msgid "Cannot hang up - no active dialup connection."
 msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
 
-#: ../src/msw/app.cpp:257
+#: ../src/msw/app.cpp:250
 msgid "Cannot initialize OLE"
 msgstr "²»Äܳõʼ»¯ OLE"
 
-#: ../contrib/src/xrc/xmlres.cpp:308
+#: ../src/mgl/app.cpp:414
+#, fuzzy
+msgid "Cannot initialize SciTech MGL!"
+msgstr "²»Äܳõʼ»¯ OLE"
+
+#: ../src/mgl/window.cpp:547
+#, fuzzy
+msgid "Cannot initialize display."
+msgstr "²»Äܳõʼ»¯ OLE"
+
+#: ../src/msw/volume.cpp:634
+#, fuzzy, c-format
+msgid "Cannot load icon from '%s'."
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+
+#: ../contrib/src/xrc/xmlres.cpp:356
 #, fuzzy, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
 
-#: ../src/html/htmlfilt.cpp:147
+#: ../src/html/htmlfilt.cpp:164
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "²»ÄÜ´ò¿ª HTML Îĵµ: %s"
 
-#: ../src/html/helpdata.cpp:585
+#: ../src/html/helpdata.cpp:584
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "²»ÄÜ´ò¿ª HTML °ïÖú: %s"
 
-#: ../src/generic/helpext.cpp:96
+#: ../src/generic/helpext.cpp:100
 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 
-#: ../src/html/helpdata.cpp:268
+#: ../src/html/helpdata.cpp:277
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:282
+#: ../contrib/src/xrc/xmlres.cpp:330
 #, fuzzy, c-format
 msgid "Cannot open file '%s'."
 msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
 
-#: ../src/generic/dcpsg.cpp:1584
+#: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
 msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!"
 
-#: ../src/html/helpdata.cpp:284
+#: ../src/html/helpdata.cpp:292
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:714
+#: ../contrib/src/xrc/xmlres.cpp:957
 #, fuzzy, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
-#: ../contrib/src/xrc/xmlres.cpp:755
+#: ../contrib/src/xrc/xmlres.cpp:998
 #, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
-#: ../src/html/helpfrm.cpp:1336
+#: ../src/html/helpfrm.cpp:1293
 msgid "Cannot print empty page."
 msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
 
-#: ../src/unix/threadpsx.cpp:957
+#: ../src/msw/volume.cpp:195 ../src/msw/volume.cpp:526
+#, fuzzy, c-format
+msgid "Cannot read typename from '%s'!"
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+
+#: ../src/unix/threadpsx.cpp:1077
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
 
-#: ../src/unix/threadpsx.cpp:606
+#: ../src/unix/threadpsx.cpp:710
 msgid "Cannot start thread: error writing TLS"
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
 
-#: ../src/html/helpfrm.cpp:459
+#: ../src/html/helpfrm.cpp:411
 msgid "Case sensitive"
 msgstr "´óСдÃô¸Ð"
 
-#: ../src/common/fontmap.cpp:124
+#: ../src/common/fontmap.cpp:126
 #, fuzzy
 msgid "Celtic (ISO-8859-14)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
-#: ../src/common/fontmap.cpp:112
+#: ../src/common/fontmap.cpp:114
 #, fuzzy
 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
 
-#: ../src/msw/dialup.cpp:774
+#: ../src/msw/dialup.cpp:748
 msgid "Choose ISP to dial"
 msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
 
-#: ../src/gtk/fontdlg.cpp:159
+#: ../src/gtk/fontdlg.cpp:122
 msgid "Choose font"
 msgstr "Ñ¡Ôñ×ÖÌå"
 
-#: ../src/msw/glcanvas.cpp:437
-msgid "ChoosePixelFormat failed."
-msgstr ""
+#: ../src/generic/mdig.cpp:112
+#, fuzzy
+msgid "Cl&ose"
+msgstr "¹Ø±Õ"
 
-#: ../src/generic/logg.cpp:473
+#: ../src/generic/logg.cpp:489
 msgid "Clear the log contents"
 msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
 
-#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:342
-#: ../src/generic/proplist.cpp:520
+#: ../src/common/prntbase.cpp:428 ../src/generic/proplist.cpp:506
+#: ../src/generic/progdlgg.cpp:358
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: ../src/generic/logg.cpp:475
+#: ../src/univ/themes/win32.cpp:4549
+msgid "Close\tAlt-F4"
+msgstr ""
+
+#: ../src/generic/mdig.cpp:113
+#, fuzzy
+msgid "Close All"
+msgstr "¹Ø±Õ"
+
+#: ../src/generic/logg.cpp:491
 msgid "Close this window"
 msgstr "¹Ø±Õ´°¿Ú"
 
-#: ../src/generic/dirctrlg.cpp:486
+#: ../src/generic/dirctrlg.cpp:549
 #, fuzzy
 msgid "Computer"
 msgstr "¼ÆËã»ú"
 
-#: ../src/common/fileconf.cpp:867
+#: ../src/common/fileconf.cpp:902
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
 
-#: ../src/generic/filedlgg.cpp:1204 ../src/gtk/filedlg.cpp:72
+#: ../src/gtk/filedlg.cpp:72 ../src/generic/filedlgg.cpp:1411
 msgid "Confirm"
 msgstr "È·ÈÏ"
 
-#: ../src/msw/mimetype.cpp:684
+#: ../src/msw/mimetype.cpp:689
 msgid "Confirm registry update"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:263
+#: ../src/html/htmlwin.cpp:262
 msgid "Connecting..."
 msgstr "Á¬½Ó..."
 
-#: ../src/generic/helpxlp.cpp:242
-#, c-format
-msgid "Connection to wxHelp timed out in %d seconds"
-msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
-
-#: ../src/generic/helpwxht.cpp:159 ../src/html/helpfrm.cpp:362
-#: ../src/html/helpfrm.cpp:371
+#: ../src/html/helpfrm.cpp:351
 msgid "Contents"
 msgstr "Ŀ¼"
 
-#: ../src/common/strconv.cpp:608
+#: ../src/common/strconv.cpp:616
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:194
+#: ../src/generic/prntdlgg.cpp:193
 msgid "Copies:"
 msgstr "·Ý:"
 
-#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1799
-#: ../src/common/resource.cpp:1929
+#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1806
+#: ../src/common/resource.cpp:1936
 #, c-format
 msgid "Could not find resource include file %s."
 msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
@@ -895,12 +917,12 @@ msgstr "
 msgid "Could not find tab for id"
 msgstr "ÕÒ²»µ½idµÄ±êÇ©"
 
-#: ../src/msw/textctrl.cpp:1644
+#: ../src/msw/textctrl.cpp:2050
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
 
-#: ../src/common/resource.cpp:795
+#: ../src/common/resource.cpp:802
 #, c-format
 msgid ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
@@ -909,7 +931,7 @@ msgstr ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
 " or provide #define (see manual for caveats)"
 
-#: ../src/common/resource.cpp:1244
+#: ../src/common/resource.cpp:1251
 #, c-format
 msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
@@ -918,81 +940,83 @@ msgstr ""
 "²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n"
 "»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)"
 
-#: ../src/common/prntbase.cpp:715
+#: ../src/common/prntbase.cpp:805
 msgid "Could not start document preview."
 msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ."
 
-#: ../src/generic/printps.cpp:197 ../src/msw/printwin.cpp:252
+#: ../src/msw/printwin.cpp:252 ../src/generic/printps.cpp:198
 msgid "Could not start printing."
 msgstr "²»ÄÜÆô¶¯´òÓ¡."
 
-#: ../src/common/wincmn.cpp:850
+#: ../src/common/wincmn.cpp:1167
 msgid "Could not transfer data to window"
 msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
 
-#: ../src/msw/thread.cpp:187
-msgid "Couldn't acquire a mutex lock"
-msgstr "²»Äܵõ½»¥³âÌåËø"
-
-#: ../src/msw/dragimag.cpp:148 ../src/msw/dragimag.cpp:184
+#: ../src/msw/dragimag.cpp:158 ../src/msw/dragimag.cpp:194
 #: ../src/msw/imaglist.cpp:152 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:187
 msgid "Couldn't add an image to the image list."
 msgstr "²»ÄÜ°ÑͼÏñ¼Óµ½Í¼ÏóÁбí."
 
-#: ../src/msw/timer.cpp:105
+#: ../src/msw/timer.cpp:103
 msgid "Couldn't create a timer"
 msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 
-#: ../src/mgl/cursor.cpp:121 ../src/mgl/cursor.cpp:146
+#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
 #, fuzzy
 msgid "Couldn't create cursor."
 msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 
-#: ../src/common/dynlib.cpp:337
+#: ../src/common/dynlib.cpp:347 ../src/common/dynload.cpp:299
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
 
-#: ../src/mac/thread.cpp:469 ../src/msw/thread.cpp:609
+#: ../src/mac/thread.cpp:502 ../src/msw/thread.cpp:711
 msgid "Couldn't get the current thread pointer"
 msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
 
-#: ../src/common/imagpng.cpp:249
+#: ../src/common/imagpng.cpp:302
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ."
 
-#: ../src/msw/ole/dataobj.cpp:143
+#: ../src/msw/ole/dataobj.cpp:147
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr "²»ÄÜ×¢²á¼ôÌù°å¸ñʽ '%s'."
 
-#: ../src/msw/thread.cpp:219
-msgid "Couldn't release a mutex"
-msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
-
-#: ../src/msw/listctrl.cpp:651
+#: ../src/msw/listctrl.cpp:737
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
 
-#: ../src/mac/thread.cpp:706 ../src/msw/thread.cpp:989
+#: ../src/common/imagpng.cpp:338 ../src/common/imagpng.cpp:349
+#: ../src/common/imagpng.cpp:357
+#, fuzzy
+msgid "Couldn't save PNG image."
+msgstr "JPEG: ²»Äܱ£´æͼÏñ."
+
+#: ../src/mac/thread.cpp:749 ../src/msw/thread.cpp:1091
 msgid "Couldn't terminate thread"
 msgstr "²»ÄÜÖÕÖ¹Ïß³Ì"
 
-#: ../src/generic/dirctrlg.cpp:1356 ../src/generic/dirdlgg.cpp:565
+#: ../src/generic/dirdlgg.cpp:263
 msgid "Create directory"
 msgstr "´´½¨Ä¿Â¼"
 
-#: ../src/generic/filedlgg.cpp:1008
+#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1132
 msgid "Create new directory"
 msgstr "´´½¨ÐÂĿ¼"
 
-#: ../src/generic/filedlgg.cpp:1015
+#: ../src/msw/textctrl.cpp:1680
+msgid "Cu&t"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1143
 msgid "Current directory:"
 msgstr "µ±Ç°Ä¿Â¼:"
 
-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fontmap.cpp:117
 #, fuzzy
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
@@ -1001,36 +1025,31 @@ msgstr "
 msgid "D sheet, 22 x 34 in"
 msgstr "D Ö½ÕÅ, 22 x 34 Ó¢´ç"
 
-#: ../src/msw/dde.cpp:587
+#: ../src/msw/dde.cpp:594
 msgid "DDE poke request failed"
 msgstr "DDE poke ÇëÇóʧ°Ü"
 
-#: ../src/common/imagbmp.cpp:809
-#, fuzzy
-msgid "DIB Header: Cannot deal with 4bit encoded yet."
-msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
-
-#: ../src/common/imagbmp.cpp:1027
+#: ../src/common/imagbmp.cpp:917
 #, fuzzy
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
 
-#: ../src/common/imagbmp.cpp:990
+#: ../src/common/imagbmp.cpp:879
 #, fuzzy
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:984
+#: ../src/common/imagbmp.cpp:873
 #, fuzzy
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:1004
+#: ../src/common/imagbmp.cpp:893
 #, fuzzy
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
 
-#: ../src/common/imagbmp.cpp:1013
+#: ../src/common/imagbmp.cpp:903
 #, fuzzy
 msgid "DIB Header: Unknown encoding in file."
 msgstr "BMP: Îļþ±àÂëδ֪."
@@ -1039,59 +1058,63 @@ msgstr "BMP: 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
 
-#: ../src/generic/filedlgg.cpp:646
+#: ../src/generic/filedlgg.cpp:705
 msgid "Date"
 msgstr "ÈÕÆÚ"
 
-#: ../src/generic/fontdlgg.cpp:209
+#: ../src/generic/fontdlgg.cpp:222
 msgid "Decorative"
 msgstr "ÐÞÊÎ"
 
-#: ../src/common/fontmap.cpp:366
+#: ../src/common/fontmap.cpp:392
 msgid "Default encoding"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:270
+#: ../src/unix/snglinst.cpp:269
 #, fuzzy, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
 
-#: ../src/msw/dialup.cpp:361
+#: ../src/msw/dialup.cpp:348
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
-#: ../src/msw/toplevel.cpp:221
+#: ../src/os2/toplevel.cpp:367
 #, fuzzy
-msgid "Did you forget to include wx/msw/wx.rc in your resources?"
+msgid "Did you forget to include wx/os2/wx.rc in your resources?"
 msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
 
-#: ../src/generic/tipdlg.cpp:177
+#: ../src/generic/tipdlg.cpp:217
 msgid "Did you know..."
 msgstr "ÄãÖªµÀ..."
 
-#: ../src/common/filefn.cpp:1219
+#: ../src/common/filefn.cpp:1279
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
 
-#: ../src/generic/dirctrlg.cpp:1291 ../src/generic/dirdlgg.cpp:532
+#: ../src/mgl/dirmgl.cpp:217
+#, fuzzy, c-format
+msgid "Directory '%s' doesn't exist!"
+msgstr "Ŀ¼²»´æÔÚ"
+
+#: ../src/generic/dirdlgg.cpp:188
 msgid "Directory does not exist"
 msgstr "Ŀ¼²»´æÔÚ"
 
-#: ../src/html/helpfrm.cpp:426
+#: ../src/html/helpfrm.cpp:379
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
 
-#: ../src/html/helpfrm.cpp:600
+#: ../src/html/helpfrm.cpp:545
 msgid "Display options dialog"
 msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
 
-#: ../src/msw/mimetype.cpp:677
-#, c-format
+#: ../src/msw/mimetype.cpp:682
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"
@@ -1101,21 +1124,16 @@ msgid ""
 "%s %1"
 msgstr ""
 
-#: ../src/common/docview.cpp:439
+#: ../src/common/docview.cpp:441
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"
 
-#: ../src/common/strconv.cpp:618
-#, c-format
-msgid "Don't know how to convert to/from charset '%s'."
-msgstr ""
-
-#: ../src/html/htmlwin.cpp:318
+#: ../src/html/htmlwin.cpp:314
 msgid "Done"
 msgstr "Íê³É"
 
-#: ../src/generic/progdlgg.cpp:354
+#: ../src/generic/progdlgg.cpp:370
 msgid "Done."
 msgstr "Íê³É¡£"
 
@@ -1128,62 +1146,55 @@ msgstr "
 msgid "E sheet, 34 x 44 in"
 msgstr "E Ö½ÕÅ, 34 x 44 Ó¢´ç"
 
-#: ../src/generic/progdlgg.cpp:178
+#: ../src/generic/progdlgg.cpp:183
 msgid "Elapsed time : "
 msgstr "ÓÃʱ£º"
 
-#: ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:335
 msgid "Entries found"
 msgstr "ÕÒµ½µÄÌõÄ¿"
 
-#: ../src/common/config.cpp:345
+#: ../src/common/config.cpp:362
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
 msgstr "»·¾³±äÁ¿À©Õ¹Ê§°Ü:  '%c' ûÓгöÏÖÔÚλÖà %d / '%s'."
 
-#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirctrlg.cpp:666
-#: ../src/generic/dirctrlg.cpp:677 ../src/generic/dirctrlg.cpp:1391
-#: ../src/generic/dirdlgg.cpp:267 ../src/generic/dirdlgg.cpp:285
-#: ../src/generic/dirdlgg.cpp:296 ../src/generic/dirdlgg.cpp:598
-#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:837
-#: ../src/generic/filedlgg.cpp:851 ../src/generic/filedlgg.cpp:864
-#: ../src/generic/filedlgg.cpp:1170 ../src/generic/filedlgg.cpp:1219
-#: ../src/generic/helpxlp.cpp:243 ../src/gtk/filedlg.cpp:80
-#: ../src/gtk/fontdlg.cpp:72
+#: ../src/gtk/fontdlg.cpp:71 ../src/gtk/filedlg.cpp:80
+#: ../src/generic/dirdlgg.cpp:298 ../src/generic/dirctrlg.cpp:704
+#: ../src/generic/dirctrlg.cpp:722 ../src/generic/dirctrlg.cpp:733
+#: ../src/generic/filedlgg.cpp:841 ../src/generic/filedlgg.cpp:942
+#: ../src/generic/filedlgg.cpp:956 ../src/generic/filedlgg.cpp:969
+#: ../src/generic/filedlgg.cpp:1365 ../src/generic/filedlgg.cpp:1418
 msgid "Error"
 msgstr "´íÎó"
 
-#: ../src/unix/utilsunx.cpp:1176 ../src/unix/utilsunx.cpp:1184
+#: ../src/unix/utilsunx.cpp:1193 ../src/unix/utilsunx.cpp:1201
 msgid "Error "
 msgstr "´íÎó"
 
-#: ../src/generic/dirctrlg.cpp:1304 ../src/generic/dirdlgg.cpp:545
+#: ../src/generic/dirdlgg.cpp:203
 msgid "Error creating directory"
 msgstr "´´½¨Ä¿Â¼´íÎó"
 
-#: ../src/common/imagbmp.cpp:1036
+#: ../src/common/imagbmp.cpp:926
 #, fuzzy
 msgid "Error in reading image DIB ."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/log.cpp:369
+#: ../src/common/log.cpp:460
 msgid "Error: "
 msgstr "´íÎó£º"
 
-#: ../src/common/fontmap.cpp:113
+#: ../src/common/fontmap.cpp:115
 msgid "Esperanto (ISO-8859-3)"
 msgstr "Esperanto (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:186
+#: ../src/generic/progdlgg.cpp:191
 msgid "Estimated time : "
 msgstr "Ô¤ÆÚʱ¼ä£º"
 
-#: ../src/generic/dirctrlg.cpp:619 ../src/generic/dirdlgg.cpp:216
-msgid "Etcetera"
-msgstr "ÆäËü"
-
-#: ../src/msw/utilsexc.cpp:588
+#: ../src/msw/utilsexc.cpp:702
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
@@ -1193,38 +1204,42 @@ msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr "Executive, 7 1/4 x 10 1/2 Ó¢´ç"
 
 #: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1391
-#: ../src/common/resource.cpp:1838 ../src/common/resource.cpp:1968
-#: ../src/common/resource.cpp:3048
+#: ../src/common/resource.cpp:1845 ../src/common/resource.cpp:1975
+#: ../src/common/resource.cpp:3059
 msgid "Expected '*' whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÆÚ´ý³öÏÖ '*' ."
 
 #: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1407
-#: ../src/common/resource.cpp:1855 ../src/common/resource.cpp:1984
-#: ../src/common/resource.cpp:3065
+#: ../src/common/resource.cpp:1862 ../src/common/resource.cpp:1991
+#: ../src/common/resource.cpp:3076
 msgid "Expected '=' whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÆÚ´ý '='."
 
 #: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1377
-#: ../src/common/resource.cpp:1824 ../src/common/resource.cpp:1954
-#: ../src/common/resource.cpp:3034
+#: ../src/common/resource.cpp:1831 ../src/common/resource.cpp:1961
+#: ../src/common/resource.cpp:3045
 msgid "Expected 'char' whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ."
 
-#: ../src/msw/dialup.cpp:869 ../src/msw/dialup.cpp:874
+#: ../src/common/fontmap.cpp:144
+msgid "Extended Unix Codepage for Japanese (EUC-JP)"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:842
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
-#: ../src/unix/snglinst.cpp:244
+#: ../src/unix/snglinst.cpp:243
 msgid "Failed to access lock file."
 msgstr ""
 
-#: ../src/common/filename.cpp:158
+#: ../src/common/filename.cpp:176
 #, fuzzy
 msgid "Failed to close file handle"
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
-#: ../src/unix/snglinst.cpp:309
+#: ../src/unix/snglinst.cpp:308
 #, fuzzy, c-format
 msgid "Failed to close lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
@@ -1233,11 +1248,11 @@ msgstr "ˢ
 msgid "Failed to close the clipboard."
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
-#: ../src/msw/dialup.cpp:808
+#: ../src/msw/dialup.cpp:782
 msgid "Failed to connect: missing username/password."
 msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
 
-#: ../src/msw/dialup.cpp:754
+#: ../src/msw/dialup.cpp:728
 msgid "Failed to connect: no ISP to dial."
 msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
 
@@ -1251,11 +1266,16 @@ msgstr "
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
 
-#: ../src/msw/dde.cpp:924
+#: ../src/common/filefn.cpp:1131
+#, fuzzy, c-format
+msgid "Failed to copy the file '%s' to '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
+#: ../src/msw/dde.cpp:948
 msgid "Failed to create DDE string"
 msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
 
-#: ../src/msw/mdi.cpp:407
+#: ../src/msw/mdi.cpp:425
 msgid "Failed to create MDI parent frame."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
@@ -1263,20 +1283,45 @@ msgstr "
 msgid "Failed to create a status bar."
 msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:625
+#: ../src/common/filename.cpp:721
 #, fuzzy
 msgid "Failed to create a temporary file name"
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/msw/dde.cpp:401
+#: ../src/msw/utilsexc.cpp:197
+#, fuzzy
+msgid "Failed to create an anonymous pipe"
+msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
+
+#: ../src/msw/dde.cpp:412
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü"
 
-#: ../src/generic/dirctrlg.cpp:1302 ../src/generic/dirdlgg.cpp:543
-msgid "Failed to create directory "
+#: ../src/msw/toplevel.cpp:313
+#, fuzzy
+msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
 msgstr "´´½¨Ä¿Â¼Ê§°Ü"
 
+#: ../src/unix/mimetype.cpp:372
+#, fuzzy, c-format
+msgid "Failed to create directory %s/.gnome."
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+
+#: ../src/unix/mimetype.cpp:381
+#, fuzzy, c-format
+msgid "Failed to create directory %s/mime-info."
+msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
+
+#: ../src/generic/dirdlgg.cpp:201
+#, fuzzy, c-format
+msgid ""
+"Failed to create directory '%s'\n"
+"(Do you have the required permissions?)"
+msgstr ""
+"\n"
+"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
+
 #: ../src/msw/mimetype.cpp:168
 #, fuzzy, c-format
 msgid "Failed to create registry entry for '%s' files."
@@ -1287,30 +1332,30 @@ msgstr "
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr ""
 
-#: ../src/html/winpars.cpp:413
+#: ../src/html/winpars.cpp:468
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
 
-#: ../src/mac/clipbrd.cpp:162 ../src/msw/clipbrd.cpp:139
+#: ../src/mac/clipbrd.cpp:168 ../src/msw/clipbrd.cpp:139
 msgid "Failed to empty the clipboard."
 msgstr "Çå¿Õ¼ôÌù°åʧ°Ü"
 
-#: ../src/msw/dde.cpp:606
+#: ../src/msw/dde.cpp:613
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ­»·Ê§°Ü"
 
-#: ../src/msw/dialup.cpp:646
+#: ../src/msw/dialup.cpp:620
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
-#: ../src/unix/utilsunx.cpp:563 ../src/unix/utilsunx.cpp:591
+#: ../src/unix/utilsunx.cpp:540 ../src/unix/utilsunx.cpp:557
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Ö´ÐÐ '%s'ʧ°Ü\n"
 
-#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2458
+#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2465
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
@@ -1319,7 +1364,7 @@ msgstr ""
 "²éÕÒXBM×ÊÔ´ %sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadBitmapData?"
 
-#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2608
+#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2619
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
@@ -1328,7 +1373,7 @@ msgstr ""
 "²éÕÒXBM×ÊÔ´%sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadIconData?"
 
-#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2473
+#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2480
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
@@ -1337,63 +1382,78 @@ msgstr ""
 "²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadBitmapData?"
 
-#: ../src/msw/dialup.cpp:706
+#: ../src/msw/dialup.cpp:680
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
 
-#: ../src/mac/clipbrd.cpp:113
+#: ../src/mac/clipbrd.cpp:119
 #, fuzzy
 msgid "Failed to get clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
-#: ../src/msw/clipbrd.cpp:628
+#: ../src/msw/clipbrd.cpp:712
 msgid "Failed to get data from the clipboard"
 msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
 
-#: ../src/common/timercmn.cpp:277
+#: ../src/common/timercmn.cpp:294
 msgid "Failed to get the UTC system time."
 msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü."
 
-#: ../src/common/timercmn.cpp:228
+#: ../src/common/timercmn.cpp:245
 msgid "Failed to get the local system time"
 msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
 
+#: ../src/common/filefn.cpp:1512
+#, fuzzy
+msgid "Failed to get the working directory"
+msgstr "´´½¨Ä¿Â¼Ê§°Ü"
+
 #: ../src/univ/theme.cpp:122
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr ""
 
-#: ../src/msw/helpchm.cpp:80
+#: ../src/msw/helpchm.cpp:69
 msgid "Failed to initialize MS HTML Help."
 msgstr ""
 
-#: ../src/msw/glcanvas.cpp:739
+#: ../src/msw/glcanvas.cpp:729
 #, fuzzy
 msgid "Failed to initialize OpenGL"
 msgstr "²»Äܳõʼ»¯ OLE"
 
-#: ../src/unix/threadpsx.cpp:776
+#: ../src/unix/threadpsx.cpp:887
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³"
 
-#: ../src/msw/utils.cpp:673
+#: ../src/msw/utils.cpp:723
 #, fuzzy, c-format
 msgid "Failed to kill process %d"
 msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
-#: ../src/common/dynlib.cpp:263
+#: ../src/common/iconbndl.cpp:66
+#, fuzzy, c-format
+msgid "Failed to load image %d from file '%s'."
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
+#: ../src/msw/volume.cpp:347
+#, fuzzy
+msgid "Failed to load mpr.dll."
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+
+#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:198
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 
-#: ../src/common/dynlib.cpp:251
+#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:127
 #, fuzzy, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 
-#: ../src/unix/snglinst.cpp:193
+#: ../src/unix/snglinst.cpp:192
 #, fuzzy, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
@@ -1403,17 +1463,17 @@ msgstr "ˢ
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
-#: ../src/common/filename.cpp:1561
+#: ../src/common/filename.cpp:1667
 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filename.cpp:147
+#: ../src/common/filename.cpp:164
 #, fuzzy, c-format
-msgid "Failed to open '%s' for reading"
+msgid "Failed to open '%s' for %s"
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:614
+#: ../src/common/filename.cpp:743
 #, fuzzy
 msgid "Failed to open temporary file."
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
@@ -1422,35 +1482,40 @@ msgstr "
 msgid "Failed to open the clipboard."
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
-#: ../src/msw/clipbrd.cpp:544
+#: ../src/msw/clipbrd.cpp:616
 msgid "Failed to put data on the clipboard"
 msgstr "°ÑÊý¾Ý·Åµ½¼ôÌù°åʧ°Ü"
 
-#: ../src/unix/snglinst.cpp:253
+#: ../src/unix/snglinst.cpp:252
 #, fuzzy
 msgid "Failed to read PID from lock file."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
-#: ../src/unix/utilsunx.cpp:662
+#: ../src/unix/utilsunx.cpp:635
 msgid "Failed to redirect child process input/output"
 msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
-#: ../src/msw/dde.cpp:285
+#: ../src/msw/utilsexc.cpp:605
+#, fuzzy
+msgid "Failed to redirect the child process IO"
+msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
+
+#: ../src/msw/dde.cpp:295
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
 
-#: ../src/common/fontmap.cpp:654
+#: ../src/common/fontmap.cpp:715
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."
 
-#: ../src/unix/snglinst.cpp:297
+#: ../src/unix/snglinst.cpp:296
 #, fuzzy, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
-#: ../src/unix/snglinst.cpp:263
+#: ../src/unix/snglinst.cpp:262
 #, fuzzy, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
@@ -1465,24 +1530,24 @@ msgstr "
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/clipbrd.cpp:433
+#: ../src/msw/clipbrd.cpp:505
 msgid "Failed to retrieve data from the clipboard."
 msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:1627
+#: ../src/common/filename.cpp:1757
 #, fuzzy, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
-#: ../src/msw/dialup.cpp:470
+#: ../src/msw/dialup.cpp:444
 msgid "Failed to retrieve text of RAS error message"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
-#: ../src/msw/clipbrd.cpp:658
+#: ../src/msw/clipbrd.cpp:742
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü"
 
-#: ../src/msw/dde.cpp:651
+#: ../src/msw/dde.cpp:658
 msgid "Failed to send DDE advise notification"
 msgstr "·¢ËÍDDE advise ֪ͨʧ°Ü"
 
@@ -1491,67 +1556,67 @@ msgstr "
 msgid "Failed to set FTP transfer mode to %s."
 msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
 
-#: ../src/msw/clipbrd.cpp:305
+#: ../src/msw/clipbrd.cpp:379
 msgid "Failed to set clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
-#: ../src/common/file.cpp:516
+#: ../src/common/file.cpp:526
 #, fuzzy
 msgid "Failed to set temporary file permissions"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/unix/threadpsx.cpp:1093
+#: ../src/unix/threadpsx.cpp:1241 ../src/unix/threadpsx.cpp:1252
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
 
-#: ../src/common/fs_mem.cpp:168
+#: ../src/common/fs_mem.cpp:167
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!"
 
-#: ../src/unix/threadpsx.cpp:1279
+#: ../src/unix/threadpsx.cpp:1425
 msgid "Failed to terminate a thread."
 msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü"
 
-#: ../src/msw/dde.cpp:625
+#: ../src/msw/dde.cpp:632
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ­»·Ê§°Ü"
 
-#: ../src/msw/dialup.cpp:948
+#: ../src/msw/dialup.cpp:915
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
-#: ../src/common/filename.cpp:1576
+#: ../src/common/filename.cpp:1682
 #, fuzzy, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/unix/snglinst.cpp:303
+#: ../src/unix/snglinst.cpp:302
 #, fuzzy, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/msw/dde.cpp:301
+#: ../src/msw/dde.cpp:311
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü"
 
-#: ../src/unix/snglinst.cpp:174
+#: ../src/unix/snglinst.cpp:173
 #, fuzzy, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/generic/logg.cpp:368
+#: ../src/generic/logg.cpp:379
 msgid "Fatal error"
 msgstr "ÖÂÃü´íÎó"
 
-#: ../src/common/log.cpp:362
+#: ../src/common/log.cpp:453
 msgid "Fatal error: "
 msgstr "ÖÂÃü´íÎó£º"
 
-#: ../src/mac/app.cpp:907 ../src/msw/app.cpp:1396
+#: ../src/mac/app.cpp:1284 ../src/msw/app.cpp:1290
 msgid "Fatal error: exiting"
 msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
 
@@ -1560,35 +1625,41 @@ msgstr "
 msgid "File %s does not exist."
 msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/generic/filedlgg.cpp:1201 ../src/gtk/filedlg.cpp:69
+#: ../src/gtk/filedlg.cpp:69 ../src/generic/filedlgg.cpp:1408
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 
+#: ../src/msw/filedlg.cpp:518
+#, fuzzy, c-format
+msgid ""
+"File '%s' already exists.\n"
+"Do you want to replace it?"
+msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
+
 #: ../src/common/textcmn.cpp:158
 msgid "File couldn't be loaded."
 msgstr "Îļþ²»Äܱ»×°ÔØ"
 
-#: ../src/common/docview.cpp:295 ../src/common/docview.cpp:331
-#: ../src/common/docview.cpp:1387
+#: ../src/common/docview.cpp:295 ../src/common/docview.cpp:332
+#: ../src/common/docview.cpp:1424
 msgid "File error"
 msgstr "Îļþ´íÎó"
 
-#: ../src/generic/dirctrlg.cpp:666 ../src/generic/dirdlgg.cpp:285
-#: ../src/generic/filedlgg.cpp:851
+#: ../src/generic/dirctrlg.cpp:722 ../src/generic/filedlgg.cpp:956
 msgid "File name exists already."
 msgstr "ÎļþÃûÒÑ´æÔÚ"
 
-#: ../src/msw/filedlg.cpp:349
+#: ../src/msw/filedlg.cpp:366
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Îļþ (%s)|%s"
 
-#: ../src/html/helpfrm.cpp:400
+#: ../src/html/helpfrm.cpp:367
 msgid "Find"
 msgstr "²éÕÒ"
 
-#: ../src/html/helpfrm.cpp:1032
+#: ../src/html/helpfrm.cpp:950
 msgid "Fixed font:"
 msgstr "¹Ì¶¨×ÖÌ壺"
 
@@ -1596,54 +1667,55 @@ msgstr "
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "Folio, 8 1/2 x 13 in"
 
-#: ../src/generic/fontdlgg.cpp:126
-msgid "Font"
-msgstr "×ÖÌå"
-
-#: ../src/html/helpfrm.cpp:1042
+#: ../src/html/helpfrm.cpp:951
 msgid "Font size:"
 msgstr "×ÖÌå´óС:"
 
-#: ../src/unix/utilsunx.cpp:619
+#: ../src/unix/utilsunx.cpp:578
 msgid "Fork failed"
 msgstr "Fork ʧ°Ü"
 
-#: ../src/common/dlgcmn.cpp:173 ../src/generic/helpwxht.cpp:158
+#: ../src/common/dlgcmn.cpp:230
 msgid "Forward"
 msgstr "ÏòÇ°"
 
 #: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1360
-#: ../src/common/resource.cpp:1807 ../src/common/resource.cpp:1937
-#: ../src/common/resource.cpp:3017
+#: ../src/common/resource.cpp:1814 ../src/common/resource.cpp:1944
+#: ../src/common/resource.cpp:3028
 msgid "Found "
 msgstr "ÕÒµ½"
 
-#: ../src/html/helpfrm.cpp:721
+#: ../src/html/helpfrm.cpp:666
 #, c-format
 msgid "Found %i matches"
 msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
 
-#: ../src/generic/prntdlgg.cpp:185
+#: ../src/generic/prntdlgg.cpp:184
 msgid "From:"
 msgstr "´Ó:"
 
-#: ../src/common/imaggif.cpp:74
+#: ../src/common/imaggif.cpp:100
+#, fuzzy
+msgid "GIF: Invalid gif index."
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
+
+#: ../src/common/imaggif.cpp:75
 msgid "GIF: data stream seems to be truncated."
 msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
 
-#: ../src/common/imaggif.cpp:58
+#: ../src/common/imaggif.cpp:59
 msgid "GIF: error in GIF image format."
 msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
 
-#: ../src/common/imaggif.cpp:61
+#: ../src/common/imaggif.cpp:62
 msgid "GIF: not enough memory."
 msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
 
-#: ../src/common/imaggif.cpp:64
+#: ../src/common/imaggif.cpp:65
 msgid "GIF: unknown error!!!"
 msgstr "GIF: λÖôíÎó!!!"
 
-#: ../src/univ/themes/gtk.cpp:578
+#: ../src/univ/themes/gtk.cpp:623
 msgid "GTK+ theme"
 msgstr ""
 
@@ -1655,40 +1727,44 @@ msgstr "
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr "µÂ¹ú±ê×¼¸´Ð´²¾, 8 1/2 x 12 in"
 
-#: ../src/common/image.cpp:753
+#: ../src/common/image.cpp:762
 msgid "GetUnusedColour:: No Unused Color in image "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:566
+#: ../src/html/helpfrm.cpp:511
 msgid "Go back"
 msgstr "»ØÍË"
 
-#: ../src/html/helpfrm.cpp:569
+#: ../src/html/helpfrm.cpp:514
 msgid "Go forward"
 msgstr "ÏòÇ°"
 
-#: ../src/html/helpfrm.cpp:574
+#: ../src/html/helpfrm.cpp:519
 msgid "Go one level up in document hierarchy"
 msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
 
-#: ../src/generic/filedlgg.cpp:1000
+#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1121
 msgid "Go to home directory"
 msgstr "½øÈëhomeĿ¼"
 
-#: ../src/generic/filedlgg.cpp:994
+#: ../src/generic/filedlgg.cpp:1113
 msgid "Go to parent directory"
 msgstr "½øÈ븸Ŀ¼"
 
-#: ../src/common/fontmap.cpp:117
+#: ../src/common/prntbase.cpp:378
+msgid "Goto Page"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:119
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: ../src/html/htmlwin.cpp:360
+#: ../src/html/htmlwin.cpp:354
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML ê %s ²»´æÔÚ."
 
-#: ../src/html/helpfrm.cpp:1350
+#: ../src/html/helpfrm.cpp:1307
 msgid ""
 "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|"
 "Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"
@@ -1696,82 +1772,81 @@ msgstr ""
 "HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ïÖú"
 "Êé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*"
 
-#: ../src/common/fontmap.cpp:118
+#: ../src/common/fontmap.cpp:120
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
-#: ../src/common/dlgcmn.cpp:185 ../src/generic/proplist.cpp:530
-#: ../src/html/helpfrm.cpp:262 ../src/msw/mdi.cpp:1304
+#: ../src/msw/mdi.cpp:1324 ../src/html/helpfrm.cpp:245
+#: ../src/common/dlgcmn.cpp:242 ../src/generic/proplist.cpp:516
+#: ../src/generic/mdig.cpp:308
 msgid "Help"
 msgstr "°ïÖú"
 
-#: ../src/html/helpfrm.cpp:1015
+#: ../src/html/helpfrm.cpp:944
 msgid "Help Browser Options"
 msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
 
-#: ../src/generic/helphtml.cpp:319 ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:334 ../src/generic/helphtml.cpp:335
 msgid "Help Index"
 msgstr "°ïÖúË÷Òý"
 
-#: ../src/html/helpfrm.cpp:1334
+#: ../src/html/helpfrm.cpp:1291
 msgid "Help Printing"
 msgstr "°ïÖú´òÓ¡"
 
-#: ../src/generic/helpwxht.cpp:251 ../src/html/helpctrl.cpp:44
+#: ../src/html/helpctrl.cpp:49
 #, c-format
 msgid "Help: %s"
 msgstr "°ïÖú: %s"
 
-#: ../src/common/imagbmp.cpp:103
-msgid "ICO: Error Image too tall for an icon."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:109
-msgid "ICO: Error Image too wide for an icon."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:201
+#: ../src/common/imagbmp.cpp:939
 #, fuzzy
-msgid "ICO: Error calculating size of DIB ."
+msgid "ICO: Error in reading mask DIB."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/imagbmp.cpp:194
+#: ../src/common/imagbmp.cpp:1041 ../src/common/imagbmp.cpp:1100
+#: ../src/common/imagbmp.cpp:1109 ../src/common/imagbmp.cpp:1120
+#: ../src/common/imagbmp.cpp:1164 ../src/common/imagbmp.cpp:1174
+#: ../src/common/imagbmp.cpp:1183
 #, fuzzy
-msgid "ICO: Error calculating size of Mask DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "ICO: Error writing the image file!"
+msgstr "TIFF:дͼÏñ´íÎó."
 
-#: ../src/common/imagbmp.cpp:186
-#, fuzzy
-msgid "ICO: Error calculating size of XOR DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+#: ../src/common/imagbmp.cpp:1009
+msgid "ICO: Image too tall for an icon."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:1015
+msgid "ICO: Image too wide for an icon."
+msgstr ""
 
-#: ../src/common/imagbmp.cpp:1049
+#: ../src/common/imagbmp.cpp:1248
 #, fuzzy
-msgid "ICO: Error in reading mask DIB."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "ICO: Invalid icon index."
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
-#: ../src/common/imagbmp.cpp:130
+#: ../src/common/imagiff.cpp:767
 #, fuzzy
-msgid "ICO: Error writing ICONDIR header."
-msgstr "TIFF:дͼÏñ´íÎó."
+msgid "IFF: data stream seems to be truncated."
+msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
 
-#: ../src/common/imagbmp.cpp:231
+#: ../src/common/imagiff.cpp:751
 #, fuzzy
-msgid "ICO: Error writing ICONDIRENTRY header."
-msgstr "TIFF:дͼÏñ´íÎó."
+msgid "IFF: error in IFF image format."
+msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
 
-#: ../src/common/imagbmp.cpp:248
+#: ../src/common/imagiff.cpp:754
 #, fuzzy
-msgid "ICO: Error writing Mask DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "IFF: not enough memory."
+msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
 
-#: ../src/common/imagbmp.cpp:240
+#: ../src/common/imagiff.cpp:757
 #, fuzzy
-msgid "ICO: Error writing XOR DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "IFF: unknown error!!!"
+msgstr "GIF: λÖôíÎó!!!"
 
 #: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
-#: ../src/common/resource.cpp:2638 ../src/common/resource.cpp:2649
+#: ../src/common/resource.cpp:2649 ../src/common/resource.cpp:2660
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
@@ -1780,72 +1855,77 @@ msgstr "û
 msgid "Ill-formed resource file syntax."
 msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
 
-#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirdlgg.cpp:267
-#: ../src/generic/filedlgg.cpp:837
+#: ../src/generic/dirctrlg.cpp:704 ../src/generic/filedlgg.cpp:942
 msgid "Illegal directory name."
 msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
 
-#: ../src/generic/filedlgg.cpp:1170
+#: ../src/generic/filedlgg.cpp:1365
 msgid "Illegal file specification."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
-#: ../src/common/image.cpp:776
+#: ../src/common/image.cpp:785
 msgid "Image and Mask have different sizes"
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:269
+#: ../src/common/image.cpp:1067
+#, c-format
+msgid "Image file is not of type %d."
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:270
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr "²»ÄÜ´´½¨rich±à¼­¿Ø¼þ, ʹÓüòµ¥Îı¾¿Ø¼þ´úÌæ. ÇëÖØ×°riched32.dll"
 
-#: ../src/unix/utilsunx.cpp:367
+#: ../src/unix/utilsunx.cpp:390
 msgid "Impossible to get child process input"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1088
+#: ../src/common/filefn.cpp:1147
 #, fuzzy, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1102
+#: ../src/common/filefn.cpp:1161
 #, fuzzy, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filefn.cpp:1152
+#: ../src/common/filefn.cpp:1212
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:319
-msgid "Incorrect version of HTML help book"
-msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
-
-#: ../src/html/helpfrm.cpp:432
+#: ../src/html/helpfrm.cpp:392
 msgid "Index"
 msgstr "Ë÷Òý"
 
-#: ../src/common/fontmap.cpp:122
+#: ../src/common/fontmap.cpp:124
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/common/imagtiff.cpp:175
+#: ../src/common/imagtiff.cpp:183
 msgid "Invalid TIFF image index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
-#: ../contrib/src/xrc/xmlres.cpp:313
+#: ../contrib/src/xrc/xmlres.cpp:362
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr ""
 
-#: ../src/common/appcmn.cpp:282
+#: ../src/common/appcmn.cpp:398
 #, fuzzy, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
-#: ../src/unix/snglinst.cpp:281
+#: ../src/x11/app.cpp:218
+#, fuzzy, c-format
+msgid "Invalid geometry specification '%s'"
+msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
+
+#: ../src/unix/snglinst.cpp:280
 #, fuzzy, c-format
 msgid "Invalid lock file '%s'."
 msgstr "²»ÄܹرÕÎļþ '%s'"
@@ -1855,7 +1935,7 @@ msgstr "
 msgid "Invalid regular expression '%s': %s"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:215
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Italic"
 msgstr "бÌå"
 
@@ -1863,20 +1943,19 @@ msgstr "б
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm"
 
-#: ../src/common/imagjpeg.cpp:206
+#: ../src/common/imagjpeg.cpp:222
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: ²»ÄÜ×°Èë - ÎļþÒ²ÐíÒѱ»ÆÆ»µ."
 
-#: ../src/common/imagjpeg.cpp:320
+#: ../src/common/imagjpeg.cpp:336
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 
-#: ../src/common/fontmap.cpp:126
+#: ../src/common/fontmap.cpp:128
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:439
-#: ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:620
 msgid "Landscape"
 msgstr "ºáÏò"
 
@@ -1884,7 +1963,7 @@ msgstr "
 msgid "Ledger, 17 x 11 in"
 msgstr "Ledger, 17 x 11 Ó¢´ç"
 
-#: ../src/generic/prntdlgg.cpp:647
+#: ../src/generic/prntdlgg.cpp:632
 msgid "Left margin (mm):"
 msgstr "×ó±ß¾à (ºÁÃ×):"
 
@@ -1900,25 +1979,25 @@ msgstr "Letter Small, 8 1/2 x 11 Ӣ
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
 
-#: ../src/generic/fontdlgg.cpp:218
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Light"
 msgstr "Çá"
 
-#: ../src/generic/filedlgg.cpp:1406 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:514
+#: ../src/gtk/filedlg.cpp:249 ../src/msw/filedlg.cpp:555
+#: ../src/motif/filedlg.cpp:357 ../src/generic/filedlgg.cpp:1623
 #, c-format
 msgid "Load %s file"
 msgstr "×°ÈëÎļþ %s "
 
-#: ../src/html/htmlwin.cpp:285
+#: ../src/generic/filedlgg.cpp:1625
+#, fuzzy
+msgid "Load file"
+msgstr "×°ÈëÎļþ %s "
+
+#: ../src/html/htmlwin.cpp:282
 msgid "Loading : "
 msgstr "×°ÔØ:"
 
-#: ../src/common/imagbmp.cpp:660 ../src/common/imagbmp.cpp:674
-#, fuzzy
-msgid "Loading DIB : Couldn't allocate memory."
-msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
-
 #: ../src/common/imagpnm.cpp:72
 msgid "Loading Grey Ascii PNM image is not yet implemented."
 msgstr "×°Èë»Ò¶È Ascii PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
@@ -1927,23 +2006,27 @@ msgstr "װ
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
 
-#: ../src/generic/logg.cpp:538
+#: ../src/generic/logg.cpp:554
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
 
-#: ../src/gtk/mdi.cpp:435
+#: ../src/gtk/mdi.cpp:433
 msgid "MDI child"
 msgstr "MDI×Ó´°¿Ú"
 
-#: ../src/msw/helpchm.cpp:70
+#: ../src/msw/helpchm.cpp:60
 #, fuzzy
 msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
-#: ../src/unix/mimetype.cpp:2412
+#: ../src/univ/themes/win32.cpp:4547
+msgid "Ma&ximize"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:2497
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ."
@@ -1952,22 +2035,30 @@ msgstr "Mailcap 
 msgid "Match case"
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:145
+#: ../src/common/fs_mem.cpp:144
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!"
 
-#: ../src/unix/mimetype.cpp:2077
+#: ../src/univ/themes/metal.cpp:174
+msgid "Metal theme"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:4545
+msgid "Mi&nimize"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:2118
 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr "Mime.ÀàÐÍÎļþ %s, ÐÐ %d: ûÓнáÊø·ûºÅµÄÒýÓÃ×Ö·û´®."
 
-#: ../src/mgl/app.cpp:169
+#: ../src/mgl/app.cpp:173
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:210
+#: ../src/generic/fontdlgg.cpp:223
 msgid "Modern"
 msgstr "ÏÖ´ú"
 
@@ -1975,61 +2066,46 @@ msgstr "
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
 
-#: ../src/common/dlgcmn.cpp:182
+#: ../src/common/dlgcmn.cpp:239
 msgid "More..."
 msgstr "¸ü¶à..."
 
-#: ../src/generic/dirctrlg.cpp:615 ../src/generic/dirdlgg.cpp:212
-msgid "Mounted Devices"
-msgstr "¹ÒÔØÉ豸"
-
-#: ../src/generic/dirdlgg.cpp:207
-msgid "My Harddisk"
-msgstr "ÎÒµÄÓ²ÅÌ"
-
-#: ../src/generic/dirctrlg.cpp:614 ../src/generic/dirdlgg.cpp:211
-msgid "My Home"
-msgstr "ÎҵļÒ"
-
-#: ../src/generic/filedlgg.cpp:644
+#: ../src/generic/filedlgg.cpp:703
 msgid "Name"
 msgstr "Ãû³Æ"
 
-#: ../src/generic/dirctrlg.cpp:1255 ../src/generic/dirdlgg.cpp:420
-msgid "New..."
-msgstr "´´½¨..."
-
-#: ../src/generic/filedlgg.cpp:727
+#: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282
+#: ../src/generic/filedlgg.cpp:817 ../src/generic/filedlgg.cpp:826
 msgid "NewName"
 msgstr "ÐÂÃû"
 
-#: ../src/html/helpfrm.cpp:580
+#: ../src/html/helpfrm.cpp:525
 msgid "Next page"
 msgstr "ÏÂÒ»Ò³"
 
-#: ../src/common/dlgcmn.cpp:152 ../src/common/dlgcmn.cpp:162
-#: ../src/mac/msgdlg.cpp:84 ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:78 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:219
 msgid "No"
 msgstr "·ñ"
 
-#: ../src/common/image.cpp:784
+#: ../src/common/image.cpp:793
 msgid "No Unused Color in image being masked"
 msgstr ""
 
 #: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:965
-#: ../src/common/resource.cpp:2464 ../src/common/resource.cpp:2614
+#: ../src/common/resource.cpp:2471 ../src/common/resource.cpp:2625
 msgid "No XBM facility available!"
 msgstr "ûÓпÉÓÃXBM¹¤¾ß!"
 
-#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2632
+#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2643
 msgid "No XPM icon facility available!"
 msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!"
 
-#: ../src/generic/helphtml.cpp:314
+#: ../src/generic/helphtml.cpp:329
 msgid "No entries found."
 msgstr "ûÕÒµ½ÌõÄ¿"
 
-#: ../src/common/fontmap.cpp:845
+#: ../src/common/fontmap.cpp:906
 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -2041,7 +2117,7 @@ msgstr ""
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
-#: ../src/common/fontmap.cpp:850
+#: ../src/common/fontmap.cpp:911
 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
@@ -2052,38 +2128,39 @@ msgstr ""
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
-#: ../contrib/src/xrc/xmlres.cpp:396
+#: ../contrib/src/xrc/xmlres.cpp:557
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr ""
 
-#: ../src/common/image.cpp:1009
+#: ../src/common/image.cpp:1049 ../src/common/image.cpp:1092
 msgid "No handler found for image type."
 msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
 
-#: ../src/common/image.cpp:1017 ../src/common/image.cpp:1051
+#: ../src/common/image.cpp:1057 ../src/common/image.cpp:1100
+#: ../src/common/image.cpp:1134
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "ûÓÐÀàÐÍ %d µÄͼÏñ´¦ÀíÆ÷."
 
-#: ../src/common/image.cpp:1035 ../src/common/image.cpp:1067
+#: ../src/common/image.cpp:1118 ../src/common/image.cpp:1150
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
 
-#: ../src/html/helpfrm.cpp:710
+#: ../src/html/helpfrm.cpp:655
 msgid "No matching page found yet"
 msgstr "No matching page found yet"
 
-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fontmap.cpp:122
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/generic/fontdlgg.cpp:214 ../src/generic/fontdlgg.cpp:217
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr "Õý³£"
 
-#: ../src/html/helpfrm.cpp:1024
+#: ../src/html/helpfrm.cpp:949
 msgid "Normal font:"
 msgstr "Normal font:"
 
@@ -2091,69 +2168,68 @@ msgstr "Normal font:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç"
 
-#: ../src/common/dlgcmn.cpp:168 ../src/generic/dcpsg.cpp:2268
-#: ../src/generic/dirctrlg.cpp:1247 ../src/generic/dirdlgg.cpp:416
-#: ../src/generic/filedlgg.cpp:1032 ../src/generic/fontdlgg.cpp:258
-#: ../src/generic/logg.cpp:723 ../src/generic/prntdlgg.cpp:465
-#: ../src/generic/proplist.cpp:513 ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:172 ../src/html/helpfrm.cpp:1052
+#: ../src/gtk/fontdlg.cpp:136 ../src/gtk/filedlg.cpp:167
+#: ../src/html/helpfrm.cpp:974 ../src/common/dlgcmn.cpp:225
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/proplist.cpp:499
+#: ../src/generic/dirdlgg.cpp:151 ../src/generic/filedlgg.cpp:1180
+#: ../src/generic/filedlgg.cpp:1191 ../src/generic/logg.cpp:739
+#: ../src/generic/prntdlgg.cpp:452
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: ../src/html/helpfrm.cpp:588 ../src/html/helpfrm.cpp:1345
+#: ../src/html/helpfrm.cpp:533 ../src/html/helpfrm.cpp:1302
 msgid "Open HTML document"
 msgstr "´ò¿ªHTMLÎĵµ"
 
-#: ../src/generic/dirctrlg.cpp:677 ../src/generic/dirctrlg.cpp:1391
-#: ../src/generic/dirdlgg.cpp:296 ../src/generic/dirdlgg.cpp:598
-#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:864
+#: ../src/generic/dirdlgg.cpp:298 ../src/generic/dirctrlg.cpp:733
+#: ../src/generic/filedlgg.cpp:841 ../src/generic/filedlgg.cpp:969
 msgid "Operation not permitted."
 msgstr "²»ÔÊÐíµÄ²Ù×÷."
 
-#: ../src/common/cmdline.cpp:627
+#: ../src/common/cmdline.cpp:667
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
 
-#: ../src/common/cmdline.cpp:647
+#: ../src/common/cmdline.cpp:687
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
 
-#: ../src/common/cmdline.cpp:708
+#: ../src/common/cmdline.cpp:748
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
 
-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:432
 msgid "Options"
 msgstr "Ñ¡Ïî"
 
-#: ../src/generic/prntdlgg.cpp:441 ../src/generic/prntdlgg.cpp:636
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:621
 msgid "Orientation"
 msgstr "·½Ïò"
 
-#: ../src/common/imagpcx.cpp:461 ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:455 ../src/common/imagpcx.cpp:478
 msgid "PCX: couldn't allocate memory"
 msgstr "PCX: ²»ÄÜ·ÖÅäÄÚ´æ"
 
-#: ../src/common/imagpcx.cpp:460
+#: ../src/common/imagpcx.cpp:454
 msgid "PCX: image format unsupported"
 msgstr "PCX: ͼÏñ¸ñʽ²»Ö§³Ö"
 
-#: ../src/common/imagpcx.cpp:483
+#: ../src/common/imagpcx.cpp:477
 msgid "PCX: invalid image"
 msgstr "PCX: ÎÞЧͼÏñ"
 
-#: ../src/common/imagpcx.cpp:447
+#: ../src/common/imagpcx.cpp:441
 msgid "PCX: this is not a PCX file."
 msgstr "PCX: ²»ÊÇPCXÎļþ."
 
-#: ../src/common/imagpcx.cpp:463 ../src/common/imagpcx.cpp:485
+#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:479
 msgid "PCX: unknown error !!!"
 msgstr "PCX: δ֪´íÎó !!!"
 
-#: ../src/common/imagpcx.cpp:462
+#: ../src/common/imagpcx.cpp:456
 msgid "PCX: version number too low"
 msgstr "PCX: °æ±¾ºÅ̫С"
 
@@ -2169,55 +2245,55 @@ msgstr "PNM: 
 msgid "PNM: File seems truncated."
 msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
 
-#: ../src/common/prntbase.cpp:736
+#: ../src/common/prntbase.cpp:826
 #, c-format
 msgid "Page %d"
 msgstr "ҳ %d"
 
-#: ../src/common/prntbase.cpp:734
+#: ../src/common/prntbase.cpp:824
 #, c-format
 msgid "Page %d of %d"
 msgstr "ҳ %d / %d"
 
-#: ../src/generic/prntdlgg.cpp:602
+#: ../src/generic/prntdlgg.cpp:587
 msgid "Page Setup"
 msgstr "Ò³ÃæÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:162
+#: ../src/generic/prntdlgg.cpp:161
 msgid "Pages"
 msgstr "ҳ"
 
-#: ../src/generic/prntdlgg.cpp:553 ../src/generic/prntdlgg.cpp:624
-#: ../src/generic/prntdlgg.cpp:806
+#: ../src/generic/prntdlgg.cpp:538 ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:794
 msgid "Paper Size"
 msgstr "Ö½ÕÅ´óС"
 
-#: ../src/generic/prntdlgg.cpp:431 ../src/generic/prntdlgg.cpp:613
-#: ../src/generic/prntdlgg.cpp:802
+#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:790
 msgid "Paper size"
 msgstr "Ö½ÕÅ´óС"
 
-#: ../src/generic/filedlgg.cpp:648
+#: ../src/generic/filedlgg.cpp:708
 msgid "Permissions"
 msgstr "ÔÊÐí"
 
-#: ../src/unix/utilsunx.cpp:562 ../src/unix/utilsunx.cpp:590
+#: ../src/unix/utilsunx.cpp:441
 msgid "Pipe creation failed"
 msgstr "¹ÜµÀ´´½¨Ê§°Ü"
 
-#: ../src/gtk/fontdlg.cpp:72
+#: ../src/gtk/fontdlg.cpp:71
 msgid "Please choose a valid font."
 msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
 
-#: ../src/generic/filedlgg.cpp:1219 ../src/gtk/filedlg.cpp:80
+#: ../src/gtk/filedlg.cpp:80 ../src/generic/filedlgg.cpp:1418
 msgid "Please choose an existing file."
 msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
 
-#: ../src/msw/dialup.cpp:775
+#: ../src/msw/dialup.cpp:749
 msgid "Please choose which ISP do you want to connect to"
 msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
 
-#: ../src/msw/listctrl.cpp:491
+#: ../src/msw/listctrl.cpp:550
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
@@ -2225,125 +2301,101 @@ msgid ""
 "or this program won't operate correctly."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:107
-msgid "Please wait..."
-msgstr "ÇëµÈ´ý..."
+#: ../src/common/prntbase.cpp:111
+msgid "Please wait while printing\n"
+msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:438
-#: ../src/generic/prntdlgg.cpp:634
+#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:619
 msgid "Portrait"
 msgstr "×ÝÏò"
 
-#: ../src/generic/dcpsg.cpp:389
-msgid "PostScript"
-msgstr "PostScript"
-
-#: ../src/generic/prntdlgg.cpp:270
+#: ../src/generic/prntdlgg.cpp:268
 msgid "PostScript file"
 msgstr "PostScriptÎļþ"
 
-#: ../src/generic/dcpsg.cpp:2301
-msgid "PostScript:"
-msgstr "PostScript:"
-
-#: ../src/generic/dcpsg.cpp:2264
-msgid "Preview Only"
-msgstr "½öÔ¤ÀÀ"
-
-#: ../src/html/helpfrm.cpp:1046
+#: ../src/html/helpfrm.cpp:966
 msgid "Preview:"
 msgstr "Ô¤ÀÀ£º"
 
-#: ../src/html/helpfrm.cpp:577
+#: ../src/html/helpfrm.cpp:522
 msgid "Previous page"
 msgstr "ǰҳ"
 
-#: ../src/generic/prntdlgg.cpp:111 ../src/generic/prntdlgg.cpp:125
+#: ../src/generic/prntdlgg.cpp:110 ../src/generic/prntdlgg.cpp:124
 msgid "Print"
 msgstr "´òÓ¡"
 
-#: ../src/common/docview.cpp:896
+#: ../src/common/docview.cpp:925
 msgid "Print Preview"
 msgstr "´òÓ¡Ô¤ÀÀ"
 
-#: ../src/common/prntbase.cpp:691 ../src/common/prntbase.cpp:715
+#: ../src/common/prntbase.cpp:781 ../src/common/prntbase.cpp:805
 msgid "Print Preview Failure"
 msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
 
-#: ../src/generic/prntdlgg.cpp:170
+#: ../src/generic/prntdlgg.cpp:169
 msgid "Print Range"
 msgstr "´òÓ¡·¶Î§"
 
-#: ../src/generic/prntdlgg.cpp:406 ../src/generic/prntdlgg.cpp:413
+#: ../src/generic/prntdlgg.cpp:406
 msgid "Print Setup"
 msgstr "´òÓ¡ÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:453
+#: ../src/generic/prntdlgg.cpp:440
 msgid "Print in colour"
 msgstr "²ÊÉ«´òÓ¡"
 
-#: ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/prntdlgg.cpp:442
 msgid "Print spooling"
 msgstr "´òÓ¡¼ÙÍÑ»ú"
 
-#: ../src/html/helpfrm.cpp:594
+#: ../src/html/helpfrm.cpp:539
 msgid "Print this page"
 msgstr "´òÓ¡±¾Ò³"
 
-#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:148
+#: ../src/generic/prntdlgg.cpp:147
 msgid "Print to File"
 msgstr "´òÓ¡µ½Îļþ"
 
-#: ../src/common/prntbase.cpp:366
+#: ../src/common/prntbase.cpp:435
 msgid "Print..."
 msgstr "´òÓ¡..."
 
-#: ../src/generic/dcpsg.cpp:2274
-msgid "Printer Command: "
-msgstr "´òÓ¡»úÃüÁî: "
-
-#: ../src/generic/dcpsg.cpp:2279
-msgid "Printer Options: "
-msgstr "´òÓ¡»úÑ¡Ïî:"
-
-#: ../src/generic/dcpsg.cpp:358
-msgid "Printer Settings"
-msgstr "´òÓ¡»úÉèÖÃ"
-
-#: ../src/generic/prntdlgg.cpp:457
+#: ../src/generic/prntdlgg.cpp:444
 msgid "Printer command:"
 msgstr "´òÓ¡»úÃüÁî:"
 
-#: ../src/generic/prntdlgg.cpp:147
+#: ../src/generic/prntdlgg.cpp:146
 msgid "Printer options"
 msgstr "´òÓ¡»úÑ¡Ïî"
 
-#: ../src/generic/prntdlgg.cpp:461
+#: ../src/generic/prntdlgg.cpp:448
 msgid "Printer options:"
 msgstr "´òÓ¡»úÑ¡Ïî:"
 
-#: ../src/generic/prntdlgg.cpp:680
+#: ../src/generic/prntdlgg.cpp:665
 msgid "Printer..."
 msgstr "´òÓ¡»ú..."
 
-#: ../src/common/prntbase.cpp:106 ../src/common/prntbase.cpp:148
-msgid "Printing"
+#: ../src/common/prntbase.cpp:108 ../src/common/prntbase.cpp:153
+#, fuzzy
+msgid "Printing "
 msgstr "´òÓ¡"
 
-#: ../src/common/prntbase.cpp:120
+#: ../src/common/prntbase.cpp:125
 msgid "Printing Error"
 msgstr "´òÓ¡³ö´í"
 
-#: ../src/generic/printps.cpp:220
+#: ../src/generic/printps.cpp:221
 #, c-format
 msgid "Printing page %d..."
 msgstr "ÕýÔÚ´òÓ¡Ò³ %d..."
 
-#: ../src/generic/printps.cpp:180
+#: ../src/generic/printps.cpp:181
 msgid "Printing..."
 msgstr "´òÓ¡..."
 
-#: ../src/common/log.cpp:363
+#: ../src/common/log.cpp:454
 msgid "Program aborted."
 msgstr "³ÌÐòÖÕÖ¹."
 
@@ -2351,7 +2403,7 @@ msgstr "
 msgid "Quarto, 215 x 275 mm"
 msgstr "ËÄ¿ª, 215 x 275 mm"
 
-#: ../src/generic/logg.cpp:1022
+#: ../src/generic/logg.cpp:1111
 msgid "Question"
 msgstr "ÎÊÌâ"
 
@@ -2360,6 +2412,11 @@ msgstr "
 msgid "Read error on file '%s'"
 msgstr "¶ÁÎļþ '%s'³ö´í"
 
+#: ../contrib/src/xrc/xmlres.cpp:532
+#, c-format
+msgid "Referenced object node with ref=\"%s\" not found!"
+msgstr ""
+
 #: ../src/msw/registry.cpp:535
 #, c-format
 msgid "Registry key '%s' already exists."
@@ -2386,11 +2443,11 @@ msgstr ""
 msgid "Registry value '%s' already exists."
 msgstr "×¢²áÖµ '%s' ÒÑ´æÔÚ."
 
-#: ../src/generic/helphtml.cpp:319
+#: ../src/generic/helphtml.cpp:334
 msgid "Relevant entries:"
 msgstr "Ïà¹ØÌõÄ¿:"
 
-#: ../src/generic/progdlgg.cpp:194
+#: ../src/generic/progdlgg.cpp:199
 msgid "Remaining time : "
 msgstr "Ê£Óàʱ¼ä : "
 
@@ -2407,20 +2464,20 @@ msgstr "
 msgid "Replace with:"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:330
+#: ../contrib/src/xrc/xmlres.cpp:379
 msgid "Resource files must have same version number!"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:659
+#: ../src/generic/prntdlgg.cpp:644
 msgid "Right margin (mm):"
 msgstr "Óұ߾à (ºÁÃ×):"
 
-#: ../src/generic/fontdlgg.cpp:208
+#: ../src/generic/fontdlgg.cpp:221
 msgid "Roman"
 msgstr "ÂÞÂí"
 
-#: ../src/generic/filedlgg.cpp:1422 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:516
+#: ../src/gtk/filedlg.cpp:265 ../src/msw/filedlg.cpp:557
+#: ../src/motif/filedlg.cpp:359 ../src/generic/filedlgg.cpp:1638
 #, c-format
 msgid "Save %s file"
 msgstr "±£´æÎļþ %s "
@@ -2429,20 +2486,24 @@ msgstr "
 msgid "Save as"
 msgstr "Áí´æΪ"
 
-#: ../src/generic/logg.cpp:471
+#: ../src/generic/filedlgg.cpp:1640
+#, fuzzy
+msgid "Save file"
+msgstr "±£´æÎļþ %s "
+
+#: ../src/generic/logg.cpp:487
 msgid "Save log contents to file"
 msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
 
-#: ../src/generic/fontdlgg.cpp:211
+#: ../src/generic/fontdlgg.cpp:224
 msgid "Script"
 msgstr "Script"
 
-#: ../src/generic/helpwxht.cpp:161 ../src/html/helpfrm.cpp:475
-#: ../src/html/helpfrm.cpp:495
+#: ../src/html/helpfrm.cpp:413 ../src/html/helpfrm.cpp:428
 msgid "Search"
 msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:477
+#: ../src/html/helpfrm.cpp:415
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
@@ -2458,15 +2519,15 @@ msgstr "
 msgid "Search for:"
 msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:871
+#: ../src/html/helpfrm.cpp:794
 msgid "Search in all books"
 msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
 
-#: ../src/html/helpfrm.cpp:710
+#: ../src/html/helpfrm.cpp:655
 msgid "Searching..."
 msgstr "ËÑË÷..."
 
-#: ../src/generic/dirctrlg.cpp:488 ../src/generic/dirdlgg.cpp:190
+#: ../src/generic/dirctrlg.cpp:551
 msgid "Sections"
 msgstr "¶Î"
 
@@ -2475,65 +2536,66 @@ msgstr "
 msgid "Seek error on file '%s'"
 msgstr "Îļþ '%s'¶¨Î»´íÎó"
 
-#: ../src/common/docview.cpp:1490
+#: ../src/msw/textctrl.cpp:1685
+#, fuzzy
+msgid "Select &All"
+msgstr "Ñ¡ÔñÎļþ"
+
+#: ../src/common/docview.cpp:1540
 msgid "Select a document template"
 msgstr "Ñ¡ÔñÎĵµÄ£°å"
 
-#: ../src/common/docview.cpp:1556
+#: ../src/common/docview.cpp:1616
 msgid "Select a document view"
 msgstr "Ñ¡ÔñÎĵµÊÓͼ"
 
-#: ../src/common/docview.cpp:1370 ../src/common/docview.cpp:1421
+#: ../src/common/docview.cpp:1407 ../src/common/docview.cpp:1458
 msgid "Select a file"
 msgstr "Ñ¡ÔñÎļþ"
 
-#: ../src/generic/dcpsg.cpp:2262
-msgid "Send to Printer"
-msgstr "·¢µ½´òÓ¡»ú"
-
-#: ../src/common/cmdline.cpp:664
+#: ../src/common/cmdline.cpp:704
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
 
-#: ../src/msw/glcanvas.cpp:441
-#, fuzzy
-msgid "SetPixelFormat failed."
-msgstr "¹ÜµÀ´´½¨Ê§°Ü"
-
-#: ../src/common/dlgcmn.cpp:179
+#: ../src/common/dlgcmn.cpp:236
 msgid "Setup"
 msgstr "ÉèÖÃ"
 
-#: ../src/generic/prntdlgg.cpp:153
+#: ../src/generic/prntdlgg.cpp:152
 msgid "Setup..."
 msgstr "ÉèÖÃ..."
 
-#: ../src/msw/dialup.cpp:546
+#: ../src/msw/dialup.cpp:520
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
 
-#: ../src/html/helpfrm.cpp:391
+#: ../src/html/helpfrm.cpp:369
 msgid "Show all"
 msgstr "ÏÔʾËùÓÐ"
 
-#: ../src/html/helpfrm.cpp:425
+#: ../src/html/helpfrm.cpp:380
 msgid "Show all items in index"
 msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
 
-#: ../src/generic/filedlgg.cpp:1038
+#: ../src/generic/dirdlgg.cpp:135
+#, fuzzy
+msgid "Show hidden directories"
+msgstr "ÏÔʾÒþ²ØÎļþ"
+
+#: ../src/generic/filedlgg.cpp:1175 ../src/generic/filedlgg.cpp:1197
 msgid "Show hidden files"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 
-#: ../src/html/helpfrm.cpp:561
+#: ../src/html/helpfrm.cpp:506
 msgid "Show/hide navigation panel"
 msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
 
-#: ../src/generic/filedlgg.cpp:645
+#: ../src/generic/filedlgg.cpp:704
 msgid "Size"
 msgstr "´óС"
 
-#: ../src/generic/fontdlgg.cpp:216
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Slant"
 msgstr "Çãб"
 
@@ -2541,8 +2603,8 @@ msgstr "
 msgid "Sorry, could not open this file for saving."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþÒԱ㱣´æ¡£"
 
-#: ../src/common/docview.cpp:341 ../src/common/docview.cpp:353
-#: ../src/common/docview.cpp:1389
+#: ../src/common/docview.cpp:342 ../src/common/docview.cpp:355
+#: ../src/common/docview.cpp:1426
 msgid "Sorry, could not open this file."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
 
@@ -2550,7 +2612,7 @@ msgstr "
 msgid "Sorry, could not save this file."
 msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
 
-#: ../src/common/prntbase.cpp:691
+#: ../src/common/prntbase.cpp:781
 msgid "Sorry, not enough memory to create a preview."
 msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
 
@@ -2558,32 +2620,37 @@ msgstr "
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "Statement, 5 1/2 x 8 1/2 in"
 
-#: ../src/generic/logg.cpp:588
+#: ../src/generic/logg.cpp:604
 msgid "Status: "
 msgstr "״̬£º"
 
-#: ../src/generic/fontdlgg.cpp:212
+#: ../contrib/src/xrc/xmlres.cpp:632
+#, c-format
+msgid "Subclass '%s' not found for resource '%s', not subclassing!"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
 msgstr "ÈðÊ¿"
 
-#: ../src/common/imagtiff.cpp:196 ../src/common/imagtiff.cpp:207
-#: ../src/common/imagtiff.cpp:318
+#: ../src/common/imagtiff.cpp:204 ../src/common/imagtiff.cpp:215
+#: ../src/common/imagtiff.cpp:326
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ."
 
-#: ../src/common/imagtiff.cpp:167
+#: ../src/common/imagtiff.cpp:175
 msgid "TIFF: Error loading image."
 msgstr "TIFF: ×°ÔØͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:218
+#: ../src/common/imagtiff.cpp:226
 msgid "TIFF: Error reading image."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:295
+#: ../src/common/imagtiff.cpp:303
 msgid "TIFF: Error saving image."
 msgstr "TIFF: ±£´æͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:342
+#: ../src/common/imagtiff.cpp:350
 msgid "TIFF: Error writing image."
 msgstr "TIFF:дͼÏñ´íÎó."
 
@@ -2591,31 +2658,23 @@ msgstr "TIFF:дͼ
 msgid "Tabloid, 11 x 17 in"
 msgstr "Tabloid, 11 x 17 Ó¢´ç"
 
-#: ../src/generic/fontdlgg.cpp:213
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Teletype"
 msgstr "µç´«´ò×Ö»ú"
 
-#: ../src/common/docview.cpp:1491
+#: ../src/common/docview.cpp:1541
 msgid "Templates"
 msgstr "Ä£°å"
 
-#: ../src/generic/dirctrlg.cpp:620 ../src/generic/dirdlgg.cpp:217
-msgid "Temporary"
-msgstr "ÁÙʱµÄ"
-
-#: ../src/common/fontmap.cpp:121
+#: ../src/common/fontmap.cpp:123
 msgid "Thai (ISO-8859-11)"
 msgstr "Ì©Óï (ISO-8859-11)"
 
-#: ../src/generic/dirctrlg.cpp:613 ../src/generic/dirdlgg.cpp:209
-msgid "The Computer"
-msgstr "¼ÆËã»ú"
-
 #: ../src/common/ftp.cpp:569
 msgid "The FTP server doesn't support passive mode."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:610
+#: ../src/common/fontmap.cpp:674
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -2626,16 +2685,22 @@ msgstr ""
 "´úÌæËü£¬»ò£¬Èç¹û²»ÄÜ\n"
 "±»Ìæ´úÑ¡Ôñ[È¡Ïû] "
 
-#: ../src/msw/ole/dataobj.cpp:161
+#: ../src/msw/ole/dataobj.cpp:165
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "¼ôÌù°å¸ñʽ '%d' ²»´æÔÚ."
 
-#: ../src/generic/dirctrlg.cpp:1288 ../src/generic/dirdlgg.cpp:529
-msgid "The directory "
-msgstr "Ŀ¼"
+#: ../src/generic/dirdlgg.cpp:186
+#, fuzzy, c-format
+msgid ""
+"The directory '%s' does not exist\n"
+"Create it now?"
+msgstr ""
+"\n"
+"²»´æÔÚ\n"
+"ÏÖÔÚ´´½¨?"
 
-#: ../src/common/docview.cpp:1744
+#: ../src/common/docview.cpp:1804
 #, fuzzy, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
@@ -2644,12 +2709,12 @@ msgstr ""
 "Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
 "ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
 
-#: ../src/common/filename.cpp:780
+#: ../src/common/filename.cpp:900
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:798
+#: ../src/common/cmdline.cpp:846
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
@@ -2658,76 +2723,81 @@ msgstr "
 msgid "The text couldn't be saved."
 msgstr "Îı¾²»Äܱ»±£´æ¡£"
 
-#: ../src/common/cmdline.cpp:777
+#: ../src/common/cmdline.cpp:825
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
 
-#: ../src/msw/dialup.cpp:422
+#: ../src/msw/dialup.cpp:408
 #, 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/msw/thread.cpp:1112
+#: ../src/html/htmprint.cpp:540
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+
+#: ../src/msw/thread.cpp:1214
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ"
 
-#: ../src/unix/threadpsx.cpp:1469
+#: ../src/unix/threadpsx.cpp:1596
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
 
-#: ../src/msw/thread.cpp:1100
+#: ../src/msw/thread.cpp:1202
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
 
-#: ../src/unix/threadpsx.cpp:984
+#: ../src/unix/threadpsx.cpp:1104
 msgid "Thread priority setting is ignored."
 msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
 
-#: ../src/msw/mdi.cpp:178
+#: ../src/msw/mdi.cpp:189
 msgid "Tile &Horizontally"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:179
+#: ../src/msw/mdi.cpp:190
 msgid "Tile &Vertically"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:647
+#: ../src/generic/filedlgg.cpp:706
 msgid "Time"
 msgstr "ʱ¼ä"
 
-#: ../src/generic/tipdlg.cpp:162
+#: ../src/generic/tipdlg.cpp:202
 msgid "Tip of the Day"
 msgstr "ÿÈÕ¼¼ÇÉ"
 
-#: ../src/generic/tipdlg.cpp:138
+#: ../src/generic/tipdlg.cpp:140
 msgid "Tips not available, sorry!"
 msgstr "¶Ô²»Æð£¬Ã»ÓÐËùÐè¼¼ÇÉ!"
 
-#: ../src/generic/prntdlgg.cpp:189
+#: ../src/generic/prntdlgg.cpp:188
 msgid "To:"
 msgstr "µ½:"
 
-#: ../src/generic/prntdlgg.cpp:648
+#: ../src/generic/prntdlgg.cpp:633
 msgid "Top margin (mm):"
 msgstr "ÉÏÒ³±ß¾à (ºÁÃ×):"
 
-#: ../src/common/fs_mem.cpp:203
+#: ../src/common/fs_mem.cpp:202
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
 
-#: ../src/common/sckaddr.cpp:108
+#: ../src/common/sckaddr.cpp:126
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú"
 
-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fontmap.cpp:121
 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
 
@@ -2735,12 +2805,12 @@ msgstr "
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç"
 
-#: ../src/html/htmlwin.cpp:271
+#: ../src/html/htmlwin.cpp:270
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
 
-#: ../src/generic/fontdlgg.cpp:244
+#: ../src/generic/fontdlgg.cpp:250
 msgid "Underline"
 msgstr "Ï»®Ïß"
 
@@ -2748,59 +2818,54 @@ msgstr "
 #: ../src/common/resourc2.cpp:335 ../src/common/resourc2.cpp:349
 #: ../src/common/resourc2.cpp:1370 ../src/common/resourc2.cpp:1384
 #: ../src/common/resourc2.cpp:1400 ../src/common/resourc2.cpp:1414
-#: ../src/common/resource.cpp:1817 ../src/common/resource.cpp:1831
-#: ../src/common/resource.cpp:1848 ../src/common/resource.cpp:1862
-#: ../src/common/resource.cpp:1947 ../src/common/resource.cpp:1961
-#: ../src/common/resource.cpp:1977 ../src/common/resource.cpp:1991
-#: ../src/common/resource.cpp:3027 ../src/common/resource.cpp:3041
-#: ../src/common/resource.cpp:3058 ../src/common/resource.cpp:3072
+#: ../src/common/resource.cpp:1824 ../src/common/resource.cpp:1838
+#: ../src/common/resource.cpp:1855 ../src/common/resource.cpp:1869
+#: ../src/common/resource.cpp:1954 ../src/common/resource.cpp:1968
+#: ../src/common/resource.cpp:1984 ../src/common/resource.cpp:1998
+#: ../src/common/resource.cpp:3038 ../src/common/resource.cpp:3052
+#: ../src/common/resource.cpp:3069 ../src/common/resource.cpp:3083
 msgid "Unexpected end of file whilst parsing resource."
 msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
 
-#: ../src/common/cmdline.cpp:749
+#: ../src/common/cmdline.cpp:789
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "ÒâÍâ²ÎÊý '%s'"
 
-#: ../src/common/fontmap.cpp:140
+#: ../src/common/fontmap.cpp:142
 msgid "Unicode 7 bit (UTF-7)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:141
+#: ../src/common/fontmap.cpp:143
 msgid "Unicode 8 bit (UTF-8)"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1020
+#: ../src/msw/dde.cpp:1044
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "δ֪ DDE ´íÎó %08x"
 
-#: ../src/common/strconv.cpp:888
-#, fuzzy, c-format
-msgid "Unknown encoding '%s'!"
-msgstr "λÖñàÂë (%d)"
-
-#: ../src/common/fontmap.cpp:383
+#: ../src/common/fontmap.cpp:406
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "λÖñàÂë (%d)"
 
-#: ../src/unix/mimetype.cpp:2120
+#: ../src/unix/mimetype.cpp:2165
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'."
 
-#: ../src/common/cmdline.cpp:533
+#: ../src/common/cmdline.cpp:565
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "δ֪longÑ¡Ïî '%s'"
 
-#: ../src/common/cmdline.cpp:555
+#: ../src/common/cmdline.cpp:574 ../src/common/cmdline.cpp:595
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "δ֪ѡÏî '%s'"
 
-#: ../contrib/src/xrc/xmlres.cpp:488
+#: ../contrib/src/xrc/xmlres.cpp:701
 msgid "Unknown style flag "
 msgstr ""
 
@@ -2809,22 +2874,22 @@ msgstr ""
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
 
-#: ../src/common/cmdproc.cpp:226 ../src/common/cmdproc.cpp:241
-#: ../src/common/cmdproc.cpp:268
+#: ../src/common/cmdproc.cpp:238 ../src/common/cmdproc.cpp:254
+#: ../src/common/cmdproc.cpp:281
 msgid "Unnamed command"
 msgstr "δÃüÃûµÄÃüÁî"
 
-#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2336
+#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2343
 #, c-format
 msgid "Unrecognized style %s whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s."
 
-#: ../src/mac/clipbrd.cpp:53 ../src/msw/clipbrd.cpp:273
-#: ../src/msw/clipbrd.cpp:374
+#: ../src/mac/clipbrd.cpp:59 ../src/msw/clipbrd.cpp:273
+#: ../src/msw/clipbrd.cpp:447
 msgid "Unsupported clipboard format."
 msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
 
-#: ../src/common/appcmn.cpp:266
+#: ../src/common/appcmn.cpp:380
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr ""
@@ -2833,61 +2898,49 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:834
+#: ../src/common/cmdline.cpp:916
 #, c-format
 msgid "Usage: %s"
 msgstr "Ó÷¨: %s"
 
-#: ../src/generic/dirctrlg.cpp:617 ../src/generic/dirdlgg.cpp:214
-msgid "User"
-msgstr "Óû§"
-
-#: ../src/generic/dirctrlg.cpp:616 ../src/generic/dirdlgg.cpp:213
-msgid "User Local"
-msgstr "±¾µØÓû§"
-
-#: ../src/common/valtext.cpp:188
+#: ../src/common/valtext.cpp:196
 msgid "Validation conflict"
 msgstr "ÑéÖ¤³åÍ»"
 
-#: ../src/generic/dirctrlg.cpp:618 ../src/generic/dirdlgg.cpp:215
-msgid "Variables"
-msgstr "±äÁ¿"
-
-#: ../src/generic/filedlgg.cpp:986
+#: ../src/generic/filedlgg.cpp:1103
 msgid "View files as a detailed view"
 msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
 
-#: ../src/generic/filedlgg.cpp:980
+#: ../src/generic/filedlgg.cpp:1096
 msgid "View files as a list view"
 msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
 
-#: ../src/common/docview.cpp:1557
+#: ../src/common/docview.cpp:1617
 msgid "Views"
 msgstr "ÊÓͼ"
 
-#: ../src/unix/utilsunx.cpp:767
+#: ../src/unix/utilsunx.cpp:758
 msgid "Waiting for subprocess termination failed"
 msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü"
 
-#: ../src/common/docview.cpp:436 ../src/common/resource.cpp:124
+#: ../src/common/resource.cpp:124 ../src/common/docview.cpp:438
 msgid "Warning"
 msgstr "¾¯¸æ"
 
-#: ../src/common/log.cpp:373
+#: ../src/common/log.cpp:464
 msgid "Warning: "
 msgstr "¾¯¸æ:"
 
-#: ../src/html/htmlpars.cpp:357
+#: ../src/html/htmlpars.cpp:362
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "¾¯¸æ: ÊÓͼ´Ó¿ÕÕ»ÖÐÒÆÈ¥HTML±êÇ©´¦ÀíÆ÷."
 
-#: ../src/common/fontmap.cpp:111
+#: ../src/common/fontmap.cpp:113
 #, fuzzy
 msgid "Western European (ISO-8859-1)"
 msgstr "West European (ISO-8859-1/Latin 1)"
 
-#: ../src/common/fontmap.cpp:125
+#: ../src/common/fontmap.cpp:127
 #, fuzzy
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "West European new (ISO-8859-15/Latin 0)"
@@ -2897,85 +2950,81 @@ msgstr "West European new (ISO-8859-15/Latin 0)"
 msgid "Whole word"
 msgstr "½öΪÕû×Ö"
 
-#: ../src/html/helpfrm.cpp:467
+#: ../src/html/helpfrm.cpp:412
 msgid "Whole words only"
 msgstr "½öΪÕû×Ö"
 
-#: ../src/univ/themes/win32.cpp:1106
+#: ../src/univ/themes/win32.cpp:1168
 msgid "Win32 theme"
 msgstr ""
 
-#: ../src/msw/utils.cpp:862
+#: ../src/msw/utils.cpp:983
 msgid "Win32s on Windows 3.1"
 msgstr "Win32s on Windows 3.1"
 
-#: ../src/msw/mdi.cpp:1338
-msgid "Window"
-msgstr "´°¿Ú"
-
-#: ../src/msw/utils.cpp:894
+#: ../src/msw/utils.cpp:1015
 msgid "Windows 3.1"
 msgstr "Windows 3.1"
 
-#: ../src/msw/utils.cpp:866
+#: ../src/msw/utils.cpp:987
 #, c-format
 msgid "Windows 9%c"
 msgstr "Windows 9%c"
 
-#: ../src/common/fontmap.cpp:137
+#: ../src/common/fontmap.cpp:139
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows Arabic (CP 1256)"
 
-#: ../src/common/fontmap.cpp:138
+#: ../src/common/fontmap.cpp:140
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows Baltic (CP 1257)"
 
-#: ../src/common/fontmap.cpp:131
+#: ../src/common/fontmap.cpp:133
 #, fuzzy
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 
-#: ../src/common/fontmap.cpp:128
+#: ../src/common/fontmap.cpp:130
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:130
+#: ../src/common/fontmap.cpp:132
 #, fuzzy
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows Latin 1 (CP 1252)"
 
-#: ../src/common/fontmap.cpp:132
+#: ../src/common/fontmap.cpp:134
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows Cyrillic (CP 1251)"
 
-#: ../src/common/fontmap.cpp:134
+#: ../src/common/fontmap.cpp:136
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fontmap.cpp:136
+#: ../src/common/fontmap.cpp:138
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 
-#: ../src/common/fontmap.cpp:127
+#: ../src/common/fontmap.cpp:129
 #, fuzzy
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fontmap.cpp:129
+#: ../src/common/fontmap.cpp:131
 #, fuzzy
 msgid "Windows Korean (CP 949)"
 msgstr "Windows Greek (CP 1253)"
 
-#: ../src/common/fontmap.cpp:135
+#: ../src/common/fontmap.cpp:137
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
 
-#: ../src/common/fontmap.cpp:133
+#: ../src/common/fontmap.cpp:135
 #, fuzzy
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows Latin 1 (CP 1252)"
 
-#: ../src/common/fontmap.cpp:139
+#: ../src/common/fontmap.cpp:141
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
@@ -2984,77 +3033,57 @@ msgstr "Windows/DOS OEM (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "дÎļþ '%s'´íÎó"
 
-#: ../src/generic/dcpsg.cpp:2319
-msgid "X Scaling"
-msgstr "XËõ·Å"
-
-#: ../src/generic/dcpsg.cpp:2328
-msgid "X Translation"
-msgstr "XƽÒÆ"
-
-#: ../contrib/src/xrc/xmlexpat.cpp:185
+#: ../contrib/src/xrc/xml.cpp:530
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:757
+#: ../src/common/xpmdecod.cpp:759
 msgid "XPM: Malformed pixel data!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:710 ../src/common/xpmdecod.cpp:719
+#: ../src/common/xpmdecod.cpp:709 ../src/common/xpmdecod.cpp:718
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:371
+#: ../contrib/src/xrc/xmlres.cpp:470
 #, fuzzy, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
 
-#: ../contrib/src/xrc/xmlres.cpp:624 ../contrib/src/xrc/xmlres.cpp:634
+#: ../contrib/src/xrc/xmlres.cpp:861 ../contrib/src/xrc/xmlres.cpp:872
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
 
-#: ../contrib/src/xrc/xh_dlg.cpp:53 ../contrib/src/xrc/xh_frame.cpp:58
-msgid "XRC resource: Cannot create dialog without instance."
-msgstr ""
-
-#: ../contrib/src/xrc/xmlres.cpp:604
+#: ../contrib/src/xrc/xmlres.cpp:821
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2323
-msgid "Y Scaling"
-msgstr "YËõ·Å"
-
-#: ../src/generic/dcpsg.cpp:2332
-msgid "Y Translation"
-msgstr "YƽÒÆ"
-
-#: ../src/common/dlgcmn.cpp:150 ../src/common/dlgcmn.cpp:157
-#: ../src/mac/msgdlg.cpp:83 ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:77 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:214
 msgid "Yes"
 msgstr "ÊÇ"
 
-#: ../src/generic/dirctrlg.cpp:1355 ../src/generic/dirdlgg.cpp:564
+#: ../src/generic/dirdlgg.cpp:262
 msgid "You cannot add a new directory to this section."
 msgstr "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼."
 
-#: ../src/common/fs_zip.cpp:86 ../src/common/fs_zip.cpp:123
+#: ../src/common/fs_zip.cpp:86 ../src/common/fs_zip.cpp:125
 msgid "ZIP handler currently supports only local files!"
 msgstr ""
 
-#: ../src/common/docview.cpp:1893
+#: ../src/common/docview.cpp:1953
 msgid "[EMPTY]"
 msgstr "[¿Õ]"
 
-#: ../src/msw/dde.cpp:987
+#: ../src/msw/dde.cpp:1011
 msgid "a DDEML application has created a prolonged race condition."
 msgstr "DDEMLÓ¦ÓóÌÐòÒÑ´´½¨ÑÓʱraceÌõ¼þ."
 
-#: ../src/msw/dde.cpp:975
+#: ../src/msw/dde.cpp:999
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -3065,39 +3094,39 @@ msgstr ""
 "»ò´«¸øDDEMLº¯ÊýµÄÊÇ\n"
 "ÎÞЧµÄʵÀý±êʶ."
 
-#: ../src/msw/dde.cpp:993
+#: ../src/msw/dde.cpp:1017
 msgid "a client's attempt to establish a conversation has failed."
 msgstr "¿Í»§ÊÔͼ½¨Á¢µÄ»á»°ÒÑʧ°Ü."
 
-#: ../src/msw/dde.cpp:990
+#: ../src/msw/dde.cpp:1014
 msgid "a memory allocation failed."
 msgstr "ÄÚ´æ·ÖÅäʧ°Ü."
 
-#: ../src/msw/dde.cpp:984
+#: ../src/msw/dde.cpp:1008
 msgid "a parameter failed to be validated by the DDEML."
 msgstr "DDEML²ÎÊýÑé֤ʧ°Ü."
 
-#: ../src/msw/dde.cpp:966
+#: ../src/msw/dde.cpp:990
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr "ͬ²½adviseÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:972
+#: ../src/msw/dde.cpp:996
 msgid "a request for a synchronous data transaction has timed out."
 msgstr "ͬ²½dataÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:981
+#: ../src/msw/dde.cpp:1005
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr "ͬ²½executeÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:999
+#: ../src/msw/dde.cpp:1023
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr "ͬ²½pokeÊÂÎñÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1014
+#: ../src/msw/dde.cpp:1038
 msgid "a request to end an advise transaction has timed out."
 msgstr "ÖÕÖ¹½¨ÒéÊÂÎñµÄÇëÇóÒѳ¬Ê±."
 
-#: ../src/msw/dde.cpp:1008
+#: ../src/msw/dde.cpp:1032
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
@@ -3107,15 +3136,15 @@ msgstr ""
 "Òѱ»¿Í»§¶ËÖÕÖ¹µÄ»á»°, »ò·þÎñÆ÷\n"
 "ÔÚÍê³ÉÊÂÎñÇ°ÖÕÖ¹."
 
-#: ../src/msw/dde.cpp:996
+#: ../src/msw/dde.cpp:1020
 msgid "a transaction failed."
 msgstr "ÊÂÎñʧ°Ü."
 
-#: ../src/common/menucmn.cpp:80
+#: ../src/common/menucmn.cpp:99
 msgid "alt"
 msgstr "alt"
 
-#: ../src/msw/dde.cpp:978
+#: ../src/msw/dde.cpp:1002
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -3127,15 +3156,15 @@ msgstr ""
 "»ò³õʼ»¯ÎªAPPCMD_CLIENTONLYµÄÓ¦ÓóÌÐò\n"
 "ÊÓͼִÐзþÎñÆ÷ÊÂÎñ."
 
-#: ../src/msw/dde.cpp:1002
+#: ../src/msw/dde.cpp:1026
 msgid "an internal call to the PostMessage function has failed. "
 msgstr "ÄÚ²¿µ÷ÓÃPostMessageʧ°Ü. "
 
-#: ../src/msw/dde.cpp:1011
+#: ../src/msw/dde.cpp:1035
 msgid "an internal error has occurred in the DDEML."
 msgstr "ÔÚDDEMLÖз¢ÉúÄÚ²¿´íÎó."
 
-#: ../src/msw/dde.cpp:1017
+#: ../src/msw/dde.cpp:1041
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
@@ -3145,7 +3174,7 @@ msgstr ""
 "Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
 "»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
 
-#: ../src/common/fileconf.cpp:1555
+#: ../src/common/fileconf.cpp:1767
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä."
@@ -3154,17 +3183,27 @@ msgstr "
 msgid "binary"
 msgstr ""
 
+#: ../src/common/fontcmn.cpp:548
+#, fuzzy
+msgid "bold"
+msgstr "´ÖÌå"
+
+#: ../src/common/fontcmn.cpp:472
+#, fuzzy
+msgid "bold "
+msgstr "´ÖÌå"
+
 #: ../src/common/ffile.cpp:93
 #, c-format
 msgid "can't close file '%s'"
 msgstr "²»ÄܹرÕÎļþ '%s'"
 
-#: ../src/common/file.cpp:272
+#: ../src/common/file.cpp:275
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
 
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:553
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
@@ -3174,133 +3213,128 @@ msgstr "
 msgid "can't create file '%s'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#: ../src/common/fileconf.cpp:1024
+#: ../src/common/fileconf.cpp:1078
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
 
-#: ../src/common/file.cpp:455
+#: ../src/common/file.cpp:458
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "²»ÄÜÈ·¶¨ÊÇ·ñÒÑ´ïÎļþ %d µÄβ²¿"
 
-#: ../src/common/file.cpp:421
+#: ../src/common/file.cpp:424
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
 
-#: ../src/msw/utils.cpp:366
+#: ../src/msw/utils.cpp:369
 msgid "can't find user's HOME, using current directory."
 msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
 
-#: ../src/common/file.cpp:335
+#: ../src/common/file.cpp:338
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
 
-#: ../src/common/file.cpp:389
+#: ../src/common/file.cpp:392
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÖ¸ÕëλÖÃ"
 
-#: ../src/common/fontmap.cpp:746
+#: ../src/common/fontmap.cpp:807
 msgid "can't load any font, aborting"
 msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
 
-#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:258
+#: ../src/common/file.cpp:261 ../src/common/ffile.cpp:77
 #, c-format
 msgid "can't open file '%s'"
 msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
 
-#: ../src/common/fileconf.cpp:386
+#: ../src/common/fileconf.cpp:397
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:398
+#: ../src/common/fileconf.cpp:416
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:904
+#: ../src/common/fileconf.cpp:949
 msgid "can't open user configuration file."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 
-#: ../src/common/file.cpp:298
+#: ../src/common/file.cpp:301
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 
-#: ../src/common/file.cpp:538
+#: ../src/common/file.cpp:548
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
-#: ../src/common/file.cpp:554
+#: ../src/common/file.cpp:564
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
 
-#: ../src/common/file.cpp:375
+#: ../src/common/file.cpp:378
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
 
-#: ../src/common/textfile.cpp:178
+#: ../src/common/textfile.cpp:196
 #, fuzzy, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
 
-#: ../src/common/file.cpp:320
+#: ../src/common/file.cpp:323
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
 
-#: ../src/common/fileconf.cpp:911
+#: ../src/common/fileconf.cpp:965
 msgid "can't write user configuration file."
 msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
 
-#: ../src/common/intl.cpp:398
+#: ../src/common/intl.cpp:364
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ."
 
-#: ../contrib/src/xrc/xh_frame.cpp:72
-#, fuzzy
-msgid "centered"
-msgstr "ÆäËü"
-
-#: ../src/common/menucmn.cpp:78
+#: ../src/common/menucmn.cpp:97
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:947
+#: ../src/common/cmdline.cpp:1056
 msgid "date"
 msgstr "ÈÕÆÚ"
 
-#: ../src/common/fontmap.cpp:393
+#: ../src/common/fontmap.cpp:416
 #, fuzzy
 msgid "default"
 msgstr "alt"
 
-#: ../src/common/datetime.cpp:3227
+#: ../src/common/datetime.cpp:3363
 msgid "eighteenth"
 msgstr "µÚÊ®°Ë"
 
-#: ../src/common/datetime.cpp:3217
+#: ../src/common/datetime.cpp:3353
 msgid "eighth"
 msgstr "µÚ°Ë"
 
-#: ../src/common/datetime.cpp:3220
+#: ../src/common/datetime.cpp:3356
 msgid "eleventh"
 msgstr "µÚʮһ"
 
-#: ../src/common/fileconf.cpp:1542
+#: ../src/common/fileconf.cpp:1753
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
 
-#: ../src/msw/dialup.cpp:870 ../src/msw/dialup.cpp:875
+#: ../src/msw/dialup.cpp:843
 msgid "establish"
 msgstr "½¨Á¢"
 
@@ -3309,207 +3343,229 @@ msgstr "
 msgid "failed to flush the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/datetime.cpp:3224
+#: ../src/common/datetime.cpp:3360
 msgid "fifteenth"
 msgstr "µÚÊ®Îå"
 
-#: ../src/common/datetime.cpp:3214
+#: ../src/common/datetime.cpp:3350
 msgid "fifth"
 msgstr "µÚÎå"
 
-#: ../src/common/fileconf.cpp:610
+#: ../src/common/fileconf.cpp:626
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
 
-#: ../src/common/fileconf.cpp:639
+#: ../src/common/fileconf.cpp:655
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
 
-#: ../src/common/fileconf.cpp:665
+#: ../src/common/fileconf.cpp:681
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "Îļþ '%s', ÐÐ %d: ¼ü '%s' µÚÒ»´Î³öÏÖÔÚÐÐ %d."
 
-#: ../src/common/fileconf.cpp:655
+#: ../src/common/fileconf.cpp:671
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
 
-#: ../src/common/fileconf.cpp:578
+#: ../src/common/fileconf.cpp:594
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
 
-#: ../src/common/datetime.cpp:3210
+#: ../src/common/datetime.cpp:3346
 msgid "first"
 msgstr "µÚÒ»"
 
-#: ../src/common/datetime.cpp:3223
+#: ../src/common/datetime.cpp:3359
 msgid "fourteenth"
 msgstr "µÚÊ®ËÄ"
 
-#: ../src/common/datetime.cpp:3213
+#: ../src/common/datetime.cpp:3349
 msgid "fourth"
 msgstr "µÚËÄ"
 
-#: ../src/common/appcmn.cpp:216
+#: ../src/common/appcmn.cpp:319
 msgid "generate verbose log messages"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:273
+#: ../src/common/timercmn.cpp:290
 msgid "gmtime() failed"
 msgstr "gmtime() ʧ°Ü"
 
-#: ../src/msw/dialup.cpp:870 ../src/msw/dialup.cpp:875
+#: ../src/mac/scrolbar.cpp:143
+#, c-format
+msgid "illegal scrollbar selector %d"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:843
 msgid "initiate"
 msgstr "³õʼ»¯"
 
-#: ../src/common/file.cpp:459
+#: ../src/common/file.cpp:462
 msgid "invalid eof() return value."
 msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
 
-#: ../src/generic/logg.cpp:1036
+#: ../src/generic/logg.cpp:1125
 msgid "invalid message box return value"
 msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
 
-#: ../src/html/helpfrm.cpp:1017
-msgid "large"
-msgstr "´ó"
+#: ../src/common/fontcmn.cpp:488 ../src/common/fontcmn.cpp:552
+#, fuzzy
+msgid "italic"
+msgstr "бÌå"
+
+#: ../src/common/fontcmn.cpp:544
+#, fuzzy
+msgid "light"
+msgstr "Çá"
+
+#: ../src/common/fontcmn.cpp:468
+#, fuzzy
+msgid "light "
+msgstr "Çá"
 
-#: ../src/common/intl.cpp:611
+#: ../src/common/intl.cpp:615
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
 
-#: ../src/common/intl.cpp:393
+#: ../src/common/intl.cpp:359
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
 
-#: ../src/html/helpfrm.cpp:1017
-msgid "medium"
-msgstr "ÖÐ"
-
-#: ../src/common/datetime.cpp:3375
+#: ../src/common/datetime.cpp:3511
 msgid "midnight"
 msgstr "ÎçÒ¹"
 
-#: ../src/common/timercmn.cpp:269
+#: ../src/common/timercmn.cpp:286
 msgid "mktime() failed"
 msgstr "mktime()ʧ°Ü"
 
-#: ../src/common/datetime.cpp:3228
+#: ../src/common/datetime.cpp:3364
 msgid "nineteenth"
 msgstr "µÚÊ®¾Å"
 
-#: ../src/common/datetime.cpp:3218
+#: ../src/common/datetime.cpp:3354
 msgid "ninth"
 msgstr "µÚ¾Å"
 
-#: ../src/msw/dde.cpp:962
+#: ../src/msw/dde.cpp:986
 msgid "no DDE error."
 msgstr "ûÓÐDDE´íÎó"
 
-#: ../src/html/helpdata.cpp:565
+#: ../src/html/helpdata.cpp:574
 msgid "noname"
 msgstr "δÃû"
 
-#: ../src/common/datetime.cpp:3374
+#: ../src/common/datetime.cpp:3510
 msgid "noon"
 msgstr "ÖÐÎç"
 
-#: ../src/common/cmdline.cpp:946
+#: ../src/common/cmdline.cpp:1052
 msgid "num"
 msgstr "num"
 
-#: ../src/msw/dde.cpp:1005
+#: ../src/common/filename.cpp:166
+msgid "reading"
+msgstr ""
+
+#: ../src/msw/dde.cpp:1029
 msgid "reentrancy problem."
 msgstr "ÖØÈëÎÊÌâ"
 
-#: ../src/common/datetime.cpp:3211
+#: ../src/common/datetime.cpp:3347
 msgid "second"
 msgstr "µÚ¶þ"
 
-#: ../src/common/datetime.cpp:3226
+#: ../src/common/datetime.cpp:3362
 msgid "seventeenth"
 msgstr "µÚÊ®Æß"
 
-#: ../src/common/datetime.cpp:3216
+#: ../src/common/datetime.cpp:3352
 msgid "seventh"
 msgstr "µÚÆß"
 
-#: ../src/common/menucmn.cpp:82
+#: ../src/common/menucmn.cpp:101
 msgid "shift"
 msgstr "shift"
 
-#: ../src/common/appcmn.cpp:206
+#: ../src/common/appcmn.cpp:309
 msgid "show this help message"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3225
+#: ../src/common/datetime.cpp:3361
 msgid "sixteenth"
 msgstr "µÚÊ®Áù"
 
-#: ../src/common/datetime.cpp:3215
+#: ../src/common/datetime.cpp:3351
 msgid "sixth"
 msgstr "µÚÁù"
 
-#: ../src/html/helpfrm.cpp:1017
-msgid "small"
-msgstr "С"
-
-#: ../src/common/appcmn.cpp:238
+#: ../src/common/appcmn.cpp:344
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr ""
 
-#: ../src/common/appcmn.cpp:225
+#: ../src/common/appcmn.cpp:330
 msgid "specify the theme to use"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:945
+#: ../src/common/cmdline.cpp:1048
 msgid "str"
 msgstr "str"
 
-#: ../src/common/datetime.cpp:3219
+#: ../src/common/datetime.cpp:3355
 msgid "tenth"
 msgstr "µÚÊ®"
 
-#: ../src/msw/dde.cpp:969
+#: ../src/msw/dde.cpp:993
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "¶ÔʼþµÄÏìÓ¦µ¼ÖÂDDE_FBUSYλ±»ÉèÖÃ."
 
-#: ../src/common/datetime.cpp:3212
+#: ../src/common/datetime.cpp:3348
 msgid "third"
 msgstr "µÚÈý"
 
-#: ../src/common/datetime.cpp:3222
+#: ../src/common/datetime.cpp:3358
 msgid "thirteenth"
 msgstr "µÚÊ®Èý"
 
-#: ../src/common/datetime.cpp:3054
+#: ../src/common/datetime.cpp:3190
 msgid "today"
 msgstr "½ñÌì"
 
-#: ../src/common/datetime.cpp:3056
+#: ../src/common/datetime.cpp:3192
 msgid "tomorrow"
 msgstr "Ã÷Ìì"
 
-#: ../src/common/datetime.cpp:3221
+#: ../src/common/datetime.cpp:3357
 msgid "twelfth"
 msgstr "µÚÊ®¶þ"
 
-#: ../src/common/datetime.cpp:3229
+#: ../src/common/datetime.cpp:3365
 msgid "twentieth"
 msgstr "µÚ¶þÊ®"
 
-#: ../src/common/fileconf.cpp:1662
+#: ../src/common/fontcmn.cpp:540
+#, fuzzy
+msgid "underlined"
+msgstr "Ï»®Ïß"
+
+#: ../src/common/fontcmn.cpp:455
+#, fuzzy
+msgid "underlined "
+msgstr "Ï»®Ïß"
+
+#: ../src/common/fileconf.cpp:1887
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
 
-#: ../src/generic/progdlgg.cpp:276
+#: ../src/generic/progdlgg.cpp:282
 msgid "unknown"
 msgstr "δ֪"
 
@@ -3518,7 +3574,7 @@ msgstr "δ֪"
 msgid "unknown error"
 msgstr "GIF: λÖôíÎó!!!"
 
-#: ../src/msw/dialup.cpp:473
+#: ../src/msw/dialup.cpp:447
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "δ֪´íÎó(´íÎóºÅ %08x)."
@@ -3528,46 +3584,53 @@ msgstr "δ֪
 msgid "unknown line terminator"
 msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/file.cpp:358
+#: ../src/common/file.cpp:361
 msgid "unknown seek origin"
 msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/fontmap.cpp:410
+#: ../src/common/fontmap.cpp:430
 #, c-format
 msgid "unknown-%d"
 msgstr "δ֪-%d"
 
-#: ../src/common/docview.cpp:405
+#: ../src/common/docview.cpp:407
 msgid "unnamed"
 msgstr "unnamed"
 
-#: ../src/common/docview.cpp:1187
+#: ../src/common/docview.cpp:1224
 #, c-format
 msgid "unnamed%d"
 msgstr "unnamed%d"
 
-#: ../src/common/intl.cpp:403
+#: ../src/common/intl.cpp:369
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
 
-#: ../src/html/helpfrm.cpp:1017
-msgid "very large"
-msgstr "·Ç³£´ó"
+#: ../src/common/filename.cpp:166
+#, fuzzy
+msgid "writing"
+msgstr "´òÓ¡"
+
+#: ../src/common/dynlib.cpp:336
+#, c-format
+msgid "wxDllLoader failed to GetSymbol '%s'"
+msgstr ""
 
-#: ../src/html/helpfrm.cpp:1017
-msgid "very small"
-msgstr "·Ç³£Ð¡"
+#: ../src/common/dynload.cpp:282
+#, c-format
+msgid "wxDynamicLibrary failed to GetSymbol '%s'"
+msgstr ""
 
-#: ../src/common/timercmn.cpp:301
+#: ../src/common/timercmn.cpp:335
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay ʧ°Ü."
 
-#: ../src/common/socket.cpp:347 ../src/common/socket.cpp:401
+#: ../src/common/socket.cpp:394 ../src/common/socket.cpp:448
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsgÖÐÎÞЧµÄÇ©Ãû."
 
-#: ../src/common/socket.cpp:921
+#: ../src/common/socket.cpp:975
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: δ֪ʼþ!."
 
@@ -3576,10 +3639,211 @@ msgstr "wxSocket: δ֪
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
-#: ../src/common/datetime.cpp:3055
+#: ../src/x11/app.cpp:245
+#, fuzzy
+msgid "wxWindows could not open display. Exiting."
+msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
+
+#: ../src/common/datetime.cpp:3191
 msgid "yesterday"
 msgstr "×òÌì"
 
+#~ msgid " bytes "
+#~ msgstr "×Ö½Ú"
+
+#~ msgid "<DIR> "
+#~ msgstr "<Ŀ¼> "
+
+#~ msgid "<LINK> "
+#~ msgstr "<Á¬½Ó>"
+
+#, fuzzy
+#~ msgid "DIB Header: Cannot deal with 4bit encoded yet."
+#~ msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
+
+#, fuzzy
+#~ msgid "Help : %s"
+#~ msgstr "°ïÖú: %s"
+
+#, fuzzy
+#~ msgid "Search!"
+#~ msgstr "ËÑË÷"
+
+#~ msgid "large"
+#~ msgstr "´ó"
+
+#~ msgid "medium"
+#~ msgstr "ÖÐ"
+
+#~ msgid "small"
+#~ msgstr "С"
+
+#~ msgid "very large"
+#~ msgstr "·Ç³£´ó"
+
+#~ msgid "very small"
+#~ msgstr "·Ç³£Ð¡"
+
+#, fuzzy
+#~ msgid "All files (*.*)|*.*"
+#~ msgstr "ËùÓÐÎļþ (*)|*"
+
+#~ msgid "Can not create mutex"
+#~ msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
+
+#~ msgid "Can't create the inter-process read pipe"
+#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ"
+
+#~ msgid "Can't create the inter-process write pipe"
+#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
+
+#~ msgid "Couldn't acquire a mutex lock"
+#~ msgstr "²»Äܵõ½»¥³âÌåËø"
+
+#~ msgid "Couldn't release a mutex"
+#~ msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
+
+#~ msgid "Font"
+#~ msgstr "×ÖÌå"
+
+#~ msgid "PostScript"
+#~ msgstr "PostScript"
+
+#~ msgid "PostScript:"
+#~ msgstr "PostScript:"
+
+#~ msgid "Preview Only"
+#~ msgstr "½öÔ¤ÀÀ"
+
+#~ msgid "Printer Command: "
+#~ msgstr "´òÓ¡»úÃüÁî: "
+
+#~ msgid "Printer Options: "
+#~ msgstr "´òÓ¡»úÑ¡Ïî:"
+
+#~ msgid "Printer Settings"
+#~ msgstr "´òÓ¡»úÉèÖÃ"
+
+#~ msgid "Send to Printer"
+#~ msgstr "·¢µ½´òÓ¡»ú"
+
+#, fuzzy
+#~ msgid "SetPixelFormat failed."
+#~ msgstr "¹ÜµÀ´´½¨Ê§°Ü"
+
+#~ msgid "X Scaling"
+#~ msgstr "XËõ·Å"
+
+#~ msgid "X Translation"
+#~ msgstr "XƽÒÆ"
+
+#~ msgid "Y Scaling"
+#~ msgstr "YËõ·Å"
+
+#~ msgid "Y Translation"
+#~ msgstr "YƽÒÆ"
+
+#, fuzzy
+#~ msgid "Fatal Error"
+#~ msgstr "ÖÂÃü´íÎó"
+
+#, fuzzy
+#~ msgid "Fatal error: %s\n"
+#~ msgstr "ÖÂÃü´íÎó£º"
+
+#~ msgid "Back"
+#~ msgstr "·µ»Ø"
+
+#~ msgid "Can not create event object."
+#~ msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
+
+#~ msgid "Can't find the serialization object '%s' for the object '%s'."
+#~ msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'."
+
+#~ msgid "Can't load wxSerial dynamic library."
+#~ msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
+
+#~ msgid "Connection to wxHelp timed out in %d seconds"
+#~ msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
+
+#~ msgid "Etcetera"
+#~ msgstr "ÆäËü"
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of Mask DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of XOR DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing ICONDIR header."
+#~ msgstr "TIFF:дͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing ICONDIRENTRY header."
+#~ msgstr "TIFF:дͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing Mask DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing XOR DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#~ msgid "Incorrect version of HTML help book"
+#~ msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
+
+#, fuzzy
+#~ msgid "Loading DIB : Couldn't allocate memory."
+#~ msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
+
+#~ msgid "Mounted Devices"
+#~ msgstr "¹ÒÔØÉ豸"
+
+#~ msgid "My Harddisk"
+#~ msgstr "ÎÒµÄÓ²ÅÌ"
+
+#~ msgid "My Home"
+#~ msgstr "ÎҵļÒ"
+
+#~ msgid "New..."
+#~ msgstr "´´½¨..."
+
+#~ msgid "Please wait..."
+#~ msgstr "ÇëµÈ´ý..."
+
+#~ msgid "Temporary"
+#~ msgstr "ÁÙʱµÄ"
+
+#~ msgid "The Computer"
+#~ msgstr "¼ÆËã»ú"
+
+#~ msgid "The directory "
+#~ msgstr "Ŀ¼"
+
+#~ msgid "User"
+#~ msgstr "Óû§"
+
+#~ msgid "User Local"
+#~ msgstr "±¾µØÓû§"
+
+#~ msgid "Variables"
+#~ msgstr "±äÁ¿"
+
+#~ msgid "Window"
+#~ msgstr "´°¿Ú"
+
+#, fuzzy
+#~ msgid "centered"
+#~ msgstr "ÆäËü"
+
 #, fuzzy
 #~ msgid "Unknown digit value"
 #~ msgstr "λÖñàÂë (%d)"
@@ -3619,9 +3883,5 @@ msgstr "
 #~ msgid "No XPM facility available!"
 #~ msgstr "ûÓпÉÓõÄXPMÉ豸!"
 
-#, fuzzy
-#~ msgid "..."
-#~ msgstr ".."
-
 #~ msgid "Cyrillic (Latin 5)"
 #~ msgstr "˹À­·òÓï (Latin 5)"