#if wxUSE_PALETTE, not #ifdef

[wxWidgets.git] / locale / zh.po

diff --git a/locale/zh.po b/locale/zh.po
index 1a8d885beff7b9def45f1695c53f21e6c9e1f932..ad5b8d3f4f81134a732176fd904f19024420c6b2 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-11-20 21:24-0800\n"
+"POT-Creation-Date: 2001-12-17 16:47+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"
@@ -40,7 +40,7 @@ msgstr " - "
 msgid " Preview"
 msgstr "Ô¤ÀÀ"
 
-#: ../src/generic/filedlgg.cpp:418
+#: ../src/generic/filedlgg.cpp:439
 msgid " bytes "
 msgstr "×Ö½Ú"
 
@@ -71,18 +71,13 @@ msgstr "#9 
 msgid "#define %s must be an integer."
 msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
 
-#: ../src/common/ftp.cpp:847
-#, c-format
-msgid "%*s %*s %*s %*s %i %*s %*s %*s %*s"
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:859 ../src/html/helpfrm.cpp:860
-#: ../src/html/helpfrm.cpp:1452 ../src/html/helpfrm.cpp:1482
+#: ../src/html/helpfrm.cpp:854 ../src/html/helpfrm.cpp:855
+#: ../src/html/helpfrm.cpp:1447 ../src/html/helpfrm.cpp:1477
 #, c-format
 msgid "%i of %i"
 msgstr "%i of %i"
 
-#: ../src/common/cmdline.cpp:806
+#: ../src/common/cmdline.cpp:772
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (»ò %s)"
@@ -132,11 +127,11 @@ msgstr "ȡ
 msgid "&Cascade"
 msgstr ""
 
-#: ../src/generic/logg.cpp:478 ../src/generic/tipdlg.cpp:170
+#: ../src/generic/logg.cpp:475 ../src/generic/tipdlg.cpp:170
 msgid "&Close"
 msgstr "¹Ø±Õ[&C]"
 
-#: ../src/generic/logg.cpp:682
+#: ../src/generic/logg.cpp:679
 msgid "&Details"
 msgstr "ϸ½Ú[&D]"
 
@@ -154,7 +149,7 @@ msgstr "
 msgid "&Help"
 msgstr "°ïÖú"
 
-#: ../src/generic/logg.cpp:479
+#: ../src/generic/logg.cpp:476
 msgid "&Log"
 msgstr "ÈÕÖ¾[&L]"
 
@@ -183,7 +178,7 @@ msgstr "
 msgid "&Replace"
 msgstr ""
 
-#: ../src/generic/logg.cpp:474 ../src/generic/logg.cpp:768
+#: ../src/generic/logg.cpp:471 ../src/generic/logg.cpp:765
 msgid "&Save..."
 msgstr "±£´æ[&S]..."
 
@@ -199,11 +194,11 @@ msgstr "
 msgid "&Undo "
 msgstr "»Ö¸´[&U]"
 
-#: ../src/msw/mdi.cpp:1308 ../src/msw/mdi.cpp:1315 ../src/msw/window.cpp:2658
+#: ../src/msw/mdi.cpp:1308 ../src/msw/mdi.cpp:1315 ../src/msw/window.cpp:2700
 msgid "&Window"
 msgstr "´°¿Ú[&W]"
 
-#: ../src/common/config.cpp:401 ../src/msw/regconf.cpp:264
+#: ../src/common/config.cpp:394 ../src/msw/regconf.cpp:264
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ÓжîÍâµÄ '..', ºöÂÔÖ®."
@@ -213,7 +208,7 @@ msgstr "'%s' 
 msgid "'%s' is invalid"
 msgstr "'%s' ÊÇÎÞЧµÄ"
 
-#: ../src/common/cmdline.cpp:728
+#: ../src/common/cmdline.cpp:694
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
@@ -248,12 +243,12 @@ msgstr "'%s' Ӧ
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
 
-#: ../src/html/helpfrm.cpp:778
+#: ../src/html/helpfrm.cpp:773
 msgid "(Help)"
 msgstr "(°ïÖú)"
 
-#: ../src/html/helpfrm.cpp:336 ../src/html/helpfrm.cpp:927
-#: ../src/html/helpfrm.cpp:1509
+#: ../src/html/helpfrm.cpp:336 ../src/html/helpfrm.cpp:922
+#: ../src/html/helpfrm.cpp:1504
 msgid "(bookmarks)"
 msgstr "(ÊéÇ©)"
 
@@ -268,12 +263,12 @@ msgstr ""
 "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
 
 #: ../src/generic/dirctrlg.cpp:644 ../src/generic/dirdlgg.cpp:263
-#: ../src/generic/filedlgg.cpp:809
+#: ../src/generic/filedlgg.cpp:833
 msgid "."
 msgstr "."
 
 #: ../src/generic/dirctrlg.cpp:645 ../src/generic/dirdlgg.cpp:264
-#: ../src/generic/filedlgg.cpp:810
+#: ../src/generic/filedlgg.cpp:834
 msgid ".."
 msgstr ".."
 
@@ -293,11 +288,11 @@ msgstr "6 3/4 
 msgid ": file does not exist!"
 msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/common/fontmap.cpp:601
+#: ../src/common/fontmap.cpp:606
 msgid ": unknown charset"
 msgstr ": δ֪×Ö·û¼¯"
 
-#: ../src/common/fontmap.cpp:809
+#: ../src/common/fontmap.cpp:837
 msgid ": unknown encoding"
 msgstr ": δ֪±àÂë"
 
@@ -305,23 +300,23 @@ msgstr ": δ֪
 msgid "< &Back"
 msgstr "< ·µ»Ø[&B]"
 
-#: ../src/generic/filedlgg.cpp:446
+#: ../src/generic/filedlgg.cpp:467
 msgid "<DIR>"
 msgstr "<Ŀ¼>"
 
-#: ../src/generic/filedlgg.cpp:413
+#: ../src/generic/filedlgg.cpp:434
 msgid "<DIR> "
 msgstr "<Ŀ¼> "
 
-#: ../src/generic/filedlgg.cpp:447
+#: ../src/generic/filedlgg.cpp:468
 msgid "<LINK>"
 msgstr "<Á¬½Ó>"
 
-#: ../src/generic/filedlgg.cpp:414
+#: ../src/generic/filedlgg.cpp:435
 msgid "<LINK> "
 msgstr "<Á¬½Ó>"
 
-#: ../src/html/helpfrm.cpp:1076
+#: ../src/html/helpfrm.cpp:1071
 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 "
@@ -351,7 +346,7 @@ msgstr ""
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 Ö½ÕÅ, 297 x 420 ºÁÃ×"
 
-#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2547
+#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2545
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 Ö½ÕÅ, 210 x 297 ºÁÃ×"
 
@@ -388,11 +383,11 @@ msgstr "
 msgid "All"
 msgstr "ËùÓÐ"
 
-#: ../include/wx/defs.h:1571 ../src/generic/filedlgg.cpp:921
+#: ../include/wx/defs.h:1626 ../src/generic/filedlgg.cpp:950
 msgid "All files (*)|*"
 msgstr "ËùÓÐÎļþ (*)|*"
 
-#: ../include/wx/defs.h:1568
+#: ../include/wx/defs.h:1623
 #, fuzzy
 msgid "All files (*.*)|*.*"
 msgstr "ËùÓÐÎļþ (*)|*"
@@ -401,7 +396,7 @@ msgstr "
 msgid "Already dialling ISP."
 msgstr "ÒѾ­²¦½ÓISP."
 
-#: ../src/generic/logg.cpp:1023
+#: ../src/generic/logg.cpp:1020
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
@@ -430,24 +425,30 @@ msgstr "B5 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
 
-#: ../src/common/imagbmp.cpp:67
+#: ../src/common/imagbmp.cpp:277
 msgid "BMP: Couldn't save invalid image."
 msgstr "BMP: ²»Äܱ£´æÎÞЧͼÏñ."
 
-#: ../src/common/imagbmp.cpp:249
+#: ../src/common/imagbmp.cpp:481
 #, fuzzy
 msgid "BMP: Couldn't write RGB color map."
 msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:380
+#: ../src/common/imagbmp.cpp:613
 msgid "BMP: Couldn't write data."
 msgstr "BMP: ²»ÄÜдÊý¾Ý."
 
-#: ../src/common/imagbmp.cpp:178
-msgid "BMP: Couldn't write the file header."
+#: ../src/common/imagbmp.cpp:386
+#, fuzzy
+msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr "BMP: ²»ÄÜдÎļþÍ·."
 
-#: ../src/common/imagbmp.cpp:101
+#: ../src/common/imagbmp.cpp:407
+#, 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."
 msgstr ""
 
@@ -484,7 +485,7 @@ msgstr "
 msgid "C sheet, 17 x 22 in"
 msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
 
-#: ../src/generic/logg.cpp:476
+#: ../src/generic/logg.cpp:473
 msgid "C&lear"
 msgstr "Çå³ý[&L]"
 
@@ -516,8 +517,12 @@ msgstr "
 msgid "Can not create mutex"
 msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
 
-#: ../src/common/filefn.cpp:1380 ../src/msw/dir.cpp:296
-#: ../src/unix/dir.cpp:224
+#: ../src/common/filefn.cpp:1324
+#, 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
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
@@ -559,7 +564,7 @@ msgstr "
 msgid "Can't copy values of unsupported type %d."
 msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
 
-#: ../src/msw/toplevel.cpp:216
+#: ../src/msw/toplevel.cpp:223
 #, fuzzy, c-format
 msgid "Can't create dialog using template '%s'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
@@ -585,7 +590,7 @@ msgstr "
 msgid "Can't create thread"
 msgstr "²»ÄÜ´´½¨½ø³Ì"
 
-#: ../src/msw/window.cpp:2813
+#: ../src/msw/window.cpp:2855
 #, fuzzy, c-format
 msgid "Can't create window of class %s"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
@@ -595,7 +600,7 @@ msgstr "
 msgid "Can't delete key '%s'"
 msgstr "²»ÄÜɾ³ý¼ü '%s'"
 
-#: ../src/msw/iniconf.cpp:476
+#: ../src/msw/iniconf.cpp:447
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
@@ -625,7 +630,7 @@ msgstr "
 msgid "Can't find current position in file '%s'"
 msgstr "²»ÄÜÔÚÎļþ'%s'ÖÐÕÒµ½µ±Ç°Î»ÖÃ"
 
-#: ../src/common/object.cpp:346 ../src/common/object.cpp:371
+#: ../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'."
@@ -640,7 +645,7 @@ msgstr "
 msgid "Can't load image from file '%s': file does not exist."
 msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 
-#: ../src/common/object.cpp:339
+#: ../src/common/object.cpp:328
 msgid "Can't load wxSerial dynamic library."
 msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
 
@@ -664,7 +669,7 @@ msgstr "
 msgid "Can't read value of key '%s'"
 msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ"
 
-#: ../src/generic/logg.cpp:538 ../src/generic/logg.cpp:933
+#: ../src/generic/logg.cpp:535 ../src/generic/logg.cpp:930
 msgid "Can't save log contents to file."
 msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
 
@@ -678,20 +683,42 @@ msgid "Can't set value of '%s'"
 msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
 
 #: ../src/common/dlgcmn.cpp:189 ../src/common/prntbase.cpp:109
-#: ../src/generic/dcpsg.cpp:2271 ../src/generic/dirctrlg.cpp:1249
-#: ../src/generic/dirdlgg.cpp:418 ../src/generic/filedlgg.cpp:1012
+#: ../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:203 ../src/generic/proplist.cpp:525
+#: ../src/generic/progdlgg.cpp:206 ../src/generic/proplist.cpp:525
 #: ../src/gtk/filedlg.cpp:173 ../src/gtk/fontdlg.cpp:178
-#: ../src/html/helpfrm.cpp:1058 ../src/motif/msgdlg.cpp:180
+#: ../src/html/helpfrm.cpp:1053 ../src/motif/msgdlg.cpp:180
 msgid "Cancel"
 msgstr "È¡Ïû"
 
+#: ../contrib/src/xrc/xmlres.cpp:726 ../contrib/src/xrc/xmlres.cpp:767
+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/msw/dialup.cpp:525
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
+#: ../contrib/src/xrc/xmlres.cpp:206
+#, fuzzy, c-format
+msgid "Cannot find container for unknown control '%s'."
+msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
+
+#: ../contrib/src/xrc/xmlres.cpp:781
+#, fuzzy, c-format
+msgid "Cannot find font node '%s'."
+msgstr "²»ÄÜ´ò¿ª URL '%s'"
+
 #: ../src/msw/dialup.cpp:839
 msgid "Cannot find the location of address book file"
 msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
@@ -713,10 +740,15 @@ msgstr "
 msgid "Cannot hang up - no active dialup connection."
 msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
 
-#: ../src/msw/app.cpp:255
+#: ../src/msw/app.cpp:257
 msgid "Cannot initialize OLE"
 msgstr "²»Äܳõʼ»¯ OLE"
 
+#: ../contrib/src/xrc/xmlres.cpp:308
+#, fuzzy, c-format
+msgid "Cannot load resources from file '%s'."
+msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
+
 #: ../src/html/htmlfilt.cpp:147
 #, c-format
 msgid "Cannot open HTML document: %s"
@@ -737,6 +769,11 @@ msgstr "
 msgid "Cannot open contents file: %s"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
+#: ../contrib/src/xrc/xmlres.cpp:282
+#, fuzzy, c-format
+msgid "Cannot open file '%s'."
+msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
+
 #: ../src/generic/dcpsg.cpp:1584
 msgid "Cannot open file for PostScript printing!"
 msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!"
@@ -746,7 +783,17 @@ msgstr "
 msgid "Cannot open index file: %s"
 msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s"
 
-#: ../src/html/helpfrm.cpp:1341
+#: ../contrib/src/xrc/xmlres.cpp:714
+#, fuzzy, c-format
+msgid "Cannot parse coordinates from '%s'."
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+
+#: ../contrib/src/xrc/xmlres.cpp:755
+#, fuzzy, c-format
+msgid "Cannot parse dimension from '%s'."
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+
+#: ../src/html/helpfrm.cpp:1336
 msgid "Cannot print empty page."
 msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
 
@@ -758,7 +805,7 @@ msgstr "
 msgid "Cannot start thread: error writing TLS"
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
 
-#: ../src/html/helpfrm.cpp:464
+#: ../src/html/helpfrm.cpp:459
 msgid "Case sensitive"
 msgstr "´óСдÃô¸Ð"
 
@@ -784,16 +831,16 @@ msgstr "ѡ
 msgid "ChoosePixelFormat failed."
 msgstr ""
 
-#: ../src/generic/logg.cpp:476
+#: ../src/generic/logg.cpp:473
 msgid "Clear the log contents"
 msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
 
-#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:339
+#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:342
 #: ../src/generic/proplist.cpp:520
 msgid "Close"
 msgstr "¹Ø±Õ"
 
-#: ../src/generic/logg.cpp:478
+#: ../src/generic/logg.cpp:475
 msgid "Close this window"
 msgstr "¹Ø±Õ´°¿Ú"
 
@@ -802,12 +849,12 @@ msgstr "
 msgid "Computer"
 msgstr "¼ÆËã»ú"
 
-#: ../src/common/fileconf.cpp:965
+#: ../src/common/fileconf.cpp:867
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
 
-#: ../src/generic/filedlgg.cpp:1173 ../src/gtk/filedlg.cpp:72
+#: ../src/generic/filedlgg.cpp:1204 ../src/gtk/filedlg.cpp:72
 msgid "Confirm"
 msgstr "È·ÈÏ"
 
@@ -815,7 +862,7 @@ msgstr "ȷ
 msgid "Confirm registry update"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:253
+#: ../src/html/htmlwin.cpp:263
 msgid "Connecting..."
 msgstr "Á¬½Ó..."
 
@@ -824,12 +871,12 @@ msgstr "
 msgid "Connection to wxHelp timed out in %d seconds"
 msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
 
-#: ../src/generic/helpwxht.cpp:159 ../src/html/helpfrm.cpp:367
-#: ../src/html/helpfrm.cpp:376
+#: ../src/generic/helpwxht.cpp:159 ../src/html/helpfrm.cpp:362
+#: ../src/html/helpfrm.cpp:371
 msgid "Contents"
 msgstr "Ŀ¼"
 
-#: ../src/common/strconv.cpp:553
+#: ../src/common/strconv.cpp:608
 #, c-format
 msgid "Convertion to charset '%s' doesn't work."
 msgstr ""
@@ -848,7 +895,7 @@ msgstr "
 msgid "Could not find tab for id"
 msgstr "ÕÒ²»µ½idµÄ±êÇ©"
 
-#: ../src/msw/textctrl.cpp:1546
+#: ../src/msw/textctrl.cpp:1644
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
@@ -879,7 +926,7 @@ msgstr "
 msgid "Could not start printing."
 msgstr "²»ÄÜÆô¶¯´òÓ¡."
 
-#: ../src/common/wincmn.cpp:839
+#: ../src/common/wincmn.cpp:850
 msgid "Could not transfer data to window"
 msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
 
@@ -911,7 +958,7 @@ msgstr "
 msgid "Couldn't get the current thread pointer"
 msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
 
-#: ../src/common/imagpng.cpp:253
+#: ../src/common/imagpng.cpp:249
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ."
 
@@ -937,11 +984,11 @@ msgstr "
 msgid "Create directory"
 msgstr "´´½¨Ä¿Â¼"
 
-#: ../src/generic/filedlgg.cpp:979
+#: ../src/generic/filedlgg.cpp:1008
 msgid "Create new directory"
 msgstr "´´½¨ÐÂĿ¼"
 
-#: ../src/generic/filedlgg.cpp:986
+#: ../src/generic/filedlgg.cpp:1015
 msgid "Current directory:"
 msgstr "µ±Ç°Ä¿Â¼:"
 
@@ -958,32 +1005,32 @@ msgstr "D ֽ
 msgid "DDE poke request failed"
 msgstr "DDE poke ÇëÇóʧ°Ü"
 
-#: ../src/common/imagbmp.cpp:610
+#: ../src/common/imagbmp.cpp:809
 #, fuzzy
 msgid "DIB Header: Cannot deal with 4bit encoded yet."
 msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
 
-#: ../src/common/imagbmp.cpp:828
+#: ../src/common/imagbmp.cpp:1027
 #, fuzzy
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
 
-#: ../src/common/imagbmp.cpp:791
+#: ../src/common/imagbmp.cpp:990
 #, fuzzy
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:785
+#: ../src/common/imagbmp.cpp:984
 #, fuzzy
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
 
-#: ../src/common/imagbmp.cpp:805
+#: ../src/common/imagbmp.cpp:1004
 #, fuzzy
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
 
-#: ../src/common/imagbmp.cpp:814
+#: ../src/common/imagbmp.cpp:1013
 #, fuzzy
 msgid "DIB Header: Unknown encoding in file."
 msgstr "BMP: Îļþ±àÂëδ֪."
@@ -992,7 +1039,7 @@ msgstr "BMP: 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
 
-#: ../src/generic/filedlgg.cpp:625
+#: ../src/generic/filedlgg.cpp:646
 msgid "Date"
 msgstr "ÈÕÆÚ"
 
@@ -1000,7 +1047,7 @@ msgstr "
 msgid "Decorative"
 msgstr "ÐÞÊÎ"
 
-#: ../src/common/fontmap.cpp:361
+#: ../src/common/fontmap.cpp:366
 msgid "Default encoding"
 msgstr ""
 
@@ -1015,7 +1062,7 @@ msgid ""
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
-#: ../src/msw/toplevel.cpp:214
+#: ../src/msw/toplevel.cpp:221
 #, fuzzy
 msgid "Did you forget to include wx/msw/wx.rc in your resources?"
 msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
@@ -1024,7 +1071,7 @@ msgstr "
 msgid "Did you know..."
 msgstr "ÄãÖªµÀ..."
 
-#: ../src/common/filefn.cpp:1198
+#: ../src/common/filefn.cpp:1219
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
@@ -1033,13 +1080,13 @@ msgstr "Ŀ¼'%s'
 msgid "Directory does not exist"
 msgstr "Ŀ¼²»´æÔÚ"
 
-#: ../src/html/helpfrm.cpp:431
+#: ../src/html/helpfrm.cpp:426
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
 
-#: ../src/html/helpfrm.cpp:605
+#: ../src/html/helpfrm.cpp:600
 msgid "Display options dialog"
 msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
 
@@ -1059,16 +1106,16 @@ msgstr ""
 msgid "Do you want to save changes to document %s?"
 msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"
 
-#: ../src/common/strconv.cpp:563
+#: ../src/common/strconv.cpp:618
 #, c-format
 msgid "Don't know how to convert to/from charset '%s'."
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:308
+#: ../src/html/htmlwin.cpp:318
 msgid "Done"
 msgstr "Íê³É"
 
-#: ../src/generic/progdlgg.cpp:351
+#: ../src/generic/progdlgg.cpp:354
 msgid "Done."
 msgstr "Íê³É¡£"
 
@@ -1081,7 +1128,7 @@ msgstr "
 msgid "E sheet, 34 x 44 in"
 msgstr "E Ö½ÕÅ, 34 x 44 Ó¢´ç"
 
-#: ../src/generic/progdlgg.cpp:175
+#: ../src/generic/progdlgg.cpp:178
 msgid "Elapsed time : "
 msgstr "ÓÃʱ£º"
 
@@ -1089,7 +1136,7 @@ msgstr "
 msgid "Entries found"
 msgstr "ÕÒµ½µÄÌõÄ¿"
 
-#: ../src/common/config.cpp:352
+#: ../src/common/config.cpp:345
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
@@ -1099,15 +1146,15 @@ msgstr "
 #: ../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:721 ../src/generic/filedlgg.cpp:813
-#: ../src/generic/filedlgg.cpp:827 ../src/generic/filedlgg.cpp:840
-#: ../src/generic/filedlgg.cpp:1139 ../src/generic/filedlgg.cpp:1188
+#: ../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
 msgid "Error"
 msgstr "´íÎó"
 
-#: ../src/unix/utilsunx.cpp:1174 ../src/unix/utilsunx.cpp:1182
+#: ../src/unix/utilsunx.cpp:1176 ../src/unix/utilsunx.cpp:1184
 msgid "Error "
 msgstr "´íÎó"
 
@@ -1115,7 +1162,7 @@ msgstr "
 msgid "Error creating directory"
 msgstr "´´½¨Ä¿Â¼´íÎó"
 
-#: ../src/common/imagbmp.cpp:837
+#: ../src/common/imagbmp.cpp:1036
 #, fuzzy
 msgid "Error in reading image DIB ."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
@@ -1128,7 +1175,7 @@ msgstr "
 msgid "Esperanto (ISO-8859-3)"
 msgstr "Esperanto (ISO-8859-3)"
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../src/generic/progdlgg.cpp:186
 msgid "Estimated time : "
 msgstr "Ô¤ÆÚʱ¼ä£º"
 
@@ -1172,7 +1219,7 @@ msgstr "
 msgid "Failed to access lock file."
 msgstr ""
 
-#: ../src/common/filename.cpp:97
+#: ../src/common/filename.cpp:158
 #, fuzzy
 msgid "Failed to close file handle"
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
@@ -1216,6 +1263,11 @@ msgstr "
 msgid "Failed to create a status bar."
 msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 
+#: ../src/common/filename.cpp:625
+#, fuzzy
+msgid "Failed to create a temporary file name"
+msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
+
 #: ../src/msw/dde.cpp:401
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
@@ -1230,7 +1282,7 @@ msgstr "
 msgid "Failed to create registry entry for '%s' files."
 msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
 
-#: ../src/msw/fdrepdlg.cpp:443
+#: ../src/msw/fdrepdlg.cpp:442
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr ""
@@ -1351,16 +1403,21 @@ msgstr "ˢ
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
-#: ../src/common/filename.cpp:961
+#: ../src/common/filename.cpp:1561
 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filename.cpp:86
+#: ../src/common/filename.cpp:147
 #, fuzzy, c-format
 msgid "Failed to open '%s' for reading"
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
+#: ../src/common/filename.cpp:614
+#, fuzzy
+msgid "Failed to open temporary file."
+msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
+
 #: ../src/msw/clipbrd.cpp:107
 msgid "Failed to open the clipboard."
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
@@ -1383,7 +1440,7 @@ msgstr "
 msgid "Failed to register DDE server '%s'"
 msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
 
-#: ../src/common/fontmap.cpp:649
+#: ../src/common/fontmap.cpp:654
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."
@@ -1412,7 +1469,7 @@ msgstr "
 msgid "Failed to retrieve data from the clipboard."
 msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
 
-#: ../src/common/filename.cpp:1027
+#: ../src/common/filename.cpp:1627
 #, fuzzy, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
@@ -1438,6 +1495,11 @@ msgstr "
 msgid "Failed to set clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
+#: ../src/common/file.cpp:516
+#, fuzzy
+msgid "Failed to set temporary file permissions"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
 #: ../src/unix/threadpsx.cpp:1093
 #, c-format
 msgid "Failed to set thread priority %d."
@@ -1461,7 +1523,7 @@ msgstr "
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
-#: ../src/common/filename.cpp:976
+#: ../src/common/filename.cpp:1576
 #, fuzzy, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
@@ -1481,7 +1543,7 @@ msgstr "
 msgid "Failed to write to lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/generic/logg.cpp:371
+#: ../src/generic/logg.cpp:368
 msgid "Fatal error"
 msgstr "ÖÂÃü´íÎó"
 
@@ -1489,7 +1551,7 @@ msgstr "
 msgid "Fatal error: "
 msgstr "ÖÂÃü´íÎó£º"
 
-#: ../src/mac/app.cpp:907 ../src/msw/app.cpp:1428
+#: ../src/mac/app.cpp:907 ../src/msw/app.cpp:1396
 msgid "Fatal error: exiting"
 msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
 
@@ -1498,12 +1560,12 @@ msgstr "
 msgid "File %s does not exist."
 msgstr ": Îļþ²»´æÔÚ!"
 
-#: ../src/generic/filedlgg.cpp:1170 ../src/gtk/filedlg.cpp:69
+#: ../src/generic/filedlgg.cpp:1201 ../src/gtk/filedlg.cpp:69
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 
-#: ../src/common/textcmn.cpp:116
+#: ../src/common/textcmn.cpp:158
 msgid "File couldn't be loaded."
 msgstr "Îļþ²»Äܱ»×°ÔØ"
 
@@ -1513,20 +1575,20 @@ msgid "File error"
 msgstr "Îļþ´íÎó"
 
 #: ../src/generic/dirctrlg.cpp:666 ../src/generic/dirdlgg.cpp:285
-#: ../src/generic/filedlgg.cpp:827
+#: ../src/generic/filedlgg.cpp:851
 msgid "File name exists already."
 msgstr "ÎļþÃûÒÑ´æÔÚ"
 
-#: ../src/msw/filedlg.cpp:305
+#: ../src/msw/filedlg.cpp:349
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Îļþ (%s)|%s"
 
-#: ../src/html/helpfrm.cpp:405
+#: ../src/html/helpfrm.cpp:400
 msgid "Find"
 msgstr "²éÕÒ"
 
-#: ../src/html/helpfrm.cpp:1037
+#: ../src/html/helpfrm.cpp:1032
 msgid "Fixed font:"
 msgstr "¹Ì¶¨×ÖÌ壺"
 
@@ -1538,7 +1600,7 @@ msgstr "Folio, 8 1/2 x 13 in"
 msgid "Font"
 msgstr "×ÖÌå"
 
-#: ../src/html/helpfrm.cpp:1047
+#: ../src/html/helpfrm.cpp:1042
 msgid "Font size:"
 msgstr "×ÖÌå´óС:"
 
@@ -1556,7 +1618,7 @@ msgstr "
 msgid "Found "
 msgstr "ÕÒµ½"
 
-#: ../src/html/helpfrm.cpp:726
+#: ../src/html/helpfrm.cpp:721
 #, c-format
 msgid "Found %i matches"
 msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
@@ -1597,23 +1659,23 @@ msgstr "
 msgid "GetUnusedColour:: No Unused Color in image "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:571
+#: ../src/html/helpfrm.cpp:566
 msgid "Go back"
 msgstr "»ØÍË"
 
-#: ../src/html/helpfrm.cpp:574
+#: ../src/html/helpfrm.cpp:569
 msgid "Go forward"
 msgstr "ÏòÇ°"
 
-#: ../src/html/helpfrm.cpp:579
+#: ../src/html/helpfrm.cpp:574
 msgid "Go one level up in document hierarchy"
 msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
 
-#: ../src/generic/filedlgg.cpp:971
+#: ../src/generic/filedlgg.cpp:1000
 msgid "Go to home directory"
 msgstr "½øÈëhomeĿ¼"
 
-#: ../src/generic/filedlgg.cpp:965
+#: ../src/generic/filedlgg.cpp:994
 msgid "Go to parent directory"
 msgstr "½øÈ븸Ŀ¼"
 
@@ -1621,12 +1683,12 @@ msgstr "
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
-#: ../src/html/htmlwin.cpp:350
+#: ../src/html/htmlwin.cpp:360
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr "HTML ê %s ²»´æÔÚ."
 
-#: ../src/html/helpfrm.cpp:1355
+#: ../src/html/helpfrm.cpp:1350
 msgid ""
 "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|"
 "Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"
@@ -1643,7 +1705,7 @@ msgstr "Hebrew (ISO-8859-8)"
 msgid "Help"
 msgstr "°ïÖú"
 
-#: ../src/html/helpfrm.cpp:1020
+#: ../src/html/helpfrm.cpp:1015
 msgid "Help Browser Options"
 msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
 
@@ -1651,7 +1713,7 @@ msgstr "
 msgid "Help Index"
 msgstr "°ïÖúË÷Òý"
 
-#: ../src/html/helpfrm.cpp:1339
+#: ../src/html/helpfrm.cpp:1334
 msgid "Help Printing"
 msgstr "°ïÖú´òÓ¡"
 
@@ -1660,11 +1722,54 @@ msgstr "
 msgid "Help: %s"
 msgstr "°ïÖú: %s"
 
-#: ../src/common/imagbmp.cpp:850
+#: ../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
+#, fuzzy
+msgid "ICO: Error calculating size of DIB ."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:194
+#, fuzzy
+msgid "ICO: Error calculating size of Mask DIB ."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:186
+#, fuzzy
+msgid "ICO: Error calculating size of XOR DIB ."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:1049
 #, fuzzy
 msgid "ICO: Error in reading mask DIB."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
+#: ../src/common/imagbmp.cpp:130
+#, fuzzy
+msgid "ICO: Error writing ICONDIR header."
+msgstr "TIFF:дͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:231
+#, fuzzy
+msgid "ICO: Error writing ICONDIRENTRY header."
+msgstr "TIFF:дͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:248
+#, fuzzy
+msgid "ICO: Error writing Mask DIB ."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#: ../src/common/imagbmp.cpp:240
+#, fuzzy
+msgid "ICO: Error writing XOR DIB ."
+msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
 #: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
 #: ../src/common/resource.cpp:2638 ../src/common/resource.cpp:2649
 #, c-format
@@ -1676,11 +1781,11 @@ msgid "Ill-formed resource file syntax."
 msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
 
 #: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirdlgg.cpp:267
-#: ../src/generic/filedlgg.cpp:813
+#: ../src/generic/filedlgg.cpp:837
 msgid "Illegal directory name."
 msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
 
-#: ../src/generic/filedlgg.cpp:1139
+#: ../src/generic/filedlgg.cpp:1170
 msgid "Illegal file specification."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
@@ -1688,7 +1793,7 @@ msgstr "
 msgid "Image and Mask have different sizes"
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:255
+#: ../src/msw/textctrl.cpp:269
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
@@ -1698,17 +1803,17 @@ msgstr "
 msgid "Impossible to get child process input"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1076
+#: ../src/common/filefn.cpp:1088
 #, fuzzy, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
-#: ../src/common/filefn.cpp:1090
+#: ../src/common/filefn.cpp:1102
 #, fuzzy, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/filefn.cpp:1140
+#: ../src/common/filefn.cpp:1152
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
@@ -1717,7 +1822,7 @@ msgstr ""
 msgid "Incorrect version of HTML help book"
 msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
 
-#: ../src/html/helpfrm.cpp:437
+#: ../src/html/helpfrm.cpp:432
 msgid "Index"
 msgstr "Ë÷Òý"
 
@@ -1726,10 +1831,15 @@ msgstr "
 msgid "Indian (ISO-8859-12)"
 msgstr "Nordic (ISO-8859-10)"
 
-#: ../src/common/imagtiff.cpp:177
+#: ../src/common/imagtiff.cpp:175
 msgid "Invalid TIFF image index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
+#: ../contrib/src/xrc/xmlres.cpp:313
+#, c-format
+msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
+msgstr ""
+
 #: ../src/common/appcmn.cpp:282
 #, fuzzy, c-format
 msgid "Invalid display mode specification '%s'."
@@ -1753,11 +1863,11 @@ msgstr "б
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm"
 
-#: ../src/common/imagjpeg.cpp:199
+#: ../src/common/imagjpeg.cpp:206
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr "JPEG: ²»ÄÜ×°Èë - ÎļþÒ²ÐíÒѱ»ÆÆ»µ."
 
-#: ../src/common/imagjpeg.cpp:312
+#: ../src/common/imagjpeg.cpp:320
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 
@@ -1765,7 +1875,7 @@ msgstr "JPEG: 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 
-#: ../src/generic/dcpsg.cpp:2262 ../src/generic/prntdlgg.cpp:439
+#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:439
 #: ../src/generic/prntdlgg.cpp:635
 msgid "Landscape"
 msgstr "ºáÏò"
@@ -1794,17 +1904,17 @@ msgstr "Letter, 8 1/2 x 11 Ӣ
 msgid "Light"
 msgstr "Çá"
 
-#: ../src/generic/filedlgg.cpp:1375 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:486
+#: ../src/generic/filedlgg.cpp:1406 ../src/gtk/filedlg.cpp:249
+#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:514
 #, c-format
 msgid "Load %s file"
 msgstr "×°ÈëÎļþ %s "
 
-#: ../src/html/htmlwin.cpp:275
+#: ../src/html/htmlwin.cpp:285
 msgid "Loading : "
 msgstr "×°ÔØ:"
 
-#: ../src/common/imagbmp.cpp:461 ../src/common/imagbmp.cpp:475
+#: ../src/common/imagbmp.cpp:660 ../src/common/imagbmp.cpp:674
 #, fuzzy
 msgid "Loading DIB : Couldn't allocate memory."
 msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
@@ -1817,7 +1927,7 @@ msgstr "װ
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
 
-#: ../src/generic/logg.cpp:541
+#: ../src/generic/logg.cpp:538
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
@@ -1852,7 +1962,7 @@ msgstr "
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr "Mime.ÀàÐÍÎļþ %s, ÐÐ %d: ûÓнáÊø·ûºÅµÄÒýÓÃ×Ö·û´®."
 
-#: ../src/mgl/app.cpp:168
+#: ../src/mgl/app.cpp:169
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr ""
@@ -1881,7 +1991,7 @@ msgstr "
 msgid "My Home"
 msgstr "ÎҵļÒ"
 
-#: ../src/generic/filedlgg.cpp:623
+#: ../src/generic/filedlgg.cpp:644
 msgid "Name"
 msgstr "Ãû³Æ"
 
@@ -1889,11 +1999,11 @@ msgstr "
 msgid "New..."
 msgstr "´´½¨..."
 
-#: ../src/generic/filedlgg.cpp:706
+#: ../src/generic/filedlgg.cpp:727
 msgid "NewName"
 msgstr "ÐÂÃû"
 
-#: ../src/html/helpfrm.cpp:585
+#: ../src/html/helpfrm.cpp:580
 msgid "Next page"
 msgstr "ÏÂÒ»Ò³"
 
@@ -1919,7 +2029,19 @@ msgstr "û
 msgid "No entries found."
 msgstr "ûÕÒµ½ÌõÄ¿"
 
-#: ../src/common/fontmap.cpp:813
+#: ../src/common/fontmap.cpp:845
+#, fuzzy, c-format
+msgid ""
+"No font for displaying text in encoding '%s' found,\n"
+"but an alternative encoding '%s' is available.\n"
+"Do you want to use this encoding (otherwise you will have to choose another "
+"one)?"
+msgstr ""
+"±àÂë'%s'δ֪.\n"
+"Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
+"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
+
+#: ../src/common/fontmap.cpp:850
 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
@@ -1930,6 +2052,11 @@ msgstr ""
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
+#: ../contrib/src/xrc/xmlres.cpp:396
+#, c-format
+msgid "No handler found for XML node '%s', class '%s'!"
+msgstr ""
+
 #: ../src/common/image.cpp:1009
 msgid "No handler found for image type."
 msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
@@ -1944,7 +2071,7 @@ msgstr "û
 msgid "No image handler for type %s defined."
 msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
 
-#: ../src/html/helpfrm.cpp:715
+#: ../src/html/helpfrm.cpp:710
 msgid "No matching page found yet"
 msgstr "No matching page found yet"
 
@@ -1956,7 +2083,7 @@ msgstr "Nordic (ISO-8859-10)"
 msgid "Normal"
 msgstr "Õý³£"
 
-#: ../src/html/helpfrm.cpp:1029
+#: ../src/html/helpfrm.cpp:1024
 msgid "Normal font:"
 msgstr "Normal font:"
 
@@ -1964,36 +2091,36 @@ 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:2270
+#: ../src/common/dlgcmn.cpp:168 ../src/generic/dcpsg.cpp:2268
 #: ../src/generic/dirctrlg.cpp:1247 ../src/generic/dirdlgg.cpp:416
-#: ../src/generic/filedlgg.cpp:1003 ../src/generic/fontdlgg.cpp:258
-#: ../src/generic/logg.cpp:726 ../src/generic/prntdlgg.cpp:465
+#: ../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:1057
+#: ../src/gtk/fontdlg.cpp:172 ../src/html/helpfrm.cpp:1052
 msgid "OK"
 msgstr "È·ÈÏ"
 
-#: ../src/html/helpfrm.cpp:593 ../src/html/helpfrm.cpp:1350
+#: ../src/html/helpfrm.cpp:588 ../src/html/helpfrm.cpp:1345
 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:721 ../src/generic/filedlgg.cpp:840
+#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:864
 msgid "Operation not permitted."
 msgstr "²»ÔÊÐíµÄ²Ù×÷."
 
-#: ../src/common/cmdline.cpp:661
+#: ../src/common/cmdline.cpp:627
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
 
-#: ../src/common/cmdline.cpp:681
+#: ../src/common/cmdline.cpp:647
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
 
-#: ../src/common/cmdline.cpp:742
+#: ../src/common/cmdline.cpp:708
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
@@ -2070,7 +2197,7 @@ msgstr "ֽ
 msgid "Paper size"
 msgstr "Ö½ÕÅ´óС"
 
-#: ../src/generic/filedlgg.cpp:627
+#: ../src/generic/filedlgg.cpp:648
 msgid "Permissions"
 msgstr "ÔÊÐí"
 
@@ -2082,7 +2209,7 @@ msgstr "
 msgid "Please choose a valid font."
 msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
 
-#: ../src/generic/filedlgg.cpp:1188 ../src/gtk/filedlg.cpp:80
+#: ../src/generic/filedlgg.cpp:1219 ../src/gtk/filedlg.cpp:80
 msgid "Please choose an existing file."
 msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
 
@@ -2102,7 +2229,7 @@ msgstr ""
 msgid "Please wait..."
 msgstr "ÇëµÈ´ý..."
 
-#: ../src/generic/dcpsg.cpp:2261 ../src/generic/prntdlgg.cpp:438
+#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:438
 #: ../src/generic/prntdlgg.cpp:634
 msgid "Portrait"
 msgstr "×ÝÏò"
@@ -2115,19 +2242,19 @@ msgstr "PostScript"
 msgid "PostScript file"
 msgstr "PostScriptÎļþ"
 
-#: ../src/generic/dcpsg.cpp:2303
+#: ../src/generic/dcpsg.cpp:2301
 msgid "PostScript:"
 msgstr "PostScript:"
 
-#: ../src/generic/dcpsg.cpp:2266
+#: ../src/generic/dcpsg.cpp:2264
 msgid "Preview Only"
 msgstr "½öÔ¤ÀÀ"
 
-#: ../src/html/helpfrm.cpp:1051
+#: ../src/html/helpfrm.cpp:1046
 msgid "Preview:"
 msgstr "Ô¤ÀÀ£º"
 
-#: ../src/html/helpfrm.cpp:582
+#: ../src/html/helpfrm.cpp:577
 msgid "Previous page"
 msgstr "ǰҳ"
 
@@ -2159,11 +2286,11 @@ msgstr "
 msgid "Print spooling"
 msgstr "´òÓ¡¼ÙÍÑ»ú"
 
-#: ../src/html/helpfrm.cpp:599
+#: ../src/html/helpfrm.cpp:594
 msgid "Print this page"
 msgstr "´òÓ¡±¾Ò³"
 
-#: ../src/generic/dcpsg.cpp:2265 ../src/generic/prntdlgg.cpp:148
+#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:148
 msgid "Print to File"
 msgstr "´òÓ¡µ½Îļþ"
 
@@ -2171,11 +2298,11 @@ msgstr "
 msgid "Print..."
 msgstr "´òÓ¡..."
 
-#: ../src/generic/dcpsg.cpp:2276
+#: ../src/generic/dcpsg.cpp:2274
 msgid "Printer Command: "
 msgstr "´òÓ¡»úÃüÁî: "
 
-#: ../src/generic/dcpsg.cpp:2281
+#: ../src/generic/dcpsg.cpp:2279
 msgid "Printer Options: "
 msgstr "´òÓ¡»úÑ¡Ïî:"
 
@@ -2224,7 +2351,7 @@ msgstr "
 msgid "Quarto, 215 x 275 mm"
 msgstr "ËÄ¿ª, 215 x 275 mm"
 
-#: ../src/generic/logg.cpp:1025
+#: ../src/generic/logg.cpp:1022
 msgid "Question"
 msgstr "ÎÊÌâ"
 
@@ -2263,7 +2390,7 @@ msgstr "ע
 msgid "Relevant entries:"
 msgstr "Ïà¹ØÌõÄ¿:"
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:194
 msgid "Remaining time : "
 msgstr "Ê£Óàʱ¼ä : "
 
@@ -2276,15 +2403,14 @@ msgstr "
 msgid "Replace &all"
 msgstr "Ìæ»»Îļþ '%s'?"
 
-#: ../src/msw/filedlg.cpp:447
-#, c-format
-msgid "Replace file '%s'?"
-msgstr "Ìæ»»Îļþ '%s'?"
-
 #: ../src/generic/fdrepdlg.cpp:129
 msgid "Replace with:"
 msgstr ""
 
+#: ../contrib/src/xrc/xmlres.cpp:330
+msgid "Resource files must have same version number!"
+msgstr ""
+
 #: ../src/generic/prntdlgg.cpp:659
 msgid "Right margin (mm):"
 msgstr "Óұ߾à (ºÁÃ×):"
@@ -2293,8 +2419,8 @@ msgstr "
 msgid "Roman"
 msgstr "ÂÞÂí"
 
-#: ../src/generic/filedlgg.cpp:1391 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:488
+#: ../src/generic/filedlgg.cpp:1422 ../src/gtk/filedlg.cpp:265
+#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:516
 #, c-format
 msgid "Save %s file"
 msgstr "±£´æÎļþ %s "
@@ -2303,7 +2429,7 @@ msgstr "
 msgid "Save as"
 msgstr "Áí´æΪ"
 
-#: ../src/generic/logg.cpp:474
+#: ../src/generic/logg.cpp:471
 msgid "Save log contents to file"
 msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
 
@@ -2311,12 +2437,12 @@ msgstr "
 msgid "Script"
 msgstr "Script"
 
-#: ../src/generic/helpwxht.cpp:161 ../src/html/helpfrm.cpp:480
-#: ../src/html/helpfrm.cpp:500
+#: ../src/generic/helpwxht.cpp:161 ../src/html/helpfrm.cpp:475
+#: ../src/html/helpfrm.cpp:495
 msgid "Search"
 msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:482
+#: ../src/html/helpfrm.cpp:477
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
@@ -2332,11 +2458,11 @@ msgstr "
 msgid "Search for:"
 msgstr "ËÑË÷"
 
-#: ../src/html/helpfrm.cpp:876
+#: ../src/html/helpfrm.cpp:871
 msgid "Search in all books"
 msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
 
-#: ../src/html/helpfrm.cpp:715
+#: ../src/html/helpfrm.cpp:710
 msgid "Searching..."
 msgstr "ËÑË÷..."
 
@@ -2361,11 +2487,11 @@ msgstr "ѡ
 msgid "Select a file"
 msgstr "Ñ¡ÔñÎļþ"
 
-#: ../src/generic/dcpsg.cpp:2264
+#: ../src/generic/dcpsg.cpp:2262
 msgid "Send to Printer"
 msgstr "·¢µ½´òÓ¡»ú"
 
-#: ../src/common/cmdline.cpp:698
+#: ../src/common/cmdline.cpp:664
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
@@ -2387,23 +2513,23 @@ msgstr "
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
 
-#: ../src/html/helpfrm.cpp:396
+#: ../src/html/helpfrm.cpp:391
 msgid "Show all"
 msgstr "ÏÔʾËùÓÐ"
 
-#: ../src/html/helpfrm.cpp:430
+#: ../src/html/helpfrm.cpp:425
 msgid "Show all items in index"
 msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
 
-#: ../src/generic/filedlgg.cpp:1009
+#: ../src/generic/filedlgg.cpp:1038
 msgid "Show hidden files"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 
-#: ../src/html/helpfrm.cpp:566
+#: ../src/html/helpfrm.cpp:561
 msgid "Show/hide navigation panel"
 msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
 
-#: ../src/generic/filedlgg.cpp:624
+#: ../src/generic/filedlgg.cpp:645
 msgid "Size"
 msgstr "´óС"
 
@@ -2432,7 +2558,7 @@ 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:591
+#: ../src/generic/logg.cpp:588
 msgid "Status: "
 msgstr "״̬£º"
 
@@ -2440,24 +2566,24 @@ msgstr "״̬
 msgid "Swiss"
 msgstr "ÈðÊ¿"
 
-#: ../src/common/imagtiff.cpp:198 ../src/common/imagtiff.cpp:209
-#: ../src/common/imagtiff.cpp:320
+#: ../src/common/imagtiff.cpp:196 ../src/common/imagtiff.cpp:207
+#: ../src/common/imagtiff.cpp:318
 msgid "TIFF: Couldn't allocate memory."
 msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ."
 
-#: ../src/common/imagtiff.cpp:169
+#: ../src/common/imagtiff.cpp:167
 msgid "TIFF: Error loading image."
 msgstr "TIFF: ×°ÔØͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:220
+#: ../src/common/imagtiff.cpp:218
 msgid "TIFF: Error reading image."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:297
+#: ../src/common/imagtiff.cpp:295
 msgid "TIFF: Error saving image."
 msgstr "TIFF: ±£´æͼÏñ´íÎó."
 
-#: ../src/common/imagtiff.cpp:344
+#: ../src/common/imagtiff.cpp:342
 msgid "TIFF: Error writing image."
 msgstr "TIFF:дͼÏñ´íÎó."
 
@@ -2489,7 +2615,7 @@ msgstr "
 msgid "The FTP server doesn't support passive mode."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:605
+#: ../src/common/fontmap.cpp:610
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -2518,21 +2644,21 @@ msgstr ""
 "Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
 "ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
 
-#: ../src/common/filename.cpp:433
+#: ../src/common/filename.cpp:780
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:832
+#: ../src/common/cmdline.cpp:798
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
 
-#: ../src/common/textcmn.cpp:145
+#: ../src/common/textcmn.cpp:187
 msgid "The text couldn't be saved."
 msgstr "Îı¾²»Äܱ»±£´æ¡£"
 
-#: ../src/common/cmdline.cpp:811
+#: ../src/common/cmdline.cpp:777
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
@@ -2572,7 +2698,7 @@ msgstr ""
 msgid "Tile &Vertically"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:626
+#: ../src/generic/filedlgg.cpp:647
 msgid "Time"
 msgstr "ʱ¼ä"
 
@@ -2597,7 +2723,7 @@ msgstr "
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
 
-#: ../src/common/sckaddr.cpp:107
+#: ../src/common/sckaddr.cpp:108
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú"
 
@@ -2609,7 +2735,7 @@ msgstr "
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç"
 
-#: ../src/html/htmlwin.cpp:261
+#: ../src/html/htmlwin.cpp:271
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
@@ -2631,7 +2757,7 @@ msgstr "
 msgid "Unexpected end of file whilst parsing resource."
 msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
 
-#: ../src/common/cmdline.cpp:783
+#: ../src/common/cmdline.cpp:749
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "ÒâÍâ²ÎÊý '%s'"
@@ -2649,12 +2775,12 @@ msgstr ""
 msgid "Unknown DDE error %08x"
 msgstr "δ֪ DDE ´íÎó %08x"
 
-#: ../src/common/strconv.cpp:830
+#: ../src/common/strconv.cpp:888
 #, fuzzy, c-format
 msgid "Unknown encoding '%s'!"
 msgstr "λÖñàÂë (%d)"
 
-#: ../src/common/fontmap.cpp:378
+#: ../src/common/fontmap.cpp:383
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "λÖñàÂë (%d)"
@@ -2664,16 +2790,20 @@ msgstr "λ
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'."
 
-#: ../src/common/cmdline.cpp:567
+#: ../src/common/cmdline.cpp:533
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "δ֪longÑ¡Ïî '%s'"
 
-#: ../src/common/cmdline.cpp:589
+#: ../src/common/cmdline.cpp:555
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "δ֪ѡÏî '%s'"
 
+#: ../contrib/src/xrc/xmlres.cpp:488
+msgid "Unknown style flag "
+msgstr ""
+
 #: ../src/common/mimecmn.cpp:167
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
@@ -2703,7 +2833,7 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:868
+#: ../src/common/cmdline.cpp:834
 #, c-format
 msgid "Usage: %s"
 msgstr "Ó÷¨: %s"
@@ -2724,11 +2854,11 @@ msgstr "
 msgid "Variables"
 msgstr "±äÁ¿"
 
-#: ../src/generic/filedlgg.cpp:957
+#: ../src/generic/filedlgg.cpp:986
 msgid "View files as a detailed view"
 msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
 
-#: ../src/generic/filedlgg.cpp:951
+#: ../src/generic/filedlgg.cpp:980
 msgid "View files as a list view"
 msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
 
@@ -2767,7 +2897,7 @@ msgstr "West European new (ISO-8859-15/Latin 0)"
 msgid "Whole word"
 msgstr "½öΪÕû×Ö"
 
-#: ../src/html/helpfrm.cpp:472
+#: ../src/html/helpfrm.cpp:467
 msgid "Whole words only"
 msgstr "½öΪÕû×Ö"
 
@@ -2854,28 +2984,52 @@ msgstr "Windows/DOS OEM (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "дÎļþ '%s'´íÎó"
 
-#: ../src/generic/dcpsg.cpp:2321
+#: ../src/generic/dcpsg.cpp:2319
 msgid "X Scaling"
 msgstr "XËõ·Å"
 
-#: ../src/generic/dcpsg.cpp:2330
+#: ../src/generic/dcpsg.cpp:2328
 msgid "X Translation"
 msgstr "XƽÒÆ"
 
-#: ../src/common/xpmdecod.cpp:754
+#: ../contrib/src/xrc/xmlexpat.cpp:185
+#, c-format
+msgid "XML parsing error: '%s' at line %d"
+msgstr ""
+
+#: ../src/common/xpmdecod.cpp:757
 msgid "XPM: Malformed pixel data!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:707 ../src/common/xpmdecod.cpp:716
+#: ../src/common/xpmdecod.cpp:710 ../src/common/xpmdecod.cpp:719
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2325
+#: ../contrib/src/xrc/xmlres.cpp:371
+#, 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
+#, 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
+#, 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:2334
+#: ../src/generic/dcpsg.cpp:2332
 msgid "Y Translation"
 msgstr "YƽÒÆ"
 
@@ -2991,7 +3145,7 @@ msgstr ""
 "Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
 "»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
 
-#: ../src/common/fileconf.cpp:1656
+#: ../src/common/fileconf.cpp:1555
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä."
@@ -3005,104 +3159,104 @@ msgstr ""
 msgid "can't close file '%s'"
 msgstr "²»ÄܹرÕÎļþ '%s'"
 
-#: ../src/common/file.cpp:255
+#: ../src/common/file.cpp:272
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
 
-#: ../src/common/file.cpp:559
+#: ../src/common/file.cpp:543
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
 
-#: ../src/common/file.cpp:202
+#: ../src/common/file.cpp:215
 #, c-format
 msgid "can't create file '%s'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
-#: ../src/common/fileconf.cpp:1125
+#: ../src/common/fileconf.cpp:1024
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
 
-#: ../src/common/file.cpp:438
+#: ../src/common/file.cpp:455
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "²»ÄÜÈ·¶¨ÊÇ·ñÒÑ´ïÎļþ %d µÄβ²¿"
 
-#: ../src/common/file.cpp:404
+#: ../src/common/file.cpp:421
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
 
-#: ../src/msw/utils.cpp:368
+#: ../src/msw/utils.cpp:366
 msgid "can't find user's HOME, using current directory."
 msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
 
-#: ../src/common/file.cpp:318
+#: ../src/common/file.cpp:335
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
 
-#: ../src/common/file.cpp:372
+#: ../src/common/file.cpp:389
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÖ¸ÕëλÖÃ"
 
-#: ../src/common/fontmap.cpp:741
+#: ../src/common/fontmap.cpp:746
 msgid "can't load any font, aborting"
 msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
 
-#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:241
+#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:258
 #, c-format
 msgid "can't open file '%s'"
 msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
 
-#: ../src/common/fileconf.cpp:462
+#: ../src/common/fileconf.cpp:386
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:474
+#: ../src/common/fileconf.cpp:398
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
 
-#: ../src/common/fileconf.cpp:1005
+#: ../src/common/fileconf.cpp:904
 msgid "can't open user configuration file."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 
-#: ../src/common/file.cpp:281
+#: ../src/common/file.cpp:298
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 
-#: ../src/common/file.cpp:554
+#: ../src/common/file.cpp:538
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
-#: ../src/common/file.cpp:570
+#: ../src/common/file.cpp:554
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
 
-#: ../src/common/file.cpp:358
+#: ../src/common/file.cpp:375
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
 
-#: ../src/common/textfile.cpp:174
+#: ../src/common/textfile.cpp:178
 #, fuzzy, c-format
 msgid "can't write buffer '%s' to disk."
 msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
 
-#: ../src/common/file.cpp:303
+#: ../src/common/file.cpp:320
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
 
-#: ../src/common/fileconf.cpp:1012
+#: ../src/common/fileconf.cpp:911
 msgid "can't write user configuration file."
 msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
 
@@ -3111,32 +3265,37 @@ msgstr "
 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
 msgid "ctrl"
 msgstr "ctrl"
 
-#: ../src/common/cmdline.cpp:981
+#: ../src/common/cmdline.cpp:947
 msgid "date"
 msgstr "ÈÕÆÚ"
 
-#: ../src/common/fontmap.cpp:388
+#: ../src/common/fontmap.cpp:393
 #, fuzzy
 msgid "default"
 msgstr "alt"
 
-#: ../src/common/datetime.cpp:3212
+#: ../src/common/datetime.cpp:3227
 msgid "eighteenth"
 msgstr "µÚÊ®°Ë"
 
-#: ../src/common/datetime.cpp:3202
+#: ../src/common/datetime.cpp:3217
 msgid "eighth"
 msgstr "µÚ°Ë"
 
-#: ../src/common/datetime.cpp:3205
+#: ../src/common/datetime.cpp:3220
 msgid "eleventh"
 msgstr "µÚʮһ"
 
-#: ../src/common/fileconf.cpp:1643
+#: ../src/common/fileconf.cpp:1542
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
@@ -3150,48 +3309,48 @@ msgstr "
 msgid "failed to flush the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
-#: ../src/common/datetime.cpp:3209
+#: ../src/common/datetime.cpp:3224
 msgid "fifteenth"
 msgstr "µÚÊ®Îå"
 
-#: ../src/common/datetime.cpp:3199
+#: ../src/common/datetime.cpp:3214
 msgid "fifth"
 msgstr "µÚÎå"
 
-#: ../src/common/fileconf.cpp:686
+#: ../src/common/fileconf.cpp:610
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
 
-#: ../src/common/fileconf.cpp:715
+#: ../src/common/fileconf.cpp:639
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
 
-#: ../src/common/fileconf.cpp:741
+#: ../src/common/fileconf.cpp:665
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "Îļþ '%s', ÐÐ %d: ¼ü '%s' µÚÒ»´Î³öÏÖÔÚÐÐ %d."
 
-#: ../src/common/fileconf.cpp:731
+#: ../src/common/fileconf.cpp:655
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
 
-#: ../src/common/fileconf.cpp:654
+#: ../src/common/fileconf.cpp:578
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
 
-#: ../src/common/datetime.cpp:3195
+#: ../src/common/datetime.cpp:3210
 msgid "first"
 msgstr "µÚÒ»"
 
-#: ../src/common/datetime.cpp:3208
+#: ../src/common/datetime.cpp:3223
 msgid "fourteenth"
 msgstr "µÚÊ®ËÄ"
 
-#: ../src/common/datetime.cpp:3198
+#: ../src/common/datetime.cpp:3213
 msgid "fourth"
 msgstr "µÚËÄ"
 
@@ -3207,15 +3366,15 @@ msgstr "gmtime() ʧ
 msgid "initiate"
 msgstr "³õʼ»¯"
 
-#: ../src/common/file.cpp:442
+#: ../src/common/file.cpp:459
 msgid "invalid eof() return value."
 msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
 
-#: ../src/generic/logg.cpp:1039
+#: ../src/generic/logg.cpp:1036
 msgid "invalid message box return value"
 msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
 
-#: ../src/html/helpfrm.cpp:1022
+#: ../src/html/helpfrm.cpp:1017
 msgid "large"
 msgstr "´ó"
 
@@ -3229,11 +3388,11 @@ msgstr "
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
 
-#: ../src/html/helpfrm.cpp:1022
+#: ../src/html/helpfrm.cpp:1017
 msgid "medium"
 msgstr "ÖÐ"
 
-#: ../src/common/datetime.cpp:3360
+#: ../src/common/datetime.cpp:3375
 msgid "midnight"
 msgstr "ÎçÒ¹"
 
@@ -3241,11 +3400,11 @@ msgstr "
 msgid "mktime() failed"
 msgstr "mktime()ʧ°Ü"
 
-#: ../src/common/datetime.cpp:3213
+#: ../src/common/datetime.cpp:3228
 msgid "nineteenth"
 msgstr "µÚÊ®¾Å"
 
-#: ../src/common/datetime.cpp:3203
+#: ../src/common/datetime.cpp:3218
 msgid "ninth"
 msgstr "µÚ¾Å"
 
@@ -3257,11 +3416,11 @@ msgstr "û
 msgid "noname"
 msgstr "δÃû"
 
-#: ../src/common/datetime.cpp:3359
+#: ../src/common/datetime.cpp:3374
 msgid "noon"
 msgstr "ÖÐÎç"
 
-#: ../src/common/cmdline.cpp:980
+#: ../src/common/cmdline.cpp:946
 msgid "num"
 msgstr "num"
 
@@ -3269,15 +3428,15 @@ msgstr "num"
 msgid "reentrancy problem."
 msgstr "ÖØÈëÎÊÌâ"
 
-#: ../src/common/datetime.cpp:3196
+#: ../src/common/datetime.cpp:3211
 msgid "second"
 msgstr "µÚ¶þ"
 
-#: ../src/common/datetime.cpp:3211
+#: ../src/common/datetime.cpp:3226
 msgid "seventeenth"
 msgstr "µÚÊ®Æß"
 
-#: ../src/common/datetime.cpp:3201
+#: ../src/common/datetime.cpp:3216
 msgid "seventh"
 msgstr "µÚÆß"
 
@@ -3289,15 +3448,15 @@ msgstr "shift"
 msgid "show this help message"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3210
+#: ../src/common/datetime.cpp:3225
 msgid "sixteenth"
 msgstr "µÚÊ®Áù"
 
-#: ../src/common/datetime.cpp:3200
+#: ../src/common/datetime.cpp:3215
 msgid "sixth"
 msgstr "µÚÁù"
 
-#: ../src/html/helpfrm.cpp:1022
+#: ../src/html/helpfrm.cpp:1017
 msgid "small"
 msgstr "С"
 
@@ -3309,11 +3468,11 @@ msgstr ""
 msgid "specify the theme to use"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:979
+#: ../src/common/cmdline.cpp:945
 msgid "str"
 msgstr "str"
 
-#: ../src/common/datetime.cpp:3204
+#: ../src/common/datetime.cpp:3219
 msgid "tenth"
 msgstr "µÚÊ®"
 
@@ -3321,36 +3480,36 @@ msgstr "
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "¶ÔʼþµÄÏìÓ¦µ¼ÖÂDDE_FBUSYλ±»ÉèÖÃ."
 
-#: ../src/common/datetime.cpp:3197
+#: ../src/common/datetime.cpp:3212
 msgid "third"
 msgstr "µÚÈý"
 
-#: ../src/common/datetime.cpp:3207
+#: ../src/common/datetime.cpp:3222
 msgid "thirteenth"
 msgstr "µÚÊ®Èý"
 
-#: ../src/common/datetime.cpp:3039
+#: ../src/common/datetime.cpp:3054
 msgid "today"
 msgstr "½ñÌì"
 
-#: ../src/common/datetime.cpp:3041
+#: ../src/common/datetime.cpp:3056
 msgid "tomorrow"
 msgstr "Ã÷Ìì"
 
-#: ../src/common/datetime.cpp:3206
+#: ../src/common/datetime.cpp:3221
 msgid "twelfth"
 msgstr "µÚÊ®¶þ"
 
-#: ../src/common/datetime.cpp:3214
+#: ../src/common/datetime.cpp:3229
 msgid "twentieth"
 msgstr "µÚ¶þÊ®"
 
-#: ../src/common/fileconf.cpp:1763
+#: ../src/common/fileconf.cpp:1662
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
 
-#: ../src/generic/progdlgg.cpp:273
+#: ../src/generic/progdlgg.cpp:276
 msgid "unknown"
 msgstr "δ֪"
 
@@ -3369,11 +3528,11 @@ msgstr "δ֪
 msgid "unknown line terminator"
 msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/file.cpp:341
+#: ../src/common/file.cpp:358
 msgid "unknown seek origin"
 msgstr "δ֪ËÑË÷Ô­µã"
 
-#: ../src/common/fontmap.cpp:405
+#: ../src/common/fontmap.cpp:410
 #, c-format
 msgid "unknown-%d"
 msgstr "δ֪-%d"
@@ -3392,11 +3551,11 @@ msgstr "unnamed%d"
 msgid "using catalog '%s' from '%s'."
 msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
 
-#: ../src/html/helpfrm.cpp:1022
+#: ../src/html/helpfrm.cpp:1017
 msgid "very large"
 msgstr "·Ç³£´ó"
 
-#: ../src/html/helpfrm.cpp:1022
+#: ../src/html/helpfrm.cpp:1017
 msgid "very small"
 msgstr "·Ç³£Ð¡"
 
@@ -3417,14 +3576,20 @@ msgstr "wxSocket: δ֪
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
-#: ../src/common/filefn.cpp:1302
-msgid "wxWindows: error finding temporary file name.\n"
-msgstr "wxWindows: ²éѯÁÙʱÎļþÃûʱ³ö´í.\n"
-
-#: ../src/common/datetime.cpp:3040
+#: ../src/common/datetime.cpp:3055
 msgid "yesterday"
 msgstr "×òÌì"
 
+#, fuzzy
+#~ msgid "Unknown digit value"
+#~ msgstr "λÖñàÂë (%d)"
+
+#~ msgid "Replace file '%s'?"
+#~ msgstr "Ìæ»»Îļþ '%s'?"
+
+#~ msgid "wxWindows: error finding temporary file name.\n"
+#~ msgstr "wxWindows: ²éѯÁÙʱÎļþÃûʱ³ö´í.\n"
+
 #, fuzzy
 #~ msgid "Can not create mutex."
 #~ msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"