From 8e97b17bbd1ebcda40b4ed10314755ecf35e8ae2 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 14 Mar 2000 14:57:16 +0000
Subject: [PATCH] 1. aapplied patch for bcc makefiles from Ricky Gonzales 2.
 regenerated makefiles with tmake

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6690 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/b32.t       |    9 +-
 docs/html/i18n.htm            |    8 +-
 locale/de.po                  | 2612 ++++++++++++++++++++++++++++++-----------
 samples/calendar/calendar.cpp |    2 +-
 samples/internat/internat.cpp |    4 +-
 samples/notebook/test.cpp     |    4 +-
 src/files.lst                 |    2 +-
 src/gtk/files.lst             |    2 +-
 src/gtk1/files.lst            |    2 +-
 src/makeb32.env               |    8 +-
 src/makeprog.b32              |    4 +-
 src/motif/files.lst           |    2 +-
 src/msw/makefile.b32          |   14 +-
 src/msw/makefile.bcc          |    5 +-
 src/msw/makefile.dos          |    8 +-
 src/msw/makefile.g95          |    6 +-
 src/msw/makefile.sc           |    7 +-
 src/msw/makefile.vc           |  623 +++++-----
 src/msw/makefile.wat          |    6 +-
 19 files changed, 2306 insertions(+), 1022 deletions(-)

diff --git a/distrib/msw/tmake/b32.t b/distrib/msw/tmake/b32.t
index 49c6f27..86aa07b 100644
--- a/distrib/msw/tmake/b32.t
+++ b/distrib/msw/tmake/b32.t
@@ -163,7 +163,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:	wx
 
-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:	all_libs all_execs
 
@@ -357,7 +357,7 @@ $(CFG): makefile.b32
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
@@ -367,6 +367,11 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
+$(LNKCFG): makefile.b32
+	copy &&!
+-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
+! $(LNKCFG)
+
 #-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
 # -Oxt
 
diff --git a/docs/html/i18n.htm b/docs/html/i18n.htm
index 283998e..ce9f7d3 100644
--- a/docs/html/i18n.htm
+++ b/docs/html/i18n.htm
@@ -33,7 +33,7 @@ translations as of wxWindows 2.2.
 <tr>
     <td valign=center>Czech</td>
     <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
-    <td align=center valign=center><A HREF="v.slavik@volny.cz">Vaclav Slavik</A>
+    <td align=center valign=center><A HREF="mailto:v.slavik@volny.cz">Vaclav Slavik</A>
                                    </td>
 </tr>
 
@@ -54,7 +54,7 @@ translations as of wxWindows 2.2.
     <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
     <td align=center valign=center><A HREF="mailto:Stephane.Junique@optics.kth.se">Stephane Junique</A>,
                                    <A HREF="mailto:lionel.allorge@lunerouge.com">Lionel Allorge</A>
-                                   <A HREF="Gilles.Guyot@Krypton.be">Gilles Guyot</A>
+                                   <A HREF="mailto:Gilles.Guyot@Krypton.be">Gilles Guyot</A>
                                    </td>
 </tr>
 
@@ -71,7 +71,7 @@ translations as of wxWindows 2.2.
 <tr>
     <td valign=center>Hungarian</td>
     <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
-    <td align=center valign=center><A HREF="janos.vegh@sysdata.siemens.hu">Végh János Dr.</A>
+    <td align=center valign=center><A HREF="mailto:janos.vegh@sysdata.siemens.hu">Végh János Dr.</A>
                                    </td>
 </tr>
 
@@ -84,7 +84,7 @@ translations as of wxWindows 2.2.
 <tr>
     <td valign=center>Russian</td>
     <td align=center valign=center><IMG SRC="icons/no.gif" ALT="Not yet"></td>
-    <td align=center valign=center><A HREF="rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>
+    <td align=center valign=center><A HREF="mailto:rolinsky@mema.ucl.ac.be">Roman Rolinsky</A>
                                    </td>
 </tr>
 
diff --git a/locale/de.po b/locale/de.po
index f1488f3..745b0df 100644
--- a/locale/de.po
+++ b/locale/de.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-05-10 18:29+0200\n"
+"POT-Creation-Date: 2000-03-07 11:31+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"
@@ -14,8 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: ENCODING\n"
 
-#: ../src/generic/dirdlgg.cpp:461 ../src/generic/dirdlgg.cpp:489
-#: src/generic/dirdlgg.cpp:461 src/generic/dirdlgg.cpp:489
+#: ../src/generic/dirdlgg.cpp:479
 msgid ""
 "\n"
 "(Do you have the required permissions?)"
@@ -23,7 +22,7 @@ msgstr ""
 "\n"
 "(Haben Sie die nötigen Zugriffsrechte?)"
 
-#: ../src/generic/dirdlgg.cpp:449 src/generic/dirdlgg.cpp:449
+#: ../src/generic/dirdlgg.cpp:466
 msgid ""
 "\n"
 "does not exist\n"
@@ -33,118 +32,160 @@ msgstr ""
 "existiert nicht\n"
 "Jetzt anlegen?"
 
-#: ../src/common/log.cpp:223 src/common/log.cpp:209
+#: ../src/common/log.cpp:238
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (Fehler %ld: %s)"
 
-#: ../src/common/date.cpp:385 ../src/common/date.cpp:400
-#: src/common/date.cpp:384 src/common/date.cpp:399
-msgid " B.C."
-msgstr " B.C."
+#: ../src/common/docview.cpp:1192
+msgid " - "
+msgstr ""
+
+#: ../src/html/htmprint.cpp:484
+#, fuzzy
+msgid " Preview"
+msgstr "Druckvoransicht"
+
+#: ../src/generic/filedlgg.cpp:326
+msgid " bytes "
+msgstr ""
 
 #: ../src/common/resourc2.cpp:265 ../src/common/resourc2.cpp:1334
-#: ../src/common/resource.cpp:1630 ../src/common/resource.cpp:2704
-#: src/common/resourc2.cpp:265 src/common/resourc2.cpp:1334
-#: src/common/resource.cpp:1613 src/common/resource.cpp:2682
+#: ../src/common/resource.cpp:1769 ../src/common/resource.cpp:1899
+#: ../src/common/resource.cpp:2980
 #, c-format
 msgid "#define %s must be an integer."
 msgstr "#define %s muß eine ganze Zahl sein"
 
-#: src/common/valtext.cpp:143 src/common/valtext.cpp:154
+#: ../src/html/helpfrm.cpp:695 ../src/html/helpfrm.cpp:696
+#: ../src/html/helpfrm.cpp:1242 ../src/html/helpfrm.cpp:1269
 #, c-format
-msgid "%s is invalid."
-msgstr "%s ist ungültig"
+msgid "%i of %i"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:735
+#, fuzzy, c-format
+msgid "%s (or %s)"
+msgstr " (Fehler %ld: %s)"
 
-#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2075
-#: src/common/resourc2.cpp:709 src/common/resource.cpp:2057
+#: ../src/common/resourc2.cpp:709 ../src/common/resource.cpp:2350
 #, c-format
 msgid "%s not a bitmap resource specification."
 msgstr "%s ist keine Bitmap-Resourcenangabe"
 
-#: ../src/common/resourc2.cpp:864 ../src/common/resource.cpp:2230
-#: src/common/resourc2.cpp:864 src/common/resource.cpp:2212
+#: ../src/common/resourc2.cpp:864 ../src/common/resource.cpp:2506
 #, c-format
 msgid "%s not an icon resource specification."
 msgstr "%s ist keine Icon-Resourcenangabe"
 
-#: src/common/valtext.cpp:188
-#, c-format
-msgid "%s should be numeric."
-msgstr "%s sollte numerisch sein"
-
-#: src/common/valtext.cpp:163
-#, c-format
-msgid "%s should only contain ASCII characters."
-msgstr "%s sollte nur ASCII Zeichen enthalten"
-
-#: src/common/valtext.cpp:171
-#, c-format
-msgid "%s should only contain alphabetic characters."
-msgstr "%s sollte nur Buchstaben enthalten"
-
-#: src/common/valtext.cpp:179
-#, c-format
-msgid "%s should only contain alphabetic or numeric characters."
-msgstr "%s sollte nur Buchstaben oder Ziffern enthalten"
-
 #: ../src/common/resourc2.cpp:357 ../src/common/resourc2.cpp:1430
-#: ../src/common/resource.cpp:1723 ../src/common/resource.cpp:2801
-#: src/common/resourc2.cpp:357 src/common/resourc2.cpp:1430
-#: src/common/resource.cpp:1705 src/common/resource.cpp:2778
+#: ../src/common/resource.cpp:1862 ../src/common/resource.cpp:1991
+#: ../src/common/resource.cpp:3077
 #, c-format
 msgid "%s: ill-formed resource file syntax."
 msgstr "%s: falsch formatierte Resourcendatei-Syntax"
 
-#: ../src/common/log.cpp:638 src/common/log.cpp:633
+#: ../src/generic/logg.cpp:435 ../src/generic/tipdlg.cpp:170
 msgid "&Close"
 msgstr "&Schließen"
 
-#: ../src/common/log.cpp:639 src/common/log.cpp:634
+#: ../src/generic/wizard.cpp:268
+msgid "&Finish"
+msgstr ""
+
+#: ../src/generic/logg.cpp:436
 msgid "&Log"
 msgstr "&Log"
 
-#: ../src/common/docview.cpp:1725 ../src/common/docview.cpp:1736
-#: src/common/docview.cpp:1687 src/common/docview.cpp:1698
+#: ../src/generic/wizard.cpp:171 ../src/generic/wizard.cpp:270
+msgid "&Next >"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:175
+msgid "&Next Tip"
+msgstr ""
+
+#: ../src/common/docview.cpp:1889 ../src/common/docview.cpp:1900
 msgid "&Redo"
 msgstr "&Wieder-Ausführen"
 
-#: ../src/common/docview.cpp:1719 ../src/common/docview.cpp:1746
-#: src/common/docview.cpp:1681 src/common/docview.cpp:1708
+#: ../src/common/docview.cpp:1883 ../src/common/docview.cpp:1910
 msgid "&Redo "
 msgstr "&Wieder-Ausführen "
 
-#: ../src/common/log.cpp:635 src/common/log.cpp:630
+#: ../src/generic/logg.cpp:431
 msgid "&Save..."
 msgstr "&Sichern..."
 
-#: ../src/common/docview.cpp:1731 src/common/docview.cpp:1693
+#: ../src/generic/tipdlg.cpp:172
+msgid "&Show tips at startup"
+msgstr ""
+
+#: ../src/common/docview.cpp:1895
 msgid "&Undo"
 msgstr "&Rückgängig"
 
-#: ../src/common/docview.cpp:1706 src/common/docview.cpp:1668
+#: ../src/common/docview.cpp:1870
 msgid "&Undo "
 msgstr "&Rückgängig "
 
-#: ../src/common/config.cpp:382 src/common/config.cpp:393
+#: ../src/common/config.cpp:390
 #, c-format
 msgid "'%s' has extra '..', ignored."
 msgstr "'%s' hat extra '..', ingoriert."
 
-#: ../src/common/intl.cpp:339 src/common/intl.cpp:338
+#: ../src/common/valtext.cpp:140
+#, c-format
+msgid "'%s' is invalid"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:652
+#, c-format
+msgid "'%s' is not a correct numeric value for option '%s'."
+msgstr ""
+
+#: ../src/common/intl.cpp:389
 #, c-format
 msgid "'%s' is not a valid message catalog."
 msgstr "'%s' ist kein gültiger Nachrichtenkatalog."
 
-#: ../src/common/textfile.cpp:133 src/common/textfile.cpp:132
+#: ../src/common/textfile.cpp:224
 #, c-format
 msgid "'%s' is probably a binary file."
 msgstr "'%s' ist vermutlich eine Binärdatei."
 
+#: ../src/common/valtext.cpp:178
+#, c-format
+msgid "'%s' should be numeric."
+msgstr ""
+
+#: ../src/common/valtext.cpp:160
+#, c-format
+msgid "'%s' should only contain ASCII characters."
+msgstr ""
+
+#: ../src/common/valtext.cpp:166
+#, c-format
+msgid "'%s' should only contain alphabetic characters."
+msgstr ""
+
+#: ../src/common/valtext.cpp:172
+#, c-format
+msgid "'%s' should only contain alphabetic or numeric characters."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:656
+msgid "(Help)"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:271 ../src/html/helpfrm.cpp:760
+#: ../src/html/helpfrm.cpp:1295
+msgid "(bookmarks)"
+msgstr ""
+
 #: ../src/common/resourc2.cpp:297 ../src/common/resourc2.cpp:1370
-#: ../src/common/resource.cpp:1662 ../src/common/resource.cpp:2740
-#: src/common/resourc2.cpp:297 src/common/resourc2.cpp:1370
-#: src/common/resource.cpp:1645 src/common/resource.cpp:2718
+#: ../src/common/resource.cpp:1801 ../src/common/resource.cpp:1931
+#: ../src/common/resource.cpp:3016
 msgid ""
 ", expected static, #include or #define\n"
 "whilst parsing resource."
@@ -152,778 +193,1551 @@ msgstr ""
 ", erwartete static, #include oder #define\n"
 "beim Lesen der Resource."
 
-#: src/generic/dcpsg.cpp:2389
-msgid "A3 297 x 420 mm"
+#: ../src/generic/dirdlgg.cpp:259 ../src/generic/filedlgg.cpp:708
+msgid "."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:260 ../src/generic/filedlgg.cpp:709
+msgid ".."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:438
+msgid ": unknown charset"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:598
+msgid ": unknown encoding"
+msgstr ""
+
+#: ../src/generic/wizard.cpp:168
+msgid "< &Back"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:354
+msgid "<DIR>"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:321
+msgid "<DIR> "
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:355
+msgid "<LINK>"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:322
+msgid "<LINK> "
 msgstr ""
 
-#: src/generic/dcpsg.cpp:1210 src/generic/dcpsg.cpp:1214
-#: src/generic/dcpsg.cpp:1800 src/generic/dcpsg.cpp:1804
-#: src/generic/dcpsg.cpp:2313 src/generic/dcpsg.cpp:2388
-#: src/generic/printps.cpp:239 src/generic/printps.cpp:243
-msgid "A4 210 x 297 mm"
+#: ../src/html/helpfrm.cpp:904
+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>"
+msgstr ""
+
+#: ../src/generic/dcpsg.cpp:2467
+msgid "A4 sheet, 210 x 297 mm"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:329 src/generic/fontdlgg.cpp:329
+#: ../src/generic/fontdlgg.cpp:325
 msgid "ABCDEFGabcdefg12345"
 msgstr ""
 
-#: ../src/generic/colrdlgg.cpp:236 src/generic/colrdlgg.cpp:236
+#: ../src/html/helpfrm.cpp:265
+msgid "Add current page to bookmarks"
+msgstr ""
+
+#: ../src/generic/colrdlgg.cpp:264
 msgid "Add to custom colours"
 msgstr "Zu Benutzerfarben hinzufügen"
 
-#: ../src/generic/prntdlgg.cpp:140 src/generic/prntdlgg.cpp:83
+#: ../src/html/helpctrl.cpp:84
+#, c-format
+msgid "Adding book %s"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:163
 msgid "All"
 msgstr "Alle"
 
-#: ../src/common/log.cpp:675 src/common/log.cpp:670
+#: ../src/generic/filedlgg.cpp:820
+msgid "All files (*)|*"
+msgstr ""
+
+#: ../src/unix/dialup.cpp:336
+msgid "Already dialling ISP."
+msgstr ""
+
+#: ../src/generic/logg.cpp:475
 #, c-format
 msgid "Append log to file '%s' (choosing [No] will overwrite it)?"
 msgstr "An Logdatei '%s' anhängen ([Nein] wird sie ersetzen)?"
 
-#: src/gtk/window.cpp:2716
-msgid "Application Error"
-msgstr "Programmfehler"
+#: ../src/common/fontmap.cpp:93
+msgid "Arabic (ISO-8859-6)"
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:271
+msgid "BMP: Cannot deal with 4bit encoded yet."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:150 ../src/common/imagbmp.cpp:162
+#, fuzzy
+msgid "BMP: Couldn't allocate memory."
+msgstr "Kann keinen Wecker anlegen."
+
+#: ../src/common/imagbmp.cpp:141
+msgid "BMP: Encoding doesn't match bitdepth."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:104
+msgid "BMP: Image height > 32767 pixels for file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:98
+msgid "BMP: Image width > 32767 pixels for file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:118
+msgid "BMP: Unknown bitdepth in file."
+msgstr ""
+
+#: ../src/common/imagbmp.cpp:127
+msgid "BMP: Unknown encoding in file."
+msgstr ""
+
+#: ../src/generic/helpwxht.cpp:156
+msgid "Back"
+msgstr ""
+
+#: ../src/common/dlgcmn.cpp:133
+msgid "Backward"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:91
+msgid "Baltic (ISO-8859-4)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:97
+msgid "Baltic II (ISO-8859-10)"
+msgstr ""
 
-#: ../src/common/resourc2.cpp:844 ../src/common/resource.cpp:2210
-#: src/common/resourc2.cpp:844 src/common/resource.cpp:2192
+#: ../src/common/resourc2.cpp:844 ../src/common/resource.cpp:2486
 #, c-format
 msgid "Bitmap resource specification %s not found."
 msgstr "Bitmapresourceangabe %s nicht gefunden."
 
-#: ../src/generic/fontdlgg.cpp:221 src/generic/fontdlgg.cpp:221
+#: ../src/generic/fontdlgg.cpp:217
 msgid "Bold"
 msgstr "Fett"
 
-#: ../src/generic/prntdlgg.cpp:643 src/generic/prntdlgg.cpp:536
+#: ../src/generic/prntdlgg.cpp:662
 msgid "Bottom margin (mm):"
 msgstr "Unterer Rand (mm)"
 
-#: ../src/common/log.cpp:636 src/common/log.cpp:631
+#: ../src/generic/logg.cpp:433
 msgid "C&lear"
 msgstr "L&öschen"
 
-#: ../src/msw/thread.cpp:183 src/msw/thread.cpp:183
+#: ../src/msw/thread.cpp:222
 msgid "Can not create event object."
 msgstr "Kann Eventobjekt nicht erzeugen."
 
-#: ../src/msw/thread.cpp:99 src/msw/thread.cpp:99
-msgid "Can not create mutex."
+#: ../src/msw/thread.cpp:124
+#, fuzzy
+msgid "Can not create mutex"
 msgstr "Kann Mutex nicht anlegen."
 
-#: ../src/msw/tooltip.cpp:199 src/msw/tooltip.cpp:199
-msgid "Can not create tooltip control"
-msgstr "Kann Tooltip nicht erzeugen."
-
-#: ../src/common/filefn.cpp:1179 src/common/filefn.cpp:1168
-#: src/common/filefn.cpp:1282
+#: ../src/common/filefn.cpp:1279 ../src/msw/dir.cpp:294
+#: ../src/unix/dir.cpp:214
 #, c-format
 msgid "Can not enumerate files in directory '%s'"
 msgstr "Kann Dateien in Verzeichnis '%s' nicht listen"
 
-#: ../src/msw/clipbrd.cpp:549 src/msw/clipbrd.cpp:549
-#, c-format
-msgid "Can not get data in format '%s' from clipboard."
-msgstr "Kann keine Daten im Format '%s' von der Zwischenablage bekommen."
-
-#: src/gtk/threadpsx.cpp:450
-#, c-format
-msgid "Can not get priority range for scheduling policy %d."
-msgstr "Kann Prioritätsbereich für Schedulingregeln %d nicht bekommen."
-
-#: ../src/msw/clipbrd.cpp:474 src/msw/clipbrd.cpp:474
-#, c-format
-msgid "Can not put data in format '%s' on clipboard."
-msgstr "Kann keine Daten im Fromat '%s' in die Zwischenablage kopieren."
-
-#: ../src/msw/thread.cpp:410 src/msw/thread.cpp:410
+#: ../src/msw/thread.cpp:520
 #, c-format
 msgid "Can not resume thread %x"
 msgstr "Kann Thread %x nicht forsetzen."
 
-#: src/gtk/threadpsx.cpp:442
-msgid "Can not retrieve thread scheduling policy."
-msgstr "Kann Schedulingregeln nicht bekommen."
-
-#: ../src/msw/thread.cpp:330 src/gtk/threadpsx.cpp:270 src/msw/thread.cpp:330
+#: ../src/msw/thread.cpp:402
 msgid "Can not start thread: error writing TLS."
 msgstr "Kann Thread nicht starten: Fehler beim Schreiben der TLS."
 
-#: ../src/msw/thread.cpp:395 src/msw/thread.cpp:395
+#: ../src/msw/thread.cpp:505
 #, c-format
 msgid "Can not suspend thread %x"
 msgstr "Kann Thread %x nicht anhalten."
 
-#: ../src/msw/thread.cpp:547 src/msw/thread.cpp:543
+#: ../src/msw/thread.cpp:823
 msgid "Can not wait for thread termination"
 msgstr "Kann nicht auf Threadende warten"
 
-#: ../src/common/docview.cpp:1708 src/common/docview.cpp:1670
+#: ../src/common/docview.cpp:1872
 msgid "Can't &Undo "
 msgstr "Kann nicht rückgängig machen "
 
-#: ../src/msw/thread.cpp:359 src/msw/thread.cpp:359
+#: ../src/common/image.cpp:713
+#, c-format
+msgid "Can't check image format of file '%s': file does not exist."
+msgstr ""
+
+#: ../src/msw/registry.cpp:410
+#, fuzzy, c-format
+msgid "Can't close registry key '%s'"
+msgstr "Kann Datei '%s' nicht anlegen."
+
+#: ../src/msw/registry.cpp:486
+#, c-format
+msgid "Can't copy values of unsupported type %d."
+msgstr ""
+
+#: ../src/msw/listctrl.cpp:207
+msgid "Can't create list control window, check that comctl32.dll is installed."
+msgstr ""
+
+#: ../src/msw/registry.cpp:393
+#, fuzzy, c-format
+msgid "Can't create registry key '%s'"
+msgstr "Kann Datei '%s' nicht anlegen."
+
+#: ../src/msw/utilsexc.cpp:425
+#, fuzzy
+msgid "Can't create the inter-process read pipe"
+msgstr "Kann Thread nicht erzeugen"
+
+#: ../src/msw/utilsexc.cpp:435
+msgid "Can't create the inter-process write pipe"
+msgstr ""
+
+#: ../src/msw/thread.cpp:487
 msgid "Can't create thread"
 msgstr "Kann Thread nicht erzeugen"
 
-#: ../src/msw/iniconf.cpp:453 src/msw/iniconf.cpp:464
+#: ../src/msw/window.cpp:2372
+#, c-format
+msgid ""
+"Can't create window of class %s!\n"
+"Possible Windows 3.x compatibility problem?"
+msgstr ""
+
+#: ../src/msw/registry.cpp:656
+#, fuzzy, c-format
+msgid "Can't delete key '%s'"
+msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+
+#: ../src/msw/iniconf.cpp:463
 #, c-format
 msgid "Can't delete the INI file '%s'"
 msgstr "Kann INI-Datei '%s' nicht löschen"
 
-#: ../src/unix/utilsunx.cpp:316 src/gtk/utilsgtk.cpp:360
-#, c-format
-msgid "Can't execute '%s'\n"
-msgstr "Kann '%s' nicht ausführen\n"
+#: ../src/msw/registry.cpp:681
+#, fuzzy, c-format
+msgid "Can't delete value '%s' from key '%s'"
+msgstr "Kann Wert '%s' von Eintrag '%s' nicht löschen."
+
+#: ../src/msw/registry.cpp:692
+#, fuzzy, c-format
+msgid "Can't delete value of key '%s'"
+msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+
+#: ../src/msw/registry.cpp:992
+#, fuzzy, c-format
+msgid "Can't enumerate subkeys of key '%s'"
+msgstr "Kann Untereinträge von '%s' nicht auflisten"
+
+#: ../src/msw/registry.cpp:947
+#, fuzzy, c-format
+msgid "Can't enumerate values of key '%s'"
+msgstr "Kann Werte von Eintrag '%s' nicht auflisten"
 
-#: ../src/msw/utilsexc.cpp:208 src/msw/utilsexc.cpp:208
+#: ../src/msw/utilsexc.cpp:400
 #, c-format
 msgid "Can't execute command '%s'"
 msgstr "Kann Befehl '%s' nicht ausführen"
 
-#: ../src/common/object.cpp:302 ../src/common/object.cpp:323
-#: src/common/object.cpp:290 src/common/object.cpp:311
+#: ../src/common/ffile.cpp:234
+#, fuzzy, c-format
+msgid "Can't find current position in file '%s'"
+msgstr "Kann Konfigurationsdatei '%s' nicht öffnen."
+
+#: ../src/msw/window.cpp:2325
+msgid ""
+"Can't find dummy dialog template!\n"
+"Check resource include path for finding wx.rc."
+msgstr ""
+
+#: ../src/common/object.cpp:321 ../src/common/object.cpp:342
 #, c-format
 msgid "Can't find the serialization object '%s' for the object '%s'."
 msgstr "Kann Serialisierungsobjekt '%s' für Object '%s' nicht finden."
 
-#: ../src/common/object.cpp:295 src/common/object.cpp:283
+#: ../src/msw/registry.cpp:342
+#, c-format
+msgid "Can't get info about registry key '%s'"
+msgstr ""
+
+#: ../src/common/image.cpp:413 ../src/common/image.cpp:433
+#, c-format
+msgid "Can't load image from file '%s': file does not exist."
+msgstr ""
+
+#: ../src/common/object.cpp:314
 msgid "Can't load wxSerial dynamic library."
 msgstr "Kann wxSerial DLL nicht laden."
 
-#: ../src/common/log.cpp:722 src/common/log.cpp:717
+#: ../src/msw/dib.cpp:434
+#, fuzzy, c-format
+msgid "Can't open file '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
+
+#: ../src/msw/registry.cpp:368
+#, fuzzy, c-format
+msgid "Can't open registry key '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
+
+#: ../src/msw/registry.cpp:871
+#, fuzzy, c-format
+msgid "Can't read value of '%s'"
+msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+
+#: ../src/msw/registry.cpp:770 ../src/msw/registry.cpp:809
+#, fuzzy, c-format
+msgid "Can't read value of key '%s'"
+msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+
+#: ../src/generic/logg.cpp:522
 msgid "Can't save log contents to file."
 msgstr "Kann Logtexte nicht in Datei sichern."
 
-#: ../src/msw/thread.cpp:384 src/msw/thread.cpp:384
+#: ../src/msw/thread.cpp:453
 msgid "Can't set thread priority"
 msgstr "Kann Thread-Priorität nicht setzen"
 
-#: ../src/common/prntbase.cpp:114 ../src/generic/choicdgg.cpp:306
-#: ../src/generic/colrdlgg.cpp:235 ../src/generic/dcpsg.cpp:1918
-#: ../src/generic/dirdlgg.cpp:341 ../src/generic/fontdlgg.cpp:261
-#: ../src/generic/msgdlgg.cpp:123 ../src/generic/prntdlgg.cpp:172
-#: ../src/generic/prntdlgg.cpp:430 ../src/generic/prntdlgg.cpp:580
-#: ../src/generic/progdlgg.cpp:94 ../src/generic/textdlgg.cpp:141
-#: ../src/gtk/filedlg.cpp:154 src/common/prntbase.cpp:113
-#: src/generic/choicdgg.cpp:306 src/generic/colrdlgg.cpp:235
-#: src/generic/dcpsg.cpp:1875 src/generic/dirdlgg.cpp:341
-#: src/generic/fontdlgg.cpp:261 src/generic/msgdlgg.cpp:143
-#: src/generic/prntdlgg.cpp:111 src/generic/prntdlgg.cpp:317
-#: src/generic/prntdlgg.cpp:473 src/generic/textdlgg.cpp:141
-#: src/gtk/filedlg.cpp:131
+#: ../src/msw/registry.cpp:795 ../src/msw/registry.cpp:895
+#, fuzzy, c-format
+msgid "Can't set value of '%s'"
+msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+
+#: ../src/common/dlgcmn.cpp:146 ../src/common/prntbase.cpp:107
+#: ../src/generic/dcpsg.cpp:2192 ../src/generic/dirdlgg.cpp:413
+#: ../src/generic/filedlgg.cpp:911 ../src/generic/fontdlgg.cpp:257
+#: ../src/generic/prntdlgg.cpp:468 ../src/generic/progdlgg.cpp:182
+#: ../src/generic/proplist.cpp:523 ../src/generic/wizard.cpp:174
+#: ../src/gtk/filedlg.cpp:164 ../src/gtk/fontdlg.cpp:178
+#: ../src/html/helpfrm.cpp:887 ../src/motif/msgdlg.cpp:178
 msgid "Cancel"
 msgstr "Abbruch"
 
-#: ../src/msw/app.cpp:223 src/msw/app.cpp:192
+#: ../src/msw/dialup.cpp:514
+#, c-format
+msgid "Cannot find active dialup connection: %s"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:829
+msgid "Cannot find the location of address book file"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:954
+#, c-format
+msgid "Cannot get priority range for scheduling policy %d."
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:691
+msgid "Cannot get the hostname"
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:727
+msgid "Cannot get the official hostname"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:922
+msgid "Cannot hang up - no active dialup connection."
+msgstr ""
+
+#: ../src/msw/app.cpp:220
 msgid "Cannot initialize OLE"
 msgstr "Kann OLE nicht initialisiern"
 
-#: ../src/generic/dcpsg.cpp:1296 src/generic/dcpsg.cpp:1247
-msgid "Cannot open file!"
-msgstr "Kann Datei nicht öffnen!"
+#: ../src/html/htmlfilt.cpp:146
+#, c-format
+msgid "Cannot open HTML document: %s"
+msgstr ""
 
-#: src/common/CVS/Base/fileconf.cpp:614 src/common/fileconf.cpp:614
+#: ../src/html/helpdata.cpp:542
 #, c-format
-msgid "Character '%c' is invalid in a config entry name."
-msgstr "Zeichen '%c' ist in einem Konfigurationseintragsnamen nicht erlaubt."
+msgid "Cannot open HTML help book: %s"
+msgstr ""
+
+#: ../src/generic/helpext.cpp:96
+#, fuzzy, c-format
+msgid "Cannot open URL '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
+
+#: ../src/html/helpdata.cpp:238
+#, fuzzy, c-format
+msgid "Cannot open contents file: %s"
+msgstr "Kann Datei nicht öffnen!"
+
+#: ../src/generic/dcpsg.cpp:1541
+msgid "Cannot open file for PostScript printing!"
+msgstr ""
+
+#: ../src/html/helpdata.cpp:253
+#, fuzzy, c-format
+msgid "Cannot open index file: %s"
+msgstr "Kann Datei nicht öffnen!"
+
+#: ../src/unix/threadpsx.cpp:935
+msgid "Cannot retrieve thread scheduling policy."
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:588
+msgid "Cannot start thread: error writing TLS"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:393
+msgid "Case sensitive"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:89
+msgid "Central European (ISO-8859-2/Latin 2)"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:763
+msgid "Choose ISP to dial"
+msgstr ""
+
+#: ../src/gtk/fontdlg.cpp:159
+msgid "Choose font"
+msgstr ""
 
-#: ../src/common/log.cpp:636 src/common/log.cpp:631
+#: ../src/generic/logg.cpp:433
 msgid "Clear the log contents"
 msgstr "Logtexte löschen"
 
-#: ../src/common/prntbase.cpp:343 src/common/prntbase.cpp:342
+#: ../src/common/prntbase.cpp:357 ../src/generic/progdlgg.cpp:309
+#: ../src/generic/proplist.cpp:518
 msgid "Close"
 msgstr "Schließen"
 
-#: ../src/common/log.cpp:638 src/common/log.cpp:633
+#: ../src/generic/logg.cpp:435
 msgid "Close this window"
 msgstr "Fenster schließen"
 
-#: ../src/gtk/filedlg.cpp:71 src/gtk/filedlg.cpp:60
+#: ../src/common/fileconf.cpp:743
+#, c-format
+msgid "Config entry name cannot start with '%c'."
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1070 ../src/gtk/filedlg.cpp:75
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../src/generic/helpxlp.cpp:242 src/generic/helpxlp.cpp:242
+#: ../src/html/htmlwin.cpp:166
+#, fuzzy
+msgid "Connecting..."
+msgstr "Drucke..."
+
+#: ../src/generic/helpxlp.cpp:240
 #, c-format
 msgid "Connection to wxHelp timed out in %d seconds"
 msgstr "Verbindung mit wxHelp nach %d Sekunden abgebrochen"
 
-#: ../src/generic/prntdlgg.cpp:167 src/generic/prntdlgg.cpp:106
+#: ../src/generic/helpwxht.cpp:158 ../src/html/helpfrm.cpp:298
+#: ../src/html/helpfrm.cpp:307
+msgid "Contents"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:196
 msgid "Copies:"
 msgstr "Kopien:"
 
-#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1652
-#: src/common/resourc2.cpp:287 src/common/resource.cpp:1635
+#: ../src/common/resourc2.cpp:287 ../src/common/resource.cpp:1791
+#: ../src/common/resource.cpp:1921
 #, c-format
 msgid "Could not find resource include file %s."
 msgstr "Konnte Resourcedatei %s nicht finden."
 
-#: ../src/generic/tabg.cpp:1038 src/generic/tabg.cpp:1038
+#: ../src/generic/tabg.cpp:1042
 msgid "Could not find tab for id"
 msgstr "Konnte Seite für Id nicht finden"
 
-#: ../src/common/resource.cpp:753 src/common/resource.cpp:753
+#: ../src/msw/textctrl.cpp:1126
+#, c-format
+msgid "Could not load Rich Edit DLL '%s'"
+msgstr ""
+
+#: ../src/common/resource.cpp:789
 #, 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 ""
-"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze Zahl\n"
+"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze "
+"Zahl\n"
 " oder ein #define."
 
-#: ../src/common/resource.cpp:1203 src/common/resource.cpp:1199
+#: ../src/common/resource.cpp:1234
 #, c-format
 msgid ""
 "Could not resolve menu id '%s'. Use (non-zero) integer instead\n"
 "or provide #define (see manual for caveats)"
 msgstr ""
-"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze Zahl\n"
+"Kann keine Kontrollklasse oder Id '%s' finden. Verwenden Sie eine ganze "
+"Zahl\n"
 " oder ein #define."
 
-#: ../src/common/prntbase.cpp:675 src/common/prntbase.cpp:673
+#: ../src/common/prntbase.cpp:709
 msgid "Could not start document preview."
 msgstr "Kann Druckvoransicht nicht starten."
 
-#: ../src/generic/printps.cpp:189 ../src/msw/printwin.cpp:228
-#: src/generic/printps.cpp:165
+#: ../src/generic/printps.cpp:200 ../src/msw/printwin.cpp:240
 msgid "Could not start printing."
 msgstr "Kann Ausdruck nicht beginnen."
 
-#: ../src/common/wincmn.cpp:598 src/gtk/window.cpp:2716
-#: src/msw/window.cpp:3756
+#: ../src/common/wincmn.cpp:762
 msgid "Could not transfer data to window"
 msgstr "Kann Daten nicht ins Fenster übertragen."
 
-#: ../src/msw/thread.cpp:127 src/msw/thread.cpp:127
+#: ../src/msw/thread.cpp:166
 msgid "Couldn't acquire a mutex lock"
 msgstr "Kann Mutex-Lock nicht bekommen"
 
-#: ../src/msw/dragimag.cpp:88 ../src/msw/dragimag.cpp:116
-#: ../src/msw/imaglist.cpp:96 src/msw/imaglist.cpp:96
+#: ../src/msw/dragimag.cpp:142 ../src/msw/dragimag.cpp:179
+#: ../src/msw/imaglist.cpp:145 ../src/msw/imaglist.cpp:167
+#: ../src/msw/imaglist.cpp:180
 msgid "Couldn't add an image to the image list."
 msgstr "Kann Bild nicht zur Liste hinzufügen."
 
-#: ../src/msw/thread.cpp:231 src/msw/thread.cpp:231
-msgid "Couldn't change the state of event object."
-msgstr "Kann Zustand des Eventobjektes nicht ändern."
-
-#: ../src/msw/timer.cpp:109 src/msw/timer.cpp:109
+#: ../src/msw/timer.cpp:96
 msgid "Couldn't create a timer"
 msgstr "Kann keinen Wecker anlegen."
 
-#: ../src/msw/thread.cpp:430 src/msw/thread.cpp:430
+#: ../src/common/dynlib.cpp:268
+#, c-format
+msgid "Couldn't find symbol '%s' in a dynamic library"
+msgstr ""
+
+#: ../src/msw/thread.cpp:540
 msgid "Couldn't get the current thread pointer"
 msgstr "Kann den aktuellen Threadzeiger nicht bekommen."
 
-#: ../src/common/imagpng.cpp:218 src/common/image.cpp:662
-msgid "Couldn't load a PNG image - probably file is corrupted."
+#: ../src/msw/utilsexc.cpp:594
+#, c-format
+msgid "Couldn't launch DDE server '%s'."
+msgstr ""
+
+#: ../src/common/imagpng.cpp:245
+msgid "Couldn't load a PNG image - file is corrupted or not enough memory."
 msgstr ""
 
-#: ../src/msw/thread.cpp:159 src/msw/thread.cpp:159
+#: ../src/msw/ole/dataobj.cpp:139
+#, fuzzy, c-format
+msgid "Couldn't register clipboard format '%s'."
+msgstr "Nicht unterstütztes Format in Zwischenablage."
+
+#: ../src/msw/thread.cpp:198
 msgid "Couldn't release a mutex"
 msgstr "Kann Mutex nicht freigeben."
 
-#: ../src/msw/listctrl.cpp:526 src/msw/listctrl.cpp:500
+#: ../src/msw/listctrl.cpp:608
 #, c-format
 msgid "Couldn't retrieve information about list control item %d."
 msgstr "Kann keine Informationen über ListControl %d bekommen."
 
-#: ../src/msw/thread.cpp:612 src/msw/thread.cpp:608
+#: ../src/msw/thread.cpp:910
 msgid "Couldn't terminate thread"
 msgstr "Kann Thread nicht beenden"
 
-#: ../src/generic/dirdlgg.cpp:478 src/generic/dirdlgg.cpp:478
-msgid "Create New Directory"
+#: ../src/generic/dirdlgg.cpp:500
+#, fuzzy
+msgid "Create directory"
+msgstr "Neues Verzeichnis anlegen"
+
+#: ../src/generic/filedlgg.cpp:878
+#, fuzzy
+msgid "Create new directory"
 msgstr "Neues Verzeichnis anlegen"
 
-#: ../src/common/log.cpp:1041 src/common/log.cpp:1022
-msgid "Debug"
+#: ../src/generic/filedlgg.cpp:885
+#, fuzzy
+msgid "Current directory:"
+msgstr "Das Verzeichnis"
+
+#: ../src/common/fontmap.cpp:92
+msgid "Cyrillic (Latin 5)"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:211 src/generic/fontdlgg.cpp:211
-msgid "Decorative"
-msgstr "Dekorativ"
+#: ../src/msw/dde.cpp:587
+#, fuzzy
+msgid "DDE poke request failed"
+msgstr "Konnte keine Pipe anlegen"
 
-#: ../src/generic/dirdlgg.cpp:450 src/generic/dirdlgg.cpp:450
-msgid "Directory does not exist"
-msgstr "Verzeichnis existiert nicht"
+#: ../src/generic/filedlgg.cpp:533
+msgid "Date"
+msgstr ""
 
-#: ../src/common/docview.cpp:404 src/common/docview.cpp:371
-#, c-format
-msgid "Do you want to save changes to document %s?"
-msgstr "Möchten Sie die Änderungen in Dokument %s sichern?"
+#: ../src/generic/fontdlgg.cpp:207
+msgid "Decorative"
+msgstr "Dekorativ"
 
-#: src/common/log.cpp:368
-msgid "DoLogString must be overrided if it's called."
+#: ../src/msw/dialup.cpp:350
+msgid ""
+"Dial up functions are unavailable because the remote access service (RAS) is "
+"not installed on this machine. Please install it."
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:477 src/generic/dirdlgg.cpp:477
-msgid "Enter the name of the directory to create"
-msgstr "Geben Sie einen Namen für das neue Verzeichnis ein"
+#: ../src/generic/tipdlg.cpp:177
+msgid "Did you know..."
+msgstr ""
 
-#: ../src/generic/helphtml.cpp:260 src/generic/helphtml.cpp:260
-msgid "Entries found"
-msgstr "Einträge gefunden"
+#: ../src/common/filefn.cpp:1092
+#, c-format
+msgid "Directory '%s' couldn't be created"
+msgstr "Verzeichnis '%s' konnte nicht angelegt werden."
+
+#: ../src/generic/dirdlgg.cpp:467
+msgid "Directory does not exist"
+msgstr "Verzeichnis existiert nicht"
 
-#: src/common/CVS/Base/fileconf.cpp:607 src/common/fileconf.cpp:607
+#: ../src/html/helpfrm.cpp:361
+msgid ""
+"Display all index items that contain given substring. Search is case "
+"insensitive."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:512
+msgid "Display options dialog"
+msgstr ""
+
+#: ../src/common/docview.cpp:431
 #, c-format
-msgid "Entry name can't start with '%c'."
-msgstr "Eintragsname kann nicht mit '%c' beginnen."
+msgid "Do you want to save changes to document %s?"
+msgstr "Möchten Sie die Änderungen in Dokument %s sichern?"
 
-#: ../src/common/config.cpp:334 src/common/config.cpp:345
+#: ../src/html/htmlwin.cpp:216
+msgid "Done"
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:315
+msgid "Done."
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:156
+msgid "Elapsed time : "
+msgstr ""
+
+#: ../src/generic/helphtml.cpp:310
+msgid "Entries found"
+msgstr "Einträge gefunden"
+
+#: ../src/common/config.cpp:342
 #, c-format
 msgid ""
 "Environment variables expansion failed: missing '%c' at position %d in '%s'."
 msgstr ""
-"Umgebungsvariablenexpansion schlug fehl: fehlendes '%c' an Position %d in '%s'."
-
-#: ../src/common/log.cpp:474 ../src/generic/dcpsg.cpp:1296
-#: ../src/generic/helpxlp.cpp:243 ../src/gtk/filedlg.cpp:79
-#: src/common/log.cpp:474 src/generic/dcpsg.cpp:1247
-#: src/generic/helpxlp.cpp:243
+"Umgebungsvariablenexpansion schlug fehl: fehlendes '%c' an Position %d in "
+"'%s'."
+
+#: ../src/generic/dcpsg.cpp:1541 ../src/generic/dirdlgg.cpp:263
+#: ../src/generic/dirdlgg.cpp:281 ../src/generic/dirdlgg.cpp:292
+#: ../src/generic/dirdlgg.cpp:533 ../src/generic/filedlgg.cpp:620
+#: ../src/generic/filedlgg.cpp:712 ../src/generic/filedlgg.cpp:726
+#: ../src/generic/filedlgg.cpp:739 ../src/generic/filedlgg.cpp:1036
+#: ../src/generic/filedlgg.cpp:1085 ../src/generic/helpxlp.cpp:241
+#: ../src/generic/logg.cpp:201 ../src/gtk/filedlg.cpp:83
+#: ../src/gtk/fontdlg.cpp:72
 msgid "Error"
 msgstr "Fehler"
 
-#: ../src/generic/dirdlgg.cpp:462 ../src/generic/dirdlgg.cpp:490
-#: src/generic/dirdlgg.cpp:462 src/generic/dirdlgg.cpp:490
+#: ../src/unix/utilsunx.cpp:803 ../src/unix/utilsunx.cpp:811
+msgid "Error "
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:480
 msgid "Error creating directory"
 msgstr "Fehler beim Anlegen des Verzeichnisses"
 
-#: ../src/common/log.cpp:325 src/common/log.cpp:332
+#: ../src/common/log.cpp:354
 msgid "Error: "
 msgstr "Fehler: "
 
-#: ../src/generic/dirdlgg.cpp:230 src/generic/dirdlgg.cpp:230
+#: ../src/common/fontmap.cpp:90
+msgid "Esperanto (ISO-8859-3)"
+msgstr ""
+
+#: ../src/generic/progdlgg.cpp:163
+msgid "Estimated time : "
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:213
 msgid "Etcetera"
 msgstr "/etc"
 
-#: ../src/msw/utilsexc.cpp:237 src/msw/utilsexc.cpp:237
+#: ../src/msw/utilsexc.cpp:484
 #, c-format
 msgid "Execution of command '%s' failed"
 msgstr "Befehlsausführung '%s' schlug fehl"
 
 #: ../src/common/resourc2.cpp:326 ../src/common/resourc2.cpp:1399
-#: ../src/common/resource.cpp:1691 ../src/common/resource.cpp:2769
-#: src/common/resourc2.cpp:326 src/common/resourc2.cpp:1399
-#: src/common/resource.cpp:1674 src/common/resource.cpp:2747
+#: ../src/common/resource.cpp:1830 ../src/common/resource.cpp:1960
+#: ../src/common/resource.cpp:3045
 msgid "Expected '*' whilst parsing resource."
 msgstr "Erwartete '*' beim Lesen der Resource."
 
 #: ../src/common/resourc2.cpp:342 ../src/common/resourc2.cpp:1415
-#: ../src/common/resource.cpp:1708 ../src/common/resource.cpp:2786
-#: src/common/resourc2.cpp:342 src/common/resourc2.cpp:1415
-#: src/common/resource.cpp:1690 src/common/resource.cpp:2763
+#: ../src/common/resource.cpp:1847 ../src/common/resource.cpp:1976
+#: ../src/common/resource.cpp:3062
 msgid "Expected '=' whilst parsing resource."
 msgstr ""
 
 #: ../src/common/resourc2.cpp:312 ../src/common/resourc2.cpp:1385
-#: ../src/common/resource.cpp:1677 ../src/common/resource.cpp:2755
-#: src/common/resourc2.cpp:312 src/common/resourc2.cpp:1385
-#: src/common/resource.cpp:1660 src/common/resource.cpp:2733
+#: ../src/common/resource.cpp:1816 ../src/common/resource.cpp:1946
+#: ../src/common/resource.cpp:3031
 msgid "Expected 'char' whilst parsing resource."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:106 src/msw/clipbrd.cpp:106
+#: ../src/msw/dialup.cpp:857
+#, c-format
+msgid "Failed to %s dialup connection: %s"
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:122
 msgid "Failed to close the clipboard."
 msgstr "Konnte Zwischenablage nicht schließen."
 
-#: ../src/generic/dirdlgg.cpp:460 ../src/generic/dirdlgg.cpp:488
-#: src/generic/dirdlgg.cpp:460 src/generic/dirdlgg.cpp:488
-msgid "Failed to create directory "
+#: ../src/msw/dialup.cpp:798
+msgid "Failed to connect: missing username/password."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:743
+#, fuzzy
+msgid "Failed to connect: no ISP to dial."
+msgstr "Konnte Zwischenablage nicht öffnen."
+
+#: ../src/msw/registry.cpp:590
+#, c-format
+msgid "Failed to copy registry value '%s'"
+msgstr ""
+
+#: ../src/msw/registry.cpp:599
+#, c-format
+msgid "Failed to copy the contents of registry key '%s' to '%s'."
+msgstr ""
+
+#: ../src/msw/dde.cpp:924
+#, fuzzy
+msgid "Failed to create DDE string"
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/msw/mdi.cpp:402
+#, fuzzy
+msgid "Failed to create MDI parent frame."
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/msw/statbr95.cpp:123
+#, fuzzy
+msgid "Failed to create a status bar."
 msgstr "Konnte Verzeichnis nicht anlegen "
 
-#: ../src/msw/tooltip.cpp:260 src/msw/tooltip.cpp:260
+#: ../src/msw/dde.cpp:401
 #, c-format
-msgid "Failed to create the tooltip '%s'"
+msgid "Failed to create connection to server '%s' on topic '%s'"
+msgstr ""
+
+#: ../src/msw/dialog.cpp:177
+msgid "Failed to create dialog."
 msgstr ""
 
-#: src/msw/dialog.cpp:143
-msgid "Failed to created dialog."
+#: ../src/generic/dirdlgg.cpp:478
+msgid "Failed to create directory "
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/html/winpars.cpp:357
+#, c-format
+msgid "Failed to display HTML document in %s encoding"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:118 src/msw/clipbrd.cpp:118
+#: ../src/msw/clipbrd.cpp:134
 msgid "Failed to empty the clipboard."
 msgstr "Konnte Zwischenablage nicht leeren."
 
-#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2174
-#: src/common/resourc2.cpp:808 src/common/resource.cpp:2156
+#: ../src/msw/dde.cpp:606
+msgid "Failed to establish an advise loop with DDE server"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:636
+#, c-format
+msgid "Failed to establish dialup connection: %s"
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:430 ../src/unix/utilsunx.cpp:454
+#, fuzzy, c-format
+msgid "Failed to execute '%s'\n"
+msgstr "Kann '%s' nicht ausführen\n"
+
+#: ../src/common/resourc2.cpp:808 ../src/common/resource.cpp:2449
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:963 ../src/common/resource.cpp:2329
-#: src/common/resourc2.cpp:963 src/common/resource.cpp:2311
+#: ../src/common/resourc2.cpp:963 ../src/common/resource.cpp:2605
 #, c-format
 msgid ""
 "Failed to find XBM resource %s.\n"
 "Forgot to use wxResourceLoadIconData?"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:824 ../src/common/resource.cpp:2190
-#: src/common/resourc2.cpp:824 src/common/resource.cpp:2172
+#: ../src/common/resourc2.cpp:824 ../src/common/resource.cpp:2465
 #, c-format
 msgid ""
 "Failed to find XPM resource %s.\n"
 "Forgot to use wxResourceLoadBitmapData?"
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:86 src/msw/clipbrd.cpp:86
+#: ../src/msw/dialup.cpp:696
+#, c-format
+msgid "Failed to get ISP names: %s"
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:623
+#, fuzzy
+msgid "Failed to get data from the clipboard"
+msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
+
+#: ../src/common/timercmn.cpp:243
+msgid "Failed to get the UTC system time."
+msgstr ""
+
+#: ../src/common/timercmn.cpp:195
+#, fuzzy
+msgid "Failed to get the local system time"
+msgstr "Konnte Zwischenablage nicht leeren."
+
+#: ../src/unix/threadpsx.cpp:754
+msgid ""
+"Failed to join a thread, potential memory leak detected - please restart the "
+"program"
+msgstr ""
+
+#: ../src/common/dynlib.cpp:225
+#, c-format
+msgid "Failed to load shared library '%s'"
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:102
 msgid "Failed to open the clipboard."
 msgstr "Konnte Zwischenablage nicht öffnen."
 
-#: ../src/msw/clipbrd.cpp:375 src/msw/clipbrd.cpp:375
+#: ../src/msw/clipbrd.cpp:539
+#, fuzzy
+msgid "Failed to put data on the clipboard"
+msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
+
+#: ../src/unix/utilsunx.cpp:523
+msgid "Failed to redirect child process input/output"
+msgstr ""
+
+#: ../src/msw/dde.cpp:285
+#, fuzzy, c-format
+msgid "Failed to register DDE server '%s'"
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/common/fontmap.cpp:485
+#, c-format
+msgid "Failed to remember the encoding for the charset '%s'."
+msgstr ""
+
+#: ../src/msw/registry.cpp:436
+#, c-format
+msgid "Failed to rename registry value '%s' to '%s'."
+msgstr ""
+
+#: ../src/msw/registry.cpp:536
+#, c-format
+msgid "Failed to rename the registry key '%s' to '%s'."
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:428
 msgid "Failed to retrieve data from the clipboard."
 msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
 
-#: ../src/msw/clipbrd.cpp:262 src/msw/clipbrd.cpp:262
+#: ../src/msw/dialup.cpp:458
+#, fuzzy
+msgid "Failed to retrieve text of RAS error message"
+msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
+
+#: ../src/msw/clipbrd.cpp:652
+#, fuzzy
+msgid "Failed to retrieve the supported clipboard formats"
+msgstr "Konnte Daten von der Zwischenablage nicht bekommen."
+
+#: ../src/msw/dde.cpp:651
+msgid "Failed to send DDE advise notification"
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:300
 msgid "Failed to set clipboard data."
 msgstr "Konnte Datein nicht in Zwischenablage kopieren."
 
-#: ../src/unix/threadpsx.cpp:551 src/gtk/threadpsx.cpp:508
+#: ../src/unix/threadpsx.cpp:1071
 #, c-format
 msgid "Failed to set thread priority %d."
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:662 src/gtk/threadpsx.cpp:611
+#: ../src/common/fs_mem.cpp:165
+#, c-format
+msgid "Failed to store image '%s' to memory VFS!"
+msgstr ""
+
+#: ../src/unix/threadpsx.cpp:1251
 msgid "Failed to terminate a thread."
 msgstr ""
 
-#: ../src/common/log.cpp:545 src/common/log.cpp:543
+#: ../src/msw/dde.cpp:625
+msgid "Failed to terminate the advise loop with DDE server"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:930
+#, fuzzy, c-format
+msgid "Failed to terminate the dialup connection: %s"
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/msw/dde.cpp:301
+#, fuzzy, c-format
+msgid "Failed to unregister DDE server '%s'"
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/msw/app.cpp:704
+msgid "Fatal Error"
+msgstr ""
+
+#: ../src/generic/logg.cpp:329
 msgid "Fatal error"
 msgstr "Nicht-behebbarer Fehler"
 
-#: ../src/common/log.cpp:318 src/common/log.cpp:325
+#: ../src/common/log.cpp:347
 msgid "Fatal error: "
 msgstr "Nicht-behebbarer Fehler"
 
-#: ../src/gtk/filedlg.cpp:68 src/gtk/filedlg.cpp:57
+#: ../src/msw/app.cpp:1199
+msgid "Fatal error: exiting"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:1067 ../src/gtk/filedlg.cpp:72
 #, c-format
 msgid "File '%s' already exists, do you really want to overwrite it?"
 msgstr "Datei '%s' existiert bereits, möchten Sie sie wirklich überschreiben?"
 
-#: ../src/common/docview.cpp:280 ../src/common/docview.cpp:311
-#: src/common/docview.cpp:247 src/common/docview.cpp:278
+#: ../src/common/textcmn.cpp:94
+#, fuzzy
+msgid "File couldn't be loaded."
+msgstr "Verzeichnis '%s' konnte nicht angelegt werden."
+
+#: ../src/common/docview.cpp:287 ../src/common/docview.cpp:323
 msgid "File error"
 msgstr "Dateifehler"
 
-#: ../src/msw/filedlg.cpp:259 src/msw/filedlg.cpp:252
+#: ../src/generic/dirdlgg.cpp:281 ../src/generic/filedlgg.cpp:726
+msgid "File name exists already."
+msgstr ""
+
+#: ../src/msw/filedlg.cpp:280
 #, c-format
 msgid "Files (%s)|%s"
 msgstr "Dateien (%s)|%s"
 
-#: ../src/generic/fontdlgg.cpp:126 src/generic/fontdlgg.cpp:126
+#: ../src/html/helpfrm.cpp:335
+#, fuzzy
+msgid "Find"
+msgstr "Gefunden "
+
+#: ../src/html/helpfrm.cpp:866
+msgid "Fixed font:"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:124
 msgid "Font"
 msgstr "Zeichensatz"
 
-#: ../src/unix/utilsunx.cpp:276 src/gtk/utilsgtk.cpp:327
+#: ../src/html/helpfrm.cpp:876
+msgid "Font size:"
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:480
 msgid "Fork failed"
 msgstr ""
 
+#: ../src/common/dlgcmn.cpp:130 ../src/generic/helpwxht.cpp:157
+msgid "Forward"
+msgstr ""
+
 #: ../src/common/resourc2.cpp:295 ../src/common/resourc2.cpp:1368
-#: ../src/common/resource.cpp:1660 ../src/common/resource.cpp:2738
-#: src/common/resourc2.cpp:295 src/common/resourc2.cpp:1368
-#: src/common/resource.cpp:1643 src/common/resource.cpp:2716
+#: ../src/common/resource.cpp:1799 ../src/common/resource.cpp:1929
+#: ../src/common/resource.cpp:3014
 msgid "Found "
 msgstr "Gefunden "
 
-#: ../src/generic/prntdlgg.cpp:158 src/generic/prntdlgg.cpp:97
+#: ../src/html/helpfrm.cpp:614
+#, c-format
+msgid "Found %i matches"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:187
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/generic/helphtml.cpp:259 ../src/generic/helphtml.cpp:260
-#: src/generic/helphtml.cpp:259 src/generic/helphtml.cpp:260
+#: ../src/html/helpfrm.cpp:478
+msgid "Go back"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:481
+msgid "Go forward"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:486
+msgid "Go one level up in document hierarchy"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:870
+#, fuzzy
+msgid "Go to home directory"
+msgstr "Das Verzeichnis"
+
+#: ../src/generic/filedlgg.cpp:864
+#, fuzzy
+msgid "Go to parent directory"
+msgstr "Konnte Verzeichnis nicht anlegen "
+
+#: ../src/common/fontmap.cpp:94
+msgid "Greek (ISO-8859-7)"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:251
+#, fuzzy, c-format
+msgid "HTML anchor %s does not exist."
+msgstr "Verzeichnis existiert nicht"
+
+#: ../src/common/fontmap.cpp:95
+msgid "Hebrew (ISO-8859-8)"
+msgstr ""
+
+#: ../src/common/dlgcmn.cpp:142 ../src/generic/proplist.cpp:528
+#: ../src/html/helpfrm.cpp:205
+msgid "Help"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:849
+msgid "Help Browser Options"
+msgstr ""
+
+#: ../src/generic/helphtml.cpp:309 ../src/generic/helphtml.cpp:310
 msgid "Help Index"
 msgstr "Hilfeindex"
 
+#: ../src/html/helpfrm.cpp:1147
+#, fuzzy
+msgid "Help Printing"
+msgstr "Drucke"
+
+#: ../src/generic/helpwxht.cpp:243 ../src/html/helpctrl.cpp:42
+#, c-format
+msgid "Help: %s"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:99
+msgid "ISO-8859-12"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:100
+msgid "ISO-8859-13"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:101
+msgid "ISO-8859-14"
+msgstr ""
+
 #: ../src/common/resourc2.cpp:997 ../src/common/resourc2.cpp:1008
-#: ../src/common/resource.cpp:2363 ../src/common/resource.cpp:2374
-#: src/common/resourc2.cpp:997 src/common/resourc2.cpp:1008
-#: src/common/resource.cpp:2345 src/common/resource.cpp:2356
+#: ../src/common/resource.cpp:2639 ../src/common/resource.cpp:2650
 #, c-format
 msgid "Icon resource specification %s not found."
 msgstr ""
 
-#: ../src/common/resource.cpp:234 src/common/resource.cpp:234
+#: ../src/common/resource.cpp:251
 msgid "Ill-formed resource file syntax."
 msgstr ""
 
-#: ../src/common/log.cpp:482 src/common/log.cpp:477
+#: ../src/generic/dirdlgg.cpp:263 ../src/generic/filedlgg.cpp:712
+#, fuzzy
+msgid "Illegal directory name."
+msgstr "Das Verzeichnis"
+
+#: ../src/generic/filedlgg.cpp:1036
+msgid "Illegal file specification."
+msgstr ""
+
+#: ../src/msw/textctrl.cpp:215
+msgid ""
+"Impossible to create a rich edit control, using simple text control instead. "
+"Please reinstall riched32.dll"
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:343
+msgid "Impossible to get child process input"
+msgstr ""
+
+#: ../src/html/helpdata.cpp:288
+msgid "Incorrect version of HTML help book"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:367
+#, fuzzy
+msgid "Index"
+msgstr "Hilfeindex"
+
+#: ../src/generic/logg.cpp:209
 msgid "Information"
 msgstr "Information"
 
-#: ../src/generic/fontdlgg.cpp:217 src/generic/fontdlgg.cpp:217
+#: ../src/common/imagtiff.cpp:136
+msgid "Invalid TIFF image index."
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:213
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/generic/dcpsg.cpp:1909 ../src/generic/prntdlgg.cpp:403
-#: ../src/generic/prntdlgg.cpp:606 src/generic/dcpsg.cpp:1866
-#: src/generic/prntdlgg.cpp:289 src/generic/prntdlgg.cpp:499
+#: ../src/common/imagjpeg.cpp:195
+msgid "JPEG: Couldn't load - file is probably corrupted."
+msgstr ""
+
+#: ../src/common/imagjpeg.cpp:312
+#, fuzzy
+msgid "JPEG: Couldn't save image."
+msgstr "Kann keinen Wecker anlegen."
+
+#: ../src/common/fontmap.cpp:103
+msgid "KOI8-R"
+msgstr ""
+
+#: ../src/generic/dcpsg.cpp:2183 ../src/generic/prntdlgg.cpp:441
+#: ../src/generic/prntdlgg.cpp:637
 msgid "Landscape"
 msgstr "Querformat"
 
-#: ../src/generic/prntdlgg.cpp:622 src/generic/prntdlgg.cpp:515
+#: ../src/generic/prntdlgg.cpp:649
 msgid "Left margin (mm):"
 msgstr "Linker Rand (mm):"
 
-#: src/generic/dcpsg.cpp:2391
-msgid "Legal 8 1/2 x 14 in"
-msgstr ""
-
-#: src/generic/dcpsg.cpp:2390
-msgid "Letter 8 1/2 x 11 in"
-msgstr ""
-
-#: ../src/generic/fontdlgg.cpp:220 src/generic/fontdlgg.cpp:220
+#: ../src/generic/fontdlgg.cpp:216
 msgid "Light"
 msgstr "Dünn"
 
-#: ../src/gtk/filedlg.cpp:212 ../src/msw/filedlg.cpp:359
-#: src/gtk/filedlg.cpp:177 src/msw/filedlg.cpp:352
+#: ../src/generic/filedlgg.cpp:1263 ../src/gtk/filedlg.cpp:241
+#: ../src/motif/filedlg.cpp:351 ../src/msw/filedlg.cpp:438
 #, c-format
 msgid "Load %s file"
 msgstr "%s-Datei laden"
 
-#: ../src/common/log.cpp:725 src/common/log.cpp:720
+#: ../src/html/htmlwin.cpp:187
+#, fuzzy
+msgid "Loading : "
+msgstr "Warning: "
+
+#: ../src/common/imagpnm.cpp:72
+msgid "Loading Grey Ascii PNM image is not yet implemented."
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:75
+msgid "Loading Grey Raw PNM image is not yet implemented."
+msgstr ""
+
+#: ../src/generic/logg.cpp:525
 #, c-format
 msgid "Log saved to the file '%s'."
 msgstr "Logtext in Datei '%s' gesichert."
 
-#: ../src/gtk/mdi.cpp:347 src/gtk/mdi.cpp:321
+#: ../src/gtk/mdi.cpp:420
 msgid "MDI child"
 msgstr ""
 
-#: ../src/common/mimetype.cpp:1265 src/common/mimetype.cpp:1203
+#: ../src/unix/mimetype.cpp:1540
 #, c-format
 msgid "Mailcap file %s, line %d: incomplete entry ignored."
 msgstr "Mailcap-Datei %s, Zeile %d: unvollständiger Eintrag ignoriert."
 
-#: src/common/mimetype.cpp:968
+#: ../src/common/fs_mem.cpp:142
 #, c-format
-msgid ""
-"Mime.types file %s, line %d: extra characters after the field value ignored."
+msgid "Memory VFS already contains file '%s'!"
+msgstr ""
+
+#: ../src/generic/logg.cpp:763
+msgid "Message"
 msgstr ""
-"Mime.types-Datei %s, Zeile %d: extra Zeichen nach dem Wert ignoriert."
 
-#: ../src/common/mimetype.cpp:979 src/common/mimetype.cpp:941
+#: ../src/unix/mimetype.cpp:1261
 #, c-format
 msgid "Mime.types file %s, line %d: unterminated quoted string."
 msgstr "Mime.types-Datei %s, Zeile %d: unterminierter Text"
 
-#: ../src/generic/fontdlgg.cpp:212 src/generic/fontdlgg.cpp:212
+#: ../src/generic/fontdlgg.cpp:208
 msgid "Modern"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:226 src/generic/dirdlgg.cpp:226
+#: ../src/common/dlgcmn.cpp:139
+#, fuzzy
+msgid "More..."
+msgstr "Neu..."
+
+#: ../src/generic/dirdlgg.cpp:209
 msgid "Mounted Devices"
 msgstr "Dateisysteme"
 
-#: ../src/generic/dirdlgg.cpp:225 src/generic/dirdlgg.cpp:225
+#: ../src/generic/dirdlgg.cpp:204
+msgid "My Harddisk"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:208
 msgid "My Home"
 msgstr "Mein Verzeichnis"
 
-#: ../src/generic/dirdlgg.cpp:342 src/generic/dirdlgg.cpp:342
+#: ../src/generic/filedlgg.cpp:531
+#, fuzzy
+msgid "Name"
+msgstr "am"
+
+#: ../src/generic/dirdlgg.cpp:415
 msgid "New..."
 msgstr "Neu..."
 
-#: ../src/generic/msgdlgg.cpp:111 src/generic/msgdlgg.cpp:131
+#: ../src/generic/filedlgg.cpp:605
+msgid "NewName"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:492
+msgid "Next page"
+msgstr ""
+
+#: ../src/common/dlgcmn.cpp:109 ../src/common/dlgcmn.cpp:119
+#: ../src/motif/msgdlg.cpp:178
 msgid "No"
 msgstr "Nein"
 
 #: ../src/common/resourc2.cpp:814 ../src/common/resourc2.cpp:969
-#: ../src/common/resource.cpp:2180 ../src/common/resource.cpp:2335
-#: src/common/resourc2.cpp:814 src/common/resourc2.cpp:969
-#: src/common/resource.cpp:2162 src/common/resource.cpp:2317
+#: ../src/common/resource.cpp:2455 ../src/common/resource.cpp:2611
 msgid "No XBM facility available!"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:830 ../src/common/resource.cpp:2196
-#: src/common/resourc2.cpp:830 src/common/resource.cpp:2178
+#: ../src/common/resourc2.cpp:830 ../src/common/resource.cpp:2471
 msgid "No XPM facility available!"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:991 ../src/common/resource.cpp:2357
-#: src/common/resourc2.cpp:991 src/common/resource.cpp:2339
+#: ../src/common/resourc2.cpp:991 ../src/common/resource.cpp:2633
 msgid "No XPM icon facility available!"
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:254 src/generic/helphtml.cpp:254
+#: ../src/generic/helphtml.cpp:304
 msgid "No entries found."
 msgstr "Keine Einträge gefunden."
 
-#: ../src/generic/fontdlgg.cpp:216 ../src/generic/fontdlgg.cpp:219
-#: src/generic/fontdlgg.cpp:216 src/generic/fontdlgg.cpp:219
+#: ../src/common/image.cpp:518
+msgid "No handler found for image type."
+msgstr ""
+
+#: ../src/common/image.cpp:526 ../src/common/image.cpp:560
+#, c-format
+msgid "No image handler for type %d defined."
+msgstr ""
+
+#: ../src/common/image.cpp:544 ../src/common/image.cpp:576
+#, c-format
+msgid "No image handler for type %s defined."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:605
+msgid "No matching page found yet"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:212 ../src/generic/fontdlgg.cpp:215
 msgid "Normal"
 msgstr ""
 
-#: ../src/generic/choicdgg.cpp:301 ../src/generic/colrdlgg.cpp:231
-#: ../src/generic/dcpsg.cpp:1917 ../src/generic/dirdlgg.cpp:340
-#: ../src/generic/fontdlgg.cpp:260 ../src/generic/msgdlgg.cpp:117
-#: ../src/generic/prntdlgg.cpp:171 ../src/generic/prntdlgg.cpp:429
-#: ../src/generic/prntdlgg.cpp:579 ../src/generic/textdlgg.cpp:136
-#: ../src/gtk/filedlg.cpp:148 src/generic/choicdgg.cpp:301
-#: src/generic/colrdlgg.cpp:231 src/generic/dcpsg.cpp:1874
-#: src/generic/dirdlgg.cpp:340 src/generic/fontdlgg.cpp:260
-#: src/generic/msgdlgg.cpp:138 src/generic/prntdlgg.cpp:110
-#: src/generic/prntdlgg.cpp:316 src/generic/prntdlgg.cpp:472
-#: src/generic/textdlgg.cpp:136 src/gtk/filedlg.cpp:125
+#: ../src/html/helpfrm.cpp:858
+msgid "Normal font:"
+msgstr ""
+
+#: ../src/common/dlgcmn.cpp:125 ../src/generic/dcpsg.cpp:2191
+#: ../src/generic/dirdlgg.cpp:411 ../src/generic/filedlgg.cpp:902
+#: ../src/generic/fontdlgg.cpp:256 ../src/generic/prntdlgg.cpp:467
+#: ../src/generic/proplist.cpp:511 ../src/gtk/filedlg.cpp:158
+#: ../src/gtk/fontdlg.cpp:172 ../src/html/helpfrm.cpp:886
 msgid "OK"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:409 src/generic/prntdlgg.cpp:295
+#: ../src/html/helpfrm.cpp:500 ../src/html/helpfrm.cpp:1155
+msgid "Open HTML document"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:292 ../src/generic/dirdlgg.cpp:533
+#: ../src/generic/filedlgg.cpp:620 ../src/generic/filedlgg.cpp:739
+msgid "Operation not permitted."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:592
+#, fuzzy, c-format
+msgid "Option '%s' requires a value, '=' expected."
+msgstr "Datei '%s', Zeile %d: '=' erwartet."
+
+#: ../src/common/cmdline.cpp:612
+#, c-format
+msgid "Option '%s' requires a value."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:668
+#, c-format
+msgid "Option '%s': '%s' cannot be converted to a date."
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:447
 msgid "Options"
 msgstr "Optionen"
 
-#: ../src/generic/prntdlgg.cpp:405 ../src/generic/prntdlgg.cpp:607
-#: src/generic/prntdlgg.cpp:291 src/generic/prntdlgg.cpp:500
+#: ../src/generic/prntdlgg.cpp:443 ../src/generic/prntdlgg.cpp:638
 msgid "Orientation"
 msgstr "Orientierung"
 
-#: ../src/common/prntbase.cpp:695 src/common/prntbase.cpp:693
+#: ../src/common/imagpcx.cpp:434
+msgid "PCX: this is not a PCX file."
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:96
+#, fuzzy
+msgid "PNM: Couldn't allocate memory."
+msgstr "Kann keinen Wecker anlegen."
+
+#: ../src/common/imagpnm.cpp:80
+msgid "PNM: File format is not recognized."
+msgstr ""
+
+#: ../src/common/imagpnm.cpp:112
+msgid "PNM: File seems truncated."
+msgstr ""
+
+#: ../src/common/prntbase.cpp:729
 #, c-format
 msgid "Page %d"
 msgstr "Seite %d"
 
-#: ../src/common/prntbase.cpp:693 src/common/prntbase.cpp:691
+#: ../src/common/prntbase.cpp:727
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d aus %d"
 
-#: ../src/generic/prntdlgg.cpp:564 src/generic/prntdlgg.cpp:457
+#: ../src/generic/prntdlgg.cpp:604
 msgid "Page Setup"
 msgstr "Seiteneinstellungen"
 
-#: ../src/generic/prntdlgg.cpp:141 src/generic/prntdlgg.cpp:84
+#: ../src/generic/prntdlgg.cpp:164
 msgid "Pages"
 msgstr "Seiten"
 
-#: ../src/generic/prntdlgg.cpp:395 ../src/generic/prntdlgg.cpp:756
-#: src/generic/prntdlgg.cpp:281 src/generic/prntdlgg.cpp:629
+#: ../src/generic/prntdlgg.cpp:555 ../src/generic/prntdlgg.cpp:626
+#: ../src/generic/prntdlgg.cpp:808
+#, fuzzy
+msgid "Paper Size"
+msgstr "Papierformat"
+
+#: ../src/generic/prntdlgg.cpp:433 ../src/generic/prntdlgg.cpp:615
+#: ../src/generic/prntdlgg.cpp:804
 msgid "Paper size"
 msgstr "Papierformat"
 
-#: ../src/unix/utilsunx.cpp:259 src/gtk/utilsgtk.cpp:315
+#: ../src/generic/filedlgg.cpp:535
+msgid "Permissions"
+msgstr ""
+
+#: ../src/unix/utilsunx.cpp:429 ../src/unix/utilsunx.cpp:453
 msgid "Pipe creation failed"
 msgstr "Konnte keine Pipe anlegen"
 
-#: ../src/common/prntbase.cpp:112 src/common/prntbase.cpp:111
+#: ../src/gtk/fontdlg.cpp:72
+#, fuzzy
+msgid "Please choose a valid font."
+msgstr "Bitte wählen Sie eine bestehende Datei."
+
+#: ../src/generic/filedlgg.cpp:1085 ../src/gtk/filedlg.cpp:83
+msgid "Please choose an existing file."
+msgstr "Bitte wählen Sie eine bestehende Datei."
+
+#: ../src/msw/dialup.cpp:764
+msgid "Please choose which ISP do you want to connect to"
+msgstr ""
+
+#: ../src/common/prntbase.cpp:105
 msgid "Please wait..."
 msgstr "Bitte warten..."
 
-#: ../src/generic/dcpsg.cpp:1908 ../src/generic/prntdlgg.cpp:402
-#: ../src/generic/prntdlgg.cpp:605 src/generic/dcpsg.cpp:1865
-#: src/generic/prntdlgg.cpp:288 src/generic/prntdlgg.cpp:498
+#: ../src/generic/dcpsg.cpp:2182 ../src/generic/prntdlgg.cpp:440
+#: ../src/generic/prntdlgg.cpp:636
 msgid "Portrait"
 msgstr "Hochformat"
 
-#: ../src/generic/dcpsg.cpp:366 src/generic/dcpsg.cpp:338
+#: ../src/generic/dcpsg.cpp:377
 msgid "PostScript"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:234 src/generic/prntdlgg.cpp:159
+#: ../src/generic/prntdlgg.cpp:272
 msgid "PostScript file"
 msgstr "PostScript-Datei"
 
-#: ../src/generic/dcpsg.cpp:1950 src/generic/dcpsg.cpp:1907
+#: ../src/generic/dcpsg.cpp:2224
 msgid "PostScript:"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:1913 src/generic/dcpsg.cpp:1870
+#: ../src/generic/dcpsg.cpp:2187
 msgid "Preview Only"
 msgstr "Nur Voransicht"
 
-#: ../src/generic/prntdlgg.cpp:102 ../src/generic/prntdlgg.cpp:116
-#: src/generic/prntdlgg.cpp:71
+#: ../src/html/helpfrm.cpp:880
+#, fuzzy
+msgid "Preview:"
+msgstr "Nur Voransicht"
+
+#: ../src/html/htmprint.cpp:479
+#, fuzzy
+msgid "Previewing"
+msgstr "Nur Voransicht"
+
+#: ../src/html/helpfrm.cpp:489
+msgid "Previous page"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:113 ../src/generic/prntdlgg.cpp:127
 msgid "Print"
 msgstr "Drucken"
 
-#: ../src/generic/printps.cpp:189 src/generic/printps.cpp:165
+#: ../src/generic/printps.cpp:200
 msgid "Print Error"
 msgstr "Fehler beim Drucken"
 
-#: ../src/common/docview.cpp:831 src/common/docview.cpp:785
+#: ../src/common/docview.cpp:884
 msgid "Print Preview"
 msgstr "Druckvoransicht"
 
-#: ../src/common/prntbase.cpp:636 ../src/common/prntbase.cpp:658
-#: ../src/common/prntbase.cpp:675 src/common/prntbase.cpp:633
-#: src/common/prntbase.cpp:655 src/common/prntbase.cpp:673
+#: ../src/common/prntbase.cpp:685 ../src/common/prntbase.cpp:709
 msgid "Print Preview Failure"
 msgstr "Fehler bei Druckvoransicht"
 
-#: ../src/generic/prntdlgg.cpp:149 src/generic/prntdlgg.cpp:90
+#: ../src/generic/prntdlgg.cpp:172
 msgid "Print Range"
 msgstr "Seitenbereich"
 
-#: ../src/generic/prntdlgg.cpp:370 ../src/generic/prntdlgg.cpp:377
-#: src/generic/prntdlgg.cpp:276
+#: ../src/generic/prntdlgg.cpp:408 ../src/generic/prntdlgg.cpp:415
 msgid "Print Setup"
 msgstr "Druckereinstellungen"
 
-#: ../src/generic/prntdlgg.cpp:417 src/generic/prntdlgg.cpp:303
+#: ../src/generic/prntdlgg.cpp:455
 msgid "Print in colour"
 msgstr "In Farbe drucken"
 
-#: ../src/generic/prntdlgg.cpp:419 src/generic/prntdlgg.cpp:306
+#: ../src/generic/prntdlgg.cpp:457
 msgid "Print spooling"
 msgstr "Druckersteuerung"
 
-#: ../src/generic/dcpsg.cpp:1912 ../src/generic/prntdlgg.cpp:135
-#: src/generic/dcpsg.cpp:1869 src/generic/prntdlgg.cpp:78
+#: ../src/html/helpfrm.cpp:506
+#, fuzzy
+msgid "Print this page"
+msgstr "Seitenbereich"
+
+#: ../src/generic/dcpsg.cpp:2186 ../src/generic/prntdlgg.cpp:150
 msgid "Print to File"
 msgstr "In Datei drucken"
 
-#: ../src/common/prntbase.cpp:350 src/common/prntbase.cpp:349
+#: ../src/common/prntbase.cpp:364
 msgid "Print..."
 msgstr "Drucken..."
 
-#: ../src/generic/dcpsg.cpp:1923 src/generic/dcpsg.cpp:1880
+#: ../src/generic/dcpsg.cpp:2197
 msgid "Printer Command: "
 msgstr "Druck-Befehl "
 
-#: ../src/generic/dcpsg.cpp:1928 src/generic/dcpsg.cpp:1885
+#: ../src/generic/dcpsg.cpp:2202
 msgid "Printer Options: "
 msgstr "Befehlsoptionen: "
 
-#: ../src/generic/dcpsg.cpp:335 src/generic/dcpsg.cpp:306
+#: ../src/generic/dcpsg.cpp:346
 msgid "Printer Settings"
 msgstr "Druckereinstellungen"
 
-#: ../src/generic/prntdlgg.cpp:421 src/generic/prntdlgg.cpp:308
+#: ../src/generic/prntdlgg.cpp:459
 msgid "Printer command:"
 msgstr "Druck-Befehl:"
 
-#: ../src/generic/prntdlgg.cpp:133 src/generic/prntdlgg.cpp:76
+#: ../src/generic/prntdlgg.cpp:149
 msgid "Printer options"
 msgstr "Druckereinstellungen"
 
-#: ../src/generic/prntdlgg.cpp:425 src/generic/prntdlgg.cpp:312
+#: ../src/generic/prntdlgg.cpp:463
 msgid "Printer options:"
 msgstr "Druckereinstellungen:"
 
-#: ../src/generic/prntdlgg.cpp:582 src/generic/prntdlgg.cpp:475
+#: ../src/generic/prntdlgg.cpp:682
 msgid "Printer..."
 msgstr "Drucker..."
 
-#: ../src/common/prntbase.cpp:111 ../src/common/prntbase.cpp:153
-#: src/common/prntbase.cpp:110 src/common/prntbase.cpp:152
+#: ../src/common/prntbase.cpp:104 ../src/common/prntbase.cpp:146
+#: ../src/html/htmprint.cpp:500
 msgid "Printing"
 msgstr "Drucke"
 
-#: ../src/common/prntbase.cpp:125 src/common/prntbase.cpp:124
+#: ../src/common/prntbase.cpp:118
 msgid "Printing Error"
 msgstr "Fehler beim Drucken"
 
-#: ../src/common/log.cpp:319 src/common/log.cpp:326
+#: ../src/generic/printps.cpp:218
+#, c-format
+msgid "Printing page %d..."
+msgstr "Drucke Seite %d..."
+
+#: ../src/generic/printps.cpp:185
+msgid "Printing..."
+msgstr "Drucke..."
+
+#: ../src/common/log.cpp:348
 msgid "Program aborted."
 msgstr "Programm abgebrochen."
 
-#: ../src/common/log.cpp:677 src/common/log.cpp:672
+#: ../src/generic/logg.cpp:477
 msgid "Question"
 msgstr "Frage"
 
-#: ../src/msw/registry.cpp:435 src/msw/registry.cpp:435
+#: ../src/common/ffile.cpp:133 ../src/common/ffile.cpp:154
+#, fuzzy, c-format
+msgid "Read error on file '%s'"
+msgstr "Datei '%s' ersetzen?"
+
+#: ../src/msw/registry.cpp:528
+#, c-format
+msgid "Registry key '%s' already exists."
+msgstr ""
+
+#: ../src/msw/registry.cpp:497
+#, c-format
+msgid "Registry key '%s' does not exist, cannot rename it."
+msgstr ""
+
+#: ../src/msw/registry.cpp:624
 #, c-format
 msgid ""
 "Registry key '%s' is needed for normal system operation,\n"
@@ -931,140 +1745,319 @@ msgid ""
 "operation aborted."
 msgstr ""
 
-#: ../src/generic/helphtml.cpp:259 src/generic/helphtml.cpp:259
+#: ../src/msw/registry.cpp:428
+#, c-format
+msgid "Registry value '%s' already exists."
+msgstr ""
+
+#: ../src/generic/helphtml.cpp:309
 msgid "Relevant entries:"
 msgstr "Relevante Einträge:"
 
-#: ../src/msw/filedlg.cpp:336 src/msw/filedlg.cpp:329
+#: ../src/generic/progdlgg.cpp:170
+msgid "Remaining time : "
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:264
+msgid "Remove current page from bookmarks"
+msgstr ""
+
+#: ../src/msw/filedlg.cpp:400
 #, c-format
 msgid "Replace file '%s'?"
 msgstr "Datei '%s' ersetzen?"
 
-#: ../src/generic/prntdlgg.cpp:628 src/generic/prntdlgg.cpp:521
+#: ../src/generic/prntdlgg.cpp:661
 msgid "Right margin (mm):"
 msgstr "Rechter Rand (mm):"
 
-#: ../src/generic/fontdlgg.cpp:210 src/generic/fontdlgg.cpp:210
+#: ../src/generic/fontdlgg.cpp:206
 msgid "Roman"
 msgstr "Römisch"
 
-#: ../src/gtk/filedlg.cpp:228 ../src/msw/filedlg.cpp:359
-#: src/gtk/filedlg.cpp:193 src/msw/filedlg.cpp:352
+#: ../src/generic/filedlgg.cpp:1279 ../src/gtk/filedlg.cpp:257
+#: ../src/motif/filedlg.cpp:353 ../src/msw/filedlg.cpp:439
 #, c-format
 msgid "Save %s file"
 msgstr "Datei %s sichern"
 
-#: ../src/common/docview.cpp:231 src/common/docview.cpp:198
+#: ../src/common/docview.cpp:240
 msgid "Save as"
 msgstr "Sichern als"
 
-#: ../src/common/log.cpp:635 src/common/log.cpp:630
+#: ../src/generic/logg.cpp:431
 msgid "Save log contents to file"
 msgstr "Logtexte in Datei sichern"
 
-#: ../src/generic/fontdlgg.cpp:213 src/generic/fontdlgg.cpp:213
+#: ../src/generic/fontdlgg.cpp:209
 msgid "Script"
 msgstr ""
 
-#: ../src/common/docview.cpp:1268 src/common/docview.cpp:1243
+#: ../src/generic/helpwxht.cpp:160 ../src/html/helpfrm.cpp:409
+#: ../src/html/helpfrm.cpp:429
+msgid "Search"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:411
+msgid ""
+"Search contents of help book(s) for all occurences of the text you typed "
+"above"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:712
+msgid "Search in all books"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:605
+#, fuzzy
+msgid "Searching..."
+msgstr "Drucke..."
+
+#: ../src/generic/dirdlgg.cpp:187
+#, fuzzy
+msgid "Sections"
+msgstr "Optionen"
+
+#: ../src/common/ffile.cpp:221
+#, fuzzy, c-format
+msgid "Seek error on file '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
+
+#: ../src/common/docview.cpp:1414
 msgid "Select a document template"
 msgstr ""
 
-#: ../src/common/docview.cpp:1291 src/common/docview.cpp:1266
+#: ../src/common/docview.cpp:1437
 msgid "Select a document view"
 msgstr ""
 
-#: ../src/common/docview.cpp:1185 ../src/common/docview.cpp:1223
-#: src/common/docview.cpp:1168 src/common/docview.cpp:1198
+#: ../src/common/docview.cpp:1332 ../src/common/docview.cpp:1369
 msgid "Select a file"
 msgstr ""
 
-#: ../src/generic/dcpsg.cpp:1911 src/generic/dcpsg.cpp:1868
+#: ../src/generic/dcpsg.cpp:2185
 msgid "Send to Printer"
 msgstr "Zum Drucker schicken"
 
-#: ../src/generic/prntdlgg.cpp:137 src/generic/prntdlgg.cpp:80
+#: ../src/common/dlgcmn.cpp:136
+#, fuzzy
+msgid "Setup"
+msgstr "Einstellungen..."
+
+#: ../src/generic/prntdlgg.cpp:155
 msgid "Setup..."
 msgstr "Einstellungen..."
 
-#: ../src/common/layout.cpp:1366 src/common/layout.cpp:1326
-msgid "Sizer error"
+#: ../src/msw/dialup.cpp:535
+msgid "Several active dialup connections found, choosing one randomly."
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:326
+msgid "Show all"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:360
+msgid "Show all items in index"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:908
+msgid "Show hidden files"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:473
+msgid "Show/hide navigation panel"
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:218 src/generic/fontdlgg.cpp:218
+#: ../src/generic/filedlgg.cpp:532
+msgid "Size"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:214
 msgid "Slant"
 msgstr "Geneigt"
 
-#: ../src/common/docview.cpp:285 src/common/docview.cpp:252
+#: ../src/common/docview.cpp:297
 msgid "Sorry, could not open this file for saving."
 msgstr ""
 
-#: ../src/common/docview.cpp:316 ../src/common/docview.cpp:322
-#: src/common/docview.cpp:283 src/common/docview.cpp:289
+#: ../src/common/docview.cpp:333 ../src/common/docview.cpp:345
 msgid "Sorry, could not open this file."
 msgstr ""
 
-#: ../src/common/docview.cpp:292 src/common/docview.cpp:259
+#: ../src/common/docview.cpp:304
 msgid "Sorry, could not save this file."
 msgstr ""
 
-#: ../src/common/prntbase.cpp:658 src/common/prntbase.cpp:655
+#: ../src/common/prntbase.cpp:685
 msgid "Sorry, not enough memory to create a preview."
 msgstr "Nicht genug Speicher für Voransicht."
 
-#: ../src/common/log.cpp:787 src/common/log.cpp:781
+#: ../src/generic/logg.cpp:585
 msgid "Status: "
 msgstr ""
 
-#: ../src/generic/fontdlgg.cpp:214 src/generic/fontdlgg.cpp:214
+#: ../src/generic/fontdlgg.cpp:210
 msgid "Swiss"
 msgstr "Schweizer"
 
-#: ../src/generic/fontdlgg.cpp:215 src/generic/fontdlgg.cpp:215
+#: ../src/common/imagtiff.cpp:157 ../src/common/imagtiff.cpp:166
+#, fuzzy
+msgid "TIFF: Couldn't allocate memory."
+msgstr "Kann keinen Wecker anlegen."
+
+#: ../src/common/imagtiff.cpp:128
+msgid "TIFF: Error loading image."
+msgstr ""
+
+#: ../src/common/imagtiff.cpp:176
+#, fuzzy
+msgid "TIFF: Error reading image."
+msgstr "Fehler beim Anlegen des Verzeichnisses"
+
+#: ../src/generic/fontdlgg.cpp:211
 msgid "Teletype"
 msgstr "Schreibmaschine"
 
-#: ../src/common/docview.cpp:1268 src/common/docview.cpp:1243
+#: ../src/common/docview.cpp:1414
 msgid "Templates"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:231 src/generic/dirdlgg.cpp:231
+#: ../src/generic/dirdlgg.cpp:214
 msgid "Temporary"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:223 src/generic/dirdlgg.cpp:223
+#: ../src/common/fontmap.cpp:98
+msgid "Thai (ISO-8859-11)"
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:206
 msgid "The Computer"
 msgstr "Der Computer"
 
-#: ../src/generic/dirdlgg.cpp:447 src/generic/dirdlgg.cpp:447
+#: ../src/common/fontmap.cpp:442
+#, c-format
+msgid ""
+"The charset '%s' is unknown. You may select\n"
+"another charset to replace it with or choose\n"
+"[Cancel] if it cannot be replaced"
+msgstr ""
+
+#: ../src/msw/ole/dataobj.cpp:157
+#, c-format
+msgid "The clipboard format '%d' doesn't exist."
+msgstr ""
+
+#: ../src/generic/dirdlgg.cpp:464
 msgid "The directory "
 msgstr "Das Verzeichnis"
 
-#: ../src/msw/thread.cpp:730 src/msw/thread.cpp:719
+#: ../src/common/fontmap.cpp:602
+#, 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)?"
+msgstr ""
+
+#: ../src/common/docview.cpp:1619
+#, 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."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:761
+#, c-format
+msgid "The required parameter '%s' was not specified."
+msgstr ""
+
+#: ../src/common/textcmn.cpp:121
+msgid "The text couldn't be saved."
+msgstr ""
+
+#: ../src/common/cmdline.cpp:740
+#, c-format
+msgid "The value for the option '%s' must be specified."
+msgstr ""
+
+#: ../src/msw/dialup.cpp:412
+#, c-format
+msgid ""
+"The version of remote access service (RAS) installed on this machine is too "
+"old, please upgrade (the following required function is missing: %s)."
+msgstr ""
+
+#: ../src/html/htmprint.cpp:479
+msgid ""
+"There was a problem previewing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+
+#: ../src/html/htmprint.cpp:500
+msgid ""
+"There was a problem printing.\n"
+"Perhaps your current printer is not set correctly?"
+msgstr ""
+
+#: ../src/msw/thread.cpp:1037
 msgid ""
 "Thread module initialization failed: can not store value in thread local "
 "storage"
 msgstr ""
 
-#: src/gtk/threadpsx.cpp:708
-msgid "Thread module initialization failed: failed to create pthread key."
+#: ../src/unix/threadpsx.cpp:1440
+msgid "Thread module initialization failed: failed to create thread key"
 msgstr ""
 
-#: ../src/msw/thread.cpp:716 src/msw/thread.cpp:705
+#: ../src/msw/thread.cpp:1023
 msgid ""
 "Thread module initialization failed: impossible to allocate index in thread "
 "local storage"
 msgstr ""
 
-#: ../src/generic/prntdlgg.cpp:162 src/generic/prntdlgg.cpp:101
+#: ../src/unix/threadpsx.cpp:962
+msgid "Thread priority setting is ignored."
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:534 ../src/generic/logg.cpp:764
+msgid "Time"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:162
+msgid "Tip of the Day"
+msgstr ""
+
+#: ../src/generic/tipdlg.cpp:138
+msgid "Tips not available, sorry!"
+msgstr ""
+
+#: ../src/generic/prntdlgg.cpp:191
 msgid "To:"
 msgstr "Bis:"
 
-#: ../src/generic/prntdlgg.cpp:637 src/generic/prntdlgg.cpp:530
+#: ../src/generic/prntdlgg.cpp:650
 msgid "Top margin (mm):"
 msgstr "Oberer Rand (mm):"
 
-#: ../src/generic/fontdlgg.cpp:246 src/generic/fontdlgg.cpp:246
+#: ../src/common/fs_mem.cpp:200
+#, c-format
+msgid "Trying to remove file '%s' from memory VFS, but it is not loaded!"
+msgstr ""
+
+#: ../src/common/sckaddr.cpp:107
+msgid "Trying to solve a NULL hostname: giving up"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:96
+msgid "Turkish (ISO-8859-9)"
+msgstr ""
+
+#: ../src/html/htmlwin.cpp:175
+#, c-format
+msgid "Unable to open requested HTML document: %s"
+msgstr ""
+
+#: ../src/generic/fontdlgg.cpp:242
 msgid "Underline"
 msgstr "Unterstreichen"
 
@@ -1072,563 +2065,816 @@ msgstr "Unterstreichen"
 #: ../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:1670 ../src/common/resource.cpp:1684
-#: ../src/common/resource.cpp:1701 ../src/common/resource.cpp:1715
-#: ../src/common/resource.cpp:2748 ../src/common/resource.cpp:2762
-#: ../src/common/resource.cpp:2779 ../src/common/resource.cpp:2793
-#: 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:1653 src/common/resource.cpp:1667
-#: src/common/resource.cpp:1683 src/common/resource.cpp:1697
-#: src/common/resource.cpp:2726 src/common/resource.cpp:2740
-#: src/common/resource.cpp:2756 src/common/resource.cpp:2770
+#: ../src/common/resource.cpp:1809 ../src/common/resource.cpp:1823
+#: ../src/common/resource.cpp:1840 ../src/common/resource.cpp:1854
+#: ../src/common/resource.cpp:1939 ../src/common/resource.cpp:1953
+#: ../src/common/resource.cpp:1969 ../src/common/resource.cpp:1983
+#: ../src/common/resource.cpp:3024 ../src/common/resource.cpp:3038
+#: ../src/common/resource.cpp:3055 ../src/common/resource.cpp:3069
 msgid "Unexpected end of file whilst parsing resource."
 msgstr ""
 
-#: ../src/common/mimetype.cpp:1021 src/common/mimetype.cpp:985
+#: ../src/common/cmdline.cpp:712
+#, c-format
+msgid "Unexpected parameter '%s'"
+msgstr ""
+
+#: ../src/msw/dde.cpp:1020
+#, c-format
+msgid "Unknown DDE error %08x"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:306
+#, c-format
+msgid "Unknown encoding (%d)"
+msgstr ""
+
+#: ../src/unix/mimetype.cpp:1303
 #, c-format
 msgid "Unknown field in file %s, line %d: '%s'."
 msgstr "Unbekanntest Feld '%s' in Datei %s, Zeile %d."
 
-#: ../src/common/mimetype.cpp:381 src/common/mimetype.cpp:363
+#: ../src/common/cmdline.cpp:498
+#, c-format
+msgid "Unknown long option '%s'"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:520
+#, c-format
+msgid "Unknown option '%s'"
+msgstr ""
+
+#: ../src/common/mimecmn.cpp:161
 #, c-format
 msgid "Unmatched '{' in an entry for mime type %s."
 msgstr "Fehlendes '}' in Eintrag für MIME-Typ %s."
 
-#: ../src/common/docview.cpp:1703 ../src/common/docview.cpp:1718
-#: ../src/common/docview.cpp:1745 src/common/docview.cpp:1665
-#: src/common/docview.cpp:1680 src/common/docview.cpp:1707
+#: ../src/common/docview.cpp:1867 ../src/common/docview.cpp:1882
+#: ../src/common/docview.cpp:1909
 msgid "Unnamed command"
 msgstr ""
 
-#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2053
-#: src/common/resourc2.cpp:687 src/common/resource.cpp:2035
+#: ../src/common/resourc2.cpp:687 ../src/common/resource.cpp:2327
 #, c-format
 msgid "Unrecognized style %s whilst parsing resource."
 msgstr ""
 
-#: ../src/msw/clipbrd.cpp:220 ../src/msw/clipbrd.cpp:330
-#: src/msw/clipbrd.cpp:220 src/msw/clipbrd.cpp:330
+#: ../src/msw/app.cpp:702
+msgid "Unrecoverable program error detected:  the application will terminate."
+msgstr ""
+
+#: ../src/msw/clipbrd.cpp:268 ../src/msw/clipbrd.cpp:369
 msgid "Unsupported clipboard format."
 msgstr "Nicht unterstütztes Format in Zwischenablage."
 
-#: ../src/generic/dirdlgg.cpp:227 src/generic/dirdlgg.cpp:227
+#: ../src/common/cmdline.cpp:793
+#, fuzzy, c-format
+msgid "Usage: %s"
+msgstr "Seite %d"
+
+#: ../src/generic/dirdlgg.cpp:210
 msgid "User"
 msgstr "Benutzer"
 
-#: ../src/generic/dirdlgg.cpp:228 src/generic/dirdlgg.cpp:228
+#: ../src/generic/dirdlgg.cpp:211
 msgid "User Local"
 msgstr "Lokaler Benutzer"
 
-#: ../src/common/valtext.cpp:188 src/common/valtext.cpp:144
-#: src/common/valtext.cpp:155 src/common/valtext.cpp:164
-#: src/common/valtext.cpp:172 src/common/valtext.cpp:180
-#: src/common/valtext.cpp:189
+#: ../src/common/valtext.cpp:188
 msgid "Validation conflict"
 msgstr ""
 
-#: ../src/generic/dirdlgg.cpp:229 src/generic/dirdlgg.cpp:229
+#: ../src/generic/dirdlgg.cpp:212
 msgid "Variables"
 msgstr "Variablen"
 
-#: ../src/common/docview.cpp:1291 src/common/docview.cpp:1266
+#: ../src/generic/filedlgg.cpp:856
+msgid "View files as a detailed view"
+msgstr ""
+
+#: ../src/generic/filedlgg.cpp:850
+msgid "View files as a list view"
+msgstr ""
+
+#: ../src/common/docview.cpp:1437
 msgid "Views"
 msgstr "Ansichten"
 
-#: ../src/common/docview.cpp:401 ../src/common/log.cpp:478
-#: ../src/common/resource.cpp:121 src/common/docview.cpp:368
-#: src/common/resource.cpp:121
-msgid "Warning"
-msgstr "Warnung"
+#: ../src/unix/utilsunx.cpp:263 ../src/unix/utilsunx.cpp:599
+msgid "Waiting for subprocess termination failed"
+msgstr ""
+
+#: ../src/common/docview.cpp:428 ../src/common/resource.cpp:121
+#: ../src/generic/logg.cpp:205
+msgid "Warning"
+msgstr "Warnung"
+
+#: ../src/common/log.cpp:358
+msgid "Warning: "
+msgstr "Warning: "
+
+#: ../src/html/htmlpars.cpp:179
+msgid "Warning: attempt to remove HTML tag handler from empty stack."
+msgstr ""
+
+#: ../src/common/fontmap.cpp:88
+msgid "West European (ISO-8859-1/Latin 1)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:102
+msgid "West European new (ISO-8859-15/Latin 0)"
+msgstr ""
+
+#: ../src/html/helpfrm.cpp:401
+msgid "Whole words only"
+msgstr ""
+
+#: ../src/msw/utils.cpp:497
+msgid "Win32s on Windows 3.1"
+msgstr ""
+
+#: ../src/msw/utils.cpp:529
+msgid "Windows 3.1"
+msgstr ""
+
+#: ../src/msw/utils.cpp:501
+#, c-format
+msgid "Windows 9%c"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:110
+msgid "Windows Arabic (CP 1256)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:111
+msgid "Windows Baltic (CP 1257)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:105
+msgid "Windows Cyrillic (CP 1251)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:107
+msgid "Windows Greek (CP 1253)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:109
+msgid "Windows Hebrew (CP 1255)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:106
+msgid "Windows Latin 1 (CP 1252)"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:104
+msgid "Windows Latin 2 (CP 1250)"
+msgstr ""
 
-#: ../src/common/log.cpp:329 src/common/log.cpp:336
-msgid "Warning: "
-msgstr "Warning: "
+#: ../src/common/fontmap.cpp:108
+msgid "Windows Turkish (CP 1254)"
+msgstr ""
+
+#: ../src/common/ffile.cpp:168
+#, fuzzy, c-format
+msgid "Write error on file '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
 
-#: ../src/generic/dcpsg.cpp:1968 src/generic/dcpsg.cpp:1925
+#: ../src/generic/dcpsg.cpp:2242
 msgid "X Scaling"
 msgstr "X Skalierung"
 
-#: ../src/generic/dcpsg.cpp:1977 src/generic/dcpsg.cpp:1934
+#: ../src/generic/dcpsg.cpp:2251
 msgid "X Translation"
 msgstr "X Verschiebung"
 
-#: ../src/generic/dcpsg.cpp:1972 src/generic/dcpsg.cpp:1929
+#: ../src/generic/dcpsg.cpp:2246
 msgid "Y Scaling"
 msgstr "Y Skalierung"
 
-#: ../src/generic/dcpsg.cpp:1981 src/generic/dcpsg.cpp:1938
+#: ../src/generic/dcpsg.cpp:2255
 msgid "Y Translation"
 msgstr "Y Verschiebung"
 
-#: ../src/generic/msgdlgg.cpp:109 src/generic/msgdlgg.cpp:130
+#: ../src/common/dlgcmn.cpp:107 ../src/common/dlgcmn.cpp:114
+#: ../src/motif/msgdlg.cpp:178
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/common/docview.cpp:1814 src/common/docview.cpp:1777
+#: ../src/generic/dirdlgg.cpp:499
+msgid "You cannot add a new directory to this section."
+msgstr ""
+
+#: ../src/common/docview.cpp:1978
 msgid "[EMPTY]"
 msgstr "[leer]"
 
-#: ../src/common/time.cpp:358 src/common/time.cpp:358
-msgid "am"
-msgstr "am"
+#: ../src/msw/dde.cpp:987
+msgid "a DDEML application has created a prolonged race condition."
+msgstr ""
 
-#: ../src/common/fileconf.cpp:1266 src/common/CVS/Base/fileconf.cpp:1269
-#: src/common/fileconf.cpp:1269
-#, c-format
-msgid "attempt to change immutable key '%s' ignored."
-msgstr "Versuch, Eintrag '%s' zu ändern, verweigert. Ist nicht schreibbar."
+#: ../src/msw/dde.cpp:975
+msgid ""
+"a DDEML function was called without first calling the DdeInitialize "
+"function,\n"
+"or an invalid instance identifier\n"
+"was passed to a DDEML function."
+msgstr ""
 
-#: ../src/common/string.cpp:1703 src/common/string.cpp:1430
-msgid "bad index in wxArrayString::Remove"
+#: ../src/msw/dde.cpp:993
+msgid "a client's attempt to establish a conversation has failed."
 msgstr ""
 
-#: ../src/common/file.cpp:273 src/common/file.cpp:268
-#, c-format
-msgid "can't close file descriptor %d"
+#: ../src/msw/dde.cpp:990
+#, fuzzy
+msgid "a memory allocation failed."
+msgstr "Konnte keine Pipe anlegen"
+
+#: ../src/msw/dde.cpp:984
+msgid "a parameter failed to be validated by the DDEML."
 msgstr ""
 
-#: ../src/msw/registry.cpp:403 src/msw/registry.cpp:403
-#, c-format
-msgid "can't close registry key '%s'"
+#: ../src/msw/dde.cpp:966
+msgid "a request for a synchronous advise transaction has timed out."
 msgstr ""
 
-#: ../src/common/file.cpp:563 src/common/file.cpp:520
-#, c-format
-msgid "can't commit changes to file '%s'"
-msgstr "Kann Änderungen in Datei '%s' nicht sichern."
+#: ../src/msw/dde.cpp:972
+msgid "a request for a synchronous data transaction has timed out."
+msgstr ""
 
-#: ../src/common/file.cpp:224 src/common/file.cpp:215
-#, c-format
-msgid "can't create file '%s'"
-msgstr "Kann Datei '%s' nicht anlegen."
+#: ../src/msw/dde.cpp:981
+msgid "a request for a synchronous execute transaction has timed out."
+msgstr ""
 
-#: ../src/msw/registry.cpp:386 src/msw/registry.cpp:386
-#, c-format
-msgid "can't create registry key '%s'"
+#: ../src/msw/dde.cpp:999
+msgid "a request for a synchronous poke transaction has timed out."
 msgstr ""
 
-#: ../src/msw/registry.cpp:467 src/msw/registry.cpp:467
-#, c-format
-msgid "can't delete key '%s'"
+#: ../src/msw/dde.cpp:1014
+msgid "a request to end an advise transaction has timed out."
+msgstr ""
+
+#: ../src/msw/dde.cpp:1008
+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
+#, fuzzy
+msgid "a transaction failed."
+msgstr "Konnte keine Pipe anlegen"
+
+#: ../src/common/utilscmn.cpp:464
+msgid "alt"
+msgstr ""
+
+#: ../src/msw/dde.cpp:978
+msgid ""
+"an application initialized as APPCLASS_MONITOR has\n"
+"attempted to perform a DDE transaction,\n"
+"or an application initialized as APPCMD_CLIENTONLY has \n"
+"attempted to perform server transactions."
+msgstr ""
+
+#: ../src/msw/dde.cpp:1002
+msgid "an internal call to the PostMessage function has failed. "
+msgstr ""
+
+#: ../src/msw/dde.cpp:1011
+msgid "an internal error has occurred in the DDEML."
 msgstr ""
 
-#: ../src/common/fileconf.cpp:736 src/common/CVS/Base/fileconf.cpp:742
-#: src/common/fileconf.cpp:742
+#: ../src/msw/dde.cpp:1017
+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:1416
 #, c-format
-msgid "can't delete user configuration file '%s'"
-msgstr "Kann  Konfigurationsdatei '%s' nicht löschen."
+msgid "attempt to change immutable key '%s' ignored."
+msgstr "Versuch, Eintrag '%s' zu ändern, verweigert. Ist nicht schreibbar."
+
+#: ../src/common/ffile.cpp:101
+#, fuzzy, c-format
+msgid "can't close file '%s'"
+msgstr "Kann Datei '%s' nicht öffnen"
 
-#: ../src/msw/registry.cpp:492 src/msw/registry.cpp:492
+#: ../src/common/file.cpp:283
 #, c-format
-msgid "can't delete value '%s' from key '%s'"
-msgstr "Kann Wert '%s' von Eintrag '%s' nicht löschen."
+msgid "can't close file descriptor %d"
+msgstr ""
 
-#: ../src/msw/registry.cpp:503 src/msw/registry.cpp:503
+#: ../src/common/file.cpp:581 ../src/common/file.cpp:591
 #, c-format
-msgid "can't delete value of key '%s'"
-msgstr "Kann Wert von Eintrag '%s' nicht löschen"
+msgid "can't commit changes to file '%s'"
+msgstr "Kann Änderungen in Datei '%s' nicht sichern."
 
-#: src/common/file.cpp:447
+#: ../src/common/file.cpp:231
 #, c-format
-msgid "can't determine if the end of file is reached on descriptor %d"
-msgstr ""
+msgid "can't create file '%s'"
+msgstr "Kann Datei '%s' nicht anlegen."
 
-#: ../src/msw/registry.cpp:780 src/msw/registry.cpp:780
+#: ../src/common/fileconf.cpp:886
 #, c-format
-msgid "can't enumerate subkeys of key '%s'"
-msgstr "Kann Untereinträge von '%s' nicht auflisten"
+msgid "can't delete user configuration file '%s'"
+msgstr "Kann  Konfigurationsdatei '%s' nicht löschen."
 
-#: ../src/msw/registry.cpp:735 src/msw/registry.cpp:735
+#: ../src/common/file.cpp:462
 #, c-format
-msgid "can't enumerate values of key '%s'"
-msgstr "Kann Werte von Eintrag '%s' nicht auflisten"
+msgid "can't determine if the end of file is reached on descriptor %d"
+msgstr ""
 
-#: ../src/common/file.cpp:418 src/common/file.cpp:413
+#: ../src/common/file.cpp:428
 #, c-format
 msgid "can't find length of file on file descriptor %d"
 msgstr ""
 
-#: ../src/msw/utils.cpp:584 src/msw/utils.cpp:561
+#: ../src/msw/utils.cpp:328
 msgid "can't find user's HOME, using current directory."
 msgstr "Kann Benutzerverzeichnis nicht finden, verwende aktuelles Verzeichnis."
 
-#: ../src/common/file.cpp:332 src/common/file.cpp:327
+#: ../src/common/file.cpp:342
 #, c-format
 msgid "can't flush file descriptor %d"
 msgstr ""
 
-#: ../src/msw/registry.cpp:335 src/msw/registry.cpp:335
+#: ../src/common/file.cpp:396
 #, c-format
-msgid "can't get info about registry key '%s'"
+msgid "can't get seek position on file descriptor %d"
 msgstr ""
 
-#: ../src/common/file.cpp:386 src/common/file.cpp:381
-#, c-format
-msgid "can't get seek position on file descriptor %d"
+#: ../src/common/fontmap.cpp:545
+msgid "can't load any font, aborting"
 msgstr ""
 
-#: ../src/common/file.cpp:259 src/common/file.cpp:254
+#: ../src/common/ffile.cpp:85 ../src/common/file.cpp:269
 #, c-format
 msgid "can't open file '%s'"
 msgstr "Kann Datei '%s' nicht öffnen"
 
-#: ../src/common/fileconf.cpp:183 src/common/CVS/Base/fileconf.cpp:186
-#: src/common/fileconf.cpp:186
+#: ../src/common/fileconf.cpp:310
 #, c-format
 msgid "can't open global configuration file '%s'."
 msgstr "Kann globale Konfigurationsdatei '%s' nicht öffnen."
 
-#: ../src/msw/registry.cpp:361 src/msw/registry.cpp:361
-#, c-format
-msgid "can't open registry key '%s'"
-msgstr ""
-
-#: ../src/common/fileconf.cpp:195 src/common/CVS/Base/fileconf.cpp:198
-#: src/common/fileconf.cpp:198
+#: ../src/common/fileconf.cpp:322
 #, c-format
 msgid "can't open user configuration file '%s'."
 msgstr "Kann Konfigurationsdatei '%s' nicht öffnen."
 
-#: ../src/common/fileconf.cpp:642 src/common/CVS/Base/fileconf.cpp:646
-#: src/common/fileconf.cpp:646
+#: ../src/common/fileconf.cpp:774
 msgid "can't open user configuration file."
 msgstr "Kann Benutzer-Konfigurationsdatei nicht öffnen."
 
-#: ../src/common/file.cpp:299 src/common/file.cpp:294
+#: ../src/common/file.cpp:309
 #, c-format
 msgid "can't read from file descriptor %d"
 msgstr ""
 
-#: ../src/msw/registry.cpp:658 src/msw/registry.cpp:658
-#, c-format
-msgid "can't read value of '%s'"
-msgstr ""
-
-#: ../src/msw/registry.cpp:569 ../src/msw/registry.cpp:608
-#: src/msw/registry.cpp:569 src/msw/registry.cpp:608
-#, c-format
-msgid "can't read value of key '%s'"
-msgstr ""
-
-#: ../src/common/file.cpp:558 src/common/file.cpp:515
+#: ../src/common/file.cpp:576 ../src/common/file.cpp:586
 #, c-format
 msgid "can't remove file '%s'"
 msgstr "Kann Datei '%s' nicht löschen."
 
-#: ../src/common/file.cpp:574 src/common/file.cpp:531
+#: ../src/common/file.cpp:604 ../src/common/file.cpp:607
 #, c-format
 msgid "can't remove temporary file '%s'"
 msgstr "Kann Temporärdatei '%s' nicht löschen"
 
-#: ../src/common/file.cpp:372 src/common/file.cpp:367
+#: ../src/common/file.cpp:382
 #, c-format
 msgid "can't seek on file descriptor %d"
 msgstr ""
 
-#: ../src/msw/registry.cpp:594 ../src/msw/registry.cpp:682
-#: src/msw/registry.cpp:594 src/msw/registry.cpp:682
-#, c-format
-msgid "can't set value of '%s'"
-msgstr ""
-
-#: src/common/CVS/Base/fileconf.cpp:594 src/common/fileconf.cpp:594
-msgid "can't set value of a group!"
-msgstr ""
-
-#: ../src/common/textfile.cpp:237 src/common/textfile.cpp:229
+#: ../src/common/textfile.cpp:328
 #, c-format
 msgid "can't write file '%s' to disk."
 msgstr "Kann Datei '%s' nicht schreiben."
 
-#: ../src/common/file.cpp:317 src/common/file.cpp:312
+#: ../src/common/file.cpp:327
 #, c-format
 msgid "can't write to file descriptor %d"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:649 src/common/CVS/Base/fileconf.cpp:653
-#: src/common/fileconf.cpp:653
+#: ../src/common/fileconf.cpp:781
 msgid "can't write user configuration file."
 msgstr "Kann Benutzers Konfigurationsdatei nicht schreiben."
 
-#: ../src/common/intl.cpp:301 src/common/intl.cpp:300
+#: ../src/common/intl.cpp:351
 #, c-format
 msgid "catalog file for domain '%s' not found."
 msgstr "Nachrichtenkatalog für Sprachbereich '%s' nicht gefunden."
 
-#: ../src/common/filefn.cpp:1527 src/common/filefn.cpp:1497
+#: ../src/common/utilscmn.cpp:462
+msgid "ctrl"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:877
+msgid "date"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3185
+msgid "eighteenth"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3175
+#, fuzzy
+msgid "eighth"
+msgstr "Dünn"
+
+#: ../src/common/datetime.cpp:3178
+msgid "eleventh"
+msgstr ""
+
+#: ../src/common/filefn.cpp:1729
 msgid "empty file name in wxFindFileInPath"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:1253 src/common/CVS/Base/fileconf.cpp:1256
-#: src/common/fileconf.cpp:1256
+#: ../src/common/fileconf.cpp:1403
 #, c-format
 msgid "entry '%s' appears more than once in group '%s'"
 msgstr "Eintrag '%s' erscheint in Gruppe '%s' mehrfach"
 
-#: ../src/common/fileconf.cpp:335 src/common/CVS/Base/fileconf.cpp:338
-#: src/common/fileconf.cpp:338
+#: ../src/msw/dialup.cpp:858
+msgid "establish"
+msgstr ""
+
+#: ../src/common/ffile.cpp:182
+#, fuzzy, c-format
+msgid "failed to flush the file '%s'"
+msgstr "Logtext in Datei '%s' gesichert."
+
+#: ../src/common/datetime.cpp:3182
+msgid "fifteenth"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3172
+msgid "fifth"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:463
 #, c-format
 msgid "file '%s', line %d: '%s' ignored after group header."
 msgstr "Datei '%s', Zeile %d: '%s' hinter Gruppenkopf ignoriert."
 
-#: ../src/common/fileconf.cpp:361 src/common/CVS/Base/fileconf.cpp:357
-#: src/common/fileconf.cpp:357
+#: ../src/common/fileconf.cpp:493
 #, c-format
 msgid "file '%s', line %d: '=' expected."
 msgstr "Datei '%s', Zeile %d: '=' erwartet."
 
-#: ../src/common/fileconf.cpp:388 src/common/CVS/Base/fileconf.cpp:384
-#: src/common/fileconf.cpp:384
+#: ../src/common/fileconf.cpp:520
 #, c-format
 msgid "file '%s', line %d: key '%s' was first found at line %d."
 msgstr "Datei '%s', Zeile %d: Eintrag '%s' taucht erstmals in Zeile %d auf."
 
-#: ../src/common/fileconf.cpp:377 src/common/CVS/Base/fileconf.cpp:373
-#: src/common/fileconf.cpp:373
+#: ../src/common/fileconf.cpp:509
 #, c-format
 msgid "file '%s', line %d: value for immutable key '%s' ignored."
-msgstr "Datei '%s', Zeile %d: Eintrag für nicht-änderbaren Eintrag '%s' ignoriert."
+msgstr ""
+"Datei '%s', Zeile %d: Eintrag für nicht-änderbaren Eintrag '%s' ignoriert."
 
-#: ../src/common/fileconf.cpp:303 src/common/CVS/Base/fileconf.cpp:307
-#: src/common/fileconf.cpp:307
+#: ../src/common/fileconf.cpp:431
 #, c-format
 msgid "file '%s': unexpected character %c at line %d."
 msgstr "Datei '%s': unerwartetes Zeichen %c in Zeile %d."
 
-#: ../src/common/date.cpp:374 ../src/common/date.cpp:392
-#: ../src/common/date.cpp:406 src/common/date.cpp:373 src/common/date.cpp:391
-#: src/common/date.cpp:405
-msgid "invalid date"
-msgstr "ungültiges Datum"
+#: ../src/common/datetime.cpp:3168
+msgid "first"
+msgstr ""
 
-#: ../src/common/date.cpp:356 src/common/date.cpp:355
-msgid "invalid day"
-msgstr "ungültiger Tag"
+#: ../src/common/datetime.cpp:3181
+msgid "fourteenth"
+msgstr ""
+
+#: ../src/common/datetime.cpp:3171
+msgid "fourth"
+msgstr ""
+
+#: ../src/common/timercmn.cpp:239
+msgid "gmtime() failed"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:858
+#, fuzzy
+msgid "initiate"
+msgstr "ungültiges Datum"
 
-#: ../src/common/file.cpp:457 src/common/file.cpp:452
+#: ../src/common/file.cpp:466
 msgid "invalid eof() return value."
 msgstr ""
 
-#: ../src/common/log.cpp:690 src/common/log.cpp:685
+#: ../src/generic/logg.cpp:490
 msgid "invalid message box return value"
 msgstr ""
 
-#: ../src/common/date.cpp:364 src/common/date.cpp:363
-msgid "invalid month"
-msgstr "ungültiger Monat"
+#: ../src/html/helpfrm.cpp:851
+#, fuzzy
+msgid "large"
+msgstr "Seiten"
 
-#: ../src/common/intl.cpp:432 src/common/intl.cpp:431
+#: ../src/common/intl.cpp:542
 #, c-format
 msgid "locale '%s' can not be set."
 msgstr "Lokale Umgebung '%s' kann nicht gesetzt werden."
 
-#: ../src/common/intl.cpp:296 src/common/intl.cpp:295
-#, c-format
-msgid "looking for catalog '%s' in path '%s'."
-msgstr "Suche Nachrichtenkatalog '%s' in Pfad '%s'."
+#: ../src/html/helpfrm.cpp:851
+msgid "medium"
+msgstr ""
 
-#: ../src/common/time.cpp:360 src/common/time.cpp:360
-msgid "pm"
-msgstr "pm"
+#: ../src/common/datetime.cpp:3289
+#, fuzzy
+msgid "midnight"
+msgstr "Dünn"
 
-#: ../src/common/string.cpp:1719 src/common/string.cpp:1446
-msgid "removing inexistent element in wxArrayString::Remove"
+#: ../src/common/timercmn.cpp:235
+msgid "mktime() failed"
 msgstr ""
 
-#: ../src/common/intl.cpp:521 src/common/intl.cpp:519
-#, c-format
-msgid "string '%s' not found in domain '%s' for locale '%s'."
-msgstr "Text '%s' in Bereich '%s' für Umgebung '%s' nicht gefunden."
+#: ../src/common/datetime.cpp:3186
+msgid "nineteenth"
+msgstr ""
 
-#: ../src/common/intl.cpp:526 src/common/intl.cpp:524
-#, c-format
-msgid "string '%s' not found in locale '%s'."
-msgstr "Text '%s' in Umgebung '%s' nicht gefunden."
+#: ../src/common/datetime.cpp:3176
+#, fuzzy
+msgid "ninth"
+msgstr "Drucken"
 
-#: ../src/common/fileconf.cpp:1373 src/common/CVS/Base/fileconf.cpp:1376
-#: src/common/fileconf.cpp:1376
-#, c-format
-msgid "unexpected \" at position %d in '%s'."
+#: ../src/html/winpars.cpp:133
+msgid "no DC assigned to wxHtmlWinParser!!"
 msgstr ""
 
-#: src/common/log.cpp:362
-msgid "unknown log level in wxLog::DoLog"
+#: ../src/msw/dde.cpp:962
+msgid "no DDE error."
 msgstr ""
 
-#: src/common/log.cpp:559
-msgid "unknown log level in wxLogGui::DoLog"
+#: ../src/html/helpdata.cpp:529
+#, fuzzy
+msgid "noname"
+msgstr "Unbenannt"
+
+#: ../src/common/datetime.cpp:3288
+msgid "noon"
 msgstr ""
 
-#: ../src/common/file.cpp:367 src/common/file.cpp:362
-msgid "unknown seek origin"
+#: ../src/common/cmdline.cpp:876
+msgid "num"
 msgstr ""
 
-#: ../src/common/docview.cpp:370 src/common/docview.cpp:337
-msgid "unnamed"
-msgstr "Unbenannt"
+#: ../src/msw/dde.cpp:1005
+msgid "reentrancy problem."
+msgstr ""
 
-#: ../src/common/docview.cpp:1055 src/common/docview.cpp:1009
-#, c-format
-msgid "unnamed%d"
-msgstr "Unbenannt"
+#: ../src/common/datetime.cpp:3169
+msgid "second"
+msgstr ""
 
-#: ../src/common/intl.cpp:306 src/common/intl.cpp:305
-#, c-format
-msgid "using catalog '%s' from '%s'."
-msgstr "Verwende Nachrichtenkatalog '%s' von '%s'."
+#: ../src/common/datetime.cpp:3184
+msgid "seventeenth"
+msgstr ""
 
-#: ../src/common/layout.cpp:1366 src/common/layout.cpp:1326
-msgid "wxExpandSizer has no parent!"
+#: ../src/common/datetime.cpp:3174
+msgid "seventh"
 msgstr ""
 
-#: ../src/common/prntbase.cpp:635 src/common/prntbase.cpp:632
-msgid ""
-"wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to "
-"let me know about the canvas!"
+#: ../src/common/utilscmn.cpp:466
+msgid "shift"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1134 src/common/filefn.cpp:1123
-msgid "wxWindows: error finding temporary file name.\n"
+#: ../src/common/datetime.cpp:3183
+msgid "sixteenth"
 msgstr ""
 
-#: ../src/gtk/filedlg.cpp:79
-msgid "Please choose an existing file."
-msgstr "Bitte wählen Sie eine bestehende Datei."
+#: ../src/common/datetime.cpp:3173
+msgid "sixth"
+msgstr ""
 
-#: ../src/generic/printps.cpp:173
-msgid "Printing..."
-msgstr "Drucke..."
+#: ../src/html/helpfrm.cpp:851
+msgid "small"
+msgstr ""
+
+#: ../src/common/cmdline.cpp:875
+msgid "str"
+msgstr ""
 
-#: ../src/generic/printps.cpp:207
+#: ../src/common/intl.cpp:635
 #, c-format
-msgid "Printing page %d..."
-msgstr "Drucke Seite %d..."
+msgid "string '%s' not found in domain '%s' for locale '%s'."
+msgstr "Text '%s' in Bereich '%s' für Umgebung '%s' nicht gefunden."
 
-#: ../src/generic/dcpsg.cpp:2189
-msgid "A4 sheet, 210 x 297 mm"
+#: ../src/common/intl.cpp:640
+#, c-format
+msgid "string '%s' not found in locale '%s'."
+msgstr "Text '%s' in Umgebung '%s' nicht gefunden."
+
+#: ../src/common/datetime.cpp:3177
+msgid "tenth"
 msgstr ""
 
-#: ../src/common/dynlib.cpp:187
-#, c-format
-msgid "Couldn't find symbol '%s' in a dynamic library"
+#: ../src/html/htmlfilt.cpp:133
+msgid "text/html"
 msgstr ""
 
-#: ../src/common/dynlib.cpp:274
-#, c-format
-msgid "Failed to load shared library '%s'"
+#: ../src/msw/dde.cpp:969
+msgid "the response to the transaction caused the DDE_FBUSY bit to be set."
 msgstr ""
 
-#: ../src/common/file.cpp:452
-#, c-format
-msgid ""
-"can't determine if the end of file is reached on                 descriptor "
-"%d"
+#: ../src/common/datetime.cpp:3170
+msgid "third"
 msgstr ""
 
-#: ../src/common/fileconf.cpp:611
-#, c-format
-msgid "Config entry name cannot start with '%c'."
+#: ../src/common/datetime.cpp:3180
+msgid "thirteenth"
 msgstr ""
 
-#: ../src/common/filefn.cpp:1003
-#, c-format
-msgid "Directory '%s' couldn't be created"
-msgstr "Verzeichnis '%s' konnte nicht angelegt werden."
+#: ../src/common/datetime.cpp:2981
+msgid "today"
+msgstr ""
 
-#: ../src/common/string.cpp:1687
-msgid "bad index in wxArrayString::Insert"
+#: ../src/common/datetime.cpp:2983
+msgid "tomorrow"
 msgstr ""
 
-#: ../src/common/valtext.cpp:140
-#, c-format
-msgid "'%s' is invalid"
+#: ../src/common/datetime.cpp:3179
+msgid "twelfth"
 msgstr ""
 
-#: ../src/common/valtext.cpp:160
+#: ../src/common/datetime.cpp:3187
+msgid "twentieth"
+msgstr ""
+
+#: ../src/common/fileconf.cpp:1523
 #, c-format
-msgid "'%s' should only contain ASCII characters."
+msgid "unexpected \" at position %d in '%s'."
 msgstr ""
 
-#: ../src/common/valtext.cpp:166
+#: ../src/generic/progdlgg.cpp:243
+msgid "unknown"
+msgstr ""
+
+#: ../src/msw/dialup.cpp:462
 #, c-format
-msgid "'%s' should only contain alphabetic characters."
+msgid "unknown error (error code %08x)."
 msgstr ""
 
-#: ../src/common/valtext.cpp:172
+#: ../src/common/file.cpp:365
+msgid "unknown seek origin"
+msgstr ""
+
+#: ../src/common/fontmap.cpp:329
 #, c-format
-msgid "'%s' should only contain alphabetic or numeric characters."
+msgid "unknown-%d"
 msgstr ""
 
-#: ../src/common/valtext.cpp:178
+#: ../src/common/docview.cpp:397
+msgid "unnamed"
+msgstr "Unbenannt"
+
+#: ../src/common/docview.cpp:1174
 #, c-format
-msgid "'%s' should be numeric."
+msgid "unnamed%d"
+msgstr "Unbenannt"
+
+#: ../src/common/intl.cpp:356
+#, c-format
+msgid "using catalog '%s' from '%s'."
+msgstr "Verwende Nachrichtenkatalog '%s' von '%s'."
+
+#: ../src/html/helpfrm.cpp:851
+msgid "very large"
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:174
-msgid "Couldn't load a JPEG image - probably file is corrupted."
+#: ../src/html/helpfrm.cpp:851
+msgid "very small"
 msgstr ""
 
-#: ../src/common/imagjpeg.cpp:287
-msgid "Couldn't save a JPEG image - probably file is corrupted."
+#: ../src/common/imaggif.cpp:74
+msgid "wxGIFHandler: data stream seems to be truncated."
 msgstr ""
 
-#: ../src/motif/app.cpp:559
-#, c-format
-msgid "wxWindows could not open display for '%s': exiting."
+#: ../src/common/imaggif.cpp:58
+msgid "wxGIFHandler: error in GIF image format."
 msgstr ""
 
-#: ../src/msw/app.cpp:198
-msgid "Could not initialise Rich Edit DLL"
+#: ../src/common/imaggif.cpp:61
+msgid "wxGIFHandler: not enough memory."
 msgstr ""
 
-#: ../src/msw/app.cpp:698
-msgid "Unrecoverable program error detected:  the application will terminate."
+#: ../src/common/imaggif.cpp:64
+msgid "wxGIFHandler: unknown error!!!"
 msgstr ""
 
-#: ../src/msw/app.cpp:700
-msgid "Fatal Error"
+#: ../src/common/timercmn.cpp:266
+msgid "wxGetTimeOfDay failed."
 msgstr ""
 
-#: ../src/msw/app.cpp:1165
-msgid "Fatal error: exiting"
+#: ../src/common/imagpcx.cpp:448 ../src/common/imagpcx.cpp:471
+msgid "wxPCXHandler: couldn't allocate memory"
 msgstr ""
 
-#: ../src/msw/dialog.cpp:145
-msgid "Failed to create dialog."
+#: ../src/common/imagpcx.cpp:447
+msgid "wxPCXHandler: image format unsupported"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:296
-msgid "Cannot start thread: error writing TLS"
+#: ../src/common/imagpcx.cpp:470
+msgid "wxPCXHandler: invalid image"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:477
-msgid "Cannot retrieve thread scheduling policy."
+#: ../src/common/imagpcx.cpp:450 ../src/common/imagpcx.cpp:472
+msgid "wxPCXHandler: unknown error !!!"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:485
-#, c-format
-msgid "Cannot get priority range for scheduling policy %d."
+#: ../src/common/imagpcx.cpp:449
+msgid "wxPCXHandler: version number too low"
 msgstr ""
 
-#: ../src/unix/threadpsx.cpp:768
-msgid "Thread module initialization failed: failed to create thread key"
+#: ../src/common/prntbase.cpp:660
+msgid ""
+"wxPrintPreviewBase::RenderPage: must use wxPrintPreviewBase::SetCanvas to "
+"let me know about the canvas!"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:211
-msgid "Waiting for subprocess termination failed"
+#: ../src/common/socket.cpp:296 ../src/common/socket.cpp:350
+msgid "wxSocket: invalid signature in ReadMsg."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:449
-msgid "Cannot get the hostname"
+#: ../src/motif/app.cpp:584
+#, c-format
+msgid "wxWindows could not open display for '%s': exiting."
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:485
-msgid "Cannot get the official hostname"
+#: ../src/common/filefn.cpp:1222
+msgid "wxWindows: error finding temporary file name.\n"
 msgstr ""
 
-#: ../src/unix/utilsunx.cpp:547 ../src/unix/utilsunx.cpp:555
-msgid "Error "
+#: ../src/common/datetime.cpp:2982
+msgid "yesterday"
 msgstr ""
+
+#~ msgid " B.C."
+#~ msgstr " B.C."
+
+#~ msgid "%s is invalid."
+#~ msgstr "%s ist ungültig"
+
+#~ msgid "%s should be numeric."
+#~ msgstr "%s sollte numerisch sein"
+
+#~ msgid "%s should only contain ASCII characters."
+#~ msgstr "%s sollte nur ASCII Zeichen enthalten"
+
+#~ msgid "%s should only contain alphabetic characters."
+#~ msgstr "%s sollte nur Buchstaben enthalten"
+
+#~ msgid "%s should only contain alphabetic or numeric characters."
+#~ msgstr "%s sollte nur Buchstaben oder Ziffern enthalten"
+
+#~ msgid "Application Error"
+#~ msgstr "Programmfehler"
+
+#~ msgid "Can not create tooltip control"
+#~ msgstr "Kann Tooltip nicht erzeugen."
+
+#~ msgid "Can not get data in format '%s' from clipboard."
+#~ msgstr "Kann keine Daten im Format '%s' von der Zwischenablage bekommen."
+
+#~ msgid "Can not get priority range for scheduling policy %d."
+#~ msgstr "Kann Prioritätsbereich für Schedulingregeln %d nicht bekommen."
+
+#~ msgid "Can not put data in format '%s' on clipboard."
+#~ msgstr "Kann keine Daten im Fromat '%s' in die Zwischenablage kopieren."
+
+#~ msgid "Can not retrieve thread scheduling policy."
+#~ msgstr "Kann Schedulingregeln nicht bekommen."
+
+#~ msgid "Character '%c' is invalid in a config entry name."
+#~ msgstr ""
+#~ "Zeichen '%c' ist in einem Konfigurationseintragsnamen nicht erlaubt."
+
+#~ msgid "Couldn't change the state of event object."
+#~ msgstr "Kann Zustand des Eventobjektes nicht ändern."
+
+#~ msgid "Enter the name of the directory to create"
+#~ msgstr "Geben Sie einen Namen für das neue Verzeichnis ein"
+
+#~ msgid "Entry name can't start with '%c'."
+#~ msgstr "Eintragsname kann nicht mit '%c' beginnen."
+
+#~ msgid ""
+#~ "Mime.types file %s, line %d: extra characters after the field value ignored."
+#~ msgstr ""
+#~ "Mime.types-Datei %s, Zeile %d: extra Zeichen nach dem Wert ignoriert."
+
+#~ msgid "invalid day"
+#~ msgstr "ungültiger Tag"
+
+#~ msgid "invalid month"
+#~ msgstr "ungültiger Monat"
+
+#~ msgid "looking for catalog '%s' in path '%s'."
+#~ msgstr "Suche Nachrichtenkatalog '%s' in Pfad '%s'."
+
+#~ msgid "pm"
+#~ msgstr "pm"
diff --git a/samples/calendar/calendar.cpp b/samples/calendar/calendar.cpp
index 9481cbf..64fa307 100644
--- a/samples/calendar/calendar.cpp
+++ b/samples/calendar/calendar.cpp
@@ -315,7 +315,7 @@ MyPanel::MyPanel(wxFrame *frame)
                                     wxCAL_SHOW_HOLIDAYS |
                                     wxRAISED_BORDER);
 
-    m_calendar->SetAutoLayout(TRUE);
+    //m_calendar->SetAutoLayout(TRUE);
     //------------------
     wxLayoutConstraints *c = new wxLayoutConstraints;
     //------------------
diff --git a/samples/internat/internat.cpp b/samples/internat/internat.cpp
index 437d7d7..5bbfb76 100644
--- a/samples/internat/internat.cpp
+++ b/samples/internat/internat.cpp
@@ -114,7 +114,9 @@ bool MyApp::OnInit()
   /* this catalog is installed in standard location on Linux systems,
      it might not be installed on yours - just ignore the errrors
      or comment out this line then */
-//  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
+#ifdef __LINUX__
+  m_locale.AddCatalog("fileutils");  // 3) and another just for testing
+#endif
   
   // Create the main frame window
   MyFrame *frame = new MyFrame((wxFrame *) NULL, _("International wxWindows App"),
diff --git a/samples/notebook/test.cpp b/samples/notebook/test.cpp
index fead54e..02e8106 100644
--- a/samples/notebook/test.cpp
+++ b/samples/notebook/test.cpp
@@ -43,7 +43,7 @@ bool MyApp::OnInit()
   // Quit immediately the dialog has been dismissed
   return FALSE;
 #else
-  frame = new MyFrame((wxFrame*) NULL, -1, "Notebook", wxPoint(-1, -1), wxSize(365, 390) );
+  frame = new MyFrame((wxFrame*) NULL, -1, "Notebook", wxPoint(-1, -1), wxSize(465, 390) );
 
   // Problem with generic wxNotebook implementation whereby it doesn't size properly unless
   // you set the size again
@@ -273,8 +273,6 @@ void MyFrame::Init()
   c->bottom.SameAs(this, wxBottom);
   m_panel->SetConstraints(c);
 
-  // Note, omit the wxTAB_STYLE_COLOUR_INTERIOR, so we will guarantee a match
-  // with the panel background, and save a bit of time.
   m_notebook = new wxNotebook(m_panel, ID_NOTEBOOK);
 
   c = new wxLayoutConstraints;
diff --git a/src/files.lst b/src/files.lst
index 486ab2a..cf81fcf 100644
--- a/src/files.lst
+++ b/src/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 12:30, 2000/03/04
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASE.T!
 ALL_SOURCES = \
 		common/init.cpp \
diff --git a/src/gtk/files.lst b/src/gtk/files.lst
index 1580116..86cfa86 100644
--- a/src/gtk/files.lst
+++ b/src/gtk/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:57, 2000/03/03
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
diff --git a/src/gtk1/files.lst b/src/gtk1/files.lst
index 1580116..86cfa86 100644
--- a/src/gtk1/files.lst
+++ b/src/gtk1/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:57, 2000/03/03
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
diff --git a/src/makeb32.env b/src/makeb32.env
index 3c90826..a612e94 100644
--- a/src/makeb32.env
+++ b/src/makeb32.env
@@ -2,14 +2,18 @@
 
 WXDIR = $(WXWIN)
 CFG = $(WXDIR)\src\msw\wxwin32.cfg
+LNKCFG=$(WXDIR)\src\msw\bclnk32.cfg
 WXLIBDIR = $(WXDIR)\lib
 WXLIBDIR2 = $(WXDIR)\contrib\lib
 WXINC = $(WXDIR)\include;$(WXDIR)\contrib\include;$(WXDIR)\src\iodbc
 WIN95FLAG = -D__WIN95__ -D__WINDOWS__
 
-# This should be changed to tlink32 if ilink32 is not available
-# Available on C++ 5.02 and above
+# This should be changed to tlink32 if ilink32 is not available.
+# Ilink32 is available on BC++ 5.02 and above, and all
+# versions of C++ Builder.
+!ifndef LINK
 LINK=ilink32
+!endif
 
 !ifndef FINAL
 FINAL=0
diff --git a/src/makeprog.b32 b/src/makeprog.b32
index 414ac24..5ecd5c0 100644
--- a/src/makeprog.b32
+++ b/src/makeprog.b32
@@ -16,11 +16,11 @@ WXDIR = $(WXWIN)
 LIBS=$(WXLIB) $(EXTRALIBS) cw32mt import32 ole2w32 winpng zlib jpeg xpm tiff odbc32
 
 !if "$(FINAL)" == "0"
-LINKFLAGS=/v /c /Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/v /c /Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS= -v
 !else
-LINKFLAGS=/Tpe /L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk $(EXTRALINKFLAGS)
+LINKFLAGS=/Tpe +$(LNKCFG) $(EXTRALINKFLAGS)
 OPT = -Od
 DEBUG_FLAGS =
 !endif
diff --git a/src/motif/files.lst b/src/motif/files.lst
index 3a7f65d..27980f1 100644
--- a/src/motif/files.lst
+++ b/src/motif/files.lst
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:58, 2000/03/03
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
 ALL_SOURCES = \
 		generic/busyinfo.cpp \
diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index 98093ff..09822b1 100644
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 05:31, 2000/03/08
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -262,6 +262,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\gdiobj.obj \
 		$(MSWDIR)\glcanvas.obj \
 		$(MSWDIR)\gsocket.obj \
+		$(MSWDIR)\gsockmsw.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\imaglist.obj \
@@ -340,7 +341,7 @@ OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 default:	wx
 
-wx:    $(CFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+wx:    $(CFG) $(LNKCFG) $(DUMMY).obj $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
 
 all:	all_libs all_execs
 
@@ -477,6 +478,8 @@ $(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
@@ -978,7 +981,7 @@ $(CFG): makefile.b32
 -I$(WXINC);$(BCCDIR)\include;$(WXDIR)/src/generic;$(WXDIR)/src/png;$(WXDIR)/src/jpeg;$(WXDIR)/src/zlib;$(WXDIR)/src/xpm;$(WXDIR)/src/tiff
 -I$(WXDIR)\include\wx\msw\gnuwin32
 
--L$(BCCDIR)\lib
+-L$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
 -D__WXWIN__
 -D__WXMSW__
 -D__WINDOWS__
@@ -988,6 +991,11 @@ $(DEBUG_FLAGS)
 $(WIN95FLAG)
 ! $(CFG)
 
+$(LNKCFG): makefile.b32
+	copy &&!
+-L$(WXLIBDIR);$(WXLIBDIR2);$(BCCDIR)\lib;$(BCCDIR)\lib\psdk
+! $(LNKCFG)
+
 #-I$(WXDIR)\src\common\wxxpm\libxpm.34b\lib
 # -Oxt
 
diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 081168b..a9c4229 100644
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 05:31, 2000/03/08
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -231,6 +231,7 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\gdiobj.obj \
 		$(MSWDIR)\glcanvas.obj \
 		$(MSWDIR)\gsocket.obj \
+		$(MSWDIR)\gsockmsw.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\iniconf.obj \
@@ -386,6 +387,8 @@ $(MSWDIR)\glcanvas.obj: $(MSWDIR)\glcanvas.$(SRCSUFF)
 
 $(MSWDIR)\gsocket.obj: $(MSWDIR)\gsocket.c
 
+$(MSWDIR)\gsockmsw.obj: $(MSWDIR)\gsockmsw.c
+
 $(MSWDIR)\helpwin.obj: $(MSWDIR)\helpwin.$(SRCSUFF)
 
 $(MSWDIR)\icon.obj: $(MSWDIR)\icon.$(SRCSUFF)
diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index b727000..afd6968 100644
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 10:10, 2000/03/07
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -220,6 +220,7 @@ MSWOBJS1 = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\gdiobj.obj \
 		$(MSWDIR)\glcanvas.obj \
 		$(MSWDIR)\gsocket.obj \
+		$(MSWDIR)\gsockmsw.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\iniconf.obj \
@@ -542,6 +543,11 @@ $(MSWDIR)/gsocket.obj:     $*.c
 $(CPPFLAGS2) /Fo$@ /c /Tc $*.c
 <<
 
+$(MSWDIR)/gsockmsw.obj:     $*.c
+        cl @<<
+$(CPPFLAGS2) /Fo$@ /c /Tc $*.c
+<<
+
 $(MSWDIR)/helpwin.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index 7f90f23..27a9d79 100644
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -550,9 +550,9 @@ $(OBJECTS):	$(WXINC)/wx/defs.h $(WXINC)/wx/object.h $(WXINC)/wx/setup.h
 $(COMMDIR)/y_tab.$(OBJSUFF):    $(COMMDIR)/y_tab.c $(COMMDIR)/lex_yy.c
 	$(CCLEX) -c $(CPPFLAGS) -DUSE_DEFINE -DYY_USE_PROTOS -o $@ $(COMMDIR)/y_tab.c
 
-$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c   	
+$(COMMDIR)/y_tab.c:     $(COMMDIR)/dosyacc.c
 	$(COPY) ../common/dosyacc.c ../common/y_tab.c
-	
+
 $(COMMDIR)/lex_yy.c:    $(COMMDIR)/doslex.c
 	$(COPY) ../common/doslex.c ../common/lex_yy.c
 
diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 528ac55..cf69648 100644
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 18:32, 2000/02/17
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -29,7 +29,9 @@ MSWDIR=$(WXDIR)\src\msw
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\calctrl.obj \
 		$(GENDIR)\choicdgg.obj \
+		$(GENDIR)\dragimgg.obj \
 		$(GENDIR)\grid.obj \
+		$(GENDIR)\gridsel.obj \
 		$(GENDIR)\laywin.obj \
 		$(GENDIR)\logg.obj \
 		$(GENDIR)\numdlgg.obj \
@@ -46,6 +48,7 @@ GENERICOBJS= $(GENDIR)\busyinfo.obj \
 		$(GENDIR)\tbarsmpl.obj \
 		$(GENDIR)\textdlgg.obj \
 		$(GENDIR)\tipdlg.obj \
+		$(GENDIR)\treelay.obj \
 		$(GENDIR)\wizard.obj
 
 COMMONOBJS = \
@@ -196,7 +199,9 @@ MSWOBJS = $(MSWDIR)\accel.obj \
 		$(MSWDIR)\gaugemsw.obj \
 		$(MSWDIR)\gdiimage.obj \
 		$(MSWDIR)\gdiobj.obj \
+		$(MSWDIR)\glcanvas.obj \
 		$(MSWDIR)\gsocket.obj \
+		$(MSWDIR)\gsockmsw.obj \
 		$(MSWDIR)\helpwin.obj \
 		$(MSWDIR)\icon.obj \
 		$(MSWDIR)\iniconf.obj \
diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index 296de35..34ec215 100644
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 16:52, 2000/02/29
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -49,309 +49,310 @@ DOCDIR = $(WXDIR)\docs
 HTMLDIR = $(WXDIR)\src\html
 
 {..\generic}.cpp{..\generic\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 {..\common}.cpp{..\common\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 {..\common}.c{..\common\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
 {..\msw}.cpp{..\msw\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 {..\msw}.c{..\msw\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Fo$@ /c /Tc $<
 <<
 
 {..\msw\ole}.cpp{..\msw\ole\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 {..\html}.cpp{..\html\$D}.obj:
-        cl @<<
+	cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $<
 <<
 
 GENERICOBJS= ..\generic\$D\busyinfo.obj \
-                ..\generic\$D\calctrl.obj \
-                ..\generic\$D\choicdgg.obj \
-                ..\generic\$D\dragimgg.obj \
-                ..\generic\$D\grid.obj \
-                ..\generic\$D\gridsel.obj \
-                ..\generic\$D\laywin.obj \
-                ..\generic\$D\logg.obj \
-                ..\generic\$D\numdlgg.obj \
-                ..\generic\$D\panelg.obj \
-                ..\generic\$D\plot.obj \
-                ..\generic\$D\progdlgg.obj \
-                ..\generic\$D\prop.obj \
-                ..\generic\$D\propform.obj \
-                ..\generic\$D\proplist.obj \
-                ..\generic\$D\sashwin.obj \
-                ..\generic\$D\scrolwin.obj \
-                ..\generic\$D\splitter.obj \
-                ..\generic\$D\statusbr.obj \
-                ..\generic\$D\tbarsmpl.obj \
-                ..\generic\$D\textdlgg.obj \
-                ..\generic\$D\tipdlg.obj \
-                ..\generic\$D\treelay.obj \
-                ..\generic\$D\wizard.obj
+		..\generic\$D\calctrl.obj \
+		..\generic\$D\choicdgg.obj \
+		..\generic\$D\dragimgg.obj \
+		..\generic\$D\grid.obj \
+		..\generic\$D\gridsel.obj \
+		..\generic\$D\laywin.obj \
+		..\generic\$D\logg.obj \
+		..\generic\$D\numdlgg.obj \
+		..\generic\$D\panelg.obj \
+		..\generic\$D\plot.obj \
+		..\generic\$D\progdlgg.obj \
+		..\generic\$D\prop.obj \
+		..\generic\$D\propform.obj \
+		..\generic\$D\proplist.obj \
+		..\generic\$D\sashwin.obj \
+		..\generic\$D\scrolwin.obj \
+		..\generic\$D\splitter.obj \
+		..\generic\$D\statusbr.obj \
+		..\generic\$D\tbarsmpl.obj \
+		..\generic\$D\textdlgg.obj \
+		..\generic\$D\tipdlg.obj \
+		..\generic\$D\treelay.obj \
+		..\generic\$D\wizard.obj
 
 # These are generic things that don't need to be compiled on MSW,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= ..\generic\$D\caret.obj \
-                ..\generic\$D\colrdlgg.obj \
-                ..\generic\$D\dcpsg.obj \
-                ..\generic\$D\dirdlgg.obj \
-                ..\generic\$D\filedlgg.obj \
-                ..\generic\$D\fontdlgg.obj \
-                ..\generic\$D\helpext.obj \
-                ..\generic\$D\helphtml.obj \
-                ..\generic\$D\helpwxht.obj \
-                ..\generic\$D\helpxlp.obj \
-                ..\generic\$D\imaglist.obj \
-                ..\generic\$D\listctrl.obj \
-                ..\generic\$D\msgdlgg.obj \
-                ..\generic\$D\notebook.obj \
-                ..\generic\$D\printps.obj \
-                ..\generic\$D\prntdlgg.obj \
-                ..\generic\$D\statline.obj \
-                ..\generic\$D\tabg.obj \
-                ..\generic\$D\treectrl.obj
+		..\generic\$D\colrdlgg.obj \
+		..\generic\$D\dcpsg.obj \
+		..\generic\$D\dirdlgg.obj \
+		..\generic\$D\filedlgg.obj \
+		..\generic\$D\fontdlgg.obj \
+		..\generic\$D\helpext.obj \
+		..\generic\$D\helphtml.obj \
+		..\generic\$D\helpwxht.obj \
+		..\generic\$D\helpxlp.obj \
+		..\generic\$D\imaglist.obj \
+		..\generic\$D\listctrl.obj \
+		..\generic\$D\msgdlgg.obj \
+		..\generic\$D\notebook.obj \
+		..\generic\$D\printps.obj \
+		..\generic\$D\prntdlgg.obj \
+		..\generic\$D\statline.obj \
+		..\generic\$D\tabg.obj \
+		..\generic\$D\treectrl.obj
 
 COMMONOBJS = \
-                ..\common\$D\y_tab.obj \
-                ..\common\$D\appcmn.obj \
-                ..\common\$D\choiccmn.obj \
-                ..\common\$D\clipcmn.obj \
-                ..\common\$D\cmdline.obj \
-                ..\common\$D\cmndata.obj \
-                ..\common\$D\config.obj \
-                ..\common\$D\ctrlcmn.obj \
-                ..\common\$D\ctrlsub.obj \
-                ..\common\$D\datetime.obj \
-                ..\common\$D\datstrm.obj \
-                ..\common\$D\db.obj \
-                ..\common\$D\dbtable.obj \
-                ..\common\$D\dcbase.obj \
-                ..\common\$D\dlgcmn.obj \
-                ..\common\$D\dndcmn.obj \
-                ..\common\$D\dobjcmn.obj \
-                ..\common\$D\docmdi.obj \
-                ..\common\$D\docview.obj \
-                ..\common\$D\dynarray.obj \
-                ..\common\$D\dynlib.obj \
-                ..\common\$D\encconv.obj \
-                ..\common\$D\event.obj \
-                ..\common\$D\extended.obj \
-                ..\common\$D\ffile.obj \
-                ..\common\$D\file.obj \
-                ..\common\$D\fileconf.obj \
-                ..\common\$D\filefn.obj \
-                ..\common\$D\filesys.obj \
-                ..\common\$D\fontcmn.obj \
-                ..\common\$D\fontmap.obj \
-                ..\common\$D\framecmn.obj \
-                ..\common\$D\fs_inet.obj \
-                ..\common\$D\fs_mem.obj \
-                ..\common\$D\fs_zip.obj \
-                ..\common\$D\ftp.obj \
-                ..\common\$D\gdicmn.obj \
-                ..\common\$D\geometry.obj \
-                ..\common\$D\gifdecod.obj \
-                ..\common\$D\hash.obj \
-                ..\common\$D\helpbase.obj \
-                ..\common\$D\http.obj \
-                ..\common\$D\imagall.obj \
-                ..\common\$D\imagbmp.obj \
-                ..\common\$D\image.obj \
-                ..\common\$D\imaggif.obj \
-                ..\common\$D\imagjpeg.obj \
-                ..\common\$D\imagpcx.obj \
-                ..\common\$D\imagpng.obj \
-                ..\common\$D\imagpnm.obj \
-                ..\common\$D\imagtiff.obj \
-                ..\common\$D\intl.obj \
-                ..\common\$D\ipcbase.obj \
-                ..\common\$D\layout.obj \
-                ..\common\$D\lboxcmn.obj \
-                ..\common\$D\list.obj \
-                ..\common\$D\log.obj \
-                ..\common\$D\longlong.obj \
-                ..\common\$D\memory.obj \
-                ..\common\$D\menucmn.obj \
-                ..\common\$D\mimecmn.obj \
-                ..\common\$D\module.obj \
-                ..\common\$D\mstream.obj \
-                ..\common\$D\object.obj \
-                ..\common\$D\objstrm.obj \
-                ..\common\$D\odbc.obj \
-                ..\common\$D\paper.obj \
-                ..\common\$D\prntbase.obj \
-                ..\common\$D\process.obj \
-                ..\common\$D\protocol.obj \
-                ..\common\$D\resource.obj \
-                ..\common\$D\sckaddr.obj \
-                ..\common\$D\sckfile.obj \
-                ..\common\$D\sckipc.obj \
-                ..\common\$D\sckstrm.obj \
-                ..\common\$D\serbase.obj \
-                ..\common\$D\sizer.obj \
-                ..\common\$D\socket.obj \
-                ..\common\$D\strconv.obj \
-                ..\common\$D\stream.obj \
-                ..\common\$D\string.obj \
-                ..\common\$D\tbarbase.obj \
-                ..\common\$D\textcmn.obj \
-                ..\common\$D\textfile.obj \
-                ..\common\$D\timercmn.obj \
-                ..\common\$D\tokenzr.obj \
-                ..\common\$D\txtstrm.obj \
-                ..\common\$D\unzip.obj \
-                ..\common\$D\url.obj \
-                ..\common\$D\utilscmn.obj \
-                ..\common\$D\valgen.obj \
-                ..\common\$D\validate.obj \
-                ..\common\$D\valtext.obj \
-                ..\common\$D\variant.obj \
-                ..\common\$D\wfstream.obj \
-                ..\common\$D\wincmn.obj \
-                ..\common\$D\wxchar.obj \
-                ..\common\$D\wxexpr.obj \
-                ..\common\$D\zipstrm.obj \
-                ..\common\$D\zstream.obj
+		..\common\$D\y_tab.obj \
+		..\common\$D\appcmn.obj \
+		..\common\$D\choiccmn.obj \
+		..\common\$D\clipcmn.obj \
+		..\common\$D\cmdline.obj \
+		..\common\$D\cmndata.obj \
+		..\common\$D\config.obj \
+		..\common\$D\ctrlcmn.obj \
+		..\common\$D\ctrlsub.obj \
+		..\common\$D\datetime.obj \
+		..\common\$D\datstrm.obj \
+		..\common\$D\db.obj \
+		..\common\$D\dbtable.obj \
+		..\common\$D\dcbase.obj \
+		..\common\$D\dlgcmn.obj \
+		..\common\$D\dndcmn.obj \
+		..\common\$D\dobjcmn.obj \
+		..\common\$D\docmdi.obj \
+		..\common\$D\docview.obj \
+		..\common\$D\dynarray.obj \
+		..\common\$D\dynlib.obj \
+		..\common\$D\encconv.obj \
+		..\common\$D\event.obj \
+		..\common\$D\extended.obj \
+		..\common\$D\ffile.obj \
+		..\common\$D\file.obj \
+		..\common\$D\fileconf.obj \
+		..\common\$D\filefn.obj \
+		..\common\$D\filesys.obj \
+		..\common\$D\fontcmn.obj \
+		..\common\$D\fontmap.obj \
+		..\common\$D\framecmn.obj \
+		..\common\$D\fs_inet.obj \
+		..\common\$D\fs_mem.obj \
+		..\common\$D\fs_zip.obj \
+		..\common\$D\ftp.obj \
+		..\common\$D\gdicmn.obj \
+		..\common\$D\geometry.obj \
+		..\common\$D\gifdecod.obj \
+		..\common\$D\hash.obj \
+		..\common\$D\helpbase.obj \
+		..\common\$D\http.obj \
+		..\common\$D\imagall.obj \
+		..\common\$D\imagbmp.obj \
+		..\common\$D\image.obj \
+		..\common\$D\imaggif.obj \
+		..\common\$D\imagjpeg.obj \
+		..\common\$D\imagpcx.obj \
+		..\common\$D\imagpng.obj \
+		..\common\$D\imagpnm.obj \
+		..\common\$D\imagtiff.obj \
+		..\common\$D\intl.obj \
+		..\common\$D\ipcbase.obj \
+		..\common\$D\layout.obj \
+		..\common\$D\lboxcmn.obj \
+		..\common\$D\list.obj \
+		..\common\$D\log.obj \
+		..\common\$D\longlong.obj \
+		..\common\$D\memory.obj \
+		..\common\$D\menucmn.obj \
+		..\common\$D\mimecmn.obj \
+		..\common\$D\module.obj \
+		..\common\$D\mstream.obj \
+		..\common\$D\object.obj \
+		..\common\$D\objstrm.obj \
+		..\common\$D\odbc.obj \
+		..\common\$D\paper.obj \
+		..\common\$D\prntbase.obj \
+		..\common\$D\process.obj \
+		..\common\$D\protocol.obj \
+		..\common\$D\resource.obj \
+		..\common\$D\sckaddr.obj \
+		..\common\$D\sckfile.obj \
+		..\common\$D\sckipc.obj \
+		..\common\$D\sckstrm.obj \
+		..\common\$D\serbase.obj \
+		..\common\$D\sizer.obj \
+		..\common\$D\socket.obj \
+		..\common\$D\strconv.obj \
+		..\common\$D\stream.obj \
+		..\common\$D\string.obj \
+		..\common\$D\tbarbase.obj \
+		..\common\$D\textcmn.obj \
+		..\common\$D\textfile.obj \
+		..\common\$D\timercmn.obj \
+		..\common\$D\tokenzr.obj \
+		..\common\$D\txtstrm.obj \
+		..\common\$D\unzip.obj \
+		..\common\$D\url.obj \
+		..\common\$D\utilscmn.obj \
+		..\common\$D\valgen.obj \
+		..\common\$D\validate.obj \
+		..\common\$D\valtext.obj \
+		..\common\$D\variant.obj \
+		..\common\$D\wfstream.obj \
+		..\common\$D\wincmn.obj \
+		..\common\$D\wxchar.obj \
+		..\common\$D\wxexpr.obj \
+		..\common\$D\zipstrm.obj \
+		..\common\$D\zstream.obj
 
 MSWOBJS = ..\msw\$D\accel.obj \
-                ..\msw\$D\app.obj \
-                ..\msw\ole\$D\automtn.obj \
-                ..\msw\$D\bitmap.obj \
-                ..\msw\$D\bmpbuttn.obj \
-                ..\msw\$D\brush.obj \
-                ..\msw\$D\button.obj \
-                ..\msw\$D\caret.obj \
-                ..\msw\$D\checkbox.obj \
-                ..\msw\$D\checklst.obj \
-                ..\msw\$D\choice.obj \
-                ..\msw\$D\clipbrd.obj \
-                ..\msw\$D\colordlg.obj \
-                ..\msw\$D\colour.obj \
-                ..\msw\$D\combobox.obj \
-                ..\msw\$D\control.obj \
-                ..\msw\$D\curico.obj \
-                ..\msw\$D\cursor.obj \
-                ..\msw\$D\data.obj \
-                ..\msw\ole\$D\dataobj.obj \
-                ..\msw\$D\dc.obj \
-                ..\msw\$D\dcclient.obj \
-                ..\msw\$D\dcmemory.obj \
-                ..\msw\$D\dcprint.obj \
-                ..\msw\$D\dcscreen.obj \
-                ..\msw\$D\dde.obj \
-                ..\msw\$D\dialog.obj \
-                ..\msw\$D\dialup.obj \
-                ..\msw\$D\dib.obj \
-                ..\msw\$D\dibutils.obj \
-                ..\msw\$D\dir.obj \
-                ..\msw\$D\dirdlg.obj \
-                ..\msw\$D\dragimag.obj \
-                ..\msw\ole\$D\dropsrc.obj \
-                ..\msw\ole\$D\droptgt.obj \
-                ..\msw\$D\enhmeta.obj \
-                ..\msw\$D\filedlg.obj \
-                ..\msw\$D\font.obj \
-                ..\msw\$D\fontdlg.obj \
-                ..\msw\$D\fontenum.obj \
-                ..\msw\$D\fontutil.obj \
-                ..\msw\$D\frame.obj \
-                ..\msw\$D\gauge95.obj \
-                ..\msw\$D\gdiimage.obj \
-                ..\msw\$D\gdiobj.obj \
-                ..\msw\$D\glcanvas.obj \
-                ..\msw\$D\gsocket.obj \
-                ..\msw\$D\helpwin.obj \
-                ..\msw\$D\icon.obj \
-                ..\msw\$D\imaglist.obj \
-                ..\msw\$D\joystick.obj \
-                ..\msw\$D\listbox.obj \
-                ..\msw\$D\listctrl.obj \
-                ..\msw\$D\main.obj \
-                ..\msw\$D\mdi.obj \
-                ..\msw\$D\menu.obj \
-                ..\msw\$D\menuitem.obj \
-                ..\msw\$D\metafile.obj \
-                ..\msw\$D\mimetype.obj \
-                ..\msw\$D\minifram.obj \
-                ..\msw\$D\msgdlg.obj \
-                ..\msw\$D\nativdlg.obj \
-                ..\msw\$D\notebook.obj \
-                ..\msw\ole\$D\oleutils.obj \
-                ..\msw\$D\ownerdrw.obj \
-                ..\msw\$D\palette.obj \
-                ..\msw\$D\pen.obj \
-                ..\msw\$D\penwin.obj \
-                ..\msw\$D\printdlg.obj \
-                ..\msw\$D\printwin.obj \
-                ..\msw\$D\radiobox.obj \
-                ..\msw\$D\radiobut.obj \
-                ..\msw\$D\regconf.obj \
-                ..\msw\$D\region.obj \
-                ..\msw\$D\registry.obj \
-                ..\msw\$D\scrolbar.obj \
-                ..\msw\$D\settings.obj \
-                ..\msw\$D\slider95.obj \
-                ..\msw\$D\spinbutt.obj \
-                ..\msw\$D\spinctrl.obj \
-                ..\msw\$D\statbmp.obj \
-                ..\msw\$D\statbox.obj \
-                ..\msw\$D\statbr95.obj \
-                ..\msw\$D\statline.obj \
-                ..\msw\$D\stattext.obj \
-                ..\msw\$D\tabctrl.obj \
-                ..\msw\$D\taskbar.obj \
-                ..\msw\$D\tbar95.obj \
-                ..\msw\$D\textctrl.obj \
-                ..\msw\$D\thread.obj \
-                ..\msw\$D\timer.obj \
-                ..\msw\$D\tooltip.obj \
-                ..\msw\$D\treectrl.obj \
-                ..\msw\$D\utils.obj \
-                ..\msw\$D\utilsexc.obj \
-                ..\msw\ole\$D\uuid.obj \
-                ..\msw\$D\wave.obj \
-                ..\msw\$D\window.obj \
-                ..\msw\$D\xpmhand.obj
+		..\msw\$D\app.obj \
+		..\msw\ole\$D\automtn.obj \
+		..\msw\$D\bitmap.obj \
+		..\msw\$D\bmpbuttn.obj \
+		..\msw\$D\brush.obj \
+		..\msw\$D\button.obj \
+		..\msw\$D\caret.obj \
+		..\msw\$D\checkbox.obj \
+		..\msw\$D\checklst.obj \
+		..\msw\$D\choice.obj \
+		..\msw\$D\clipbrd.obj \
+		..\msw\$D\colordlg.obj \
+		..\msw\$D\colour.obj \
+		..\msw\$D\combobox.obj \
+		..\msw\$D\control.obj \
+		..\msw\$D\curico.obj \
+		..\msw\$D\cursor.obj \
+		..\msw\$D\data.obj \
+		..\msw\ole\$D\dataobj.obj \
+		..\msw\$D\dc.obj \
+		..\msw\$D\dcclient.obj \
+		..\msw\$D\dcmemory.obj \
+		..\msw\$D\dcprint.obj \
+		..\msw\$D\dcscreen.obj \
+		..\msw\$D\dde.obj \
+		..\msw\$D\dialog.obj \
+		..\msw\$D\dialup.obj \
+		..\msw\$D\dib.obj \
+		..\msw\$D\dibutils.obj \
+		..\msw\$D\dir.obj \
+		..\msw\$D\dirdlg.obj \
+		..\msw\$D\dragimag.obj \
+		..\msw\ole\$D\dropsrc.obj \
+		..\msw\ole\$D\droptgt.obj \
+		..\msw\$D\enhmeta.obj \
+		..\msw\$D\filedlg.obj \
+		..\msw\$D\font.obj \
+		..\msw\$D\fontdlg.obj \
+		..\msw\$D\fontenum.obj \
+		..\msw\$D\fontutil.obj \
+		..\msw\$D\frame.obj \
+		..\msw\$D\gauge95.obj \
+		..\msw\$D\gdiimage.obj \
+		..\msw\$D\gdiobj.obj \
+		..\msw\$D\glcanvas.obj \
+		..\msw\$D\gsocket.obj \
+		..\msw\$D\gsockmsw.obj \
+		..\msw\$D\helpwin.obj \
+		..\msw\$D\icon.obj \
+		..\msw\$D\imaglist.obj \
+		..\msw\$D\joystick.obj \
+		..\msw\$D\listbox.obj \
+		..\msw\$D\listctrl.obj \
+		..\msw\$D\main.obj \
+		..\msw\$D\mdi.obj \
+		..\msw\$D\menu.obj \
+		..\msw\$D\menuitem.obj \
+		..\msw\$D\metafile.obj \
+		..\msw\$D\mimetype.obj \
+		..\msw\$D\minifram.obj \
+		..\msw\$D\msgdlg.obj \
+		..\msw\$D\nativdlg.obj \
+		..\msw\$D\notebook.obj \
+		..\msw\ole\$D\oleutils.obj \
+		..\msw\$D\ownerdrw.obj \
+		..\msw\$D\palette.obj \
+		..\msw\$D\pen.obj \
+		..\msw\$D\penwin.obj \
+		..\msw\$D\printdlg.obj \
+		..\msw\$D\printwin.obj \
+		..\msw\$D\radiobox.obj \
+		..\msw\$D\radiobut.obj \
+		..\msw\$D\regconf.obj \
+		..\msw\$D\region.obj \
+		..\msw\$D\registry.obj \
+		..\msw\$D\scrolbar.obj \
+		..\msw\$D\settings.obj \
+		..\msw\$D\slider95.obj \
+		..\msw\$D\spinbutt.obj \
+		..\msw\$D\spinctrl.obj \
+		..\msw\$D\statbmp.obj \
+		..\msw\$D\statbox.obj \
+		..\msw\$D\statbr95.obj \
+		..\msw\$D\statline.obj \
+		..\msw\$D\stattext.obj \
+		..\msw\$D\tabctrl.obj \
+		..\msw\$D\taskbar.obj \
+		..\msw\$D\tbar95.obj \
+		..\msw\$D\textctrl.obj \
+		..\msw\$D\thread.obj \
+		..\msw\$D\timer.obj \
+		..\msw\$D\tooltip.obj \
+		..\msw\$D\treectrl.obj \
+		..\msw\$D\utils.obj \
+		..\msw\$D\utilsexc.obj \
+		..\msw\ole\$D\uuid.obj \
+		..\msw\$D\wave.obj \
+		..\msw\$D\window.obj \
+		..\msw\$D\xpmhand.obj
 
 HTMLOBJS = ..\html\$D\helpctrl.obj \
-                ..\html\$D\helpdata.obj \
-                ..\html\$D\helpfrm.obj \
-                ..\html\$D\htmlcell.obj \
-                ..\html\$D\htmlfilt.obj \
-                ..\html\$D\htmlpars.obj \
-                ..\html\$D\htmltag.obj \
-                ..\html\$D\htmlwin.obj \
-                ..\html\$D\htmprint.obj \
-                ..\html\$D\m_dflist.obj \
-                ..\html\$D\m_fonts.obj \
-                ..\html\$D\m_hline.obj \
-                ..\html\$D\m_image.obj \
-                ..\html\$D\m_layout.obj \
-                ..\html\$D\m_links.obj \
-                ..\html\$D\m_list.obj \
-                ..\html\$D\m_meta.obj \
-                ..\html\$D\m_pre.obj \
-                ..\html\$D\m_tables.obj \
-                ..\html\$D\winpars.obj
+		..\html\$D\helpdata.obj \
+		..\html\$D\helpfrm.obj \
+		..\html\$D\htmlcell.obj \
+		..\html\$D\htmlfilt.obj \
+		..\html\$D\htmlpars.obj \
+		..\html\$D\htmltag.obj \
+		..\html\$D\htmlwin.obj \
+		..\html\$D\htmprint.obj \
+		..\html\$D\m_dflist.obj \
+		..\html\$D\m_fonts.obj \
+		..\html\$D\m_hline.obj \
+		..\html\$D\m_image.obj \
+		..\html\$D\m_layout.obj \
+		..\html\$D\m_links.obj \
+		..\html\$D\m_list.obj \
+		..\html\$D\m_meta.obj \
+		..\html\$D\m_pre.obj \
+		..\html\$D\m_tables.obj \
+		..\html\$D\winpars.obj
 
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
@@ -421,8 +422,8 @@ pch1:   dirs $(DUMMYOBJ)
 ### Static library
 
 $(WXDIR)\lib\$(WXLIBNAME).lib:      $D\dummy.obj $(OBJECTS) $(PERIPH_LIBS)
-        -erase $(LIBTARGET)
-        $(implib) @<<
+	-erase $(LIBTARGET)
+	$(implib) @<<
 -out:$@
 -machine:$(CPU)
 $(OBJECTS) $(PERIPH_LIBS)
@@ -445,7 +446,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib
 <<
 
 !endif
@@ -465,58 +466,58 @@ $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 # Compile certain files with no optimization (some files cause a
 # compiler crash for buggy versions of VC++, e.g. 4.0)
 noopt:
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\datetime.obj /c /Tp $(COMMDIR)\datetime.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\encconv.obj /c /Tp $(COMMDIR)\encconv.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\fileconf.obj /c /Tp $(COMMDIR)\fileconf.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\resource.obj /c /Tp $(COMMDIR)\resource.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(COMMDIR)\$D\textfile.obj /c /Tp $(COMMDIR)\textfile.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\choicdgg.obj /c /Tp $(GENDIR)\choicdgg.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\grid.obj /c /Tp $(GENDIR)\grid.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\logg.obj /c /Tp $(GENDIR)\logg.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(GENDIR)\$D\proplist.obj /c /Tp $(GENDIR)\proplist.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\clipbrd.obj /c /Tp $(MSWDIR)\clipbrd.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\control.obj /c /Tp $(MSWDIR)\control.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\listbox.obj /c /Tp $(MSWDIR)\listbox.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\mdi.obj /c /Tp $(MSWDIR)\mdi.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\menu.obj /c /Tp $(MSWDIR)\menu.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\notebook.obj /c /Tp $(MSWDIR)\notebook.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\tbar95.obj /c /Tp $(MSWDIR)\tbar95.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(MSWDIR)\$D\treectrl.obj /c /Tp $(MSWDIR)\treectrl.cpp
 <<
-        cl @<<
+	cl @<<
 $(CPPFLAGS2) /Od /Fo$(HTMLDIR)\$D\helpfrm.obj /c /Tp $(HTMLDIR)\helpfrm.cpp
 <<
 
@@ -541,7 +542,7 @@ $(CPPFLAGS2) /c ..\common\y_tab.c -DUSE_DEFINE -DYY_USE_PROTOS /Fo$@
 ..\common\lex_yy.c:    ..\common\doslex.c
     copy "..\common"\doslex.c "..\common"\lex_yy.c
 
-$(OBJECTS):     $(WXDIR)/include/wx/setup.h
+$(OBJECTS):	$(WXDIR)/include/wx/setup.h
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
         cl @<<
@@ -605,14 +606,17 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
-        -erase $(LIBTARGET)
-        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
+cleanall: clean_png clean_zlib clean_xpm clean_jpeg clean_tiff
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).lib
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).exp
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).ilk
+
+
+clean: $(PERIPH_CLEAN_TARGET)
+        -erase $(LIBTARGET)
+        -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase *.pdb
         -erase *.sbr
         -erase $(WXLIBNAME).pch
@@ -639,7 +643,6 @@ clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_ti
         -rmdir ..\common\$(D)
         -rmdir ..\html\$(D)
 
-cleanall: clean
 
 # Making documents
 docs:   allhlp allhtml allpdfrtf
@@ -650,12 +653,12 @@ refhlp: $(DOCDIR)/winhelp/techref.hlp
 rtf:    $(DOCDIR)/winhelp/wx.rtf
 pdfrtf:    $(DOCDIR)/pdf/wx.rtf
 refpdfrtf: $(DOCDIR)/pdf/techref.rtf
-html:   wxhtml
-wxhtml: $(DOCDIR)\html\wx\wx.htm
+html:	wxhtml
+wxhtml:	$(DOCDIR)\html\wx\wx.htm
 htmlhelp: $(DOCDIR)\html\wx\wx.chm
 ps:     wxps referencps
-wxps:   $(WXDIR)\docs\ps\wx.ps
-referencps:     $(WXDIR)\docs\ps\referenc.ps
+wxps:	$(WXDIR)\docs\ps\wx.ps
+referencps:	$(WXDIR)\docs\ps\referenc.ps
 
 allhlp: wxhlp
         cd $(WXDIR)\utils\dialoged\src
@@ -771,12 +774,12 @@ $(DOCDIR)\html\wx\wx.htm:         $(DOCDIR)\latex\wx\classes.tex $(DOCDIR)\latex
          cd $(THISDIR)
 
 $(DOCDIR)\html\wx\wx.chm : $(DOCDIR)\html\wx\wx.htm $(DOCDIR)\html\wx\wx.hhp
-        cd $(DOCDIR)\html\wx
-        -hhc wx.hhp
-        cd $(THISDIR)
+	cd $(DOCDIR)\html\wx
+	-hhc wx.hhp
+	cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\manual.dvi:      $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
-        cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\manual.dvi:	$(DOCDIR)/latex/wx/body.tex $(DOCDIR)/latex/wx/manual.tex
+	cd $(WXDIR)\docs\latex\wx
         -latex manual
         -latex manual
         -makeindx manual
@@ -785,14 +788,14 @@ $(WXDIR)\docs\latex\wx\manual.dvi:      $(DOCDIR)/latex/wx/body.tex $(DOCDIR)/la
         -latex manual
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\wx.ps: $(WXDIR)\docs\latex\wx\manual.dvi
-        cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\wx.ps:	$(WXDIR)\docs\latex\wx\manual.dvi
+	cd $(WXDIR)\docs\latex\wx
         -dvips32 -o wx.ps manual
         move wx.ps $(WXDIR)\docs\ps\wx.ps
         cd $(THISDIR)
 
-$(WXDIR)\docs\latex\wx\referenc.dvi:    $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
-        cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\latex\wx\referenc.dvi:	$(DOCDIR)/latex/wx/classes.tex $(DOCDIR)/latex/wx/topics.tex $(DOCDIR)/latex/wx/referenc.tex
+	cd $(WXDIR)\docs\latex\wx
         -latex referenc
         -latex referenc
         -makeindx referenc
@@ -801,8 +804,8 @@ $(WXDIR)\docs\latex\wx\referenc.dvi:    $(DOCDIR)/latex/wx/classes.tex $(DOCDIR)
         -latex referenc
         cd $(THISDIR)
 
-$(WXDIR)\docs\ps\referenc.ps:   $(WXDIR)\docs\latex\wx\referenc.dvi
-        cd $(WXDIR)\docs\latex\wx
+$(WXDIR)\docs\ps\referenc.ps:	$(WXDIR)\docs\latex\wx\referenc.dvi
+	cd $(WXDIR)\docs\latex\wx
         -dvips32 -o referenc.ps referenc
         move referenc.ps $(WXDIR)\docs\ps\referenc.ps
         cd $(THISDIR)
@@ -821,7 +824,7 @@ updatepdf:  # touchmanual pdfrtf
 
 MFTYPE=vc
 makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-        cd $(WXWIN)\distrib\msw\tmake
-        tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-        copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+	cd $(WXWIN)\distrib\msw\tmake
+	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
+	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
 
diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 3379c69..b342d6e 100644
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 05:31, 2000/03/08
+# This file was automatically generated by tmake at 15:55, 2000/03/14
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -235,6 +235,7 @@ MSWOBJS = accel.obj &
 	gdiobj.obj &
 	glcanvas.obj &
 	gsocket.obj &
+	gsockmsw.obj &
 	helpwin.obj &
 	icon.obj &
 	imaglist.obj &
@@ -460,6 +461,9 @@ glcanvas.obj:     $(MSWDIR)\glcanvas.cpp
 gsocket.obj:     $(MSWDIR)\gsocket.c
   *$(CC) $(CPPFLAGS) $(IFLAGS) $<
 
+gsockmsw.obj:     $(MSWDIR)\gsockmsw.c
+  *$(CC) $(CPPFLAGS) $(IFLAGS) $<
+
 helpwin.obj:     $(MSWDIR)\helpwin.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
-- 
2.7.4