X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/97d69640d0242cbe792ea5ceaab27fbf328023d5..42b6a61ef6680602b4893a39e4a42d66bcb2f2a8:/locale/wxstd.po?ds=sidebyside

diff --git a/locale/wxstd.po b/locale/wxstd.po
index bac2c4156a..1f244c50f5 100644
--- a/locale/wxstd.po
+++ b/locale/wxstd.po
@@ -1,49 +1,33 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-03 21:03-0800\n"
+"POT-Creation-Date: 2002-12-12 11:59+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
+"Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/generic/dirctrlg.cpp:1259 ../src/generic/dirdlgg.cpp:550
-msgid ""
-"\n"
-"(Do you have the required permissions?)"
-msgstr ""
-
-#: ../src/generic/dirctrlg.cpp:1246 ../src/generic/dirdlgg.cpp:537
-msgid ""
-"\n"
-"does not exist\n"
-"Create it now?"
-msgstr ""
-
-#: ../src/common/log.cpp:240
+#: ../src/common/log.cpp:304
 #, c-format
 msgid " (error %ld: %s)"
 msgstr ""
 
-#: ../src/common/docview.cpp:1206
+#: ../src/common/docview.cpp:1242
 msgid " - "
 msgstr ""
 
-#: ../src/html/htmprint.cpp:500
+#: ../src/html/htmprint.cpp:497
 msgid " Preview"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:328
-msgid " bytes "
-msgstr ""
-
 #: ../src/common/paper.cpp:124
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr ""
@@ -64,177 +48,250 @@ msgstr ""
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1334
-#: ../src/common/resource.cpp:1778 ../src/common/resource.cpp:1908
-#: ../src/common/resource.cpp:2989
+#: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1326
+#: ../src/common/resource.cpp:1784 ../src/common/resource.cpp:1914
+#: ../src/common/resource.cpp:2994
 #, c-format
 msgid "#define %s must be an integer."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:750 ../src/html/helpfrm.cpp:751
-#: ../src/html/helpfrm.cpp:1329 ../src/html/helpfrm.cpp:1358
+#: ../src/common/prntbase.cpp:375
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:373
+#, c-format
+msgid "%d...%d"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:777 ../src/html/helpfrm.cpp:778
+#: ../src/html/helpfrm.cpp:1404 ../src/html/helpfrm.cpp:1434
 #, c-format
 msgid "%i of %i"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:787
+#: ../src/common/cmdline.cpp:814
 #, c-format
 msgid "%s (or %s)"
 msgstr ""
 
-#: ../src/generic/logg.cpp:258
+#: ../src/generic/logg.cpp:246
 #, c-format
 msgid "%s Error"
 msgstr ""
 
-#: ../src/generic/logg.cpp:266
+#: ../src/generic/logg.cpp:254
 #, c-format
 msgid "%s Information"
 msgstr ""
 
-#: ../src/generic/logg.cpp:262
+#: ../src/generic/logg.cpp:250
 #, c-format
 msgid "%s Warning"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2360
+#: ../src/common/msgout.cpp:108
+#, c-format
+msgid "%s message"
+msgstr ""
+
+#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2366
 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr ""
 
-#: ../src/common/resourc2.cpp:864 ../src/common/resource.cpp:2515
+#: ../src/common/resourc2.cpp:860 ../src/common/resource.cpp:2520
 #, c-format
 msgid "%s not an icon resource specification."
 msgstr ""
 
-#: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1430
-#: ../src/common/resource.cpp:1871 ../src/common/resource.cpp:2000
-#: ../src/common/resource.cpp:3086
+#: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1422
+#: ../src/common/resource.cpp:1877 ../src/common/resource.cpp:2006
+#: ../src/common/resource.cpp:3091
 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr ""
 
-#: ../src/generic/logg.cpp:492 ../src/generic/tipdlg.cpp:170
+#: ../src/msw/mdi.cpp:192
+msgid "&Arrange Icons"
+msgstr ""
+
+#: ../src/generic/wizard.cpp:271 ../src/generic/fdrepdlg.cpp:170
+msgid "&Cancel"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:188
+msgid "&Cascade"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:210 ../src/generic/logg.cpp:491
 msgid "&Close"
 msgstr ""
 
-#: ../src/generic/logg.cpp:704
+#: ../src/msw/textctrl.cpp:1681
+msgid "&Copy"
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:1683
+msgid "&Delete"
+msgstr ""
+
+#: ../src/generic/logg.cpp:695
 msgid "&Details"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:284
+#: ../src/generic/fdrepdlg.cpp:168
+msgid "&Find"
+msgstr ""
+
+#: ../src/generic/wizard.cpp:412
 msgid "&Finish"
 msgstr ""
 
-#: ../src/generic/logg.cpp:493
+#: ../src/generic/wizard.cpp:258
+msgid "&Help"
+msgstr ""
+
+#: ../src/generic/logg.cpp:492
 msgid "&Log"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:189 ../src/generic/wizard.cpp:286
+#: ../src/univ/themes/win32.cpp:4541
+msgid "&Move"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:193 ../src/generic/mdig.cpp:115
+msgid "&Next"
+msgstr ""
+
+#: ../src/generic/wizard.cpp:268 ../src/generic/wizard.cpp:414
 msgid "&Next >"
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:175
+#: ../src/generic/tipdlg.cpp:215
 msgid "&Next Tip"
 msgstr ""
 
-#: ../src/common/docview.cpp:1978 ../src/common/docview.cpp:1989
+#: ../src/msw/textctrl.cpp:1682
+msgid "&Paste"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:194 ../src/generic/mdig.cpp:116
+msgid "&Previous"
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:1678 ../src/common/cmdproc.cpp:261
+#: ../src/common/cmdproc.cpp:272
 msgid "&Redo"
 msgstr ""
 
-#: ../src/common/docview.cpp:1972 ../src/common/docview.cpp:1999
+#: ../src/common/cmdproc.cpp:255 ../src/common/cmdproc.cpp:282
 msgid "&Redo "
 msgstr ""
 
-#: ../src/generic/logg.cpp:488 ../src/generic/logg.cpp:789
+#: ../src/generic/fdrepdlg.cpp:174
+msgid "&Replace"
+msgstr ""
+
+#: ../src/univ/themes/win32.cpp:4540
+msgid "&Restore"
+msgstr ""
+
+#: ../src/generic/logg.cpp:487 ../src/generic/logg.cpp:818
 msgid "&Save..."
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:172
+#: ../src/generic/tipdlg.cpp:212
 msgid "&Show tips at startup"
 msgstr ""
 
-#: ../src/common/docview.cpp:1984
+#: ../src/univ/themes/win32.cpp:4543
+msgid "&Size"
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:1677 ../src/common/cmdproc.cpp:267
 msgid "&Undo"
 msgstr ""
 
-#: ../src/common/docview.cpp:1959
+#: ../src/common/cmdproc.cpp:241
 msgid "&Undo "
 msgstr ""
 
-#: ../src/msw/mdi.cpp:1280 ../src/msw/mdi.cpp:1287
+#: ../src/msw/mdi.cpp:1328 ../src/msw/mdi.cpp:1335 ../src/msw/mdi.cpp:1365
+#: ../src/generic/mdig.cpp:295 ../src/generic/mdig.cpp:311
+#: ../src/generic/mdig.cpp:315
 msgid "&Window"
 msgstr ""
 
-#: ../src/common/config.cpp:396
+#: ../src/msw/regconf.cpp:264 ../src/common/config.cpp:410
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr ""
 
-#: ../src/common/valtext.cpp:140
+#: ../src/common/valtext.cpp:147 ../src/common/valtext.cpp:177
+#: ../src/common/valtext.cpp:183
 #, c-format
 msgid "'%s' is invalid"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:709
+#: ../src/common/cmdline.cpp:734
 #, c-format
 msgid "'%s' is not a correct numeric value for option '%s'."
 msgstr ""
 
-#: ../src/common/intl.cpp:395
+#: ../src/common/intl.cpp:402
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr ""
 
-#: ../src/common/textfile.cpp:254
+#: ../src/common/textbuf.cpp:245
 #, c-format
-msgid "'%s' is probably a binary file."
+msgid "'%s' is probably a binary buffer."
 msgstr ""
 
-#: ../src/common/valtext.cpp:178
+#: ../src/common/valtext.cpp:172
 #, c-format
 msgid "'%s' should be numeric."
 msgstr ""
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/valtext.cpp:154
 #, c-format
 msgid "'%s' should only contain ASCII characters."
 msgstr ""
 
-#: ../src/common/valtext.cpp:166
+#: ../src/common/valtext.cpp:160
 #, c-format
 msgid "'%s' should only contain alphabetic characters."
 msgstr ""
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/valtext.cpp:166
 #, c-format
 msgid "'%s' should only contain alphabetic or numeric characters."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:706
+#: ../src/html/helpfrm.cpp:714
 msgid "(Help)"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:289 ../src/html/helpfrm.cpp:818
-#: ../src/html/helpfrm.cpp:1384
+#: ../src/html/helpfrm.cpp:315 ../src/html/helpfrm.cpp:845
+#: ../src/html/helpfrm.cpp:1461
 msgid "(bookmarks)"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1370
-#: ../src/common/resource.cpp:1810 ../src/common/resource.cpp:1940
-#: ../src/common/resource.cpp:3025
+#: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1362
+#: ../src/common/resource.cpp:1816 ../src/common/resource.cpp:1946
+#: ../src/common/resource.cpp:3030
 msgid ""
 ", expected static, #include or #define\n"
 "whilst parsing resource."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:600 ../src/generic/dirdlgg.cpp:264
-#: ../src/generic/filedlgg.cpp:713
+#: ../src/generic/dirctrlg.cpp:700 ../src/generic/filedlgg.cpp:938
 msgid "."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:601 ../src/generic/dirdlgg.cpp:265
-#: ../src/generic/filedlgg.cpp:714
+#: ../src/generic/dirctrlg.cpp:701 ../src/generic/filedlgg.cpp:939
 msgid ".."
 msgstr ""
 
@@ -250,58 +307,50 @@ msgstr ""
 msgid "6 3/4 Envelope, 3 5/8 x 6 1/2 in"
 msgstr ""
 
-#: ../src/html/htmprint.cpp:278
+#: ../src/html/htmprint.cpp:279
 msgid ": file does not exist!"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:471
+#: ../src/common/fontmap.cpp:670
 msgid ": unknown charset"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:664
+#: ../src/common/fontmap.cpp:898
 msgid ": unknown encoding"
 msgstr ""
 
-#: ../src/generic/wizard.cpp:186
+#: ../src/generic/wizard.cpp:263
 msgid "< &Back"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:356
+#: ../src/generic/filedlgg.cpp:534
 msgid "<DIR>"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:323
-msgid "<DIR> "
-msgstr ""
-
-#: ../src/generic/filedlgg.cpp:357
+#: ../src/generic/filedlgg.cpp:536
 msgid "<LINK>"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:324
-msgid "<LINK> "
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:967
+#: ../src/html/helpfrm.cpp:994
 msgid ""
-"<html><body>Normal face<br>(and <u>underlined</u>. <i>Italic face.</i> "
-"<b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-2>font size "
-"-2</font><br><font size=-1>font size -1</font><br><font size=+0>font size "
-"+0</font><br><font size=+1>font size +1</font><br><font size=+2>font size "
-"+2</font><br><font size=+3>font size +3</font><br><font size=+4>font size "
-"+4</font><br><p><tt>Fixed size face.<br> <b>bold</b> <i>italic</i> "
-"<b><i>bold italic <u>underlined</u></i></b><br><font size=-2>font size "
-"-2</font><br><font size=-1>font size -1</font><br><font size=+0>font size "
-"+0</font><br><font size=+1>font size +1</font><br><font size=+2>font size "
-"+2</font><br><font size=+3>font size +3</font><br><font size=+4>font size "
-"+4</font></tt></body></html>"
+"<html><body><table><tr><td>Normal face<br>(and <u>underlined</u>. <i>Italic "
+"face.</i> <b>Bold face.</b> <b><i>Bold italic face.</i></b><br><font size=-"
+"2>font size -2</font><br><font size=-1>font size -1</font><br><font size="
+"+0>font size +0</font><br><font size=+1>font size +1</font><br><font size="
+"+2>font size +2</font><br><font size=+3>font size +3</font><br><font size="
+"+4>font size +4</font><br><td><p><tt>Fixed size face.<br> <b>bold</b> "
+"<i>italic</i> <b><i>bold italic <u>underlined</u></i></b><br><font size=-"
+"2>font size -2</font><br><font size=-1>font size -1</font><br><font size="
+"+0>font size +0</font><br><font size=+1>font size +1</font><br><font size="
+"+2>font size +2</font><br><font size=+3>font size +3</font><br><font size="
+"+4>font size +4</font></tt></table></body></html>"
 msgstr ""
 
 #: ../src/common/paper.cpp:113
 msgid "A3 sheet, 297 x 420 mm"
 msgstr ""
 
-#: ../src/common/paper.cpp:104 ../src/generic/dcpsg.cpp:2543
+#: ../src/common/paper.cpp:104
 msgid "A4 sheet, 210 x 297 mm"
 msgstr ""
 
@@ -313,41 +362,45 @@ msgstr ""
 msgid "A5 sheet, 148 x 210 mm"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:325
+#: ../src/generic/fontdlgg.cpp:83
 msgid "ABCDEFGabcdefg12345"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:283
+#: ../src/common/ftp.cpp:369
+msgid "ASCII"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:328
 msgid "Add current page to bookmarks"
 msgstr ""
 
-#: ../src/generic/colrdlgg.cpp:269
+#: ../src/generic/colrdlgg.cpp:287
 msgid "Add to custom colours"
 msgstr ""
 
-#: ../src/html/helpctrl.cpp:84
+#: ../src/html/helpctrl.cpp:100
 #, c-format
 msgid "Adding book %s"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:163
+#: ../src/generic/prntdlgg.cpp:160
 msgid "All"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:825
+#: ../src/generic/filedlgg.cpp:1062
 msgid "All files (*)|*"
 msgstr ""
 
-#: ../src/unix/dialup.cpp:359
+#: ../src/unix/dialup.cpp:362
 msgid "Already dialling ISP."
 msgstr ""
 
-#: ../src/generic/logg.cpp:1036
+#: ../src/generic/logg.cpp:1109
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:102
+#: ../src/common/fontmap.cpp:118
 msgid "Arabic (ISO-8859-6)"
 msgstr ""
 
@@ -371,72 +424,56 @@ msgstr ""
 msgid "B6 Envelope, 176 x 125 mm"
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:400
-msgid "BMP: Cannot deal with 4bit encoded yet."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:266 ../src/common/imagbmp.cpp:278
+#: ../src/common/imagbmp.cpp:468 ../src/common/imagbmp.cpp:484
 msgid "BMP: Couldn't allocate memory."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:62
+#: ../src/common/imagbmp.cpp:86
 msgid "BMP: Couldn't save invalid image."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:154
-msgid "BMP: Couldn't write data."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:131
-msgid "BMP: Couldn't write the file header."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:257
-msgid "BMP: Encoding doesn't match bitdepth."
+#: ../src/common/imagbmp.cpp:290
+msgid "BMP: Couldn't write RGB color map."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:220
-msgid "BMP: Image height > 32767 pixels for file."
-msgstr ""
-
-#: ../src/common/imagbmp.cpp:214
-msgid "BMP: Image width > 32767 pixels for file."
+#: ../src/common/imagbmp.cpp:422
+msgid "BMP: Couldn't write data."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:234
-msgid "BMP: Unknown bitdepth in file."
+#: ../src/common/imagbmp.cpp:195
+msgid "BMP: Couldn't write the file (Bitmap) header."
 msgstr ""
 
-#: ../src/common/imagbmp.cpp:243
-msgid "BMP: Unknown encoding in file."
+#: ../src/common/imagbmp.cpp:216
+msgid "BMP: Couldn't write the file (BitmapInfo) header."
 msgstr ""
 
-#: ../src/generic/helpwxht.cpp:157
-msgid "Back"
+#: ../src/common/imagbmp.cpp:120
+msgid "BMP: wxImage doesn't have own wxPalette."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:135
+#: ../src/common/dlgcmn.cpp:233
 msgid "Backward"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:109
+#: ../src/common/fontmap.cpp:125
 msgid "Baltic (ISO-8859-13)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:100
+#: ../src/common/fontmap.cpp:116
 msgid "Baltic (old) (ISO-8859-4)"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:844 ../src/common/resource.cpp:2495
+#: ../src/common/resourc2.cpp:840 ../src/common/resource.cpp:2500
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:217
+#: ../src/generic/fontdlgg.cpp:232
 msgid "Bold"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:662
+#: ../src/generic/prntdlgg.cpp:645
 msgid "Bottom margin (mm):"
 msgstr ""
 
@@ -444,7 +481,7 @@ msgstr ""
 msgid "C sheet, 17 x 22 in"
 msgstr ""
 
-#: ../src/generic/logg.cpp:490
+#: ../src/generic/logg.cpp:489
 msgid "C&lear"
 msgstr ""
 
@@ -468,549 +505,652 @@ msgstr ""
 msgid "C65 Envelope, 114 x 229 mm"
 msgstr ""
 
-#: ../src/msw/thread.cpp:222
-msgid "Can not create event object."
-msgstr ""
-
-#: ../src/msw/thread.cpp:124
-msgid "Can not create mutex"
+#: ../src/common/filefn.cpp:1383
+#, c-format
+msgid "Can not enumerate files '%s'"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1310 ../src/msw/dir.cpp:294
-#: ../src/unix/dir.cpp:214
+#: ../src/msw/dir.cpp:296 ../src/unix/dir.cpp:232
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr ""
 
-#: ../src/mac/thread.cpp:439 ../src/msw/thread.cpp:552
+#: ../src/mac/thread.cpp:472 ../src/msw/thread.cpp:685
 #, c-format
 msgid "Can not resume thread %x"
 msgstr ""
 
-#: ../src/msw/thread.cpp:433
+#: ../src/msw/thread.cpp:559
 msgid "Can not start thread: error writing TLS."
 msgstr ""
 
-#: ../src/mac/thread.cpp:415 ../src/msw/thread.cpp:537
+#: ../src/mac/thread.cpp:448 ../src/msw/thread.cpp:670
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr ""
 
-#: ../src/msw/thread.cpp:871
+#: ../src/msw/thread.cpp:1016
 msgid "Can not wait for thread termination"
 msgstr ""
 
-#: ../src/common/docview.cpp:1961
+#: ../src/common/cmdproc.cpp:243
 msgid "Can't &Undo "
 msgstr ""
 
-#: ../src/common/image.cpp:1030
+#: ../src/common/image.cpp:1315
 #, c-format
 msgid "Can't check image format of file '%s': file does not exist."
 msgstr ""
 
-#: ../src/msw/registry.cpp:412
+#: ../src/msw/registry.cpp:421
 #, c-format
 msgid "Can't close registry key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:488
+#: ../src/msw/registry.cpp:493
 #, c-format
 msgid "Can't copy values of unsupported type %d."
 msgstr ""
 
-#: ../src/msw/listctrl.cpp:217
-msgid "Can't create list control window, check that comctl32.dll is installed."
+#: ../src/msw/toplevel.cpp:315
+msgid "Can't create dialog using memory template"
 msgstr ""
 
-#: ../src/msw/registry.cpp:395
+#: ../src/os2/toplevel.cpp:369
 #, c-format
-msgid "Can't create registry key '%s'"
+msgid "Can't create dialog using template '%ul'"
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:441
-msgid "Can't create the inter-process read pipe"
+#: ../src/msw/listctrl.cpp:334
+msgid "Can't create list control window, check that comctl32.dll is installed."
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:453
-msgid "Can't create the inter-process write pipe"
+#: ../src/msw/registry.cpp:402
+#, c-format
+msgid "Can't create registry key '%s'"
 msgstr ""
 
-#: ../src/mac/thread.cpp:394 ../src/msw/thread.cpp:519
+#: ../src/mac/thread.cpp:427 ../src/msw/thread.cpp:652
 msgid "Can't create thread"
 msgstr ""
 
-#: ../src/msw/window.cpp:2486
+#: ../src/msw/window.cpp:3062
 #, c-format
-msgid ""
-"Can't create window of class %s!\n"
-"Possible Windows 3.x compatibility problem?"
+msgid "Can't create window of class %s"
 msgstr ""
 
-#: ../src/msw/registry.cpp:656
+#: ../src/msw/registry.cpp:661
 #, c-format
 msgid "Can't delete key '%s'"
 msgstr ""
 
-#: ../src/msw/iniconf.cpp:476
+#: ../src/msw/iniconf.cpp:445
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:681
+#: ../src/msw/registry.cpp:686
 #, c-format
 msgid "Can't delete value '%s' from key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:692
+#: ../src/msw/registry.cpp:697
 #, c-format
 msgid "Can't delete value of key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:1020
+#: ../src/msw/registry.cpp:1025
 #, c-format
 msgid "Can't enumerate subkeys of key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:975
+#: ../src/msw/registry.cpp:980
 #, c-format
 msgid "Can't enumerate values of key '%s'"
 msgstr ""
 
-#: ../src/common/ffile.cpp:234
+#: ../src/common/ffile.cpp:226
 #, c-format
 msgid "Can't find current position in file '%s'"
 msgstr ""
 
-#: ../src/msw/window.cpp:2403
-#, c-format
-msgid ""
-"Can't find dialog template '%s'!\n"
-"Check resource include path for finding wx.rc."
-msgstr ""
-
-#: ../src/common/object.cpp:356 ../src/common/object.cpp:381
-#, c-format
-msgid "Can't find the serialization object '%s' for the object '%s'."
-msgstr ""
-
-#: ../src/msw/registry.cpp:344
+#: ../src/msw/registry.cpp:351
 #, c-format
 msgid "Can't get info about registry key '%s'"
 msgstr ""
 
-#: ../src/common/image.cpp:730 ../src/common/image.cpp:750
+#: ../src/common/image.cpp:913 ../src/common/image.cpp:933
 #, c-format
 msgid "Can't load image from file '%s': file does not exist."
 msgstr ""
 
-#: ../src/common/object.cpp:349
-msgid "Can't load wxSerial dynamic library."
-msgstr ""
-
 #: ../src/msw/dib.cpp:434
 #, c-format
 msgid "Can't open file '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:370
+#: ../src/msw/registry.cpp:377
 #, c-format
 msgid "Can't open registry key '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:899
+#: ../src/msw/registry.cpp:904
 #, c-format
 msgid "Can't read value of '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:772 ../src/msw/registry.cpp:811
+#: ../src/msw/registry.cpp:777 ../src/msw/registry.cpp:816
 #, c-format
 msgid "Can't read value of key '%s'"
 msgstr ""
 
-#: ../src/generic/logg.cpp:550 ../src/generic/logg.cpp:947
+#: ../src/common/image.cpp:955
+#, c-format
+msgid "Can't save image to file '%s': unknown extension."
+msgstr ""
+
+#: ../src/generic/logg.cpp:551 ../src/generic/logg.cpp:985
 msgid "Can't save log contents to file."
 msgstr ""
 
-#: ../src/msw/thread.cpp:485
+#: ../src/msw/thread.cpp:611
 msgid "Can't set thread priority"
 msgstr ""
 
-#: ../src/msw/registry.cpp:797 ../src/msw/registry.cpp:923
+#: ../src/msw/registry.cpp:802 ../src/msw/registry.cpp:928
 #, c-format
 msgid "Can't set value of '%s'"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:148 ../src/common/prntbase.cpp:109
-#: ../src/generic/dcpsg.cpp:2267 ../src/generic/dirctrlg.cpp:1205
-#: ../src/generic/dirdlgg.cpp:424 ../src/generic/filedlgg.cpp:916
-#: ../src/generic/fontdlgg.cpp:257 ../src/generic/prntdlgg.cpp:468
-#: ../src/generic/progdlgg.cpp:182 ../src/generic/proplist.cpp:523
-#: ../src/generic/wizard.cpp:192 ../src/gtk/filedlg.cpp:173
-#: ../src/gtk/fontdlg.cpp:173 ../src/html/helpfrm.cpp:949
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/gtk/fontdlg.cpp:144 ../src/gtk/filedlg.cpp:173
+#: ../src/html/helpfrm.cpp:976 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:246 ../src/generic/fontdlgg.cpp:255
+#: ../src/generic/proplist.cpp:511 ../src/generic/dirdlgg.cpp:153
+#: ../src/generic/progdlgg.cpp:211 ../src/generic/filedlgg.cpp:1181
+#: ../src/generic/filedlgg.cpp:1200 ../src/generic/prntdlgg.cpp:453
 msgid "Cancel"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:518
+#: ../contrib/src/xrc/xmlres.cpp:969 ../contrib/src/xrc/xmlres.cpp:1010
+msgid "Cannot convert dialog units: dialog unknown."
+msgstr ""
+
+#: ../src/common/strconv.cpp:963
+#, c-format
+msgid "Cannot convert from encoding '%s'!"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:499
 #, c-format
 msgid "Cannot find active dialup connection: %s"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:832
+#: ../contrib/src/xrc/xmlres.cpp:243
+#, c-format
+msgid "Cannot find container for unknown control '%s'."
+msgstr ""
+
+#: ../contrib/src/xrc/xmlres.cpp:1024
+#, c-format
+msgid "Cannot find font node '%s'."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:813
 msgid "Cannot find the location of address book file"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:954
+#: ../src/unix/threadpsx.cpp:1096
 #, c-format
 msgid "Cannot get priority range for scheduling policy %d."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:721
+#: ../src/unix/utilsunx.cpp:865
 msgid "Cannot get the hostname"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:757
+#: ../src/unix/utilsunx.cpp:901
 msgid "Cannot get the official hostname"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:925
+#: ../src/msw/dialup.cpp:907
 msgid "Cannot hang up - no active dialup connection."
 msgstr ""
 
-#: ../src/msw/app.cpp:252
+#: ../src/msw/app.cpp:250
 msgid "Cannot initialize OLE"
 msgstr ""
 
-#: ../src/html/htmlfilt.cpp:146
+#: ../src/mgl/app.cpp:414
+msgid "Cannot initialize SciTech MGL!"
+msgstr ""
+
+#: ../src/mgl/window.cpp:547
+msgid "Cannot initialize display."
+msgstr ""
+
+#: ../src/msw/volume.cpp:634
+#, c-format
+msgid "Cannot load icon from '%s'."
+msgstr ""
+
+#: ../contrib/src/xrc/xmlres.cpp:356
+#, c-format
+msgid "Cannot load resources from file '%s'."
+msgstr ""
+
+#: ../src/html/htmlfilt.cpp:164
 #, c-format
 msgid "Cannot open HTML document: %s"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:673
+#: ../src/html/helpdata.cpp:584
 #, c-format
 msgid "Cannot open HTML help book: %s"
 msgstr ""
 
-#: ../src/generic/helpext.cpp:96
+#: ../src/generic/helpext.cpp:100
 #, c-format
 msgid "Cannot open URL '%s'"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:363
+#: ../src/html/helpdata.cpp:277
 #, c-format
 msgid "Cannot open contents file: %s"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:1596
+#: ../contrib/src/xrc/xmlres.cpp:330
+#, c-format
+msgid "Cannot open file '%s'."
+msgstr ""
+
+#: ../src/generic/dcpsg.cpp:1719
 msgid "Cannot open file for PostScript printing!"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:379
+#: ../src/html/helpdata.cpp:292
 #, c-format
 msgid "Cannot open index file: %s"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1222
+#: ../contrib/src/xrc/xmlres.cpp:957
+#, c-format
+msgid "Cannot parse coordinates from '%s'."
+msgstr ""
+
+#: ../contrib/src/xrc/xmlres.cpp:998
+#, c-format
+msgid "Cannot parse dimension from '%s'."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:1293
 msgid "Cannot print empty page."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:935
+#: ../src/msw/volume.cpp:195 ../src/msw/volume.cpp:526
+#, c-format
+msgid "Cannot read typename from '%s'!"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:1077
 msgid "Cannot retrieve thread scheduling policy."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:588
+#: ../src/unix/threadpsx.cpp:710
 msgid "Cannot start thread: error writing TLS"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:413
+#: ../src/html/helpfrm.cpp:411
 msgid "Case sensitive"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:110
+#: ../src/common/fontmap.cpp:126
 msgid "Celtic (ISO-8859-14)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:98
-msgid "Central European (ISO-8859-2/Latin 2)"
+#: ../src/common/fontmap.cpp:114
+msgid "Central European (ISO-8859-2)"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:767
+#: ../src/msw/dialup.cpp:748
 msgid "Choose ISP to dial"
 msgstr ""
 
-#: ../src/gtk/fontdlg.cpp:154
+#: ../src/gtk/fontdlg.cpp:122
 msgid "Choose font"
 msgstr ""
 
-#: ../src/generic/logg.cpp:490
+#: ../src/generic/mdig.cpp:112
+msgid "Cl&ose"
+msgstr ""
+
+#: ../src/generic/logg.cpp:489
 msgid "Clear the log contents"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:359 ../src/generic/progdlgg.cpp:310
-#: ../src/generic/proplist.cpp:518
+#: ../src/common/prntbase.cpp:428 ../src/generic/proplist.cpp:506
+#: ../src/generic/progdlgg.cpp:358
 msgid "Close"
 msgstr ""
 
-#: ../src/generic/logg.cpp:492
+#: ../src/univ/themes/win32.cpp:4549
+msgid "Close\tAlt-F4"
+msgstr ""
+
+#: ../src/generic/mdig.cpp:113
+msgid "Close All"
+msgstr ""
+
+#: ../src/generic/logg.cpp:491
 msgid "Close this window"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:452
+#: ../src/generic/dirctrlg.cpp:549
 msgid "Computer"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:758
+#: ../src/common/fileconf.cpp:902
 #, c-format
 msgid "Config entry name cannot start with '%c'."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1077 ../src/gtk/filedlg.cpp:72
+#: ../src/gtk/filedlg.cpp:72 ../src/generic/filedlgg.cpp:1411
 msgid "Confirm"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:173
-msgid "Connecting..."
+#: ../src/msw/mimetype.cpp:689
+msgid "Confirm registry update"
 msgstr ""
 
-#: ../src/generic/helpxlp.cpp:240
-#, c-format
-msgid "Connection to wxHelp timed out in %d seconds"
+#: ../src/html/htmlwin.cpp:262
+msgid "Connecting..."
 msgstr ""
 
-#: ../src/generic/helpwxht.cpp:159 ../src/html/helpfrm.cpp:316
-#: ../src/html/helpfrm.cpp:325
+#: ../src/html/helpfrm.cpp:351
 msgid "Contents"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:196
+#: ../src/common/strconv.cpp:616
+#, c-format
+msgid "Conversion to charset '%s' doesn't work."
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:193
 msgid "Copies:"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1800
-#: ../src/common/resource.cpp:1930
+#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1806
+#: ../src/common/resource.cpp:1936
 #, c-format
 msgid "Could not find resource include file %s."
 msgstr ""
 
-#: ../src/generic/tabg.cpp:1042
+#: ../src/generic/tabg.cpp:1044
 msgid "Could not find tab for id"
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:1249
+#: ../src/msw/textctrl.cpp:2050
 #, c-format
 msgid "Could not load Rich Edit DLL '%s'"
 msgstr ""
 
-#: ../src/common/resource.cpp:796
+#: ../src/common/resource.cpp:802
 #, 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:1245
+#: ../src/common/resource.cpp:1251
 #, 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:711
+#: ../src/common/prntbase.cpp:805
 msgid "Could not start document preview."
 msgstr ""
 
-#: ../src/generic/printps.cpp:197 ../src/msw/printwin.cpp:252
+#: ../src/msw/printwin.cpp:252 ../src/generic/printps.cpp:198
 msgid "Could not start printing."
 msgstr ""
 
-#: ../src/common/wincmn.cpp:800
+#: ../src/common/wincmn.cpp:1167
 msgid "Could not transfer data to window"
 msgstr ""
 
-#: ../src/msw/thread.cpp:166
-msgid "Couldn't acquire a mutex lock"
-msgstr ""
-
-#: ../src/msw/dragimag.cpp:142 ../src/msw/dragimag.cpp:179
+#: ../src/msw/dragimag.cpp:158 ../src/msw/dragimag.cpp:194
 #: ../src/msw/imaglist.cpp:152 ../src/msw/imaglist.cpp:174
 #: ../src/msw/imaglist.cpp:187
 msgid "Couldn't add an image to the image list."
 msgstr ""
 
-#: ../src/msw/timer.cpp:96
+#: ../src/msw/timer.cpp:103
 msgid "Couldn't create a timer"
 msgstr ""
 
-#: ../src/common/dynlib.cpp:305
+#: ../src/mgl/cursor.cpp:135 ../src/mgl/cursor.cpp:166
+msgid "Couldn't create cursor."
+msgstr ""
+
+#: ../src/common/dynlib.cpp:347 ../src/common/dynload.cpp:299
 #, c-format
 msgid "Couldn't find symbol '%s' in a dynamic library"
 msgstr ""
 
-#: ../src/mac/thread.cpp:469 ../src/msw/thread.cpp:578
+#: ../src/mac/thread.cpp:502 ../src/msw/thread.cpp:711
 msgid "Couldn't get the current thread pointer"
 msgstr ""
 
-#: ../src/msw/utilsexc.cpp:665
-#, c-format
-msgid "Couldn't launch DDE server '%s'."
-msgstr ""
-
-#: ../src/common/imagpng.cpp:251
+#: ../src/common/imagpng.cpp:302
 msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr ""
 
-#: ../src/msw/ole/dataobj.cpp:151
+#: ../src/msw/ole/dataobj.cpp:147
 #, c-format
 msgid "Couldn't register clipboard format '%s'."
 msgstr ""
 
-#: ../src/msw/thread.cpp:198
-msgid "Couldn't release a mutex"
-msgstr ""
-
-#: ../src/msw/listctrl.cpp:624
+#: ../src/msw/listctrl.cpp:737
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr ""
 
-#: ../src/mac/thread.cpp:706 ../src/msw/thread.cpp:958
+#: ../src/common/imagpng.cpp:338 ../src/common/imagpng.cpp:349
+#: ../src/common/imagpng.cpp:357
+msgid "Couldn't save PNG image."
+msgstr ""
+
+#: ../src/mac/thread.cpp:749 ../src/msw/thread.cpp:1091
 msgid "Couldn't terminate thread"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1312 ../src/generic/dirdlgg.cpp:571
+#: ../src/generic/dirdlgg.cpp:263
 msgid "Create directory"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:883
+#: ../src/generic/dirdlgg.cpp:103 ../src/generic/filedlgg.cpp:1132
 msgid "Create new directory"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:890
+#: ../src/msw/textctrl.cpp:1680
+msgid "Cu&t"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1143
 msgid "Current directory:"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:101
-msgid "Cyrillic (Latin 5)"
+#: ../src/common/fontmap.cpp:117
+msgid "Cyrillic (ISO-8859-5)"
 msgstr ""
 
 #: ../src/common/paper.cpp:106
 msgid "D sheet, 22 x 34 in"
 msgstr ""
 
-#: ../src/msw/dde.cpp:587
+#: ../src/msw/dde.cpp:594
 msgid "DDE poke request failed"
 msgstr ""
 
+#: ../src/common/imagbmp.cpp:917
+msgid "DIB Header: Encoding doesn't match bitdepth."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:879
+msgid "DIB Header: Image height > 32767 pixels for file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:873
+msgid "DIB Header: Image width > 32767 pixels for file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:893
+msgid "DIB Header: Unknown bitdepth in file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:903
+msgid "DIB Header: Unknown encoding in file."
+msgstr ""
+
 #: ../src/common/paper.cpp:128
 msgid "DL Envelope, 110 x 220 mm"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:535
+#: ../src/generic/filedlgg.cpp:705
 msgid "Date"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:207
+#: ../src/generic/fontdlgg.cpp:222
 msgid "Decorative"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:354
+#: ../src/common/fontmap.cpp:392
+msgid "Default encoding"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:269
+#, c-format
+msgid "Deleted stale lock file '%s'."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:348
 msgid ""
 "Dial up functions are unavailable because the remote access service (RAS) is "
 "not installed on this machine. Please install it."
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:177
+#: ../src/os2/toplevel.cpp:367
+msgid "Did you forget to include wx/os2/wx.rc in your resources?"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:217
 msgid "Did you know..."
 msgstr ""
 
-#: ../src/common/filefn.cpp:1088
+#: ../src/common/filefn.cpp:1279
 #, c-format
 msgid "Directory '%s' couldn't be created"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1247 ../src/generic/dirdlgg.cpp:538
+#: ../src/mgl/dirmgl.cpp:217
+#, c-format
+msgid "Directory '%s' doesn't exist!"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:188
 msgid "Directory does not exist"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:380
+#: ../src/html/helpfrm.cpp:379
 msgid ""
 "Display all index items that contain given substring. Search is case "
 "insensitive."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:554
+#: ../src/html/helpfrm.cpp:545
 msgid "Display options dialog"
 msgstr ""
 
-#: ../src/common/docview.cpp:440
+#: ../src/msw/mimetype.cpp:682
+msgid ""
+"Do you want to overwrite the command used to %s files with extension \"%s"
+"\" ?\n"
+"Current value is \n"
+"%s, \n"
+"New value is \n"
+"%s %1"
+msgstr ""
+
+#: ../src/common/docview.cpp:441
 #, c-format
 msgid "Do you want to save changes to document %s?"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:230
+#: ../src/html/htmlwin.cpp:314
 msgid "Done"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:316
+#: ../src/generic/progdlgg.cpp:370
 msgid "Done."
 msgstr ""
 
+#: ../src/generic/fdrepdlg.cpp:157
+msgid "Down"
+msgstr ""
+
 #: ../src/common/paper.cpp:107
 msgid "E sheet, 34 x 44 in"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:156
+#: ../src/generic/progdlgg.cpp:183
 msgid "Elapsed time : "
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:335
 msgid "Entries found"
 msgstr ""
 
-#: ../src/common/config.cpp:349
+#: ../src/common/config.cpp:362
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:604 ../src/generic/dirctrlg.cpp:622
-#: ../src/generic/dirctrlg.cpp:633 ../src/generic/dirctrlg.cpp:1347
-#: ../src/generic/dirdlgg.cpp:268 ../src/generic/dirdlgg.cpp:286
-#: ../src/generic/dirdlgg.cpp:297 ../src/generic/dirdlgg.cpp:604
-#: ../src/generic/filedlgg.cpp:625 ../src/generic/filedlgg.cpp:717
-#: ../src/generic/filedlgg.cpp:731 ../src/generic/filedlgg.cpp:744
-#: ../src/generic/filedlgg.cpp:1043 ../src/generic/filedlgg.cpp:1092
-#: ../src/generic/helpxlp.cpp:241 ../src/gtk/filedlg.cpp:80
-#: ../src/gtk/fontdlg.cpp:67
+#: ../src/gtk/fontdlg.cpp:71 ../src/gtk/filedlg.cpp:80
+#: ../src/generic/dirdlgg.cpp:298 ../src/generic/dirctrlg.cpp:704
+#: ../src/generic/dirctrlg.cpp:722 ../src/generic/dirctrlg.cpp:733
+#: ../src/generic/filedlgg.cpp:841 ../src/generic/filedlgg.cpp:942
+#: ../src/generic/filedlgg.cpp:956 ../src/generic/filedlgg.cpp:969
+#: ../src/generic/filedlgg.cpp:1365 ../src/generic/filedlgg.cpp:1418
 msgid "Error"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:1002 ../src/unix/utilsunx.cpp:1010
+#: ../src/unix/utilsunx.cpp:1193 ../src/unix/utilsunx.cpp:1201
 msgid "Error "
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1260 ../src/generic/dirdlgg.cpp:551
+#: ../src/generic/dirdlgg.cpp:203
 msgid "Error creating directory"
 msgstr ""
 
-#: ../src/common/log.cpp:356
+#: ../src/common/imagbmp.cpp:926
+msgid "Error in reading image DIB ."
+msgstr ""
+
+#: ../src/common/log.cpp:460
 msgid "Error: "
 msgstr ""
 
-#: ../src/common/fontmap.cpp:99
+#: ../src/common/fontmap.cpp:115
 msgid "Esperanto (ISO-8859-3)"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:163
+#: ../src/generic/progdlgg.cpp:191
 msgid "Estimated time : "
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:575 ../src/generic/dirdlgg.cpp:217
-msgid "Etcetera"
-msgstr ""
-
-#: ../src/msw/utilsexc.cpp:544
+#: ../src/msw/utilsexc.cpp:702
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr ""
@@ -1019,203 +1159,349 @@ msgstr ""
 msgid "Executive, 7 1/4 x 10 1/2 in"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1399
-#: ../src/common/resource.cpp:1839 ../src/common/resource.cpp:1969
-#: ../src/common/resource.cpp:3054
+#: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1391
+#: ../src/common/resource.cpp:1845 ../src/common/resource.cpp:1975
+#: ../src/common/resource.cpp:3059
 msgid "Expected '*' whilst parsing resource."
 msgstr ""
 
-#: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1415
-#: ../src/common/resource.cpp:1856 ../src/common/resource.cpp:1985
-#: ../src/common/resource.cpp:3071
+#: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1407
+#: ../src/common/resource.cpp:1862 ../src/common/resource.cpp:1991
+#: ../src/common/resource.cpp:3076
 msgid "Expected '=' whilst parsing resource."
 msgstr ""
 
-#: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1385
-#: ../src/common/resource.cpp:1825 ../src/common/resource.cpp:1955
-#: ../src/common/resource.cpp:3040
+#: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1377
+#: ../src/common/resource.cpp:1831 ../src/common/resource.cpp:1961
+#: ../src/common/resource.cpp:3045
 msgid "Expected 'char' whilst parsing resource."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:860
+#: ../src/common/fontmap.cpp:144
+msgid "Extended Unix Codepage for Japanese (EUC-JP)"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:842
 #, c-format
 msgid "Failed to %s dialup connection: %s"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:122
+#: ../src/unix/snglinst.cpp:243
+msgid "Failed to access lock file."
+msgstr ""
+
+#: ../src/common/filename.cpp:176
+msgid "Failed to close file handle"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:308
+#, c-format
+msgid "Failed to close lock file '%s'"
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:127
 msgid "Failed to close the clipboard."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:801
+#: ../src/msw/dialup.cpp:782
 msgid "Failed to connect: missing username/password."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:747
+#: ../src/msw/dialup.cpp:728
 msgid "Failed to connect: no ISP to dial."
 msgstr ""
 
-#: ../src/msw/registry.cpp:592
+#: ../src/msw/registry.cpp:597
 #, c-format
 msgid "Failed to copy registry value '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:601
+#: ../src/msw/registry.cpp:606
 #, c-format
 msgid "Failed to copy the contents of registry key '%s' to '%s'."
 msgstr ""
 
-#: ../src/msw/dde.cpp:924
+#: ../src/common/filefn.cpp:1131
+#, c-format
+msgid "Failed to copy the file '%s' to '%s'"
+msgstr ""
+
+#: ../src/msw/dde.cpp:948
 msgid "Failed to create DDE string"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:421
+#: ../src/msw/mdi.cpp:425
 msgid "Failed to create MDI parent frame."
 msgstr ""
 
-#: ../src/msw/statbr95.cpp:149
+#: ../src/msw/statbr95.cpp:110
 msgid "Failed to create a status bar."
 msgstr ""
 
-#: ../src/msw/dde.cpp:401
+#: ../src/common/filename.cpp:721
+msgid "Failed to create a temporary file name"
+msgstr ""
+
+#: ../src/msw/utilsexc.cpp:197
+msgid "Failed to create an anonymous pipe"
+msgstr ""
+
+#: ../src/msw/dde.cpp:412
 #, c-format
 msgid "Failed to create connection to server '%s' on topic '%s'"
 msgstr ""
 
-#: ../src/msw/dialog.cpp:183
+#: ../src/msw/toplevel.cpp:313
+msgid "Failed to create dialog. Incorrect DLGTEMPLATE?"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:372
+#, c-format
+msgid "Failed to create directory %s/.gnome."
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:381
+#, c-format
+msgid "Failed to create directory %s/mime-info."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:201
+#, c-format
 msgid ""
-"Failed to create dialog. You probably forgot to include wx/msw/wx.rc in your "
-"resources."
+"Failed to create directory '%s'\n"
+"(Do you have the required permissions?)"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1258 ../src/generic/dirdlgg.cpp:549
-msgid "Failed to create directory "
+#: ../src/msw/mimetype.cpp:168
+#, c-format
+msgid "Failed to create registry entry for '%s' files."
 msgstr ""
 
-#: ../src/html/winpars.cpp:375
+#: ../src/msw/fdrepdlg.cpp:442
+#, c-format
+msgid "Failed to create the standard find/replace dialog (error code %d)"
+msgstr ""
+
+#: ../src/html/winpars.cpp:468
 #, c-format
 msgid "Failed to display HTML document in %s encoding"
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:61 ../src/msw/clipbrd.cpp:134
+#: ../src/mac/clipbrd.cpp:168 ../src/msw/clipbrd.cpp:139
 msgid "Failed to empty the clipboard."
 msgstr ""
 
-#: ../src/msw/dde.cpp:606
+#: ../src/msw/dde.cpp:613
 msgid "Failed to establish an advise loop with DDE server"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:639
+#: ../src/msw/dialup.cpp:620
 #, c-format
 msgid "Failed to establish dialup connection: %s"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:441 ../src/unix/utilsunx.cpp:469
+#: ../src/unix/utilsunx.cpp:540 ../src/unix/utilsunx.cpp:557
 #, c-format
 msgid "Failed to execute '%s'\n"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2459
+#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2465
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:963 ../src/common/resource.cpp:2614
+#: ../src/common/resourc2.cpp:959 ../src/common/resource.cpp:2619
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadIconData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:824 ../src/common/resource.cpp:2475
+#: ../src/common/resourc2.cpp:823 ../src/common/resource.cpp:2480
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:699
+#: ../src/msw/dialup.cpp:680
 #, c-format
 msgid "Failed to get ISP names: %s"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:623
+#: ../src/mac/clipbrd.cpp:119
+msgid "Failed to get clipboard data."
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:712
 msgid "Failed to get data from the clipboard"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:264
+#: ../src/common/timercmn.cpp:294
 msgid "Failed to get the UTC system time."
 msgstr ""
 
-#: ../src/common/timercmn.cpp:216
+#: ../src/common/timercmn.cpp:245
 msgid "Failed to get the local system time"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:754
+#: ../src/common/filefn.cpp:1512
+msgid "Failed to get the working directory"
+msgstr ""
+
+#: ../src/univ/theme.cpp:122
+msgid "Failed to initialize GUI: no built-in themes found."
+msgstr ""
+
+#: ../src/msw/helpchm.cpp:69
+msgid "Failed to initialize MS HTML Help."
+msgstr ""
+
+#: ../src/msw/glcanvas.cpp:729
+msgid "Failed to initialize OpenGL"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:887
 msgid ""
 "Failed to join a thread, potential memory leak detected - please restart the "
 "program"
 msgstr ""
 
-#: ../src/common/dynlib.cpp:235
+#: ../src/msw/utils.cpp:723
+#, c-format
+msgid "Failed to kill process %d"
+msgstr ""
+
+#: ../src/common/iconbndl.cpp:66
+#, c-format
+msgid "Failed to load image %d from file '%s'."
+msgstr ""
+
+#: ../src/msw/volume.cpp:347
+msgid "Failed to load mpr.dll."
+msgstr ""
+
+#: ../src/common/dynlib.cpp:274 ../src/common/dynload.cpp:198
 #, c-format
 msgid "Failed to load shared library '%s'"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:102
+#: ../src/common/dynlib.cpp:256 ../src/common/dynload.cpp:127
+#, c-format
+msgid "Failed to load shared library '%s' Error '%s'"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:192
+#, c-format
+msgid "Failed to lock the lock file '%s'"
+msgstr ""
+
+#: ../src/common/regex.cpp:251
+#, c-format
+msgid "Failed to match '%s' in regular expression: %s"
+msgstr ""
+
+#: ../src/common/filename.cpp:1667
+#, c-format
+msgid "Failed to modify file times for '%s'"
+msgstr ""
+
+#: ../src/common/filename.cpp:164
+#, c-format
+msgid "Failed to open '%s' for %s"
+msgstr ""
+
+#: ../src/common/filename.cpp:743
+msgid "Failed to open temporary file."
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:107
 msgid "Failed to open the clipboard."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:539
+#: ../src/msw/clipbrd.cpp:616
 msgid "Failed to put data on the clipboard"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:540
+#: ../src/unix/snglinst.cpp:252
+msgid "Failed to read PID from lock file."
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:635
 msgid "Failed to redirect child process input/output"
 msgstr ""
 
-#: ../src/msw/dde.cpp:285
+#: ../src/msw/utilsexc.cpp:605
+msgid "Failed to redirect the child process IO"
+msgstr ""
+
+#: ../src/msw/dde.cpp:295
 #, c-format
 msgid "Failed to register DDE server '%s'"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:516
+#: ../src/common/fontmap.cpp:715
 #, c-format
 msgid "Failed to remember the encoding for the charset '%s'."
 msgstr ""
 
-#: ../src/msw/registry.cpp:438
+#: ../src/unix/snglinst.cpp:296
+#, c-format
+msgid "Failed to remove lock file '%s'"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:262
+#, c-format
+msgid "Failed to remove stale lock file '%s'."
+msgstr ""
+
+#: ../src/msw/registry.cpp:443
 #, c-format
 msgid "Failed to rename registry value '%s' to '%s'."
 msgstr ""
 
-#: ../src/msw/registry.cpp:538
+#: ../src/msw/registry.cpp:543
 #, c-format
 msgid "Failed to rename the registry key '%s' to '%s'."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:428
+#: ../src/msw/clipbrd.cpp:505
 msgid "Failed to retrieve data from the clipboard."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:463
+#: ../src/common/filename.cpp:1757
+#, c-format
+msgid "Failed to retrieve file times for '%s'"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:444
 msgid "Failed to retrieve text of RAS error message"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:652
+#: ../src/msw/clipbrd.cpp:742
 msgid "Failed to retrieve the supported clipboard formats"
 msgstr ""
 
-#: ../src/msw/dde.cpp:651
+#: ../src/msw/dde.cpp:658
 msgid "Failed to send DDE advise notification"
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:226 ../src/msw/clipbrd.cpp:300
+#: ../src/common/ftp.cpp:368
+#, c-format
+msgid "Failed to set FTP transfer mode to %s."
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:379
 msgid "Failed to set clipboard data."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1071
+#: ../src/common/file.cpp:526
+msgid "Failed to set temporary file permissions"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:1241 ../src/unix/threadpsx.cpp:1252
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr ""
@@ -1225,65 +1511,91 @@ msgstr ""
 msgid "Failed to store image '%s' to memory VFS!"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1251
+#: ../src/unix/threadpsx.cpp:1425
 msgid "Failed to terminate a thread."
 msgstr ""
 
-#: ../src/msw/dde.cpp:625
+#: ../src/msw/dde.cpp:632
 msgid "Failed to terminate the advise loop with DDE server"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:933
+#: ../src/msw/dialup.cpp:915
 #, c-format
 msgid "Failed to terminate the dialup connection: %s"
 msgstr ""
 
-#: ../src/msw/dde.cpp:301
+#: ../src/common/filename.cpp:1682
+#, c-format
+msgid "Failed to touch the file '%s'"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:302
+#, c-format
+msgid "Failed to unlock lock file '%s'"
+msgstr ""
+
+#: ../src/msw/dde.cpp:311
 #, c-format
 msgid "Failed to unregister DDE server '%s'"
 msgstr ""
 
-#: ../src/generic/logg.cpp:386
+#: ../src/unix/snglinst.cpp:173
+#, c-format
+msgid "Failed to write to lock file '%s'"
+msgstr ""
+
+#: ../src/generic/logg.cpp:379
 msgid "Fatal error"
 msgstr ""
 
-#: ../src/common/log.cpp:349
+#: ../src/common/log.cpp:453
 msgid "Fatal error: "
 msgstr ""
 
-#: ../src/mac/app.cpp:793 ../src/msw/app.cpp:1257
+#: ../src/mac/app.cpp:1284 ../src/msw/app.cpp:1290
 msgid "Fatal error: exiting"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1074 ../src/gtk/filedlg.cpp:69
+#: ../src/mgl/bitmap.cpp:544
+#, c-format
+msgid "File %s does not exist."
+msgstr ""
+
+#: ../src/gtk/filedlg.cpp:69 ../src/generic/filedlgg.cpp:1408
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr ""
 
-#: ../src/common/textcmn.cpp:94
+#: ../src/msw/filedlg.cpp:518
+#, c-format
+msgid ""
+"File '%s' already exists.\n"
+"Do you want to replace it?"
+msgstr ""
+
+#: ../src/common/textcmn.cpp:158
 msgid "File couldn't be loaded."
 msgstr ""
 
-#: ../src/common/docview.cpp:296 ../src/common/docview.cpp:332
-#: ../src/common/docview.cpp:1388
+#: ../src/common/docview.cpp:295 ../src/common/docview.cpp:332
+#: ../src/common/docview.cpp:1424
 msgid "File error"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:622 ../src/generic/dirdlgg.cpp:286
-#: ../src/generic/filedlgg.cpp:731
+#: ../src/generic/dirctrlg.cpp:722 ../src/generic/filedlgg.cpp:956
 msgid "File name exists already."
 msgstr ""
 
-#: ../src/msw/filedlg.cpp:303
+#: ../src/msw/filedlg.cpp:366
 #, c-format
 msgid "Files (%s)|%s"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:354
+#: ../src/html/helpfrm.cpp:367
 msgid "Find"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:928
+#: ../src/html/helpfrm.cpp:950
 msgid "Fixed font:"
 msgstr ""
 
@@ -1291,51 +1603,55 @@ msgstr ""
 msgid "Folio, 8 1/2 x 13 in"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:124
-msgid "Font"
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:938
+#: ../src/html/helpfrm.cpp:951
 msgid "Font size:"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:497
+#: ../src/unix/utilsunx.cpp:578
 msgid "Fork failed"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:132 ../src/generic/helpwxht.cpp:158
+#: ../src/common/dlgcmn.cpp:230
 msgid "Forward"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1368
-#: ../src/common/resource.cpp:1808 ../src/common/resource.cpp:1938
-#: ../src/common/resource.cpp:3023
+#: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1360
+#: ../src/common/resource.cpp:1814 ../src/common/resource.cpp:1944
+#: ../src/common/resource.cpp:3028
 msgid "Found "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:663
+#: ../src/html/helpfrm.cpp:666
 #, c-format
 msgid "Found %i matches"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:187
+#: ../src/generic/prntdlgg.cpp:184
 msgid "From:"
 msgstr ""
 
-#: ../src/common/imaggif.cpp:74
+#: ../src/common/imaggif.cpp:100
+msgid "GIF: Invalid gif index."
+msgstr ""
+
+#: ../src/common/imaggif.cpp:75
 msgid "GIF: data stream seems to be truncated."
 msgstr ""
 
-#: ../src/common/imaggif.cpp:58
+#: ../src/common/imaggif.cpp:59
 msgid "GIF: error in GIF image format."
 msgstr ""
 
-#: ../src/common/imaggif.cpp:61
+#: ../src/common/imaggif.cpp:62
 msgid "GIF: not enough memory."
 msgstr ""
 
-#: ../src/common/imaggif.cpp:64
-msgid "GIF: unknown error!!!"
+#: ../src/common/imaggif.cpp:65
+msgid "GIF: unknown error!!!"
+msgstr ""
+
+#: ../src/univ/themes/gtk.cpp:623
+msgid "GTK+ theme"
 msgstr ""
 
 #: ../src/common/paper.cpp:142
@@ -1346,114 +1662,205 @@ msgstr ""
 msgid "German Std Fanfold, 8 1/2 x 12 in"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:520
+#: ../src/common/image.cpp:762
+msgid "GetUnusedColour:: No Unused Color in image "
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:511
 msgid "Go back"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:523
+#: ../src/html/helpfrm.cpp:514
 msgid "Go forward"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:528
+#: ../src/html/helpfrm.cpp:519
 msgid "Go one level up in document hierarchy"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:875
+#: ../src/generic/dirdlgg.cpp:108 ../src/generic/filedlgg.cpp:1121
 msgid "Go to home directory"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:869
+#: ../src/generic/filedlgg.cpp:1113
 msgid "Go to parent directory"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:103
+#: ../src/common/prntbase.cpp:378
+msgid "Goto Page"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:119
 msgid "Greek (ISO-8859-7)"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:267
+#: ../src/html/htmlwin.cpp:354
 #, c-format
 msgid "HTML anchor %s does not exist."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1236
+#: ../src/html/helpfrm.cpp:1307
 msgid ""
-"HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books "
-"(*.htb)|*.htb|Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All "
-"files (*.*)|*"
+"HTML files (*.htm)|*.htm|HTML files (*.html)|*.html|Help books (*.htb)|*.htb|"
+"Help books (*.zip)|*.zip|HTML Help Project (*.hhp)|*.hhp|All files (*.*)|*"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:104
+#: ../src/common/fontmap.cpp:120
 msgid "Hebrew (ISO-8859-8)"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:144 ../src/generic/proplist.cpp:528
-#: ../src/html/helpfrm.cpp:215 ../src/msw/mdi.cpp:1276
+#: ../src/msw/mdi.cpp:1324 ../src/html/helpfrm.cpp:245
+#: ../src/common/dlgcmn.cpp:242 ../src/generic/proplist.cpp:516
+#: ../src/generic/mdig.cpp:308
 msgid "Help"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:911
+#: ../src/html/helpfrm.cpp:944
 msgid "Help Browser Options"
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:319 ../src/generic/helphtml.cpp:320
+#: ../src/generic/helphtml.cpp:334 ../src/generic/helphtml.cpp:335
 msgid "Help Index"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:1220
+#: ../src/html/helpfrm.cpp:1291
 msgid "Help Printing"
 msgstr ""
 
-#: ../src/generic/helpwxht.cpp:251 ../src/html/helpctrl.cpp:38
+#: ../src/html/helpctrl.cpp:49
 #, c-format
 msgid "Help: %s"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:997 ../src/common/resourc2.cpp:1008
-#: ../src/common/resource.cpp:2648 ../src/common/resource.cpp:2659
+#: ../src/common/imagbmp.cpp:939
+msgid "ICO: Error in reading mask DIB."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:1041 ../src/common/imagbmp.cpp:1100
+#: ../src/common/imagbmp.cpp:1109 ../src/common/imagbmp.cpp:1120
+#: ../src/common/imagbmp.cpp:1164 ../src/common/imagbmp.cpp:1174
+#: ../src/common/imagbmp.cpp:1183
+msgid "ICO: Error writing the image file!"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:1009
+msgid "ICO: Image too tall for an icon."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:1015
+msgid "ICO: Image too wide for an icon."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:1248
+msgid "ICO: Invalid icon index."
+msgstr ""
+
+#: ../src/common/imagiff.cpp:767
+msgid "IFF: data stream seems to be truncated."
+msgstr ""
+
+#: ../src/common/imagiff.cpp:751
+msgid "IFF: error in IFF image format."
+msgstr ""
+
+#: ../src/common/imagiff.cpp:754
+msgid "IFF: not enough memory."
+msgstr ""
+
+#: ../src/common/imagiff.cpp:757
+msgid "IFF: unknown error!!!"
+msgstr ""
+
+#: ../src/common/resourc2.cpp:989 ../src/common/resourc2.cpp:1000
+#: ../src/common/resource.cpp:2649 ../src/common/resource.cpp:2660
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr ""
 
-#: ../src/common/resource.cpp:251
+#: ../src/common/resource.cpp:250
 msgid "Ill-formed resource file syntax."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:604 ../src/generic/dirdlgg.cpp:268
-#: ../src/generic/filedlgg.cpp:717
+#: ../src/generic/dirctrlg.cpp:704 ../src/generic/filedlgg.cpp:942
 msgid "Illegal directory name."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1043
+#: ../src/generic/filedlgg.cpp:1365
 msgid "Illegal file specification."
 msgstr ""
 
-#: ../src/msw/textctrl.cpp:219
+#: ../src/common/image.cpp:785
+msgid "Image and Mask have different sizes"
+msgstr ""
+
+#: ../src/common/image.cpp:1067
+#, c-format
+msgid "Image file is not of type %d."
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:270
 msgid ""
 "Impossible to create a rich edit control, using simple text control instead. "
 "Please reinstall riched32.dll"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:350
+#: ../src/unix/utilsunx.cpp:390
 msgid "Impossible to get child process input"
 msgstr ""
 
-#: ../src/html/helpdata.cpp:414
-msgid "Incorrect version of HTML help book"
+#: ../src/common/filefn.cpp:1147
+#, c-format
+msgid "Impossible to get permissions for file '%s'"
+msgstr ""
+
+#: ../src/common/filefn.cpp:1161
+#, c-format
+msgid "Impossible to overwrite the file '%s'"
+msgstr ""
+
+#: ../src/common/filefn.cpp:1212
+#, c-format
+msgid "Impossible to set permissions for the file '%s'"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:386
+#: ../src/html/helpfrm.cpp:392
 msgid "Index"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:108
+#: ../src/common/fontmap.cpp:124
 msgid "Indian (ISO-8859-12)"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:171
+#: ../src/common/imagtiff.cpp:183
 msgid "Invalid TIFF image index."
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:213
+#: ../contrib/src/xrc/xmlres.cpp:362
+#, c-format
+msgid "Invalid XRC resource '%s': doesn't have root node 'resource'."
+msgstr ""
+
+#: ../src/common/appcmn.cpp:398
+#, c-format
+msgid "Invalid display mode specification '%s'."
+msgstr ""
+
+#: ../src/x11/app.cpp:218
+#, c-format
+msgid "Invalid geometry specification '%s'"
+msgstr ""
+
+#: ../src/unix/snglinst.cpp:280
+#, c-format
+msgid "Invalid lock file '%s'."
+msgstr ""
+
+#: ../src/common/regex.cpp:173
+#, c-format
+msgid "Invalid regular expression '%s': %s"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:228
 msgid "Italic"
 msgstr ""
 
@@ -1461,20 +1868,19 @@ msgstr ""
 msgid "Italy Envelope, 110 x 230 mm"
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:202
+#: ../src/common/imagjpeg.cpp:222
 msgid "JPEG: Couldn't load - file is probably corrupted."
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:315
+#: ../src/common/imagjpeg.cpp:336
 msgid "JPEG: Couldn't save image."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:112
+#: ../src/common/fontmap.cpp:128
 msgid "KOI8-R"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2258 ../src/generic/prntdlgg.cpp:441
-#: ../src/generic/prntdlgg.cpp:637
+#: ../src/generic/prntdlgg.cpp:426 ../src/generic/prntdlgg.cpp:620
 msgid "Landscape"
 msgstr ""
 
@@ -1482,7 +1888,7 @@ msgstr ""
 msgid "Ledger, 17 x 11 in"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:649
+#: ../src/generic/prntdlgg.cpp:632
 msgid "Left margin (mm):"
 msgstr ""
 
@@ -1498,17 +1904,21 @@ msgstr ""
 msgid "Letter, 8 1/2 x 11 in"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:216
+#: ../src/generic/fontdlgg.cpp:231
 msgid "Light"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1279 ../src/gtk/filedlg.cpp:249
-#: ../src/motif/filedlg.cpp:357 ../src/msw/filedlg.cpp:483
+#: ../src/gtk/filedlg.cpp:249 ../src/msw/filedlg.cpp:555
+#: ../src/motif/filedlg.cpp:357 ../src/generic/filedlgg.cpp:1623
 #, c-format
 msgid "Load %s file"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:197
+#: ../src/generic/filedlgg.cpp:1625
+msgid "Load file"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:282
 msgid "Loading : "
 msgstr ""
 
@@ -1520,119 +1930,154 @@ msgstr ""
 msgid "Loading Grey Raw PNM image is not yet implemented."
 msgstr ""
 
-#: ../src/generic/logg.cpp:553
+#: ../src/generic/logg.cpp:554
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr ""
 
-#: ../src/gtk/mdi.cpp:435
+#: ../src/gtk/mdi.cpp:433
 msgid "MDI child"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:1570
+#: ../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:4547
+msgid "Ma&ximize"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:2497
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr ""
 
+#: ../src/generic/fdrepdlg.cpp:152
+msgid "Match case"
+msgstr ""
+
 #: ../src/common/fs_mem.cpp:144
 #, c-format
 msgid "Memory VFS already contains file '%s'!"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:1292
-#, c-format
-msgid "Mime.types file %s, line %d: unterminated quoted string."
+#: ../src/univ/themes/metal.cpp:174
+msgid "Metal theme"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:208
-msgid "Modern"
+#: ../src/univ/themes/win32.cpp:4545
+msgid "Mi&nimize"
 msgstr ""
 
-#: ../src/common/paper.cpp:138
-msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
+#: ../src/unix/mimetype.cpp:2118
+#, c-format
+msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:141
-msgid "More..."
+#: ../src/mgl/app.cpp:173
+#, c-format
+msgid "Mode %ix%i-%i not available."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:571 ../src/generic/dirdlgg.cpp:213
-msgid "Mounted Devices"
+#: ../src/generic/fontdlgg.cpp:223
+msgid "Modern"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:208
-msgid "My Harddisk"
+#: ../src/common/paper.cpp:138
+msgid "Monarch Envelope, 3 7/8 x 7 1/2 in"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:570 ../src/generic/dirdlgg.cpp:212
-msgid "My Home"
+#: ../src/common/dlgcmn.cpp:239
+msgid "More..."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:533
+#: ../src/generic/filedlgg.cpp:703
 msgid "Name"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1211 ../src/generic/dirdlgg.cpp:426
-msgid "New..."
-msgstr ""
-
-#: ../src/generic/filedlgg.cpp:610
+#: ../src/generic/dirdlgg.cpp:272 ../src/generic/dirdlgg.cpp:282
+#: ../src/generic/filedlgg.cpp:817 ../src/generic/filedlgg.cpp:826
 msgid "NewName"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:534
+#: ../src/html/helpfrm.cpp:525
 msgid "Next page"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:111 ../src/common/dlgcmn.cpp:121
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:78 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:219
 msgid "No"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:969
-#: ../src/common/resource.cpp:2465 ../src/common/resource.cpp:2620
-msgid "No XBM facility available!"
+#: ../src/common/image.cpp:793
+msgid "No Unused Color in image being masked"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:830 ../src/common/resource.cpp:2480
-msgid "No XPM facility available!"
+#: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:965
+#: ../src/common/resource.cpp:2471 ../src/common/resource.cpp:2625
+msgid "No XBM facility available!"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:991 ../src/common/resource.cpp:2642
+#: ../src/common/resourc2.cpp:983 ../src/common/resource.cpp:2643
 msgid "No XPM icon facility available!"
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:314
+#: ../src/generic/helphtml.cpp:329
 msgid "No entries found."
 msgstr ""
 
-#: ../src/common/image.cpp:835
+#: ../src/common/fontmap.cpp:906
+#, c-format
+msgid ""
+"No font for displaying text in encoding '%s' found,\n"
+"but an alternative encoding '%s' is available.\n"
+"Do you want to use this encoding (otherwise you will have to choose another "
+"one)?"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:911
+#, c-format
+msgid ""
+"No font for displaying text in encoding '%s' found.\n"
+"Would you like to select a font to be used for this encoding\n"
+"(otherwise the text in this encoding will not be shown correctly)?"
+msgstr ""
+
+#: ../contrib/src/xrc/xmlres.cpp:557
+#, c-format
+msgid "No handler found for XML node '%s', class '%s'!"
+msgstr ""
+
+#: ../src/common/image.cpp:1049 ../src/common/image.cpp:1092
 msgid "No handler found for image type."
 msgstr ""
 
-#: ../src/common/image.cpp:843 ../src/common/image.cpp:877
+#: ../src/common/image.cpp:1057 ../src/common/image.cpp:1100
+#: ../src/common/image.cpp:1134
 #, c-format
 msgid "No image handler for type %d defined."
 msgstr ""
 
-#: ../src/common/image.cpp:861 ../src/common/image.cpp:893
+#: ../src/common/image.cpp:1118 ../src/common/image.cpp:1150
 #, c-format
 msgid "No image handler for type %s defined."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:652
+#: ../src/html/helpfrm.cpp:655
 msgid "No matching page found yet"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:106
+#: ../src/common/fontmap.cpp:122
 msgid "Nordic (ISO-8859-10)"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:212 ../src/generic/fontdlgg.cpp:215
+#: ../src/generic/fontdlgg.cpp:227 ../src/generic/fontdlgg.cpp:230
 msgid "Normal"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:920
+#: ../src/html/helpfrm.cpp:949
 msgid "Normal font:"
 msgstr ""
 
@@ -1640,69 +2085,68 @@ msgstr ""
 msgid "Note, 8 1/2 x 11 in"
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:127 ../src/generic/dcpsg.cpp:2266
-#: ../src/generic/dirctrlg.cpp:1203 ../src/generic/dirdlgg.cpp:422
-#: ../src/generic/filedlgg.cpp:907 ../src/generic/fontdlgg.cpp:256
-#: ../src/generic/logg.cpp:748 ../src/generic/prntdlgg.cpp:467
-#: ../src/generic/proplist.cpp:511 ../src/gtk/filedlg.cpp:167
-#: ../src/gtk/fontdlg.cpp:167 ../src/html/helpfrm.cpp:948
+#: ../src/gtk/fontdlg.cpp:136 ../src/gtk/filedlg.cpp:167
+#: ../src/html/helpfrm.cpp:974 ../src/common/dlgcmn.cpp:225
+#: ../src/generic/fontdlgg.cpp:254 ../src/generic/proplist.cpp:499
+#: ../src/generic/dirdlgg.cpp:151 ../src/generic/filedlgg.cpp:1180
+#: ../src/generic/filedlgg.cpp:1191 ../src/generic/logg.cpp:739
+#: ../src/generic/prntdlgg.cpp:452
 msgid "OK"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:542 ../src/html/helpfrm.cpp:1231
+#: ../src/html/helpfrm.cpp:533 ../src/html/helpfrm.cpp:1302
 msgid "Open HTML document"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:633 ../src/generic/dirctrlg.cpp:1347
-#: ../src/generic/dirdlgg.cpp:297 ../src/generic/dirdlgg.cpp:604
-#: ../src/generic/filedlgg.cpp:625 ../src/generic/filedlgg.cpp:744
+#: ../src/generic/dirdlgg.cpp:298 ../src/generic/dirctrlg.cpp:733
+#: ../src/generic/filedlgg.cpp:841 ../src/generic/filedlgg.cpp:969
 msgid "Operation not permitted."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:642
+#: ../src/common/cmdline.cpp:667
 #, c-format
 msgid "Option '%s' requires a value, '=' expected."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:662
+#: ../src/common/cmdline.cpp:687
 #, c-format
 msgid "Option '%s' requires a value."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:723
+#: ../src/common/cmdline.cpp:748
 #, c-format
 msgid "Option '%s': '%s' cannot be converted to a date."
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:447
+#: ../src/generic/prntdlgg.cpp:432
 msgid "Options"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:443 ../src/generic/prntdlgg.cpp:638
+#: ../src/generic/prntdlgg.cpp:428 ../src/generic/prntdlgg.cpp:621
 msgid "Orientation"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:460 ../src/common/imagpcx.cpp:483
+#: ../src/common/imagpcx.cpp:455 ../src/common/imagpcx.cpp:478
 msgid "PCX: couldn't allocate memory"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:459
+#: ../src/common/imagpcx.cpp:454
 msgid "PCX: image format unsupported"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:482
+#: ../src/common/imagpcx.cpp:477
 msgid "PCX: invalid image"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:446
+#: ../src/common/imagpcx.cpp:441
 msgid "PCX: this is not a PCX file."
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:462 ../src/common/imagpcx.cpp:484
+#: ../src/common/imagpcx.cpp:457 ../src/common/imagpcx.cpp:479
 msgid "PCX: unknown error !!!"
 msgstr ""
 
-#: ../src/common/imagpcx.cpp:461
+#: ../src/common/imagpcx.cpp:456
 msgid "PCX: version number too low"
 msgstr ""
 
@@ -1718,173 +2162,156 @@ msgstr ""
 msgid "PNM: File seems truncated."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:731
+#: ../src/common/prntbase.cpp:826
 #, c-format
 msgid "Page %d"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:729
+#: ../src/common/prntbase.cpp:824
 #, c-format
 msgid "Page %d of %d"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:604
+#: ../src/generic/prntdlgg.cpp:587
 msgid "Page Setup"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:164
+#: ../src/generic/prntdlgg.cpp:161
 msgid "Pages"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:555 ../src/generic/prntdlgg.cpp:626
-#: ../src/generic/prntdlgg.cpp:808
+#: ../src/generic/prntdlgg.cpp:538 ../src/generic/prntdlgg.cpp:609
+#: ../src/generic/prntdlgg.cpp:794
 msgid "Paper Size"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:433 ../src/generic/prntdlgg.cpp:615
-#: ../src/generic/prntdlgg.cpp:804
+#: ../src/generic/prntdlgg.cpp:418 ../src/generic/prntdlgg.cpp:598
+#: ../src/generic/prntdlgg.cpp:790
 msgid "Paper size"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:537
+#: ../src/generic/filedlgg.cpp:708
 msgid "Permissions"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:440 ../src/unix/utilsunx.cpp:468
+#: ../src/unix/utilsunx.cpp:441
 msgid "Pipe creation failed"
 msgstr ""
 
-#: ../src/gtk/fontdlg.cpp:67
+#: ../src/gtk/fontdlg.cpp:71
 msgid "Please choose a valid font."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1092 ../src/gtk/filedlg.cpp:80
+#: ../src/gtk/filedlg.cpp:80 ../src/generic/filedlgg.cpp:1418
 msgid "Please choose an existing file."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:768
+#: ../src/msw/dialup.cpp:749
 msgid "Please choose which ISP do you want to connect to"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:107
-msgid "Please wait..."
+#: ../src/msw/listctrl.cpp:550
+#, c-format
+msgid ""
+"Please install a newer version of comctl32.dll\n"
+"(at least version 4.70 is required but you have %d.%02d)\n"
+"or this program won't operate correctly."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2257 ../src/generic/prntdlgg.cpp:440
-#: ../src/generic/prntdlgg.cpp:636
-msgid "Portrait"
+#: ../src/common/prntbase.cpp:111
+msgid "Please wait while printing\n"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:391
-msgid "PostScript"
+#: ../src/generic/prntdlgg.cpp:425 ../src/generic/prntdlgg.cpp:619
+msgid "Portrait"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:272
+#: ../src/generic/prntdlgg.cpp:268
 msgid "PostScript file"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2299
-msgid "PostScript:"
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:2262
-msgid "Preview Only"
-msgstr ""
-
-#: ../src/html/helpfrm.cpp:942
+#: ../src/html/helpfrm.cpp:966
 msgid "Preview:"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:531
+#: ../src/html/helpfrm.cpp:522
 msgid "Previous page"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:113 ../src/generic/prntdlgg.cpp:127
+#: ../src/generic/prntdlgg.cpp:110 ../src/generic/prntdlgg.cpp:124
 msgid "Print"
 msgstr ""
 
-#: ../src/common/docview.cpp:897
+#: ../src/common/docview.cpp:925
 msgid "Print Preview"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:687 ../src/common/prntbase.cpp:711
+#: ../src/common/prntbase.cpp:781 ../src/common/prntbase.cpp:805
 msgid "Print Preview Failure"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:172
+#: ../src/generic/prntdlgg.cpp:169
 msgid "Print Range"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:408 ../src/generic/prntdlgg.cpp:415
+#: ../src/generic/prntdlgg.cpp:406
 msgid "Print Setup"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:455
+#: ../src/generic/prntdlgg.cpp:440
 msgid "Print in colour"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:457
+#: ../src/generic/prntdlgg.cpp:442
 msgid "Print spooling"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:548
+#: ../src/html/helpfrm.cpp:539
 msgid "Print this page"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2261 ../src/generic/prntdlgg.cpp:150
+#: ../src/generic/prntdlgg.cpp:147
 msgid "Print to File"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:366
+#: ../src/common/prntbase.cpp:435
 msgid "Print..."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2272
-msgid "Printer Command: "
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:2277
-msgid "Printer Options: "
-msgstr ""
-
-#: ../src/generic/dcpsg.cpp:360
-msgid "Printer Settings"
-msgstr ""
-
-#: ../src/generic/prntdlgg.cpp:459
+#: ../src/generic/prntdlgg.cpp:444
 msgid "Printer command:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:149
+#: ../src/generic/prntdlgg.cpp:146
 msgid "Printer options"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:463
+#: ../src/generic/prntdlgg.cpp:448
 msgid "Printer options:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:682
+#: ../src/generic/prntdlgg.cpp:665
 msgid "Printer..."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:106 ../src/common/prntbase.cpp:148
-msgid "Printing"
+#: ../src/common/prntbase.cpp:108 ../src/common/prntbase.cpp:153
+msgid "Printing "
 msgstr ""
 
-#: ../src/common/prntbase.cpp:120
+#: ../src/common/prntbase.cpp:125
 msgid "Printing Error"
 msgstr ""
 
-#: ../src/generic/printps.cpp:220
+#: ../src/generic/printps.cpp:221
 #, c-format
 msgid "Printing page %d..."
 msgstr ""
 
-#: ../src/generic/printps.cpp:180
+#: ../src/generic/printps.cpp:181
 msgid "Printing..."
 msgstr ""
 
-#: ../src/common/log.cpp:350
+#: ../src/common/log.cpp:454
 msgid "Program aborted."
 msgstr ""
 
@@ -1892,26 +2319,31 @@ msgstr ""
 msgid "Quarto, 215 x 275 mm"
 msgstr ""
 
-#: ../src/generic/logg.cpp:1038
+#: ../src/generic/logg.cpp:1111
 msgid "Question"
 msgstr ""
 
-#: ../src/common/ffile.cpp:133 ../src/common/ffile.cpp:154
+#: ../src/common/ffile.cpp:125 ../src/common/ffile.cpp:146
 #, c-format
 msgid "Read error on file '%s'"
 msgstr ""
 
-#: ../src/msw/registry.cpp:530
+#: ../contrib/src/xrc/xmlres.cpp:532
+#, c-format
+msgid "Referenced object node with ref=\"%s\" not found!"
+msgstr ""
+
+#: ../src/msw/registry.cpp:535
 #, c-format
 msgid "Registry key '%s' already exists."
 msgstr ""
 
-#: ../src/msw/registry.cpp:499
+#: ../src/msw/registry.cpp:504
 #, c-format
 msgid "Registry key '%s' does not exist, cannot rename it."
 msgstr ""
 
-#: ../src/msw/registry.cpp:626
+#: ../src/msw/registry.cpp:631
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -1919,153 +2351,175 @@ msgid ""
 "operation aborted."
 msgstr ""
 
-#: ../src/msw/registry.cpp:430
+#: ../src/msw/registry.cpp:435
 #, c-format
 msgid "Registry value '%s' already exists."
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:319
+#: ../src/generic/helphtml.cpp:334
 msgid "Relevant entries:"
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:170
+#: ../src/generic/progdlgg.cpp:199
 msgid "Remaining time : "
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:282
+#: ../src/html/helpfrm.cpp:329
 msgid "Remove current page from bookmarks"
 msgstr ""
 
-#: ../src/msw/filedlg.cpp:445
-#, c-format
-msgid "Replace file '%s'?"
+#: ../src/generic/fdrepdlg.cpp:177
+msgid "Replace &all"
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:129
+msgid "Replace with:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:661
+#: ../contrib/src/xrc/xmlres.cpp:379
+msgid "Resource files must have same version number!"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:644
 msgid "Right margin (mm):"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:206
+#: ../src/generic/fontdlgg.cpp:221
 msgid "Roman"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:1295 ../src/gtk/filedlg.cpp:265
-#: ../src/motif/filedlg.cpp:359 ../src/msw/filedlg.cpp:484
+#: ../src/gtk/filedlg.cpp:265 ../src/msw/filedlg.cpp:557
+#: ../src/motif/filedlg.cpp:359 ../src/generic/filedlgg.cpp:1638
 #, c-format
 msgid "Save %s file"
 msgstr ""
 
-#: ../src/common/docview.cpp:249
+#: ../src/common/docview.cpp:248
 msgid "Save as"
 msgstr ""
 
-#: ../src/generic/logg.cpp:488
+#: ../src/generic/filedlgg.cpp:1640
+msgid "Save file"
+msgstr ""
+
+#: ../src/generic/logg.cpp:487
 msgid "Save log contents to file"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:209
+#: ../src/generic/fontdlgg.cpp:224
 msgid "Script"
 msgstr ""
 
-#: ../src/generic/helpwxht.cpp:161 ../src/html/helpfrm.cpp:429
-#: ../src/html/helpfrm.cpp:449
+#: ../src/html/helpfrm.cpp:413 ../src/html/helpfrm.cpp:428
 msgid "Search"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:431
+#: ../src/html/helpfrm.cpp:415
 msgid ""
 "Search contents of help book(s) for all occurences of the text you typed "
 "above"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:767
+#: ../src/generic/fdrepdlg.cpp:158
+msgid "Search direction"
+msgstr ""
+
+#: ../src/generic/fdrepdlg.cpp:117
+msgid "Search for:"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:794
 msgid "Search in all books"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:652
+#: ../src/html/helpfrm.cpp:655
 msgid "Searching..."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:454 ../src/generic/dirdlgg.cpp:191
+#: ../src/generic/dirctrlg.cpp:551
 msgid "Sections"
 msgstr ""
 
-#: ../src/common/ffile.cpp:221
+#: ../src/common/ffile.cpp:213
 #, c-format
 msgid "Seek error on file '%s'"
 msgstr ""
 
-#: ../src/common/docview.cpp:1472
+#: ../src/msw/textctrl.cpp:1685
+msgid "Select &All"
+msgstr ""
+
+#: ../src/common/docview.cpp:1540
 msgid "Select a document template"
 msgstr ""
 
-#: ../src/common/docview.cpp:1519
+#: ../src/common/docview.cpp:1616
 msgid "Select a document view"
 msgstr ""
 
-#: ../src/common/docview.cpp:1371 ../src/common/docview.cpp:1422
+#: ../src/common/docview.cpp:1407 ../src/common/docview.cpp:1458
 msgid "Select a file"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2260
-msgid "Send to Printer"
-msgstr ""
-
-#: ../src/common/cmdline.cpp:679
+#: ../src/common/cmdline.cpp:704
 #, c-format
 msgid "Separator expected after the option '%s'."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:138
+#: ../src/common/dlgcmn.cpp:236
 msgid "Setup"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:155
+#: ../src/generic/prntdlgg.cpp:152
 msgid "Setup..."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:539
+#: ../src/msw/dialup.cpp:520
 msgid "Several active dialup connections found, choosing one randomly."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:345
+#: ../src/html/helpfrm.cpp:369
 msgid "Show all"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:379
+#: ../src/html/helpfrm.cpp:380
 msgid "Show all items in index"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:913
+#: ../src/generic/dirdlgg.cpp:135
+msgid "Show hidden directories"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1175 ../src/generic/filedlgg.cpp:1197
 msgid "Show hidden files"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:515
+#: ../src/html/helpfrm.cpp:506
 msgid "Show/hide navigation panel"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:534
+#: ../src/generic/filedlgg.cpp:704
 msgid "Size"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:214
+#: ../src/generic/fontdlgg.cpp:229
 msgid "Slant"
 msgstr ""
 
-#: ../src/common/docview.cpp:306
+#: ../src/common/docview.cpp:305
 msgid "Sorry, could not open this file for saving."
 msgstr ""
 
-#: ../src/common/docview.cpp:342 ../src/common/docview.cpp:354
-#: ../src/common/docview.cpp:1390
+#: ../src/common/docview.cpp:342 ../src/common/docview.cpp:355
+#: ../src/common/docview.cpp:1426
 msgid "Sorry, could not open this file."
 msgstr ""
 
-#: ../src/common/docview.cpp:313
+#: ../src/common/docview.cpp:312
 msgid "Sorry, could not save this file."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:687
+#: ../src/common/prntbase.cpp:781
 msgid "Sorry, not enough memory to create a preview."
 msgstr ""
 
@@ -2073,32 +2527,37 @@ msgstr ""
 msgid "Statement, 5 1/2 x 8 1/2 in"
 msgstr ""
 
-#: ../src/generic/logg.cpp:613
+#: ../src/generic/logg.cpp:604
 msgid "Status: "
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:210
+#: ../contrib/src/xrc/xmlres.cpp:632
+#, c-format
+msgid "Subclass '%s' not found for resource '%s', not subclassing!"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:225
 msgid "Swiss"
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:192 ../src/common/imagtiff.cpp:203
-#: ../src/common/imagtiff.cpp:314
+#: ../src/common/imagtiff.cpp:204 ../src/common/imagtiff.cpp:215
+#: ../src/common/imagtiff.cpp:326
 msgid "TIFF: Couldn't allocate memory."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:163
+#: ../src/common/imagtiff.cpp:175
 msgid "TIFF: Error loading image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:214
+#: ../src/common/imagtiff.cpp:226
 msgid "TIFF: Error reading image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:291
+#: ../src/common/imagtiff.cpp:303
 msgid "TIFF: Error saving image."
 msgstr ""
 
-#: ../src/common/imagtiff.cpp:338
+#: ../src/common/imagtiff.cpp:350
 msgid "TIFF: Error writing image."
 msgstr ""
 
@@ -2106,27 +2565,23 @@ msgstr ""
 msgid "Tabloid, 11 x 17 in"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:211
+#: ../src/generic/fontdlgg.cpp:226
 msgid "Teletype"
 msgstr ""
 
-#: ../src/common/docview.cpp:1473
+#: ../src/common/docview.cpp:1541
 msgid "Templates"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:576 ../src/generic/dirdlgg.cpp:218
-msgid "Temporary"
-msgstr ""
-
-#: ../src/common/fontmap.cpp:107
+#: ../src/common/fontmap.cpp:123
 msgid "Thai (ISO-8859-11)"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:569 ../src/generic/dirdlgg.cpp:210
-msgid "The Computer"
+#: ../src/common/ftp.cpp:569
+msgid "The FTP server doesn't support passive mode."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:475
+#: ../src/common/fontmap.cpp:674
 #, c-format
 msgid ""
 "The charset '%s' is unknown. You may select\n"
@@ -2134,88 +2589,101 @@ msgid ""
 "[Cancel] if it cannot be replaced"
 msgstr ""
 
-#: ../src/msw/ole/dataobj.cpp:169
+#: ../src/msw/ole/dataobj.cpp:165
 #, c-format
 msgid "The clipboard format '%d' doesn't exist."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1244 ../src/generic/dirdlgg.cpp:535
-msgid "The directory "
-msgstr ""
-
-#: ../src/common/fontmap.cpp:668
+#: ../src/generic/dirdlgg.cpp:186
 #, c-format
 msgid ""
-"The encoding '%s' is unknown.\n"
-"Would you like to select a font to be used for this encoding\n"
-"(otherwise the text in this encoding will not be shown correctly)?"
+"The directory '%s' does not exist\n"
+"Create it now?"
 msgstr ""
 
-#: ../src/common/docview.cpp:1707
+#: ../src/common/docview.cpp:1804
 #, c-format
 msgid ""
 "The file '%s' doesn't exist and couldn't be opened.\n"
-"It has been also removed from the MRU files list."
+"It has been removed from the most recently used files list."
+msgstr ""
+
+#: ../src/common/filename.cpp:900
+#, c-format
+msgid "The path '%s' contains too many \"..\"!"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:813
+#: ../src/common/cmdline.cpp:846
 #, c-format
 msgid "The required parameter '%s' was not specified."
 msgstr ""
 
-#: ../src/common/textcmn.cpp:121
+#: ../src/common/textcmn.cpp:187
 msgid "The text couldn't be saved."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:792
+#: ../src/common/cmdline.cpp:825
 #, c-format
 msgid "The value for the option '%s' must be specified."
 msgstr ""
 
-#: ../src/msw/dialup.cpp:415
+#: ../src/msw/dialup.cpp:408
 #, c-format
 msgid ""
 "The version of remote access service (RAS) installed on this machine is "
 "tooold, please upgrade (the following required function is missing: %s)."
 msgstr ""
 
-#: ../src/msw/thread.cpp:1083
+#: ../src/html/htmprint.cpp:540
+msgid ""
+"There was a problem during page setup: you may need to set a default printer."
+msgstr ""
+
+#: ../src/msw/thread.cpp:1214
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:1441
+#: ../src/unix/threadpsx.cpp:1596
 msgid "Thread module initialization failed: failed to create thread key"
 msgstr ""
 
-#: ../src/msw/thread.cpp:1071
+#: ../src/msw/thread.cpp:1202
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:962
+#: ../src/unix/threadpsx.cpp:1104
 msgid "Thread priority setting is ignored."
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:536
+#: ../src/msw/mdi.cpp:189
+msgid "Tile &Horizontally"
+msgstr ""
+
+#: ../src/msw/mdi.cpp:190
+msgid "Tile &Vertically"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:706
 msgid "Time"
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:162
+#: ../src/generic/tipdlg.cpp:202
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../src/generic/tipdlg.cpp:138
+#: ../src/generic/tipdlg.cpp:140
 msgid "Tips not available, sorry!"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:191
+#: ../src/generic/prntdlgg.cpp:188
 msgid "To:"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:650
+#: ../src/generic/prntdlgg.cpp:633
 msgid "Top margin (mm):"
 msgstr ""
 
@@ -2224,11 +2692,11 @@ msgstr ""
 msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
 msgstr ""
 
-#: ../src/common/sckaddr.cpp:107
+#: ../src/common/sckaddr.cpp:126
 msgid "Trying to solve a NULL hostname: giving up"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:105
+#: ../src/common/fontmap.cpp:121
 msgid "Turkish (ISO-8859-9)"
 msgstr ""
 
@@ -2236,231 +2704,277 @@ msgstr ""
 msgid "US Std Fanfold, 14 7/8 x 11 in"
 msgstr ""
 
-#: ../src/html/htmlwin.cpp:183
+#: ../src/html/htmlwin.cpp:270
 #, c-format
 msgid "Unable to open requested HTML document: %s"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:242
+#: ../src/generic/fontdlgg.cpp:250
 msgid "Underline"
 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:1378 ../src/common/resourc2.cpp:1392
-#: ../src/common/resourc2.cpp:1408 ../src/common/resourc2.cpp:1422
-#: ../src/common/resource.cpp:1818 ../src/common/resource.cpp:1832
-#: ../src/common/resource.cpp:1849 ../src/common/resource.cpp:1863
-#: ../src/common/resource.cpp:1948 ../src/common/resource.cpp:1962
-#: ../src/common/resource.cpp:1978 ../src/common/resource.cpp:1992
-#: ../src/common/resource.cpp:3033 ../src/common/resource.cpp:3047
-#: ../src/common/resource.cpp:3064 ../src/common/resource.cpp:3078
+#: ../src/common/resourc2.cpp:1370 ../src/common/resourc2.cpp:1384
+#: ../src/common/resourc2.cpp:1400 ../src/common/resourc2.cpp:1414
+#: ../src/common/resource.cpp:1824 ../src/common/resource.cpp:1838
+#: ../src/common/resource.cpp:1855 ../src/common/resource.cpp:1869
+#: ../src/common/resource.cpp:1954 ../src/common/resource.cpp:1968
+#: ../src/common/resource.cpp:1984 ../src/common/resource.cpp:1998
+#: ../src/common/resource.cpp:3038 ../src/common/resource.cpp:3052
+#: ../src/common/resource.cpp:3069 ../src/common/resource.cpp:3083
 msgid "Unexpected end of file whilst parsing resource."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:764
+#: ../src/common/cmdline.cpp:789
 #, c-format
 msgid "Unexpected parameter '%s'"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1020
+#: ../src/common/fontmap.cpp:142
+msgid "Unicode 7 bit (UTF-7)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:143
+msgid "Unicode 8 bit (UTF-8)"
+msgstr ""
+
+#: ../src/msw/dde.cpp:1044
 #, c-format
 msgid "Unknown DDE error %08x"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:329
+#: ../src/common/fontmap.cpp:406
 #, c-format
 msgid "Unknown encoding (%d)"
 msgstr ""
 
-#: ../src/unix/mimetype.cpp:1335
+#: ../src/unix/mimetype.cpp:2165
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:548
+#: ../src/common/cmdline.cpp:565
 #, c-format
 msgid "Unknown long option '%s'"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:570
+#: ../src/common/cmdline.cpp:574 ../src/common/cmdline.cpp:595
 #, c-format
 msgid "Unknown option '%s'"
 msgstr ""
 
-#: ../src/common/mimecmn.cpp:161
+#: ../contrib/src/xrc/xmlres.cpp:701
+msgid "Unknown style flag "
+msgstr ""
+
+#: ../src/common/mimecmn.cpp:167
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr ""
 
-#: ../src/common/docview.cpp:1956 ../src/common/docview.cpp:1971
-#: ../src/common/docview.cpp:1998
+#: ../src/common/cmdproc.cpp:238 ../src/common/cmdproc.cpp:254
+#: ../src/common/cmdproc.cpp:281
 msgid "Unnamed command"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2337
+#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2343
 #, c-format
 msgid "Unrecognized style %s whilst parsing resource."
 msgstr ""
 
-#: ../src/mac/clipbrd.cpp:191 ../src/msw/clipbrd.cpp:268
-#: ../src/msw/clipbrd.cpp:369
+#: ../src/mac/clipbrd.cpp:59 ../src/msw/clipbrd.cpp:273
+#: ../src/msw/clipbrd.cpp:447
 msgid "Unsupported clipboard format."
 msgstr ""
 
-#: ../src/common/cmdline.cpp:849
+#: ../src/common/appcmn.cpp:380
 #, c-format
-msgid "Usage: %s"
+msgid "Unsupported theme '%s'."
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:573 ../src/generic/dirdlgg.cpp:215
-msgid "User"
+#: ../src/generic/fdrepdlg.cpp:157
+msgid "Up"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:572 ../src/generic/dirdlgg.cpp:214
-msgid "User Local"
+#: ../src/common/cmdline.cpp:916
+#, c-format
+msgid "Usage: %s"
 msgstr ""
 
-#: ../src/common/valtext.cpp:188
+#: ../src/common/valtext.cpp:196
 msgid "Validation conflict"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:574 ../src/generic/dirdlgg.cpp:216
-msgid "Variables"
-msgstr ""
-
-#: ../src/generic/filedlgg.cpp:861
+#: ../src/generic/filedlgg.cpp:1103
 msgid "View files as a detailed view"
 msgstr ""
 
-#: ../src/generic/filedlgg.cpp:855
+#: ../src/generic/filedlgg.cpp:1096
 msgid "View files as a list view"
 msgstr ""
 
-#: ../src/common/docview.cpp:1520
+#: ../src/common/docview.cpp:1617
 msgid "Views"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:270 ../src/unix/utilsunx.cpp:619
+#: ../src/unix/utilsunx.cpp:758
 msgid "Waiting for subprocess termination failed"
 msgstr ""
 
-#: ../src/common/docview.cpp:437 ../src/common/resource.cpp:121
+#: ../src/common/resource.cpp:124 ../src/common/docview.cpp:438
 msgid "Warning"
 msgstr ""
 
-#: ../src/common/log.cpp:360
+#: ../src/common/log.cpp:464
 msgid "Warning: "
 msgstr ""
 
-#: ../src/html/htmlpars.cpp:185
+#: ../src/html/htmlpars.cpp:362
 msgid "Warning: attempt to remove HTML tag handler from empty stack."
 msgstr ""
 
-#: ../src/common/fontmap.cpp:97
-msgid "Western European (ISO-8859-1/Latin 1)"
+#: ../src/common/fontmap.cpp:113
+msgid "Western European (ISO-8859-1)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:127
+msgid "Western European with Euro (ISO-8859-15)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:111
-msgid "Western European with Euro (ISO-8859-15/Latin 0)"
+#: ../src/generic/fdrepdlg.cpp:149
+msgid "Whole word"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:421
+#: ../src/html/helpfrm.cpp:412
 msgid "Whole words only"
 msgstr ""
 
-#: ../src/msw/utils.cpp:571
-msgid "Win32s on Windows 3.1"
+#: ../src/univ/themes/win32.cpp:1168
+msgid "Win32 theme"
 msgstr ""
 
-#: ../src/msw/mdi.cpp:1311
-msgid "Window"
+#: ../src/msw/utils.cpp:983
+msgid "Win32s on Windows 3.1"
 msgstr ""
 
-#: ../src/msw/utils.cpp:603
+#: ../src/msw/utils.cpp:1015
 msgid "Windows 3.1"
 msgstr ""
 
-#: ../src/msw/utils.cpp:575
+#: ../src/msw/utils.cpp:987
 #, c-format
 msgid "Windows 9%c"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:119
+#: ../src/common/fontmap.cpp:139
 msgid "Windows Arabic (CP 1256)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:120
+#: ../src/common/fontmap.cpp:140
 msgid "Windows Baltic (CP 1257)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:113
+#: ../src/common/fontmap.cpp:133
 msgid "Windows Central European (CP 1250)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:114
+#: ../src/common/fontmap.cpp:130
+msgid "Windows Chinese Simplified (CP 936)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:132
+msgid "Windows Chinese Traditional (CP 950)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:134
 msgid "Windows Cyrillic (CP 1251)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:116
+#: ../src/common/fontmap.cpp:136
 msgid "Windows Greek (CP 1253)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:118
+#: ../src/common/fontmap.cpp:138
 msgid "Windows Hebrew (CP 1255)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:117
+#: ../src/common/fontmap.cpp:129
+msgid "Windows Japanese (CP 932)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:131
+msgid "Windows Korean (CP 949)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:137
 msgid "Windows Turkish (CP 1254)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:115
+#: ../src/common/fontmap.cpp:135
 msgid "Windows Western European (CP 1252)"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:121
+#: ../src/common/fontmap.cpp:141
 msgid "Windows/DOS OEM (CP 437)"
 msgstr ""
 
-#: ../src/common/ffile.cpp:168
+#: ../src/common/ffile.cpp:160
 #, c-format
 msgid "Write error on file '%s'"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2317
-msgid "X Scaling"
+#: ../contrib/src/xrc/xml.cpp:530
+#, c-format
+msgid "XML parsing error: '%s' at line %d"
+msgstr ""
+
+#: ../src/common/xpmdecod.cpp:759
+msgid "XPM: Malformed pixel data!"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2326
-msgid "X Translation"
+#: ../src/common/xpmdecod.cpp:709 ../src/common/xpmdecod.cpp:718
+#, c-format
+msgid "XPM: malformed colour definition '%s'!"
+msgstr ""
+
+#: ../contrib/src/xrc/xmlres.cpp:470
+#, c-format
+msgid "XRC resource '%s' (class '%s') not found!"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2321
-msgid "Y Scaling"
+#: ../contrib/src/xrc/xmlres.cpp:861 ../contrib/src/xrc/xmlres.cpp:872
+#, c-format
+msgid "XRC resource: Cannot create bitmap from '%s'."
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:2330
-msgid "Y Translation"
+#: ../contrib/src/xrc/xmlres.cpp:821
+#, c-format
+msgid "XRC resource: Incorrect colour specification '%s' for property '%s'."
 msgstr ""
 
-#: ../src/common/dlgcmn.cpp:109 ../src/common/dlgcmn.cpp:116
-#: ../src/motif/msgdlg.cpp:180
+#: ../src/mac/msgdlg.cpp:77 ../src/motif/msgdlg.cpp:182
+#: ../src/common/dlgcmn.cpp:214
 msgid "Yes"
 msgstr ""
 
-#: ../src/generic/dirctrlg.cpp:1311 ../src/generic/dirdlgg.cpp:570
+#: ../src/generic/dirdlgg.cpp:262
 msgid "You cannot add a new directory to this section."
 msgstr ""
 
-#: ../src/common/docview.cpp:2067
+#: ../src/common/fs_zip.cpp:86 ../src/common/fs_zip.cpp:125
+msgid "ZIP handler currently supports only local files!"
+msgstr ""
+
+#: ../src/common/docview.cpp:1953
 msgid "[EMPTY]"
 msgstr ""
 
-#: ../src/msw/dde.cpp:987
+#: ../src/msw/dde.cpp:1011
 msgid "a DDEML application has created a prolonged race condition."
 msgstr ""
 
-#: ../src/msw/dde.cpp:975
+#: ../src/msw/dde.cpp:999
 msgid ""
 "a DDEML function was called without first calling the DdeInitialize "
 "function,\n"
@@ -2468,54 +2982,54 @@ msgid ""
 "was passed to a DDEML function."
 msgstr ""
 
-#: ../src/msw/dde.cpp:993
+#: ../src/msw/dde.cpp:1017
 msgid "a client's attempt to establish a conversation has failed."
 msgstr ""
 
-#: ../src/msw/dde.cpp:990
+#: ../src/msw/dde.cpp:1014
 msgid "a memory allocation failed."
 msgstr ""
 
-#: ../src/msw/dde.cpp:984
+#: ../src/msw/dde.cpp:1008
 msgid "a parameter failed to be validated by the DDEML."
 msgstr ""
 
-#: ../src/msw/dde.cpp:966
+#: ../src/msw/dde.cpp:990
 msgid "a request for a synchronous advise transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:972
+#: ../src/msw/dde.cpp:996
 msgid "a request for a synchronous data transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:981
+#: ../src/msw/dde.cpp:1005
 msgid "a request for a synchronous execute transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:999
+#: ../src/msw/dde.cpp:1023
 msgid "a request for a synchronous poke transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1014
+#: ../src/msw/dde.cpp:1038
 msgid "a request to end an advise transaction has timed out."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1008
+#: ../src/msw/dde.cpp:1032
 msgid ""
 "a server-side transaction was attempted on a conversation\n"
 "that was terminated by the client, or the server\n"
 "terminated before completing a transaction."
 msgstr ""
 
-#: ../src/msw/dde.cpp:996
+#: ../src/msw/dde.cpp:1020
 msgid "a transaction failed."
 msgstr ""
 
-#: ../src/common/utilscmn.cpp:470
+#: ../src/common/menucmn.cpp:99
 msgid "alt"
 msgstr ""
 
-#: ../src/msw/dde.cpp:978
+#: ../src/msw/dde.cpp:1002
 msgid ""
 "an application initialized as APPCLASS_MONITOR has\n"
 "attempted to perform a DDE transaction,\n"
@@ -2523,416 +3037,479 @@ msgid ""
 "attempted to perform server transactions."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1002
+#: ../src/msw/dde.cpp:1026
 msgid "an internal call to the PostMessage function has failed. "
 msgstr ""
 
-#: ../src/msw/dde.cpp:1011
+#: ../src/msw/dde.cpp:1035
 msgid "an internal error has occurred in the DDEML."
 msgstr ""
 
-#: ../src/msw/dde.cpp:1017
+#: ../src/msw/dde.cpp:1041
 msgid ""
 "an invalid transaction identifier was passed to a DDEML function.\n"
 "Once the application has returned from an XTYP_XACT_COMPLETE callback,\n"
 "the transaction identifier for that callback is no longer valid."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1448
+#: ../src/common/fileconf.cpp:1767
 #, c-format
 msgid "attempt to change immutable key '%s' ignored."
 msgstr ""
 
-#: ../src/common/ffile.cpp:101
+#: ../src/common/ftp.cpp:369
+msgid "binary"
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:548
+msgid "bold"
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:472
+msgid "bold "
+msgstr ""
+
+#: ../src/common/ffile.cpp:93
 #, c-format
 msgid "can't close file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:257
+#: ../src/common/file.cpp:275
 #, c-format
 msgid "can't close file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:555 ../src/common/file.cpp:565
+#: ../src/common/file.cpp:553
 #, c-format
 msgid "can't commit changes to file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:200
+#: ../src/common/file.cpp:215
 #, c-format
 msgid "can't create file '%s'"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:918
+#: ../src/common/fileconf.cpp:1078
 #, c-format
 msgid "can't delete user configuration file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:436
+#: ../src/common/file.cpp:458
 #, c-format
 msgid "can't determine if the end of file is reached on descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:402
+#: ../src/common/file.cpp:424
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr ""
 
-#: ../src/msw/utils.cpp:376
+#: ../src/msw/utils.cpp:369
 msgid "can't find user's HOME, using current directory."
 msgstr ""
 
-#: ../src/common/file.cpp:316
+#: ../src/common/file.cpp:338
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:370
+#: ../src/common/file.cpp:392
 #, c-format
 msgid "can't get seek position on file descriptor %d"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:610
+#: ../src/common/fontmap.cpp:807
 msgid "can't load any font, aborting"
 msgstr ""
 
-#: ../src/common/ffile.cpp:85 ../src/common/file.cpp:243
+#: ../src/common/file.cpp:261 ../src/common/ffile.cpp:77
 #, c-format
 msgid "can't open file '%s'"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:317
+#: ../src/common/fileconf.cpp:397
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:329
+#: ../src/common/fileconf.cpp:416
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:798
+#: ../src/common/fileconf.cpp:949
 msgid "can't open user configuration file."
 msgstr ""
 
-#: ../src/common/file.cpp:283
+#: ../src/common/file.cpp:301
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:550 ../src/common/file.cpp:560
+#: ../src/common/file.cpp:548
 #, c-format
 msgid "can't remove file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:578 ../src/common/file.cpp:581
+#: ../src/common/file.cpp:564
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr ""
 
-#: ../src/common/file.cpp:356
+#: ../src/common/file.cpp:378
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr ""
 
-#: ../src/common/textfile.cpp:358
+#: ../src/common/textfile.cpp:196
 #, c-format
-msgid "can't write file '%s' to disk."
+msgid "can't write buffer '%s' to disk."
 msgstr ""
 
-#: ../src/common/file.cpp:301
+#: ../src/common/file.cpp:323
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:805
+#: ../src/common/fileconf.cpp:965
 msgid "can't write user configuration file."
 msgstr ""
 
-#: ../src/common/intl.cpp:357
+#: ../src/common/intl.cpp:364
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr ""
 
-#: ../src/common/utilscmn.cpp:468
+#: ../src/common/menucmn.cpp:97
 msgid "ctrl"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:962
+#: ../src/common/cmdline.cpp:1056
 msgid "date"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3182
+#: ../src/common/fontmap.cpp:416
+msgid "default"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3363
 msgid "eighteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3172
+#: ../src/common/datetime.cpp:3353
 msgid "eighth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3175
+#: ../src/common/datetime.cpp:3356
 msgid "eleventh"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1435
+#: ../src/common/fileconf.cpp:1753
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:861
+#: ../src/msw/dialup.cpp:843
 msgid "establish"
 msgstr ""
 
-#: ../src/common/ffile.cpp:182
+#: ../src/common/ffile.cpp:174
 #, c-format
 msgid "failed to flush the file '%s'"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3179
+#: ../src/common/datetime.cpp:3360
 msgid "fifteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3169
+#: ../src/common/datetime.cpp:3350
 msgid "fifth"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:479
+#: ../src/common/fileconf.cpp:626
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:508
+#: ../src/common/fileconf.cpp:655
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:534
+#: ../src/common/fileconf.cpp:681
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:524
+#: ../src/common/fileconf.cpp:671
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:447
+#: ../src/common/fileconf.cpp:594
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3165
+#: ../src/common/datetime.cpp:3346
 msgid "first"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3178
+#: ../src/common/datetime.cpp:3359
 msgid "fourteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3168
+#: ../src/common/datetime.cpp:3349
 msgid "fourth"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:260
+#: ../src/common/appcmn.cpp:319
+msgid "generate verbose log messages"
+msgstr ""
+
+#: ../src/common/timercmn.cpp:290
 msgid "gmtime() failed"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:861
+#: ../src/mac/scrolbar.cpp:143
+#, c-format
+msgid "illegal scrollbar selector %d"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:843
 msgid "initiate"
 msgstr ""
 
-#: ../src/common/file.cpp:440
+#: ../src/common/file.cpp:462
 msgid "invalid eof() return value."
 msgstr ""
 
-#: ../src/generic/logg.cpp:1052
+#: ../src/generic/logg.cpp:1125
 msgid "invalid message box return value"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:913
-msgid "large"
+#: ../src/common/fontcmn.cpp:488 ../src/common/fontcmn.cpp:552
+msgid "italic"
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:544
+msgid "light"
 msgstr ""
 
-#: ../src/common/intl.cpp:549
+#: ../src/common/fontcmn.cpp:468
+msgid "light "
+msgstr ""
+
+#: ../src/common/intl.cpp:615
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr ""
 
-#: ../src/common/intl.cpp:352
+#: ../src/common/intl.cpp:359
 #, c-format
 msgid "looking for catalog '%s' in path '%s'."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:913
-msgid "medium"
-msgstr ""
-
-#: ../src/common/datetime.cpp:3329
+#: ../src/common/datetime.cpp:3511
 msgid "midnight"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:256
+#: ../src/common/timercmn.cpp:286
 msgid "mktime() failed"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3183
+#: ../src/common/datetime.cpp:3364
 msgid "nineteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3173
+#: ../src/common/datetime.cpp:3354
 msgid "ninth"
 msgstr ""
 
-#: ../src/msw/dde.cpp:962
+#: ../src/msw/dde.cpp:986
 msgid "no DDE error."
 msgstr ""
 
-#: ../src/html/helpdata.cpp:660
+#: ../src/html/helpdata.cpp:574
 msgid "noname"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3328
+#: ../src/common/datetime.cpp:3510
 msgid "noon"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:961
+#: ../src/common/cmdline.cpp:1052
 msgid "num"
 msgstr ""
 
-#: ../src/msw/dde.cpp:1005
+#: ../src/common/filename.cpp:166
+msgid "reading"
+msgstr ""
+
+#: ../src/msw/dde.cpp:1029
 msgid "reentrancy problem."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3166
+#: ../src/common/datetime.cpp:3347
 msgid "second"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3181
+#: ../src/common/datetime.cpp:3362
 msgid "seventeenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3171
+#: ../src/common/datetime.cpp:3352
 msgid "seventh"
 msgstr ""
 
-#: ../src/common/utilscmn.cpp:472
+#: ../src/common/menucmn.cpp:101
 msgid "shift"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3180
+#: ../src/common/appcmn.cpp:309
+msgid "show this help message"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3361
 msgid "sixteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3170
+#: ../src/common/datetime.cpp:3351
 msgid "sixth"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:913
-msgid "small"
+#: ../src/common/appcmn.cpp:344
+msgid "specify display mode to use (e.g. 640x480-16)"
+msgstr ""
+
+#: ../src/common/appcmn.cpp:330
+msgid "specify the theme to use"
 msgstr ""
 
-#: ../src/common/cmdline.cpp:960
+#: ../src/common/cmdline.cpp:1048
 msgid "str"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3174
+#: ../src/common/datetime.cpp:3355
 msgid "tenth"
 msgstr ""
 
-#: ../src/msw/dde.cpp:969
+#: ../src/msw/dde.cpp:993
 msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3167
+#: ../src/common/datetime.cpp:3348
 msgid "third"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3177
+#: ../src/common/datetime.cpp:3358
 msgid "thirteenth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3022
+#: ../src/common/datetime.cpp:3190
 msgid "today"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3024
+#: ../src/common/datetime.cpp:3192
 msgid "tomorrow"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3176
+#: ../src/common/datetime.cpp:3357
 msgid "twelfth"
 msgstr ""
 
-#: ../src/common/datetime.cpp:3184
+#: ../src/common/datetime.cpp:3365
 msgid "twentieth"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1555
+#: ../src/common/fontcmn.cpp:540
+msgid "underlined"
+msgstr ""
+
+#: ../src/common/fontcmn.cpp:455
+msgid "underlined "
+msgstr ""
+
+#: ../src/common/fileconf.cpp:1887
 #, c-format
 msgid "unexpected \" at position %d in '%s'."
 msgstr ""
 
-#: ../src/generic/progdlgg.cpp:244
+#: ../src/generic/progdlgg.cpp:282
 msgid "unknown"
 msgstr ""
 
-#: ../src/msw/dialup.cpp:466
+#: ../src/common/regex.cpp:144
+msgid "unknown error"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:447
 #, c-format
 msgid "unknown error (error code %08x)."
 msgstr ""
 
-#: ../src/common/file.cpp:339
+#: ../src/common/textbuf.cpp:229
+msgid "unknown line terminator"
+msgstr ""
+
+#: ../src/common/file.cpp:361
 msgid "unknown seek origin"
 msgstr ""
 
-#: ../src/common/fontmap.cpp:351
+#: ../src/common/fontmap.cpp:430
 #, c-format
 msgid "unknown-%d"
 msgstr ""
 
-#: ../src/common/docview.cpp:406
+#: ../src/common/docview.cpp:407
 msgid "unnamed"
 msgstr ""
 
-#: ../src/common/docview.cpp:1188
+#: ../src/common/docview.cpp:1224
 #, c-format
 msgid "unnamed%d"
 msgstr ""
 
-#: ../src/common/intl.cpp:362
+#: ../src/common/intl.cpp:369
 #, c-format
 msgid "using catalog '%s' from '%s'."
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:913
-msgid "very large"
+#: ../src/common/filename.cpp:166
+msgid "writing"
 msgstr ""
 
-#: ../src/html/helpfrm.cpp:913
-msgid "very small"
+#: ../src/common/dynlib.cpp:336
+#, c-format
+msgid "wxDllLoader failed to GetSymbol '%s'"
+msgstr ""
+
+#: ../src/common/dynload.cpp:282
+#, c-format
+msgid "wxDynamicLibrary failed to GetSymbol '%s'"
 msgstr ""
 
-#: ../src/common/timercmn.cpp:287
+#: ../src/common/timercmn.cpp:335
 msgid "wxGetTimeOfDay failed."
 msgstr ""
 
-#: ../src/common/socket.cpp:329 ../src/common/socket.cpp:383
+#: ../src/common/socket.cpp:394 ../src/common/socket.cpp:448
 msgid "wxSocket: invalid signature in ReadMsg."
 msgstr ""
 
-#: ../src/common/socket.cpp:903
+#: ../src/common/socket.cpp:975
 msgid "wxSocket: unknown event!."
 msgstr ""
 
-#: ../src/motif/app.cpp:596
+#: ../src/motif/app.cpp:586
 #, c-format
 msgid "wxWindows could not open display for '%s': exiting."
 msgstr ""
 
-#: ../src/common/filefn.cpp:1232
-msgid "wxWindows: error finding temporary file name.\n"
+#: ../src/x11/app.cpp:245
+msgid "wxWindows could not open display. Exiting."
 msgstr ""
 
-#: ../src/common/datetime.cpp:3023
+#: ../src/common/datetime.cpp:3191
 msgid "yesterday"
 msgstr ""