Fix previous change in case somebody is still using

[wxWidgets.git] / locale / wxstd.po

diff --git a/locale/wxstd.po b/locale/wxstd.po
index 48172b0248af109862cb7d5b5100e6c6cd6abe3a..a968bed321b99fdf8edbc58037a329eb23204ff4 100644 (file)
--- a/locale/wxstd.po
+++ b/locale/wxstd.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2002-06-03 21:07+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -14,595 +14,855 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/common/log.cpp:304
+#: ../src/common/debugrpt.cpp:547
+#, c-format
+msgid "\t%s: %s\n"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:550
+msgid ""
+"\n"
+"Please send this report to the program maintainer, thank you!\n"
+msgstr ""
+
+#: ../src/palmos/utils.cpp:205
+msgid " "
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:293
+msgid "              Thank you and we're sorry for the inconvenience!\n"
+msgstr ""
+
+#: ../src/common/log.cpp:321
 #, c-format
 msgid " (error %ld: %s)"
 msgstr ""
 
-#: ../src/common/docview.cpp:1227
+#: ../src/common/docview.cpp:1432
 msgid " - "
 msgstr ""
 
-#: ../src/html/htmprint.cpp:505
+#: ../src/html/htmprint.cpp:570
 msgid " Preview"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:465
-msgid " bytes "
-msgstr ""
-
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:131
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:132
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:133
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:134
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:130
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr ""
 
-#: ../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
+#: ../contrib/src/deprecated/resource.cpp:1808
+#: ../contrib/src/deprecated/resource.cpp:1938
+#: ../contrib/src/deprecated/resource.cpp:3026
 #, c-format
 msgid "#define %s must be an integer."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:772 ../src/html/helpfrm.cpp:773
-#: ../src/html/helpfrm.cpp:1376 ../src/html/helpfrm.cpp:1406
+#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
+#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
 #, c-format
 msgid "%i of %i"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:776
+#: ../src/generic/filedlgg.cpp:295
+#, c-format
+msgid "%ld bytes"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:851
 #, c-format
 msgid "%s (or %s)"
 msgstr ""
 
-#: ../src/generic/logg.cpp:239
+#: ../src/generic/logg.cpp:266
 #, c-format
 msgid "%s Error"
 msgstr ""
 
-#: ../src/generic/logg.cpp:247
+#: ../src/generic/logg.cpp:274
 #, c-format
 msgid "%s Information"
 msgstr ""
 
-#: ../src/generic/logg.cpp:243
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Warning"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2359
+#: ../src/common/fldlgcmn.cpp:81
+#, c-format
+msgid "%s files (%s)|%s"
+msgstr ""
+
+#: ../src/common/msgout.cpp:189
+#, c-format
+msgid "%s message"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2390
 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr ""
 
-#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2509
+#: ../contrib/src/deprecated/resource.cpp:2544
 #, c-format
 msgid "%s not an icon resource specification."
 msgstr ""
 
-#: ../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
+#: ../contrib/src/deprecated/resource.cpp:1901
+#: ../contrib/src/deprecated/resource.cpp:2030
+#: ../contrib/src/deprecated/resource.cpp:3123
 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr ""
 
-#: ../src/msw/mdi.cpp:189
+#: ../src/html/helpfrm.cpp:357 ../src/html/helpfrm.cpp:359
+msgid "&About..."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:153
+msgid "&Actual Size"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:108
+msgid "&Apply"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:190
 msgid "&Arrange Icons"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:170 ../src/generic/wizard.cpp:260
+#: ../src/common/stockitem.cpp:118
+msgid "&Back"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:109
+msgid "&Bold"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:110 ../src/generic/fontdlgg.cpp:363
+#: ../src/generic/fontdlgg.cpp:382 ../src/generic/wizard.cpp:418
 msgid "&Cancel"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:185
+#: ../src/msw/mdi.cpp:186
 msgid "&Cascade"
 msgstr ""
 
-#: ../src/generic/logg.cpp:484 ../src/generic/tipdlg.cpp:171
+#: ../src/common/stockitem.cpp:111
+msgid "&Clear"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:828 ../src/common/stockitem.cpp:112
+#: ../src/generic/logg.cpp:512 ../src/html/helpfrm.cpp:354
 msgid "&Close"
 msgstr ""
 
-#: ../src/generic/logg.cpp:688
+#: ../src/common/stockitem.cpp:113 ../src/msw/textctrl.cpp:2065
+msgid "&Copy"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:301
+msgid "&Debug report preview:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:115 ../src/msw/textctrl.cpp:2067
+msgid "&Delete"
+msgstr ""
+
+#: ../src/generic/logg.cpp:718
 msgid "&Details"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:168
+#: ../src/common/stockitem.cpp:119
+msgid "&Down"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:361
+msgid "&File"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:116
 msgid "&Find"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:402
+#: ../src/generic/wizard.cpp:606
 msgid "&Finish"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:249
+#: ../src/generic/fontdlgg.cpp:273
+msgid "&Font family:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:120
+msgid "&Forward"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:863
+msgid "&Goto..."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:122 ../src/generic/wizard.cpp:414
+#: ../src/generic/wizard.cpp:421 ../src/html/helpfrm.cpp:362
 msgid "&Help"
 msgstr ""
 
-#: ../src/generic/logg.cpp:485
+#: ../src/common/stockitem.cpp:123
+msgid "&Home"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:125
+msgid "&Index"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:126
+msgid "&Italic"
+msgstr ""
+
+#: ../src/generic/logg.cpp:513
 msgid "&Log"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4539
+#: ../src/univ/themes/win32.cpp:4817
 msgid "&Move"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:190
+#: ../src/common/stockitem.cpp:131
+msgid "&New"
+msgstr ""
+
+#: ../src/generic/mdig.cpp:117 ../src/msw/mdi.cpp:191
 msgid "&Next"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:257 ../src/generic/wizard.cpp:404
+#: ../src/generic/wizard.cpp:417 ../src/generic/wizard.cpp:608
 msgid "&Next >"
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:176
+#: ../src/generic/tipdlg.cpp:243
 msgid "&Next Tip"
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:266
+#: ../src/common/stockitem.cpp:132
+msgid "&No"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:323
+msgid "&Notes:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:133 ../src/generic/fontdlgg.cpp:368
+#: ../src/generic/fontdlgg.cpp:375
+msgid "&OK"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:134
+msgid "&Open"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:352
+msgid "&Open..."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:135 ../src/msw/textctrl.cpp:2066
+msgid "&Paste"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:324
+msgid "&Point size:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:136
+msgid "&Preferences"
+msgstr ""
+
+#: ../src/generic/mdig.cpp:118 ../src/msw/mdi.cpp:192
+msgid "&Previous"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:137
+msgid "&Print"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:833
+msgid "&Print..."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:139
+msgid "&Properties"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:140
+msgid "&Quit"
+msgstr ""
+
+#: ../src/common/cmdproc.cpp:292 ../src/common/cmdproc.cpp:299
+#: ../src/common/stockitem.cpp:141 ../src/msw/textctrl.cpp:2062
 msgid "&Redo"
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:249 ../src/common/cmdproc.cpp:276
+#: ../src/common/cmdproc.cpp:288 ../src/common/cmdproc.cpp:308
 msgid "&Redo "
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:174
+#: ../src/generic/fdrepdlg.cpp:185
 msgid "&Replace"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4538
+#: ../src/univ/themes/win32.cpp:4816
 msgid "&Restore"
 msgstr ""
 
-#: ../src/generic/logg.cpp:480 ../src/generic/logg.cpp:785
+#: ../src/common/stockitem.cpp:145
+msgid "&Save"
+msgstr ""
+
+#: ../src/generic/logg.cpp:508
 msgid "&Save..."
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:173
+#: ../src/generic/tipdlg.cpp:238
 msgid "&Show tips at startup"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4541
+#: ../src/univ/themes/win32.cpp:4819
 msgid "&Size"
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:261
+#: ../src/common/stockitem.cpp:147
+msgid "&Stop"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:284
+msgid "&Style:"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:149 ../src/generic/fontdlgg.cpp:337
+msgid "&Underline"
+msgstr ""
+
+#: ../src/common/cmdproc.cpp:270 ../src/common/stockitem.cpp:150
+#: ../src/msw/textctrl.cpp:2061
 msgid "&Undo"
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:236
+#: ../src/common/cmdproc.cpp:264
 msgid "&Undo "
 msgstr ""
 
-#: ../src/msw/mdi.cpp:1317 ../src/msw/mdi.cpp:1324 ../src/msw/mdi.cpp:1349
+#: ../src/common/stockitem.cpp:151
+msgid "&Unindent"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:121
+msgid "&Up"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:295
+msgid "&Weight:"
+msgstr ""
+
+#: ../src/generic/mdig.cpp:297 ../src/generic/mdig.cpp:313
+#: ../src/generic/mdig.cpp:317 ../src/msw/mdi.cpp:1387 ../src/msw/mdi.cpp:1394
+#: ../src/msw/mdi.cpp:1424
 msgid "&Window"
 msgstr ""
 
-#: ../src/common/config.cpp:394 ../src/msw/regconf.cpp:264
+#: ../src/common/stockitem.cpp:152
+msgid "&Yes"
+msgstr ""
+
+#: ../src/common/config.cpp:432 ../src/msw/regconf.cpp:258
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr ""
 
-#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
-#: ../src/common/valtext.cpp:183
+#: ../src/common/valtext.cpp:132 ../src/common/valtext.cpp:162
+#: ../src/common/valtext.cpp:168
 #, c-format
 msgid "'%s' is invalid"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:698
+#: ../src/common/cmdline.cpp:769
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr ""
 
-#: ../src/common/intl.cpp:401
+#: ../src/common/intl.cpp:1146
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr ""
 
-#: ../src/common/textbuf.cpp:245
+#: ../src/common/textbuf.cpp:246
 #, c-format
 msgid "'%s' is probably a binary buffer."
 msgstr ""
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:157
 #, c-format
 msgid "'%s' should be numeric."
 msgstr ""
 
-#: ../src/common/valtext.cpp:154
+#: ../src/common/valtext.cpp:139
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr ""
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:145
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr ""
 
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:151
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:709
+#: ../src/html/helpfrm.cpp:976
 msgid "(Help)"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:310 ../src/html/helpfrm.cpp:840
-#: ../src/html/helpfrm.cpp:1433
+#: ../src/html/helpfrm.cpp:431 ../src/html/helpfrm.cpp:1114
+#: ../src/html/helpfrm.cpp:1764
 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/debugrpt.cpp:537
+msgid "*** A debug report has been generated\n"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:540
+msgid "*** And includes the following files:\n"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:538
+#, c-format
+msgid "*** It can be found in \"%s\"\n"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:1840
+#: ../contrib/src/deprecated/resource.cpp:1970
+#: ../contrib/src/deprecated/resource.cpp:3062
 msgid ""
 ", expected static, #include or #define\n"
-"whilst parsing resource."
+"while parsing resource."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:698 ../src/generic/filedlgg.cpp:918
+#: ../src/generic/dirctrlg.cpp:675 ../src/generic/filedlgg.cpp:747
 msgid "."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:919
+#: ../src/generic/dirctrlg.cpp:676 ../src/generic/filedlgg.cpp:748
 msgid ".."
 msgstr ""
 
-#: ../src/common/paper.cpp:120
+#: ../src/common/paper.cpp:127
 msgid "10 x 14 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:121
+#: ../src/common/paper.cpp:128
 msgid "11 x 17 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:139
+#: ../src/common/paper.cpp:146
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr ""
 
-#: ../src/html/htmprint.cpp:282
+#: ../src/html/htmprint.cpp:309
 msgid ": file does not exist!"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:626
+#: ../src/common/fontmap.cpp:200
 msgid ": unknown charset"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:857
+#: ../src/common/fontmap.cpp:414
 msgid ": unknown encoding"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:254
+#: ../src/generic/wizard.cpp:423
 msgid "< &Back"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:493
+#: ../src/common/prntbase.cpp:845
+msgid "<<"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:266 ../src/generic/filedlgg.cpp:289
 msgid "<DIR>"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:460
-msgid "<DIR> "
+#: ../src/generic/filedlgg.cpp:270 ../src/generic/filedlgg.cpp:293
+msgid "<DRIVE>"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:494
+#: ../src/generic/filedlgg.cpp:268 ../src/generic/filedlgg.cpp:291
 msgid "<LINK>"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:461
-msgid "<LINK> "
+#: ../src/html/helpfrm.cpp:1276
+msgid "<b><i>Bold italic face.</i></b><br>"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:992
-msgid ""
-"<html><body>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
-"<b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size "
-"-2</font><br><font size=-1>font size -1</font><br><font size=+0>font size "
-"+0</font><br><font size=+1>font size +1</font><br><font size=+2>font size "
-"+2</font><br><font size=+3>font size +3</font><br><font size=+4>font size "
-"+4</font><br><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "
-"<b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size -2</"
-"font><br><font size=-1>font size -1</font><br><font size=+0>font size +0</"
-"font><br><font size=+1>font size +1</font><br><font size=+2>font size +2</"
-"font><br><font size=+3>font size +3</font><br><font size=+4>font size +4</"
-"font></tt></body></html>"
+#: ../src/html/helpfrm.cpp:1280
+msgid "<b><i>bold italic <u>underlined</u></i></b><br>"
 msgstr ""
 
-#: ../src/common/paper.cpp:113
+#: ../src/html/helpfrm.cpp:1275
+msgid "<b>Bold face.</b> "
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:1274
+msgid "<i>Italic face.</i> "
+msgstr ""
+
+#: ../src/common/prntbase.cpp:851
+msgid ">>"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:857
+msgid ">>|"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:285
+msgid "A debug report has been generated in the directory\n"
+msgstr ""
+
+#: ../src/common/xtixml.cpp:409
+msgid "A non empty collection must consist of 'element' nodes"
+msgstr ""
+
+#: ../src/common/paper.cpp:120
 msgid "A3 sheet, 297 x 420 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2545
+#: ../src/common/paper.cpp:111
 msgid "A4 sheet, 210 x 297 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:114
+#: ../src/common/paper.cpp:121
 msgid "A4 small sheet, 210 x 297 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:115
+#: ../src/common/paper.cpp:122
 msgid "A5 sheet, 148 x 210 mm"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:83
+#: ../src/generic/fontdlgg.cpp:87
 msgid "ABCDEFGabcdefg12345"
 msgstr ""
 
-#: ../src/common/ftp.cpp:369
+#: ../src/common/ftp.cpp:385
 msgid "ASCII"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:323
+#: ../src/common/stockitem.cpp:107
+msgid "Add"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:444
 msgid "Add current page to bookmarks"
 msgstr ""
 
-#: ../src/generic/colrdlgg.cpp:273
+#: ../src/generic/colrdlgg.cpp:297
 msgid "Add to custom colours"
 msgstr ""
 
-#: ../src/html/helpctrl.cpp:90
+#: ../include/wx/xti.h:902
+msgid "AddToPropertyCollection called on a generic accessor"
+msgstr ""
+
+#: ../include/wx/xti.h:849
+msgid "AddToPropertyCollection called w/o valid adder"
+msgstr ""
+
+#: ../src/html/helpctrl.cpp:106
 #, c-format
 msgid "Adding book %s"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:162
+#: ../src/common/stockitem.cpp:129
+msgid "Align Left"
+msgstr ""
+
+#: ../src/common/stockitem.cpp:130
+msgid "Align Right"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:209
 msgid "All"
 msgstr ""
 
-#: ../include/wx/defs.h:1732 ../src/generic/filedlgg.cpp:1041
+#: ../src/common/fldlgcmn.cpp:64
+#, c-format
+msgid "All files (%s)|%s"
+msgstr ""
+
+#: ../include/wx/defs.h:2229
 msgid "All files (*)|*"
 msgstr ""
 
-#: ../include/wx/defs.h:1729
+#: ../src/html/helpfrm.cpp:1578
+msgid "All files (*.*)|*"
+msgstr ""
+
+#: ../include/wx/defs.h:2226
 msgid "All files (*.*)|*.*"
 msgstr ""
 
+#: ../src/common/xtistrm.cpp:385
+msgid "Already Registered Object passed to SetObjectClassInfo"
+msgstr ""
+
 #: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr ""
 
-#: ../src/generic/logg.cpp:1051
+#: ../src/generic/logg.cpp:1164
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:117
+#: ../src/common/fmapbase.cpp:108
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
-#: ../src/common/paper.cpp:134
+#: ../src/html/chm.cpp:564
+msgid "Archive doesnt contain #SYSTEM file"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:447
+msgid "Attributes"
+msgstr ""
+
+#: ../src/common/paper.cpp:141
 msgid "B4 Envelope, 250 x 353 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:116
+#: ../src/common/paper.cpp:123
 msgid "B4 sheet, 250 x 354 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:135
+#: ../src/common/paper.cpp:142
 msgid "B5 Envelope, 176 x 250 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:117
+#: ../src/common/paper.cpp:124
 msgid "B5 sheet, 182 x 257 millimeter"
 msgstr ""
 
-#: ../src/common/paper.cpp:136
+#: ../src/common/paper.cpp:143
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:467 ../src/common/imagbmp.cpp:483
+#: ../src/common/imagbmp.cpp:477 ../src/common/imagbmp.cpp:493
 msgid "BMP: Couldn't allocate memory."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:86
+#: ../src/common/imagbmp.cpp:94
 msgid "BMP: Couldn't save invalid image."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:290
+#: ../src/common/imagbmp.cpp:298
 msgid "BMP: Couldn't write RGB color map."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:422
+#: ../src/common/imagbmp.cpp:431
 msgid "BMP: Couldn't write data."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:195
+#: ../src/common/imagbmp.cpp:203
 msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:216
+#: ../src/common/imagbmp.cpp:224
 msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:120
+#: ../src/common/imagbmp.cpp:128
 msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:170
-msgid "Backward"
-msgstr ""
-
-#: ../src/common/fontmap.cpp:124
+#: ../src/common/fmapbase.cpp:115
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fmapbase.cpp:106
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2489
+#: ../contrib/src/deprecated/resource.cpp:2524
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:234
+#: ../src/generic/fontdlgg.cpp:237
 msgid "Bold"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:659
+#: ../src/generic/prntdlgg.cpp:892
 msgid "Bottom margin (mm):"
 msgstr ""
 
-#: ../src/common/paper.cpp:105
+#: ../src/common/paper.cpp:112
 msgid "C sheet, 17 x 22 in"
 msgstr ""
 
-#: ../src/generic/logg.cpp:482
+#: ../src/generic/logg.cpp:510
 msgid "C&lear"
 msgstr ""
 
-#: ../src/common/paper.cpp:130
+#: ../src/generic/fontdlgg.cpp:308
+msgid "C&olour:"
+msgstr ""
+
+#: ../src/common/paper.cpp:137
 msgid "C3 Envelope, 324 x 458 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:131
+#: ../src/common/paper.cpp:138
 msgid "C4 Envelope, 229 x 324 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:129
+#: ../src/common/paper.cpp:136
 msgid "C5 Envelope, 162 x 229 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:132
+#: ../src/common/paper.cpp:139
 msgid "C6 Envelope, 114 x 162 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:133
+#: ../src/common/paper.cpp:140
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr ""
 
-#: ../src/msw/thread.cpp:145
-msgid "Can not create mutex"
+#: ../src/html/chm.cpp:797 ../src/html/chm.cpp:856
+msgid "CHM handler currently supports only local files!"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1334
+#: ../src/os2/thread.cpp:121
+msgid "Can not create mutex."
+msgstr ""
+
+#: ../src/common/filefn.cpp:1290
 #, c-format
 msgid "Can not enumerate files '%s'"
 msgstr ""
 
-#: ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:224
+#: ../src/msw/dir.cpp:205 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr ""
 
-#: ../src/mac/thread.cpp:455 ../src/msw/thread.cpp:761
+#: ../src/os2/thread.cpp:523
+#, c-format
+msgid "Can not resume thread %lu"
+msgstr ""
+
+#: ../src/mac/classic/thread.cpp:491 ../src/msw/thread.cpp:824
 #, c-format
 msgid "Can not resume thread %x"
 msgstr ""
 
-#: ../src/msw/thread.cpp:635
+#: ../src/msw/thread.cpp:498
 msgid "Can not start thread: error writing TLS."
 msgstr ""
 
-#: ../src/mac/thread.cpp:431 ../src/msw/thread.cpp:746
+#: ../src/os2/thread.cpp:510
+#, c-format
+msgid "Can not suspend thread %lu"
+msgstr ""
+
+#: ../src/mac/classic/thread.cpp:464 ../src/msw/thread.cpp:809
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr ""
 
-#: ../src/msw/thread.cpp:1085
+#: ../src/msw/thread.cpp:722
 msgid "Can not wait for thread termination"
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:238
+#: ../src/common/cmdproc.cpp:266
 msgid "Can't &Undo "
 msgstr ""
 
-#: ../src/common/image.cpp:1289
+#: ../src/common/image.cpp:1763
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr ""
 
-#: ../src/msw/registry.cpp:421
+#: ../src/msw/registry.cpp:434
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:493
+#: ../src/msw/registry.cpp:510
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr ""
 
-#: ../src/msw/toplevel.cpp:305
-msgid "Can't create dialog using memory template"
-msgstr ""
-
-#: ../src/os2/toplevel.cpp:266
-#, c-format
-msgid "Can't create dialog using template '%ul'"
-msgstr ""
-
-#: ../src/msw/listctrl.cpp:318
-msgid "Can't create list control window, check that comctl32.dll is installed."
-msgstr ""
-
-#: ../src/msw/registry.cpp:402
+#: ../src/msw/registry.cpp:415
 #, c-format
 msgid "Can't create registry key '%s'"
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:485
-msgid "Can't create the inter-process read pipe"
-msgstr ""
-
-#: ../src/msw/utilsexc.cpp:498
-msgid "Can't create the inter-process write pipe"
-msgstr ""
-
-#: ../src/mac/thread.cpp:410 ../src/msw/thread.cpp:728
+#: ../src/mac/carbon/mpthread.cpp:911 ../src/mac/carbon/thread.cpp:1100
+#: ../src/mac/classic/thread.cpp:439 ../src/msw/thread.cpp:594
+#: ../src/os2/thread.cpp:491
 msgid "Can't create thread"
 msgstr ""
 
-#: ../src/msw/window.cpp:2966
+#: ../src/msw/window.cpp:3077
 #, c-format
 msgid "Can't create window of class %s"
 msgstr ""
 
-#: ../src/msw/registry.cpp:661
+#: ../src/msw/registry.cpp:686
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr ""
 
-#: ../src/msw/iniconf.cpp:445
+#: ../src/msw/iniconf.cpp:444 ../src/os2/iniconf.cpp:448
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:686
+#: ../src/msw/registry.cpp:713
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:697
+#: ../src/msw/registry.cpp:1061
 #, c-format
-msgid "Can't delete value of key '%s'"
+msgid "Can't enumerate subkeys of key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:1025
+#: ../src/msw/registry.cpp:1016
 #, c-format
-msgid "Can't enumerate subkeys of key '%s'"
+msgid "Can't enumerate values of key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:980
+#: ../src/msw/registry.cpp:1267
 #, c-format
-msgid "Can't enumerate values of key '%s'"
+msgid "Can't export value of unsupported type %d."
 msgstr ""
 
-#: ../src/common/ffile.cpp:226
+#: ../src/common/ffile.cpp:238
 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr ""
@@ -612,310 +872,390 @@ msgstr ""
 msgid "Can't get info about registry key '%s'"
 msgstr ""
 
-#: ../src/common/image.cpp:913 ../src/common/image.cpp:933
+#: ../src/common/zstream.cpp:237
+msgid "Can't initialize zlib deflate stream."
+msgstr ""
+
+#: ../src/common/zstream.cpp:99
+msgid "Can't initialize zlib inflate stream."
+msgstr ""
+
+#: ../src/common/image.cpp:1344 ../src/common/image.cpp:1364
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr ""
 
-#: ../src/msw/dib.cpp:434
+#: ../src/msw/registry.cpp:381
 #, c-format
-msgid "Can't open file '%s'"
+msgid "Can't open registry key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:377
+#: ../src/common/zstream.cpp:166
 #, c-format
-msgid "Can't open registry key '%s'"
+msgid "Can't read from inflate stream: %s"
 msgstr ""
 
-#: ../src/msw/registry.cpp:904
+#: ../src/common/zstream.cpp:159
+msgid "Can't read inflate stream: unexpected EOF in underlying stream."
+msgstr ""
+
+#: ../src/msw/registry.cpp:950
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:777 ../src/msw/registry.cpp:816
+#: ../src/msw/registry.cpp:786 ../src/msw/registry.cpp:816
+#: ../src/msw/registry.cpp:876
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr ""
 
-#: ../src/common/image.cpp:955
+#: ../src/common/image.cpp:1386
 #, c-format
 msgid "Can't save image to file '%s': unknown extension."
 msgstr ""
 
-#: ../src/generic/logg.cpp:544 ../src/generic/logg.cpp:952
+#: ../src/generic/logg.cpp:572 ../src/generic/logg.cpp:1021
 msgid "Can't save log contents to file."
 msgstr ""
 
-#: ../src/msw/thread.cpp:687
+#: ../src/msw/thread.cpp:550 ../src/os2/thread.cpp:473
 msgid "Can't set thread priority"
 msgstr ""
 
-#: ../src/msw/registry.cpp:802 ../src/msw/registry.cpp:928
+#: ../src/msw/registry.cpp:803 ../src/msw/registry.cpp:845
+#: ../src/msw/registry.cpp:965
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:183 ../src/generic/dcpsg.cpp:2269
-#: ../src/generic/dirdlgg.cpp:153 ../src/generic/filedlgg.cpp:1155
-#: ../src/generic/filedlgg.cpp:1174 ../src/generic/fontdlgg.cpp:257
-#: ../src/generic/prntdlgg.cpp:465 ../src/generic/progdlgg.cpp:211
-#: ../src/generic/proplist.cpp:511 ../src/gtk/filedlg.cpp:173
-#: ../src/gtk/fontdlg.cpp:141 ../src/html/helpfrm.cpp:974
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/common/zstream.cpp:316
+#, c-format
+msgid "Can't write to deflate stream: %s"
+msgstr ""
+
+#: ../contrib/src/deprecated/proplist.cpp:518 ../src/generic/choicdgg.cpp:291
+#: ../src/generic/dirdlgg.cpp:116 ../src/generic/numdlgg.cpp:136
+#: ../src/generic/textdlgg.cpp:120 ../src/gtk/fontdlg.cpp:155
+#: ../src/motif/msgdlg.cpp:187
 msgid "Cancel"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:866 ../contrib/src/xrc/xmlres.cpp:907
+#: ../src/xrc/xmlres.cpp:1127 ../src/xrc/xmlres.cpp:1175
 msgid "Cannot convert dialog units: dialog unknown."
 msgstr ""
 
-#: ../src/common/strconv.cpp:900
+#: ../src/common/strconv.cpp:2665
 #, c-format
-msgid "Cannot convert from encoding '%s'!"
+msgid "Cannot convert from the charset '%s'!"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:502
+#: ../src/msw/dialup.cpp:509
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:223
+#: ../src/xrc/xmlres.cpp:269
 #, c-format
 msgid "Cannot find container for unknown control '%s'."
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:921
+#: ../src/xrc/xmlres.cpp:1210
 #, c-format
 msgid "Cannot find font node '%s'."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:816
+#: ../src/msw/dialup.cpp:814
 msgid "Cannot find the location of address book file"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1200
+#: ../src/unix/threadpsx.cpp:1100
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:897
+#: ../src/unix/utilsunx.cpp:758
 msgid "Cannot get the hostname"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:933
+#: ../src/unix/utilsunx.cpp:794
 msgid "Cannot get the official hostname"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:910
+#: ../src/msw/dialup.cpp:908
 msgid "Cannot hang up - no active dialup connection."
 msgstr ""
 
-#: ../src/msw/app.cpp:248
+#: ../include/wx/msw/ole/oleutils.h:47
 msgid "Cannot initialize OLE"
 msgstr ""
 
+#: ../src/mgl/app.cpp:292
+msgid "Cannot initialize SciTech MGL!"
+msgstr ""
+
 #: ../src/mgl/window.cpp:546
 msgid "Cannot initialize display."
 msgstr ""
 
-#: ../src/msw/volume.cpp:627
+#: ../src/msw/volume.cpp:601
 #, c-format
 msgid "Cannot load icon from '%s'."
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:336
+#: ../src/xrc/xmlres.cpp:392
 #, c-format
 msgid "Cannot load resources from file '%s'."
 msgstr ""
 
-#: ../src/html/htmlfilt.cpp:171
+#: ../src/html/htmlfilt.cpp:164
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:579
+#: ../src/html/helpdata.cpp:672
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr ""
 
-#: ../src/generic/helpext.cpp:101
+#: ../src/generic/helpext.cpp:123
 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:275
+#: ../src/html/helpdata.cpp:312
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:310
+#: ../src/xrc/xmlres.cpp:360
 #, c-format
 msgid "Cannot open file '%s'."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:1584
+#: ../src/generic/dcpsg.cpp:1568
 msgid "Cannot open file for PostScript printing!"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:288
+#: ../src/html/helpdata.cpp:326
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:854
+#: ../src/common/intl.cpp:1202
+#, c-format
+msgid "Cannot parse Plural-Forms:'%s'"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:1111
 #, c-format
 msgid "Cannot parse coordinates from '%s'."
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:895
+#: ../src/xrc/xmlres.cpp:1159
 #, c-format
 msgid "Cannot parse dimension from '%s'."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1265
+#: ../src/html/helpfrm.cpp:1562
 msgid "Cannot print empty page."
 msgstr ""
 
-#: ../src/msw/volume.cpp:188 ../src/msw/volume.cpp:519
+#: ../src/msw/volume.cpp:160 ../src/msw/volume.cpp:491
 #, c-format
 msgid "Cannot read typename from '%s'!"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1181
+#: ../src/unix/threadpsx.cpp:1081
 msgid "Cannot retrieve thread scheduling policy."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:806
+#: ../src/unix/threadpsx.cpp:729
 msgid "Cannot start thread: error writing TLS"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:406
+#: ../src/mac/carbon/mpthread.cpp:977 ../src/mac/carbon/thread.cpp:1174
+msgid "Cannot wait for thread termination."
+msgstr ""
+
+#: ../src/mac/carbon/mpthread.cpp:893 ../src/mac/carbon/thread.cpp:1082
+msgid "Cant create the thread event queue"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:534
 msgid "Case sensitive"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:125
+#: ../src/common/fmapbase.cpp:116
 msgid "Celtic (ISO-8859-14)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:113
+#: ../src/common/stockitem.cpp:127
+msgid "Centered"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:104
 msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:751
+#: ../src/msw/dialup.cpp:749
 msgid "Choose ISP to dial"
 msgstr ""
 
-#: ../src/gtk/fontdlg.cpp:122
+#: ../src/generic/colrdlgg.cpp:151 ../src/gtk/colordlg.cpp:45
+#: ../src/palmos/colordlg.cpp:76
+msgid "Choose colour"
+msgstr ""
+
+#: ../src/gtk/fontdlg.cpp:133
 msgid "Choose font"
 msgstr ""
 
-#: ../src/msw/glcanvas.cpp:428
-msgid "ChoosePixelFormat failed."
+#: ../src/generic/mdig.cpp:114
+msgid "Cl&ose"
 msgstr ""
 
-#: ../src/generic/logg.cpp:482
+#: ../src/generic/logg.cpp:510
 msgid "Clear the log contents"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:364 ../src/generic/progdlgg.cpp:356
-#: ../src/generic/proplist.cpp:506
+#: ../src/generic/fontdlgg.cpp:365 ../src/generic/fontdlgg.cpp:384
+msgid "Click to cancel the font selection."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:370 ../src/generic/fontdlgg.cpp:372
+#: ../src/generic/fontdlgg.cpp:377 ../src/generic/fontdlgg.cpp:379
+msgid "Click to confirm the font selection."
+msgstr ""
+
+#: ../contrib/src/deprecated/proplist.cpp:513 ../src/generic/dbgrptg.cpp:88
+#: ../src/generic/progdlgg.cpp:629 ../src/generic/progdlgg.cpp:634
 msgid "Close"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4547
+#: ../src/univ/themes/win32.cpp:4825
 msgid "Close\tAlt-F4"
 msgstr ""
 
-#: ../src/generic/logg.cpp:484
+#: ../src/generic/mdig.cpp:115
+msgid "Close All"
+msgstr ""
+
+#: ../src/generic/logg.cpp:512
 msgid "Close this window"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:547
+#: ../src/html/helpfrm.cpp:1576
+msgid "Compressed HTML Help file (*.chm)|*.chm|"
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:582
 msgid "Computer"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:868
+#: ../src/common/fileconf.cpp:938
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1338 ../src/gtk/filedlg.cpp:72
+#: ../src/generic/filedlgg.cpp:1323 ../src/gtk/filedlg.cpp:64
 msgid "Confirm"
 msgstr ""
 
-#: ../src/msw/mimetype.cpp:684
+#: ../src/msw/mimetype.cpp:677
 msgid "Confirm registry update"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:262
+#: ../src/html/htmlwin.cpp:386
 msgid "Connecting..."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:346
+#: ../src/html/helpfrm.cpp:476
 msgid "Contents"
 msgstr ""
 
-#: ../src/common/strconv.cpp:579
+#: ../src/common/strconv.cpp:1428
 #, c-format
-msgid "Convertion to charset '%s' doesn't work."
+msgid "Conversion to charset '%s' doesn't work."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:195
+#: ../src/html/htmlwin.cpp:824
+#, c-format
+msgid "Copied to clipboard:\"%s\""
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:242
 msgid "Copies:"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1799
-#: ../src/common/resource.cpp:1929
+#: ../src/html/chm.cpp:703
+#, c-format
+msgid "Could not create temporary file '%s'"
+msgstr ""
+
+#: ../src/html/chm.cpp:274
+#, c-format
+msgid "Could not extract %s into %s: %s"
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:1830
+#: ../contrib/src/deprecated/resource.cpp:1960
 #, c-format
 msgid "Could not find resource include file %s."
 msgstr ""
 
-#: ../src/generic/tabg.cpp:1044
+#: ../src/generic/tabg.cpp:1048
 msgid "Could not find tab for id"
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:1799
+#: ../src/html/chm.cpp:445
 #, c-format
-msgid "Could not load Rich Edit DLL '%s'"
+msgid "Could not locate file '%s'."
 msgstr ""
 
-#: ../src/common/resource.cpp:795
+#: ../contrib/src/deprecated/resource.cpp:829
 #, c-format
 msgid ""
 "Could not resolve control class or id '%s'. Use (non-zero) integer instead\n"
 " or provide #define (see manual for caveats)"
 msgstr ""
 
-#: ../src/common/resource.cpp:1244
+#: ../contrib/src/deprecated/resource.cpp:1278
 #, c-format
 msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 "or provide #define (see manual for caveats)"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:720
+#: ../src/common/prntbase.cpp:1225
 msgid "Could not start document preview."
 msgstr ""
 
-#: ../src/generic/printps.cpp:197 ../src/msw/printwin.cpp:252
+#: ../src/generic/printps.cpp:185 ../src/gtk/gnome/gprint.cpp:756
+#: ../src/msw/printwin.cpp:235
 msgid "Could not start printing."
 msgstr ""
 
-#: ../src/common/wincmn.cpp:1124
+#: ../src/common/wincmn.cpp:1488
 msgid "Could not transfer data to window"
 msgstr ""
 
-#: ../src/msw/thread.cpp:187
+#: ../src/mac/carbon/mpthread.cpp:227 ../src/mac/carbon/mpthread.cpp:306
+#: ../src/mac/carbon/thread.cpp:414 ../src/mac/carbon/thread.cpp:495
+msgid "Could not unlock mutex"
+msgstr ""
+
+#: ../src/os2/thread.cpp:154
 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
+#: ../src/msw/dragimag.cpp:166 ../src/msw/dragimag.cpp:206
+#: ../src/msw/imaglist.cpp:158 ../src/msw/imaglist.cpp:176
+#: ../src/msw/imaglist.cpp:188
 msgid "Couldn't add an image to the image list."
 msgstr ""
 
-#: ../src/msw/timer.cpp:103
+#: ../src/msw/timer.cpp:106 ../src/os2/timer.cpp:155
 msgid "Couldn't create a timer"
 msgstr ""
 
@@ -923,126 +1263,157 @@ msgstr ""
 msgid "Couldn't create cursor."
 msgstr ""
 
-#: ../src/common/dynlib.cpp:344 ../src/common/dynload.cpp:280
+#: ../src/common/dynlib.cpp:199
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr ""
 
-#: ../src/mac/thread.cpp:485 ../src/msw/thread.cpp:787
+#: ../src/mac/classic/thread.cpp:521 ../src/msw/thread.cpp:850
 msgid "Couldn't get the current thread pointer"
 msgstr ""
 
-#: ../src/common/imagpng.cpp:298
+#: ../src/common/imagpng.cpp:596
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr ""
 
-#: ../src/msw/ole/dataobj.cpp:143
+#: ../src/unix/sound.cpp:472
+#, c-format
+msgid "Couldn't load sound data from '%s'."
+msgstr ""
+
+#: ../src/unix/sound_sdl.cpp:230
+#, c-format
+msgid "Couldn't open audio: %s"
+msgstr ""
+
+#: ../src/msw/ole/dataobj.cpp:147
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr ""
 
-#: ../src/msw/thread.cpp:219
+#: ../src/os2/thread.cpp:171
 msgid "Couldn't release a mutex"
 msgstr ""
 
-#: ../src/msw/listctrl.cpp:696
+#: ../src/msw/listctrl.cpp:735
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr ""
 
-#: ../src/common/imagpng.cpp:334 ../src/common/imagpng.cpp:345
-#: ../src/common/imagpng.cpp:353
+#: ../src/common/imagpng.cpp:642 ../src/common/imagpng.cpp:651
+#: ../src/common/imagpng.cpp:659
 msgid "Couldn't save PNG image."
 msgstr ""
 
-#: ../src/mac/thread.cpp:729 ../src/msw/thread.cpp:1175
+#: ../src/mac/classic/thread.cpp:779 ../src/msw/thread.cpp:611
 msgid "Couldn't terminate thread"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:263
+#: ../src/common/xtistrm.cpp:161
+msgid "Create Parameter not found in declared RTTI Parameters"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:309
 msgid "Create directory"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1108
+#: ../src/generic/dirdlgg.cpp:142 ../src/generic/filedlgg.cpp:1007
 msgid "Create new directory"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1119
+#: ../src/common/stockitem.cpp:114 ../src/msw/textctrl.cpp:2064
+msgid "Cu&t"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1018
 msgid "Current directory:"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fmapbase.cpp:107
 msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
-#: ../src/common/paper.cpp:106
+#: ../src/common/paper.cpp:113
 msgid "D sheet, 22 x 34 in"
 msgstr ""
 
-#: ../src/msw/dde.cpp:587
+#: ../src/msw/dde.cpp:633
 msgid "DDE poke request failed"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:618
-msgid "DIB Header: Cannot deal with 4bit encoded yet."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:836
+#: ../src/common/imagbmp.cpp:921
 msgid "DIB Header: Encoding doesn't match bitdepth."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:798
+#: ../src/common/imagbmp.cpp:883
 msgid "DIB Header: Image height > 32767 pixels for file."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:792
+#: ../src/common/imagbmp.cpp:877
 msgid "DIB Header: Image width > 32767 pixels for file."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:812
+#: ../src/common/imagbmp.cpp:897
 msgid "DIB Header: Unknown bitdepth in file."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:822
+#: ../src/common/imagbmp.cpp:907
 msgid "DIB Header: Unknown encoding in file."
 msgstr ""
 
-#: ../src/common/paper.cpp:128
+#: ../src/common/paper.cpp:135
 msgid "DL Envelope, 110 x 220 mm"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:689
-msgid "Date"
+#: ../src/generic/dbgrptg.cpp:276
+#, c-format
+msgid "Debug report \"%s\""
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:203
+msgid "Debug report couldn't be created."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:224
+#: ../src/common/debugrpt.cpp:517
+msgid "Debug report generation has failed."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:227
 msgid "Decorative"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:386
+#: ../src/common/fmapbase.cpp:674
 msgid "Default encoding"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:269
+#: ../src/generic/prntdlgg.cpp:506
+msgid "Default printer"
+msgstr ""
+
+#: ../contrib/src/gizmos/editlbox.cpp:160
+msgid "Delete item"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:300
 #, c-format
 msgid "Deleted stale lock file '%s'."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:351
+#: ../src/generic/dirctrlg.cpp:648
+msgid "Desktop"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:358
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr ""
 
-#: ../src/os2/toplevel.cpp:264
-msgid "Did you forget to include wx/os2/wx.rc in your resources?"
-msgstr ""
-
-#: ../src/generic/tipdlg.cpp:178
+#: ../src/generic/tipdlg.cpp:246
 msgid "Did you know..."
 msgstr ""
 
-#: ../src/common/filefn.cpp:1228
+#: ../src/common/filefn.cpp:1172
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr ""
@@ -1052,21 +1423,25 @@ msgstr ""
 msgid "Directory '%s' doesn't exist!"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:188
+#: ../src/generic/dirdlgg.cpp:228
 msgid "Directory does not exist"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:374
+#: ../src/generic/filedlgg.cpp:1300
+msgid "Directory doesn't exist."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:503
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:540
+#: ../src/html/helpfrm.cpp:685
 msgid "Display options dialog"
 msgstr ""
 
-#: ../src/msw/mimetype.cpp:677
+#: ../src/msw/mimetype.cpp:670
 #, c-format
 msgid ""
 "Do you want to overwrite the command used to %s files with extension \"%s"
@@ -1077,258 +1452,367 @@ msgid ""
 "%s %1"
 msgstr ""
 
-#: ../src/common/docview.cpp:438
+#: ../src/common/docview.cpp:464
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:314
+#: ../src/common/sizer.cpp:1842
+msgid "Don't Save"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:451 ../src/msw/frame.cpp:211
 msgid "Done"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:368
+#: ../src/generic/progdlgg.cpp:433
 msgid "Done."
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:157
+#: ../src/common/xtixml.cpp:271
+#, c-format
+msgid "Doubly used id : %d"
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Down"
 msgstr ""
 
-#: ../src/common/paper.cpp:107
+#: ../src/common/paper.cpp:114
 msgid "E sheet, 34 x 44 in"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:183
+#: ../contrib/src/gizmos/editlbox.cpp:158
+msgid "Edit item"
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:194
 msgid "Elapsed time : "
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:335
+#: ../src/common/prntbase.cpp:799
+#, c-format
+msgid "Enter a page number between %d and %d:"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:158
+#, c-format
+msgid "Enter command to open file \"%s\":"
+msgstr ""
+
+#: ../src/generic/helpext.cpp:443
 msgid "Entries found"
 msgstr ""
 
-#: ../src/common/config.cpp:345
+#: ../src/common/config.cpp:383
 #, c-format
 msgid ""
-"Environment variables expansion failed: missing '%c' at position %d in '%s'."
+"Environment variables expansion failed: missing '%c' at position %u in '%s'."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:702 ../src/generic/dirctrlg.cpp:720
-#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:825 ../src/generic/filedlgg.cpp:922
-#: ../src/generic/filedlgg.cpp:936 ../src/generic/filedlgg.cpp:949
-#: ../src/generic/filedlgg.cpp:1303 ../src/generic/filedlgg.cpp:1353
-#: ../src/gtk/filedlg.cpp:80 ../src/gtk/fontdlg.cpp:72
+#: ../src/generic/dirctrlg.cpp:681 ../src/generic/dirctrlg.cpp:699
+#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
+#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:751
+#: ../src/generic/filedlgg.cpp:765 ../src/generic/filedlgg.cpp:779
+#: ../src/generic/filedlgg.cpp:1275 ../src/generic/filedlgg.cpp:1300
+#: ../src/generic/filedlgg.cpp:1330 ../src/gtk/fontdlg.cpp:81
 msgid "Error"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:1215 ../src/unix/utilsunx.cpp:1223
+#: ../src/unix/utilsunx.cpp:1073 ../src/unix/utilsunx.cpp:1081
 msgid "Error "
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:203
+#: ../src/generic/dirdlgg.cpp:243
 msgid "Error creating directory"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:845
+#: ../src/common/imagbmp.cpp:930
 msgid "Error in reading image DIB ."
 msgstr ""
 
-#: ../src/common/log.cpp:460
+#: ../src/common/fileconf.cpp:504
+msgid "Error reading config options."
+msgstr ""
+
+#: ../src/common/fileconf.cpp:1026
+msgid "Error saving user configuration data."
+msgstr ""
+
+#: ../src/mac/carbon/mpthread.cpp:482 ../src/mac/carbon/thread.cpp:672
+msgid "Error while waiting on semaphore"
+msgstr ""
+
+#: ../src/common/log.cpp:476
 msgid "Error: "
 msgstr ""
 
-#: ../src/common/fontmap.cpp:114
+#: ../src/common/fmapbase.cpp:105
 msgid "Esperanto (ISO-8859-3)"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:191
+#: ../src/generic/progdlgg.cpp:202
 msgid "Estimated time : "
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:594
+#: ../src/generic/dbgrptg.cpp:211
+msgid "Executable files (*.exe)|*.exe|All files (*.*)|*.*||"
+msgstr ""
+
+#: ../src/msw/utilsexc.cpp:753
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr ""
 
-#: ../src/common/paper.cpp:112
+#: ../src/os2/utilsexc.cpp:169
+#, c-format
+msgid "Execution of command '%s' failed with error: %ul"
+msgstr ""
+
+#: ../src/common/paper.cpp:119
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr ""
 
-#: ../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
-msgid "Expected '*' whilst parsing resource."
+#: ../contrib/src/deprecated/resource.cpp:1869
+#: ../contrib/src/deprecated/resource.cpp:1999
+#: ../contrib/src/deprecated/resource.cpp:3091
+msgid "Expected '*' while parsing resource."
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:1886
+#: ../contrib/src/deprecated/resource.cpp:2015
+#: ../contrib/src/deprecated/resource.cpp:3108
+msgid "Expected '=' while parsing resource."
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:1855
+#: ../contrib/src/deprecated/resource.cpp:1985
+#: ../contrib/src/deprecated/resource.cpp:3077
+msgid "Expected 'char' while parsing resource."
+msgstr ""
+
+#: ../src/msw/registry.cpp:1125
+#, c-format
+msgid ""
+"Exporting registry key: file \"%s\" already exists and won't be overwritten."
 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
-msgid "Expected '=' whilst parsing resource."
+#: ../src/common/fmapbase.cpp:141
+msgid "Extended Unix Codepage for Japanese (EUC-JP)"
 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
-msgid "Expected 'char' whilst parsing resource."
+#: ../src/html/chm.cpp:710
+#, c-format
+msgid "Extraction of '%s' into '%s' failed."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:845
+#: ../src/msw/dialup.cpp:843
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:243
+#: ../src/unix/snglinst.cpp:274
 msgid "Failed to access lock file."
 msgstr ""
 
-#: ../src/common/filename.cpp:172
+#: ../src/msw/dib.cpp:543
+#, c-format
+msgid "Failed to allocated %luKb of memory for bitmap data."
+msgstr ""
+
+#: ../src/unix/displayx11.cpp:224
+msgid "Failed to change video mode"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:237
+#, c-format
+msgid "Failed to clean up debug report directory \"%s\""
+msgstr ""
+
+#: ../src/common/filename.cpp:191
 msgid "Failed to close file handle"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:308
+#: ../src/unix/snglinst.cpp:339
 #, c-format
 msgid "Failed to close lock file '%s'"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:127
+#: ../src/msw/clipbrd.cpp:119
 msgid "Failed to close the clipboard."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:785
+#: ../src/msw/dialup.cpp:783
 msgid "Failed to connect: missing username/password."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:731
+#: ../src/msw/dialup.cpp:729
 msgid "Failed to connect: no ISP to dial."
 msgstr ""
 
-#: ../src/msw/registry.cpp:597
+#: ../src/msw/registry.cpp:618
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:606
+#: ../src/msw/registry.cpp:627
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr ""
 
-#: ../src/common/filefn.cpp:1081
+#: ../src/common/filefn.cpp:1008
 #, c-format
 msgid "Failed to copy the file '%s' to '%s'"
 msgstr ""
 
-#: ../src/msw/dde.cpp:924
+#: ../src/msw/registry.cpp:605
+#, c-format
+msgid "Failed to copy the registry subkey '%s' to '%s'."
+msgstr ""
+
+#: ../src/msw/dde.cpp:988
 msgid "Failed to create DDE string"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:421
+#: ../src/msw/mdi.cpp:459
 msgid "Failed to create MDI parent frame."
 msgstr ""
 
-#: ../src/msw/statbr95.cpp:110
+#: ../src/msw/statbr95.cpp:112
 msgid "Failed to create a status bar."
 msgstr ""
 
-#: ../src/common/filename.cpp:705
+#: ../src/common/filename.cpp:766
 msgid "Failed to create a temporary file name"
 msgstr ""
 
-#: ../src/msw/dde.cpp:401
+#: ../src/msw/utilsexc.cpp:227
+msgid "Failed to create an anonymous pipe"
+msgstr ""
+
+#: ../src/msw/dde.cpp:450
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr ""
 
-#: ../src/msw/toplevel.cpp:303
-msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
+#: ../src/msw/cursor.cpp:216
+msgid "Failed to create cursor."
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:202
+#, c-format
+msgid "Failed to create directory \"%s\""
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:370
+#, c-format
+msgid "Failed to create directory %s/.gnome."
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:379
+#, c-format
+msgid "Failed to create directory %s/mime-info."
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:201
+#: ../src/generic/dirdlgg.cpp:241
 #, c-format
 msgid ""
 "Failed to create directory '%s'\n"
 "(Do you have the required permissions?)"
 msgstr ""
 
-#: ../src/msw/mimetype.cpp:168
+#: ../src/msw/mimetype.cpp:193
 #, c-format
 msgid "Failed to create registry entry for '%s' files."
 msgstr ""
 
-#: ../src/msw/fdrepdlg.cpp:442
+#: ../src/msw/fdrepdlg.cpp:474
 #, c-format
 msgid "Failed to create the standard find/replace dialog (error code %d)"
 msgstr ""
 
-#: ../src/html/winpars.cpp:428
+#: ../src/html/winpars.cpp:549
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:167 ../src/msw/clipbrd.cpp:139
+#: ../src/mac/carbon/clipbrd.cpp:189 ../src/mac/classic/clipbrd.cpp:185
+#: ../src/msw/clipbrd.cpp:131
 msgid "Failed to empty the clipboard."
 msgstr ""
 
-#: ../src/msw/dde.cpp:606
+#: ../src/unix/displayx11.cpp:201
+msgid "Failed to enumerate video modes"
+msgstr ""
+
+#: ../src/msw/dde.cpp:652
 msgid "Failed to establish an advise loop with DDE server"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:623
+#: ../src/msw/dialup.cpp:621
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:586 ../src/unix/utilsunx.cpp:614
+#: ../src/unix/utilsunx.cpp:491 ../src/unix/utilsunx.cpp:507
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2458
+#: ../src/common/debugrpt.cpp:652
+msgid "Failed to execute curl, please install it in PATH."
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:2489
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2608
+#: ../contrib/src/deprecated/resource.cpp:2643
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadIconData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2473
+#: ../contrib/src/deprecated/resource.cpp:2504
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:683
+#: ../src/msw/dialup.cpp:681
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:118
+#: ../src/mac/carbon/clipbrd.cpp:138 ../src/mac/classic/clipbrd.cpp:134
 msgid "Failed to get clipboard data."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:712
+#: ../src/msw/clipbrd.cpp:723
 msgid "Failed to get data from the clipboard"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:282
-msgid "Failed to get the UTC system time."
+#: ../src/msw/stackwalk.cpp:221
+#, c-format
+msgid ""
+"Failed to get stack backtrace:\n"
+"%s"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:233
+#: ../src/common/stopwatch.cpp:223
 msgid "Failed to get the local system time"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1460
+#: ../src/common/filefn.cpp:1423
 msgid "Failed to get the working directory"
 msgstr ""
 
-#: ../src/univ/theme.cpp:120
+#: ../src/univ/theme.cpp:122
 msgid "Failed to initialize GUI: no built-in themes found."
 msgstr ""
 
@@ -1336,132 +1820,165 @@ msgstr ""
 msgid "Failed to initialize MS HTML Help."
 msgstr ""
 
-#: ../src/msw/glcanvas.cpp:730
+#: ../src/msw/glcanvas.cpp:808
 msgid "Failed to initialize OpenGL"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:987
+#: ../src/unix/snglinst.cpp:246
+#, c-format
+msgid "Failed to inspect the lock file '%s'"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:897
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr ""
 
-#: ../src/msw/utils.cpp:726
+#: ../src/msw/utils.cpp:702
 #, c-format
 msgid "Failed to kill process %d"
 msgstr ""
 
-#: ../src/common/iconbndl.cpp:67
+#: ../src/common/iconbndl.cpp:72
 #, c-format
 msgid "Failed to load image %d from file '%s'."
 msgstr ""
 
-#: ../src/msw/volume.cpp:340
+#: ../src/msw/enhmeta.cpp:84
+#, c-format
+msgid "Failed to load metafile from file \"%s\"."
+msgstr ""
+
+#: ../src/msw/volume.cpp:312
 msgid "Failed to load mpr.dll."
 msgstr ""
 
-#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:196
+#: ../src/common/dynlib.cpp:133
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr ""
 
-#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:125
+#: ../src/common/dynlib.cpp:115
 #, c-format
 msgid "Failed to load shared library '%s' Error '%s'"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:192
+#: ../src/unix/snglinst.cpp:203
 #, c-format
 msgid "Failed to lock the lock file '%s'"
 msgstr ""
 
-#: ../src/common/regex.cpp:251
+#: ../src/common/regex.cpp:300
 #, c-format
 msgid "Failed to match '%s' in regular expression: %s"
 msgstr ""
 
-#: ../src/common/filename.cpp:1632
+#: ../src/common/filename.cpp:1917
 #, c-format
 msgid "Failed to modify file times for '%s'"
 msgstr ""
 
-#: ../src/common/filename.cpp:160
+#: ../src/common/filename.cpp:179
 #, c-format
 msgid "Failed to open '%s' for %s"
 msgstr ""
 
-#: ../src/common/filename.cpp:727
+#: ../src/html/chm.cpp:142
+#, c-format
+msgid "Failed to open CHM archive '%s'."
+msgstr ""
+
+#: ../src/common/filename.cpp:788
 msgid "Failed to open temporary file."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:107
+#: ../src/msw/clipbrd.cpp:99
 msgid "Failed to open the clipboard."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:616
+#: ../src/msw/clipbrd.cpp:626
 msgid "Failed to put data on the clipboard"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:252
+#: ../src/unix/snglinst.cpp:283
 msgid "Failed to read PID from lock file."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:694
+#: ../src/unix/utilsunx.cpp:581
 msgid "Failed to redirect child process input/output"
 msgstr ""
 
-#: ../src/msw/dde.cpp:285
+#: ../src/msw/utilsexc.cpp:653
+msgid "Failed to redirect the child process IO"
+msgstr ""
+
+#: ../src/msw/dde.cpp:300
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:674
+#: ../src/msw/glcanvas.cpp:368
+msgid "Failed to register OpenGL window class."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:246
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:296
+#: ../src/common/debugrpt.cpp:220
+#, c-format
+msgid "Failed to remove debug report file \"%s\""
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:327
 #, c-format
 msgid "Failed to remove lock file '%s'"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:262
+#: ../src/unix/snglinst.cpp:293
 #, c-format
 msgid "Failed to remove stale lock file '%s'."
 msgstr ""
 
-#: ../src/msw/registry.cpp:443
+#: ../src/msw/registry.cpp:456
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr ""
 
-#: ../src/msw/registry.cpp:543
+#: ../src/msw/registry.cpp:560
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:505
+#: ../src/msw/clipbrd.cpp:503
 msgid "Failed to retrieve data from the clipboard."
 msgstr ""
 
-#: ../src/common/filename.cpp:1698
+#: ../src/common/filename.cpp:2007
 #, c-format
 msgid "Failed to retrieve file times for '%s'"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:447
+#: ../src/msw/dialup.cpp:454
 msgid "Failed to retrieve text of RAS error message"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:742
+#: ../src/msw/clipbrd.cpp:760
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr ""
 
-#: ../src/msw/dde.cpp:651
+#: ../src/msw/dib.cpp:345
+#, c-format
+msgid "Failed to save the bitmap image to file \"%s\"."
+msgstr ""
+
+#: ../src/msw/dde.cpp:697
 msgid "Failed to send DDE advise notification"
 msgstr ""
 
-#: ../src/common/ftp.cpp:368
+#: ../src/common/ftp.cpp:384
 #, c-format
 msgid "Failed to set FTP transfer mode to %s."
 msgstr ""
@@ -1470,63 +1987,78 @@ msgstr ""
 msgid "Failed to set clipboard data."
 msgstr ""
 
-#: ../src/common/file.cpp:527
+#: ../src/unix/snglinst.cpp:186
+#, c-format
+msgid "Failed to set permissions on lock file '%s'"
+msgstr ""
+
+#: ../src/common/file.cpp:523
 msgid "Failed to set temporary file permissions"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1317
+#: ../src/unix/threadpsx.cpp:1245 ../src/unix/threadpsx.cpp:1256
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:168
+#: ../src/common/fs_mem.cpp:231
 #, c-format
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1497
+#: ../src/mac/carbon/mpthread.cpp:1273 ../src/mac/carbon/thread.cpp:1465
+#: ../src/unix/threadpsx.cpp:1429
 msgid "Failed to terminate a thread."
 msgstr ""
 
-#: ../src/msw/dde.cpp:625
+#: ../src/msw/dde.cpp:671
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:918
+#: ../src/msw/dialup.cpp:916
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr ""
 
-#: ../src/common/filename.cpp:1647
+#: ../src/common/filename.cpp:1932
 #, c-format
 msgid "Failed to touch the file '%s'"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:302
+#: ../src/unix/snglinst.cpp:333
 #, c-format
 msgid "Failed to unlock lock file '%s'"
 msgstr ""
 
-#: ../src/msw/dde.cpp:301
+#: ../src/msw/dde.cpp:321
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr ""
 
+#: ../src/common/fileconf.cpp:999
+msgid "Failed to update user configuration file."
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:665
+#, c-format
+msgid "Failed to upload the debug report (error code %d)."
+msgstr ""
+
 #: ../src/unix/snglinst.cpp:173
 #, c-format
 msgid "Failed to write to lock file '%s'"
 msgstr ""
 
-#: ../src/generic/logg.cpp:372
+#: ../src/generic/logg.cpp:399
 msgid "Fatal error"
 msgstr ""
 
-#: ../src/common/log.cpp:453
+#: ../src/common/log.cpp:465
 msgid "Fatal error: "
 msgstr ""
 
-#: ../src/mac/app.cpp:1217 ../src/msw/app.cpp:1306
-msgid "Fatal error: exiting"
+#: ../src/msw/wince/filedlgwce.cpp:120
+msgid "File"
 msgstr ""
 
 #: ../src/mgl/bitmap.cpp:544
@@ -1534,76 +2066,76 @@ msgstr ""
 msgid "File %s does not exist."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1335 ../src/gtk/filedlg.cpp:69
+#: ../src/generic/filedlgg.cpp:1321 ../src/gtk/filedlg.cpp:61
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr ""
 
-#: ../src/msw/filedlg.cpp:502
+#: ../src/os2/filedlg.cpp:307
 #, c-format
 msgid ""
 "File '%s' already exists.\n"
 "Do you want to replace it?"
 msgstr ""
 
-#: ../src/common/textcmn.cpp:158
+#: ../src/common/textcmn.cpp:215
 msgid "File couldn't be loaded."
 msgstr ""
 
-#: ../src/common/docview.cpp:292 ../src/common/docview.cpp:329
-#: ../src/common/docview.cpp:1409
+#: ../src/common/docview.cpp:571 ../src/common/docview.cpp:603
+#: ../src/common/docview.cpp:1609
 msgid "File error"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:720 ../src/generic/filedlgg.cpp:936
+#: ../src/generic/dirctrlg.cpp:699 ../src/generic/filedlgg.cpp:765
 msgid "File name exists already."
 msgstr ""
 
-#: ../src/msw/filedlg.cpp:350
+#: ../src/common/filefn.cpp:1739
 #, c-format
-msgid "Files (%s)|%s"
+msgid "Files (%s)"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:362
+#: ../src/html/helpfrm.cpp:491
 msgid "Find"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:950
+#: ../src/html/helpfrm.cpp:1219
 msgid "Fixed font:"
 msgstr ""
 
-#: ../src/common/paper.cpp:118
-msgid "Folio, 8 1/2 x 13 in"
+#: ../src/html/helpfrm.cpp:1279
+msgid "Fixed size face.<br> <b>bold</b> <i>italic</i> "
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:174
-msgid "Font"
+#: ../src/common/paper.cpp:125
+msgid "Folio, 8 1/2 x 13 in"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:960
+#: ../src/html/helpfrm.cpp:1220
 msgid "Font size:"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:642
+#: ../src/unix/utilsunx.cpp:528
 msgid "Fork failed"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:167
-msgid "Forward"
+#: ../src/common/xtixml.cpp:235
+msgid "Forward hrefs are not supported"
 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
+#: ../contrib/src/deprecated/resource.cpp:1838
+#: ../contrib/src/deprecated/resource.cpp:1968
+#: ../contrib/src/deprecated/resource.cpp:3060
 msgid "Found "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:661
+#: ../src/html/helpfrm.cpp:886
 #, c-format
 msgid "Found %i matches"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:186
+#: ../src/generic/prntdlgg.cpp:233
 msgid "From:"
 msgstr ""
 
@@ -1627,267 +2159,366 @@ msgstr ""
 msgid "GIF: unknown error!!!"
 msgstr ""
 
-#: ../src/univ/themes/gtk.cpp:623
+#: ../src/univ/themes/gtk.cpp:634
 msgid "GTK+ theme"
 msgstr ""
 
-#: ../src/common/paper.cpp:142
+#: ../src/common/prntbase.cpp:228
+msgid "Generic PostScript"
+msgstr ""
+
+#: ../src/common/paper.cpp:149
 msgid "German Legal Fanfold, 8 1/2 x 13 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:141
+#: ../src/common/paper.cpp:148
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr ""
 
-#: ../src/common/image.cpp:762
-msgid "GetUnusedColour:: No Unused Color in image "
+#: ../include/wx/xti.h:845
+msgid "GetProperty called w/o valid getter"
+msgstr ""
+
+#: ../include/wx/xti.h:906
+msgid "GetPropertyCollection called on a generic accessor"
+msgstr ""
+
+#: ../include/wx/xti.h:853
+msgid "GetPropertyCollection called w/o valid collection getter"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:506
+#: ../src/html/helpfrm.cpp:651
 msgid "Go back"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:509
+#: ../src/html/helpfrm.cpp:654
 msgid "Go forward"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:514
+#: ../src/html/helpfrm.cpp:659
 msgid "Go one level up in document hierarchy"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1097
+#: ../src/generic/dirdlgg.cpp:147 ../src/generic/filedlgg.cpp:997
 msgid "Go to home directory"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1089
+#: ../src/generic/filedlgg.cpp:989
 msgid "Go to parent directory"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:118
+#: ../src/common/prntbase.cpp:804
+msgid "Goto Page"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:109
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:354
+#: ../src/common/zstream.cpp:72 ../src/common/zstream.cpp:209
+msgid "Gzip not supported by this version of zlib"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:1574
+msgid "HTML Help Project (*.hhp)|*.hhp|"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:498
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr ""
 
-#: ../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 (*.*)|*"
+#: ../src/html/helpfrm.cpp:1572
+msgid "HTML files (*.html;*.htm)|*.html;*.htm|"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fmapbase.cpp:110
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:179 ../src/generic/proplist.cpp:516
-#: ../src/html/helpfrm.cpp:240 ../src/msw/mdi.cpp:1313
+#: ../contrib/src/deprecated/proplist.cpp:523 ../src/generic/mdig.cpp:310
+#: ../src/html/helpfrm.cpp:337 ../src/msw/mdi.cpp:1383
 msgid "Help"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:933
+#: ../src/html/helpfrm.cpp:1213
 msgid "Help Browser Options"
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:334 ../src/generic/helphtml.cpp:335
+#: ../src/generic/helpext.cpp:442 ../src/generic/helpext.cpp:443
 msgid "Help Index"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1263
+#: ../src/html/helpfrm.cpp:1560
 msgid "Help Printing"
 msgstr ""
 
-#: ../src/html/helpctrl.cpp:44
+#: ../src/html/helpfrm.cpp:814
+msgid "Help Topics"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:1573
+msgid "Help books (*.htb)|*.htb|Help books (*.zip)|*.zip|"
+msgstr ""
+
+#: ../src/html/helpctrl.cpp:55
 #, c-format
 msgid "Help: %s"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:858
+#: ../src/generic/dirdlgg.cpp:107
+msgid "Home"
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:646
+msgid "Home directory"
+msgstr ""
+
+#: ../include/wx/filefn.h:142
+msgid "I64"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:943
 msgid "ICO: Error in reading mask DIB."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:960 ../src/common/imagbmp.cpp:1019
-#: ../src/common/imagbmp.cpp:1028 ../src/common/imagbmp.cpp:1039
-#: ../src/common/imagbmp.cpp:1083 ../src/common/imagbmp.cpp:1093
-#: ../src/common/imagbmp.cpp:1102
+#: ../src/common/imagbmp.cpp:1048 ../src/common/imagbmp.cpp:1107
+#: ../src/common/imagbmp.cpp:1116 ../src/common/imagbmp.cpp:1127
+#: ../src/common/imagbmp.cpp:1171 ../src/common/imagbmp.cpp:1181
+#: ../src/common/imagbmp.cpp:1190
 msgid "ICO: Error writing the image file!"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:928
+#: ../src/common/imagbmp.cpp:1016
 msgid "ICO: Image too tall for an icon."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:934
+#: ../src/common/imagbmp.cpp:1022
 msgid "ICO: Image too wide for an icon."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:1167
+#: ../src/common/imagbmp.cpp:1255
 msgid "ICO: Invalid icon index."
 msgstr ""
 
-#: ../src/common/imagiff.cpp:767
+#: ../src/common/imagiff.cpp:771
 msgid "IFF: data stream seems to be truncated."
 msgstr ""
 
-#: ../src/common/imagiff.cpp:751
+#: ../src/common/imagiff.cpp:755
 msgid "IFF: error in IFF image format."
 msgstr ""
 
-#: ../src/common/imagiff.cpp:754
+#: ../src/common/imagiff.cpp:758
 msgid "IFF: not enough memory."
 msgstr ""
 
-#: ../src/common/imagiff.cpp:757
+#: ../src/common/imagiff.cpp:761
 msgid "IFF: unknown error!!!"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
-#: ../src/common/resource.cpp:2638 ../src/common/resource.cpp:2649
+#: ../contrib/src/deprecated/resource.cpp:2673
+#: ../contrib/src/deprecated/resource.cpp:2684
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr ""
 
-#: ../src/common/resource.cpp:250
+#: ../src/generic/dbgrptg.cpp:325
+msgid ""
+"If you have any additional information pertaining to this bug\n"
+"report, please enter it here and it will be joined to it:"
+msgstr ""
+
+#: ../src/generic/dbgrptg.cpp:291
+msgid ""
+"If you wish to suppress this debug report completely, please choose the "
+"\"Cancel\" button,\n"
+"but be warned that it may hinder improving the program, so if\n"
+"at all possible please do continue with the report generation.\n"
+msgstr ""
+
+#: ../src/msw/registry.cpp:1281
+#, c-format
+msgid "Ignoring value \"%s\" of the key \"%s\"."
+msgstr ""
+
+#: ../contrib/src/deprecated/resource.cpp:271
 msgid "Ill-formed resource file syntax."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:702 ../src/generic/filedlgg.cpp:922
+#: ../src/common/xtistrm.cpp:260
+msgid "Illegal Object Class (Non-wxEvtHandler) as Event Source"
+msgstr ""
+
+#: ../include/wx/xti.h:1650
+msgid "Illegal Parameter Count for ConstructObject Method"
+msgstr ""
+
+#: ../include/wx/xti.h:1723
+msgid "Illegal Parameter Count for Create Method"
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:681 ../src/generic/filedlgg.cpp:751
 msgid "Illegal directory name."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1303
+#: ../src/generic/filedlgg.cpp:1275
 msgid "Illegal file specification."
 msgstr ""
 
-#: ../src/common/image.cpp:785
-msgid "Image and Mask have different sizes"
+#: ../src/common/image.cpp:1169
+msgid "Image and mask have different sizes."
 msgstr ""
 
-#: ../src/common/image.cpp:1064
+#: ../src/common/image.cpp:1500
 #, c-format
 msgid "Image file is not of type %d."
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:249
+#: ../src/msw/textctrl.cpp:361
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:390
+#: ../src/unix/utilsunx.cpp:411
 msgid "Impossible to get child process input"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1097
+#: ../src/common/filefn.cpp:1027
 #, c-format
 msgid "Impossible to get permissions for file '%s'"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1111
+#: ../src/common/filefn.cpp:1041
 #, c-format
 msgid "Impossible to overwrite the file '%s'"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1161
+#: ../src/common/filefn.cpp:1085
 #, c-format
 msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:387
+#: ../src/common/stockitem.cpp:124
+msgid "Indent"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:516
 msgid "Index"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:123
+#: ../src/common/fmapbase.cpp:114
 msgid "Indian (ISO-8859-12)"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:183
+#: ../src/common/xtistrm.cpp:704
+msgid "Internal error, illegal wxCustomTypeInfo"
+msgstr ""
+
+#: ../src/common/imagtiff.cpp:211
 msgid "Invalid TIFF image index."
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:342
+#: ../src/xrc/xmlres.cpp:399
 #, c-format
 msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
 msgstr ""
 
-#: ../src/common/appcmn.cpp:327
+#: ../src/common/appcmn.cpp:249
 #, c-format
 msgid "Invalid display mode specification '%s'."
 msgstr ""
 
-#: ../src/x11/app.cpp:227
+#: ../src/x11/app.cpp:128
 #, c-format
 msgid "Invalid geometry specification '%s'"
 msgstr ""
 
-#: ../src/unix/snglinst.cpp:280
+#: ../src/unix/snglinst.cpp:311
 #, c-format
 msgid "Invalid lock file '%s'."
 msgstr ""
 
-#: ../src/common/regex.cpp:173
+#: ../src/common/xtistrm.cpp:365 ../src/common/xtistrm.cpp:380
+msgid "Invalid or Null Object ID passed to GetObjectClassInfo"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:395
+msgid "Invalid or Null Object ID passed to HasObjectClassInfo"
+msgstr ""
+
+#: ../src/common/regex.cpp:210
 #, c-format
 msgid "Invalid regular expression '%s': %s"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:230
+#: ../src/generic/fontdlgg.cpp:233
 msgid "Italic"
 msgstr ""
 
-#: ../src/common/paper.cpp:137
+#: ../src/common/paper.cpp:144
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:222
+#: ../src/common/imagjpeg.cpp:225
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:336
+#: ../src/common/imagjpeg.cpp:339
 msgid "JPEG: Couldn't save image."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:127
+#: ../src/common/stockitem.cpp:128
+msgid "Justified"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:118
 msgid "KOI8-R"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2260 ../src/generic/prntdlgg.cpp:438
-#: ../src/generic/prntdlgg.cpp:634
+#: ../src/common/fmapbase.cpp:119
+msgid "KOI8-U"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:609 ../src/generic/prntdlgg.cpp:867
 msgid "Landscape"
 msgstr ""
 
-#: ../src/common/paper.cpp:110
+#: ../src/common/paper.cpp:117
 msgid "Ledger, 17 x 11 in"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:646
+#: ../src/generic/prntdlgg.cpp:879
 msgid "Left margin (mm):"
 msgstr ""
 
-#: ../src/common/paper.cpp:103
+#: ../src/common/paper.cpp:110
 msgid "Legal, 8 1/2 x 14 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:108
+#: ../src/common/paper.cpp:115
 msgid "Letter Small, 8 1/2 x 11 in"
 msgstr ""
 
-#: ../src/common/paper.cpp:102
+#: ../src/common/paper.cpp:109
 msgid "Letter, 8 1/2 x 11 in"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:233
+#: ../src/generic/fontdlgg.cpp:236
 msgid "Light"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1545 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:539
+#: ../src/html/chm.cpp:820
+msgid "Link contained '//', converted to absolute link."
+msgstr ""
+
+#: ../src/common/fldlgcmn.cpp:257
 #, c-format
 msgid "Load %s file"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:282
+#: ../src/html/htmlwin.cpp:416
 msgid "Loading : "
 msgstr ""
 
@@ -1899,105 +2530,144 @@ msgstr ""
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr ""
 
-#: ../src/generic/logg.cpp:547
+#: ../src/unix/snglinst.cpp:251
+#, c-format
+msgid "Lock file '%s' has incorrect owner."
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:256
+#, c-format
+msgid "Lock file '%s' has incorrect permissions."
+msgstr ""
+
+#: ../src/generic/logg.cpp:575
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:432
+#: ../include/wx/xti.h:501 ../include/wx/xti.h:505
+msgid "Long Conversions not supported"
+msgstr ""
+
+#: ../src/gtk/mdi.cpp:465
 msgid "MDI child"
 msgstr ""
 
+#: ../src/mac/carbon/thread.cpp:1635
+msgid "MP Thread Support is not available on this System"
+msgstr ""
+
 #: ../src/msw/helpchm.cpp:60
 msgid ""
 "MS HTML Help functions are unavailable because the MS HTML Help library is "
 "not installed on this machine. Please install it."
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4545
+#: ../src/univ/themes/win32.cpp:4823
 msgid "Ma&ximize"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:2418
+#: ../src/unix/mimetype.cpp:2671
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:152
+#: ../src/generic/fdrepdlg.cpp:153
 msgid "Match case"
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:145
+#: ../src/common/fs_mem.cpp:176
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr ""
 
+#: ../src/msw/frame.cpp:374
+msgid "Menu"
+msgstr ""
+
 #: ../src/univ/themes/metal.cpp:174
 msgid "Metal theme"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:4543
+#: ../src/univ/themes/win32.cpp:4821
 msgid "Mi&nimize"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:2078
+#: ../src/unix/mimetype.cpp:2292
 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr ""
 
-#: ../src/mgl/app.cpp:173
+#: ../src/mgl/app.cpp:165
 #, c-format
 msgid "Mode %ix%i-%i not available."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:225
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Modern"
 msgstr ""
 
-#: ../src/common/paper.cpp:138
+#: ../src/generic/filedlgg.cpp:441
+msgid "Modified"
+msgstr ""
+
+#: ../src/common/paper.cpp:145
 msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:176
-msgid "More..."
+#: ../contrib/src/gizmos/editlbox.cpp:162
+msgid "Move down"
+msgstr ""
+
+#: ../contrib/src/gizmos/editlbox.cpp:161
+msgid "Move up"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:687
+#: ../src/generic/filedlgg.cpp:438
 msgid "Name"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282
-#: ../src/generic/filedlgg.cpp:801 ../src/generic/filedlgg.cpp:810
+#: ../src/generic/dirdlgg.cpp:111
+msgid "New directory"
+msgstr ""
+
+#: ../contrib/src/gizmos/editlbox.cpp:159
+msgid "New item"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:318 ../src/generic/dirdlgg.cpp:328
+#: ../src/generic/filedlgg.cpp:615 ../src/generic/filedlgg.cpp:624
 msgid "NewName"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:520
-msgid "Next page"
+#: ../src/generic/tipdlg.cpp:305
+msgid "Next"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:156 ../src/mac/msgdlg.cpp:78
-#: ../src/motif/msgdlg.cpp:180
-msgid "No"
+#: ../src/html/helpfrm.cpp:665
+msgid "Next page"
 msgstr ""
 
-#: ../src/common/image.cpp:793
-msgid "No Unused Color in image being masked"
+#: ../src/mac/carbon/msgdlg.cpp:60 ../src/mac/carbon/msgdlg.cpp:145
+#: ../src/mac/classic/msgdlg.cpp:58 ../src/mac/classic/msgdlg.cpp:142
+#: ../src/motif/msgdlg.cpp:187
+msgid "No"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:965
-#: ../src/common/resource.cpp:2464 ../src/common/resource.cpp:2614
+#: ../contrib/src/deprecated/resource.cpp:2495
+#: ../contrib/src/deprecated/resource.cpp:2649
 msgid "No XBM facility available!"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2632
+#: ../contrib/src/deprecated/resource.cpp:2667
 msgid "No XPM icon facility available!"
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:329
+#: ../src/generic/helpext.cpp:437
 msgid "No entries found."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:865
+#: ../src/common/fontmap.cpp:422
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found,\n"
@@ -2006,7 +2676,7 @@ msgid ""
 "one)?"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:870
+#: ../src/common/fontmap.cpp:427
 #, c-format
 msgid ""
 "No font for displaying text in encoding '%s' found.\n"
@@ -2014,108 +2684,133 @@ msgid ""
 "(otherwise the text in this encoding will not be shown correctly)?"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:522
+#: ../src/xrc/xmlres.cpp:616
 #, c-format
 msgid "No handler found for XML node '%s', class '%s'!"
 msgstr ""
 
-#: ../src/common/image.cpp:1046 ../src/common/image.cpp:1089
+#: ../src/common/image.cpp:1482 ../src/common/image.cpp:1525
 msgid "No handler found for image type."
 msgstr ""
 
-#: ../src/common/image.cpp:1054 ../src/common/image.cpp:1097
-#: ../src/common/image.cpp:1131
+#: ../src/common/image.cpp:1490 ../src/common/image.cpp:1533
+#: ../src/common/image.cpp:1566
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr ""
 
-#: ../src/common/image.cpp:1115 ../src/common/image.cpp:1147
+#: ../src/common/image.cpp:1551 ../src/common/image.cpp:1581
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:650
+#: ../src/html/helpfrm.cpp:869
 msgid "No matching page found yet"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:121
+#: ../src/unix/sound.cpp:89
+msgid "No sound"
+msgstr ""
+
+#: ../src/common/image.cpp:1177 ../src/common/image.cpp:1216
+msgid "No unused colour in image being masked."
+msgstr ""
+
+#: ../src/common/image.cpp:1821
+msgid "No unused colour in image."
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:112
 msgid "Nordic (ISO-8859-10)"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:229 ../src/generic/fontdlgg.cpp:232
+#: ../src/generic/fontdlgg.cpp:232 ../src/generic/fontdlgg.cpp:235
 msgid "Normal"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:942
+#: ../src/html/helpfrm.cpp:1273
+msgid "Normal face<br>and <u>underlined</u>. "
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:1218
 msgid "Normal font:"
 msgstr ""
 
-#: ../src/common/paper.cpp:122
+#: ../src/common/paper.cpp:129
 msgid "Note, 8 1/2 x 11 in"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:162 ../src/generic/dcpsg.cpp:2268
-#: ../src/generic/dirdlgg.cpp:151 ../src/generic/filedlgg.cpp:1154
-#: ../src/generic/filedlgg.cpp:1165 ../src/generic/fontdlgg.cpp:256
-#: ../src/generic/logg.cpp:732 ../src/generic/prntdlgg.cpp:464
-#: ../src/generic/proplist.cpp:499 ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:135 ../src/html/helpfrm.cpp:972
+#: ../contrib/src/deprecated/proplist.cpp:506 ../src/gtk/fontdlg.cpp:147
+#: ../src/msw/dialog.cpp:193
 msgid "OK"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:528 ../src/html/helpfrm.cpp:1274
+#: ../src/common/xtixml.cpp:263
+msgid "Objects must have an id attribute"
+msgstr ""
+
+#: ../src/common/docview.cpp:1282 ../src/common/docview.cpp:1632
+msgid "Open File"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:673 ../src/html/helpfrm.cpp:1579
 msgid "Open HTML document"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:731 ../src/generic/dirdlgg.cpp:298
-#: ../src/generic/filedlgg.cpp:825 ../src/generic/filedlgg.cpp:949
+#: ../src/generic/dbgrptg.cpp:147
+#, c-format
+msgid "Open file \"%s\""
+msgstr ""
+
+#: ../src/generic/dirctrlg.cpp:710 ../src/generic/dirdlgg.cpp:344
+#: ../src/generic/filedlgg.cpp:639 ../src/generic/filedlgg.cpp:779
 msgid "Operation not permitted."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:631
+#: ../src/common/cmdline.cpp:702
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:651
+#: ../src/common/cmdline.cpp:722
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:712
+#: ../src/common/cmdline.cpp:784
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:444
+#: ../src/generic/dirdlgg.cpp:118 ../src/generic/prntdlgg.cpp:614
 msgid "Options"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:440 ../src/generic/prntdlgg.cpp:635
+#: ../src/generic/prntdlgg.cpp:611 ../src/generic/prntdlgg.cpp:868
 msgid "Orientation"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:455 ../src/common/imagpcx.cpp:478
+#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:485
 msgid "PCX: couldn't allocate memory"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:454
+#: ../src/common/imagpcx.cpp:461
 msgid "PCX: image format unsupported"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:477
+#: ../src/common/imagpcx.cpp:484
 msgid "PCX: invalid image"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:441
+#: ../src/common/imagpcx.cpp:448
 msgid "PCX: this is not a PCX file."
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:479
+#: ../src/common/imagpcx.cpp:464 ../src/common/imagpcx.cpp:486
 msgid "PCX: unknown error !!!"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:456
+#: ../src/common/imagpcx.cpp:463
 msgid "PCX: version number too low"
 msgstr ""
 
@@ -2131,55 +2826,75 @@ msgstr ""
 msgid "PNM: File seems truncated."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:741
+#: ../src/common/prntbase.cpp:1247
 #, c-format
 msgid "Page %d"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:739
+#: ../src/common/prntbase.cpp:1245
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:601
+#: ../src/generic/prntdlgg.cpp:827
 msgid "Page Setup"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:163
+#: ../src/common/prntbase.cpp:451 ../src/gtk/gnome/gprint.cpp:533
+msgid "Page setup"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:210
 msgid "Pages"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:552 ../src/generic/prntdlgg.cpp:623
-#: ../src/generic/prntdlgg.cpp:805
+#: ../src/generic/prntdlgg.cpp:800 ../src/generic/prntdlgg.cpp:854
+#: ../src/generic/prntdlgg.cpp:1056
 msgid "Paper Size"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:612
-#: ../src/generic/prntdlgg.cpp:801
+#: ../src/generic/prntdlgg.cpp:598 ../src/generic/prntdlgg.cpp:841
+#: ../src/generic/prntdlgg.cpp:1051
 msgid "Paper size"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:692
+#: ../src/common/xtistrm.cpp:425
+msgid "Passing a already registered object to SetObject"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:643
+msgid "Passing a already registered object to SetObjectName"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:436 ../src/common/xtistrm.cpp:656
+msgid "Passing an unkown object to GetObject"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:444
 msgid "Permissions"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:585 ../src/unix/utilsunx.cpp:613
+#: ../include/wx/unix/pipe.h:47
 msgid "Pipe creation failed"
 msgstr ""
 
-#: ../src/gtk/fontdlg.cpp:72
+#: ../src/gtk/fontdlg.cpp:81
 msgid "Please choose a valid font."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1353 ../src/gtk/filedlg.cpp:80
+#: ../src/generic/filedlgg.cpp:1330
 msgid "Please choose an existing file."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:752
+#: ../src/html/helpfrm.cpp:813
+msgid "Please choose the page to display:"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:750
 msgid "Please choose which ISP do you want to connect to"
 msgstr ""
 
-#: ../src/msw/listctrl.cpp:536
+#: ../src/msw/listctrl.cpp:434
 #, c-format
 msgid ""
 "Please install a newer version of comctl32.dll\n"
@@ -2187,157 +2902,160 @@ msgid ""
 "or this program won't operate correctly."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:111
+#: ../src/common/prntbase.cpp:313
 msgid "Please wait while printing\n"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2259 ../src/generic/prntdlgg.cpp:437
-#: ../src/generic/prntdlgg.cpp:633
+#: ../src/generic/prntdlgg.cpp:608 ../src/generic/prntdlgg.cpp:866
 msgid "Portrait"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:388
-msgid "PostScript"
-msgstr ""
-
-#: ../src/generic/prntdlgg.cpp:271
+#: ../src/generic/prntdlgg.cpp:296
 msgid "PostScript file"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2301
-msgid "PostScript:"
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:2264
-msgid "Preview Only"
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:964
+#: ../src/generic/fontdlgg.cpp:348 ../src/html/helpfrm.cpp:1235
 msgid "Preview:"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:517
+#: ../src/html/helpfrm.cpp:662
 msgid "Previous page"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:112 ../src/generic/prntdlgg.cpp:126
+#: ../src/common/prntbase.cpp:393 ../src/generic/prntdlgg.cpp:138
+#: ../src/generic/prntdlgg.cpp:151 ../src/gtk/gnome/gprint.cpp:388
+#: ../src/gtk/gnome/gprint.cpp:400
 msgid "Print"
 msgstr ""
 
-#: ../src/common/docview.cpp:910
+#: ../src/common/docview.cpp:1045
 msgid "Print Preview"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:696 ../src/common/prntbase.cpp:720
+#: ../src/common/prntbase.cpp:1199 ../src/common/prntbase.cpp:1225
 msgid "Print Preview Failure"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:171
+#: ../src/generic/prntdlgg.cpp:218
 msgid "Print Range"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:405 ../src/generic/prntdlgg.cpp:412
+#: ../src/generic/prntdlgg.cpp:445
 msgid "Print Setup"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:452
+#: ../src/generic/prntdlgg.cpp:617
 msgid "Print in colour"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:454
-msgid "Print spooling"
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:534
-msgid "Print this page"
+#: ../src/common/stockitem.cpp:138
+msgid "Print previe&w"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2263 ../src/generic/prntdlgg.cpp:149
-msgid "Print to File"
+#: ../src/gtk/gnome/gprint.cpp:778
+msgid "Print preview"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:371
-msgid "Print..."
+#: ../src/generic/prntdlgg.cpp:626
+msgid "Print spooling"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2274
-msgid "Printer Command: "
+#: ../src/html/helpfrm.cpp:679
+msgid "Print this page"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2279
-msgid "Printer Options: "
+#: ../src/generic/prntdlgg.cpp:179
+msgid "Print to File"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:357
-msgid "Printer Settings"
+#: ../src/generic/prntdlgg.cpp:489
+msgid "Printer"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:456
+#: ../src/generic/prntdlgg.cpp:629
 msgid "Printer command:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:148
+#: ../src/generic/prntdlgg.cpp:174
 msgid "Printer options"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:460
+#: ../src/generic/prntdlgg.cpp:641
 msgid "Printer options:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:679
+#: ../src/generic/prntdlgg.cpp:915
 msgid "Printer..."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:108 ../src/common/prntbase.cpp:153
+#: ../src/generic/prntdlgg.cpp:190
+msgid "Printer:"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:310 ../src/common/prntbase.cpp:531
 msgid "Printing "
 msgstr ""
 
-#: ../src/common/prntbase.cpp:125
+#: ../src/common/prntbase.cpp:327
 msgid "Printing Error"
 msgstr ""
 
-#: ../src/generic/printps.cpp:220
+#: ../src/generic/printps.cpp:208
 #, c-format
 msgid "Printing page %d..."
 msgstr ""
 
-#: ../src/generic/printps.cpp:180
+#: ../src/generic/printps.cpp:168
 msgid "Printing..."
 msgstr ""
 
-#: ../src/common/log.cpp:454
+#: ../src/common/debugrpt.cpp:524
+#, c-format
+msgid ""
+"Processing debug report has failed, leaving the files in \"%s\" directory."
+msgstr ""
+
+#: ../src/common/log.cpp:466
 msgid "Program aborted."
 msgstr ""
 
-#: ../src/common/paper.cpp:119
+#: ../src/common/paper.cpp:126
 msgid "Quarto, 215 x 275 mm"
 msgstr ""
 
-#: ../src/generic/logg.cpp:1053
+#: ../src/generic/logg.cpp:1166
 msgid "Question"
 msgstr ""
 
-#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:146
+#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:144
 #, c-format
 msgid "Read error on file '%s'"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:497
+#: ../src/common/prntbase.cpp:242
+msgid "Ready"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:582
 #, c-format
 msgid "Referenced object node with ref=\"%s\" not found!"
 msgstr ""
 
-#: ../src/msw/registry.cpp:535
+#: ../src/common/stockitem.cpp:142
+msgid "Refresh"
+msgstr ""
+
+#: ../src/msw/registry.cpp:552
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr ""
 
-#: ../src/msw/registry.cpp:504
+#: ../src/msw/registry.cpp:521
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr ""
 
-#: ../src/msw/registry.cpp:631
+#: ../src/msw/registry.cpp:653
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -2345,241 +3063,309 @@ msgid ""
 "operation aborted."
 msgstr ""
 
-#: ../src/msw/registry.cpp:435
+#: ../src/msw/registry.cpp:448
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:334
+#: ../src/generic/helpext.cpp:442
 msgid "Relevant entries:"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:199
+#: ../src/generic/progdlgg.cpp:210
 msgid "Remaining time : "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:324
+#: ../src/common/stockitem.cpp:143
+msgid "Remove"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:445
 msgid "Remove current page from bookmarks"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:177
+#: ../src/common/rendcmn.cpp:193
+#, c-format
+msgid "Renderer \"%s\" has incompatible version %d.%d and couldn't be loaded."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:117
+msgid "Rep&lace"
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:188
 msgid "Replace &all"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:129
+#: ../src/generic/fdrepdlg.cpp:130
 msgid "Replace with:"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:359
+#: ../src/xrc/xmlres.cpp:418
 msgid "Resource files must have same version number!"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:658
+#: ../src/common/stockitem.cpp:144
+msgid "Revert to Saved"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:891
 msgid "Right margin (mm):"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:223
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Roman"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1561 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:541
+#: ../src/common/sizer.cpp:1841
+msgid "Save"
+msgstr ""
+
+#: ../src/common/fldlgcmn.cpp:259
 #, c-format
 msgid "Save %s file"
 msgstr ""
 
-#: ../src/common/docview.cpp:245
-msgid "Save as"
+#: ../src/common/stockitem.cpp:146
+msgid "Save &As..."
 msgstr ""
 
-#: ../src/generic/logg.cpp:480
-msgid "Save log contents to file"
+#: ../src/common/docview.cpp:305
+msgid "Save as"
 msgstr ""
 
-#: ../src/mgl/window.cpp:132
-msgid "Screenshot captured: "
+#: ../src/generic/logg.cpp:508
+msgid "Save log contents to file"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:226
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Script"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:408 ../src/html/helpfrm.cpp:423
+#: ../src/html/helpfrm.cpp:536 ../src/html/helpfrm.cpp:551
 msgid "Search"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:410
+#: ../src/html/helpfrm.cpp:538
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:158
+#: ../src/generic/fdrepdlg.cpp:166
 msgid "Search direction"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:117
+#: ../src/generic/fdrepdlg.cpp:118
 msgid "Search for:"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:789
+#: ../src/html/helpfrm.cpp:1060
 msgid "Search in all books"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:650
+#: ../src/html/helpfrm.cpp:868
 msgid "Searching..."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:549
+#: ../src/generic/dirctrlg.cpp:584
 msgid "Sections"
 msgstr ""
 
-#: ../src/common/ffile.cpp:213
+#: ../src/common/ffile.cpp:222
 #, c-format
 msgid "Seek error on file '%s'"
 msgstr ""
 
-#: ../src/common/docview.cpp:1525
+#: ../src/common/ffile.cpp:212
+#, c-format
+msgid "Seek error on file '%s' (large files not supported by stdio)"
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:2069
+msgid "Select &All"
+msgstr ""
+
+#: ../src/common/docview.cpp:1712
 msgid "Select a document template"
 msgstr ""
 
-#: ../src/common/docview.cpp:1601
+#: ../src/common/docview.cpp:1789
 msgid "Select a document view"
 msgstr ""
 
-#: ../src/common/docview.cpp:1392 ../src/common/docview.cpp:1443
+#: ../src/common/docview.cpp:1592
 msgid "Select a file"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2262
-msgid "Send to Printer"
-msgstr ""
-
-#: ../src/common/cmdline.cpp:668
+#: ../src/common/cmdline.cpp:739
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr ""
 
-#: ../src/msw/glcanvas.cpp:432
-msgid "SetPixelFormat failed."
-msgstr ""
-
-#: ../src/common/dlgcmn.cpp:173
-msgid "Setup"
+#: ../include/wx/xti.h:841
+msgid "SetProperty called w/o valid setter"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:154
+#: ../src/generic/prntdlgg.cpp:182
 msgid "Setup..."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:523
+#: ../src/msw/dialup.cpp:530
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:364
+#: ../src/html/helpfrm.cpp:493
 msgid "Show all"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:375
+#: ../src/html/helpfrm.cpp:504
 msgid "Show all items in index"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:135
+#: ../src/generic/dirdlgg.cpp:114 ../src/generic/dirdlgg.cpp:177
 msgid "Show hidden directories"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1149 ../src/generic/filedlgg.cpp:1171
+#: ../src/generic/filedlgg.cpp:1064
 msgid "Show hidden files"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:501
+#: ../src/html/helpfrm.cpp:646
 msgid "Show/hide navigation panel"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:688
+#: ../src/generic/fontdlgg.cpp:353 ../src/generic/fontdlgg.cpp:355
+msgid "Shows the font preview."
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:439
 msgid "Size"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:231
+#: ../src/generic/progdlgg.cpp:222 ../src/generic/progdlgg.cpp:240
+#: ../src/generic/progdlgg.cpp:598
+msgid "Skip"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:234
 msgid "Slant"
 msgstr ""
 
-#: ../src/common/docview.cpp:302
+#: ../src/common/docview.cpp:581
 msgid "Sorry, could not open this file for saving."
 msgstr ""
 
-#: ../src/common/docview.cpp:339 ../src/common/docview.cpp:352
-#: ../src/common/docview.cpp:1411
+#: ../src/common/docview.cpp:613 ../src/common/docview.cpp:626
+#: ../src/common/docview.cpp:1611
 msgid "Sorry, could not open this file."
 msgstr ""
 
-#: ../src/common/docview.cpp:309
+#: ../src/common/docview.cpp:588
 msgid "Sorry, could not save this file."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:696
+#: ../src/common/prntbase.cpp:1199
 msgid "Sorry, not enough memory to create a preview."
 msgstr ""
 
-#: ../src/common/paper.cpp:111
+#: ../src/common/docview.cpp:1041
+msgid "Sorry, print preview needs a printer to be installed."
+msgstr ""
+
+#: ../src/common/docview.cpp:1281 ../src/common/docview.cpp:1631
+msgid "Sorry, the format for this file is unknown."
+msgstr ""
+
+#: ../src/unix/sound.cpp:493
+msgid "Sound data are in unsupported format."
+msgstr ""
+
+#: ../src/unix/sound.cpp:478
+#, c-format
+msgid "Sound file '%s' is in unsupported format."
+msgstr ""
+
+#: ../src/common/paper.cpp:118
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr ""
 
-#: ../src/generic/logg.cpp:597
+#: ../src/generic/prntdlgg.cpp:198
+msgid "Status:"
+msgstr ""
+
+#: ../src/generic/logg.cpp:625
 msgid "Status: "
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:557
+#: ../src/common/xtistrm.cpp:253
+msgid "Streaming delegates for not already streamed objects not yet supported"
+msgstr ""
+
+#: ../src/msw/colour.cpp:38 ../src/palmos/colour.cpp:38
+#, c-format
+msgid "String To Colour : Incorrect colour specification : %s"
+msgstr ""
+
+#: ../include/wx/xti.h:428 ../include/wx/xti.h:432
+msgid "String conversions not supported"
+msgstr ""
+
+#: ../src/xrc/xmlres.cpp:689
 #, c-format
 msgid "Subclass '%s' not found for resource '%s', not subclassing!"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:227
+#: ../src/generic/fontdlgg.cpp:230
 msgid "Swiss"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:204 ../src/common/imagtiff.cpp:215
-#: ../src/common/imagtiff.cpp:326
+#: ../src/common/imagtiff.cpp:232 ../src/common/imagtiff.cpp:243
+#: ../src/common/imagtiff.cpp:383
 msgid "TIFF: Couldn't allocate memory."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:175
+#: ../src/common/imagtiff.cpp:203
 msgid "TIFF: Error loading image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:226
+#: ../src/common/imagtiff.cpp:254
 msgid "TIFF: Error reading image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:303
+#: ../src/common/imagtiff.cpp:331
 msgid "TIFF: Error saving image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:350
+#: ../src/common/imagtiff.cpp:434
 msgid "TIFF: Error writing image."
 msgstr ""
 
-#: ../src/common/paper.cpp:109
+#: ../src/common/paper.cpp:116
 msgid "Tabloid, 11 x 17 in"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:228
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Teletype"
 msgstr ""
 
-#: ../src/common/docview.cpp:1526
+#: ../src/common/docview.cpp:1713
 msgid "Templates"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:122
+#: ../src/common/fmapbase.cpp:113
 msgid "Thai (ISO-8859-11)"
 msgstr ""
 
-#: ../src/common/ftp.cpp:569
+#: ../src/common/ftp.cpp:708
 msgid "The FTP server doesn't support passive mode."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:630
+#: ../src/common/ftp.cpp:696
+msgid "The FTP server doesn't support the PORT command."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:204
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -2587,412 +3373,545 @@ msgid ""
 "[Cancel] if it cannot be replaced"
 msgstr ""
 
-#: ../src/msw/ole/dataobj.cpp:161
+#: ../src/msw/ole/dataobj.cpp:164
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:186
+#: ../src/generic/dirdlgg.cpp:226
 #, c-format
 msgid ""
 "The directory '%s' does not exist\n"
 "Create it now?"
 msgstr ""
 
-#: ../src/common/docview.cpp:1789
+#: ../src/common/docview.cpp:1962
+#, c-format
+msgid ""
+"The file '%s' couldn't be opened.\n"
+"It has been removed from the most recently used files list."
+msgstr ""
+
+#: ../src/common/docview.cpp:1972
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
 "It has been removed from the most recently used files list."
 msgstr ""
 
-#: ../src/common/filename.cpp:884
+#: ../src/generic/fontdlgg.cpp:316 ../src/generic/fontdlgg.cpp:318
+msgid "The font colour."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:277 ../src/generic/fontdlgg.cpp:279
+msgid "The font family."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:328 ../src/generic/fontdlgg.cpp:330
+msgid "The font point size."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:288 ../src/generic/fontdlgg.cpp:290
+msgid "The font style."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:299 ../src/generic/fontdlgg.cpp:301
+msgid "The font weight."
+msgstr ""
+
+#: ../src/common/filename.cpp:966
 #, c-format
 msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:802
+#: ../src/generic/dbgrptg.cpp:289
+msgid ""
+"The report contains the files listed below. If any of these files contain "
+"private information,\n"
+"please uncheck them and they will be removed from the report.\n"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:883
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr ""
 
-#: ../src/common/textcmn.cpp:187
+#: ../src/common/textcmn.cpp:246
 msgid "The text couldn't be saved."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:781
+#: ../src/common/cmdline.cpp:862
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:411
+#: ../src/msw/dialup.cpp:418
 #, 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 ""
 
-#: ../src/html/htmprint.cpp:548
+#: ../src/html/htmprint.cpp:601
 msgid ""
 "There was a problem during page setup: you may need to set a default printer."
 msgstr ""
 
-#: ../src/msw/thread.cpp:1298
+#: ../src/msw/datectrl.cpp:109
+msgid ""
+"This system doesn't support date picker control, please upgrade your version "
+"of comctl32.dll"
+msgstr ""
+
+#: ../src/msw/thread.cpp:1204
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1688
+#: ../src/unix/threadpsx.cpp:1603
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr ""
 
-#: ../src/msw/thread.cpp:1286
+#: ../src/msw/thread.cpp:1192
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1208
+#: ../src/unix/threadpsx.cpp:1108
 msgid "Thread priority setting is ignored."
 msgstr ""
 
-#: ../src/msw/mdi.cpp:186
+#: ../src/msw/mdi.cpp:187
 msgid "Tile &Horizontally"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:187
+#: ../src/msw/mdi.cpp:188
 msgid "Tile &Vertically"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:690
-msgid "Time"
+#: ../src/common/ftp.cpp:635
+msgid "Timeout while waiting for FTP server to connect, try passive mode."
+msgstr ""
+
+#: ../src/msw/timer.cpp:116 ../src/os2/timer.cpp:141
+msgid "Timer creation failed."
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:163
+#: ../src/generic/tipdlg.cpp:220
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:139
+#: ../src/generic/tipdlg.cpp:157
 msgid "Tips not available, sorry!"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:190
+#: ../src/generic/prntdlgg.cpp:237
 msgid "To:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:647
+#: ../src/common/imagpng.cpp:292
+msgid "Too many colours in PNG, the image may be slightly blurred."
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:880
 msgid "Top margin (mm):"
 msgstr ""
 
-#: ../src/common/fs_mem.cpp:203
+#: ../src/common/fs_mem.cpp:205
 #, c-format
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr ""
 
-#: ../src/common/sckaddr.cpp:126
+#: ../src/common/sckaddr.cpp:146 ../src/common/sckaddr.cpp:250
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fmapbase.cpp:111
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
-#: ../src/common/paper.cpp:140
+#: ../src/generic/filedlgg.cpp:440
+msgid "Type"
+msgstr ""
+
+#: ../src/common/xtistrm.cpp:281 ../src/common/xtixml.cpp:351
+#: ../src/common/xtixml.cpp:498
+msgid "Type must have enum - long conversion"
+msgstr ""
+
+#: ../src/common/paper.cpp:147
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:270
+#: ../src/html/htmlwin.cpp:403
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:252
-msgid "Underline"
+#: ../src/unix/sound.cpp:376
+msgid "Unable to play sound asynchronously."
+msgstr ""
+
+#: ../src/common/stockitem.cpp:148
+msgid "Undelete"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:305 ../src/common/resourc2.cpp:319
-#: ../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
-msgid "Unexpected end of file whilst parsing resource."
+#: ../contrib/src/deprecated/resource.cpp:1848
+#: ../contrib/src/deprecated/resource.cpp:1862
+#: ../contrib/src/deprecated/resource.cpp:1879
+#: ../contrib/src/deprecated/resource.cpp:1893
+#: ../contrib/src/deprecated/resource.cpp:1978
+#: ../contrib/src/deprecated/resource.cpp:1992
+#: ../contrib/src/deprecated/resource.cpp:2008
+#: ../contrib/src/deprecated/resource.cpp:2022
+#: ../contrib/src/deprecated/resource.cpp:3070
+#: ../contrib/src/deprecated/resource.cpp:3084
+#: ../contrib/src/deprecated/resource.cpp:3101
+#: ../contrib/src/deprecated/resource.cpp:3115
+msgid "Unexpected end of file while parsing resource."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:753
+#: ../src/common/cmdline.cpp:826
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:141
+#: ../src/common/fmapbase.cpp:135
+msgid "Unicode 16 bit (UTF-16)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:136
+msgid "Unicode 16 bit Big Endian (UTF-16BE)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:137
+msgid "Unicode 16 bit Little Endian (UTF-16LE)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:138
+msgid "Unicode 32 bit (UTF-32)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:139
+msgid "Unicode 32 bit Big Endian (UTF-32BE)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:140
+msgid "Unicode 32 bit Little Endian (UTF-32LE)"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:133
 msgid "Unicode 7 bit (UTF-7)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:142
+#: ../src/common/fmapbase.cpp:134
 msgid "Unicode 8 bit (UTF-8)"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1020
+#: ../src/msw/dde.cpp:1092
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:403
+#: ../src/common/xtistrm.cpp:370
+msgid "Unknown Object passed to GetObjectClassInfo"
+msgstr ""
+
+#: ../src/unix/dlunix.cpp:275
+msgid "Unknown dynamic library error"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:688
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:2125
+#: ../src/unix/mimetype.cpp:2344
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:537
+#: ../src/common/cmdline.cpp:599
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:559
+#: ../src/common/cmdline.cpp:608 ../src/common/cmdline.cpp:629
 #, c-format
 msgid "Unknown option '%s'"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:627
+#: ../src/xrc/xmlres.cpp:762
 msgid "Unknown style flag "
 msgstr ""
 
-#: ../src/common/mimecmn.cpp:167
+#: ../src/common/xtixml.cpp:324
+#, c-format
+msgid "Unkown Property %s"
+msgstr ""
+
+#: ../src/common/mimecmn.cpp:161
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr ""
 
-#: ../src/common/cmdproc.cpp:233 ../src/common/cmdproc.cpp:248
-#: ../src/common/cmdproc.cpp:275
+#: ../src/common/cmdproc.cpp:261 ../src/common/cmdproc.cpp:287
+#: ../src/common/cmdproc.cpp:307
 msgid "Unnamed command"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2336
+#: ../contrib/src/deprecated/resource.cpp:2367
 #, c-format
-msgid "Unrecognized style %s whilst parsing resource."
+msgid "Unrecognized style %s while parsing resource."
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:58 ../src/msw/clipbrd.cpp:273
-#: ../src/msw/clipbrd.cpp:447
+#: ../src/mac/carbon/clipbrd.cpp:68 ../src/mac/classic/clipbrd.cpp:64
+#: ../src/msw/clipbrd.cpp:273 ../src/msw/clipbrd.cpp:445
 msgid "Unsupported clipboard format."
 msgstr ""
 
-#: ../src/common/appcmn.cpp:311
+#: ../src/common/appcmn.cpp:232
 #, c-format
 msgid "Unsupported theme '%s'."
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:157
+#: ../src/generic/fdrepdlg.cpp:158
 msgid "Up"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:838
+#: ../src/common/cmdline.cpp:953
 #, c-format
 msgid "Usage: %s"
 msgstr ""
 
-#: ../src/common/valtext.cpp:196
+#: ../src/common/valtext.cpp:181
 msgid "Validation conflict"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1079
+#: ../contrib/src/mmedia/vidbase.cpp:65
+msgid "Video Output"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:980
 msgid "View files as a detailed view"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1072
+#: ../src/generic/filedlgg.cpp:973
 msgid "View files as a list view"
 msgstr ""
 
-#: ../src/common/docview.cpp:1602
+#: ../src/common/docview.cpp:1790
 msgid "Views"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:801
+#: ../src/unix/baseunix.cpp:78
 msgid "Waiting for subprocess termination failed"
 msgstr ""
 
-#: ../src/common/docview.cpp:435 ../src/common/resource.cpp:124
+#: ../src/common/docview.cpp:461
 msgid "Warning"
 msgstr ""
 
-#: ../src/common/log.cpp:464
+#: ../src/common/log.cpp:480
 msgid "Warning: "
 msgstr ""
 
-#: ../src/html/htmlpars.cpp:357
+#: ../src/html/htmlpars.cpp:395
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:112
+#: ../src/common/fmapbase.cpp:103
 msgid "Western European (ISO-8859-1)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:126
+#: ../src/common/fmapbase.cpp:117
 msgid "Western European with Euro (ISO-8859-15)"
 msgstr ""
 
-#: ../src/generic/fdrepdlg.cpp:149
+#: ../src/generic/fontdlgg.cpp:339 ../src/generic/fontdlgg.cpp:341
+msgid "Whether the font is underlined."
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:150
 msgid "Whole word"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:407
+#: ../src/html/helpfrm.cpp:535
 msgid "Whole words only"
 msgstr ""
 
-#: ../src/univ/themes/win32.cpp:1168
+#: ../src/univ/themes/win32.cpp:1235
 msgid "Win32 theme"
 msgstr ""
 
-#: ../src/msw/utils.cpp:975
+#: ../src/msw/utils.cpp:1096
 msgid "Win32s on Windows 3.1"
 msgstr ""
 
-#: ../src/msw/utils.cpp:1007
-msgid "Windows 3.1"
+#: ../src/msw/utils.cpp:1145
+#, c-format
+msgid "Windows 2000 (build %lu"
+msgstr ""
+
+#: ../src/msw/utils.cpp:1110
+msgid "Windows 95"
+msgstr ""
+
+#: ../src/msw/utils.cpp:1106
+msgid "Windows 95 OSR2"
 msgstr ""
 
-#: ../src/msw/utils.cpp:979
+#: ../src/msw/utils.cpp:1121
+msgid "Windows 98"
+msgstr ""
+
+#: ../src/msw/utils.cpp:1117
+msgid "Windows 98 SE"
+msgstr ""
+
+#: ../src/msw/utils.cpp:1128
 #, c-format
-msgid "Windows 9%c"
+msgid "Windows 9x (%d.%d)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:138
+#: ../src/common/fmapbase.cpp:130
 msgid "Windows Arabic (CP 1256)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:139
+#: ../src/common/fmapbase.cpp:131
 msgid "Windows Baltic (CP 1257)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:132
+#: ../src/common/fmapbase.cpp:124
 msgid "Windows Central European (CP 1250)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:129
+#: ../src/common/fmapbase.cpp:121
 msgid "Windows Chinese Simplified (CP 936)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:131
+#: ../src/common/fmapbase.cpp:123
 msgid "Windows Chinese Traditional (CP 950)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:133
+#: ../src/common/fmapbase.cpp:125
 msgid "Windows Cyrillic (CP 1251)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:135
+#: ../src/common/fmapbase.cpp:127
 msgid "Windows Greek (CP 1253)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:137
+#: ../src/common/fmapbase.cpp:129
 msgid "Windows Hebrew (CP 1255)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:128
+#: ../src/common/fmapbase.cpp:120
 msgid "Windows Japanese (CP 932)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:130
+#: ../src/common/fmapbase.cpp:122
 msgid "Windows Korean (CP 949)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:136
-msgid "Windows Turkish (CP 1254)"
+#: ../src/msw/utils.cpp:1125
+msgid "Windows ME"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:134
-msgid "Windows Western European (CP 1252)"
+#: ../src/msw/utils.cpp:1160
+#, c-format
+msgid "Windows NT %lu.%lu (build %lu"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:140
-msgid "Windows/DOS OEM (CP 437)"
+#: ../src/msw/utils.cpp:1153
+#, c-format
+msgid "Windows Server 2003 (build %lu"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:128
+msgid "Windows Turkish (CP 1254)"
 msgstr ""
 
-#: ../src/common/ffile.cpp:160
+#: ../src/common/fmapbase.cpp:126
+msgid "Windows Western European (CP 1252)"
+msgstr ""
+
+#: ../src/msw/utils.cpp:1149
 #, c-format
-msgid "Write error on file '%s'"
+msgid "Windows XP (build %lu"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2319
-msgid "X Scaling"
+#: ../src/common/fmapbase.cpp:132
+msgid "Windows/DOS OEM (CP 437)"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2328
-msgid "X Translation"
+#: ../src/common/ffile.cpp:158
+#, c-format
+msgid "Write error on file '%s'"
 msgstr ""
 
-#: ../contrib/src/xrc/xml.cpp:529
+#: ../src/xml/xml.cpp:562
 #, c-format
 msgid "XML parsing error: '%s' at line %d"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:761
+#: ../src/common/xpmdecod.cpp:774
 msgid "XPM: Malformed pixel data!"
 msgstr ""
 
-#: ../src/common/xpmdecod.cpp:711 ../src/common/xpmdecod.cpp:720
+#: ../src/common/xpmdecod.cpp:712 ../src/common/xpmdecod.cpp:721
 #, c-format
 msgid "XPM: malformed colour definition '%s'!"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:435
+#: ../src/xrc/xmlres.cpp:518
 #, c-format
 msgid "XRC resource '%s' (class '%s') not found!"
 msgstr ""
 
-#: ../contrib/src/xrc/xmlres.cpp:764 ../contrib/src/xrc/xmlres.cpp:774
+#: ../src/xrc/xmlres.cpp:1019 ../src/xrc/xmlres.cpp:1031
 #, c-format
 msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
 
-#: ../contrib/src/xrc/xh_dlg.cpp:52 ../contrib/src/xrc/xh_frame.cpp:57
-msgid "XRC resource: Cannot create dialog without instance."
-msgstr ""
-
-#: ../contrib/src/xrc/xmlres.cpp:744
+#: ../src/xrc/xmlres.cpp:975
 #, c-format
 msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2323
-msgid "Y Scaling"
+#: ../src/mac/carbon/msgdlg.cpp:61 ../src/mac/carbon/msgdlg.cpp:144
+#: ../src/mac/classic/msgdlg.cpp:59 ../src/mac/classic/msgdlg.cpp:141
+#: ../src/motif/msgdlg.cpp:187
+msgid "Yes"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2332
-msgid "Y Translation"
+#: ../src/generic/dirdlgg.cpp:308
+msgid "You cannot add a new directory to this section."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:151 ../src/mac/msgdlg.cpp:77
-#: ../src/motif/msgdlg.cpp:180
-msgid "Yes"
+#: ../src/common/stockitem.cpp:155
+msgid "Zoom &In"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:262
-msgid "You cannot add a new directory to this section."
+#: ../src/common/stockitem.cpp:156
+msgid "Zoom &Out"
 msgstr ""
 
-#: ../src/common/fs_zip.cpp:86 ../src/common/fs_zip.cpp:123
-msgid "ZIP handler currently supports only local files!"
+#: ../src/common/stockitem.cpp:154
+msgid "Zoom to &Fit"
 msgstr ""
 
-#: ../src/common/docview.cpp:1938
+#: ../src/common/docview.cpp:2146
 msgid "[EMPTY]"
 msgstr ""
 
-#: ../src/msw/dde.cpp:987
+#: ../src/msw/dde.cpp:1059
 msgid "a DDEML application has created a prolonged race condition."
 msgstr ""
 
-#: ../src/msw/dde.cpp:975
+#: ../src/msw/dde.cpp:1047
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -3000,54 +3919,54 @@ msgid ""
 "was passed to a DDEML function."
 msgstr ""
 
-#: ../src/msw/dde.cpp:993
+#: ../src/msw/dde.cpp:1065
 msgid "a client's attempt to establish a conversation has failed."
 msgstr ""
 
-#: ../src/msw/dde.cpp:990
+#: ../src/msw/dde.cpp:1062
 msgid "a memory allocation failed."
 msgstr ""
 
-#: ../src/msw/dde.cpp:984
+#: ../src/msw/dde.cpp:1056
 msgid "a parameter failed to be validated by the DDEML."
 msgstr ""
 
-#: ../src/msw/dde.cpp:966
+#: ../src/msw/dde.cpp:1038
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:972
+#: ../src/msw/dde.cpp:1044
 msgid "a request for a synchronous data transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:981
+#: ../src/msw/dde.cpp:1053
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:999
+#: ../src/msw/dde.cpp:1071
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1014
+#: ../src/msw/dde.cpp:1086
 msgid "a request to end an advise transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1008
+#: ../src/msw/dde.cpp:1080
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
 
-#: ../src/msw/dde.cpp:996
+#: ../src/msw/dde.cpp:1068
 msgid "a transaction failed."
 msgstr ""
 
-#: ../src/common/menucmn.cpp:99
+#: ../src/common/menucmn.cpp:114
 msgid "alt"
 msgstr ""
 
-#: ../src/msw/dde.cpp:978
+#: ../src/msw/dde.cpp:1050
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -3055,126 +3974,158 @@ msgid ""
 "attempted to perform server transactions."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1002
+#: ../src/msw/dde.cpp:1074
 msgid "an internal call to the PostMessage function has failed. "
 msgstr ""
 
-#: ../src/msw/dde.cpp:1011
+#: ../src/msw/dde.cpp:1083
 msgid "an internal error has occurred in the DDEML."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1017
+#: ../src/msw/dde.cpp:1089
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1556
+#: ../src/common/zipstrm.cpp:1331
+msgid "assuming this is a multi-part zip concatenated"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:1819
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr ""
 
-#: ../src/common/ftp.cpp:369
+#: ../src/html/chm.cpp:330
+msgid "bad arguments to library function"
+msgstr ""
+
+#: ../src/html/chm.cpp:342
+msgid "bad signature"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1581
+msgid "bad zipfile offset to entry"
+msgstr ""
+
+#: ../src/common/ftp.cpp:385
 msgid "binary"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:518
+#: ../src/common/fontcmn.cpp:645
 msgid "bold"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:442
+#: ../src/common/fontcmn.cpp:569
 msgid "bold "
 msgstr ""
 
-#: ../src/common/ffile.cpp:93
+#: ../src/common/ffile.cpp:91
 #, c-format
 msgid "can't close file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:276
+#: ../src/common/file.cpp:286
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:554
+#: ../src/common/file.cpp:551
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:219
+#: ../src/common/file.cpp:217
 #, c-format
 msgid "can't create file '%s'"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1025
+#: ../src/common/fileconf.cpp:1134
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:459
+#: ../src/common/file.cpp:457
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:425
+#: ../src/common/zipstrm.cpp:1358
+msgid "can't find central directory in zip"
+msgstr ""
+
+#: ../src/common/file.cpp:427
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr ""
 
-#: ../src/msw/utils.cpp:374
+#: ../src/msw/utils.cpp:376
 msgid "can't find user's HOME, using current directory."
 msgstr ""
 
-#: ../src/common/file.cpp:339
+#: ../src/common/file.cpp:341
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:393
+#: ../src/common/file.cpp:399 ../src/msw/wince/filefnwce.cpp:202
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:766
+#: ../src/common/fontmap.cpp:326
 msgid "can't load any font, aborting"
 msgstr ""
 
-#: ../src/common/ffile.cpp:77 ../src/common/file.cpp:262
+#: ../src/common/ffile.cpp:75 ../src/common/file.cpp:271
 #, c-format
 msgid "can't open file '%s'"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:388
+#: ../src/common/fileconf.cpp:404
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:400
+#: ../src/common/fileconf.cpp:419
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:905
+#: ../src/common/fileconf.cpp:981
 msgid "can't open user configuration file."
 msgstr ""
 
-#: ../src/common/file.cpp:302
+#: ../src/common/dynlib.cpp:253
+msgid "can't query for GUI plugins name in console applications"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:436
+msgid "can't re-initialize zlib deflate stream"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:461
+msgid "can't re-initialize zlib inflate stream"
+msgstr ""
+
+#: ../src/common/file.cpp:310
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:549
+#: ../src/common/file.cpp:546
 #, c-format
 msgid "can't remove file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:565
+#: ../src/common/file.cpp:562
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:379
+#: ../src/common/file.cpp:385 ../src/msw/wince/filefnwce.cpp:189
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr ""
@@ -3184,365 +4135,459 @@ msgstr ""
 msgid "can't write buffer '%s' to disk."
 msgstr ""
 
-#: ../src/common/file.cpp:324
+#: ../src/common/file.cpp:326
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:912
+#: ../src/common/fileconf.cpp:992
 msgid "can't write user configuration file."
 msgstr ""
 
-#: ../src/common/intl.cpp:363
+#: ../src/common/intl.cpp:1109
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr ""
 
-#: ../src/common/menucmn.cpp:97
+#: ../src/html/chm.cpp:346
+msgid "checksum error"
+msgstr ""
+
+#: ../src/html/chm.cpp:348
+msgid "compression error"
+msgstr ""
+
+#: ../src/common/regex.cpp:141
+msgid "conversion to 8-bit encoding failed"
+msgstr ""
+
+#: ../src/common/menucmn.cpp:112
 msgid "ctrl"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:979
+#: ../src/common/cmdline.cpp:1093
 msgid "date"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:413
+#: ../src/html/chm.cpp:350
+msgid "decompression error"
+msgstr ""
+
+#: ../src/common/fmapbase.cpp:698 ../src/common/fmapbase.cpp:730
 msgid "default"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3237
+#: ../src/common/xtistrm.cpp:843
+msgid "delegate has no type info"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:502
+msgid "dump of the process state (binary)"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3779
 msgid "eighteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3227
+#: ../src/common/datetime.cpp:3769
 msgid "eighth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3230
+#: ../src/common/datetime.cpp:3772
 msgid "eleventh"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1543
+#: ../src/common/strconv.cpp:2671
+#, c-format
+msgid "encoding %s"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:1805
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:846
+#: ../src/html/chm.cpp:344
+msgid "error in data format"
+msgstr ""
+
+#: ../src/html/chm.cpp:332
+msgid "error opening file"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1443
+msgid "error reading zip central directory"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1521
+msgid "error reading zip local header"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:2237
+#, c-format
+msgid "error writing zip entry '%s': bad crc or length"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:844
 msgid "establish"
 msgstr ""
 
-#: ../src/common/ffile.cpp:174
+#: ../src/common/ffile.cpp:172
 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3234
+#: ../src/common/datetime.cpp:3776
 msgid "fifteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3224
+#: ../src/common/datetime.cpp:3766
 msgid "fifth"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:612
+#: ../src/common/fileconf.cpp:664
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:641
+#: ../src/common/fileconf.cpp:693
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:667
+#: ../src/common/fileconf.cpp:716
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:657
+#: ../src/common/fileconf.cpp:706
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:580
+#: ../src/common/fileconf.cpp:628
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3220
+#: ../src/common/datetime.cpp:3762
 msgid "first"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3233
+#: ../src/html/helpfrm.cpp:1262
+msgid "font size"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3775
 msgid "fourteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3223
+#: ../src/common/datetime.cpp:3765
 msgid "fourth"
 msgstr ""
 
-#: ../src/common/appcmn.cpp:250
+#: ../src/common/appbase.cpp:361
 msgid "generate verbose log messages"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:278
-msgid "gmtime() failed"
+#: ../src/common/xtixml.cpp:479
+msgid "incorrect event handler string, missing dot"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:846
+#: ../src/msw/dialup.cpp:844
 msgid "initiate"
 msgstr ""
 
-#: ../src/common/file.cpp:463
+#: ../src/common/file.cpp:459
 msgid "invalid eof() return value."
 msgstr ""
 
-#: ../src/generic/logg.cpp:1067
+#: ../src/generic/logg.cpp:1180
 msgid "invalid message box return value"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:458 ../src/common/fontcmn.cpp:522
-msgid "italic"
+#: ../src/common/zipstrm.cpp:1307
+msgid "invalid zip file"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:935
-msgid "large"
+#: ../src/common/fontcmn.cpp:585 ../src/common/fontcmn.cpp:649
+msgid "italic"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:514
+#: ../src/common/fontcmn.cpp:641
 msgid "light"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:438
+#: ../src/common/fontcmn.cpp:565
 msgid "light "
 msgstr ""
 
-#: ../src/common/intl.cpp:614
+#: ../src/common/intl.cpp:1455
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr ""
 
-#: ../src/common/intl.cpp:358
+#: ../src/common/intl.cpp:1102
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:935
-msgid "medium"
-msgstr ""
-
-#: ../src/common/datetime.cpp:3385
+#: ../src/common/datetime.cpp:3926
 msgid "midnight"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:274
-msgid "mktime() failed"
-msgstr ""
-
-#: ../src/common/datetime.cpp:3238
+#: ../src/common/datetime.cpp:3780
 msgid "nineteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3228
+#: ../src/common/datetime.cpp:3770
 msgid "ninth"
 msgstr ""
 
-#: ../src/msw/dde.cpp:962
+#: ../src/msw/dde.cpp:1034
 msgid "no DDE error."
 msgstr ""
 
-#: ../src/html/helpdata.cpp:559
+#: ../src/html/chm.cpp:328
+msgid "no error"
+msgstr ""
+
+#: ../src/html/helpdata.cpp:662
 msgid "noname"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3384
+#: ../src/common/datetime.cpp:3925
 msgid "noon"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:978
+#: ../src/common/cmdline.cpp:1089
 msgid "num"
 msgstr ""
 
-#: ../src/common/filename.cpp:162
+#: ../src/common/xtixml.cpp:258
+msgid "objects cannot have XML Text Nodes"
+msgstr ""
+
+#: ../src/html/chm.cpp:340
+msgid "out of memory"
+msgstr ""
+
+#: ../src/common/debugrpt.cpp:478
+msgid "process context description"
+msgstr ""
+
+#: ../src/html/chm.cpp:334
+msgid "read error"
+msgstr ""
+
+#: ../src/common/filename.cpp:181
 msgid "reading"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1005
+#: ../src/common/zipstrm.cpp:1744
+#, c-format
+msgid "reading zip stream (entry %s): bad crc"
+msgstr ""
+
+#: ../src/common/zipstrm.cpp:1741
+#, c-format
+msgid "reading zip stream (entry %s): bad length"
+msgstr ""
+
+#: ../src/msw/dde.cpp:1077
 msgid "reentrancy problem."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3221
+#: ../src/common/datetime.cpp:3763
 msgid "second"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3236
+#: ../src/html/chm.cpp:338
+msgid "seek error"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3778
 msgid "seventeenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3226
+#: ../src/common/datetime.cpp:3768
 msgid "seventh"
 msgstr ""
 
-#: ../src/common/menucmn.cpp:101
+#: ../src/common/menucmn.cpp:116
 msgid "shift"
 msgstr ""
 
-#: ../src/common/appcmn.cpp:240
+#: ../src/common/appbase.cpp:351
 msgid "show this help message"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3235
+#: ../src/common/datetime.cpp:3777
 msgid "sixteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3225
+#: ../src/common/datetime.cpp:3767
 msgid "sixth"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:935
-msgid "small"
-msgstr ""
-
-#: ../src/common/appcmn.cpp:275
+#: ../src/common/appcmn.cpp:203
 msgid "specify display mode to use (e.g. 640x480-16)"
 msgstr ""
 
-#: ../src/common/appcmn.cpp:261
+#: ../src/common/appcmn.cpp:189
 msgid "specify the theme to use"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:977
+#: ../src/common/zipstrm.cpp:1647
+msgid "stored file length not in Zip header"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:1085
 msgid "str"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3229
+#: ../src/common/datetime.cpp:3771
 msgid "tenth"
 msgstr ""
 
-#: ../src/msw/dde.cpp:969
+#: ../src/msw/dde.cpp:1041
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3222
+#: ../src/common/datetime.cpp:3764
 msgid "third"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3232
+#: ../src/common/datetime.cpp:3774
 msgid "thirteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3064
+#: ../src/common/imagtiff.cpp:143 ../src/common/imagtiff.cpp:151
+#, c-format
+msgid "tiff module: %s"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3591
 msgid "today"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3066
+#: ../src/common/datetime.cpp:3593
 msgid "tomorrow"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3231
+#: ../src/common/datetime.cpp:3773
 msgid "twelfth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3239
+#: ../src/common/datetime.cpp:3781
 msgid "twentieth"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:510
+#: ../src/common/fontcmn.cpp:637
 msgid "underlined"
 msgstr ""
 
-#: ../src/common/fontcmn.cpp:425
+#: ../src/common/fontcmn.cpp:552
 msgid "underlined "
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1663
+#: ../src/common/fileconf.cpp:1932
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:283
+#: ../src/generic/progdlgg.cpp:307
 msgid "unknown"
 msgstr ""
 
-#: ../src/common/regex.cpp:144
+#: ../src/common/xtixml.cpp:252
+#, c-format
+msgid "unknown class %s"
+msgstr ""
+
+#: ../src/common/regex.cpp:163 ../src/html/chm.cpp:352
 msgid "unknown error"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:450
+#: ../src/msw/dialup.cpp:457
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr ""
 
-#: ../src/common/textbuf.cpp:229
+#: ../src/common/textbuf.cpp:230
 msgid "unknown line terminator"
 msgstr ""
 
-#: ../src/common/file.cpp:362
+#: ../src/common/file.cpp:367 ../src/msw/wince/filefnwce.cpp:170
 msgid "unknown seek origin"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:430
+#: ../src/common/fmapbase.cpp:712
 #, c-format
 msgid "unknown-%d"
 msgstr ""
 
-#: ../src/common/docview.cpp:404
+#: ../src/common/docview.cpp:430
 msgid "unnamed"
 msgstr ""
 
-#: ../src/common/docview.cpp:1209
+#: ../src/common/docview.cpp:1414
 #, c-format
 msgid "unnamed%d"
 msgstr ""
 
-#: ../src/common/intl.cpp:368
-#, c-format
-msgid "using catalog '%s' from '%s'."
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:935
-msgid "very large"
+#: ../src/common/zipstrm.cpp:1661 ../src/common/zipstrm.cpp:2031
+msgid "unsupported Zip compression method"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:935
-msgid "very small"
+#: ../src/common/zipstrm.cpp:1142
+msgid "unsupported zip archive"
 msgstr ""
 
-#: ../src/common/filename.cpp:162
-msgid "writing"
+#: ../src/common/intl.cpp:1114
+#, c-format
+msgid "using catalog '%s' from '%s'."
 msgstr ""
 
-#: ../src/common/dynlib.cpp:333
-#, c-format
-msgid "wxDllLoader failed to GetSymbol '%s'"
+#: ../src/html/chm.cpp:336
+msgid "write error"
 msgstr ""
 
-#: ../src/common/dynload.cpp:270
-#, c-format
-msgid "wxDynamicLibrary failed to GetSymbol '%s'"
+#: ../src/common/filename.cpp:181
+msgid "writing"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:323
+#: ../src/common/stopwatch.cpp:281
 msgid "wxGetTimeOfDay failed."
 msgstr ""
 
-#: ../src/common/socket.cpp:392 ../src/common/socket.cpp:446
+#: ../src/common/socket.cpp:415 ../src/common/socket.cpp:469
+#: ../src/mac/carbon/cfsocket.cpp:452 ../src/mac/carbon/cfsocket.cpp:506
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr ""
 
-#: ../src/common/socket.cpp:967
+#: ../src/common/socket.cpp:966 ../src/mac/carbon/cfsocket.cpp:1006
 msgid "wxSocket: unknown event!."
 msgstr ""
 
-#: ../src/motif/app.cpp:580
+#: ../src/motif/app.cpp:210
 #, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+msgid "wxWidgets could not open display for '%s': exiting."
 msgstr ""
 
-#: ../src/x11/app.cpp:261
-msgid "wxWindows could not open display. Exiting."
+#: ../src/x11/app.cpp:176
+msgid "wxWidgets could not open display. Exiting."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3065
+#: ../src/common/datetime.cpp:3592
 msgid "yesterday"
 msgstr ""
+
+#: ../src/common/zstream.cpp:165 ../src/common/zstream.cpp:315
+#, c-format
+msgid "zlib error %d"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:839
+msgid "|<<"
+msgstr ""