msgid ""
msgstr ""
"Project-Id-Version: wxWindows-2.2.2\n"
-"POT-Creation-Date: 2001-12-17 16:47+0100\n"
+"POT-Creation-Date: 2002-06-03 21:07+0200\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"
"Content-Type: text/plain; charset=GB2312\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: ../src/generic/dirctrlg.cpp:1303 ../src/generic/dirdlgg.cpp:544
-msgid ""
-"\n"
-"(Do you have the required permissions?)"
-msgstr ""
-"\n"
-"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
-
-#: ../src/generic/dirctrlg.cpp:1290 ../src/generic/dirdlgg.cpp:531
-msgid ""
-"\n"
-"does not exist\n"
-"Create it now?"
-msgstr ""
-"\n"
-"²»´æÔÚ\n"
-"ÏÖÔÚ´´½¨?"
-
-#: ../src/common/log.cpp:241
+#: ../src/common/log.cpp:304
#, c-format
msgid " (error %ld: %s)"
msgstr " (´íÎó %ld: %s)"
-#: ../src/common/docview.cpp:1205
+#: ../src/common/docview.cpp:1227
msgid " - "
msgstr " - "
-#: ../src/html/htmprint.cpp:507
+#: ../src/html/htmprint.cpp:505
msgid " Preview"
msgstr "Ô¤ÀÀ"
-#: ../src/generic/filedlgg.cpp:439
+#: ../src/generic/filedlgg.cpp:465
msgid " bytes "
msgstr "×Ö½Ú"
msgid "#define %s must be an integer."
msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý."
-#: ../src/html/helpfrm.cpp:854 ../src/html/helpfrm.cpp:855
-#: ../src/html/helpfrm.cpp:1447 ../src/html/helpfrm.cpp:1477
+#: ../src/html/helpfrm.cpp:772 ../src/html/helpfrm.cpp:773
+#: ../src/html/helpfrm.cpp:1376 ../src/html/helpfrm.cpp:1406
#, c-format
msgid "%i of %i"
msgstr "%i of %i"
-#: ../src/common/cmdline.cpp:772
+#: ../src/common/cmdline.cpp:776
#, c-format
msgid "%s (or %s)"
msgstr "%s (»ò %s)"
-#: ../src/generic/logg.cpp:233
+#: ../src/generic/logg.cpp:239
#, c-format
msgid "%s Error"
msgstr "%s ´íÎó"
-#: ../src/generic/logg.cpp:241
+#: ../src/generic/logg.cpp:247
#, c-format
msgid "%s Information"
msgstr "%s ÐÅÏ¢"
-#: ../src/generic/logg.cpp:237
+#: ../src/generic/logg.cpp:243
#, c-format
msgid "%s Warning"
msgstr "%s ¾¯¸æ"
msgid "%s: ill-formed resource file syntax."
msgstr "%s: ²»Á¼×ÊÔ´ÎļþÓï·¨."
-#: ../src/msw/mdi.cpp:181
+#: ../src/msw/mdi.cpp:189
msgid "&Arrange Icons"
msgstr ""
-#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:239
+#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:260
#, fuzzy
msgid "&Cancel"
msgstr "È¡Ïû"
-#: ../src/msw/mdi.cpp:177
+#: ../src/msw/mdi.cpp:185
msgid "&Cascade"
msgstr ""
-#: ../src/generic/logg.cpp:475 ../src/generic/tipdlg.cpp:170
+#: ../src/generic/logg.cpp:484 ../src/generic/tipdlg.cpp:171
msgid "&Close"
msgstr "¹Ø±Õ[&C]"
-#: ../src/generic/logg.cpp:679
+#: ../src/generic/logg.cpp:688
msgid "&Details"
msgstr "ϸ½Ú[&D]"
msgid "&Find"
msgstr "²éÕÒ"
-#: ../src/generic/wizard.cpp:355
+#: ../src/generic/wizard.cpp:402
msgid "&Finish"
msgstr "Íê³É[&F]"
-#: ../src/generic/wizard.cpp:228
+#: ../src/generic/wizard.cpp:249
#, fuzzy
msgid "&Help"
msgstr "°ïÖú"
-#: ../src/generic/logg.cpp:476
+#: ../src/generic/logg.cpp:485
msgid "&Log"
msgstr "ÈÕÖ¾[&L]"
-#: ../src/msw/mdi.cpp:182
+#: ../src/univ/themes/win32.cpp:4539
+msgid "&Move"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:190
#, fuzzy
msgid "&Next"
msgstr "ÏÂÒ»¸ö[&N] >"
-#: ../src/generic/wizard.cpp:236 ../src/generic/wizard.cpp:357
+#: ../src/generic/wizard.cpp:257 ../src/generic/wizard.cpp:404
msgid "&Next >"
msgstr "ÏÂÒ»¸ö[&N] >"
-#: ../src/generic/tipdlg.cpp:175
+#: ../src/generic/tipdlg.cpp:176
msgid "&Next Tip"
msgstr "ÏÂÒ»¼¼ÇÉ[&N]"
-#: ../src/common/cmdproc.cpp:248 ../src/common/cmdproc.cpp:259
+#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:266
msgid "&Redo"
msgstr "Öظ´[&R]"
-#: ../src/common/cmdproc.cpp:242 ../src/common/cmdproc.cpp:269
+#: ../src/common/cmdproc.cpp:249 ../src/common/cmdproc.cpp:276
msgid "&Redo "
msgstr "Öظ´[&R]"
msgid "&Replace"
msgstr ""
-#: ../src/generic/logg.cpp:471 ../src/generic/logg.cpp:765
+#: ../src/univ/themes/win32.cpp:4538
+#, fuzzy
+msgid "&Restore"
+msgstr "Öظ´[&R]"
+
+#: ../src/generic/logg.cpp:480 ../src/generic/logg.cpp:785
msgid "&Save..."
msgstr "±£´æ[&S]..."
-#: ../src/generic/tipdlg.cpp:172
+#: ../src/generic/tipdlg.cpp:173
msgid "&Show tips at startup"
msgstr "Æô¶¯Ê±ÏÔʾ¼¼ÇÉ[&S]"
-#: ../src/common/cmdproc.cpp:254
+#: ../src/univ/themes/win32.cpp:4541
+#, fuzzy
+msgid "&Size"
+msgstr "´óС"
+
+#: ../src/common/cmdproc.cpp:261
msgid "&Undo"
msgstr "»Ö¸´[&U]"
-#: ../src/common/cmdproc.cpp:229
+#: ../src/common/cmdproc.cpp:236
msgid "&Undo "
msgstr "»Ö¸´[&U]"
-#: ../src/msw/mdi.cpp:1308 ../src/msw/mdi.cpp:1315 ../src/msw/window.cpp:2700
+#: ../src/msw/mdi.cpp:1317 ../src/msw/mdi.cpp:1324 ../src/msw/mdi.cpp:1349
msgid "&Window"
msgstr "´°¿Ú[&W]"
msgid "'%s' has extra '..', ignored."
msgstr "'%s' ÓжîÍâµÄ '..', ºöÂÔÖ®."
-#: ../src/common/valtext.cpp:140
+#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
+#: ../src/common/valtext.cpp:183
#, c-format
msgid "'%s' is invalid"
msgstr "'%s' ÊÇÎÞЧµÄ"
-#: ../src/common/cmdline.cpp:694
+#: ../src/common/cmdline.cpp:698
#, c-format
msgid "'%s' is not a correct numeric value for option '%s'."
msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ."
-#: ../src/common/intl.cpp:436
+#: ../src/common/intl.cpp:401
#, c-format
msgid "'%s' is not a valid message catalog."
msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼."
msgid "'%s' is probably a binary buffer."
msgstr "'%s' »òÐíÊÇÒ»¸ö¶þ½øÖÆÎļþ."
-#: ../src/common/valtext.cpp:178
+#: ../src/common/valtext.cpp:172
#, c-format
msgid "'%s' should be numeric."
msgstr "'%s' Ó¦¸ÃÊÇÒ»¸öÊýÖµ."
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:154
#, c-format
msgid "'%s' should only contain ASCII characters."
msgstr "'%s' Ó¦¸Ã½ö°üº¬ASCII×Ö·û."
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:160
#, c-format
msgid "'%s' should only contain alphabetic characters."
msgstr "'%s' Ó¦½ö°üº¬×Öĸ×Ö·û."
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:166
#, c-format
msgid "'%s' should only contain alphabetic or numeric characters."
msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û."
-#: ../src/html/helpfrm.cpp:773
+#: ../src/html/helpfrm.cpp:709
msgid "(Help)"
msgstr "(°ïÖú)"
-#: ../src/html/helpfrm.cpp:336 ../src/html/helpfrm.cpp:922
-#: ../src/html/helpfrm.cpp:1504
+#: ../src/html/helpfrm.cpp:310 ../src/html/helpfrm.cpp:840
+#: ../src/html/helpfrm.cpp:1433
msgid "(bookmarks)"
msgstr "(ÊéÇ©)"
", ÆÚÍû static, #include »ò #define\n"
"ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö."
-#: ../src/generic/dirctrlg.cpp:644 ../src/generic/dirdlgg.cpp:263
-#: ../src/generic/filedlgg.cpp:833
+#: ../src/generic/dirctrlg.cpp:698 ../src/generic/filedlgg.cpp:918
msgid "."
msgstr "."
-#: ../src/generic/dirctrlg.cpp:645 ../src/generic/dirdlgg.cpp:264
-#: ../src/generic/filedlgg.cpp:834
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:919
msgid ".."
msgstr ".."
msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
msgstr "6 3/4 ÐÅ·â, 3 5/8 x 6 1/2 Ó¢´ç"
-#: ../src/html/htmprint.cpp:281
+#: ../src/html/htmprint.cpp:282
msgid ": file does not exist!"
msgstr ": Îļþ²»´æÔÚ!"
-#: ../src/common/fontmap.cpp:606
+#: ../src/common/fontmap.cpp:626
msgid ": unknown charset"
msgstr ": δ֪×Ö·û¼¯"
-#: ../src/common/fontmap.cpp:837
+#: ../src/common/fontmap.cpp:857
msgid ": unknown encoding"
msgstr ": δ֪±àÂë"
-#: ../src/generic/wizard.cpp:233
+#: ../src/generic/wizard.cpp:254
msgid "< &Back"
msgstr "< ·µ»Ø[&B]"
-#: ../src/generic/filedlgg.cpp:467
+#: ../src/generic/filedlgg.cpp:493
msgid "<DIR>"
msgstr "<Ŀ¼>"
-#: ../src/generic/filedlgg.cpp:434
+#: ../src/generic/filedlgg.cpp:460
msgid "<DIR> "
msgstr "<Ŀ¼> "
-#: ../src/generic/filedlgg.cpp:468
+#: ../src/generic/filedlgg.cpp:494
msgid "<LINK>"
msgstr "<Á¬½Ó>"
-#: ../src/generic/filedlgg.cpp:435
+#: ../src/generic/filedlgg.cpp:461
msgid "<LINK> "
msgstr "<Á¬½Ó>"
-#: ../src/html/helpfrm.cpp:1071
+#: ../src/html/helpfrm.cpp:992
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 "
msgid "A5 sheet, 148 x 210 mm"
msgstr "A5 Ö½ÕÅ, 148 x 210 ºÁÃ×"
-#: ../src/generic/fontdlgg.cpp:327
+#: ../src/generic/fontdlgg.cpp:83
msgid "ABCDEFGabcdefg12345"
msgstr "ABCDEFGabcdefg12345"
msgid "ASCII"
msgstr ""
-#: ../src/html/helpfrm.cpp:330
+#: ../src/html/helpfrm.cpp:323
msgid "Add current page to bookmarks"
msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ"
msgid "Adding book %s"
msgstr "ÕýÔÚÌí¼Ó¾í %s"
-#: ../src/generic/prntdlgg.cpp:161
+#: ../src/generic/prntdlgg.cpp:162
msgid "All"
msgstr "ËùÓÐ"
-#: ../include/wx/defs.h:1626 ../src/generic/filedlgg.cpp:950
+#: ../include/wx/defs.h:1732 ../src/generic/filedlgg.cpp:1041
msgid "All files (*)|*"
msgstr "ËùÓÐÎļþ (*)|*"
-#: ../include/wx/defs.h:1623
+#: ../include/wx/defs.h:1729
#, fuzzy
msgid "All files (*.*)|*.*"
msgstr "ËùÓÐÎļþ (*)|*"
msgid "Already dialling ISP."
msgstr "ÒѾ²¦½ÓISP."
-#: ../src/generic/logg.cpp:1020
+#: ../src/generic/logg.cpp:1051
#, c-format
msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?"
-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fontmap.cpp:117
msgid "Arabic (ISO-8859-6)"
msgstr "°¢À²®Óï (ISO-8859-6)"
msgid "B6 Envelope, 176 x 125 mm"
msgstr "B6 ÐÅ·â, 176 x 125 ºÁÃ×"
-#: ../src/common/imagbmp.cpp:277
+#: ../src/common/imagbmp.cpp:467 ../src/common/imagbmp.cpp:483
+#, fuzzy
+msgid "BMP: Couldn't allocate memory."
+msgstr "PNM: ²»ÄÜ·ÖÅäÄÚ´æ."
+
+#: ../src/common/imagbmp.cpp:86
msgid "BMP: Couldn't save invalid image."
msgstr "BMP: ²»Äܱ£´æÎÞЧͼÏñ."
-#: ../src/common/imagbmp.cpp:481
+#: ../src/common/imagbmp.cpp:290
#, fuzzy
msgid "BMP: Couldn't write RGB color map."
msgstr "BMP: ²»ÄÜдÊý¾Ý."
-#: ../src/common/imagbmp.cpp:613
+#: ../src/common/imagbmp.cpp:422
msgid "BMP: Couldn't write data."
msgstr "BMP: ²»ÄÜдÊý¾Ý."
-#: ../src/common/imagbmp.cpp:386
+#: ../src/common/imagbmp.cpp:195
#, fuzzy
msgid "BMP: Couldn't write the file (Bitmap) header."
msgstr "BMP: ²»ÄÜдÎļþÍ·."
-#: ../src/common/imagbmp.cpp:407
+#: ../src/common/imagbmp.cpp:216
#, fuzzy
msgid "BMP: Couldn't write the file (BitmapInfo) header."
msgstr "BMP: ²»ÄÜдÎļþÍ·."
-#: ../src/common/imagbmp.cpp:311
-msgid "BMP: wImage doesn't have own wxPalette."
+#: ../src/common/imagbmp.cpp:120
+msgid "BMP: wxImage doesn't have own wxPalette."
msgstr ""
-#: ../src/generic/helpwxht.cpp:157
-msgid "Back"
-msgstr "·µ»Ø"
-
-#: ../src/common/dlgcmn.cpp:176
+#: ../src/common/dlgcmn.cpp:170
msgid "Backward"
msgstr "Ïòºó"
-#: ../src/common/fontmap.cpp:123
+#: ../src/common/fontmap.cpp:124
msgid "Baltic (ISO-8859-13)"
msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
-#: ../src/common/fontmap.cpp:114
+#: ../src/common/fontmap.cpp:115
msgid "Baltic (old) (ISO-8859-4)"
msgstr "²¨Â޵ĺ£Óï (¾ÉµÄ) (ISO-8859-4)"
msgid "Bitmap resource specification %s not found."
msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s."
-#: ../src/generic/fontdlgg.cpp:219
+#: ../src/generic/fontdlgg.cpp:234
msgid "Bold"
msgstr "´ÖÌå"
-#: ../src/generic/prntdlgg.cpp:660
+#: ../src/generic/prntdlgg.cpp:659
msgid "Bottom margin (mm):"
msgstr "µ×±ß¾à (ºÁÃ×):"
msgid "C sheet, 17 x 22 in"
msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç"
-#: ../src/generic/logg.cpp:473
+#: ../src/generic/logg.cpp:482
msgid "C&lear"
msgstr "Çå³ý[&L]"
msgid "C65 Envelope, 114 x 229 mm"
msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×"
-#: ../src/msw/thread.cpp:243
-msgid "Can not create event object."
-msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
-
#: ../src/msw/thread.cpp:145
msgid "Can not create mutex"
msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó"
-#: ../src/common/filefn.cpp:1324
+#: ../src/common/filefn.cpp:1334
#, fuzzy, c-format
msgid "Can not enumerate files '%s'"
msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
-#: ../src/mgl/dir.cpp:202 ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:224
+#: ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:224
#, c-format
msgid "Can not enumerate files in directory '%s'"
msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
-#: ../src/mac/thread.cpp:439 ../src/msw/thread.cpp:583
+#: ../src/mac/thread.cpp:455 ../src/msw/thread.cpp:761
#, c-format
msgid "Can not resume thread %x"
msgstr "²»Äָܻ´Ïß³Ì %x"
-#: ../src/msw/thread.cpp:461
+#: ../src/msw/thread.cpp:635
msgid "Can not start thread: error writing TLS."
msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í."
-#: ../src/mac/thread.cpp:415 ../src/msw/thread.cpp:568
+#: ../src/mac/thread.cpp:431 ../src/msw/thread.cpp:746
#, c-format
msgid "Can not suspend thread %x"
msgstr "²»ÄܹÒÆðÏß³Ì %x"
-#: ../src/msw/thread.cpp:902
+#: ../src/msw/thread.cpp:1085
msgid "Can not wait for thread termination"
msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹"
-#: ../src/common/cmdproc.cpp:231
+#: ../src/common/cmdproc.cpp:238
msgid "Can't &Undo "
msgstr "²»Äָܻ´[&U]"
-#: ../src/common/image.cpp:1207
+#: ../src/common/image.cpp:1289
#, c-format
msgid "Can't check image format of file '%s': file does not exist."
msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ."
msgid "Can't copy values of unsupported type %d."
msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ."
-#: ../src/msw/toplevel.cpp:223
+#: ../src/msw/toplevel.cpp:305
+#, fuzzy
+msgid "Can't create dialog using memory template"
+msgstr "²»ÄÜ´´½¨Îļþ '%s'"
+
+#: ../src/os2/toplevel.cpp:266
#, fuzzy, c-format
-msgid "Can't create dialog using template '%s'"
+msgid "Can't create dialog using template '%ul'"
msgstr "²»ÄÜ´´½¨Îļþ '%s'"
-#: ../src/msw/listctrl.cpp:270
+#: ../src/msw/listctrl.cpp:318
msgid "Can't create list control window, check that comctl32.dll is installed."
msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°."
msgid "Can't create the inter-process read pipe"
msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ"
-#: ../src/msw/utilsexc.cpp:497
+#: ../src/msw/utilsexc.cpp:498
msgid "Can't create the inter-process write pipe"
msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ"
-#: ../src/mac/thread.cpp:394 ../src/msw/thread.cpp:550
+#: ../src/mac/thread.cpp:410 ../src/msw/thread.cpp:728
msgid "Can't create thread"
msgstr "²»ÄÜ´´½¨½ø³Ì"
-#: ../src/msw/window.cpp:2855
+#: ../src/msw/window.cpp:2966
#, fuzzy, c-format
msgid "Can't create window of class %s"
msgstr "²»ÄÜ´´½¨Îļþ '%s'"
msgid "Can't delete key '%s'"
msgstr "²»ÄÜɾ³ý¼ü '%s'"
-#: ../src/msw/iniconf.cpp:447
+#: ../src/msw/iniconf.cpp:445
#, c-format
msgid "Can't delete the INI file '%s'"
msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
msgid "Can't find current position in file '%s'"
msgstr "²»ÄÜÔÚÎļþ'%s'ÖÐÕÒµ½µ±Ç°Î»ÖÃ"
-#: ../src/common/object.cpp:335 ../src/common/object.cpp:360
-#, c-format
-msgid "Can't find the serialization object '%s' for the object '%s'."
-msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'."
-
#: ../src/msw/registry.cpp:351
#, c-format
msgid "Can't get info about registry key '%s'"
msgstr "²»ÄÜ»ñµÃ×¢²á¼ü '%s'µÄÐÅÏ¢"
-#: ../src/common/image.cpp:904 ../src/common/image.cpp:924
+#: ../src/common/image.cpp:913 ../src/common/image.cpp:933
#, c-format
msgid "Can't load image from file '%s': file does not exist."
msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
-#: ../src/common/object.cpp:328
-msgid "Can't load wxSerial dynamic library."
-msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
-
#: ../src/msw/dib.cpp:434
#, c-format
msgid "Can't open file '%s'"
msgid "Can't read value of key '%s'"
msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ"
-#: ../src/generic/logg.cpp:535 ../src/generic/logg.cpp:930
+#: ../src/common/image.cpp:955
+#, fuzzy, c-format
+msgid "Can't save image to file '%s': unknown extension."
+msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ."
+
+#: ../src/generic/logg.cpp:544 ../src/generic/logg.cpp:952
msgid "Can't save log contents to file."
msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ."
-#: ../src/msw/thread.cpp:513
+#: ../src/msw/thread.cpp:687
msgid "Can't set thread priority"
msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶"
msgid "Can't set value of '%s'"
msgstr "²»ÄÜÉèÖà '%s'µÄÖµ"
-#: ../src/common/dlgcmn.cpp:189 ../src/common/prntbase.cpp:109
-#: ../src/generic/dcpsg.cpp:2269 ../src/generic/dirctrlg.cpp:1249
-#: ../src/generic/dirdlgg.cpp:418 ../src/generic/filedlgg.cpp:1041
-#: ../src/generic/fontdlgg.cpp:259 ../src/generic/prntdlgg.cpp:466
-#: ../src/generic/progdlgg.cpp:206 ../src/generic/proplist.cpp:525
-#: ../src/gtk/filedlg.cpp:173 ../src/gtk/fontdlg.cpp:178
-#: ../src/html/helpfrm.cpp:1053 ../src/motif/msgdlg.cpp:180
+#: ../src/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
msgid "Cancel"
msgstr "È¡Ïû"
-#: ../contrib/src/xrc/xmlres.cpp:726 ../contrib/src/xrc/xmlres.cpp:767
+#: ../contrib/src/xrc/xmlres.cpp:866 ../contrib/src/xrc/xmlres.cpp:907
msgid "Cannot convert dialog units: dialog unknown."
msgstr ""
-#: ../contrib/src/xrc/xml.cpp:372
-msgid "Cannot find XML I/O handler capable of loading this format."
-msgstr ""
-
-#: ../contrib/src/xrc/xml.cpp:398
-msgid "Cannot find XML I/O handler capable of saving in this format."
-msgstr ""
+#: ../src/common/strconv.cpp:900
+#, fuzzy, c-format
+msgid "Cannot convert from encoding '%s'!"
+msgstr "λÖñàÂë (%d)"
-#: ../src/msw/dialup.cpp:525
+#: ../src/msw/dialup.cpp:502
#, c-format
msgid "Cannot find active dialup connection: %s"
msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
-#: ../contrib/src/xrc/xmlres.cpp:206
+#: ../contrib/src/xrc/xmlres.cpp:223
#, fuzzy, c-format
msgid "Cannot find container for unknown control '%s'."
msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s"
-#: ../contrib/src/xrc/xmlres.cpp:781
+#: ../contrib/src/xrc/xmlres.cpp:921
#, fuzzy, c-format
msgid "Cannot find font node '%s'."
msgstr "²»ÄÜ´ò¿ª URL '%s'"
-#: ../src/msw/dialup.cpp:839
+#: ../src/msw/dialup.cpp:816
msgid "Cannot find the location of address book file"
msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ"
-#: ../src/unix/threadpsx.cpp:976
+#: ../src/unix/threadpsx.cpp:1200
#, c-format
msgid "Cannot get priority range for scheduling policy %d."
msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§."
-#: ../src/unix/utilsunx.cpp:863
+#: ../src/unix/utilsunx.cpp:897
msgid "Cannot get the hostname"
msgstr "²»ÄÜ»ñµÃÖ÷»úÃû"
-#: ../src/unix/utilsunx.cpp:899
+#: ../src/unix/utilsunx.cpp:933
msgid "Cannot get the official hostname"
msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû"
-#: ../src/msw/dialup.cpp:940
+#: ../src/msw/dialup.cpp:910
msgid "Cannot hang up - no active dialup connection."
msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó."
-#: ../src/msw/app.cpp:257
+#: ../src/msw/app.cpp:248
msgid "Cannot initialize OLE"
msgstr "²»Äܳõʼ»¯ OLE"
-#: ../contrib/src/xrc/xmlres.cpp:308
+#: ../src/mgl/window.cpp:546
+#, fuzzy
+msgid "Cannot initialize display."
+msgstr "²»Äܳõʼ»¯ OLE"
+
+#: ../src/msw/volume.cpp:627
+#, fuzzy, c-format
+msgid "Cannot load icon from '%s'."
+msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
+
+#: ../contrib/src/xrc/xmlres.cpp:336
#, fuzzy, c-format
msgid "Cannot load resources from file '%s'."
msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s."
-#: ../src/html/htmlfilt.cpp:147
+#: ../src/html/htmlfilt.cpp:171
#, c-format
msgid "Cannot open HTML document: %s"
msgstr "²»ÄÜ´ò¿ª HTML Îĵµ: %s"
-#: ../src/html/helpdata.cpp:585
+#: ../src/html/helpdata.cpp:579
#, c-format
msgid "Cannot open HTML help book: %s"
msgstr "²»ÄÜ´ò¿ª HTML °ïÖú: %s"
-#: ../src/generic/helpext.cpp:96
+#: ../src/generic/helpext.cpp:101
#, c-format
msgid "Cannot open URL '%s'"
msgstr "²»ÄÜ´ò¿ª URL '%s'"
-#: ../src/html/helpdata.cpp:268
+#: ../src/html/helpdata.cpp:275
#, c-format
msgid "Cannot open contents file: %s"
msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
-#: ../contrib/src/xrc/xmlres.cpp:282
+#: ../contrib/src/xrc/xmlres.cpp:310
#, fuzzy, c-format
msgid "Cannot open file '%s'."
msgstr "²»ÄÜ´ò¿ªÎļþ'%s'"
msgid "Cannot open file for PostScript printing!"
msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!"
-#: ../src/html/helpdata.cpp:284
+#: ../src/html/helpdata.cpp:288
#, c-format
msgid "Cannot open index file: %s"
msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s"
-#: ../contrib/src/xrc/xmlres.cpp:714
+#: ../contrib/src/xrc/xmlres.cpp:854
#, fuzzy, c-format
msgid "Cannot parse coordinates from '%s'."
msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
-#: ../contrib/src/xrc/xmlres.cpp:755
+#: ../contrib/src/xrc/xmlres.cpp:895
#, fuzzy, c-format
msgid "Cannot parse dimension from '%s'."
msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ"
-#: ../src/html/helpfrm.cpp:1336
+#: ../src/html/helpfrm.cpp:1265
msgid "Cannot print empty page."
msgstr "²»ÄÜ´òÓ¡¿ÕÒ³Ãæ."
-#: ../src/unix/threadpsx.cpp:957
+#: ../src/msw/volume.cpp:188 ../src/msw/volume.cpp:519
+#, fuzzy, c-format
+msgid "Cannot read typename from '%s'!"
+msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s"
+
+#: ../src/unix/threadpsx.cpp:1181
msgid "Cannot retrieve thread scheduling policy."
msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ."
-#: ../src/unix/threadpsx.cpp:606
+#: ../src/unix/threadpsx.cpp:806
msgid "Cannot start thread: error writing TLS"
msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS´íÎó"
-#: ../src/html/helpfrm.cpp:459
+#: ../src/html/helpfrm.cpp:406
msgid "Case sensitive"
msgstr "´óСдÃô¸Ð"
-#: ../src/common/fontmap.cpp:124
+#: ../src/common/fontmap.cpp:125
#, fuzzy
msgid "Celtic (ISO-8859-14)"
msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
-#: ../src/common/fontmap.cpp:112
+#: ../src/common/fontmap.cpp:113
#, fuzzy
msgid "Central European (ISO-8859-2)"
msgstr "ÖÐÅ·Óïϵ (ISO-8859-2/Latin 2)"
-#: ../src/msw/dialup.cpp:774
+#: ../src/msw/dialup.cpp:751
msgid "Choose ISP to dial"
msgstr "Ñ¡ÔñISP½øÐв¦ºÅ"
-#: ../src/gtk/fontdlg.cpp:159
+#: ../src/gtk/fontdlg.cpp:122
msgid "Choose font"
msgstr "Ñ¡Ôñ×ÖÌå"
-#: ../src/msw/glcanvas.cpp:437
+#: ../src/msw/glcanvas.cpp:428
msgid "ChoosePixelFormat failed."
msgstr ""
-#: ../src/generic/logg.cpp:473
+#: ../src/generic/logg.cpp:482
msgid "Clear the log contents"
msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ"
-#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:342
-#: ../src/generic/proplist.cpp:520
+#: ../src/common/prntbase.cpp:364 ../src/generic/progdlgg.cpp:356
+#: ../src/generic/proplist.cpp:506
msgid "Close"
msgstr "¹Ø±Õ"
-#: ../src/generic/logg.cpp:475
+#: ../src/univ/themes/win32.cpp:4547
+msgid "Close\tAlt-F4"
+msgstr ""
+
+#: ../src/generic/logg.cpp:484
msgid "Close this window"
msgstr "¹Ø±Õ´°¿Ú"
-#: ../src/generic/dirctrlg.cpp:486
+#: ../src/generic/dirctrlg.cpp:547
#, fuzzy
msgid "Computer"
msgstr "¼ÆËã»ú"
-#: ../src/common/fileconf.cpp:867
+#: ../src/common/fileconf.cpp:868
#, c-format
msgid "Config entry name cannot start with '%c'."
msgstr "ÅäÖÃÌõÄ¿Ãû²»ÄÜÒÔ '%c'¿ªÍ·."
-#: ../src/generic/filedlgg.cpp:1204 ../src/gtk/filedlg.cpp:72
+#: ../src/generic/filedlgg.cpp:1338 ../src/gtk/filedlg.cpp:72
msgid "Confirm"
msgstr "È·ÈÏ"
msgid "Confirm registry update"
msgstr ""
-#: ../src/html/htmlwin.cpp:263
+#: ../src/html/htmlwin.cpp:262
msgid "Connecting..."
msgstr "Á¬½Ó..."
-#: ../src/generic/helpxlp.cpp:242
-#, c-format
-msgid "Connection to wxHelp timed out in %d seconds"
-msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
-
-#: ../src/generic/helpwxht.cpp:159 ../src/html/helpfrm.cpp:362
-#: ../src/html/helpfrm.cpp:371
+#: ../src/html/helpfrm.cpp:346
msgid "Contents"
msgstr "Ŀ¼"
-#: ../src/common/strconv.cpp:608
+#: ../src/common/strconv.cpp:579
#, c-format
msgid "Convertion to charset '%s' doesn't work."
msgstr ""
-#: ../src/generic/prntdlgg.cpp:194
+#: ../src/generic/prntdlgg.cpp:195
msgid "Copies:"
msgstr "·Ý:"
msgid "Could not find tab for id"
msgstr "ÕÒ²»µ½idµÄ±êÇ©"
-#: ../src/msw/textctrl.cpp:1644
+#: ../src/msw/textctrl.cpp:1799
#, c-format
msgid "Could not load Rich Edit DLL '%s'"
msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'"
"²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n"
"»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)"
-#: ../src/common/prntbase.cpp:715
+#: ../src/common/prntbase.cpp:720
msgid "Could not start document preview."
msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ."
msgid "Could not start printing."
msgstr "²»ÄÜÆô¶¯´òÓ¡."
-#: ../src/common/wincmn.cpp:850
+#: ../src/common/wincmn.cpp:1124
msgid "Could not transfer data to window"
msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú"
msgid "Couldn't add an image to the image list."
msgstr "²»ÄÜ°ÑͼÏñ¼Óµ½Í¼ÏóÁбí."
-#: ../src/msw/timer.cpp:105
+#: ../src/msw/timer.cpp:103
msgid "Couldn't create a timer"
msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
-#: ../src/mgl/cursor.cpp:121 ../src/mgl/cursor.cpp:146
+#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
#, fuzzy
msgid "Couldn't create cursor."
msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷"
-#: ../src/common/dynlib.cpp:337
+#: ../src/common/dynlib.cpp:344 ../src/common/dynload.cpp:280
#, c-format
msgid "Couldn't find symbol '%s' in a dynamic library"
msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'"
-#: ../src/mac/thread.cpp:469 ../src/msw/thread.cpp:609
+#: ../src/mac/thread.cpp:485 ../src/msw/thread.cpp:787
msgid "Couldn't get the current thread pointer"
msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë"
-#: ../src/common/imagpng.cpp:249
+#: ../src/common/imagpng.cpp:298
msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ."
msgid "Couldn't release a mutex"
msgstr "²»ÄÜÊÍ·Å»¥³âÌå"
-#: ../src/msw/listctrl.cpp:651
+#: ../src/msw/listctrl.cpp:696
#, c-format
msgid "Couldn't retrieve information about list control item %d."
msgstr "²»ÄÜ»ñµÃÁбí¿Ø¼þµÄÏî %dÐÅÏ¢."
-#: ../src/mac/thread.cpp:706 ../src/msw/thread.cpp:989
+#: ../src/common/imagpng.cpp:334 ../src/common/imagpng.cpp:345
+#: ../src/common/imagpng.cpp:353
+#, fuzzy
+msgid "Couldn't save PNG image."
+msgstr "JPEG: ²»Äܱ£´æͼÏñ."
+
+#: ../src/mac/thread.cpp:729 ../src/msw/thread.cpp:1175
msgid "Couldn't terminate thread"
msgstr "²»ÄÜÖÕÖ¹Ïß³Ì"
-#: ../src/generic/dirctrlg.cpp:1356 ../src/generic/dirdlgg.cpp:565
+#: ../src/generic/dirdlgg.cpp:263
msgid "Create directory"
msgstr "´´½¨Ä¿Â¼"
-#: ../src/generic/filedlgg.cpp:1008
+#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1108
msgid "Create new directory"
msgstr "´´½¨ÐÂĿ¼"
-#: ../src/generic/filedlgg.cpp:1015
+#: ../src/generic/filedlgg.cpp:1119
msgid "Current directory:"
msgstr "µ±Ç°Ä¿Â¼:"
-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fontmap.cpp:116
#, fuzzy
msgid "Cyrillic (ISO-8859-5)"
msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)"
msgid "DDE poke request failed"
msgstr "DDE poke ÇëÇóʧ°Ü"
-#: ../src/common/imagbmp.cpp:809
+#: ../src/common/imagbmp.cpp:618
#, fuzzy
msgid "DIB Header: Cannot deal with 4bit encoded yet."
msgstr "BMP: »¹²»ÄÜ´¦Àí4λ±àÂë."
-#: ../src/common/imagbmp.cpp:1027
+#: ../src/common/imagbmp.cpp:836
#, fuzzy
msgid "DIB Header: Encoding doesn't match bitdepth."
msgstr "BMP: ±àÂë²»ÄÜÆ¥ÅäÑÕɫλÊý."
-#: ../src/common/imagbmp.cpp:990
+#: ../src/common/imagbmp.cpp:798
#, fuzzy
msgid "DIB Header: Image height > 32767 pixels for file."
msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¸ß¶È > 32767 ÏóËØ."
-#: ../src/common/imagbmp.cpp:984
+#: ../src/common/imagbmp.cpp:792
#, fuzzy
msgid "DIB Header: Image width > 32767 pixels for file."
msgstr "BMP: ¶ÔÓÚÎļþ£¬Í¼Ïñ¿í¶È > 32767 ÏóËØ."
-#: ../src/common/imagbmp.cpp:1004
+#: ../src/common/imagbmp.cpp:812
#, fuzzy
msgid "DIB Header: Unknown bitdepth in file."
msgstr "BMP: ÎļþÖÐÑÕɫλÊýδ֪."
-#: ../src/common/imagbmp.cpp:1013
+#: ../src/common/imagbmp.cpp:822
#, fuzzy
msgid "DIB Header: Unknown encoding in file."
msgstr "BMP: Îļþ±àÂëδ֪."
msgid "DL Envelope, 110 x 220 mm"
msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×"
-#: ../src/generic/filedlgg.cpp:646
+#: ../src/generic/filedlgg.cpp:689
msgid "Date"
msgstr "ÈÕÆÚ"
-#: ../src/generic/fontdlgg.cpp:209
+#: ../src/generic/fontdlgg.cpp:224
msgid "Decorative"
msgstr "ÐÞÊÎ"
-#: ../src/common/fontmap.cpp:366
+#: ../src/common/fontmap.cpp:386
msgid "Default encoding"
msgstr ""
-#: ../src/unix/snglinst.cpp:270
+#: ../src/unix/snglinst.cpp:269
#, fuzzy, c-format
msgid "Deleted stale lock file '%s'."
msgstr "²»ÄÜɾ³ý INI Îļþ '%s'"
-#: ../src/msw/dialup.cpp:361
+#: ../src/msw/dialup.cpp:351
msgid ""
"Dial up functions are unavailable because the remote access service (RAS) is "
"not installed on this machine. Please install it."
msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
-#: ../src/msw/toplevel.cpp:221
+#: ../src/os2/toplevel.cpp:264
#, fuzzy
-msgid "Did you forget to include wx/msw/wx.rc in your resources?"
+msgid "Did you forget to include wx/os2/wx.rc in your resources?"
msgstr "´´½¨¶Ô»°¿òʧ°Ü. Ò²ÐíÄãûÓаÑwx/msw/wx.rc°üÀ¨½ø×ÊÔ´ÖÐ."
-#: ../src/generic/tipdlg.cpp:177
+#: ../src/generic/tipdlg.cpp:178
msgid "Did you know..."
msgstr "ÄãÖªµÀ..."
-#: ../src/common/filefn.cpp:1219
+#: ../src/common/filefn.cpp:1228
#, c-format
msgid "Directory '%s' couldn't be created"
msgstr "Ŀ¼'%s'²»Äܱ»´´½¨"
-#: ../src/generic/dirctrlg.cpp:1291 ../src/generic/dirdlgg.cpp:532
+#: ../src/mgl/dirmgl.cpp:217
+#, fuzzy, c-format
+msgid "Directory '%s' doesn't exist!"
+msgstr "Ŀ¼²»´æÔÚ"
+
+#: ../src/generic/dirdlgg.cpp:188
msgid "Directory does not exist"
msgstr "Ŀ¼²»´æÔÚ"
-#: ../src/html/helpfrm.cpp:426
+#: ../src/html/helpfrm.cpp:374
msgid ""
"Display all index items that contain given substring. Search is case "
"insensitive."
msgstr "ÏÔʾ°üº¬¸ø¶¨×Ó´®µÄËùÓÐË÷ÒýÏî. ËÑË÷ÊÇ´óСдÎ޹صÄ."
-#: ../src/html/helpfrm.cpp:600
+#: ../src/html/helpfrm.cpp:540
msgid "Display options dialog"
msgstr "ÏÔʾѡÏî¶Ô»°¿ò"
"%s %1"
msgstr ""
-#: ../src/common/docview.cpp:439
+#: ../src/common/docview.cpp:438
#, c-format
msgid "Do you want to save changes to document %s?"
msgstr "ÄãÏë±£´æ¶ÔÎĵµ%sµÄÐÞ¸Ä?"
-#: ../src/common/strconv.cpp:618
-#, c-format
-msgid "Don't know how to convert to/from charset '%s'."
-msgstr ""
-
-#: ../src/html/htmlwin.cpp:318
+#: ../src/html/htmlwin.cpp:314
msgid "Done"
msgstr "Íê³É"
-#: ../src/generic/progdlgg.cpp:354
+#: ../src/generic/progdlgg.cpp:368
msgid "Done."
msgstr "Íê³É¡£"
msgid "E sheet, 34 x 44 in"
msgstr "E Ö½ÕÅ, 34 x 44 Ó¢´ç"
-#: ../src/generic/progdlgg.cpp:178
+#: ../src/generic/progdlgg.cpp:183
msgid "Elapsed time : "
msgstr "ÓÃʱ£º"
-#: ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:335
msgid "Entries found"
msgstr "ÕÒµ½µÄÌõÄ¿"
"Environment variables expansion failed: missing '%c' at position %d in '%s'."
msgstr "»·¾³±äÁ¿À©Õ¹Ê§°Ü: '%c' ûÓгöÏÖÔÚλÖà %d / '%s'."
-#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirctrlg.cpp:666
-#: ../src/generic/dirctrlg.cpp:677 ../src/generic/dirctrlg.cpp:1391
-#: ../src/generic/dirdlgg.cpp:267 ../src/generic/dirdlgg.cpp:285
-#: ../src/generic/dirdlgg.cpp:296 ../src/generic/dirdlgg.cpp:598
-#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:837
-#: ../src/generic/filedlgg.cpp:851 ../src/generic/filedlgg.cpp:864
-#: ../src/generic/filedlgg.cpp:1170 ../src/generic/filedlgg.cpp:1219
-#: ../src/generic/helpxlp.cpp:243 ../src/gtk/filedlg.cpp:80
-#: ../src/gtk/fontdlg.cpp:72
+#: ../src/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
msgid "Error"
msgstr "´íÎó"
-#: ../src/unix/utilsunx.cpp:1176 ../src/unix/utilsunx.cpp:1184
+#: ../src/unix/utilsunx.cpp:1215 ../src/unix/utilsunx.cpp:1223
msgid "Error "
msgstr "´íÎó"
-#: ../src/generic/dirctrlg.cpp:1304 ../src/generic/dirdlgg.cpp:545
+#: ../src/generic/dirdlgg.cpp:203
msgid "Error creating directory"
msgstr "´´½¨Ä¿Â¼´íÎó"
-#: ../src/common/imagbmp.cpp:1036
+#: ../src/common/imagbmp.cpp:845
#, fuzzy
msgid "Error in reading image DIB ."
msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-#: ../src/common/log.cpp:369
+#: ../src/common/log.cpp:460
msgid "Error: "
msgstr "´íÎó£º"
-#: ../src/common/fontmap.cpp:113
+#: ../src/common/fontmap.cpp:114
msgid "Esperanto (ISO-8859-3)"
msgstr "Esperanto (ISO-8859-3)"
-#: ../src/generic/progdlgg.cpp:186
+#: ../src/generic/progdlgg.cpp:191
msgid "Estimated time : "
msgstr "Ô¤ÆÚʱ¼ä£º"
-#: ../src/generic/dirctrlg.cpp:619 ../src/generic/dirdlgg.cpp:216
-msgid "Etcetera"
-msgstr "ÆäËü"
-
-#: ../src/msw/utilsexc.cpp:588
+#: ../src/msw/utilsexc.cpp:594
#, c-format
msgid "Execution of command '%s' failed"
msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü"
msgid "Expected 'char' whilst parsing resource."
msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ."
-#: ../src/msw/dialup.cpp:869 ../src/msw/dialup.cpp:874
+#: ../src/msw/dialup.cpp:845
#, c-format
msgid "Failed to %s dialup connection: %s"
msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
-#: ../src/unix/snglinst.cpp:244
+#: ../src/unix/snglinst.cpp:243
msgid "Failed to access lock file."
msgstr ""
-#: ../src/common/filename.cpp:158
+#: ../src/common/filename.cpp:172
#, fuzzy
msgid "Failed to close file handle"
msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
-#: ../src/unix/snglinst.cpp:309
+#: ../src/unix/snglinst.cpp:308
#, fuzzy, c-format
msgid "Failed to close lock file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
msgid "Failed to close the clipboard."
msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü."
-#: ../src/msw/dialup.cpp:808
+#: ../src/msw/dialup.cpp:785
msgid "Failed to connect: missing username/password."
msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî."
-#: ../src/msw/dialup.cpp:754
+#: ../src/msw/dialup.cpp:731
msgid "Failed to connect: no ISP to dial."
msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP."
msgid "Failed to copy the contents of registry key '%s' to '%s'."
msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü."
+#: ../src/common/filefn.cpp:1081
+#, fuzzy, c-format
+msgid "Failed to copy the file '%s' to '%s'"
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
#: ../src/msw/dde.cpp:924
msgid "Failed to create DDE string"
msgstr "´´½¨ DDE ×Ö·û´®Ê§°Ü"
-#: ../src/msw/mdi.cpp:407
+#: ../src/msw/mdi.cpp:421
msgid "Failed to create MDI parent frame."
msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
msgid "Failed to create a status bar."
msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£"
-#: ../src/common/filename.cpp:625
+#: ../src/common/filename.cpp:705
#, fuzzy
msgid "Failed to create a temporary file name"
msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
msgid "Failed to create connection to server '%s' on topic '%s'"
msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü"
-#: ../src/generic/dirctrlg.cpp:1302 ../src/generic/dirdlgg.cpp:543
-msgid "Failed to create directory "
+#: ../src/msw/toplevel.cpp:303
+#, fuzzy
+msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
msgstr "´´½¨Ä¿Â¼Ê§°Ü"
+#: ../src/generic/dirdlgg.cpp:201
+#, fuzzy, c-format
+msgid ""
+"Failed to create directory '%s'\n"
+"(Do you have the required permissions?)"
+msgstr ""
+"\n"
+"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)"
+
#: ../src/msw/mimetype.cpp:168
#, fuzzy, c-format
msgid "Failed to create registry entry for '%s' files."
msgid "Failed to create the standard find/replace dialog (error code %d)"
msgstr ""
-#: ../src/html/winpars.cpp:413
+#: ../src/html/winpars.cpp:428
#, c-format
msgid "Failed to display HTML document in %s encoding"
msgstr "°´±àÂë %s ÏÔʾHTMLÎĵµÊ§°Ü"
-#: ../src/mac/clipbrd.cpp:162 ../src/msw/clipbrd.cpp:139
+#: ../src/mac/clipbrd.cpp:167 ../src/msw/clipbrd.cpp:139
msgid "Failed to empty the clipboard."
msgstr "Çå¿Õ¼ôÌù°åʧ°Ü"
msgid "Failed to establish an advise loop with DDE server"
msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ»·Ê§°Ü"
-#: ../src/msw/dialup.cpp:646
+#: ../src/msw/dialup.cpp:623
#, c-format
msgid "Failed to establish dialup connection: %s"
msgstr "½¨Á¢²¦ºÅÁ¬½Ó: %sʧ°Ü"
-#: ../src/unix/utilsunx.cpp:563 ../src/unix/utilsunx.cpp:591
+#: ../src/unix/utilsunx.cpp:586 ../src/unix/utilsunx.cpp:614
#, c-format
msgid "Failed to execute '%s'\n"
msgstr "Ö´ÐÐ '%s'ʧ°Ü\n"
"²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n"
"ûÓÐʹÓÃwxResourceLoadBitmapData?"
-#: ../src/msw/dialup.cpp:706
+#: ../src/msw/dialup.cpp:683
#, c-format
msgid "Failed to get ISP names: %s"
msgstr "»ñÈ¡ISPÃû: %sʧ°Ü"
-#: ../src/mac/clipbrd.cpp:113
+#: ../src/mac/clipbrd.cpp:118
#, fuzzy
msgid "Failed to get clipboard data."
msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
-#: ../src/msw/clipbrd.cpp:628
+#: ../src/msw/clipbrd.cpp:712
msgid "Failed to get data from the clipboard"
msgstr "´Ó¼ôÌù°å»ñÈ¡Êý¾Ýʧ°Ü"
-#: ../src/common/timercmn.cpp:277
+#: ../src/common/timercmn.cpp:282
msgid "Failed to get the UTC system time."
msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü."
-#: ../src/common/timercmn.cpp:228
+#: ../src/common/timercmn.cpp:233
msgid "Failed to get the local system time"
msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü"
-#: ../src/univ/theme.cpp:122
+#: ../src/common/filefn.cpp:1460
+#, fuzzy
+msgid "Failed to get the working directory"
+msgstr "´´½¨Ä¿Â¼Ê§°Ü"
+
+#: ../src/univ/theme.cpp:120
msgid "Failed to initialize GUI: no built-in themes found."
msgstr ""
-#: ../src/msw/helpchm.cpp:80
+#: ../src/msw/helpchm.cpp:69
msgid "Failed to initialize MS HTML Help."
msgstr ""
-#: ../src/msw/glcanvas.cpp:739
+#: ../src/msw/glcanvas.cpp:730
#, fuzzy
msgid "Failed to initialize OpenGL"
msgstr "²»Äܳõʼ»¯ OLE"
-#: ../src/unix/threadpsx.cpp:776
+#: ../src/unix/threadpsx.cpp:987
msgid ""
"Failed to join a thread, potential memory leak detected - please restart the "
"program"
msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³"
-#: ../src/msw/utils.cpp:673
+#: ../src/msw/utils.cpp:726
#, fuzzy, c-format
msgid "Failed to kill process %d"
msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
-#: ../src/common/dynlib.cpp:263
+#: ../src/common/iconbndl.cpp:67
+#, fuzzy, c-format
+msgid "Failed to load image %d from file '%s'."
+msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
+
+#: ../src/msw/volume.cpp:340
+#, fuzzy
+msgid "Failed to load mpr.dll."
+msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
+
+#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:196
#, c-format
msgid "Failed to load shared library '%s'"
msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
-#: ../src/common/dynlib.cpp:251
+#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:125
#, fuzzy, c-format
msgid "Failed to load shared library '%s' Error '%s'"
msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'"
-#: ../src/unix/snglinst.cpp:193
+#: ../src/unix/snglinst.cpp:192
#, fuzzy, c-format
msgid "Failed to lock the lock file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
msgid "Failed to match '%s' in regular expression: %s"
msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s"
-#: ../src/common/filename.cpp:1561
+#: ../src/common/filename.cpp:1632
#, fuzzy, c-format
msgid "Failed to modify file times for '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/common/filename.cpp:147
+#: ../src/common/filename.cpp:160
#, fuzzy, c-format
-msgid "Failed to open '%s' for reading"
+msgid "Failed to open '%s' for %s"
msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
-#: ../src/common/filename.cpp:614
+#: ../src/common/filename.cpp:727
#, fuzzy
msgid "Failed to open temporary file."
msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
msgid "Failed to open the clipboard."
msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£"
-#: ../src/msw/clipbrd.cpp:544
+#: ../src/msw/clipbrd.cpp:616
msgid "Failed to put data on the clipboard"
msgstr "°ÑÊý¾Ý·Åµ½¼ôÌù°åʧ°Ü"
-#: ../src/unix/snglinst.cpp:253
+#: ../src/unix/snglinst.cpp:252
#, fuzzy
msgid "Failed to read PID from lock file."
msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü."
-#: ../src/unix/utilsunx.cpp:662
+#: ../src/unix/utilsunx.cpp:694
msgid "Failed to redirect child process input/output"
msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü"
msgid "Failed to register DDE server '%s'"
msgstr "×¢²áDDE·þÎñÆ÷ '%s'ʧ°Ü"
-#: ../src/common/fontmap.cpp:654
+#: ../src/common/fontmap.cpp:674
#, c-format
msgid "Failed to remember the encoding for the charset '%s'."
msgstr "»ØÒä×Ö·û¼¯ '%s'±àÂëʧ°Ü."
-#: ../src/unix/snglinst.cpp:297
+#: ../src/unix/snglinst.cpp:296
#, fuzzy, c-format
msgid "Failed to remove lock file '%s'"
msgstr "²»ÄÜɾ³ýÎļþ '%s'"
-#: ../src/unix/snglinst.cpp:263
+#: ../src/unix/snglinst.cpp:262
#, fuzzy, c-format
msgid "Failed to remove stale lock file '%s'."
msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
msgid "Failed to rename the registry key '%s' to '%s'."
msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü."
-#: ../src/msw/clipbrd.cpp:433
+#: ../src/msw/clipbrd.cpp:505
msgid "Failed to retrieve data from the clipboard."
msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£"
-#: ../src/common/filename.cpp:1627
+#: ../src/common/filename.cpp:1698
#, fuzzy, c-format
msgid "Failed to retrieve file times for '%s'"
msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
-#: ../src/msw/dialup.cpp:470
+#: ../src/msw/dialup.cpp:447
msgid "Failed to retrieve text of RAS error message"
msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü"
-#: ../src/msw/clipbrd.cpp:658
+#: ../src/msw/clipbrd.cpp:742
msgid "Failed to retrieve the supported clipboard formats"
msgstr "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü"
msgid "Failed to set FTP transfer mode to %s."
msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
-#: ../src/msw/clipbrd.cpp:305
+#: ../src/msw/clipbrd.cpp:379
msgid "Failed to set clipboard data."
msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü"
-#: ../src/common/file.cpp:516
+#: ../src/common/file.cpp:527
#, fuzzy
msgid "Failed to set temporary file permissions"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/unix/threadpsx.cpp:1093
+#: ../src/unix/threadpsx.cpp:1317
#, c-format
msgid "Failed to set thread priority %d."
msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü."
msgid "Failed to store image '%s' to memory VFS!"
msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!"
-#: ../src/unix/threadpsx.cpp:1279
+#: ../src/unix/threadpsx.cpp:1497
msgid "Failed to terminate a thread."
msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü"
msgid "Failed to terminate the advise loop with DDE server"
msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ»·Ê§°Ü"
-#: ../src/msw/dialup.cpp:948
+#: ../src/msw/dialup.cpp:918
#, c-format
msgid "Failed to terminate the dialup connection: %s"
msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü"
-#: ../src/common/filename.cpp:1576
+#: ../src/common/filename.cpp:1647
#, fuzzy, c-format
msgid "Failed to touch the file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/unix/snglinst.cpp:303
+#: ../src/unix/snglinst.cpp:302
#, fuzzy, c-format
msgid "Failed to unlock lock file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
msgid "Failed to unregister DDE server '%s'"
msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü"
-#: ../src/unix/snglinst.cpp:174
+#: ../src/unix/snglinst.cpp:173
#, fuzzy, c-format
msgid "Failed to write to lock file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/generic/logg.cpp:368
+#: ../src/generic/logg.cpp:372
msgid "Fatal error"
msgstr "ÖÂÃü´íÎó"
-#: ../src/common/log.cpp:362
+#: ../src/common/log.cpp:453
msgid "Fatal error: "
msgstr "ÖÂÃü´íÎó£º"
-#: ../src/mac/app.cpp:907 ../src/msw/app.cpp:1396
+#: ../src/mac/app.cpp:1217 ../src/msw/app.cpp:1306
msgid "Fatal error: exiting"
msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ"
msgid "File %s does not exist."
msgstr ": Îļþ²»´æÔÚ!"
-#: ../src/generic/filedlgg.cpp:1201 ../src/gtk/filedlg.cpp:69
+#: ../src/generic/filedlgg.cpp:1335 ../src/gtk/filedlg.cpp:69
#, c-format
msgid "File '%s' already exists, do you really want to overwrite it?"
msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
+#: ../src/msw/filedlg.cpp:502
+#, fuzzy, c-format
+msgid ""
+"File '%s' already exists.\n"
+"Do you want to replace it?"
+msgstr "Îļþ '%s' ÒÑ´æÔÚ, ÕæÐèÒª¸´Ð´Ëü?"
+
#: ../src/common/textcmn.cpp:158
msgid "File couldn't be loaded."
msgstr "Îļþ²»Äܱ»×°ÔØ"
-#: ../src/common/docview.cpp:295 ../src/common/docview.cpp:331
-#: ../src/common/docview.cpp:1387
+#: ../src/common/docview.cpp:292 ../src/common/docview.cpp:329
+#: ../src/common/docview.cpp:1409
msgid "File error"
msgstr "Îļþ´íÎó"
-#: ../src/generic/dirctrlg.cpp:666 ../src/generic/dirdlgg.cpp:285
-#: ../src/generic/filedlgg.cpp:851
+#: ../src/generic/dirctrlg.cpp:720 ../src/generic/filedlgg.cpp:936
msgid "File name exists already."
msgstr "ÎļþÃûÒÑ´æÔÚ"
-#: ../src/msw/filedlg.cpp:349
+#: ../src/msw/filedlg.cpp:350
#, c-format
msgid "Files (%s)|%s"
msgstr "Îļþ (%s)|%s"
-#: ../src/html/helpfrm.cpp:400
+#: ../src/html/helpfrm.cpp:362
msgid "Find"
msgstr "²éÕÒ"
-#: ../src/html/helpfrm.cpp:1032
+#: ../src/html/helpfrm.cpp:950
msgid "Fixed font:"
msgstr "¹Ì¶¨×ÖÌ壺"
msgid "Folio, 8 1/2 x 13 in"
msgstr "Folio, 8 1/2 x 13 in"
-#: ../src/generic/fontdlgg.cpp:126
+#: ../src/generic/fontdlgg.cpp:174
msgid "Font"
msgstr "×ÖÌå"
-#: ../src/html/helpfrm.cpp:1042
+#: ../src/html/helpfrm.cpp:960
msgid "Font size:"
msgstr "×ÖÌå´óС:"
-#: ../src/unix/utilsunx.cpp:619
+#: ../src/unix/utilsunx.cpp:642
msgid "Fork failed"
msgstr "Fork ʧ°Ü"
-#: ../src/common/dlgcmn.cpp:173 ../src/generic/helpwxht.cpp:158
+#: ../src/common/dlgcmn.cpp:167
msgid "Forward"
msgstr "ÏòÇ°"
msgid "Found "
msgstr "ÕÒµ½"
-#: ../src/html/helpfrm.cpp:721
+#: ../src/html/helpfrm.cpp:661
#, c-format
msgid "Found %i matches"
msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî"
-#: ../src/generic/prntdlgg.cpp:185
+#: ../src/generic/prntdlgg.cpp:186
msgid "From:"
msgstr "´Ó:"
-#: ../src/common/imaggif.cpp:74
+#: ../src/common/imaggif.cpp:100
+#, fuzzy
+msgid "GIF: Invalid gif index."
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
+
+#: ../src/common/imaggif.cpp:75
msgid "GIF: data stream seems to be truncated."
msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
-#: ../src/common/imaggif.cpp:58
+#: ../src/common/imaggif.cpp:59
msgid "GIF: error in GIF image format."
msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
-#: ../src/common/imaggif.cpp:61
+#: ../src/common/imaggif.cpp:62
msgid "GIF: not enough memory."
msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
-#: ../src/common/imaggif.cpp:64
+#: ../src/common/imaggif.cpp:65
msgid "GIF: unknown error!!!"
msgstr "GIF: λÖôíÎó!!!"
-#: ../src/univ/themes/gtk.cpp:578
+#: ../src/univ/themes/gtk.cpp:623
msgid "GTK+ theme"
msgstr ""
msgid "German Std Fanfold, 8 1/2 x 12 in"
msgstr "µÂ¹ú±ê×¼¸´Ð´²¾, 8 1/2 x 12 in"
-#: ../src/common/image.cpp:753
+#: ../src/common/image.cpp:762
msgid "GetUnusedColour:: No Unused Color in image "
msgstr ""
-#: ../src/html/helpfrm.cpp:566
+#: ../src/html/helpfrm.cpp:506
msgid "Go back"
msgstr "»ØÍË"
-#: ../src/html/helpfrm.cpp:569
+#: ../src/html/helpfrm.cpp:509
msgid "Go forward"
msgstr "ÏòÇ°"
-#: ../src/html/helpfrm.cpp:574
+#: ../src/html/helpfrm.cpp:514
msgid "Go one level up in document hierarchy"
msgstr "ÔÚÎĵµ²ã´ÎÖÐÉÏÉýÒ»¼¶"
-#: ../src/generic/filedlgg.cpp:1000
+#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1097
msgid "Go to home directory"
msgstr "½øÈëhomeĿ¼"
-#: ../src/generic/filedlgg.cpp:994
+#: ../src/generic/filedlgg.cpp:1089
msgid "Go to parent directory"
msgstr "½øÈ븸Ŀ¼"
-#: ../src/common/fontmap.cpp:117
+#: ../src/common/fontmap.cpp:118
msgid "Greek (ISO-8859-7)"
msgstr "Greek (ISO-8859-7)"
-#: ../src/html/htmlwin.cpp:360
+#: ../src/html/htmlwin.cpp:354
#, c-format
msgid "HTML anchor %s does not exist."
msgstr "HTML ê %s ²»´æÔÚ."
-#: ../src/html/helpfrm.cpp:1350
+#: ../src/html/helpfrm.cpp:1279
msgid ""
"HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|"
"Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"
"HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ïÖú"
"Êé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*"
-#: ../src/common/fontmap.cpp:118
+#: ../src/common/fontmap.cpp:119
msgid "Hebrew (ISO-8859-8)"
msgstr "Hebrew (ISO-8859-8)"
-#: ../src/common/dlgcmn.cpp:185 ../src/generic/proplist.cpp:530
-#: ../src/html/helpfrm.cpp:262 ../src/msw/mdi.cpp:1304
+#: ../src/common/dlgcmn.cpp:179 ../src/generic/proplist.cpp:516
+#: ../src/html/helpfrm.cpp:240 ../src/msw/mdi.cpp:1313
msgid "Help"
msgstr "°ïÖú"
-#: ../src/html/helpfrm.cpp:1015
+#: ../src/html/helpfrm.cpp:933
msgid "Help Browser Options"
msgstr "°ïÖúä¯ÀÀÆ÷Ñ¡Ïî"
-#: ../src/generic/helphtml.cpp:319 ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:334 ../src/generic/helphtml.cpp:335
msgid "Help Index"
msgstr "°ïÖúË÷Òý"
-#: ../src/html/helpfrm.cpp:1334
+#: ../src/html/helpfrm.cpp:1263
msgid "Help Printing"
msgstr "°ïÖú´òÓ¡"
-#: ../src/generic/helpwxht.cpp:251 ../src/html/helpctrl.cpp:44
+#: ../src/html/helpctrl.cpp:44
#, c-format
msgid "Help: %s"
msgstr "°ïÖú: %s"
-#: ../src/common/imagbmp.cpp:103
-msgid "ICO: Error Image too tall for an icon."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:109
-msgid "ICO: Error Image too wide for an icon."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:201
+#: ../src/common/imagbmp.cpp:858
#, fuzzy
-msgid "ICO: Error calculating size of DIB ."
+msgid "ICO: Error in reading mask DIB."
msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-#: ../src/common/imagbmp.cpp:194
+#: ../src/common/imagbmp.cpp: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
#, fuzzy
-msgid "ICO: Error calculating size of Mask DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "ICO: Error writing the image file!"
+msgstr "TIFF:дͼÏñ´íÎó."
-#: ../src/common/imagbmp.cpp:186
-#, fuzzy
-msgid "ICO: Error calculating size of XOR DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+#: ../src/common/imagbmp.cpp:928
+msgid "ICO: Image too tall for an icon."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:934
+msgid "ICO: Image too wide for an icon."
+msgstr ""
-#: ../src/common/imagbmp.cpp:1049
+#: ../src/common/imagbmp.cpp:1167
#, fuzzy
-msgid "ICO: Error in reading mask DIB."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "ICO: Invalid icon index."
+msgstr "ÎÞЧTIFFͼÏñË÷Òý."
-#: ../src/common/imagbmp.cpp:130
+#: ../src/common/imagiff.cpp:767
#, fuzzy
-msgid "ICO: Error writing ICONDIR header."
-msgstr "TIFF:дͼÏñ´íÎó."
+msgid "IFF: data stream seems to be truncated."
+msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï."
-#: ../src/common/imagbmp.cpp:231
+#: ../src/common/imagiff.cpp:751
#, fuzzy
-msgid "ICO: Error writing ICONDIRENTRY header."
-msgstr "TIFF:дͼÏñ´íÎó."
+msgid "IFF: error in IFF image format."
+msgstr "GIF: GIFÎļþ¸ñʽ´íÎó."
-#: ../src/common/imagbmp.cpp:248
+#: ../src/common/imagiff.cpp:754
#, fuzzy
-msgid "ICO: Error writing Mask DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "IFF: not enough memory."
+msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ."
-#: ../src/common/imagbmp.cpp:240
+#: ../src/common/imagiff.cpp:757
#, fuzzy
-msgid "ICO: Error writing XOR DIB ."
-msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+msgid "IFF: unknown error!!!"
+msgstr "GIF: λÖôíÎó!!!"
#: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
#: ../src/common/resource.cpp:2638 ../src/common/resource.cpp:2649
msgid "Ill-formed resource file syntax."
msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£"
-#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirdlgg.cpp:267
-#: ../src/generic/filedlgg.cpp:837
+#: ../src/generic/dirctrlg.cpp:702 ../src/generic/filedlgg.cpp:922
msgid "Illegal directory name."
msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£"
-#: ../src/generic/filedlgg.cpp:1170
+#: ../src/generic/filedlgg.cpp:1303
msgid "Illegal file specification."
msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
-#: ../src/common/image.cpp:776
+#: ../src/common/image.cpp:785
msgid "Image and Mask have different sizes"
msgstr ""
-#: ../src/msw/textctrl.cpp:269
+#: ../src/common/image.cpp:1064
+#, c-format
+msgid "Image file is not of type %d."
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:249
msgid ""
"Impossible to create a rich edit control, using simple text control instead. "
"Please reinstall riched32.dll"
msgstr "²»ÄÜ´´½¨rich±à¼¿Ø¼þ, ʹÓüòµ¥Îı¾¿Ø¼þ´úÌæ. ÇëÖØ×°riched32.dll"
-#: ../src/unix/utilsunx.cpp:367
+#: ../src/unix/utilsunx.cpp:390
msgid "Impossible to get child process input"
msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
-#: ../src/common/filefn.cpp:1088
+#: ../src/common/filefn.cpp:1097
#, fuzzy, c-format
msgid "Impossible to get permissions for file '%s'"
msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë"
-#: ../src/common/filefn.cpp:1102
+#: ../src/common/filefn.cpp:1111
#, fuzzy, c-format
msgid "Impossible to overwrite the file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/common/filefn.cpp:1152
+#: ../src/common/filefn.cpp:1161
#, c-format
msgid "Impossible to set permissions for the file '%s'"
msgstr ""
-#: ../src/html/helpdata.cpp:319
-msgid "Incorrect version of HTML help book"
-msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
-
-#: ../src/html/helpfrm.cpp:432
+#: ../src/html/helpfrm.cpp:387
msgid "Index"
msgstr "Ë÷Òý"
-#: ../src/common/fontmap.cpp:122
+#: ../src/common/fontmap.cpp:123
#, fuzzy
msgid "Indian (ISO-8859-12)"
msgstr "Nordic (ISO-8859-10)"
-#: ../src/common/imagtiff.cpp:175
+#: ../src/common/imagtiff.cpp:183
msgid "Invalid TIFF image index."
msgstr "ÎÞЧTIFFͼÏñË÷Òý."
-#: ../contrib/src/xrc/xmlres.cpp:313
+#: ../contrib/src/xrc/xmlres.cpp:342
#, c-format
msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
msgstr ""
-#: ../src/common/appcmn.cpp:282
+#: ../src/common/appcmn.cpp:327
#, fuzzy, c-format
msgid "Invalid display mode specification '%s'."
msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
-#: ../src/unix/snglinst.cpp:281
+#: ../src/x11/app.cpp:227
+#, fuzzy, c-format
+msgid "Invalid geometry specification '%s'"
+msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö"
+
+#: ../src/unix/snglinst.cpp:280
#, fuzzy, c-format
msgid "Invalid lock file '%s'."
msgstr "²»ÄܹرÕÎļþ '%s'"
msgid "Invalid regular expression '%s': %s"
msgstr ""
-#: ../src/generic/fontdlgg.cpp:215
+#: ../src/generic/fontdlgg.cpp:230
msgid "Italic"
msgstr "бÌå"
msgid "Italy Envelope, 110 x 230 mm"
msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm"
-#: ../src/common/imagjpeg.cpp:206
+#: ../src/common/imagjpeg.cpp:222
msgid "JPEG: Couldn't load - file is probably corrupted."
msgstr "JPEG: ²»ÄÜ×°Èë - ÎļþÒ²ÐíÒѱ»ÆÆ»µ."
-#: ../src/common/imagjpeg.cpp:320
+#: ../src/common/imagjpeg.cpp:336
msgid "JPEG: Couldn't save image."
msgstr "JPEG: ²»Äܱ£´æͼÏñ."
-#: ../src/common/fontmap.cpp:126
+#: ../src/common/fontmap.cpp:127
msgid "KOI8-R"
msgstr "KOI8-R"
-#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:439
-#: ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:438
+#: ../src/generic/prntdlgg.cpp:634
msgid "Landscape"
msgstr "ºáÏò"
msgid "Ledger, 17 x 11 in"
msgstr "Ledger, 17 x 11 Ó¢´ç"
-#: ../src/generic/prntdlgg.cpp:647
+#: ../src/generic/prntdlgg.cpp:646
msgid "Left margin (mm):"
msgstr "×ó±ß¾à (ºÁÃ×):"
msgid "Letter, 8 1/2 x 11 in"
msgstr "Letter, 8 1/2 x 11 Ó¢´ç"
-#: ../src/generic/fontdlgg.cpp:218
+#: ../src/generic/fontdlgg.cpp:233
msgid "Light"
msgstr "Çá"
-#: ../src/generic/filedlgg.cpp:1406 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:514
+#: ../src/generic/filedlgg.cpp:1545 ../src/gtk/filedlg.cpp:249
+#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:539
#, c-format
msgid "Load %s file"
msgstr "×°ÈëÎļþ %s "
-#: ../src/html/htmlwin.cpp:285
+#: ../src/html/htmlwin.cpp:282
msgid "Loading : "
msgstr "×°ÔØ:"
-#: ../src/common/imagbmp.cpp:660 ../src/common/imagbmp.cpp:674
-#, fuzzy
-msgid "Loading DIB : Couldn't allocate memory."
-msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
-
#: ../src/common/imagpnm.cpp:72
msgid "Loading Grey Ascii PNM image is not yet implemented."
msgstr "×°Èë»Ò¶È Ascii PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
msgid "Loading Grey Raw PNM image is not yet implemented."
msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ."
-#: ../src/generic/logg.cpp:538
+#: ../src/generic/logg.cpp:547
#, c-format
msgid "Log saved to the file '%s'."
msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'."
-#: ../src/gtk/mdi.cpp:435
+#: ../src/gtk/mdi.cpp:432
msgid "MDI child"
msgstr "MDI×Ó´°¿Ú"
-#: ../src/msw/helpchm.cpp:70
+#: ../src/msw/helpchm.cpp:60
#, fuzzy
msgid ""
"MS HTML Help functions are unavailable because the MS HTML Help library is "
"not installed on this machine. Please install it."
msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü."
-#: ../src/unix/mimetype.cpp:2412
+#: ../src/univ/themes/win32.cpp:4545
+msgid "Ma&ximize"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:2418
#, c-format
msgid "Mailcap file %s, line %d: incomplete entry ignored."
msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ."
msgid "Memory VFS already contains file '%s'!"
msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!"
-#: ../src/unix/mimetype.cpp:2077
+#: ../src/univ/themes/metal.cpp:174
+msgid "Metal theme"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:4543
+msgid "Mi&nimize"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:2078
#, c-format
msgid "Mime.types file %s, line %d: unterminated quoted string."
msgstr "Mime.ÀàÐÍÎļþ %s, ÐÐ %d: ûÓнáÊø·ûºÅµÄÒýÓÃ×Ö·û´®."
-#: ../src/mgl/app.cpp:169
+#: ../src/mgl/app.cpp:173
#, c-format
msgid "Mode %ix%i-%i not available."
msgstr ""
-#: ../src/generic/fontdlgg.cpp:210
+#: ../src/generic/fontdlgg.cpp:225
msgid "Modern"
msgstr "ÏÖ´ú"
msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in"
-#: ../src/common/dlgcmn.cpp:182
+#: ../src/common/dlgcmn.cpp:176
msgid "More..."
msgstr "¸ü¶à..."
-#: ../src/generic/dirctrlg.cpp:615 ../src/generic/dirdlgg.cpp:212
-msgid "Mounted Devices"
-msgstr "¹ÒÔØÉ豸"
-
-#: ../src/generic/dirdlgg.cpp:207
-msgid "My Harddisk"
-msgstr "ÎÒµÄÓ²ÅÌ"
-
-#: ../src/generic/dirctrlg.cpp:614 ../src/generic/dirdlgg.cpp:211
-msgid "My Home"
-msgstr "ÎҵļÒ"
-
-#: ../src/generic/filedlgg.cpp:644
+#: ../src/generic/filedlgg.cpp:687
msgid "Name"
msgstr "Ãû³Æ"
-#: ../src/generic/dirctrlg.cpp:1255 ../src/generic/dirdlgg.cpp:420
-msgid "New..."
-msgstr "´´½¨..."
-
-#: ../src/generic/filedlgg.cpp:727
+#: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282
+#: ../src/generic/filedlgg.cpp:801 ../src/generic/filedlgg.cpp:810
msgid "NewName"
msgstr "ÐÂÃû"
-#: ../src/html/helpfrm.cpp:580
+#: ../src/html/helpfrm.cpp:520
msgid "Next page"
msgstr "ÏÂÒ»Ò³"
-#: ../src/common/dlgcmn.cpp:152 ../src/common/dlgcmn.cpp:162
-#: ../src/mac/msgdlg.cpp:84 ../src/motif/msgdlg.cpp:180
+#: ../src/common/dlgcmn.cpp:156 ../src/mac/msgdlg.cpp:78
+#: ../src/motif/msgdlg.cpp:180
msgid "No"
msgstr "·ñ"
-#: ../src/common/image.cpp:784
+#: ../src/common/image.cpp:793
msgid "No Unused Color in image being masked"
msgstr ""
msgid "No XPM icon facility available!"
msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!"
-#: ../src/generic/helphtml.cpp:314
+#: ../src/generic/helphtml.cpp:329
msgid "No entries found."
msgstr "ûÕÒµ½ÌõÄ¿"
-#: ../src/common/fontmap.cpp:845
+#: ../src/common/fontmap.cpp:865
#, fuzzy, c-format
msgid ""
"No font for displaying text in encoding '%s' found,\n"
"Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
-#: ../src/common/fontmap.cpp:850
+#: ../src/common/fontmap.cpp:870
#, fuzzy, c-format
msgid ""
"No font for displaying text in encoding '%s' found.\n"
"Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n"
"(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?"
-#: ../contrib/src/xrc/xmlres.cpp:396
+#: ../contrib/src/xrc/xmlres.cpp:522
#, c-format
msgid "No handler found for XML node '%s', class '%s'!"
msgstr ""
-#: ../src/common/image.cpp:1009
+#: ../src/common/image.cpp:1046 ../src/common/image.cpp:1089
msgid "No handler found for image type."
msgstr "ûÓÐÕÒµ½Í¼ÏñÀàÐÍ´¦ÀíÆ÷."
-#: ../src/common/image.cpp:1017 ../src/common/image.cpp:1051
+#: ../src/common/image.cpp:1054 ../src/common/image.cpp:1097
+#: ../src/common/image.cpp:1131
#, c-format
msgid "No image handler for type %d defined."
msgstr "ûÓÐÀàÐÍ %d µÄͼÏñ´¦ÀíÆ÷."
-#: ../src/common/image.cpp:1035 ../src/common/image.cpp:1067
+#: ../src/common/image.cpp:1115 ../src/common/image.cpp:1147
#, c-format
msgid "No image handler for type %s defined."
msgstr "ûÓÐÀàÐÍ %sµÄͼÏñ´¦ÀíÆ÷."
-#: ../src/html/helpfrm.cpp:710
+#: ../src/html/helpfrm.cpp:650
msgid "No matching page found yet"
msgstr "No matching page found yet"
-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fontmap.cpp:121
msgid "Nordic (ISO-8859-10)"
msgstr "Nordic (ISO-8859-10)"
-#: ../src/generic/fontdlgg.cpp:214 ../src/generic/fontdlgg.cpp:217
+#: ../src/generic/fontdlgg.cpp:229 ../src/generic/fontdlgg.cpp:232
msgid "Normal"
msgstr "Õý³£"
-#: ../src/html/helpfrm.cpp:1024
+#: ../src/html/helpfrm.cpp:942
msgid "Normal font:"
msgstr "Normal font:"
msgid "Note, 8 1/2 x 11 in"
msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç"
-#: ../src/common/dlgcmn.cpp:168 ../src/generic/dcpsg.cpp:2268
-#: ../src/generic/dirctrlg.cpp:1247 ../src/generic/dirdlgg.cpp:416
-#: ../src/generic/filedlgg.cpp:1032 ../src/generic/fontdlgg.cpp:258
-#: ../src/generic/logg.cpp:723 ../src/generic/prntdlgg.cpp:465
-#: ../src/generic/proplist.cpp:513 ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:172 ../src/html/helpfrm.cpp:1052
+#: ../src/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
msgid "OK"
msgstr "È·ÈÏ"
-#: ../src/html/helpfrm.cpp:588 ../src/html/helpfrm.cpp:1345
+#: ../src/html/helpfrm.cpp:528 ../src/html/helpfrm.cpp:1274
msgid "Open HTML document"
msgstr "´ò¿ªHTMLÎĵµ"
-#: ../src/generic/dirctrlg.cpp:677 ../src/generic/dirctrlg.cpp:1391
-#: ../src/generic/dirdlgg.cpp:296 ../src/generic/dirdlgg.cpp:598
-#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:864
+#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298
+#: ../src/generic/filedlgg.cpp:825 ../src/generic/filedlgg.cpp:949
msgid "Operation not permitted."
msgstr "²»ÔÊÐíµÄ²Ù×÷."
-#: ../src/common/cmdline.cpp:627
+#: ../src/common/cmdline.cpp:631
#, c-format
msgid "Option '%s' requires a value, '=' expected."
msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='."
-#: ../src/common/cmdline.cpp:647
+#: ../src/common/cmdline.cpp:651
#, c-format
msgid "Option '%s' requires a value."
msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ."
-#: ../src/common/cmdline.cpp:708
+#: ../src/common/cmdline.cpp:712
#, c-format
msgid "Option '%s': '%s' cannot be converted to a date."
msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ."
-#: ../src/generic/prntdlgg.cpp:445
+#: ../src/generic/prntdlgg.cpp:444
msgid "Options"
msgstr "Ñ¡Ïî"
-#: ../src/generic/prntdlgg.cpp:441 ../src/generic/prntdlgg.cpp:636
+#: ../src/generic/prntdlgg.cpp:440 ../src/generic/prntdlgg.cpp:635
msgid "Orientation"
msgstr "·½Ïò"
-#: ../src/common/imagpcx.cpp:461 ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:455 ../src/common/imagpcx.cpp:478
msgid "PCX: couldn't allocate memory"
msgstr "PCX: ²»ÄÜ·ÖÅäÄÚ´æ"
-#: ../src/common/imagpcx.cpp:460
+#: ../src/common/imagpcx.cpp:454
msgid "PCX: image format unsupported"
msgstr "PCX: ͼÏñ¸ñʽ²»Ö§³Ö"
-#: ../src/common/imagpcx.cpp:483
+#: ../src/common/imagpcx.cpp:477
msgid "PCX: invalid image"
msgstr "PCX: ÎÞЧͼÏñ"
-#: ../src/common/imagpcx.cpp:447
+#: ../src/common/imagpcx.cpp:441
msgid "PCX: this is not a PCX file."
msgstr "PCX: ²»ÊÇPCXÎļþ."
-#: ../src/common/imagpcx.cpp:463 ../src/common/imagpcx.cpp:485
+#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:479
msgid "PCX: unknown error !!!"
msgstr "PCX: δ֪´íÎó !!!"
-#: ../src/common/imagpcx.cpp:462
+#: ../src/common/imagpcx.cpp:456
msgid "PCX: version number too low"
msgstr "PCX: °æ±¾ºÅ̫С"
msgid "PNM: File seems truncated."
msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï."
-#: ../src/common/prntbase.cpp:736
+#: ../src/common/prntbase.cpp:741
#, c-format
msgid "Page %d"
msgstr "ҳ %d"
-#: ../src/common/prntbase.cpp:734
+#: ../src/common/prntbase.cpp:739
#, c-format
msgid "Page %d of %d"
msgstr "ҳ %d / %d"
-#: ../src/generic/prntdlgg.cpp:602
+#: ../src/generic/prntdlgg.cpp:601
msgid "Page Setup"
msgstr "Ò³ÃæÉèÖÃ"
-#: ../src/generic/prntdlgg.cpp:162
+#: ../src/generic/prntdlgg.cpp:163
msgid "Pages"
msgstr "ҳ"
-#: ../src/generic/prntdlgg.cpp:553 ../src/generic/prntdlgg.cpp:624
-#: ../src/generic/prntdlgg.cpp:806
+#: ../src/generic/prntdlgg.cpp:552 ../src/generic/prntdlgg.cpp:623
+#: ../src/generic/prntdlgg.cpp:805
msgid "Paper Size"
msgstr "Ö½ÕÅ´óС"
-#: ../src/generic/prntdlgg.cpp:431 ../src/generic/prntdlgg.cpp:613
-#: ../src/generic/prntdlgg.cpp:802
+#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:612
+#: ../src/generic/prntdlgg.cpp:801
msgid "Paper size"
msgstr "Ö½ÕÅ´óС"
-#: ../src/generic/filedlgg.cpp:648
+#: ../src/generic/filedlgg.cpp:692
msgid "Permissions"
msgstr "ÔÊÐí"
-#: ../src/unix/utilsunx.cpp:562 ../src/unix/utilsunx.cpp:590
+#: ../src/unix/utilsunx.cpp:585 ../src/unix/utilsunx.cpp:613
msgid "Pipe creation failed"
msgstr "¹ÜµÀ´´½¨Ê§°Ü"
msgid "Please choose a valid font."
msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£"
-#: ../src/generic/filedlgg.cpp:1219 ../src/gtk/filedlg.cpp:80
+#: ../src/generic/filedlgg.cpp:1353 ../src/gtk/filedlg.cpp:80
msgid "Please choose an existing file."
msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£"
-#: ../src/msw/dialup.cpp:775
+#: ../src/msw/dialup.cpp:752
msgid "Please choose which ISP do you want to connect to"
msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP"
-#: ../src/msw/listctrl.cpp:491
+#: ../src/msw/listctrl.cpp:536
#, c-format
msgid ""
"Please install a newer version of comctl32.dll\n"
"or this program won't operate correctly."
msgstr ""
-#: ../src/common/prntbase.cpp:107
-msgid "Please wait..."
-msgstr "ÇëµÈ´ý..."
+#: ../src/common/prntbase.cpp:111
+msgid "Please wait while printing\n"
+msgstr ""
-#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:438
-#: ../src/generic/prntdlgg.cpp:634
+#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:437
+#: ../src/generic/prntdlgg.cpp:633
msgid "Portrait"
msgstr "×ÝÏò"
-#: ../src/generic/dcpsg.cpp:389
+#: ../src/generic/dcpsg.cpp:388
msgid "PostScript"
msgstr "PostScript"
-#: ../src/generic/prntdlgg.cpp:270
+#: ../src/generic/prntdlgg.cpp:271
msgid "PostScript file"
msgstr "PostScriptÎļþ"
msgid "Preview Only"
msgstr "½öÔ¤ÀÀ"
-#: ../src/html/helpfrm.cpp:1046
+#: ../src/html/helpfrm.cpp:964
msgid "Preview:"
msgstr "Ô¤ÀÀ£º"
-#: ../src/html/helpfrm.cpp:577
+#: ../src/html/helpfrm.cpp:517
msgid "Previous page"
msgstr "ǰҳ"
-#: ../src/generic/prntdlgg.cpp:111 ../src/generic/prntdlgg.cpp:125
+#: ../src/generic/prntdlgg.cpp:112 ../src/generic/prntdlgg.cpp:126
msgid "Print"
msgstr "´òÓ¡"
-#: ../src/common/docview.cpp:896
+#: ../src/common/docview.cpp:910
msgid "Print Preview"
msgstr "´òÓ¡Ô¤ÀÀ"
-#: ../src/common/prntbase.cpp:691 ../src/common/prntbase.cpp:715
+#: ../src/common/prntbase.cpp:696 ../src/common/prntbase.cpp:720
msgid "Print Preview Failure"
msgstr "´òÓ¡Ô¤ÀÀʧ°Ü"
-#: ../src/generic/prntdlgg.cpp:170
+#: ../src/generic/prntdlgg.cpp:171
msgid "Print Range"
msgstr "´òÓ¡·¶Î§"
-#: ../src/generic/prntdlgg.cpp:406 ../src/generic/prntdlgg.cpp:413
+#: ../src/generic/prntdlgg.cpp:405 ../src/generic/prntdlgg.cpp:412
msgid "Print Setup"
msgstr "´òÓ¡ÉèÖÃ"
-#: ../src/generic/prntdlgg.cpp:453
+#: ../src/generic/prntdlgg.cpp:452
msgid "Print in colour"
msgstr "²ÊÉ«´òÓ¡"
-#: ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/prntdlgg.cpp:454
msgid "Print spooling"
msgstr "´òÓ¡¼ÙÍÑ»ú"
-#: ../src/html/helpfrm.cpp:594
+#: ../src/html/helpfrm.cpp:534
msgid "Print this page"
msgstr "´òÓ¡±¾Ò³"
-#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:148
+#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:149
msgid "Print to File"
msgstr "´òÓ¡µ½Îļþ"
-#: ../src/common/prntbase.cpp:366
+#: ../src/common/prntbase.cpp:371
msgid "Print..."
msgstr "´òÓ¡..."
msgid "Printer Options: "
msgstr "´òÓ¡»úÑ¡Ïî:"
-#: ../src/generic/dcpsg.cpp:358
+#: ../src/generic/dcpsg.cpp:357
msgid "Printer Settings"
msgstr "´òÓ¡»úÉèÖÃ"
-#: ../src/generic/prntdlgg.cpp:457
+#: ../src/generic/prntdlgg.cpp:456
msgid "Printer command:"
msgstr "´òÓ¡»úÃüÁî:"
-#: ../src/generic/prntdlgg.cpp:147
+#: ../src/generic/prntdlgg.cpp:148
msgid "Printer options"
msgstr "´òÓ¡»úÑ¡Ïî"
-#: ../src/generic/prntdlgg.cpp:461
+#: ../src/generic/prntdlgg.cpp:460
msgid "Printer options:"
msgstr "´òÓ¡»úÑ¡Ïî:"
-#: ../src/generic/prntdlgg.cpp:680
+#: ../src/generic/prntdlgg.cpp:679
msgid "Printer..."
msgstr "´òÓ¡»ú..."
-#: ../src/common/prntbase.cpp:106 ../src/common/prntbase.cpp:148
-msgid "Printing"
+#: ../src/common/prntbase.cpp:108 ../src/common/prntbase.cpp:153
+#, fuzzy
+msgid "Printing "
msgstr "´òÓ¡"
-#: ../src/common/prntbase.cpp:120
+#: ../src/common/prntbase.cpp:125
msgid "Printing Error"
msgstr "´òÓ¡³ö´í"
msgid "Printing..."
msgstr "´òÓ¡..."
-#: ../src/common/log.cpp:363
+#: ../src/common/log.cpp:454
msgid "Program aborted."
msgstr "³ÌÐòÖÕÖ¹."
msgid "Quarto, 215 x 275 mm"
msgstr "ËÄ¿ª, 215 x 275 mm"
-#: ../src/generic/logg.cpp:1022
+#: ../src/generic/logg.cpp:1053
msgid "Question"
msgstr "ÎÊÌâ"
msgid "Read error on file '%s'"
msgstr "¶ÁÎļþ '%s'³ö´í"
+#: ../contrib/src/xrc/xmlres.cpp:497
+#, c-format
+msgid "Referenced object node with ref=\"%s\" not found!"
+msgstr ""
+
#: ../src/msw/registry.cpp:535
#, c-format
msgid "Registry key '%s' already exists."
msgid "Registry value '%s' already exists."
msgstr "×¢²áÖµ '%s' ÒÑ´æÔÚ."
-#: ../src/generic/helphtml.cpp:319
+#: ../src/generic/helphtml.cpp:334
msgid "Relevant entries:"
msgstr "Ïà¹ØÌõÄ¿:"
-#: ../src/generic/progdlgg.cpp:194
+#: ../src/generic/progdlgg.cpp:199
msgid "Remaining time : "
msgstr "Ê£Óàʱ¼ä : "
-#: ../src/html/helpfrm.cpp:329
+#: ../src/html/helpfrm.cpp:324
msgid "Remove current page from bookmarks"
msgstr "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³"
msgid "Replace with:"
msgstr ""
-#: ../contrib/src/xrc/xmlres.cpp:330
+#: ../contrib/src/xrc/xmlres.cpp:359
msgid "Resource files must have same version number!"
msgstr ""
-#: ../src/generic/prntdlgg.cpp:659
+#: ../src/generic/prntdlgg.cpp:658
msgid "Right margin (mm):"
msgstr "Óұ߾à (ºÁÃ×):"
-#: ../src/generic/fontdlgg.cpp:208
+#: ../src/generic/fontdlgg.cpp:223
msgid "Roman"
msgstr "ÂÞÂí"
-#: ../src/generic/filedlgg.cpp:1422 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:516
+#: ../src/generic/filedlgg.cpp:1561 ../src/gtk/filedlg.cpp:265
+#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:541
#, c-format
msgid "Save %s file"
msgstr "±£´æÎļþ %s "
-#: ../src/common/docview.cpp:248
+#: ../src/common/docview.cpp:245
msgid "Save as"
msgstr "Áí´æΪ"
-#: ../src/generic/logg.cpp:471
+#: ../src/generic/logg.cpp:480
msgid "Save log contents to file"
msgstr "°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ"
-#: ../src/generic/fontdlgg.cpp:211
+#: ../src/mgl/window.cpp:132
+msgid "Screenshot captured: "
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:226
msgid "Script"
msgstr "Script"
-#: ../src/generic/helpwxht.cpp:161 ../src/html/helpfrm.cpp:475
-#: ../src/html/helpfrm.cpp:495
+#: ../src/html/helpfrm.cpp:408 ../src/html/helpfrm.cpp:423
msgid "Search"
msgstr "ËÑË÷"
-#: ../src/html/helpfrm.cpp:477
+#: ../src/html/helpfrm.cpp:410
msgid ""
"Search contents of help book(s) for all occurences of the text you typed "
"above"
msgid "Search for:"
msgstr "ËÑË÷"
-#: ../src/html/helpfrm.cpp:871
+#: ../src/html/helpfrm.cpp:789
msgid "Search in all books"
msgstr "ÔÚË÷ÒýÊéÖÐËÑË÷"
-#: ../src/html/helpfrm.cpp:710
+#: ../src/html/helpfrm.cpp:650
msgid "Searching..."
msgstr "ËÑË÷..."
-#: ../src/generic/dirctrlg.cpp:488 ../src/generic/dirdlgg.cpp:190
+#: ../src/generic/dirctrlg.cpp:549
msgid "Sections"
msgstr "¶Î"
msgid "Seek error on file '%s'"
msgstr "Îļþ '%s'¶¨Î»´íÎó"
-#: ../src/common/docview.cpp:1490
+#: ../src/common/docview.cpp:1525
msgid "Select a document template"
msgstr "Ñ¡ÔñÎĵµÄ£°å"
-#: ../src/common/docview.cpp:1556
+#: ../src/common/docview.cpp:1601
msgid "Select a document view"
msgstr "Ñ¡ÔñÎĵµÊÓͼ"
-#: ../src/common/docview.cpp:1370 ../src/common/docview.cpp:1421
+#: ../src/common/docview.cpp:1392 ../src/common/docview.cpp:1443
msgid "Select a file"
msgstr "Ñ¡ÔñÎļþ"
msgid "Send to Printer"
msgstr "·¢µ½´òÓ¡»ú"
-#: ../src/common/cmdline.cpp:664
+#: ../src/common/cmdline.cpp:668
#, c-format
msgid "Separator expected after the option '%s'."
msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û."
-#: ../src/msw/glcanvas.cpp:441
+#: ../src/msw/glcanvas.cpp:432
#, fuzzy
msgid "SetPixelFormat failed."
msgstr "¹ÜµÀ´´½¨Ê§°Ü"
-#: ../src/common/dlgcmn.cpp:179
+#: ../src/common/dlgcmn.cpp:173
msgid "Setup"
msgstr "ÉèÖÃ"
-#: ../src/generic/prntdlgg.cpp:153
+#: ../src/generic/prntdlgg.cpp:154
msgid "Setup..."
msgstr "ÉèÖÃ..."
-#: ../src/msw/dialup.cpp:546
+#: ../src/msw/dialup.cpp:523
msgid "Several active dialup connections found, choosing one randomly."
msgstr "ÕÒµ½¶à¸ö»î¶¯²¦ºÅÁ¬½Ó, Ëæ»úÑ¡ÔñÒ»¸ö."
-#: ../src/html/helpfrm.cpp:391
+#: ../src/html/helpfrm.cpp:364
msgid "Show all"
msgstr "ÏÔʾËùÓÐ"
-#: ../src/html/helpfrm.cpp:425
+#: ../src/html/helpfrm.cpp:375
msgid "Show all items in index"
msgstr "°ÑËùÓÐÏîÄ¿ÏÔʾΪË÷Òý"
-#: ../src/generic/filedlgg.cpp:1038
+#: ../src/generic/dirdlgg.cpp:135
+#, fuzzy
+msgid "Show hidden directories"
+msgstr "ÏÔʾÒþ²ØÎļþ"
+
+#: ../src/generic/filedlgg.cpp:1149 ../src/generic/filedlgg.cpp:1171
msgid "Show hidden files"
msgstr "ÏÔʾÒþ²ØÎļþ"
-#: ../src/html/helpfrm.cpp:561
+#: ../src/html/helpfrm.cpp:501
msgid "Show/hide navigation panel"
msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å"
-#: ../src/generic/filedlgg.cpp:645
+#: ../src/generic/filedlgg.cpp:688
msgid "Size"
msgstr "´óС"
-#: ../src/generic/fontdlgg.cpp:216
+#: ../src/generic/fontdlgg.cpp:231
msgid "Slant"
msgstr "Çãб"
-#: ../src/common/docview.cpp:305
+#: ../src/common/docview.cpp:302
msgid "Sorry, could not open this file for saving."
msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþÒԱ㱣´æ¡£"
-#: ../src/common/docview.cpp:341 ../src/common/docview.cpp:353
-#: ../src/common/docview.cpp:1389
+#: ../src/common/docview.cpp:339 ../src/common/docview.cpp:352
+#: ../src/common/docview.cpp:1411
msgid "Sorry, could not open this file."
msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£"
-#: ../src/common/docview.cpp:312
+#: ../src/common/docview.cpp:309
msgid "Sorry, could not save this file."
msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£"
-#: ../src/common/prntbase.cpp:691
+#: ../src/common/prntbase.cpp:696
msgid "Sorry, not enough memory to create a preview."
msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ."
msgid "Statement, 5 1/2 x 8 1/2 in"
msgstr "Statement, 5 1/2 x 8 1/2 in"
-#: ../src/generic/logg.cpp:588
+#: ../src/generic/logg.cpp:597
msgid "Status: "
msgstr "״̬£º"
-#: ../src/generic/fontdlgg.cpp:212
+#: ../contrib/src/xrc/xmlres.cpp:557
+#, c-format
+msgid "Subclass '%s' not found for resource '%s', not subclassing!"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:227
msgid "Swiss"
msgstr "ÈðÊ¿"
-#: ../src/common/imagtiff.cpp:196 ../src/common/imagtiff.cpp:207
-#: ../src/common/imagtiff.cpp:318
+#: ../src/common/imagtiff.cpp:204 ../src/common/imagtiff.cpp:215
+#: ../src/common/imagtiff.cpp:326
msgid "TIFF: Couldn't allocate memory."
msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ."
-#: ../src/common/imagtiff.cpp:167
+#: ../src/common/imagtiff.cpp:175
msgid "TIFF: Error loading image."
msgstr "TIFF: ×°ÔØͼÏñ´íÎó."
-#: ../src/common/imagtiff.cpp:218
+#: ../src/common/imagtiff.cpp:226
msgid "TIFF: Error reading image."
msgstr "TIFF: ¶ÁͼÏñ´íÎó."
-#: ../src/common/imagtiff.cpp:295
+#: ../src/common/imagtiff.cpp:303
msgid "TIFF: Error saving image."
msgstr "TIFF: ±£´æͼÏñ´íÎó."
-#: ../src/common/imagtiff.cpp:342
+#: ../src/common/imagtiff.cpp:350
msgid "TIFF: Error writing image."
msgstr "TIFF:дͼÏñ´íÎó."
msgid "Tabloid, 11 x 17 in"
msgstr "Tabloid, 11 x 17 Ó¢´ç"
-#: ../src/generic/fontdlgg.cpp:213
+#: ../src/generic/fontdlgg.cpp:228
msgid "Teletype"
msgstr "µç´«´ò×Ö»ú"
-#: ../src/common/docview.cpp:1491
+#: ../src/common/docview.cpp:1526
msgid "Templates"
msgstr "Ä£°å"
-#: ../src/generic/dirctrlg.cpp:620 ../src/generic/dirdlgg.cpp:217
-msgid "Temporary"
-msgstr "ÁÙʱµÄ"
-
-#: ../src/common/fontmap.cpp:121
+#: ../src/common/fontmap.cpp:122
msgid "Thai (ISO-8859-11)"
msgstr "Ì©Óï (ISO-8859-11)"
-#: ../src/generic/dirctrlg.cpp:613 ../src/generic/dirdlgg.cpp:209
-msgid "The Computer"
-msgstr "¼ÆËã»ú"
-
#: ../src/common/ftp.cpp:569
msgid "The FTP server doesn't support passive mode."
msgstr ""
-#: ../src/common/fontmap.cpp:610
+#: ../src/common/fontmap.cpp:630
#, c-format
msgid ""
"The charset '%s' is unknown. You may select\n"
msgid "The clipboard format '%d' doesn't exist."
msgstr "¼ôÌù°å¸ñʽ '%d' ²»´æÔÚ."
-#: ../src/generic/dirctrlg.cpp:1288 ../src/generic/dirdlgg.cpp:529
-msgid "The directory "
-msgstr "Ŀ¼"
+#: ../src/generic/dirdlgg.cpp:186
+#, fuzzy, c-format
+msgid ""
+"The directory '%s' does not exist\n"
+"Create it now?"
+msgstr ""
+"\n"
+"²»´æÔÚ\n"
+"ÏÖÔÚ´´½¨?"
-#: ../src/common/docview.cpp:1744
+#: ../src/common/docview.cpp:1789
#, fuzzy, c-format
msgid ""
"The file '%s' doesn't exist and couldn't be opened.\n"
"Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n"
"ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥."
-#: ../src/common/filename.cpp:780
+#: ../src/common/filename.cpp:884
#, c-format
msgid "The path '%s' contains too many \"..\"!"
msgstr ""
-#: ../src/common/cmdline.cpp:798
+#: ../src/common/cmdline.cpp:802
#, c-format
msgid "The required parameter '%s' was not specified."
msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨."
msgid "The text couldn't be saved."
msgstr "Îı¾²»Äܱ»±£´æ¡£"
-#: ../src/common/cmdline.cpp:777
+#: ../src/common/cmdline.cpp:781
#, c-format
msgid "The value for the option '%s' must be specified."
msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨."
-#: ../src/msw/dialup.cpp:422
+#: ../src/msw/dialup.cpp:411
#, c-format
msgid ""
"The version of remote access service (RAS) installed on this machine is "
"tooold, please upgrade (the following required function is missing: %s)."
msgstr "°²×°ÔÚ±¾»úµÄÔ¶³Ì·ÃÎÊ·þÎñ(RAS)Ì«¾É, Çë¸üÐÂËü (ÏÂÁбØÐëµÃº¯Êýȱʧ: %s)."
-#: ../src/msw/thread.cpp:1112
+#: ../src/html/htmprint.cpp:548
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+
+#: ../src/msw/thread.cpp:1298
msgid ""
"Thread module initialization failed: can not store value in thread local "
"storage"
msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ"
-#: ../src/unix/threadpsx.cpp:1469
+#: ../src/unix/threadpsx.cpp:1688
msgid "Thread module initialization failed: failed to create thread key"
msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü"
-#: ../src/msw/thread.cpp:1100
+#: ../src/msw/thread.cpp:1286
msgid ""
"Thread module initialization failed: impossible to allocate index in thread "
"local storage"
msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý"
-#: ../src/unix/threadpsx.cpp:984
+#: ../src/unix/threadpsx.cpp:1208
msgid "Thread priority setting is ignored."
msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ."
-#: ../src/msw/mdi.cpp:178
+#: ../src/msw/mdi.cpp:186
msgid "Tile &Horizontally"
msgstr ""
-#: ../src/msw/mdi.cpp:179
+#: ../src/msw/mdi.cpp:187
msgid "Tile &Vertically"
msgstr ""
-#: ../src/generic/filedlgg.cpp:647
+#: ../src/generic/filedlgg.cpp:690
msgid "Time"
msgstr "ʱ¼ä"
-#: ../src/generic/tipdlg.cpp:162
+#: ../src/generic/tipdlg.cpp:163
msgid "Tip of the Day"
msgstr "ÿÈÕ¼¼ÇÉ"
-#: ../src/generic/tipdlg.cpp:138
+#: ../src/generic/tipdlg.cpp:139
msgid "Tips not available, sorry!"
msgstr "¶Ô²»Æð£¬Ã»ÓÐËùÐè¼¼ÇÉ!"
-#: ../src/generic/prntdlgg.cpp:189
+#: ../src/generic/prntdlgg.cpp:190
msgid "To:"
msgstr "µ½:"
-#: ../src/generic/prntdlgg.cpp:648
+#: ../src/generic/prntdlgg.cpp:647
msgid "Top margin (mm):"
msgstr "ÉÏÒ³±ß¾à (ºÁÃ×):"
msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!"
-#: ../src/common/sckaddr.cpp:108
+#: ../src/common/sckaddr.cpp:126
msgid "Trying to solve a NULL hostname: giving up"
msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú"
-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fontmap.cpp:120
msgid "Turkish (ISO-8859-9)"
msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)"
msgid "US Std Fanfold, 14 7/8 x 11 in"
msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç"
-#: ../src/html/htmlwin.cpp:271
+#: ../src/html/htmlwin.cpp:270
#, c-format
msgid "Unable to open requested HTML document: %s"
msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s"
-#: ../src/generic/fontdlgg.cpp:244
+#: ../src/generic/fontdlgg.cpp:252
msgid "Underline"
msgstr "Ï»®Ïß"
msgid "Unexpected end of file whilst parsing resource."
msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ."
-#: ../src/common/cmdline.cpp:749
+#: ../src/common/cmdline.cpp:753
#, c-format
msgid "Unexpected parameter '%s'"
msgstr "ÒâÍâ²ÎÊý '%s'"
-#: ../src/common/fontmap.cpp:140
+#: ../src/common/fontmap.cpp:141
msgid "Unicode 7 bit (UTF-7)"
msgstr ""
-#: ../src/common/fontmap.cpp:141
+#: ../src/common/fontmap.cpp:142
msgid "Unicode 8 bit (UTF-8)"
msgstr ""
msgid "Unknown DDE error %08x"
msgstr "δ֪ DDE ´íÎó %08x"
-#: ../src/common/strconv.cpp:888
-#, fuzzy, c-format
-msgid "Unknown encoding '%s'!"
-msgstr "λÖñàÂë (%d)"
-
-#: ../src/common/fontmap.cpp:383
+#: ../src/common/fontmap.cpp:403
#, c-format
msgid "Unknown encoding (%d)"
msgstr "λÖñàÂë (%d)"
-#: ../src/unix/mimetype.cpp:2120
+#: ../src/unix/mimetype.cpp:2125
#, c-format
msgid "Unknown field in file %s, line %d: '%s'."
msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'."
-#: ../src/common/cmdline.cpp:533
+#: ../src/common/cmdline.cpp:537
#, c-format
msgid "Unknown long option '%s'"
msgstr "δ֪longÑ¡Ïî '%s'"
-#: ../src/common/cmdline.cpp:555
+#: ../src/common/cmdline.cpp:559
#, c-format
msgid "Unknown option '%s'"
msgstr "δ֪ѡÏî '%s'"
-#: ../contrib/src/xrc/xmlres.cpp:488
+#: ../contrib/src/xrc/xmlres.cpp:627
msgid "Unknown style flag "
msgstr ""
msgid "Unmatched '{' in an entry for mime type %s."
msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'."
-#: ../src/common/cmdproc.cpp:226 ../src/common/cmdproc.cpp:241
-#: ../src/common/cmdproc.cpp:268
+#: ../src/common/cmdproc.cpp:233 ../src/common/cmdproc.cpp:248
+#: ../src/common/cmdproc.cpp:275
msgid "Unnamed command"
msgstr "δÃüÃûµÄÃüÁî"
msgid "Unrecognized style %s whilst parsing resource."
msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s."
-#: ../src/mac/clipbrd.cpp:53 ../src/msw/clipbrd.cpp:273
-#: ../src/msw/clipbrd.cpp:374
+#: ../src/mac/clipbrd.cpp:58 ../src/msw/clipbrd.cpp:273
+#: ../src/msw/clipbrd.cpp:447
msgid "Unsupported clipboard format."
msgstr "²»Ö§³ÖµÄ¼ôÌù°å¸ñʽ"
-#: ../src/common/appcmn.cpp:266
+#: ../src/common/appcmn.cpp:311
#, c-format
msgid "Unsupported theme '%s'."
msgstr ""
msgid "Up"
msgstr ""
-#: ../src/common/cmdline.cpp:834
+#: ../src/common/cmdline.cpp:838
#, c-format
msgid "Usage: %s"
msgstr "Ó÷¨: %s"
-#: ../src/generic/dirctrlg.cpp:617 ../src/generic/dirdlgg.cpp:214
-msgid "User"
-msgstr "Óû§"
-
-#: ../src/generic/dirctrlg.cpp:616 ../src/generic/dirdlgg.cpp:213
-msgid "User Local"
-msgstr "±¾µØÓû§"
-
-#: ../src/common/valtext.cpp:188
+#: ../src/common/valtext.cpp:196
msgid "Validation conflict"
msgstr "ÑéÖ¤³åÍ»"
-#: ../src/generic/dirctrlg.cpp:618 ../src/generic/dirdlgg.cpp:215
-msgid "Variables"
-msgstr "±äÁ¿"
-
-#: ../src/generic/filedlgg.cpp:986
+#: ../src/generic/filedlgg.cpp:1079
msgid "View files as a detailed view"
msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ"
-#: ../src/generic/filedlgg.cpp:980
+#: ../src/generic/filedlgg.cpp:1072
msgid "View files as a list view"
msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ"
-#: ../src/common/docview.cpp:1557
+#: ../src/common/docview.cpp:1602
msgid "Views"
msgstr "ÊÓͼ"
-#: ../src/unix/utilsunx.cpp:767
+#: ../src/unix/utilsunx.cpp:801
msgid "Waiting for subprocess termination failed"
msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü"
-#: ../src/common/docview.cpp:436 ../src/common/resource.cpp:124
+#: ../src/common/docview.cpp:435 ../src/common/resource.cpp:124
msgid "Warning"
msgstr "¾¯¸æ"
-#: ../src/common/log.cpp:373
+#: ../src/common/log.cpp:464
msgid "Warning: "
msgstr "¾¯¸æ:"
msgid "Warning: attempt to remove HTML tag handler from empty stack."
msgstr "¾¯¸æ: ÊÓͼ´Ó¿ÕÕ»ÖÐÒÆÈ¥HTML±êÇ©´¦ÀíÆ÷."
-#: ../src/common/fontmap.cpp:111
+#: ../src/common/fontmap.cpp:112
#, fuzzy
msgid "Western European (ISO-8859-1)"
msgstr "West European (ISO-8859-1/Latin 1)"
-#: ../src/common/fontmap.cpp:125
+#: ../src/common/fontmap.cpp:126
#, fuzzy
msgid "Western European with Euro (ISO-8859-15)"
msgstr "West European new (ISO-8859-15/Latin 0)"
msgid "Whole word"
msgstr "½öΪÕû×Ö"
-#: ../src/html/helpfrm.cpp:467
+#: ../src/html/helpfrm.cpp:407
msgid "Whole words only"
msgstr "½öΪÕû×Ö"
-#: ../src/univ/themes/win32.cpp:1106
+#: ../src/univ/themes/win32.cpp:1168
msgid "Win32 theme"
msgstr ""
-#: ../src/msw/utils.cpp:862
+#: ../src/msw/utils.cpp:975
msgid "Win32s on Windows 3.1"
msgstr "Win32s on Windows 3.1"
-#: ../src/msw/mdi.cpp:1338
-msgid "Window"
-msgstr "´°¿Ú"
-
-#: ../src/msw/utils.cpp:894
+#: ../src/msw/utils.cpp:1007
msgid "Windows 3.1"
msgstr "Windows 3.1"
-#: ../src/msw/utils.cpp:866
+#: ../src/msw/utils.cpp:979
#, c-format
msgid "Windows 9%c"
msgstr "Windows 9%c"
-#: ../src/common/fontmap.cpp:137
+#: ../src/common/fontmap.cpp:138
msgid "Windows Arabic (CP 1256)"
msgstr "Windows Arabic (CP 1256)"
-#: ../src/common/fontmap.cpp:138
+#: ../src/common/fontmap.cpp:139
msgid "Windows Baltic (CP 1257)"
msgstr "Windows Baltic (CP 1257)"
-#: ../src/common/fontmap.cpp:131
+#: ../src/common/fontmap.cpp:132
#, fuzzy
msgid "Windows Central European (CP 1250)"
msgstr "Windows Ï£²®À´ (CP 1255)"
-#: ../src/common/fontmap.cpp:128
+#: ../src/common/fontmap.cpp:129
msgid "Windows Chinese Simplified (CP 936)"
msgstr ""
-#: ../src/common/fontmap.cpp:130
+#: ../src/common/fontmap.cpp:131
#, fuzzy
msgid "Windows Chinese Traditional (CP 950)"
msgstr "Windows Latin 1 (CP 1252)"
-#: ../src/common/fontmap.cpp:132
+#: ../src/common/fontmap.cpp:133
msgid "Windows Cyrillic (CP 1251)"
msgstr "Windows Cyrillic (CP 1251)"
-#: ../src/common/fontmap.cpp:134
+#: ../src/common/fontmap.cpp:135
msgid "Windows Greek (CP 1253)"
msgstr "Windows Greek (CP 1253)"
-#: ../src/common/fontmap.cpp:136
+#: ../src/common/fontmap.cpp:137
msgid "Windows Hebrew (CP 1255)"
msgstr "Windows Ï£²®À´ (CP 1255)"
-#: ../src/common/fontmap.cpp:127
+#: ../src/common/fontmap.cpp:128
#, fuzzy
msgid "Windows Japanese (CP 932)"
msgstr "Windows Greek (CP 1253)"
-#: ../src/common/fontmap.cpp:129
+#: ../src/common/fontmap.cpp:130
#, fuzzy
msgid "Windows Korean (CP 949)"
msgstr "Windows Greek (CP 1253)"
-#: ../src/common/fontmap.cpp:135
+#: ../src/common/fontmap.cpp:136
msgid "Windows Turkish (CP 1254)"
msgstr "Windows ÍÁ¶úÆäÓï (CP 1254)"
-#: ../src/common/fontmap.cpp:133
+#: ../src/common/fontmap.cpp:134
#, fuzzy
msgid "Windows Western European (CP 1252)"
msgstr "Windows Latin 1 (CP 1252)"
-#: ../src/common/fontmap.cpp:139
+#: ../src/common/fontmap.cpp:140
msgid "Windows/DOS OEM (CP 437)"
msgstr "Windows/DOS OEM (CP 437)"
msgid "X Translation"
msgstr "XƽÒÆ"
-#: ../contrib/src/xrc/xmlexpat.cpp:185
+#: ../contrib/src/xrc/xml.cpp:529
#, c-format
msgid "XML parsing error: '%s' at line %d"
msgstr ""
-#: ../src/common/xpmdecod.cpp:757
+#: ../src/common/xpmdecod.cpp:761
msgid "XPM: Malformed pixel data!"
msgstr ""
-#: ../src/common/xpmdecod.cpp:710 ../src/common/xpmdecod.cpp:719
+#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:720
#, c-format
msgid "XPM: malformed colour definition '%s'!"
msgstr ""
-#: ../contrib/src/xrc/xmlres.cpp:371
+#: ../contrib/src/xrc/xmlres.cpp:435
#, fuzzy, c-format
msgid "XRC resource '%s' (class '%s') not found!"
msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ."
-#: ../contrib/src/xrc/xmlres.cpp:624 ../contrib/src/xrc/xmlres.cpp:634
+#: ../contrib/src/xrc/xmlres.cpp:764 ../contrib/src/xrc/xmlres.cpp:774
#, c-format
msgid "XRC resource: Cannot create bitmap from '%s'."
msgstr ""
-#: ../contrib/src/xrc/xh_dlg.cpp:53 ../contrib/src/xrc/xh_frame.cpp:58
+#: ../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:604
+#: ../contrib/src/xrc/xmlres.cpp:744
#, c-format
msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
msgstr ""
msgid "Y Translation"
msgstr "YƽÒÆ"
-#: ../src/common/dlgcmn.cpp:150 ../src/common/dlgcmn.cpp:157
-#: ../src/mac/msgdlg.cpp:83 ../src/motif/msgdlg.cpp:180
+#: ../src/common/dlgcmn.cpp:151 ../src/mac/msgdlg.cpp:77
+#: ../src/motif/msgdlg.cpp:180
msgid "Yes"
msgstr "ÊÇ"
-#: ../src/generic/dirctrlg.cpp:1355 ../src/generic/dirdlgg.cpp:564
+#: ../src/generic/dirdlgg.cpp:262
msgid "You cannot add a new directory to this section."
msgstr "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼."
msgid "ZIP handler currently supports only local files!"
msgstr ""
-#: ../src/common/docview.cpp:1893
+#: ../src/common/docview.cpp:1938
msgid "[EMPTY]"
msgstr "[¿Õ]"
msgid "a transaction failed."
msgstr "ÊÂÎñʧ°Ü."
-#: ../src/common/menucmn.cpp:80
+#: ../src/common/menucmn.cpp:99
msgid "alt"
msgstr "alt"
"Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n"
"»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ."
-#: ../src/common/fileconf.cpp:1555
+#: ../src/common/fileconf.cpp:1556
#, c-format
msgid "attempt to change immutable key '%s' ignored."
msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä."
msgid "binary"
msgstr ""
+#: ../src/common/fontcmn.cpp:518
+#, fuzzy
+msgid "bold"
+msgstr "´ÖÌå"
+
+#: ../src/common/fontcmn.cpp:442
+#, fuzzy
+msgid "bold "
+msgstr "´ÖÌå"
+
#: ../src/common/ffile.cpp:93
#, c-format
msgid "can't close file '%s'"
msgstr "²»ÄܹرÕÎļþ '%s'"
-#: ../src/common/file.cpp:272
+#: ../src/common/file.cpp:276
#, c-format
msgid "can't close file descriptor %d"
msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d"
-#: ../src/common/file.cpp:543
+#: ../src/common/file.cpp:554
#, c-format
msgid "can't commit changes to file '%s'"
msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'"
-#: ../src/common/file.cpp:215
+#: ../src/common/file.cpp:219
#, c-format
msgid "can't create file '%s'"
msgstr "²»ÄÜ´´½¨Îļþ '%s'"
-#: ../src/common/fileconf.cpp:1024
+#: ../src/common/fileconf.cpp:1025
#, c-format
msgid "can't delete user configuration file '%s'"
msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'"
-#: ../src/common/file.cpp:455
+#: ../src/common/file.cpp:459
#, c-format
msgid "can't determine if the end of file is reached on descriptor %d"
msgstr "²»ÄÜÈ·¶¨ÊÇ·ñÒÑ´ïÎļþ %d µÄβ²¿"
-#: ../src/common/file.cpp:421
+#: ../src/common/file.cpp:425
#, c-format
msgid "can't find length of file on file descriptor %d"
msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È"
-#: ../src/msw/utils.cpp:366
+#: ../src/msw/utils.cpp:374
msgid "can't find user's HOME, using current directory."
msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼."
-#: ../src/common/file.cpp:335
+#: ../src/common/file.cpp:339
#, c-format
msgid "can't flush file descriptor %d"
msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d"
-#: ../src/common/file.cpp:389
+#: ../src/common/file.cpp:393
#, c-format
msgid "can't get seek position on file descriptor %d"
msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÖ¸ÕëλÖÃ"
-#: ../src/common/fontmap.cpp:746
+#: ../src/common/fontmap.cpp:766
msgid "can't load any font, aborting"
msgstr "²»ÄÜ×°ÔØÈκÎ×ÖÌå, ÕýÔÚÖÐÖ¹"
-#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:258
+#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:262
#, c-format
msgid "can't open file '%s'"
msgstr "²»ÄÜ´ò¿ªÎļþ '%s'"
-#: ../src/common/fileconf.cpp:386
+#: ../src/common/fileconf.cpp:388
#, c-format
msgid "can't open global configuration file '%s'."
msgstr "²»ÄÜ´ò¿ªÈ«¾ÖÅäÖÃÎļþ '%s'."
-#: ../src/common/fileconf.cpp:398
+#: ../src/common/fileconf.cpp:400
#, c-format
msgid "can't open user configuration file '%s'."
msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ '%s'."
-#: ../src/common/fileconf.cpp:904
+#: ../src/common/fileconf.cpp:905
msgid "can't open user configuration file."
msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ."
-#: ../src/common/file.cpp:298
+#: ../src/common/file.cpp:302
#, c-format
msgid "can't read from file descriptor %d"
msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ"
-#: ../src/common/file.cpp:538
+#: ../src/common/file.cpp:549
#, c-format
msgid "can't remove file '%s'"
msgstr "²»ÄÜɾ³ýÎļþ '%s'"
-#: ../src/common/file.cpp:554
+#: ../src/common/file.cpp:565
#, c-format
msgid "can't remove temporary file '%s'"
msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'"
-#: ../src/common/file.cpp:375
+#: ../src/common/file.cpp:379
#, c-format
msgid "can't seek on file descriptor %d"
msgstr "²»Äܶ¨Î»ÎļþÃèÊö×Ó %d"
-#: ../src/common/textfile.cpp:178
+#: ../src/common/textfile.cpp:196
#, fuzzy, c-format
msgid "can't write buffer '%s' to disk."
msgstr "²»ÄÜ°ÑÎļþ '%s'дµ½´ÅÅÌ."
-#: ../src/common/file.cpp:320
+#: ../src/common/file.cpp:324
#, c-format
msgid "can't write to file descriptor %d"
msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d"
-#: ../src/common/fileconf.cpp:911
+#: ../src/common/fileconf.cpp:912
msgid "can't write user configuration file."
msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ."
-#: ../src/common/intl.cpp:398
+#: ../src/common/intl.cpp:363
#, c-format
msgid "catalog file for domain '%s' not found."
msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ."
-#: ../contrib/src/xrc/xh_frame.cpp:72
-#, fuzzy
-msgid "centered"
-msgstr "ÆäËü"
-
-#: ../src/common/menucmn.cpp:78
+#: ../src/common/menucmn.cpp:97
msgid "ctrl"
msgstr "ctrl"
-#: ../src/common/cmdline.cpp:947
+#: ../src/common/cmdline.cpp:979
msgid "date"
msgstr "ÈÕÆÚ"
-#: ../src/common/fontmap.cpp:393
+#: ../src/common/fontmap.cpp:413
#, fuzzy
msgid "default"
msgstr "alt"
-#: ../src/common/datetime.cpp:3227
+#: ../src/common/datetime.cpp:3237
msgid "eighteenth"
msgstr "µÚÊ®°Ë"
-#: ../src/common/datetime.cpp:3217
+#: ../src/common/datetime.cpp:3227
msgid "eighth"
msgstr "µÚ°Ë"
-#: ../src/common/datetime.cpp:3220
+#: ../src/common/datetime.cpp:3230
msgid "eleventh"
msgstr "µÚʮһ"
-#: ../src/common/fileconf.cpp:1542
+#: ../src/common/fileconf.cpp:1543
#, c-format
msgid "entry '%s' appears more than once in group '%s'"
msgstr "ÌõÄ¿ '%s' ÔÚ×é '%s'ÖÐÒѳöÏÖÒ»´ÎÒÔÉÏ"
-#: ../src/msw/dialup.cpp:870 ../src/msw/dialup.cpp:875
+#: ../src/msw/dialup.cpp:846
msgid "establish"
msgstr "½¨Á¢"
msgid "failed to flush the file '%s'"
msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü"
-#: ../src/common/datetime.cpp:3224
+#: ../src/common/datetime.cpp:3234
msgid "fifteenth"
msgstr "µÚÊ®Îå"
-#: ../src/common/datetime.cpp:3214
+#: ../src/common/datetime.cpp:3224
msgid "fifth"
msgstr "µÚÎå"
-#: ../src/common/fileconf.cpp:610
+#: ../src/common/fileconf.cpp:612
#, c-format
msgid "file '%s', line %d: '%s' ignored after group header."
msgstr "Îļþ '%s', ÐÐ %d: '%s' ×éÍ·ºó±¸ºöÂÔ."
-#: ../src/common/fileconf.cpp:639
+#: ../src/common/fileconf.cpp:641
#, c-format
msgid "file '%s', line %d: '=' expected."
msgstr "Îļþ '%s', ÐÐ %d: ÆÚÍû '='."
-#: ../src/common/fileconf.cpp:665
+#: ../src/common/fileconf.cpp:667
#, c-format
msgid "file '%s', line %d: key '%s' was first found at line %d."
msgstr "Îļþ '%s', ÐÐ %d: ¼ü '%s' µÚÒ»´Î³öÏÖÔÚÐÐ %d."
-#: ../src/common/fileconf.cpp:655
+#: ../src/common/fileconf.cpp:657
#, c-format
msgid "file '%s', line %d: value for immutable key '%s' ignored."
msgstr "Îļþ '%s', ÐÐ %d: ºöÂÔ²»ÄÜÐ޸ļü '%s'µÄÖµ."
-#: ../src/common/fileconf.cpp:578
+#: ../src/common/fileconf.cpp:580
#, c-format
msgid "file '%s': unexpected character %c at line %d."
msgstr "Îļþ '%s': ·ÇÔ¤ÆÚµÄ×Ö·û %c ´æÔÚÓÚÐÐ %d.ÖÐ"
-#: ../src/common/datetime.cpp:3210
+#: ../src/common/datetime.cpp:3220
msgid "first"
msgstr "µÚÒ»"
-#: ../src/common/datetime.cpp:3223
+#: ../src/common/datetime.cpp:3233
msgid "fourteenth"
msgstr "µÚÊ®ËÄ"
-#: ../src/common/datetime.cpp:3213
+#: ../src/common/datetime.cpp:3223
msgid "fourth"
msgstr "µÚËÄ"
-#: ../src/common/appcmn.cpp:216
+#: ../src/common/appcmn.cpp:250
msgid "generate verbose log messages"
msgstr ""
-#: ../src/common/timercmn.cpp:273
+#: ../src/common/timercmn.cpp:278
msgid "gmtime() failed"
msgstr "gmtime() ʧ°Ü"
-#: ../src/msw/dialup.cpp:870 ../src/msw/dialup.cpp:875
+#: ../src/msw/dialup.cpp:846
msgid "initiate"
msgstr "³õʼ»¯"
-#: ../src/common/file.cpp:459
+#: ../src/common/file.cpp:463
msgid "invalid eof() return value."
msgstr "ÎÞЧµÄeof()·µ»ØÖµ."
-#: ../src/generic/logg.cpp:1036
+#: ../src/generic/logg.cpp:1067
msgid "invalid message box return value"
msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ"
-#: ../src/html/helpfrm.cpp:1017
+#: ../src/common/fontcmn.cpp:458 ../src/common/fontcmn.cpp:522
+#, fuzzy
+msgid "italic"
+msgstr "бÌå"
+
+#: ../src/html/helpfrm.cpp:935
msgid "large"
msgstr "´ó"
-#: ../src/common/intl.cpp:611
+#: ../src/common/fontcmn.cpp:514
+#, fuzzy
+msgid "light"
+msgstr "Çá"
+
+#: ../src/common/fontcmn.cpp:438
+#, fuzzy
+msgid "light "
+msgstr "Çá"
+
+#: ../src/common/intl.cpp:614
#, c-format
msgid "locale '%s' can not be set."
msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'."
-#: ../src/common/intl.cpp:393
+#: ../src/common/intl.cpp:358
#, c-format
msgid "looking for catalog '%s' in path '%s'."
msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ."
-#: ../src/html/helpfrm.cpp:1017
+#: ../src/html/helpfrm.cpp:935
msgid "medium"
msgstr "ÖÐ"
-#: ../src/common/datetime.cpp:3375
+#: ../src/common/datetime.cpp:3385
msgid "midnight"
msgstr "ÎçÒ¹"
-#: ../src/common/timercmn.cpp:269
+#: ../src/common/timercmn.cpp:274
msgid "mktime() failed"
msgstr "mktime()ʧ°Ü"
-#: ../src/common/datetime.cpp:3228
+#: ../src/common/datetime.cpp:3238
msgid "nineteenth"
msgstr "µÚÊ®¾Å"
-#: ../src/common/datetime.cpp:3218
+#: ../src/common/datetime.cpp:3228
msgid "ninth"
msgstr "µÚ¾Å"
msgid "no DDE error."
msgstr "ûÓÐDDE´íÎó"
-#: ../src/html/helpdata.cpp:565
+#: ../src/html/helpdata.cpp:559
msgid "noname"
msgstr "δÃû"
-#: ../src/common/datetime.cpp:3374
+#: ../src/common/datetime.cpp:3384
msgid "noon"
msgstr "ÖÐÎç"
-#: ../src/common/cmdline.cpp:946
+#: ../src/common/cmdline.cpp:978
msgid "num"
msgstr "num"
+#: ../src/common/filename.cpp:162
+msgid "reading"
+msgstr ""
+
#: ../src/msw/dde.cpp:1005
msgid "reentrancy problem."
msgstr "ÖØÈëÎÊÌâ"
-#: ../src/common/datetime.cpp:3211
+#: ../src/common/datetime.cpp:3221
msgid "second"
msgstr "µÚ¶þ"
-#: ../src/common/datetime.cpp:3226
+#: ../src/common/datetime.cpp:3236
msgid "seventeenth"
msgstr "µÚÊ®Æß"
-#: ../src/common/datetime.cpp:3216
+#: ../src/common/datetime.cpp:3226
msgid "seventh"
msgstr "µÚÆß"
-#: ../src/common/menucmn.cpp:82
+#: ../src/common/menucmn.cpp:101
msgid "shift"
msgstr "shift"
-#: ../src/common/appcmn.cpp:206
+#: ../src/common/appcmn.cpp:240
msgid "show this help message"
msgstr ""
-#: ../src/common/datetime.cpp:3225
+#: ../src/common/datetime.cpp:3235
msgid "sixteenth"
msgstr "µÚÊ®Áù"
-#: ../src/common/datetime.cpp:3215
+#: ../src/common/datetime.cpp:3225
msgid "sixth"
msgstr "µÚÁù"
-#: ../src/html/helpfrm.cpp:1017
+#: ../src/html/helpfrm.cpp:935
msgid "small"
msgstr "С"
-#: ../src/common/appcmn.cpp:238
+#: ../src/common/appcmn.cpp:275
msgid "specify display mode to use (e.g. 640x480-16)"
msgstr ""
-#: ../src/common/appcmn.cpp:225
+#: ../src/common/appcmn.cpp:261
msgid "specify the theme to use"
msgstr ""
-#: ../src/common/cmdline.cpp:945
+#: ../src/common/cmdline.cpp:977
msgid "str"
msgstr "str"
-#: ../src/common/datetime.cpp:3219
+#: ../src/common/datetime.cpp:3229
msgid "tenth"
msgstr "µÚÊ®"
msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
msgstr "¶ÔʼþµÄÏìÓ¦µ¼ÖÂDDE_FBUSYλ±»ÉèÖÃ."
-#: ../src/common/datetime.cpp:3212
+#: ../src/common/datetime.cpp:3222
msgid "third"
msgstr "µÚÈý"
-#: ../src/common/datetime.cpp:3222
+#: ../src/common/datetime.cpp:3232
msgid "thirteenth"
msgstr "µÚÊ®Èý"
-#: ../src/common/datetime.cpp:3054
+#: ../src/common/datetime.cpp:3064
msgid "today"
msgstr "½ñÌì"
-#: ../src/common/datetime.cpp:3056
+#: ../src/common/datetime.cpp:3066
msgid "tomorrow"
msgstr "Ã÷Ìì"
-#: ../src/common/datetime.cpp:3221
+#: ../src/common/datetime.cpp:3231
msgid "twelfth"
msgstr "µÚÊ®¶þ"
-#: ../src/common/datetime.cpp:3229
+#: ../src/common/datetime.cpp:3239
msgid "twentieth"
msgstr "µÚ¶þÊ®"
-#: ../src/common/fileconf.cpp:1662
+#: ../src/common/fontcmn.cpp:510
+#, fuzzy
+msgid "underlined"
+msgstr "Ï»®Ïß"
+
+#: ../src/common/fontcmn.cpp:425
+#, fuzzy
+msgid "underlined "
+msgstr "Ï»®Ïß"
+
+#: ../src/common/fileconf.cpp:1663
#, c-format
msgid "unexpected \" at position %d in '%s'."
msgstr "ÀýÍâµÄ \" ÔÚλÖà %d in '%s'."
-#: ../src/generic/progdlgg.cpp:276
+#: ../src/generic/progdlgg.cpp:283
msgid "unknown"
msgstr "δ֪"
msgid "unknown error"
msgstr "GIF: λÖôíÎó!!!"
-#: ../src/msw/dialup.cpp:473
+#: ../src/msw/dialup.cpp:450
#, c-format
msgid "unknown error (error code %08x)."
msgstr "δ֪´íÎó(´íÎóºÅ %08x)."
msgid "unknown line terminator"
msgstr "δ֪ËÑË÷Ôµã"
-#: ../src/common/file.cpp:358
+#: ../src/common/file.cpp:362
msgid "unknown seek origin"
msgstr "δ֪ËÑË÷Ôµã"
-#: ../src/common/fontmap.cpp:410
+#: ../src/common/fontmap.cpp:430
#, c-format
msgid "unknown-%d"
msgstr "δ֪-%d"
-#: ../src/common/docview.cpp:405
+#: ../src/common/docview.cpp:404
msgid "unnamed"
msgstr "unnamed"
-#: ../src/common/docview.cpp:1187
+#: ../src/common/docview.cpp:1209
#, c-format
msgid "unnamed%d"
msgstr "unnamed%d"
-#: ../src/common/intl.cpp:403
+#: ../src/common/intl.cpp:368
#, c-format
msgid "using catalog '%s' from '%s'."
msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'."
-#: ../src/html/helpfrm.cpp:1017
+#: ../src/html/helpfrm.cpp:935
msgid "very large"
msgstr "·Ç³£´ó"
-#: ../src/html/helpfrm.cpp:1017
+#: ../src/html/helpfrm.cpp:935
msgid "very small"
msgstr "·Ç³£Ð¡"
-#: ../src/common/timercmn.cpp:301
+#: ../src/common/filename.cpp:162
+#, fuzzy
+msgid "writing"
+msgstr "´òÓ¡"
+
+#: ../src/common/dynlib.cpp:333
+#, c-format
+msgid "wxDllLoader failed to GetSymbol '%s'"
+msgstr ""
+
+#: ../src/common/dynload.cpp:270
+#, c-format
+msgid "wxDynamicLibrary failed to GetSymbol '%s'"
+msgstr ""
+
+#: ../src/common/timercmn.cpp:323
msgid "wxGetTimeOfDay failed."
msgstr "wxGetTimeOfDay ʧ°Ü."
-#: ../src/common/socket.cpp:347 ../src/common/socket.cpp:401
+#: ../src/common/socket.cpp:392 ../src/common/socket.cpp:446
msgid "wxSocket: invalid signature in ReadMsg."
msgstr "wxSocket: ReadMsgÖÐÎÞЧµÄÇ©Ãû."
-#: ../src/common/socket.cpp:921
+#: ../src/common/socket.cpp:967
msgid "wxSocket: unknown event!."
msgstr "wxSocket: δ֪ʼþ!."
-#: ../src/motif/app.cpp:586
+#: ../src/motif/app.cpp:580
#, c-format
msgid "wxWindows could not open display for '%s': exiting."
msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ´æÔÚ."
-#: ../src/common/datetime.cpp:3055
+#: ../src/x11/app.cpp:261
+#, fuzzy
+msgid "wxWindows could not open display. Exiting."
+msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ´æÔÚ."
+
+#: ../src/common/datetime.cpp:3065
msgid "yesterday"
msgstr "×òÌì"
+#, fuzzy
+#~ msgid "Fatal Error"
+#~ msgstr "ÖÂÃü´íÎó"
+
+#, fuzzy
+#~ msgid "Fatal error: %s\n"
+#~ msgstr "ÖÂÃü´íÎó£º"
+
+#~ msgid "Back"
+#~ msgstr "·µ»Ø"
+
+#~ msgid "Can not create event object."
+#~ msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó."
+
+#~ msgid "Can't find the serialization object '%s' for the object '%s'."
+#~ msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'."
+
+#~ msgid "Can't load wxSerial dynamic library."
+#~ msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â."
+
+#~ msgid "Connection to wxHelp timed out in %d seconds"
+#~ msgstr "Á¬½Óµ½wxHelp ³¬¹ýʱÏÞ %d Ãë"
+
+#~ msgid "Etcetera"
+#~ msgstr "ÆäËü"
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of Mask DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error calculating size of XOR DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing ICONDIR header."
+#~ msgstr "TIFF:дͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing ICONDIRENTRY header."
+#~ msgstr "TIFF:дͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing Mask DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#, fuzzy
+#~ msgid "ICO: Error writing XOR DIB ."
+#~ msgstr "TIFF: ¶ÁͼÏñ´íÎó."
+
+#~ msgid "Incorrect version of HTML help book"
+#~ msgstr "HTML°ïÖú°æ±¾²»ÕýÈ·"
+
+#, fuzzy
+#~ msgid "Loading DIB : Couldn't allocate memory."
+#~ msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ."
+
+#~ msgid "Mounted Devices"
+#~ msgstr "¹ÒÔØÉ豸"
+
+#~ msgid "My Harddisk"
+#~ msgstr "ÎÒµÄÓ²ÅÌ"
+
+#~ msgid "My Home"
+#~ msgstr "ÎҵļÒ"
+
+#~ msgid "New..."
+#~ msgstr "´´½¨..."
+
+#~ msgid "Please wait..."
+#~ msgstr "ÇëµÈ´ý..."
+
+#~ msgid "Temporary"
+#~ msgstr "ÁÙʱµÄ"
+
+#~ msgid "The Computer"
+#~ msgstr "¼ÆËã»ú"
+
+#~ msgid "The directory "
+#~ msgstr "Ŀ¼"
+
+#~ msgid "User"
+#~ msgstr "Óû§"
+
+#~ msgid "User Local"
+#~ msgstr "±¾µØÓû§"
+
+#~ msgid "Variables"
+#~ msgstr "±äÁ¿"
+
+#~ msgid "Window"
+#~ msgstr "´°¿Ú"
+
+#, fuzzy
+#~ msgid "centered"
+#~ msgstr "ÆäËü"
+
#, fuzzy
#~ msgid "Unknown digit value"
#~ msgstr "λÖñàÂë (%d)"
projects / wxWidgets.git / blobdiff