X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/13b1472fdd967912d2d003881f981b5f9f5b509c..e9378bd66114d67bd2380c3dac103f276668b5d3:/locale/zh.po diff --git a/locale/zh.po b/locale/zh.po index ad5b8d3f4f..4f43f92c28 100644 --- a/locale/zh.po +++ b/locale/zh.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: wxWindows-2.2.2\n" -"POT-Creation-Date: 2001-12-17 16:47+0100\n" +"POT-Creation-Date: 2002-08-21 16:39+0200\n" "PO-Revision-Date: 2000-11-09 16:09Öйú±ê׼ʱ¼ä\n" "Last-Translator: mrfx \n" "Language-Team: wxWindows tranlators \n" @@ -9,38 +9,20 @@ msgstr "" "Content-Type: text/plain; charset=GB2312\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/generic/dirctrlg.cpp:1303 ../src/generic/dirdlgg.cpp:544 -msgid "" -"\n" -"(Do you have the required permissions?)" -msgstr "" -"\n" -"(ÄúÊÇ·ñÓÐËùÐèµÄȨÏÞ?)" - -#: ../src/generic/dirctrlg.cpp:1290 ../src/generic/dirdlgg.cpp:531 -msgid "" -"\n" -"does not exist\n" -"Create it now?" -msgstr "" -"\n" -"²»´æÔÚ\n" -"ÏÖÔÚ´´½¨?" - -#: ../src/common/log.cpp:241 +#: ../src/common/log.cpp:304 #, c-format msgid " (error %ld: %s)" msgstr " (´íÎó %ld: %s)" -#: ../src/common/docview.cpp:1205 +#: ../src/common/docview.cpp:1240 msgid " - " msgstr " - " -#: ../src/html/htmprint.cpp:507 +#: ../src/html/htmprint.cpp:502 msgid " Preview" msgstr "Ô¤ÀÀ" -#: ../src/generic/filedlgg.cpp:439 +#: ../src/generic/filedlgg.cpp:476 msgid " bytes " msgstr "×Ö½Ú" @@ -65,73 +47,83 @@ msgid "#9 Envelope, 3 7/8 x 8 7/8 in" msgstr "#9 ÐÅ·â, 3 7/8 x 8 7/8 in" #: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1326 -#: ../src/common/resource.cpp:1777 ../src/common/resource.cpp:1907 -#: ../src/common/resource.cpp:2983 +#: ../src/common/resource.cpp:1784 ../src/common/resource.cpp:1914 +#: ../src/common/resource.cpp:2994 #, c-format msgid "#define %s must be an integer." msgstr "#Ëù¶¨ÒåµÄ %s ±ØÐëÊÇÕûÊý." -#: ../src/html/helpfrm.cpp:854 ../src/html/helpfrm.cpp:855 -#: ../src/html/helpfrm.cpp:1447 ../src/html/helpfrm.cpp:1477 +#: ../src/common/prntbase.cpp:376 +#, c-format +msgid "%d" +msgstr "" + +#: ../src/common/prntbase.cpp:374 +#, fuzzy, c-format +msgid "%d...%d" +msgstr ".." + +#: ../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:813 #, c-format msgid "%s (or %s)" msgstr "%s (»ò %s)" -#: ../src/generic/logg.cpp:233 +#: ../src/generic/logg.cpp:246 #, c-format msgid "%s Error" msgstr "%s ´íÎó" -#: ../src/generic/logg.cpp:241 +#: ../src/generic/logg.cpp:254 #, c-format msgid "%s Information" msgstr "%s ÐÅÏ¢" -#: ../src/generic/logg.cpp:237 +#: ../src/generic/logg.cpp:250 #, c-format msgid "%s Warning" msgstr "%s ¾¯¸æ" -#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2359 +#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2366 #, c-format msgid "%s not a bitmap resource specification." msgstr "%s ²»ÊÇλͼ×ÊÔ´." -#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2509 +#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2520 #, c-format msgid "%s not an icon resource specification." msgstr "%s ²»ÊÇͼ±ê×ÊÔ´." #: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1422 -#: ../src/common/resource.cpp:1870 ../src/common/resource.cpp:1999 -#: ../src/common/resource.cpp:3080 +#: ../src/common/resource.cpp:1877 ../src/common/resource.cpp:2006 +#: ../src/common/resource.cpp:3091 #, c-format msgid "%s: ill-formed resource file syntax." msgstr "%s: ²»Á¼×ÊÔ´ÎļþÓï·¨." -#: ../src/msw/mdi.cpp:181 +#: ../src/msw/mdi.cpp:192 msgid "&Arrange Icons" msgstr "" -#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:239 +#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:260 #, fuzzy msgid "&Cancel" msgstr "È¡Ïû" -#: ../src/msw/mdi.cpp:177 +#: ../src/msw/mdi.cpp:188 msgid "&Cascade" msgstr "" -#: ../src/generic/logg.cpp:475 ../src/generic/tipdlg.cpp:170 +#: ../src/generic/logg.cpp:491 ../src/generic/tipdlg.cpp:171 msgid "&Close" msgstr "¹Ø±Õ[&C]" -#: ../src/generic/logg.cpp:679 +#: ../src/generic/logg.cpp:695 msgid "&Details" msgstr "ϸ½Ú[&D]" @@ -140,37 +132,46 @@ msgstr "ϸ msgid "&Find" msgstr "²éÕÒ" -#: ../src/generic/wizard.cpp:355 +#: ../src/generic/wizard.cpp:396 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:492 msgid "&Log" msgstr "ÈÕÖ¾[&L]" -#: ../src/msw/mdi.cpp:182 +#: ../src/univ/themes/win32.cpp:4539 +msgid "&Move" +msgstr "" + +#: ../src/msw/mdi.cpp:193 #, fuzzy msgid "&Next" msgstr "ÏÂÒ»¸ö[&N] >" -#: ../src/generic/wizard.cpp:236 ../src/generic/wizard.cpp:357 +#: ../src/generic/wizard.cpp:257 ../src/generic/wizard.cpp:398 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/msw/mdi.cpp:194 +#, fuzzy +msgid "&Previous" +msgstr "Ç°Ò³" + +#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:272 msgid "&Redo" msgstr "Öظ´[&R]" -#: ../src/common/cmdproc.cpp:242 ../src/common/cmdproc.cpp:269 +#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:282 msgid "&Redo " msgstr "Öظ´[&R]" @@ -178,23 +179,33 @@ msgstr " 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:487 ../src/generic/logg.cpp:818 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:267 msgid "&Undo" msgstr "»Ö¸´[&U]" -#: ../src/common/cmdproc.cpp:229 +#: ../src/common/cmdproc.cpp:241 msgid "&Undo " msgstr "»Ö¸´[&U]" -#: ../src/msw/mdi.cpp:1308 ../src/msw/mdi.cpp:1315 ../src/msw/window.cpp:2700 +#: ../src/msw/mdi.cpp:1328 ../src/msw/mdi.cpp:1335 ../src/msw/mdi.cpp:1360 msgid "&Window" msgstr "´°¿Ú[&W]" @@ -203,17 +214,18 @@ msgstr " 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:733 #, c-format msgid "'%s' is not a correct numeric value for option '%s'." msgstr "'%s' ²»ÊÇÆ¥ÅäÑ¡Ïî '%s'µÄÕýÈ·Êý×ÖÖµ." -#: ../src/common/intl.cpp:436 +#: ../src/common/intl.cpp:402 #, c-format msgid "'%s' is not a valid message catalog." msgstr "'%s' ²»ÊÇÓÐЧµÄÏûϢĿ¼." @@ -223,38 +235,38 @@ msgstr "'%s' msgid "'%s' is probably a binary buffer." msgstr "'%s' »òÐíÊÇÒ»¸ö¶þ½øÖÆÎļþ." -#: ../src/common/valtext.cpp:178 +#: ../src/common/valtext.cpp:172 #, c-format msgid "'%s' should be numeric." msgstr "'%s' Ó¦¸ÃÊÇÒ»¸öÊýÖµ." -#: ../src/common/valtext.cpp:160 +#: ../src/common/valtext.cpp:154 #, c-format msgid "'%s' should only contain ASCII characters." msgstr "'%s' Ó¦¸Ã½ö°üº¬ASCII×Ö·û." -#: ../src/common/valtext.cpp:166 +#: ../src/common/valtext.cpp:160 #, c-format msgid "'%s' should only contain alphabetic characters." msgstr "'%s' Ó¦½ö°üº¬×Öĸ×Ö·û." -#: ../src/common/valtext.cpp:172 +#: ../src/common/valtext.cpp:166 #, c-format msgid "'%s' should only contain alphabetic or numeric characters." msgstr "'%s' Ó¦½ö°üº¬×Öĸ»òÊý×Ö×Ö·û." -#: ../src/html/helpfrm.cpp:773 +#: ../src/html/helpfrm.cpp:709 ../src/html/htmlhelp.cpp:638 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 "(ÊéÇ©)" #: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1362 -#: ../src/common/resource.cpp:1809 ../src/common/resource.cpp:1939 -#: ../src/common/resource.cpp:3019 +#: ../src/common/resource.cpp:1816 ../src/common/resource.cpp:1946 +#: ../src/common/resource.cpp:3030 msgid "" ", expected static, #include or #define\n" "whilst parsing resource." @@ -262,13 +274,11 @@ msgstr "" ", ÆÚÍû static, #include »ò #define\n" "ͬʱ¶Ô×ÊÔ´½øÐÐÓï·¨·ÖÎö." -#: ../src/generic/dirctrlg.cpp:644 ../src/generic/dirdlgg.cpp:263 -#: ../src/generic/filedlgg.cpp:833 +#: ../src/generic/dirctrlg.cpp:698 ../src/generic/filedlgg.cpp:929 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:930 msgid ".." msgstr ".." @@ -284,39 +294,39 @@ msgstr "11 x 17 Ó¢ msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in" msgstr "6 3/4 ÐÅ·â, 3 5/8 x 6 1/2 Ó¢´ç" -#: ../src/html/htmprint.cpp:281 +#: ../src/html/htmprint.cpp: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:504 msgid "" msgstr "<Ŀ¼>" -#: ../src/generic/filedlgg.cpp:434 +#: ../src/generic/filedlgg.cpp:471 msgid " " msgstr "<Ŀ¼> " -#: ../src/generic/filedlgg.cpp:468 +#: ../src/generic/filedlgg.cpp:505 msgid "" msgstr "<Á¬½Ó>" -#: ../src/generic/filedlgg.cpp:435 +#: ../src/generic/filedlgg.cpp:472 msgid " " msgstr "<Á¬½Ó>" -#: ../src/html/helpfrm.cpp:1071 +#: ../src/html/helpfrm.cpp:992 msgid "" "Normal face
(and underlined. Italic face. " "Bold face. Bold italic face.
font size " @@ -324,11 +334,11 @@ msgid "" "+0
font size +1
font size " "+2
font size +3
font size " "+4

Fixed size face.
bold italic " -"bold italic underlined
font size -2
font size -1
font size +0
font size +1
font size +2
font size +3
font size +4" +"bold italic underlined
font size " +"-2
font size -1
font size " +"+0
font size +1
font size " +"+2
font size +3
font size " +"+4" msgstr "" "Normal face
(and underlined. Italic face. " "Bold face. Bold italic face.
font size " @@ -336,17 +346,17 @@ msgstr "" "+0
font size +1
font size " "+2
font size +3
font size " "+4

Fixed size face.
bold italic " -"bold italic underlined
font size -2
font size -1
font size +0
font size +1
font size +2
font size +3
font size +4" +"bold italic underlined
font size " +"-2
font size -1
font size " +"+0
font size +1
font size " +"+2
font size +3
font size " +"+4" #: ../src/common/paper.cpp:113 msgid "A3 sheet, 297 x 420 mm" msgstr "A3 Ö½ÕÅ, 297 x 420 ºÁÃ×" -#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2545 +#: ../src/common/paper.cpp:104 msgid "A4 sheet, 210 x 297 mm" msgstr "A4 Ö½ÕÅ, 210 x 297 ºÁÃ×" @@ -358,7 +368,7 @@ msgstr "A4 Сֽ msgid "A5 sheet, 148 x 210 mm" msgstr "A5 Ö½ÕÅ, 148 x 210 ºÁÃ×" -#: ../src/generic/fontdlgg.cpp:327 +#: ../src/generic/fontdlgg.cpp:83 msgid "ABCDEFGabcdefg12345" msgstr "ABCDEFGabcdefg12345" @@ -366,42 +376,37 @@ msgstr "ABCDEFGabcdefg12345" msgid "ASCII" msgstr "" -#: ../src/html/helpfrm.cpp:330 +#: ../src/html/helpfrm.cpp:323 msgid "Add current page to bookmarks" msgstr "°Ñµ±Ç°Ò³¼Óµ½ÊéÇ©ÖÐ" -#: ../src/generic/colrdlgg.cpp:273 +#: ../src/generic/colrdlgg.cpp:287 msgid "Add to custom colours" msgstr "¼Óµ½×Ô¶¨ÒåÑÕÉ«ÖÐ" -#: ../src/html/helpctrl.cpp:90 +#: ../src/html/helpctrl.cpp:95 #, c-format msgid "Adding book %s" msgstr "ÕýÔÚÌí¼Ó¾í %s" -#: ../src/generic/prntdlgg.cpp:161 +#: ../src/generic/prntdlgg.cpp:160 msgid "All" msgstr "ËùÓÐ" -#: ../include/wx/defs.h:1626 ../src/generic/filedlgg.cpp:950 +#: ../src/generic/filedlgg.cpp:1052 msgid "All files (*)|*" msgstr "ËùÓÐÎļþ (*)|*" -#: ../include/wx/defs.h:1623 -#, fuzzy -msgid "All files (*.*)|*.*" -msgstr "ËùÓÐÎļþ (*)|*" - #: ../src/unix/dialup.cpp:362 msgid "Already dialling ISP." msgstr "ÒѾ­²¦½ÓISP." -#: ../src/generic/logg.cpp:1020 +#: ../src/generic/logg.cpp:1109 #, c-format msgid "Append log to file '%s' (choosing [No] will overwrite it)?" msgstr "°ÑÈÕÖ¾Ìí¼Óµ½Îļþ '%s' (Ñ¡Ôñ [·ñ] ½«¸²Ð´¸ÃÎļþ)?" -#: ../src/common/fontmap.cpp:116 +#: ../src/common/fontmap.cpp:117 msgid "Arabic (ISO-8859-6)" msgstr "°¢À­²®Óï (ISO-8859-6)" @@ -425,59 +430,60 @@ msgstr "B5 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)" -#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2489 +#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2500 #, c-format msgid "Bitmap resource specification %s not found." msgstr "ÕÒ²»µ½Î»Í¼¹æ¸ñ %s." -#: ../src/generic/fontdlgg.cpp:219 +#: ../src/generic/fontdlgg.cpp:231 msgid "Bold" msgstr "´ÖÌå" -#: ../src/generic/prntdlgg.cpp:660 +#: ../src/generic/prntdlgg.cpp:645 msgid "Bottom margin (mm):" msgstr "µ×±ß¾à (ºÁÃ×):" @@ -485,7 +491,7 @@ msgstr " msgid "C sheet, 17 x 22 in" msgstr "C Ö½ÕÅ, 17 x 22 Ó¢´ç" -#: ../src/generic/logg.cpp:473 +#: ../src/generic/logg.cpp:489 msgid "C&lear" msgstr "Çå³ý[&L]" @@ -509,47 +515,39 @@ msgstr "C6 msgid "C65 Envelope, 114 x 229 mm" msgstr "C65 ÐÅ·â, 114 x 229 ºÁÃ×" -#: ../src/msw/thread.cpp:243 -msgid "Can not create event object." -msgstr "²»ÄÜ´´½¨Ê¼þ¶ÔÏó." - -#: ../src/msw/thread.cpp:145 -msgid "Can not create mutex" -msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó" - -#: ../src/common/filefn.cpp:1324 +#: ../src/common/filefn.cpp:1358 #, 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:236 #, c-format msgid "Can not enumerate files in directory '%s'" msgstr "²»ÄÜö¾ÙĿ¼ '%s'ÖеÄÎļþ" -#: ../src/mac/thread.cpp:439 ../src/msw/thread.cpp:583 +#: ../src/mac/thread.cpp:472 ../src/msw/thread.cpp:685 #, c-format msgid "Can not resume thread %x" msgstr "²»Äָܻ´Ïß³Ì %x" -#: ../src/msw/thread.cpp:461 +#: ../src/msw/thread.cpp:559 msgid "Can not start thread: error writing TLS." msgstr "²»ÄÜÆô¶¯Ïß³Ì: дTLS³ö´í." -#: ../src/mac/thread.cpp:415 ../src/msw/thread.cpp:568 +#: ../src/mac/thread.cpp:448 ../src/msw/thread.cpp:670 #, c-format msgid "Can not suspend thread %x" msgstr "²»ÄܹÒÆðÏß³Ì %x" -#: ../src/msw/thread.cpp:902 +#: ../src/msw/thread.cpp:1016 msgid "Can not wait for thread termination" msgstr "²»ÄܵȺòÏß³ÌÖÕÖ¹" -#: ../src/common/cmdproc.cpp:231 +#: ../src/common/cmdproc.cpp:243 msgid "Can't &Undo " msgstr "²»Äָܻ´[&U]" -#: ../src/common/image.cpp:1207 +#: ../src/common/image.cpp:1289 #, c-format msgid "Can't check image format of file '%s': file does not exist." msgstr "²»Äܼì²éÎļþ¸ñʽ '%s': Îļþ²»´æÔÚ." @@ -564,12 +562,17 @@ msgstr " msgid "Can't copy values of unsupported type %d." msgstr "²»ÄÜ¿½±´²»Ö§³ÖµÄÀàÐÍ %d µÄÖµ." -#: ../src/msw/toplevel.cpp:223 +#: ../src/msw/toplevel.cpp:295 +#, fuzzy +msgid "Can't create dialog using memory template" +msgstr "²»ÄÜ´´½¨Îļþ '%s'" + +#: ../src/os2/toplevel.cpp:331 #, 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:319 msgid "Can't create list control window, check that comctl32.dll is installed." msgstr "²»ÄÜ´´½¨Áбí¿Ø¼þ´°¿Ú, ¼ì²écomctl32.dllÊÇ·ñÒÑ°²×°." @@ -578,19 +581,11 @@ msgstr " msgid "Can't create registry key '%s'" msgstr "²»ÄÜ´´½¨×¢²á¼ü '%s'" -#: ../src/msw/utilsexc.cpp:485 -msgid "Can't create the inter-process read pipe" -msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ" - -#: ../src/msw/utilsexc.cpp:497 -msgid "Can't create the inter-process write pipe" -msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ" - -#: ../src/mac/thread.cpp:394 ../src/msw/thread.cpp:550 +#: ../src/mac/thread.cpp:427 ../src/msw/thread.cpp:652 msgid "Can't create thread" msgstr "²»ÄÜ´´½¨½ø³Ì" -#: ../src/msw/window.cpp:2855 +#: ../src/msw/window.cpp:2989 #, fuzzy, c-format msgid "Can't create window of class %s" msgstr "²»ÄÜ´´½¨Îļþ '%s'" @@ -600,7 +595,7 @@ msgstr " msgid "Can't delete key '%s'" msgstr "²»ÄÜɾ³ý¼ü '%s'" -#: ../src/msw/iniconf.cpp:447 +#: ../src/msw/iniconf.cpp:445 #, c-format msgid "Can't delete the INI file '%s'" msgstr "²»ÄÜɾ³ý INI Îļþ '%s'" @@ -630,25 +625,16 @@ msgstr " msgid "Can't find current position in file '%s'" msgstr "²»ÄÜÔÚÎļþ'%s'ÖÐÕÒµ½µ±Ç°Î»ÖÃ" -#: ../src/common/object.cpp:335 ../src/common/object.cpp:360 -#, c-format -msgid "Can't find the serialization object '%s' for the object '%s'." -msgstr "ÕÒ²»µ½ÐòÁл¯¶ÔÏó '%s'£¬ËüÓÃÓÚ¶ÔÏó '%s'." - #: ../src/msw/registry.cpp:351 #, c-format msgid "Can't get info about registry key '%s'" msgstr "²»ÄÜ»ñµÃ×¢²á¼ü '%s'µÄÐÅÏ¢" -#: ../src/common/image.cpp:904 ../src/common/image.cpp:924 +#: ../src/common/image.cpp:913 ../src/common/image.cpp:933 #, c-format msgid "Can't load image from file '%s': file does not exist." msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ." -#: ../src/common/object.cpp:328 -msgid "Can't load wxSerial dynamic library." -msgstr "²»ÄÜ×°ÔØ wxSerial ¶¯Ì¬¿â." - #: ../src/msw/dib.cpp:434 #, c-format msgid "Can't open file '%s'" @@ -669,11 +655,16 @@ msgstr " msgid "Can't read value of key '%s'" msgstr "²»ÄܶÁ¼ü '%s'µÄÖµ" -#: ../src/generic/logg.cpp:535 ../src/generic/logg.cpp:930 +#: ../src/common/image.cpp:955 +#, fuzzy, c-format +msgid "Can't save image to file '%s': unknown extension." +msgstr "²»ÄÜ´ÓÎļþ '%s'ÖÐ×°ÈëͼÏñ: Îļþ²»´æÔÚ." + +#: ../src/generic/logg.cpp:551 ../src/generic/logg.cpp:985 msgid "Can't save log contents to file." msgstr "²»ÄÜ°ÑÈÕÖ¾ÄÚÈݱ£´æµ½Îļþ." -#: ../src/msw/thread.cpp:513 +#: ../src/msw/thread.cpp:611 msgid "Can't set thread priority" msgstr "²»ÄÜÉèÖÃÏß³ÌÓÅÏȼ¶" @@ -682,211 +673,222 @@ 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/dirdlgg.cpp:153 +#: ../src/generic/filedlgg.cpp:1166 ../src/generic/filedlgg.cpp:1185 +#: ../src/generic/fontdlgg.cpp:254 ../src/generic/prntdlgg.cpp:453 +#: ../src/generic/progdlgg.cpp:211 ../src/generic/proplist.cpp:511 +#: ../src/gtk/filedlg.cpp:173 ../src/gtk/fontdlg.cpp:144 +#: ../src/html/helpfrm.cpp:974 ../src/html/htmlhelp.cpp:434 +#: ../src/motif/msgdlg.cpp:182 msgid "Cancel" msgstr "È¡Ïû" -#: ../contrib/src/xrc/xmlres.cpp:726 ../contrib/src/xrc/xmlres.cpp:767 +#: ../contrib/src/xrc/xmlres.cpp:893 ../contrib/src/xrc/xmlres.cpp:934 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:929 +#, fuzzy, c-format +msgid "Cannot convert from encoding '%s'!" +msgstr "λÖñàÂë (%d)" -#: ../src/msw/dialup.cpp:525 +#: ../src/msw/dialup.cpp:497 #, c-format msgid "Cannot find active dialup connection: %s" msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s" -#: ../contrib/src/xrc/xmlres.cpp:206 +#: ../contrib/src/xrc/xmlres.cpp:224 #, fuzzy, c-format msgid "Cannot find container for unknown control '%s'." msgstr "ÕÒ²»µ½»î¶¯µÄ²¦ºÅÁ¬½Ó: %s" -#: ../contrib/src/xrc/xmlres.cpp:781 +#: ../contrib/src/xrc/xmlres.cpp:948 #, fuzzy, c-format msgid "Cannot find font node '%s'." msgstr "²»ÄÜ´ò¿ª URL '%s'" -#: ../src/msw/dialup.cpp:839 +#: ../src/msw/dialup.cpp:811 msgid "Cannot find the location of address book file" msgstr "ÕÒ²»µ½µØÖ·²¾ÎļþµÄλÖÃ" -#: ../src/unix/threadpsx.cpp:976 +#: ../src/unix/threadpsx.cpp:1068 #, c-format msgid "Cannot get priority range for scheduling policy %d." msgstr "²»ÄÜ»ñµÃµ÷¶È²ßÂÔ %d µÄÓÅÏȼ¶·¶Î§." -#: ../src/unix/utilsunx.cpp:863 +#: ../src/unix/utilsunx.cpp:854 msgid "Cannot get the hostname" msgstr "²»ÄÜ»ñµÃÖ÷»úÃû" -#: ../src/unix/utilsunx.cpp:899 +#: ../src/unix/utilsunx.cpp:890 msgid "Cannot get the official hostname" msgstr "²»ÄÜ»ñµÃÕýʽµÄÖ÷»úÃû" -#: ../src/msw/dialup.cpp:940 +#: ../src/msw/dialup.cpp:905 msgid "Cannot hang up - no active dialup connection." msgstr "²»ÄܹÒÆð - ûÓлµÄ²¦ºÅÁ¬½Ó." -#: ../src/msw/app.cpp:257 +#: ../src/msw/app.cpp:249 msgid "Cannot initialize OLE" msgstr "²»Äܳõʼ»¯ OLE" -#: ../contrib/src/xrc/xmlres.cpp:308 +#: ../src/mgl/app.cpp:414 +#, fuzzy +msgid "Cannot initialize SciTech MGL!" +msgstr "²»Äܳõʼ»¯ OLE" + +#: ../src/mgl/window.cpp: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:337 #, 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:581 #, 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:277 #, c-format msgid "Cannot open contents file: %s" msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s" -#: ../contrib/src/xrc/xmlres.cpp:282 +#: ../contrib/src/xrc/xmlres.cpp:311 #, fuzzy, c-format msgid "Cannot open file '%s'." msgstr "²»ÄÜ´ò¿ªÎļþ'%s'" -#: ../src/generic/dcpsg.cpp:1584 +#: ../src/generic/dcpsg.cpp:1765 msgid "Cannot open file for PostScript printing!" msgstr "²»ÄÜ´ò¿ªÎļþ½øÐÐPostScript´òÓ¡!" -#: ../src/html/helpdata.cpp:284 +#: ../src/html/helpdata.cpp:290 #, c-format msgid "Cannot open index file: %s" msgstr "²»ÄÜ´ò¿ªË÷ÒýÎļþ: %s" -#: ../contrib/src/xrc/xmlres.cpp:714 +#: ../contrib/src/xrc/xmlres.cpp:881 #, fuzzy, c-format msgid "Cannot parse coordinates from '%s'." msgstr "²»ÄÜ´ò¿ªÄ¿Â¼Îļþ: %s" -#: ../contrib/src/xrc/xmlres.cpp:755 +#: ../contrib/src/xrc/xmlres.cpp:922 #, 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:1049 msgid "Cannot retrieve thread scheduling policy." msgstr "²»ÄÜÕÒ»ØÏ̵߳÷¶È²ßÂÔ." -#: ../src/unix/threadpsx.cpp:606 +#: ../src/unix/threadpsx.cpp:706 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:746 msgid "Choose ISP to dial" msgstr "Ñ¡ÔñISP½øÐв¦ºÅ" -#: ../src/gtk/fontdlg.cpp:159 +#: ../src/gtk/fontdlg.cpp:122 msgid "Choose font" msgstr "Ñ¡Ôñ×ÖÌå" -#: ../src/msw/glcanvas.cpp:437 -msgid "ChoosePixelFormat failed." -msgstr "" - -#: ../src/generic/logg.cpp:473 +#: ../src/generic/logg.cpp:489 msgid "Clear the log contents" msgstr "Çå³ýÈÕÖ¾ÄÚÈÝ" -#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:342 -#: ../src/generic/proplist.cpp:520 +#: ../src/common/prntbase.cpp:429 ../src/generic/progdlgg.cpp:360 +#: ../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:491 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:872 #, 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:1357 ../src/gtk/filedlg.cpp:72 msgid "Confirm" msgstr "È·ÈÏ" -#: ../src/msw/mimetype.cpp:684 +#: ../src/msw/mimetype.cpp:686 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 ../src/html/htmlhelp.cpp:565 msgid "Contents" msgstr "Ŀ¼" -#: ../src/common/strconv.cpp:608 +#: ../src/common/strconv.cpp:596 #, c-format msgid "Convertion to charset '%s' doesn't work." msgstr "" -#: ../src/generic/prntdlgg.cpp:194 +#: ../src/generic/prntdlgg.cpp:193 msgid "Copies:" msgstr "·Ý:" -#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1799 -#: ../src/common/resource.cpp:1929 +#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1806 +#: ../src/common/resource.cpp:1936 #, c-format msgid "Could not find resource include file %s." msgstr "ÕÒ²»µ½×ÊÔ´°üº¬Îļþ %s." @@ -895,12 +897,12 @@ msgstr " msgid "Could not find tab for id" msgstr "ÕÒ²»µ½idµÄ±êÇ©" -#: ../src/msw/textctrl.cpp:1644 +#: ../src/msw/textctrl.cpp:1859 #, c-format msgid "Could not load Rich Edit DLL '%s'" msgstr "²»ÄÜ×°ÔØ Rich Edit DLL '%s'" -#: ../src/common/resource.cpp:795 +#: ../src/common/resource.cpp:802 #, c-format msgid "" "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" @@ -909,7 +911,7 @@ msgstr "" "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n" " or provide #define (see manual for caveats)" -#: ../src/common/resource.cpp:1244 +#: ../src/common/resource.cpp:1251 #, c-format msgid "" "Could not resolve menu id '%s'. Use (non-zero) integer instead\n" @@ -918,7 +920,7 @@ msgstr "" "²»ÄܽâÎö²Ëµ¥id '%s'. ÓÃ(·ÇÁã)ÕûÊý´úÌæ\n" "»ò Ìṩ #define (ÏêϸÐÅÏ¢¼ûÊÖ²á)" -#: ../src/common/prntbase.cpp:715 +#: ../src/common/prntbase.cpp:806 msgid "Could not start document preview." msgstr "²»ÄÜÆô¶¯ÎĵµÔ¤ÀÀ." @@ -926,39 +928,35 @@ msgstr " msgid "Could not start printing." msgstr "²»ÄÜÆô¶¯´òÓ¡." -#: ../src/common/wincmn.cpp:850 +#: ../src/common/wincmn.cpp:1148 msgid "Could not transfer data to window" msgstr "²»ÄÜ°ÑÊý¾Ýתµ½´°¿Ú" -#: ../src/msw/thread.cpp:187 -msgid "Couldn't acquire a mutex lock" -msgstr "²»Äܵõ½»¥³âÌåËø" - #: ../src/msw/dragimag.cpp:148 ../src/msw/dragimag.cpp:184 #: ../src/msw/imaglist.cpp:152 ../src/msw/imaglist.cpp:174 #: ../src/msw/imaglist.cpp:187 msgid "Couldn't add an image to the image list." msgstr "²»ÄÜ°ÑͼÏñ¼Óµ½Í¼ÏóÁбí." -#: ../src/msw/timer.cpp:105 +#: ../src/msw/timer.cpp:103 msgid "Couldn't create a timer" msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷" -#: ../src/mgl/cursor.cpp:121 ../src/mgl/cursor.cpp:146 +#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166 #, fuzzy msgid "Couldn't create cursor." msgstr "²»ÄÜ´´½¨¼ÆʱÆ÷" -#: ../src/common/dynlib.cpp:337 +#: ../src/common/dynlib.cpp:347 ../src/common/dynload.cpp:295 #, c-format msgid "Couldn't find symbol '%s' in a dynamic library" msgstr "ÔÚ¶¯Ì¬Á¬½Ó¿âÖÐÕÒ²»µ½·ûºÅ'%s'" -#: ../src/mac/thread.cpp:469 ../src/msw/thread.cpp:609 +#: ../src/mac/thread.cpp:502 ../src/msw/thread.cpp:711 msgid "Couldn't get the current thread pointer" msgstr "²»ÄÜ»ñµÃµ±Ç°Ïß³ÌÖ¸Õë" -#: ../src/common/imagpng.cpp:249 +#: ../src/common/imagpng.cpp:298 msgid "Couldn't load a PNG image - file is corrupted or not enough memory." msgstr "²»ÄÜ×°ÈëPNGͼÏñ - Îļþ±»ÆÆ»µ »ò ûÓÐ×ã¹»ÄÚ´æ." @@ -967,32 +965,34 @@ msgstr " msgid "Couldn't register clipboard format '%s'." msgstr "²»ÄÜ×¢²á¼ôÌù°å¸ñʽ '%s'." -#: ../src/msw/thread.cpp:219 -msgid "Couldn't release a mutex" -msgstr "²»ÄÜÊÍ·Å»¥³âÌå" - -#: ../src/msw/listctrl.cpp:651 +#: ../src/msw/listctrl.cpp:722 #, 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:749 ../src/msw/thread.cpp:1091 msgid "Couldn't terminate thread" msgstr "²»ÄÜÖÕÖ¹Ïß³Ì" -#: ../src/generic/dirctrlg.cpp:1356 ../src/generic/dirdlgg.cpp:565 +#: ../src/generic/dirdlgg.cpp:263 msgid "Create directory" msgstr "´´½¨Ä¿Â¼" -#: ../src/generic/filedlgg.cpp:1008 +#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1119 msgid "Create new directory" msgstr "´´½¨ÐÂĿ¼" -#: ../src/generic/filedlgg.cpp:1015 +#: ../src/generic/filedlgg.cpp:1130 msgid "Current directory:" msgstr "µ±Ç°Ä¿Â¼:" -#: ../src/common/fontmap.cpp:115 +#: ../src/common/fontmap.cpp:116 #, fuzzy msgid "Cyrillic (ISO-8859-5)" msgstr "²¨Â޵ĺ£Óï (ISO-8859-13)" @@ -1005,32 +1005,32 @@ msgstr "D Ö½ 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: Îļþ±àÂëδ֪." @@ -1039,83 +1039,83 @@ msgstr "BMP: msgid "DL Envelope, 110 x 220 mm" msgstr "DL ÐÅ·â, 110 x 220 ºÁÃ×" -#: ../src/generic/filedlgg.cpp:646 +#: ../src/generic/filedlgg.cpp:700 msgid "Date" msgstr "ÈÕÆÚ" -#: ../src/generic/fontdlgg.cpp:209 +#: ../src/generic/fontdlgg.cpp:221 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:346 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:329 #, 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:1254 #, 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 "ÏÔʾѡÏî¶Ô»°¿ò" -#: ../src/msw/mimetype.cpp:677 +#: ../src/msw/mimetype.cpp:679 #, c-format msgid "" -"Do you want to overwrite the command used to %s files with extension \"%s" -"\" ?\n" +"Do you want to overwrite the command used to %s files with extension \"%s\" " +"?\n" "Current value is \n" "%s, \n" "New value is \n" "%s %1" msgstr "" -#: ../src/common/docview.cpp:439 +#: ../src/common/docview.cpp:440 #, 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:372 msgid "Done." msgstr "Íê³É¡£" @@ -1128,11 +1128,11 @@ 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 "ÕÒµ½µÄÌõÄ¿" @@ -1142,48 +1142,41 @@ msgid "" "Environment variables expansion failed: missing '%c' at position %d in '%s'." msgstr "»·¾³±äÁ¿À©Õ¹Ê§°Ü: '%c' ûÓгöÏÖÔÚλÖà %d / '%s'." -#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirctrlg.cpp:666 -#: ../src/generic/dirctrlg.cpp:677 ../src/generic/dirctrlg.cpp:1391 -#: ../src/generic/dirdlgg.cpp:267 ../src/generic/dirdlgg.cpp:285 -#: ../src/generic/dirdlgg.cpp:296 ../src/generic/dirdlgg.cpp:598 -#: ../src/generic/filedlgg.cpp:742 ../src/generic/filedlgg.cpp:837 -#: ../src/generic/filedlgg.cpp:851 ../src/generic/filedlgg.cpp:864 -#: ../src/generic/filedlgg.cpp:1170 ../src/generic/filedlgg.cpp:1219 -#: ../src/generic/helpxlp.cpp:243 ../src/gtk/filedlg.cpp:80 -#: ../src/gtk/fontdlg.cpp:72 +#: ../src/generic/dirctrlg.cpp:702 ../src/generic/dirctrlg.cpp:720 +#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298 +#: ../src/generic/filedlgg.cpp:836 ../src/generic/filedlgg.cpp:933 +#: ../src/generic/filedlgg.cpp:947 ../src/generic/filedlgg.cpp:960 +#: ../src/generic/filedlgg.cpp:1322 ../src/generic/filedlgg.cpp:1372 +#: ../src/gtk/filedlg.cpp:80 ../src/gtk/fontdlg.cpp:71 msgid "Error" msgstr "´íÎó" -#: ../src/unix/utilsunx.cpp:1176 ../src/unix/utilsunx.cpp:1184 +#: ../src/unix/utilsunx.cpp:1182 ../src/unix/utilsunx.cpp:1190 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:697 #, c-format msgid "Execution of command '%s' failed" msgstr "ÃüÁî '%s'Ö´ÐÐʧ°Ü" @@ -1193,38 +1186,38 @@ msgid "Executive, 7 1/4 x 10 1/2 in" msgstr "Executive, 7 1/4 x 10 1/2 Ó¢´ç" #: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1391 -#: ../src/common/resource.cpp:1838 ../src/common/resource.cpp:1968 -#: ../src/common/resource.cpp:3048 +#: ../src/common/resource.cpp:1845 ../src/common/resource.cpp:1975 +#: ../src/common/resource.cpp:3059 msgid "Expected '*' whilst parsing resource." msgstr "½âÎö×ÊԴʱÆÚ´ý³öÏÖ '*' ." #: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1407 -#: ../src/common/resource.cpp:1855 ../src/common/resource.cpp:1984 -#: ../src/common/resource.cpp:3065 +#: ../src/common/resource.cpp:1862 ../src/common/resource.cpp:1991 +#: ../src/common/resource.cpp:3076 msgid "Expected '=' whilst parsing resource." msgstr "½âÎö×ÊԴʱÆÚ´ý '='." #: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1377 -#: ../src/common/resource.cpp:1824 ../src/common/resource.cpp:1954 -#: ../src/common/resource.cpp:3034 +#: ../src/common/resource.cpp:1831 ../src/common/resource.cpp:1961 +#: ../src/common/resource.cpp:3045 msgid "Expected 'char' whilst parsing resource." msgstr "½âÎö×ÊԴʱÆÚ´ý 'char' ." -#: ../src/msw/dialup.cpp:869 ../src/msw/dialup.cpp:874 +#: ../src/msw/dialup.cpp:840 #, 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'ʧ°Ü" @@ -1233,11 +1226,11 @@ msgstr "Ë¢ msgid "Failed to close the clipboard." msgstr "¹Ø±Õ¼ôÌù°åʧ°Ü." -#: ../src/msw/dialup.cpp:808 +#: ../src/msw/dialup.cpp:780 msgid "Failed to connect: missing username/password." msgstr "Á¬½Óʧ°Ü: ȱÉÙÓû§Ãû/¿ÚÁî." -#: ../src/msw/dialup.cpp:754 +#: ../src/msw/dialup.cpp:726 msgid "Failed to connect: no ISP to dial." msgstr "Á¬½Óʧ°Ü: ûÓÐÒª²¦ºÅµÄISP." @@ -1251,11 +1244,16 @@ msgstr " msgid "Failed to copy the contents of registry key '%s' to '%s'." msgstr "°Ñ×¢²á¼üÄÚÈÝ´Ó '%s' ¿½±´µ½ '%s'ʧ°Ü." +#: ../src/common/filefn.cpp:1106 +#, 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:425 msgid "Failed to create MDI parent frame." msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü." @@ -1263,20 +1261,35 @@ msgstr " msgid "Failed to create a status bar." msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£" -#: ../src/common/filename.cpp:625 +#: ../src/common/filename.cpp:717 #, fuzzy msgid "Failed to create a temporary file name" msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü." +#: ../src/msw/utilsexc.cpp:195 +#, fuzzy +msgid "Failed to create an anonymous pipe" +msgstr "´´½¨×´Ì¬Ìõʧ°Ü¡£" + #: ../src/msw/dde.cpp:401 #, c-format msgid "Failed to create connection to server '%s' on topic '%s'" msgstr "´´½¨µ½·þÎñÆ÷ '%s'µÄ¹ØÓÚÖ÷Ìâ'%s'µÄÁ¬½Óʧ°Ü" -#: ../src/generic/dirctrlg.cpp:1302 ../src/generic/dirdlgg.cpp:543 -msgid "Failed to create directory " +#: ../src/msw/toplevel.cpp:293 +#, 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." @@ -1287,12 +1300,12 @@ msgstr " msgid "Failed to create the standard find/replace dialog (error code %d)" msgstr "" -#: ../src/html/winpars.cpp:413 +#: ../src/html/winpars.cpp:430 #, 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 "Çå¿Õ¼ôÌù°åʧ°Ü" @@ -1300,17 +1313,17 @@ msgstr " msgid "Failed to establish an advise loop with DDE server" msgstr "ÔÚDDE·þÎñÆ÷½¨Á¢adviseÑ­»·Ê§°Ü" -#: ../src/msw/dialup.cpp:646 +#: ../src/msw/dialup.cpp:618 #, 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:538 ../src/unix/utilsunx.cpp:555 #, c-format msgid "Failed to execute '%s'\n" msgstr "Ö´ÐÐ '%s'ʧ°Ü\n" -#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2458 +#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2465 #, c-format msgid "" "Failed to find XBM resource %s.\n" @@ -1319,7 +1332,7 @@ msgstr "" "²éÕÒXBM×ÊÔ´ %sʧ°Ü.\n" "ûÓÐʹÓÃwxResourceLoadBitmapData?" -#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2608 +#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2619 #, c-format msgid "" "Failed to find XBM resource %s.\n" @@ -1328,7 +1341,7 @@ msgstr "" "²éÕÒXBM×ÊÔ´%sʧ°Ü.\n" "ûÓÐʹÓÃwxResourceLoadIconData?" -#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2473 +#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2480 #, c-format msgid "" "Failed to find XPM resource %s.\n" @@ -1337,63 +1350,78 @@ msgstr "" "²éÕÒXPM×ÊÔ´ %sʧ°Ü.\n" "ûÓÐʹÓÃwxResourceLoadBitmapData?" -#: ../src/msw/dialup.cpp:706 +#: ../src/msw/dialup.cpp:678 #, 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:286 msgid "Failed to get the UTC system time." msgstr "»ñÈ¡UTCϵͳʱ¼äʧ°Ü." -#: ../src/common/timercmn.cpp:228 +#: ../src/common/timercmn.cpp:237 msgid "Failed to get the local system time" msgstr "»ñÈ¡±¾µØϵͳʱ¼äʧ°Ü" -#: ../src/univ/theme.cpp:122 +#: ../src/common/filefn.cpp:1487 +#, 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:729 #, fuzzy msgid "Failed to initialize OpenGL" msgstr "²»Äܳõʼ»¯ OLE" -#: ../src/unix/threadpsx.cpp:776 +#: ../src/unix/threadpsx.cpp:871 msgid "" "Failed to join a thread, potential memory leak detected - please restart the " "program" msgstr "ºÏ²¢Ïß³Ìʧ°Ü, ¼ì²âµ½Ç±ÔÚµØÄڴ涪ʧ - ÇëÖØÐÂÆô¶¯ÏµÍ³" -#: ../src/msw/utils.cpp:673 +#: ../src/msw/utils.cpp:721 #, fuzzy, c-format msgid "Failed to kill process %d" msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü" -#: ../src/common/dynlib.cpp:263 +#: ../src/common/iconbndl.cpp:66 +#, fuzzy, c-format +msgid "Failed to load image %d from file '%s'." +msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü" + +#: ../src/msw/volume.cpp:340 +#, fuzzy +msgid "Failed to load mpr.dll." +msgstr "ÉèÖüôÌù°åÊý¾Ýʧ°Ü" + +#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:197 #, 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:126 #, fuzzy, c-format msgid "Failed to load shared library '%s' Error '%s'" msgstr "²»ÄÜ×°Ôع²Ïí¿â '%s'" -#: ../src/unix/snglinst.cpp:193 +#: ../src/unix/snglinst.cpp:192 #, fuzzy, c-format msgid "Failed to lock the lock file '%s'" msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü" @@ -1403,17 +1431,17 @@ msgstr "Ë¢ msgid "Failed to match '%s' in regular expression: %s" msgstr "µ½ %s µÄ²¦ºÅÁ¬½Óʧ°Ü: %s" -#: ../src/common/filename.cpp:1561 +#: ../src/common/filename.cpp:1644 #, 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:739 #, fuzzy msgid "Failed to open temporary file." msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£" @@ -1422,35 +1450,40 @@ msgstr " msgid "Failed to open the clipboard." msgstr "´ò¿ª¼ôÌù°åʧ°Ü¡£" -#: ../src/msw/clipbrd.cpp:544 +#: ../src/msw/clipbrd.cpp:616 msgid "Failed to put data on the clipboard" msgstr "°ÑÊý¾Ý·Åµ½¼ôÌù°åʧ°Ü" -#: ../src/unix/snglinst.cpp:253 +#: ../src/unix/snglinst.cpp:252 #, fuzzy msgid "Failed to read PID from lock file." msgstr "´´½¨ MDI ¸¸¿ò¼Üʧ°Ü." -#: ../src/unix/utilsunx.cpp:662 +#: ../src/unix/utilsunx.cpp:629 msgid "Failed to redirect child process input/output" msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü" +#: ../src/msw/utilsexc.cpp:600 +#, fuzzy +msgid "Failed to redirect the child process IO" +msgstr "Öض¨Ïò×Ó¹ý³ÌÊäÈë/Êä³öʧ°Ü" + #: ../src/msw/dde.cpp:285 #, c-format 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'ʧ°Ü." @@ -1465,20 +1498,20 @@ msgstr " msgid "Failed to rename the registry key '%s' to '%s'." msgstr "½«×¢²áÖµ '%s'¸ÄÃûµ½'%s'ʧ°Ü." -#: ../src/msw/clipbrd.cpp:433 +#: ../src/msw/clipbrd.cpp:505 msgid "Failed to retrieve data from the clipboard." msgstr "´Ó¼ôÌù°å¼ìÈ¡Êý¾Ýʧ°Ü¡£" -#: ../src/common/filename.cpp:1627 +#: ../src/common/filename.cpp:1710 #, fuzzy, c-format msgid "Failed to retrieve file times for '%s'" msgstr "¼ìÈ¡RAS´íÎóÏûÏ¢ÕýÎÄʧ°Ü" -#: ../src/msw/dialup.cpp:470 +#: ../src/msw/dialup.cpp:442 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 "¼ìÈ¡Ö§³ÖµÄ¼ôÌù°å¸ñʽʧ°Ü" @@ -1491,26 +1524,26 @@ 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:522 #, fuzzy msgid "Failed to set temporary file permissions" msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü" -#: ../src/unix/threadpsx.cpp:1093 +#: ../src/unix/threadpsx.cpp:1213 ../src/unix/threadpsx.cpp:1224 #, c-format msgid "Failed to set thread priority %d." msgstr "ÉèÖÃÏß³ÌÓÅÏȼ¶ %dʧ°Ü." -#: ../src/common/fs_mem.cpp:168 +#: ../src/common/fs_mem.cpp:167 #, c-format msgid "Failed to store image '%s' to memory VFS!" msgstr "½«Í¼Ïñ'%s'´æµ½ÄÚ´æVFSʧ°Ü!" -#: ../src/unix/threadpsx.cpp:1279 +#: ../src/unix/threadpsx.cpp:1397 msgid "Failed to terminate a thread." msgstr "ÖÕÖ¹Ïß³Ìʧ°Ü" @@ -1518,17 +1551,17 @@ msgstr " msgid "Failed to terminate the advise loop with DDE server" msgstr "ÖÕÖ¹ÓëDDE·þÎñÆ÷µÄadviseÑ­»·Ê§°Ü" -#: ../src/msw/dialup.cpp:948 +#: ../src/msw/dialup.cpp:913 #, c-format msgid "Failed to terminate the dialup connection: %s" msgstr "ÖÕÖ¹²¦ºÅÁ¬½Ó: %sʧ°Ü" -#: ../src/common/filename.cpp:1576 +#: ../src/common/filename.cpp:1659 #, 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'ʧ°Ü" @@ -1538,20 +1571,20 @@ msgstr "Ë¢ msgid "Failed to unregister DDE server '%s'" msgstr "³·ÏûDDE·þÎñÆ÷ '%s'×¢²áʧ°Ü" -#: ../src/unix/snglinst.cpp:174 +#: ../src/unix/snglinst.cpp:173 #, fuzzy, c-format msgid "Failed to write to lock file '%s'" msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü" -#: ../src/generic/logg.cpp:368 +#: ../src/generic/logg.cpp:379 msgid "Fatal error" msgstr "ÖÂÃü´íÎó" -#: ../src/common/log.cpp:362 +#: ../src/common/log.cpp:453 msgid "Fatal error: " msgstr "ÖÂÃü´íÎó£º" -#: ../src/mac/app.cpp:907 ../src/msw/app.cpp:1396 +#: ../src/mac/app.cpp:1220 ../src/msw/app.cpp:1281 msgid "Fatal error: exiting" msgstr "ÖÂÃü´íÎó£ºÒÑ´æÔÚ" @@ -1560,35 +1593,41 @@ msgstr " msgid "File %s does not exist." msgstr ": Îļþ²»´æÔÚ!" -#: ../src/generic/filedlgg.cpp:1201 ../src/gtk/filedlg.cpp:69 +#: ../src/generic/filedlgg.cpp:1354 ../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:505 +#, 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:294 ../src/common/docview.cpp:331 +#: ../src/common/docview.cpp:1422 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:947 msgid "File name exists already." msgstr "ÎļþÃûÒÑ´æÔÚ" -#: ../src/msw/filedlg.cpp:349 +#: ../src/msw/filedlg.cpp:353 #, 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 "¹Ì¶¨×ÖÌ壺" @@ -1596,54 +1635,55 @@ msgstr " msgid "Folio, 8 1/2 x 13 in" msgstr "Folio, 8 1/2 x 13 in" -#: ../src/generic/fontdlgg.cpp:126 -msgid "Font" -msgstr "×ÖÌå" - -#: ../src/html/helpfrm.cpp:1042 +#: ../src/html/helpfrm.cpp:960 msgid "Font size:" msgstr "×ÖÌå´óС:" -#: ../src/unix/utilsunx.cpp:619 +#: ../src/unix/utilsunx.cpp:572 msgid "Fork failed" msgstr "Fork ʧ°Ü" -#: ../src/common/dlgcmn.cpp:173 ../src/generic/helpwxht.cpp:158 +#: ../src/common/dlgcmn.cpp:167 msgid "Forward" msgstr "ÏòÇ°" #: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1360 -#: ../src/common/resource.cpp:1807 ../src/common/resource.cpp:1937 -#: ../src/common/resource.cpp:3017 +#: ../src/common/resource.cpp:1814 ../src/common/resource.cpp:1944 +#: ../src/common/resource.cpp:3028 msgid "Found " msgstr "ÕÒµ½" -#: ../src/html/helpfrm.cpp:721 +#: ../src/html/helpfrm.cpp:661 ../src/html/htmlhelp.cpp:460 #, c-format msgid "Found %i matches" msgstr "ÕÒµ½ %i ¸öÆ¥ÅäÏî" -#: ../src/generic/prntdlgg.cpp:185 +#: ../src/generic/prntdlgg.cpp:184 msgid "From:" msgstr "´Ó:" -#: ../src/common/imaggif.cpp:74 +#: ../src/common/imaggif.cpp:100 +#, fuzzy +msgid "GIF: Invalid gif index." +msgstr "ÎÞЧTIFFͼÏñË÷Òý." + +#: ../src/common/imaggif.cpp:75 msgid "GIF: data stream seems to be truncated." msgstr "GIF: Êý¾ÝÁ÷ËƺõÒѱ»½Ø¶Ï." -#: ../src/common/imaggif.cpp:58 +#: ../src/common/imaggif.cpp:59 msgid "GIF: error in GIF image format." msgstr "GIF: GIFÎļþ¸ñʽ´íÎó." -#: ../src/common/imaggif.cpp:61 +#: ../src/common/imaggif.cpp:62 msgid "GIF: not enough memory." msgstr "GIF: ûÓÐ×ã¹»ÄÚ´æ." -#: ../src/common/imaggif.cpp:64 +#: ../src/common/imaggif.cpp:65 msgid "GIF: unknown error!!!" msgstr "GIF: λÖôíÎó!!!" -#: ../src/univ/themes/gtk.cpp:578 +#: ../src/univ/themes/gtk.cpp:623 msgid "GTK+ theme" msgstr "" @@ -1655,123 +1695,140 @@ 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/htmlhelp.cpp:541 +msgid "Go back to the previous HTML page" +msgstr "" + +#: ../src/html/helpfrm.cpp:509 msgid "Go forward" msgstr "ÏòÇ°" -#: ../src/html/helpfrm.cpp:574 +#: ../src/html/htmlhelp.cpp:543 +msgid "Go forward to the next HTML page" +msgstr "" + +#: ../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:1108 msgid "Go to home directory" msgstr "½øÈëhomeĿ¼" -#: ../src/generic/filedlgg.cpp:994 +#: ../src/generic/filedlgg.cpp:1100 msgid "Go to parent directory" msgstr "½øÈ븸Ŀ¼" -#: ../src/common/fontmap.cpp:117 +#: ../src/common/prntbase.cpp:379 +msgid "Goto Page" +msgstr "" + +#: ../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 files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books " +"(*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All " +"files (*.*)|*" msgstr "" -"HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé (*.htb)|*.htb|°ïÖú" -"Êé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ (*.*)|*" +"HTML Îļþ (*.htm)|*.htm|HTML Îļþ (*.html)|*.html|°ïÖúÊé " +"(*.htb)|*.htb|°ïÖúÊé (*.zip)|*.zip|HTML °ïÖúÏîÄ¿ (*.hhp)|*.hhp|ËùÓÐÎļþ " +"(*.*)|*" -#: ../src/common/fontmap.cpp: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:1324 msgid "Help" msgstr "°ïÖú" -#: ../src/html/helpfrm.cpp:1015 +#: ../src/html/htmlhelp.cpp:87 +#, fuzzy, c-format +msgid "Help : %s" +msgstr "°ïÖú: %s" + +#: ../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:49 #, c-format msgid "Help: %s" msgstr "°ïÖú: %s" -#: ../src/common/imagbmp.cpp:103 -msgid "ICO: Error Image too tall for an icon." -msgstr "" - -#: ../src/common/imagbmp.cpp:109 -msgid "ICO: Error Image too wide for an icon." -msgstr "" - -#: ../src/common/imagbmp.cpp:201 +#: ../src/common/imagbmp.cpp: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 +#: ../src/common/resource.cpp:2649 ../src/common/resource.cpp:2660 #, c-format msgid "Icon resource specification %s not found." msgstr "ûÓÐÕÒµ½Í¼±ê×ÊÔ´¹æ·¶ %s ." @@ -1780,72 +1837,77 @@ msgstr "û msgid "Ill-formed resource file syntax." msgstr "²»Á¼µÄ×ÊÔ´ÎļþÓï·¨¡£" -#: ../src/generic/dirctrlg.cpp:648 ../src/generic/dirdlgg.cpp:267 -#: ../src/generic/filedlgg.cpp:837 +#: ../src/generic/dirctrlg.cpp:702 ../src/generic/filedlgg.cpp:933 msgid "Illegal directory name." msgstr "²»ºÏ·¨µÄĿ¼Ãû¡£" -#: ../src/generic/filedlgg.cpp:1170 +#: ../src/generic/filedlgg.cpp:1322 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:1122 #, fuzzy, c-format msgid "Impossible to get permissions for file '%s'" msgstr "²»¿ÉÄÜ»ñµÃ×Ó¹ý³ÌµÄÊäÈë" -#: ../src/common/filefn.cpp:1102 +#: ../src/common/filefn.cpp:1136 #, fuzzy, c-format msgid "Impossible to overwrite the file '%s'" msgstr "Ë¢ÐÂÎļþ '%s'ʧ°Ü" -#: ../src/common/filefn.cpp:1152 +#: ../src/common/filefn.cpp:1187 #, 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 ../src/html/htmlhelp.cpp:578 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:343 #, c-format msgid "Invalid XRC resource '%s': doesn't have root node 'resource'." msgstr "" -#: ../src/common/appcmn.cpp:282 +#: ../src/common/appcmn.cpp:378 #, fuzzy, c-format msgid "Invalid display mode specification '%s'." msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö" -#: ../src/unix/snglinst.cpp:281 +#: ../src/x11/app.cpp:231 +#, fuzzy, c-format +msgid "Invalid geometry specification '%s'" +msgstr "²»ºÏ¹æ·¶µÄÎļþÃèÊö" + +#: ../src/unix/snglinst.cpp:280 #, fuzzy, c-format msgid "Invalid lock file '%s'." msgstr "²»ÄܹرÕÎļþ '%s'" @@ -1855,7 +1917,7 @@ msgstr " msgid "Invalid regular expression '%s': %s" msgstr "" -#: ../src/generic/fontdlgg.cpp:215 +#: ../src/generic/fontdlgg.cpp:227 msgid "Italic" msgstr "бÌå" @@ -1863,20 +1925,19 @@ msgstr "б msgid "Italy Envelope, 110 x 230 mm" msgstr "Òâ´óÀûÐÅ·â, 110 x 230 mm" -#: ../src/common/imagjpeg.cpp:206 +#: ../src/common/imagjpeg.cpp:222 msgid "JPEG: Couldn't load - file is probably corrupted." msgstr "JPEG: ²»ÄÜ×°Èë - ÎļþÒ²ÐíÒѱ»ÆÆ»µ." -#: ../src/common/imagjpeg.cpp:320 +#: ../src/common/imagjpeg.cpp:336 msgid "JPEG: Couldn't save image." msgstr "JPEG: ²»Äܱ£´æͼÏñ." -#: ../src/common/fontmap.cpp:126 +#: ../src/common/fontmap.cpp:127 msgid "KOI8-R" msgstr "KOI8-R" -#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:439 -#: ../src/generic/prntdlgg.cpp:635 +#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:620 msgid "Landscape" msgstr "ºáÏò" @@ -1884,7 +1945,7 @@ msgstr " msgid "Ledger, 17 x 11 in" msgstr "Ledger, 17 x 11 Ó¢´ç" -#: ../src/generic/prntdlgg.cpp:647 +#: ../src/generic/prntdlgg.cpp:632 msgid "Left margin (mm):" msgstr "×ó±ß¾à (ºÁÃ×):" @@ -1900,25 +1961,25 @@ msgstr "Letter Small, 8 1/2 x 11 Ó¢ msgid "Letter, 8 1/2 x 11 in" msgstr "Letter, 8 1/2 x 11 Ó¢´ç" -#: ../src/generic/fontdlgg.cpp:218 +#: ../src/generic/fontdlgg.cpp:230 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:1587 ../src/gtk/filedlg.cpp:249 +#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:542 #, c-format msgid "Load %s file" msgstr "×°ÈëÎļþ %s " -#: ../src/html/htmlwin.cpp:285 +#: ../src/generic/filedlgg.cpp:1589 +#, fuzzy +msgid "Load file" +msgstr "×°ÈëÎļþ %s " + +#: ../src/html/htmlwin.cpp:282 msgid "Loading : " msgstr "×°ÔØ:" -#: ../src/common/imagbmp.cpp:660 ../src/common/imagbmp.cpp:674 -#, fuzzy -msgid "Loading DIB : Couldn't allocate memory." -msgstr "BMP: ²»ÄÜ·ÖÅäÄÚ´æ." - #: ../src/common/imagpnm.cpp:72 msgid "Loading Grey Ascii PNM image is not yet implemented." msgstr "×°Èë»Ò¶È Ascii PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ." @@ -1927,23 +1988,27 @@ msgstr "×° msgid "Loading Grey Raw PNM image is not yet implemented." msgstr "×°Èë»Ò¶È Raw PNMͼÏñ¹¦ÄÜ»¹Ã»ÓÐʵÏÖ." -#: ../src/generic/logg.cpp:538 +#: ../src/generic/logg.cpp:554 #, c-format msgid "Log saved to the file '%s'." msgstr "ÈÕÖ¾±£´æµ½Îļþ '%s'." -#: ../src/gtk/mdi.cpp:435 +#: ../src/gtk/mdi.cpp:433 msgid "MDI child" msgstr "MDI×Ó´°¿Ú" -#: ../src/msw/helpchm.cpp:70 +#: ../src/msw/helpchm.cpp:60 #, fuzzy msgid "" "MS HTML Help functions are unavailable because the MS HTML Help library is " "not installed on this machine. Please install it." msgstr "ÓÉÓÚÔ¶³Ì·ÃÎÊ·þÎñ£¨RAS£©Ã»Óа²×°ÔÚ±¾»ú,²¦ºÅ¹¦Äܲ»ÄÜʹÓÃ. Çë°²×°Ëü." -#: ../src/unix/mimetype.cpp:2412 +#: ../src/univ/themes/win32.cpp:4545 +msgid "Ma&ximize" +msgstr "" + +#: ../src/unix/mimetype.cpp:2477 #, c-format msgid "Mailcap file %s, line %d: incomplete entry ignored." msgstr "Mailcap Îļþ %s, ÐÐ %d: ²»ÍêÕûÌõÄ¿±»ºöÂÔ." @@ -1952,22 +2017,30 @@ msgstr "Mailcap msgid "Match case" msgstr "" -#: ../src/common/fs_mem.cpp:145 +#: ../src/common/fs_mem.cpp:144 #, c-format msgid "Memory VFS already contains file '%s'!" msgstr "ÄÚ´æ VFS ÒÑ°üº¬Îļþ '%s'!" -#: ../src/unix/mimetype.cpp:2077 +#: ../src/univ/themes/metal.cpp:174 +msgid "Metal theme" +msgstr "" + +#: ../src/univ/themes/win32.cpp:4543 +msgid "Mi&nimize" +msgstr "" + +#: ../src/unix/mimetype.cpp:2102 #, 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:222 msgid "Modern" msgstr "ÏÖ´ú" @@ -1975,61 +2048,46 @@ msgstr " msgid "Monarch Envelope, 3 7/8 x 7 1/2 in" msgstr "Monarch Envelope, 3 7/8 x 7 1/2 in" -#: ../src/common/dlgcmn.cpp:182 +#: ../src/common/dlgcmn.cpp: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:698 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:812 ../src/generic/filedlgg.cpp:821 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:182 msgid "No" msgstr "·ñ" -#: ../src/common/image.cpp:784 +#: ../src/common/image.cpp:793 msgid "No Unused Color in image being masked" msgstr "" #: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:965 -#: ../src/common/resource.cpp:2464 ../src/common/resource.cpp:2614 +#: ../src/common/resource.cpp:2471 ../src/common/resource.cpp:2625 msgid "No XBM facility available!" msgstr "ûÓпÉÓÃXBM¹¤¾ß!" -#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2632 +#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2643 msgid "No XPM icon facility available!" msgstr "ûÓпÉÓõÄXPMͼ±êÉ豸!" -#: ../src/generic/helphtml.cpp:314 +#: ../src/generic/helphtml.cpp:329 msgid "No entries found." msgstr "ûÕÒµ½ÌõÄ¿" -#: ../src/common/fontmap.cpp:845 +#: ../src/common/fontmap.cpp:865 #, fuzzy, c-format msgid "" "No font for displaying text in encoding '%s' found,\n" @@ -2041,7 +2099,7 @@ msgstr "" "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\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" @@ -2052,38 +2110,40 @@ msgstr "" "Ñ¡ÔñÓÃÓڸıàÂëµÄ×ÖÌå\n" "(·ñÔò¸Ã±àÂëµÄÎı¾½«²»ÄÜÕýÈ·ÏÔʾ)?" -#: ../contrib/src/xrc/xmlres.cpp:396 +#: ../contrib/src/xrc/xmlres.cpp:523 #, 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 ../src/html/htmlhelp.cpp:436 +#: ../src/html/htmlhelp.cpp:441 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:226 ../src/generic/fontdlgg.cpp:229 msgid "Normal" msgstr "Õý³£" -#: ../src/html/helpfrm.cpp:1024 +#: ../src/html/helpfrm.cpp:942 msgid "Normal font:" msgstr "Normal font:" @@ -2091,69 +2151,68 @@ msgstr "Normal font:" msgid "Note, 8 1/2 x 11 in" msgstr "±Ê¼Ç²¾, 8 1/2 x 11 Ó¢´ç" -#: ../src/common/dlgcmn.cpp:168 ../src/generic/dcpsg.cpp:2268 -#: ../src/generic/dirctrlg.cpp:1247 ../src/generic/dirdlgg.cpp:416 -#: ../src/generic/filedlgg.cpp:1032 ../src/generic/fontdlgg.cpp:258 -#: ../src/generic/logg.cpp:723 ../src/generic/prntdlgg.cpp:465 -#: ../src/generic/proplist.cpp:513 ../src/gtk/filedlg.cpp:167 -#: ../src/gtk/fontdlg.cpp:172 ../src/html/helpfrm.cpp:1052 +#: ../src/common/dlgcmn.cpp:162 ../src/generic/dirdlgg.cpp:151 +#: ../src/generic/filedlgg.cpp:1165 ../src/generic/filedlgg.cpp:1176 +#: ../src/generic/fontdlgg.cpp:253 ../src/generic/logg.cpp:739 +#: ../src/generic/prntdlgg.cpp:452 ../src/generic/proplist.cpp:499 +#: ../src/gtk/filedlg.cpp:167 ../src/gtk/fontdlg.cpp:136 +#: ../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:836 ../src/generic/filedlgg.cpp:960 msgid "Operation not permitted." msgstr "²»ÔÊÐíµÄ²Ù×÷." -#: ../src/common/cmdline.cpp:627 +#: ../src/common/cmdline.cpp:666 #, c-format msgid "Option '%s' requires a value, '=' expected." msgstr "Ñ¡Ïî '%s' ÒªÇóÒ»¸öÖµ, ÆÚÍû '='." -#: ../src/common/cmdline.cpp:647 +#: ../src/common/cmdline.cpp:686 #, c-format msgid "Option '%s' requires a value." msgstr "Ñ¡Ïî '%s' ÐèÒªÖµ." -#: ../src/common/cmdline.cpp:708 +#: ../src/common/cmdline.cpp:747 #, c-format msgid "Option '%s': '%s' cannot be converted to a date." msgstr "Ñ¡Ïî '%s': '%s' ²»ÄÜת³ÉÈÕÆÚ." -#: ../src/generic/prntdlgg.cpp:445 +#: ../src/generic/prntdlgg.cpp:432 msgid "Options" msgstr "Ñ¡Ïî" -#: ../src/generic/prntdlgg.cpp:441 ../src/generic/prntdlgg.cpp:636 +#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:621 msgid "Orientation" msgstr "·½Ïò" -#: ../src/common/imagpcx.cpp:461 ../src/common/imagpcx.cpp:484 +#: ../src/common/imagpcx.cpp:455 ../src/common/imagpcx.cpp:478 msgid "PCX: couldn't allocate memory" msgstr "PCX: ²»ÄÜ·ÖÅäÄÚ´æ" -#: ../src/common/imagpcx.cpp:460 +#: ../src/common/imagpcx.cpp:454 msgid "PCX: image format unsupported" msgstr "PCX: ͼÏñ¸ñʽ²»Ö§³Ö" -#: ../src/common/imagpcx.cpp:483 +#: ../src/common/imagpcx.cpp:477 msgid "PCX: invalid image" msgstr "PCX: ÎÞЧͼÏñ" -#: ../src/common/imagpcx.cpp:447 +#: ../src/common/imagpcx.cpp:441 msgid "PCX: this is not a PCX file." msgstr "PCX: ²»ÊÇPCXÎļþ." -#: ../src/common/imagpcx.cpp:463 ../src/common/imagpcx.cpp:485 +#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:479 msgid "PCX: unknown error !!!" msgstr "PCX: δ֪´íÎó !!!" -#: ../src/common/imagpcx.cpp:462 +#: ../src/common/imagpcx.cpp:456 msgid "PCX: version number too low" msgstr "PCX: °æ±¾ºÅ̫С" @@ -2169,55 +2228,55 @@ msgstr "PNM: msgid "PNM: File seems truncated." msgstr "PNM: ÎļþËƺõÒѱ»½Ø¶Ï." -#: ../src/common/prntbase.cpp:736 +#: ../src/common/prntbase.cpp:827 #, c-format msgid "Page %d" msgstr "Ò³ %d" -#: ../src/common/prntbase.cpp:734 +#: ../src/common/prntbase.cpp:825 #, c-format msgid "Page %d of %d" msgstr "Ò³ %d / %d" -#: ../src/generic/prntdlgg.cpp:602 +#: ../src/generic/prntdlgg.cpp:587 msgid "Page Setup" msgstr "Ò³ÃæÉèÖÃ" -#: ../src/generic/prntdlgg.cpp:162 +#: ../src/generic/prntdlgg.cpp:161 msgid "Pages" msgstr "Ò³" -#: ../src/generic/prntdlgg.cpp:553 ../src/generic/prntdlgg.cpp:624 -#: ../src/generic/prntdlgg.cpp:806 +#: ../src/generic/prntdlgg.cpp:538 ../src/generic/prntdlgg.cpp:609 +#: ../src/generic/prntdlgg.cpp:794 msgid "Paper Size" msgstr "Ö½ÕÅ´óС" -#: ../src/generic/prntdlgg.cpp:431 ../src/generic/prntdlgg.cpp:613 -#: ../src/generic/prntdlgg.cpp:802 +#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:598 +#: ../src/generic/prntdlgg.cpp:790 msgid "Paper size" msgstr "Ö½ÕÅ´óС" -#: ../src/generic/filedlgg.cpp:648 +#: ../src/generic/filedlgg.cpp:703 msgid "Permissions" msgstr "ÔÊÐí" -#: ../src/unix/utilsunx.cpp:562 ../src/unix/utilsunx.cpp:590 +#: ../src/unix/utilsunx.cpp:439 msgid "Pipe creation failed" msgstr "¹ÜµÀ´´½¨Ê§°Ü" -#: ../src/gtk/fontdlg.cpp:72 +#: ../src/gtk/fontdlg.cpp:71 msgid "Please choose a valid font." msgstr "ÇëÑ¡ÔñÒ»¸öÓÐЧµÄ×ÖÌå¡£" -#: ../src/generic/filedlgg.cpp:1219 ../src/gtk/filedlg.cpp:80 +#: ../src/generic/filedlgg.cpp:1372 ../src/gtk/filedlg.cpp:80 msgid "Please choose an existing file." msgstr "ÇëÑ¡ÔñÒ»¸öÒÑ´æÔÚµÄÎļþ¡£" -#: ../src/msw/dialup.cpp:775 +#: ../src/msw/dialup.cpp:747 msgid "Please choose which ISP do you want to connect to" msgstr "ÇëÑ¡ÔñÄãÏëÁ¬½ÓµÄISP" -#: ../src/msw/listctrl.cpp:491 +#: ../src/msw/listctrl.cpp:535 #, c-format msgid "" "Please install a newer version of comctl32.dll\n" @@ -2225,112 +2284,92 @@ msgid "" "or this program won't operate correctly." msgstr "" -#: ../src/common/prntbase.cpp:107 -msgid "Please wait..." -msgstr "ÇëµÈ´ý..." +#: ../src/common/prntbase.cpp:112 +msgid "Please wait while printing\n" +msgstr "" -#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:438 -#: ../src/generic/prntdlgg.cpp:634 +#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:619 msgid "Portrait" msgstr "×ÝÏò" -#: ../src/generic/dcpsg.cpp:389 -msgid "PostScript" -msgstr "PostScript" - -#: ../src/generic/prntdlgg.cpp:270 +#: ../src/generic/prntdlgg.cpp:268 msgid "PostScript file" msgstr "PostScriptÎļþ" -#: ../src/generic/dcpsg.cpp:2301 -msgid "PostScript:" -msgstr "PostScript:" - -#: ../src/generic/dcpsg.cpp:2264 -msgid "Preview Only" -msgstr "½öÔ¤ÀÀ" +#: ../src/html/htmlhelp.cpp:509 +msgid "Preparing help window..." +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:110 ../src/generic/prntdlgg.cpp:124 msgid "Print" msgstr "´òÓ¡" -#: ../src/common/docview.cpp:896 +#: ../src/common/docview.cpp:923 msgid "Print Preview" msgstr "´òÓ¡Ô¤ÀÀ" -#: ../src/common/prntbase.cpp:691 ../src/common/prntbase.cpp:715 +#: ../src/common/prntbase.cpp:782 ../src/common/prntbase.cpp:806 msgid "Print Preview Failure" msgstr "´òÓ¡Ô¤ÀÀʧ°Ü" -#: ../src/generic/prntdlgg.cpp:170 +#: ../src/generic/prntdlgg.cpp:169 msgid "Print Range" msgstr "´òÓ¡·¶Î§" -#: ../src/generic/prntdlgg.cpp:406 ../src/generic/prntdlgg.cpp:413 +#: ../src/generic/prntdlgg.cpp:406 msgid "Print Setup" msgstr "´òÓ¡ÉèÖÃ" -#: ../src/generic/prntdlgg.cpp:453 +#: ../src/generic/prntdlgg.cpp:440 msgid "Print in colour" msgstr "²ÊÉ«´òÓ¡" -#: ../src/generic/prntdlgg.cpp:455 +#: ../src/generic/prntdlgg.cpp:442 msgid "Print spooling" msgstr "´òÓ¡¼ÙÍÑ»ú" -#: ../src/html/helpfrm.cpp:594 +#: ../src/html/helpfrm.cpp:534 msgid "Print this page" msgstr "´òÓ¡±¾Ò³" -#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:148 +#: ../src/generic/prntdlgg.cpp:147 msgid "Print to File" msgstr "´òÓ¡µ½Îļþ" -#: ../src/common/prntbase.cpp:366 +#: ../src/common/prntbase.cpp:436 msgid "Print..." msgstr "´òÓ¡..." -#: ../src/generic/dcpsg.cpp:2274 -msgid "Printer Command: " -msgstr "´òÓ¡»úÃüÁî: " - -#: ../src/generic/dcpsg.cpp:2279 -msgid "Printer Options: " -msgstr "´òÓ¡»úÑ¡Ïî:" - -#: ../src/generic/dcpsg.cpp:358 -msgid "Printer Settings" -msgstr "´òÓ¡»úÉèÖÃ" - -#: ../src/generic/prntdlgg.cpp:457 +#: ../src/generic/prntdlgg.cpp:444 msgid "Printer command:" msgstr "´òÓ¡»úÃüÁî:" -#: ../src/generic/prntdlgg.cpp:147 +#: ../src/generic/prntdlgg.cpp:146 msgid "Printer options" msgstr "´òÓ¡»úÑ¡Ïî" -#: ../src/generic/prntdlgg.cpp:461 +#: ../src/generic/prntdlgg.cpp:448 msgid "Printer options:" msgstr "´òÓ¡»úÑ¡Ïî:" -#: ../src/generic/prntdlgg.cpp:680 +#: ../src/generic/prntdlgg.cpp:665 msgid "Printer..." msgstr "´òÓ¡»ú..." -#: ../src/common/prntbase.cpp:106 ../src/common/prntbase.cpp:148 -msgid "Printing" +#: ../src/common/prntbase.cpp:109 ../src/common/prntbase.cpp:154 +#, fuzzy +msgid "Printing " msgstr "´òÓ¡" -#: ../src/common/prntbase.cpp:120 +#: ../src/common/prntbase.cpp:126 msgid "Printing Error" msgstr "´òÓ¡³ö´í" @@ -2343,7 +2382,7 @@ msgstr " msgid "Printing..." msgstr "´òÓ¡..." -#: ../src/common/log.cpp:363 +#: ../src/common/log.cpp:454 msgid "Program aborted." msgstr "³ÌÐòÖÕÖ¹." @@ -2351,7 +2390,7 @@ msgstr " msgid "Quarto, 215 x 275 mm" msgstr "ËÄ¿ª, 215 x 275 mm" -#: ../src/generic/logg.cpp:1022 +#: ../src/generic/logg.cpp:1111 msgid "Question" msgstr "ÎÊÌâ" @@ -2360,6 +2399,11 @@ msgstr " msgid "Read error on file '%s'" msgstr "¶ÁÎļþ '%s'³ö´í" +#: ../contrib/src/xrc/xmlres.cpp:498 +#, c-format +msgid "Referenced object node with ref=\"%s\" not found!" +msgstr "" + #: ../src/msw/registry.cpp:535 #, c-format msgid "Registry key '%s' already exists." @@ -2386,15 +2430,19 @@ msgstr "" msgid "Registry value '%s' already exists." msgstr "×¢²áÖµ '%s' ÒÑ´æÔÚ." -#: ../src/generic/helphtml.cpp:319 +#: ../src/msw/thread.cpp:246 +msgid "ReleaseMutex()" +msgstr "" + +#: ../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 "´ÓÊéÇ©ÖÐÒÆÈ¥µ±Ç°Ò³" @@ -2407,42 +2455,51 @@ msgstr " msgid "Replace with:" msgstr "" -#: ../contrib/src/xrc/xmlres.cpp:330 +#: ../contrib/src/xrc/xmlres.cpp:360 msgid "Resource files must have same version number!" msgstr "" -#: ../src/generic/prntdlgg.cpp:659 +#: ../src/generic/prntdlgg.cpp:644 msgid "Right margin (mm):" msgstr "Óұ߾à (ºÁÃ×):" -#: ../src/generic/fontdlgg.cpp:208 +#: ../src/generic/fontdlgg.cpp:220 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:1602 ../src/gtk/filedlg.cpp:265 +#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:544 #, c-format msgid "Save %s file" msgstr "±£´æÎļþ %s " -#: ../src/common/docview.cpp:248 +#: ../src/common/docview.cpp:247 msgid "Save as" msgstr "Áí´æΪ" -#: ../src/generic/logg.cpp:471 +#: ../src/generic/filedlgg.cpp:1604 +#, fuzzy +msgid "Save file" +msgstr "±£´æÎļþ %s " + +#: ../src/generic/logg.cpp:487 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:223 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 +#: ../src/html/htmlhelp.cpp:610 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" @@ -2458,15 +2515,21 @@ msgstr " 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/htmlhelp.cpp:593 +#, fuzzy +msgid "Search!" +msgstr "ËÑË÷" + +#: ../src/html/helpfrm.cpp:650 ../src/html/htmlhelp.cpp:383 +#: ../src/html/htmlhelp.cpp:441 msgid "Searching..." msgstr "ËÑË÷..." -#: ../src/generic/dirctrlg.cpp:488 ../src/generic/dirdlgg.cpp:190 +#: ../src/generic/dirctrlg.cpp:549 msgid "Sections" msgstr "¶Î" @@ -2475,82 +2538,78 @@ msgstr " msgid "Seek error on file '%s'" msgstr "Îļþ '%s'¶¨Î»´íÎó" -#: ../src/common/docview.cpp:1490 +#: ../src/common/docview.cpp:1538 msgid "Select a document template" msgstr "Ñ¡ÔñÎĵµÄ£°å" -#: ../src/common/docview.cpp:1556 +#: ../src/common/docview.cpp:1614 msgid "Select a document view" msgstr "Ñ¡ÔñÎĵµÊÓͼ" -#: ../src/common/docview.cpp:1370 ../src/common/docview.cpp:1421 +#: ../src/common/docview.cpp:1405 ../src/common/docview.cpp:1456 msgid "Select a file" msgstr "Ñ¡ÔñÎļþ" -#: ../src/generic/dcpsg.cpp:2262 -msgid "Send to Printer" -msgstr "·¢µ½´òÓ¡»ú" - -#: ../src/common/cmdline.cpp:664 +#: ../src/common/cmdline.cpp:703 #, c-format msgid "Separator expected after the option '%s'." msgstr "ÆÚÍûÔÚÑ¡Ïî '%s'ºó´æÔÚ·Ö¸ô·û." -#: ../src/msw/glcanvas.cpp:441 -#, fuzzy -msgid "SetPixelFormat failed." -msgstr "¹ÜµÀ´´½¨Ê§°Ü" - -#: ../src/common/dlgcmn.cpp:179 +#: ../src/common/dlgcmn.cpp:173 msgid "Setup" msgstr "ÉèÖÃ" -#: ../src/generic/prntdlgg.cpp:153 +#: ../src/generic/prntdlgg.cpp:152 msgid "Setup..." msgstr "ÉèÖÃ..." -#: ../src/msw/dialup.cpp:546 +#: ../src/msw/dialup.cpp:518 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:1160 ../src/generic/filedlgg.cpp:1182 msgid "Show hidden files" msgstr "ÏÔʾÒþ²ØÎļþ" -#: ../src/html/helpfrm.cpp:561 +#: ../src/html/helpfrm.cpp:501 ../src/html/htmlhelp.cpp:538 msgid "Show/hide navigation panel" msgstr "ÏÔʾ/Òþ²Øµ¼º½Ãæ°å" -#: ../src/generic/filedlgg.cpp:645 +#: ../src/generic/filedlgg.cpp:699 msgid "Size" msgstr "´óС" -#: ../src/generic/fontdlgg.cpp:216 +#: ../src/generic/fontdlgg.cpp:228 msgid "Slant" msgstr "Çãб" -#: ../src/common/docview.cpp:305 +#: ../src/common/docview.cpp:304 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:341 ../src/common/docview.cpp:354 +#: ../src/common/docview.cpp:1424 msgid "Sorry, could not open this file." msgstr "¶Ô²»Æ𣬲»ÄÜ´ò¿ªÎļþ¡£" -#: ../src/common/docview.cpp:312 +#: ../src/common/docview.cpp:311 msgid "Sorry, could not save this file." msgstr "¶Ô²»Æ𣬲»Äܱ£´æÎļþ¡£" -#: ../src/common/prntbase.cpp:691 +#: ../src/common/prntbase.cpp:782 msgid "Sorry, not enough memory to create a preview." msgstr "¶Ô²»Æð, ûÓÐ×ã¹»ÄÚ´æ´´½¨Ô¤ÀÀ." @@ -2558,32 +2617,37 @@ msgstr " msgid "Statement, 5 1/2 x 8 1/2 in" msgstr "Statement, 5 1/2 x 8 1/2 in" -#: ../src/generic/logg.cpp:588 +#: ../src/generic/logg.cpp:604 msgid "Status: " msgstr "״̬£º" -#: ../src/generic/fontdlgg.cpp:212 +#: ../contrib/src/xrc/xmlres.cpp:558 +#, c-format +msgid "Subclass '%s' not found for resource '%s', not subclassing!" +msgstr "" + +#: ../src/generic/fontdlgg.cpp:224 msgid "Swiss" msgstr "ÈðÊ¿" -#: ../src/common/imagtiff.cpp:196 ../src/common/imagtiff.cpp:207 -#: ../src/common/imagtiff.cpp:318 +#: ../src/common/imagtiff.cpp:204 ../src/common/imagtiff.cpp:215 +#: ../src/common/imagtiff.cpp:326 msgid "TIFF: Couldn't allocate memory." msgstr "TIFF: ²»ÄÜ·ÖÅäÄÚ´æ." -#: ../src/common/imagtiff.cpp:167 +#: ../src/common/imagtiff.cpp:175 msgid "TIFF: Error loading image." msgstr "TIFF: ×°ÔØͼÏñ´íÎó." -#: ../src/common/imagtiff.cpp:218 +#: ../src/common/imagtiff.cpp:226 msgid "TIFF: Error reading image." msgstr "TIFF: ¶ÁͼÏñ´íÎó." -#: ../src/common/imagtiff.cpp:295 +#: ../src/common/imagtiff.cpp:303 msgid "TIFF: Error saving image." msgstr "TIFF: ±£´æͼÏñ´íÎó." -#: ../src/common/imagtiff.cpp:342 +#: ../src/common/imagtiff.cpp:350 msgid "TIFF: Error writing image." msgstr "TIFF:дͼÏñ´íÎó." @@ -2591,31 +2655,23 @@ msgstr "TIFF:дͼ msgid "Tabloid, 11 x 17 in" msgstr "Tabloid, 11 x 17 Ó¢´ç" -#: ../src/generic/fontdlgg.cpp:213 +#: ../src/generic/fontdlgg.cpp:225 msgid "Teletype" msgstr "µç´«´ò×Ö»ú" -#: ../src/common/docview.cpp:1491 +#: ../src/common/docview.cpp:1539 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" @@ -2631,11 +2687,17 @@ msgstr "" 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:1802 #, fuzzy, c-format msgid "" "The file '%s' doesn't exist and couldn't be opened.\n" @@ -2644,12 +2706,12 @@ msgstr "" "Îļþ '%s' ²»´æÔÚ,²»Äܱ»´ò¿ª.\n" "ÒÑ´ÓMRUÎļþÁбíÖÐÒÆÈ¥." -#: ../src/common/filename.cpp:780 +#: ../src/common/filename.cpp:896 #, c-format msgid "The path '%s' contains too many \"..\"!" msgstr "" -#: ../src/common/cmdline.cpp:798 +#: ../src/common/cmdline.cpp:845 #, c-format msgid "The required parameter '%s' was not specified." msgstr "±ØÐëµÄ²ÎÊý '%s' ûÓÐÖ¸¶¨." @@ -2658,76 +2720,81 @@ msgstr " msgid "The text couldn't be saved." msgstr "Îı¾²»Äܱ»±£´æ¡£" -#: ../src/common/cmdline.cpp:777 +#: ../src/common/cmdline.cpp:824 #, c-format msgid "The value for the option '%s' must be specified." msgstr "Ñ¡Ïî '%s'µÄÖµ±ØÐë±»Ö¸¶¨." -#: ../src/msw/dialup.cpp:422 +#: ../src/msw/dialup.cpp:406 #, 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:545 +msgid "" +"There was a problem during page setup: you may need to set a default printer." +msgstr "" + +#: ../src/msw/thread.cpp:1214 msgid "" "Thread module initialization failed: can not store value in thread local " "storage" msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖдæ·ÅÖµ" -#: ../src/unix/threadpsx.cpp:1469 +#: ../src/unix/threadpsx.cpp:1568 msgid "Thread module initialization failed: failed to create thread key" msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ´´½¨Ï̼߳üʧ°Ü" -#: ../src/msw/thread.cpp:1100 +#: ../src/msw/thread.cpp:1202 msgid "" "Thread module initialization failed: impossible to allocate index in thread " "local storage" msgstr "Ïß³ÌÄ£¿é³õʼ»¯Ê§°Ü: ²»ÄÜÔÚÏ̱߳¾µØ´æ´¢ÇøÖзÖÅäË÷Òý" -#: ../src/unix/threadpsx.cpp:984 +#: ../src/unix/threadpsx.cpp:1076 msgid "Thread priority setting is ignored." msgstr "Ïß³ÌÓÅÏȼ¶ÉèÖñ»ºöÂÔ." -#: ../src/msw/mdi.cpp:178 +#: ../src/msw/mdi.cpp:189 msgid "Tile &Horizontally" msgstr "" -#: ../src/msw/mdi.cpp:179 +#: ../src/msw/mdi.cpp:190 msgid "Tile &Vertically" msgstr "" -#: ../src/generic/filedlgg.cpp:647 +#: ../src/generic/filedlgg.cpp:701 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:188 msgid "To:" msgstr "µ½:" -#: ../src/generic/prntdlgg.cpp:648 +#: ../src/generic/prntdlgg.cpp:633 msgid "Top margin (mm):" msgstr "ÉÏÒ³±ß¾à (ºÁÃ×):" -#: ../src/common/fs_mem.cpp:203 +#: ../src/common/fs_mem.cpp:202 #, c-format msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!" msgstr "ÊÔͼ´ÓÄÚ´æVFSÖÐÒÆÈ¥Îļþ'%s', µ«Ëü²¢Ã»Óб»×°ÈëÄÚ´æ!" -#: ../src/common/sckaddr.cpp:108 +#: ../src/common/sckaddr.cpp:126 msgid "Trying to solve a NULL hostname: giving up" msgstr "ÊÔͼ½â¾ö NULL Ö÷»úÃû: ·ÅÆú" -#: ../src/common/fontmap.cpp:119 +#: ../src/common/fontmap.cpp:120 msgid "Turkish (ISO-8859-9)" msgstr "ÍÁ¶úÆäÓï (ISO-8859-9)" @@ -2735,12 +2802,12 @@ msgstr " msgid "US Std Fanfold, 14 7/8 x 11 in" msgstr "US ±ê×¼¸´Ð´²¾, 14 7/8 x 11 Ó¢´ç" -#: ../src/html/htmlwin.cpp:271 +#: ../src/html/htmlwin.cpp:270 #, c-format msgid "Unable to open requested HTML document: %s" msgstr "²»ÄÜ´ò¿ªHTMLÎĵµ: %s" -#: ../src/generic/fontdlgg.cpp:244 +#: ../src/generic/fontdlgg.cpp:249 msgid "Underline" msgstr "Ï»®Ïß" @@ -2748,25 +2815,25 @@ msgstr " #: ../src/common/resourc2.cpp:335 ../src/common/resourc2.cpp:349 #: ../src/common/resourc2.cpp:1370 ../src/common/resourc2.cpp:1384 #: ../src/common/resourc2.cpp:1400 ../src/common/resourc2.cpp:1414 -#: ../src/common/resource.cpp:1817 ../src/common/resource.cpp:1831 -#: ../src/common/resource.cpp:1848 ../src/common/resource.cpp:1862 -#: ../src/common/resource.cpp:1947 ../src/common/resource.cpp:1961 -#: ../src/common/resource.cpp:1977 ../src/common/resource.cpp:1991 -#: ../src/common/resource.cpp:3027 ../src/common/resource.cpp:3041 -#: ../src/common/resource.cpp:3058 ../src/common/resource.cpp:3072 +#: ../src/common/resource.cpp:1824 ../src/common/resource.cpp:1838 +#: ../src/common/resource.cpp:1855 ../src/common/resource.cpp:1869 +#: ../src/common/resource.cpp:1954 ../src/common/resource.cpp:1968 +#: ../src/common/resource.cpp:1984 ../src/common/resource.cpp:1998 +#: ../src/common/resource.cpp:3038 ../src/common/resource.cpp:3052 +#: ../src/common/resource.cpp:3069 ../src/common/resource.cpp:3083 msgid "Unexpected end of file whilst parsing resource." msgstr "ÔÚ½âÎö×ÊԴʱÒâÍâµ½´ïÎļþ½áβ." -#: ../src/common/cmdline.cpp:749 +#: ../src/common/cmdline.cpp:788 #, 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 "" @@ -2775,32 +2842,27 @@ 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:2149 #, c-format msgid "Unknown field in file %s, line %d: '%s'." msgstr "ÔÚÎļþ %s, ÐÐ %dÊÇδ֪×Ö¶Î: '%s'." -#: ../src/common/cmdline.cpp:533 +#: ../src/common/cmdline.cpp:564 #, c-format msgid "Unknown long option '%s'" msgstr "δ֪longÑ¡Ïî '%s'" -#: ../src/common/cmdline.cpp:555 +#: ../src/common/cmdline.cpp:573 ../src/common/cmdline.cpp:594 #, c-format msgid "Unknown option '%s'" msgstr "δ֪ѡÏî '%s'" -#: ../contrib/src/xrc/xmlres.cpp:488 +#: ../contrib/src/xrc/xmlres.cpp:628 msgid "Unknown style flag " msgstr "" @@ -2809,22 +2871,22 @@ msgstr "" msgid "Unmatched '{' in an entry for mime type %s." msgstr "ÀàÐÍ %sÖÐÓв»ÅäÌ×µÄ'{'." -#: ../src/common/cmdproc.cpp:226 ../src/common/cmdproc.cpp:241 -#: ../src/common/cmdproc.cpp:268 +#: ../src/common/cmdproc.cpp:238 ../src/common/cmdproc.cpp:254 +#: ../src/common/cmdproc.cpp:281 msgid "Unnamed command" msgstr "δÃüÃûµÄÃüÁî" -#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2336 +#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2343 #, c-format msgid "Unrecognized style %s whilst parsing resource." msgstr "½âÎö×ÊԴʱÓöµ½ÎÞ·¨Ê¶±ðµÄ·ç¸ñ %s." -#: ../src/mac/clipbrd.cpp:53 ../src/msw/clipbrd.cpp:273 -#: ../src/msw/clipbrd.cpp:374 +#: ../src/mac/clipbrd.cpp: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:362 #, c-format msgid "Unsupported theme '%s'." msgstr "" @@ -2833,48 +2895,36 @@ msgstr "" msgid "Up" msgstr "" -#: ../src/common/cmdline.cpp:834 +#: ../src/common/cmdline.cpp:901 #, 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:1090 msgid "View files as a detailed view" msgstr "°´ÏêϸÊÓͼ¹Û¿´Îļþ" -#: ../src/generic/filedlgg.cpp:980 +#: ../src/generic/filedlgg.cpp:1083 msgid "View files as a list view" msgstr "°´ÁбíÊÓͼ¹Û¿´Îļþ" -#: ../src/common/docview.cpp:1557 +#: ../src/common/docview.cpp:1615 msgid "Views" msgstr "ÊÓͼ" -#: ../src/unix/utilsunx.cpp:767 +#: ../src/unix/utilsunx.cpp:752 msgid "Waiting for subprocess termination failed" msgstr "µÈ´ý×Ó¹ý³ÌÖÕֹʧ°Ü" -#: ../src/common/docview.cpp:436 ../src/common/resource.cpp:124 +#: ../src/common/docview.cpp:437 ../src/common/resource.cpp:124 msgid "Warning" msgstr "¾¯¸æ" -#: ../src/common/log.cpp:373 +#: ../src/common/log.cpp:464 msgid "Warning: " msgstr "¾¯¸æ:" @@ -2882,12 +2932,12 @@ 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)" @@ -2897,85 +2947,81 @@ 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:979 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:1011 msgid "Windows 3.1" msgstr "Windows 3.1" -#: ../src/msw/utils.cpp:866 +#: ../src/msw/utils.cpp:983 #, 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)" @@ -2984,61 +3030,45 @@ msgstr "Windows/DOS OEM (CP 437)" msgid "Write error on file '%s'" msgstr "дÎļþ '%s'´íÎó" -#: ../src/generic/dcpsg.cpp:2319 -msgid "X Scaling" -msgstr "XËõ·Å" - -#: ../src/generic/dcpsg.cpp:2328 -msgid "X Translation" -msgstr "XƽÒÆ" - -#: ../contrib/src/xrc/xmlexpat.cpp:185 +#: ../contrib/src/xrc/xml.cpp:530 #, c-format msgid "XML parsing error: '%s' at line %d" msgstr "" -#: ../src/common/xpmdecod.cpp:757 +#: ../src/common/xpmdecod.cpp:759 msgid "XPM: Malformed pixel data!" msgstr "" -#: ../src/common/xpmdecod.cpp:710 ../src/common/xpmdecod.cpp:719 +#: ../src/common/xpmdecod.cpp:709 ../src/common/xpmdecod.cpp:718 #, c-format msgid "XPM: malformed colour definition '%s'!" msgstr "" -#: ../contrib/src/xrc/xmlres.cpp:371 +#: ../contrib/src/xrc/xmlres.cpp:436 #, 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:787 ../contrib/src/xrc/xmlres.cpp:798 #, 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:747 #, c-format msgid "XRC resource: Incorrect colour specification '%s' for property '%s'." msgstr "" -#: ../src/generic/dcpsg.cpp:2323 -msgid "Y Scaling" -msgstr "YËõ·Å" - -#: ../src/generic/dcpsg.cpp:2332 -msgid "Y Translation" -msgstr "YƽÒÆ" - -#: ../src/common/dlgcmn.cpp:150 ../src/common/dlgcmn.cpp:157 -#: ../src/mac/msgdlg.cpp:83 ../src/motif/msgdlg.cpp:180 +#: ../src/common/dlgcmn.cpp:151 ../src/mac/msgdlg.cpp:77 +#: ../src/motif/msgdlg.cpp:182 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 "Äã²»ÄÜÏò¸ÃÏîÖмÓÈëеÄĿ¼." @@ -3046,7 +3076,7 @@ msgstr " msgid "ZIP handler currently supports only local files!" msgstr "" -#: ../src/common/docview.cpp:1893 +#: ../src/common/docview.cpp:1951 msgid "[EMPTY]" msgstr "[¿Õ]" @@ -3111,7 +3141,7 @@ msgstr "" msgid "a transaction failed." msgstr "ÊÂÎñʧ°Ü." -#: ../src/common/menucmn.cpp:80 +#: ../src/common/menucmn.cpp:99 msgid "alt" msgstr "alt" @@ -3145,7 +3175,7 @@ msgstr "" "Ò»µ©Ó¦ÓóÌÐò´ÓXTYP_XACT_COMPLETE»Øµ÷º¯Êý·µ»Ø,\n" "»Øµ÷º¯ÊýÊÂÎñ±êʶ·û¾Í²»ÔÙÓÐЧ." -#: ../src/common/fileconf.cpp:1555 +#: ../src/common/fileconf.cpp:1570 #, c-format msgid "attempt to change immutable key '%s' ignored." msgstr "ºöÂÔ¶ÔÖ»¶Á¼ü '%s'µÄÐÞ¸Ä." @@ -3154,153 +3184,158 @@ msgstr " 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:271 #, c-format msgid "can't close file descriptor %d" msgstr "²»ÄܹرÕÎļþÃèÊö×Ó %d" -#: ../src/common/file.cpp:543 +#: ../src/common/file.cpp:549 #, c-format msgid "can't commit changes to file '%s'" msgstr "²»ÄÜ°ÑÐÞ¸ÄÌá½»¸øÎļþ '%s'" -#: ../src/common/file.cpp:215 +#: ../src/common/file.cpp:211 #, c-format msgid "can't create file '%s'" msgstr "²»ÄÜ´´½¨Îļþ '%s'" -#: ../src/common/fileconf.cpp:1024 +#: ../src/common/fileconf.cpp:1039 #, c-format msgid "can't delete user configuration file '%s'" msgstr "²»ÄÜɾ³ýÓû§ÅäÖÃÎļþ '%s'" -#: ../src/common/file.cpp:455 +#: ../src/common/file.cpp:454 #, 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:420 #, c-format msgid "can't find length of file on file descriptor %d" msgstr "²»ÄÜ»ñµÃÎļþÃèÊö×Ó %dµÄÎļþµÄ³¤¶È" -#: ../src/msw/utils.cpp:366 +#: ../src/msw/utils.cpp:369 msgid "can't find user's HOME, using current directory." msgstr "ÕÒ²»µ½Óû§Ä¿Â¼HOME, ʹÓõ±Ç°Ä¿Â¼." -#: ../src/common/file.cpp:335 +#: ../src/common/file.cpp:334 #, c-format msgid "can't flush file descriptor %d" msgstr "²»ÄÜË¢ÐÂÎļþÃèÊö×Ó %d" -#: ../src/common/file.cpp:389 +#: ../src/common/file.cpp:388 #, 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:257 #, 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:910 msgid "can't open user configuration file." msgstr "²»ÄÜ´ò¿ªÓû§ÅäÖÃÎļþ." -#: ../src/common/file.cpp:298 +#: ../src/common/file.cpp:297 #, c-format msgid "can't read from file descriptor %d" msgstr "²»ÄÜ´ÓÎļþÃèÊö×Ó %dÖжÁ" -#: ../src/common/file.cpp:538 +#: ../src/common/file.cpp:544 #, c-format msgid "can't remove file '%s'" msgstr "²»ÄÜɾ³ýÎļþ '%s'" -#: ../src/common/file.cpp:554 +#: ../src/common/file.cpp:560 #, c-format msgid "can't remove temporary file '%s'" msgstr "²»ÄÜɾ³ýÁÙʱÎļþ '%s'" -#: ../src/common/file.cpp:375 +#: ../src/common/file.cpp:374 #, 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:319 #, c-format msgid "can't write to file descriptor %d" msgstr "²»ÄÜдµ½ÎļþÃèÊö×Ó %d" -#: ../src/common/fileconf.cpp:911 +#: ../src/common/fileconf.cpp:926 msgid "can't write user configuration file." msgstr "²»ÄÜдÓû§ÅäÖÃÎļþ." -#: ../src/common/intl.cpp:398 +#: ../src/common/intl.cpp:364 #, c-format msgid "catalog file for domain '%s' not found." msgstr "ÕÒ²»µ½Óò '%s'µÄĿ¼Îļþ." -#: ../contrib/src/xrc/xh_frame.cpp:72 -#, fuzzy -msgid "centered" -msgstr "ÆäËü" - -#: ../src/common/menucmn.cpp:78 +#: ../src/common/menucmn.cpp:97 msgid "ctrl" msgstr "ctrl" -#: ../src/common/cmdline.cpp:947 +#: ../src/common/cmdline.cpp:1034 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:1557 #, 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:841 msgid "establish" msgstr "½¨Á¢" @@ -3309,102 +3344,117 @@ 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:301 msgid "generate verbose log messages" msgstr "" -#: ../src/common/timercmn.cpp:273 +#: ../src/common/timercmn.cpp:282 msgid "gmtime() failed" msgstr "gmtime() ʧ°Ü" -#: ../src/msw/dialup.cpp:870 ../src/msw/dialup.cpp:875 +#: ../src/msw/dialup.cpp:841 msgid "initiate" msgstr "³õʼ»¯" -#: ../src/common/file.cpp:459 +#: ../src/common/file.cpp:458 msgid "invalid eof() return value." msgstr "ÎÞЧµÄeof()·µ»ØÖµ." -#: ../src/generic/logg.cpp:1036 +#: ../src/generic/logg.cpp:1125 msgid "invalid message box return value" msgstr "ÏûÏ¢¿ò·µ»ØÎÞЧµÄÖµ" -#: ../src/html/helpfrm.cpp:1017 +#: ../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:615 #, c-format msgid "locale '%s' can not be set." msgstr "²»ÄÜÉèÖÃÏÖ³¡locale '%s'." -#: ../src/common/intl.cpp:393 +#: ../src/common/intl.cpp:359 #, c-format msgid "looking for catalog '%s' in path '%s'." msgstr "²éÕÒĿ¼ '%s' ÔÚ·¾¶ '%s'ÏÂ." -#: ../src/html/helpfrm.cpp:1017 +#: ../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:278 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 "µÚ¾Å" @@ -3412,67 +3462,71 @@ msgstr " msgid "no DDE error." msgstr "ûÓÐDDE´íÎó" -#: ../src/html/helpdata.cpp:565 +#: ../src/html/helpdata.cpp:561 ../src/html/htmlhelp.cpp:201 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:1033 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:291 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:326 msgid "specify display mode to use (e.g. 640x480-16)" msgstr "" -#: ../src/common/appcmn.cpp:225 +#: ../src/common/appcmn.cpp:312 msgid "specify the theme to use" msgstr "" -#: ../src/common/cmdline.cpp:945 +#: ../src/common/cmdline.cpp:1032 msgid "str" msgstr "str" -#: ../src/common/datetime.cpp:3219 +#: ../src/common/datetime.cpp:3229 msgid "tenth" msgstr "µÚÊ®" @@ -3480,36 +3534,46 @@ 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:1684 #, 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 "δ֪" @@ -3518,68 +3582,251 @@ msgstr "δ֪" msgid "unknown error" msgstr "GIF: λÖôíÎó!!!" -#: ../src/msw/dialup.cpp:473 +#: ../src/msw/dialup.cpp:445 #, c-format msgid "unknown error (error code %08x)." msgstr "δ֪´íÎó(´íÎóºÅ %08x)." -#: ../src/common/textbuf.cpp:229 -#, fuzzy -msgid "unknown line terminator" -msgstr "δ֪ËÑË÷Ô­µã" - -#: ../src/common/file.cpp:358 +#: ../src/common/file.cpp:357 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:406 msgid "unnamed" msgstr "unnamed" -#: ../src/common/docview.cpp:1187 +#: ../src/common/docview.cpp:1222 #, c-format msgid "unnamed%d" msgstr "unnamed%d" -#: ../src/common/intl.cpp:403 +#: ../src/common/intl.cpp:369 #, c-format msgid "using catalog '%s' from '%s'." msgstr "ʹÓÃĿ¼ '%s' ´Ó '%s'." -#: ../src/html/helpfrm.cpp:1017 +#: ../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:336 +#, c-format +msgid "wxDllLoader failed to GetSymbol '%s'" +msgstr "" + +#: ../src/common/dynload.cpp:278 +#, c-format +msgid "wxDynamicLibrary failed to GetSymbol '%s'" +msgstr "" + +#: ../src/common/timercmn.cpp:327 msgid "wxGetTimeOfDay failed." msgstr "wxGetTimeOfDay ʧ°Ü." -#: ../src/common/socket.cpp:347 ../src/common/socket.cpp:401 +#: ../src/html/search.cpp:49 +msgid "wxSearchEngine::LookFor must be called before scanning!" +msgstr "" + +#: ../src/common/socket.cpp:394 ../src/common/socket.cpp:448 msgid "wxSocket: invalid signature in ReadMsg." msgstr "wxSocket: ReadMsgÖÐÎÞЧµÄÇ©Ãû." -#: ../src/common/socket.cpp:921 +#: ../src/common/socket.cpp:975 msgid "wxSocket: unknown event!." msgstr "wxSocket: δ֪ʼþ!." -#: ../src/motif/app.cpp:586 +#: ../src/motif/app.cpp:590 #, c-format msgid "wxWindows could not open display for '%s': exiting." msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ." -#: ../src/common/datetime.cpp:3055 +#: ../src/x11/app.cpp:265 +#, fuzzy +msgid "wxWindows could not open display. Exiting." +msgstr "wxWindows ²»ÄÜΪ '%s' ´ò¿ªÏÔʾÉ豸: ÒѾ­´æÔÚ." + +#: ../src/common/datetime.cpp:3065 msgid "yesterday" msgstr "×òÌì" +#, fuzzy +#~ msgid "All files (*.*)|*.*" +#~ msgstr "ËùÓÐÎļþ (*)|*" + +#~ msgid "Can not create mutex" +#~ msgstr "²»ÄÜ´´½¨»¥³â¶ÔÏó" + +#~ msgid "Can't create the inter-process read pipe" +#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ì¶Á¹ÜµÀ" + +#~ msgid "Can't create the inter-process write pipe" +#~ msgstr "²»ÄÜ´´½¨ÄÚ²¿½ø³Ìд¹ÜµÀ" + +#~ msgid "Couldn't acquire a mutex lock" +#~ msgstr "²»Äܵõ½»¥³âÌåËø" + +#~ msgid "Couldn't release a mutex" +#~ msgstr "²»ÄÜÊÍ·Å»¥³âÌå" + +#~ msgid "Font" +#~ msgstr "×ÖÌå" + +#~ msgid "PostScript" +#~ msgstr "PostScript" + +#~ msgid "PostScript:" +#~ msgstr "PostScript:" + +#~ msgid "Preview Only" +#~ msgstr "½öÔ¤ÀÀ" + +#~ msgid "Printer Command: " +#~ msgstr "´òÓ¡»úÃüÁî: " + +#~ msgid "Printer Options: " +#~ msgstr "´òÓ¡»úÑ¡Ïî:" + +#~ msgid "Printer Settings" +#~ msgstr "´òÓ¡»úÉèÖÃ" + +#~ msgid "Send to Printer" +#~ msgstr "·¢µ½´òÓ¡»ú" + +#, fuzzy +#~ msgid "SetPixelFormat failed." +#~ msgstr "¹ÜµÀ´´½¨Ê§°Ü" + +#~ msgid "X Scaling" +#~ msgstr "XËõ·Å" + +#~ msgid "X Translation" +#~ msgstr "XƽÒÆ" + +#~ msgid "Y Scaling" +#~ msgstr "YËõ·Å" + +#~ msgid "Y Translation" +#~ msgstr "YƽÒÆ" + +#, fuzzy +#~ msgid "unknown line terminator" +#~ 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)" @@ -3619,9 +3866,5 @@ msgstr " #~ msgid "No XPM facility available!" #~ msgstr "ûÓпÉÓõÄXPMÉ豸!" -#, fuzzy -#~ msgid "..." -#~ msgstr ".." - #~ msgid "Cyrillic (Latin 5)" #~ msgstr "˹À­·òÓï (Latin 5)"