updated po files, fixed some bugs

2025-12-20 21:08:08 +01:00 · 1999-09-16 03:01:14 +00:00
parent 3c04618278
commit ac4053478a
47 changed files with 9008 additions and 4166 deletions
--- a/WPrefs.app/Makefile.in
+++ b/WPrefs.app/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -148,7 +145,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(WPrefs_SOURCES)
 OBJECTS = $(WPrefs_OBJECTS)
--- a/WPrefs.app/MouseSettings.c
+++ b/WPrefs.app/MouseSettings.c
@@ -66,14 +66,10 @@ typedef struct _Panel {
    WMLabel *listL;
    WMLabel *appL;
    WMLabel *selL;
-    WMLabel *mblL;
-    WMLabel *mbmL;
-    WMLabel *mbrL;
-    WMButton *lmb[3];
-    WMButton *amb[3];
-    WMButton *smb[3];
+    WMPopUpButton *listP;
+    WMPopUpButton *appP;
+    WMPopUpButton *selP;

-    
    WMButton *disaB;

    WMFrame *grabF;
@@ -92,9 +88,6 @@ typedef struct _Panel {
 #define DELAY_ICON "timer%i"
 #define DELAY_ICON_S "timer%is"

-#define MOUSEB_L "minimouseleft"
-#define MOUSEB_M "minimousemiddle"
-#define MOUSEB_R "minimouseright"

 /* need access to the double click variables */
 #include "WINGsP.h"
@@ -113,6 +106,16 @@ static char *modifierNames[] = {
 };


+static char *buttonNames[] = {
+    "None",
+	"Btn1 (left)",
+	"Btn2 (middle)",
+	"Btn3 (right)",
+	"Btn4",
+	"Btn5"
+};
+
+
 #define DELAY(i)		((i)*75+170)


@@ -213,21 +216,21 @@ getbutton(char *str)
 	return -2;

    if (strcasecmp(str, "left")==0)
-	return 0;
+	return 1;
    else if (strcasecmp(str, "middle")==0)
-	return 1;
+	return 2;
    else if (strcasecmp(str, "right")==0)
-	return 2;
+	return 3;
    else if (strcasecmp(str, "button1")==0)
-	return 0;
-    else if (strcasecmp(str, "button2")==0)
 	return 1;
-    else if (strcasecmp(str, "button3")==0)
+    else if (strcasecmp(str, "button2")==0)
 	return 2;
-    else if (strcasecmp(str, "button4")==0
-	     || strcasecmp(str, "button5")==0) {
-	wwarning(_("mouse button %s not supported by WPrefs."), str);
-	return -2;
+    else if (strcasecmp(str, "button3")==0)
+	return 3;
+    else if (strcasecmp(str, "button4")==0)
+	return 4;
+    else if (strcasecmp(str, "button5")==0) {
+	return 5;
    } else {
 	return -1;
    }
@@ -257,45 +260,47 @@ showData(_Panel *panel)
    Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));

    str = GetStringForKey("SelectWindowsMouseButton");
-    if (!str)
-	str = "left";
-    i = getbutton(str);
-    if (i==-1) {
+    if (str) {
+	i = getbutton(str);
+	if (i==-1) {
+	    a = 1;
+	    wwarning(_("bad value %s for option %s"),str, "SelectWindowsMouseButton");
+	} else if (i>=0) {
+	    a = i;
+	} 
+    } else {
 	a = 0;
-	wwarning(_("bad value %s for option %s"),str, "SelectWindowsMouseButton");
-	WMPerformButtonClick(panel->smb[0]);
-    } else if (i>=0) {
-	a = i;
-	WMPerformButtonClick(panel->smb[i]);
-    } 
+    }
+    WMSetPopUpButtonSelectedItem(panel->selP, a);
    
    str = GetStringForKey("WindowListMouseButton");
-    if (!str)
-	str = "middle";
-    i = getbutton(str);
-    if (i==-1) {
+    if (str) {
+	i = getbutton(str);
+	if (i==-1) {
+	    b = 2;
+	    wwarning(_("bad value %s for option %s"), str, "WindowListMouseButton");
+	} else if (i>=0) {
+	    b = i;
+	} 
+    } else {
 	b = 0;
-	wwarning(_("bad value %s for option %s"), str, "WindowListMouseButton");
-	WMPerformButtonClick(panel->lmb[1]);
-    } else if (i>=0) {
-	b = i;
-	WMPerformButtonClick(panel->lmb[i]);
-    } 
+    }
+    WMSetPopUpButtonSelectedItem(panel->listP, b);
    
    str = GetStringForKey("ApplicationMenuMouseButton");
-    if (!str)
-	str = "right";
-    i = getbutton(str);
-    if (i==-1) {
+    if (str) {
+	i = getbutton(str);
+	if (i==-1) {
+	    c = 3;
+	    wwarning(_("bad value %s for option %s"), str, "ApplicationMenuMouseButton");
+	} else if (i>=0) {
+	    c = i;
+	}
+    } else {
 	c = 0;
-	wwarning(_("bad value %s for option %s"), str, "ApplicationMenuMouseButton");
-	WMPerformButtonClick(panel->amb[2]);
-    } else if (i>=0) {
-	c = i;
-	WMPerformButtonClick(panel->amb[i]);
    }
-    
-    
+    WMSetPopUpButtonSelectedItem(panel->appP, c);
+
    WMSetButtonSelected(panel->disaB, GetBoolForKey("DisableWSMouseActions"));
    
    /**/
@@ -422,6 +427,8 @@ fillModifierPopUp(WMPopUpButton *pop)
 	    sprintf(buffer, "%s (%s)", modifierNames[j], tmp);
 	    WMAddPopUpButtonItem(pop, buffer);
 	    for (i=k+1; i<a; i++) {
+		if (array[i] == NULL)
+		    continue;
 		if (strstr(array[i], tmp)) {
 		    free(array[i]);
 		    array[i]=NULL;
@@ -443,60 +450,6 @@ fillModifierPopUp(WMPopUpButton *pop)



-static void
-mouseButtonClickA(WMWidget *w, void *data)
-{
-    _Panel *panel = (_Panel*)data;
-    int i;
-    
-    for (i=0; i<3; i++) {
-	if (panel->amb[i]==w)
-	    break;
-    }
-    if (i==3)
-	return;
-    if (WMGetButtonSelected(panel->lmb[i]))
-	WMSetButtonSelected(panel->lmb[i], False);
-    if (WMGetButtonSelected(panel->smb[i]))
-	WMSetButtonSelected(panel->smb[i], False);
-}
-
-static void
-mouseButtonClickL(WMWidget *w, void *data)
-{
-    _Panel *panel = (_Panel*)data;
-    int i;
-    
-    for (i=0; i<3; i++) {
-	if (panel->lmb[i]==w)
-	    break;
-    }
-    if (i==3)
-	return;
-    if (WMGetButtonSelected(panel->smb[i]))
-	WMSetButtonSelected(panel->smb[i], False);
-    if (WMGetButtonSelected(panel->amb[i]))
-	WMSetButtonSelected(panel->amb[i], False);    
-}
-
-static void
-mouseButtonClickS(WMWidget *w, void *data)
-{
-    _Panel *panel = (_Panel*)data;
-    int i;
-    
-    for (i=0; i<3; i++) {
-	if (panel->smb[i]==w)
-	    break;
-    }
-    if (i==3)
-	return;
-    if (WMGetButtonSelected(panel->lmb[i]))
-	WMSetButtonSelected(panel->lmb[i], False);
-    if (WMGetButtonSelected(panel->amb[i]))
-	WMSetButtonSelected(panel->amb[i], False);    
-}
-
 static void
 createPanel(Panel *p)
 {
@@ -659,96 +612,42 @@ createPanel(Panel *p)
    WMMoveWidget(panel->disaB, 10, 20);
    WMSetButtonText(panel->disaB, _("Disable mouse actions"));

-    panel->mblL = WMCreateLabel(panel->menuF);
-    WMResizeWidget(panel->mblL, 16, 22);
-    WMMoveWidget(panel->mblL, 135, 40);
-    WMSetLabelImagePosition(panel->mblL, WIPImageOnly);
-    path = LocateImage(MOUSEB_L);
-    if (path) {
-	icon = WMCreatePixmapFromFile(scr, path);
-	if (icon) {
-	    WMSetLabelImage(panel->mblL, icon);
-	    WMReleasePixmap(icon);
-	} else {
-	    wwarning(_("could not load icon file %s"), path);
-	}
-	free(path);
-    }
-    panel->mbmL = WMCreateLabel(panel->menuF);
-    WMResizeWidget(panel->mbmL, 16, 22);
-    WMMoveWidget(panel->mbmL, 170, 40);
-    WMSetLabelImagePosition(panel->mbmL, WIPImageOnly);
-    path = LocateImage(MOUSEB_M);
-    if (path) {
-	icon = WMCreatePixmapFromFile(scr, path);
-	if (icon) {
-	    WMSetLabelImage(panel->mbmL, icon);
-	    WMReleasePixmap(icon);
-	} else {
-	    wwarning(_("could not load icon file %s"), path);
-	}
-	free(path);
-    }
-
-    panel->mbrL = WMCreateLabel(panel->menuF);
-    WMResizeWidget(panel->mbrL, 16, 22);
-    WMMoveWidget(panel->mbrL, 205, 40);
-    WMSetLabelImagePosition(panel->mbrL, WIPImageOnly);
-    path = LocateImage(MOUSEB_R);
-    if (path) {
-	icon = WMCreatePixmapFromFile(scr, path);
-	if (icon) {
-	    WMSetLabelImage(panel->mbrL, icon);
-	    WMReleasePixmap(icon);
-	} else {
-	    wwarning(_("could not load icon file %s"), path);
-	}
-	free(path);
-    }
-
+    
    panel->appL = WMCreateLabel(panel->menuF);
    WMResizeWidget(panel->appL, 125, 16);
-    WMMoveWidget(panel->appL, 5, 65);
+    WMMoveWidget(panel->appL, 5, 45);
    WMSetLabelTextAlignment(panel->appL, WARight);
    WMSetLabelText(panel->appL, _("Applications menu"));
+
+    panel->appP = WMCreatePopUpButton(panel->menuF);
+    WMResizeWidget(panel->appP, 95, 20);
+    WMMoveWidget(panel->appP, 135, 45);
    
    panel->listL = WMCreateLabel(panel->menuF);
    WMResizeWidget(panel->listL, 125, 16);
-    WMMoveWidget(panel->listL, 5, 90);
+    WMMoveWidget(panel->listL, 5, 80);
    WMSetLabelTextAlignment(panel->listL, WARight);
    WMSetLabelText(panel->listL, _("Window list menu"));
    
+    panel->listP = WMCreatePopUpButton(panel->menuF);
+    WMResizeWidget(panel->listP, 95, 20);
+    WMMoveWidget(panel->listP, 135, 80);
+
+    
    panel->selL = WMCreateLabel(panel->menuF);
    WMResizeWidget(panel->selL, 125, 16);
    WMMoveWidget(panel->selL, 5, 115);
    WMSetLabelTextAlignment(panel->selL, WARight);
    WMSetLabelText(panel->selL, _("Select windows"));

-    
-    for (i=0; i<3; i++) {
-	panel->amb[i] = WMCreateRadioButton(panel->menuF);
-	WMResizeWidget(panel->amb[i], 24, 24);
-	WMMoveWidget(panel->amb[i], 135+35*i, 65);
-	WMSetButtonText(panel->amb[i], NULL);
-	WMSetButtonAction(panel->amb[i], mouseButtonClickA, panel);
+    panel->selP = WMCreatePopUpButton(panel->menuF);
+    WMResizeWidget(panel->selP, 95, 20);
+    WMMoveWidget(panel->selP, 135, 115);

-	panel->lmb[i] = WMCreateRadioButton(panel->menuF);
-	WMResizeWidget(panel->lmb[i], 24, 24);
-	WMMoveWidget(panel->lmb[i], 135+35*i, 90);
-	WMSetButtonText(panel->lmb[i], NULL);	
-	WMSetButtonAction(panel->lmb[i], mouseButtonClickL, panel);
-
-	panel->smb[i] = WMCreateRadioButton(panel->menuF);
-	WMResizeWidget(panel->smb[i], 24, 24);
-	WMMoveWidget(panel->smb[i], 135+35*i, 115);
-	WMSetButtonText(panel->smb[i], NULL);	
-	WMSetButtonAction(panel->smb[i], mouseButtonClickS, panel);
-
-	if (i>0) {
-	    WMGroupButtons(panel->lmb[0], panel->lmb[i]);
-	    WMGroupButtons(panel->amb[0], panel->amb[i]);
-	    WMGroupButtons(panel->smb[0], panel->smb[i]);	    
-	}
+    for (i = 0; i < sizeof(buttonNames)/sizeof(char*); i++) {
+	WMAddPopUpButtonItem(panel->appP, buttonNames[i]);
+	WMAddPopUpButtonItem(panel->selP, buttonNames[i]);
+	WMAddPopUpButtonItem(panel->listP, buttonNames[i]);
    }
    
    WMMapSubwidgets(panel->menuF);
@@ -883,28 +782,16 @@ storeData(_Panel *panel)

    SetBoolForKey(WMGetButtonSelected(panel->disaB), "DisableWSMouseActions");

-    for (i=0; i<3; i++) {
-	if (WMGetButtonSelected(panel->amb[i]))
-	    break;
-    }
-    if (i<3)
-	SetStringForKey(button[i], "ApplicationMenuMouseButton");
+    i = WMGetPopUpButtonSelectedItem(panel->appP);
+    SetStringForKey(button[i], "ApplicationMenuMouseButton");
+
+    i = WMGetPopUpButtonSelectedItem(panel->listP);
+    SetStringForKey(button[i], "WindowListMouseButton");
    
-    for (i=0; i<3; i++) {
-	if (WMGetButtonSelected(panel->lmb[i]))
-	    break;
-    }
-    if (i<3)
-	SetStringForKey(button[i], "WindowListMouseButton");
+    i = WMGetPopUpButtonSelectedItem(panel->selP);
+    SetStringForKey(button[i], "SelectWindowsMouseButton");
    
-    for (i=0; i<3; i++) {
-	if (WMGetButtonSelected(panel->smb[i]))
-	    break;
-    }
-    if (i<3)
-	SetStringForKey(button[i], "SelectWindowsMouseButton");
-    
-    tmp = WMGetPopUpButtonItem(panel->grabP, 
+    tmp = WMGetPopUpButtonItem(panel->grabP,
 			       WMGetPopUpButtonSelectedItem(panel->grabP));
    tmp = wstrdup(tmp);
    p = strchr(tmp, ' ');
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -37,14 +37,10 @@
 #include <WINGs.h>
 #include <WUtil.h>

-/** some config options **/
-/* is not easier to include ../src/wconfig.h ?? */
-#undef EXTEND_WINDOWSHORTCUT
-
 /****/

-#define WVERSION	"0.40"
-#define WMVERSION	"0.60.x"
+#define WVERSION	"0.41"
+#define WMVERSION	"0.61.x"


 extern char *NOptionValueChanged;
--- a/WPrefs.app/po/Makefile.am
+++ b/WPrefs.app/po/Makefile.am
@@ -5,7 +5,7 @@ nlsdir = $(NLSDIR)
 CLEANFILES = $(CATALOGS)

 EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po\
-		zh_CN.po fi.po it.po ru.po
+		zh_CN.po fi.po it.po ru.po de.po

 POTFILES  = \
 	$(top_builddir)/WPrefs.app/main.c \
--- a/WPrefs.app/po/Makefile.in
+++ b/WPrefs.app/po/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -98,7 +95,7 @@ nlsdir = $(NLSDIR)

 CLEANFILES = $(CATALOGS)

-EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po 		zh_CN.po fi.po it.po ru.po
+EXTRA_DIST = pt.po hr.po fr.po ko.po cs.po ja.po zh_TW.Big5.po es.po 		zh_CN.po fi.po it.po ru.po de.po


 POTFILES =  	$(top_builddir)/WPrefs.app/main.c 	$(top_builddir)/WPrefs.app/WPrefs.c 	$(top_builddir)/WPrefs.app/Appearance.c 	$(top_builddir)/WPrefs.app/Configurations.c 	$(top_builddir)/WPrefs.app/Expert.c 	$(top_builddir)/WPrefs.app/Focus.c 	$(top_builddir)/WPrefs.app/Icons.c 	$(top_builddir)/WPrefs.app/KeyboardSettings.c 	$(top_builddir)/WPrefs.app/KeyboardShortcuts.c 	$(top_builddir)/WPrefs.app/Menu.c 	$(top_builddir)/WPrefs.app/MenuPreferences.c 	$(top_builddir)/WPrefs.app/MouseSettings.c 	$(top_builddir)/WPrefs.app/NoMenuAlert.c 	$(top_builddir)/WPrefs.app/Paths.c 	$(top_builddir)/WPrefs.app/Preferences.c 	$(top_builddir)/WPrefs.app/Text.c 	$(top_builddir)/WPrefs.app/TexturePanel.c 	$(top_builddir)/WPrefs.app/Themes.c 	$(top_builddir)/WPrefs.app/WindowHandling.c 	$(top_builddir)/WPrefs.app/Workspace.c 	$(top_builddir)/WPrefs.app/double.c 	$(top_builddir)/WPrefs.app/editmenu.c 	$(top_builddir)/WPrefs.app/MenuGuru.c 	$(top_builddir)/WPrefs.app/xmodifier.c
@@ -118,7 +115,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WPrefs.app/po/README
+++ b/WPrefs.app/po/README
@@ -8,7 +8,7 @@ pt.po	Portuguese		Eliphas Levy Theodoro <eliphas@conectiva.com.br>
 hr.po	Croatian		Toni Biliæ <tbilic@oliver.efos.hr>
 fr.po	French			Bastien NOCERA <hadess@writeme.com>
 				Hadess <hadess@infonie.fr>
-ko.po	Korean			Byeong-Chan, Kim <redhands@linux.sarang.net>
+ko.po	Korean			Byeong-Chan Kim <redhands@linux.sarang.net>
 cs.po	Czech		 	David ©auer <xsauer@hwlab.felk.cvut.cz>
 ja.po	Japanese		Kazuhide Takahashi <kazu@dgra.ne.jp>
 zh_TW.Big5.po Chinese		Li Wei Jih <lwj83@cs.ccu.edu.tw>
@@ -17,3 +17,5 @@ es.po   Spanish			Alvaro Herrera <alvherre@webhost.cl>
 fi.po	Finnish			Tomi Kajala <tomi@iki.fi>
 it.po	Italian			Michele Campeotto <micampe@tv.record.unipd.it>
 ru.po	Russian			Igor P. Roboul <igor@srcso.sochi.su>
+de.po   German			Bernd Eggert <Bernd.Eggert@t-online.de>
+
--- a/WPrefs.app/po/cs.po
+++ b/WPrefs.app/po/cs.po
--- a/WPrefs.app/po/de.po
+++ b/WPrefs.app/po/de.po
--- a/WPrefs.app/po/fi.po
+++ b/WPrefs.app/po/fi.po
--- a/WPrefs.app/po/ko.po
+++ b/WPrefs.app/po/ko.po
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.40\n"
-"POT-Creation-Date: 1999-05-30 16:44+0900\n"
-"PO-Revision-Date: 1999-05-30 16+44+0900\n"
+"Project-Id-Version: 0.40.0\n"
+"POT-Creation-Date: 1999-06-04 11:53+0900\n"
+"PO-Revision-Date: 1999-06-04 11+56+0900\n"
 "Last-Translator: Byeong-Chan Kim <redhands@linux.sarang.net>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
@@ -73,7 +73,7 @@ msgstr "
 msgid "Save"
 msgstr "저장"

-#: ../../WPrefs.app/Appearance.c:2220 ../../WPrefs.app/WPrefs.c:296
+#: ../../WPrefs.app/Appearance.c:2227 ../../WPrefs.app/WPrefs.c:296
 msgid "Close"
 msgstr "닫기"

@@ -109,7 +109,7 @@ msgstr ""
 msgid "could not locate image file %s\n"
 msgstr "이미지 파일 %s를 찾을 수 없음\n"

-#: ../../WPrefs.app/Appearance.c:1888 ../../WPrefs.app/Configurations.c:242
+#: ../../WPrefs.app/Appearance.c:1895 ../../WPrefs.app/Configurations.c:242
 #: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:316
 #: ../../WPrefs.app/Focus.c:327 ../../WPrefs.app/MenuPreferences.c:137
 #: ../../WPrefs.app/MenuPreferences.c:148
@@ -153,7 +153,7 @@ msgstr "

 #: ../../WPrefs.app/Menu.c:1384 ../../WPrefs.app/MouseSettings.c:149
 #: ../../WPrefs.app/MouseSettings.c:169 ../../WPrefs.app/Text.c:183
-#: ../../WPrefs.app/TexturePanel.c:604 ../../WPrefs.app/TexturePanel.c:677
+#: ../../WPrefs.app/TexturePanel.c:608 ../../WPrefs.app/TexturePanel.c:686
 #: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:639
 #: ../../WPrefs.app/WPrefs.c:644 ../../WPrefs.app/WPrefs.c:658
 #: ../../WPrefs.app/WPrefs.c:668 ../../WPrefs.app/WPrefs.c:678
@@ -164,8 +164,8 @@ msgstr "
 #: ../../WPrefs.app/Menu.c:1384 ../../WPrefs.app/MenuGuru.c:119
 #: ../../WPrefs.app/MenuGuru.c:126 ../../WPrefs.app/MenuGuru.c:140
 #: ../../WPrefs.app/MouseSettings.c:151 ../../WPrefs.app/MouseSettings.c:171
-#: ../../WPrefs.app/Text.c:183 ../../WPrefs.app/TexturePanel.c:605
-#: ../../WPrefs.app/TexturePanel.c:679 ../../WPrefs.app/TexturePanel.c:1505
+#: ../../WPrefs.app/Text.c:183 ../../WPrefs.app/TexturePanel.c:609
+#: ../../WPrefs.app/TexturePanel.c:688 ../../WPrefs.app/TexturePanel.c:1520
 #: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:639
 #: ../../WPrefs.app/WPrefs.c:644 ../../WPrefs.app/WPrefs.c:660
 #: ../../WPrefs.app/WPrefs.c:672 ../../WPrefs.app/WPrefs.c:678
@@ -244,71 +244,71 @@ msgstr ""
 "옵션 %s에 잘못된 속도 값을 주었습니다.\n"
 "기본값 Medium을 사용합니다"

-#: ../../WPrefs.app/Appearance.c:1082
+#: ../../WPrefs.app/Appearance.c:1089
 msgid "Select File"
 msgstr "파일 선택"

-#: ../../WPrefs.app/Appearance.c:1481
+#: ../../WPrefs.app/Appearance.c:1488
 msgid "Focused Window"
 msgstr "활성화 창"

-#: ../../WPrefs.app/Appearance.c:1485
+#: ../../WPrefs.app/Appearance.c:1492
 msgid "Unfocused Window"
 msgstr "비활성 창"

-#: ../../WPrefs.app/Appearance.c:1489
+#: ../../WPrefs.app/Appearance.c:1496
 msgid "Owner of Focused Window"
 msgstr "활성 창의 부모창"

-#: ../../WPrefs.app/Appearance.c:1493 ../../WPrefs.app/Appearance.c:1812
+#: ../../WPrefs.app/Appearance.c:1500 ../../WPrefs.app/Appearance.c:1819
 msgid "Menu Title"
 msgstr "메뉴 타이틀"

-#: ../../WPrefs.app/Appearance.c:1497 ../../WPrefs.app/Appearance.c:1499
+#: ../../WPrefs.app/Appearance.c:1504 ../../WPrefs.app/Appearance.c:1506
 msgid "Normal Item"
 msgstr "일반 항목"

-#: ../../WPrefs.app/Appearance.c:1503
+#: ../../WPrefs.app/Appearance.c:1510
 msgid "Disabled Item"
 msgstr "안 쓰는 항목"

-#: ../../WPrefs.app/Appearance.c:1512
+#: ../../WPrefs.app/Appearance.c:1519
 msgid "Highlighted"
 msgstr "선택됨"

-#: ../../WPrefs.app/Appearance.c:1704
+#: ../../WPrefs.app/Appearance.c:1711
 msgid "Texture"
 msgstr "텍스처"

-#: ../../WPrefs.app/Appearance.c:1713
+#: ../../WPrefs.app/Appearance.c:1720
 msgid "Titlebar of Focused Window"
 msgstr "활성 창 타이틀바"

-#: ../../WPrefs.app/Appearance.c:1714
+#: ../../WPrefs.app/Appearance.c:1721
 msgid "Titlebar of Unfocused Windows"
 msgstr "비활성 창 타이틀바"

-#: ../../WPrefs.app/Appearance.c:1715
+#: ../../WPrefs.app/Appearance.c:1722
 msgid "Titlebar of Focused Window's Owner"
 msgstr "활성 창의 부모창 타이틀바"

-#: ../../WPrefs.app/Appearance.c:1716
+#: ../../WPrefs.app/Appearance.c:1723
 msgid "Window Resizebar"
 msgstr "크기조정 바"

-#: ../../WPrefs.app/Appearance.c:1717
+#: ../../WPrefs.app/Appearance.c:1724
 msgid "Titlebar of Menus"
 msgstr "메뉴 타이틀바"

-#: ../../WPrefs.app/Appearance.c:1718
+#: ../../WPrefs.app/Appearance.c:1725
 msgid "Menu Items"
 msgstr "메뉴 항목"

-#: ../../WPrefs.app/Appearance.c:1719
+#: ../../WPrefs.app/Appearance.c:1726
 msgid "Icon Background"
 msgstr "아이콘 배경"

-#: ../../WPrefs.app/Appearance.c:1733
+#: ../../WPrefs.app/Appearance.c:1740
 msgid ""
 "Double click in the texture you want to use\n"
 "for the selected item."
@@ -316,100 +316,100 @@ msgstr ""
 "선택한 아이템에서 사용하고자 하는\n"
 "텍스쳐를 두번 클릭하십시오."

-#: ../../WPrefs.app/Appearance.c:1747
+#: ../../WPrefs.app/Appearance.c:1754
 msgid "New"
 msgstr "생성"

-#: ../../WPrefs.app/Appearance.c:1751
+#: ../../WPrefs.app/Appearance.c:1758
 msgid "Create a new texture."
 msgstr "새로운 텍스쳐를 생성합니다."

-#: ../../WPrefs.app/Appearance.c:1759
+#: ../../WPrefs.app/Appearance.c:1766
 msgid "Extract..."
 msgstr "추출..."

-#: ../../WPrefs.app/Appearance.c:1763
+#: ../../WPrefs.app/Appearance.c:1770
 msgid "Extract texture(s) from a theme or a style file."
 msgstr "테마나 스타일 파일에서 텍스쳐를 추출합니다."

-#: ../../WPrefs.app/Appearance.c:1773
+#: ../../WPrefs.app/Appearance.c:1780
 msgid "Edit"
 msgstr "편집"

-#: ../../WPrefs.app/Appearance.c:1776
+#: ../../WPrefs.app/Appearance.c:1783
 msgid "Edit the highlighted texture."
 msgstr "선택된 텍스쳐를 편집합니다."

-#: ../../WPrefs.app/Appearance.c:1784 ../../WPrefs.app/TexturePanel.c:1293
+#: ../../WPrefs.app/Appearance.c:1791 ../../WPrefs.app/TexturePanel.c:1308
 msgid "Delete"
 msgstr "지움"

-#: ../../WPrefs.app/Appearance.c:1788
+#: ../../WPrefs.app/Appearance.c:1795
 msgid "Delete the highlighted texture."
 msgstr "선택된 텍스쳐를 삭제합니다."

-#: ../../WPrefs.app/Appearance.c:1801
+#: ../../WPrefs.app/Appearance.c:1808
 msgid "Color"
 msgstr "색상"

-#: ../../WPrefs.app/Appearance.c:1809
+#: ../../WPrefs.app/Appearance.c:1816
 msgid "Focused Window Title"
 msgstr "활성화 창 타이틀"

-#: ../../WPrefs.app/Appearance.c:1810
+#: ../../WPrefs.app/Appearance.c:1817
 msgid "Unfocused Window Title"
 msgstr "비활성 창 타이틀"

-#: ../../WPrefs.app/Appearance.c:1811
+#: ../../WPrefs.app/Appearance.c:1818
 msgid "Owner of Focused Window Title"
 msgstr "활성 창의 부모창 제목"

-#: ../../WPrefs.app/Appearance.c:1813
+#: ../../WPrefs.app/Appearance.c:1820
 msgid "Menu Item Text"
 msgstr "메뉴 항목 글자"

-#: ../../WPrefs.app/Appearance.c:1814
+#: ../../WPrefs.app/Appearance.c:1821
 msgid "Disabled Menu Item Text"
 msgstr "꺼진 메뉴 항목 글자"

-#: ../../WPrefs.app/Appearance.c:1815
+#: ../../WPrefs.app/Appearance.c:1822
 msgid "Menu Highlight Color"
 msgstr "선택된 메뉴 색상"

-#: ../../WPrefs.app/Appearance.c:1816
+#: ../../WPrefs.app/Appearance.c:1823
 msgid "Highlighted Menu Text Color"
 msgstr "선택된 메뉴의 글자 색상"

-#: ../../WPrefs.app/Appearance.c:1853
+#: ../../WPrefs.app/Appearance.c:1860
 msgid "Options"
 msgstr "옵션"

-#: ../../WPrefs.app/Appearance.c:1860
+#: ../../WPrefs.app/Appearance.c:1867
 msgid "Menu Style"
 msgstr "메뉴 스타일"

-#: ../../WPrefs.app/Appearance.c:1902
+#: ../../WPrefs.app/Appearance.c:1909
 msgid "Title Alignment"
 msgstr "제목 정렬"

-#: ../../WPrefs.app/Appearance.c:1909 ../../WPrefs.app/Text.c:292
+#: ../../WPrefs.app/Appearance.c:1916 ../../WPrefs.app/Text.c:292
 msgid "Left"
 msgstr "왼쪽"

-#: ../../WPrefs.app/Appearance.c:1912 ../../WPrefs.app/Text.c:298
-#: ../../WPrefs.app/TexturePanel.c:1494
+#: ../../WPrefs.app/Appearance.c:1919 ../../WPrefs.app/Text.c:298
+#: ../../WPrefs.app/TexturePanel.c:1509
 msgid "Center"
 msgstr "중앙"

-#: ../../WPrefs.app/Appearance.c:1915 ../../WPrefs.app/Text.c:305
+#: ../../WPrefs.app/Appearance.c:1922 ../../WPrefs.app/Text.c:305
 msgid "Right"
 msgstr "오른쪽"

-#: ../../WPrefs.app/Appearance.c:2142
+#: ../../WPrefs.app/Appearance.c:2149
 msgid "Appearance Preferences"
 msgstr "작업 환경 설정"

-#: ../../WPrefs.app/Appearance.c:2144
+#: ../../WPrefs.app/Appearance.c:2151
 msgid ""
 "Background texture configuration for windows,\n"
 "menus and icons."
@@ -417,15 +417,15 @@ msgstr ""
 "창, 메뉴, 아이콘에 사용할\n"
 "배경 텍스쳐를 설정합니다."

-#: ../../WPrefs.app/Appearance.c:2189
+#: ../../WPrefs.app/Appearance.c:2196
 msgid "Extract Texture"
 msgstr "추출된 텍스처"

-#: ../../WPrefs.app/Appearance.c:2209
+#: ../../WPrefs.app/Appearance.c:2216
 msgid "Textures"
 msgstr "텍스처"

-#: ../../WPrefs.app/Appearance.c:2225
+#: ../../WPrefs.app/Appearance.c:2232
 msgid "Extract"
 msgstr "추출"

@@ -773,7 +773,7 @@ msgid "Not done"
 msgstr "완료 안됨"

 #: ../../WPrefs.app/KeyboardShortcuts.c:185 ../../WPrefs.app/Menu.c:1010
-#: ../../WPrefs.app/MenuGuru.c:263 ../../WPrefs.app/TexturePanel.c:1511
+#: ../../WPrefs.app/MenuGuru.c:263 ../../WPrefs.app/TexturePanel.c:1526
 msgid "Cancel"
 msgstr "취소"

@@ -1305,7 +1305,7 @@ msgid "Select directory"
 msgstr "디렉터리 선택"

 #: ../../WPrefs.app/Paths.c:281 ../../WPrefs.app/Paths.c:312
-#: ../../WPrefs.app/TexturePanel.c:1287
+#: ../../WPrefs.app/TexturePanel.c:1302
 msgid "Add"
 msgstr "추가"

@@ -1457,79 +1457,79 @@ msgstr "
 msgid "Text Preferences"
 msgstr "텍스트 설정"

-#: ../../WPrefs.app/TexturePanel.c:601
+#: ../../WPrefs.app/TexturePanel.c:605
 msgid "Could not load the selected file: "
 msgstr "선택한 파일을 읽을 수 없음: "

-#: ../../WPrefs.app/TexturePanel.c:678
+#: ../../WPrefs.app/TexturePanel.c:687
 msgid "The selected file does not contain a supported image."
 msgstr "선택한 이미지 파일의 형식을 지원하지 않습니다."

-#: ../../WPrefs.app/TexturePanel.c:1231
+#: ../../WPrefs.app/TexturePanel.c:1246
 msgid "Texture Panel"
 msgstr "텍스처 패널"

-#: ../../WPrefs.app/TexturePanel.c:1239
+#: ../../WPrefs.app/TexturePanel.c:1254
 msgid "Texture Name"
 msgstr "텍스처 이름"

-#: ../../WPrefs.app/TexturePanel.c:1251
+#: ../../WPrefs.app/TexturePanel.c:1266
 msgid "Solid Color"
 msgstr "단색"

-#: ../../WPrefs.app/TexturePanel.c:1252
+#: ../../WPrefs.app/TexturePanel.c:1267
 msgid "Gradient Texture"
 msgstr "그래디언트 텍스처"

-#: ../../WPrefs.app/TexturePanel.c:1253
+#: ../../WPrefs.app/TexturePanel.c:1268
 msgid "Simple Gradient Texture"
 msgstr "간결한 그래디언트 텍스쳐"

-#: ../../WPrefs.app/TexturePanel.c:1254
+#: ../../WPrefs.app/TexturePanel.c:1269
 msgid "Textured Gradient"
 msgstr "텍스쳐 그래디언트"

-#: ../../WPrefs.app/TexturePanel.c:1255
+#: ../../WPrefs.app/TexturePanel.c:1270
 msgid "Image Texture"
 msgstr "이미지 텍스처"

-#: ../../WPrefs.app/TexturePanel.c:1263
+#: ../../WPrefs.app/TexturePanel.c:1278
 msgid "Default Color"
 msgstr "기본색"

-#: ../../WPrefs.app/TexturePanel.c:1275
+#: ../../WPrefs.app/TexturePanel.c:1290
 msgid "Gradient Colors"
 msgstr "그래디언트 색"

-#: ../../WPrefs.app/TexturePanel.c:1371
+#: ../../WPrefs.app/TexturePanel.c:1386
 msgid "Direction"
 msgstr "방향"

-#: ../../WPrefs.app/TexturePanel.c:1399
+#: ../../WPrefs.app/TexturePanel.c:1414
 msgid "Gradient"
 msgstr "그래디언트"

-#: ../../WPrefs.app/TexturePanel.c:1417
+#: ../../WPrefs.app/TexturePanel.c:1432
 msgid "Gradient Opacity"
 msgstr "그래디언트 불투명도"

-#: ../../WPrefs.app/TexturePanel.c:1460
+#: ../../WPrefs.app/TexturePanel.c:1475
 msgid "Image"
 msgstr "이미지"

-#: ../../WPrefs.app/TexturePanel.c:1480
+#: ../../WPrefs.app/TexturePanel.c:1495
 msgid "Browse..."
 msgstr "찾기..."

-#: ../../WPrefs.app/TexturePanel.c:1492
+#: ../../WPrefs.app/TexturePanel.c:1507
 msgid "Tile"
 msgstr "타일"

-#: ../../WPrefs.app/TexturePanel.c:1493
+#: ../../WPrefs.app/TexturePanel.c:1508
 msgid "Scale"
 msgstr "스케일"

-#: ../../WPrefs.app/TexturePanel.c:1495
+#: ../../WPrefs.app/TexturePanel.c:1510
 msgid "Maximize"
 msgstr "최대화"

--- a/WPrefs.app/po/pt.po
+++ b/WPrefs.app/po/pt.po
--- a/WPrefs.app/po/ru.po
+++ b/WPrefs.app/po/ru.po
@@ -122,7 +122,7 @@ msgstr ""

 #: ../../WPrefs.app/WPrefs.c:605 ../../WPrefs.app/WPrefs.c:670
 msgid "Window Maker domain (%s) is corrupted!"
-msgstr ""
+msgstr "Window Maker ÄÏÍÅÎ (%s) ÐÏ×ÒÅÖÄÅÎ!"

 #: ../../WPrefs.app/Menu.c:1342 ../../WPrefs.app/MouseSettings.c:147 ../../WPrefs.app/MouseSettings.c:167 ../../WPrefs.app/Text.c:181 ../../WPrefs.app/TexturePanel.c:604 ../../WPrefs.app/TexturePanel.c:677 ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:606 ../../WPrefs.app/WPrefs.c:611 ../../WPrefs.app/WPrefs.c:620 ../../WPrefs.app/WPrefs.c:630 ../../WPrefs.app/WPrefs.c:640 ../../WPrefs.app/WPrefs.c:671 ../../WPrefs.app/WPrefs.c:676
 msgid "Error"
@@ -202,7 +202,7 @@ msgstr "

 #: ../../WPrefs.app/Appearance.c:1261
 msgid "Window Resizebar"
-msgstr ""
+msgstr "òÅÓÁÊÚ ÏËÎÁ"

 #: ../../WPrefs.app/Appearance.c:1262
 msgid "Titlebar of Menus"
@@ -222,19 +222,19 @@ msgstr "

 #: ../../WPrefs.app/Appearance.c:1313
 msgid "New"
-msgstr ""
+msgstr "îÏ×ÙÊ"

 #: ../../WPrefs.app/Appearance.c:1322
 msgid "Extract..."
-msgstr ""
+msgstr "éÚ×ÌÅÞØ..."

 #: ../../WPrefs.app/Appearance.c:1333
 msgid "Edit"
-msgstr ""
+msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"

 #: ../../WPrefs.app/Appearance.c:1342 ../../WPrefs.app/TexturePanel.c:1293
 msgid "Delete"
-msgstr ""
+msgstr "óÔÅÒÅÔØ"

 #: ../../WPrefs.app/Appearance.c:1518
 msgid "Appearance Preferences"
@@ -242,11 +242,11 @@ msgstr "

 #: ../../WPrefs.app/Appearance.c:1562
 msgid "Extract Texture"
-msgstr ""
+msgstr "éÚ×ÌÅÞØ ÔÅËÓÔÕÒÕ"

 #: ../../WPrefs.app/Appearance.c:1598
 msgid "Extract"
-msgstr ""
+msgstr "éÚ×ÌÅÞØ"

 #: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148 ../../WPrefs.app/MouseSettings.c:534 ../../WPrefs.app/WindowHandling.c:311 ../../WPrefs.app/WindowHandling.c:323 ../../WPrefs.app/Workspace.c:71 ../../WPrefs.app/Workspace.c:77
 msgid "could not load icon %s"
@@ -274,23 +274,23 @@ msgstr "

 #: ../../WPrefs.app/Configurations.c:299
 msgid "Animations and Sound"
-msgstr ""
+msgstr "áÎÉÍÁÃÉÑ É Ú×ÕË"

 #: ../../WPrefs.app/Configurations.c:305
 msgid "Animations"
-msgstr ""
+msgstr "áÎÉÍÁÃÉÑ"

 #: ../../WPrefs.app/Configurations.c:321
 msgid "Superfluous"
-msgstr ""
+msgstr "ìÉÛÎÉÊ"

 #: ../../WPrefs.app/Configurations.c:337
 msgid "Sounds"
-msgstr ""
+msgstr "ú×ÕËÉ"

 #: ../../WPrefs.app/Configurations.c:354
 msgid "Note: sound requires a module distributed separately"
-msgstr ""
+msgstr "úÁÍÅÞÁÎÉÅ: ÄÌÑ Ú×ÕËÁ ÔÒÅÂÕÅÔÓÑ ÏÔÄÅÌØÎÏ ÐÏÓÔÁ×ÌÑÅÍÙÊ ÍÏÄÕÌØ"

 #: ../../WPrefs.app/Configurations.c:364
 msgid "Dithering colormap for 8bpp"
@@ -302,15 +302,15 @@ msgstr ""

 #: ../../WPrefs.app/Configurations.c:390
 msgid "More colors for applications"
-msgstr ""
+msgstr "âÏÌØÛÅ Ã×ÅÔÏ× ÐÒÉÌÏÖÅÎÉÑÍ"

 #: ../../WPrefs.app/Configurations.c:397
 msgid "More colors for WindowMaker"
-msgstr ""
+msgstr "âÏÌØÛÅ Ã×ÅÔÏ× ÄÌÑ WindowMaker"

 #: ../../WPrefs.app/Configurations.c:450
 msgid "Other Configurations"
-msgstr "äÒÕÇÉÅ"
+msgstr "äÒÕÇÉÅ ÎÁÓÔÒÏÊËÉ" 

 #: ../../WPrefs.app/Expert.c:72
 msgid "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
@@ -348,7 +348,8 @@ msgstr "
 msgid ""
 "Click on the window to set\n"
 "keyboard input focus."
-msgstr ""
+msgstr "ýÅÌËÎÉÔÅ ÎÁ ÏËÎÅ, ÞÔÏÂÙ\n"
+"××ÏÄÉÔØ Ó ËÌÁ×ÉÁÔÕÒÙ"

 #: ../../WPrefs.app/Focus.c:198
 msgid ""
@@ -401,7 +402,7 @@ msgstr "

 #: ../../WPrefs.app/Focus.c:345
 msgid "msec"
-msgstr ""
+msgstr "íÓÅË"

 #: ../../WPrefs.app/Focus.c:362
 msgid "Do not let applications receive the click used to focus windows."
@@ -433,7 +434,7 @@ msgstr "

 #: ../../WPrefs.app/Icons.c:240
 msgid "3D-flipping"
-msgstr ""
+msgstr "3D-ËÒÕÞÅÎÉÅ"

 #: ../../WPrefs.app/Icons.c:241
 msgid "None"
@@ -465,7 +466,7 @@ msgstr ""

 #: ../../WPrefs.app/KeyboardSettings.c:113
 msgid "Key Repeat Rate"
-msgstr ""
+msgstr "óËÏÒÏÓÔØ ÐÏ×ÔÏÒÅÎÉÑ ËÌÁÉÛÉ"

 #: ../../WPrefs.app/KeyboardSettings.c:153
 msgid "Type here to test"
@@ -705,7 +706,7 @@ msgstr "

 #: ../../WPrefs.app/Menu.c:1068 ../../WPrefs.app/Menu.c:1083
 msgid "Add Workspace Menu"
-msgstr ""
+msgstr "äÏÂÁ×ÉÔØ ÍÅÎÀ òÁÂÏÞÉÅ ÍÅÓÔÁ"

 #: ../../WPrefs.app/Menu.c:1069 ../../WPrefs.app/Menu.c:1084
 msgid "Remove Item"
@@ -825,7 +826,7 @@ msgid ""
 "Always open submenus inside the screen, instead of scrolling.\n"
 "Note: this can be an annoyance at some circumstances.\n"
 msgstr ""
-"÷ÓÅÇÄÁ ÏÔËÒÙ×ÁÔØ ÐÏÄÍÅÎÀ ×ÎÕÔÒÉ ÜËÒÁÎÁ, ×ÍÅÓÔÏ ÐÒÏËÒÕÔËÉ.\n"
+"÷ÓÅÇÄÁ ÏÔËÒÙ×ÁÔØ ÐÏÄÍÅÎÀ ×ÎÕÔÒÉ ÜËÒÁÎÁ, ×ÍÅÓÔÏ ÐÒÏËÒÕÔËÉ."

 #: ../../WPrefs.app/MenuPreferences.c:209
 msgid "Scroll off-screen menus when pointer is moved over them."
@@ -873,7 +874,7 @@ msgstr "

 #: ../../WPrefs.app/MouseSettings.c:579
 msgid "Double-Click Delay"
-msgstr ""
+msgstr "úÁÄÅÒÖËÁ Ä×ÏÊÎÏÇÏ ÝÅÌÞËÁ"

 #: ../../WPrefs.app/MouseSettings.c:623
 msgid "Test"
@@ -885,7 +886,7 @@ msgstr "

 #: ../../WPrefs.app/MouseSettings.c:658
 msgid "Disable mouse actions"
-msgstr "ïÔÍÅÎÉÔØ ÍÙÛØ"
+msgstr "ïÔËÌÀÞÉÔØ ÍÙÛØ"

 #: ../../WPrefs.app/MouseSettings.c:711
 msgid "Applications menu"
@@ -1001,7 +1002,7 @@ msgstr "

 #: ../../WPrefs.app/Preferences.c:214
 msgid "Keep keyboard language status for each window."
-msgstr ""
+msgstr "óÏÈÒÁÎÑÔØ ÑÚÙË ËÌÁ×ÉÁÔÕÒÙ ÄÌÑ ËÁÖÄÏÇÏ ÏËÎÁ"

 #: ../../WPrefs.app/Preferences.c:235
 msgid "Miscellaneous Ergonomic Preferences"
@@ -1069,59 +1070,59 @@ msgstr "

 #: ../../WPrefs.app/Text.c:325
 msgid "Text Preferences"
-msgstr ""
+msgstr "ó×ÏÊÓÔ×Á ÔÅËÓÔÁ"

 #: ../../WPrefs.app/TexturePanel.c:601
 msgid "Could not load the selected file: "
-msgstr ""
+msgstr "îÅ ÍÏÇÕ ÚÁÇÒÕÚÉÔØ ×ÙÂÒÁÎÙÊ ÆÁÊÌ"

 #: ../../WPrefs.app/TexturePanel.c:678
 msgid "The selected file does not contain a supported image."
-msgstr ""
+msgstr "÷ÙÂÒÁÎÙÊ ÆÁÊÌ ÎÅ ÓÏÄÅÒÖÉÔ ÐÏÄÄÅÒÖÉ×ÁÅÍÏÊ ËÁÒÔÉÎËÉ"

 #: ../../WPrefs.app/TexturePanel.c:1231
 msgid "Texture Panel"
-msgstr ""
+msgstr "ðÁÎÅÌØ ÔÅËÓÔÕÒ"

 #: ../../WPrefs.app/TexturePanel.c:1239
 msgid "Texture Name"
-msgstr ""
+msgstr "îÁÚ×ÁÎÉÅ ÔÅËÓÔÕÒÙ"

 #: ../../WPrefs.app/TexturePanel.c:1251
 msgid "Solid Color"
-msgstr ""
+msgstr "òÁ×ÎÏÍÅÒÎÙÊ Ã×ÅÔ"

 #: ../../WPrefs.app/TexturePanel.c:1252
 msgid "Gradient Texture"
-msgstr ""
+msgstr "çÒÁÄÉÅÎÔ"

 #: ../../WPrefs.app/TexturePanel.c:1253
 msgid "Simple Gradient Texture"
-msgstr ""
+msgstr "ðÒÏÓÔÏÊ ÇÒÁÄÉÅÎÔ"

 #: ../../WPrefs.app/TexturePanel.c:1254
 msgid "Textured Gradient"
-msgstr ""
+msgstr "ôÅËÓÔÕÒÎÙÊ ÇÒÁÄÉÅÎÔ"

 #: ../../WPrefs.app/TexturePanel.c:1255
 msgid "Image Texture"
-msgstr ""
+msgstr "ôÅËÓÔÕÒÁ ÉÚÏÂÒÁÖÅÎÉÑ"

 #: ../../WPrefs.app/TexturePanel.c:1263
 msgid "Default Color"
-msgstr ""
+msgstr "ã×ÅÔ ÐÏ ÕÍÏÌÞÁÎÉÀ"

 #: ../../WPrefs.app/TexturePanel.c:1275
 msgid "Gradient Colors"
-msgstr ""
+msgstr "çÒÁÄÉÅÎÔÎÙÅ Ã×ÅÔÁ"

 #: ../../WPrefs.app/TexturePanel.c:1371
 msgid "Direction"
-msgstr ""
+msgstr "îÁÐÒ×ÌÅÎÉÅ"

 #: ../../WPrefs.app/TexturePanel.c:1399
 msgid "Gradient"
-msgstr ""
+msgstr "çÒÁÄÉÅÎÔ"

 #: ../../WPrefs.app/TexturePanel.c:1417
 msgid "Gradient Opacity"
@@ -1129,47 +1130,47 @@ msgstr ""

 #: ../../WPrefs.app/TexturePanel.c:1460
 msgid "Image"
-msgstr ""
+msgstr "éÚÏÂÒÁÖÅÎÉÅ"

 #: ../../WPrefs.app/TexturePanel.c:1480
 msgid "Browse..."
-msgstr ""
+msgstr "îÁÊÔÉ..."

 #: ../../WPrefs.app/TexturePanel.c:1492
 msgid "Tile"
-msgstr ""
+msgstr "úÁÇÏÌÏ×ÏË"

 #: ../../WPrefs.app/TexturePanel.c:1493
 msgid "Scale"
-msgstr ""
+msgstr "ûËÁÌÁ"

 #: ../../WPrefs.app/TexturePanel.c:1495
 msgid "Maximize"
-msgstr ""
+msgstr "òÁÚ×ÅÒÎÕÔØ"

 #: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
 msgid "Set"
-msgstr ""
+msgstr "õÓÔÁÎÏ×ÉÔØ"

 #: ../../WPrefs.app/Themes.c:132
 msgid "Stop"
-msgstr ""
+msgstr "óÔÏÐ"

 #: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:205 ../../WPrefs.app/Themes.c:225
 msgid "Download"
-msgstr ""
+msgstr "úÁÇÒÕÚÉÔØ ÉÚ ÉÎÅÔÁ"

 #: ../../WPrefs.app/Themes.c:173
 msgid "Save Current Theme"
-msgstr ""
+msgstr "óÏÈÒÁÎÉÔØ ÔÅËÕÝÕÀ ÔÅÍÕ"

 #: ../../WPrefs.app/Themes.c:182
 msgid "Load"
-msgstr ""
+msgstr "úÁÇÒÕÚÉÔØ"

 #: ../../WPrefs.app/Themes.c:187
 msgid "Install"
-msgstr ""
+msgstr "éÎÓÔÁÌÉÒÏ×ÁÔØ"

 #: ../../WPrefs.app/Themes.c:195
 msgid "Tile of The Day"
@@ -1181,11 +1182,11 @@ msgstr ""

 #: ../../WPrefs.app/Themes.c:252
 msgid "Themes"
-msgstr ""
+msgstr "ôÅÍÙ"

 #: ../../WPrefs.app/WindowHandling.c:134
 msgid "bad option value %s in WindowPlacement. Using default value"
-msgstr ""
+msgstr "ÎÅ×ÅÒÎÏÅ ÚÎÁÞÅÎÉÅ %s × ÒÁÚÍÅÝÅÎÉÉ ÏËÎÁ. éÓÐÏÌØÚÕÅÔÓÑ ÚÎÁÞÅÎÉÅ ÐÏ ÕÍÏÌÞÁÎÉÀ"

 #: ../../WPrefs.app/WindowHandling.c:156
 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
@@ -1233,7 +1234,7 @@ msgstr "...

 #: ../../WPrefs.app/WindowHandling.c:353
 msgid "Edge Resistance"
-msgstr ""
+msgstr "óÏÐÒÁÔÉ×ÌÑÅÍÏÓÔØ ËÒÁÅ×"

 #: ../../WPrefs.app/WindowHandling.c:377
 msgid "Open dialogs in same workspace as their owners"
@@ -1299,7 +1300,8 @@ msgstr "
 msgid ""
 "This process will help you create a submenu which definition is located in another file or is created dynamically.\n"
 "What do you want to use as the contents of the submenu?"
-msgstr ""
+msgstr "üÔÏÔ ÐÒÏÃÅÓÓ ÐÏÍÏÖÅÔ ×ÁÍ ÓÏÚÄÁÔØ ÐÏÄÍÅÎÀ ÎÁÈÏÄÑÝÅÅÓÑ × ÄÒÕÇÏÍ ÆÁÊÌÅ ÉÌÉ ÓÏÚÄÁ×ÁÅÍÏÅ ÄÉÎÁÍÉÞÅÓËÉ.\n"
+"þÔÏ ×Ù ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ × ËÁÞÅÓÔ×Å ÓÏÄÅÒÖÁÎÉÑ ÜÔÏÇÏ ÐÏÄÍÅÎÀ"

 #: ../../WPrefs.app/MenuGuru.c:279
 msgid "A file containing the menu definition in the plain text (non-property list) menu format."
@@ -1311,19 +1313,19 @@ msgstr ""

 #: ../../WPrefs.app/MenuGuru.c:291
 msgid "The files in one or more directories."
-msgstr ""
+msgstr "æÁÊÌÙ × ÏÄÎÏÊ ÉÌÉ ÂÏÌÅÅ ÄÉÒÅËÔÏÒÉÑÈ."

 #: ../../WPrefs.app/MenuGuru.c:303
 msgid "Type the path for the menu file:"
-msgstr ""
+msgstr "÷×ÅÄÉÔÅ ÐÕÔØ Ë ÆÁÊÌÕ Ó ÍÅÎÀ:"

 #: ../../WPrefs.app/MenuGuru.c:318
 msgid "The menu file must contain a menu in the plain text menu file format. This format is described in the menu files included with WindowMaker, probably at ~/GNUstep/Library/WindowMaker/menu"
-msgstr ""
+msgstr "æÁÊÌ ÍÅÎÀ ÄÏÌÖÅÎ ÓÏÄÅÒÖÁÔØ ÍÅÎÀ × ÆÏÒÍÁÔÅ plain text. æÏÒÍÁÔ ÆÁÊÌÁ ÏÐÉÓÁÎ × menu ÆÁÊÌÁÈ ÉÄÕÝÉÈ Ó WindowMaker, ×ÅÒÏÑÔÎÅÅ ×ÓÅÇÏ ~/GNUstep/Library/WindowMaker/menu"

 #: ../../WPrefs.app/MenuGuru.c:328
 msgid "Type the command that will generate the menu definition:"
-msgstr ""
+msgstr "îÁÂÅÒÉÔÅ ËÏÍÁÎÄÕ ËÏÔÏÒÁÑ ×ÏÊÄÅÔ × ÍÅÎÀ:"

 #: ../../WPrefs.app/MenuGuru.c:338
 msgid "The command supplied must generate and output a valid menu definition to stdout. This definition should be in the plain text menu file format, described in the menu files included with WindowMaker, usually at ~/GNUstep/Library/WindowMaker/menu"
@@ -1331,7 +1333,7 @@ msgstr ""

 #: ../../WPrefs.app/MenuGuru.c:350 ../../WPrefs.app/MenuGuru.c:372 ../../WPrefs.app/MenuGuru.c:394
 msgid "Type the path for the directory. You can type more than one path by separating them with spaces."
-msgstr ""
+msgstr "îÁÂÅÒÉÔÅ ÐÕÔØ Ë ÄÉÒÅËÔÏÒÉÉ. ÷Ù ÍÏÖÉÔÅ ××ÅÓÔÉ ÂÏÌÅÅ ÏÄÎÏÇÏ ÐÕÔÉ ×ÁÚÄÅÌÉ× ÉÈ ÐÒÏÂÅÌÁÍÉ."

 #: ../../WPrefs.app/MenuGuru.c:361 ../../WPrefs.app/MenuGuru.c:383 ../../WPrefs.app/MenuGuru.c:405
 msgid "The menu generated will have an item for each file in the directory. The directories can contain program executables or data files (such as jpeg images)."
@@ -1339,7 +1341,7 @@ msgstr ""

 #: ../../WPrefs.app/MenuGuru.c:415
 msgid "If the directory contain data files, type the command used to open these files. Otherwise, leave it in blank."
-msgstr ""
+msgstr "åÓÌÉ ÄÉÒÅËÔÏÒÉÑ ÓÏÄÅÒÖÉÔ ÆÁÊÌÙ ÄÁÎÎÙÈ, ÎÁÂÅÒÉÔÅ ËÏÍÁÎÄÕ ÉÓÐÏÌØÚÕÅÍÕÀ ÄÌÑ ÏÔËÒÙÔÉÑ ÜÔÉÈ ÆÁÊÌÏ×. éÌÉ ÏÓÔÁ×ØÔÅ ÔÁË."

 #: ../../WPrefs.app/MenuGuru.c:426
 msgid "Each file in the directory will have an item and they will be opened with the supplied command.For example, if the directory contains image files and the command is \"xv -root\", each file in the directory will have a menu item like \"xv -root imagefile\"."
--- a/WPrefs.app/tiff/Makefile.in
+++ b/WPrefs.app/tiff/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,7 +105,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WPrefs.app/xpm/Makefile.in
+++ b/WPrefs.app/xpm/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,7 +105,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Backgrounds/Makefile.in
+++ b/WindowMaker/Backgrounds/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -107,7 +104,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Defaults/Makefile.in
+++ b/WindowMaker/Defaults/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -109,7 +106,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/IconSets/Makefile.in
+++ b/WindowMaker/IconSets/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -109,7 +106,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Icons/Makefile.in
+++ b/WindowMaker/Icons/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,7 +105,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -38,6 +38,7 @@ prefsdata_DATA =\
 	plmenu.hr\
 	plmenu.zh_CN\
 	plmenu.it\
+	plmenu.de\
 	wmmacros\
 	xtree.dat

--- a/WindowMaker/Makefile.in
+++ b/WindowMaker/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -96,7 +93,7 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes

 prefsdatadir = $(pkgdatadir)

-prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cz 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.da 	plmenu.fr 	plmenu.hr 	plmenu.zh_CN 	plmenu.it 	wmmacros 	xtree.dat
+prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cz 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_CN 	menu.zh_TW.Big5 	plmenu 	plmenu.da 	plmenu.fr 	plmenu.hr 	plmenu.zh_CN 	plmenu.it 	plmenu.de 	wmmacros 	xtree.dat


 EXTRA_DIST = $(prefsdata_DATA) mkMakefile
@@ -110,7 +107,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Pixmaps/Makefile.in
+++ b/WindowMaker/Pixmaps/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,7 +105,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/README
+++ b/WindowMaker/README
@@ -66,3 +66,4 @@ plmenu.da Danish 	Birger Langkjer <birger.langkjer@image.dk>
 plmenu.zh_CN Chinese	Wang Jian <wangjian2@asiainfo.com>
 plmenu.hr Croatian	Toni Bilic <tbilic@efos.hr>
 plmenu.it Italian	Michele Campeotto <micampe@tv.record.unipd.it>
+plmenu.de German 	Matthias Warkus <mawarkus@t-online.de>
--- a/WindowMaker/Styles/Brownish.style
+++ b/WindowMaker/Styles/Brownish.style
@@ -0,0 +1,29 @@
+{
+  TitleJustify = center;
+  ClipTitleFont = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*";
+  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  HighlightColor = "#c0b0b0";
+  HighlightTextColor = "#201010";
+  ClipTitleColor = white;
+  CClipTitleColor = gray60;
+  FTitleColor = "#f0e0e0";
+  PTitleColor = "#f0e0e0";
+  UTitleColor = gray;
+  FTitleBack = (solid, "#a09080");
+  PTitleBack = (solid, "#908080");
+  UTitleBack = (solid, "#808090");
+  ResizebarBack = (solid, "#808090");
+  MenuTitleColor = "#f0e0e0";
+  MenuTextColor = "#f0e0e0";
+  MenuDisabledColor = "#504040";
+  MenuTitleBack = (solid, "#a09080");
+  MenuTextBack = (solid, "#908080");
+  IconBack = (solid, "#809080");
+  IconTitleColor = white;
+  IconTitleBack = "#446594";
+  MenuStyle = normal;
+}
--- a/WindowMaker/Styles/Makefile.am
+++ b/WindowMaker/Styles/Makefile.am
@@ -9,6 +9,7 @@ prefsdata_DATA =\
 	BlueDawn.style\
 	BlueishGreen.style\
 	Brown.style\
+	Brownish.style\
 	Chumbo.style\
 	Copper.style\
 	DarkBlue.style\
@@ -24,6 +25,7 @@ prefsdata_DATA =\
 	Pink.style\
 	Pumpkin.style\
 	Purple.style\
+	Purplish.style\
 	Red.style\
 	RednBlue.style\
 	Summer.style\
--- a/WindowMaker/Styles/Makefile.in
+++ b/WindowMaker/Styles/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -94,7 +91,7 @@ wprefsdir = @wprefsdir@

 prefsdatadir = $(pkgdatadir)/Styles

-prefsdata_DATA =  	Autumn.style 	Black.style 	BlackTexture.style 	Blue.style 	BlueDawn.style 	BlueishGreen.style 	Brown.style 	Chumbo.style 	Copper.style 	DarkBlue.style 	DarkRed.style 	Fire.style 	Food.style 	Golden.style 	Green.style 	GreyBlue.style 	Gtk.style 	LightBlue.style 	Pastel.style 	Pink.style 	Pumpkin.style 	Purple.style 	Red.style 	RednBlue.style 	Summer.style 	Traditional.style 	VioletBlue.style
+prefsdata_DATA =  	Autumn.style 	Black.style 	BlackTexture.style 	Blue.style 	BlueDawn.style 	BlueishGreen.style 	Brown.style 	Brownish.style 	Chumbo.style 	Copper.style 	DarkBlue.style 	DarkRed.style 	Fire.style 	Food.style 	Golden.style 	Green.style 	GreyBlue.style 	Gtk.style 	LightBlue.style 	Pastel.style 	Pink.style 	Pumpkin.style 	Purple.style 	Purplish.style 	Red.style 	RednBlue.style 	Summer.style 	Traditional.style 	VioletBlue.style


 EXTRA_DIST = $(prefsdata_DATA)
@@ -108,7 +105,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/Styles/Purplish.style
+++ b/WindowMaker/Styles/Purplish.style
@@ -0,0 +1,29 @@
+{
+  TitleJustify = center;
+  ClipTitleFont = "-*-helvetica-medium-r-normal-*-10-*-*-*-*-*-*-*";
+  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  HighlightColor = "#c0c0d0";
+  HighlightTextColor = "#505070";
+  ClipTitleColor = white;
+  CClipTitleColor = gray60;
+  FTitleColor = "#804040";
+  PTitleColor = "#f0e0e0";
+  UTitleColor = "#706070";
+  FTitleBack = (solid, "#b08080");
+  PTitleBack = (solid, "#908080");
+  UTitleBack = (solid, "#a090a0");
+  ResizebarBack = (solid, "#808090");
+  MenuTitleColor = "#804040";
+  MenuTextColor = "#505060";
+  MenuDisabledColor = "#707080";
+  MenuTitleBack = (solid, "#b08080");
+  MenuTextBack = (solid, "#9090a0");
+  IconBack = (solid, "#909080");
+  IconTitleColor = white;
+  IconTitleBack = "#446594";
+  MenuStyle = normal;
+}
--- a/WindowMaker/Themes/Makefile.in
+++ b/WindowMaker/Themes/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -107,7 +104,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/WindowMaker/menu.da
+++ b/WindowMaker/menu.da
@@ -105,12 +105,13 @@
                "Copyright..." LEGAL_PANEL
                "Systemkonsol" EXEC xconsole
                "Systembelastning" SHEXEC xosview || xload
-                "Procesliste" EXEC xterm -e top
-                "Brugsanvisninger" EXEC xman
+                "Procesliste" EXEC xterm -fg wheat -bg black -fn 6x10 -geometry 
+80x50 -e top
+                "Manualer" EXEC xman
        "Info" END
+	"Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)"
        "XTerm" EXEC xterm -sb 
-        "Rxvt (lille)" EXEC rxvt -bg black -fg white -fn fixed
-        "Rxvt (stor)" EXEC rxvt -bg black -fg white -fn 9x15
+        "Rxvt" EXEC rxvt -bg black -fg white 
        "Arbejdsborde" WORKSPACE_MENU
        "Applikationer" MENU
                "Grafik" MENU
@@ -123,8 +124,9 @@
                "OffiX Files" EXEC files
                "LyX" EXEC lyx
                "Netscape" EXEC netscape 
-                "Ghostview" EXEC ghostview %a(Skriv filnavn)
-                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Skriv PDF-filnavn)
+                "Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
+                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indta
+st PDF-filnavn)
                "TkDesk" EXEC tkdesk
        "Applikationer" END
        "Tekstbehandling" MENU
@@ -142,7 +144,8 @@
        "Diverse" END
        "Tilbehør" MENU
                "Lommeregner" EXEC xcalc
-                "Window Egenskaber" SHEXEC xprop | xmessage -center -title 'xprop' -file
+                "Vindues Egenskaber" SHEXEC xprop | xmessage -center -title 'xpr
+op' -file -
                "Vælg skrifttype" EXEC xfontsel
                "Terminalemulator" EXEC xminicom
                "Forstørrelsesglas" EXEC xmag
@@ -152,15 +155,15 @@
                "Udklipsbord" EXEC xclipboard
        "Tilbehør" END

-        "Markering" MENU
+        "Markeret" MENU
                "Kopier" SHEXEC echo '%s' | wxcopy
-                "Send e-post" EXEC xterm -name mail -T "Pine" -e pine %s
+                "Send e-post til" EXEC xterm -name mail -T "Pine" -e pine %s
                "Indtast URL" EXEC netscape %s
                "Søg i manual" SHEXEC MANUAL_SEARCH(%s)
-        "Markering" END
+        "Markeret" END

        "Arbejdsbord" MENU
-                "Gem andre" HIDE_OTHERS
+                "Skjul andre" HIDE_OTHERS
                "Vis alle" SHOW_ALL
                "Arranger ikoner" ARRANGE_ICONS
                "Genindlæs" REFRESH
@@ -170,9 +173,12 @@
        "Arbejdsbord" END

        "Udseende" MENU
-                "Temaer" OPEN_MENU -noext  THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-                "Stil" OPEN_MENU -noext  STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-                "Ikonsæt" OPEN_MENU -noext  ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
+                "Temaer" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/Windo
+wMaker/Themes WITH setstyle
+                "Stil" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowM
+aker/Styles WITH setstyle
+                "Ikonsæt" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/W
+indowMaker/IconSets WITH seticons
                "Baggrund" MENU
                        "Ensfarvet" MENU
                                "Sort" WS_BACK '(solid, black)'
@@ -185,19 +191,32 @@
                                "Bordeaux" WS_BACK '(solid, "#400020")'
                        "Ensfarvet" END
                        "Nuancer" MENU
-                                "Flag" WS_BACK '(mdgradient, green, red, white, green)'
-                                "Himmel" WS_BACK '(vgradient, blue4, white)'
+				"Solopgang" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4
+)'
+				"Himmel" WS_BACK '(vgradient, blue4, white)'
+    				"Blå Skygger" WS_BACK '(vgradient, "#7080a5", "#101020")'
+				"Indigo Skygger" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+			    	"Lilla Skygger" WS_BACK '(vgradient, "#654c66", "#151426")'
+    				"Hvede Skygger" WS_BACK '(vgradient, "#a09060", "#302010")'
+    				"Grå Skygger" WS_BACK '(vgradient, "#636380", "#131318")'
+    				"Bordeaux Skygger" WS_BACK '(vgradient, "#600040", "#180010")'
+                                "Flag" WS_BACK '(mdgradient, green, red, white, 
+green)'
                        "Nuancer" END
-                        "Billeder" OPEN_MENU -noext  BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
+                        "Billeder" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUste
+p/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
                "Baggrund" END
-                "Gem tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
-                "Gem ikonsæt" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+                "Gem Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/
+Themes/"%a(Tema navn,Indtast navn:)"
+                "Gem Ikonsæt" SHEXEC geticonset $HOME/GNUstep/Library/WindowMake
+r/IconSets/"%a(Ikonsæt navn,Indtast navn:)"
        "Udseende" END

        "Afslut" MENU
-                "Genindlæs" RESTART
-                "Start AfterStep" RESTART afterstep
-                "Afslut WindowMaker..."  EXIT
-                "Afslut X-session..." SHUTDOWN
+                "Genstart" RESTART
+                "Start Blackbox" RESTART blackbox
+		"Start kwm" RESTART kwm
+		"Start IceWM" RESTART icewm
+                "Afslut..."  EXIT
        "Afslut" END
 "Applikationer" END
--- a/WindowMaker/plmenu.da
+++ b/WindowMaker/plmenu.da
@@ -1,169 +1,70 @@
 (
-  Applikationer,
+  "Applikationer",
  (
-    Info,
+    "Info",
    ("Info Panel...", INFO_PANEL),
-    (Copyright..., LEGAL_PANEL),
-    (Systemkonsol, EXEC, xconsole),
-    (Systembelastning, SHEXEC, "xosview || xload"),
-    (Procesliste, EXEC, "rxvt -fn 6x10 -geometry 80x50 -e top"),
-    (Brugsanvisninger, EXEC, xman),
-    (Kontrolpanel, EXEC, "control-panel"),
-    (LinuxConfig, EXEC, linuxconf)
-  ),
-  ("Kør...", EXEC, "%a(Koer,Indtast kommando du vil udfoere:)"),
-  (Xterm, EXEC, "rxvt -bg black -fg white -fn 8x13"),
-  (Arbejdsborde, WORKSPACE_MENU),
-  (
-    Programmer,
+    ("Copyright...", LEGAL_PANEL),
+    ("Systemkonsol", EXEC, "xconsole"),
+    ("Systembelastning", EXEC, "xosview || xload"),
    (
-      Grafik,
-      (Gimp, SHEXEC, "gimp >/dev/null"),
-      ("Electric Eyes", EXEC, ee),
-      (XV, EXEC, xv),
-      (XPaint, EXEC, xpaint),
-      (XFig, EXEC, xfig)
-    ),
-    ("X Filh\345ndtering", EXEC, xfm),
-    ("Midnight Commander", EXEC, "rxvt -fn 8x13 -e mc"),
-    ("OffiX Files", EXEC, files),
-    (LyX, EXEC, lyx),
-    (Netscape, EXEC, netscape),
-    ("Netscape Mail", EXEC, "netscape -news"),
-    (Lynx, EXEC, "rxvt -fn 8x13 -e lynx"),
-    (Ghostview, EXEC, "ghostview %a(Skriv filnavn)"),
-    (
-      Acrobat,
+      "Procesliste",
      EXEC,
-      "/usr/local/Acrobat3/bin/acroread %a(Skriv PDF-filnavn)"
+      "xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top"
    ),
-    (TkDesk, EXEC, tkdesk),
-    ("X11 apps", OPEN_MENU, "/usr/local/bin")
+    ("Manualer", EXEC, "xman")
  ),
  (
-    Tekstbehandling,
-    (Wordperfect, EXEC, "/usr/local/wp8/wpbin/xwp"),
-    ("Pathetic Writer", EXEC, pw),
-    (GXedit, EXEC, gxedit),
-    ("Gnotepad+", EXEC, gnp),
-    (gEdit, EXEC, gedit),
-    (Emacs, EXEC, emacs),
-    (NEdit, EXEC, nedit),
-    (VI, EXEC, "rxvt -e vi")
+    "K\370r...",
+    SHEXEC,
+    "%a(K\370r,Indtast kommando der skal udf\370res:)"
+  ),
+  ("XTerm", EXEC, "xterm -sb"),
+  ("Rxvt", EXEC, "rxvt -bg black -fg white"),
+  ("Arbejdsborde", WORKSPACE_MENU),
+  (
+    "Applikationer",
+    (
+      "Grafik",
+      ("Gimp", SHEXEC, "gimp >/dev/null"),
+      ("XV", EXEC, "xv"),
+      ("XPaint", EXEC, "xpaint"),
+      ("XFig", EXEC, "xfig")
+    ),
+    ("X Filh\345ndtering", EXEC, "xfm"),
+    ("OffiX Files", EXEC, "files"),
+    ("LyX", EXEC, "lyx"),
+    ("Netscape", EXEC, "netscape"),
+    ("Ghostview", EXEC, "ghostview %a(GhostView,Indtast filnavn)"),
+    (
+      "Acrobat",
+      EXEC,
+      "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
+    ),
+    ("TkDesk", EXEC, "tkdesk")
  ),
  (
-    "KDE programmer",
-    (Kmail, EXEC, kmail),
-    (Kppp, EXEC, kppp),
-    ("K Filh\345ndtering", EXEC, "kfm -w"),
-    ("Kdehj\346lp", EXEC, kdehelp),
-    (Kexplorer, EXEC, kexplorer)
+    "Tekstbehandling",
+    ("XFte", EXEC, "xfte"),
+    ("Emacs", SHEXEC, "xemacs || emacs"),
+    ("XJed", EXEC, "xjed"),
+    ("NEdit", EXEC, "nedit"),
+    ("Xedit", EXEC, "xedit"),
+    ("VI", EXEC, "xterm -e vi")
  ),
  (
-    "KDE Applications",
-    (
-      Applications,
-      ("Text Editor", EXEC, kedit),
-      (WebMaker, EXEC, webmaker),
-      ("Advanced Editor", EXEC, kwrite),
-      (Organizer, EXEC, korganizer),
-      (KLyx, EXEC, klyx)
-    ),
-    (
-      Games,
-      (Asteroids, EXEC, kasteroids),
-      (Abalone, EXEC, kabalone),
-      (KBlackBox, EXEC, kblackbox),
-      (Minesweeper, EXEC, kmines),
-      (Reversi, EXEC, kreversi),
-      (SameGame, EXEC, ksame),
-      (Patience, EXEC, kpat),
-      (Poker, EXEC, kpoker),
-      (Mahjongg, EXEC, kmahjongg),
-      ("Shisen-Sho", EXEC, kshisen),
-      (Konquest, EXEC, konquest),
-      (Sirtet, EXEC, ksirtet),
-      (Smiletris, EXEC, ksmiletris),
-      ("Snake Race", EXEC, ksnake),
-      (Sokoban, EXEC, ksokoban)
-    ),
-    (
-      Graphics,
-      ("DVI Viewer", EXEC, kdvi),
-      ("Fax Viewer", EXEC, kfax),
-      ("Fractals Generator", EXEC, kfract),
-      ("PS Viewer", EXEC, kghostview),
-      ("Icon Editor", EXEC, kiconedit),
-      ("Image Viewer", EXEC, kview),
-      (Paint, EXEC, kpaint),
-      (Snapshot, EXEC, ksnapshot)
-    ),
-    (
-      Internet,
-      ("Chat Client (ksirc)", EXEC, ksirc),
-      (PWS, EXEC, pws),
-      ("Mail client", EXEC, kmail),
-      ("News client", EXEC, krn),
-      (Kppp, EXEC, kppp),
-      ("KPPP - Logview", EXEC, kppplogview),
-      ("Mail monitor", EXEC, korn),
-      ("Archie client", EXEC, karchie),
-      (Biff, EXEC, kbiff),
-      ("User information", EXEC, kfinger),
-      ("Network utilities", EXEC, knu)
-    ),
-    (
-      Multimedia,
-      ("CD Player", EXEC, "kscd"),
-      ("Media Player", EXEC, "kmedia"),
-      ("Midi player", EXEC, kmidi),
-      ("Midi/Karaoke Player", EXEC, "kmid"),
-      ("Sound Mixer Panel", EXEC, "kmix")
-    ),
-    (
-      System,
-      ("Arrange Icons", EXEC, "kfmclient sortDesktop"),
-      (Fontmanager, EXEC, kfontmanager),
-      (Appfinder, EXEC, "xterm -T \"Appfinder\" -e kappfinder_restart"),
-      ("File manager ( Super User Mode )", EXEC, kfmsu),
-      ("International Keyboard Layout", EXEC, kikbd),
-      ("Desktop Pager", EXEC, kpager),
-      ("SysV Init Editor", EXEC, ksysv)
-    ),
-    (
-      Utilities,
-      ("Menu Editor", EXEC, kmenuedit),
-      (Konsole, EXEC, konsole),
-      (Terminal, EXEC, kvt),
-      ("Tape Backup Tool", EXEC, kdat),
-      (MoonPhase, EXEC, kmoon),
-      (Mouspedometa, EXEC, kodo),
-      ("World Watch", EXEC, kworldwatch),
-      ("Address book", EXEC, kab),
-      ("HP LaserJet Control Panel", EXEC, kljettool),
-      (KJots, EXEC, kjots),
-      (KNotes, EXEC, knotes),
-      ("Personal Time Tracker", EXEC, karm),
-      (KFloppy, EXEC, kfloppy),
-      ("Printer Queue", EXEC, klpq),
-      (Archiver, EXEC, ark),
-      (Calculator, EXEC, kcalc),
-      ("Hex Editor", EXEC, khexdit),
-      ("Cut & paste history (klipper)", EXEC, klipper),
-      ("Process management", EXEC, kpm),
-      (kpackage, EXEC, kpackage)
-    )
-  ),
-  (
-    Diverse,
-    (Xmcd, SHEXEC, "xmcd 2> /dev/null"),
-    (Xplaycd, EXEC, xplaycd),
-    (Xmixer, EXEC, xmixer)
+    "Diverse",
+    ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
+    ("Xplaycd", EXEC, xplaycd),
+    ("Xmixer", EXEC, xmixer)
  ),
  (
    "Tilbeh\370r",
    (Lommeregner, EXEC, xcalc),
-    ("Window Egenskaber", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+    (
+      "Vindues Egenskaber",
+      SHEXEC,
+      "xprop | xmessage -center -title 'xprop' -file -"
+    ),
    ("V\346lg skrifttype", EXEC, xfontsel),
    (Terminalemulator, EXEC, xminicom),
    ("Forst\370rrelsesglas", EXEC, xmag),
@@ -173,15 +74,15 @@
    (Udklipsbord, EXEC, xclipboard)
  ),
  (
-    Markering,
+    "Markeret",
    (Kopier, SHEXEC, "echo '%s' | wxcopy"),
-    ("Send e-post", EXEC, "rxvt -name mail -T Pine -e pine %s"),
+    ("Send e-post til", EXEC, "xterm -name mail -T Pine -e pine %s"),
    ("Indtast URL", EXEC, "netscape %s"),
-    ("S\370g i manual", EXEC, "MANUAL_SEARCH(%s)")
+    ("S\370g i Manual", EXEC, "MANUAL_SEARCH(%s)")
  ),
  (
-    Arbejdsbord,
-    ("Gem andre", HIDE_OTHERS),
+    "Arbejdsbord",
+    ("Skjul andre", HIDE_OTHERS),
    ("Vis alle", SHOW_ALL),
    ("Arranger ikoner", ARRANGE_ICONS),
    ("Genindl\346s", REFRESH),
@@ -190,16 +91,31 @@
    ("Slet gemt milj\370", CLEAR_SESSION)
  ),
  (
-    Udseende,
-    (Temaer, OPEN_MENU, "-noext #wmdatadir#/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-    (Stil, OPEN_MENU, "-noext #wmdatadir#/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-    ("Ikons\346t", OPEN_MENU, "-noext #wmdatadir#/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+    "Udseende",
    (
-      Baggrund,
+      "Temaer",
+      OPEN_MENU,
+      "-noext /usr/local/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowM
+aker/Themes WITH setstyle"
+    ),
+    (
+      "Stil",
+      OPEN_MENU,
+      "-noext /usr/local/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowM
+aker/Styles WITH setstyle"
+    ),
+    (
+      "Ikons\346t",
+      OPEN_MENU,
+      "-noext /usr/local/share/WindowMaker/IconSets  $HOME/GNUstep/Library/Windo
+wMaker/IconSets WITH seticons"
+    ),
+    (
+      "Baggrund",
      (
-        Ensfarvet,
+        "Ensfarvet",
        (
-          Sort,
+          "Sort",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(solid, black)'"
        ),
@@ -209,7 +125,7 @@
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#505075\")'"
        ),
        (
-          Indigo,
+          "Indigo",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#243e6c\")'"
        ),
@@ -219,12 +135,12 @@
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#180090\")'"
        ),
        (
-          Lilla,
+          "Lilla",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#554466\")'"
        ),
        (
-          Hvede,
+          "Hvede",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"wheat4\")'"
        ),
@@ -234,80 +150,93 @@
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#333340\")'"
        ),
        (
-          Bordeaux,
+          "Bordeaux",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(solid, \"#400020\")'"
        )
      ),
      (
-        Nuancer,
+        "Nuancer",
        (
-          Flag,
+          "Solopgang",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(mdgradient, green, red, white, green)'"
+          "wdwrite WindowMaker WorkspaceBack  '(mvgradient, deepskyblue4, black,
+ deepskyblue4, tomato4)'"
        ),
        (
-          Himmel,
+          "Himmel",
          EXEC,
          "wdwrite WindowMaker WorkspaceBack  '(vgradient, blue4, white)'"
        ),
        (
-          "Blue Shades",
+          "Bl\345 Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#7080a5\", \"#101020\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#7080a5\", \"#10102
+0\")'"
        ),
        (
-          "Indigo Shades",
+          "Indigo Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#746ebc\", \"#242e4c\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#746ebc\", \"#242e4
+c\")'"
        ),
        (
-          "Purple Shades",
+          "Lilla Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#654c66\", \"#151426\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#654c66\", \"#15142
+6\")'"
        ),
        (
-          "Wheat Shades",
+          "Hvede Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#a09060\", \"#302010\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#a09060\", \"#30201
+0\")'"
        ),
        (
-          "Grey Shades",
+          "Gr\345 Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#636380\", \"#131318\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#636380\", \"#13131
+8\")'"
        ),
        (
-          "Wine Shades",
+          "Bordeaux Skygger",
          EXEC,
-          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#600040\", \"#180010\")'"
+          "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#600040\", \"#18001
+0\")'"
+        ),
+        (
+          "Flag",
+          EXEC,
+          "wdwrite WindowMaker WorkspaceBack  '(mdgradient, green, red, white, g
+reen)'"
        )
      ),
      (
-        Billeder,
+        "Billeder",
        OPEN_MENU,
-        "-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+        "-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/
+WindowMaker/Backgrounds WITH wmsetbg -u -t"
      )
    ),
    (
-      "Gem tema",
+      "Gem Tema",
      SHEXEC,
-      "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indtast fil navn:)\""
+      "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indta
+st navn:)\""
    ),
    (
-      "Gem ikons\346t",
+      "Gem Ikons\346t",
      SHEXEC,
-      "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikonsæt navn,Enter fil navn:)\""
+      "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikons\346t nav
+n,Indtast navn:)\""
    )
  ),
  (
-    Afslut,
+    "Afslut",
    ("Genstart", RESTART),
-    ("Start Fvwm2", RESTART, fvwm2),
-    ("Start AfterStep", RESTART, afterstep),
-    ("Start Icewm", RESTART, icewm),
-    ("Start KDE", RESTART, startkde),
    ("Start Blackbox", RESTART, blackbox),
-    ("Afslut WindowMaker...", EXIT),
-    ("Afslut X...", SHUTDOWN)
+    ("Start kwm", RESTART, kwm),
+    ("Start IceWM", RESTART, icewm),
+    ("Afslut...", EXIT)
  )
 )
--- a/WindowMaker/plmenu.de
+++ b/WindowMaker/plmenu.de
@@ -0,0 +1,105 @@
+("Anwendungen",
+ ("Info",
+  ("Infokasten...", INFO_PANEL),
+  ("Rechtliches...", LEGAL_PANEL),
+  ("Systemkonsole", EXEC, "xconsole"),
+  ("Systemlast", SHEXEC, "xosview || xload"),
+  ("Prozessliste", EXEC, "xterm -e top"),
+  ("Man-Page-Betrachter", EXEC, "xman")
+  ),
+ ("Ausführen...", SHEXEC, "%a(Ausführen,Auszuführender Befehl:)"),
+ ("XTerm", EXEC, "xterm -sb"),
+ ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("Arbeitsflächen", WORKSPACE_MENU),
+ ("Anwendungen",
+  ("Grafik",
+   ("Gimp", SHEXEC, "gimp >/dev/null"),
+   ("XV", EXEC, "xv"),
+   ("XPaint", EXEC, "xpaint"),
+   ("XFig", EXEC, "xfig")
+   ),
+  ("X File Manager", EXEC, "xfm"),
+  ("OffiX Files", EXEC, "files"),
+  ("LyX", EXEC, "lyx"),
+  ("Netscape", EXEC, "netscape"),
+  ("Ghostview", EXEC, "ghostview %a(Zu betrachtende Datei:)"),
+  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
+  ("TkDesk", EXEC, "tkdesk")
+  ),
+ ("Editoren",
+  ("XFte", EXEC, "xfte"),
+  ("XEmacs", SHEXEC, "xemacs || emacs"),
+  ("XJed", EXEC, "xjed"),
+  ("NEdit", EXEC, "nedit"),
+  ("Xedit", EXEC, "xedit"),
+  ("VI", EXEC, "xterm -e vi")
+  ),
+ ("Verschiedenes",
+  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
+  ("Xplaycd", EXEC, "xplaycd"),
+  ("Xmixer", EXEC, "xmixer")
+  ),
+ ("Werkzeuge",
+  ("Taschenrechner", EXEC, "xcalc"),
+  ("Fenstereigenschaften", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+  ("Schriftartwähler", EXEC, "xfontsel"),
+  ("Terminalemulator", EXEC, "xminicom"),
+  ("Vergrößern", EXEC, "xmag"),
+  ("Colormap", EXEC, "xcmap"),
+  ("XKill", EXEC, "xkill"),
+  ("ASClock", EXEC, "asclock -shape"),
+  ("Zwischenablage", EXEC, "xclipboard")
+  ),
+ ("Auswahl",
+  ("Kopieren", SHEXEC, "echo '%s' | wxcopy"),
+  ("Mail an", EXEC, "xterm -name mail -T Pine -e pine %s"),
+  ("Mit Browser darstellen", EXEC, "netscape %s"),
+  ("In Man-Pages suchen", EXEC, "MANUAL_SEARCH(%s)")
+  ),
+ ("Arbeitsfläche",
+  ("Andere verbergen", HIDE_OTHERS),
+  ("Alle zeigen", SHOW_ALL),
+  ("Icons anordnen", ARRANGE_ICONS),
+  ("Auffrischen", REFRESH),
+  ("Sperren", EXEC, "xlock -allowroot -usefirst"),
+  ("Sitzung speichern", SAVE_SESSION),
+  ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
+  ),
+ ("Erscheinungsbild",
+  ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes /home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles /home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Hintergrund",
+   ("Einfarbig",
+    ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+    ("Blau",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+    ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+    ("Tiefblau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"),
+    ("Purpur", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+    ("Weizen", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+    ("Dunkelgrau", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+    ("Wein", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+    ),
+   ("Verlauf",
+    ("Sonnenuntergang", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+    ("Himmel", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+    ("Blau schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+    ("Indigofarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+    ("Purpurfarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+    ("Weizenfarben schattiert",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+    ("Grau schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+    ("Weinfarben schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+    ),
+   ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds /home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ),   
+  ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
+  ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
+  ), 
+ ("Beenden",
+  ("Neustart", RESTART),
+  ("BlackBox starten", RESTART, blackbox),
+  ("kwm starten", RESTART, kwm),
+  ("IceWM starten", RESTART, icewm),
+  ("Beenden...", EXIT)
+ )
+)
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -101,7 +98,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -108,7 +105,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -118,7 +115,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
--- a/po/README
+++ b/po/README
@@ -6,10 +6,10 @@ File	Language	Note	Current Maintainer
 ja.po	Japanese	1	ABE Shige <sabe@ibm.net>
 				MANOME Tomonori <manome@itlb.te.noda.sut.ac.jp>
 pt.po	Portuguese		Eliphas Levy Theodoro <eliphas@conectiva.com.br>
-de.po	German			Carsten Schaar 
-					<nhadcasc@fs-maphy.uni-hannover.de>
+de.po	German			Bernd Eggert <Bernd.Eggert@t-online.de>
+				[Matthias Warkus <mawarkus@t-online.de>]
 es.po	Spanish			Raul Benito Garcia <raul@fi.upm.es>
-ko.po	Korean		1,2	Byeong-Chan, Kim <redhands@linux.sarang.net>
+ko.po	Korean		1,2	Byeong-Chan Kim <redhands@linux.sarang.net>
 se.po	Swedish			John Forgoil <forgoil@rsn.hk-r.se>
 cs.po	Czech		3	David ©auer <xsauer@hwlab.felk.cvut.cz>
 no.po	Norwegian		Marcus Ramberg <draven@mo.himolde.no>
@@ -39,6 +39,11 @@ sk.po	Slovak			Milan Hromada <mhromada@elas.sk>
 Some translations are based on previous translations by other people.
 The history of translations can be found in the po files.

+If you want to update a translation that's maintained by someone else
+please please please contact the original maintainer first. It's for
+your own good.
+
+
 Notes
 -----
 1. Multibyte character support must be enabled in WindowMaker. 
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/ko.po
+++ b/po/ko.po
@@ -5,16 +5,16 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 0.53.0\n"
-"POT-Creation-Date: 1999-06-03 01:12+0900\n"
-"PO-Revision-Date: 1999-06-03 01:30+0900\n"
+"Project-Id-Version: 0.60.0\n"
+"POT-Creation-Date: 1999-06-04 11:52+0900\n"
+"PO-Revision-Date: 1999-06-04 11:56+0900\n"
 "Last-Translator: Byeong-Chan Kim <redhands@linux.sarang.net>\n"
 "Language-Team: Korean\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=EUC-KR\n"
 "Content-Transfer-Encoding: 8-bit\n"

-#: ../src/appicon.c:570 ../src/dialog.c:223 ../src/dock.c:3300
+#: ../src/appicon.c:570 ../src/dialog.c:223 ../src/dock.c:3301
 #: ../src/dockedapp.c:210 ../src/dockedapp.c:251 ../src/rootmenu.c:1754
 #: ../src/winspector.c:290 ../src/winspector.c:306
 msgid "Error"
@@ -26,7 +26,7 @@ msgstr "

 #: ../src/appicon.c:572 ../src/dialog.c:122 ../src/dialog.c:223
 #: ../src/dialog.c:460 ../src/dialog.c:1477 ../src/dock.c:514
-#: ../src/dock.c:522 ../src/dock.c:545 ../src/dock.c:3301
+#: ../src/dock.c:522 ../src/dock.c:545 ../src/dock.c:3302
 #: ../src/dockedapp.c:211 ../src/dockedapp.c:257 ../src/dockedapp.c:371
 #: ../src/rootmenu.c:1758 ../src/winspector.c:291 ../src/winspector.c:307
 msgid "OK"
@@ -54,12 +54,12 @@ msgstr "
 msgid "No"
 msgstr "아니오"

-#: ../src/appicon.c:624 ../src/dock.c:1195
+#: ../src/appicon.c:624 ../src/dock.c:1196
 msgid "Unhide Here"
 msgstr "숨긴 것 이곳에 보임"

-#: ../src/appicon.c:625 ../src/appicon.c:650 ../src/dock.c:1197
-#: ../src/dock.c:1199 ../src/dock.c:3473 ../src/dock.c:3475
+#: ../src/appicon.c:625 ../src/appicon.c:650 ../src/dock.c:1198
+#: ../src/dock.c:1200 ../src/dock.c:3468 ../src/dock.c:3470
 #: ../src/winmenu.c:465
 msgid "Hide"
 msgstr "숨김"
@@ -68,12 +68,12 @@ msgstr "
 msgid "Set Icon..."
 msgstr "아이콘 지정..."

-#: ../src/appicon.c:627 ../src/dock.c:1203 ../src/rootmenu.c:228
+#: ../src/appicon.c:627 ../src/dock.c:1204 ../src/rootmenu.c:228
 #: ../src/rootmenu.c:242 ../src/winmenu.c:512
 msgid "Kill"
 msgstr "강제 종료"

-#: ../src/appicon.c:648 ../src/dock.c:3471
+#: ../src/appicon.c:648 ../src/dock.c:3466
 msgid "Unhide"
 msgstr "숨김 해제"

@@ -331,7 +331,7 @@ msgstr "
 msgid "Type the name for workspace %i:"
 msgstr "작업공간 %i의 이름을 입력하세요:"

-#: ../src/dock.c:213 ../src/dock.c:1160 ../src/dock.c:1163 ../src/dock.c:3383
+#: ../src/dock.c:213 ../src/dock.c:1160 ../src/dock.c:1163 ../src/dock.c:3384
 msgid "Rename Workspace"
 msgstr "작업공간 이름 바꿈"

@@ -355,9 +355,9 @@ msgid ""
 "docked in the same position on the other workspaces and the Clip is not full "
 "in some workspace."
 msgstr ""
-"아이콘을 항상 보이게 할 수 없습니다. 다른 작업 공간의 같은 위치에 "
-"아이콘이 도크되지 않았는지 그리고 다른 작업공간의 클립이 가득차지 않았는지 "
-"확인 하시기 바랍니다."
+"아이콘을 항상 보이게 할 수 없습니다. 다른 작업 공간의 같은 위치에 아이콘이 "
+"도크되지 않았는지 그리고 다른 작업공간의 클립이 가득차지 않았는지 확인 "
+"하시기 바랍니다."

 #: ../src/dock.c:543
 msgid "Workspace Clip"
@@ -367,11 +367,11 @@ msgstr "
 msgid "All selected icons will be removed!"
 msgstr "선택한 모든 아이콘이 없어질 것입니다!!"

-#: ../src/dock.c:591 ../src/dock.c:1174 ../src/dock.c:1176 ../src/dock.c:3425
+#: ../src/dock.c:591 ../src/dock.c:1175 ../src/dock.c:1177 ../src/dock.c:3420
 msgid "Keep Icon"
 msgstr "아이콘 유지"

-#: ../src/dock.c:592 ../src/dock.c:2129 ../src/dock.c:2263
+#: ../src/dock.c:592 ../src/dock.c:2130 ../src/dock.c:2264
 msgid "Type the command used to launch the application"
 msgstr "애플리케이션을 실행하는데 필요한 명령을 입력합니다"

@@ -420,92 +420,80 @@ msgstr "
 msgid "Clip Options"
 msgstr "클립 옵션"

-#: ../src/dock.c:1165 ../src/dock.c:1167 ../src/dock.c:3407
-msgid "Select Icon"
-msgstr "아이콘 선택"
+#: ../src/dock.c:1165
+msgid "Selected"
+msgstr "선택됨"

-#: ../src/dock.c:1169 ../src/dock.c:1172 ../src/dock.c:3416
+#: ../src/dock.c:1170 ../src/dock.c:1173 ../src/dock.c:3411
 msgid "Select All Icons"
 msgstr "모든 아이콘 선택"

-#: ../src/dock.c:1178 ../src/dock.c:1180 ../src/dock.c:3433
+#: ../src/dock.c:1179 ../src/dock.c:1181 ../src/dock.c:3428
 msgid "Move Icon To"
 msgstr "아이콘 옮김"

-#: ../src/dock.c:1185 ../src/dock.c:1188 ../src/dock.c:3444
+#: ../src/dock.c:1186 ../src/dock.c:1189 ../src/dock.c:3439
 msgid "Remove Icon"
 msgstr "아이콘 없앰"

-#: ../src/dock.c:1190
+#: ../src/dock.c:1191
 msgid "Attract Icons"
 msgstr "아이콘 모음"

-#: ../src/dock.c:1193
+#: ../src/dock.c:1194
 msgid "Launch"
 msgstr "실행"

-#: ../src/dock.c:1201
+#: ../src/dock.c:1202
 msgid "Settings..."
 msgstr "설정..."

-#: ../src/dock.c:1594 ../src/dock.c:1608 ../src/dock.c:1622 ../src/dock.c:1632
-#: ../src/dock.c:1657
+#: ../src/dock.c:1595 ../src/dock.c:1609 ../src/dock.c:1623 ../src/dock.c:1633
+#: ../src/dock.c:1658
 #, c-format
 msgid "bad value in docked icon state info %s"
 msgstr "Dock 아이콘의 상태정보에 잘못된 값 %s"

-#: ../src/dock.c:1640
+#: ../src/dock.c:1641
 #, c-format
 msgid "bad value in docked icon position %i,%i"
 msgstr "Dock 아이콘의 위치값 %i,%i 는 잘못된 값"

-#: ../src/dock.c:1896
+#: ../src/dock.c:1897
 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
 msgstr "Dock에 들어간 아이콘이 너무 많음. 맞지 않는 것은 무시합니다"

 #. icon->forced_dock = 1;
-#: ../src/dock.c:2128 ../src/dock.c:2262
+#: ../src/dock.c:2129 ../src/dock.c:2263
 msgid "Dock Icon"
 msgstr "Dock 아이콘"

-#: ../src/dock.c:3293 ../src/dock.c:3297
+#: ../src/dock.c:3294 ../src/dock.c:3298
 #, c-format
 msgid "Could not execute command \"%s\""
 msgstr "\"%s\" 명령을 실행할 수 없음."

-#: ../src/dock.c:3390 ../src/winmenu.c:417 ../src/winspector.c:1197
-msgid "Omnipresent"
-msgstr "항상 보임"
-
-#: ../src/dock.c:3392
+#: ../src/dock.c:3390
 msgid "Toggle Omnipresent"
 msgstr "항상 보임 선택"

-#: ../src/dock.c:3395
-msgid "Unset Omnipresent"
-msgstr "항상 보임 해제"
+#: ../src/dock.c:3395 ../src/winmenu.c:417 ../src/winspector.c:1197
+msgid "Omnipresent"
+msgstr "항상 보임"

-#: ../src/dock.c:3397
-msgid "Set Omnipresent"
-msgstr "항상 보임 설정"
-
-#: ../src/dock.c:3405
-msgid "Unselect Icon"
-msgstr "아이콘 선택 해제"
-
-#: ../src/dock.c:3414
+#: ../src/dock.c:3409
 msgid "Unselect All Icons"
 msgstr "모든 아이콘 선택 해제"

-#: ../src/dock.c:3423
+#: ../src/dock.c:3418
 msgid "Keep Icons"
 msgstr "아이콘 유지"

-#: ../src/dock.c:3431
+#: ../src/dock.c:3426
 msgid "Move Icons To"
 msgstr "아이콘 옮김"

-#: ../src/dock.c:3442
+#: ../src/dock.c:3437
 msgid "Remove Icons"
 msgstr "아이콘 없앰"

@@ -529,9 +517,9 @@ msgid ""
 "is docked in the same position on the other workspaces, and the Clip is not "
 "full in some workspace, then try again."
 msgstr ""
-"아이콘을 항상 보이게 할 수 없습니다. 다른 작업 공간의 같은 위치에 "
-"아이콘이 도크되지 않았는지 그리고 다른 작업공간의 클립이 가득차지 않았는지 "
-"확인 하신 후에 다시 시도하십시오."
+"아이콘을 항상 보이게 할 수 없습니다. 다른 작업 공간의 같은 위치에 아이콘이 "
+"도크되지 않았는지 그리고 다른 작업공간의 클립이 가득차지 않았는지 확인 하신 "
+"후에 다시 시도하십시오."

 #: ../src/dockedapp.c:313
 msgid "Start when WindowMaker is started"
@@ -1070,8 +1058,8 @@ msgstr "%s:

 #: ../src/rootmenu.c:1755
 msgid ""
-"The applications menu could not be loaded.Look at the console output for a "
-"detaileddescription of the errors"
+"The applications menu could not be loaded. Look at the console output for a "
+"detailed description of the errors."
 msgstr ""
 "애플리케이션 메뉴를 읽을 수 없음. 콘솔로 출력되는 자세한 오류 메세지를 "
 "참고하십시오."
--- a/po/pt.po
+++ b/po/pt.po
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -129,7 +126,7 @@ DIST_COMMON =  Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(wtest_SOURCES)
 OBJECTS = $(wtest_OBJECTS)
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -10,12 +10,12 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c \
 		wkdemenu.pl

-INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
+INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib \
+	@HEADER_SEARCH_PATH@

 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
 liblist= @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@

-
 wdwrite_LDADD = $(liblist)

 wxcopy_LDADD = @XLFLAGS@ @XLIBS@ 
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -57,12 +57,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -77,7 +75,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -101,7 +98,8 @@ bin_SCRIPTS = wmaker.inst wm-oldmenu2new wsetfont wkdemenu.pl
 EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wsetfont directjpeg.c 		wkdemenu.pl


-INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@
+INCLUDES = @DFLAGS@ -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib 	@HEADER_SEARCH_PATH@
+

 # X_EXTRA_LIBS is for libproplist in systems that need -lsocket
 liblist = @LIBRARY_SEARCH_PATH@ @LIBPL@ @X_EXTRA_LIBS@
@@ -190,7 +188,7 @@ DIST_COMMON =  README Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(wxcopy_SOURCES) $(wxpaste_SOURCES) $(wdwrite_SOURCES) $(getstyle_SOURCES) $(setstyle_SOURCES) $(seticons_SOURCES) $(geticonset_SOURCES) $(wmsetbg_SOURCES)
 OBJECTS = $(wxcopy_OBJECTS) $(wxpaste_OBJECTS) $(wdwrite_OBJECTS) $(getstyle_OBJECTS) $(setstyle_OBJECTS) $(seticons_OBJECTS) $(geticonset_OBJECTS) $(wmsetbg_OBJECTS)
--- a/util/wmsetbg.c
+++ b/util/wmsetbg.c
@@ -51,7 +51,7 @@

 #include <proplist.h>

-#define PROG_VERSION	"wmsetbg (Window Maker) 2.3"
+#define PROG_VERSION	"wmsetbg (Window Maker) 2.5"


 #define WORKSPACE_COUNT (MAX_WORKSPACES+1)
@@ -350,6 +350,8 @@ parseTexture(RContext *rc, char *text)
 	RImage *image = NULL;
 	int w, h;
 	int iwidth, iheight;
+	RColor rcolor;
+

 	GETSTRORGOTO(val, tmp, 1, error);
 /*
@@ -374,12 +376,18 @@ parseTexture(RContext *rc, char *text)
 	    goto error;
 	}
 	if (!XAllocColor(dpy, DefaultColormap(dpy, scr), &color)) {
-	    RColor rcolor;
-
 	    rcolor.red = color.red >> 8;
 	    rcolor.green = color.green >> 8;
 	    rcolor.blue = color.blue >> 8;
 	    RGetClosestXColor(rc, &rcolor, &color);
+	} else {
+	    rcolor.red = 0;
+	    rcolor.green = 0;
+	    rcolor.blue = 0;
+	}
+	/* for images with a transparent color */
+	if (image->data[3]) {
+	    RCombineImageWithColor(image, &rcolor);
 	}

 	switch (toupper(type[0])) {
@@ -842,8 +850,9 @@ setPixmapProperty(Pixmap pixmap)
 void
 changeTexture(BackgroundTexture *texture)
 {
-    if (!texture)
+    if (!texture) {
 	return;
+    }

    if (texture->solid) {
 	XSetWindowBackground(dpy, root, texture->color.pixel);
@@ -958,10 +967,11 @@ helperLoop(RContext *rc)
 #ifdef DEBUG
 	    printf("change texture %i\n", workspace);
 #endif
-	    if (!textures[workspace])
+	    if (!textures[workspace]) {
 		changeTexture(textures[0]);
-	    else
+	    } else {
 		changeTexture(textures[workspace]);
+	    }
 	    break;

 	 case 'P':
@@ -1350,9 +1360,13 @@ main(int argc, char **argv)
    PixmapPath = getPixmapPath(domain);
    if (!smooth) {
 	proplist_t val;
-	
+#if 0 /* some problem with Alpha... TODO: check if its right */
 	val = PLGetDictionaryEntry(domain, 
 				   PLMakeString("SmoothWorkspaceBack"));
+#else
+	val = getValueForKey(domain, "SmoothWorkspaceBack");
+#endif
+
 	if (val && PLIsString(val) && strcasecmp(PLGetString(val), "YES")==0)
 	    smooth = True;
    }
@@ -1408,7 +1422,7 @@ main(int argc, char **argv)
 	    changeTexture(tex);
 	else {
 	    /* always update domain */
-	    changeTextureForWorkspace(domain, texture, workspace-1);
+	    changeTextureForWorkspace(domain, texture, workspace);
 	}
    }

--- a/wmlib/Makefile.in
+++ b/wmlib/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -130,7 +127,7 @@ DIST_COMMON =  COPYING.LIB Makefile.am Makefile.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libWMaker_a_SOURCES)
 OBJECTS = $(libWMaker_a_OBJECTS)
--- a/wrlib/Makefile.in
+++ b/wrlib/Makefile.in
@@ -59,12 +59,10 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 host_alias = @host_alias@
 host_triplet = @host@
-AS = @AS@
 CC = @CC@
 CPP_PATH = @CPP_PATH@
 DFLAGS = @DFLAGS@
 DLLIBS = @DLLIBS@
-DLLTOOL = @DLLTOOL@
 GFXLIBS = @GFXLIBS@
 HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@
 ICONEXT = @ICONEXT@
@@ -79,7 +77,6 @@ MAKEINFO = @MAKEINFO@
 MOFILES = @MOFILES@
 NLSDIR = @NLSDIR@
 NM = @NM@
-OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
@@ -169,7 +166,7 @@ Makefile.in NEWS TODO alloca.c configure.in

 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)

-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 SOURCES = $(libwraster_la_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES)
 OBJECTS = $(libwraster_la_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS)
--- a/wrlib/convert.c
+++ b/wrlib/convert.c
@@ -217,6 +217,7 @@ image2TrueColorD16(RContext *ctx, RImage *image)
 	    ofs += image->width;
            /*(char*)dataP += line_offset;*/
            dataP = (unsigned short *)((char *)dataP + line_offset);
+
 	    /* skip to next line */
 	    terr = rerr;
 	    rerr = nrerr;