+diff -Nur WindowMaker-0.92.0.orig/ChangeLog WindowMaker-0.92.0/ChangeLog
+--- WindowMaker-0.92.0.orig/ChangeLog 2005-07-03 19:36:39.000000000 +0200
++++ WindowMaker-0.92.0/ChangeLog 2006-01-23 07:47:10.000000000 +0100
+@@ -1,3 +1,37 @@
++Changes since version 0.92.0:
++.............................
++
++- added check for --with-gnustepdir option to configure to verify that its
++ argument is an absolute path
++- updated german translations (Torsten Marek <shlomme@gmx.net>)
++- fixed WPrefs.app to find its icons when not installed under GNUstep paths
++- fixed gcc-4 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
++- fixed amd64 compilation issues (Vladimir Nadvornik <nadvornik@suse.cz>)
++- eliminated gcc-4 compilation warnings
++- small fix for compilation in a different directory than the source
++ (Balaton Zoltan <balaton@eik.bme.hu>)
++- fixed some warnings on 64bit platforms (Balaton Zoltan <balaton@eik.bme.hu>)
++- fixed issue with invisible modal windows from Qt and Gtk applications
++ on 64bit platforms (Max Loparyev <max@city.veganet.ru>)
++- fixed issue with icon colors on big endian platforms
++ (Max Loparyev <max@city.veganet.ru>)
++- release colors to avoid issues with the reference count overflowing a
++ small integer and causing unexpected color releases that can crash
++ Window Maker (Martin Frydl <martin.frydl@systinet.com>)
++- fixed a small memory leak in WINGs/wview.c caused by not releasing the
++ background color of a view (Martin Frydl <martin.frydl@systinet.com>)
++- updated estonian translation (Ivar Smolin <okul@linux.ee>)
++- updated the XDND code in WINGs to work with GDK based applications.
++ WINGs based applications should now work with both KDE and GNOME
++ applications (Sylvain Reynal <sreynal@nerim.net>)
++- better check for the XDND protocol version when interoperating with other
++ applications. As it seems xdnd version 3 (which WINGs supports) and newer
++ are not backward compatible with xdnd version 1 and 2. This is why WINGs
++ applications cannot interoperate with GNUstep applications (which uses
++ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
++ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
++
++
+ Changes since version 0.91.0:
+ .............................
+
+diff -Nur WindowMaker-0.92.0.orig/configure.ac WindowMaker-0.92.0/configure.ac
+--- WindowMaker-0.92.0.orig/configure.ac 2005-01-06 16:31:40.000000000 +0100
++++ WindowMaker-0.92.0/configure.ac 2005-08-22 23:48:20.000000000 +0200
+@@ -197,7 +197,7 @@
+
+ AC_CACHE_CHECK(whether gcc supports x86 inline asm,
+ ac_cv_c_inline_asm,
+- [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n"::
++ [AC_TRY_LINK(,[{int x; asm volatile("movl %%eax, %%ebx\n\t pushal\n\t popal"::
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x),
+ "m" (x),"m" (x),"m" (x),"m" (x),"m" (x),"m" (x));}],
+ ac_cv_c_inline_asm=yes,
+@@ -831,7 +831,9 @@
+ AC_ARG_WITH(appspath,
+ [ --with-gnustepdir=PATH specify the directory for GNUstep applications])
+
+-appspath=$with_gnustepdir
++if test "x`echo $with_gnustepdir | grep ^/`" != "x"; then
++ appspath=$with_gnustepdir
++fi
+
+ if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then
+ wprefs_base_dir=${prefix}
+diff -Nur WindowMaker-0.92.0.orig/po/de.po WindowMaker-0.92.0/po/de.po
+--- WindowMaker-0.92.0.orig/po/de.po 2004-10-26 05:52:38.000000000 +0200
++++ WindowMaker-0.92.0/po/de.po 2005-07-05 21:39:14.000000000 +0200
+@@ -1,38 +1,44 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+ #
++# German Message Catalog for Window Maker
++#
++# Initial translation
++# Gudio Scholz <guido.scholz@bayernline.de>
++# Bernd Eggert <Bernd.Eggert@t-online.de>
++#
++# Adapted to versions 0.80 ff.
++# Torsten Marek <shlomme@gmx.net>
++#
++
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: WindowMaker 0.80.0\n"
+-"POT-Creation-Date: 2002-01-22 21:20+0100\n"
+-"PO-Revision-Date: 2002-01-25 16:42GMT\n"
+-"Last-Translator: Torsten Marek <shlomme@gmx.net>\n"
+-"Language-Team: German \n"
++"Project-Id-Version: Window Maker 0.91\n"
++"POT-Creation-Date: 2004-11-01 16:17+0100\n"
++"PO-Revision-Date: 2004-11-08 22:58+0100\n"
++"Last-Translator: shlomme@gmx.net\n"
++"Language-Team: German\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+-"X-Generator: KBabel 0.9.6\n"
+
+-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
+-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
+-#: ../src/winspector.c:389 ../src/winspector.c:406
++#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
++#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
++#: ../src/winspector.c:394 ../src/winspector.c:411
+ msgid "Error"
+ msgstr "Fehler"
+
+-#: ../src/appicon.c:427
++#: ../src/appicon.c:416
+ msgid "Could not open specified icon file"
+ msgstr "Symboldatei konnte nicht geöffnet werden"
+
+-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
+-#: ../src/dialog.c:729 ../src/dialog.c:1814 ../src/dock.c:526
+-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
+-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
+-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
++#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
++#: ../src/dialog.c:725 ../src/dialog.c:1796 ../src/dock.c:515
++#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
++#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
++#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
+ msgid "OK"
+ msgstr "OK"
+
+-#: ../src/appicon.c:456 ../src/dock.c:264
++#: ../src/appicon.c:445 ../src/dock.c:244
+ msgid ""
+ " will be forcibly closed.\n"
+ "Any unsaved changes will be lost.\n"
+@@ -42,344 +48,369 @@
+ "Alle ungespeicherten Änderungen gehen dabei verloren.\n"
+ "Bitte bestätigen."
+
+-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
++#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
+ msgid "Kill Application"
+ msgstr "Anwendung töten"
+
+-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
++#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
+ msgid "Yes"
+ msgstr "Ja"
+
+-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
++#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
+ msgid "No"
+ msgstr "Nein"
+
+-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
++#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
+ msgid "Unhide Here"
+ msgstr "Hier wiederherstellen"
+
+-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
+-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
++#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
++#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
+ msgid "Hide"
+ msgstr "Verstecken"
+
+-#: ../src/appicon.c:497
++#: ../src/appicon.c:486
+ msgid "Set Icon..."
+ msgstr "Symbol wählen..."
+
+-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
++#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
+ #: ../src/rootmenu.c:264 ../src/winmenu.c:508
+ msgid "Kill"
+ msgstr "Töten"
+
+-#: ../src/appicon.c:519 ../src/dock.c:3501
++#: ../src/appicon.c:508 ../src/dock.c:3511
+ msgid "Unhide"
+ msgstr "Wiederherstellen"
+
+-#: ../src/application.c:398
++#: ../src/application.c:405
+ #, c-format
+ msgid "recreating missing icon '%s'"
+ msgstr "fehlendes Symbol '%s' wird wiederhergestellt"
+
+-#: ../src/defaults.c:919 ../src/defaults.c:1008
++#: ../src/defaults.c:930 ../src/defaults.c:1092
+ #, c-format
+ msgid "Domain %s (%s) of global defaults database is corrupted!"
+ msgstr "Domäne %s (%s) in globaler Standarddatenbank ist fehlerhaft!"
+
+-#: ../src/defaults.c:924
++#: ../src/defaults.c:935
+ #, c-format
+ msgid "could not load domain %s from global defaults database"
+ msgstr "Domäne %s aus globaler Standarddatenbank konnte nicht geladen werden"
+
+-#: ../src/defaults.c:946 ../src/startup.c:884 ../src/startup.c:902
+-#: ../src/startup.c:908
++#: ../src/defaults.c:987 ../src/defaults.c:1002
++#, c-format
++msgid "invalid global menu file %s"
++msgstr "Ungültige Datei %s für globales Menü"
++
++#: ../src/defaults.c:1030 ../src/startup.c:762 ../src/startup.c:780
++#: ../src/startup.c:787
+ #, c-format
+ msgid "could not read domain \"%s\" from defaults database"
+-msgstr "Dömane \"%s\" aus Standarddatenbank konnte nicht gelesen werden"
++msgstr "Dömane \"%s\" aus der Standarddatenbank konnte nicht gelesen werden"
+
+-#: ../src/defaults.c:992 ../src/defaults.c:1096 ../src/defaults.c:1137
+-#: ../src/defaults.c:1193
++#: ../src/defaults.c:1076 ../src/defaults.c:1181 ../src/defaults.c:1222
++#: ../src/defaults.c:1278
+ #, c-format
+ msgid "Domain %s (%s) of defaults database is corrupted!"
+-msgstr "Domäne %s (%s) aus Standarddatenbank ist fehlerhaft!"
++msgstr "Domäne %s (%s) aus der Standarddatenbank ist fehlerhaft!"
+
+-#: ../src/defaults.c:997 ../src/defaults.c:1116 ../src/defaults.c:1173
+-#: ../src/defaults.c:1202
++#: ../src/defaults.c:1081 ../src/defaults.c:1201 ../src/defaults.c:1258
++#: ../src/defaults.c:1288
+ #, c-format
+ msgid "could not load domain %s from user defaults database"
+ msgstr "Domäne %s aus Benutzer-Standarddatenbank konnte nicht geladen werden"
+
+-#: ../src/defaults.c:1027
++#: ../src/defaults.c:1111
+ #, c-format
+ msgid "could not load domain %s from global defaults database (%s)"
+ msgstr "Dömane %s konnte nicht aus globaler Standarddatenbank (%s) gelesen werden"
+
+-#: ../src/defaults.c:1163 ../src/screen.c:458
++#: ../src/defaults.c:1248 ../src/screen.c:419
+ #, c-format
+ msgid "could not load logo image for panels: %s"
+ msgstr "Panel-Logo konnte nicht geladen werden: %s"
+
+ #. --------------------------- Local -----------------------
+-#: ../src/defaults.c:1411 ../src/defaults.c:1553 ../src/defaults.c:1665
+-#: ../src/defaults.c:2144 ../src/defaults.c:2161 ../src/defaults.c:2206
+-#: ../src/defaults.c:2253 ../src/defaults.c:2726 ../src/wdefaults.c:571
+-#: ../src/wdefaults.c:607
++#: ../src/defaults.c:1497 ../src/defaults.c:1636 ../src/defaults.c:1756
++#: ../src/defaults.c:2234 ../src/defaults.c:2251 ../src/defaults.c:2296
++#: ../src/defaults.c:2343 ../src/defaults.c:2816 ../src/wdefaults.c:571
++#: ../src/wdefaults.c:604
+ #, c-format
+ msgid "Wrong option format for key \"%s\". Should be %s."
+ msgstr "Falsches Optionsformat für Schlüssel \"%s\". %s erwartet."
+
+-#: ../src/defaults.c:1413 ../src/defaults.c:1494 ../src/defaults.c:1526
+-#: ../src/defaults.c:1558 ../src/defaults.c:1571 ../src/defaults.c:1586
+-#: ../src/defaults.c:1600 ../src/defaults.c:1670 ../src/defaults.c:1682
+-#: ../src/defaults.c:2149 ../src/defaults.c:2166 ../src/defaults.c:2179
+-#: ../src/defaults.c:2211 ../src/defaults.c:2227 ../src/defaults.c:2258
+-#: ../src/defaults.c:2345 ../src/defaults.c:2731 ../src/defaults.c:2742
++#: ../src/defaults.c:1499 ../src/defaults.c:1580 ../src/defaults.c:1610
++#: ../src/defaults.c:1641 ../src/defaults.c:1654 ../src/defaults.c:1669
++#: ../src/defaults.c:1683 ../src/defaults.c:1761 ../src/defaults.c:1773
++#: ../src/defaults.c:2239 ../src/defaults.c:2256 ../src/defaults.c:2269
++#: ../src/defaults.c:2301 ../src/defaults.c:2317 ../src/defaults.c:2348
++#: ../src/defaults.c:2435 ../src/defaults.c:2821 ../src/defaults.c:2832
+ #, c-format
+ msgid "using default \"%s\" instead"
+-msgstr "benutze Standardeinstellung \"%s\" anderenstatt"
++msgstr "benutze Standardeinstellung \"%s\" anstatt"
+
+-#: ../src/defaults.c:1444
++#: ../src/defaults.c:1530
+ #, c-format
+ msgid "wrong option value for key \"%s\". Should be one of %s"
+ msgstr "falscher Eigenschaftenwert für Schlüssel \"%s\". Wert aus %s erwartet"
+
+-#: ../src/defaults.c:1489
++#: ../src/defaults.c:1575
+ #, c-format
+ msgid "can't convert \"%s\" to boolean for key \"%s\""
+-msgstr "\"%s\" konnte nicht in Wahrheitswert für Schlüssel \"%s\" konvertiert werden"
++msgstr "\"%s\" konnte nicht in Boolean für Schlüssel \"%s\" konvertiert werden"
+
+-#: ../src/defaults.c:1523
++#: ../src/defaults.c:1607
+ #, c-format
+ msgid "can't convert \"%s\" to integer for key \"%s\""
+-msgstr "\"%s\" konnte nicht in Ganzzahl für Schlüssel \"%s\" konvertiert werden"
++msgstr "\"%s\" konnte nicht in Integer für Schlüssel \"%s\" konvertiert werden"
+
+-#: ../src/defaults.c:1566
++#: ../src/defaults.c:1649
+ #, c-format
+ msgid "Incorrect number of elements in array for key \"%s\"."
+ msgstr "Falsche Anzahl von Argumenten für Schlüssel \"%s\""
+
+-#: ../src/defaults.c:1581
++#: ../src/defaults.c:1664
+ #, c-format
+ msgid "Wrong value for key \"%s\". Should be Coordinate."
+-msgstr "Falscher Wert für Schlüssel \"%s\". Koordinate erwartet."
++msgstr "Falscher Wert für Schlüssel \"%s\". Koordinaten erwartet."
+
+-#: ../src/defaults.c:1596
++#: ../src/defaults.c:1679
+ #, c-format
+ msgid "can't convert array to integers for \"%s\"."
+-msgstr "Feld konnte nicht in Ganzzahlen für \"%s\" konvertiert werden."
++msgstr "Feld konnte nicht in Integer für \"%s\" konvertiert werden."
+
+-#: ../src/defaults.c:1794 ../src/defaults.c:1826 ../src/defaults.c:1842
+-#: ../src/defaults.c:1871 ../src/defaults.c:1894 ../src/defaults.c:1947
+-#: ../src/defaults.c:1987 ../src/defaults.c:2025 ../src/defaults.c:2041
++#: ../src/defaults.c:1884 ../src/defaults.c:1916 ../src/defaults.c:1932
++#: ../src/defaults.c:1961 ../src/defaults.c:1984 ../src/defaults.c:2037
++#: ../src/defaults.c:2077 ../src/defaults.c:2115 ../src/defaults.c:2131
+ #, c-format
+ msgid "\"%s\" is not a valid color name"
+ msgstr "\"%s\" ist kein gültiger Farbname"
+
+-#: ../src/defaults.c:1807 ../src/defaults.c:1859
++#: ../src/defaults.c:1897 ../src/defaults.c:1949
+ msgid "bad number of arguments in gradient specification"
+ msgstr "falsche Anzahl von Argumenten in Farbverlaufsbeschreibung"
+
+-#: ../src/defaults.c:1920
++#: ../src/defaults.c:2010
+ msgid "too few arguments in multicolor gradient specification"
+ msgstr "zuwenig Argumente in Mehrfarbverlaufsbeschreibung"
+
+-#: ../src/defaults.c:2014
++#: ../src/defaults.c:2104
+ msgid "bad number of arguments in textured gradient specification"
+ msgstr "falsche Anzahl von Argumenten in Texturverlaufsbeschreibung"
+
+-#: ../src/defaults.c:2057
++#: ../src/defaults.c:2147
+ #, c-format
+ msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
+ msgstr "falscher Transparenzwert für Textur \"%s\". [0..255] erwartet."
+
+-#: ../src/defaults.c:2117
++#: ../src/defaults.c:2207
+ #, c-format
+ msgid "could not initialize library %s"
+ msgstr "Bibliothek %s konnte nicht initialisiert werden"
+
+-#: ../src/defaults.c:2120
++#: ../src/defaults.c:2210
+ #, c-format
+ msgid "could not find function %s::%s"
+ msgstr "Funktion %s::%s konnte nicht gefunden werden"
+
+-#: ../src/defaults.c:2127
++#: ../src/defaults.c:2217
+ #, c-format
+ msgid "invalid texture type %s"
+ msgstr "ungültiger Texturtyp %s"
+
+-#: ../src/defaults.c:2174
++#: ../src/defaults.c:2264
+ #, c-format
+ msgid "Error in texture specification for key \"%s\""
+ msgstr "fehlerhafte Texturbeschreibung für Schlüssel \"%s\""
+
+-#: ../src/defaults.c:2223
++#: ../src/defaults.c:2313
+ msgid "Wrong type for workspace background. Should be a texture type."
+ msgstr "Falscher Typ für Arbeitsflächen-Hintergrund. Textur erwartet."
+
+-#: ../src/defaults.c:2271
++#: ../src/defaults.c:2361
+ #, c-format
+ msgid "Wrong type for background of workspace %i. Should be a texture."
+ msgstr "Falscher Typ für Arbeitsflächen-Hintergrund %i. Textur erwartet."
+
+-#: ../src/defaults.c:2313
++#: ../src/defaults.c:2403
+ msgid "could not load any usable font!!!"
+ msgstr "keine brauchbaren Schriften konnten geladen werden!!!"
+
+-#: ../src/defaults.c:2340
++#: ../src/defaults.c:2430
+ #, c-format
+ msgid "could not get color for key \"%s\""
+ msgstr "Farbe für Schlüssel \"%s\" konnte nicht ermittelt werden"
+
+-#: ../src/defaults.c:2398 ../src/rootmenu.c:523
++#: ../src/defaults.c:2488 ../src/rootmenu.c:531
+ #, c-format
+ msgid "%s:invalid key modifier \"%s\""
+ msgstr "%s: ungültiger Schlüsselmodifikator \"%s\""
+
+-#: ../src/defaults.c:2410
++#: ../src/defaults.c:2500
+ #, c-format
+ msgid "%s:invalid kbd shortcut specification \"%s\""
+ msgstr "%s: ungültiges Tastaturkürzel \"%s\""
+
+-#: ../src/defaults.c:2417
++#: ../src/defaults.c:2507
+ #, c-format
+ msgid "%s:invalid key in shortcut \"%s\""
+-msgstr "%s: ungülige Taste in Kürzel \"%s\""
++msgstr "%s: ungültige Taste in Kürzel \"%s\""
+
+-#: ../src/defaults.c:2442
++#: ../src/defaults.c:2532
+ #, c-format
+ msgid "%s: modifier key %s is not valid"
+-msgstr "%s: ungültige Umschalttaste %s"
++msgstr "%s: ungültige Tastenmodifikator %s"
+
+-#: ../src/defaults.c:2474
++#: ../src/defaults.c:2564
+ #, c-format
+ msgid "could not load image in option %s: %s"
+ msgstr "Bild aus Eigenschaft %s konnte nicht geladen werden (%s)"
+
+-#: ../src/defaults.c:2591
++#: ../src/defaults.c:2681
+ #, c-format
+ msgid "failed to open bitmap file \"%s\""
+ msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
+
+-#: ../src/defaults.c:2594
++#: ../src/defaults.c:2684
+ #, c-format
+ msgid "\"%s\" is not a valid bitmap file"
+ msgstr "\"%s\" ist keine gültige Bitmap-Datei"
+
+-#: ../src/defaults.c:2597
++#: ../src/defaults.c:2687
+ #, c-format
+ msgid "out of memory reading bitmap file \"%s\""
+ msgstr "zuwenig Speicher beim Lesen der Bitmap \"%s\""
+
+-#: ../src/defaults.c:2636 ../src/defaults.c:2669
++#: ../src/defaults.c:2726 ../src/defaults.c:2759
+ msgid "bad number of arguments in cursor specification"
+ msgstr "falsche Anzahl von Argumente in Mauszeigerbeschreibung"
+
+-#: ../src/defaults.c:2652
++#: ../src/defaults.c:2742
+ #, c-format
+ msgid "unknown builtin cursor name \"%s\""
+ msgstr "unbekannter interner Mauszeiger \"%s\""
+
+-#: ../src/defaults.c:2679 ../src/defaults.c:2691
++#: ../src/defaults.c:2769 ../src/defaults.c:2781
+ #, c-format
+ msgid "could not find cursor bitmap file \"%s\""
+ msgstr "Bitmap-Datei \"%s\" konnte nicht geladen werden"
+
+-#: ../src/defaults.c:2738
++#: ../src/defaults.c:2828
+ #, c-format
+ msgid "Error in cursor specification for key \"%s\""
+ msgstr "Fehler in Mauszeigerbeschreibung für Schlüssel \"%s\""
+
+-#: ../src/defaults.c:2823
++#: ../src/defaults.c:2913
+ msgid "could not render texture for icon background"
+ msgstr "Textur für Symbolhintergrund konnte nicht angezeigt werden"
+
+-#: ../src/dialog.c:135
++#: ../src/defaults.c:3541 ../src/defaults.c:3616
++#, c-format
++msgid "Invalid arguments for option \"%s\""
++msgstr "Falsche Argument für Option \"%s\""
++
++#: ../src/defaults.c:3548 ../src/defaults.c:3623
++#, c-format
++msgid "Could not find image \"%s\" for option \"%s\""
++msgstr "Bild \"%s\" aus Eigenschaft \"%s\" konnte nicht gefunden werden"
++
++#: ../src/defaults.c:3554 ../src/defaults.c:3631
++#, c-format
++msgid "Could not load image \"%s\" for option \"%s\""
++msgstr "Bild \"%s\"aus Eigenschaft \"%s\" konnte nicht geladen werden"
++
++#: ../src/defaults.c:3566
++msgid "Invalid split sizes for SwitchPanel back image."
++msgstr "Ungültige Unterteilungsangaben für SwitchPanel-Hintergrundbild."
++
++#: ../src/defaults.c:3639
++#, c-format
++msgid "Invalid number of arguments for option \"%s\""
++msgstr "Falsche Anzahl von Argumente für Option \"%s\""
++
++#: ../src/dialog.c:147
+ msgid "Save workspace state"
+ msgstr "Sitzung speichern"
+
+-#: ../src/dialog.c:173 ??
+-msgid "Shutdown Computer"
+-msgstr "Computer herunterfahren"
+-
+-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
+-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
++#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
++#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
+ #: ../src/rootmenu.c:264
+ msgid "Cancel"
+ msgstr "Abbrechen"
+
+-#: ../src/dialog.c:277
++#: ../src/dialog.c:290
+ msgid "Could not open directory "
+ msgstr "Verzeichnis konnte nicht geöffnet werden"
+
+-#: ../src/dialog.c:332
++#: ../src/dialog.c:345
+ msgid "Could not load image file "
+ msgstr "Bilddatei konnte nicht geöffnet werden"
+
+-#: ../src/dialog.c:663
++#: ../src/dialog.c:659
+ msgid "Directories"
+ msgstr "Verzeichnisse"
+
+-#: ../src/dialog.c:672
++#: ../src/dialog.c:668
+ msgid "Icons"
+ msgstr "Symbole"
+
+-#: ../src/dialog.c:705
++#: ../src/dialog.c:701
+ msgid "Preview"
+ msgstr "Vorschau"
+
+-#: ../src/dialog.c:718
++#: ../src/dialog.c:714
+ msgid "File Name:"
+ msgstr "Dateiname:"
+
+-#: ../src/dialog.c:742
++#: ../src/dialog.c:738
+ msgid "Choose File"
+ msgstr "Datei auswählen"
+
+-#: ../src/dialog.c:760 ../src/dialog.c:762
++#: ../src/dialog.c:757 ../src/dialog.c:759
+ msgid "Icon Chooser"
+ msgstr "Symbol-Wähler"
+
+-#: ../src/dialog.c:1241 ../src/dialog.c:1351
++#: ../src/dialog.c:1196 ../src/dialog.c:1304
+ #, c-format
+ msgid "Version %s"
+ msgstr "Version %s"
+
+-#: ../src/dialog.c:1348
++#: ../src/dialog.c:1302
+ msgid "Window Manager for X"
+ msgstr "Windowmanager für X"
+
+-#: ../src/dialog.c:1371
++#: ../src/dialog.c:1325
+ #, c-format
+ msgid "Using visual 0x%x: %s %ibpp "
+ msgstr "Benutze Visual 0x%x %s %ibpp "
+
+-#: ../src/dialog.c:1379
++#: ../src/dialog.c:1333
+ msgid "(32 thousand colors)\n"
+ msgstr "(32.000 Farben)\n"
+
+-#: ../src/dialog.c:1382
++#: ../src/dialog.c:1336
+ msgid "(64 thousand colors)\n"
+ msgstr "(64.000 Farben)\n"
+
+-#: ../src/dialog.c:1386
++#: ../src/dialog.c:1340
+ msgid "(16 million colors)\n"
+ msgstr "(16 Millionen Farben)\n"
+
+-#: ../src/dialog.c:1389
++#: ../src/dialog.c:1343
+ #, c-format
+ msgid "(%d colors)\n"
+ msgstr "(%d Farben)\n"
+
+-#: ../src/dialog.c:1399
++#: ../src/dialog.c:1353
+ #, c-format
+ msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
+ msgstr "Gesamter belegter Speicher: %i kB. Gesamter benutzter Speicher: %i kB.\n"
+
+-#: ../src/dialog.c:1406
++#: ../src/dialog.c:1360
+ msgid "Supported image formats: "
+ msgstr "Unterstütze Grafikformate: "
+
+-#: ../src/dialog.c:1413
++#: ../src/dialog.c:1367
+ msgid ""
+ "\n"
+ "Additional support for: "
+@@ -387,11 +418,11 @@
+ "\n"
+ "Zusätzliche Unterstützung für: "
+
+-#: ../src/dialog.c:1436
++#: ../src/dialog.c:1384
+ msgid " and "
+ msgstr " und "
+
+-#: ../src/dialog.c:1446
++#: ../src/dialog.c:1394
+ msgid ""
+ "\n"
+ "Sound disabled"
+@@ -399,7 +430,7 @@
+ "\n"
+ "Ton ausgeschaltet"
+
+-#: ../src/dialog.c:1448
++#: ../src/dialog.c:1396
+ msgid ""
+ "\n"
+ "Sound enabled"
+@@ -407,89 +438,105 @@
+ "\n"
+ "Ton eingeschaltet"
+
+-#: ../src/dialog.c:1472
++#: ../src/dialog.c:1401
++msgid ", VirtualDesktop enabled"
++msgstr ", VirtualDesktop aktiviert"
++
++#: ../src/dialog.c:1403
++msgid ", VirtualDesktop disabled"
++msgstr ", VirtualDesktop deaktiviert"
++
++#: ../src/dialog.c:1407
++msgid "\n"
++msgstr ""
++
++#: ../src/dialog.c:1409
++msgid "Solaris "
++msgstr ""
++
++#: ../src/dialog.c:1411
++msgid "Xinerama: "
++msgstr ""
++
++#: ../src/dialog.c:1445
+ msgid "Info"
+ msgstr "Info"
+
+-#: ../src/dialog.c:1495
++#: ../src/dialog.c:1469
+ msgid "Merry Christmas!"
+ msgstr "Frohe Weihnachten!"
+
+-#: ../src/dialog.c:1565
++#: ../src/dialog.c:1539
+ msgid ""
+ " Window Maker is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License as\n"
+ "published by the Free Software Foundation; either version 2 of the\n"
+ "License, or (at your option) any later version.\n"
+ "\n"
+-"\n"
+ " Window Maker is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty\n"
+ "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+ "See the GNU General Public License for more details.\n"
+ "\n"
+-"\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+ "02111-1307, USA."
+ msgstr ""
+
+-#: ../src/dialog.c:1586
++#: ../src/dialog.c:1563
+ msgid "Legal"
+ msgstr "Rechtliches"
+
+-#: ../src/dialog.c:1737 ../src/startup.c:395
++#: ../src/dialog.c:1719
+ msgid "cannot open connection for crashing dialog panel. Aborting."
+-msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden"
++msgstr "Verbindung zum Absturz-Dialog konnte nicht erstellt werden. Abbruch."
+
+-#: ../src/dialog.c:1763
++#: ../src/dialog.c:1745
+ msgid "Fatal error"
+ msgstr "Fataler Fehler"
+
+-#: ../src/dialog.c:1774
++#: ../src/dialog.c:1756
+ #, c-format
+ msgid ""
+ "Window Maker received signal %i\n"
+ "(%s)."
+ msgstr ""
+-"Window Maker erhielt Signale %i\n"
++"Window Maker erhielt Signal %i\n"
+ "(%s)."
+
+-#: ../src/dialog.c:1777
++#: ../src/dialog.c:1759
+ #, c-format
+ msgid "Window Maker received signal %i."
+ msgstr "Window Maker erhielt Signal %i"
+
+-#: ../src/dialog.c:1786
++#: ../src/dialog.c:1768
+ msgid ""
+ " This fatal error occured probably due to a bug. Please fill the included "
+ "BUGFORM and report it to bugs@windowmaker.org."
+-msgstr ""
+-" Dieser fatale Fehler trat möglicherweise aufgrund eines Programmfehlers auf. Bitte füllen Sie die "
+-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
++msgstr " Dieser fatale Fehler trat möglicherweise wegen eines Bugs auf. Bitte füllen Sie die mitgelieferte BUGFORM aus und schicken Sie sie an bugs@windowmaker.org."
+
+-#: ../src/dialog.c:1795
++#: ../src/dialog.c:1777
+ msgid "What do you want to do now?"
+ msgstr "Was möchten Sie jetzt tun?"
+
+-#: ../src/dialog.c:1801
++#: ../src/dialog.c:1783
+ msgid "Select action"
+ msgstr "Aktion auswählen"
+
+-#: ../src/dialog.c:1802
++#: ../src/dialog.c:1784
+ msgid "Abort and leave a core file"
+ msgstr "Abbrechen und Core-Datei hinterlassen"
+
+-#: ../src/dialog.c:1803
++#: ../src/dialog.c:1785
+ msgid "Restart Window Maker"
+ msgstr "Window Maker neustarten"
+
+-#: ../src/dialog.c:1804
++#: ../src/dialog.c:1786
+ msgid "Start alternate window manager"
+ msgstr "Anderen Windowmanager starten"
+
+-#: ../src/dialog.c:1982
++#: ../src/dialog.c:1964
+ msgid ""
+ "Window Maker is part of the GNUstep project.\n"
+ "The GNUstep project aims to create a free\n"
+@@ -510,567 +557,507 @@
+ "erstellt. Für weitere Informationen zu GNUstep besuchen\n"
+ "sie bitte www.gnustep.org"
+
+-#: ../src/dialog.c:2002
++#: ../src/dialog.c:1987
+ msgid "About GNUstep"
+ msgstr "Über GNUStep"
+
+-#: ../src/dock.c:213
++#: ../src/dock.c:193
+ #, c-format
+ msgid "Type the name for workspace %i:"
+-msgstr "Geben sie den Namen der Arbeitsfläche %i ein:"
++msgstr "Geben Sie den Namen der Arbeitsfläche %i ein:"
+
+-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
++#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
+ msgid "Rename Workspace"
+ msgstr "Arbeitsfläche umbenennen"
+
+-#: ../src/dock.c:520 ../src/dock.c:528
++#: ../src/dock.c:509 ../src/dock.c:517
+ msgid "Warning"
+ msgstr "Warnung"
+
+-#: ../src/dock.c:521
++#: ../src/dock.c:510
+ msgid ""
+ "Some icons cannot be made omnipresent. Please make sure that no other icon "
+ "is docked in the same positions on the other workspaces and the Clip is not "
+ "full in some workspace."
+ msgstr ""
+-"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie sicher, "
+-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position andockt "
+-"und der Clip in keiner Arbeitsfläche voll ist."
++"Einige Symbole konnten nicht haftend gemacht werden. Bitte stellen Sie "
++"sicher, dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen "
++"Position andockt und der Clip in keiner Arbeitsfläche voll ist."
+
+-#: ../src/dock.c:529
++#: ../src/dock.c:518
+ msgid ""
+ "Icon cannot be made omnipresent. Please make sure that no other icon is "
+ "docked in the same position on the other workspaces and the Clip is not full "
+ "in some workspace."
+ msgstr ""
+-"Symbol konntennicht haftend gemacht werden. Bitte stellen Sie sicher, "
+-"dass kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
++"Symbol konnte nicht haftend gemacht werden. Bitte stellen Sie sicher, dass "
++"kein anderes Symbol auf anderen Arbeitflächen an der gleichen Position klebt "
+ "und der Clip in keiner Arbeitsfläche voll ist."
+
+-#: ../src/dock.c:556
++#: ../src/dock.c:545
+ msgid "Workspace Clip"
+ msgstr "Arbeitsflächen-Clip"
+
+-#: ../src/dock.c:557
++#: ../src/dock.c:546
+ msgid "All selected icons will be removed!"
+ msgstr "Alle ausgewählten Symbole werden entfernt!"
+
+-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
++#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
+ msgid "Keep Icon"
+ msgstr "Symbol behalten"
+
+-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
++#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
+ msgid "Type the command used to launch the application"
+ msgstr "Geben Sie den Befehl zum Starten der Anwendung ein"
+
+-#: ../src/dock.c:965
++#: ../src/dock.c:954
+ #, c-format
+ msgid "could not launch application %s\n"
+ msgstr "Anwendung %s konnte nicht gestartet werden\n"
+
+-#: ../src/dock.c:1020
++#: ../src/dock.c:1010
+ msgid "could not create workspace submenu for Clip menu"
+ msgstr "Arbeitsflächen-Untermenü für Clip konnte nicht erstellt werden"
+
+-#: ../src/dock.c:1078
++#: ../src/dock.c:1069
+ msgid "could not create options submenu for Clip menu"
+ msgstr "Eigenschaften-Menü für Clip konnte nicht erstellt werden"
+
+-#: ../src/dock.c:1082 ../src/dock.c:1130
++#: ../src/dock.c:1073 ../src/dock.c:1121
+ msgid "Keep on Top"
+ msgstr "Immer oben"
+
+-#: ../src/dock.c:1088
++#: ../src/dock.c:1079
+ msgid "Collapsed"
+ msgstr "Zusammengefaltet"
+
+-#: ../src/dock.c:1094
++#: ../src/dock.c:1085
+ msgid "Autocollapse"
+ msgstr "Automatisch zusammenfalten"
+
+-#: ../src/dock.c:1100
++#: ../src/dock.c:1091
+ msgid "Autoraise"
+ msgstr "Automatisch oben"
+
+-#: ../src/dock.c:1106
++#: ../src/dock.c:1097
+ msgid "Autoattract Icons"
+ msgstr "Symbole automatisch anziehen"
+
+-#: ../src/dock.c:1136
++#: ../src/dock.c:1127
+ msgid "Clip Options"
+ msgstr "Clip-Optionen"
+
+-#: ../src/dock.c:1146
++#: ../src/dock.c:1137
+ msgid "Selected"
+ msgstr "Ausgewählt"
+
+-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
++#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
+ msgid "Select All Icons"
+ msgstr "Alle Symbole auswählen"
+
+-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
++#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
+ msgid "Move Icon To"
+ msgstr "Verschiebe Symbol nach..."
+
+-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
++#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
+ msgid "Remove Icon"
+ msgstr "Entferne Symbol"
+
+-#: ../src/dock.c:1172
++#: ../src/dock.c:1163
+ msgid "Attract Icons"
+ msgstr "Symbole anziehen"
+
+-#: ../src/dock.c:1175
++#: ../src/dock.c:1166
+ msgid "Launch"
+-msgstr "Starten"
++msgstr "Ausführen"
+
+-#: ../src/dock.c:1183
++#: ../src/dock.c:1174
+ msgid "Settings..."
+ msgstr "Einstellungen..."
+
+-#: ../src/dock.c:1548 ../src/dock.c:1655
++#: ../src/dock.c:1538 ../src/dock.c:1645
+ #, c-format
+ msgid "bad value in docked icon state info %s"
+ msgstr "falscher Wert für Statusinfo %s des angedockten Symbols"
+
+-#: ../src/dock.c:1663
++#: ../src/dock.c:1653
+ #, c-format
+ msgid "bad value in docked icon position %i,%i"
+ msgstr "falscher Wert für Position eines angedockten Symbols: %i,%i"
+
+-#: ../src/dock.c:1683
++#: ../src/dock.c:1673
+ #, c-format
+ msgid "bad value in dock state info:%s"
+ msgstr "falscher Wert in Dock-Statusinfo: %s"
+
+-#: ../src/dock.c:1919
++#: ../src/dock.c:1923
+ msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
+ msgstr "zu viele Symbole im Dock, überzählige werden ignoriert"
+
+ #. icon->forced_dock = 1;
+-#: ../src/dock.c:2136 ../src/dock.c:2277
++#: ../src/dock.c:2138 ../src/dock.c:2275
+ msgid "Dock Icon"
+ msgstr "Dock-Symbol"
+
+-#: ../src/dock.c:3323
++#: ../src/dock.c:3333
+ #, c-format
+ msgid "Could not execute command \"%s\""
+ msgstr "Befehl \"%s\" konnte nicht ausgeführt werden"
+
+-#: ../src/dock.c:3415
++#: ../src/dock.c:3425
+ msgid "Toggle Omnipresent"
+ msgstr "Haftend ein/aus"
+
+-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
+-#: ../src/winspector.c:1375
++#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
+ msgid "Omnipresent"
+ msgstr "Haftend"
+
+-#: ../src/dock.c:3434
++#: ../src/dock.c:3444
+ msgid "Unselect All Icons"
+ msgstr "Alle Symbole abwählen"
+
+-#: ../src/dock.c:3443
++#: ../src/dock.c:3453
+ msgid "Keep Icons"
+ msgstr "Symbole behalten"
+
+-#: ../src/dock.c:3451
++#: ../src/dock.c:3461
+ msgid "Move Icons To"
+ msgstr "Verschiebe Symbole nach"
+
+-#: ../src/dock.c:3462
++#: ../src/dock.c:3472
+ msgid "Remove Icons"
+ msgstr "Symbole entfernen"
+
+-#: ../src/dock.c:3493 ../src/kwm.c:643
++#: ../src/dock.c:3503
+ msgid "Bring Here"
+ msgstr "Hierher holen"
+
+-#: ../src/dockedapp.c:149
++#: ../src/dockedapp.c:150
+ #, c-format
+ msgid "could not find icon %s, used in a docked application"
+ msgstr "Symbol %s für gedockte Anwendung konnte nicht gefunden"
+
+-#: ../src/dockedapp.c:229
++#: ../src/dockedapp.c:230
+ #, c-format
+ msgid "Could not open specified icon file: %s"
+ msgstr "Symboldatei %s konnte nicht geöffnet werden"
+
+-#: ../src/dockedapp.c:231
++#: ../src/dockedapp.c:232
+ msgid "Ignore"
+ msgstr "Ignorieren"
+
+-#: ../src/dockedapp.c:333
++#: ../src/dockedapp.c:334
+ msgid "Start when Window Maker is started"
+ msgstr "Autostart"
+
+-#: ../src/dockedapp.c:340
++#: ../src/dockedapp.c:341
+ msgid "Lock (prevent accidental removal)"
+ msgstr "Festhalten (kein versehentliches Entfernen)"
+
+-#: ../src/dockedapp.c:344
++#: ../src/dockedapp.c:345
+ msgid "Application path and arguments"
+ msgstr "Anwendungspfad und -argumente"
+
+-#: ../src/dockedapp.c:357
++#: ../src/dockedapp.c:358
+ msgid "Command for middle-click launch"
+ msgstr "Befehl für Klick mit mittlerer Maustaste"
+
+-#: ../src/dockedapp.c:371
++#: ../src/dockedapp.c:372
+ #, c-format
+ msgid "%s will be replaced with current selection"
+ msgstr "%s wird durch die aktuelle Auswahl ersetzt"
+
+-#: ../src/dockedapp.c:376
++#: ../src/dockedapp.c:377
+ msgid "Command for files dropped with DND"
+ msgstr "Befehl für per DND-Operationen"
+
+-#: ../src/dockedapp.c:390
++#: ../src/dockedapp.c:391
+ #, c-format
+ msgid "%d will be replaced with the file name"
+ msgstr "%d wird durch den Dateinamen ersetzt"
+
+-#: ../src/dockedapp.c:394
++#: ../src/dockedapp.c:395
+ msgid "DND support was not compiled in"
+ msgstr "keine einkompilierte DND-Unterstützung"
+
+-#: ../src/dockedapp.c:399
++#: ../src/dockedapp.c:400
+ msgid "Icon Image"
+ msgstr "Symbol"
+
+-#: ../src/dockedapp.c:413 ../src/winspector.c:1513
++#: ../src/dockedapp.c:414 ../src/winspector.c:1521
+ msgid "Browse..."
+ msgstr "Suchen..."
+
+-#: ../src/dockedapp.c:466
++#: ../src/dockedapp.c:475
+ msgid "Docked Application Settings"
+ msgstr "Einstellungen für gedockte Anwendungen"
+
+-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
++#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
+ #: ../src/texture.c:594
+ #, c-format
+ msgid "could not render texture: %s"
+ msgstr "Textur %s konnte nicht angezeigt werden"
+
+-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
+-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
+-#: ../src/icon.c:350 ../src/menu.c:485
++#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
++#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
++#: ../src/icon.c:360 ../src/menu.c:492
+ #, c-format
+ msgid "error rendering image:%s"
+ msgstr "Fehler beim Anzeigen des Bildes: %s"
+
+-#: ../src/framewin.c:777
++#: ../src/framewin.c:775
+ #, c-format
+ msgid "error rendering image: %s"
+ msgstr "Fehler beim Anzeigen des Bildes: %s"
+
+-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
+-msgid "out of memory while updating GNOME hints"
+-msgstr "zuwenig Speicher beim Erneuern der GNOME-Hinweise"
+-
+-#: ../src/icon.c:229 ../src/wdefaults.c:443
++#: ../src/icon.c:239 ../src/wdefaults.c:443
+ #, c-format
+ msgid "error loading image file \"%s\""
+ msgstr "Fehler beim Laden der Bilddatei \"%s\""
+
+-#: ../src/icon.c:491 ../src/icon.c:500
++#: ../src/icon.c:503 ../src/icon.c:512
+ #, c-format
+ msgid "could not create directory %s"
+ msgstr "Vezeichnis %s konnte nicht erstellt werden"
+
+-#: ../src/icon.c:767
++#: ../src/icon.c:782
+ #, c-format
+ msgid "could not find default icon \"%s\""
+ msgstr "Standardsymbol \"%s\" konnte nicht gefunden werden"
+
+-#: ../src/icon.c:773
++#: ../src/icon.c:788
+ #, c-format
+ msgid "could not load default icon \"%s\":%s"
+ msgstr "Standardsymbol \"%s\" (%s) konnte nicht geöffnet werden"
+
+-#.
+-#. * Warning: If you make some change that affects the order of the
+-#. * entries, you must update the command #defines in the top of
+-#. * this file.
+-#.
+-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
+-msgid "Maximize"
+-msgstr "Maximieren"
+-
+-#: ../src/kwm.c:634 ../src/winmenu.c:566
+-msgid "Unmaximize"
+-msgstr "Ursprüngliche Größe"
+-
+-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
+-msgid "Miniaturize"
+-msgstr "Minimieren"
+-
+-#: ../src/kwm.c:636 ../src/winmenu.c:552
+-msgid "Deminiaturize"
+-msgstr "Wiederherstellen"
+-
+-#: ../src/kwm.c:638
+-msgid "Not Omnipresent"
+-msgstr "Nicht haftend"
+-
+-#: ../src/kwm.c:639
+-msgid "Move"
+-msgstr "Bewegen"
+-
+-#: ../src/kwm.c:640
+-msgid "Resize"
+-msgstr "Größe ändern"
+-
+-#.
+-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+-#.
+-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
+-msgid "Close"
+-msgstr "Schließen"
+-
+-#: ../src/kwm.c:642 ../src/winmenu.c:485
+-msgid "Move To"
+-msgstr "Bewegen nach..."
+-
+-#: ../src/kwm.c:1096
+-msgid "%a(Run Command,Type the command to run:)"
+-msgstr "%a (Befehl zum Ausführen eintippen)"
+-
+-#: ../src/main.c:222
++#: ../src/main.c:220
+ msgid "failed to restart Window Maker."
+ msgstr "Window Maker-Neustart schlug fehl"
+
+-#: ../src/main.c:225
++#: ../src/main.c:223
+ #, c-format
+ msgid "could not exec %s"
+ msgstr "%s konnte nicht ausgeführt werden"
+
+-#: ../src/main.c:271
++#: ../src/main.c:269
+ msgid "Could not execute command: "
+ msgstr "Befehl konnte nicht ausgeführt werden: "
+
+-#: ../src/main.c:428
++#: ../src/main.c:426
+ #, c-format
+ msgid "%s aborted.\n"
+ msgstr "%s wurde abgebrochen.\n"
+
+-#: ../src/main.c:439
++#: ../src/main.c:437
+ #, c-format
+ msgid "Usage: %s [options]\n"
+ msgstr "Benutzung: %s [Optionen]\n"
+
+-#: ../src/main.c:440
++#: ../src/main.c:438
+ msgid "The Window Maker window manager for the X window system"
+-msgstr "Der Window Maker Windowmanager für das X-Window System"
++msgstr "Der Window Maker-Windowmanager für das X-Window System"
+
+-#: ../src/main.c:442
++#: ../src/main.c:440
+ msgid " -display host:dpy\tdisplay to use"
+ msgstr " -display host:dpy\tverwendetes Display"
+
+-#: ../src/main.c:444
++#: ../src/main.c:442
+ msgid " --no-cpp \t\tdisable preprocessing of configuration files"
+-msgstr " --no-cpp \t\tkein Abarbeiten der Konfigurationsdateien"
++msgstr " --no-cpp \t\tkein Präprozessieren der Konfigurationsdateien"
+
+-#: ../src/main.c:446
++#: ../src/main.c:444
+ msgid " --no-dock\t\tdo not open the application Dock"
+ msgstr " --no-dock\t\tAnwendungsdock nicht öffnen"
+
+-#: ../src/main.c:447
++#: ../src/main.c:445
+ msgid " --no-clip\t\tdo not open the workspace Clip"
+ msgstr " --no-clip\t\tArbeitsflächen-Clip nicht öffnen"
+
+-#: ../src/main.c:448
++#: ../src/main.c:446
+ msgid " --no-autolaunch\tdo not autolaunch applications"
+-msgstr " --no-autolaunch\tkein Anwendungs-Autostart"
++msgstr " --no-autolaunch\tkein Autostart von Anwendungen"
+
+-#: ../src/main.c:449
++#: ../src/main.c:447
+ msgid " --dont-restore\t\tdo not restore saved session"
+ msgstr " --dont-restore\t\tgespeicherte Sitzung nicht wiederherstellen"
+
+-#: ../src/main.c:451
++#: ../src/main.c:449
+ msgid " --locale locale\tlocale to use"
+-msgstr " --locale locale\tbenutzte Lokale"
++msgstr " --locale locale\tzu benutzende Lokalisierung"
+
+-#: ../src/main.c:453
++#: ../src/main.c:451
+ msgid " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
+-msgstr " --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit Pseudofarben"
++msgstr ""
++" --create-stdcmap\terstelle Hinweise für Standardfarben-Tabelle mit "
++"Pseudofarben"
+
+-#: ../src/main.c:454
++#: ../src/main.c:452
+ msgid " --visual-id visualid\tvisual id of visual to use"
+ msgstr " --visual-id visualid\tID des zu benutzenden Visuals"
+
+-#: ../src/main.c:455
++#: ../src/main.c:453
+ msgid " --static\t\tdo not update or save configurations"
+ msgstr " --static\t\tKonfiguration nicht ändern oder speichern"
+
+-#: ../src/main.c:456
++#: ../src/main.c:454
+ msgid " --no-polling\t\tdo not periodically check for configuration updates"
+ msgstr " --no-polling\t\tnicht periodisch auf Konfigurationsänderungen testen"
+
+-#: ../src/main.c:458
++#: ../src/main.c:456
+ msgid " --synchronous\t\tturn on synchronous display mode"
+ msgstr " --synchronous\t\tsnychronen Display-Modus einschalten"
+
+-#: ../src/main.c:460
++#: ../src/main.c:458
+ msgid " --version\t\tprint version and exit"
+ msgstr " --version\t\tVersion anzeigen und beenden"
+
+-#: ../src/main.c:461
++#: ../src/main.c:459
+ msgid " --help\t\t\tshow this message"
+ msgstr " --help\t\t\tdiese Nachricht anzeigen"
+
+-#: ../src/main.c:474
++#: ../src/main.c:473
+ #, c-format
+ msgid ""
+ "could not find user GNUstep directory (%s).\n"
+ "Make sure you have installed Window Maker correctly and run wmaker.inst"
+ msgstr ""
+ "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden.\n"
+-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
++"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker."
++"inst aufgerufen haben"
+
+-#: ../src/main.c:479
++#: ../src/main.c:478
+ #, c-format
+ msgid "could not find user GNUstep directory (%s)."
+ msgstr "GNUstep-Verzeichnis (%s) konnte nicht gefunden werden."
+
+-#: ../src/main.c:482
++#: ../src/main.c:481
+ msgid ""
+ "There was an error while creating GNUstep directory, please make sure you "
+ "have installed Window Maker correctly and run wmaker.inst"
+ msgstr ""
+-"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler aufgetreten, "
+-"Stellen Sie sicher, dass sie Window Maker korrekt installiert und wmaker.inst aufgerufen haben"
++"Während der Erstellung der GNUstep-Verzeichnisses ist ein Fehler "
++"aufgetreten, Stellen Sie sicher, dass sie Window Maker korrekt installiert "
++"und wmaker.inst aufgerufen haben"
+
+-#: ../src/main.c:485
++#: ../src/main.c:484
+ #, c-format
+ msgid "%s directory created with default configuration."
+ msgstr "Verzeichnis %s wurde mit Standardkonfiguration erstellt"
+
+-#: ../src/main.c:505 ../src/main.c:510
++#: ../src/main.c:506 ../src/main.c:511
+ #, c-format
+ msgid "%s:could not execute initialization script"
+ msgstr "%s:Initialisierungsskript konnte nicht ausgeführt werden"
+
+-#: ../src/main.c:530 ../src/main.c:535
++#: ../src/main.c:533 ../src/main.c:538
+ #, c-format
+ msgid "%s:could not execute exit script"
+ msgstr "%s: Beendigungsskript konnte nicht ausgeführt werden"
+
+-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
++#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
++#: ../src/main.c:758
+ #, c-format
+ msgid "too few arguments for %s"
+ msgstr "zuwenig Argumente für %s"
+
+-#: ../src/main.c:671
++#: ../src/main.c:742
+ #, c-format
+ msgid "bad value for visualid: \"%s\""
+ msgstr "falscher Wert für Visual-ID: \"%s\""
+
+-#: ../src/main.c:695
++#: ../src/main.c:766
+ #, c-format
+ msgid "%s: invalid argument '%s'\n"
+ msgstr "%s: falsches Argument '%s'\n"
+
+-#: ../src/main.c:696
++#: ../src/main.c:767
+ #, c-format
+ msgid "Try '%s --help' for more information\n"
+ msgstr "Versuchen Sie '%s --help' für mehr Informationen\n"
+
+-#: ../src/main.c:727
++#: ../src/main.c:802
+ msgid "X server does not support locale"
+-msgstr "X-Server unterstützt keine Locales"
++msgstr "X-Server unterstützt gewählte Lokalisierung nicht"
+
+-#: ../src/main.c:731
++#: ../src/main.c:806
+ msgid "cannot set locale modifiers"
+-msgstr "Lokalen-Modifikator konnte nicht gesetzt werden"
++msgstr "Lokalisierungs-Modifikator konnte nicht gesetzt werden"
+
+-#: ../src/main.c:747
++#: ../src/main.c:822
+ #, c-format
+ msgid "could not open display \"%s\""
+ msgstr "Display \"%s\" konnte nicht geöffnet werden"
+
+-#: ../src/menu.c:1255
++#: ../src/menu.c:1276
+ msgid "could not grab keyboard"
+ msgstr "Tastatur konnte nicht abfangen werden"
+
+-#: ../src/menu.c:2569
++#: ../src/menu.c:2615
+ #, c-format
+ msgid "bad value in menus state info:%s"
+ msgstr "falsche Werte in Menü-Statusinfo: %s"
+
+-#: ../src/misc.c:71
++#: ../src/misc.c:65
+ #, c-format
+ msgid "could not define value for %s for cpp"
+-msgstr "Wert für %s für cpp konnte nicht definiert werden"
++msgstr "Wert des Symbols %s für cpp konnte nicht definiert werden"
+
+-#: ../src/misc.c:101
++#: ../src/misc.c:95
+ #, c-format
+ msgid "could not get password entry for UID %i"
+-msgstr "Passwort für UID %i konnte nicht ermittelt werden"
++msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
+
+-#: ../src/misc.c:126
++#: ../src/misc.c:120
+ #, c-format
+ msgid "your machine is misconfigured. HOSTNAME is set to %s"
+ msgstr "Ihr System ist falsch konfiguriert. HOSTNAME wird auf %s gesetzt."
+
+-#: ../src/misc.c:132
++#: ../src/misc.c:126
+ #, c-format
+ msgid "your machine is misconfigured. HOST is set to %s"
+ msgstr "Ihr System ist falsch konfiguriert. HOST wird auf %s gesetzt."
+
+-#: ../src/misc.c:630
++#: ../src/misc.c:621
+ msgid "Program Arguments"
+ msgstr "Programmargumente"
+
+-#: ../src/misc.c:631
++#: ../src/misc.c:622
+ msgid "Enter command arguments:"
+ msgstr "Programmargumente eintragen"
+
+-#: ../src/misc.c:724
+-msgid "unable to get dropped data from DND drop"
+-msgstr "Daten der DND-Operation konnten nicht ermittelt werden"
+-
+-#: ../src/misc.c:732
+-msgid "error getting dropped data from DND drop"
+-msgstr "beim Ermitteln der Daten der DND-Operation ist ein Fehler aufgetreten"
+-
+-#: ../src/misc.c:738
+-msgid "out of memory while getting data from DND drop"
+-msgstr "zuwenig Speicher beim Ermitteln der Daten der DND-Operation"
+-
+-#: ../src/misc.c:783 ../src/misc.c:923
++#: ../src/misc.c:736 ../src/misc.c:874
+ #, c-format
+ msgid "out of memory during expansion of \"%s\""
+ msgstr "zuwenig Speicher bei der Expansion von \"%s\""
+
+-#: ../src/misc.c:837
++#: ../src/misc.c:790
+ msgid "out of memory during expansion of \"%w\""
+ msgstr "zuwenig Speicher bei der Expansion von \"%w\""
+
+-#: ../src/misc.c:855
++#: ../src/misc.c:808
+ msgid "out of memory during expansion of \"%W\""
+ msgstr "zuwenig Speicher bei der Expansion von \"%W\""
+
+-#: ../src/misc.c:871
++#: ../src/misc.c:824
++#, c-format
+ msgid "out of memory during expansion of \"%a\""
+ msgstr "zuwenig Speicher bei der Expansion von \"%a\""
+
+-#: ../src/misc.c:902
++#: ../src/misc.c:853
+ #, c-format
+ msgid "out of memory during expansion of \"%d\""
+ msgstr "zuwenig Speicher bei der Expansion von \"%d\""
+
+-#: ../src/misc.c:916
++#: ../src/misc.c:867
+ msgid "selection not available"
+ msgstr "keine Auswahl verfügbar"
+
+-#: ../src/misc.c:972 ../src/misc.c:978
++#: ../src/misc.c:911 ../src/misc.c:917
+ #, c-format
+ msgid "bad window name value in %s state info"
+ msgstr "falscher Fenstername in Statusinfo von %s"
+
+-#: ../src/misc.c:1235
++#: ../src/misc.c:1156
+ msgid "could not send message to background image helper"
+ msgstr "Nachricht an Hintergrundbild-Anwendung konnte nicht gesendet werden"
+
+@@ -1109,6 +1096,14 @@
+ "Windowsystem-Sitzung beenden?\n"
+ "Ungespeicherte Daten in Anwendungen können verloren gehen."
+
++#.
++#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
++#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
++#.
++#: ../src/rootmenu.c:248 ../src/winmenu.c:501
++msgid "Close"
++msgstr "Schließen"
++
+ #: ../src/rootmenu.c:261
+ msgid "Kill X session"
+ msgstr "Töte X-Sitzung"
+@@ -1121,194 +1116,200 @@
+ "Windowsystem-Sitzung töten?\n"
+ "(alle Anwendungen werden geschlossen)"
+
+-#: ../src/rootmenu.c:536
++#: ../src/rootmenu.c:544
+ #, c-format
+ msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
+ msgstr "%s: ungültiges Tastaturkürzel \"%s\" für Eintrag %s"
+
+-#: ../src/rootmenu.c:544
++#: ../src/rootmenu.c:552
+ #, c-format
+ msgid "%s:invalid key in shortcut \"%s\" for entry %s"
+ msgstr "%s: ungültige Taste in Kürzel \"%s\" für Eintrag %s"
+
+-#: ../src/rootmenu.c:597
++#: ../src/rootmenu.c:605
+ #, c-format
+ msgid "%s: unmatched '\"' in menu file"
+ msgstr "%s: fehlendes \" in Menüdatei"
+
+-#: ../src/rootmenu.c:647
++#: ../src/rootmenu.c:655
+ #, c-format
+ msgid "%s: missing command"
+ msgstr "%s: fehlender Befehl"
+
+-#: ../src/rootmenu.c:679
++#: ../src/rootmenu.c:687
+ #, c-format
+ msgid "invalid OPEN_MENU specification: %s"
+ msgstr "ungültige OPEN_MENU-Beschreibung: %s"
+
+-#: ../src/rootmenu.c:730
++#: ../src/rootmenu.c:738
+ #, c-format
+ msgid "%s:could not stat menu"
+ msgstr "%s: Menü konnte nicht erzeugt werden"
+
+-#: ../src/rootmenu.c:738
++#: ../src/rootmenu.c:746
+ #, c-format
+ msgid "%s:could not stat menu:%s"
+ msgstr "%s: Menü konnte nicht erzeugt werden: %s"
+
+-#: ../src/rootmenu.c:756
++#: ../src/rootmenu.c:764
+ #, c-format
+ msgid "too many parameters in OPEN_MENU: %s"
+ msgstr "zuviele Parameter in OPEN_MENU: %s"
+
+-#: ../src/rootmenu.c:800
++#: ../src/rootmenu.c:808
+ msgid ""
+ "There are more than one WORKSPACE_MENU commands in the applications menu. "
+ "Only one is allowed."
+-msgstr "Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer ist erlaubt."
++msgstr ""
++"Im Anwendungsmenü ist mehr als ein WORKSPACE_MENU-Eintrag, aber nur einer "
++"ist erlaubt."
+
+-#: ../src/rootmenu.c:834
++#: ../src/rootmenu.c:842
+ msgid ""
+ "There are more than one WINDOWS_MENU commands in the applications menu. Only "
+ "one is allowed."
+-msgstr "Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist erlaubt."
++msgstr ""
++"Im Anwendungsmenü ist mehr als ein WINDOWS_MENU-Eintrag, aber nur einer ist "
++"erlaubt."
+
+-#: ../src/rootmenu.c:839
++#: ../src/rootmenu.c:847
+ msgid "Window List"
+ msgstr "Fenster-Liste"
+
+-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
++#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
+ #, c-format
+ msgid "%s:missing parameter for menu command \"%s\""
+ msgstr "%s: fehlender Parameter für Menübefehl \"%s\""
+
+-#: ../src/rootmenu.c:964
++#: ../src/rootmenu.c:972
+ #, c-format
+ msgid "%s:unknown command \"%s\" in menu config."
+ msgstr "%s: unbekannter Befehl \"%s\" in Menükonfiguration"
+
+-#: ../src/rootmenu.c:972
++#: ../src/rootmenu.c:980
+ #, c-format
+ msgid "%s:can't add shortcut for entry \"%s\""
+ msgstr "%s: Tastaturkürzel für Eintrag \"%s\" kann nicht hinzugefügt werden"
+
+-#: ../src/rootmenu.c:1109
++#: ../src/rootmenu.c:1117
+ #, c-format
+ msgid "%s:maximal line size exceeded in menu config: %s"
+ msgstr "%s: überlange Zeilen in Menükonfiguration: %s"
+
+-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
++#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
+ #, c-format
+ msgid "%s:missing command in menu config: %s"
+ msgstr "%s: fehlender Befehl in Menükonfiguration: %s"
+
+-#: ../src/rootmenu.c:1161
++#: ../src/rootmenu.c:1169
+ #, c-format
+ msgid "%s:syntax error in menu file:END declaration missing"
+ msgstr "%s: Syntaxfehler in Menüdatei: END-Schlüsselwort fehlt."
+
+-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
++#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
+ msgid "could not make arguments for menu file preprocessor"
+ msgstr "Argumente für Menüdatei-Präprozessort konnten nicht gesetzt werden"
+
+-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
++#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
+ #, c-format
+ msgid "%s:could not open/preprocess menu file"
+ msgstr "%s: Menüdatei konnte nicht geöffnet/bearbeitet werden"
+
+-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
++#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
+ #, c-format
+ msgid "%s:could not open menu file"
+ msgstr "%s: Menüdatei konnte nicht geöffnet werden"
+
+-#: ../src/rootmenu.c:1236
++#: ../src/rootmenu.c:1244
+ #, c-format
+ msgid "%s:invalid menu file. MENU command is missing"
+ msgstr "%s: ungültige Menüdatei: MENU-Befehl fehlt"
+
+-#: ../src/rootmenu.c:1245
++#: ../src/rootmenu.c:1253
+ msgid "error reading preprocessed menu data"
+ msgstr "Fehler beim Lesen der aufbereiteten Menüdaten"
+
+-#: ../src/rootmenu.c:1338
++#: ../src/rootmenu.c:1348
+ #, c-format
+ msgid "%s:no title given for the root menu"
+ msgstr "%s: kein Titel für das Stammenü"
+
+-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
++#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
+ #, c-format
+ msgid "out of memory while constructing directory menu %s"
+ msgstr "zuwenig Speicher beim Erstellen des Verzeichnismenüs %s"
+
+-#: ../src/rootmenu.c:1439
++#: ../src/rootmenu.c:1449
+ #, c-format
+ msgid "%s:could not stat file \"%s\" in menu directory"
+ msgstr "%s: Datei \"%s\" in Menü-Verzeichnis konnte nicht erstellt werden"
+
+-#: ../src/rootmenu.c:1597
++#: ../src/rootmenu.c:1607
+ msgid "Commands"
+ msgstr "Befehle"
+
+-#: ../src/rootmenu.c:1600
++#: ../src/rootmenu.c:1610
+ msgid "Restart"
+ msgstr "Neustart"
+
+-#: ../src/rootmenu.c:1601
++#: ../src/rootmenu.c:1611
+ msgid "Exit..."
+ msgstr "Beenden..."
+
+-#: ../src/rootmenu.c:1646
++#: ../src/rootmenu.c:1656
+ #, c-format
+ msgid "could not find menu file \"%s\" referenced in WMRootMenu"
+-msgstr "Menüdate \"%s\" aus WMRootMenu konnte nicht gefunden werden"
++msgstr "Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden"
+
+-#: ../src/rootmenu.c:1653
++#: ../src/rootmenu.c:1663
+ #, c-format
+ msgid "could not access menu \"%s\" referenced in WMRootMenu"
+-msgstr "auf Menüdate \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
++msgstr "auf Menüdatei \"%s\" aus WMRootMenu konnte nicht zugegriffen werden"
+
+-#: ../src/rootmenu.c:1664
++#: ../src/rootmenu.c:1674
+ #, c-format
+ msgid ""
+ "using default menu file \"%s\" as the menu referenced in WMRootMenu could "
+ "not be found "
+ msgstr "Standard-Menüdatei \"%s\" aus WMRootMenu konnte nicht gefunden werden "
+
+-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
++#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
+ #, c-format
+ msgid "%s:format error in root menu configuration \"%s\""
+ msgstr "%s: Formatierungsfehler in Stammenü-Konfiguration \"%s\""
+
+-#: ../src/rootmenu.c:1851
++#: ../src/rootmenu.c:1855
+ msgid ""
+ "The applications menu could not be loaded. Look at the console output for a "
+ "detailed description of the errors."
+-msgstr "Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
++msgstr ""
++"Das Anwendungsmenü konnte nicht geladen werden. Für detaillierte "
++"Fehlerbeschreibungen bitte die Konsolenausgabe ansehen."
+
+-#: ../src/screen.c:740
++#: ../src/screen.c:709
+ #, c-format
+ msgid "could not initialize graphics library context: %s"
+ msgstr "Kontext der Grafikbibliothek konnte nicht initialisiert werden: %s"
+
+-#: ../src/screen.c:771
+-msgid "could not do initialization of WINGs widget set"
+-msgstr "WINGs Widgets konnten nicht initialisiert werden"
++#: ../src/screen.c:737
++msgid "could not initialize WINGs widget set"
++msgstr "WINGs-Widgets konnten nicht initialisiert werden"
+
+-#: ../src/screen.c:1139
++#: ../src/screen.c:1144
+ #, c-format
+ msgid "could not save session state in %s"
+ msgstr "Sitzung konnte nicht in %s gespeichert werden"
+
+-#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454
++#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
+ #, c-format
+ msgid "can't convert \"%s\" to boolean"
+-msgstr "\"%s\" konnte nicht in Wahrheitswert konvertiert werden"
++msgstr "\"%s\" konnte nicht in Boolean konvertiert werden"
+
+-#: ../src/session.c:1021
++#: ../src/session.c:1018
+ msgid "out of memory while saving session state"
+ msgstr "zuwenig Speicher beim Sichern der Sitzung"
+
+-#: ../src/session.c:1104
++#: ../src/session.c:1101
+ msgid "end of memory while saving session state"
+ msgstr "zuwenig Speicher beim Sichern der Sitzung"
+
+@@ -1318,107 +1319,42 @@
+ #. * If the sm was the last client of session, then we'll die
+ #. * anyway, otherwise we can continue doing our stuff.
+ #.
+-#: ../src/session.c:1242
++#: ../src/session.c:1239
+ msgid "connection to the session manager was lost"
+ msgstr "Verbindung zum Sitzungsmanager verloren"
+
+-#: ../src/stacking.c:79
++#: ../src/stacking.c:81
+ msgid "could not get window list!!"
+ msgstr "Konnte Fensterliste nicht erstellen!"
+
+-#: ../src/startup.c:202
++#: ../src/startup.c:195
+ #, c-format
+ msgid "internal X error: %s\n"
+ msgstr "interner X-Fehler %s\n"
+
+-#: ../src/startup.c:260
+-#, c-format
+-msgid "got signal %i (%s) - restarting\n"
+-msgstr "Signal %i (%s) erhalten - starte neu...\n"
+-
+-#: ../src/startup.c:262
+-#, c-format
+-msgid "got signal %i - restarting\n"
+-msgstr "Signal %i erhalten - starte neu...\n"
+-
+-#: ../src/startup.c:272
+-#, c-format
+-msgid "got signal %i (%s) - rereading defaults\n"
+-msgstr "Signal %i (%s) erhalten - Standard werden neu eingelesen\n"
+-
+-#: ../src/startup.c:274
+-#, c-format
+-msgid "got signal %i - rereading defaults\n"
+-msgstr "Signal %i erhalten - Standard werden neu eingelesen\n"
+-
+-#: ../src/startup.c:284
+-#, c-format
+-msgid "got signal %i (%s) - exiting...\n"
+-msgstr "Signal %i (%s) erhalten - beende...\n"
+-
+-#: ../src/startup.c:286
+-#, c-format
+-msgid "got signal %i - exiting...\n"
+-msgstr "Signal %i erhalten - beende...\n"
+-
+-#: ../src/startup.c:329
+-#, c-format
+-msgid "got signal %i (%s)\n"
+-msgstr "Signal %i (%s) erhalten\n"
+-
+-#: ../src/startup.c:331
+-#, c-format
+-msgid "got signal %i\n"
+-msgstr "Signal %i erhalten\n"
+-
+-#: ../src/startup.c:342
+-msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
+-msgstr "Beim Aufräumen nach einem Fehler trat ein weiterer Fehler auf. Programm wird sofort angebrochen."
+-
+-#. we try to restart Window Maker
+-#: ../src/startup.c:407
+-msgid "trying to restart Window Maker..."
+-msgstr "versuche, Window Maker neu zu starten..."
+-
+-#: ../src/startup.c:412
+-msgid "trying to start alternate window manager..."
+-msgstr "versuche, anderen Windowmanager zu starten..."
+-
+-#: ../src/startup.c:417
+-msgid "failed to start alternate window manager. Aborting."
+-msgstr "Start eines anderen Windowmanagers schlug fehl. Breche ab."
+-
+-#: ../src/startup.c:419
+-msgid ""
+-"a fatal error has occured, probably due to a bug. Please fill the included "
+-"BUGFORM and report it."
+-msgstr ""
+-"Ein fataler Fehler ist möglicherweise aufgrund eines Programmfehlers aufgetreten. Bitte füllen Sie die "
+-"mitgelieferte BUGFORM aus und schicken sie an bugs@windowmaker.org"
+-
+-#: ../src/startup.c:894
++#: ../src/startup.c:772
+ #, c-format
+ msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
+-msgstr "Symbolgröße ist eingestellt auf %i, aber zu klein. Neue Größe ist 16\n"
++msgstr "Symbolgröße ist eingestellt auf %i, dieser Wert ist zu klein. Neue Größe ist 16\n"
+
+-#: ../src/startup.c:922
++#: ../src/startup.c:801
+ msgid "XKB is not supported. KbdModeLock is automatically disabled."
+ msgstr "XKB wird nicht unterstützt. KbdModeLock wird ausgeschaltet"
+
+-#: ../src/startup.c:941
++#: ../src/startup.c:820
+ msgid "it seems that there is already a window manager running"
+-msgstr "Läuft da nicht schon ein anderer Windowmanager;-)?"
++msgstr "Es sieht aus, als ob schon ein anderer Windowmanager liefe."
+
+-#: ../src/startup.c:947
++#: ../src/startup.c:826
+ #, c-format
+ msgid "could not manage screen %i"
+ msgstr "Konnte Bildschirm %i nicht ansprechen"
+
+-#: ../src/startup.c:1015
++#: ../src/startup.c:885
+ msgid "could not manage any screen"
+ msgstr "kein Bildschirm konnte angesprochen werden"
+
+-#: ../src/switchmenu.c:137
++#: ../src/switchmenu.c:145
+ msgid "Windows"
+ msgstr "Fenster"
+
+@@ -1448,20 +1384,21 @@
+
+ #: ../src/texture.c:598
+ msgid "could not allocate image buffer"
+-msgstr "Bildpuffer konnte nicht allokiert werden"
++msgstr "Bildpuffer konnte nicht erstellt werden"
+
+ #: ../src/wdefaults.c:437
+ #, c-format
+ msgid "could not find icon file \"%s\""
+ msgstr "Symboldatei \"%s\" konnte nicht gefunden werden"
+
+-#: ../src/window.c:2936 ../src/window.c:3075
++#: ../src/window.c:3052 ../src/window.c:3193
+ msgid ""
+ "the NumLock, ScrollLock or similar key seems to be turned on.\n"
+ "Turn it off or some mouse actions and keyboard shortcuts will not work."
+ msgstr ""
+ "Es scheint, dass NumLock, ScrollLock oder ähnliche Tasten aktiviert sind.\n"
+-"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel nicht funktionieren."
++"Schalten Sie diese aus, da sonst einige Mausaktionen oder Tastaturkürzel "
++"nicht funktionieren."
+
+ #: ../src/winmenu.c:125
+ msgid ""
+@@ -1473,30 +1410,39 @@
+ "dabei gehen alle ungespeicherten Daten verloren.\n"
+ "Bitte bestätigen."
+
+-#: ../src/winmenu.c:267 ../src/winmenu.c:276
++#: ../src/winmenu.c:268 ../src/winmenu.c:277
+ msgid "Set Shortcut"
+ msgstr "Setze Kürzel"
+
+-#: ../src/winmenu.c:354 ../src/winmenu.c:399
++#: ../src/winmenu.c:355 ../src/winmenu.c:400
+ msgid "could not create submenu for window menu"
+ msgstr "Untermenü für Fenstermenü konnte nicht erstellt werden"
+
+-#: ../src/winmenu.c:403
++#: ../src/winmenu.c:404
+ msgid "Keep on top"
+ msgstr "Immer oben"
+
+-#: ../src/winmenu.c:408
++#: ../src/winmenu.c:409
+ msgid "Keep at bottom"
+ msgstr "Immer unten"
+
++#.
++#. * Warning: If you make some change that affects the order of the
++#. * entries, you must update the command #defines in the top of
++#. * this file.
++#.
++#: ../src/winmenu.c:437 ../src/winmenu.c:571
++msgid "Maximize"
++msgstr "Maximieren"
++
++#: ../src/winmenu.c:445 ../src/winmenu.c:557
++msgid "Miniaturize"
++msgstr "Minimieren"
++
+ #: ../src/winmenu.c:453 ../src/winmenu.c:588
+ msgid "Shade"
+ msgstr "Aufrollen"
+
+-#: ../src/winmenu.c:473
+-msgid "Hide Others"
+-msgstr "Andere Verstecken"
+-
+ #: ../src/winmenu.c:469
+ msgid "Resize/Move"
+ msgstr "Größe/ Position ändern"
+@@ -1505,6 +1451,10 @@
+ msgid "Select"
+ msgstr "Auswählen"
+
++#: ../src/winmenu.c:485
++msgid "Move To"
++msgstr "Bewegen nach..."
++
+ #: ../src/winmenu.c:490
+ msgid "Attributes..."
+ msgstr "Eigenschaften"
+@@ -1513,30 +1463,38 @@
+ msgid "Options"
+ msgstr "Optionen"
+
++#: ../src/winmenu.c:552
++msgid "Deminiaturize"
++msgstr "Wiederherstellen"
++
++#: ../src/winmenu.c:566
++msgid "Unmaximize"
++msgstr "Ursprüngliche Größe"
++
+ #: ../src/winmenu.c:583
+ msgid "Unshade"
+ msgstr "Abrollen"
+
+-#: ../src/winspector.c:387
++#: ../src/winspector.c:392
+ #, c-format
+ msgid "Could not find icon \"%s\" specified for this window"
+ msgstr "Symbol \"%s\" für dieses Fenster konnte nicht gefunden werden"
+
+-#: ../src/winspector.c:404
++#: ../src/winspector.c:409
+ #, c-format
+ msgid "Could not open specified icon \"%s\":%s"
+ msgstr "Symbol \"%s\" konnte nicht geöffnet werden: %s"
+
+-#: ../src/winspector.c:1121
++#: ../src/winspector.c:1129
+ #, c-format
+ msgid "Inspecting %s.%s"
+ msgstr "Untersuchen von %s.%s"
+
+-#: ../src/winspector.c:1147
++#: ../src/winspector.c:1155
+ msgid "Click in the window you wish to inspect."
+ msgstr "Klicken Sie auf das Fenster, das untersucht werden soll."
+
+-#: ../src/winspector.c:1186
++#: ../src/winspector.c:1194
+ msgid ""
+ "The configuration will apply to all\n"
+ "windows that have their WM_CLASS\n"
+@@ -1546,57 +1504,57 @@
+ "Beim Speichern wirkt sich diese\n"
+ "Konfiguration auf alle Fenster aus,\n"
+ "deren WM_CLASS-Eigenschaft den\n"
+-"obigen Namen hat."
++"obigen Wert hat."
+
+-#: ../src/winspector.c:1215
++#: ../src/winspector.c:1223
+ msgid "Save"
+ msgstr "Speichern"
+
+-#: ../src/winspector.c:1223
++#: ../src/winspector.c:1231
+ msgid "Apply"
+ msgstr "Anwenden"
+
+-#: ../src/winspector.c:1229
++#: ../src/winspector.c:1237
+ msgid "Reload"
+ msgstr "Neu laden"
+
+-#: ../src/winspector.c:1238 ../src/winspector.c:1248
++#: ../src/winspector.c:1246 ../src/winspector.c:1256
+ msgid "Window Specification"
+ msgstr "Fensterbeschreibung"
+
+-#: ../src/winspector.c:1239
++#: ../src/winspector.c:1247
+ msgid "Window Attributes"
+ msgstr "Fenstereigenschaften"
+
+-#: ../src/winspector.c:1240
++#: ../src/winspector.c:1248
+ msgid "Advanced Options"
+ msgstr "Erweiterte Optionen"
+
+-#: ../src/winspector.c:1241
++#: ../src/winspector.c:1249
+ msgid "Icon and Initial Workspace"
+ msgstr "Symbol und Start-Arbeitsfläche"
+
+-#: ../src/winspector.c:1242
++#: ../src/winspector.c:1250
+ msgid "Application Specific"
+ msgstr "Anwendungsspezifisches"
+
+-#: ../src/winspector.c:1256
++#: ../src/winspector.c:1264
+ msgid "Defaults for all windows"
+ msgstr "Standards für alle Fenster"
+
+-#: ../src/winspector.c:1310
++#: ../src/winspector.c:1318
+ msgid "Select window"
+ msgstr "Fenster auswählen"
+
+-#: ../src/winspector.c:1324
++#: ../src/winspector.c:1332
+ msgid "Attributes"
+ msgstr "Eigenschaften"
+
+-#: ../src/winspector.c:1335
++#: ../src/winspector.c:1343
+ msgid "Disable titlebar"
+ msgstr "Keine Titelleiste"
+
+-#: ../src/winspector.c:1337
++#: ../src/winspector.c:1345
+ msgid ""
+ "Remove the titlebar of this window.\n"
+ "To access the window commands menu of a window\n"
+@@ -1608,43 +1566,43 @@
+ "Für das Fenstermenü drücken Sie bitte Strg+Esc\n"
+ "bzw. die von Ihnen eingestellte Tastenkombination."
+
+-#: ../src/winspector.c:1344
++#: ../src/winspector.c:1352
+ msgid "Disable resizebar"
+-msgstr "Keine Leiste zum Ändern der Größe"
++msgstr "Keine Leiste für Größenänderung"
+
+-#: ../src/winspector.c:1346
++#: ../src/winspector.c:1354
+ msgid "Remove the resizebar of this window."
+ msgstr "Entfernen der Leiste zum Ändern der Größe bei diesem Fenster."
+
+-#: ../src/winspector.c:1349
++#: ../src/winspector.c:1357
+ msgid "Disable close button"
+ msgstr "Keine Schließen-Schaltfläche"
+
+-#: ../src/winspector.c:1351
++#: ../src/winspector.c:1359
+ msgid "Remove the `close window' button of this window."
+ msgstr "Entfernen der 'Fenster schließen'-Schaltfläche für dieses Fensters"
+
+-#: ../src/winspector.c:1354
++#: ../src/winspector.c:1362
+ msgid "Disable miniaturize button"
+ msgstr "Keine Minimieren-Schaltfläche"
+
+-#: ../src/winspector.c:1356
++#: ../src/winspector.c:1364
+ msgid "Remove the `miniaturize window' button of the window."
+ msgstr "Entfernen der 'Fenster minimieren'-Schaltfläche für dieses Fenster"
+
+-#: ../src/winspector.c:1359
++#: ../src/winspector.c:1367
+ msgid "Disable border"
+ msgstr "Kein Rand"
+
+-#: ../src/winspector.c:1361
++#: ../src/winspector.c:1369
+ msgid "Remove the 1 pixel black border around the window."
+-msgstr "Entfernen des ein Pixel breiten schwarzen Randes um das Fenster."
++msgstr "Entfernen des einen Pixel breiten schwarzen Randes um das Fenster."
+
+-#: ../src/winspector.c:1364
++#: ../src/winspector.c:1372
+ msgid "Keep on top (floating)"
+ msgstr "Immer oben"
+
+-#: ../src/winspector.c:1366
++#: ../src/winspector.c:1374
+ msgid ""
+ "Keep the window over other windows, not allowing\n"
+ "them to cover it."
+@@ -1652,43 +1610,43 @@
+ "Dieses Fenster immer oben halten, sodass es nicht\n"
+ "von anderen Fenstern verdeckt wird"
+
+-#: ../src/winspector.c:1370
++#: ../src/winspector.c:1378
+ msgid "Keep at bottom (sunken)"
+ msgstr "Immer unten"
+
+-#: ../src/winspector.c:1372
++#: ../src/winspector.c:1380
+ msgid "Keep the window under all other windows."
+ msgstr "Dieses Fenster unter allen anderen Fenster platzieren"
+
+-#: ../src/winspector.c:1377
++#: ../src/winspector.c:1385
+ msgid "Make window present in all workspaces."
+ msgstr "Dieses Fenster auf allen Arbeitsflächen sichtbar machen"
+
+-#: ../src/winspector.c:1380
++#: ../src/winspector.c:1388
+ msgid "Start miniaturized"
+ msgstr "Minimiert starten"
+
+-#: ../src/winspector.c:1382
++#: ../src/winspector.c:1390
+ msgid ""
+ "Make the window be automatically miniaturized when it's\n"
+ "first shown."
+ msgstr "Dieses Fenster beim Start automatisch minimieren"
+
+-#: ../src/winspector.c:1386
++#: ../src/winspector.c:1394
+ msgid "Start maximized"
+ msgstr "Maximiert starten"
+
+-#: ../src/winspector.c:1388
++#: ../src/winspector.c:1396
+ msgid ""
+ "Make the window be automatically maximized when it's\n"
+ "first shown."
+-msgstr "Dieses Fenster wird beim Start automatisch maximiert"
++msgstr "Dieses Fenster beim Start automatisch maximieren"
+
+-#: ../src/winspector.c:1392
++#: ../src/winspector.c:1400
+ msgid "Full screen maximization"
+ msgstr "Vollbild-Maximierung"
+
+-#: ../src/winspector.c:1394
++#: ../src/winspector.c:1402
+ msgid ""
+ "Make the window use the whole screen space when it's\n"
+ "maximized. The titlebar and resizebar will be moved\n"
+@@ -1698,15 +1656,15 @@
+ "ausdehnen, Titel- und Größenleiste befinden sich dann außerhalb\n"
+ "des Bildschirms."
+
+-#: ../src/winspector.c:1411
++#: ../src/winspector.c:1419
+ msgid "Advanced"
+ msgstr "Erweitert"
+
+-#: ../src/winspector.c:1428
++#: ../src/winspector.c:1436
+ msgid "Do not bind keyboard shortcuts"
+ msgstr "Keine Tastatur-Kürzel abfangen"
+
+-#: ../src/winspector.c:1430
++#: ../src/winspector.c:1438
+ msgid ""
+ "Do not bind keyboard shortcuts from Window Maker\n"
+ "when this window is focused. This will allow the\n"
+@@ -1714,14 +1672,14 @@
+ "of your shortcut configuration."
+ msgstr ""
+ "Keine globalen Window Maker-Tastaturkürzel abfangen,\n"
+-"wenn dieses Fenster maximiert ist. Dadurch erhalt dieses\n"
++"wenn dieses Fenster maximiert ist. Dadurch erhält dieses\n"
+ "Fenster alle Tastendrücke."
+
+-#: ../src/winspector.c:1436
++#: ../src/winspector.c:1444
+ msgid "Do not bind mouse clicks"
+ msgstr "Kein Mausklicks abfangen"
+
+-#: ../src/winspector.c:1438
++#: ../src/winspector.c:1446
+ msgid ""
+ "Do not bind mouse actions, such as `Alt'+drag\n"
+ "in the window (when alt is the modifier you haveconfigured)."
+@@ -1729,29 +1687,29 @@
+ "Für dieses Fenster keine Mausaktionen abfangen,\n"
+ "zum Beispiel Alt+Ziehen."
+
+-#: ../src/winspector.c:1443
++#: ../src/winspector.c:1451
+ msgid "Do not show in the window list"
+ msgstr "Nicht in der Fensterliste zeigen"
+
+-#: ../src/winspector.c:1445
++#: ../src/winspector.c:1453
+ msgid "Do not list the window in the window list menu."
+ msgstr "Dieses Fenster nicht in der Fensterliste aufführen."
+
+-#: ../src/winspector.c:1448
++#: ../src/winspector.c:1456
+ msgid "Do not let it take focus"
+ msgstr "Keinen Fokus erlauben"
+
+-#: ../src/winspector.c:1450
++#: ../src/winspector.c:1458
+ msgid ""
+ "Do not let the window take keyboard focus when you\n"
+ "click on it."
+ msgstr "Diesem Fenster beim Klick nicht den Tastaturfokus geben."
+
+-#: ../src/winspector.c:1454
++#: ../src/winspector.c:1462
+ msgid "Keep inside screen"
+ msgstr "Immer innerhalb des Bildschirmes"
+
+-#: ../src/winspector.c:1456
++#: ../src/winspector.c:1464
+ msgid ""
+ "Do not allow the window to move itself completely\n"
+ "outside the screen. For bug compatibility.\n"
+@@ -1759,21 +1717,21 @@
+ "Diesem Fenster nicht erlauben, ganz aus dem Bildschirm\n"
+ "bewegt zu werden.\n"
+
+-#: ../src/winspector.c:1460
++#: ../src/winspector.c:1468
+ msgid "Ignore 'Hide Others'"
+-msgstr "Ignoriere 'Andere Verstecken'"
++msgstr "Ignoriere 'Andere verstecken'"
+
+-#: ../src/winspector.c:1462
++#: ../src/winspector.c:1470
+ msgid ""
+ "Do not hide the window when issuing the\n"
+ "`HideOthers' command."
+-msgstr "Beim AndereVerstecken-Befehl dieses Fenster auslassen."
++msgstr "Beim 'Andere verstecken'-Befehl dieses Fenster auslassen."
+
+-#: ../src/winspector.c:1466
++#: ../src/winspector.c:1474
+ msgid "Ignore 'Save Session'"
+ msgstr "'Sitzung speichern' ignorieren"
+
+-#: ../src/winspector.c:1468
++#: ../src/winspector.c:1476
+ msgid ""
+ "Do not save the associated application in the\n"
+ "session's state, so that it won't be restarted\n"
+@@ -1784,11 +1742,11 @@
+ "im Sitzungszustand speichern, sodass sie beim\n"
+ "Start von Window Maker nicht gestartet wird."
+
+-#: ../src/winspector.c:1474
++#: ../src/winspector.c:1482
+ msgid "Emulate application icon"
+ msgstr "Anwendungssymbol ignorieren"
+
+-#: ../src/winspector.c:1476
++#: ../src/winspector.c:1484
+ msgid ""
+ "Make this window act as an application that provides\n"
+ "enough information to Window Maker for a dockable\n"
+@@ -1798,55 +1756,55 @@
+ "es genügend Informationen für eine dockbare\n"
+ "Anwendung an Window Maker liefern würde."
+
+-#: ../src/winspector.c:1482
++#: ../src/winspector.c:1490
+ msgid "Disable language button"
+ msgstr "Keine Sprachen-Schaltfläche"
+
+-#: ../src/winspector.c:1484
++#: ../src/winspector.c:1492
+ msgid "Remove the `toggle language' button of the window."
+ msgstr "Entfern der 'Wechsle Sprache'-Schaltfläche bei diesem Fenster"
+
+-#: ../src/winspector.c:1501
++#: ../src/winspector.c:1509
+ msgid "Miniwindow Image"
+ msgstr "Minifenster-Bild"
+
+-#: ../src/winspector.c:1528
++#: ../src/winspector.c:1536
+ msgid "Icon filename:"
+ msgstr "Symboldateiname"
+
+-#: ../src/winspector.c:1541
++#: ../src/winspector.c:1549
+ msgid "Ignore client supplied icon"
+ msgstr "Ignoriere zur Verfügung gestelltes Symbol"
+
+-#: ../src/winspector.c:1548
++#: ../src/winspector.c:1556
+ msgid "Initial Workspace"
+ msgstr "Start-Arbeitsfläche"
+
+-#: ../src/winspector.c:1550
++#: ../src/winspector.c:1558
+ msgid "The workspace to place the window when it'sfirst shown."
+ msgstr "Die Arbeitsfläche, auf dem das Fenster beim Start erscheinen soll"
+
+-#: ../src/winspector.c:1556
++#: ../src/winspector.c:1564
+ msgid "Nowhere in particular"
+-msgstr "Ist mir eigentlich egal"
++msgstr "Keine Angabe"
+
+-#: ../src/winspector.c:1574
++#: ../src/winspector.c:1582
+ msgid "Application Attributes"
+ msgstr "Anwendungseigenschaften"
+
+-#: ../src/winspector.c:1585
++#: ../src/winspector.c:1593
+ msgid "Start hidden"
+ msgstr "Versteckt starten"
+
+-#: ../src/winspector.c:1587
++#: ../src/winspector.c:1595
+ msgid "Automatically hide application when it's started."
+ msgstr "Anwendung beim Start automatisch verstecken"
+
+-#: ../src/winspector.c:1590
++#: ../src/winspector.c:1598
+ msgid "No application icon"
+ msgstr "Kein Anwendungssymbol"
+
+-#: ../src/winspector.c:1592
++#: ../src/winspector.c:1600
+ msgid ""
+ "Disable the application icon for the application.\n"
+ "Note that you won't be able to dock it anymore,\n"
+@@ -1858,36 +1816,36 @@
+ "docken lässt und bereits gedockte Symbole nicht mehr korrekt\n"
+ "arbeiten."
+
+-#: ../src/winspector.c:1598
++#: ../src/winspector.c:1606
+ msgid "Shared application icon"
+ msgstr "Geteiltes Anwendungssymbol"
+
+-#: ../src/winspector.c:1600
++#: ../src/winspector.c:1608
+ msgid ""
+ "Use a single shared application icon for all of\n"
+ "the instances of this application.\n"
+ msgstr ""
+ "Für alle Instanzen dieser Anwendung ein\n"
+-"einziges Symbol verwenden.\n"
++"einziges Anwendungssymbol verwenden.\n"
+
+-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
++#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
+ #, c-format
+ msgid "Workspace %i"
+ msgstr "Arbeitsfläche: %i"
+
+-#: ../src/workspace.c:926
++#: ../src/workspace.c:1352
+ msgid "Workspaces"
+ msgstr "Arbeitsflächen"
+
+-#: ../src/workspace.c:928
++#: ../src/workspace.c:1354
+ msgid "could not create Workspace menu"
+ msgstr "Arbeitsflächenmenü konnte nicht erstellt werden"
+
+-#: ../src/workspace.c:935
++#: ../src/workspace.c:1361
+ msgid "New"
+ msgstr "Neu"
+
+-#: ../src/workspace.c:936
++#: ../src/workspace.c:1362
+ msgid "Destroy Last"
+-msgstr "Letztes zerstören"
++msgstr "Letzten zerstören"
+
+diff -Nur WindowMaker-0.92.0.orig/po/et.po WindowMaker-0.92.0/po/et.po
+--- WindowMaker-0.92.0.orig/po/et.po 2004-10-26 05:52:38.000000000 +0200
++++ WindowMaker-0.92.0/po/et.po 2006-01-22 20:07:15.000000000 +0100
+@@ -1,10 +1,14 @@
+-# Estonian translation of Window Maker
+-# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+-# Ivar Smolin <okul@linux.ee>, 2000, 2001
++# Window Maker'i eesti keele tõlge.
++# Estonian translation of Window Maker.
++#
++# Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc.
++# Ivar Smolin <okul@linux.ee>, 2000, 2001, 2005
++#
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Window Maker 0.70.0\n"
+-"POT-Creation-Date: 2001-12-17 23:29+0200\n"
++"Project-Id-Version: Window Maker 0.92.0\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2005-08-11 23:45+0300\n"
+ "PO-Revision-Date: 2001-12-17 23:30+0200\n"
+ "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
+ "Language-Team: Estonian <et@li.org>\n"
+@@ -12,25 +16,25 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325
+-#: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1850
+-#: ../src/winspector.c:389 ../src/winspector.c:406
++#: ../src/appicon.c:415 ../src/dialog.c:295 ../src/dock.c:3335
++#: ../src/dockedapp.c:231 ../src/main.c:271 ../src/rootmenu.c:1854
++#: ../src/winspector.c:394 ../src/winspector.c:411
+ msgid "Error"
+ msgstr "Viga"
+
+-#: ../src/appicon.c:427
++#: ../src/appicon.c:416
+ msgid "Could not open specified icon file"
+-msgstr "Ei õnnestu avada kirjeldatud ikoonifaili"
++msgstr "Kirjeldatud ikoonifaili pole võimalik avada"
+
+-#: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282
+-#: ../src/dialog.c:729 ../src/dialog.c:1792 ../src/dock.c:526
+-#: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326
+-#: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273
+-#: ../src/rootmenu.c:1854 ../src/winspector.c:390 ../src/winspector.c:407
++#: ../src/appicon.c:417 ../src/dialog.c:192 ../src/dialog.c:295
++#: ../src/dialog.c:725 ../src/dialog.c:1797 ../src/dock.c:515
++#: ../src/dock.c:523 ../src/dock.c:547 ../src/dock.c:3336
++#: ../src/dockedapp.c:232 ../src/dockedapp.c:427 ../src/main.c:271
++#: ../src/rootmenu.c:1858 ../src/winspector.c:395 ../src/winspector.c:412
+ msgid "OK"
+-msgstr "OK"
++msgstr "Olgu"
+
+-#: ../src/appicon.c:456 ../src/dock.c:264
++#: ../src/appicon.c:445 ../src/dock.c:244
+ msgid ""
+ " will be forcibly closed.\n"
+ "Any unsaved changes will be lost.\n"
+@@ -38,344 +42,377 @@
+ msgstr ""
+ " suletakse jõuga.\n"
+ "Kõik salvestamata andmed lähevad kaotsi.\n"
+-"Kas soovite seda teha?"
++"Kas soovid seda teha?"
+
+-#: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:124
++#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124
+ msgid "Kill Application"
+ msgstr "Programmi kõrvaldamine"
+
+-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
++#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
+ msgid "Yes"
+ msgstr "Jah"
+
+-#: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:126
++#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126
+ msgid "No"
+ msgstr "Ei"
+
+-#: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491
++#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501
+ msgid "Unhide Here"
+ msgstr "Too siia töölauale"
+
+-#: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179
+-#: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:461
++#: ../src/appicon.c:485 ../src/appicon.c:510 ../src/dock.c:1170
++#: ../src/dock.c:1172 ../src/dock.c:3513 ../src/winmenu.c:461
+ msgid "Hide"
+ msgstr "Peida"
+
+-#: ../src/appicon.c:497
++#: ../src/appicon.c:486
+ msgid "Set Icon..."
+-msgstr "Vali ikoon..."
++msgstr "Ikooni määramine..."
+
+-#: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248
++#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248
+ #: ../src/rootmenu.c:264 ../src/winmenu.c:508
+ msgid "Kill"
+ msgstr "Kõrvalda"
+
+-#: ../src/appicon.c:519 ../src/dock.c:3501
++#: ../src/appicon.c:508 ../src/dock.c:3511
+ msgid "Unhide"
+ msgstr "Too nähtavale"
+
+-#: ../src/application.c:397
++#: ../src/application.c:405
+ #, c-format
+ msgid "recreating missing icon '%s'"
+-msgstr "loon uuesti puuduva ikooni '%s'"
++msgstr "puuduva ikooni '%s' uuestiloomine"
+
+-#: ../src/defaults.c:923 ../src/startup.c:885 ../src/startup.c:903
+-#: ../src/startup.c:909
++#: ../src/defaults.c:930 ../src/defaults.c:1148
++#, c-format
++msgid "Domain %s (%s) of global defaults database is corrupted!"
++msgstr "Üldiste vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
++
++#: ../src/defaults.c:935
++#, c-format
++msgid "could not load domain %s from global defaults database"
++msgstr ""
++"domeeni %s pole võimalik globaalsete vaikeväärtuste andmebaasist laadida"
++
++#: ../src/defaults.c:1034 ../src/defaults.c:1049
++#, c-format
++msgid "invalid global menu file %s"
++msgstr "vigane globaalmenüü fail %s"
++
++#: ../src/defaults.c:1077 ../src/startup.c:761 ../src/startup.c:779
++#: ../src/startup.c:786
+ #, c-format
+ msgid "could not read domain \"%s\" from defaults database"
+-msgstr "ei õnnestu lugeda domeeni \"%s\" vaikeväärtuste andmebaasist"
++msgstr "domeeni \"%s\" pole võimalik vaikeväärtuste andmebaasist lugeda"
+
+-#: ../src/defaults.c:969 ../src/defaults.c:1086 ../src/defaults.c:1124
+-#: ../src/defaults.c:1170
++#: ../src/defaults.c:1123 ../src/defaults.c:1237 ../src/defaults.c:1278
++#: ../src/defaults.c:1334
+ #, c-format
+ msgid "Domain %s (%s) of defaults database is corrupted!"
+-msgstr "Domeen %s (%s) vaikeväärtuste andmebaasis on katki!"
++msgstr "Vaikeväärtuste andmebaasi domeen %s (%s) on rikutud!"
+
+-#: ../src/defaults.c:974 ../src/defaults.c:1106 ../src/defaults.c:1153
+-#: ../src/defaults.c:1179 ../src/menureader.c:397
++#: ../src/defaults.c:1137 ../src/defaults.c:1257 ../src/defaults.c:1314
++#: ../src/defaults.c:1344
+ #, c-format
+ msgid "could not load domain %s from user defaults database"
+-msgstr "ei õnnestu lugeda domeeni %s kasutaja vaikeväärtuste andmebaasist"
++msgstr "domeeni %s pole võimalik kasutaja vaikeväärtuste andmebaasist lugeda"
+
+-#: ../src/defaults.c:985 ../src/defaults.c:1071
+-#, c-format
+-msgid "Domain %s (%s) of global defaults database is corrupted!"
+-msgstr "Üldise vaikeväärtuste andmebaasi domeen %s (%s) on katki!"
+-
+-#: ../src/defaults.c:1004
++#: ../src/defaults.c:1167
+ #, c-format
+ msgid "could not load domain %s from global defaults database (%s)"
+ msgstr ""
+-"ei õnnestu laadida domeeni %s üldisest vaikeväärtuste andmebaasist (%s)"
+-
+-#: ../src/defaults.c:1076
+-#, c-format
+-msgid "could not load domain %s from global defaults database"
+-msgstr "ei õnnestu laadida domeeni %s globaalsete vaikeväärtuste andmebaasist"
++"domeeni %s pole võimalik üldisest vaikeväärtuste andmebaasist (%s) laadida"
+
+-#: ../src/defaults.c:1143 ../src/screen.c:458
++#: ../src/defaults.c:1304 ../src/screen.c:419
+ #, c-format
+ msgid "could not load logo image for panels: %s"
+-msgstr "ei õnnestu laadida paneelide logopilti: %s"
++msgstr "paneelidele pole logopilti võimalik laadida: %s"
+
+ #. --------------------------- Local -----------------------
+-#: ../src/defaults.c:1388 ../src/defaults.c:1530 ../src/defaults.c:1642
+-#: ../src/defaults.c:2121 ../src/defaults.c:2138 ../src/defaults.c:2183
+-#: ../src/defaults.c:2230 ../src/defaults.c:2703 ../src/wdefaults.c:570
+-#: ../src/wdefaults.c:606
++#: ../src/defaults.c:1553 ../src/defaults.c:1692 ../src/defaults.c:1812
++#: ../src/defaults.c:2290 ../src/defaults.c:2307 ../src/defaults.c:2352
++#: ../src/defaults.c:2399 ../src/defaults.c:2872 ../src/wdefaults.c:571
++#: ../src/wdefaults.c:604
+ #, c-format
+ msgid "Wrong option format for key \"%s\". Should be %s."
+-msgstr "Vigane formaat võtmele \"%s\". Peaks olema %s."
++msgstr "Vigane vorming võtmele \"%s\". Peaks olema %s."
+
+-#: ../src/defaults.c:1390 ../src/defaults.c:1471 ../src/defaults.c:1503
+-#: ../src/defaults.c:1535 ../src/defaults.c:1548 ../src/defaults.c:1563
+-#: ../src/defaults.c:1577 ../src/defaults.c:1647 ../src/defaults.c:1659
+-#: ../src/defaults.c:2126 ../src/defaults.c:2143 ../src/defaults.c:2156
+-#: ../src/defaults.c:2188 ../src/defaults.c:2204 ../src/defaults.c:2235
+-#: ../src/defaults.c:2322 ../src/defaults.c:2708 ../src/defaults.c:2719
++#: ../src/defaults.c:1555 ../src/defaults.c:1636 ../src/defaults.c:1666
++#: ../src/defaults.c:1697 ../src/defaults.c:1710 ../src/defaults.c:1725
++#: ../src/defaults.c:1739 ../src/defaults.c:1817 ../src/defaults.c:1829
++#: ../src/defaults.c:2295 ../src/defaults.c:2312 ../src/defaults.c:2325
++#: ../src/defaults.c:2357 ../src/defaults.c:2373 ../src/defaults.c:2404
++#: ../src/defaults.c:2491 ../src/defaults.c:2877 ../src/defaults.c:2888
+ #, c-format
+ msgid "using default \"%s\" instead"
+-msgstr "selle asemel kasutan vaikimisi \"%s\""
++msgstr "selle asemel kasutatakse vaikimisi \"%s\""
+
+-#: ../src/defaults.c:1421
++#: ../src/defaults.c:1586
+ #, c-format
+ msgid "wrong option value for key \"%s\". Should be one of %s"
+-msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks %s väärtustest"
++msgstr "vigane valikuväärtus võtmele \"%s\". Peab olema üks väärtustest %s"
+
+-#: ../src/defaults.c:1466
++#: ../src/defaults.c:1631
+ #, c-format
+ msgid "can't convert \"%s\" to boolean for key \"%s\""
+-msgstr "ei õnnestu teisendada \"%s\" võtme \"%s\" loogikaväärtuseks"
++msgstr ""
++"väärtust \"%s\" pole võimalik võtme \"%s\" loogikaväärtuseks teisendada"
+
+-#: ../src/defaults.c:1500
++#: ../src/defaults.c:1663
+ #, c-format
+ msgid "can't convert \"%s\" to integer for key \"%s\""
+-msgstr "ei õnnestu teisendada \"%s\" täisarvuks võtmele \"%s\""
++msgstr ""
++"väärtust \"%s\" pole võimalik võtme \"%s\" täisarvuliseks väärtuseks "
++"teisendada"
+
+-#: ../src/defaults.c:1543
++#: ../src/defaults.c:1705
+ #, c-format
+ msgid "Incorrect number of elements in array for key \"%s\"."
+-msgstr "Ebatäpne massiivi elementide arv võtmele \"%s\"."
++msgstr "Vigane massiivi elementide arv võtmele \"%s\"."
+
+-#: ../src/defaults.c:1558
++#: ../src/defaults.c:1720
+ #, c-format
+ msgid "Wrong value for key \"%s\". Should be Coordinate."
+-msgstr "Vale võtme \"%s\" väärtus. Peaksid olemad koordinaadid."
++msgstr "Vale väärtus võtmele \"%s\". Peaks olema koordinaat."
+
+-#: ../src/defaults.c:1573
++#: ../src/defaults.c:1735
+ #, c-format
+ msgid "can't convert array to integers for \"%s\"."
+-msgstr "ei õnnestu teisendada massiivi täisarvudeks \"%s\" jaoks."
++msgstr "väärtust pole võimalik \"%s\" täisarvude massiiviks teisendada."
+
+-#: ../src/defaults.c:1771 ../src/defaults.c:1803 ../src/defaults.c:1819
+-#: ../src/defaults.c:1848 ../src/defaults.c:1871 ../src/defaults.c:1924
+-#: ../src/defaults.c:1964 ../src/defaults.c:2002 ../src/defaults.c:2018
++#: ../src/defaults.c:1940 ../src/defaults.c:1972 ../src/defaults.c:1988
++#: ../src/defaults.c:2017 ../src/defaults.c:2040 ../src/defaults.c:2093
++#: ../src/defaults.c:2133 ../src/defaults.c:2171 ../src/defaults.c:2187
+ #, c-format
+ msgid "\"%s\" is not a valid color name"
+-msgstr "\"%s\" ei ole korrektne värvi nimetus"
++msgstr "\"%s\" pole korrektne värvi nimetus"
+
+-#: ../src/defaults.c:1784 ../src/defaults.c:1836
++#: ../src/defaults.c:1953 ../src/defaults.c:2005
+ msgid "bad number of arguments in gradient specification"
+ msgstr "vigane argumentide arv hajusülemineku kirjelduses"
+
+-#: ../src/defaults.c:1897
++#: ../src/defaults.c:2066
+ msgid "too few arguments in multicolor gradient specification"
+ msgstr "liiga vähe argumente mitmevärvilise hajusülemineku kirjelduses"
+
+-#: ../src/defaults.c:1991
++#: ../src/defaults.c:2160
+ msgid "bad number of arguments in textured gradient specification"
+ msgstr "vigane argumentide arv tekstuuriga hajusülemineku kirjelduses"
+
+-#: ../src/defaults.c:2034
++#: ../src/defaults.c:2203
+ #, c-format
+ msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
+ msgstr ""
+ "vigane tumeduse väärtus tgradient tekstuurile \"%s\". Peaks olema [0..255]"
+
+-#: ../src/defaults.c:2094
++#: ../src/defaults.c:2263
+ #, c-format
+ msgid "could not initialize library %s"
+-msgstr "ei õnnestu lähtestada teeki %s"
++msgstr "teeki %s pole võimalik lähtestada"
+
+-#: ../src/defaults.c:2097
++#: ../src/defaults.c:2266
+ #, c-format
+ msgid "could not find function %s::%s"
+-msgstr "ei õnnestu leida funktsiooni %s::%s"
++msgstr "funktsiooni %s::%s pole võimalik leida"
+
+-#: ../src/defaults.c:2104
++#: ../src/defaults.c:2273
+ #, c-format
+ msgid "invalid texture type %s"
+ msgstr "vigane tekstuuri tüüp %s"
+
+-#: ../src/defaults.c:2151
++#: ../src/defaults.c:2320
+ #, c-format
+ msgid "Error in texture specification for key \"%s\""
+ msgstr "Viga võtme \"%s\" tekstuuri kirjelduses"
+
+-#: ../src/defaults.c:2200
++#: ../src/defaults.c:2369
+ msgid "Wrong type for workspace background. Should be a texture type."
+ msgstr "Vigane töölaua tausta tüüp. Peaks olema tekstuur-tüüpi."
+
+-#: ../src/defaults.c:2248
++#: ../src/defaults.c:2417
+ #, c-format
+ msgid "Wrong type for background of workspace %i. Should be a texture."
+ msgstr "Vigane töölaua %i tausta tüüp. Peaks olema tekstuur-tüüpi."
+
+-#: ../src/defaults.c:2290
++#: ../src/defaults.c:2459
+ msgid "could not load any usable font!!!"
+-msgstr "ei õnnestu laadid ühtki kasutuskõlblikku shrifti!!!"
++msgstr "ei õnnestu laadida ühtki kasutuskõlblikku kirjatüüpi!!!"
+
+-#: ../src/defaults.c:2317
++#: ../src/defaults.c:2486
+ #, c-format
+ msgid "could not get color for key \"%s\""
+-msgstr "ei õnnestu leida värvi võtmele \"%s\""
++msgstr "võtmele \"%s\" pole võimali värvi hankida"
+
+-#: ../src/defaults.c:2375 ../src/rootmenu.c:523
++#: ../src/defaults.c:2544 ../src/rootmenu.c:531
+ #, c-format
+-msgid "%s:invalid key modifier \"%s\""
+-msgstr "%s: vigane võtme muutja \"%s\""
++msgid "%s: invalid key modifier \"%s\""
++msgstr "%s: vigane võtmemuutja \"%s\""
+
+-#: ../src/defaults.c:2387
++#: ../src/defaults.c:2556
+ #, c-format
+ msgid "%s:invalid kbd shortcut specification \"%s\""
+ msgstr "%s: vigane kiirklahvi kirjeldus \"%s\""
+
+-#: ../src/defaults.c:2394
++#: ../src/defaults.c:2563
+ #, c-format
+ msgid "%s:invalid key in shortcut \"%s\""
+-msgstr "%s: vigane võti kiirklahvil \"%s\""
++msgstr "%s: vigane võti kiirklahvile \"%s\""
+
+-#: ../src/defaults.c:2419
++#: ../src/defaults.c:2588
+ #, c-format
+ msgid "%s: modifier key %s is not valid"
+-msgstr "%s: muutmisklahv %s on vigane"
++msgstr "%s: muuteklahv %s on vigane"
+
+-#: ../src/defaults.c:2451
++#: ../src/defaults.c:2620
+ #, c-format
+ msgid "could not load image in option %s: %s"
+-msgstr "ei õnnestu pildi laadimine valikus %s: %s"
++msgstr "pildi laadimine valikus %s pole võimalik: %s"
+
+-#: ../src/defaults.c:2568
++#: ../src/defaults.c:2737
+ #, c-format
+ msgid "failed to open bitmap file \"%s\""
+-msgstr "ei õnnestu avada pildifaili \"%s\""
++msgstr "pildifaili \"%s\" pole võimalik avada"
+
+-#: ../src/defaults.c:2571
++#: ../src/defaults.c:2740
+ #, c-format
+ msgid "\"%s\" is not a valid bitmap file"
+ msgstr "\"%s\" ei ole korrektne pildifail"
+
+-#: ../src/defaults.c:2574
++#: ../src/defaults.c:2743
+ #, c-format
+ msgid "out of memory reading bitmap file \"%s\""
+-msgstr "mälu lõppes pildifaili \"%s\" lugemisel"
++msgstr "pildifaili \"%s\" lugemisel lõppes mälu"
+
+-#: ../src/defaults.c:2613 ../src/defaults.c:2646
++#: ../src/defaults.c:2782 ../src/defaults.c:2815
+ msgid "bad number of arguments in cursor specification"
+ msgstr "vigane argumentide arv kursori kirjelduses"
+
+-#: ../src/defaults.c:2629
++#: ../src/defaults.c:2798
+ #, c-format
+ msgid "unknown builtin cursor name \"%s\""
+ msgstr "tundmatu sisseehitatud kursori nimi: \"%s\""
+
+-#: ../src/defaults.c:2656 ../src/defaults.c:2668
++#: ../src/defaults.c:2825 ../src/defaults.c:2837
+ #, c-format
+ msgid "could not find cursor bitmap file \"%s\""
+-msgstr "ei õnnestu leida kursori pildifaili \"%s\""
++msgstr "kursori pildifaili \"%s\" pole võimalik leida"
+
+-#: ../src/defaults.c:2715
++#: ../src/defaults.c:2884
+ #, c-format
+ msgid "Error in cursor specification for key \"%s\""
+ msgstr "Viga võtme \"%s\" kursori kirjelduses"
+
+-#: ../src/defaults.c:2800
++#: ../src/defaults.c:2969
+ msgid "could not render texture for icon background"
+-msgstr "tekstuuri renderdamine ikooni taustapildiks ei õnnestu"
++msgstr "tekstuuri pole võimalik ikooni taustapildiks renderdada"
++
++#: ../src/defaults.c:3597 ../src/defaults.c:3672
++#, c-format
++msgid "Invalid arguments for option \"%s\""
++msgstr "Vigased argumendid võtmele \"%s\""
++
++#: ../src/defaults.c:3604 ../src/defaults.c:3679
++#, c-format
++msgid "Could not find image \"%s\" for option \"%s\""
++msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik leida"
+
+-#: ../src/dialog.c:135
++#: ../src/defaults.c:3610 ../src/defaults.c:3687
++#, c-format
++msgid "Could not load image \"%s\" for option \"%s\""
++msgstr "Pilti \"%s\" pole võtmele \"%s\" võimalik laadida"
++
++#: ../src/defaults.c:3622
++msgid "Invalid split sizes for SwitchPanel back image."
++msgstr ""
++
++#: ../src/defaults.c:3695
++#, c-format
++msgid "Invalid number of arguments for option \"%s\""
++msgstr "Vigane argumentide arv võtmele \"%s\""
++
++#: ../src/dialog.c:147
+ msgid "Save workspace state"
+-msgstr "Salvesta töölaua olek"
++msgstr "Töölaua oleku salvestamine"
+
+-#: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558
+-#: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248
++#: ../src/dialog.c:192 ../src/dialog.c:732 ../src/dock.c:547
++#: ../src/dockedapp.c:432 ../src/rootmenu.c:198 ../src/rootmenu.c:248
+ #: ../src/rootmenu.c:264
+ msgid "Cancel"
+-msgstr "Tühista"
++msgstr "Loobu"
+
+-#: ../src/dialog.c:277
++#: ../src/dialog.c:290
+ msgid "Could not open directory "
+-msgstr "Ei õnnestu avada kataloogi "
++msgstr "Pole võimalik avada kataloogi "
+
+-#: ../src/dialog.c:332
++#: ../src/dialog.c:345
+ msgid "Could not load image file "
+-msgstr "Ei õnnestu avada pildifaili "
++msgstr "Pole võimalik avada pildifaili "
+
+-#: ../src/dialog.c:663
++#: ../src/dialog.c:659
+ msgid "Directories"
+ msgstr "Kataloogid"
+
+-#: ../src/dialog.c:672
++#: ../src/dialog.c:668
+ msgid "Icons"
+ msgstr "Ikoonid"
+
+-#: ../src/dialog.c:705
++#: ../src/dialog.c:701
+ msgid "Preview"
+ msgstr "Eelvaade"
+
+-#: ../src/dialog.c:718
++#: ../src/dialog.c:714
+ msgid "File Name:"
+ msgstr "Faili nimi:"
+
+-#: ../src/dialog.c:742
++#: ../src/dialog.c:738
+ msgid "Choose File"
+ msgstr "Vali fail"
+
+-#: ../src/dialog.c:760 ../src/dialog.c:762
++#: ../src/dialog.c:757 ../src/dialog.c:759
+ msgid "Icon Chooser"
+-msgstr "Ikooni valija"
++msgstr "Ikoonivalik"
+
+-#: ../src/dialog.c:1219 ../src/dialog.c:1329
++#: ../src/dialog.c:1197 ../src/dialog.c:1305
+ #, c-format
+ msgid "Version %s"
+ msgstr "Versioon %s"
+
+-#: ../src/dialog.c:1326
++#: ../src/dialog.c:1303
+ msgid "Window Manager for X"
+ msgstr "X'i aknahaldur"
+
+-#: ../src/dialog.c:1349
++#: ../src/dialog.c:1326
+ #, c-format
+ msgid "Using visual 0x%x: %s %ibpp "
+-msgstr "Kasutan visuaali 0x%x: %s %ibpp "
++msgstr "Kasutatakse visuaali 0x%x: %s %ibpp "
+
+-#: ../src/dialog.c:1357
++#: ../src/dialog.c:1334
+ msgid "(32 thousand colors)\n"
+ msgstr "(32 tuhat värvi)\n"
+
+-#: ../src/dialog.c:1360
++#: ../src/dialog.c:1337
+ msgid "(64 thousand colors)\n"
+ msgstr "(64 tuhat värvi)\n"
+
+-#: ../src/dialog.c:1364
++#: ../src/dialog.c:1341
+ msgid "(16 million colors)\n"
+ msgstr "(16 miljonit värvi)\n"
+
+-#: ../src/dialog.c:1367
++#: ../src/dialog.c:1344
+ #, c-format
+ msgid "(%d colors)\n"
+ msgstr "(%d värvi)\n"
+
+-#: ../src/dialog.c:1377
++#: ../src/dialog.c:1354
+ #, c-format
+ msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n"
+-msgstr "Eraldatud mälu kokku: %i kB. Mälu kasutuses: %i kB.\n"
++msgstr "Kogu eraldatud mälu: %i kB. Kogu kasutusel olev mälu: %i kB.\n"
+
+-#: ../src/dialog.c:1384
++#: ../src/dialog.c:1361
+ msgid "Supported image formats: "
+ msgstr "Toetatud pildivormingud: "
+
+-#: ../src/dialog.c:1391
++#: ../src/dialog.c:1368
+ msgid ""
+ "\n"
+ "Additional support for: "
+@@ -383,11 +420,11 @@
+ "\n"
+ "Lisaks on toetatud: "
+
+-#: ../src/dialog.c:1414
++#: ../src/dialog.c:1385
+ msgid " and "
+ msgstr " ja "
+
+-#: ../src/dialog.c:1424
++#: ../src/dialog.c:1395
+ msgid ""
+ "\n"
+ "Sound disabled"
+@@ -395,7 +432,7 @@
+ "\n"
+ "Heli on keelatud"
+
+-#: ../src/dialog.c:1426
++#: ../src/dialog.c:1397
+ msgid ""
+ "\n"
+ "Sound enabled"
+@@ -403,28 +440,46 @@
+ "\n"
+ "Heli on lubatud"
+
+-#: ../src/dialog.c:1450
++#: ../src/dialog.c:1402
++msgid ", VirtualDesktop enabled"
++msgstr ", VirtualDesktop on lubatud"
++
++#: ../src/dialog.c:1404
++msgid ", VirtualDesktop disabled"
++msgstr ", VirtualDesktop on keelatud"
++
++#: ../src/dialog.c:1408
++msgid "\n"
++msgstr "\n"
++
++#: ../src/dialog.c:1410
++msgid "Solaris "
++msgstr "Solaris "
++
++#: ../src/dialog.c:1412
++msgid "Xinerama: "
++msgstr "Xinerama: "
++
++#: ../src/dialog.c:1446
+ msgid "Info"
+-msgstr "Info"
++msgstr "Andmed"
+
+-#: ../src/dialog.c:1473
+-msgid "Merry X'mas!"
++#: ../src/dialog.c:1470
++msgid "Merry Christmas!"
+ msgstr "Häid jõule!"
+
+-#: ../src/dialog.c:1543
++#: ../src/dialog.c:1540
+ msgid ""
+ " Window Maker is free software; you can redistribute it and/or\n"
+ "modify it under the terms of the GNU General Public License as\n"
+ "published by the Free Software Foundation; either version 2 of the\n"
+ "License, or (at your option) any later version.\n"
+ "\n"
+-"\n"
+ " Window Maker is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty\n"
+ "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
+ "See the GNU General Public License for more details.\n"
+ "\n"
+-"\n"
+ " You should have received a copy of the GNU General Public\n"
+ "License along with this program; if not, write to the Free Software\n"
+ "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n"
+@@ -436,13 +491,11 @@
+ "avaldatud; kas Litsentsi versioon number 2 või (vastavalt\n"
+ "Teie valikule) ükskõik milline hilisem versioon.\n"
+ "\n"
+-"\n"
+ "Seda programmi levitatakse lootuses, et see on kasulik, kuid\n"
+ "ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE KVALITEEDI\n"
+ "GARANTIITA või SOBIVUSELE TEATUD KINDLAKS EESMÄRGIKS.\n"
+ "Üksikasjade suhtes vaata GNU Üldist Avalikku Litsentsi.\n"
+ "\n"
+-"\n"
+ "Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia\n"
+ "koos selle programmiga, kui ei, siis kontakteeruge Free\n"
+ "Software Foundation'iga, 59 Temple Place - Suite 330,\n"
+@@ -450,17 +503,17 @@
+
+ #: ../src/dialog.c:1564
+ msgid "Legal"
+-msgstr "Litsentsiinfo"
++msgstr "Litsentsiandmed"
+
+-#: ../src/dialog.c:1715 ../src/startup.c:395
++#: ../src/dialog.c:1720
+ msgid "cannot open connection for crashing dialog panel. Aborting."
+-msgstr "ei õnnestu luua ühendust avariipaneeliga. Annan alla."
++msgstr "krahhidialoogi paneeliga pole võimalik ühendust luua. Annan alla."
+
+-#: ../src/dialog.c:1741
++#: ../src/dialog.c:1746
+ msgid "Fatal error"
+ msgstr "Fataalviga"
+
+-#: ../src/dialog.c:1752
++#: ../src/dialog.c:1757
+ #, c-format
+ msgid ""
+ "Window Maker received signal %i\n"
+@@ -469,41 +522,41 @@
+ "Window Maker võttis vastu signaali %i\n"
+ "(%s)."
+
+-#: ../src/dialog.c:1755
++#: ../src/dialog.c:1760
+ #, c-format
+ msgid "Window Maker received signal %i."
+ msgstr "Window Maker võttis vastu signaali %i."
+
+-#: ../src/dialog.c:1764
++#: ../src/dialog.c:1769
+ msgid ""
+ " This fatal error occured probably due to a bug. Please fill the included "
+ "BUGFORM and report it to bugs@windowmaker.org."
+ msgstr ""
+ " See fataalviga on arvatavasti põhjustatud programmi enese veast. Palun "
+-"täitke kaasasolev vigadest teatamise vorm (BUGFORM) ja saatke see aadressil "
++"täida kaasasolev vigadest teatamise vorm (BUGFORM) ja saada see aadressil "
+ "bugs@windowmaker.org."
+
+-#: ../src/dialog.c:1773
++#: ../src/dialog.c:1778
+ msgid "What do you want to do now?"
+ msgstr "Mida sa nüüd soovid teha?"
+
+-#: ../src/dialog.c:1779
++#: ../src/dialog.c:1784
+ msgid "Select action"
+-msgstr "Vali tegevus"
++msgstr "Tegevuse valimine"
+
+-#: ../src/dialog.c:1780
++#: ../src/dialog.c:1785
+ msgid "Abort and leave a core file"
+-msgstr "Lõpetan töö ja salvestan mälutõmmise"
++msgstr "Töö lõpetamine ja mälutõmmise salvestan"
+
+-#: ../src/dialog.c:1781
++#: ../src/dialog.c:1786
+ msgid "Restart Window Maker"
+-msgstr "Taaskäivitan Window Makeri"
++msgstr "Window Maker'i taaskäivitamine"
+
+-#: ../src/dialog.c:1782
++#: ../src/dialog.c:1787
+ msgid "Start alternate window manager"
+-msgstr "Käivitan alternatiivse aknahalduri"
++msgstr "Alternatiivse aknahalduri käivitamine"
+
+-#: ../src/dialog.c:1960
++#: ../src/dialog.c:1965
+ msgid ""
+ "Window Maker is part of the GNUstep project.\n"
+ "The GNUstep project aims to create a free\n"
+@@ -517,441 +570,387 @@
+ msgstr ""
+ "Window Maker on osa GNUstep projektist. GNUstep\n"
+ "projekti eesmärgiks on OpenStep(tm) kirjelduse\n"
+-"(objektorienteeritud framework graafiliste\n"
+-"multiplatvorm rakenduste jaoks) vaba\n"
++"(objektorienteeritud raamistik graafiliste\n"
++"mitme platvormi toega rakenduste jaoks) vaba\n"
+ "implementatsiooni loomine. Lisaeesmärgiks on \n"
+-"ka sellel baseeruva ka arenduskeskkonna ja\n"
+-"kasutaja töölauakeskkonna loomine. Lisateabe\n"
+-"saamiseks palun külasada saidi www.gnustep.org"
++"ka sellel põhineva arenduskeskkonna ja kasutaja\n"
++"töölauakeskkonna loomine. Lisateabe saamiseks\n"
++"palun külasta saiti www.gnustep.org"
+
+-#: ../src/dialog.c:1980
++#: ../src/dialog.c:1988
+ msgid "About GNUstep"
+ msgstr "GNUstep'ist lähemalt"
+
+-#: ../src/dock.c:213
++#: ../src/dock.c:193
+ #, c-format
+ msgid "Type the name for workspace %i:"
+ msgstr "Sisesta töölaua %i nimi:"
+
+-#: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409
++#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419
+ msgid "Rename Workspace"
+ msgstr "Töölaua ümbernimetamine"
+
+-#: ../src/dock.c:520 ../src/dock.c:528
++#: ../src/dock.c:509 ../src/dock.c:517
+ msgid "Warning"
+ msgstr "Hoiatus"
+
+-#: ../src/dock.c:521
++#: ../src/dock.c:510
+ msgid ""
+ "Some icons cannot be made omnipresent. Please make sure that no other icon "
+ "is docked in the same positions on the other workspaces and the Clip is not "
+ "full in some workspace."
+ msgstr ""
+-"Mõningaid ikoone ei ole võimalik kõikidel töölaudadel nähtavaks teha. "
+-"Veenduge, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
++"Mõningaid ikoone pole võimalik kõikidel töölaudadel nähtavaks teha. "
++"Veendu, et teistel töölaudadel ei ole ükski ikoon dokitud samale "
+ "positsioonile ja Klamber ei ole mõnel töölaual täis."
+
+-#: ../src/dock.c:529
++#: ../src/dock.c:518
+ msgid ""
+ "Icon cannot be made omnipresent. Please make sure that no other icon is "
+ "docked in the same position on the other workspaces and the Clip is not full "
+ "in some workspace."
+ msgstr ""
+-"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veenduge, et "
++"Ikooni ei ole võimalik kõikidel töölaudadel nähtavaks teha. Veendu, et "
+ "teistel töölaudadel ei ole ükski ikoon dokitud samale positsioonile ja "
+ "Klamber ei ole mõnel töölaual täis."
+
+-#: ../src/dock.c:556
++#: ../src/dock.c:545
+ msgid "Workspace Clip"
+ msgstr "Töölaua Klamber"
+
+-#: ../src/dock.c:557
++#: ../src/dock.c:546
+ msgid "All selected icons will be removed!"
+ msgstr "Kõik valitud ikoonid eemaldatakse!"
+
+-#: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445
++#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455
+ msgid "Keep Icon"
+ msgstr "Hoia ikooni"
+
+-#: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278
++#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276
+ msgid "Type the command used to launch the application"
+ msgstr "Tipi korraldus, mida kasutada rakenduse käivitamiseks"
+
+-#: ../src/dock.c:965
++#: ../src/dock.c:954
+ #, c-format
+ msgid "could not launch application %s\n"
+ msgstr "ei õnnestu käivitada rakendust %s\n"
+
+-#: ../src/dock.c:1020
++#: ../src/dock.c:1010
+ msgid "could not create workspace submenu for Clip menu"
+ msgstr "ei õnnestu luua klambrimenüüle töölaua alammenüüd"
+
+-#: ../src/dock.c:1078
++#: ../src/dock.c:1069
+ msgid "could not create options submenu for Clip menu"
+ msgstr "ei õnnestu luua klambrimenüüle valikute alammenüüd"
+
+-#: ../src/dock.c:1082 ../src/dock.c:1130
++#: ../src/dock.c:1073 ../src/dock.c:1121
+ msgid "Keep on Top"
+-msgstr "Hoitakse esiplaanil"
++msgstr "Hoia esiplaanil"
+
+-#: ../src/dock.c:1088
++#: ../src/dock.c:1079
+ msgid "Collapsed"
+ msgstr "Ahendatud"
+
+-#: ../src/dock.c:1094
++#: ../src/dock.c:1085
+ msgid "Autocollapse"
+ msgstr "Automaatselt ahenev"
+
+-#: ../src/dock.c:1100
++#: ../src/dock.c:1091
+ msgid "Autoraise"
+ msgstr "Automaatselt esile tõusev"
+
+-#: ../src/dock.c:1106
++#: ../src/dock.c:1097
+ msgid "Autoattract Icons"
+ msgstr "Ikoonide automaatne külgehaakimine"
+
+-#: ../src/dock.c:1136
++#: ../src/dock.c:1127
+ msgid "Clip Options"
+ msgstr "Klambri valikud"
+
+-#: ../src/dock.c:1146
++#: ../src/dock.c:1137
+ msgid "Selected"
+ msgstr "Valitud"
+
+-#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436
++#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446
+ msgid "Select All Icons"
+ msgstr "Vali kõik ikoonid"
+
+-#: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453
++#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463
+ msgid "Move Icon To"
+ msgstr "Teisalda ikoon->"
+
+-#: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464
++#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474
+ msgid "Remove Icon"
+ msgstr "Eemalda ikoon"
+
+-#: ../src/dock.c:1172
++#: ../src/dock.c:1163
+ msgid "Attract Icons"
+ msgstr "Haagi ikoonid külge"
+
+-#: ../src/dock.c:1175
++#: ../src/dock.c:1166
+ msgid "Launch"
+ msgstr "Käivita programm"
+
+-#: ../src/dock.c:1183
++#: ../src/dock.c:1174
+ msgid "Settings..."
+-msgstr "Määrangud..."
++msgstr "Sätted..."
+
+-#: ../src/dock.c:1548 ../src/dock.c:1655
++#: ../src/dock.c:1538 ../src/dock.c:1645
+ #, c-format
+ msgid "bad value in docked icon state info %s"
+ msgstr "vigane väärtus dokitud ikooni olekuinfos %s "
+
+-#: ../src/dock.c:1663
++#: ../src/dock.c:1653
+ #, c-format
+ msgid "bad value in docked icon position %i,%i"
+ msgstr "vigane väärtus dokitud ikooni asukohal %i,%i"
+
+-#: ../src/dock.c:1683
++#: ../src/dock.c:1673
+ #, c-format
+ msgid "bad value in dock state info:%s"
+ msgstr "vigane väärtus doki olekuinfos:%s"
+
+-#: ../src/dock.c:1919
++#: ../src/dock.c:1923
+ msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
+ msgstr ""
+ "dokki on salvestatud liiga palju ikoone. Eiran neid, mida ei suuda hallata"
+
+ #. icon->forced_dock = 1;
+-#: ../src/dock.c:2136 ../src/dock.c:2277
++#: ../src/dock.c:2138 ../src/dock.c:2275
+ msgid "Dock Icon"
+ msgstr "Dokin ikooni"
+
+-#: ../src/dock.c:3323
++#: ../src/dock.c:3333
+ #, c-format
+ msgid "Could not execute command \"%s\""
+ msgstr "Ei õnnestu täita korraldust \"%s\""
+
+-#: ../src/dock.c:3415
++#: ../src/dock.c:3425
+ msgid "Toggle Omnipresent"
+ msgstr "Näita/ära näita kõigil töölaudadel"
+
+-#: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:413
+-#: ../src/winspector.c:1389
++#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383
+ msgid "Omnipresent"
+-msgstr "Näha kõigil töölaudadel"
++msgstr "Nähtav kõigil töölaudadel"
+
+-#: ../src/dock.c:3434
++#: ../src/dock.c:3444
+ msgid "Unselect All Icons"
+ msgstr "Tühista ikoonivalik"
+
+-#: ../src/dock.c:3443
++#: ../src/dock.c:3453
+ msgid "Keep Icons"
+ msgstr "Hoia ikoone"
+
+-#: ../src/dock.c:3451
++#: ../src/dock.c:3461
+ msgid "Move Icons To"
+ msgstr "Teisalda ikoonid->"
+
+-#: ../src/dock.c:3462
++#: ../src/dock.c:3472
+ msgid "Remove Icons"
+ msgstr "Eemalda ikoonid"
+
+-#: ../src/dock.c:3493 ../src/kwm.c:643
++#: ../src/dock.c:3503
+ msgid "Bring Here"
+ msgstr "Too siia"
+
+-#: ../src/dockedapp.c:149
++#: ../src/dockedapp.c:150
+ #, c-format
+ msgid "could not find icon %s, used in a docked application"
+ msgstr "ei leia dokitud rakenduses kasutatavat ikooni %s"
+
+-#: ../src/dockedapp.c:229
++#: ../src/dockedapp.c:230
+ #, c-format
+ msgid "Could not open specified icon file: %s"
+ msgstr "Ei õnnestu avada määratud ikoonifaili: %s"
+
+-#: ../src/dockedapp.c:231
++#: ../src/dockedapp.c:232
+ msgid "Ignore"
+ msgstr "Eira"
+
+-#: ../src/dockedapp.c:333
++#: ../src/dockedapp.c:334
+ msgid "Start when Window Maker is started"
+-msgstr "Käivita koos Window Maker'iga"
++msgstr "Käivitada koos Window Maker'iga"
+
+-#: ../src/dockedapp.c:340
++#: ../src/dockedapp.c:341
+ msgid "Lock (prevent accidental removal)"
+ msgstr "Lukustatud (ei saa kogemata kustutada)"
+
+-#: ../src/dockedapp.c:344
++#: ../src/dockedapp.c:345
+ msgid "Application path and arguments"
+-msgstr "Rakenduse tee ja argumendid"
++msgstr "Rakenduse rada ja argumendid"
+
+-#: ../src/dockedapp.c:357
++#: ../src/dockedapp.c:358
+ msgid "Command for middle-click launch"
+ msgstr "Keskmise nupu korraldus"
+
+-#: ../src/dockedapp.c:371
++#: ../src/dockedapp.c:372
+ #, c-format
+ msgid "%s will be replaced with current selection"
+-msgstr "%s asendatakse antud valikuga"
++msgstr "%s asendatakse käesoleva valikuga"
+
+-#: ../src/dockedapp.c:376
++#: ../src/dockedapp.c:377
+ msgid "Command for files dropped with DND"
+ msgstr "Korraldus DND abil saadetud failidele"
+
+-#: ../src/dockedapp.c:390
++#: ../src/dockedapp.c:391
+ #, c-format
+ msgid "%d will be replaced with the file name"
+ msgstr "%d asendatakse failinimega"
+
+-#: ../src/dockedapp.c:394
++#: ../src/dockedapp.c:395
+ msgid "DND support was not compiled in"
+-msgstr "DND toetus ei ole sisse kompileeritud"
++msgstr "DND tugi pole sisse kompileeritud"
+
+-#: ../src/dockedapp.c:399
++#: ../src/dockedapp.c:400
+ msgid "Icon Image"
+ msgstr "Ikooni pilt"
+
+-#: ../src/dockedapp.c:413 ../src/winspector.c:1527
++#: ../src/dockedapp.c:414 ../src/winspector.c:1521
+ msgid "Browse..."
+-msgstr "Kuva..."
++msgstr "Sirvi..."
+
+-#: ../src/dockedapp.c:466
++#: ../src/dockedapp.c:475
+ msgid "Docked Application Settings"
+-msgstr "Dokitud rakenduse määrangud"
++msgstr "Dokitud rakenduse sätted"
+
+-#: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456
++#: ../src/framewin.c:647 ../src/framewin.c:742 ../src/menu.c:463
+ #: ../src/texture.c:594
+ #, c-format
+ msgid "could not render texture: %s"
+-msgstr "ei õnnestu renderdada tekstuuri %s"
++msgstr "tekstuuri pole võimalik renderdada: %s"
+
+-#: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699
+-#: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724
+-#: ../src/icon.c:350 ../src/menu.c:485
++#: ../src/framewin.c:670 ../src/framewin.c:681 ../src/framewin.c:697
++#: ../src/framewin.c:708 ../src/framewin.c:715 ../src/framewin.c:722
++#: ../src/icon.c:360 ../src/menu.c:492
+ #, c-format
+ msgid "error rendering image:%s"
+ msgstr "viga pildi renderdamisel:%s"
+
+-#: ../src/framewin.c:777
++#: ../src/framewin.c:775
+ #, c-format
+ msgid "error rendering image: %s"
+ msgstr "viga pildi renderdamisel: %s"
+
+-#: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401
+-msgid "out of memory while updating GNOME hints"
+-msgstr "mälu lõppes GNOME vihjete uuendamise käigus"
+-
+-#: ../src/icon.c:229 ../src/wdefaults.c:443
++#: ../src/icon.c:239 ../src/wdefaults.c:443
+ #, c-format
+ msgid "error loading image file \"%s\""
+ msgstr "viga pildifaili \"%s\" laadimisel"
+
+-#: ../src/icon.c:491 ../src/icon.c:500
++#: ../src/icon.c:503 ../src/icon.c:512
+ #, c-format
+ msgid "could not create directory %s"
+-msgstr "ei õnnestu luua kataloogi %s"
++msgstr "kataloogi %s pole võimalik luua"
+
+-#: ../src/icon.c:767
++#: ../src/icon.c:782
+ #, c-format
+ msgid "could not find default icon \"%s\""
+-msgstr "ei õnnestu leida vaikimisi kasutatavat ikooni \"%s\""
++msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik leida"
+
+-#: ../src/icon.c:773
++#: ../src/icon.c:788
+ #, c-format
+ msgid "could not load default icon \"%s\":%s"
+-msgstr "Ei õnnestu laadida vaikimisi kasutatavat ikooni \"%s\":%s"
+-
+-#.
+-#. * Warning: If you make some change that affects the order of the
+-#. * entries, you must update the command #defines in the top of
+-#. * this file.
+-#.
+-#: ../src/kwm.c:633 ../src/winmenu.c:436 ../src/winmenu.c:571
+-msgid "Maximize"
+-msgstr "Maksimeeri"
+-
+-#: ../src/kwm.c:634 ../src/winmenu.c:566
+-msgid "Unmaximize"
+-msgstr "Taasta suurus"
+-
+-#: ../src/kwm.c:635 ../src/winmenu.c:444 ../src/winmenu.c:557
+-msgid "Miniaturize"
+-msgstr "Minimeeri"
+-
+-#: ../src/kwm.c:636 ../src/winmenu.c:552
+-msgid "Deminiaturize"
+-msgstr "Ava aken"
+-
+-#: ../src/kwm.c:638
+-msgid "Not Omnipresent"
+-msgstr "Näita ainult ühel töölaual"
+-
+-#: ../src/kwm.c:639
+-msgid "Move"
+-msgstr "Liiguta"
+-
+-#: ../src/kwm.c:640
+-msgid "Resize"
+-msgstr "Muuda suurust"
+-
+-#.
+-#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+-#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+-#.
+-#: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:501
+-msgid "Close"
+-msgstr "Sulge"
+-
+-#: ../src/kwm.c:642 ../src/winmenu.c:485
+-msgid "Move To"
+-msgstr "Teisalda"
++msgstr "vaikimisi kasutatavat ikooni \"%s\" pole võimalik laadida:%s"
+
+-#: ../src/kwm.c:1096
+-msgid "%a(Run Command,Type the command to run:)"
+-msgstr "%a(Käivita korraldus,Sisesta korraldus, mida käivitada:)"
+-
+-#: ../src/main.c:222
++#: ../src/main.c:220
+ msgid "failed to restart Window Maker."
+-msgstr "Window Makeri taaskäivitamine ebaõnnestus."
++msgstr "Tõrge Window Maker'i taaskäivitamisel."
+
+-#: ../src/main.c:225
++#: ../src/main.c:223
+ #, c-format
+ msgid "could not exec %s"
+-msgstr "ei õnnestu käivitada %s"
++msgstr "%s pole võimalik käivitada"
+
+-#: ../src/main.c:271
++#: ../src/main.c:269
+ msgid "Could not execute command: "
+-msgstr "Ei õnnestu käivitada korraldust: "
++msgstr "Korraldust pole võimalik käivitada : "
+
+-#: ../src/main.c:428
++#: ../src/main.c:426
+ #, c-format
+ msgid "%s aborted.\n"
+ msgstr "%s katkestatud.\n"
+
+-#: ../src/main.c:439
++#: ../src/main.c:437
+ #, c-format
+ msgid "Usage: %s [options]\n"
+-msgstr "Kasuta: %s [valikud]\n"
++msgstr "Kasutamine: %s [võtmed]\n"
+
+-#: ../src/main.c:440
++#: ../src/main.c:438
+ msgid "The Window Maker window manager for the X window system"
+-msgstr "Window Maker on aknahaldur X window system'ile"
++msgstr "Window Maker on X window system'i aknahaldur"
+
+-#: ../src/main.c:442
++#: ../src/main.c:440
+ msgid " -display host:dpy\tdisplay to use"
+-msgstr " -display host:dpy\tmäärab, millist kuva kasutada"
++msgstr " -display host:dpy\tkasutatava kuva määramine"
+
+-#: ../src/main.c:444
++#: ../src/main.c:442
+ msgid " --no-cpp \t\tdisable preprocessing of configuration files"
+-msgstr " --no-cpp \t\tkeelab häälestusfailide eeltöötluse"
++msgstr " --no-cpp \t\tseadistusfailide eeltöötluse keelamine"
+
+-#: ../src/main.c:446
++#: ../src/main.c:444
+ msgid " --no-dock\t\tdo not open the application Dock"
+-msgstr " --no-dock\t\tkeelab rakenduste doki avamise"
++msgstr " --no-dock\t\trakenduste doki avamise keelamine"
+
+-#: ../src/main.c:447
++#: ../src/main.c:445
+ msgid " --no-clip\t\tdo not open the workspace Clip"
+-msgstr " --no-clip\t\tkeelab töölaua klambri avamise"
++msgstr " --no-clip\t\ttöölaua klambri avamise keelamine"
+
+-#: ../src/main.c:448
++#: ../src/main.c:446
+ msgid " --no-autolaunch\tdo not autolaunch applications"
+-msgstr " --no-autolaunch\tkeelab rakenduste automaatse käivitamise"
++msgstr " --no-autolaunch\trakenduste automaatse käivitamise keelamine"
+
+-#: ../src/main.c:449
++#: ../src/main.c:447
+ msgid " --dont-restore\t\tdo not restore saved session"
+-msgstr " --dont-restore\tei taasta salvestatud seanssi"
++msgstr " --dont-restore\tsalvestatud seansi taastamise keelamine"
+
+-#: ../src/main.c:451
++#: ../src/main.c:449
+ msgid " --locale locale\tlocale to use"
+-msgstr " --locale locale\t\tmillist locale't kasutada"
++msgstr " --locale locale\t\tkasutatava lokaadi määramine"
+
+-#: ../src/main.c:453
++#: ../src/main.c:451
+ msgid ""
+ " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals"
+ msgstr ""
+-" --create-stdcmap\tloo standardne värvikaardi vihje PseudoColor visuaalile"
++" --create-stdcmap\tstandardse värvikaardi vihje loomine PseudoColor visuaalile"
+
+-#: ../src/main.c:454
++#: ../src/main.c:452
+ msgid " --visual-id visualid\tvisual id of visual to use"
+ msgstr " --visual-id visualid\tkasutatava visuaali id"
+
+-#: ../src/main.c:455
++#: ../src/main.c:453
+ msgid " --static\t\tdo not update or save configurations"
+-msgstr " --static\t\thäälestusi ei salvestata ega uuendata"
++msgstr " --static\t\tseadistusi ei salvestata ega uuendata"
+
+-#: ../src/main.c:456
++#: ../src/main.c:454
+ msgid " --no-polling\t\tdo not periodically check for configuration updates"
+-msgstr " --no-polling\t\tkeelab ümberhäälestustuste regulaarse kontrolli"
++msgstr " --no-polling\t\tümberseadistustuste korrapärase kontrolli keelamine"
+
+-#: ../src/main.c:458
++#: ../src/main.c:456
+ msgid " --synchronous\t\tturn on synchronous display mode"
+-msgstr " --synchronous\t\tlülitab sisse sünkroonse ekraanirezhiimi"
++msgstr " --synchronous\t\tsünkroonse ekraanirezhiimi sisselülitamine"
+
+-#: ../src/main.c:460
++#: ../src/main.c:458
+ msgid " --version\t\tprint version and exit"
+-msgstr " --version\t\tväljastab versiooninumbri ja lõpetab programmi töö"
++msgstr " --version\t\tversiooninumbri väljastamine ja programmi töö lõpetamine"
+
+-#: ../src/main.c:461
++#: ../src/main.c:459
+ msgid " --help\t\t\tshow this message"
+-msgstr " --help\t\t\tnäitab seda teadet"
++msgstr " --help\t\t\tselle teate näitamine"
+
+-#: ../src/main.c:474
++#: ../src/main.c:473
+ #, c-format
+ msgid ""
+ "could not find user GNUstep directory (%s).\n"
+ "Make sure you have installed Window Maker correctly and run wmaker.inst"
+ msgstr ""
+-"ei õnnestu leida kasutaja GNUstep kataloogi (%s).\n"
++"kasutaja GNUstep kataloogi (%s) pole võimalik leida.\n"
+ "Veendu, et Window Maker on korrektselt paigaldatud ja käivita wmaker.inst"
+
+-#: ../src/main.c:479
++#: ../src/main.c:478
+ #, c-format
+ msgid "could not find user GNUstep directory (%s)."
+-msgstr "ei õnnestu leida kasutaja GNUstep kataloogi (%s)"
++msgstr "kasutaja GNUstep kataloogi (%s) pole võimalik leida."
+
+-#: ../src/main.c:482
++#: ../src/main.c:481
+ msgid ""
+ "There was an error while creating GNUstep directory, please make sure you "
+ "have installed Window Maker correctly and run wmaker.inst"
+@@ -959,190 +958,142 @@
+ "Viga GNUstep kataloogi loomise käigus. Palun veendu, et Window Maker on "
+ "korrektselt paigaldatud ja käivita wmaker.inst"
+
+-#: ../src/main.c:485
++#: ../src/main.c:484
+ #, c-format
+ msgid "%s directory created with default configuration."
+-msgstr "%s kataloog loodi vaikimisi häälestusega"
++msgstr "%s kataloog loodi vaikimisi seadistusega"
+
+-#: ../src/main.c:505 ../src/main.c:510
++#: ../src/main.c:506 ../src/main.c:511
+ #, c-format
+ msgid "%s:could not execute initialization script"
+-msgstr "%s:ei õnnestu käivitada lähtestamisskripti"
++msgstr "%s:lähtestamisskripti pole võimalik käivitada"
+
+-#: ../src/main.c:530 ../src/main.c:535
++#: ../src/main.c:533 ../src/main.c:538
+ #, c-format
+ msgid "%s:could not execute exit script"
+-msgstr "%s:ei õnnestu käivitada lõpetamisskripti"
++msgstr "%s:lõpetamisskripti pole võimalik käivitada"
+
+-#: ../src/main.c:651 ../src/main.c:659 ../src/main.c:667 ../src/main.c:687
++#: ../src/main.c:622 ../src/main.c:722 ../src/main.c:730 ../src/main.c:738
++#: ../src/main.c:758
+ #, c-format
+ msgid "too few arguments for %s"
+ msgstr "liiga vähe argumente %s jaoks"
+
+-#: ../src/main.c:671
++#: ../src/main.c:742
+ #, c-format
+ msgid "bad value for visualid: \"%s\""
+ msgstr "vigane visualid väärtus: \"%s\""
+
+-#: ../src/main.c:695
++#: ../src/main.c:766
+ #, c-format
+ msgid "%s: invalid argument '%s'\n"
+ msgstr "%s: vigane argument '%s'\n"
+
+-#: ../src/main.c:696
++#: ../src/main.c:767
+ #, c-format
+ msgid "Try '%s --help' for more information\n"
+-msgstr "Et saada rohkem informatsiooni, proovi '%s --help'\n"
++msgstr "Täiendava teabe saamiseks proovi kasutada '%s --help'\n"
+
+-#: ../src/main.c:727
++#: ../src/main.c:802
+ msgid "X server does not support locale"
+ msgstr "X server ei toeta lokaliseerimist"
+
+-#: ../src/main.c:731
++#: ../src/main.c:806
+ msgid "cannot set locale modifiers"
+-msgstr ""
++msgstr "lokaadimuujaid pole võimalik määrata"
+
+-#: ../src/main.c:747
++#: ../src/main.c:822
+ #, c-format
+ msgid "could not open display \"%s\""
+-msgstr "ei õnnestu avada kuva \"%s\""
++msgstr "kuva \"%s\" pole võimalik avada"
+
+-#: ../src/menu.c:1255
++#: ../src/menu.c:1276
+ msgid "could not grab keyboard"
+-msgstr "ei suuda klaviatuuriga ühendust saada"
+-
+-#: ../src/menu.c:2569
+-#, c-format
+-msgid "bad value in menus state info:%s"
+-msgstr "vigane väärtus menüüde olekuinfos:%s"
++msgstr "klaviatuuriga pole võimalik ühendust saada"
+
+-#: ../src/menureader.c:264 ../src/rootmenu.c:730
++#: ../src/menu.c:2615
+ #, c-format
+-msgid "%s:could not stat menu"
+-msgstr "%s:ei õnnestu tuvastada menüü atribuute"
+-
+-#: ../src/menureader.c:341 ../src/menureader.c:380
+-#, c-format
+-msgid "could not stat() menu file '%s'"
+-msgstr "ei õnnestu lugeda (stat()) menüüfaili '%s' atribuute"
++msgid "bad value in menus state info: %s"
++msgstr "vigane väärtus menüüde olekuandmetes:%s"
+
+-#: ../src/menureader.c:416
+-#, c-format
+-msgid "could not find menu file '%s' referenced in WMRootMenu"
+-msgstr "ei õnnestu leida menüüfaili '%s', millele viitab WMRootMenu"
+-
+-#: ../src/menureader.c:423
+-#, c-format
+-msgid "could not find any usable menu files. Please check '%s'"
+-msgstr ""
+-"ei õnnestu leida ühtegi kasutuskõlblikku menüüfaili. Palun kontrolli '%s'"
+-
+-#: ../src/menureader.c:438 ../src/rootmenu.c:1664
+-#, c-format
+-msgid ""
+-"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
+-"not be found "
+-msgstr ""
+-"ei õnnestu leida vaikimisi kasutatavat menüüfaili \"%s\", millele viitab "
+-"WMRootMenu"
+-
+-#: ../src/menureader.c:457
+-#, c-format
+-msgid ""
+-"invalid content in menu file '%s'.\n"
+-"It should either be a property list menu or the path to the file, enclosed "
+-"in \"."
+-msgstr ""
+-
+-#: ../src/misc.c:71
++#: ../src/misc.c:65
+ #, c-format
+ msgid "could not define value for %s for cpp"
+-msgstr "ei õnnestu defineerida %s väärtust cpp jaoks"
++msgstr "%s väärtust pole võimalik cpp jaoks kirjedada"
+
+-#: ../src/misc.c:101
++#: ../src/misc.c:95
+ #, c-format
+ msgid "could not get password entry for UID %i"
+-msgstr "ei õnnestu leida UID %i paroolikirjet"
++msgstr "UID %i paroolikirjet pole võimalik leida"
+
+-#: ../src/misc.c:126
++#: ../src/misc.c:121
+ #, c-format
+ msgid "your machine is misconfigured. HOSTNAME is set to %s"
+-msgstr "Teie masin on häälestamata. HOSTNAME väärtus on %s"
++msgstr "Teie masin on seadistamata. HOSTNAME väärtus on %s"
+
+-#: ../src/misc.c:132
++#: ../src/misc.c:127
+ #, c-format
+ msgid "your machine is misconfigured. HOST is set to %s"
+-msgstr "Teie masin on häälestamata. HOST väärtus on %s"
++msgstr "Teie masin on seadistamata. HOST väärtus on %s"
+
+-#: ../src/misc.c:630
++#: ../src/misc.c:622
+ msgid "Program Arguments"
+ msgstr "Programmi argumendid"
+
+-#: ../src/misc.c:631
++#: ../src/misc.c:623
+ msgid "Enter command arguments:"
+ msgstr "Sisesta käsu argumendid:"
+
+-#: ../src/misc.c:724
+-msgid "unable to get dropped data from DND drop"
+-msgstr "ei õnnestu vastu võtta DND saadetud andmeid"
+-
+-#: ../src/misc.c:732
+-msgid "error getting dropped data from DND drop"
+-msgstr "viga DND saadetud andmete vastuvõtmisel"
+-
+-#: ../src/misc.c:738
+-msgid "out of memory while getting data from DND drop"
+-msgstr "mälu lõppes DND saadetud andmete vastuvõtmisel "
+-
+-#: ../src/misc.c:783 ../src/misc.c:923
++#: ../src/misc.c:737 ../src/misc.c:875
+ #, c-format
+ msgid "out of memory during expansion of \"%s\""
+ msgstr "mälu lõppes \"%s\" laiendamise käigus"
+
+-#: ../src/misc.c:837
++#: ../src/misc.c:791
+ msgid "out of memory during expansion of \"%w\""
+ msgstr "mälu lõppes \"%w\" laiendamise käigus"
+
+-#: ../src/misc.c:855
++#: ../src/misc.c:809
+ msgid "out of memory during expansion of \"%W\""
+ msgstr "mälu lõppes \"%W\" laiendamise käigus"
+
+-#: ../src/misc.c:871
++#: ../src/misc.c:825
++#, c-format
+ msgid "out of memory during expansion of \"%a\""
+ msgstr "mälu lõppes \"%a\" laiendamise käigus"
+
+-#: ../src/misc.c:902
++#: ../src/misc.c:854
+ #, c-format
+ msgid "out of memory during expansion of \"%d\""
+ msgstr "mälu lõppes \"%d\" laiendamise käigus"
+
+-#: ../src/misc.c:916
++#: ../src/misc.c:868
+ msgid "selection not available"
+ msgstr "valik ei ole kättesaadav"
+
+-#: ../src/misc.c:972 ../src/misc.c:978
++#: ../src/misc.c:912 ../src/misc.c:918
+ #, c-format
+ msgid "bad window name value in %s state info"
+-msgstr "vigane akna nimi %s olekuinfos"
++msgstr "vigane akna nimi %s olekuandmetes"
+
+-#: ../src/misc.c:1235
++#: ../src/misc.c:1157
+ msgid "could not send message to background image helper"
+-msgstr "ei õnnestu saata teadet taustapildiprogrammile"
++msgstr "taustapildi abiprogrammile pole võimalik teadet saata"
+
+ #: ../src/pixmap.c:235
+ #, c-format
+ msgid "could not load mask bitmap file \"%s\". Won't use mask"
+-msgstr "ei õnnestu laadida bitmap maskifaili \"%s\". Maski ei saa kasutada"
++msgstr "bitmap maskifaili \"%s\" pole võimalik laadida. Maski ei saa kasutada"
+
+ #: ../src/resources.c:44
+ #, c-format
+ msgid "could not parse color \"%s\""
+-msgstr "ei õnnestu sõeluda värvi \"%s\""
++msgstr "värvi \"%s\" pole võimalik analüüsida"
+
+ #: ../src/resources.c:48
+ #, c-format
+ msgid "could not allocate color \"%s\""
+-msgstr "ei õnnestu eraldada värvi \"%s\""
++msgstr "värvi \"%s\" pole võimalik eraldada"
+
+ #: ../src/rootmenu.c:196 ../src/rootmenu.c:198
+ msgid "Exit"
+@@ -1150,7 +1101,7 @@
+
+ #: ../src/rootmenu.c:197
+ msgid "Exit window manager?"
+-msgstr "Kas lõpetan aknahalduri töö?"
++msgstr "Kas lõpetada aknahalduri töö?"
+
+ #: ../src/rootmenu.c:245
+ msgid "Close X session"
+@@ -1165,6 +1116,14 @@
+ "On võimalik, et suletakse ka mõned rakendused, mis sisaldavad salvestamata "
+ "andmeid."
+
++#.
++#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
++#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
++#.
++#: ../src/rootmenu.c:248 ../src/winmenu.c:501
++msgid "Close"
++msgstr "Sulge"
++
+ #: ../src/rootmenu.c:261
+ msgid "Kill X session"
+ msgstr "X seansi kõrvaldamine"
+@@ -1177,190 +1136,202 @@
+ "Kas kõrvaldame X seansi?\n"
+ "(kõik rakendused suletakse)"
+
+-#: ../src/rootmenu.c:536
++#: ../src/rootmenu.c:544
+ #, c-format
+ msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
+ msgstr "%s:vigane kiirklahvi kirjeldus \"%s\" kirjele %s"
+
+-#: ../src/rootmenu.c:544
++#: ../src/rootmenu.c:552
+ #, c-format
+ msgid "%s:invalid key in shortcut \"%s\" for entry %s"
+ msgstr "%s: vigane klahv kiirkorralduses \"%s\" kirjele %s"
+
+-#: ../src/rootmenu.c:597
++#: ../src/rootmenu.c:605
+ #, c-format
+ msgid "%s: unmatched '\"' in menu file"
+ msgstr "%s: ebamäärane '\"' menüüfailis"
+
+-#: ../src/rootmenu.c:647
++#: ../src/rootmenu.c:655
+ #, c-format
+ msgid "%s: missing command"
+ msgstr "%s: puuduv korraldus"
+
+-#: ../src/rootmenu.c:679
++#: ../src/rootmenu.c:687
+ #, c-format
+ msgid "invalid OPEN_MENU specification: %s"
+ msgstr "vigane OPEN_MENU kirjeldus: %s"
+
+ #: ../src/rootmenu.c:738
+ #, c-format
++msgid "%s:could not stat menu"
++msgstr "%s:menüü rekvisiite pole võimalik tuvastada"
++
++#: ../src/rootmenu.c:746
++#, c-format
+ msgid "%s:could not stat menu:%s"
+-msgstr "%s:ei õnnestu tuvastada menüü atribuute:%s"
++msgstr "%s:menüü rekvisiite pole võimalik tuvastada:%s"
+
+-#: ../src/rootmenu.c:756
++#: ../src/rootmenu.c:764
+ #, c-format
+ msgid "too many parameters in OPEN_MENU: %s"
+-msgstr "liiga palju parameetreid OPEN_MENU's: %s"
++msgstr "liiga palju OPEN_MENU parameetreid: %s"
+
+-#: ../src/rootmenu.c:800
++#: ../src/rootmenu.c:808
+ msgid ""
+ "There are more than one WORKSPACE_MENU commands in the applications menu. "
+ "Only one is allowed."
+ msgstr ""
+-"Rakenduste menüüs on rohkem kui üks WORKSPACE_MENU korraldus. Lubatud on "
+-"ainult üks."
++"Rakenduste menüüs on mitu WORKSPACE_MENU korraldust. Lubatud on ainult üks."
+
+-#: ../src/rootmenu.c:834
++#: ../src/rootmenu.c:842
+ msgid ""
+ "There are more than one WINDOWS_MENU commands in the applications menu. Only "
+ "one is allowed."
+ msgstr ""
+-"Rakenduste menüüs on rohkem kui üks WINDOWS_MENU korraldus. Lubatud on "
+-"ainult üks."
++"Rakenduste menüüs on mitu WINDOWS_MENU korraldust. Lubatud on ainult üks."
+
+-#: ../src/rootmenu.c:839
++#: ../src/rootmenu.c:847
+ msgid "Window List"
+ msgstr "Akende nimekiri"
+
+-#: ../src/rootmenu.c:868 ../src/rootmenu.c:886 ../src/rootmenu.c:896
++#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904
+ #, c-format
+ msgid "%s:missing parameter for menu command \"%s\""
+-msgstr "%s:puuduvad parameetrid menüükorraldusele \"%s\""
++msgstr "%s:menüükorraldusel \"%s\" puuduvad parameetrid"
+
+-#: ../src/rootmenu.c:964
++#: ../src/rootmenu.c:972
+ #, c-format
+ msgid "%s:unknown command \"%s\" in menu config."
+-msgstr "%s:tundmatu käsk menüü seadistuses: \"%s\"."
++msgstr "%s:menüü seadistuses on tundmatu käsk \"%s\"."
+
+-#: ../src/rootmenu.c:972
++#: ../src/rootmenu.c:980
+ #, c-format
+ msgid "%s:can't add shortcut for entry \"%s\""
+-msgstr "%s:ei õnnestu lisada kiirkorraldust kirjele \"%s\""
++msgstr "%s:kiirkorraldust pole võimalik kirjele \"%s\" lisada"
+
+-#: ../src/rootmenu.c:1109
++#: ../src/rootmenu.c:1117
+ #, c-format
+ msgid "%s:maximal line size exceeded in menu config: %s"
+-msgstr "%s:maksimaalne rea pikkus ületatud menüü seadistuses: %s"
++msgstr "%s:menüü seadistustes on suurim rea pikkus ületatud: %s"
+
+-#: ../src/rootmenu.c:1131 ../src/rootmenu.c:1224 ../src/rootmenu.c:1326
++#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336
+ #, c-format
+ msgid "%s:missing command in menu config: %s"
+-msgstr "%s:puudub korraldus menüü seadistuses: %s"
++msgstr "%s:menüü seadistuses puudub korraldus: %s"
+
+-#: ../src/rootmenu.c:1161
++#: ../src/rootmenu.c:1169
+ #, c-format
+ msgid "%s:syntax error in menu file:END declaration missing"
+-msgstr "%s:süntaksi viga menüüfaili: puudub lõputunnus END"
++msgstr "%s:menüüfaili süntaksi viga: puudub lõputunnus END"
+
+-#: ../src/rootmenu.c:1190 ../src/rootmenu.c:1290
++#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300
+ msgid "could not make arguments for menu file preprocessor"
+-msgstr "ei suuda luua argumente menüüfaili eeltöötlejale"
++msgstr "menüüfaili eeltöötlejale pole võimalik argumente luua"
+
+-#: ../src/rootmenu.c:1197 ../src/rootmenu.c:1298
++#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308
+ #, c-format
+ msgid "%s:could not open/preprocess menu file"
+-msgstr "%s:ei suuda avada/eeltöödelda menüüfaili"
++msgstr "%s:menüüfaili pole võimalik avada või eeltöödelda"
+
+-#: ../src/rootmenu.c:1209 ../src/rootmenu.c:1311
++#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321
+ #, c-format
+ msgid "%s:could not open menu file"
+-msgstr "%s:menüüfaili avamine ebaõnnestus"
++msgstr "%s:menüüfaili pole võimalik avada"
+
+-#: ../src/rootmenu.c:1236
++#: ../src/rootmenu.c:1244
+ #, c-format
+ msgid "%s:invalid menu file. MENU command is missing"
+ msgstr "%s:vigane menüüfail. Puudub MENU käsk"
+
+-#: ../src/rootmenu.c:1245
++#: ../src/rootmenu.c:1253
+ msgid "error reading preprocessed menu data"
+-msgstr "viga eelnevalt töödeldud menüüandmete lugemisel"
++msgstr "viga eeltöödeldud menüüandmete lugemisel"
+
+-#: ../src/rootmenu.c:1338
++#: ../src/rootmenu.c:1348
+ #, c-format
+ msgid "%s:no title given for the root menu"
+ msgstr "%s:juurmenüü pealkiri on puudu"
+
+-#: ../src/rootmenu.c:1429 ../src/rootmenu.c:1502 ../src/rootmenu.c:1543
++#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553
+ #, c-format
+ msgid "out of memory while constructing directory menu %s"
+-msgstr "mälu lõppes menüü %s loomise käigus"
++msgstr "menüü %s loomise käigus lõppes mälu"
+
+-#: ../src/rootmenu.c:1439
++#: ../src/rootmenu.c:1449
+ #, c-format
+ msgid "%s:could not stat file \"%s\" in menu directory"
+-msgstr "%s:ei õnnestu lugeda faili \"%s\" atribuute menüükataloogis"
++msgstr "%s:faili \"%s\" rekvisiite pole menüükataloogist võimalik lugeda"
+
+-#: ../src/rootmenu.c:1597
++#: ../src/rootmenu.c:1607
+ msgid "Commands"
+ msgstr "Korraldused"
+
+-#: ../src/rootmenu.c:1600
++#: ../src/rootmenu.c:1610
+ msgid "Restart"
+ msgstr "Taaskäivitamine"
+
+-#: ../src/rootmenu.c:1601
++#: ../src/rootmenu.c:1611
+ msgid "Exit..."
+ msgstr "Lõpetamine..."
+
+-#: ../src/rootmenu.c:1646
++#: ../src/rootmenu.c:1656
+ #, c-format
+ msgid "could not find menu file \"%s\" referenced in WMRootMenu"
+-msgstr "ei õnnestu leida menüüfaili \"%s\", millele viitab WMRootMenu"
++msgstr "WMRootMenu poolt viidatud menüüfaili \"%s\" pole võimalik leida"
+
+-#: ../src/rootmenu.c:1653
++#: ../src/rootmenu.c:1663
+ #, c-format
+ msgid "could not access menu \"%s\" referenced in WMRootMenu"
+-msgstr "ei õnnestu ligi pääseda menüüle \"%s\", millele viitab WMRootMenu"
++msgstr "WMRootMenu poolt viidatud menüüle \"%s\" pole võimalik ligi pääseda"
+
+-#: ../src/rootmenu.c:1687 ../src/rootmenu.c:1763
++#: ../src/rootmenu.c:1674
++#, c-format
++msgid ""
++"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
++"not be found "
++msgstr ""
++"WMRootMenu poolt viidatud vaikimisi kasutatavat menüüfaili \"%s\" pole "
++"võimalik leida"
++
++#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773
+ #, c-format
+ msgid "%s:format error in root menu configuration \"%s\""
+-msgstr "%s:vormingu viga juurmenüü häälestuses \"%s\""
++msgstr "%s:vormingu viga juurmenüü seadistuses \"%s\""
+
+-#: ../src/rootmenu.c:1851
++#: ../src/rootmenu.c:1855
+ msgid ""
+ "The applications menu could not be loaded. Look at the console output for a "
+ "detailed description of the errors."
+ msgstr ""
+-"Ei õnnestu lugeda rakenduste menüüd. Põhjalikuma vigade kirjelduse "
++"Rakenduste menüüd pole võimalik lugeda. Põhjalikuma vigade kirjelduse "
+ "lugemiseks vaata konsooliväljundit."
+
+-#: ../src/screen.c:740
++#: ../src/screen.c:709
+ #, c-format
+ msgid "could not initialize graphics library context: %s"
+-msgstr "ei õnnesta lähtestada graafikateegi konteksti: %s"
++msgstr "graafikateegi konteksti pole võimalik lähtestada: %s"
+
+-#: ../src/screen.c:771
+-msgid "could not do initialization of WINGs widget set"
+-msgstr ""
++#: ../src/screen.c:737
++msgid "could not initialize WINGs widget set"
++msgstr "WINGs vidinakomplekti pole võimalik lähtestada"
+
+-#: ../src/screen.c:1139
++#: ../src/screen.c:1148
+ #, c-format
+ msgid "could not save session state in %s"
+-msgstr "ei õnnestu salvestada seansi olekut %s"
++msgstr "seansi olekut %s pole võimalik salvestada"
+
+-#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:454
++#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459
+ #, c-format
+ msgid "can't convert \"%s\" to boolean"
+-msgstr "ei õnnestu \"%s\" teisendamine boolean väärtuseks"
++msgstr "väärtust \"%s\" pole võimalik tõeväärtuseks teisendada"
+
+-#: ../src/session.c:1021
++#: ../src/session.c:1018
+ msgid "out of memory while saving session state"
+-msgstr "mälu lõppes seansi oleku salvestamise käigus"
++msgstr "seansi oleku salvestamise käigus lõppes mälu"
+
+-#: ../src/session.c:1104
++#: ../src/session.c:1101
+ msgid "end of memory while saving session state"
+-msgstr "mälu lõpp seansi oleku salvestamise käigus"
++msgstr "seansi oleku salvestamise käigus lõppes mälu"
+
+ #. This is not fatal but can mean the session manager exited.
+ #. * If the session manager exited normally we would get a
+@@ -1368,156 +1339,87 @@
+ #. * If the sm was the last client of session, then we'll die
+ #. * anyway, otherwise we can continue doing our stuff.
+ #.
+-#: ../src/session.c:1242
++#: ../src/session.c:1239
+ msgid "connection to the session manager was lost"
+ msgstr "ühendus seansihalduriga on katkenud"
+
+-#: ../src/stacking.c:79
++#: ../src/stacking.c:81
+ msgid "could not get window list!!"
+-msgstr "ei õnnestu saada akende nimekirja!!"
++msgstr "akende nimekirja pole võimalik saada!!"
+
+-#: ../src/startup.c:202
++#: ../src/startup.c:194
+ #, c-format
+ msgid "internal X error: %s\n"
+ msgstr "X'i sisemine viga: %s\n"
+
+-#: ../src/startup.c:260
+-#, c-format
+-msgid "got signal %i (%s) - restarting\n"
+-msgstr "sain signaali %i (%s) - stardin uuesti\n"
+-
+-#: ../src/startup.c:262
+-#, c-format
+-msgid "got signal %i - restarting\n"
+-msgstr "sain signaali %i - stardin uuesti\n"
+-
+-#: ../src/startup.c:272
+-#, c-format
+-msgid "got signal %i (%s) - rereading defaults\n"
+-msgstr "sain signaali %i (%s) - loen vaikeväärtused uuesti\n"
+-
+-#: ../src/startup.c:274
+-#, c-format
+-msgid "got signal %i - rereading defaults\n"
+-msgstr "sain signaali %i - loen vaikeväärtused uuesti\n"
+-
+-#: ../src/startup.c:284
+-#, c-format
+-msgid "got signal %i (%s) - exiting...\n"
+-msgstr "sain signaali %i (%s) - lõpetan...\n"
+-
+-#: ../src/startup.c:286
+-#, c-format
+-msgid "got signal %i - exiting...\n"
+-msgstr "sain signaali %i - lõpetan...\n"
+-
+-#: ../src/startup.c:329
+-#, c-format
+-msgid "got signal %i (%s)\n"
+-msgstr "sain signaali %i (%s)\n"
+-
+-#: ../src/startup.c:331
+-#, c-format
+-msgid "got signal %i\n"
+-msgstr "sain signaali %i\n"
+-
+-#: ../src/startup.c:342
+-msgid ""
+-"crashed while trying to do some post-crash cleanup. Aborting immediatelly."
+-msgstr ""
+-"järjekordne avarii ajal, mil tehti avariijärgseid puhastusi. Katkestan "
+-"viivitamatult."
+-
+-#. we try to restart Window Maker
+-#: ../src/startup.c:407
+-msgid "trying to restart Window Maker..."
+-msgstr "proovin taaskäivitada Window Maker'it..."
+-
+-#: ../src/startup.c:412
+-msgid "trying to start alternate window manager..."
+-msgstr "proovin käivitada alternatiivset aknahaldurit"
+-
+-#: ../src/startup.c:417
+-msgid "failed to start alternate window manager. Aborting."
+-msgstr "ei õnnestu käivitada alternatiivset aknahaldurit. Annan alla."
+-
+-#: ../src/startup.c:419
+-msgid ""
+-"a fatal error has occured, probably due to a bug. Please fill the included "
+-"BUGFORM and report it."
+-msgstr ""
+-"aset on leidnud fataalne viga, arvatavasti programmi viga. Palun täida "
+-"programmiga kaasa tulnud vearaport (BUGFORM) ja saada see programmi "
+-"autoritele."
+-
+-#: ../src/startup.c:895
++#: ../src/startup.c:771
+ #, c-format
+ msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
+ msgstr ""
+-"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutan suurust "
+-"16\n"
++"ikooni suuruseks on määratud %i, kuid see on liiga väike. Kasutatakse "
++"suurust 16\n"
+
+-#: ../src/startup.c:923
++#: ../src/startup.c:800
+ msgid "XKB is not supported. KbdModeLock is automatically disabled."
+ msgstr "Puudub XKB tugi. KbdModeLock on automaatselt keelatud."
+
+-#: ../src/startup.c:942
++#: ../src/startup.c:819
+ msgid "it seems that there is already a window manager running"
+ msgstr "paistab, et mingi aknahaldur juba töötab"
+
+-#: ../src/startup.c:948
++#: ../src/startup.c:825
+ #, c-format
+ msgid "could not manage screen %i"
+-msgstr "ei õnnestu hallata ekraani %i"
++msgstr "ekraani %i pole võimalik hallata"
+
+-#: ../src/startup.c:1016
++#: ../src/startup.c:884
+ msgid "could not manage any screen"
+-msgstr "ei õnnestu hallata ühtegi ekraani"
++msgstr "ühtegi ekraani pole võimalik hallata"
+
+-#: ../src/switchmenu.c:137
++#: ../src/switchmenu.c:145
+ msgid "Windows"
+ msgstr "Aknad"
+
+ #: ../src/texture.c:329 ../src/texture.c:371
+ #, c-format
+ msgid "image file \"%s\" used as texture could not be found."
+-msgstr "ei õnnestu leida tekstuuriks kasutatavat pildifaili \"%s\"."
++msgstr "tekstuuriks kasutatavat pildifaili \"%s\" pole võimalik leida."
+
+ #: ../src/texture.c:335 ../src/texture.c:377
+ #, c-format
+ msgid "could not load texture pixmap \"%s\":%s"
+-msgstr "ei õnnestu laadida tekstuuri pixmap faili \"%s\":%s"
++msgstr "tekstuuri pildifaili \"%s\" pole võimalik laadida:%s"
+
+ #: ../src/texture.c:437
+ #, c-format
+ msgid "library \"%s\" cound not be opened."
+-msgstr "ei õnnestu avada teeki \"%s\""
++msgstr "teeki \"%s\" pole võimalik avada."
+
+ #: ../src/texture.c:446
+ #, c-format
+ msgid "function \"%s\" not found in library \"%s\""
+-msgstr "ei leia funktsiooni \"%s\" teegist \"%s\""
++msgstr "funktsiooni \"%s\" pole teegist \"%s\" võimalik leida"
+
+ #: ../src/texture.c:453
+ msgid "function textures not supported on this system, sorry."
+-msgstr "tekstuurifunktsioon ei ole selles süsteemis toetatud."
++msgstr "tekstuurifunktsioon pole selles süsteemis toetatud. vabandust."
+
+ #: ../src/texture.c:598
+ msgid "could not allocate image buffer"
+-msgstr "ei õnnestu eraldada pildi puhvrit"
++msgstr "pildipuhvrit pole võimalik eraldada"
+
+ #: ../src/wdefaults.c:437
+ #, c-format
+ msgid "could not find icon file \"%s\""
+-msgstr "ei õnnestu leida ikoonifaili \"%s\""
++msgstr "ikoonifaili \"%s\" pole võimalik leida"
+
+-#: ../src/window.c:2884 ../src/window.c:3023
++#: ../src/window.c:3041 ../src/window.c:3182
+ msgid ""
+ "the NumLock, ScrollLock or similar key seems to be turned on.\n"
+ "Turn it off or some mouse actions and keyboard shortcuts will not work."
+ msgstr ""
+ "klahvid NumLock, ScrollLock (või sarnased) näivad olevat sisse lülitatud.\n"
+-"Lülita need välja või muidu ei tööta mõned hiire toimingud ja klaviatuuri\n"
++"Lülita need välja või muidu ei tööta mõned hiiretoimingud ja klaviatuuri\n"
+ "kiirkorraldused."
+
+ #: ../src/winmenu.c:125
+@@ -1528,24 +1430,37 @@
+ msgstr ""
+ "Programm suletakse jõuga.\n"
+ "Kõik salvestamata andmed lähevad kaotsi.\n"
+-"Kas soovite seda teha?"
++"Kas soovid seda teha?"
+
+-#: ../src/winmenu.c:267 ../src/winmenu.c:276
++#: ../src/winmenu.c:268 ../src/winmenu.c:277
+ msgid "Set Shortcut"
+ msgstr "Määra kiirkorraldus"
+
+-#: ../src/winmenu.c:354 ../src/winmenu.c:399
++#: ../src/winmenu.c:355 ../src/winmenu.c:400
+ msgid "could not create submenu for window menu"
+ msgstr "ei õnnestu luua aknamenüü alammenüüd"
+
+-#: ../src/winmenu.c:403
++#: ../src/winmenu.c:404
+ msgid "Keep on top"
+ msgstr "Hoia esiplaanil"
+
+-#: ../src/winmenu.c:408
++#: ../src/winmenu.c:409
+ msgid "Keep at bottom"
+ msgstr "Hoia tagaplaanil"
+
++#.
++#. * Warning: If you make some change that affects the order of the
++#. * entries, you must update the command #defines in the top of
++#. * this file.
++#.
++#: ../src/winmenu.c:437 ../src/winmenu.c:571
++msgid "Maximize"
++msgstr "Maksimeeri"
++
++#: ../src/winmenu.c:445 ../src/winmenu.c:557
++msgid "Miniaturize"
++msgstr "Minimeeri"
++
+ #: ../src/winmenu.c:453 ../src/winmenu.c:588
+ msgid "Shade"
+ msgstr "Keri kokku"
+@@ -1558,6 +1473,10 @@
+ msgid "Select"
+ msgstr "Vali"
+
++#: ../src/winmenu.c:485
++msgid "Move To"
++msgstr "Teisalda"
++
+ #: ../src/winmenu.c:490
+ msgid "Attributes..."
+ msgstr "Rekvisiidid..."
+@@ -1566,89 +1485,97 @@
+ msgid "Options"
+ msgstr "Valikud"
+
++#: ../src/winmenu.c:552
++msgid "Deminiaturize"
++msgstr "Ava aken"
++
++#: ../src/winmenu.c:566
++msgid "Unmaximize"
++msgstr "Taasta suurus"
++
+ #: ../src/winmenu.c:583
+ msgid "Unshade"
+ msgstr "Keri lahti"
+
+-#: ../src/winspector.c:387
++#: ../src/winspector.c:392
+ #, c-format
+ msgid "Could not find icon \"%s\" specified for this window"
+-msgstr "Ei õnnestu leida selle akna jaoks määratud ikooni \"%s\""
++msgstr "Selle akna jaoks määratud ikooni \"%s\" pole võimalik leida"
+
+-#: ../src/winspector.c:404
++#: ../src/winspector.c:409
+ #, c-format
+ msgid "Could not open specified icon \"%s\":%s"
+-msgstr "Ei õnnestu avada kirjeldatud ikooni \"%s\":%s"
++msgstr "Kirjeldatud ikooni \"%s\" pole võimalik avada:%s"
+
+-#: ../src/winspector.c:1135
++#: ../src/winspector.c:1129
+ #, c-format
+ msgid "Inspecting %s.%s"
+-msgstr "Vaatlen %s.%s"
++msgstr "%s.%s vaatlemine"
+
+-#: ../src/winspector.c:1161
++#: ../src/winspector.c:1155
+ msgid "Click in the window you wish to inspect."
+ msgstr "Kliki aknale, mida soovid vaadelda."
+
+-#: ../src/winspector.c:1200
++#: ../src/winspector.c:1194
+ msgid ""
+ "The configuration will apply to all\n"
+ "windows that have their WM_CLASS\n"
+ "property set to the above selected\n"
+ "name, when saved."
+ msgstr ""
+-"Häälestuse salvestamisel laieneb see\n"
++"Seadistuste salvestamisel laieneb see\n"
+ "kõigile akendele, mille WM_CLASS\n"
+ "omadus on üks ülalloetletud nimedest."
+
+-#: ../src/winspector.c:1229
++#: ../src/winspector.c:1223
+ msgid "Save"
+ msgstr "Salvesta"
+
+-#: ../src/winspector.c:1237
++#: ../src/winspector.c:1231
+ msgid "Apply"
+ msgstr "Rakenda"
+
+-#: ../src/winspector.c:1243
++#: ../src/winspector.c:1237
+ msgid "Reload"
+ msgstr "Taasta"
+
+-#: ../src/winspector.c:1252 ../src/winspector.c:1262
++#: ../src/winspector.c:1246 ../src/winspector.c:1256
+ msgid "Window Specification"
+ msgstr "Akna kirjeldus"
+
+-#: ../src/winspector.c:1253
++#: ../src/winspector.c:1247
+ msgid "Window Attributes"
+ msgstr "Akna rekvisiidid"
+
+-#: ../src/winspector.c:1254
++#: ../src/winspector.c:1248
+ msgid "Advanced Options"
+ msgstr "Laiendatud valikud"
+
+-#: ../src/winspector.c:1255
++#: ../src/winspector.c:1249
+ msgid "Icon and Initial Workspace"
+ msgstr "Ikoon ja töölaud"
+
+-#: ../src/winspector.c:1256
++#: ../src/winspector.c:1250
+ msgid "Application Specific"
+ msgstr "Rakendusele omane"
+
+-#: ../src/winspector.c:1270
++#: ../src/winspector.c:1264
+ msgid "Defaults for all windows"
+ msgstr "Vaikimisi kõigile akendele"
+
+-#: ../src/winspector.c:1324
++#: ../src/winspector.c:1318
+ msgid "Select window"
+ msgstr "Vali aken"
+
+-#: ../src/winspector.c:1338
++#: ../src/winspector.c:1332
+ msgid "Attributes"
+ msgstr "Rekvisiidid"
+
+-#: ../src/winspector.c:1349
++#: ../src/winspector.c:1343
+ msgid "Disable titlebar"
+ msgstr "Tiitliriba peidus"
+
+-#: ../src/winspector.c:1351
++#: ../src/winspector.c:1345
+ msgid ""
+ "Remove the titlebar of this window.\n"
+ "To access the window commands menu of a window\n"
+@@ -1656,298 +1583,304 @@
+ "equivalent shortcut, if you changed the default\n"
+ "settings)."
+ msgstr ""
+-"Eemaldab akna tiitliriba. Ilma tiitliribata\n"
+-"akna parameetreid saab muuta,\n"
+-"vajutadades Control+Esc (või kui\n"
+-"kontrollklahve on muudetud, siis sellele\n"
++"Aknalt tiitliriba eemaldamine. Ilma\n"
++"tiitliribata akna parameetreid saab\n"
++"muuta,vajutadades Control+Esc (või kui\n"
++"juhtklahve on muudetud, siis sellele\n"
+ "vastavat klahvikombinatsiooni)."
+
+-#: ../src/winspector.c:1358
++#: ../src/winspector.c:1352
+ msgid "Disable resizebar"
+ msgstr "Suuruse muutmise riba peidus"
+
+-#: ../src/winspector.c:1360
++#: ../src/winspector.c:1354
+ msgid "Remove the resizebar of this window."
+-msgstr "Eemaldab riba, mille abil muudetakse akna suurust."
++msgstr "Akna suuruse muutmise riba eemaldamine sellelt aknalt."
+
+-#: ../src/winspector.c:1363
++#: ../src/winspector.c:1357
+ msgid "Disable close button"
+ msgstr "Sulgemisnupp peidus"
+
+-#: ../src/winspector.c:1365
++#: ../src/winspector.c:1359
+ msgid "Remove the `close window' button of this window."
+-msgstr "Eemaldab sulgemisnupu akna tiitliribalt."
++msgstr "Akna sulgemisnupu eemaldamine selle akna tiitliribalt."
+
+-#: ../src/winspector.c:1368
++#: ../src/winspector.c:1362
+ msgid "Disable miniaturize button"
+ msgstr "Minimeerimisnupp peidus"
+
+-#: ../src/winspector.c:1370
++#: ../src/winspector.c:1364
+ msgid "Remove the `miniaturize window' button of the window."
+-msgstr "Eemaldab minimeerimisnupu akna tiitliribalt."
++msgstr "Akna minimeerimisnupu eemaldamine selle akna tiitliribalt."
+
+-#: ../src/winspector.c:1373
++#: ../src/winspector.c:1367
+ msgid "Disable border"
+ msgstr "Raam peidus"
+
+-#: ../src/winspector.c:1375
++#: ../src/winspector.c:1369
+ msgid "Remove the 1 pixel black border around the window."
+-msgstr "Eemaldab akna ümbert ühepikslise musta raami."
++msgstr "Akna ümbert ühepikslise musta raami eemaldamine."
+
+-#: ../src/winspector.c:1378
++#: ../src/winspector.c:1372
+ msgid "Keep on top (floating)"
+-msgstr "Hoia esiplaanil"
++msgstr "Hoitakse esiplaanil (ujuv)"
+
+-#: ../src/winspector.c:1380
++#: ../src/winspector.c:1374
+ msgid ""
+ "Keep the window over other windows, not allowing\n"
+ "them to cover it."
+-msgstr "Hoiab akent teiste akende suhtes esiplaanil."
++msgstr "Akna hoidmine teiste akende peal."
+
+-#: ../src/winspector.c:1384
++#: ../src/winspector.c:1378
++#, fuzzy
+ msgid "Keep at bottom (sunken)"
+-msgstr "Hoia tagaplaanil"
++msgstr "Hoitakse tagaplaanil"
+
+-#: ../src/winspector.c:1386
++#: ../src/winspector.c:1380
+ msgid "Keep the window under all other windows."
+-msgstr "Hoiab akent kõigi teiste akende taga."
++msgstr "Akna hoidmine kõigi teiste akende taga."
+
+-#: ../src/winspector.c:1391
++#: ../src/winspector.c:1385
+ msgid "Make window present in all workspaces."
+-msgstr "Näitab akent kõigil töölaudadel."
++msgstr "Aken on kõigil töölaudadel."
+
+-#: ../src/winspector.c:1394
++#: ../src/winspector.c:1388
+ msgid "Start miniaturized"
+-msgstr "Käivita minimeerituna"
++msgstr "Käivitatakse minimeerituna"
+
+-#: ../src/winspector.c:1396
++#: ../src/winspector.c:1390
+ msgid ""
+ "Make the window be automatically miniaturized when it's\n"
+ "first shown."
+-msgstr "Programmi käivitamise hetkel minimeerib akna."
++msgstr ""
++"Programmi esmasel näitamisel minimeeritakse\n"
++"aken automaatselt."
+
+-#: ../src/winspector.c:1400
++#: ../src/winspector.c:1394
+ msgid "Start maximized"
+ msgstr "Käivita maksimeerituna"
+
+-#: ../src/winspector.c:1402
++#: ../src/winspector.c:1396
+ msgid ""
+ "Make the window be automatically maximized when it's\n"
+ "first shown."
+-msgstr "Programmi käivitamise hetkel maksimeerib akna."
++msgstr ""
++"Programmi esmasel näitamisel maksimeeritakse\n"
++"aken automaatselt."
+
+-#: ../src/winspector.c:1406
++#: ../src/winspector.c:1400
+ msgid "Full screen maximization"
+-msgstr "Maksimeeri üle kogu ekraani"
++msgstr "Maksimeeritakse üle kogu ekraani"
+
+-#: ../src/winspector.c:1408
++#: ../src/winspector.c:1402
+ msgid ""
+ "Make the window use the whole screen space when it's\n"
+ "maximized. The titlebar and resizebar will be moved\n"
+ "to outside the screen."
+ msgstr ""
+-"Lubab akent maksimeerida kogu ekraani ulatuses.\n"
+-"Kui lubatud, siis akna maksimeerimise korral\n"
+-"jäävad akna tiitliriba ja suuruse muutmise riba\n"
+-"väljapoole ekraani piirkonda."
++"Akent lubatakse suurendada kogu ekraani ulatuses.\n"
++"Akna tiitliriba ja suuruse muutmise riba jäävad\n"
++"siis väljaspoole ekraani piirkonda."
+
+-#: ../src/winspector.c:1425
++#: ../src/winspector.c:1419
+ msgid "Advanced"
+ msgstr "Laiendatud võimalused"
+
+-#: ../src/winspector.c:1442
++#: ../src/winspector.c:1436
+ msgid "Do not bind keyboard shortcuts"
+ msgstr "Kiirklahvidele ei reageerita"
+
+-#: ../src/winspector.c:1444
++#: ../src/winspector.c:1438
+ msgid ""
+ "Do not bind keyboard shortcuts from Window Maker\n"
+ "when this window is focused. This will allow the\n"
+ "window to receive all key combinations regardless\n"
+ "of your shortcut configuration."
+ msgstr ""
+-"Keelab fookuses oleval aknal reageerimase\n"
++"Fookuses oleval aknal keelatakse reageerimast\n"
+ "Window Maker'i kiirklahvidele. See võimaldab\n"
+ "aknal vastu võtta kõiki klaviatuurilt tulevaid\n"
+ "koode."
+
+-#: ../src/winspector.c:1450
++#: ../src/winspector.c:1444
+ msgid "Do not bind mouse clicks"
+ msgstr "Hiirevajutustele ei reageerita"
+
+-#: ../src/winspector.c:1452
++#: ../src/winspector.c:1446
+ msgid ""
+ "Do not bind mouse actions, such as `Alt'+drag\n"
+-"in the window (when alt is the modifier you haveconfigured)."
++"in the window (when alt is the modifier you have\n"
++"configured)."
+ msgstr ""
+-"Keelab aknal reageerimast hiiretoimingutele.\n"
++"Aknal keelatakse reageerimast hiiretoimingutele.\n"
+ "Näiteks `Alt'+lohistamine (kui alt on määratud\n"
+ "muuteklahviks)."
+
+-#: ../src/winspector.c:1457
++#: ../src/winspector.c:1451
+ msgid "Do not show in the window list"
+ msgstr "Akende nimekirjas ei näidata"
+
+-#: ../src/winspector.c:1459
++#: ../src/winspector.c:1453
+ msgid "Do not list the window in the window list menu."
+-msgstr "Keelab akna nime näitamise akende nimekirjas."
++msgstr "Akna nime ei näidata akende nimekirjas."
+
+-#: ../src/winspector.c:1462
++#: ../src/winspector.c:1456
+ msgid "Do not let it take focus"
+ msgstr "Akna fokuseerimine keelatud"
+
+-#: ../src/winspector.c:1464
++#: ../src/winspector.c:1458
+ msgid ""
+ "Do not let the window take keyboard focus when you\n"
+ "click on it."
+ msgstr ""
+-"Keelab akna fokuseerimise. Aknale ei\n"
++"Akna fokuseerimine on keelatud. Aknale ei\n"
+ "mõju klaviatuurilt saabuvad vajutused."
+
+-#: ../src/winspector.c:1468
++#: ../src/winspector.c:1462
+ msgid "Keep inside screen"
+ msgstr "Hoia ekraani sees"
+
+-#: ../src/winspector.c:1470
++#: ../src/winspector.c:1464
+ msgid ""
+ "Do not allow the window to move itself completely\n"
+ "outside the screen. For bug compatibility.\n"
+ msgstr ""
+-"Keelab akna liigutamise\n"
+-"väljapoole ekraani pinda.\n"
++"Aknent ei saa liigutada\n"
++"väljaspoole ekraani pinda.\n"
+
+-#: ../src/winspector.c:1474
++#: ../src/winspector.c:1468
+ msgid "Ignore 'Hide Others'"
+-msgstr "Eira käsku 'Peida teised aknad'"
++msgstr "Käsu 'Peida teised aknad' eiramine"
+
+-#: ../src/winspector.c:1476
++#: ../src/winspector.c:1470
+ msgid ""
+ "Do not hide the window when issuing the\n"
+ "`HideOthers' command."
+ msgstr ""
+-"Keelab reageerimise käsule\n"
+-"\"Peida teised aknad\"."
++"Akent ei peideta käsu\n"
++"\"Peida teised aknad\" puhul."
+
+-#: ../src/winspector.c:1480
++#: ../src/winspector.c:1474
+ msgid "Ignore 'Save Session'"
+-msgstr "Eira seansi salvestamist"
++msgstr "Seansi salvestamist eiratakse"
+
+-#: ../src/winspector.c:1482
++#: ../src/winspector.c:1476
+ msgid ""
+ "Do not save the associated application in the\n"
+ "session's state, so that it won't be restarted\n"
+ "together with other applications when Window Maker\n"
+ "starts."
+ msgstr ""
+-"Keelab akna andmete salvestamise seansi\n"
+-"andmetesse. Rakendust ei käivitata koos\n"
+-"seansi koosseisu kuuluvate akendega."
++"Akna andmeid ei salvestata seansi\n"
++"andmetesse ja seetõttu ei käivitata\n"
++"rakendust koos seansi koosseisu\n"
++"kuuluvate akendega."
+
+-#: ../src/winspector.c:1488
++#: ../src/winspector.c:1482
+ msgid "Emulate application icon"
+-msgstr "Emuleeri rakenduse ikooni"
++msgstr "Rakenduse ikooni emuleeritakse"
+
+-#: ../src/winspector.c:1490
++#: ../src/winspector.c:1484
+ msgid ""
+ "Make this window act as an application that provides\n"
+ "enough information to Window Maker for a dockable\n"
+ "application icon to be created."
+-msgstr "Loob aknale dokitava rakenduse ikooni."
++msgstr ""
++"Aknale luuakse dokitava rakenduse ikoon, mille alusel\n"
++"Window Maker on suuteline looma rakenduse ikooni."
+
+-#: ../src/winspector.c:1496
++#: ../src/winspector.c:1490
+ msgid "Disable language button"
+ msgstr "Keelenupp peidus"
+
+-#: ../src/winspector.c:1498
++#: ../src/winspector.c:1492
+ msgid "Remove the `toggle language' button of the window."
+ msgstr ""
+-"Eemaldab keele sisse- ja väljalülitamise\n"
+-"nupu akna tiitliribalt."
++"Keele sisse- ja väljalülitamise\n"
++"nupp on akna tiitliribalt eemaldatud."
+
+-#: ../src/winspector.c:1515
++#: ../src/winspector.c:1509
+ msgid "Miniwindow Image"
+ msgstr "Pisiakna pilt"
+
+-#: ../src/winspector.c:1542
++#: ../src/winspector.c:1536
+ msgid "Icon filename:"
+ msgstr "Ikoonifaili nimi:"
+
+-#: ../src/winspector.c:1555
++#: ../src/winspector.c:1549
+ msgid "Ignore client supplied icon"
+-msgstr "Eira kliendi enda ikooni"
++msgstr "Kliendi enda ikooni eiramine"
+
+-#: ../src/winspector.c:1562
++#: ../src/winspector.c:1556
+ msgid "Initial Workspace"
+ msgstr "Töölaud, millel käivitatakse"
+
+-#: ../src/winspector.c:1564
++#: ../src/winspector.c:1558
+ msgid "The workspace to place the window when it'sfirst shown."
+ msgstr "Töölaua nimi, mille peal akent esimest korda näidatakse."
+
+-#: ../src/winspector.c:1570
++#: ../src/winspector.c:1564
+ msgid "Nowhere in particular"
+ msgstr "Ei oma tähtsust"
+
+-#: ../src/winspector.c:1588
++#: ../src/winspector.c:1582
+ msgid "Application Attributes"
+ msgstr "Rakenduse rekvisiidid"
+
+-#: ../src/winspector.c:1599
++#: ../src/winspector.c:1593
+ msgid "Start hidden"
+ msgstr "Käivita peidetuna"
+
+-#: ../src/winspector.c:1601
++#: ../src/winspector.c:1595
+ msgid "Automatically hide application when it's started."
+-msgstr "Peidab akna programmi käivitamise hetkel."
++msgstr "Akna peitmine rakenduse käivitamise hetkel."
+
+-#: ../src/winspector.c:1604
++#: ../src/winspector.c:1598
+ msgid "No application icon"
+ msgstr "Rakenduse ikoon peidus"
+
+-#: ../src/winspector.c:1606
++#: ../src/winspector.c:1600
+ msgid ""
+ "Disable the application icon for the application.\n"
+ "Note that you won't be able to dock it anymore,\n"
+ "and any icons that are already docked will stop\n"
+ "working correctly."
+ msgstr ""
+-"Keelab rakenduse ikooni. Keelamise korral ei ole\n"
+-"võimalik rakendust dokkida ja kõik selle rakenduse\n"
+-"juba dokitud ikoonid ei toimi enam korrektselt."
++"Rakenduse ikooni keelamine. Sel juhul pole\n"
++"rakendust võimalik dokkida ja kõik selle\n"
++"rakenduse juba dokitud ikoonid ei toimi enam\n"
++"korrektselt."
+
+-#: ../src/winspector.c:1612
++#: ../src/winspector.c:1606
+ msgid "Shared application icon"
+ msgstr "Rakenduse ikoon jagatud"
+
+-#: ../src/winspector.c:1614
++#: ../src/winspector.c:1608
+ msgid ""
+ "Use a single shared application icon for all of\n"
+ "the instances of this application.\n"
+ msgstr ""
+-"Kasutab ühte jagatud ikooni kõigi\n"
++"Ühe jagatud ikooni kasutamine kõigi\n"
+ "rakenduse instantside jaoks.\n"
+
+-#: ../src/wmspec.c:277
+-msgid "out of memory while updating wm hints"
+-msgstr "mälu lõppes wm vihjete uuendamise käigus"
+-
+-#: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:876
++#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302
+ #, c-format
+ msgid "Workspace %i"
+ msgstr "Töölaud %i"
+
+-#: ../src/workspace.c:926
++#: ../src/workspace.c:1352
+ msgid "Workspaces"
+ msgstr "Töölauad"
+
+-#: ../src/workspace.c:928
++#: ../src/workspace.c:1354
+ msgid "could not create Workspace menu"
+-msgstr "ei õnnestu luua töölaua menüüd"
++msgstr "töölaua menüüd pole võimalik luua"
+
+-#: ../src/workspace.c:935
++#: ../src/workspace.c:1361
+ msgid "New"
+ msgstr "Uus"
+
+-#: ../src/workspace.c:936
++#: ../src/workspace.c:1362
+ msgid "Destroy Last"
+ msgstr "Eemalda viimane"
++
+diff -Nur WindowMaker-0.92.0.orig/src/actions.c WindowMaker-0.92.0/src/actions.c
+--- WindowMaker-0.92.0.orig/src/actions.c 2005-07-03 19:25:14.000000000 +0200
++++ WindowMaker-0.92.0/src/actions.c 2005-08-23 01:23:41.000000000 +0200
+@@ -365,7 +365,8 @@
+ void
+ wMaximizeWindow(WWindow *wwin, int directions)
+ {
+- int new_width, new_height, new_x, new_y;
++ int new_x, new_y;
++ unsigned int new_width, new_height;
+ int changed_h, changed_v, shrink_h, shrink_v;
+ WArea usableArea, totalArea;
+
+diff -Nur WindowMaker-0.92.0.orig/src/event.c WindowMaker-0.92.0/src/event.c
+--- WindowMaker-0.92.0.orig/src/event.c 2005-03-13 01:13:55.000000000 +0100
++++ WindowMaker-0.92.0/src/event.c 2005-12-07 20:22:09.000000000 +0100
+@@ -559,6 +559,10 @@
+ wwin->flags.skip_next_animation = 1;
+ wIconifyWindow(wwin);
+ }
++ if (wwin->flags.fullscreen) {
++ wwin->flags.fullscreen = 0;
++ wFullscreenWindow(wwin);
++ }
+ if (wwin->flags.hidden) {
+ WApplication *wapp = wApplicationOf(wwin->main_window);
+
+diff -Nur WindowMaker-0.92.0.orig/src/icon.c WindowMaker-0.92.0/src/icon.c
+--- WindowMaker-0.92.0.orig/src/icon.c 2005-03-11 23:27:58.000000000 +0100
++++ WindowMaker-0.92.0/src/icon.c 2005-08-23 00:18:46.000000000 +0200
+@@ -651,7 +651,7 @@
+ if (icon->icon_win!=None) {
+ XWindowAttributes attr;
+ int resize=0;
+- int width, height, depth;
++ unsigned int width, height, depth;
+ int theight;
+ Pixmap pixmap;
+
+diff -Nur WindowMaker-0.92.0.orig/src/misc.c WindowMaker-0.92.0/src/misc.c
+--- WindowMaker-0.92.0.orig/src/misc.c 2004-11-11 14:31:47.000000000 +0100
++++ WindowMaker-0.92.0/src/misc.c 2005-08-23 00:46:24.000000000 +0200
+@@ -1128,7 +1128,7 @@
+ void
+ SendHelperMessage(WScreen *scr, char type, int workspace, char *msg)
+ {
+- unsigned char *buffer;
++ char *buffer;
+ int len;
+ int i;
+ char buf[16];
+diff -Nur WindowMaker-0.92.0.orig/src/moveres.c WindowMaker-0.92.0/src/moveres.c
+--- WindowMaker-0.92.0.orig/src/moveres.c 2004-10-24 21:36:09.000000000 +0200
++++ WindowMaker-0.92.0/src/moveres.c 2005-08-23 01:27:24.000000000 +0200
+@@ -1471,7 +1471,7 @@
+
+ ww=w;wh=h;
+ wh-=vert_border;
+- wWindowConstrainSize(wwin, &ww, &wh);
++ wWindowConstrainSize(wwin, (unsigned int*)&ww, (unsigned int*)&wh);
+ wh+=vert_border;
+
+ if (wPreferences.ws_cycle){
+@@ -2070,7 +2070,7 @@
+ rh += dh;
+ fw = rw;
+ fh = rh - vert_border;
+- wWindowConstrainSize(wwin, &fw, &fh);
++ wWindowConstrainSize(wwin, (unsigned int*)&fw, (unsigned int*)&fh);
+ fh += vert_border;
+ if (res & LEFT)
+ fx = rx2 - fw + 1;
+diff -Nur WindowMaker-0.92.0.orig/src/properties.c WindowMaker-0.92.0/src/properties.c
+--- WindowMaker-0.92.0.orig/src/properties.c 2004-10-14 23:11:52.000000000 +0200
++++ WindowMaker-0.92.0/src/properties.c 2005-08-23 00:19:58.000000000 +0200
+@@ -234,8 +234,8 @@
+ if (image->format == RRGBAFormat) {
+ memcpy(&tmp[4], image->data, image->width*image->height*4);
+ } else {
+- char *ptr = tmp+4;
+- char *src = image->data;
++ char *ptr = (char*)(tmp+4);
++ char *src = (char*)image->data;
+
+ for (y = 0; y < image->height; y++) {
+ for (x = 0; x < image->width; x++) {
+diff -Nur WindowMaker-0.92.0.orig/src/startup.c WindowMaker-0.92.0/src/startup.c
+--- WindowMaker-0.92.0.orig/src/startup.c 2005-03-12 02:11:30.000000000 +0100
++++ WindowMaker-0.92.0/src/startup.c 2005-08-23 00:20:16.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <string.h>
+ #include <errno.h>
+ #include <signal.h>
+ #include <sys/wait.h>
+diff -Nur WindowMaker-0.92.0.orig/src/switchpanel.c WindowMaker-0.92.0/src/switchpanel.c
+--- WindowMaker-0.92.0.orig/src/switchpanel.c 2004-10-30 09:16:04.000000000 +0200
++++ WindowMaker-0.92.0/src/switchpanel.c 2006-01-22 19:08:39.000000000 +0100
+@@ -501,6 +501,7 @@
+
+ if (!panel->bg) {
+ WMFrame *frame = WMCreateFrame(panel->win);
++ WMColor *darkGray = WMDarkGrayColor(scr->wmscreen);
+ WMSetFrameRelief(frame, WRSimple);
+ WMSetViewExpandsToParent(WMWidgetView(frame), 0, 0, 0, 0);
+
+@@ -508,10 +509,11 @@
+ WMResizeWidget(panel->label, width, LABEL_HEIGHT);
+ WMMoveWidget(panel->label, BORDER_SPACE, BORDER_SPACE+ICON_TILE_SIZE+5);
+ WMSetLabelRelief(panel->label, WRSimple);
+- WMSetWidgetBackgroundColor(panel->label, WMDarkGrayColor(scr->wmscreen));
++ WMSetWidgetBackgroundColor(panel->label, darkGray);
+ WMSetLabelFont(panel->label, panel->font);
+ WMSetLabelTextColor(panel->label, panel->white);
+
++ WMReleaseColor(darkGray);
+ height+= 5;
+ }
+
+@@ -604,6 +606,8 @@
+ RReleaseImage(panel->bg);
+ if (panel->font)
+ WMReleaseFont(panel->font);
++ if (panel->white)
++ WMReleaseColor(panel->white);
+ wfree(panel);
+ }
+
+diff -Nur WindowMaker-0.92.0.orig/src/window.c WindowMaker-0.92.0/src/window.c
+--- WindowMaker-0.92.0.orig/src/window.c 2005-07-01 02:56:11.000000000 +0200
++++ WindowMaker-0.92.0/src/window.c 2005-08-23 01:20:14.000000000 +0200
+@@ -2043,10 +2043,10 @@
+ *----------------------------------------------------------------------
+ */
+ void
+-wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight)
++wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight)
+ {
+- int width = *nwidth;
+- int height = *nheight;
++ int width = (int)*nwidth;
++ int height = (int)*nheight;
+ int winc = 1;
+ int hinc = 1;
+ int minW = 1, minH = 1;
+@@ -2143,8 +2143,8 @@
+
+
+ void
+-wWindowCropSize(WWindow *wwin, int maxW, int maxH,
+- int *width, int *height)
++wWindowCropSize(WWindow *wwin, unsigned int maxW, unsigned int maxH,
++ unsigned int *width, unsigned int *height)
+ {
+ int baseW = 0, baseH = 0;
+ int winc = 1, hinc = 1;
+diff -Nur WindowMaker-0.92.0.orig/src/window.h WindowMaker-0.92.0/src/window.h
+--- WindowMaker-0.92.0.orig/src/window.h 2005-07-01 02:05:43.000000000 +0200
++++ WindowMaker-0.92.0/src/window.h 2005-08-23 01:20:31.000000000 +0200
+@@ -388,9 +388,9 @@
+ void wWindowUnfocus(WWindow *wwin);
+
+ void wWindowUpdateName(WWindow *wwin, char *newTitle);
+-void wWindowConstrainSize(WWindow *wwin, int *nwidth, int *nheight);
+-void wWindowCropSize(WWindow *wwin, int maxw, int maxh,
+- int *nwidth, int *nheight);
++void wWindowConstrainSize(WWindow *wwin, unsigned int *nwidth, unsigned int *nheight);
++void wWindowCropSize(WWindow *wwin, unsigned int maxw, unsigned int maxh,
++ unsigned int *nwidth, unsigned int *nheight);
+ void wWindowConfigure(WWindow *wwin, int req_x, int req_y,
+ int req_width, int req_height);
+
+diff -Nur WindowMaker-0.92.0.orig/src/wmspec.c WindowMaker-0.92.0/src/wmspec.c
+--- WindowMaker-0.92.0.orig/src/wmspec.c 2005-05-15 18:41:09.000000000 +0200
++++ WindowMaker-0.92.0/src/wmspec.c 2006-01-22 18:28:21.000000000 +0100
+@@ -35,6 +35,7 @@
+
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
++#include <X11/Xarch.h>
+ #include <string.h>
+
+ #include "WindowMaker.h"
+@@ -70,22 +71,22 @@
+ static Atom net_current_desktop;
+ static Atom net_desktop_names;
+ static Atom net_active_window;
+-static Atom net_workarea; /* XXX: not xinerama compatible */
++static Atom net_workarea; /* XXX: not xinerama compatible */
+ static Atom net_supporting_wm_check;
+-static Atom net_virtual_roots; /* N/A */
+-static Atom net_desktop_layout; /* XXX */
++static Atom net_virtual_roots; /* N/A */
++static Atom net_desktop_layout; /* XXX */
+ static Atom net_showing_desktop;
+
+ /* Other Root Window Messages */
+ static Atom net_close_window;
+-static Atom net_moveresize_window; /* TODO */
+-static Atom net_wm_moveresize; /* TODO */
++static Atom net_moveresize_window; /* TODO */
++static Atom net_wm_moveresize; /* TODO */
+
+ /* Application Window Properties */
+ static Atom net_wm_name;
+-static Atom net_wm_visible_name; /* TODO (unnecessary?) */
++static Atom net_wm_visible_name; /* TODO (unnecessary?) */
+ static Atom net_wm_icon_name;
+-static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
++static Atom net_wm_visible_icon_name; /* TODO (unnecessary?) */
+ static Atom net_wm_desktop;
+ static Atom net_wm_window_type;
+ static Atom net_wm_window_type_desktop;
+@@ -97,7 +98,7 @@
+ static Atom net_wm_window_type_dialog;
+ static Atom net_wm_window_type_normal;
+ static Atom net_wm_state;
+-static Atom net_wm_state_modal; /* XXX: what is this?!? */
++static Atom net_wm_state_modal; /* XXX: what is this?!? */
+ static Atom net_wm_state_sticky;
+ static Atom net_wm_state_maximized_vert;
+ static Atom net_wm_state_maximized_horz;
+@@ -119,15 +120,15 @@
+ static Atom net_wm_action_fullscreen;
+ static Atom net_wm_action_change_desktop;
+ static Atom net_wm_action_close;
+-static Atom net_wm_strut; /* XXX: see net_workarea */
+-static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
+-static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
++static Atom net_wm_strut; /* XXX: see net_workarea */
++static Atom net_wm_strut_partial; /* TODO: doesn't really fit into the current strut scheme */
++static Atom net_wm_icon_geometry; /* FIXME: should work together with net_wm_handled_icons, gnome-panel-2.2.0.1 doesn't use _NET_WM_HANDLED_ICONS, thus present situation. */
+ static Atom net_wm_icon;
+-static Atom net_wm_pid; /* TODO */
+-static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
++static Atom net_wm_pid; /* TODO */
++static Atom net_wm_handled_icons; /* FIXME: see net_wm_icon_geometry */
+
+ /* Window Manager Protocols */
+-static Atom net_wm_ping; /* TODO */
++static Atom net_wm_ping; /* TODO */
+
+ static Atom utf8_string;
+
+@@ -322,15 +323,15 @@
+ void
+ wNETWMUpdateDesktop(WScreen *scr)
+ {
+- CARD32 *views, sizes[2];
++ long *views, sizes[2];
+ int count, i;
+
+ if (scr->workspace_count==0)
+ return;
+
+ count = scr->workspace_count * 2;
+- views = wmalloc(sizeof(CARD32) * count);
+- /*memset(views, 0, sizeof(CARD32) * count);*/
++ views = wmalloc(sizeof(long) * count);
++ /*memset(views, 0, sizeof(long) * count);*/
+
+ #ifdef VIRTUAL_DESKTOP
+ sizes[0] = scr->workspaces[scr->current_workspace]->width;
+@@ -370,7 +371,7 @@
+ 0, 1, &count);
+ if (prop)
+ {
+- int desktop= *(CARD32*)prop;
++ int desktop= *(long*)prop;
+ XFree(prop);
+ return desktop;
+ }
+@@ -389,12 +390,12 @@
+ *
+ * The logic can also be changed to accept bigger images and scale them down.
+ */
+-static CARD32*
+-findBestIcon(CARD32 *data, unsigned long items)
++static unsigned long*
++findBestIcon(unsigned long *data, unsigned long items)
+ {
+ int size, wanted, d, distance;
+ unsigned long i;
+- CARD32 *icon;
++ unsigned long *icon;
+
+ /* better use only 75% of icon_size. For 64x64 this means 48x48
+ * This leaves room around the icon for the miniwindow title and
+@@ -418,12 +419,12 @@
+
+
+ static RImage*
+-makeRImageFromARGBData(CARD32 *data)
++makeRImageFromARGBData(unsigned long *data)
+ {
+ int size, width, height, i;
+ RImage *image;
+ unsigned char *imgdata;
+- CARD32 pixel;
++ unsigned long pixel;
+
+ width = data[0];
+ height = data[1];
+@@ -436,10 +437,18 @@
+
+ for (imgdata=image->data, i=2; i<size+2; i++, imgdata+=4) {
+ pixel = data[i];
++#if BYTE_ORDER == BIG_ENDIAN
++ imgdata[2] = (pixel >> 24) & 0xff; /* A */
++ imgdata[1] = (pixel >> 16) & 0xff; /* R */
++ imgdata[0] = (pixel >> 8) & 0xff; /* G */
++ imgdata[3] = (pixel >> 0) & 0xff; /* B */
++#else /* Little endian */
+ imgdata[3] = (pixel >> 24) & 0xff; /* A */
+ imgdata[0] = (pixel >> 16) & 0xff; /* R */
+ imgdata[1] = (pixel >> 8) & 0xff; /* G */
+ imgdata[2] = (pixel >> 0) & 0xff; /* B */
++#endif /* endianness */
++
+ }
+
+ return image;
+@@ -449,7 +458,7 @@
+ static void
+ updateIconImage(WScreen *scr, WWindow *wwin)
+ {
+- CARD32 *property, *data;
++ unsigned long *property, *data;
+ unsigned long items, rest;
+ Atom type;
+ int format;
+@@ -487,7 +496,7 @@
+ static void
+ updateShowDesktop(WScreen * scr, Bool show)
+ {
+- CARD32 foo;
++ long foo;
+
+ foo = (show == True);
+ XChangeProperty(dpy, scr->root_win, net_showing_desktop, XA_CARDINAL, 32,
+@@ -660,7 +669,7 @@
+ void
+ wNETWMUpdateWorkarea(WScreen *scr, WArea usableArea)
+ {
+- CARD32 *area;
++ long *area;
+ int count, i;
+
+ /* XXX: not Xinerama compatible,
+@@ -670,7 +679,7 @@
+ return;
+
+ count = scr->workspace_count * 4;
+- area = wmalloc(sizeof(CARD32) * count);
++ area = wmalloc(sizeof(long) * count);
+ for (i=0; i<scr->workspace_count; i++) {
+ area[4*i + 0] = usableArea.x1;
+ area[4*i + 1] = usableArea.y1;
+@@ -793,7 +802,7 @@
+ static void
+ updateWorkspaceCount(WScreen *scr) /* changeable */
+ {
+- CARD32 count;
++ long count;
+
+ count = scr->workspace_count;
+
+@@ -805,7 +814,7 @@
+ static void
+ updateCurrentWorkspace(WScreen *scr) /* changeable */
+ {
+- CARD32 count;
++ long count;
+
+ count = scr->current_workspace;
+
+@@ -852,7 +861,7 @@
+ static void
+ updateWorkspaceHint(WWindow *wwin, Bool fake, Bool del)
+ {
+- CARD32 l;
++ long l;
+
+ if (del) {
+ XDeleteProperty(dpy, wwin->client_win, net_wm_desktop);
+diff -Nur WindowMaker-0.92.0.orig/test/wtest.c WindowMaker-0.92.0/test/wtest.c
+--- WindowMaker-0.92.0.orig/test/wtest.c 2004-10-12 23:03:04.000000000 +0200
++++ WindowMaker-0.92.0/test/wtest.c 2005-08-23 00:40:15.000000000 +0200
+@@ -15,11 +15,11 @@
+ #include <X11/Xproto.h>
+ #include <WMaker.h>
+
+-static unsigned char bits[] = {
++static char bits[] = {
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
+-static unsigned char mbits[] = {
++static char mbits[] = {
+ 0xff, 0x03, 0xff, 0x01, 0xff, 0x00, 0x7f, 0x00, 0x3f, 0x00, 0x1f, 0x00,
+ 0x0f, 0x00, 0x07, 0x00, 0x03, 0x00, 0x01, 0x00};
+
+diff -Nur WindowMaker-0.92.0.orig/util/wmsetbg.c WindowMaker-0.92.0/util/wmsetbg.c
+--- WindowMaker-0.92.0.orig/util/wmsetbg.c 2004-10-27 05:01:38.000000000 +0200
++++ WindowMaker-0.92.0/util/wmsetbg.c 2005-08-23 00:49:29.000000000 +0200
+@@ -787,7 +787,7 @@
+ freeTexture(BackgroundTexture *texture)
+ {
+ if (texture->solid) {
+- long pixel[1];
++ unsigned long pixel[1];
+
+ pixel[0] = texture->color.pixel;
+ /* dont free black/white pixels */
+@@ -966,7 +966,7 @@
+
+
+ int
+-readmsg(int fd, unsigned char *buffer, int size)
++readmsg(int fd, char *buffer, int size)
+ {
+ int count;
+
+@@ -998,7 +998,7 @@
+ {
+ BackgroundTexture *textures[WORKSPACE_COUNT];
+ int maxTextures = 0;
+- unsigned char buffer[2048], buf[8];
++ char buffer[2048], buf[8];
+ int size;
+ int errcount = 4;
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/ChangeLog WindowMaker-0.92.0/WINGs/ChangeLog
+--- WindowMaker-0.92.0.orig/WINGs/ChangeLog 2004-10-23 04:21:59.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/ChangeLog 2006-01-22 21:33:00.000000000 +0100
+@@ -1,3 +1,17 @@
++Changes since wmaker 0.92.0:
++............................
++
++- updated the XDND code in to work with GDK based applications.
++ WINGs based applications should now work with both KDE and GNOME
++ applications (Sylvain Reynal <sreynal@nerim.net>)
++- better check for the XDND protocol version when interoperating with other
++ applications. As it seems xdnd version 3 (which WINGs supports) and newer
++ are not backward compatible with xdnd version 1 and 2. This is why WINGs
++ applications cannot interoperate with GNUstep applications (which uses
++ xdnd version 2). Xdnd version 4 and 5 are backwards compatible with
++ version 3 though. (Sylvain Reynal <sreynal@nerim.net>)
++
++
+ Changes since wmaker 0.80.1:
+ ............................
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/connection.c WindowMaker-0.92.0/WINGs/connection.c
+--- WindowMaker-0.92.0.orig/WINGs/connection.c 2004-10-23 04:46:36.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/connection.c 2005-08-23 00:10:49.000000000 +0200
+@@ -201,7 +201,7 @@
+
+ if (cPtr->state == WCInProgress) {
+ Bool failed;
+- int len = sizeof(result);
++ socklen_t len = sizeof(result);
+
+ WCErrorCode = 0;
+ if (getsockopt(cPtr->sock, SOL_SOCKET, SO_ERROR,
+@@ -462,8 +462,8 @@
+ {
+ WMConnection *cPtr;
+ struct sockaddr_in *socketaddr;
++ socklen_t size;
+ int sock, on;
+- int size;
+
+ WCErrorCode = 0;
+
+@@ -678,7 +678,7 @@
+ WMAcceptConnection(WMConnection *listener)
+ {
+ struct sockaddr_in clientname;
+- int size;
++ socklen_t size;
+ int newSock;
+ WMConnection *newConnection;
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/dragcommon.c WindowMaker-0.92.0/WINGs/dragcommon.c
+--- WindowMaker-0.92.0.orig/WINGs/dragcommon.c 2004-10-28 11:25:23.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/dragcommon.c 2006-01-22 21:15:43.000000000 +0100
+@@ -2,11 +2,9 @@
+
+ #include "WINGsP.h"
+
+-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
++#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
+ #define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
+ #define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
+-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
+- && ((dragInfo->destInfo->destView) != NULL)
+
+
+ static Bool _WindowExists;
+@@ -151,6 +149,13 @@
+ {
+ XEvent ev;
+
++#ifdef XDND_DEBUG
++ char* msgName = XGetAtomName(dpy, message);
++
++ printf("sending message %s ... ", msgName);
++ XFree(msgName);
++#endif
++
+ if (! windowExists(dpy, win)) {
+ wwarning("xdnd message target %d does no longer exist.", win);
+ return False; /* message not sent */
+@@ -170,6 +175,9 @@
+ XSendEvent(dpy, win, False, 0, &ev);
+ XFlush(dpy);
+
++#ifdef XDND_DEBUG
++ printf("sent\n");
++#endif
+ return True; /* message sent */
+ }
+
+@@ -178,7 +186,9 @@
+ handleLeaveMessage(WMDraggingInfo *info)
+ {
+ if (XDND_DEST_INFO(info) != NULL) {
+- if (XDND_DEST_VIEW(info) != NULL) {
++ /* XDND_DEST_VIEW is never NULL (it's the xdnd aware view) */
++ wassertr(XDND_DEST_VIEW(info) != NULL);
++ if (XDND_DEST_VIEW(info)->dragDestinationProcs != NULL) {
+ XDND_DEST_VIEW(info)->dragDestinationProcs->concludeDragOperation(
+ XDND_DEST_VIEW(info));
+ }
+@@ -216,11 +226,15 @@
+
+ /* Messages from source to destination */
+ if (messageType == scr->xdndEnterAtom) {
++ Bool positionSent = (XDND_DEST_INFO(info) != NULL);
++
+ W_DragDestinationStopTimer();
+ W_DragDestinationStoreEnterMsgInfo(info, toplevel, event);
+
+- if (VERSION_INFO(info) <= XDND_VERSION) {
+- if (XDND_DEST_VIEW_STORED(info)) {
++ /* Xdnd version 3 and up are not compatible with version 1 or 2 */
++ if (XDND_SOURCE_VERSION(info) > 2) {
++
++ if (positionSent) {
+ /* xdndPosition previously received on xdnd aware view */
+ W_DragDestinationStateHandler(info, event);
+ return;
+@@ -230,7 +244,7 @@
+ }
+ } else {
+ wwarning("received dnd enter msg with unsupported version %i",
+- VERSION_INFO(info));
++ XDND_SOURCE_VERSION(info));
+ W_DragDestinationCancelDropOnEnter(toplevel, info);
+ return;
+ }
+diff -Nur WindowMaker-0.92.0.orig/WINGs/dragdestination.c WindowMaker-0.92.0/WINGs/dragdestination.c
+--- WindowMaker-0.92.0.orig/WINGs/dragdestination.c 2004-10-28 11:25:36.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/dragdestination.c 2006-01-22 21:19:18.000000000 +0100
+@@ -5,15 +5,16 @@
+
+ #define XDND_SOURCE_RESPONSE_MAX_DELAY 3000
+
+-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
+-
+ #define XDND_PROPERTY_FORMAT 32
+ #define XDND_ACTION_DESCRIPTION_FORMAT 8
+
++#define XDND_SOURCE_VERSION(dragInfo) dragInfo->protocolVersion
+ #define XDND_DEST_INFO(dragInfo) dragInfo->destInfo
++#define XDND_AWARE_VIEW(dragInfo) dragInfo->destInfo->xdndAwareView
+ #define XDND_SOURCE_WIN(dragInfo) dragInfo->destInfo->sourceWindow
+ #define XDND_DEST_VIEW(dragInfo) dragInfo->destInfo->destView
+ #define XDND_DEST_STATE(dragInfo) dragInfo->destInfo->state
++#define XDND_SOURCE_ACTION_CHANGED(dragInfo) dragInfo->destInfo->sourceActionChanged
+ #define XDND_SOURCE_TYPES(dragInfo) dragInfo->destInfo->sourceTypes
+ #define XDND_TYPE_LIST_AVAILABLE(dragInfo) dragInfo->destInfo->typeListAvailable
+ #define XDND_REQUIRED_TYPES(dragInfo) dragInfo->destInfo->requiredTypes
+@@ -22,8 +23,8 @@
+ #define XDND_SOURCE_OPERATIONS(dragInfo) dragInfo->destInfo->sourceOperations
+ #define XDND_DROP_DATAS(dragInfo) dragInfo->destInfo->dropDatas
+ #define XDND_DROP_DATA_COUNT(dragInfo) dragInfo->destInfo->dropDataCount
+-#define XDND_DEST_VIEW_STORED(dragInfo) ((dragInfo->destInfo) != NULL)\
+- && ((dragInfo->destInfo->destView) != NULL)
++#define XDND_DEST_VIEW_IS_REGISTERED(dragInfo) ((dragInfo->destInfo) != NULL)\
++ && ((dragInfo->destInfo->destView->dragDestinationProcs) != NULL)
+
+
+ static unsigned char XDNDversion = XDND_VERSION;
+@@ -81,7 +82,6 @@
+ static WMArray*
+ getTypesFromTypeList(WMScreen *scr, Window sourceWin)
+ {
+- /* // WMDraggingInfo *info = &scr->dragInfo;*/
+ Atom dataType;
+ Atom* typeAtomList;
+ WMArray* typeList;
+@@ -138,22 +138,29 @@
+ WMScreen *scr = W_VIEW_SCREEN(destView);
+ WMArray *requiredTypes;
+
+- /* First, see if the 3 source types are enough for dest requirements */
++ /* First, see if the stored source types are enough for dest requirements */
+ requiredTypes = destView->dragDestinationProcs->requiredDataTypes(
+ destView,
+ W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
+ XDND_SOURCE_TYPES(info));
+
+ if (requiredTypes == NULL && XDND_TYPE_LIST_AVAILABLE(info)) {
+- /* None of the 3 source types fits, get the whole type list */
++ /* None of the stored source types fits, but the whole type list
++ hasn't been retrieved yet. */
++ WMFreeArray(XDND_SOURCE_TYPES(info));
++ XDND_SOURCE_TYPES(info) = getTypesFromTypeList(
++ scr,
++ XDND_SOURCE_WIN(info));
++ /* Don't retrieve the type list again */
++ XDND_TYPE_LIST_AVAILABLE(info) = False;
++
+ requiredTypes =
+ destView->dragDestinationProcs->requiredDataTypes(
+ destView,
+ W_ActionToOperation(scr, XDND_SOURCE_ACTION(info)),
+- getTypesFromTypeList(scr, XDND_SOURCE_WIN(info)));
++ XDND_SOURCE_TYPES(info));
+ }
+
+-
+ XDND_REQUIRED_TYPES(info) = requiredTypes;
+ }
+
+@@ -219,7 +226,7 @@
+ }
+
+ operationArray = WMCreateDragOperationArray(count);
+- description = descriptionList;
++ description = (char*)descriptionList;
+
+ for (i=0; count > 0; i++) {
+ size = strlen(description);
+@@ -249,47 +256,35 @@
+ }
+
+
+-static Window
+-findChildInWindow(Display *dpy, Window toplevel, int x, int y)
++static WMView*
++findChildInView(WMView* parent, int x, int y)
+ {
+- Window foo, bar;
+- Window *children;
+- unsigned nchildren;
+- int i;
++ if (parent->childrenList == NULL)
++ return parent;
++ else {
++ WMView* child = parent->childrenList;
+
+- if (!XQueryTree(dpy, toplevel, &foo, &bar,
+- &children, &nchildren) || children == NULL) {
+- return None;
+- }
+-
+- /* first window that contains the point is the one */
+- for (i = nchildren-1; i >= 0; i--) {
+- XWindowAttributes attr;
+-
+- if (XGetWindowAttributes(dpy, children[i], &attr)
+- && attr.map_state == IsViewable
+- && x >= attr.x && y >= attr.y
+- && x < attr.x + attr.width && y < attr.y + attr.height) {
+- Window child, tmp;
+-
+- tmp = children[i];
+- child = findChildInWindow(dpy, tmp, x - attr.x, y - attr.y);
+- XFree(children);
+-
+- if (child == None)
+- return tmp;
+- else
+- return child;
+- }
++ while (child != NULL
++ && (! child->flags.mapped
++ || x < WMGetViewPosition(child).x
++ || x > WMGetViewPosition(child).x + WMGetViewSize(child).width
++ || y < WMGetViewPosition(child).y
++ || y > WMGetViewPosition(child).y + WMGetViewSize(child).height))
++
++ child = child->nextSister;
++
++ if (child == NULL)
++ return parent;
++ else
++ return findChildInView(child,
++ x - WMGetViewPosition(child).x,
++ y - WMGetViewPosition(child).y);
+ }
+-
+- XFree(children);
+- return None;
+ }
+
+
+ static WMView*
+-findXdndViewInToplevel(WMView* toplevel, int x, int y)
++findDestinationViewInToplevel(WMView* toplevel, int x, int y)
+ {
+ WMScreen *scr = W_VIEW_SCREEN(toplevel);
+ Window toplevelWin = WMViewXID(toplevel);
+@@ -300,20 +295,7 @@
+ XTranslateCoordinates(scr->display, scr->rootWin, toplevelWin,
+ x, y, &xInToplevel, &yInToplevel,
+ &foo);
+-
+- child = findChildInWindow(scr->display, toplevelWin,
+- xInToplevel, yInToplevel);
+-
+- if (child != None) {
+- childView = W_GetViewForXWindow(scr->display, child);
+-
+- /* if childView supports Xdnd, return childView */
+- if (childView != NULL
+- && childView->dragDestinationProcs != NULL)
+- return childView;
+- }
+-
+- return NULL;
++ return findChildInView(toplevel, xInToplevel, yInToplevel);
+ }
+
+
+@@ -334,6 +316,7 @@
+ XDND_REQUIRED_TYPES(info) = NULL;
+ }
+
++
+ void
+ W_DragDestinationInfoClear(WMDraggingInfo *info)
+ {
+@@ -347,15 +330,19 @@
+ }
+ }
+
++
+ static void
+-initDestinationDragInfo(WMDraggingInfo *info)
++initDestinationDragInfo(WMDraggingInfo *info, WMView *destView)
+ {
++ wassertr(destView != NULL);
++
+ XDND_DEST_INFO(info) =
+ (W_DragDestinationInfo*) wmalloc(sizeof(W_DragDestinationInfo));
+
+ XDND_DEST_STATE(info) = idleState;
+- XDND_DEST_VIEW(info) = NULL;
++ XDND_DEST_VIEW(info) = destView;
+
++ XDND_SOURCE_ACTION_CHANGED(info) = False;
+ XDND_SOURCE_TYPES(info) = NULL;
+ XDND_REQUIRED_TYPES(info) = NULL;
+ XDND_DROP_DATAS(info) = NULL;
+@@ -369,13 +356,19 @@
+ WMScreen *scr = W_VIEW_SCREEN(toplevel);
+
+ if (XDND_DEST_INFO(info) == NULL)
+- initDestinationDragInfo(info);
++ initDestinationDragInfo(info, toplevel);
+
++ XDND_SOURCE_VERSION(info) = (event->data.l[1] >> 24);
++ XDND_AWARE_VIEW(info) = toplevel;
+ updateSourceWindow(info, event);
+
+- /* store xdnd version for source */
+- info->protocolVersion = (event->data.l[1] >> 24);
+-
++/*
++ if (event->data.l[1] & 1)
++ /* XdndTypeList property is available */
++/* XDND_SOURCE_TYPES(info) = getTypesFromTypeList(scr, XDND_SOURCE_WIN(info));
++ else
++ XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
++*/
+ XDND_SOURCE_TYPES(info) = getTypesFromThreeTypes(scr, event);
+
+ /* to use if the 3 types are not enough */
+@@ -383,45 +376,30 @@
+ }
+
+
+-static void
+-cancelDrop(WMView *destView, WMDraggingInfo *info);
+-
+-static void
+-suspendDropAuthorization(WMView *destView, WMDraggingInfo *info);
+-
+-
+ void
+- W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
+- WMView *toplevel, XClientMessageEvent *event)
++W_DragDestinationStorePositionMsgInfo(WMDraggingInfo *info,
++ WMView *toplevel, XClientMessageEvent *event)
+ {
+ int x = event->data.l[2] >> 16;
+ int y = event->data.l[2] & 0xffff;
+- WMView *oldDestView;
+ WMView *newDestView;
+
+- newDestView = findXdndViewInToplevel(toplevel, x, y);
++ newDestView = findDestinationViewInToplevel(toplevel, x, y);
+
+ if (XDND_DEST_INFO(info) == NULL) {
+- initDestinationDragInfo(info);
++ initDestinationDragInfo(info, newDestView);
++ XDND_AWARE_VIEW(info) = toplevel;
+ updateSourceWindow(info, event);
+- XDND_DEST_VIEW(info) = newDestView;
+- }
+- else {
+- oldDestView = XDND_DEST_VIEW(info);
+-
+- if (newDestView != oldDestView) {
+- if (oldDestView != NULL) {
+- suspendDropAuthorization(oldDestView, info);
+- XDND_DEST_STATE(info) = dropNotAllowedState;
+- }
+-
++ } else {
++ if (newDestView != XDND_DEST_VIEW(info)) {
+ updateSourceWindow(info, event);
+ XDND_DEST_VIEW(info) = newDestView;
++ XDND_SOURCE_ACTION_CHANGED(info) = False;
+
+- if (newDestView != NULL) {
+- if (XDND_DEST_STATE(info) != waitEnterState)
+- XDND_DEST_STATE(info) = idleState;
+- }
++ if (XDND_DEST_STATE(info) != waitEnterState)
++ XDND_DEST_STATE(info) = idleState;
++ } else {
++ XDND_SOURCE_ACTION_CHANGED(info) = (XDND_SOURCE_ACTION(info) != event->data.l[4]);
+ }
+ }
+
+@@ -437,27 +415,62 @@
+
+ /* send a DnD message to the source window */
+ static void
+-sendDnDClientMessage(WMView *destView, Atom message,
++sendDnDClientMessage(WMDraggingInfo *info, Atom message,
+ unsigned long data1,
+ unsigned long data2,
+ unsigned long data3,
+ unsigned long data4)
+ {
+- WMScreen *scr = W_VIEW_SCREEN(destView);
+- WMDraggingInfo *info = &scr->dragInfo;
++ if (! W_SendDnDClientMessage(W_VIEW_SCREEN(XDND_AWARE_VIEW(info))->display,
++ XDND_SOURCE_WIN(info),
++ message,
++ WMViewXID(XDND_AWARE_VIEW(info)),
++ data1,
++ data2,
++ data3,
++ data4)) {
++ /* drop failed */
++ W_DragDestinationInfoClear(info);
++ }
++}
+
+- if (XDND_DEST_INFO(info) != NULL) {
+- if (! W_SendDnDClientMessage(scr->display,
+- XDND_SOURCE_WIN(info),
+- message,
+- WMViewXID(destView),
+- data1,
+- data2,
+- data3,
+- data4)) {
+- /* drop failed */
+- W_DragDestinationInfoClear(info);
+- }
++
++/* send a xdndStatus message to the source, with position and size
++ of the destination if it has no subwidget (requesting a position message
++ on every move otherwise) */
++static void
++sendStatusMessage(WMView *destView, WMDraggingInfo *info, Atom action)
++{
++ unsigned long data1;
++
++ data1 = (action == None) ? 0 : 1;
++
++ if (destView->childrenList == NULL) {
++ WMScreen *scr = W_VIEW_SCREEN(destView);
++ int destX, destY;
++ WMSize destSize = WMGetViewSize(destView);
++ Window foo;
++
++ XTranslateCoordinates(scr->display, WMViewXID(destView), scr->rootWin,
++ 0, 0, &destX, &destY,
++ &foo);
++
++ sendDnDClientMessage(info,
++ W_VIEW_SCREEN(destView)->xdndStatusAtom,
++ data1,
++ (destX << 16)|destY,
++ (destSize.width << 16)|destSize.height,
++ action);
++ } else {
++ /* set bit 1 to request explicitly position message on every move */
++ data1 = data1 | 2;
++
++ sendDnDClientMessage(info,
++ W_VIEW_SCREEN(destView)->xdndStatusAtom,
++ data1,
++ 0,
++ 0,
++ action);
+ }
+ }
+
+@@ -534,31 +547,26 @@
+ static void
+ cancelDrop(WMView *destView, WMDraggingInfo *info)
+ {
+- /* send XdndStatus with action None */
+- sendDnDClientMessage(destView,
+- W_VIEW_SCREEN(destView)->xdndStatusAtom,
+- 0, 0, 0, None);
++ sendStatusMessage(destView, info, None);
+ concludeDrop(destView);
+ freeDestinationViewInfos(info);
+ }
+
+
+-/* suspend drop, when dragged icon enter an unaware subview of destView */
++/* suspend drop, when dragged icon enter an unregistered view
++ or a register view that doesn't accept the drop */
+ static void
+ suspendDropAuthorization(WMView *destView, WMDraggingInfo *info)
+ {
+- /* free datas that depend on destination behaviour */
+- /* (in short: only keep source's types) */
++ sendStatusMessage(destView, info, None);
++
++ /* Free datas that depend on destination behaviour */
+ if (XDND_DROP_DATAS(info) != NULL) {
+ WMFreeArray(XDND_DROP_DATAS(info));
+ XDND_DROP_DATAS(info) = NULL;
+ }
+- XDND_REQUIRED_TYPES(info) = NULL;
+
+- /* send XdndStatus with action None */
+- sendDnDClientMessage(destView,
+- W_VIEW_SCREEN(destView)->xdndStatusAtom,
+- 0, 0, 0, None);
++ XDND_REQUIRED_TYPES(info) = NULL;
+ }
+
+
+@@ -566,14 +574,10 @@
+ void
+ W_DragDestinationCancelDropOnEnter(WMView *toplevel, WMDraggingInfo *info)
+ {
+- if (XDND_DEST_VIEW_STORED(info))
++ if (XDND_DEST_VIEW_IS_REGISTERED(info))
+ cancelDrop(XDND_DEST_VIEW(info), info);
+- else {
+- /* send XdndStatus with action None */
+- sendDnDClientMessage(toplevel,
+- W_VIEW_SCREEN(toplevel)->xdndStatusAtom,
+- 0, 0, 0, None);
+- }
++ else
++ sendStatusMessage(toplevel, info, None);
+
+ W_DragDestinationInfoClear(info);
+ }
+@@ -582,7 +586,7 @@
+ static void
+ finishDrop(WMView *destView, WMDraggingInfo *info)
+ {
+- sendDnDClientMessage(destView,
++ sendDnDClientMessage(info,
+ W_VIEW_SCREEN(destView)->xdndFinishedAtom,
+ 0, 0, 0, 0);
+ concludeDrop(destView);
+@@ -603,31 +607,6 @@
+ }
+
+
+-/* send the action that can be performed,
+- and the limits outside wich the source must re-send
+- its position and action */
+-static void
+-sendAllowedAction(WMView *destView, Atom action)
+-{
+- WMScreen *scr = W_VIEW_SCREEN(destView);
+- /* // WMPoint destPos = WMGetViewScreenPosition(destView); */
+- WMSize destSize = WMGetViewSize(destView);
+- int destX, destY;
+- Window foo;
+-
+- XTranslateCoordinates(scr->display, scr->rootWin, WMViewXID(destView),
+- 0, 0, &destX, &destY,
+- &foo);
+-
+- sendDnDClientMessage(destView,
+- scr->xdndStatusAtom,
+- 1,
+- (destX << 16)|destY,
+- (destSize.width << 16)|destSize.height,
+- action);
+-}
+-
+-
+ static void*
+ checkActionAllowed(WMView *destView, WMDraggingInfo* info)
+ {
+@@ -639,10 +618,11 @@
+ return dropNotAllowedState;
+ }
+
+- sendAllowedAction(destView, XDND_DEST_ACTION(info));
++ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
+ return dropAllowedState;
+ }
+
++
+ static void*
+ checkDropAllowed(WMView *destView, XClientMessageEvent *event,
+ WMDraggingInfo* info)
+@@ -670,6 +650,7 @@
+ return checkActionAllowed(destView, info);
+ }
+
++
+ static WMPoint*
+ getDropLocationInView(WMView *view)
+ {
+@@ -690,6 +671,7 @@
+ return location;
+ }
+
++
+ static void
+ callPerformDragOperation(WMView *destView, WMDraggingInfo *info)
+ {
+@@ -721,21 +703,17 @@
+ WMDraggingInfo *info;
+
+ wwarning("delay for drag source response expired");
+- if (view != NULL) {
+- info = &(W_VIEW_SCREEN(view)->dragInfo);
+- if (XDND_DEST_VIEW_STORED(info))
+- cancelDrop(view, info);
+- else {
+- /* send XdndStatus with action None */
+- sendDnDClientMessage(view,
+- W_VIEW_SCREEN(view)->xdndStatusAtom,
+- 0, 0, 0, None);
+- }
+-
+- W_DragDestinationInfoClear(info);
++ info = &(W_VIEW_SCREEN(view)->dragInfo);
++ if (XDND_DEST_VIEW_IS_REGISTERED(info))
++ cancelDrop(view, info);
++ else {
++ sendStatusMessage(view, info, None);
+ }
++
++ W_DragDestinationInfoClear(info);
+ }
+
++
+ void
+ W_DragDestinationStopTimer()
+ {
+@@ -745,21 +723,17 @@
+ }
+ }
+
++
+ void
+ W_DragDestinationStartTimer(WMDraggingInfo *info)
+ {
+ W_DragDestinationStopTimer();
+
+- if (XDND_DEST_STATE(info) != idleState
+- || XDND_DEST_VIEW(info) == NULL) {
+- /* note: info->destView == NULL means :
+- Enter message has been received, waiting for Position message */
+-
++ if (XDND_DEST_STATE(info) != idleState)
+ dndDestinationTimer = WMAddTimerHandler(
+ XDND_SOURCE_RESPONSE_MAX_DELAY,
+ dragSourceResponseTimeOut,
+ XDND_DEST_VIEW(info));
+- }
+ }
+ /* ----- End of Destination timer ----- */
+
+@@ -795,6 +769,7 @@
+ }
+ #endif
+
++
+ static void*
+ idleState(WMView *destView, XClientMessageEvent *event,
+ WMDraggingInfo *info)
+@@ -802,21 +777,24 @@
+ WMScreen *scr;
+ Atom sourceMsg;
+
+- scr = W_VIEW_SCREEN(destView);
+- sourceMsg = event->message_type;
+-
+- if (sourceMsg == scr->xdndPositionAtom) {
+- destView->dragDestinationProcs->prepareForDragOperation(destView);
++ if (destView->dragDestinationProcs != NULL) {
++ scr = W_VIEW_SCREEN(destView);
++ sourceMsg = event->message_type;
++
++ if (sourceMsg == scr->xdndPositionAtom) {
++ destView->dragDestinationProcs->prepareForDragOperation(destView);
++
++ if (XDND_SOURCE_TYPES(info) != NULL) {
++ /* enter message infos are available */
++ return checkDropAllowed(destView, event, info);
++ }
+
+- if (XDND_SOURCE_TYPES(info) != NULL) {
+- /* enter message infos are available */
+- return checkDropAllowed(destView, event, info);
++ /* waiting for enter message */
++ return waitEnterState;
+ }
+-
+- /* waiting for enter message */
+- return waitEnterState;
+ }
+
++ suspendDropAuthorization(destView, info);
+ return idleState;
+ }
+
+@@ -881,6 +859,15 @@
+ return idleState;
+ }
+
++ if (sourceMsg == scr->xdndPositionAtom) {
++ if (XDND_SOURCE_ACTION_CHANGED(info)) {
++ return checkDropAllowed(destView, event, info);
++ } else {
++ sendStatusMessage(destView, info, None);
++ return dropNotAllowedState;
++ }
++ }
++
+ return dropNotAllowedState;
+ }
+
+@@ -912,6 +899,15 @@
+ return idleState;
+ }
+
++ if (sourceMsg == scr->xdndPositionAtom) {
++ if (XDND_SOURCE_ACTION_CHANGED(info)) {
++ return checkDropAllowed(destView, event, info);
++ } else {
++ sendStatusMessage(destView, info, XDND_DEST_ACTION(info));
++ return dropAllowedState;
++ }
++ }
++
+ return dropAllowedState;
+ }
+
+@@ -947,29 +943,30 @@
+ WMView *destView;
+ W_DndState* newState;
+
+- if (XDND_DEST_VIEW_STORED(info)) {
+- destView = XDND_DEST_VIEW(info);
+- if (XDND_DEST_STATE(info) == NULL)
+- XDND_DEST_STATE(info) = idleState;
++ wassertr(XDND_DEST_INFO(info) != NULL);
++ wassertr(XDND_DEST_VIEW(info) != NULL);
++
++ destView = XDND_DEST_VIEW(info);
++ if (XDND_DEST_STATE(info) == NULL)
++ XDND_DEST_STATE(info) = idleState;
+
+ #ifdef XDND_DEBUG
+
+- printf("current dest state: %s\n",
+- stateName(XDND_DEST_STATE(info)));
++ printf("current dest state: %s\n",
++ stateName(XDND_DEST_STATE(info)));
+ #endif
+
+- newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
++ newState = (W_DndState*) XDND_DEST_STATE(info)(destView, event, info);
+
+ #ifdef XDND_DEBUG
+
+- printf("new dest state: %s\n", stateName(newState));
++ printf("new dest state: %s\n", stateName(newState));
+ #endif
+
+- if (XDND_DEST_INFO(info) != NULL) {
+- XDND_DEST_STATE(info) = newState;
+- if (XDND_DEST_STATE(info) != idleState)
+- W_DragDestinationStartTimer(info);
+- }
++ if (XDND_DEST_INFO(info) != NULL) {
++ XDND_DEST_STATE(info) = newState;
++ if (XDND_DEST_STATE(info) != idleState)
++ W_DragDestinationStartTimer(info);
+ }
+ }
+
+@@ -1104,7 +1101,7 @@
+ Process drop
+ dropDatas: datas (WMData*) required by destination (self)
+ (given in same order as returned by requiredDataTypes).
+- A NULL data means it couldn't be retrivied.
++ A NULL data means it couldn't be retrieved.
+ Destroyed when drop ends.
+ operationList: if source operation is WDOperationAsk, contains
+ operations (and associated texts) that can be asked
+diff -Nur WindowMaker-0.92.0.orig/WINGs/dragsource.c WindowMaker-0.92.0/WINGs/dragsource.c
+--- WindowMaker-0.92.0.orig/WINGs/dragsource.c 2004-10-28 11:29:59.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/dragsource.c 2006-01-22 21:19:36.000000000 +0100
+@@ -16,10 +16,10 @@
+ #define MIN_Y_MOVE_OFFSET 5
+ #define MAX_SLIDEBACK_ITER 15
+
+-#define VERSION_INFO(dragInfo) dragInfo->protocolVersion
+ #define XDND_PROPERTY_FORMAT 32
+ #define XDND_ACTION_DESCRIPTION_FORMAT 8
+
++#define XDND_DEST_VERSION(dragInfo) dragInfo->protocolVersion
+ #define XDND_SOURCE_INFO(dragInfo) dragInfo->sourceInfo
+ #define XDND_DEST_WIN(dragInfo) dragInfo->sourceInfo->destinationWindow
+ #define XDND_SOURCE_ACTION(dragInfo) dragInfo->sourceAction
+@@ -415,21 +415,25 @@
+ sendEnterMessage(WMDraggingInfo *info)
+ {
+ WMScreen *scr = sourceScreen(info);
+- unsigned long data1;
++ unsigned long version;
+
+- data1 = (VERSION_INFO(info) << 24)|1; /* 1: support of type list */
++ if (XDND_DEST_VERSION(info) > 2) {
++ if (XDND_DEST_VERSION(info) < XDND_VERSION)
++ version = XDND_DEST_VERSION(info);
++ else
++ version = XDND_VERSION;
++ } else {
++ version = 3;
++ }
+
+ return sendDnDClientMessage(info, scr->xdndEnterAtom,
+- data1,
++ (version << 24) | 1, /* 1: support of type list */
+ XDND_3_TYPES(info)[0],
+ XDND_3_TYPES(info)[1],
+ XDND_3_TYPES(info)[2]);
+ }
+
+
+-/*
+-// this functon doesn't return something in all cases.
+-// control reaches end of non-void function. fix this -Dan */
+ static Bool
+ sendPositionMessage(WMDraggingInfo *info, WMPoint *mousePos)
+ {
+@@ -440,7 +444,7 @@
+ if (mousePos->x < noPosZone->pos.x
+ || mousePos->x > (noPosZone->pos.x + noPosZone->size.width)
+ || mousePos->y < noPosZone->pos.y
+- || mousePos->y > (noPosZone->pos.y + noPosZone->size.width)) {
++ || mousePos->y > (noPosZone->pos.y + noPosZone->size.height)) {
+ /* send position if out of zone defined by destination */
+ return sendDnDClientMessage(info, scr->xdndPositionAtom,
+ 0,
+@@ -448,14 +452,18 @@
+ XDND_TIMESTAMP(info),
+ XDND_SOURCE_ACTION(info));
+ }
+- } else {
+- /* send position on each move */
+- return sendDnDClientMessage(info, scr->xdndPositionAtom,
+- 0,
+- mousePos->x<<16|mousePos->y,
+- XDND_TIMESTAMP(info),
+- XDND_SOURCE_ACTION(info));
++
++ /* Nothing to send, always succeed */
++ return True;
++
+ }
++
++ /* send position on each move */
++ return sendDnDClientMessage(info, scr->xdndPositionAtom,
++ 0,
++ mousePos->x<<16|mousePos->y,
++ XDND_TIMESTAMP(info),
++ XDND_SOURCE_ACTION(info));
+ }
+
+
+@@ -846,6 +854,30 @@
+
+
+ static void
++storeDestinationProtocolVersion(WMDraggingInfo *info)
++{
++ Atom type;
++ int format;
++ unsigned long count, remain;
++ unsigned char *winXdndVersion;
++ WMScreen *scr = W_VIEW_SCREEN(XDND_SOURCE_VIEW(info));
++
++ wassertr(XDND_DEST_WIN(info) != None);
++
++ if (XGetWindowProperty(scr->display, XDND_DEST_WIN(info),
++ scr->xdndAwareAtom,
++ 0, 1, False, XA_ATOM, &type, &format,
++ &count, &remain, &winXdndVersion) == Success) {
++ XDND_DEST_VERSION(info) = *winXdndVersion;
++ XFree(winXdndVersion);
++ } else {
++ XDND_DEST_VERSION(info) = 0;
++ wwarning("failed to read XDND version of drop target");
++ }
++}
++
++
++static void
+ initMotionProcess(WMView *view, WMDraggingInfo *info,
+ XEvent *event, WMPoint *startLocation)
+ {
+@@ -878,9 +910,8 @@
+
+
+ static void
+-processMotion(WMDraggingInfo *info, Window windowUnderDrag, WMPoint *mousePos)
++processMotion(WMDraggingInfo *info, WMPoint *mousePos)
+ {
+- /* // WMScreen *scr = sourceScreen(info); */
+ Window newDestination = findDestination(info, mousePos);
+
+ W_DragSourceStopTimer();
+@@ -894,20 +925,24 @@
+ }
+
+ XDND_DEST_WIN(info) = newDestination;
+- XDND_SOURCE_STATE(info) = idleState;
+ XDND_DEST_ACTION(info) = None;
+ XDND_NO_POS_ZONE(info).size.width = 0;
+ XDND_NO_POS_ZONE(info).size.height = 0;
+
+ if (newDestination != None) {
+ /* entering a xdnd window */
++ XDND_SOURCE_STATE(info) = idleState;
++ storeDestinationProtocolVersion(info);
++
+ if (! sendEnterMessage(info)) {
+ XDND_DEST_WIN(info) = None;
+ return;
+ }
+
+ W_DragSourceStartTimer(info);
+- }
++ } else {
++ XDND_SOURCE_STATE(info) = NULL;
++ }
+ } else {
+ if (XDND_DEST_WIN(info) != None) {
+ if (! sendPositionMessage(info, mousePos)) {
+@@ -1010,9 +1045,7 @@
+ mouseLocation.y - XDND_MOUSE_OFFSET(info).y;
+
+ refreshDragImage(view, info);
+- processMotion(info,
+- event->xmotion.window,
+- &mouseLocation);
++ processMotion(info, &mouseLocation);
+ }
+ }
+ }
+@@ -1041,7 +1074,7 @@
+ printf("Xdnd status message:\n");
+
+ if (statusEvent->data.l[1] & 0x2UL)
+- printf("send position on every move\n");
++ printf("\tsend position on every move\n");
+ else {
+ int x, y, w, h;
+ x = statusEvent->data.l[2] >> 16;
+@@ -1049,15 +1082,15 @@
+ w = statusEvent->data.l[3] >> 16;
+ h = statusEvent->data.l[3] & 0xFFFFL;
+
+- printf("send position out of ((%d,%d) , (%d,%d))\n",
++ printf("\tsend position out of ((%d,%d) , (%d,%d))\n",
+ x, y, x+w, y+h);
+ }
+
+ if (statusEvent->data.l[1] & 0x1L)
+- printf("allowed action: %s\n",
++ printf("\tallowed action: %s\n",
+ XGetAtomName(dpy, statusEvent->data.l[4]));
+ else
+- printf("no action allowed\n");
++ printf("\tno action allowed\n");
+ }
+ #endif
+
+@@ -1231,23 +1264,28 @@
+ W_DndState* newState;
+
+ if (XDND_SOURCE_VIEW_STORED(info)) {
+- view = XDND_SOURCE_VIEW(info);
++ if (XDND_SOURCE_STATE(info) != NULL) {
++ view = XDND_SOURCE_VIEW(info);
+ #ifdef XDND_DEBUG
+
+- printf("current source state: %s\n",
+- stateName(XDND_SOURCE_STATE(info)));
++ printf("current source state: %s\n",
++ stateName(XDND_SOURCE_STATE(info)));
+ #endif
+
+- newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
++ newState = (W_DndState*) XDND_SOURCE_STATE(info)(view, event, info);
+
+ #ifdef XDND_DEBUG
+
+- printf("new source state: %s\n", stateName(newState));
++ printf("new source state: %s\n", stateName(newState));
+ #endif
+
+- if (newState != NULL)
+- XDND_SOURCE_STATE(info) = newState;
+- /* else drop finished, and info has been flushed */
++ if (newState != NULL)
++ XDND_SOURCE_STATE(info) = newState;
++ /* else drop finished, and info has been flushed */
++ }
++
++ } else {
++ wwarning("received DnD message without having a target");
+ }
+ }
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/Examples/server.c WindowMaker-0.92.0/WINGs/Examples/server.c
+--- WindowMaker-0.92.0.orig/WINGs/Examples/server.c 2004-10-12 21:31:51.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/Examples/server.c 2005-08-23 00:16:13.000000000 +0200
+@@ -126,8 +126,8 @@
+ }
+
+
+-static unsigned char*
+-findDelimiter(unsigned char *data, unsigned const char *endPtr)
++static char*
++findDelimiter(char *data, const char *endPtr)
+ {
+ wassertrv(data < endPtr, NULL);
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/Makefile.am WindowMaker-0.92.0/WINGs/Makefile.am
+--- WindowMaker-0.92.0.orig/WINGs/Makefile.am 2004-10-30 07:44:13.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/Makefile.am 2005-07-17 20:27:58.000000000 +0200
+@@ -108,12 +108,12 @@
+ wutil.c
+
+
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
++AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(datadir)/WINGs\" -DDEBUG
+
+ AM_CFLAGS = @NOSTRICTALIASING@
+
+ INCLUDES = -I$(top_srcdir)/WINGs/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src \
+- -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG
++ @XFTFLAGS@ @HEADER_SEARCH_PATH@
+
+
+ wcolorpanel.o: wcolorpanel.c
+diff -Nur WindowMaker-0.92.0.orig/WINGs/po/de.po WindowMaker-0.92.0/WINGs/po/de.po
+--- WindowMaker-0.92.0.orig/WINGs/po/de.po 2005-07-03 02:45:48.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/po/de.po 2005-07-05 21:39:14.000000000 +0200
+@@ -1,23 +1,28 @@
+-# KTranslator Generated File
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+ #
++# German Message Catalog for WINGs
++#
++# Initial translation
++# Gudio Scholz <guido.scholz@bayernline.de>
++#
++# Adapted to versions 0.80 ff.
++# Torsten Marek <shlomme@gmx.net>
++#
++
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: WINGs 0.80.0\n"
+-"POT-Creation-Date: 2002-01-09 21:06+0100\n"
+-"PO-Revision-Date: 2002-01-09 21:20+0100\n"
+-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
+-"Language-Team: Deutsch <de@li.org>\n"
++"Project-Id-Version: WINGs\n"
++"POT-Creation-Date: 2004-11-01 16:24+0100\n"
++"PO-Revision-Date: 2004-11-05 23:48+0100\n"
++"Last-Translator: shlomme@gmx.net\n"
++"Language-Team: German\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+-"Content-Transfer-Encoding: unknown\n"
++"Content-Transfer-Encoding: 8bit\n"
+
+-#: ../../WINGs/connection.c:461 ../../WINGs/connection.c:526
+-#: ../../WINGs/connection.c:569
++#: ../../WINGs/connection.c:471 ../../WINGs/connection.c:536
++#: ../../WINGs/connection.c:579
+ msgid "Bad address-service-protocol combination"
+-msgstr "Ungültige Adress-Dienst-Protokoll Kombination"
++msgstr "Ungültige Kombination von Adresse und Dienstprotokoll"
+
+ #: ../../WINGs/error.c:54
+ #, c-format
+@@ -44,346 +49,349 @@
+ #: ../../WINGs/findfile.c:48
+ #, c-format
+ msgid "could not get password entry for UID %i"
+-msgstr "konnte Passwort nicht ermitteln für UID %i"
++msgstr "Passworteintrag für UID %i konnte nicht ermittelt werden"
+
+ #: ../../WINGs/findfile.c:66
+ #, c-format
+ msgid "could not get password entry for user %s"
+-msgstr "konnte Passwort nicht ermitteln für Benutzer %s"
++msgstr "Passworteintrag für Benutzer %s konnte nicht ermittelt werden"
+
+ #: ../../WINGs/host.c:114
+ msgid "Cannot get current host name"
+-msgstr "Kann aktuellen Hostnamen nicht ermitteln"
++msgstr "Aktueller Hostname kann nicht ermittelt werden"
++
++#: ../../WINGs/proplist.c:91
++#, c-format
++msgid "syntax error in %s %s, line %i: %s"
++msgstr "Syntaxfehler in %s %s, Zeile %i: %s"
+
+ #: ../../WINGs/proplist.c:150
+ msgid "Only string or data is supported for a proplist dictionary key"
+ msgstr ""
+-"Nur string oder data wird als Schlüssel für ein proplist dictionary "
++"Nur Zeichenketten oder Binärdaten werden als Schlüssel für ein PropList-Dictionary "
+ "unterstützt"
+
+ #: ../../WINGs/proplist.c:184 ../../WINGs/proplist.c:236
+ #: ../../WINGs/proplist.c:394 ../../WINGs/proplist.c:474
+-#: ../../WINGs/proplist.c:1071 ../../WINGs/proplist.c:1123
+-#: ../../WINGs/proplist.c:1289 ../../WINGs/proplist.c:1368
+-#: ../../WINGs/proplist.c:1489 ../../WINGs/proplist.c:1536
++#: ../../WINGs/proplist.c:1075 ../../WINGs/proplist.c:1127
++#: ../../WINGs/proplist.c:1293 ../../WINGs/proplist.c:1372
++#: ../../WINGs/proplist.c:1493 ../../WINGs/proplist.c:1540
+ msgid "Used proplist functions on non-WMPropLists objects"
+-msgstr ""
++msgstr "PropList-Funktionen werden auf nicht-WMPropList-Objekte angewendet"
+
+ #: ../../WINGs/proplist.c:630
+ msgid "unterminated PropList string"
+-msgstr "nicht terminierter PropList string"
++msgstr "nicht terminierte PropList-Zeichenkette"
+
+ #: ../../WINGs/proplist.c:670
+ msgid "unterminated PropList data"
+-msgstr "nicht terminiertes PropList data"
++msgstr "nicht terminierte PropList-Binärdaten"
+
+ #: ../../WINGs/proplist.c:678
+ msgid "unterminated PropList data (missing hexdigit)"
+-msgstr "nicht terminiertes PropList data (fehlendes hex-Zeichen)"
++msgstr "nicht terminierte PropList-Binärdaten (fehlendes Hex-Zeichen)"
+
+-#: ../../WINGs/proplist.c:690
++#: ../../WINGs/proplist.c:690 ../../WINGs/proplist.c:695
+ msgid "non hexdigit character in PropList data"
+-msgstr "falsches hex-Zeichen in PropList data"
++msgstr "falsches Hex-Zeichen in PropList-Binärdaten"
+
+-#: ../../WINGs/proplist.c:725
++#: ../../WINGs/proplist.c:729
+ msgid "unterminated PropList array"
+-msgstr "nicht terminiertes PropList array"
++msgstr "nicht terminiertes PropList-Array"
+
+-#: ../../WINGs/proplist.c:733
++#: ../../WINGs/proplist.c:737
+ msgid "missing or unterminated PropList array"
+-msgstr "fehlendes oder nicht terminiertes PropList array"
++msgstr "fehlendes oder nicht terminiertes PropList-Array"
+
+-#: ../../WINGs/proplist.c:743
++#: ../../WINGs/proplist.c:747
+ msgid "could not get PropList array element"
+-msgstr ""
++msgstr "PropList-Array-Element konnte nicht gelesen werden"
+
+-#: ../../WINGs/proplist.c:772
++#: ../../WINGs/proplist.c:776
+ msgid "unterminated PropList dictionary"
+-msgstr ""
++msgstr "nicht terminiertes PropList-Dictionary"
+
+-#: ../../WINGs/proplist.c:789
++#: ../../WINGs/proplist.c:793
+ msgid "missing PropList dictionary key"
+-msgstr ""
++msgstr "fehlender Schlüssel in PropList-Dictionary"
+
+-#: ../../WINGs/proplist.c:791
++#: ../../WINGs/proplist.c:795
+ msgid "missing PropList dictionary entry key or unterminated dictionary"
+-msgstr ""
++msgstr "fehlender Schlüssel in PropList-Dictionary oder fehlende Terminierung"
+
+-#: ../../WINGs/proplist.c:799
++#: ../../WINGs/proplist.c:803
+ msgid "error parsing PropList dictionary key"
+-msgstr ""
++msgstr "Fehler beim Parsen eines PropList-Dictionary-Schlüssels"
+
+-#: ../../WINGs/proplist.c:807
++#: ../../WINGs/proplist.c:811
+ msgid "missing = in PropList dictionary entry"
+-msgstr ""
++msgstr "fehlendes \"=\" in PropList-Dictionary-Schlüssel"
+
+-#: ../../WINGs/proplist.c:815
++#: ../../WINGs/proplist.c:819
+ msgid "error parsing PropList dictionary entry value"
+-msgstr ""
++msgstr "Fehler beim Parsen eines PropList-Dictionary-Wertes"
+
+-#: ../../WINGs/proplist.c:823
++#: ../../WINGs/proplist.c:827
+ msgid "missing ; in PropList dictionary entry"
+-msgstr ""
++msgstr "fehlendes \";\" in PropList-Dictionary-Eintrag"
+
+-#: ../../WINGs/proplist.c:884
++#: ../../WINGs/proplist.c:888
+ msgid ""
+ "was expecting a string, data, array or dictionary. If it's a string, try "
+ "enclosing it with \"."
+ msgstr ""
+-"string, data, array oder dictionary wurde erwartet. Zeichenketten mit \" "
++"Zeichenkette, Binärdaten, Array oder Dictionary erwartet. Zeichenketten ggf. mit \" "
+ "einklammern."
+
+-#: ../../WINGs/proplist.c:888
++#: ../../WINGs/proplist.c:892
+ msgid "Comments are not allowed inside WindowMaker owned domain files."
+-msgstr "Kommentare sind in Domaindaten von WindowMaker nicht erlaubt."
++msgstr "Kommentare sind in Domänendaten von WindowMaker nicht erlaubt."
+
+-#: ../../WINGs/proplist.c:1559 ../../WINGs/proplist.c:1624
++#: ../../WINGs/proplist.c:1563 ../../WINGs/proplist.c:1630
+ msgid "extra data after end of property list"
+ msgstr "zusätzliche Daten hinter dem Ende der Propertyliste"
+
+-#: ../../WINGs/proplist.c:1602
++#: ../../WINGs/proplist.c:1606
+ #, c-format
+ msgid "could not get size for file '%s'"
+-msgstr "konnte Dateigröße von '%s' nicht ermitteln"
++msgstr "Dateigröße von '%s' konnte nicht ermittelt werden"
+
+-#: ../../WINGs/proplist.c:1614
++#: ../../WINGs/proplist.c:1619
+ #, c-format
+ msgid "error reading from file '%s'"
+ msgstr "Fehler beim Lesen der Datei '%s'"
+
+-#: ../../WINGs/proplist.c:1665
++#: ../../WINGs/proplist.c:1671
+ #, c-format
+ msgid "mkstemp (%s) failed"
+-msgstr "mkstemp (%s) schlug fehl"
++msgstr "mkstemp (%s) fehlgeschlagen"
+
+-#: ../../WINGs/proplist.c:1676
++#: ../../WINGs/proplist.c:1682
+ #, c-format
+ msgid "mktemp (%s) failed"
+-msgstr "mktemp (%s) schlug fehl"
++msgstr "mktemp (%s) fehlgeschlagen"
+
+-#: ../../WINGs/proplist.c:1687
++#: ../../WINGs/proplist.c:1693
+ #, c-format
+ msgid "open (%s) failed"
+-msgstr "open (%s) schlug fehl"
++msgstr "open (%s) fehlgeschlagen"
+
+-#: ../../WINGs/proplist.c:1694
++#: ../../WINGs/proplist.c:1700
+ #, c-format
+ msgid "writing to file: %s failed"
+-msgstr "Schreiben in Datei: %s schlug fehl"
++msgstr "Schreiben in Datei: %s fehlgeschlagen"
+
+-#: ../../WINGs/proplist.c:1702
++#: ../../WINGs/proplist.c:1708
+ #, c-format
+ msgid "fclose (%s) failed"
+-msgstr "fclose (%s) schlug fehl"
++msgstr "fclose (%s) fehlgeschlagen"
+
+-#: ../../WINGs/proplist.c:1711
++#: ../../WINGs/proplist.c:1717
+ #, c-format
+ msgid "rename ('%s' to '%s') failed"
+-msgstr "rename ('%s' to '%s') schlug fehl"
++msgstr "rename ('%s' nach '%s') fehlgeschlagen"
+
+ #. something happened with the file. just overwrite it
+-#: ../../WINGs/userdefaults.c:192 ../../WINGs/userdefaults.c:208
++#: ../../WINGs/userdefaults.c:188 ../../WINGs/userdefaults.c:204
+ #, c-format
+ msgid "cannot read domain from file '%s' when syncing"
+-msgstr "Kann bei der Synchronisation nicht aus Datei '%s' lesen"
++msgstr "Bei der Synchronisation konnte nicht aus der Datei '%s' gelesen werden"
+
+-#: ../../WINGs/wcolor.c:198 ../../WINGs/wcolor.c:211 ../../WINGs/wcolor.c:250
+-#: ../../WINGs/wcolor.c:291
++#: ../../WINGs/wcolor.c:237 ../../WINGs/wcolor.c:249 ../../WINGs/wcolor.c:288
++#: ../../WINGs/wcolor.c:329
+ #, c-format
+ msgid "could not allocate %s color"
+-msgstr "konnte die Farbe %s nicht erzeugen"
++msgstr "Farbe %s konnte nicht erzeugt werden"
+
+-#: ../../WINGs/wcolor.c:198
++#: ../../WINGs/wcolor.c:237
+ msgid "white"
+-msgstr "weiß"
++msgstr "Weiß"
+
+-#: ../../WINGs/wcolor.c:211
++#: ../../WINGs/wcolor.c:249
+ msgid "black"
+-msgstr "schwarz"
++msgstr "Schwarz"
+
+-#: ../../WINGs/wcolor.c:250
++#: ../../WINGs/wcolor.c:288
+ msgid "gray"
+-msgstr "grau"
++msgstr "Grau"
+
+-#: ../../WINGs/wcolor.c:291
++#: ../../WINGs/wcolor.c:329
+ msgid "dark gray"
+-msgstr "dunkelgrau"
++msgstr "Dunkelgrau"
+
+-#: ../../WINGs/wcolorpanel.c:415
++#: ../../WINGs/wcolorpanel.c:420
+ msgid "Colors"
+ msgstr "Farben"
+
+-#: ../../WINGs/wcolorpanel.c:605 ../../WINGs/wcolorpanel.c:2824
++#: ../../WINGs/wcolorpanel.c:610 ../../WINGs/wcolorpanel.c:2829
+ msgid "Brightness"
+ msgstr "Helligkeit"
+
+-#: ../../WINGs/wcolorpanel.c:607 ../../WINGs/wcolorpanel.c:683
+-#: ../../WINGs/wcolorpanel.c:716 ../../WINGs/wcolorpanel.c:750
+-#: ../../WINGs/wcolorpanel.c:810 ../../WINGs/wcolorpanel.c:844
+-#: ../../WINGs/wcolorpanel.c:878 ../../WINGs/wcolorpanel.c:913
+-#: ../../WINGs/wcolorpanel.c:2164 ../../WINGs/wcolorpanel.c:2826
+-#: ../../WINGs/wcolorpanel.c:2862 ../../WINGs/wcolorpanel.c:2898
+-#: ../../WINGs/wcolorpanel.c:3746
++#: ../../WINGs/wcolorpanel.c:612 ../../WINGs/wcolorpanel.c:688
++#: ../../WINGs/wcolorpanel.c:721 ../../WINGs/wcolorpanel.c:755
++#: ../../WINGs/wcolorpanel.c:815 ../../WINGs/wcolorpanel.c:849
++#: ../../WINGs/wcolorpanel.c:883 ../../WINGs/wcolorpanel.c:918
++#: ../../WINGs/wcolorpanel.c:2169 ../../WINGs/wcolorpanel.c:2831
++#: ../../WINGs/wcolorpanel.c:2867 ../../WINGs/wcolorpanel.c:2903
++#: ../../WINGs/wcolorpanel.c:3745
+ msgid "Color Panel: Could not allocate memory"
+-msgstr "Color Panel: Konnte keinen Speicher reservieren"
++msgstr "Farb-Panel: Speicher konnte nicht reserviert werden"
+
+-#: ../../WINGs/wcolorpanel.c:680 ../../WINGs/wcolorpanel.c:681
++#: ../../WINGs/wcolorpanel.c:685 ../../WINGs/wcolorpanel.c:686
+ msgid "Red"
+ msgstr "Rot"
+
+-#: ../../WINGs/wcolorpanel.c:713 ../../WINGs/wcolorpanel.c:714
++#: ../../WINGs/wcolorpanel.c:718 ../../WINGs/wcolorpanel.c:719
+ msgid "Green"
+ msgstr "Grün"
+
+-#: ../../WINGs/wcolorpanel.c:747 ../../WINGs/wcolorpanel.c:748
++#: ../../WINGs/wcolorpanel.c:752 ../../WINGs/wcolorpanel.c:753
+ msgid "Blue"
+ msgstr "Blau"
+
+-#: ../../WINGs/wcolorpanel.c:807 ../../WINGs/wcolorpanel.c:808
++#: ../../WINGs/wcolorpanel.c:812 ../../WINGs/wcolorpanel.c:813
+ msgid "Cyan"
+ msgstr ""
+
+-#: ../../WINGs/wcolorpanel.c:841 ../../WINGs/wcolorpanel.c:842
++#: ../../WINGs/wcolorpanel.c:846 ../../WINGs/wcolorpanel.c:847
+ msgid "Magenta"
+ msgstr ""
+
+-#: ../../WINGs/wcolorpanel.c:875 ../../WINGs/wcolorpanel.c:876
++#: ../../WINGs/wcolorpanel.c:880 ../../WINGs/wcolorpanel.c:881
+ msgid "Yellow"
+ msgstr "Gelb"
+
+-#: ../../WINGs/wcolorpanel.c:910 ../../WINGs/wcolorpanel.c:911
++#: ../../WINGs/wcolorpanel.c:915 ../../WINGs/wcolorpanel.c:916
+ msgid "Black"
+ msgstr "Schwarz"
+
+-#: ../../WINGs/wcolorpanel.c:991
++#: ../../WINGs/wcolorpanel.c:996
+ msgid "Spectrum"
+ msgstr "Spektrum"
+
+-#: ../../WINGs/wcolorpanel.c:1021
++#: ../../WINGs/wcolorpanel.c:1026
+ msgid "Palette"
+ msgstr ""
+
+-#: ../../WINGs/wcolorpanel.c:1027
++#: ../../WINGs/wcolorpanel.c:1032
+ msgid "New from File..."
+ msgstr "Neu aus Datei..."
+
+-#: ../../WINGs/wcolorpanel.c:1028 ../../WINGs/wcolorpanel.c:1076
+-#: ../../WINGs/wcolorpanel.c:1093
++#: ../../WINGs/wcolorpanel.c:1033 ../../WINGs/wcolorpanel.c:1081
++#: ../../WINGs/wcolorpanel.c:1098
+ msgid "Rename..."
+ msgstr "Umbenennen..."
+
+-#: ../../WINGs/wcolorpanel.c:1029 ../../WINGs/wcolorpanel.c:1077
+-#: ../../WINGs/wcolorpanel.c:1094 ../../WINGs/wcolorpanel.c:3321
++#: ../../WINGs/wcolorpanel.c:1034 ../../WINGs/wcolorpanel.c:1082
++#: ../../WINGs/wcolorpanel.c:1099 ../../WINGs/wcolorpanel.c:3326
+ msgid "Remove"
+ msgstr "Entfernen"
+
+-#: ../../WINGs/wcolorpanel.c:1030
++#: ../../WINGs/wcolorpanel.c:1035
+ msgid "Copy"
+ msgstr "Kopieren"
+
+-#: ../../WINGs/wcolorpanel.c:1031
++#: ../../WINGs/wcolorpanel.c:1036
+ msgid "New from Clipboard"
+ msgstr "Neu aus Zwischenablage"
+
+-#: ../../WINGs/wcolorpanel.c:1052
++#: ../../WINGs/wcolorpanel.c:1057
+ msgid "X11-Colors"
+ msgstr "X11-Farben"
+
+-#: ../../WINGs/wcolorpanel.c:1069
++#: ../../WINGs/wcolorpanel.c:1074
+ msgid "Color"
+ msgstr "Farbe"
+
+-#: ../../WINGs/wcolorpanel.c:1075
++#: ../../WINGs/wcolorpanel.c:1080
+ msgid "Add..."
+ msgstr "Hinzufügen..."
+
+-#: ../../WINGs/wcolorpanel.c:1085
++#: ../../WINGs/wcolorpanel.c:1090
+ msgid "List"
+ msgstr "Liste"
+
+-#: ../../WINGs/wcolorpanel.c:1092
++#: ../../WINGs/wcolorpanel.c:1097
+ msgid "New..."
+ msgstr "Neu..."
+
+-#: ../../WINGs/wcolorpanel.c:1231
++#: ../../WINGs/wcolorpanel.c:1236
+ #, c-format
+-msgid ""
+-"Color Panel: Could not create directory %s needed to store configurations"
+-msgstr ""
+-"Color Panel: Konnte das Verzeichnis %s zum Speichern der Konfiguration nicht erzeugen"
++msgid "Color Panel: Could not create directory %s needed to store configurations"
++msgstr "Farb-Panel: Verzeichnis %s konnte zum Speichern der Konfiguration nicht erzeugt werden"
+
+ #. Delete the file, it doesn't belong here
+-#: ../../WINGs/wcolorpanel.c:1237 ../../WINGs/wcolorpanel.c:3207
+-#: ../../WINGs/wcolorpanel.c:3211
++#: ../../WINGs/wcolorpanel.c:1242 ../../WINGs/wcolorpanel.c:3212
++#: ../../WINGs/wcolorpanel.c:3216
+ msgid "File Error"
+ msgstr "Dateifehler"
+
+-#: ../../WINGs/wcolorpanel.c:1238
++#: ../../WINGs/wcolorpanel.c:1243
+ msgid "Could not create ColorPanel configuration directory"
+-msgstr "Konnte Konfigurationsverzeichnis für Farbdialog nicht erzeugen"
++msgstr "Konfigurationsverzeichnis für Farb-Panel konnte nicht erzeugt werden"
+
+-#: ../../WINGs/wcolorpanel.c:1239 ../../WINGs/wcolorpanel.c:3208
+-#: ../../WINGs/wcolorpanel.c:3213 ../../WINGs/wcolorpanel.c:3240
+-#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:647
+-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
+-#: ../../WINGs/wfilepanel.c:971 ../../WINGs/wfontpanel.c:709
++#: ../../WINGs/wcolorpanel.c:1244 ../../WINGs/wcolorpanel.c:3213
++#: ../../WINGs/wcolorpanel.c:3218 ../../WINGs/wcolorpanel.c:3245
++#: ../../WINGs/wfilepanel.c:250 ../../WINGs/wfilepanel.c:650
++#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
++#: ../../WINGs/wfilepanel.c:974 ../../WINGs/wfontpanel.c:591
+ msgid "OK"
+-msgstr "OK"
++msgstr ""
+
+-#: ../../WINGs/wcolorpanel.c:1245 ../../WINGs/wcolorpanel.c:1281
+-#: ../../WINGs/wcolorpanel.c:1299
++#: ../../WINGs/wcolorpanel.c:1250 ../../WINGs/wcolorpanel.c:1286
++#: ../../WINGs/wcolorpanel.c:1304
+ msgid "Color Panel: Could not find file"
+-msgstr "Color Panel: Konnte Datei nicht finden"
++msgstr "Farb-Panel: Datei konnte nicht gefunden werden"
+
+-#: ../../WINGs/wcolorpanel.c:1486 ../../WINGs/wcolorpanel.c:1551
+-#: ../../WINGs/wcolorpanel.c:1615
++#: ../../WINGs/wcolorpanel.c:1491 ../../WINGs/wcolorpanel.c:1556
++#: ../../WINGs/wcolorpanel.c:1620
+ msgid "Color Panel: X failed request"
+-msgstr "Color Panel: X Anfrage schlug fehl"
++msgstr "Farb-Panel: X-Anfrage fehlgeschlagen"
+
+-#: ../../WINGs/wcolorpanel.c:2860
++#: ../../WINGs/wcolorpanel.c:2865
+ msgid "Saturation"
+ msgstr "Sättigung"
+
+-#: ../../WINGs/wcolorpanel.c:2896
++#: ../../WINGs/wcolorpanel.c:2901
+ msgid "Hue"
+ msgstr "Farbton"
+
+-#: ../../WINGs/wcolorpanel.c:3146
++#: ../../WINGs/wcolorpanel.c:3151
+ msgid "Open Palette"
+ msgstr "Palette öffnen"
+
+-#: ../../WINGs/wcolorpanel.c:3208
++#: ../../WINGs/wcolorpanel.c:3213
+ msgid "Invalid file format !"
+ msgstr "Ungültiges Dateiformat!"
+
+-#: ../../WINGs/wcolorpanel.c:3210
++#: ../../WINGs/wcolorpanel.c:3215
+ #, c-format
+ msgid "can't remove file %s"
+-msgstr "kann Datei %s nicht entfernen"
++msgstr "Datei %s konnte nicht entfert werden"
+
+-#: ../../WINGs/wcolorpanel.c:3212
++#: ../../WINGs/wcolorpanel.c:3217
+ msgid "Couldn't remove file from Configuration Directory !"
+-msgstr "Konnte Datei nicht aus Konfigurationsverzeichnis entfernen!"
++msgstr "Datei konnte nicht aus Konfigurationsverzeichnis entfernt werden!"
+
+-#: ../../WINGs/wcolorpanel.c:3239
++#: ../../WINGs/wcolorpanel.c:3244
+ msgid "Rename"
+ msgstr "Umbenennen"
+
+-#: ../../WINGs/wcolorpanel.c:3239
++#: ../../WINGs/wcolorpanel.c:3244
+ msgid "Rename palette to:"
+ msgstr "Palette umbenennen in:"
+
+-#: ../../WINGs/wcolorpanel.c:3240 ../../WINGs/wfilepanel.c:259
+-#: ../../WINGs/wfilepanel.c:659 ../../WINGs/wfilepanel.c:760
++#: ../../WINGs/wcolorpanel.c:3245 ../../WINGs/wfilepanel.c:259
++#: ../../WINGs/wfilepanel.c:662 ../../WINGs/wfilepanel.c:763
+ msgid "Cancel"
+ msgstr "Abbrechen"
+
+ #. Careful, this palette exists already
+-#: ../../WINGs/wcolorpanel.c:3256 ../../WINGs/wfilepanel.c:760
++#: ../../WINGs/wcolorpanel.c:3261 ../../WINGs/wfilepanel.c:763
+ msgid "Warning"
+ msgstr "Warnung"
+
+-#: ../../WINGs/wcolorpanel.c:3257
++#: ../../WINGs/wcolorpanel.c:3262
+ msgid ""
+ "Palette already exists !\n"
+ "\n"
+@@ -393,24 +401,24 @@
+ "\n"
+ "Überschreiben?"
+
+-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
++#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
+ msgid "No"
+ msgstr "Nein"
+
+-#: ../../WINGs/wcolorpanel.c:3257 ../../WINGs/wcolorpanel.c:3321
++#: ../../WINGs/wcolorpanel.c:3262 ../../WINGs/wcolorpanel.c:3326
+ msgid "Yes"
+ msgstr "Ja"
+
+-#: ../../WINGs/wcolorpanel.c:3289
++#: ../../WINGs/wcolorpanel.c:3294
+ #, c-format
+ msgid "Couldn't rename palette %s to %s\n"
+-msgstr "Konnte Palette %s nicht in %s umbenennen\n"
++msgstr "Palette %s konnte nicht nach %s umbenannt werden\n"
+
+-#: ../../WINGs/wcolorpanel.c:3315
++#: ../../WINGs/wcolorpanel.c:3320
+ msgid "This will permanently remove the palette "
+-msgstr "Das wird die Palette unwiderruflich löschen "
++msgstr "Hiermit wird die Palette unwiderruflich gelöscht "
+
+-#: ../../WINGs/wcolorpanel.c:3318
++#: ../../WINGs/wcolorpanel.c:3323
+ msgid ""
+ ".\n"
+ "\n"
+@@ -420,29 +428,29 @@
+ "\n"
+ "Sind Sie sicher, dass Sie die Palette löschen wollen?"
+
+-#: ../../WINGs/wcolorpanel.c:3343
++#: ../../WINGs/wcolorpanel.c:3348
+ #, c-format
+ msgid "Couldn't remove palette %s\n"
+-msgstr "Konnte Palette %s nicht löschen\n"
++msgstr "Palette %s konnte nicht gelöscht werden\n"
+
+-#: ../../WINGs/wcolorpanel.c:3648
++#: ../../WINGs/wcolorpanel.c:3647
+ #, c-format
+ msgid "Could not open %s"
+-msgstr "Konnte %s nicht öffnen"
++msgstr "%s konnte nicht geöffnet werden"
+
+-#: ../../WINGs/wcolorpanel.c:3655
++#: ../../WINGs/wcolorpanel.c:3654
+ #, c-format
+ msgid "Could not create %s"
+-msgstr "Konnte %s nicht erzeugen"
++msgstr "%s konnte nicht erzeugt werden"
+
+-#: ../../WINGs/wcolorpanel.c:3666
++#: ../../WINGs/wcolorpanel.c:3665
+ #, c-format
+ msgid "Write error on file %s"
+ msgstr "Schreibfehler bei Datei %s"
+
+-#: ../../WINGs/wcolorpanel.c:3711
++#: ../../WINGs/wcolorpanel.c:3710
+ msgid "Color Panel: Color unspecified"
+-msgstr "Color Panel: Farbe nicht spezifiziert"
++msgstr "Farb-Panel: Farbe nicht spezifiziert"
+
+ #: ../../WINGs/wfilepanel.c:235
+ msgid "Name:"
+@@ -456,208 +464,164 @@
+ msgid "Save"
+ msgstr "Speichern"
+
+-#: ../../WINGs/wfilepanel.c:562
++#: ../../WINGs/wfilepanel.c:565
+ #, c-format
+ msgid "WINGs: could not open directory %s\n"
+-msgstr "WINGs: Konnte Verzeichnis %s nicht öffen\n"
++msgstr "WINGs: Verzeichnis %s konnte nicht geöffnet werden\n"
+
+-#: ../../WINGs/wfilepanel.c:580
++#: ../../WINGs/wfilepanel.c:583
+ #, c-format
+ msgid "WINGs: could not stat %s\n"
+-msgstr "WINGs: Dateistatus von %s nicht bestimmbar\n"
++msgstr "WINGs: Dateistatus von %s unbestimmbar\n"
+
+-#: ../../WINGs/wfilepanel.c:647 ../../WINGs/wfilepanel.c:970
+-#: ../../WINGs/wfontpanel.c:708
++#: ../../WINGs/wfilepanel.c:650 ../../WINGs/wfilepanel.c:973
++#: ../../WINGs/wfontpanel.c:590
+ msgid "Error"
+ msgstr "Fehler"
+
+-#: ../../WINGs/wfilepanel.c:658
++#: ../../WINGs/wfilepanel.c:661
+ msgid "Create Directory"
+ msgstr "Verzeichnis anlegen"
+
+-#: ../../WINGs/wfilepanel.c:659
++#: ../../WINGs/wfilepanel.c:662
+ msgid "Enter directory name"
+ msgstr "Verzeichnisname eingeben"
+
+-#: ../../WINGs/wfilepanel.c:695 ../../WINGs/wfilepanel.c:734
+-#: ../../WINGs/wfilepanel.c:765 ../../WINGs/wfilepanel.c:793
++#: ../../WINGs/wfilepanel.c:698 ../../WINGs/wfilepanel.c:737
++#: ../../WINGs/wfilepanel.c:768 ../../WINGs/wfilepanel.c:796
+ msgid "Permission denied."
+ msgstr "Zugriff verweigert."
+
+-#: ../../WINGs/wfilepanel.c:698
++#: ../../WINGs/wfilepanel.c:701
+ #, c-format
+ msgid "'%s' already exists."
+ msgstr "'%s' existiert bereits."
+
+-#: ../../WINGs/wfilepanel.c:701
++#: ../../WINGs/wfilepanel.c:704
+ msgid "Path does not exist."
+ msgstr "Pfad existiert nicht."
+
+-#: ../../WINGs/wfilepanel.c:731 ../../WINGs/wfilepanel.c:790
++#: ../../WINGs/wfilepanel.c:734 ../../WINGs/wfilepanel.c:793
+ #, c-format
+ msgid "'%s' does not exist."
+ msgstr "'%s' existiert nicht."
+
+-#: ../../WINGs/wfilepanel.c:738 ../../WINGs/wfilepanel.c:797
++#: ../../WINGs/wfilepanel.c:741 ../../WINGs/wfilepanel.c:800
+ msgid "Insufficient memory available."
+ msgstr "Nicht genügend Speicher verfügbar."
+
+-#: ../../WINGs/wfilepanel.c:742 ../../WINGs/wfilepanel.c:801
++#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:804
+ #, c-format
+ msgid "'%s' is on a read-only filesystem."
+-msgstr "'%s' liegt auf einem read-only Dateisystem."
++msgstr "'%s' liegt auf einem nur lesbaren Dateisystem."
+
+-#: ../../WINGs/wfilepanel.c:745 ../../WINGs/wfilepanel.c:777
+-#: ../../WINGs/wfilepanel.c:804
++#: ../../WINGs/wfilepanel.c:748 ../../WINGs/wfilepanel.c:780
++#: ../../WINGs/wfilepanel.c:807
+ #, c-format
+ msgid "Can not delete '%s'."
+ msgstr "Kann %s nicht löschen."
+
+-#: ../../WINGs/wfilepanel.c:752
++#: ../../WINGs/wfilepanel.c:755
+ #, c-format
+ msgid "Delete directory %s ?"
+-msgstr "Verzeichnis % s löschen?"
++msgstr "Verzeichnis %s löschen?"
+
+-#: ../../WINGs/wfilepanel.c:756
++#: ../../WINGs/wfilepanel.c:759
+ #, c-format
+ msgid "Delete file %s ?"
+ msgstr "Datei %s löschen?"
+
+-#: ../../WINGs/wfilepanel.c:768
++#: ../../WINGs/wfilepanel.c:771
+ #, c-format
+ msgid "Directory '%s' does not exist."
+ msgstr "Verzeichnis '%s' existiert nicht."
+
+-#: ../../WINGs/wfilepanel.c:771
++#: ../../WINGs/wfilepanel.c:774
+ #, c-format
+ msgid "Directory '%s' is not empty."
+ msgstr "Verzeichnis '%s' ist nicht leer."
+
+-#: ../../WINGs/wfilepanel.c:774
++#: ../../WINGs/wfilepanel.c:777
+ #, c-format
+ msgid "Directory '%s' is busy."
+-msgstr "Verzeichnis '%s' ist belegt."
++msgstr "Verzeichnis '%s' wird benutz."
+
+-#: ../../WINGs/wfilepanel.c:787
++#: ../../WINGs/wfilepanel.c:790
+ #, c-format
+ msgid "'%s' is a directory."
+ msgstr "'%s' ist ein Verzeichnis."
+
+-#: ../../WINGs/wfilepanel.c:829
++#: ../../WINGs/wfilepanel.c:832
+ #, c-format
+ msgid "An error occured browsing '%s'."
+ msgstr "Fehler beim Lesen von '%s'."
+
+-#: ../../WINGs/wfilepanel.c:833
++#: ../../WINGs/wfilepanel.c:836
+ #, c-format
+ msgid "'%s' is not a directory."
+ msgstr "'%s' ist kein Verzeichnis."
+
+-#: ../../WINGs/wfilepanel.c:970
++#: ../../WINGs/wfilepanel.c:973
+ msgid "File does not exist."
+ msgstr "Datei existiert nicht."
+
+-#: ../../WINGs/wfont.c:129
++#: ../../WINGs/wfont.c:40
+ #, c-format
+-msgid "the following character sets are missing in %s:"
+-msgstr "die folgenden Zeichensätze fehlen in %s:"
++msgid "invalid font: %s. Trying '%s'"
++msgstr "Ungültige Schriftart: %s. Wird ersetzt durch %s."
+
+-#: ../../WINGs/wfont.c:136
++#: ../../WINGs/wfont.c:257 ../../WINGs/wfont.c:277
+ #, c-format
+-msgid ""
+-"the string \"%s\" will be used in place of any characters from those sets."
+-msgstr ""
+-"die Zeichenkette \"%s\" ersetzt alle anderen Zeichen dieser Zeichensätze."
++msgid "could not load font: %s."
++msgstr "Schriftart konnte nicht geladen werden: %s"
+
+-#: ../../WINGs/wfont.c:287 ../../WINGs/wfont.c:323
+-#, c-format
+-msgid "could not load font set %s. Trying fixed."
+-msgstr "konnte Fonts %s nicht laden. Nehme fixed-Font."
++#. WMSetWidgetBackgroundColor(panel->win, WMWhiteColor(scr));
++#: ../../WINGs/wfontpanel.c:203
++msgid "Font Panel"
++msgstr "Schrift-Panel"
+
+-#: ../../WINGs/wfont.c:293 ../../WINGs/wfont.c:329
+-#, c-format
+-msgid "could not load font %s. Trying fixed."
+-msgstr "Konnte Font %s nicht laden. Nehme fixed-Font."
+-
+-#: ../../WINGs/wfont.c:297 ../../WINGs/wfont.c:333
+-msgid "could not load fixed font!"
+-msgstr "konnte fixed-Font nicht laden!"
+-
+-#: ../../WINGs/wfont.c:428
+-#, c-format
+-msgid "font description %s is too large."
+-msgstr "Fontbeschreibung %s ist zu groß."
+-
+-#: ../../WINGs/wfontpanel.c:205
+-msgid "Test!!!"
+-msgstr "Test!"
++#: ../../WINGs/wfontpanel.c:239
++msgid "The quick brown fox jumps over the lazy dog"
++msgstr ""
+
+-#: ../../WINGs/wfontpanel.c:211
++#: ../../WINGs/wfontpanel.c:245
+ msgid "Family"
+ msgstr "Familie"
+
+-#: ../../WINGs/wfontpanel.c:222
++#: ../../WINGs/wfontpanel.c:256
+ msgid "Typeface"
+ msgstr "Schriftart"
+
+-#: ../../WINGs/wfontpanel.c:233
++#: ../../WINGs/wfontpanel.c:267
+ msgid "Size"
+ msgstr "Größe"
+
+-#: ../../WINGs/wfontpanel.c:252
++#: ../../WINGs/wfontpanel.c:286
+ msgid "Set"
+ msgstr "Setzen"
+
+-#: ../../WINGs/wfontpanel.c:257
++#: ../../WINGs/wfontpanel.c:292
+ msgid "Revert"
+-msgstr "Zurückn."
++msgstr "Zurücksetzen"
+
+-#: ../../WINGs/wfontpanel.c:709
+-msgid "Could not retrieve font list"
+-msgstr "Konnte Fontliste nicht wiederherstellen"
++#: ../../WINGs/wfontpanel.c:591
++msgid "Could not init font config library\n"
++msgstr "\"font-config\"-Bibliothek konnte nicht initialisiert werden\n"
+
+-#: ../../WINGs/wfontpanel.c:721
+-#, c-format
+-msgid "font name %s is longer than 256, which is invalid."
+-msgstr "Fontname %s ist ungültig, da länger als 256 Zeichen."
+-
+-#: ../../WINGs/wfontpanel.c:868
+-msgid "Roman"
+-msgstr "Roman"
+-
+-#: ../../WINGs/wfontpanel.c:871
+-msgid "Italic"
+-msgstr "Kursiv"
+-
+-#: ../../WINGs/wfontpanel.c:873
+-msgid "Oblique"
+-msgstr "Schräg"
+-
+-#: ../../WINGs/wfontpanel.c:875
+-msgid "Rev Italic"
+-msgstr ""
+-
+-#: ../../WINGs/wfontpanel.c:877
+-msgid "Rev Oblique"
+-msgstr ""
+-
+-#: ../../WINGs/wfontpanel.c:883
+-msgid "Normal"
+-msgstr "Normal"
+-
+-#: ../../WINGs/widgets.c:415
++#: ../../WINGs/widgets.c:419
+ #, c-format
+ msgid "WINGs: could not load widget images file: %s"
+-msgstr "WINGs: Konnte Widget-Bildatei %s nicht laden."
++msgstr "WINGs: Widget-Bilderdatei konnte nicht geladen werden: %s"
+
+-#: ../../WINGs/widgets.c:763
++#: ../../WINGs/widgets.c:767
+ msgid ""
+-"could not load any fonts. Make sure your font installationand locale "
++"could not load any fonts. Make sure your font installation and locale "
+ "settings are correct."
+ msgstr ""
+-"Konnte keine Fonts laden. Überprüfen Sie, ob Ihre Fontinstallation und "
+-"-einstellungen korrekt sind."
++"Keine Schrifen konnten geladen werden. Überprüfen Sie, ob Ihre Schrifteninstallation und -"
++"Lokalisierungseinstellungen korrekt sind."
+
+-#: ../../WINGs/wruler.c:189
++#: ../../WINGs/wruler.c:192
+ msgid "0 inches"
+ msgstr "0 Inch"
++
+diff -Nur WindowMaker-0.92.0.orig/WINGs/selection.c WindowMaker-0.92.0/WINGs/selection.c
+--- WindowMaker-0.92.0.orig/WINGs/selection.c 2004-10-12 20:31:44.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/selection.c 2005-08-23 00:12:16.000000000 +0200
+@@ -279,7 +279,7 @@
+ WMData *wdata;
+ unsigned char *data;
+ Atom rtype;
+- unsigned bits, bpi;
++ int bits, bpi;
+ unsigned long len, bytes;
+
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wapplication.c WindowMaker-0.92.0/WINGs/wapplication.c
+--- WindowMaker-0.92.0.orig/WINGs/wapplication.c 2004-10-24 05:13:29.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wapplication.c 2005-07-17 20:33:09.000000000 +0200
+@@ -181,7 +181,6 @@
+ return path;
+ }
+
+-
+ if (getenv("GNUSTEP_SYSTEM_ROOT")) {
+ path = checkFile(getenv("GNUSTEP_SYSTEM_ROOT"), appdir, ext, resource);
+ if (path) {
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wbrowser.c WindowMaker-0.92.0/WINGs/wbrowser.c
+--- WindowMaker-0.92.0.orig/WINGs/wbrowser.c 2004-10-12 22:43:22.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wbrowser.c 2006-01-22 16:47:25.000000000 +0100
+@@ -188,7 +188,7 @@
+ int curMaxVisibleColumns;
+ int newFirstVisibleColumn = 0;
+
+- assert ((int) bPtr);
++ assert (bPtr != NULL);
+
+ columns = (columns < MIN_VISIBLE_COLUMNS) ? MIN_VISIBLE_COLUMNS : columns;
+ columns = (columns > MAX_VISIBLE_COLUMNS) ? MAX_VISIBLE_COLUMNS : columns;
+@@ -324,7 +324,7 @@
+ WMList **clist;
+ char **tlist;
+
+- assert ((int) bPtr);
++ assert (bPtr != NULL);
+
+ column = (column < 0) ? 0 : column;
+ if (column >= bPtr->columnCount) {
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wcolor.c WindowMaker-0.92.0/WINGs/wcolor.c
+--- WindowMaker-0.92.0.orig/WINGs/wcolor.c 2004-10-25 03:48:39.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wcolor.c 2005-08-23 00:36:29.000000000 +0200
+@@ -7,12 +7,12 @@
+
+ #define LIGHT_STIPPLE_WIDTH 4
+ #define LIGHT_STIPPLE_HEIGHT 4
+-static unsigned char LIGHT_STIPPLE_BITS[] = {
++static char LIGHT_STIPPLE_BITS[] = {
+ 0x05, 0x0a, 0x05, 0x0a};
+
+ #define DARK_STIPPLE_WIDTH 4
+ #define DARK_STIPPLE_HEIGHT 4
+-static unsigned char DARK_STIPPLE_BITS[] = {
++static char DARK_STIPPLE_BITS[] = {
+ 0x0a, 0x04, 0x0a, 0x01};
+
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wfont.c WindowMaker-0.92.0/WINGs/wfont.c
+--- WindowMaker-0.92.0.orig/WINGs/wfont.c 2004-10-30 08:29:25.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wfont.c 2005-08-23 01:22:44.000000000 +0200
+@@ -27,7 +27,7 @@
+ /* Just skip old font names that contain %d in them.
+ * We don't support that anymore. */
+ if (strchr(xlfd, '%')!=NULL)
+- return FcNameParse(DEFAULT_FONT);
++ return FcNameParse((FcChar8*)DEFAULT_FONT);
+
+ fname= wstrdup(xlfd);
+ if ((ptr = strchr(fname, ','))) {
+@@ -38,7 +38,7 @@
+
+ if (!pattern) {
+ wwarning(_("invalid font: %s. Trying '%s'"), xlfd, DEFAULT_FONT);
+- pattern = FcNameParse(DEFAULT_FONT);
++ pattern = FcNameParse((FcChar8*)DEFAULT_FONT);
+ }
+
+ return pattern;
+@@ -52,7 +52,7 @@
+ char *fname;
+
+ pattern = xlfdToFcPattern(xlfd);
+- fname = FcNameUnparse(pattern);
++ fname = (char*)FcNameUnparse(pattern);
+ FcPatternDestroy(pattern);
+
+ return fname;
+@@ -102,7 +102,7 @@
+ if (font[0]=='-') {
+ pattern = xlfdToFcPattern(font);
+ } else {
+- pattern = FcNameParse(font);
++ pattern = FcNameParse((FcChar8*)font);
+ }
+
+ /*FcPatternPrint(pattern);*/
+@@ -116,12 +116,12 @@
+ }
+
+ if (fallback && !hasPropertyWithStringValue(pattern, FC_FAMILY, fallback)) {
+- FcPatternAddString(pattern, FC_FAMILY, fallback);
++ FcPatternAddString(pattern, FC_FAMILY, (FcChar8*)fallback);
+ }
+
+ /*FcPatternPrint(pattern);*/
+
+- result = FcNameUnparse(pattern);
++ result = (char*)FcNameUnparse(pattern);
+ FcPatternDestroy(pattern);
+
+ return result;
+@@ -366,7 +366,7 @@
+ * return the closest match font to what we requested which is the
+ * oblique font. Same goes for using bold for weight.
+ */
+- pattern = FcNameParse(WMGetFontName(font));
++ pattern = FcNameParse((FcChar8*)WMGetFontName(font));
+ switch (style) {
+ case WFSNormal:
+ FcPatternDel(pattern, FC_WEIGHT);
+@@ -374,21 +374,21 @@
+ break;
+ case WFSBold:
+ FcPatternDel(pattern, FC_WEIGHT);
+- FcPatternAddString(pattern, FC_WEIGHT, "bold");
++ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
+ break;
+ case WFSItalic:
+ FcPatternDel(pattern, FC_SLANT);
+- FcPatternAddString(pattern, FC_SLANT, "italic");
++ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
+ break;
+ case WFSBoldItalic:
+ FcPatternDel(pattern, FC_WEIGHT);
+ FcPatternDel(pattern, FC_SLANT);
+- FcPatternAddString(pattern, FC_WEIGHT, "bold");
+- FcPatternAddString(pattern, FC_SLANT, "italic");
++ FcPatternAddString(pattern, FC_WEIGHT, (FcChar8*)"bold");
++ FcPatternAddString(pattern, FC_SLANT, (FcChar8*)"italic");
+ break;
+ }
+
+- name = FcNameUnparse(pattern);
++ name = (char*)FcNameUnparse(pattern);
+ copy = WMCreateFont(scrPtr, name);
+ FcPatternDestroy(pattern);
+ wfree(name);
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wfontpanel.c WindowMaker-0.92.0/WINGs/wfontpanel.c
+--- WindowMaker-0.92.0.orig/WINGs/wfontpanel.c 2004-10-23 04:44:17.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wfontpanel.c 2005-08-23 01:12:49.000000000 +0200
+@@ -83,7 +83,7 @@
+
+
+
+-static void setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size);
++static void setFontPanelFontName(FontPanel *panel, char *family, char *style, double size);
+
+ static int isXLFD(char *font, int *length_ret);
+
+@@ -370,7 +370,7 @@
+
+ if (!isXLFD(fontName, &fname_len)) {
+ /* maybe its proper fontconfig and we can parse it */
+- pattern = FcNameParse(fontName);
++ pattern = FcNameParse((FcChar8*)fontName);
+ } else {
+ /* maybe its proper xlfd and we can convert it to an FcPattern */
+ pattern = XftXlfdParse(fontName, False, False);
+@@ -383,7 +383,7 @@
+ if (FcPatternGetString(pattern, FC_FAMILY, 0, &family)==FcResultMatch)
+ if (FcPatternGetString(pattern, FC_STYLE, 0, &style)==FcResultMatch)
+ if (FcPatternGetDouble(pattern, "pixelsize", 0, &size)==FcResultMatch)
+- setFontPanelFontName(panel, family, style, size);
++ setFontPanelFontName(panel, (char*)family, (char*)style, size);
+
+ FcPatternDestroy(pattern);
+ }
+@@ -603,7 +603,7 @@
+
+ if (FcPatternGetString(fs->fonts[i],FC_FAMILY,0,&family)==FcResultMatch)
+ if (FcPatternGetString(fs->fonts[i],FC_STYLE,0,&style)==FcResultMatch)
+- addFontToXftFamily(families, family, style);
++ addFontToXftFamily(families, (char*)family, (char*)style);
+ }
+ FcFontSetDestroy(fs);
+ }
+@@ -815,7 +815,7 @@
+
+
+ static void
+-setFontPanelFontName(FontPanel *panel, FcChar8 *family, FcChar8 *style, double size)
++setFontPanelFontName(FontPanel *panel, char *family, char *style, double size)
+ {
+ int famrow;
+ int stlrow;
+diff -Nur WindowMaker-0.92.0.orig/WINGs/widgets.c WindowMaker-0.92.0/WINGs/widgets.c
+--- WindowMaker-0.92.0.orig/WINGs/widgets.c 2004-10-28 04:15:54.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/widgets.c 2005-08-23 00:41:43.000000000 +0200
+@@ -305,7 +305,7 @@
+
+ #define STIPPLE_WIDTH 8
+ #define STIPPLE_HEIGHT 8
+-static unsigned char STIPPLE_BITS[] = {
++static char STIPPLE_BITS[] = {
+ 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55
+ };
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/WINGs/WINGsP.h WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h
+--- WindowMaker-0.92.0.orig/WINGs/WINGs/WINGsP.h 2004-10-30 08:32:50.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/WINGs/WINGsP.h 2006-01-22 21:18:55.000000000 +0100
+@@ -29,7 +29,7 @@
+
+ #define SCROLLER_WIDTH 20
+
+-#define XDND_VERSION 4
++#define XDND_VERSION 3
+
+
+ typedef struct W_Application {
+@@ -78,7 +78,7 @@
+
+ typedef struct W_FocusInfo {
+ struct W_View *toplevel;
+- struct W_View *focused; /* view that has the focus in this toplevel */
++ struct W_View *focused; /* view that has the focus in this toplevel */
+ struct W_FocusInfo *next;
+ } W_FocusInfo;
+
+@@ -110,8 +110,10 @@
+
+ typedef struct W_DragDestinationInfo {
+ WMView *destView;
++ WMView *xdndAwareView;
+ Window sourceWindow;
+ W_DndState *state;
++ Bool sourceActionChanged;
+ WMArray *sourceTypes;
+ WMArray *requiredTypes;
+ Bool typeListAvailable;
+@@ -120,7 +122,7 @@
+
+
+ struct W_DraggingInfo {
+- unsigned char protocolVersion;
++ unsigned char protocolVersion; /* version supported on the other side */
+ Time timestamp;
+
+ Atom sourceAction;
+@@ -162,7 +164,7 @@
+
+ struct W_Window *windowList; /* list of windows in the app */
+
+- Window groupLeader; /* the leader of the application */
++ Window groupLeader; /* the leader of the application */
+ /* also used for other things */
+
+ struct W_SelectionHandlers *selectionHandlerList;
+@@ -195,11 +197,11 @@
+ GC copyGC;
+ GC clipGC;
+
+- GC monoGC; /* GC for 1bpp visuals */
++ GC monoGC; /* GC for 1bpp visuals */
+
+ GC xorGC;
+
+- GC ixorGC; /* IncludeInferiors XOR */
++ GC ixorGC; /* IncludeInferiors XOR */
+
+ GC drawStringGC; /* for WMDrawString() */
+
+@@ -276,15 +278,15 @@
+
+ Cursor invisibleCursor;
+
+- Atom attribsAtom; /* GNUstepWindowAttributes */
++ Atom attribsAtom; /* GNUstepWindowAttributes */
+
+- Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
++ Atom deleteWindowAtom; /* WM_DELETE_WINDOW */
+
+- Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
++ Atom protocolsAtom; /* _XA_WM_PROTOCOLS */
+
+- Atom clipboardAtom; /* CLIPBOARD */
++ Atom clipboardAtom; /* CLIPBOARD */
+
+- Atom xdndAwareAtom; /* XdndAware */
++ Atom xdndAwareAtom; /* XdndAware */
+ Atom xdndSelectionAtom;
+ Atom xdndEnterAtom;
+ Atom xdndLeaveAtom;
+@@ -304,7 +306,7 @@
+
+ Atom wmIconDragOffsetAtom;
+
+- Atom wmStateAtom; /* WM_STATE */
++ Atom wmStateAtom; /* WM_STATE */
+
+ Atom utf8String;
+
+@@ -313,8 +315,8 @@
+ Atom netwmIcon;
+
+ /* stuff for detecting double-clicks */
+- Time lastClickTime; /* time of last mousedown event */
+- Window lastClickWindow; /* window of the last mousedown */
++ Time lastClickTime; /* time of last mousedown event */
++ Window lastClickWindow; /* window of the last mousedown */
+
+ struct W_View *modalView;
+ unsigned modalLoop:1;
+@@ -341,8 +343,7 @@
+ typedef struct W_View {
+ struct W_Screen *screen;
+
+- WMWidget *self; /* must point to the widget the
+- * view belongs to */
++ WMWidget *self; /* must point to the widget the view belongs to */
+
+ W_ViewDelegate *delegate;
+
+@@ -362,18 +363,18 @@
+
+ struct W_View *nextResponder; /* next to receive keyboard events */
+
+- struct W_View *parent; /* parent WMView */
++ struct W_View *parent; /* parent WMView */
+
+ struct W_View *childrenList; /* first in list of child windows */
+
+- struct W_View *nextSister; /* next on parent's children list */
++ struct W_View *nextSister; /* next on parent's children list */
+
+- WMArray *eventHandlers; /* event handlers for this window */
++ WMArray *eventHandlers; /* event handlers for this window */
+
+ unsigned long attribFlags;
+ XSetWindowAttributes attribs;
+
+- void *hangedData; /* data holder for user program */
++ void *hangedData; /* data holder for user program */
+
+ WMColor *backColor;
+
+@@ -391,9 +392,9 @@
+ unsigned int realized:1;
+ unsigned int mapped:1;
+ unsigned int parentDying:1;
+- unsigned int dying:1; /* the view is being destroyed */
++ unsigned int dying:1; /* the view is being destroyed */
+ unsigned int topLevel:1; /* is a top level window */
+- unsigned int root:1; /* is the root window */
++ unsigned int root:1; /* is the root window */
+ unsigned int mapWhenRealized:1; /* map the view when it's realized */
+ unsigned int alreadyDead:1; /* view was freed */
+
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wtext.c WindowMaker-0.92.0/WINGs/wtext.c
+--- WindowMaker-0.92.0.orig/WINGs/wtext.c 2004-10-28 05:14:55.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wtext.c 2006-01-22 16:47:25.000000000 +0100
+@@ -207,7 +207,7 @@
+
+ #define STIPPLE_WIDTH 8
+ #define STIPPLE_HEIGHT 8
+-static unsigned char STIPPLE_BITS[] = {
++static char STIPPLE_BITS[] = {
+ 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa, 0x55, 0xaa
+ };
+
+@@ -1969,7 +1969,7 @@
+ } else if(tb->used == 0) {
+ tb->blank = 1;
+ } else if(tb->graphic) {
+- Bool hasNext = (Bool)(tb->next);
++ Bool hasNext = (tb->next != NULL);
+
+ WMDestroyTextBlock(tPtr, WMRemoveTextBlock(tPtr));
+ if(hasNext) {
+diff -Nur WindowMaker-0.92.0.orig/WINGs/wview.c WindowMaker-0.92.0/WINGs/wview.c
+--- WindowMaker-0.92.0.orig/WINGs/wview.c 2004-10-28 04:41:04.000000000 +0200
++++ WindowMaker-0.92.0/WINGs/wview.c 2006-01-22 19:08:39.000000000 +0100
+@@ -450,6 +450,9 @@
+
+ W_FreeViewXdndPart(view);
+
++ if (view->backColor)
++ WMReleaseColor(view->backColor);
++
+ wfree(view);
+ }
+
+@@ -715,7 +718,8 @@
+ {
+ WMScreen *scr = W_VIEW_SCREEN(view);
+ Window foo;
+- int x, y, topX, topY, bar;
++ int x, y, topX, topY;
++ unsigned int bar;
+ WMView *topView;
+
+ topView = view;
+diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/FontSimple.c WindowMaker-0.92.0/WPrefs.app/FontSimple.c
+--- WindowMaker-0.92.0.orig/WPrefs.app/FontSimple.c 2004-10-26 14:03:42.000000000 +0200
++++ WindowMaker-0.92.0/WPrefs.app/FontSimple.c 2005-08-23 01:15:17.000000000 +0200
+@@ -231,11 +231,11 @@
+
+ for (i= 0; i < fonts->nfont; i++)
+ {
+- FcChar8 *name;
++ char *name;
+ int weight, slant, width;
+ int j, found;
+
+- if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, &name) != FcResultMatch)
++ if (FcPatternGetString(fonts->fonts[i], FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
+ continue;
+
+ if (FcPatternGetInteger(fonts->fonts[i], FC_WEIGHT, 0, &weight) != FcResultMatch)
+@@ -309,7 +309,7 @@
+
+
+ static char*
+-getSelectedFont(_Panel *panel, char *curfont)
++getSelectedFont(_Panel *panel, FcChar8 *curfont)
+ {
+ WMListItem *item;
+ FcPattern *pat= FcNameParse(curfont);
+@@ -319,7 +319,7 @@
+ if (item)
+ {
+ FcPatternDel(pat, FC_FAMILY);
+- FcPatternAddString(pat, FC_FAMILY, item->text);
++ FcPatternAddString(pat, FC_FAMILY, (FcChar8*)item->text);
+ }
+
+ item= WMGetListSelectedItem(panel->styleL);
+@@ -344,9 +344,9 @@
+ FcPatternAddDouble(pat, FC_PIXEL_SIZE, atoi(item->text));
+ }
+
+- name= FcNameUnparse(pat);
++ name = (char*)FcNameUnparse(pat);
+ FcPatternDestroy(pat);
+-
++
+ return name;
+ }
+
+@@ -446,12 +446,13 @@
+ {
+ int index= WMGetPopUpButtonSelectedItem(panel->optionP);
+ WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
+- char *ofont, *nfont;
++ FcChar8 *ofont;
++ char *nfont;
+
+- ofont= (char*)WMGetMenuItemRepresentedObject(item);
+-
++ ofont= (FcChar8*)WMGetMenuItemRepresentedObject(item);
+ nfont= getSelectedFont(panel, ofont);
+- free(ofont);
++ wfree(ofont);
++
+ WMSetMenuItemRepresentedObject(item, nfont);
+ }
+ updateSampleFont(panel);
+@@ -465,12 +466,13 @@
+ _Panel *panel= (_Panel*)data;
+ int index= WMGetPopUpButtonSelectedItem(panel->optionP);
+ WMMenuItem *item= WMGetPopUpButtonMenuItem(panel->optionP, index);
+- char *ofont, *nfont;
++ FcChar8 *ofont;
++ char *nfont;
+
+- ofont= (char*)WMGetMenuItemRepresentedObject(item);
+-
++ ofont = (FcChar8*)WMGetMenuItemRepresentedObject(item);
+ nfont= getSelectedFont(panel, ofont);
+- free(ofont);
++ wfree(ofont);
++
+ WMSetMenuItemRepresentedObject(item, nfont);
+
+ updateSampleFont(panel);
+@@ -490,10 +492,10 @@
+ {
+ FcPattern *pat;
+
+- pat= FcNameParse(font);
++ pat= FcNameParse((FcChar8*)font);
+ if (pat)
+ {
+- FcChar8 *name;
++ char *name;
+ int weight, slant, width;
+ double size;
+ int distance, closest, found;
+@@ -501,7 +503,7 @@
+
+ FcDefaultSubstitute(pat);
+
+- if (FcPatternGetString(pat, FC_FAMILY, 0, &name) != FcResultMatch)
++ if (FcPatternGetString(pat, FC_FAMILY, 0, (FcChar8**)&name) != FcResultMatch)
+ name= "sans serif";
+
+ found= 0;
+diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/main.c WindowMaker-0.92.0/WPrefs.app/main.c
+--- WindowMaker-0.92.0.orig/WPrefs.app/main.c 2004-10-19 04:41:54.000000000 +0200
++++ WindowMaker-0.92.0/WPrefs.app/main.c 2005-07-17 21:15:36.000000000 +0200
+@@ -100,7 +100,7 @@
+ {
+ Display *dpy;
+ WMScreen *scr;
+- char *locale;
++ char *locale, *path;
+ int i;
+ char *display_name="";
+
+@@ -110,6 +110,20 @@
+
+ WMInitializeApplication("WPrefs", &argc, argv);
+
++ WMSetResourcePath(RESOURCE_PATH);
++ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
++ if (!path) {
++ /* maybe it is run directly from the source directory */
++ WMSetResourcePath(".");
++ path = WMPathForResourceOfType("WPrefs.tiff", NULL);
++ if (!path) {
++ WMSetResourcePath("..");
++ }
++ }
++ if (path) {
++ wfree(path);
++ }
++
+ if (argc>1) {
+ for (i=1; i<argc; i++) {
+ if (strcmp(argv[i], "-version")==0
+diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/Makefile.am WindowMaker-0.92.0/WPrefs.app/Makefile.am
+--- WindowMaker-0.92.0.orig/WPrefs.app/Makefile.am 2004-11-06 20:41:39.000000000 +0100
++++ WindowMaker-0.92.0/WPrefs.app/Makefile.am 2005-07-17 20:21:00.000000000 +0200
+@@ -42,7 +42,7 @@
+ imagebrowser.h \
+ xmodifier.c
+
+-AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\"
++AM_CPPFLAGS = -DLOCALEDIR=\"$(NLSDIR)\" -DRESOURCE_PATH=\"$(wpdatadir)\"
+
+ AM_CFLAGS = @NOSTRICTALIASING@
+
+diff -Nur WindowMaker-0.92.0.orig/WPrefs.app/po/de.po WindowMaker-0.92.0/WPrefs.app/po/de.po
+--- WindowMaker-0.92.0.orig/WPrefs.app/po/de.po 2004-10-17 08:28:06.000000000 +0200
++++ WindowMaker-0.92.0/WPrefs.app/po/de.po 2005-07-05 21:39:14.000000000 +0200
+@@ -1,17 +1,26 @@
+-# SOME DESCRIPTIVE TITLE.
+-# Copyright (C) YEAR Free Software Foundation, Inc.
+-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++# translation of wprefsneu.po to
++#
++# German Message Catalog for WPrefs.app
++#
++# Initial translation
++# Gudio Scholz <guido.scholz@bayernline.de>
++# Bernd Eggert <Bernd.Eggert@t-online.de>
++#
++# Fully retranslated and updated for newer versions
++# Torsten Marek <shlomme@gmx.net>
++# , 2004.
+ #
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: WPrefs 0.45\n"
+-"POT-Creation-Date: 2003-01-06 01:33+0100\n"
+-"PO-Revision-Date: 2003-01-25 16:00CET\n"
+-"Last-Translator: Guido Scholz <guido.scholz@bayernline.de>\n"
+-"Language-Team: Deutsch <de@li.org>\n"
++"Project-Id-Version: wprefsneu\n"
++"POT-Creation-Date: 2004-11-05 23:50+0100\n"
++"PO-Revision-Date: 2004-11-14 13:15+0100\n"
++"Last-Translator: \n"
++"Language-Team: <en@li.org>\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.9.1\n"
+
+ #: ../../WPrefs.app/Appearance.c:1154
+ msgid "Select File"
+@@ -27,19 +36,20 @@
+
+ #: ../../WPrefs.app/Appearance.c:1565
+ msgid "Owner of Focused Window"
+-msgstr "Eigentümer des akt. Fensters"
++msgstr "Eigentümer des aktiven Fensters"
+
+ #: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893
++#: ../../WPrefs.app/FontSimple.c:108
+ msgid "Menu Title"
+ msgstr "Menütitel"
+
+ #: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578
+ msgid "Normal Item"
+-msgstr "Normal"
++msgstr "Normaler Eintrag"
+
+ #: ../../WPrefs.app/Appearance.c:1583
+ msgid "Disabled Item"
+-msgstr "Deaktiviert"
++msgstr "Ausgeschalteter Eintrag"
+
+ #: ../../WPrefs.app/Appearance.c:1595
+ msgid "Highlighted"
+@@ -59,11 +69,11 @@
+
+ #: ../../WPrefs.app/Appearance.c:1796
+ msgid "Titlebar of Focused Window's Owner"
+-msgstr "Titelleiste d. Eigent. d. akt. Fensters"
++msgstr "Titelleiste des Eigentümers des aktiven Fensters"
+
+ #: ../../WPrefs.app/Appearance.c:1797
+ msgid "Window Resizebar"
+-msgstr "Fenster-Größenänderungsleiste"
++msgstr "Größenänderungsleiste"
+
+ #: ../../WPrefs.app/Appearance.c:1798
+ msgid "Titlebar of Menus"
+@@ -91,19 +101,19 @@
+
+ #: ../../WPrefs.app/Appearance.c:1833
+ msgid "Create a new texture."
+-msgstr "Neue Textur erzeugen."
++msgstr "Neue Textur erstellen."
+
+ #: ../../WPrefs.app/Appearance.c:1841
+ msgid "Extract..."
+-msgstr "Extrahieren..."
++msgstr "Holen"
+
+ #: ../../WPrefs.app/Appearance.c:1845
+ msgid "Extract texture(s) from a theme or a style file."
+-msgstr "Extrahiere Textur(en) aus einer Themen- oder Stildatei."
++msgstr "Textur(en) aus einer Themen- oder Stildatei holen."
+
+ #: ../../WPrefs.app/Appearance.c:1855
+ msgid "Edit"
+-msgstr "Bearbeiten"
++msgstr "Ändern"
+
+ #: ../../WPrefs.app/Appearance.c:1858
+ msgid "Edit the highlighted texture."
+@@ -131,7 +141,7 @@
+
+ #: ../../WPrefs.app/Appearance.c:1892
+ msgid "Owner of Focused Window Title"
+-msgstr "Titel d. Eigentümers d. akt. Fensters"
++msgstr "Titel des Eigentümers des aktiven Fensters"
+
+ #: ../../WPrefs.app/Appearance.c:1894
+ msgid "Menu Item Text"
+@@ -139,7 +149,7 @@
+
+ #: ../../WPrefs.app/Appearance.c:1895
+ msgid "Disabled Menu Item Text"
+-msgstr "Text eines deaktiv. Menüeintrages"
++msgstr "Text eines ausgeschalteten Menüeintrages"
+
+ #: ../../WPrefs.app/Appearance.c:1896
+ msgid "Menu Highlight Color"
+@@ -147,7 +157,7 @@
+
+ #: ../../WPrefs.app/Appearance.c:1897
+ msgid "Highlighted Menu Text Color"
+-msgstr "Text des ausgew. Menüeintrages"
++msgstr "Text des ausgewählten Menüeintrages"
+
+ #: ../../WPrefs.app/Appearance.c:1936
+ msgid "Background"
+@@ -163,23 +173,23 @@
+
+ #: ../../WPrefs.app/Appearance.c:1968
+ msgid "Menu Style"
+-msgstr " Menüstil "
++msgstr "Menü-Stil"
+
+-#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:242
+-#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288
++#: ../../WPrefs.app/Appearance.c:1996 ../../WPrefs.app/Configurations.c:241
++#: ../../WPrefs.app/Configurations.c:253 ../../WPrefs.app/Focus.c:288
+ #: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134
+ #: ../../WPrefs.app/MenuPreferences.c:145
+ #: ../../WPrefs.app/MenuPreferences.c:173
+ #: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560
+-#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558
+-#: ../../WPrefs.app/WPrefs.c:583
++#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:546
++#: ../../WPrefs.app/WPrefs.c:571
+ #, c-format
+ msgid "could not load icon file %s"
+-msgstr "Symboldatei %s konnte nicht geladen werden"
++msgstr "Symboldatei %s konnte nicht geöffnet werden"
+
+ #: ../../WPrefs.app/Appearance.c:2010
+ msgid "Title Alignment"
+-msgstr " Titelausrichtung "
++msgstr "Titel-Ausrichtung"
+
+ #: ../../WPrefs.app/Appearance.c:2017
+ msgid "Left"
+@@ -214,13 +224,13 @@
+ msgid "Textures"
+ msgstr "Texturen"
+
+-#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:302
++#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301
+ msgid "Close"
+ msgstr "Schließen"
+
+ #: ../../WPrefs.app/Appearance.c:2330
+ msgid "Extract"
+-msgstr "Extrahieren"
++msgstr "Holen"
+
+ #: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156
+ #: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339
+@@ -228,250 +238,239 @@
+ #: ../../WPrefs.app/Workspace.c:101
+ #, c-format
+ msgid "could not load icon %s"
+-msgstr "Symbol %s konnte nicht geladen werden"
++msgstr "Symboldatei %s konnte nicht geöffnet werden"
+
+ #: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109
+ #, c-format
+ msgid "could not process icon %s:"
+-msgstr "Symbol %s konnte nicht verarbeitet werden"
++msgstr "Symboldatei %s konnte nicht verarbeitet werden"
+
+-#: ../../WPrefs.app/Configurations.c:189 ../../WPrefs.app/Workspace.c:164
++#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164
+ #, c-format
+ msgid "could not load image file %s"
+ msgstr "Bilddatei %s konnte nicht geladen werden"
+
+-#: ../../WPrefs.app/Configurations.c:203
++#: ../../WPrefs.app/Configurations.c:202
+ msgid "Icon Slide Speed"
+ msgstr "Symbol-Bewegungsgeschwindigkeit"
+
+-#: ../../WPrefs.app/Configurations.c:209
++#: ../../WPrefs.app/Configurations.c:208
+ msgid "Shade Animation Speed"
+ msgstr "Roll-Animationsgeschwindigkeit"
+
+-#: ../../WPrefs.app/Configurations.c:271
++#: ../../WPrefs.app/Configurations.c:270
+ msgid "Smooth Scaling"
+ msgstr "Weiche Skalierung"
+
+-#: ../../WPrefs.app/Configurations.c:272
++#: ../../WPrefs.app/Configurations.c:271
+ msgid ""
+ "Smooth scaled background images, neutralizing\n"
+ "the `pixelization' effect. This will slow\n"
+ "down loading of background images considerably."
+ msgstr ""
+-"Weich skalierte Hintergrundbilder, neutralisiert\n"
+-"Verpixelungen. Diese Option verlangsamt\n"
+-"deutlich das Laden von Hintergrundbildern."
++"Weiche Skalierung von Hintergrundbilderverhindert\n"
++"Verpixelungen, aber führt zu einem deutlich\n"
++"längeren Ladeprozess."
+
+-#: ../../WPrefs.app/Configurations.c:313
++#: ../../WPrefs.app/Configurations.c:312
+ msgid "Titlebar Style"
+ msgstr "Titelleisten-Stil"
+
+-#: ../../WPrefs.app/Configurations.c:351
++#: ../../WPrefs.app/Configurations.c:350
+ msgid "Animations and Sound"
+ msgstr "Animationen und Klänge"
+
+-#: ../../WPrefs.app/Configurations.c:357
++#: ../../WPrefs.app/Configurations.c:356
+ msgid "Animations"
+ msgstr "Animationen"
+
+-#: ../../WPrefs.app/Configurations.c:368
++#: ../../WPrefs.app/Configurations.c:367
+ msgid ""
+ "Disable/enable animations such as those shown\n"
+ "for window miniaturization, shading etc."
+ msgstr ""
+-"Animationen für Fenster-Minimierung,\n"
+-"-Aufrollen usw. ein/ausschalten."
++"Animationen wie Fenster-Minimierung, Rollen usw. \n"
++"ein-/ausschalten"
+
+-#: ../../WPrefs.app/Configurations.c:376
++#: ../../WPrefs.app/Configurations.c:375
+ msgid "Superfluous"
+-msgstr "Effekte"
++msgstr "Zusätzliche Effekte"
+
+-#: ../../WPrefs.app/Configurations.c:387
++#: ../../WPrefs.app/Configurations.c:386
+ msgid ""
+ "Disable/enable `superfluous' features and\n"
+ "animations. These include the `ghosting' of the\n"
+ "dock when it's being moved to another side and\n"
+ "the explosion animation when undocking icons."
+ msgstr ""
+-"Überflüssige Effekte ein/ausschalten. Dazu gehören\n"
+-"das 'Ghosten' des Docks beim Verschieben und die\n"
+-"Explosion von aus dem Dock entfernten Symbolen."
++"Zusätzliche Effekte ein-/ausschalten. Dazu gehören\n"
++"das transparente Bild des Dock, wenn es auf die\n"
++"andere Seite verschoben wird und die Explosion\n"
++"der aus dem Dock entfernten Symbole."
+
+-#: ../../WPrefs.app/Configurations.c:397
++#: ../../WPrefs.app/Configurations.c:396
+ msgid "Sounds"
+ msgstr "Klänge"
+
+-#: ../../WPrefs.app/Configurations.c:408
++#: ../../WPrefs.app/Configurations.c:407
+ msgid ""
+ "Disable/enable support for sound effects played\n"
+ "for actions like shading and closing a window.\n"
+ "You will need a module distributed separately\n"
+ "for this. You can get it at:\n"
+-"http://shadowmere.student.utwente.nl/"
++"http://largo.windowmaker.org/files.php#WSoundServer"
+ msgstr ""
+-"Unterstützung für Klanguntermalung von Ereignissen\n"
+-"wie dem Auf-/Abrollen oder Schließen eines Fensters.\n"
+-"Hierzu brauchen sie ein zusätzliches Modul, das separat\n"
+-"vertrieben wird. Sie erhalten es bei\n"
+-"http://shadowmere.student.utwente.nl/"
++"Klangsignale für Ereignisse wie Auf-/Abrollen und\n"
++"Schließen eines Fenster ein-/ausschalten. Hierfür\n"
++"wird ein separates Modul benötigt, dass sie von\n"
++"http.//largo.windowmaker.org/files.php#WSoundServer\n"
++"herunterladen können."
+
+-#: ../../WPrefs.app/Configurations.c:419
++#: ../../WPrefs.app/Configurations.c:418
+ msgid ""
+ "Note: sound requires a module distributed\n"
+ "separately"
+-msgstr "Achtung: Klänge benötigen ein separates Modul"
++msgstr "Achtung: Klänge benötigen separates Modul"
+
+-#: ../../WPrefs.app/Configurations.c:429
++#: ../../WPrefs.app/Configurations.c:428
+ msgid "Dithering colormap for 8bpp"
+-msgstr "Dithering für 8 bpp-Farbpalette"
++msgstr "Dithering für 8bpp-Farbpalette"
+
+-#: ../../WPrefs.app/Configurations.c:431
++#: ../../WPrefs.app/Configurations.c:430
+ msgid ""
+ "Number of colors to reserve for Window Maker\n"
+ "on displays that support only 8bpp (PseudoColor)."
+ msgstr ""
+ "Anzahl der Farben, die für Window Maker auf\n"
+-"Displays mit 8 bpp reserviert werden sollen (PseudoColor)."
++"Display mit nur 8bpp reserviert werden sollen (PseudoColor)."
+
+-#: ../../WPrefs.app/Configurations.c:438
++#: ../../WPrefs.app/Configurations.c:437
+ msgid "Disable dithering in any visual/depth"
+-msgstr "Dithering für alle Visuals und Farbtiefen deaktivieren."
++msgstr "Dithering in jedem Visual und jeder Farbtiefe ausschalten."
+
+-#: ../../WPrefs.app/Configurations.c:459
++#: ../../WPrefs.app/Configurations.c:458
+ msgid ""
+ "More colors for\n"
+ "applications"
+ msgstr ""
+-"Mehr Farben f.\n"
++"Mehr Farben für\n"
+ "Anwendungen"
+
+-#: ../../WPrefs.app/Configurations.c:466
++#: ../../WPrefs.app/Configurations.c:465
+ msgid ""
+ "More colors for\n"
+ "Window Maker"
+ msgstr ""
+-"Mehr Farben f.\n"
++"Mehr Farben für\n"
+ "Window Maker"
+
+-#: ../../WPrefs.app/Configurations.c:521
++#: ../../WPrefs.app/Configurations.c:520
+ msgid "Other Configurations"
+ msgstr "Verschiedene Einstellungen"
+
+-#: ../../WPrefs.app/Configurations.c:523
++#: ../../WPrefs.app/Configurations.c:522
+ msgid ""
+ "Animation speeds, titlebar styles, various option\n"
+ "toggling and number of colors to reserve for\n"
+ "Window Maker on 8bit displays."
+ msgstr ""
+ "Animationsgeschwindigkeiten, Titelleisten-Stil,\n"
+-"verschiedene Einstellungen und Festlegung der für\n"
+-"Window Maker reservierten Farben auf 8 bpp-Displays."
++"Einstellen der für Window Maker reservierten\n"
++"Farben auf 8bpp-Displays."
+
+-#: ../../WPrefs.app/Expert.c:77
+-msgid "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
++#: ../../WPrefs.app/Expert.c:75
++msgid "Disable miniwindows (icons for minimized windows). For use with KDE/GNOME."
+ msgstr "Keine Minifenster (Symbole für minimierte Fenster). Für KDE/GNOME."
+
+-#: ../../WPrefs.app/Expert.c:78
++#: ../../WPrefs.app/Expert.c:76
+ msgid "Do not set non-WindowMaker specific parameters (do not use xset)."
+ msgstr "Keine Window Maker-spezifischen Parameter setzen (xset nicht benutzen)."
+
+-#: ../../WPrefs.app/Expert.c:79
++#: ../../WPrefs.app/Expert.c:77
+ msgid "Automatically save session when exiting Window Maker."
+-msgstr "Automatisches Abspeichern der Sitzung beim Beenden."
++msgstr "Automatischens Abspeichern der Sitzung beim Beenden."
+
+-#: ../../WPrefs.app/Expert.c:80
++#: ../../WPrefs.app/Expert.c:78
+ msgid "Use SaveUnder in window frames, icons, menus and other objects."
+-msgstr "\"SaveUnder\" für Fensterrahmen, Symbole, Menüs u. a. benutzen."
++msgstr "SaveUnder für Fensterrahmen, Symbole, Menü u. a. benutzen"
+
+-#: ../../WPrefs.app/Expert.c:81
+-msgid "Use Windoze style cycling."
+-msgstr "\"Windoze\"-Stil beim Durchlaufen der Fenster."
+-
+-#: ../../WPrefs.app/Expert.c:82
++#: ../../WPrefs.app/Expert.c:79
+ msgid "Disable confirmation panel for the Kill command."
+-msgstr "Kein Bestätigungsdialog für das \"Kill\"-Kommando."
++msgstr "Kein Bestätigungsdialog für den Töten-Befehl"
+
+-#: ../../WPrefs.app/Expert.c:83
++#: ../../WPrefs.app/Expert.c:80
+ msgid "Disable selection animation for selected icons."
+-msgstr "Keine Auswahlanimation für ausgewählte Symbole."
++msgstr "Keine Auswahlanimation für ausgewählte Symbole"
+
+-#: ../../WPrefs.app/Expert.c:84
++#: ../../WPrefs.app/Expert.c:81
+ msgid "Smooth font edges (needs restart)."
+ msgstr "Geglättete Schriftarten (Neustart erforderlich)."
+
+-#: ../../WPrefs.app/Expert.c:123
++#: ../../WPrefs.app/Expert.c:117
+ msgid "Expert User Preferences"
+-msgstr "Einstellugen für Experten"
++msgstr "Einstellungen für Experten"
+
+-#: ../../WPrefs.app/Expert.c:125
++#: ../../WPrefs.app/Expert.c:119
+ msgid ""
+ "Options for people who know what they're doing...\n"
+ "Also have some other misc. options."
+ msgstr ""
+ "Einstellungen für Leute, die wissen, was sie tun...\n"
+-"und einige andere Einstellungen."
++"Und einige andere Einstellungen."
+
+ #: ../../WPrefs.app/Focus.c:80
+ #, c-format
+ msgid "bad option value %s for option FocusMode. Using default Manual"
+-msgstr "falscher Eigenschaftswert %s für \"FocusMode\". Benutze Standard 'Manuell'"
++msgstr "falscher Eigenschaftswert %s für FocusMode. Standardwert 'Manuell' wird benutzt."
+
+ #: ../../WPrefs.app/Focus.c:94
+ #, c-format
+ msgid "bad option value %s for option ColormapMode. Using default Auto"
+-msgstr "falscher Eigenschaftswert %s für \"ColormapMode\". Benutze Standard 'Auto'"
++msgstr "falscher Eigenschaftswert %s für ColormapMode. Standardwert 'Auto' wird benutzt."
+
+ #: ../../WPrefs.app/Focus.c:214
+ msgid "Input Focus Mode"
+ msgstr "Eingabefokus-Modus"
+
+ #: ../../WPrefs.app/Focus.c:222
+-msgid "Manual: Click on the window to set keyboard input focus"
+-msgstr "Manuell: Setzen des Tastaturfokus durch Klick"
++msgid "Manual: Click on the window to set keyboard input focus."
++msgstr "Manuell: Tastaturfokus durch Anklicken des Fensters setzen"
+
+ #: ../../WPrefs.app/Focus.c:229
+-msgid "Auto: Set keyboard input focus to the window under the mouse pointer"
+-msgstr "Automatisch: Tastaturfokus folgt dem Mauszeiger"
++msgid "Auto: Set keyboard input focus to the window under the mouse pointer."
++msgstr "Auto: Tastaturfokus immer auf das Fenster unter dem Mauszeiger setzen"
+
+ #: ../../WPrefs.app/Focus.c:243
+ msgid "Install colormap in the window..."
+-msgstr "Farbtabelle im Fenster installieren, ..."
++msgstr "Farbtabelle im Fenster setzen, das..."
+
+ #: ../../WPrefs.app/Focus.c:248
+ msgid "...that has the input focus."
+-msgstr "..das den Eingabefokus hat."
++msgstr "...den Eingabefokus hat."
+
+ #: ../../WPrefs.app/Focus.c:253
+-msgid "...that is under the mouse pointer."
+-msgstr "...das unter dem Mauszeiger ist."
++msgid "...that's under the mouse pointer."
++msgstr "...unter dem Mauszeiger ist."
+
+ #: ../../WPrefs.app/Focus.c:262
+ msgid "Automatic Window Raise Delay"
+-msgstr "Verzögerung für \"Fenster nach vorne\""
++msgstr "Verzögerung für Auto-Fensterheber"
+
+ #: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601
+ msgid "msec"
+ msgstr "ms"
+
+ #: ../../WPrefs.app/Focus.c:336
+-msgid ""
+-"Do not let applications receive\n"
+-"the click used to focus windows."
+-msgstr ""
+-"Aktivierungsklick wird nicht an\n"
+-"Anwendung gesendet."
++msgid "Do not let applications receive the click used to focus windows."
++msgstr "Mausklicks, die ein Fenster fokussiert haben, nicht an die Anwendung senden."
+
+ #: ../../WPrefs.app/Focus.c:342
+-msgid ""
+-"Automatically focus new\n"
+-"windows."
+-msgstr ""
+-"Neue Fenster erhalten den\n"
+-"Fokus automatisch."
++msgid "Automatically focus new windows."
++msgstr "Neue Fenster automatisch auswählen"
+
+ #: ../../WPrefs.app/Focus.c:363
+ msgid "Window Focus Preferences"
+-msgstr "Fensterfokus-Einstellungen"
++msgstr "Einstellungen zum Fokusverhalten"
+
+ #: ../../WPrefs.app/Focus.c:365
+ msgid ""
+@@ -479,78 +478,51 @@
+ "policy for 8bpp displays and other related options."
+ msgstr ""
+ "Tastaturfokuswechsel, Farbtabellenwechsel für\n"
+-"8 bpp-Displays und weitere verwandte Eigenschaften."
+-
+-#: ../../WPrefs.app/Font.c:276
+-msgid "Could not locate font information file WPrefs.app/font.data"
+-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gefunden werden."
+-
+-#: ../../WPrefs.app/Font.c:282
+-msgid "Could not read font information file WPrefs.app/font.data"
+-msgstr "Schrifteninformationsdatei \"WPrefs.app/font.data\" konnte nicht gelesen werden."
+-
+-#: ../../WPrefs.app/Font.c:293
+-msgid ""
+-"Invalid data in font information file WPrefs.app/font.data.\n"
+-"Encodings data not found."
+-msgstr ""
+-"Ungültige Daten in Schrifteninformationsdatei \"WPrefs.app/font.data\".\n"
+-"Daten für Kodierung nicht gefunden."
+-
+-#: ../../WPrefs.app/Font.c:298
+-msgid "- Custom -"
+-msgstr "- Angepasst -"
+-
+-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
+-#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160
+-#: ../../WPrefs.app/TexturePanel.c:615 ../../WPrefs.app/TexturePanel.c:695
+-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:759
+-#: ../../WPrefs.app/WPrefs.c:764 ../../WPrefs.app/WPrefs.c:781
+-#: ../../WPrefs.app/WPrefs.c:791 ../../WPrefs.app/WPrefs.c:801
+-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
+-msgid "Error"
+-msgstr "Fehler"
+-
+-#: ../../WPrefs.app/Font.c:329 ../../WPrefs.app/Menu.c:1594
+-#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162
+-#: ../../WPrefs.app/TexturePanel.c:616 ../../WPrefs.app/TexturePanel.c:697
+-#: ../../WPrefs.app/TexturePanel.c:1529 ../../WPrefs.app/Themes.c:98
+-#: ../../WPrefs.app/WPrefs.c:759 ../../WPrefs.app/WPrefs.c:764
+-#: ../../WPrefs.app/WPrefs.c:783 ../../WPrefs.app/WPrefs.c:795
+-#: ../../WPrefs.app/WPrefs.c:801 ../../WPrefs.app/WPrefs.c:808
+-#: ../../WPrefs.app/WPrefs.c:839 ../../WPrefs.app/WPrefs.c:844
+-#: ../../WPrefs.app/imagebrowser.c:105
+-msgid "OK"
+-msgstr "OK"
++"8bpp-Display und weitere verwandte Eigenschaften."
+
+-#: ../../WPrefs.app/Font.c:376
+-msgid "Default Font Sets"
+-msgstr "Standardschriftarten"
+-
+-#: ../../WPrefs.app/Font.c:389
+-msgid "Font Set"
+-msgstr "Schriftart"
+-
+-#: ../../WPrefs.app/Font.c:418
+-msgid "Add..."
+-msgstr "Hinzufügen..."
+-
+-#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438
+-msgid "Change..."
+-msgstr "Ändern..."
++#: ../../WPrefs.app/FontSimple.c:107
++msgid "Window Title"
++msgstr "Titel des aktiven Fensters"
+
+-#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:284
+-#: ../../WPrefs.app/Paths.c:315
+-msgid "Remove"
+-msgstr "Entfernen"
++#: ../../WPrefs.app/FontSimple.c:109
++msgid "Menu Text"
++msgstr "Text eines Menüeintrages"
+
+-#: ../../WPrefs.app/Font.c:477
+-msgid "Font Preferences"
+-msgstr "Schrift-Einstellungen"
+-
+-#: ../../WPrefs.app/Font.c:478
+-msgid "Font Configurations for Windows, Menus etc"
+-msgstr "Schriftkonfiguration für Fenster, Menüs usw."
++#: ../../WPrefs.app/FontSimple.c:110
++msgid "Icon Title"
++msgstr "Symboltitel"
++
++#: ../../WPrefs.app/FontSimple.c:111
++msgid "Clip Title"
++msgstr "Clip-Titel"
++
++#: ../../WPrefs.app/FontSimple.c:112
++msgid "Desktop Caption"
++msgstr "Arbeitsflächentitel"
++
++#: ../../WPrefs.app/FontSimple.c:690
++msgid "Sample Text"
++msgstr "Beispieltext"
++
++#: ../../WPrefs.app/FontSimple.c:708
++msgid "Family"
++msgstr "Familie"
++
++#: ../../WPrefs.app/FontSimple.c:737
++msgid "Style"
++msgstr "Stil"
++
++#: ../../WPrefs.app/FontSimple.c:740
++msgid "Size"
++msgstr "Größe"
++
++#: ../../WPrefs.app/FontSimple.c:778
++msgid "Font Configuration"
++msgstr "Schrifteinstellungen"
++
++#: ../../WPrefs.app/FontSimple.c:780
++msgid "Configure fonts for Window Maker titlebars, menus etc."
++msgstr "Schrifteinstellungen für Fenster, Menüs usw."
+
+ #: ../../WPrefs.app/Icons.c:180
+ msgid "Icon Positioning"
+@@ -562,7 +534,7 @@
+
+ #: ../../WPrefs.app/Icons.c:238
+ msgid "Shrinking/Zooming"
+-msgstr "Verkleinern/Vergrößern"
++msgstr "Schrumpfen/Vergrößern"
+
+ #: ../../WPrefs.app/Icons.c:239
+ msgid "Spinning/Twisting"
+@@ -583,11 +555,11 @@
+
+ #: ../../WPrefs.app/Icons.c:256
+ msgid "Keep icons and miniwindows arranged all the time."
+-msgstr "Symbole und Minifenster immer anordnen."
++msgstr "Symbole und Minifenster immer anordnen"
+
+ #: ../../WPrefs.app/Icons.c:262
+ msgid "Omnipresent miniwindows"
+-msgstr "Omnipräsente Minifenster"
++msgstr "Haftende Minifenster"
+
+ #: ../../WPrefs.app/Icons.c:264
+ msgid "Make miniwindows be present in all workspaces."
+@@ -603,7 +575,7 @@
+
+ #: ../../WPrefs.app/Icons.c:345
+ msgid "Icon Preferences"
+-msgstr "Symbol-Einstellungen"
++msgstr "Symboleinstellungen"
+
+ #: ../../WPrefs.app/Icons.c:347
+ msgid ""
+@@ -633,237 +605,254 @@
+ msgid "Not done"
+ msgstr "Noch nicht erstellt"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:307 ../../WPrefs.app/Menu.c:360
++#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360
+ #: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100
+ msgid "Cancel"
+ msgstr "Abbrechen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:308
++#: ../../WPrefs.app/KeyboardShortcuts.c:311
+ msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
+ msgstr ""
+-"Drücken Sie die gewünschte Tastenkombination oder auf \"Abbrechen\"."
++"Drücken Sie die gewünschte Tastenkombination oder klicken Sie auf Abbrechen "
++"zum Stoppen der Aufzeichnung."
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:328
+-#: ../../WPrefs.app/KeyboardShortcuts.c:575 ../../WPrefs.app/Menu.c:371
++#: ../../WPrefs.app/KeyboardShortcuts.c:331
++#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371
+ #: ../../WPrefs.app/Menu.c:830
+ msgid "Capture"
+ msgstr "Aufzeichnen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:329
+-#: ../../WPrefs.app/KeyboardShortcuts.c:583
+-msgid "Click Capture to interactively define the shortcut key."
+-msgstr "Zum interaktiven Auswählen einer Tastenkombination \"Aufzeichnen\" klicken."
++#: ../../WPrefs.app/KeyboardShortcuts.c:332
++#: ../../WPrefs.app/KeyboardShortcuts.c:592
++msgid "Click on Capture to interactively define the shortcut key."
++msgstr "Zum Erstellen eines Tastenkürzels auf \"Aufzeichnen\" klicken."
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:483
++#: ../../WPrefs.app/KeyboardShortcuts.c:486
+ msgid "Actions"
+ msgstr "Aktionen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:497
++#: ../../WPrefs.app/KeyboardShortcuts.c:500
+ msgid "Open applications menu"
+-msgstr "Anwendungsmenü öffnen"
++msgstr "Anwendungmenü öffnen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:498
++#: ../../WPrefs.app/KeyboardShortcuts.c:501
+ msgid "Open window list menu"
+ msgstr "Fensterliste öffnen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:499
++#: ../../WPrefs.app/KeyboardShortcuts.c:502
+ msgid "Open window commands menu"
+ msgstr "Fenstermenü öffnen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:500
++#: ../../WPrefs.app/KeyboardShortcuts.c:503
+ msgid "Hide active application"
+-msgstr "Aktive Anwendung ausblenden"
++msgstr "Aktive Anwendung verstecken"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:501
++#: ../../WPrefs.app/KeyboardShortcuts.c:504
+ msgid "Hide other applications"
+-msgstr "Alle anderen Anwendungen ausblenden"
++msgstr "Alle anderen Anwendung verstecken"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:502
++#: ../../WPrefs.app/KeyboardShortcuts.c:505
+ msgid "Miniaturize active window"
+ msgstr "Aktives Fenster minimieren"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:503
++#: ../../WPrefs.app/KeyboardShortcuts.c:506
+ msgid "Close active window"
+ msgstr "Aktives Fenster schließen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:504
++#: ../../WPrefs.app/KeyboardShortcuts.c:507
+ msgid "Maximize active window"
+ msgstr "Aktives Fenster maximieren"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:505
++#: ../../WPrefs.app/KeyboardShortcuts.c:508
+ msgid "Maximize active window vertically"
+ msgstr "Aktives Fenster vertikal maximieren"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:506
++#: ../../WPrefs.app/KeyboardShortcuts.c:509
+ msgid "Maximize active window horizontally"
+ msgstr "Aktives Fenster horizontal maximieren"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:507
++#: ../../WPrefs.app/KeyboardShortcuts.c:510
+ msgid "Raise active window"
+ msgstr "Aktives Fenster in den Vordergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:508
++#: ../../WPrefs.app/KeyboardShortcuts.c:511
+ msgid "Lower active window"
+ msgstr "Aktives Fenster in den Hintergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:509
++#: ../../WPrefs.app/KeyboardShortcuts.c:512
+ msgid "Raise/Lower window under mouse pointer"
+-msgstr "Fenster unter Mauszeiger in Vor-/Hintergrund"
++msgstr "Fenster unter dem Mauszeiger in den Vor-/Hintergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:510
++#: ../../WPrefs.app/KeyboardShortcuts.c:513
+ msgid "Shade active window"
+ msgstr "Aktives Fenster aufrollen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:511
++#: ../../WPrefs.app/KeyboardShortcuts.c:514
+ msgid "Move/Resize active window"
+ msgstr "Aktives Fenster bewegen/verändern"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:512
++#: ../../WPrefs.app/KeyboardShortcuts.c:515
+ msgid "Select active window"
+ msgstr "Aktives Fenster auswählen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:513
++#: ../../WPrefs.app/KeyboardShortcuts.c:516
+ msgid "Focus next window"
+ msgstr "Nächstes Fenster"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:514
++#: ../../WPrefs.app/KeyboardShortcuts.c:517
+ msgid "Focus previous window"
+ msgstr "Vorheriges Fenster"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:515
++#: ../../WPrefs.app/KeyboardShortcuts.c:518
+ msgid "Switch to next workspace"
+ msgstr "Zur nächsten Arbeitsfläche"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:516
++#: ../../WPrefs.app/KeyboardShortcuts.c:519
+ msgid "Switch to previous workspace"
+ msgstr "Zur vorherigen Arbeitsfläche"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:517
++#: ../../WPrefs.app/KeyboardShortcuts.c:520
+ msgid "Switch to next ten workspaces"
+ msgstr "Springe 10 Arbeitsflächen vorwärts"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:518
++#: ../../WPrefs.app/KeyboardShortcuts.c:521
+ msgid "Switch to previous ten workspaces"
+ msgstr "Springe 10 Arbeitsflächen rückwärts"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:519
++#: ../../WPrefs.app/KeyboardShortcuts.c:522
+ msgid "Switch to workspace 1"
+ msgstr "Springe zu Arbeitsfläche 1"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:520
++#: ../../WPrefs.app/KeyboardShortcuts.c:523
+ msgid "Switch to workspace 2"
+ msgstr "Springe zu Arbeitsfläche 2"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:521
++#: ../../WPrefs.app/KeyboardShortcuts.c:524
+ msgid "Switch to workspace 3"
+ msgstr "Springe zu Arbeitsfläche 3"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:522
++#: ../../WPrefs.app/KeyboardShortcuts.c:525
+ msgid "Switch to workspace 4"
+ msgstr "Springe zu Arbeitsfläche 4"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:523
++#: ../../WPrefs.app/KeyboardShortcuts.c:526
+ msgid "Switch to workspace 5"
+ msgstr "Springe zu Arbeitsfläche 5"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:524
++#: ../../WPrefs.app/KeyboardShortcuts.c:527
+ msgid "Switch to workspace 6"
+ msgstr "Springe zu Arbeitsfläche 6"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:525
++#: ../../WPrefs.app/KeyboardShortcuts.c:528
+ msgid "Switch to workspace 7"
+ msgstr "Springe zu Arbeitsfläche 7"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:526
++#: ../../WPrefs.app/KeyboardShortcuts.c:529
+ msgid "Switch to workspace 8"
+ msgstr "Springe zu Arbeitsfläche 8"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:527
++#: ../../WPrefs.app/KeyboardShortcuts.c:530
+ msgid "Switch to workspace 9"
+ msgstr "Springe zu Arbeitsfläche 9"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:528
++#: ../../WPrefs.app/KeyboardShortcuts.c:531
+ msgid "Switch to workspace 10"
+ msgstr "Springe zu Arbeitsfläche 10"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:529
++#: ../../WPrefs.app/KeyboardShortcuts.c:532
+ msgid "Shortcut for window 1"
+ msgstr "Tastenkürzel für Fenster 1"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:530
++#: ../../WPrefs.app/KeyboardShortcuts.c:533
+ msgid "Shortcut for window 2"
+ msgstr "Tastenkürzel für Fenster 2"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:531
++#: ../../WPrefs.app/KeyboardShortcuts.c:534
+ msgid "Shortcut for window 3"
+ msgstr "Tastenkürzel für Fenster 3"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:532
++#: ../../WPrefs.app/KeyboardShortcuts.c:535
+ msgid "Shortcut for window 4"
+ msgstr "Tastenkürzel für Fenster 4"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:533
++#: ../../WPrefs.app/KeyboardShortcuts.c:536
+ msgid "Shortcut for window 5"
+ msgstr "Tastenkürzel für Fenster 5"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:534
++#: ../../WPrefs.app/KeyboardShortcuts.c:537
+ msgid "Shortcut for window 6"
+ msgstr "Tastenkürzel für Fenster 6"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:535
++#: ../../WPrefs.app/KeyboardShortcuts.c:538
+ msgid "Shortcut for window 7"
+ msgstr "Tastenkürzel für Fenster 7"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:536
++#: ../../WPrefs.app/KeyboardShortcuts.c:539
+ msgid "Shortcut for window 8"
+ msgstr "Tastenkürzel für Fenster 8"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:537
++#: ../../WPrefs.app/KeyboardShortcuts.c:540
+ msgid "Shortcut for window 9"
+ msgstr "Tastenkürzel für Fenster 9"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:538
++#: ../../WPrefs.app/KeyboardShortcuts.c:541
+ msgid "Shortcut for window 10"
+ msgstr "Tastenkürzel für Fenster 10"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:539
++#: ../../WPrefs.app/KeyboardShortcuts.c:542
+ msgid "Switch to Next Screen/Monitor"
+-msgstr "Springe zum nächsten Bildschirm"
++msgstr "Springe zu nächstem Bildschirm"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:540
++#: ../../WPrefs.app/KeyboardShortcuts.c:544
++msgid "Move VirtualDesktop to next left edge"
++msgstr "Virtuelle Arbeitsfläche zur nächsten Kante links bewegen"
++
++#: ../../WPrefs.app/KeyboardShortcuts.c:545
++msgid "Move VirtualDesktop to next right edge"
++msgstr "Virtuelle Arbeitsfläche zur nächsten Kante rechts bewegen"
++
++#: ../../WPrefs.app/KeyboardShortcuts.c:546
++msgid "Move VirtualDesktop to next top edge"
++msgstr "Virtuelle Arbeitsfläche zur nächsten Kante oben bewegen"
++
++#: ../../WPrefs.app/KeyboardShortcuts.c:547
++msgid "Move VirtualDesktop to next bottom edge"
++msgstr "Virtuelle Arbeitsfläche zur nächsten Kante unten bewegen"
++
++#: ../../WPrefs.app/KeyboardShortcuts.c:549
+ msgid "Raise Clip"
+ msgstr "Clip in den Vordergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:541
++#: ../../WPrefs.app/KeyboardShortcuts.c:550
+ msgid "Lower Clip"
+ msgstr "Clip in den Hintergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:542
++#: ../../WPrefs.app/KeyboardShortcuts.c:551
+ msgid "Raise/Lower Clip"
+ msgstr "Clip in den Vor-/Hintergrund"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:544
++#: ../../WPrefs.app/KeyboardShortcuts.c:553
+ msgid "Toggle keyboard language"
+-msgstr "Tastatursprache ändern"
++msgstr "Tastatursbelegung ändern"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:558
++#: ../../WPrefs.app/KeyboardShortcuts.c:567
+ msgid "Shortcut"
+-msgstr " Tastatur-Kurzbefehle "
++msgstr "Kürzel"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:569 ../../WPrefs.app/Menu.c:836
++#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836
+ msgid "Clear"
+ msgstr "Löschen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:631
++#: ../../WPrefs.app/KeyboardShortcuts.c:640
+ msgid "Keyboard Shortcut Preferences"
+-msgstr "Tastaturkürzel-Einstellungen"
++msgstr "Tastenkürzel-Einstellungen"
+
+-#: ../../WPrefs.app/KeyboardShortcuts.c:633
++#: ../../WPrefs.app/KeyboardShortcuts.c:642
+ msgid ""
+ "Change the keyboard shortcuts for actions such\n"
+ "as changing workspaces and opening menus."
+ msgstr ""
+-"Ändern der Tastenkombinationen für Aktionen wie das\n"
++"Ändern der Tastenkürzel für Aktionen wie das\n"
+ "Wechseln der Arbeitsflächen und das Öffnen von Menüs."
+
+ #: ../../WPrefs.app/Menu.c:278
+@@ -872,11 +861,11 @@
+
+ #: ../../WPrefs.app/Menu.c:510
+ msgid "New Items"
+-msgstr "Neue Menüeinträge"
++msgstr "Neue Einträge"
+
+ #: ../../WPrefs.app/Menu.c:511
+ msgid "Sample Commands"
+-msgstr "Beispielkommandos"
++msgstr "Beispielbefehle"
+
+ #: ../../WPrefs.app/Menu.c:512
+ msgid "Sample Submenus"
+@@ -888,7 +877,7 @@
+
+ #: ../../WPrefs.app/Menu.c:527
+ msgid "Internal Command"
+-msgstr "Internes Kommando"
++msgstr "interner Befehl"
+
+ #: ../../WPrefs.app/Menu.c:528
+ msgid "Submenu"
+@@ -896,11 +885,11 @@
+
+ #: ../../WPrefs.app/Menu.c:529
+ msgid "External Submenu"
+-msgstr "Externes Untermenü"
++msgstr "externes Untermenü"
+
+ #: ../../WPrefs.app/Menu.c:530
+ msgid "Generated Submenu"
+-msgstr "Erzeugtes Untermenü"
++msgstr "erstelltes Untermenü"
+
+ #: ../../WPrefs.app/Menu.c:531
+ msgid "Directory Contents"
+@@ -912,19 +901,19 @@
+
+ #: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840
+ msgid "Window List Menu"
+-msgstr "Fensterlistenmenü"
++msgstr "Fensterliste"
+
+ #: ../../WPrefs.app/Menu.c:552
+ msgid "XTerm"
+-msgstr "XTerm"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:555
+ msgid "rxvt"
+-msgstr "rxvt"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:558
+ msgid "ETerm"
+-msgstr "ETerm"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:561
+ msgid "Run..."
+@@ -933,35 +922,35 @@
+ #: ../../WPrefs.app/Menu.c:562
+ #, c-format
+ msgid "%a(Run,Type command to run)"
+-msgstr "%a(Ausführen,Auszuführendes Kommando eingeben)"
++msgstr "%a(Befehl zum Ausführen eingeben)"
+
+ #: ../../WPrefs.app/Menu.c:564
+ msgid "Netscape"
+-msgstr "Netscape"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:567
+ msgid "gimp"
+-msgstr "gimp"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:570
+ msgid "epic"
+-msgstr "epic"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:573
+ msgid "ee"
+-msgstr "ee"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:576
+ msgid "xv"
+-msgstr "xv"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:579
+ msgid "Acrobat Reader"
+-msgstr "Acrobat Reader"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:582
+ msgid "ghostview"
+-msgstr "ghostview"
++msgstr ""
+
+ #: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857
+ msgid "Exit Window Maker"
+@@ -985,15 +974,15 @@
+
+ #: ../../WPrefs.app/Menu.c:622
+ msgid "Bg Images (scale)"
+-msgstr "Hg Bilder (voll)"
++msgstr "Hintergrundbilder (skaliert)"
+
+ #: ../../WPrefs.app/Menu.c:627
+ msgid "Bg Images (tile)"
+-msgstr "Hg Bilder (Kachel)"
++msgstr "Hintergrundbilder (Kacheln)"
+
+ #: ../../WPrefs.app/Menu.c:632
+ msgid "Assorted XTerms"
+-msgstr "Versch. XTerms"
++msgstr "sortierte XTerms"
+
+ #: ../../WPrefs.app/Menu.c:634
+ msgid "XTerm Yellow on Blue"
+@@ -1029,7 +1018,7 @@
+
+ #: ../../WPrefs.app/Menu.c:677
+ msgid "Program to Run"
+-msgstr "Auszuführendes Programm"
++msgstr "auszuführendes Programm"
+
+ #: ../../WPrefs.app/Menu.c:687
+ msgid "Browse"
+@@ -1061,47 +1050,47 @@
+
+ #: ../../WPrefs.app/Menu.c:736
+ msgid "Command"
+-msgstr "Kommando"
++msgstr "Befehl"
+
+ #: ../../WPrefs.app/Menu.c:750
+ msgid ""
+ "Enter a command that outputs a menu\n"
+ "definition to stdout when invoked."
+ msgstr ""
+-"Geben Sie ein Kommando ein, das beim Aufruf\n"
+-"ein Menü nach STDOUT ausgibt."
++"Geben Sie einen Befehl ein, der bei Aufruf\n"
++"ein Menü auf der Standardausgabe zurückgibt."
+
+ #: ../../WPrefs.app/Menu.c:758
+ msgid ""
+ "Cache menu contents after opening for\n"
+ "the first time"
+ msgstr ""
+-"Menüinhalt nach dem ersten Laden\n"
++"Menüinhalt nach erstem Laden\n"
+ "zwischenspeichern"
+
+ #: ../../WPrefs.app/Menu.c:769
+ msgid "Command to Open Files"
+-msgstr "Befehl zum Öffnen von Dateien"
++msgstr "Befehl zum Öffnen der Dateien"
+
+ #: ../../WPrefs.app/Menu.c:783
+ msgid ""
+ "Enter the command you want to use to open the\n"
+ "files in the directories listed below."
+ msgstr ""
+-"Geben Sie das Kommando zum Öffnen der Dateien\n"
+-"in den unten aufgelisteten Verzeichnissen ein."
++"Geben Sie den Befehl zum Öffnen der Dateien\n"
++"in den augelisteten Verzeichnissen ein."
+
+ #: ../../WPrefs.app/Menu.c:792
+ msgid "Directories with Files"
+-msgstr "Verzeichnisse mit Dateien"
++msgstr "Verzeichnis mit Dateien"
+
+ #: ../../WPrefs.app/Menu.c:805
+ msgid "Strip extensions from file names"
+-msgstr "Dateierweiterungen entfernen"
++msgstr "Erweiterungen von den Dateinamen entfernen"
+
+ #: ../../WPrefs.app/Menu.c:817
+ msgid "Keyboard Shortcut"
+-msgstr "Tastaturkürzel"
++msgstr "Tastenkürzel"
+
+ #: ../../WPrefs.app/Menu.c:853
+ msgid "Arrange Icons"
+@@ -1109,7 +1098,7 @@
+
+ #: ../../WPrefs.app/Menu.c:854
+ msgid "Hide All Windows Except For The Focused One"
+-msgstr "Alle Fenster bis auf das aktive ausblenden"
++msgstr "Alle Fenster bis auf das aktive verstecken"
+
+ #: ../../WPrefs.app/Menu.c:855
+ msgid "Show All Windows"
+@@ -1121,19 +1110,19 @@
+
+ #: ../../WPrefs.app/Menu.c:859
+ msgid "Restart Window Maker"
+-msgstr "Window Maker neu starten"
++msgstr "Window Maker neustarten"
+
+ #: ../../WPrefs.app/Menu.c:860
+ msgid "Start Another Window Manager : ("
+-msgstr "Anderen Windowmanager starten : ("
++msgstr "anderen Windowmanager starten : ("
+
+ #: ../../WPrefs.app/Menu.c:862
+ msgid "Save Current Session"
+-msgstr "Aktuelle Sitzung speichern"
++msgstr "aktuelle Sitzung speichern"
+
+ #: ../../WPrefs.app/Menu.c:863
+ msgid "Clear Saved Session"
+-msgstr "Gespeicherte Sitzung löschen"
++msgstr "gespeicherte Sitzung löschen"
+
+ #: ../../WPrefs.app/Menu.c:864
+ msgid "Refresh Screen"
+@@ -1141,21 +1130,21 @@
+
+ #: ../../WPrefs.app/Menu.c:865
+ msgid "Open Info Panel"
+-msgstr "Kurzinformation anzeigen"
++msgstr "Infodialog anzeigen"
+
+ #: ../../WPrefs.app/Menu.c:866
+ msgid "Open Copyright Panel"
+-msgstr "Copyright anzeigen"
++msgstr "Copyrightinformationen anzeigen"
+
+ #: ../../WPrefs.app/Menu.c:872
+ msgid "Window Manager to Start"
+-msgstr "Zu startender Windowmanager"
++msgstr "zu startender Windowmanager"
+
+ #: ../../WPrefs.app/Menu.c:888
+ msgid "Do not confirm action."
+-msgstr "Aktion nicht bestätigen."
++msgstr "Aktion nicht bestätigen"
+
+-#: ../../WPrefs.app/Menu.c:898
++#: ../../WPrefs.app/Menu.c:896
+ msgid ""
+ "Instructions:\n"
+ "\n"
+@@ -1166,110 +1155,125 @@
+ " - double click in a menu item to change the label\n"
+ " - click on a menu item to change related information"
+ msgstr ""
+-"Anweisungen:\n"
++"Hilfe:\n"
+ "\n"
+-" - Neue Menüeinträge von links in das Menü ziehen.\n"
+-" - Zum Löschen Menüeinträge aus dem Menü herausz.\n"
+-" - Einträge im Menü durch Ziehen neu platzieren.\n"
+-" - Einträge durch Ziehen mit gedr. 'Strg' kopieren.\n"
+-" - Beschriftung durch Doppelklick ändern.\n"
+-" - Nach Anklicken sind weitere Einstellungen sichtbar."
++" - ziehen Sie Einträge von links in das Menü, um neue Einträge zu erstellen\n"
++" - ziehen Sie Einträge aus dem Menu, um sie zu entfernen\n"
++" - ziehen Sie Einträge innerhalb des Menüs, um sie zu verschieben\n"
++" - ziehen Sie Einträge bei gedrückter Strg-Taste, um sie zu kopieren\n"
++" - doppelklicken Sie auf Einträge, um den Text zu verändern\n"
++" - klicken Sie auf die Einträge, um diese zu konfigurieren "
+
+-#: ../../WPrefs.app/Menu.c:1122
++#: ../../WPrefs.app/Menu.c:1120
+ #, c-format
+ msgid "unknown command '%s' in menu"
+ msgstr "unbekannter Menübefehl '%s'"
+
+-#: ../../WPrefs.app/Menu.c:1154
++#: ../../WPrefs.app/Menu.c:1152
+ msgid ": Execute Program"
+ msgstr ": Programm ausführen"
+
+-#: ../../WPrefs.app/Menu.c:1158
++#: ../../WPrefs.app/Menu.c:1156
+ msgid ": Perform Internal Command"
+-msgstr ": Internen Befehl ausführen"
++msgstr ": internen Befehl ausführen"
+
+-#: ../../WPrefs.app/Menu.c:1162
++#: ../../WPrefs.app/Menu.c:1160
+ msgid ": Open a Submenu"
+ msgstr ": Untermenü öffnen"
+
+-#: ../../WPrefs.app/Menu.c:1166
++#: ../../WPrefs.app/Menu.c:1164
+ msgid ": Program Generated Submenu"
+-msgstr ": Programmgeneriertes Untermenü"
++msgstr ": programmgeneriertes Unternmenü"
+
+-#: ../../WPrefs.app/Menu.c:1170
++#: ../../WPrefs.app/Menu.c:1168
+ msgid ": Directory Contents Menu"
+ msgstr ": Menü mit Verzeichnisinhalt"
+
+-#: ../../WPrefs.app/Menu.c:1174
++#: ../../WPrefs.app/Menu.c:1172
+ msgid ": Open Workspaces Submenu"
+ msgstr ": Arbeitsflächen-Untermenü"
+
+-#: ../../WPrefs.app/Menu.c:1178
++#: ../../WPrefs.app/Menu.c:1176
+ msgid ": Open Window List Submenu"
+ msgstr ": Fensterlisten-Untermenü"
+
+-#: ../../WPrefs.app/Menu.c:1403
++#: ../../WPrefs.app/Menu.c:1401
+ msgid "Remove Submenu"
+ msgstr "Untermenü entfernen"
+
+-#: ../../WPrefs.app/Menu.c:1404
++#: ../../WPrefs.app/Menu.c:1402
+ msgid ""
+ "Removing this item will destroy all items inside\n"
+ "the submenu. Do you really want to do that?"
+ msgstr ""
+ "Das Entfernen dieses Eintrages löscht alle Einträge\n"
+-"innerhalb des Untermenüs. Wollen Sie das wirklich?"
++"im Untermenü. Wollen Sie das wirklich tun?"
+
+-#: ../../WPrefs.app/Menu.c:1406
++#: ../../WPrefs.app/Menu.c:1404
+ msgid "Yes"
+ msgstr "Ja"
+
+-#: ../../WPrefs.app/Menu.c:1406
++#: ../../WPrefs.app/Menu.c:1404
+ msgid "No"
+ msgstr "Nein"
+
+-#: ../../WPrefs.app/Menu.c:1407
++#: ../../WPrefs.app/Menu.c:1405
+ msgid "Yes, don't ask again."
+-msgstr "Ja, nicht mehr nachfragen"
+-
+-#. if there is a localized plmenu for the tongue put it's filename here
+-#: ../../WPrefs.app/Menu.c:1575 ../../WPrefs.app/Menu.c:1582
+-#, c-format
+-msgid "%s/Library/WindowMaker/plmenu"
+-msgstr "%s/Library/WindowMaker/plmenu.de"
++msgstr "Ja, alle"
+
+-#: ../../WPrefs.app/Menu.c:1591
++#: ../../WPrefs.app/Menu.c:1579
+ #, c-format
+ msgid "Could not open default menu from '%s'"
+-msgstr "Standardmenü '%s' konnte nicht geöffnet werden"
++msgstr "Standardmenü aus '%s' konnte nicht geöffnet werden"
++
++#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:140
++#: ../../WPrefs.app/MouseSettings.c:160 ../../WPrefs.app/TexturePanel.c:615
++#: ../../WPrefs.app/TexturePanel.c:695 ../../WPrefs.app/Themes.c:96
++#: ../../WPrefs.app/WPrefs.c:740 ../../WPrefs.app/WPrefs.c:745
++#: ../../WPrefs.app/WPrefs.c:762 ../../WPrefs.app/WPrefs.c:772
++#: ../../WPrefs.app/WPrefs.c:782 ../../WPrefs.app/WPrefs.c:820
++#: ../../WPrefs.app/WPrefs.c:825
++msgid "Error"
++msgstr "Fehler"
+
+-#: ../../WPrefs.app/Menu.c:1629 ../../WPrefs.app/WPrefs.c:808
++#: ../../WPrefs.app/Menu.c:1583 ../../WPrefs.app/MouseSettings.c:142
++#: ../../WPrefs.app/MouseSettings.c:162 ../../WPrefs.app/TexturePanel.c:616
++#: ../../WPrefs.app/TexturePanel.c:697 ../../WPrefs.app/TexturePanel.c:1529
++#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:740
++#: ../../WPrefs.app/WPrefs.c:745 ../../WPrefs.app/WPrefs.c:764
++#: ../../WPrefs.app/WPrefs.c:776 ../../WPrefs.app/WPrefs.c:782
++#: ../../WPrefs.app/WPrefs.c:789 ../../WPrefs.app/WPrefs.c:820
++#: ../../WPrefs.app/WPrefs.c:825 ../../WPrefs.app/imagebrowser.c:105
++msgid "OK"
++msgstr "OK"
++
++#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789
+ msgid "Warning"
+ msgstr "Warnung"
+
+-#: ../../WPrefs.app/Menu.c:1630
++#: ../../WPrefs.app/Menu.c:1613
+ msgid ""
+ "The menu file format currently in use is not supported\n"
+ "by this tool. Do you want to discard the current menu\n"
+ "to use this tool?"
+ msgstr ""
+-"Das momentan verwendete Menüdateiformat wird vom\n"
+-"Programm nicht unterstützt. Wollen Sie das aktuelle Menü\n"
+-"verwerfen, um dieses Programm verwenden zu können?"
++"Das momentan verwendete Menüdateiformat wird von\n"
++"diesem Programm nicht unterstützt. Wollen Sie das aktuelle\n"
++"Menü verwerfen, um dieses Programm verwenden zu können?"
+
+-#: ../../WPrefs.app/Menu.c:1633
++#: ../../WPrefs.app/Menu.c:1616
+ msgid "Yes, Discard and Update"
+ msgstr "Ja, Verwerfen und Erneuern"
+
+-#: ../../WPrefs.app/Menu.c:1634
++#: ../../WPrefs.app/Menu.c:1617
+ msgid "No, Keep Current Menu"
+ msgstr "Nein, aktuelles Menü behalten"
+
+-#: ../../WPrefs.app/Menu.c:1897
++#: ../../WPrefs.app/Menu.c:1880
+ msgid "Applications Menu Definition"
+ msgstr "Anwendungsmenü-Definition"
+
+-#: ../../WPrefs.app/Menu.c:1899
++#: ../../WPrefs.app/Menu.c:1882
+ msgid "Edit the menu for launching applications."
+ msgstr "Editieren des Menüs zum Starten von Anwendungen"
+
+@@ -1286,16 +1290,16 @@
+ "Always open submenus inside the screen, instead of scrolling.\n"
+ "Note: this is annoying."
+ msgstr ""
+-"Untermenüs immer innerhalb des Bildschirms anzeigen, statt zu scrollen.\n"
+-"Anmerkung: Nicht empfehlenswert."
++"Untermenüs immer im Bildschirm öffnen anstatt zu Scrollen.\n"
++"Anmerkung: kann störend sein."
+
+ #: ../../WPrefs.app/MenuPreferences.c:209
+ msgid "Scroll off-screen menus when pointer is moved over them."
+-msgstr "Außenliegende Menüs hereinbewegen, wenn der Mauszeiger darüber ist."
++msgstr "Menüs außerhalb des Bildschirms scrollen, wenn der Mauszeiger über ihnen ist."
+
+ #: ../../WPrefs.app/MenuPreferences.c:229
+ msgid "Menu Preferences"
+-msgstr "Menü-Einstellungen"
++msgstr "Menüeinstellungen"
+
+ #: ../../WPrefs.app/MenuPreferences.c:231
+ msgid ""
+@@ -1307,15 +1311,15 @@
+
+ #: ../../WPrefs.app/MouseSettings.c:141
+ msgid "Invalid mouse acceleration value. Must be a positive real value."
+-msgstr "Ungültiger Wert für Mausbeschleunigung: Positiver Wert erwartet."
++msgstr "Ungültiger Wert für Mausy^: positive Kommazahl erwartet."
+
+ #: ../../WPrefs.app/MouseSettings.c:161
+ msgid ""
+ "Invalid mouse acceleration threshold value. Must be the number of pixels to "
+ "travel before accelerating."
+ msgstr ""
+-"Ungültiger Schwellwert für Mausbeschleunigung: Anzahl der zurückgelegten "
+-"Pixel erwartet"
++"Ungültiger Schwellenwert für Mausbeuschleunigung: Anzahl der zurückgelegten "
++"Pixel erwartet."
+
+ #: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274
+ #: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298
+@@ -1329,36 +1333,36 @@
+ "modifier key %s for option ModifierKey was not recognized. Using %s as "
+ "default"
+ msgstr ""
+-"Umschalttaste %s für die Option \"ModifierKey\" wurde nicht erkannt. Standard %s "
++"Tastenmodifikator %s für die Option ModifierKey wurde nicht erkannt. Standardwert %s "
+ "wird benutzt"
+
+ #: ../../WPrefs.app/MouseSettings.c:382
+ msgid "could not retrieve keyboard modifier mapping"
+-msgstr "Tastaturmodifikator-Belegung konnte nicht zurückverfolgt werden"
++msgstr "Tastenmodifikator-Zuordnung konnte nicht zurückverfolgt werden"
+
+ #: ../../WPrefs.app/MouseSettings.c:477
+ msgid "Mouse Speed"
+-msgstr " Mausgeschwindigkeit "
++msgstr "Mausgeschwindigkeit"
+
+ #: ../../WPrefs.app/MouseSettings.c:507
+ msgid "Acceler.:"
+-msgstr "Beschl."
++msgstr "Beschl.:"
+
+ #: ../../WPrefs.app/MouseSettings.c:520
+ msgid "Threshold:"
+-msgstr "Schwellwert"
++msgstr "Schwelle:"
+
+ #: ../../WPrefs.app/MouseSettings.c:535
+ msgid "Double-Click Delay"
+-msgstr " Doppelklickverzögerung "
++msgstr "Doppelklickverzögerung"
+
+ #: ../../WPrefs.app/MouseSettings.c:579
+ msgid "Test"
+-msgstr "Test"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:609
+ msgid "Workspace Mouse Actions"
+-msgstr " Arbeitsflächen-Mausklicks "
++msgstr "Arbeitsflächen-Mausaktionen"
+
+ #: ../../WPrefs.app/MouseSettings.c:614
+ msgid "Disable mouse actions"
+@@ -1366,15 +1370,15 @@
+
+ #: ../../WPrefs.app/MouseSettings.c:620
+ msgid "Left Button"
+-msgstr "Linke Taste"
++msgstr "Links"
+
+ #: ../../WPrefs.app/MouseSettings.c:630
+ msgid "Middle Button"
+-msgstr "Mittlere Taste"
++msgstr "Mitte"
+
+ #: ../../WPrefs.app/MouseSettings.c:640
+ msgid "Right Button"
+-msgstr "Rechte Taste"
++msgstr "Rechts"
+
+ #: ../../WPrefs.app/MouseSettings.c:650
+ msgid "Mouse Wheel"
+@@ -1382,7 +1386,7 @@
+
+ #: ../../WPrefs.app/MouseSettings.c:672
+ msgid "Mouse Grab Modifier"
+-msgstr " Taste zum Aufnehmen "
++msgstr "Taste zum Aufnehmen"
+
+ #: ../../WPrefs.app/MouseSettings.c:674
+ msgid ""
+@@ -1390,19 +1394,19 @@
+ "involve dragging windows with the mouse,\n"
+ "clicking inside the window."
+ msgstr ""
+-"Taste zum Verschieben eines Fensters,\n"
+-"wenn in dessen Client-Bereich geklickt\n"
+-"wurde."
++"Die Modifikatortaste, die den Verschiebe- oder\n"
++"Größenänderungsmodus aktiviert, wenn auf\n"
++"das Fenster geklickt wurde."
+
+ #: ../../WPrefs.app/MouseSettings.c:708
+ #, c-format
+ msgid "could not create %s"
+-msgstr "%s konnte nicht erzeugt werden"
++msgstr "%s konnte nicht erstellt werden"
+
+ #: ../../WPrefs.app/MouseSettings.c:724
+ #, c-format
+ msgid "could not create temporary file %s"
+-msgstr "temporäre Datei %s konnte nicht erzeugt werden"
++msgstr "temporäre Datei %s konnte nicht erstellt werden"
+
+ #: ../../WPrefs.app/MouseSettings.c:756
+ #, c-format
+@@ -1411,35 +1415,35 @@
+
+ #: ../../WPrefs.app/MouseSettings.c:829
+ msgid "Shift"
+-msgstr "Shift"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:830
+ msgid "Lock"
+-msgstr "Untbr"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:831
+ msgid "Control"
+-msgstr "Strg"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:832
+ msgid "Mod1"
+-msgstr "Mod1"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:833
+ msgid "Mod2"
+-msgstr "Mod2"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:834
+ msgid "Mod3"
+-msgstr "Mod3"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:835
+ msgid "Mod4"
+-msgstr "Mod4"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:836
+ msgid "Mod5"
+-msgstr "Mod5"
++msgstr ""
+
+ #: ../../WPrefs.app/MouseSettings.c:839
+ msgid "Applications Menu"
+@@ -1455,7 +1459,7 @@
+
+ #: ../../WPrefs.app/MouseSettings.c:849
+ msgid "Mouse Preferences"
+-msgstr "Maus-Einstellungen"
++msgstr "Mauseinstellungen"
+
+ #: ../../WPrefs.app/MouseSettings.c:851
+ msgid ""
+@@ -1463,36 +1467,40 @@
+ "mouse button bindings etc."
+ msgstr ""
+ "Mausgeschwindigkeit/-beschleunigung, Doppelklickverzögerung,\n"
+-"Maustastenbelegung usw."
++"Maustastenaktionen"
+
+ #: ../../WPrefs.app/Paths.c:85
+ msgid "bad value in option IconPath. Using default path list"
+-msgstr "ungültiger Wert in Eigenschaft \"IconPath\". Standard Pfadliste wird verwendet."
++msgstr "ungültiger Wert in Eigenschaft IconPath. Standardliste wird verwendet."
+
+ #: ../../WPrefs.app/Paths.c:102
+ msgid "bad value in option PixmapPath. Using default path list"
+-msgstr "ungültiger Wert in Eigenschaft \"PixmapPath\". Standard Pfadliste wird verwendet."
++msgstr "ungültiger Wert in Eigenschaft PixmapPath. Standardliste wird verwendet."
+
+ #: ../../WPrefs.app/Paths.c:150
+ msgid "Select directory"
+-msgstr "Verzeichnis wählen"
++msgstr "Verzeichnis auswählen"
+
+ #: ../../WPrefs.app/Paths.c:266
+ msgid "Icon Search Paths"
+-msgstr "Symbol-Verzeichnisse"
++msgstr "Symbol-Suchpfade"
+
+ #: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308
+ #: ../../WPrefs.app/TexturePanel.c:1312
+ msgid "Add"
+ msgstr "Hinzufügen"
+
++#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315
++msgid "Remove"
++msgstr "Entfernen"
++
+ #: ../../WPrefs.app/Paths.c:297
+ msgid "Pixmap Search Paths"
+-msgstr "Pixmap-Verzeichnisse"
++msgstr "Pixmap-Suchpfade"
+
+ #: ../../WPrefs.app/Paths.c:337
+ msgid "Search Path Configuration"
+-msgstr "Suchpfad-Einstellungen"
++msgstr "Suchpfadeinstellungen"
+
+ #: ../../WPrefs.app/Paths.c:339
+ msgid ""
+@@ -1501,10 +1509,12 @@
+ msgstr "Suchpfade für Pixmaps und Symbole"
+
+ #: ../../WPrefs.app/Preferences.c:75
++#, c-format
+ msgid "OFF"
+-msgstr "Aus"
++msgstr "AUS"
+
+ #: ../../WPrefs.app/Preferences.c:77
++#, c-format
+ msgid "1 pixel"
+ msgstr "1 Pixel"
+
+@@ -1529,8 +1539,8 @@
+ "The position or style of the window size\n"
+ "display that's shown when a window is resized."
+ msgstr ""
+-"Die Position oder Stil der Größenanzeige,\n"
+-"die beim Verändern eines Fensters erscheint."
++"Die Position und Art der Anzeige die bei der\n"
++"Größenänderung der Fensters benutzt wird."
+
+ #: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259
+ msgid "Corner of screen"
+@@ -1546,11 +1556,11 @@
+
+ #: ../../WPrefs.app/Preferences.c:241
+ msgid "Technical drawing-like"
+-msgstr "Wie technische Zeichnung"
++msgstr "wie technische Zeichnung"
+
+ #: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262
+ msgid "Disabled"
+-msgstr "Deaktiviert"
++msgstr "Keine"
+
+ #: ../../WPrefs.app/Preferences.c:250
+ msgid "Position Display"
+@@ -1561,8 +1571,8 @@
+ "The position or style of the window position\n"
+ "display that's shown when a window is moved."
+ msgstr ""
+-"Ausrichtung oder Stil der Positionsanzeige, die\n"
+-"beim Verschieben eines Fensters sichtbar ist."
++"Die Position und Art der Anzeige\n"
++"beim Verschieben eines Fensters"
+
+ #: ../../WPrefs.app/Preferences.c:270
+ msgid "Show balloon text for..."
+@@ -1578,7 +1588,7 @@
+
+ #: ../../WPrefs.app/Preferences.c:279
+ msgid "application/dock icons"
+-msgstr "Anwendungs-/ Docksymbole"
++msgstr "Anwendungs-/Docksymbole"
+
+ #: ../../WPrefs.app/Preferences.c:280
+ msgid "internal help"
+@@ -1589,8 +1599,8 @@
+ "Raise window when switching\n"
+ "focus with keyboard."
+ msgstr ""
+-"Fenster nach vorne bei Fokus-\n"
+-"wechsel mit Tastatur."
++"Aktives Fenster nach Tastatur-\n"
++"Fokuswechsel oben."
+
+ #: ../../WPrefs.app/Preferences.c:298
+ msgid ""
+@@ -1614,7 +1624,7 @@
+
+ #: ../../WPrefs.app/Preferences.c:349
+ msgid "Miscellaneous Ergonomic Preferences"
+-msgstr "Diverse Ergonomie-Einstellungen"
++msgstr "Verschiedene Einstellungen zur Ergonomie"
+
+ #: ../../WPrefs.app/Preferences.c:350
+ msgid ""
+@@ -1656,15 +1666,15 @@
+ #: ../../WPrefs.app/TexturePanel.c:1066
+ #, c-format
+ msgid "error creating texture %s"
+-msgstr "Fehler beim Erzeugen der Textur %s"
++msgstr "Fehler beim Erstellen der Textur %s"
+
+ #: ../../WPrefs.app/TexturePanel.c:1256
+ msgid "Texture Panel"
+-msgstr "Textur bearbeiten"
++msgstr "Texturanzeige"
+
+ #: ../../WPrefs.app/TexturePanel.c:1264
+ msgid "Texture Name"
+-msgstr "Textur-Name"
++msgstr "Texturname"
+
+ #: ../../WPrefs.app/TexturePanel.c:1276
+ msgid "Solid Color"
+@@ -1684,27 +1694,27 @@
+
+ #: ../../WPrefs.app/TexturePanel.c:1280
+ msgid "Image Texture"
+-msgstr "Grafik-Textur"
++msgstr "Bildtextur"
+
+ #: ../../WPrefs.app/TexturePanel.c:1288
+ msgid "Default Color"
+-msgstr " Standardfarbe "
++msgstr "Standardfarbe"
+
+ #: ../../WPrefs.app/TexturePanel.c:1300
+ msgid "Gradient Colors"
+-msgstr " Verlaufsfarben "
++msgstr "Verlaufsfarben"
+
+ #: ../../WPrefs.app/TexturePanel.c:1396
+ msgid "Direction"
+-msgstr " Richtung "
++msgstr "Richtung"
+
+ #: ../../WPrefs.app/TexturePanel.c:1424
+ msgid "Gradient"
+-msgstr " Verlauf "
++msgstr "Farbverlauf"
+
+ #: ../../WPrefs.app/TexturePanel.c:1442
+ msgid "Gradient Opacity"
+-msgstr "Transparenz"
++msgstr "Farbverlaufsdeckung"
+
+ #: ../../WPrefs.app/TexturePanel.c:1484
+ msgid "Image"
+@@ -1720,7 +1730,7 @@
+
+ #: ../../WPrefs.app/TexturePanel.c:1519
+ msgid "Maximize"
+-msgstr "Maximiert"
++msgstr "Maximieren"
+
+ #: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
+ msgid "Set"
+@@ -1728,12 +1738,12 @@
+
+ #: ../../WPrefs.app/Themes.c:132
+ msgid "Stop"
+-msgstr "Stop"
++msgstr ""
+
+ #: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203
+ #: ../../WPrefs.app/Themes.c:223
+ msgid "Download"
+-msgstr "Herunterladen"
++msgstr ""
+
+ #: ../../WPrefs.app/Themes.c:171
+ msgid "Save Current Theme"
+@@ -1749,119 +1759,96 @@
+
+ #: ../../WPrefs.app/Themes.c:193
+ msgid "Tile of The Day"
+-msgstr "Tageskachel"
++msgstr "Kachel des Tages"
+
+ #: ../../WPrefs.app/Themes.c:213
+ msgid "Bar of The Day"
+-msgstr "Tagesleiste"
++msgstr "Leiste des Tages"
+
+-#: ../../WPrefs.app/WPrefs.c:260
++#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331
+ msgid "Window Maker Preferences"
+-msgstr "Window Maker-Einstellungen"
++msgstr "Window Maker Einstellungen"
+
+-#: ../../WPrefs.app/WPrefs.c:284
++#: ../../WPrefs.app/WPrefs.c:283
+ msgid "Revert Page"
+ msgstr "Seite zurücknehmen"
+
+-#: ../../WPrefs.app/WPrefs.c:290
++#: ../../WPrefs.app/WPrefs.c:289
+ msgid "Revert All"
+-msgstr "Alle zurücknehmen"
++msgstr "Alles zurücknehmen"
+
+-#: ../../WPrefs.app/WPrefs.c:296
++#: ../../WPrefs.app/WPrefs.c:295
+ msgid "Save"
+ msgstr "Speichern"
+
+-#: ../../WPrefs.app/WPrefs.c:309
++#: ../../WPrefs.app/WPrefs.c:308
+ msgid "Balloon Help"
+ msgstr "Ballon-Hilfe"
+
+-#: ../../WPrefs.app/WPrefs.c:334
+-msgid "Window Maker Preferences Utility"
+-msgstr "Window Maker Einstellungen"
+-
+-#: ../../WPrefs.app/WPrefs.c:341
++#: ../../WPrefs.app/WPrefs.c:338
+ #, c-format
+-msgid "Version %s for Window Maker %s or newer"
+-msgstr "Version %s für Window Maker %s oder neuer"
++msgid "Version %s"
++msgstr ""
+
+-#: ../../WPrefs.app/WPrefs.c:349
++#: ../../WPrefs.app/WPrefs.c:345
+ msgid "Starting..."
+ msgstr "Starte..."
+
+-#: ../../WPrefs.app/WPrefs.c:355
+-msgid ""
+-"Programming/Design: Alfredo K. Kojima\n"
+-"Artwork: Marco van Hylckama Vlieg, Largo et al\n"
+-"More Programming: James Thompson et al"
+-msgstr ""
+-"Programmierung/Design: Alfredo K. Kojima\n"
+-"Künstlerische Gestaltung: Marco van Hylckama Vlieg, Largo et al\n"
+-"Weitere Programmierung: James Thompson et al"
+-
+-#: ../../WPrefs.app/WPrefs.c:455
++#: ../../WPrefs.app/WPrefs.c:443
+ #, c-format
+ msgid "could not locate image file %s\n"
+ msgstr "Bilddatei %s konnte nicht gefunden werden\n"
+
+-#: ../../WPrefs.app/WPrefs.c:670
++#: ../../WPrefs.app/WPrefs.c:656
+ #, c-format
+ msgid "could not load image file %s:%s"
+ msgstr "Bilddatei %s konnte nicht geladen werden: %s"
+
+-#: ../../WPrefs.app/WPrefs.c:689
++#: ../../WPrefs.app/WPrefs.c:674
+ msgid "Loading Window Maker configuration files..."
+ msgstr "Window Maker-Konfigurationsdateien werden geladen..."
+
+-#: ../../WPrefs.app/WPrefs.c:693
++#: ../../WPrefs.app/WPrefs.c:678
+ msgid "Initializing configuration panels..."
+-msgstr "Einstellungsdialoge werden vorbereitet..."
+-
+-#: ../../WPrefs.app/WPrefs.c:728
+-msgid ""
+-"WPrefs is free software and is distributed WITHOUT ANY\n"
+-"WARRANTY under the terms of the GNU General Public License."
+-msgstr ""
+-"WPrefs ist freie Software und wird OHNE JEDE GEWÄHRLEISTUNG\n"
+-"unter den Bedingungen der GNU General Public License vertrieben."
++msgstr "Einstellungsseiten werden vorbereitet..."
+
+-#: ../../WPrefs.app/WPrefs.c:758 ../../WPrefs.app/WPrefs.c:838
++#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819
+ #, c-format
+ msgid "Window Maker domain (%s) is corrupted!"
+ msgstr "Window Maker-Domäne (%s) ist fehlerhaft!"
+
+-#: ../../WPrefs.app/WPrefs.c:762
++#: ../../WPrefs.app/WPrefs.c:743
+ #, c-format
+ msgid "Could not load Window Maker domain (%s) from defaults database."
+ msgstr "Window Maker-Domäne (%s) konnte nicht aus Standarddatenbank geladen werden."
+
+-#: ../../WPrefs.app/WPrefs.c:778
++#: ../../WPrefs.app/WPrefs.c:759
+ msgid "could not extract version information from Window Maker"
+ msgstr "Window Maker-Versionsinformationen konnten nicht festgestellt werden"
+
+-#: ../../WPrefs.app/WPrefs.c:779
++#: ../../WPrefs.app/WPrefs.c:760
+ msgid "Make sure wmaker is in your search path."
+-msgstr "Stellen Sie sicher, das \"wmaker\" im Suchfpad enthalten ist."
++msgstr "Stellen Sie sicher, das \"wmaker\" in Ihrem Suchpfad enhalten ist."
+
+-#: ../../WPrefs.app/WPrefs.c:782
++#: ../../WPrefs.app/WPrefs.c:763
+ msgid ""
+ "Could not extract version from Window Maker. Make sure it is correctly "
+ "installed and is in your PATH environment variable."
+ msgstr ""
+ "Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
+-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
+-"Variable enthalten ist."
++"Stellen Sie sicher, dass Window Maker korrekt installiert und in der PATH-"
++"Umgebungsvariable enthalten ist."
+
+-#: ../../WPrefs.app/WPrefs.c:792
++#: ../../WPrefs.app/WPrefs.c:773
+ msgid ""
+ "Could not extract version from Window Maker. Make sure it is correctly "
+ "installed and the path where it installed is in the PATH environment "
+ "variable."
+ msgstr ""
+ "Window Maker-Versionsinformationen konnten nicht festgestellt werden. "
+-"Stellen Sie sicher, das Window Maker korrekt installiert ist und in der PATH-"
+-"Variable enthalten ist."
++"Stellen Sie sicher, dass Window Maker korrekt installiert und der Installationspfad in der PATH-Umgebungsvariable enthalten ist."
+
+-#: ../../WPrefs.app/WPrefs.c:799
++#: ../../WPrefs.app/WPrefs.c:780
+ #, c-format
+ msgid ""
+ "WPrefs only supports Window Maker 0.18.0 or newer.\n"
+@@ -1870,44 +1857,42 @@
+ "WPrefs unterstützt nur Window Maker 0.18.0 oder neuer.\n"
+ "Die installierte Version ist %i.%i.%i\n"
+
+-#: ../../WPrefs.app/WPrefs.c:806
++#: ../../WPrefs.app/WPrefs.c:787
+ #, c-format
+ msgid ""
+ "Window Maker %i.%i.%i, which is installed in your system, is not fully "
+ "supported by this version of WPrefs."
+ msgstr ""
+ "Der auf Ihrem System installierte Window Maker %i.%i.%i wird von dieser "
+-"WPrefs-Version nicht voll unterstützt."
++"WPrefs-Version nicht komplett unterstützt."
+
+-#: ../../WPrefs.app/WPrefs.c:819
++#: ../../WPrefs.app/WPrefs.c:800
+ #, c-format
+ msgid "could not run \"%s --global_defaults_path\"."
+ msgstr "\"%s --global_defaults_path\" konnte nicht ausgeführt werden."
+
+-#: ../../WPrefs.app/WPrefs.c:842
++#: ../../WPrefs.app/WPrefs.c:823
+ #, c-format
+ msgid "Could not load global Window Maker domain (%s)."
+ msgstr "Globale Window Maker-Domäne (%s) konnte nicht geladen werden."
+
+-#: ../../WPrefs.app/WPrefs.c:1091
++#: ../../WPrefs.app/WPrefs.c:1072
+ #, c-format
+ msgid ""
+ "bad speed value for option %s\n"
+ ". Using default Medium"
+ msgstr ""
+ "Falscher Geschwindigkeitswert für Eigenschaft %s.\n"
+-"Standard \"Mittel\" wird benutzt."
++"Standardwert 'Mittel' wird benutzt."
+
+ #: ../../WPrefs.app/WindowHandling.c:141
+ #, c-format
+ msgid "bad option value %s in WindowPlacement. Using default value"
+-msgstr "Ungültiger Wert %s für \"WindowPlacement\". Standardwert wird benutzt."
++msgstr "Ungültiger Wert %s in Fensterplatzierung. Standardwert wird benutzt."
+
+ #: ../../WPrefs.app/WindowHandling.c:163
+ msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
+-msgstr ""
+-"Ungültige Daten in Option \"WindowPlaceOrigin\". Benutze Standardeinstellung "
+-"(0,0)"
++msgstr "Ungültige Daten in Option WindowPlaceOrigin. Standardwert (0,0) wird benutzt."
+
+ #: ../../WPrefs.app/WindowHandling.c:243
+ msgid "Window Placement"
+@@ -1917,7 +1902,7 @@
+ msgid ""
+ "How to place windows when they are first put\n"
+ "on screen."
+-msgstr "Wie Fenster beim ersten Anzeigen platziert werden sollen."
++msgstr "Wahl der Fensterplatzierung beim ersten Anzeigen."
+
+ #: ../../WPrefs.app/WindowHandling.c:250
+ msgid "Automatic"
+@@ -1937,15 +1922,15 @@
+
+ #: ../../WPrefs.app/WindowHandling.c:254
+ msgid "Smart"
+-msgstr "Passend"
++msgstr "Schlau"
+
+ #: ../../WPrefs.app/WindowHandling.c:260
+ msgid "Placement Origin"
+-msgstr "Platzierungsursprung"
++msgstr "Startplatzierung"
+
+ #: ../../WPrefs.app/WindowHandling.c:321
+ msgid "Opaque Move"
+-msgstr "Mit Inhalt versch."
++msgstr "Verschiebeart"
+
+ #: ../../WPrefs.app/WindowHandling.c:322
+ msgid ""
+@@ -1953,13 +1938,13 @@
+ "when dragging windows aroung or if only a\n"
+ "frame should be displayed.\n"
+ msgstr ""
+-"Legt fest, ob beim Verschieben die Fensterinhalte\n"
++"Legt fest, ob beim Verschieben der Fensterinhalt\n"
+ "oder nur ein Rechteck in Fenstergröße angezeigt \n"
+ "werden soll.\n"
+
+ #: ../../WPrefs.app/WindowHandling.c:361
+ msgid "When maximizing..."
+-msgstr " Beim Maximieren... "
++msgstr "Beim Maximieren..."
+
+ #: ../../WPrefs.app/WindowHandling.c:366
+ msgid "...do not cover icons"
+@@ -1971,7 +1956,7 @@
+
+ #: ../../WPrefs.app/WindowHandling.c:381
+ msgid "Edge Resistance"
+-msgstr " Kantenwiderstand "
++msgstr "Kantenwiderstand"
+
+ #: ../../WPrefs.app/WindowHandling.c:383
+ msgid ""
+@@ -1980,10 +1965,10 @@
+ "when moved against other windows or the edges\n"
+ "of the screen."
+ msgstr ""
+-"Kantenwiderstand bewirkt, dass Fenster bis\n"
+-"zur eingestellten Schwelle weiterer Bewegung\n"
+-"widerstehen, wenn sie auf anderen Fenster oder\n"
+-"die Bildschirmkante treffen."
++"Der Kantenwiderstand bewirkt, dass Fenster\n"
++"bis zur eingestellten Schwelle weiterer Bewegung\n"
++"widerstehen, wenn sie auf andere Fenster oder die\n"
++"Bildschirmkante treffen."
+
+ #: ../../WPrefs.app/WindowHandling.c:402
+ msgid "Resist"
+@@ -1993,57 +1978,55 @@
+ msgid "Attract"
+ msgstr "Zug"
+
+-#: ../../WPrefs.app/WindowHandling.c:423
++#: ../../WPrefs.app/WindowHandling.c:421
+ msgid ""
+-"Open dialogs in same workspace\n"
++"Open dialogs in the same workspace\n"
+ "as their owners"
+ msgstr ""
+-"Dialogfenster auf Arbeitsfläche des\n"
++"Dialoge auf Arbeitsfläche des\n"
+ "Eigentümers öffnen"
+
+-#: ../../WPrefs.app/WindowHandling.c:450
++#: ../../WPrefs.app/WindowHandling.c:448
+ msgid "Window Handling Preferences"
+-msgstr "Fensterhandhabungs-Einstellungen"
++msgstr "Einstellungen zum Fensterverhalten"
+
+-#: ../../WPrefs.app/WindowHandling.c:452
++#: ../../WPrefs.app/WindowHandling.c:450
+ msgid ""
+ "Window handling options. Initial placement style\n"
+ "edge resistance, opaque move etc."
+ msgstr ""
+-"Einstellungen zur Fensterhandhabung: Anfangsplatzierung,\n"
+-"Kantenwiderstand, mit Inhalt verschieben usw."
++"Einstellungen zum Fensterverhalten: Anfangsplatzierung,\n"
++"Kantenwiderstand, Verschiebeart usw."
+
+ #: ../../WPrefs.app/Workspace.c:176
+ msgid "Workspace Navigation"
+-msgstr " Arbeitsflächennavigation "
++msgstr "Arbeitsflächennavigation"
+
+ #: ../../WPrefs.app/Workspace.c:183
+-msgid ""
+-"wrap to the first workspace after the\n"
+-"last workspace."
++msgid "Wrap to the first workspace from the last workspace."
+ msgstr ""
+-"Auf letzte Arbeitsfläche folgt wieder\n"
+-"die erste"
++"Auf die letzte Arbeitsfläche folgt wieder\n"
++"die erste."
+
+ #: ../../WPrefs.app/Workspace.c:205
+-msgid "switch workspaces while dragging windows."
+-msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln"
++msgid "Switch workspaces while dragging windows."
++msgstr "Beim Bewegen von Fenstern Arbeitsfläche wechseln."
+
+ #: ../../WPrefs.app/Workspace.c:227
+-msgid "automatically create new workspaces."
+-msgstr "Automatisch neue Arbeitsflächen erzeugen"
++msgid "Automatically create new workspaces."
++msgstr "Automatisch neue Arbeitsflächen erstellen."
+
+ #: ../../WPrefs.app/Workspace.c:250
+ msgid ""
+ "Position of workspace\n"
+ "name display"
+ msgstr ""
+-"Position des\n"
+-"Arbeitsflächennamens"
++"Position des Namens\n"
++"der Arbeitsfläche"
+
+ #: ../../WPrefs.app/Workspace.c:269
+ msgid "Disable"
+-msgstr "Deaktiviert"
++msgstr "Keiner"
+
+ #: ../../WPrefs.app/Workspace.c:271
+ msgid "Top"
+@@ -2071,35 +2054,35 @@
+
+ #: ../../WPrefs.app/Workspace.c:284
+ msgid "Dock/Clip"
+-msgstr " Dock/Clip "
++msgstr "Dock/Clip"
+
+ #: ../../WPrefs.app/Workspace.c:303
+ msgid ""
+ "Disable/enable the application Dock (the\n"
+ "vertical icon bar in the side of the screen)."
+ msgstr ""
+-"Anwendungsdock ein-/ausschalten (die vertikale\n"
+-"Symbolleiste am Rande des Bildschirmes)."
++"Anwendungsdock ein-/ausschalten (die\n"
++"vertikale Symbolleiste am Rande des Bildschirmes)."
+
+ #: ../../WPrefs.app/Workspace.c:324
+ msgid ""
+ "Disable/enable the Clip (that thing with\n"
+ "a paper clip icon)."
+ msgstr ""
+-"Clip ein-/ausschalten (das Ding mit\n"
+-"dem Büroklammersymbol)."
++"Clip ein-/ausschalten (das Ding mit der\n"
++"Büroklammer)."
+
+ #: ../../WPrefs.app/Workspace.c:364
+ msgid "Workspace Preferences"
+-msgstr "Arbeitsflächen-Einstellungen"
++msgstr "Arbeitsflächeneinstellungen"
+
+ #: ../../WPrefs.app/Workspace.c:366
+ msgid ""
+ "Workspace navigation features.\n"
+ "You can also enable/disable the Dock and Clip here."
+ msgstr ""
+-"Einstellungen zur Arbeitsflächennavigation. Auch Dock\n"
+-"und Clip können hier ein-/ausgeschaltet werden."
++"Einstellungen zur Arbeitsflächennavigation.\n"
++"Auch Dock und Clip können hier ein-/ausgeschaltet werden."
+
+ #: ../../WPrefs.app/imagebrowser.c:95
+ msgid "View"
+@@ -2131,20 +2114,20 @@
+ msgid "too few arguments for %s"
+ msgstr "zu wenig Argumente für %s"
+
+-#: ../../WPrefs.app/main.c:144
++#: ../../WPrefs.app/main.c:145
+ msgid "X server does not support locale"
+-msgstr "X-Server unterstützt keine Lokalisierung"
++msgstr "X-Server unterstützt keine Lokalisierungen"
+
+-#: ../../WPrefs.app/main.c:147
++#: ../../WPrefs.app/main.c:148
+ msgid "cannot set locale modifiers"
+ msgstr "Lokalisierung kann nicht gesetzt werden"
+
+-#: ../../WPrefs.app/main.c:153
++#: ../../WPrefs.app/main.c:154
+ #, c-format
+ msgid "could not open display %s"
+-msgstr "Display %s konnte nicht geöffnet werden"
++msgstr "Display %s kann nicht geöffnet werden"
+
+-#: ../../WPrefs.app/main.c:161
++#: ../../WPrefs.app/main.c:162
+ msgid "could not initialize application"
+ msgstr "Anwendung konnte nicht initialisiert werden"
+
+diff -Nur WindowMaker-0.92.0.orig/wrlib/convert.c WindowMaker-0.92.0/wrlib/convert.c
+--- WindowMaker-0.92.0.orig/wrlib/convert.c 2004-10-12 20:20:30.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/convert.c 2005-08-23 00:30:35.000000000 +0200
+@@ -68,8 +68,9 @@
+ extern void x86_mmx_TrueColor_32_to_16(unsigned char *image,
+ unsigned short *ximage,
+ short *err, short *nerr,
+- short *rtable, short *gtable,
+- short *btable,
++ const unsigned short *rtable,
++ const unsigned short *gtable,
++ const unsigned short *btable,
+ int dr, int dg, int db,
+ unsigned int roffs,
+ unsigned int goffs,
+@@ -175,9 +176,9 @@
+ static void
+ convertTrueColor_generic(RXImage *ximg, RImage *image,
+ signed char *err, signed char *nerr,
+- const short *rtable,
+- const short *gtable,
+- const short *btable,
++ const unsigned short *rtable,
++ const unsigned short *gtable,
++ const unsigned short *btable,
+ const int dr, const int dg, const int db,
+ const unsigned short roffs,
+ const unsigned short goffs,
+@@ -408,8 +409,8 @@
+ } else
+ #endif /* ASM_X86_MMX */
+ {
+- char *err;
+- char *nerr;
++ signed char *err;
++ signed char *nerr;
+ int ch = (HAS_ALPHA(image) ? 4 : 3);
+
+ err = malloc(ch*(image->width+2));
+@@ -447,9 +448,9 @@
+ static void
+ convertPseudoColor_to_8(RXImage *ximg, RImage *image,
+ signed char *err, signed char *nerr,
+- const short *rtable,
+- const short *gtable,
+- const short *btable,
++ const unsigned short *rtable,
++ const unsigned short *gtable,
++ const unsigned short *btable,
+ const int dr, const int dg, const int db,
+ unsigned long *pixels,
+ int cpc)
+@@ -459,7 +460,7 @@
+ int pixel;
+ int rer, ger, ber;
+ unsigned char *ptr = image->data;
+- unsigned char *optr = ximg->image->data;
++ unsigned char *optr = (unsigned char*)ximg->image->data;
+ int channels = (HAS_ALPHA(image) ? 4 : 3);
+ int cpcpc = cpc*cpc;
+
+@@ -573,8 +574,8 @@
+ }
+ } else {
+ /* dither */
+- char *err;
+- char *nerr;
++ signed char *err;
++ signed char *nerr;
+ const int dr=0xff/rmask;
+ const int dg=0xff/gmask;
+ const int db=0xff/bmask;
+diff -Nur WindowMaker-0.92.0.orig/wrlib/gradient.c WindowMaker-0.92.0/wrlib/gradient.c
+--- WindowMaker-0.92.0.orig/wrlib/gradient.c 2004-10-12 20:21:11.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/gradient.c 2005-08-23 00:04:37.000000000 +0200
+@@ -242,7 +242,7 @@
+ RImage *image, *tmp;
+ int j;
+ float a, offset;
+- char *ptr;
++ unsigned char *ptr;
+
+ if (width == 1)
+ return renderVGradient(width, height, r0, g0, b0, rf, gf, bf);
+diff -Nur WindowMaker-0.92.0.orig/wrlib/ppm.c WindowMaker-0.92.0/wrlib/ppm.c
+--- WindowMaker-0.92.0.orig/wrlib/ppm.c 2004-10-12 20:22:13.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/ppm.c 2005-08-23 00:09:41.000000000 +0200
+@@ -43,8 +43,9 @@
+
+ } else {
+ if (max<256) {
++ unsigned char *ptr;
++ char *buf;
+ int x, y;
+- char *buf, *ptr;
+
+ buf = malloc(w+1);
+ if (!buf) {
+@@ -83,7 +84,7 @@
+ RImage *image;
+ int i;
+ char buf[3];
+- char *ptr;
++ unsigned char *ptr;
+
+ image = RCreateImage(w, h, 0);
+ if (!image) {
+diff -Nur WindowMaker-0.92.0.orig/wrlib/raster.c WindowMaker-0.92.0/wrlib/raster.c
+--- WindowMaker-0.92.0.orig/wrlib/raster.c 2004-10-25 03:48:39.000000000 +0200
++++ WindowMaker-0.92.0/wrlib/raster.c 2005-08-23 00:35:27.000000000 +0200
+@@ -283,31 +283,37 @@
+
+ int
+ calculateCombineArea(RImage *des, RImage *src, int *sx, int *sy,
+- int *swidth, int *sheight, int *dx, int *dy)
++ unsigned int *swidth, unsigned int *sheight, int *dx, int *dy)
+ {
++ int width = (int)*swidth, height = (int)*sheight;
++
+ if (*dx < 0) {
+ *sx = -*dx;
+- *swidth = *swidth + *dx;
++ width = width + *dx;
+ *dx = 0;
+ }
+
+- if (*dx + *swidth > des->width) {
+- *swidth = des->width - *dx;
++ if (*dx + width > des->width) {
++ width = des->width - *dx;
+ }
+
+ if (*dy < 0) {
+ *sy = -*dy;
+- *sheight = *sheight + *dy;
++ height = height + *dy;
+ *dy = 0;
+ }
+
+- if (*dy + *sheight > des->height) {
+- *sheight = des->height - *dy;
++ if (*dy + height > des->height) {
++ height = des->height - *dy;
+ }
+
+- if (*sheight > 0 && *swidth > 0) {
++ if (height>0 && width>0) {
++ *swidth = width;
++ *sheight = height;
+ return True;
+- } else return False;
++ }
++
++ return False;
+ }
+
+ void
+diff -Nur WindowMaker-0.92.0.orig/wrlib/tests/Makefile.am WindowMaker-0.92.0/wrlib/tests/Makefile.am
+--- WindowMaker-0.92.0.orig/wrlib/tests/Makefile.am 2005-03-02 11:09:45.000000000 +0100
++++ WindowMaker-0.92.0/wrlib/tests/Makefile.am 2006-01-22 16:47:25.000000000 +0100
+@@ -6,7 +6,7 @@
+
+ EXTRA_DIST = test.png tile.xpm ballot_box.xpm
+
+-INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@
++INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@
+
+ LIBLIST = $(top_builddir)/wrlib/libwraster.la
+
+diff -Nur WindowMaker-0.92.0.orig/wrlib/x86_specific.c WindowMaker-0.92.0/wrlib/x86_specific.c
+--- WindowMaker-0.92.0.orig/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100
++++ WindowMaker-0.92.0/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200
+@@ -85,9 +85,9 @@
+ unsigned short *ximage,
+ short *err,
+ short *nerr,
+- short *rtable,
+- short *gtable,
+- short *btable,
++ unsigned short *rtable,
++ unsigned short *gtable,
++ unsigned short *btable,
+ int dr,
+ int dg,
+ int db,
+@@ -98,15 +98,27 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {
++ short int rr, gg, bb, aa;
++ } words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {
++ short int rr, gg, bb, aa;
++ } words;
++ } pixel;
++
+ short *tmp_err;
+ short *tmp_nerr;
+ int x;
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ // pack dr, dg and db into mm6
+ "movl %7, %%eax \n\t"
+@@ -219,7 +231,7 @@
+ "movq %%mm0, %%mm1 \n\t"
+ "pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7
+ "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
+- "paddw 8(%%ebx), %%mm1 \n\t"
++ "paddw 8(%%ebx), %%mm1 \n\t"
+ "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16
+
+
+@@ -228,7 +240,7 @@
+ "movq %%mm0, %%mm1 \n\t"
+ "pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5
+ "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16
+- "paddw -8(%%ebx), %%mm1 \n\t"
++ "paddw -8(%%ebx), %%mm1 \n\t"
+ "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16
+
+ "movq %%mm0, %%mm1 \n\t"
+@@ -274,7 +286,7 @@
+ // because, punpcklbw is used (which reads 8 bytes) and the last
+ // pixel is only 4 bytes. This is no problem because the image data
+ // was allocated with extra 4 bytes when created.
+- "addl $4, %%esi \n\t" // image->data += 4
++ "addl $4, %%esi \n\t" // image->data += 4
+
+
+ "decl %26 \n\t" // x--
+@@ -290,7 +302,7 @@
+
+ ".Enda: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -309,17 +321,18 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.words.rr), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.words.rr), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x) // %26
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
+@@ -342,8 +355,19 @@
+ int height,
+ int line_offset)
+ {
+- long long rrggbbaa;
+- long long pixel;
++ union {
++ long long rrggbbaa;
++ struct {
++ short int rr, gg, bb, aa;
++ } words;
++ } rrggbbaa;
++
++ union {
++ long long pixel;
++ struct {
++ short int rr, gg, bb, aa;
++ } words;
++ } pixel;
+
+ short *tmp_err;
+ short *tmp_nerr;
+@@ -354,7 +378,7 @@
+
+ asm volatile
+ (
+- "pushal \n\t"
++ "pushl %%ebx \n\t"
+
+ "movl %13, %%eax \n\t" // eax = width
+ "movl %%eax, %%ebx \n\t"
+@@ -424,7 +448,7 @@
+
+ ".Endc: \n\t" // THE END
+ "emms \n\t"
+- "popal \n\t"
++ "popl %%ebx \n\t"
+ :
+ :
+ "m" (image), // %0
+@@ -443,19 +467,20 @@
+ "m" (width), // %13
+ "m" (height), // %14
+ "m" (line_offset), // %15
+- "m" (rrggbbaa), // %16 (access to rr)
+- "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg)
+- "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb)
+- "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa)
+- "m" (pixel), // %20 (access to pixel.r)
+- "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g)
+- "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b)
+- "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a)
++ "m" (rrggbbaa.words.rr), // %16 (access to rr)
++ "m" (rrggbbaa.words.gg), // %17 (access to gg)
++ "m" (rrggbbaa.words.bb), // %18 (access to bb)
++ "m" (rrggbbaa.words.aa), // %19 (access to aa)
++ "m" (pixel.words.rr), // %20 (access to pixel.r)
++ "m" (pixel.words.gg), // %21 (access to pixel.g)
++ "m" (pixel.words.bb), // %22 (access to pixel.b)
++ "m" (pixel.words.aa), // %23 (access to pixel.a)
+ "m" (tmp_err), // %24
+ "m" (tmp_nerr), // %25
+ "m" (x), // %26
+ "m" (w1), // %27
+ "m" (w2) // %28
++ : "eax", "ecx", "edx", "esi", "edi"
+ );
+ }
+
+@@ -653,7 +678,7 @@
+ "movw $0xff, %%dx \n\t" // pixel.blu > 255
+ "jmp .OKBb \n"
+ ".NEGBb: \n\t"
+- "xorw %%dx, %%dx \n"
++ "xorw %%dx, %%dx \n"
+ ".OKBb: \n\t"
+ //partial reg
+ "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu]
projects / packages / WindowMaker.git / commitdiff