load any files, not only XPMs, in wxIcon(wxIconLocation)

[wxWidgets.git] / locale / zh.po

diff --git a/locale/zh.po b/locale/zh.po
index 39ae6887cfdf6260e3425d7f1ae579995bf3e5c6..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"
 msgid ""
 msgstr ""
 "Project-Id-Version: wxWindows-2.2.2\n"

-"POT-Creation-Date: 2002-06-03 21:07+0200\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"
 "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"


@@ -14,18 +14,14 @@ msgstr ""
 msgid " (error %ld: %s)"
 msgstr " (´íÎó %ld: %s)"
 
 msgid " (error %ld: %s)"
 msgstr " (´íÎó %ld: %s)"
 

-#: ../src/common/docview.cpp:1227
+#: ../src/common/docview.cpp:1242

 msgid " - "
 msgstr " - "
 
 msgid " - "
 msgstr " - "
 

-#: ../src/html/htmprint.cpp:505
+#: ../src/html/htmprint.cpp:497

 msgid " Preview"
 msgstr "Ô¤ÀÀ"
 
 msgid " Preview"
 msgstr "Ô¤ÀÀ"
 

-#: ../src/generic/filedlgg.cpp:465
-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"
 #: ../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"


@@ -47,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
 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 ±ØÐëÊÇÕûÊý."
 
 #, c-format
 msgid "#define %s must be an integer."
 msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
 

-#: ../src/html/helpfrm.cpp:772 ../src/html/helpfrm.cpp:773
-#: ../src/html/helpfrm.cpp:1376 ../src/html/helpfrm.cpp:1406
+#: ../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"
 
 #, c-format
 msgid "%i of %i"
 msgstr "%i of %i"
 

-#: ../src/common/cmdline.cpp:776
+#: ../src/common/cmdline.cpp:814

 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (»ò %s)"
 
 #, c-format
 msgid "%s (or %s)"
 msgstr "%s (»ò %s)"
 

-#: ../src/generic/logg.cpp:239
+#: ../src/generic/logg.cpp:246

 #, c-format
 msgid "%s Error"
 msgstr "%s ´íÎó"
 
 #, c-format
 msgid "%s Error"
 msgstr "%s ´íÎó"
 

-#: ../src/generic/logg.cpp:247
+#: ../src/generic/logg.cpp:254

 #, c-format
 msgid "%s Information"
 msgstr "%s ÐÅÏ¢"
 
 #, c-format
 msgid "%s Information"
 msgstr "%s ÐÅÏ¢"
 

-#: ../src/generic/logg.cpp:243
+#: ../src/generic/logg.cpp:250

 #, c-format
 msgid "%s Warning"
 msgstr "%s ¾¯¸æ"
 
 #, 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 ²»ÊÇλͼ×ÊÔ´."
 
 #, 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
 #, 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: ²»Á¼×ÊÔ´ÎļþÓï·¨."
 
 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: ²»Á¼×ÊÔ´ÎļþÓï·¨."
 

-#: ../src/msw/mdi.cpp:189
+#: ../src/msw/mdi.cpp:192

 msgid "&Arrange Icons"
 msgstr ""
 
 msgid "&Arrange Icons"
 msgstr ""
 

-#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:260
+#: ../src/generic/wizard.cpp:271 ../src/generic/fdrepdlg.cpp:170

 #, fuzzy
 msgid "&Cancel"
 msgstr "È¡Ïû"
 
 #, fuzzy
 msgid "&Cancel"
 msgstr "È¡Ïû"
 

-#: ../src/msw/mdi.cpp:185
+#: ../src/msw/mdi.cpp:188

 msgid "&Cascade"
 msgstr ""
 
 msgid "&Cascade"
 msgstr ""
 

-#: ../src/generic/logg.cpp:484 ../src/generic/tipdlg.cpp:171
+#: ../src/generic/tipdlg.cpp:210 ../src/generic/logg.cpp:491

 msgid "&Close"
 msgstr "¹Ø±Õ[&C]"
 
 msgid "&Close"
 msgstr "¹Ø±Õ[&C]"
 

-#: ../src/generic/logg.cpp:688
+#: ../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]"
 
 msgid "&Details"
 msgstr "ϸ½Ú[&D]"
 


@@ -122,41 +142,52 @@ msgstr "ϸ
 msgid "&Find"
 msgstr "²éÕÒ"
 
 msgid "&Find"
 msgstr "²éÕÒ"
 

-#: ../src/generic/wizard.cpp:402
+#: ../src/generic/wizard.cpp:412

 msgid "&Finish"
 msgstr "Íê³É[&F]"
 
 msgid "&Finish"
 msgstr "Íê³É[&F]"
 

-#: ../src/generic/wizard.cpp:249
+#: ../src/generic/wizard.cpp:258

 #, fuzzy
 msgid "&Help"
 msgstr "°ïÖú"
 
 #, fuzzy
 msgid "&Help"
 msgstr "°ïÖú"
 

-#: ../src/generic/logg.cpp:485
+#: ../src/generic/logg.cpp:492

 msgid "&Log"
 msgstr "ÈÕÖ¾[&L]"
 
 msgid "&Log"
 msgstr "ÈÕÖ¾[&L]"
 

-#: ../src/univ/themes/win32.cpp:4539
+#: ../src/univ/themes/win32.cpp:4541

 msgid "&Move"
 msgstr ""
 
 msgid "&Move"
 msgstr ""
 

-#: ../src/msw/mdi.cpp:190
+#: ../src/msw/mdi.cpp:193 ../src/generic/mdig.cpp:115

 #, fuzzy
 msgid "&Next"
 msgstr "ÏÂÒ»¸ö[&N] >"
 
 #, fuzzy
 msgid "&Next"
 msgstr "ÏÂÒ»¸ö[&N] >"
 

-#: ../src/generic/wizard.cpp:257 ../src/generic/wizard.cpp:404
+#: ../src/generic/wizard.cpp:268 ../src/generic/wizard.cpp:414

 msgid "&Next >"
 msgstr "ÏÂÒ»¸ö[&N] >"
 
 msgid "&Next >"
 msgstr "ÏÂÒ»¸ö[&N] >"
 

-#: ../src/generic/tipdlg.cpp:176
+#: ../src/generic/tipdlg.cpp:215

 msgid "&Next Tip"
 msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
 
 msgid "&Next Tip"
 msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
 

-#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:266
+#: ../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]"
 
 msgid "&Redo"
 msgstr "Öظ´[&R]"
 

-#: ../src/common/cmdproc.cpp:249 ../src/common/cmdproc.cpp:276
+#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:282

 msgid "&Redo "
 msgstr "Öظ´[&R]"
 
 msgid "&Redo "
 msgstr "Öظ´[&R]"
 


@@ -164,37 +195,39 @@ msgstr "
 msgid "&Replace"
 msgstr ""
 
 msgid "&Replace"
 msgstr ""
 

-#: ../src/univ/themes/win32.cpp:4538
+#: ../src/univ/themes/win32.cpp:4540

 #, fuzzy
 msgid "&Restore"
 msgstr "Öظ´[&R]"
 
 #, fuzzy
 msgid "&Restore"
 msgstr "Öظ´[&R]"
 

-#: ../src/generic/logg.cpp:480 ../src/generic/logg.cpp:785
+#: ../src/generic/logg.cpp:487 ../src/generic/logg.cpp:818

 msgid "&Save..."
 msgstr "±£´æ[&S]..."
 
 msgid "&Save..."
 msgstr "±£´æ[&S]..."
 

-#: ../src/generic/tipdlg.cpp:173
+#: ../src/generic/tipdlg.cpp:212

 msgid "&Show tips at startup"
 msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
 
 msgid "&Show tips at startup"
 msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
 

-#: ../src/univ/themes/win32.cpp:4541
+#: ../src/univ/themes/win32.cpp:4543

 #, fuzzy
 msgid "&Size"
 msgstr "´óС"
 
 #, fuzzy
 msgid "&Size"
 msgstr "´óС"
 

-#: ../src/common/cmdproc.cpp:261
+#: ../src/msw/textctrl.cpp:1677 ../src/common/cmdproc.cpp:267

 msgid "&Undo"
 msgstr "»Ö¸´[&U]"
 
 msgid "&Undo"
 msgstr "»Ö¸´[&U]"
 

-#: ../src/common/cmdproc.cpp:236
+#: ../src/common/cmdproc.cpp:241

 msgid "&Undo "
 msgstr "»Ö¸´[&U]"
 
 msgid "&Undo "
 msgstr "»Ö¸´[&U]"
 

-#: ../src/msw/mdi.cpp:1317 ../src/msw/mdi.cpp:1324 ../src/msw/mdi.cpp:1349
+#: ../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]"
 
 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' ÓжîÍâµÄ '..', ºöÂÔÖ®."
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' ÓжîÍâµÄ '..', ºöÂÔÖ®."


@@ -205,12 +238,12 @@ msgstr "'%s' 
 msgid "'%s' is invalid"
 msgstr "'%s' ÊÇÎÞЧµÄ"
 
 msgid "'%s' is invalid"
 msgstr "'%s' ÊÇÎÞЧµÄ"
 

-#: ../src/common/cmdline.cpp:698
+#: ../src/common/cmdline.cpp:734

 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
 
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
 

-#: ../src/common/intl.cpp:401
+#: ../src/common/intl.cpp:402

 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."


@@ -240,18 +273,18 @@ msgstr "'%s' Ӧ
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
 
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
 

-#: ../src/html/helpfrm.cpp:709
+#: ../src/html/helpfrm.cpp:714

 msgid "(Help)"
 msgstr "(°ïÖú)"
 
 msgid "(Help)"
 msgstr "(°ïÖú)"
 

-#: ../src/html/helpfrm.cpp:310 ../src/html/helpfrm.cpp:840
-#: ../src/html/helpfrm.cpp:1433
+#: ../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
 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."
 msgid ""
 ", expected static, #include or #define\n"
 "whilst parsing resource."


@@ -259,11 +292,11 @@ msgstr ""
 ", ÆÚÍû static, #include »ò #define\n"
 "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
 
 ", ÆÚÍû static, #include »ò #define\n"
 "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
 

-#: ../src/generic/dirctrlg.cpp:698 ../src/generic/filedlgg.cpp:918
+#: ../src/generic/dirctrlg.cpp:700 ../src/generic/filedlgg.cpp:938

 msgid "."
 msgstr "."
 
 msgid "."
 msgstr "."
 

-#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:919
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:939

 msgid ".."
 msgstr ".."
 
 msgid ".."
 msgstr ".."
 


@@ -279,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 Ó¢´ç"
 
 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:282
+#: ../src/html/htmprint.cpp:279

 msgid ": file does not exist!"
 msgstr ": Îļþ²»´æÔÚ!"
 
 msgid ": file does not exist!"
 msgstr ": Îļþ²»´æÔÚ!"
 

-#: ../src/common/fontmap.cpp:626
+#: ../src/common/fontmap.cpp:670

 msgid ": unknown charset"
 msgstr ": δ֪×Ö·û¼¯"
 
 msgid ": unknown charset"
 msgstr ": δ֪×Ö·û¼¯"
 

-#: ../src/common/fontmap.cpp:857
+#: ../src/common/fontmap.cpp:898

 msgid ": unknown encoding"
 msgstr ": δ֪±àÂë"
 
 msgid ": unknown encoding"
 msgstr ": δ֪±àÂë"
 

-#: ../src/generic/wizard.cpp:254
+#: ../src/generic/wizard.cpp:263

 msgid "< &Back"
 msgstr "< ·µ»Ø[&B]"
 
 msgid "< &Back"
 msgstr "< ·µ»Ø[&B]"
 

-#: ../src/generic/filedlgg.cpp:493
+#: ../src/generic/filedlgg.cpp:534

 msgid "<DIR>"
 msgstr "<Ŀ¼>"
 
 msgid "<DIR>"
 msgstr "<Ŀ¼>"
 

-#: ../src/generic/filedlgg.cpp:460
-msgid "<DIR> "
-msgstr "<Ŀ¼> "
-
-#: ../src/generic/filedlgg.cpp:494
+#: ../src/generic/filedlgg.cpp:536

 msgid "<LINK>"
 msgstr "<Á¬½Ó>"
 
 msgid "<LINK>"
 msgstr "<Á¬½Ó>"
 

-#: ../src/generic/filedlgg.cpp:461
-msgid "<LINK> "
-msgstr "<Á¬½Ó>"
-
-#: ../src/html/helpfrm.cpp:992
+#: ../src/html/helpfrm.cpp:994
+#, fuzzy

 msgid ""
 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 "
 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 "


@@ -341,7 +367,7 @@ msgstr ""
 msgid "A3 sheet, 297 x 420 mm"
 msgstr "A3 Ö½ÕÅ, 297 x 420 ºÁÃ×"
 
 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 ºÁÃ×"
 
 msgid "A4 sheet, 210 x 297 mm"
 msgstr "A4 Ö½ÕÅ, 210 x 297 ºÁÃ×"
 


@@ -361,42 +387,37 @@ msgstr "ABCDEFGabcdefg12345"
 msgid "ASCII"
 msgstr ""
 
 msgid "ASCII"
 msgstr ""
 

-#: ../src/html/helpfrm.cpp:323
+#: ../src/html/helpfrm.cpp:328

 msgid "Add current page to bookmarks"
 msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ"
 
 msgid "Add current page to bookmarks"
 msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ"
 

-#: ../src/generic/colrdlgg.cpp:273
+#: ../src/generic/colrdlgg.cpp:287

 msgid "Add to custom colours"
 msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ"
 
 msgid "Add to custom colours"
 msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ"
 

-#: ../src/html/helpctrl.cpp:90
+#: ../src/html/helpctrl.cpp:100

 #, c-format
 msgid "Adding book %s"
 msgstr "ÕýÔÚÌí¼Ó¾í %s"
 
 #, c-format
 msgid "Adding book %s"
 msgstr "ÕýÔÚÌí¼Ó¾í %s"
 

-#: ../src/generic/prntdlgg.cpp:162
+#: ../src/generic/prntdlgg.cpp:160

 msgid "All"
 msgstr "ËùÓÐ"
 
 msgid "All"
 msgstr "ËùÓÐ"
 

-#: ../include/wx/defs.h:1732 ../src/generic/filedlgg.cpp:1041
+#: ../src/generic/filedlgg.cpp:1062

 msgid "All files (*)|*"
 msgstr "ËùÓÐÎļþ (*)|*"
 
 msgid "All files (*)|*"
 msgstr "ËùÓÐÎļþ (*)|*"
 

-#: ../include/wx/defs.h:1729
-#, fuzzy
-msgid "All files (*.*)|*.*"
-msgstr "ËùÓÐÎļþ (*)|*"
-

 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr "ÒѾ­²¦½ÓISP."
 
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr "ÒѾ­²¦½ÓISP."
 

-#: ../src/generic/logg.cpp:1051
+#: ../src/generic/logg.cpp:1109

 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
 
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
 

-#: ../src/common/fontmap.cpp:117
+#: ../src/common/fontmap.cpp:118

 msgid "Arabic (ISO-8859-6)"
 msgstr "°¢À­²®Óï (ISO-8859-6)"
 
 msgid "Arabic (ISO-8859-6)"
 msgstr "°¢À­²®Óï (ISO-8859-6)"
 


@@ -420,7 +441,7 @@ msgstr "B5 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
 
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
 

-#: ../src/common/imagbmp.cpp:467 ../src/common/imagbmp.cpp:483
+#: ../src/common/imagbmp.cpp:468 ../src/common/imagbmp.cpp:484

 #, fuzzy
 msgid "BMP: Couldn't allocate memory."
 msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
 #, fuzzy
 msgid "BMP: Couldn't allocate memory."
 msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."


@@ -452,28 +473,28 @@ msgstr "BMP: 
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 

-#: ../src/common/dlgcmn.cpp:170
+#: ../src/common/dlgcmn.cpp:233

 msgid "Backward"
 msgstr "Ïòºó"
 
 msgid "Backward"
 msgstr "Ïòºó"
 

-#: ../src/common/fontmap.cpp:124
+#: ../src/common/fontmap.cpp:125

 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 

-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fontmap.cpp:116

 msgid "Baltic (old) (ISO-8859-4)"
 msgstr "²¨Â޵ĺ£Óï (¾ÉµÄ) (ISO-8859-4)"
 
 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."
 
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s."
 

-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:232

 msgid "Bold"
 msgstr "´ÖÌå"
 
 msgid "Bold"
 msgstr "´ÖÌå"
 

-#: ../src/generic/prntdlgg.cpp:659
+#: ../src/generic/prntdlgg.cpp:645

 msgid "Bottom margin (mm):"
 msgstr "µ×±ß¾à (ºÁÃ×):"
 
 msgid "Bottom margin (mm):"
 msgstr "µ×±ß¾à (ºÁÃ×):"
 


@@ -481,7 +502,7 @@ msgstr "
 msgid "C sheet, 17 x 22 in"
 msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
 
 msgid "C sheet, 17 x 22 in"
 msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
 

-#: ../src/generic/logg.cpp:482
+#: ../src/generic/logg.cpp:489

 msgid "C&lear"
 msgstr "Çå³ý[&L]"
 
 msgid "C&lear"
 msgstr "Çå³ý[&L]"
 


@@ -505,43 +526,39 @@ msgstr "C6 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×"
 
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×"
 

-#: ../src/msw/thread.cpp:145
-msgid "Can not create mutex"
-msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
-
-#: ../src/common/filefn.cpp:1334
+#: ../src/common/filefn.cpp:1383

 #, fuzzy, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
 #, fuzzy, c-format
 msgid "Can not enumerate files '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 

-#: ../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'ÖеÄÎļþ"
 
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 

-#: ../src/mac/thread.cpp:455 ../src/msw/thread.cpp:761
+#: ../src/mac/thread.cpp:472 ../src/msw/thread.cpp:685

 #, c-format
 msgid "Can not resume thread %x"
 msgstr "²»Äָܻ´Ïß³Ì %x"
 
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "²»Äָܻ´Ïß³Ì %x"
 

-#: ../src/msw/thread.cpp:635
+#: ../src/msw/thread.cpp:559

 msgid "Can not start thread: error writing TLS."
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
 
 msgid "Can not start thread: error writing TLS."
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
 

-#: ../src/mac/thread.cpp:431 ../src/msw/thread.cpp:746
+#: ../src/mac/thread.cpp:448 ../src/msw/thread.cpp:670

 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "²»ÄܹÒÆðÏß³Ì %x"
 
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "²»ÄܹÒÆðÏß³Ì %x"
 

-#: ../src/msw/thread.cpp:1085
+#: ../src/msw/thread.cpp:1016

 msgid "Can not wait for thread termination"
 msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
 
 msgid "Can not wait for thread termination"
 msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
 

-#: ../src/common/cmdproc.cpp:238
+#: ../src/common/cmdproc.cpp:243

 msgid "Can't &Undo "
 msgstr "²»Äָܻ´[&U]"
 
 msgid "Can't &Undo "
 msgstr "²»Äָܻ´[&U]"
 

-#: ../src/common/image.cpp:1289
+#: ../src/common/image.cpp:1315

 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."


@@ -556,17 +573,17 @@ msgstr "
 msgid "Can't copy values of unsupported type %d."
 msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
 
 msgid "Can't copy values of unsupported type %d."
 msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
 

-#: ../src/msw/toplevel.cpp:305
+#: ../src/msw/toplevel.cpp:315

 #, fuzzy
 msgid "Can't create dialog using memory template"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
 #, fuzzy
 msgid "Can't create dialog using memory template"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 

-#: ../src/os2/toplevel.cpp:266
+#: ../src/os2/toplevel.cpp:369

 #, fuzzy, c-format
 msgid "Can't create dialog using template '%ul'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
 #, fuzzy, c-format
 msgid "Can't create dialog using template '%ul'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 

-#: ../src/msw/listctrl.cpp:318
+#: ../src/msw/listctrl.cpp:334

 msgid "Can't create list control window, check that comctl32.dll is installed."
 msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°."
 
 msgid "Can't create list control window, check that comctl32.dll is installed."
 msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°."
 


@@ -575,19 +592,11 @@ msgstr "
 msgid "Can't create registry key '%s'"
 msgstr "²»ÄÜ´´½¨×¢²á¼ü '%s'"
 
 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:498
-msgid "Can't create the inter-process write pipe"
-msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
-
-#: ../src/mac/thread.cpp:410 ../src/msw/thread.cpp:728
+#: ../src/mac/thread.cpp:427 ../src/msw/thread.cpp:652

 msgid "Can't create thread"
 msgstr "²»ÄÜ´´½¨½ø³Ì"
 
 msgid "Can't create thread"
 msgstr "²»ÄÜ´´½¨½ø³Ì"
 

-#: ../src/msw/window.cpp:2966
+#: ../src/msw/window.cpp:3062

 #, fuzzy, c-format
 msgid "Can't create window of class %s"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 #, fuzzy, c-format
 msgid "Can't create window of class %s"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"


@@ -662,11 +671,11 @@ msgstr "
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 
 msgid "Can't save image to file '%s': unknown extension."
 msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
 

-#: ../src/generic/logg.cpp:544 ../src/generic/logg.cpp:952
+#: ../src/generic/logg.cpp:551 ../src/generic/logg.cpp:985

 msgid "Can't save log contents to file."
 msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
 
 msgid "Can't save log contents to file."
 msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
 

-#: ../src/msw/thread.cpp:687
+#: ../src/msw/thread.cpp:611

 msgid "Can't set thread priority"
 msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
 
 msgid "Can't set thread priority"
 msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
 


@@ -675,156 +684,160 @@ msgstr "
 msgid "Can't set value of '%s'"
 msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
 
 msgid "Can't set value of '%s'"
 msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
 

-#: ../src/common/dlgcmn.cpp:183 ../src/generic/dcpsg.cpp:2269
-#: ../src/generic/dirdlgg.cpp:153 ../src/generic/filedlgg.cpp:1155
-#: ../src/generic/filedlgg.cpp:1174 ../src/generic/fontdlgg.cpp:257
-#: ../src/generic/prntdlgg.cpp:465 ../src/generic/progdlgg.cpp:211
-#: ../src/generic/proplist.cpp:511 ../src/gtk/filedlg.cpp:173
-#: ../src/gtk/fontdlg.cpp:141 ../src/html/helpfrm.cpp:974
-#: ../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 "È¡Ïû"
 
 msgid "Cancel"
 msgstr "È¡Ïû"
 

-#: ../contrib/src/xrc/xmlres.cpp:866 ../contrib/src/xrc/xmlres.cpp:907
+#: ../contrib/src/xrc/xmlres.cpp:969 ../contrib/src/xrc/xmlres.cpp:1010

 msgid "Cannot convert dialog units: dialog unknown."
 msgstr ""
 
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr ""
 

-#: ../src/common/strconv.cpp:900
+#: ../src/common/strconv.cpp:963

 #, fuzzy, c-format
 msgid "Cannot convert from encoding '%s'!"
 msgstr "λÖñàÂë (%d)"
 
 #, fuzzy, c-format
 msgid "Cannot convert from encoding '%s'!"
 msgstr "λÖñàÂë (%d)"
 

-#: ../src/msw/dialup.cpp:502
+#: ../src/msw/dialup.cpp:499

 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 

-#: ../contrib/src/xrc/xmlres.cpp:223
+#: ../contrib/src/xrc/xmlres.cpp:243

 #, fuzzy, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 
 #, fuzzy, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
 

-#: ../contrib/src/xrc/xmlres.cpp:921
+#: ../contrib/src/xrc/xmlres.cpp:1024

 #, fuzzy, c-format
 msgid "Cannot find font node '%s'."
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 
 #, fuzzy, c-format
 msgid "Cannot find font node '%s'."
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 

-#: ../src/msw/dialup.cpp:816
+#: ../src/msw/dialup.cpp:813

 msgid "Cannot find the location of address book file"
 msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
 
 msgid "Cannot find the location of address book file"
 msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
 

-#: ../src/unix/threadpsx.cpp:1200
+#: ../src/unix/threadpsx.cpp:1096

 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
 
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
 

-#: ../src/unix/utilsunx.cpp:897
+#: ../src/unix/utilsunx.cpp:865

 msgid "Cannot get the hostname"
 msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
 
 msgid "Cannot get the hostname"
 msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
 

-#: ../src/unix/utilsunx.cpp:933
+#: ../src/unix/utilsunx.cpp:901

 msgid "Cannot get the official hostname"
 msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
 
 msgid "Cannot get the official hostname"
 msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
 

-#: ../src/msw/dialup.cpp:910
+#: ../src/msw/dialup.cpp:907

 msgid "Cannot hang up - no active dialup connection."
 msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
 
 msgid "Cannot hang up - no active dialup connection."
 msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
 

-#: ../src/msw/app.cpp:248
+#: ../src/msw/app.cpp:250

 msgid "Cannot initialize OLE"
 msgstr "²»Äܳõʼ»¯ OLE"
 
 msgid "Cannot initialize OLE"
 msgstr "²»Äܳõʼ»¯ OLE"
 

-#: ../src/mgl/window.cpp:546
+#: ../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"
 
 #, fuzzy
 msgid "Cannot initialize display."
 msgstr "²»Äܳõʼ»¯ OLE"
 

-#: ../src/msw/volume.cpp:627
+#: ../src/msw/volume.cpp:634

 #, fuzzy, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
 #, fuzzy, c-format
 msgid "Cannot load icon from '%s'."
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 

-#: ../contrib/src/xrc/xmlres.cpp:336
+#: ../contrib/src/xrc/xmlres.cpp:356

 #, fuzzy, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
 
 #, fuzzy, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
 

-#: ../src/html/htmlfilt.cpp:171
+#: ../src/html/htmlfilt.cpp:164

 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "²»ÄÜ´ò¿ª HTML Îĵµ: %s"
 
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr "²»ÄÜ´ò¿ª HTML Îĵµ: %s"
 

-#: ../src/html/helpdata.cpp:579
+#: ../src/html/helpdata.cpp:584

 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "²»ÄÜ´ò¿ª HTML °ïÖú: %s"
 
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr "²»ÄÜ´ò¿ª HTML °ïÖú: %s"
 

-#: ../src/generic/helpext.cpp:101
+#: ../src/generic/helpext.cpp:100

 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 
 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr "²»ÄÜ´ò¿ª URL '%s'"
 

-#: ../src/html/helpdata.cpp:275
+#: ../src/html/helpdata.cpp:277

 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 

-#: ../contrib/src/xrc/xmlres.cpp:310
+#: ../contrib/src/xrc/xmlres.cpp:330

 #, fuzzy, c-format
 msgid "Cannot open file '%s'."
 msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
 
 #, 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´òÓ¡!"
 
 msgid "Cannot open file for PostScript printing!"
 msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!"
 

-#: ../src/html/helpdata.cpp:288
+#: ../src/html/helpdata.cpp:292

 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s"
 
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s"
 

-#: ../contrib/src/xrc/xmlres.cpp:854
+#: ../contrib/src/xrc/xmlres.cpp:957

 #, fuzzy, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
 #, fuzzy, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 

-#: ../contrib/src/xrc/xmlres.cpp:895
+#: ../contrib/src/xrc/xmlres.cpp:998

 #, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 
 #, fuzzy, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
 

-#: ../src/html/helpfrm.cpp:1265
+#: ../src/html/helpfrm.cpp:1293

 msgid "Cannot print empty page."
 msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
 
 msgid "Cannot print empty page."
 msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
 

-#: ../src/msw/volume.cpp:188 ../src/msw/volume.cpp:519
+#: ../src/msw/volume.cpp:195 ../src/msw/volume.cpp:526

 #, fuzzy, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 
 #, fuzzy, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
 

-#: ../src/unix/threadpsx.cpp:1181
+#: ../src/unix/threadpsx.cpp:1077

 msgid "Cannot retrieve thread scheduling policy."
 msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
 
 msgid "Cannot retrieve thread scheduling policy."
 msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
 

-#: ../src/unix/threadpsx.cpp:806
+#: ../src/unix/threadpsx.cpp:710

 msgid "Cannot start thread: error writing TLS"
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
 
 msgid "Cannot start thread: error writing TLS"
 msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
 

-#: ../src/html/helpfrm.cpp:406
+#: ../src/html/helpfrm.cpp:411

 msgid "Case sensitive"
 msgstr "´óСдÃô¸Ð"
 
 msgid "Case sensitive"
 msgstr "´óСдÃô¸Ð"
 

-#: ../src/common/fontmap.cpp:125
+#: ../src/common/fontmap.cpp:126

 #, fuzzy
 msgid "Celtic (ISO-8859-14)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 
 #, fuzzy
 msgid "Celtic (ISO-8859-14)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 

-#: ../src/common/fontmap.cpp:113
+#: ../src/common/fontmap.cpp:114

 #, fuzzy
 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
 
 #, fuzzy
 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
 

-#: ../src/msw/dialup.cpp:751
+#: ../src/msw/dialup.cpp:748

 msgid "Choose ISP to dial"
 msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
 
 msgid "Choose ISP to dial"
 msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
 


@@ -832,42 +845,48 @@ msgstr "ѡ
 msgid "Choose font"
 msgstr "Ñ¡Ôñ×ÖÌå"
 
 msgid "Choose font"
 msgstr "Ñ¡Ôñ×ÖÌå"
 

-#: ../src/msw/glcanvas.cpp:428
-msgid "ChoosePixelFormat failed."
-msgstr ""
+#: ../src/generic/mdig.cpp:112
+#, fuzzy
+msgid "Cl&ose"
+msgstr "¹Ø±Õ"

 
 

-#: ../src/generic/logg.cpp:482
+#: ../src/generic/logg.cpp:489

 msgid "Clear the log contents"
 msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
 
 msgid "Clear the log contents"
 msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
 

-#: ../src/common/prntbase.cpp:364 ../src/generic/progdlgg.cpp:356
-#: ../src/generic/proplist.cpp:506
+#: ../src/common/prntbase.cpp:428 ../src/generic/proplist.cpp:506
+#: ../src/generic/progdlgg.cpp:358

 msgid "Close"
 msgstr "¹Ø±Õ"
 
 msgid "Close"
 msgstr "¹Ø±Õ"
 

-#: ../src/univ/themes/win32.cpp:4547
+#: ../src/univ/themes/win32.cpp:4549

 msgid "Close\tAlt-F4"
 msgstr ""
 
 msgid "Close\tAlt-F4"
 msgstr ""
 

-#: ../src/generic/logg.cpp:484
+#: ../src/generic/mdig.cpp:113
+#, fuzzy
+msgid "Close All"
+msgstr "¹Ø±Õ"
+
+#: ../src/generic/logg.cpp:491

 msgid "Close this window"
 msgstr "¹Ø±Õ´°¿Ú"
 
 msgid "Close this window"
 msgstr "¹Ø±Õ´°¿Ú"
 

-#: ../src/generic/dirctrlg.cpp:547
+#: ../src/generic/dirctrlg.cpp:549

 #, fuzzy
 msgid "Computer"
 msgstr "¼ÆËã»ú"
 
 #, fuzzy
 msgid "Computer"
 msgstr "¼ÆËã»ú"
 

-#: ../src/common/fileconf.cpp:868
+#: ../src/common/fileconf.cpp:902

 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
 
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
 

-#: ../src/generic/filedlgg.cpp:1338 ../src/gtk/filedlg.cpp:72
+#: ../src/gtk/filedlg.cpp:72 ../src/generic/filedlgg.cpp:1411

 msgid "Confirm"
 msgstr "È·ÈÏ"
 
 msgid "Confirm"
 msgstr "È·ÈÏ"
 

-#: ../src/msw/mimetype.cpp:684
+#: ../src/msw/mimetype.cpp:689

 msgid "Confirm registry update"
 msgstr ""
 
 msgid "Confirm registry update"
 msgstr ""
 


@@ -875,21 +894,21 @@ msgstr ""
 msgid "Connecting..."
 msgstr "Á¬½Ó..."
 
 msgid "Connecting..."
 msgstr "Á¬½Ó..."
 

-#: ../src/html/helpfrm.cpp:346
+#: ../src/html/helpfrm.cpp:351

 msgid "Contents"
 msgstr "Ŀ¼"
 
 msgid "Contents"
 msgstr "Ŀ¼"
 

-#: ../src/common/strconv.cpp:579
+#: ../src/common/strconv.cpp:616

 #, c-format
 #, c-format

-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."

 msgstr ""
 
 msgstr ""
 

-#: ../src/generic/prntdlgg.cpp:195
+#: ../src/generic/prntdlgg.cpp:193

 msgid "Copies:"
 msgstr "·Ý:"
 
 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."
 #, c-format
 msgid "Could not find resource include file %s."
 msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."


@@ -898,12 +917,12 @@ msgstr "
 msgid "Could not find tab for id"
 msgstr "ÕÒ²»µ½idµÄ±êÇ©"
 
 msgid "Could not find tab for id"
 msgstr "ÕÒ²»µ½idµÄ±êÇ©"
 

-#: ../src/msw/textctrl.cpp:1799
+#: ../src/msw/textctrl.cpp:2050

 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
 
 #, 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"
 #, c-format
 msgid ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"


@@ -912,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)"
 
 "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"
 #, c-format
 msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"


@@ -921,23 +940,19 @@ msgstr ""
 "²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n"
 "»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)"
 
 "²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n"
 "»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)"
 

-#: ../src/common/prntbase.cpp:720
+#: ../src/common/prntbase.cpp:805

 msgid "Could not start document preview."
 msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ."
 
 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 "²»ÄÜÆô¶¯´òÓ¡."
 
 msgid "Could not start printing."
 msgstr "²»ÄÜÆô¶¯´òÓ¡."
 

-#: ../src/common/wincmn.cpp:1124
+#: ../src/common/wincmn.cpp:1167

 msgid "Could not transfer data to window"
 msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
 
 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."
 #: ../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."


@@ -952,40 +967,36 @@ msgstr "
 msgid "Couldn't create cursor."
 msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 
 msgid "Couldn't create cursor."
 msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
 

-#: ../src/common/dynlib.cpp:344 ../src/common/dynload.cpp:280
+#: ../src/common/dynlib.cpp:347 ../src/common/dynload.cpp:299

 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
 
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
 

-#: ../src/mac/thread.cpp:485 ../src/msw/thread.cpp:787
+#: ../src/mac/thread.cpp:502 ../src/msw/thread.cpp:711

 msgid "Couldn't get the current thread pointer"
 msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
 
 msgid "Couldn't get the current thread pointer"
 msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
 

-#: ../src/common/imagpng.cpp:298
+#: ../src/common/imagpng.cpp:302

 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ."
 
 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'."
 
 #, 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:696
+#: ../src/msw/listctrl.cpp:737

 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
 
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
 

-#: ../src/common/imagpng.cpp:334 ../src/common/imagpng.cpp:345
-#: ../src/common/imagpng.cpp:353
+#: ../src/common/imagpng.cpp:338 ../src/common/imagpng.cpp:349
+#: ../src/common/imagpng.cpp:357

 #, fuzzy
 msgid "Couldn't save PNG image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 
 #, fuzzy
 msgid "Couldn't save PNG image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 

-#: ../src/mac/thread.cpp:729 ../src/msw/thread.cpp:1175
+#: ../src/mac/thread.cpp:749 ../src/msw/thread.cpp:1091

 msgid "Couldn't terminate thread"
 msgstr "²»ÄÜÖÕÖ¹Ïß³Ì"
 
 msgid "Couldn't terminate thread"
 msgstr "²»ÄÜÖÕÖ¹Ïß³Ì"
 


@@ -993,15 +1004,19 @@ msgstr "
 msgid "Create directory"
 msgstr "´´½¨Ä¿Â¼"
 
 msgid "Create directory"
 msgstr "´´½¨Ä¿Â¼"
 

-#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1108
+#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1132

 msgid "Create new directory"
 msgstr "´´½¨ÐÂĿ¼"
 
 msgid "Create new directory"
 msgstr "´´½¨ÐÂĿ¼"
 

-#: ../src/generic/filedlgg.cpp:1119
+#: ../src/msw/textctrl.cpp:1680
+msgid "Cu&t"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1143

 msgid "Current directory:"
 msgstr "µ±Ç°Ä¿Â¼:"
 
 msgid "Current directory:"
 msgstr "µ±Ç°Ä¿Â¼:"
 

-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fontmap.cpp:117

 #, fuzzy
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
 #, fuzzy
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"


@@ -1010,36 +1025,31 @@ msgstr "
 msgid "D sheet, 22 x 34 in"
 msgstr "D Ö½ÕÅ, 22 x 34 Ó¢´ç"
 
 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 ÇëÇóʧ°Ü"
 
 msgid "DDE poke request failed"
 msgstr "DDE poke ÇëÇóʧ°Ü"
 

-#: ../src/common/imagbmp.cpp:618
-#, fuzzy
-msgid "DIB Header: Cannot deal with 4bit encoded yet."
-msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
-
-#: ../src/common/imagbmp.cpp:836
+#: ../src/common/imagbmp.cpp:917

 #, fuzzy
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
 
 #, fuzzy
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
 

-#: ../src/common/imagbmp.cpp:798
+#: ../src/common/imagbmp.cpp:879

 #, fuzzy
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
 
 #, fuzzy
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
 

-#: ../src/common/imagbmp.cpp:792
+#: ../src/common/imagbmp.cpp:873

 #, fuzzy
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
 
 #, fuzzy
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
 

-#: ../src/common/imagbmp.cpp:812
+#: ../src/common/imagbmp.cpp:893

 #, fuzzy
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
 
 #, fuzzy
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
 

-#: ../src/common/imagbmp.cpp:822
+#: ../src/common/imagbmp.cpp:903

 #, fuzzy
 msgid "DIB Header: Unknown encoding in file."
 msgstr "BMP: Îļþ±àÂëδ֪."
 #, fuzzy
 msgid "DIB Header: Unknown encoding in file."
 msgstr "BMP: Îļþ±àÂëδ֪."


@@ -1048,15 +1058,15 @@ msgstr "BMP: 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
 
 msgid "DL Envelope, 110 x 220 mm"
 msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
 

-#: ../src/generic/filedlgg.cpp:689
+#: ../src/generic/filedlgg.cpp:705

 msgid "Date"
 msgstr "ÈÕÆÚ"
 
 msgid "Date"
 msgstr "ÈÕÆÚ"
 

-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/generic/fontdlgg.cpp:222

 msgid "Decorative"
 msgstr "ÐÞÊÎ"
 
 msgid "Decorative"
 msgstr "ÐÞÊÎ"
 

-#: ../src/common/fontmap.cpp:386
+#: ../src/common/fontmap.cpp:392

 msgid "Default encoding"
 msgstr ""
 
 msgid "Default encoding"
 msgstr ""
 


@@ -1065,22 +1075,22 @@ msgstr ""
 msgid "Deleted stale lock file '%s'."
 msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
 
 msgid "Deleted stale lock file '%s'."
 msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
 

-#: ../src/msw/dialup.cpp:351
+#: ../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£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 

-#: ../src/os2/toplevel.cpp:264
+#: ../src/os2/toplevel.cpp:367

 #, fuzzy
 msgid "Did you forget to include wx/os2/wx.rc in your resources?"
 msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
 
 #, fuzzy
 msgid "Did you forget to include wx/os2/wx.rc in your resources?"
 msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
 

-#: ../src/generic/tipdlg.cpp:178
+#: ../src/generic/tipdlg.cpp:217

 msgid "Did you know..."
 msgstr "ÄãÖªµÀ..."
 
 msgid "Did you know..."
 msgstr "ÄãÖªµÀ..."
 

-#: ../src/common/filefn.cpp:1228
+#: ../src/common/filefn.cpp:1279

 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"


@@ -1094,18 +1104,17 @@ msgstr "Ŀ¼
 msgid "Directory does not exist"
 msgstr "Ŀ¼²»´æÔÚ"
 
 msgid "Directory does not exist"
 msgstr "Ŀ¼²»´æÔÚ"
 

-#: ../src/html/helpfrm.cpp:374
+#: ../src/html/helpfrm.cpp:379

 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
 
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
 

-#: ../src/html/helpfrm.cpp:540
+#: ../src/html/helpfrm.cpp:545

 msgid "Display options dialog"
 msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
 
 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"
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
 "\" ?\n"


@@ -1115,7 +1124,7 @@ msgid ""
 "%s %1"
 msgstr ""
 
 "%s %1"
 msgstr ""
 

-#: ../src/common/docview.cpp:438
+#: ../src/common/docview.cpp:441

 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"


@@ -1124,7 +1133,7 @@ msgstr "
 msgid "Done"
 msgstr "Íê³É"
 
 msgid "Done"
 msgstr "Íê³É"
 

-#: ../src/generic/progdlgg.cpp:368
+#: ../src/generic/progdlgg.cpp:370

 msgid "Done."
 msgstr "Íê³É¡£"
 
 msgid "Done."
 msgstr "Íê³É¡£"
 


@@ -1145,22 +1154,22 @@ msgstr "
 msgid "Entries found"
 msgstr "ÕÒµ½µÄÌõÄ¿"
 
 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'."
 
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
 msgstr "»·¾³±äÁ¿À©Õ¹Ê§°Ü:  '%c' ûÓгöÏÖÔÚλÖà %d / '%s'."
 

-#: ../src/generic/dirctrlg.cpp:702 ../src/generic/dirctrlg.cpp:720
-#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:825 ../src/generic/filedlgg.cpp:922
-#: ../src/generic/filedlgg.cpp:936 ../src/generic/filedlgg.cpp:949
-#: ../src/generic/filedlgg.cpp:1303 ../src/generic/filedlgg.cpp:1353
-#: ../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 "´íÎó"
 
 msgid "Error"
 msgstr "´íÎó"
 

-#: ../src/unix/utilsunx.cpp:1215 ../src/unix/utilsunx.cpp:1223
+#: ../src/unix/utilsunx.cpp:1193 ../src/unix/utilsunx.cpp:1201

 msgid "Error "
 msgstr "´íÎó"
 
 msgid "Error "
 msgstr "´íÎó"
 


@@ -1168,7 +1177,7 @@ msgstr "
 msgid "Error creating directory"
 msgstr "´´½¨Ä¿Â¼´íÎó"
 
 msgid "Error creating directory"
 msgstr "´´½¨Ä¿Â¼´íÎó"
 

-#: ../src/common/imagbmp.cpp:845
+#: ../src/common/imagbmp.cpp:926

 #, fuzzy
 msgid "Error in reading image DIB ."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 #, fuzzy
 msgid "Error in reading image DIB ."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."


@@ -1177,7 +1186,7 @@ msgstr "TIFF: 
 msgid "Error: "
 msgstr "´íÎó£º"
 
 msgid "Error: "
 msgstr "´íÎó£º"
 

-#: ../src/common/fontmap.cpp:114
+#: ../src/common/fontmap.cpp:115

 msgid "Esperanto (ISO-8859-3)"
 msgstr "Esperanto (ISO-8859-3)"
 
 msgid "Esperanto (ISO-8859-3)"
 msgstr "Esperanto (ISO-8859-3)"
 


@@ -1185,7 +1194,7 @@ msgstr "Esperanto (ISO-8859-3)"
 msgid "Estimated time : "
 msgstr "Ô¤ÆÚʱ¼ä£º"
 
 msgid "Estimated time : "
 msgstr "Ô¤ÆÚʱ¼ä£º"
 

-#: ../src/msw/utilsexc.cpp:594
+#: ../src/msw/utilsexc.cpp:702

 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"


@@ -1195,24 +1204,28 @@ 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
 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
 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
 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' ."
 
 msgid "Expected 'char' whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ."
 

-#: ../src/msw/dialup.cpp:845
+#: ../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"
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"


@@ -1221,7 +1234,7 @@ msgstr "
 msgid "Failed to access lock file."
 msgstr ""
 
 msgid "Failed to access lock file."
 msgstr ""
 

-#: ../src/common/filename.cpp:172
+#: ../src/common/filename.cpp:176

 #, fuzzy
 msgid "Failed to close file handle"
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 #, fuzzy
 msgid "Failed to close file handle"
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."


@@ -1235,11 +1248,11 @@ msgstr "ˢ
 msgid "Failed to close the clipboard."
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 
 msgid "Failed to close the clipboard."
 msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
 

-#: ../src/msw/dialup.cpp:785
+#: ../src/msw/dialup.cpp:782

 msgid "Failed to connect: missing username/password."
 msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
 
 msgid "Failed to connect: missing username/password."
 msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
 

-#: ../src/msw/dialup.cpp:731
+#: ../src/msw/dialup.cpp:728

 msgid "Failed to connect: no ISP to dial."
 msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
 
 msgid "Failed to connect: no ISP to dial."
 msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
 


@@ -1253,16 +1266,16 @@ msgstr "
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
 
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
 

-#: ../src/common/filefn.cpp:1081
+#: ../src/common/filefn.cpp:1131

 #, fuzzy, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/msw/dde.cpp:924
+#: ../src/msw/dde.cpp:948

 msgid "Failed to create DDE string"
 msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
 
 msgid "Failed to create DDE string"
 msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
 

-#: ../src/msw/mdi.cpp:421
+#: ../src/msw/mdi.cpp:425

 msgid "Failed to create MDI parent frame."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
 msgid "Failed to create MDI parent frame."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 


@@ -1270,21 +1283,36 @@ msgstr "
 msgid "Failed to create a status bar."
 msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 
 msgid "Failed to create a status bar."
 msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
 

-#: ../src/common/filename.cpp:705
+#: ../src/common/filename.cpp:721

 #, fuzzy
 msgid "Failed to create a temporary file name"
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
 #, 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'µÄÁ¬½Óʧ°Ü"
 
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü"
 

-#: ../src/msw/toplevel.cpp:303
+#: ../src/msw/toplevel.cpp:313

 #, fuzzy
 msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
 msgstr "´´½¨Ä¿Â¼Ê§°Ü"
 
 #, 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 ""
 #: ../src/generic/dirdlgg.cpp:201
 #, fuzzy, c-format
 msgid ""


@@ -1304,30 +1332,30 @@ msgstr "
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr ""
 
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr ""
 

-#: ../src/html/winpars.cpp:428
+#: ../src/html/winpars.cpp:468

 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
 
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
 

-#: ../src/mac/clipbrd.cpp:167 ../src/msw/clipbrd.cpp:139
+#: ../src/mac/clipbrd.cpp:168 ../src/msw/clipbrd.cpp:139

 msgid "Failed to empty the clipboard."
 msgstr "Çå¿Õ¼ôÌù°åʧ°Ü"
 
 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Ñ­»·Ê§°Ü"
 
 msgid "Failed to establish an advise loop with DDE server"
 msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ­»·Ê§°Ü"
 

-#: ../src/msw/dialup.cpp:623
+#: ../src/msw/dialup.cpp:620

 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
 

-#: ../src/unix/utilsunx.cpp:586 ../src/unix/utilsunx.cpp:614
+#: ../src/unix/utilsunx.cpp:540 ../src/unix/utilsunx.cpp:557

 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr "Ö´ÐÐ '%s'ʧ°Ü\n"
 
 #, 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"
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"


@@ -1336,7 +1364,7 @@ msgstr ""
 "²éÕÒXBM×ÊÔ´ %sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadBitmapData?"
 
 "²éÕÒ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"
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"


@@ -1345,7 +1373,7 @@ msgstr ""
 "²éÕÒXBM×ÊÔ´%sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadIconData?"
 
 "²éÕÒ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"
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"


@@ -1354,12 +1382,12 @@ msgstr ""
 "²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadBitmapData?"
 
 "²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n"
 "ûÓÐʹÓÃwxResourceLoadBitmapData?"
 

-#: ../src/msw/dialup.cpp:683
+#: ../src/msw/dialup.cpp:680

 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
 
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
 

-#: ../src/mac/clipbrd.cpp:118
+#: ../src/mac/clipbrd.cpp:119

 #, fuzzy
 msgid "Failed to get clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 #, fuzzy
 msgid "Failed to get clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"


@@ -1368,20 +1396,20 @@ msgstr "
 msgid "Failed to get data from the clipboard"
 msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
 
 msgid "Failed to get data from the clipboard"
 msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
 

-#: ../src/common/timercmn.cpp:282
+#: ../src/common/timercmn.cpp:294

 msgid "Failed to get the UTC system time."
 msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü."
 
 msgid "Failed to get the UTC system time."
 msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü."
 

-#: ../src/common/timercmn.cpp:233
+#: ../src/common/timercmn.cpp:245

 msgid "Failed to get the local system time"
 msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
 
 msgid "Failed to get the local system time"
 msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
 

-#: ../src/common/filefn.cpp:1460
+#: ../src/common/filefn.cpp:1512

 #, fuzzy
 msgid "Failed to get the working directory"
 msgstr "´´½¨Ä¿Â¼Ê§°Ü"
 
 #, fuzzy
 msgid "Failed to get the working directory"
 msgstr "´´½¨Ä¿Â¼Ê§°Ü"
 

-#: ../src/univ/theme.cpp:120
+#: ../src/univ/theme.cpp:122

 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr ""
 
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr ""
 


@@ -1389,38 +1417,38 @@ msgstr ""
 msgid "Failed to initialize MS HTML Help."
 msgstr ""
 
 msgid "Failed to initialize MS HTML Help."
 msgstr ""
 

-#: ../src/msw/glcanvas.cpp:730
+#: ../src/msw/glcanvas.cpp:729

 #, fuzzy
 msgid "Failed to initialize OpenGL"
 msgstr "²»Äܳõʼ»¯ OLE"
 
 #, fuzzy
 msgid "Failed to initialize OpenGL"
 msgstr "²»Äܳõʼ»¯ OLE"
 

-#: ../src/unix/threadpsx.cpp:987
+#: ../src/unix/threadpsx.cpp:887

 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³"
 
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³"
 

-#: ../src/msw/utils.cpp:726
+#: ../src/msw/utils.cpp:723

 #, fuzzy, c-format
 msgid "Failed to kill process %d"
 msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Failed to kill process %d"
 msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 

-#: ../src/common/iconbndl.cpp:67
+#: ../src/common/iconbndl.cpp:66

 #, fuzzy, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/msw/volume.cpp:340
+#: ../src/msw/volume.cpp:347

 #, fuzzy
 msgid "Failed to load mpr.dll."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
 #, fuzzy
 msgid "Failed to load mpr.dll."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 

-#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:196
+#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:198

 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 

-#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:125
+#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:127

 #, fuzzy, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
 #, fuzzy, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"


@@ -1435,17 +1463,17 @@ msgstr "ˢ
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
 

-#: ../src/common/filename.cpp:1632
+#: ../src/common/filename.cpp:1667

 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/common/filename.cpp:160
+#: ../src/common/filename.cpp:164

 #, fuzzy, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 
 #, fuzzy, c-format
 msgid "Failed to open '%s' for %s"
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 

-#: ../src/common/filename.cpp:727
+#: ../src/common/filename.cpp:743

 #, fuzzy
 msgid "Failed to open temporary file."
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
 #, fuzzy
 msgid "Failed to open temporary file."
 msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"


@@ -1463,16 +1491,21 @@ msgstr "
 msgid "Failed to read PID from lock file."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 
 msgid "Failed to read PID from lock file."
 msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
 

-#: ../src/unix/utilsunx.cpp:694
+#: ../src/unix/utilsunx.cpp:635

 msgid "Failed to redirect child process input/output"
 msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
 
 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'ʧ°Ü"
 
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
 

-#: ../src/common/fontmap.cpp:674
+#: ../src/common/fontmap.cpp:715

 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."


@@ -1501,12 +1534,12 @@ msgstr "
 msgid "Failed to retrieve data from the clipboard."
 msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
 
 msgid "Failed to retrieve data from the clipboard."
 msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
 

-#: ../src/common/filename.cpp:1698
+#: ../src/common/filename.cpp:1757

 #, fuzzy, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 

-#: ../src/msw/dialup.cpp:447
+#: ../src/msw/dialup.cpp:444

 msgid "Failed to retrieve text of RAS error message"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 
 msgid "Failed to retrieve text of RAS error message"
 msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
 


@@ -1514,7 +1547,7 @@ msgstr "
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü"
 
 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 ֪ͨʧ°Ü"
 
 msgid "Failed to send DDE advise notification"
 msgstr "·¢ËÍDDE advise ֪ͨʧ°Ü"
 


@@ -1527,35 +1560,35 @@ msgstr "
 msgid "Failed to set clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 
 msgid "Failed to set clipboard data."
 msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
 

-#: ../src/common/file.cpp:527
+#: ../src/common/file.cpp:526

 #, fuzzy
 msgid "Failed to set temporary file permissions"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #, fuzzy
 msgid "Failed to set temporary file permissions"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/unix/threadpsx.cpp:1317
+#: ../src/unix/threadpsx.cpp:1241 ../src/unix/threadpsx.cpp:1252

 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
 
 #, 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ʧ°Ü!"
 
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!"
 

-#: ../src/unix/threadpsx.cpp:1497
+#: ../src/unix/threadpsx.cpp:1425

 msgid "Failed to terminate a thread."
 msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü"
 
 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Ñ­»·Ê§°Ü"
 
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ­»·Ê§°Ü"
 

-#: ../src/msw/dialup.cpp:918
+#: ../src/msw/dialup.cpp:915

 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
 
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
 

-#: ../src/common/filename.cpp:1647
+#: ../src/common/filename.cpp:1682

 #, fuzzy, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 #, fuzzy, c-format
 msgid "Failed to touch the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"


@@ -1565,7 +1598,7 @@ msgstr "ˢ
 msgid "Failed to unlock lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 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'×¢²áʧ°Ü"
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü"


@@ -1575,7 +1608,7 @@ msgstr "
 msgid "Failed to write to lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 msgid "Failed to write to lock file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/generic/logg.cpp:372
+#: ../src/generic/logg.cpp:379

 msgid "Fatal error"
 msgstr "ÖÂÃü´íÎó"
 
 msgid "Fatal error"
 msgstr "ÖÂÃü´íÎó"
 


@@ -1583,7 +1616,7 @@ msgstr "
 msgid "Fatal error: "
 msgstr "ÖÂÃü´íÎó£º"
 
 msgid "Fatal error: "
 msgstr "ÖÂÃü´íÎó£º"
 

-#: ../src/mac/app.cpp:1217 ../src/msw/app.cpp:1306
+#: ../src/mac/app.cpp:1284 ../src/msw/app.cpp:1290

 msgid "Fatal error: exiting"
 msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
 
 msgid "Fatal error: exiting"
 msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
 


@@ -1592,12 +1625,12 @@ msgstr "
 msgid "File %s does not exist."
 msgstr ": Îļþ²»´æÔÚ!"
 
 msgid "File %s does not exist."
 msgstr ": Îļþ²»´æÔÚ!"
 

-#: ../src/generic/filedlgg.cpp:1335 ../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' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
 

-#: ../src/msw/filedlg.cpp:502
+#: ../src/msw/filedlg.cpp:518

 #, fuzzy, c-format
 msgid ""
 "File '%s' already exists.\n"
 #, fuzzy, c-format
 msgid ""
 "File '%s' already exists.\n"


@@ -1608,21 +1641,21 @@ msgstr "
 msgid "File couldn't be loaded."
 msgstr "Îļþ²»Äܱ»×°ÔØ"
 
 msgid "File couldn't be loaded."
 msgstr "Îļþ²»Äܱ»×°ÔØ"
 

-#: ../src/common/docview.cpp:292 ../src/common/docview.cpp:329
-#: ../src/common/docview.cpp:1409
+#: ../src/common/docview.cpp:295 ../src/common/docview.cpp:332
+#: ../src/common/docview.cpp:1424

 msgid "File error"
 msgstr "Îļþ´íÎó"
 
 msgid "File error"
 msgstr "Îļþ´íÎó"
 

-#: ../src/generic/dirctrlg.cpp:720 ../src/generic/filedlgg.cpp:936
+#: ../src/generic/dirctrlg.cpp:722 ../src/generic/filedlgg.cpp:956

 msgid "File name exists already."
 msgstr "ÎļþÃûÒÑ´æÔÚ"
 
 msgid "File name exists already."
 msgstr "ÎļþÃûÒÑ´æÔÚ"
 

-#: ../src/msw/filedlg.cpp:350
+#: ../src/msw/filedlg.cpp:366

 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Îļþ (%s)|%s"
 
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Îļþ (%s)|%s"
 

-#: ../src/html/helpfrm.cpp:362
+#: ../src/html/helpfrm.cpp:367

 msgid "Find"
 msgstr "²éÕÒ"
 
 msgid "Find"
 msgstr "²éÕÒ"
 


@@ -1634,34 +1667,30 @@ msgstr "
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "Folio, 8 1/2 x 13 in"
 
 msgid "Folio, 8 1/2 x 13 in"
 msgstr "Folio, 8 1/2 x 13 in"
 

-#: ../src/generic/fontdlgg.cpp:174
-msgid "Font"
-msgstr "×ÖÌå"
-
-#: ../src/html/helpfrm.cpp:960
+#: ../src/html/helpfrm.cpp:951

 msgid "Font size:"
 msgstr "×ÖÌå´óС:"
 
 msgid "Font size:"
 msgstr "×ÖÌå´óС:"
 

-#: ../src/unix/utilsunx.cpp:642
+#: ../src/unix/utilsunx.cpp:578

 msgid "Fork failed"
 msgstr "Fork ʧ°Ü"
 
 msgid "Fork failed"
 msgstr "Fork ʧ°Ü"
 

-#: ../src/common/dlgcmn.cpp:167
+#: ../src/common/dlgcmn.cpp:230

 msgid "Forward"
 msgstr "ÏòÇ°"
 
 #: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1360
 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 "ÕÒµ½"
 
 msgid "Found "
 msgstr "ÕÒµ½"
 

-#: ../src/html/helpfrm.cpp:661
+#: ../src/html/helpfrm.cpp:666

 #, c-format
 msgid "Found %i matches"
 msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
 
 #, c-format
 msgid "Found %i matches"
 msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
 

-#: ../src/generic/prntdlgg.cpp:186
+#: ../src/generic/prntdlgg.cpp:184

 msgid "From:"
 msgstr "´Ó:"
 
 msgid "From:"
 msgstr "´Ó:"
 


@@ -1702,27 +1731,31 @@ msgstr "
 msgid "GetUnusedColour:: No Unused Color in image "
 msgstr ""
 
 msgid "GetUnusedColour:: No Unused Color in image "
 msgstr ""
 

-#: ../src/html/helpfrm.cpp:506
+#: ../src/html/helpfrm.cpp:511

 msgid "Go back"
 msgstr "»ØÍË"
 
 msgid "Go back"
 msgstr "»ØÍË"
 

-#: ../src/html/helpfrm.cpp:509
+#: ../src/html/helpfrm.cpp:514

 msgid "Go forward"
 msgstr "ÏòÇ°"
 
 msgid "Go forward"
 msgstr "ÏòÇ°"
 

-#: ../src/html/helpfrm.cpp:514
+#: ../src/html/helpfrm.cpp:519

 msgid "Go one level up in document hierarchy"
 msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
 
 msgid "Go one level up in document hierarchy"
 msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
 

-#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1097
+#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1121

 msgid "Go to home directory"
 msgstr "½øÈëhomeĿ¼"
 
 msgid "Go to home directory"
 msgstr "½øÈëhomeĿ¼"
 

-#: ../src/generic/filedlgg.cpp:1089
+#: ../src/generic/filedlgg.cpp:1113

 msgid "Go to parent directory"
 msgstr "½øÈ븸Ŀ¼"
 
 msgid "Go to parent directory"
 msgstr "½øÈ븸Ŀ¼"
 

-#: ../src/common/fontmap.cpp:118
+#: ../src/common/prntbase.cpp:378
+msgid "Goto Page"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:119

 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Greek (ISO-8859-7)"
 


@@ -1731,7 +1764,7 @@ msgstr "Greek (ISO-8859-7)"
 msgid "HTML anchor %s does not exist."
 msgstr "HTML ê %s ²»´æÔÚ."
 
 msgid "HTML anchor %s does not exist."
 msgstr "HTML ê %s ²»´æÔÚ."
 

-#: ../src/html/helpfrm.cpp:1279
+#: ../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 (*.*)|*"
 msgid ""
 "HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|"
 "Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"


@@ -1739,16 +1772,17 @@ msgstr ""
 "HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ïÖú"
 "Êé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*"
 
 "HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ïÖú"
 "Êé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*"
 

-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fontmap.cpp:120

 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 
 msgid "Hebrew (ISO-8859-8)"
 msgstr "Hebrew (ISO-8859-8)"
 

-#: ../src/common/dlgcmn.cpp:179 ../src/generic/proplist.cpp:516
-#: ../src/html/helpfrm.cpp:240 ../src/msw/mdi.cpp:1313
+#: ../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 "°ïÖú"
 
 msgid "Help"
 msgstr "°ïÖú"
 

-#: ../src/html/helpfrm.cpp:933
+#: ../src/html/helpfrm.cpp:944

 msgid "Help Browser Options"
 msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
 
 msgid "Help Browser Options"
 msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
 


@@ -1756,37 +1790,37 @@ msgstr "
 msgid "Help Index"
 msgstr "°ïÖúË÷Òý"
 
 msgid "Help Index"
 msgstr "°ïÖúË÷Òý"
 

-#: ../src/html/helpfrm.cpp:1263
+#: ../src/html/helpfrm.cpp:1291

 msgid "Help Printing"
 msgstr "°ïÖú´òÓ¡"
 
 msgid "Help Printing"
 msgstr "°ïÖú´òÓ¡"
 

-#: ../src/html/helpctrl.cpp:44
+#: ../src/html/helpctrl.cpp:49

 #, c-format
 msgid "Help: %s"
 msgstr "°ïÖú: %s"
 
 #, c-format
 msgid "Help: %s"
 msgstr "°ïÖú: %s"
 

-#: ../src/common/imagbmp.cpp:858
+#: ../src/common/imagbmp.cpp:939

 #, fuzzy
 msgid "ICO: Error in reading mask DIB."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 
 #, fuzzy
 msgid "ICO: Error in reading mask DIB."
 msgstr "TIFF: ¶ÁͼÏñ´íÎó."
 

-#: ../src/common/imagbmp.cpp:960 ../src/common/imagbmp.cpp:1019
-#: ../src/common/imagbmp.cpp:1028 ../src/common/imagbmp.cpp:1039
-#: ../src/common/imagbmp.cpp:1083 ../src/common/imagbmp.cpp:1093
-#: ../src/common/imagbmp.cpp:1102
+#: ../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 writing the image file!"
 msgstr "TIFF:дͼÏñ´íÎó."
 
 #, fuzzy
 msgid "ICO: Error writing the image file!"
 msgstr "TIFF:дͼÏñ´íÎó."
 

-#: ../src/common/imagbmp.cpp:928
+#: ../src/common/imagbmp.cpp:1009

 msgid "ICO: Image too tall for an icon."
 msgstr ""
 
 msgid "ICO: Image too tall for an icon."
 msgstr ""
 

-#: ../src/common/imagbmp.cpp:934
+#: ../src/common/imagbmp.cpp:1015

 msgid "ICO: Image too wide for an icon."
 msgstr ""
 
 msgid "ICO: Image too wide for an icon."
 msgstr ""
 

-#: ../src/common/imagbmp.cpp:1167
+#: ../src/common/imagbmp.cpp:1248

 #, fuzzy
 msgid "ICO: Invalid icon index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 #, fuzzy
 msgid "ICO: Invalid icon index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."


@@ -1812,7 +1846,7 @@ msgid "IFF: unknown error!!!"
 msgstr "GIF: λÖôíÎó!!!"
 
 #: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
 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 ."
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."


@@ -1821,11 +1855,11 @@ msgstr "û
 msgid "Ill-formed resource file syntax."
 msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
 
 msgid "Ill-formed resource file syntax."
 msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
 

-#: ../src/generic/dirctrlg.cpp:702 ../src/generic/filedlgg.cpp:922
+#: ../src/generic/dirctrlg.cpp:704 ../src/generic/filedlgg.cpp:942

 msgid "Illegal directory name."
 msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
 
 msgid "Illegal directory name."
 msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
 

-#: ../src/generic/filedlgg.cpp:1303
+#: ../src/generic/filedlgg.cpp:1365

 msgid "Illegal file specification."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
 msgid "Illegal file specification."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 


@@ -1833,12 +1867,12 @@ msgstr "
 msgid "Image and Mask have different sizes"
 msgstr ""
 
 msgid "Image and Mask have different sizes"
 msgstr ""
 

-#: ../src/common/image.cpp:1064
+#: ../src/common/image.cpp:1067

 #, c-format
 msgid "Image file is not of type %d."
 msgstr ""
 
 #, c-format
 msgid "Image file is not of type %d."
 msgstr ""
 

-#: ../src/msw/textctrl.cpp:249
+#: ../src/msw/textctrl.cpp:270

 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"


@@ -1848,26 +1882,26 @@ msgstr "
 msgid "Impossible to get child process input"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
 msgid "Impossible to get child process input"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 

-#: ../src/common/filefn.cpp:1097
+#: ../src/common/filefn.cpp:1147

 #, fuzzy, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 
 #, fuzzy, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
 

-#: ../src/common/filefn.cpp:1111
+#: ../src/common/filefn.cpp:1161

 #, fuzzy, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 #, fuzzy, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/common/filefn.cpp:1161
+#: ../src/common/filefn.cpp:1212

 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
 
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
 

-#: ../src/html/helpfrm.cpp:387
+#: ../src/html/helpfrm.cpp:392

 msgid "Index"
 msgstr "Ë÷Òý"
 
 msgid "Index"
 msgstr "Ë÷Òý"
 

-#: ../src/common/fontmap.cpp:123
+#: ../src/common/fontmap.cpp:124

 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "Nordic (ISO-8859-10)"
 #, fuzzy
 msgid "Indian (ISO-8859-12)"
 msgstr "Nordic (ISO-8859-10)"


@@ -1876,17 +1910,17 @@ msgstr "Nordic (ISO-8859-10)"
 msgid "Invalid TIFF image index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 
 msgid "Invalid TIFF image index."
 msgstr "ÎÞЧTIFFͼÏñË÷Òý."
 

-#: ../contrib/src/xrc/xmlres.cpp:342
+#: ../contrib/src/xrc/xmlres.cpp:362

 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr ""
 
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr ""
 

-#: ../src/common/appcmn.cpp:327
+#: ../src/common/appcmn.cpp:398

 #, fuzzy, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 
 #, fuzzy, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 

-#: ../src/x11/app.cpp:227
+#: ../src/x11/app.cpp:218

 #, fuzzy, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
 #, fuzzy, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"


@@ -1901,7 +1935,7 @@ msgstr "
 msgid "Invalid regular expression '%s': %s"
 msgstr ""
 
 msgid "Invalid regular expression '%s': %s"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:228

 msgid "Italic"
 msgstr "бÌå"
 
 msgid "Italic"
 msgstr "бÌå"
 


@@ -1917,12 +1951,11 @@ msgstr "JPEG: 
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 
 msgid "JPEG: Couldn't save image."
 msgstr "JPEG: ²»Äܱ£´æͼÏñ."
 

-#: ../src/common/fontmap.cpp:127
+#: ../src/common/fontmap.cpp:128

 msgid "KOI8-R"
 msgstr "KOI8-R"
 
 msgid "KOI8-R"
 msgstr "KOI8-R"
 

-#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:438
-#: ../src/generic/prntdlgg.cpp:634
+#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:620

 msgid "Landscape"
 msgstr "ºáÏò"
 
 msgid "Landscape"
 msgstr "ºáÏò"
 


@@ -1930,7 +1963,7 @@ msgstr "
 msgid "Ledger, 17 x 11 in"
 msgstr "Ledger, 17 x 11 Ó¢´ç"
 
 msgid "Ledger, 17 x 11 in"
 msgstr "Ledger, 17 x 11 Ó¢´ç"
 

-#: ../src/generic/prntdlgg.cpp:646
+#: ../src/generic/prntdlgg.cpp:632

 msgid "Left margin (mm):"
 msgstr "×ó±ß¾à (ºÁÃ×):"
 
 msgid "Left margin (mm):"
 msgstr "×ó±ß¾à (ºÁÃ×):"
 


@@ -1946,16 +1979,21 @@ msgstr "Letter Small, 8 1/2 x 11 Ӣ
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
 
 msgid "Letter, 8 1/2 x 11 in"
 msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
 

-#: ../src/generic/fontdlgg.cpp:233
+#: ../src/generic/fontdlgg.cpp:231

 msgid "Light"
 msgstr "Çá"
 
 msgid "Light"
 msgstr "Çá"
 

-#: ../src/generic/filedlgg.cpp:1545 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:539
+#: ../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 "
 
 #, c-format
 msgid "Load %s file"
 msgstr "×°ÈëÎļþ %s "
 

+#: ../src/generic/filedlgg.cpp:1625
+#, fuzzy
+msgid "Load file"
+msgstr "×°ÈëÎļþ %s "
+

 #: ../src/html/htmlwin.cpp:282
 msgid "Loading : "
 msgstr "×°ÔØ:"
 #: ../src/html/htmlwin.cpp:282
 msgid "Loading : "
 msgstr "×°ÔØ:"


@@ -1968,12 +2006,12 @@ msgstr "װ
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
 
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
 

-#: ../src/generic/logg.cpp:547
+#: ../src/generic/logg.cpp:554

 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
 
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
 

-#: ../src/gtk/mdi.cpp:432
+#: ../src/gtk/mdi.cpp:433

 msgid "MDI child"
 msgstr "MDI×Ó´°¿Ú"
 
 msgid "MDI child"
 msgstr "MDI×Ó´°¿Ú"
 


@@ -1984,11 +2022,11 @@ msgid ""
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 
 "not installed on this machine. Please install it."
 msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
 

-#: ../src/univ/themes/win32.cpp:4545
+#: ../src/univ/themes/win32.cpp:4547

 msgid "Ma&ximize"
 msgstr ""
 
 msgid "Ma&ximize"
 msgstr ""
 

-#: ../src/unix/mimetype.cpp:2418
+#: ../src/unix/mimetype.cpp:2497

 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ."
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ."


@@ -1997,7 +2035,7 @@ msgstr "Mailcap 
 msgid "Match case"
 msgstr ""
 
 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'!"
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!"


@@ -2006,11 +2044,11 @@ msgstr "
 msgid "Metal theme"
 msgstr ""
 
 msgid "Metal theme"
 msgstr ""
 

-#: ../src/univ/themes/win32.cpp:4543
+#: ../src/univ/themes/win32.cpp:4545

 msgid "Mi&nimize"
 msgstr ""
 
 msgid "Mi&nimize"
 msgstr ""
 

-#: ../src/unix/mimetype.cpp:2078
+#: ../src/unix/mimetype.cpp:2118

 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr "Mime.ÀàÐÍÎļþ %s, ÐÐ %d: ûÓнáÊø·ûºÅµÄÒýÓÃ×Ö·û´®."
 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr "Mime.ÀàÐÍÎļþ %s, ÐÐ %d: ûÓнáÊø·ûºÅµÄÒýÓÃ×Ö·û´®."


@@ -2020,7 +2058,7 @@ msgstr "Mime.
 msgid "Mode %ix%i-%i not available."
 msgstr ""
 
 msgid "Mode %ix%i-%i not available."
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:223

 msgid "Modern"
 msgstr "ÏÖ´ú"
 
 msgid "Modern"
 msgstr "ÏÖ´ú"
 


@@ -2028,25 +2066,25 @@ msgstr "
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
 
 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:176
+#: ../src/common/dlgcmn.cpp:239

 msgid "More..."
 msgstr "¸ü¶à..."
 
 msgid "More..."
 msgstr "¸ü¶à..."
 

-#: ../src/generic/filedlgg.cpp:687
+#: ../src/generic/filedlgg.cpp:703

 msgid "Name"
 msgstr "Ãû³Æ"
 
 #: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282
 msgid "Name"
 msgstr "Ãû³Æ"
 
 #: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282

-#: ../src/generic/filedlgg.cpp:801 ../src/generic/filedlgg.cpp:810
+#: ../src/generic/filedlgg.cpp:817 ../src/generic/filedlgg.cpp:826

 msgid "NewName"
 msgstr "ÐÂÃû"
 
 msgid "NewName"
 msgstr "ÐÂÃû"
 

-#: ../src/html/helpfrm.cpp:520
+#: ../src/html/helpfrm.cpp:525

 msgid "Next page"
 msgstr "ÏÂÒ»Ò³"
 
 msgid "Next page"
 msgstr "ÏÂÒ»Ò³"
 

-#: ../src/common/dlgcmn.cpp:156 ../src/mac/msgdlg.cpp:78
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:78 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:219

 msgid "No"
 msgstr "·ñ"
 
 msgid "No"
 msgstr "·ñ"
 


@@ -2055,11 +2093,11 @@ msgid "No Unused Color in image being masked"
 msgstr ""
 
 #: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:965
 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¹¤¾ß!"
 
 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ͼ±êÉ豸!"
 
 msgid "No XPM icon facility available!"
 msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!"
 


@@ -2067,7 +2105,7 @@ msgstr "û
 msgid "No entries found."
 msgstr "ûÕÒµ½ÌõÄ¿"
 
 msgid "No entries found."
 msgstr "ûÕÒµ½ÌõÄ¿"
 

-#: ../src/common/fontmap.cpp:865
+#: ../src/common/fontmap.cpp:906

 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"


@@ -2079,7 +2117,7 @@ msgstr ""
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 

-#: ../src/common/fontmap.cpp:870
+#: ../src/common/fontmap.cpp:911

 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
 #, fuzzy, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"


@@ -2090,39 +2128,39 @@ msgstr ""
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 
 "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
 "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
 

-#: ../contrib/src/xrc/xmlres.cpp:522
+#: ../contrib/src/xrc/xmlres.cpp:557

 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr ""
 
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr ""
 

-#: ../src/common/image.cpp:1046 ../src/common/image.cpp:1089
+#: ../src/common/image.cpp:1049 ../src/common/image.cpp:1092

 msgid "No handler found for image type."
 msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
 
 msgid "No handler found for image type."
 msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
 

-#: ../src/common/image.cpp:1054 ../src/common/image.cpp:1097
-#: ../src/common/image.cpp:1131
+#: ../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 µÄͼÏñ´¦ÀíÆ÷."
 
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr "ûÓÐÀàÐÍ %d µÄͼÏñ´¦ÀíÆ÷."
 

-#: ../src/common/image.cpp:1115 ../src/common/image.cpp:1147
+#: ../src/common/image.cpp:1118 ../src/common/image.cpp:1150

 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
 
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
 

-#: ../src/html/helpfrm.cpp:650
+#: ../src/html/helpfrm.cpp:655

 msgid "No matching page found yet"
 msgstr "No matching page found yet"
 
 msgid "No matching page found yet"
 msgstr "No matching page found yet"
 

-#: ../src/common/fontmap.cpp:121
+#: ../src/common/fontmap.cpp:122

 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordic (ISO-8859-10)"
 
 msgid "Nordic (ISO-8859-10)"
 msgstr "Nordic (ISO-8859-10)"
 

-#: ../src/generic/fontdlgg.cpp:229 ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230

 msgid "Normal"
 msgstr "Õý³£"
 
 msgid "Normal"
 msgstr "Õý³£"
 

-#: ../src/html/helpfrm.cpp:942
+#: ../src/html/helpfrm.cpp:949

 msgid "Normal font:"
 msgstr "Normal font:"
 
 msgid "Normal font:"
 msgstr "Normal font:"
 


@@ -2130,44 +2168,44 @@ msgstr "Normal font:"
 msgid "Note, 8 1/2 x 11 in"
 msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç"
 
 msgid "Note, 8 1/2 x 11 in"
 msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç"
 

-#: ../src/common/dlgcmn.cpp:162 ../src/generic/dcpsg.cpp:2268
-#: ../src/generic/dirdlgg.cpp:151 ../src/generic/filedlgg.cpp:1154
-#: ../src/generic/filedlgg.cpp:1165 ../src/generic/fontdlgg.cpp:256
-#: ../src/generic/logg.cpp:732 ../src/generic/prntdlgg.cpp:464
-#: ../src/generic/proplist.cpp:499 ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:135 ../src/html/helpfrm.cpp:972
+#: ../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 "È·ÈÏ"
 
 msgid "OK"
 msgstr "È·ÈÏ"
 

-#: ../src/html/helpfrm.cpp:528 ../src/html/helpfrm.cpp:1274
+#: ../src/html/helpfrm.cpp:533 ../src/html/helpfrm.cpp:1302

 msgid "Open HTML document"
 msgstr "´ò¿ªHTMLÎĵµ"
 
 msgid "Open HTML document"
 msgstr "´ò¿ªHTMLÎĵµ"
 

-#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:825 ../src/generic/filedlgg.cpp:949
+#: ../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 "²»ÔÊÐíµÄ²Ù×÷."
 
 msgid "Operation not permitted."
 msgstr "²»ÔÊÐíµÄ²Ù×÷."
 

-#: ../src/common/cmdline.cpp:631
+#: ../src/common/cmdline.cpp:667

 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
 
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
 

-#: ../src/common/cmdline.cpp:651
+#: ../src/common/cmdline.cpp:687

 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
 
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
 

-#: ../src/common/cmdline.cpp:712
+#: ../src/common/cmdline.cpp:748

 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
 
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
 

-#: ../src/generic/prntdlgg.cpp:444
+#: ../src/generic/prntdlgg.cpp:432

 msgid "Options"
 msgstr "Ñ¡Ïî"
 
 msgid "Options"
 msgstr "Ñ¡Ïî"
 

-#: ../src/generic/prntdlgg.cpp:440 ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:621

 msgid "Orientation"
 msgstr "·½Ïò"
 
 msgid "Orientation"
 msgstr "·½Ïò"
 


@@ -2207,55 +2245,55 @@ msgstr "PNM: 
 msgid "PNM: File seems truncated."
 msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
 
 msgid "PNM: File seems truncated."
 msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
 

-#: ../src/common/prntbase.cpp:741
+#: ../src/common/prntbase.cpp:826

 #, c-format
 msgid "Page %d"
 msgstr "ҳ %d"
 
 #, c-format
 msgid "Page %d"
 msgstr "ҳ %d"
 

-#: ../src/common/prntbase.cpp:739
+#: ../src/common/prntbase.cpp:824

 #, c-format
 msgid "Page %d of %d"
 msgstr "ҳ %d / %d"
 
 #, c-format
 msgid "Page %d of %d"
 msgstr "ҳ %d / %d"
 

-#: ../src/generic/prntdlgg.cpp:601
+#: ../src/generic/prntdlgg.cpp:587

 msgid "Page Setup"
 msgstr "Ò³ÃæÉèÖÃ"
 
 msgid "Page Setup"
 msgstr "Ò³ÃæÉèÖÃ"
 

-#: ../src/generic/prntdlgg.cpp:163
+#: ../src/generic/prntdlgg.cpp:161

 msgid "Pages"
 msgstr "ҳ"
 
 msgid "Pages"
 msgstr "ҳ"
 

-#: ../src/generic/prntdlgg.cpp:552 ../src/generic/prntdlgg.cpp:623
-#: ../src/generic/prntdlgg.cpp:805
+#: ../src/generic/prntdlgg.cpp:538 ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:794

 msgid "Paper Size"
 msgstr "Ö½ÕÅ´óС"
 
 msgid "Paper Size"
 msgstr "Ö½ÕÅ´óС"
 

-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:612
-#: ../src/generic/prntdlgg.cpp:801
+#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:790

 msgid "Paper size"
 msgstr "Ö½ÕÅ´óС"
 
 msgid "Paper size"
 msgstr "Ö½ÕÅ´óС"
 

-#: ../src/generic/filedlgg.cpp:692
+#: ../src/generic/filedlgg.cpp:708

 msgid "Permissions"
 msgstr "ÔÊÐí"
 
 msgid "Permissions"
 msgstr "ÔÊÐí"
 

-#: ../src/unix/utilsunx.cpp:585 ../src/unix/utilsunx.cpp:613
+#: ../src/unix/utilsunx.cpp:441

 msgid "Pipe creation failed"
 msgstr "¹ÜµÀ´´½¨Ê§°Ü"
 
 msgid "Pipe creation failed"
 msgstr "¹ÜµÀ´´½¨Ê§°Ü"
 

-#: ../src/gtk/fontdlg.cpp:72
+#: ../src/gtk/fontdlg.cpp:71

 msgid "Please choose a valid font."
 msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
 
 msgid "Please choose a valid font."
 msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
 

-#: ../src/generic/filedlgg.cpp:1353 ../src/gtk/filedlg.cpp:80
+#: ../src/gtk/filedlg.cpp:80 ../src/generic/filedlgg.cpp:1418

 msgid "Please choose an existing file."
 msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
 
 msgid "Please choose an existing file."
 msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
 

-#: ../src/msw/dialup.cpp:752
+#: ../src/msw/dialup.cpp:749

 msgid "Please choose which ISP do you want to connect to"
 msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
 
 msgid "Please choose which ISP do you want to connect to"
 msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
 

-#: ../src/msw/listctrl.cpp:536
+#: ../src/msw/listctrl.cpp:550

 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"


@@ -2267,100 +2305,75 @@ msgstr ""
 msgid "Please wait while printing\n"
 msgstr ""
 
 msgid "Please wait while printing\n"
 msgstr ""
 

-#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:437
-#: ../src/generic/prntdlgg.cpp:633
+#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:619

 msgid "Portrait"
 msgstr "×ÝÏò"
 
 msgid "Portrait"
 msgstr "×ÝÏò"
 

-#: ../src/generic/dcpsg.cpp:388
-msgid "PostScript"
-msgstr "PostScript"
-
-#: ../src/generic/prntdlgg.cpp:271
+#: ../src/generic/prntdlgg.cpp:268

 msgid "PostScript file"
 msgstr "PostScriptÎļþ"
 
 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:964
+#: ../src/html/helpfrm.cpp:966

 msgid "Preview:"
 msgstr "Ô¤ÀÀ£º"
 
 msgid "Preview:"
 msgstr "Ô¤ÀÀ£º"
 

-#: ../src/html/helpfrm.cpp:517
+#: ../src/html/helpfrm.cpp:522

 msgid "Previous page"
 msgstr "ǰҳ"
 
 msgid "Previous page"
 msgstr "ǰҳ"
 

-#: ../src/generic/prntdlgg.cpp:112 ../src/generic/prntdlgg.cpp:126
+#: ../src/generic/prntdlgg.cpp:110 ../src/generic/prntdlgg.cpp:124

 msgid "Print"
 msgstr "´òÓ¡"
 
 msgid "Print"
 msgstr "´òÓ¡"
 

-#: ../src/common/docview.cpp:910
+#: ../src/common/docview.cpp:925

 msgid "Print Preview"
 msgstr "´òÓ¡Ô¤ÀÀ"
 
 msgid "Print Preview"
 msgstr "´òÓ¡Ô¤ÀÀ"
 

-#: ../src/common/prntbase.cpp:696 ../src/common/prntbase.cpp:720
+#: ../src/common/prntbase.cpp:781 ../src/common/prntbase.cpp:805

 msgid "Print Preview Failure"
 msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
 
 msgid "Print Preview Failure"
 msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
 

-#: ../src/generic/prntdlgg.cpp:171
+#: ../src/generic/prntdlgg.cpp:169

 msgid "Print Range"
 msgstr "´òÓ¡·¶Î§"
 
 msgid "Print Range"
 msgstr "´òÓ¡·¶Î§"
 

-#: ../src/generic/prntdlgg.cpp:405 ../src/generic/prntdlgg.cpp:412
+#: ../src/generic/prntdlgg.cpp:406

 msgid "Print Setup"
 msgstr "´òÓ¡ÉèÖÃ"
 
 msgid "Print Setup"
 msgstr "´òÓ¡ÉèÖÃ"
 

-#: ../src/generic/prntdlgg.cpp:452
+#: ../src/generic/prntdlgg.cpp:440

 msgid "Print in colour"
 msgstr "²ÊÉ«´òÓ¡"
 
 msgid "Print in colour"
 msgstr "²ÊÉ«´òÓ¡"
 

-#: ../src/generic/prntdlgg.cpp:454
+#: ../src/generic/prntdlgg.cpp:442

 msgid "Print spooling"
 msgstr "´òÓ¡¼ÙÍÑ»ú"
 
 msgid "Print spooling"
 msgstr "´òÓ¡¼ÙÍÑ»ú"
 

-#: ../src/html/helpfrm.cpp:534
+#: ../src/html/helpfrm.cpp:539

 msgid "Print this page"
 msgstr "´òÓ¡±¾Ò³"
 
 msgid "Print this page"
 msgstr "´òÓ¡±¾Ò³"
 

-#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:147

 msgid "Print to File"
 msgstr "´òÓ¡µ½Îļþ"
 
 msgid "Print to File"
 msgstr "´òÓ¡µ½Îļþ"
 

-#: ../src/common/prntbase.cpp:371
+#: ../src/common/prntbase.cpp:435

 msgid "Print..."
 msgstr "´òÓ¡..."
 
 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:357
-msgid "Printer Settings"
-msgstr "´òÓ¡»úÉèÖÃ"
-
-#: ../src/generic/prntdlgg.cpp:456
+#: ../src/generic/prntdlgg.cpp:444

 msgid "Printer command:"
 msgstr "´òÓ¡»úÃüÁî:"
 
 msgid "Printer command:"
 msgstr "´òÓ¡»úÃüÁî:"
 

-#: ../src/generic/prntdlgg.cpp:148
+#: ../src/generic/prntdlgg.cpp:146

 msgid "Printer options"
 msgstr "´òÓ¡»úÑ¡Ïî"
 
 msgid "Printer options"
 msgstr "´òÓ¡»úÑ¡Ïî"
 

-#: ../src/generic/prntdlgg.cpp:460
+#: ../src/generic/prntdlgg.cpp:448

 msgid "Printer options:"
 msgstr "´òÓ¡»úÑ¡Ïî:"
 
 msgid "Printer options:"
 msgstr "´òÓ¡»úÑ¡Ïî:"
 

-#: ../src/generic/prntdlgg.cpp:679
+#: ../src/generic/prntdlgg.cpp:665

 msgid "Printer..."
 msgstr "´òÓ¡»ú..."
 
 msgid "Printer..."
 msgstr "´òÓ¡»ú..."
 


@@ -2373,12 +2386,12 @@ msgstr "
 msgid "Printing Error"
 msgstr "´òÓ¡³ö´í"
 
 msgid "Printing Error"
 msgstr "´òÓ¡³ö´í"
 

-#: ../src/generic/printps.cpp:220
+#: ../src/generic/printps.cpp:221

 #, c-format
 msgid "Printing page %d..."
 msgstr "ÕýÔÚ´òÓ¡Ò³ %d..."
 
 #, c-format
 msgid "Printing page %d..."
 msgstr "ÕýÔÚ´òÓ¡Ò³ %d..."
 

-#: ../src/generic/printps.cpp:180
+#: ../src/generic/printps.cpp:181

 msgid "Printing..."
 msgstr "´òÓ¡..."
 
 msgid "Printing..."
 msgstr "´òÓ¡..."
 


@@ -2390,7 +2403,7 @@ msgstr "
 msgid "Quarto, 215 x 275 mm"
 msgstr "ËÄ¿ª, 215 x 275 mm"
 
 msgid "Quarto, 215 x 275 mm"
 msgstr "ËÄ¿ª, 215 x 275 mm"
 

-#: ../src/generic/logg.cpp:1053
+#: ../src/generic/logg.cpp:1111

 msgid "Question"
 msgstr "ÎÊÌâ"
 
 msgid "Question"
 msgstr "ÎÊÌâ"
 


@@ -2399,7 +2412,7 @@ msgstr "
 msgid "Read error on file '%s'"
 msgstr "¶ÁÎļþ '%s'³ö´í"
 
 msgid "Read error on file '%s'"
 msgstr "¶ÁÎļþ '%s'³ö´í"
 

-#: ../contrib/src/xrc/xmlres.cpp:497
+#: ../contrib/src/xrc/xmlres.cpp:532

 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr ""
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr ""


@@ -2438,7 +2451,7 @@ msgstr "
 msgid "Remaining time : "
 msgstr "Ê£Óàʱ¼ä : "
 
 msgid "Remaining time : "
 msgstr "Ê£Óàʱ¼ä : "
 

-#: ../src/html/helpfrm.cpp:324
+#: ../src/html/helpfrm.cpp:329

 msgid "Remove current page from bookmarks"
 msgstr "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³"
 
 msgid "Remove current page from bookmarks"
 msgstr "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³"
 


@@ -2451,45 +2464,46 @@ msgstr "
 msgid "Replace with:"
 msgstr ""
 
 msgid "Replace with:"
 msgstr ""
 

-#: ../contrib/src/xrc/xmlres.cpp:359
+#: ../contrib/src/xrc/xmlres.cpp:379

 msgid "Resource files must have same version number!"
 msgstr ""
 
 msgid "Resource files must have same version number!"
 msgstr ""
 

-#: ../src/generic/prntdlgg.cpp:658
+#: ../src/generic/prntdlgg.cpp:644

 msgid "Right margin (mm):"
 msgstr "Óұ߾à (ºÁÃ×):"
 
 msgid "Right margin (mm):"
 msgstr "Óұ߾à (ºÁÃ×):"
 

-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:221

 msgid "Roman"
 msgstr "ÂÞÂí"
 
 msgid "Roman"
 msgstr "ÂÞÂí"
 

-#: ../src/generic/filedlgg.cpp:1561 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:541
+#: ../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 "
 
 #, c-format
 msgid "Save %s file"
 msgstr "±£´æÎļþ %s "
 

-#: ../src/common/docview.cpp:245
+#: ../src/common/docview.cpp:248

 msgid "Save as"
 msgstr "Áí´æΪ"
 
 msgid "Save as"
 msgstr "Áí´æΪ"
 

-#: ../src/generic/logg.cpp:480
+#: ../src/generic/filedlgg.cpp:1640
+#, fuzzy
+msgid "Save file"
+msgstr "±£´æÎļþ %s "
+
+#: ../src/generic/logg.cpp:487

 msgid "Save log contents to file"
 msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
 
 msgid "Save log contents to file"
 msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
 

-#: ../src/mgl/window.cpp:132
-msgid "Screenshot captured: "
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/generic/fontdlgg.cpp:224

 msgid "Script"
 msgstr "Script"
 
 msgid "Script"
 msgstr "Script"
 

-#: ../src/html/helpfrm.cpp:408 ../src/html/helpfrm.cpp:423
+#: ../src/html/helpfrm.cpp:413 ../src/html/helpfrm.cpp:428

 msgid "Search"
 msgstr "ËÑË÷"
 
 msgid "Search"
 msgstr "ËÑË÷"
 

-#: ../src/html/helpfrm.cpp:410
+#: ../src/html/helpfrm.cpp:415

 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"


@@ -2505,15 +2519,15 @@ msgstr "
 msgid "Search for:"
 msgstr "ËÑË÷"
 
 msgid "Search for:"
 msgstr "ËÑË÷"
 

-#: ../src/html/helpfrm.cpp:789
+#: ../src/html/helpfrm.cpp:794

 msgid "Search in all books"
 msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
 
 msgid "Search in all books"
 msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
 

-#: ../src/html/helpfrm.cpp:650
+#: ../src/html/helpfrm.cpp:655

 msgid "Searching..."
 msgstr "ËÑË÷..."
 
 msgid "Searching..."
 msgstr "ËÑË÷..."
 

-#: ../src/generic/dirctrlg.cpp:549
+#: ../src/generic/dirctrlg.cpp:551

 msgid "Sections"
 msgstr "¶Î"
 
 msgid "Sections"
 msgstr "¶Î"
 


@@ -2522,49 +2536,45 @@ msgstr "
 msgid "Seek error on file '%s'"
 msgstr "Îļþ '%s'¶¨Î»´íÎó"
 
 msgid "Seek error on file '%s'"
 msgstr "Îļþ '%s'¶¨Î»´íÎó"
 

-#: ../src/common/docview.cpp:1525
+#: ../src/msw/textctrl.cpp:1685
+#, fuzzy
+msgid "Select &All"
+msgstr "Ñ¡ÔñÎļþ"
+
+#: ../src/common/docview.cpp:1540

 msgid "Select a document template"
 msgstr "Ñ¡ÔñÎĵµÄ£°å"
 
 msgid "Select a document template"
 msgstr "Ñ¡ÔñÎĵµÄ£°å"
 

-#: ../src/common/docview.cpp:1601
+#: ../src/common/docview.cpp:1616

 msgid "Select a document view"
 msgstr "Ñ¡ÔñÎĵµÊÓͼ"
 
 msgid "Select a document view"
 msgstr "Ñ¡ÔñÎĵµÊÓͼ"
 

-#: ../src/common/docview.cpp:1392 ../src/common/docview.cpp:1443
+#: ../src/common/docview.cpp:1407 ../src/common/docview.cpp:1458

 msgid "Select a file"
 msgstr "Ñ¡ÔñÎļþ"
 
 msgid "Select a file"
 msgstr "Ñ¡ÔñÎļþ"
 

-#: ../src/generic/dcpsg.cpp:2262
-msgid "Send to Printer"
-msgstr "·¢µ½´òÓ¡»ú"
-
-#: ../src/common/cmdline.cpp:668
+#: ../src/common/cmdline.cpp:704

 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
 
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
 

-#: ../src/msw/glcanvas.cpp:432
-#, fuzzy
-msgid "SetPixelFormat failed."
-msgstr "¹ÜµÀ´´½¨Ê§°Ü"
-
-#: ../src/common/dlgcmn.cpp:173
+#: ../src/common/dlgcmn.cpp:236

 msgid "Setup"
 msgstr "ÉèÖÃ"
 
 msgid "Setup"
 msgstr "ÉèÖÃ"
 

-#: ../src/generic/prntdlgg.cpp:154
+#: ../src/generic/prntdlgg.cpp:152

 msgid "Setup..."
 msgstr "ÉèÖÃ..."
 
 msgid "Setup..."
 msgstr "ÉèÖÃ..."
 

-#: ../src/msw/dialup.cpp:523
+#: ../src/msw/dialup.cpp:520

 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
 
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
 

-#: ../src/html/helpfrm.cpp:364
+#: ../src/html/helpfrm.cpp:369

 msgid "Show all"
 msgstr "ÏÔʾËùÓÐ"
 
 msgid "Show all"
 msgstr "ÏÔʾËùÓÐ"
 

-#: ../src/html/helpfrm.cpp:375
+#: ../src/html/helpfrm.cpp:380

 msgid "Show all items in index"
 msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
 
 msgid "Show all items in index"
 msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
 


@@ -2573,36 +2583,36 @@ msgstr "
 msgid "Show hidden directories"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 
 msgid "Show hidden directories"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 

-#: ../src/generic/filedlgg.cpp:1149 ../src/generic/filedlgg.cpp:1171
+#: ../src/generic/filedlgg.cpp:1175 ../src/generic/filedlgg.cpp:1197

 msgid "Show hidden files"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 
 msgid "Show hidden files"
 msgstr "ÏÔʾÒþ²ØÎļþ"
 

-#: ../src/html/helpfrm.cpp:501
+#: ../src/html/helpfrm.cpp:506

 msgid "Show/hide navigation panel"
 msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
 
 msgid "Show/hide navigation panel"
 msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
 

-#: ../src/generic/filedlgg.cpp:688
+#: ../src/generic/filedlgg.cpp:704

 msgid "Size"
 msgstr "´óС"
 
 msgid "Size"
 msgstr "´óС"
 

-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/fontdlgg.cpp:229

 msgid "Slant"
 msgstr "Çãб"
 
 msgid "Slant"
 msgstr "Çãб"
 

-#: ../src/common/docview.cpp:302
+#: ../src/common/docview.cpp:305

 msgid "Sorry, could not open this file for saving."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþÒԱ㱣´æ¡£"
 
 msgid "Sorry, could not open this file for saving."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþÒԱ㱣´æ¡£"
 

-#: ../src/common/docview.cpp:339 ../src/common/docview.cpp:352
-#: ../src/common/docview.cpp:1411
+#: ../src/common/docview.cpp:342 ../src/common/docview.cpp:355
+#: ../src/common/docview.cpp:1426

 msgid "Sorry, could not open this file."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
 
 msgid "Sorry, could not open this file."
 msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
 

-#: ../src/common/docview.cpp:309
+#: ../src/common/docview.cpp:312

 msgid "Sorry, could not save this file."
 msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
 
 msgid "Sorry, could not save this file."
 msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
 

-#: ../src/common/prntbase.cpp:696
+#: ../src/common/prntbase.cpp:781

 msgid "Sorry, not enough memory to create a preview."
 msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
 
 msgid "Sorry, not enough memory to create a preview."
 msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
 


@@ -2610,16 +2620,16 @@ msgstr "
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "Statement, 5 1/2 x 8 1/2 in"
 
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr "Statement, 5 1/2 x 8 1/2 in"
 

-#: ../src/generic/logg.cpp:597
+#: ../src/generic/logg.cpp:604

 msgid "Status: "
 msgstr "״̬£º"
 
 msgid "Status: "
 msgstr "״̬£º"
 

-#: ../contrib/src/xrc/xmlres.cpp:557
+#: ../contrib/src/xrc/xmlres.cpp:632

 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr ""
 
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr ""
 

-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:225

 msgid "Swiss"
 msgstr "ÈðÊ¿"
 
 msgid "Swiss"
 msgstr "ÈðÊ¿"
 


@@ -2648,15 +2658,15 @@ msgstr "TIFF:дͼ
 msgid "Tabloid, 11 x 17 in"
 msgstr "Tabloid, 11 x 17 Ó¢´ç"
 
 msgid "Tabloid, 11 x 17 in"
 msgstr "Tabloid, 11 x 17 Ó¢´ç"
 

-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:226

 msgid "Teletype"
 msgstr "µç´«´ò×Ö»ú"
 
 msgid "Teletype"
 msgstr "µç´«´ò×Ö»ú"
 

-#: ../src/common/docview.cpp:1526
+#: ../src/common/docview.cpp:1541

 msgid "Templates"
 msgstr "Ä£°å"
 
 msgid "Templates"
 msgstr "Ä£°å"
 

-#: ../src/common/fontmap.cpp:122
+#: ../src/common/fontmap.cpp:123

 msgid "Thai (ISO-8859-11)"
 msgstr "Ì©Óï (ISO-8859-11)"
 
 msgid "Thai (ISO-8859-11)"
 msgstr "Ì©Óï (ISO-8859-11)"
 


@@ -2664,7 +2674,7 @@ msgstr "̩
 msgid "The FTP server doesn't support passive mode."
 msgstr ""
 
 msgid "The FTP server doesn't support passive mode."
 msgstr ""
 

-#: ../src/common/fontmap.cpp:630
+#: ../src/common/fontmap.cpp:674

 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"


@@ -2675,7 +2685,7 @@ msgstr ""
 "´úÌæËü£¬»ò£¬Èç¹û²»ÄÜ\n"
 "±»Ìæ´úÑ¡Ôñ[È¡Ïû] "
 
 "´úÌæËü£¬»ò£¬Èç¹û²»ÄÜ\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' ²»´æÔÚ."
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr "¼ôÌù°å¸ñʽ '%d' ²»´æÔÚ."


@@ -2690,7 +2700,7 @@ msgstr ""
 "²»´æÔÚ\n"
 "ÏÖÔÚ´´½¨?"
 
 "²»´æÔÚ\n"
 "ÏÖÔÚ´´½¨?"
 

-#: ../src/common/docview.cpp:1789
+#: ../src/common/docview.cpp:1804

 #, fuzzy, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 #, fuzzy, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"


@@ -2699,12 +2709,12 @@ msgstr ""
 "Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
 "ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
 
 "Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
 "ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
 

-#: ../src/common/filename.cpp:884
+#: ../src/common/filename.cpp:900

 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 

-#: ../src/common/cmdline.cpp:802
+#: ../src/common/cmdline.cpp:846

 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."


@@ -2713,72 +2723,72 @@ msgstr "
 msgid "The text couldn't be saved."
 msgstr "Îı¾²»Äܱ»±£´æ¡£"
 
 msgid "The text couldn't be saved."
 msgstr "Îı¾²»Äܱ»±£´æ¡£"
 

-#: ../src/common/cmdline.cpp:781
+#: ../src/common/cmdline.cpp:825

 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
 
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
 

-#: ../src/msw/dialup.cpp:411
+#: ../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)."
 
 #, c-format
 msgid ""
 "The version of remote access service (RAS) installed on this machine is "
 "tooold, please upgrade (the following required function is missing: %s)."
 msgstr "°²×°ÔÚ±¾»úµÄÔ¶³Ì·ÃÎÊ·þÎñ(RAS)Ì«¾É, Çë¸üÐÂËü (ÏÂÁбØÐëµÃº¯Êýȱʧ: %s)."
 

-#: ../src/html/htmprint.cpp:548
+#: ../src/html/htmprint.cpp:540

 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr ""
 
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr ""
 

-#: ../src/msw/thread.cpp:1298
+#: ../src/msw/thread.cpp:1214

 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ"
 
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ"
 

-#: ../src/unix/threadpsx.cpp:1688
+#: ../src/unix/threadpsx.cpp:1596

 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
 
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
 

-#: ../src/msw/thread.cpp:1286
+#: ../src/msw/thread.cpp:1202

 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
 
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
 

-#: ../src/unix/threadpsx.cpp:1208
+#: ../src/unix/threadpsx.cpp:1104

 msgid "Thread priority setting is ignored."
 msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
 
 msgid "Thread priority setting is ignored."
 msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
 

-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:189

 msgid "Tile &Horizontally"
 msgstr ""
 
 msgid "Tile &Horizontally"
 msgstr ""
 

-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:190

 msgid "Tile &Vertically"
 msgstr ""
 
 msgid "Tile &Vertically"
 msgstr ""
 

-#: ../src/generic/filedlgg.cpp:690
+#: ../src/generic/filedlgg.cpp:706

 msgid "Time"
 msgstr "ʱ¼ä"
 
 msgid "Time"
 msgstr "ʱ¼ä"
 

-#: ../src/generic/tipdlg.cpp:163
+#: ../src/generic/tipdlg.cpp:202

 msgid "Tip of the Day"
 msgstr "ÿÈÕ¼¼ÇÉ"
 
 msgid "Tip of the Day"
 msgstr "ÿÈÕ¼¼ÇÉ"
 

-#: ../src/generic/tipdlg.cpp:139
+#: ../src/generic/tipdlg.cpp:140

 msgid "Tips not available, sorry!"
 msgstr "¶Ô²»Æð£¬Ã»ÓÐËùÐè¼¼ÇÉ!"
 
 msgid "Tips not available, sorry!"
 msgstr "¶Ô²»Æð£¬Ã»ÓÐËùÐè¼¼ÇÉ!"
 

-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:188

 msgid "To:"
 msgstr "µ½:"
 
 msgid "To:"
 msgstr "µ½:"
 

-#: ../src/generic/prntdlgg.cpp:647
+#: ../src/generic/prntdlgg.cpp:633

 msgid "Top margin (mm):"
 msgstr "ÉÏÒ³±ß¾à (ºÁÃ×):"
 
 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', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"


@@ -2787,7 +2797,7 @@ msgstr "
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú"
 
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú"
 

-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fontmap.cpp:121

 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
 


@@ -2800,7 +2810,7 @@ msgstr "US 
 msgid "Unable to open requested HTML document: %s"
 msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
 
 msgid "Unable to open requested HTML document: %s"
 msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
 

-#: ../src/generic/fontdlgg.cpp:252
+#: ../src/generic/fontdlgg.cpp:250

 msgid "Underline"
 msgstr "Ï»®Ïß"
 
 msgid "Underline"
 msgstr "Ï»®Ïß"
 


@@ -2808,54 +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/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 "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
 
 msgid "Unexpected end of file whilst parsing resource."
 msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
 

-#: ../src/common/cmdline.cpp:753
+#: ../src/common/cmdline.cpp:789

 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "ÒâÍâ²ÎÊý '%s'"
 
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr "ÒâÍâ²ÎÊý '%s'"
 

-#: ../src/common/fontmap.cpp:141
+#: ../src/common/fontmap.cpp:142

 msgid "Unicode 7 bit (UTF-7)"
 msgstr ""
 
 msgid "Unicode 7 bit (UTF-7)"
 msgstr ""
 

-#: ../src/common/fontmap.cpp:142
+#: ../src/common/fontmap.cpp:143

 msgid "Unicode 8 bit (UTF-8)"
 msgstr ""
 
 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"
 
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr "δ֪ DDE ´íÎó %08x"
 

-#: ../src/common/fontmap.cpp:403
+#: ../src/common/fontmap.cpp:406

 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "λÖñàÂë (%d)"
 
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr "λÖñàÂë (%d)"
 

-#: ../src/unix/mimetype.cpp:2125
+#: ../src/unix/mimetype.cpp:2165

 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'."
 
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'."
 

-#: ../src/common/cmdline.cpp:537
+#: ../src/common/cmdline.cpp:565

 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "δ֪longÑ¡Ïî '%s'"
 
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr "δ֪longÑ¡Ïî '%s'"
 

-#: ../src/common/cmdline.cpp:559
+#: ../src/common/cmdline.cpp:574 ../src/common/cmdline.cpp:595

 #, c-format
 msgid "Unknown option '%s'"
 msgstr "δ֪ѡÏî '%s'"
 
 #, c-format
 msgid "Unknown option '%s'"
 msgstr "δ֪ѡÏî '%s'"
 

-#: ../contrib/src/xrc/xmlres.cpp:627
+#: ../contrib/src/xrc/xmlres.cpp:701

 msgid "Unknown style flag "
 msgstr ""
 
 msgid "Unknown style flag "
 msgstr ""
 


@@ -2864,22 +2874,22 @@ msgstr ""
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
 
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
 

-#: ../src/common/cmdproc.cpp:233 ../src/common/cmdproc.cpp:248
-#: ../src/common/cmdproc.cpp:275
+#: ../src/common/cmdproc.cpp:238 ../src/common/cmdproc.cpp:254
+#: ../src/common/cmdproc.cpp:281

 msgid "Unnamed command"
 msgstr "δÃüÃûµÄÃüÁî"
 
 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."
 
 #, c-format
 msgid "Unrecognized style %s whilst parsing resource."
 msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s."
 

-#: ../src/mac/clipbrd.cpp:58 ../src/msw/clipbrd.cpp:273
+#: ../src/mac/clipbrd.cpp:59 ../src/msw/clipbrd.cpp:273

 #: ../src/msw/clipbrd.cpp:447
 msgid "Unsupported clipboard format."
 msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
 
 #: ../src/msw/clipbrd.cpp:447
 msgid "Unsupported clipboard format."
 msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
 

-#: ../src/common/appcmn.cpp:311
+#: ../src/common/appcmn.cpp:380

 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr ""
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr ""


@@ -2888,7 +2898,7 @@ msgstr ""
 msgid "Up"
 msgstr ""
 
 msgid "Up"
 msgstr ""
 

-#: ../src/common/cmdline.cpp:838
+#: ../src/common/cmdline.cpp:916

 #, c-format
 msgid "Usage: %s"
 msgstr "Ó÷¨: %s"
 #, c-format
 msgid "Usage: %s"
 msgstr "Ó÷¨: %s"


@@ -2897,23 +2907,23 @@ msgstr "
 msgid "Validation conflict"
 msgstr "ÑéÖ¤³åÍ»"
 
 msgid "Validation conflict"
 msgstr "ÑéÖ¤³åÍ»"
 

-#: ../src/generic/filedlgg.cpp:1079
+#: ../src/generic/filedlgg.cpp:1103

 msgid "View files as a detailed view"
 msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
 
 msgid "View files as a detailed view"
 msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
 

-#: ../src/generic/filedlgg.cpp:1072
+#: ../src/generic/filedlgg.cpp:1096

 msgid "View files as a list view"
 msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
 
 msgid "View files as a list view"
 msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
 

-#: ../src/common/docview.cpp:1602
+#: ../src/common/docview.cpp:1617

 msgid "Views"
 msgstr "ÊÓͼ"
 
 msgid "Views"
 msgstr "ÊÓͼ"
 

-#: ../src/unix/utilsunx.cpp:801
+#: ../src/unix/utilsunx.cpp:758

 msgid "Waiting for subprocess termination failed"
 msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü"
 
 msgid "Waiting for subprocess termination failed"
 msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü"
 

-#: ../src/common/docview.cpp:435 ../src/common/resource.cpp:124
+#: ../src/common/resource.cpp:124 ../src/common/docview.cpp:438

 msgid "Warning"
 msgstr "¾¯¸æ"
 
 msgid "Warning"
 msgstr "¾¯¸æ"
 


@@ -2921,16 +2931,16 @@ msgstr "
 msgid "Warning: "
 msgstr "¾¯¸æ:"
 
 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±êÇ©´¦ÀíÆ÷."
 
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr "¾¯¸æ: ÊÓͼ´Ó¿ÕÕ»ÖÐÒÆÈ¥HTML±êÇ©´¦ÀíÆ÷."
 

-#: ../src/common/fontmap.cpp:112
+#: ../src/common/fontmap.cpp:113

 #, fuzzy
 msgid "Western European (ISO-8859-1)"
 msgstr "West European (ISO-8859-1/Latin 1)"
 
 #, fuzzy
 msgid "Western European (ISO-8859-1)"
 msgstr "West European (ISO-8859-1/Latin 1)"
 

-#: ../src/common/fontmap.cpp:126
+#: ../src/common/fontmap.cpp:127

 #, fuzzy
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "West European new (ISO-8859-15/Latin 0)"
 #, fuzzy
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr "West European new (ISO-8859-15/Latin 0)"


@@ -2940,7 +2950,7 @@ msgstr "West European new (ISO-8859-15/Latin 0)"
 msgid "Whole word"
 msgstr "½öΪÕû×Ö"
 
 msgid "Whole word"
 msgstr "½öΪÕû×Ö"
 

-#: ../src/html/helpfrm.cpp:407
+#: ../src/html/helpfrm.cpp:412

 msgid "Whole words only"
 msgstr "½öΪÕû×Ö"
 
 msgid "Whole words only"
 msgstr "½öΪÕû×Ö"
 


@@ -2948,73 +2958,73 @@ msgstr "
 msgid "Win32 theme"
 msgstr ""
 
 msgid "Win32 theme"
 msgstr ""
 

-#: ../src/msw/utils.cpp:975
+#: ../src/msw/utils.cpp:983

 msgid "Win32s on Windows 3.1"
 msgstr "Win32s on Windows 3.1"
 
 msgid "Win32s on Windows 3.1"
 msgstr "Win32s on Windows 3.1"
 

-#: ../src/msw/utils.cpp:1007
+#: ../src/msw/utils.cpp:1015

 msgid "Windows 3.1"
 msgstr "Windows 3.1"
 
 msgid "Windows 3.1"
 msgstr "Windows 3.1"
 

-#: ../src/msw/utils.cpp:979
+#: ../src/msw/utils.cpp:987

 #, c-format
 msgid "Windows 9%c"
 msgstr "Windows 9%c"
 
 #, c-format
 msgid "Windows 9%c"
 msgstr "Windows 9%c"
 

-#: ../src/common/fontmap.cpp:138
+#: ../src/common/fontmap.cpp:139

 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows Arabic (CP 1256)"
 
 msgid "Windows Arabic (CP 1256)"
 msgstr "Windows Arabic (CP 1256)"
 

-#: ../src/common/fontmap.cpp:139
+#: ../src/common/fontmap.cpp:140

 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows Baltic (CP 1257)"
 
 msgid "Windows Baltic (CP 1257)"
 msgstr "Windows Baltic (CP 1257)"
 

-#: ../src/common/fontmap.cpp:132
+#: ../src/common/fontmap.cpp:133

 #, fuzzy
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 
 #, fuzzy
 msgid "Windows Central European (CP 1250)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 

-#: ../src/common/fontmap.cpp:129
+#: ../src/common/fontmap.cpp:130

 msgid "Windows Chinese Simplified (CP 936)"
 msgstr ""
 
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr ""
 

-#: ../src/common/fontmap.cpp:131
+#: ../src/common/fontmap.cpp:132

 #, fuzzy
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows Latin 1 (CP 1252)"
 
 #, fuzzy
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr "Windows Latin 1 (CP 1252)"
 

-#: ../src/common/fontmap.cpp:133
+#: ../src/common/fontmap.cpp:134

 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows Cyrillic (CP 1251)"
 
 msgid "Windows Cyrillic (CP 1251)"
 msgstr "Windows Cyrillic (CP 1251)"
 

-#: ../src/common/fontmap.cpp:135
+#: ../src/common/fontmap.cpp:136

 msgid "Windows Greek (CP 1253)"
 msgstr "Windows Greek (CP 1253)"
 
 msgid "Windows Greek (CP 1253)"
 msgstr "Windows Greek (CP 1253)"
 

-#: ../src/common/fontmap.cpp:137
+#: ../src/common/fontmap.cpp:138

 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 
 msgid "Windows Hebrew (CP 1255)"
 msgstr "Windows Ï£²®À´ (CP 1255)"
 

-#: ../src/common/fontmap.cpp:128
+#: ../src/common/fontmap.cpp:129

 #, fuzzy
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows Greek (CP 1253)"
 
 #, fuzzy
 msgid "Windows Japanese (CP 932)"
 msgstr "Windows Greek (CP 1253)"
 

-#: ../src/common/fontmap.cpp:130
+#: ../src/common/fontmap.cpp:131

 #, fuzzy
 msgid "Windows Korean (CP 949)"
 msgstr "Windows Greek (CP 1253)"
 
 #, fuzzy
 msgid "Windows Korean (CP 949)"
 msgstr "Windows Greek (CP 1253)"
 

-#: ../src/common/fontmap.cpp:136
+#: ../src/common/fontmap.cpp:137

 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
 
 msgid "Windows Turkish (CP 1254)"
 msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
 

-#: ../src/common/fontmap.cpp:134
+#: ../src/common/fontmap.cpp:135

 #, fuzzy
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows Latin 1 (CP 1252)"
 
 #, fuzzy
 msgid "Windows Western European (CP 1252)"
 msgstr "Windows Latin 1 (CP 1252)"
 

-#: ../src/common/fontmap.cpp:140
+#: ../src/common/fontmap.cpp:141

 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 
 msgid "Windows/DOS OEM (CP 437)"
 msgstr "Windows/DOS OEM (CP 437)"
 


@@ -3023,57 +3033,37 @@ msgstr "Windows/DOS OEM (CP 437)"
 msgid "Write error on file '%s'"
 msgstr "дÎļþ '%s'´íÎó"
 
 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/xml.cpp:529
+#: ../contrib/src/xrc/xml.cpp:530

 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr ""
 
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr ""
 

-#: ../src/common/xpmdecod.cpp:761
+#: ../src/common/xpmdecod.cpp:759

 msgid "XPM: Malformed pixel data!"
 msgstr ""
 
 msgid "XPM: Malformed pixel data!"
 msgstr ""
 

-#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:720
+#: ../src/common/xpmdecod.cpp:709 ../src/common/xpmdecod.cpp:718

 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
 
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
 

-#: ../contrib/src/xrc/xmlres.cpp:435
+#: ../contrib/src/xrc/xmlres.cpp:470

 #, fuzzy, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
 
 #, fuzzy, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
 

-#: ../contrib/src/xrc/xmlres.cpp:764 ../contrib/src/xrc/xmlres.cpp:774
+#: ../contrib/src/xrc/xmlres.cpp:861 ../contrib/src/xrc/xmlres.cpp:872

 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
 
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
 

-#: ../contrib/src/xrc/xh_dlg.cpp:52 ../contrib/src/xrc/xh_frame.cpp:57
-msgid "XRC resource: Cannot create dialog without instance."
-msgstr ""
-
-#: ../contrib/src/xrc/xmlres.cpp:744
+#: ../contrib/src/xrc/xmlres.cpp:821

 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr ""
 
 #, 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:151 ../src/mac/msgdlg.cpp:77
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:77 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:214

 msgid "Yes"
 msgstr "ÊÇ"
 
 msgid "Yes"
 msgstr "ÊÇ"
 


@@ -3081,19 +3071,19 @@ msgstr "
 msgid "You cannot add a new directory to this section."
 msgstr "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼."
 
 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 ""
 
 msgid "ZIP handler currently supports only local files!"
 msgstr ""
 

-#: ../src/common/docview.cpp:1938
+#: ../src/common/docview.cpp:1953

 msgid "[EMPTY]"
 msgstr "[¿Õ]"
 
 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Ìõ¼þ."
 
 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"
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"


@@ -3104,39 +3094,39 @@ msgstr ""
 "»ò´«¸øDDEMLº¯ÊýµÄÊÇ\n"
 "ÎÞЧµÄʵÀý±êʶ."
 
 "»ò´«¸øDDEMLº¯ÊýµÄÊÇ\n"
 "ÎÞЧµÄʵÀý±êʶ."
 

-#: ../src/msw/dde.cpp:993
+#: ../src/msw/dde.cpp:1017

 msgid "a client's attempt to establish a conversation has failed."
 msgstr "¿Í»§ÊÔͼ½¨Á¢µÄ»á»°ÒÑʧ°Ü."
 
 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 "ÄÚ´æ·ÖÅäʧ°Ü."
 
 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²ÎÊýÑé֤ʧ°Ü."
 
 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ÊÂÎñÇëÇóÒѳ¬Ê±."
 
 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ÊÂÎñÇëÇóÒѳ¬Ê±."
 
 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ÊÂÎñÇëÇóÒѳ¬Ê±."
 
 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ÊÂÎñÇëÇóÒѳ¬Ê±."
 
 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 "ÖÕÖ¹½¨ÒéÊÂÎñµÄÇëÇóÒѳ¬Ê±."
 
 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"
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"


@@ -3146,7 +3136,7 @@ msgstr ""
 "Òѱ»¿Í»§¶ËÖÕÖ¹µÄ»á»°, »ò·þÎñÆ÷\n"
 "ÔÚÍê³ÉÊÂÎñÇ°ÖÕÖ¹."
 
 "Òѱ»¿Í»§¶ËÖÕÖ¹µÄ»á»°, »ò·þÎñÆ÷\n"
 "ÔÚÍê³ÉÊÂÎñÇ°ÖÕÖ¹."
 

-#: ../src/msw/dde.cpp:996
+#: ../src/msw/dde.cpp:1020

 msgid "a transaction failed."
 msgstr "ÊÂÎñʧ°Ü."
 
 msgid "a transaction failed."
 msgstr "ÊÂÎñʧ°Ü."
 


@@ -3154,7 +3144,7 @@ msgstr "
 msgid "alt"
 msgstr "alt"
 
 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"
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"


@@ -3166,15 +3156,15 @@ msgstr ""
 "»ò³õʼ»¯ÎªAPPCMD_CLIENTONLYµÄÓ¦ÓóÌÐò\n"
 "ÊÓͼִÐзþÎñÆ÷ÊÂÎñ."
 
 "»ò³õʼ»¯Îª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ʧ°Ü. "
 
 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Öз¢ÉúÄÚ²¿´íÎó."
 
 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"
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"


@@ -3184,7 +3174,7 @@ msgstr ""
 "Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
 "»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
 
 "Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
 "»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
 

-#: ../src/common/fileconf.cpp:1556
+#: ../src/common/fileconf.cpp:1767

 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä."
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä."


@@ -3193,12 +3183,12 @@ msgstr "
 msgid "binary"
 msgstr ""
 
 msgid "binary"
 msgstr ""
 

-#: ../src/common/fontcmn.cpp:518
+#: ../src/common/fontcmn.cpp:548

 #, fuzzy
 msgid "bold"
 msgstr "´ÖÌå"
 
 #, fuzzy
 msgid "bold"
 msgstr "´ÖÌå"
 

-#: ../src/common/fontcmn.cpp:442
+#: ../src/common/fontcmn.cpp:472

 #, fuzzy
 msgid "bold "
 msgstr "´ÖÌå"
 #, fuzzy
 msgid "bold "
 msgstr "´ÖÌå"


@@ -3208,89 +3198,89 @@ msgstr "
 msgid "can't close file '%s'"
 msgstr "²»ÄܹرÕÎļþ '%s'"
 
 msgid "can't close file '%s'"
 msgstr "²»ÄܹرÕÎļþ '%s'"
 

-#: ../src/common/file.cpp:276
+#: ../src/common/file.cpp:275

 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
 
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
 

-#: ../src/common/file.cpp:554
+#: ../src/common/file.cpp:553

 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
 
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
 

-#: ../src/common/file.cpp:219
+#: ../src/common/file.cpp:215

 #, c-format
 msgid "can't create file '%s'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 
 #, c-format
 msgid "can't create file '%s'"
 msgstr "²»ÄÜ´´½¨Îļþ '%s'"
 

-#: ../src/common/fileconf.cpp:1025
+#: ../src/common/fileconf.cpp:1078

 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
 
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
 

-#: ../src/common/file.cpp:459
+#: ../src/common/file.cpp:458

 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "²»ÄÜÈ·¶¨ÊÇ·ñÒÑ´ïÎļþ %d µÄβ²¿"
 
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr "²»ÄÜÈ·¶¨ÊÇ·ñÒÑ´ïÎļþ %d µÄβ²¿"
 

-#: ../src/common/file.cpp:425
+#: ../src/common/file.cpp:424

 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
 
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
 

-#: ../src/msw/utils.cpp:374
+#: ../src/msw/utils.cpp:369

 msgid "can't find user's HOME, using current directory."
 msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
 
 msgid "can't find user's HOME, using current directory."
 msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
 

-#: ../src/common/file.cpp:339
+#: ../src/common/file.cpp:338

 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
 
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
 

-#: ../src/common/file.cpp:393
+#: ../src/common/file.cpp:392

 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÖ¸ÕëλÖÃ"
 
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÖ¸ÕëλÖÃ"
 

-#: ../src/common/fontmap.cpp:766
+#: ../src/common/fontmap.cpp:807

 msgid "can't load any font, aborting"
 msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
 
 msgid "can't load any font, aborting"
 msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
 

-#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:262
+#: ../src/common/file.cpp:261 ../src/common/ffile.cpp:77

 #, c-format
 msgid "can't open file '%s'"
 msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
 
 #, c-format
 msgid "can't open file '%s'"
 msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
 

-#: ../src/common/fileconf.cpp:388
+#: ../src/common/fileconf.cpp:397

 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
 
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
 

-#: ../src/common/fileconf.cpp:400
+#: ../src/common/fileconf.cpp:416

 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
 
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
 

-#: ../src/common/fileconf.cpp:905
+#: ../src/common/fileconf.cpp:949

 msgid "can't open user configuration file."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 
 msgid "can't open user configuration file."
 msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
 

-#: ../src/common/file.cpp:302
+#: ../src/common/file.cpp:301

 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
 

-#: ../src/common/file.cpp:549
+#: ../src/common/file.cpp:548

 #, c-format
 msgid "can't remove file '%s'"
 msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "²»ÄÜɾ³ýÎļþ '%s'"
 

-#: ../src/common/file.cpp:565
+#: ../src/common/file.cpp:564

 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
 
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
 

-#: ../src/common/file.cpp:379
+#: ../src/common/file.cpp:378

 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"


@@ -3300,16 +3290,16 @@ msgstr "
 msgid "can't write buffer '%s' to disk."
 msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
 
 msgid "can't write buffer '%s' to disk."
 msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
 

-#: ../src/common/file.cpp:324
+#: ../src/common/file.cpp:323

 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
 
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
 

-#: ../src/common/fileconf.cpp:912
+#: ../src/common/fileconf.cpp:965

 msgid "can't write user configuration file."
 msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
 
 msgid "can't write user configuration file."
 msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
 

-#: ../src/common/intl.cpp:363
+#: ../src/common/intl.cpp:364

 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ."
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ."


@@ -3318,33 +3308,33 @@ msgstr "
 msgid "ctrl"
 msgstr "ctrl"
 
 msgid "ctrl"
 msgstr "ctrl"
 

-#: ../src/common/cmdline.cpp:979
+#: ../src/common/cmdline.cpp:1056

 msgid "date"
 msgstr "ÈÕÆÚ"
 
 msgid "date"
 msgstr "ÈÕÆÚ"
 

-#: ../src/common/fontmap.cpp:413
+#: ../src/common/fontmap.cpp:416

 #, fuzzy
 msgid "default"
 msgstr "alt"
 
 #, fuzzy
 msgid "default"
 msgstr "alt"
 

-#: ../src/common/datetime.cpp:3237
+#: ../src/common/datetime.cpp:3363

 msgid "eighteenth"
 msgstr "µÚÊ®°Ë"
 
 msgid "eighteenth"
 msgstr "µÚÊ®°Ë"
 

-#: ../src/common/datetime.cpp:3227
+#: ../src/common/datetime.cpp:3353

 msgid "eighth"
 msgstr "µÚ°Ë"
 
 msgid "eighth"
 msgstr "µÚ°Ë"
 

-#: ../src/common/datetime.cpp:3230
+#: ../src/common/datetime.cpp:3356

 msgid "eleventh"
 msgstr "µÚʮһ"
 
 msgid "eleventh"
 msgstr "µÚʮһ"
 

-#: ../src/common/fileconf.cpp:1543
+#: ../src/common/fileconf.cpp:1753

 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
 
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
 

-#: ../src/msw/dialup.cpp:846
+#: ../src/msw/dialup.cpp:843

 msgid "establish"
 msgstr "½¨Á¢"
 
 msgid "establish"
 msgstr "½¨Á¢"
 


@@ -3353,153 +3343,150 @@ msgstr "
 msgid "failed to flush the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 
 msgid "failed to flush the file '%s'"
 msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
 

-#: ../src/common/datetime.cpp:3234
+#: ../src/common/datetime.cpp:3360

 msgid "fifteenth"
 msgstr "µÚÊ®Îå"
 
 msgid "fifteenth"
 msgstr "µÚÊ®Îå"
 

-#: ../src/common/datetime.cpp:3224
+#: ../src/common/datetime.cpp:3350

 msgid "fifth"
 msgstr "µÚÎå"
 
 msgid "fifth"
 msgstr "µÚÎå"
 

-#: ../src/common/fileconf.cpp:612
+#: ../src/common/fileconf.cpp:626

 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
 
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
 

-#: ../src/common/fileconf.cpp:641
+#: ../src/common/fileconf.cpp:655

 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
 
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
 

-#: ../src/common/fileconf.cpp:667
+#: ../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."
 
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "Îļþ '%s', ÐÐ %d: ¼ü '%s' µÚÒ»´Î³öÏÖÔÚÐÐ %d."
 

-#: ../src/common/fileconf.cpp:657
+#: ../src/common/fileconf.cpp:671

 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
 
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
 

-#: ../src/common/fileconf.cpp:580
+#: ../src/common/fileconf.cpp:594

 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
 
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
 

-#: ../src/common/datetime.cpp:3220
+#: ../src/common/datetime.cpp:3346

 msgid "first"
 msgstr "µÚÒ»"
 
 msgid "first"
 msgstr "µÚÒ»"
 

-#: ../src/common/datetime.cpp:3233
+#: ../src/common/datetime.cpp:3359

 msgid "fourteenth"
 msgstr "µÚÊ®ËÄ"
 
 msgid "fourteenth"
 msgstr "µÚÊ®ËÄ"
 

-#: ../src/common/datetime.cpp:3223
+#: ../src/common/datetime.cpp:3349

 msgid "fourth"
 msgstr "µÚËÄ"
 
 msgid "fourth"
 msgstr "µÚËÄ"
 

-#: ../src/common/appcmn.cpp:250
+#: ../src/common/appcmn.cpp:319

 msgid "generate verbose log messages"
 msgstr ""
 
 msgid "generate verbose log messages"
 msgstr ""
 

-#: ../src/common/timercmn.cpp:278
+#: ../src/common/timercmn.cpp:290

 msgid "gmtime() failed"
 msgstr "gmtime() ʧ°Ü"
 
 msgid "gmtime() failed"
 msgstr "gmtime() ʧ°Ü"
 

-#: ../src/msw/dialup.cpp:846
+#: ../src/mac/scrolbar.cpp:143
+#, c-format
+msgid "illegal scrollbar selector %d"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:843

 msgid "initiate"
 msgstr "³õʼ»¯"
 
 msgid "initiate"
 msgstr "³õʼ»¯"
 

-#: ../src/common/file.cpp:463
+#: ../src/common/file.cpp:462

 msgid "invalid eof() return value."
 msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
 
 msgid "invalid eof() return value."
 msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
 

-#: ../src/generic/logg.cpp:1067
+#: ../src/generic/logg.cpp:1125

 msgid "invalid message box return value"
 msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
 
 msgid "invalid message box return value"
 msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
 

-#: ../src/common/fontcmn.cpp:458 ../src/common/fontcmn.cpp:522
+#: ../src/common/fontcmn.cpp:488 ../src/common/fontcmn.cpp:552

 #, fuzzy
 msgid "italic"
 msgstr "бÌå"
 
 #, fuzzy
 msgid "italic"
 msgstr "бÌå"
 

-#: ../src/html/helpfrm.cpp:935
-msgid "large"
-msgstr "´ó"
-
-#: ../src/common/fontcmn.cpp:514
+#: ../src/common/fontcmn.cpp:544

 #, fuzzy
 msgid "light"
 msgstr "Çá"
 
 #, fuzzy
 msgid "light"
 msgstr "Çá"
 

-#: ../src/common/fontcmn.cpp:438
+#: ../src/common/fontcmn.cpp:468

 #, fuzzy
 msgid "light "
 msgstr "Çá"
 
 #, fuzzy
 msgid "light "
 msgstr "Çá"
 

-#: ../src/common/intl.cpp:614
+#: ../src/common/intl.cpp:615

 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
 
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
 

-#: ../src/common/intl.cpp:358
+#: ../src/common/intl.cpp:359

 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
 
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
 

-#: ../src/html/helpfrm.cpp:935
-msgid "medium"
-msgstr "ÖÐ"
-
-#: ../src/common/datetime.cpp:3385
+#: ../src/common/datetime.cpp:3511

 msgid "midnight"
 msgstr "ÎçÒ¹"
 
 msgid "midnight"
 msgstr "ÎçÒ¹"
 

-#: ../src/common/timercmn.cpp:274
+#: ../src/common/timercmn.cpp:286

 msgid "mktime() failed"
 msgstr "mktime()ʧ°Ü"
 
 msgid "mktime() failed"
 msgstr "mktime()ʧ°Ü"
 

-#: ../src/common/datetime.cpp:3238
+#: ../src/common/datetime.cpp:3364

 msgid "nineteenth"
 msgstr "µÚÊ®¾Å"
 
 msgid "nineteenth"
 msgstr "µÚÊ®¾Å"
 

-#: ../src/common/datetime.cpp:3228
+#: ../src/common/datetime.cpp:3354

 msgid "ninth"
 msgstr "µÚ¾Å"
 
 msgid "ninth"
 msgstr "µÚ¾Å"
 

-#: ../src/msw/dde.cpp:962
+#: ../src/msw/dde.cpp:986

 msgid "no DDE error."
 msgstr "ûÓÐDDE´íÎó"
 
 msgid "no DDE error."
 msgstr "ûÓÐDDE´íÎó"
 

-#: ../src/html/helpdata.cpp:559
+#: ../src/html/helpdata.cpp:574

 msgid "noname"
 msgstr "δÃû"
 
 msgid "noname"
 msgstr "δÃû"
 

-#: ../src/common/datetime.cpp:3384
+#: ../src/common/datetime.cpp:3510

 msgid "noon"
 msgstr "ÖÐÎç"
 
 msgid "noon"
 msgstr "ÖÐÎç"
 

-#: ../src/common/cmdline.cpp:978
+#: ../src/common/cmdline.cpp:1052

 msgid "num"
 msgstr "num"
 
 msgid "num"
 msgstr "num"
 

-#: ../src/common/filename.cpp:162
+#: ../src/common/filename.cpp:166

 msgid "reading"
 msgstr ""
 
 msgid "reading"
 msgstr ""
 

-#: ../src/msw/dde.cpp:1005
+#: ../src/msw/dde.cpp:1029

 msgid "reentrancy problem."
 msgstr "ÖØÈëÎÊÌâ"
 
 msgid "reentrancy problem."
 msgstr "ÖØÈëÎÊÌâ"
 

-#: ../src/common/datetime.cpp:3221
+#: ../src/common/datetime.cpp:3347

 msgid "second"
 msgstr "µÚ¶þ"
 
 msgid "second"
 msgstr "µÚ¶þ"
 

-#: ../src/common/datetime.cpp:3236
+#: ../src/common/datetime.cpp:3362

 msgid "seventeenth"
 msgstr "µÚÊ®Æß"
 
 msgid "seventeenth"
 msgstr "µÚÊ®Æß"
 

-#: ../src/common/datetime.cpp:3226
+#: ../src/common/datetime.cpp:3352

 msgid "seventh"
 msgstr "µÚÆß"
 
 msgid "seventh"
 msgstr "µÚÆß"
 


@@ -3507,82 +3494,78 @@ msgstr "
 msgid "shift"
 msgstr "shift"
 
 msgid "shift"
 msgstr "shift"
 

-#: ../src/common/appcmn.cpp:240
+#: ../src/common/appcmn.cpp:309

 msgid "show this help message"
 msgstr ""
 
 msgid "show this help message"
 msgstr ""
 

-#: ../src/common/datetime.cpp:3235
+#: ../src/common/datetime.cpp:3361

 msgid "sixteenth"
 msgstr "µÚÊ®Áù"
 
 msgid "sixteenth"
 msgstr "µÚÊ®Áù"
 

-#: ../src/common/datetime.cpp:3225
+#: ../src/common/datetime.cpp:3351

 msgid "sixth"
 msgstr "µÚÁù"
 
 msgid "sixth"
 msgstr "µÚÁù"
 

-#: ../src/html/helpfrm.cpp:935
-msgid "small"
-msgstr "С"
-
-#: ../src/common/appcmn.cpp:275
+#: ../src/common/appcmn.cpp:344

 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr ""
 
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr ""
 

-#: ../src/common/appcmn.cpp:261
+#: ../src/common/appcmn.cpp:330

 msgid "specify the theme to use"
 msgstr ""
 
 msgid "specify the theme to use"
 msgstr ""
 

-#: ../src/common/cmdline.cpp:977
+#: ../src/common/cmdline.cpp:1048

 msgid "str"
 msgstr "str"
 
 msgid "str"
 msgstr "str"
 

-#: ../src/common/datetime.cpp:3229
+#: ../src/common/datetime.cpp:3355

 msgid "tenth"
 msgstr "µÚÊ®"
 
 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λ±»ÉèÖÃ."
 
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr "¶ÔʼþµÄÏìÓ¦µ¼ÖÂDDE_FBUSYλ±»ÉèÖÃ."
 

-#: ../src/common/datetime.cpp:3222
+#: ../src/common/datetime.cpp:3348

 msgid "third"
 msgstr "µÚÈý"
 
 msgid "third"
 msgstr "µÚÈý"
 

-#: ../src/common/datetime.cpp:3232
+#: ../src/common/datetime.cpp:3358

 msgid "thirteenth"
 msgstr "µÚÊ®Èý"
 
 msgid "thirteenth"
 msgstr "µÚÊ®Èý"
 

-#: ../src/common/datetime.cpp:3064
+#: ../src/common/datetime.cpp:3190

 msgid "today"
 msgstr "½ñÌì"
 
 msgid "today"
 msgstr "½ñÌì"
 

-#: ../src/common/datetime.cpp:3066
+#: ../src/common/datetime.cpp:3192

 msgid "tomorrow"
 msgstr "Ã÷Ìì"
 
 msgid "tomorrow"
 msgstr "Ã÷Ìì"
 

-#: ../src/common/datetime.cpp:3231
+#: ../src/common/datetime.cpp:3357

 msgid "twelfth"
 msgstr "µÚÊ®¶þ"
 
 msgid "twelfth"
 msgstr "µÚÊ®¶þ"
 

-#: ../src/common/datetime.cpp:3239
+#: ../src/common/datetime.cpp:3365

 msgid "twentieth"
 msgstr "µÚ¶þÊ®"
 
 msgid "twentieth"
 msgstr "µÚ¶þÊ®"
 

-#: ../src/common/fontcmn.cpp:510
+#: ../src/common/fontcmn.cpp:540

 #, fuzzy
 msgid "underlined"
 msgstr "Ï»®Ïß"
 
 #, fuzzy
 msgid "underlined"
 msgstr "Ï»®Ïß"
 

-#: ../src/common/fontcmn.cpp:425
+#: ../src/common/fontcmn.cpp:455

 #, fuzzy
 msgid "underlined "
 msgstr "Ï»®Ïß"
 
 #, fuzzy
 msgid "underlined "
 msgstr "Ï»®Ïß"
 

-#: ../src/common/fileconf.cpp:1663
+#: ../src/common/fileconf.cpp:1887

 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
 
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
 

-#: ../src/generic/progdlgg.cpp:283
+#: ../src/generic/progdlgg.cpp:282

 msgid "unknown"
 msgstr "δ֪"
 
 msgid "unknown"
 msgstr "δ֪"
 


@@ -3591,7 +3574,7 @@ msgstr "δ֪"
 msgid "unknown error"
 msgstr "GIF: λÖôíÎó!!!"
 
 msgid "unknown error"
 msgstr "GIF: λÖôíÎó!!!"
 

-#: ../src/msw/dialup.cpp:450
+#: ../src/msw/dialup.cpp:447

 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "δ֪´íÎó(´íÎóºÅ %08x)."
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr "δ֪´íÎó(´íÎóºÅ %08x)."


@@ -3601,7 +3584,7 @@ msgstr "δ֪
 msgid "unknown line terminator"
 msgstr "δ֪ËÑË÷Ô­µã"
 
 msgid "unknown line terminator"
 msgstr "δ֪ËÑË÷Ô­µã"
 

-#: ../src/common/file.cpp:362
+#: ../src/common/file.cpp:361

 msgid "unknown seek origin"
 msgstr "δ֪ËÑË÷Ô­µã"
 
 msgid "unknown seek origin"
 msgstr "δ֪ËÑË÷Ô­µã"
 


@@ -3610,69 +3593,156 @@ msgstr "δ֪
 msgid "unknown-%d"
 msgstr "δ֪-%d"
 
 msgid "unknown-%d"
 msgstr "δ֪-%d"
 

-#: ../src/common/docview.cpp:404
+#: ../src/common/docview.cpp:407

 msgid "unnamed"
 msgstr "unnamed"
 
 msgid "unnamed"
 msgstr "unnamed"
 

-#: ../src/common/docview.cpp:1209
+#: ../src/common/docview.cpp:1224

 #, c-format
 msgid "unnamed%d"
 msgstr "unnamed%d"
 
 #, c-format
 msgid "unnamed%d"
 msgstr "unnamed%d"
 

-#: ../src/common/intl.cpp:368
+#: ../src/common/intl.cpp:369

 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
 
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
 

-#: ../src/html/helpfrm.cpp:935
-msgid "very large"
-msgstr "·Ç³£´ó"
-
-#: ../src/html/helpfrm.cpp:935
-msgid "very small"
-msgstr "·Ç³£Ð¡"
-
-#: ../src/common/filename.cpp:162
+#: ../src/common/filename.cpp:166

 #, fuzzy
 msgid "writing"
 msgstr "´òÓ¡"
 
 #, fuzzy
 msgid "writing"
 msgstr "´òÓ¡"
 

-#: ../src/common/dynlib.cpp:333
+#: ../src/common/dynlib.cpp:336

 #, c-format
 msgid "wxDllLoader failed to GetSymbol '%s'"
 msgstr ""
 
 #, c-format
 msgid "wxDllLoader failed to GetSymbol '%s'"
 msgstr ""
 

-#: ../src/common/dynload.cpp:270
+#: ../src/common/dynload.cpp:282

 #, c-format
 msgid "wxDynamicLibrary failed to GetSymbol '%s'"
 msgstr ""
 
 #, c-format
 msgid "wxDynamicLibrary failed to GetSymbol '%s'"
 msgstr ""
 

-#: ../src/common/timercmn.cpp:323
+#: ../src/common/timercmn.cpp:335

 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay ʧ°Ü."
 
 msgid "wxGetTimeOfDay failed."
 msgstr "wxGetTimeOfDay ʧ°Ü."
 

-#: ../src/common/socket.cpp:392 ../src/common/socket.cpp:446
+#: ../src/common/socket.cpp:394 ../src/common/socket.cpp:448

 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsgÖÐÎÞЧµÄÇ©Ãû."
 
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr "wxSocket: ReadMsgÖÐÎÞЧµÄÇ©Ãû."
 

-#: ../src/common/socket.cpp:967
+#: ../src/common/socket.cpp:975

 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: δ֪ʼþ!."
 
 msgid "wxSocket: unknown event!."
 msgstr "wxSocket: δ֪ʼþ!."
 

-#: ../src/motif/app.cpp:580
+#: ../src/motif/app.cpp:586

 #, c-format
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
 #, c-format
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 

-#: ../src/x11/app.cpp:261
+#: ../src/x11/app.cpp:245

 #, fuzzy
 msgid "wxWindows could not open display. Exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 
 #, fuzzy
 msgid "wxWindows could not open display. Exiting."
 msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ."
 

-#: ../src/common/datetime.cpp:3065
+#: ../src/common/datetime.cpp:3191

 msgid "yesterday"
 msgstr "×òÌì"
 
 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"
 #~ msgstr "ÖÂÃü´íÎó"


@@ -3813,9 +3883,5 @@ msgstr "
 #~ msgid "No XPM facility available!"
 #~ msgstr "ûÓпÉÓõÄXPMÉ豸!"
 
 #~ msgid "No XPM facility available!"
 #~ msgstr "ûÓпÉÓõÄXPMÉ豸!"
 

-#, fuzzy
-#~ msgid "..."
-#~ msgstr ".."
-

 #~ msgid "Cyrillic (Latin 5)"
 #~ msgstr "˹À­·òÓï (Latin 5)"
 #~ msgid "Cyrillic (Latin 5)"
 #~ msgstr "˹À­·òÓï (Latin 5)"