diff --git a/NEWS b/NEWS
index 8e851180..a4286bf7 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
 NEWS for veteran Window Maker users
 -----------------------------------
 
---- 0.53.1
+--- 0.54.0
 
 New Option For setstyle
 -----------------------
diff --git a/WINGs/Resources/Makefile.in b/WINGs/Resources/Makefile.in
index a8bf066a..6451bfc8 100644
--- a/WINGs/Resources/Makefile.in
+++ b/WINGs/Resources/Makefile.in
@@ -108,9 +108,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WINGs/Resources/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -142,6 +142,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WINGs/Resources
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WINGs/Resources/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WINGs/wballoon.c b/WINGs/wballoon.c
index c3be98a6..2f491b81 100644
--- a/WINGs/wballoon.c
+++ b/WINGs/wballoon.c
@@ -172,18 +172,19 @@ W_BalloonHandleLeaveView(WMView *view)
 {
     Balloon *bPtr = view->screen->balloon;
 
-    if (bPtr->view->flags.mapped && bPtr->forWindow == view->window) {
-	W_UnmapView(bPtr->view);
-
+    if (bPtr->forWindow == view->window) {
+	if (bPtr->view->flags.mapped) {
+	    W_UnmapView(bPtr->view);
+	    bPtr->noDelayTimer = WMAddTimerHandler(NO_DELAY_DELAY,
+						   clearNoDelay, bPtr);
+	}
 	if (bPtr->timer)
 	    WMDeleteTimerHandler(bPtr->timer);
 
 	bPtr->timer = NULL;
 
-	bPtr->noDelayTimer = WMAddTimerHandler(NO_DELAY_DELAY, clearNoDelay, 
-					       bPtr);
+	bPtr->forWindow = None;
     }
-    bPtr->forWindow = None;
 }
 
 
@@ -210,8 +211,6 @@ showBalloon(void *data)
 
     showText(bPtr, x, y, view->size.width, view->size.height, text);
 
-    bPtr->forWindow = view->window;
-
     bPtr->flags.noDelay = 1;
 }
 
@@ -228,8 +227,6 @@ W_BalloonHandleEnterView(WMView *view)
 
     text = WMHashGet(bPtr->table, view);
     if (!text) {
-	bPtr->forWindow = None;
-
 	if (bPtr->view->flags.realized)
 	    W_UnmapView(bPtr->view);
 
@@ -238,11 +235,14 @@ W_BalloonHandleEnterView(WMView *view)
 
     if (bPtr->timer)
 	WMDeleteTimerHandler(bPtr->timer);
+    bPtr->timer = NULL;
 
     if (bPtr->noDelayTimer)
 	WMDeleteTimerHandler(bPtr->noDelayTimer);
     bPtr->noDelayTimer = NULL;
 
+    bPtr->forWindow = view->window;
+
     if (bPtr->flags.noDelay) {
 	bPtr->timer = NULL;
 
diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c
index 3c5690f4..cf5c50ae 100644
--- a/WINGs/wtextfield.c
+++ b/WINGs/wtextfield.c
@@ -1070,6 +1070,7 @@ handleTextFieldActionEvents(XEvent *event, void *data)
      case KeyPress:
         if (tPtr->flags.enabled && tPtr->flags.focused)
             handleTextFieldKeyPress(tPtr, event);
+	
         break;
 
      case MotionNotify:
diff --git a/WPrefs.app/Preferences.c b/WPrefs.app/Preferences.c
index f73561cc..101fc3b4 100644
--- a/WPrefs.app/Preferences.c
+++ b/WPrefs.app/Preferences.c
@@ -192,7 +192,7 @@ createPanel(Panel *p)
     for (i=0; i<4; i++) {
 	panel->ballB[i] = WMCreateSwitchButton(panel->ballF);
 	WMResizeWidget(panel->ballB[i], 205, 20);
-	WMMoveWidget(panel->ballB[i], 15, 25+i*30);
+	WMMoveWidget(panel->ballB[i], 15, 20+i*25);
     }
     WMSetButtonText(panel->ballB[0], _("incomplete window titles"));
     WMSetButtonText(panel->ballB[1], _("miniwindow titles"));
diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h
index 87155855..56ec9f3a 100644
--- a/WPrefs.app/WPrefs.h
+++ b/WPrefs.app/WPrefs.h
@@ -2,7 +2,7 @@
  * 
  *  WPrefs - Window Maker Preferences Program
  * 
- *  Copyright (c) 1998 Alfredo K. Kojima
+ *  Copyright (c) 1998, 1999 Alfredo K. Kojima
  * 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,7 +43,7 @@
 /****/
 
 #define WVERSION	"0.40"
-#define WMVERSION	"0.53.x"
+#define WMVERSION	"0.54.x"
 
 
 extern char *NOptionValueChanged;
diff --git a/WPrefs.app/po/Makefile.in b/WPrefs.app/po/Makefile.in
index 32fd1ca1..9de9fbfc 100644
--- a/WPrefs.app/po/Makefile.in
+++ b/WPrefs.app/po/Makefile.in
@@ -120,9 +120,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .mo .po
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/po/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -135,6 +135,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/po
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/po/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WPrefs.app/po/README b/WPrefs.app/po/README
index 794db89b..fe51c44a 100644
--- a/WPrefs.app/po/README
+++ b/WPrefs.app/po/README
@@ -7,6 +7,7 @@ File	Language		Current Maintainer
 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>
 cs.po	Czech		 	David ©auer <xsauer@hwlab.felk.cvut.cz>
 ja.po	Japanese		Kazuhide Takahashi <kazu@dgra.ne.jp>
diff --git a/WPrefs.app/po/fr.po b/WPrefs.app/po/fr.po
index bb4f2f34..31a210a8 100644
--- a/WPrefs.app/po/fr.po
+++ b/WPrefs.app/po/fr.po
@@ -1,105 +1,417 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Date: 1998-08-24 14:36:41-0300\n"
-"From: Bastien NOCERA <hadess@writeme.com>\n"
-"Language-Team:  French\n"
-"Content-Type: text/plain; charset=ISO8859-1\n"
-"Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n"
-"Files: ../../WPrefs/Configurations.c ../../WPrefs/Expert.c ../../WPrefs/Focus.c ../../WPrefs/KeyboardSettings.c ../../WPrefs/KeyboardShortcuts.c ../../WPrefs/Menu.c ../../WPrefs/MenuGuru.c ../../WPrefs/MenuPreferences.c ../../WPrefs/MouseSettings.c ../../WPrefs/Paths.c ../../WPrefs/Preferences.c ../../WPrefs/Text.c ../../WPrefs/TextureAndColor.c ../../WPrefs/WPrefs.c ../../WPrefs/WindowHandling.c ../../WPrefs/Workspace.c ../../WPrefs/main.c ../../WPrefs/xmodifier.c\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-04-22 07:09+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
 
-#: ../../WPrefs/Configurations.c:141 ../../WPrefs/Configurations.c:147 ../../WPrefs/MouseSettings.c:456 ../../WPrefs/WindowHandling.c:274 ../../WPrefs/WindowHandling.c:286 ../../WPrefs/Workspace.c:78 ../../WPrefs/Workspace.c:84
+#: ../../WPrefs.app/main.c:74
+#, c-format
+msgid "usage: %s [options]\n"
+msgstr "usage: %s [options]\n"
+
+#: ../../WPrefs.app/main.c:75
+msgid "options:"
+msgstr "options:"
+
+#: ../../WPrefs.app/main.c:76
+msgid " -display <display>\tdisplay to be used"
+msgstr " -display host:dpy\tdisplay à utiliser"
+
+#: ../../WPrefs.app/main.c:77
+msgid " --version\t\tprint version number and exit"
+msgstr " --version\t\taffiche le numéro de version et quitte"
+
+#: ../../WPrefs.app/main.c:78
+msgid " --help\t\tprint this message and exit"
+msgstr " --help\t\taffiche ce message et quitte"
+
+#: ../../WPrefs.app/main.c:137
+#, c-format
+msgid "too few arguments for %s"
+msgstr "Trop peu d'arguments pour %s"
+
+#: ../../WPrefs.app/main.c:159
+msgid "X server does not support locale"
+msgstr "le Serveur X ne supporte pas les locale"
+
+#: ../../WPrefs.app/main.c:162
+msgid "cannot set locale modifiers"
+msgstr "Modificateurs de locale inappliquables."
+
+#: ../../WPrefs.app/main.c:168
+#, c-format
+msgid "could not open display %s"
+msgstr "Ouverture du display «%s» impossible."
+
+#: ../../WPrefs.app/main.c:176
+msgid "could not initialize application"
+msgstr "Initialisation de l'application impossible."
+
+#: ../../WPrefs.app/WPrefs.c:239
+msgid "Window Maker Preferences"
+msgstr "Préférences de Window Maker"
+
+#: ../../WPrefs.app/WPrefs.c:263
+msgid "Revert Page"
+msgstr "Défaire la Page"
+
+#: ../../WPrefs.app/WPrefs.c:269
+msgid "Revert All"
+msgstr "Tout Défaire"
+
+#: ../../WPrefs.app/WPrefs.c:275
+msgid "Save"
+msgstr "Sauver"
+
+#: ../../WPrefs.app/Appearance.c:1593 ../../WPrefs.app/WPrefs.c:281
+msgid "Close"
+msgstr "Fermer"
+
+#: ../../WPrefs.app/WPrefs.c:299
+msgid "Window Maker Preferences Utility"
+msgstr "Utilitaire de Configuration de Window Maker"
+
+#: ../../WPrefs.app/WPrefs.c:306
+#, c-format
+msgid "Version %s for Window Maker %s"
+msgstr "Version %s pour Window Maker %s"
+
+#: ../../WPrefs.app/WPrefs.c:313
+msgid "Starting..."
+msgstr "Démarrage..."
+
+#: ../../WPrefs.app/WPrefs.c:319
+msgid ""
+"Programming/Design: Alfredo K. Kojima\n"
+"Artwork: Marco van Hylckama Vlieg\n"
+"More Programming: James Thompson"
+msgstr ""
+"Programmation/Conception: Alfredo K. Kojima\n"
+"Dessins: Marco van Hylckama Vlieg"
+"Plus de Programmation: James Thompson"
+
+#: ../../WPrefs.app/WPrefs.c:407
+#, c-format
+msgid "could not locate image file %s\n"
+msgstr "Image %s introuvable\n"
+
+#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246
+#: ../../WPrefs.app/Focus.c:314 ../../WPrefs.app/Focus.c:325
+#: ../../WPrefs.app/MenuPreferences.c:135
+#: ../../WPrefs.app/MenuPreferences.c:146
+#: ../../WPrefs.app/MenuPreferences.c:174
+#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:604
+#: ../../WPrefs.app/MouseSettings.c:615 ../../WPrefs.app/MouseSettings.c:671
+#: ../../WPrefs.app/MouseSettings.c:686 ../../WPrefs.app/MouseSettings.c:702
+#: ../../WPrefs.app/WPrefs.c:430 ../../WPrefs.app/WPrefs.c:447
+#, c-format
+msgid "could not load icon file %s"
+msgstr "Image %s introuvable"
+
+#: ../../WPrefs.app/WPrefs.c:520
+#, c-format
+msgid "could not load image file %s:%s"
+msgstr "Image %s introuvable: %s"
+
+#: ../../WPrefs.app/WPrefs.c:539
+msgid "Loading Window Maker configuration files..."
+msgstr "Lecture de la configuration de Window Maker..."
+
+#: ../../WPrefs.app/WPrefs.c:543
+msgid "Initializing configuration panels..."
+msgstr "Initialisation des panneaux de configuration..."
+
+#: ../../WPrefs.app/WPrefs.c:574
+msgid ""
+"WPrefs is free software and is distributed WITHOUT ANY\n"
+"WARRANTY under the terms of the GNU General Public License.\n"
+"The icons in this program are licensed through the\n"
+"OpenContent License."
+msgstr ""
+"WPrefs est un logiciel libre et distribué sans AUCUNE\n"
+"GARANTIE sous les termes de la GNU General Public License.\n"
+"Les icones de ce programme sont distribués sous licence\n"
+"OpenContent."
+
+#: ../../WPrefs.app/WPrefs.c:605 ../../WPrefs.app/WPrefs.c:670
+#, c-format
+msgid "Window Maker domain (%s) is corrupted!"
+msgstr "Le domaine Window Maker (%s) est corrompu!"
+
+#: ../../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"
+msgstr "Erreur"
+
+#: ../../WPrefs.app/Menu.c:1342 ../../WPrefs.app/MenuGuru.c:119
+#: ../../WPrefs.app/MenuGuru.c:126 ../../WPrefs.app/MenuGuru.c:140
+#: ../../WPrefs.app/MouseSettings.c:149 ../../WPrefs.app/MouseSettings.c:169
+#: ../../WPrefs.app/Text.c:181 ../../WPrefs.app/TexturePanel.c:605
+#: ../../WPrefs.app/TexturePanel.c:679 ../../WPrefs.app/TexturePanel.c:1505
+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:606
+#: ../../WPrefs.app/WPrefs.c:611 ../../WPrefs.app/WPrefs.c:622
+#: ../../WPrefs.app/WPrefs.c:634 ../../WPrefs.app/WPrefs.c:640
+#: ../../WPrefs.app/WPrefs.c:647 ../../WPrefs.app/WPrefs.c:671
+#: ../../WPrefs.app/WPrefs.c:676
+msgid "OK"
+msgstr "OK"
+
+#: ../../WPrefs.app/WPrefs.c:609
+#, c-format
+msgid "Could not load Window Maker domain (%s) from defaults database."
+msgstr "Lecture du domaine Window Maker (%s) impossible depuis la base par défaut."
+
+#: ../../WPrefs.app/WPrefs.c:617
+msgid "could not extract version information from Window Maker"
+msgstr "Extraction du numéro de version de Window Maker impossible."
+
+#: ../../WPrefs.app/WPrefs.c:618
+msgid "Make sure wmaker is in your search path."
+msgstr "Assurez-vous que WindowMaker est dans votre PATH."
+
+#: ../../WPrefs.app/WPrefs.c:621
+msgid ""
+"Could not extract version from Window Maker. Make sure it is correctly "
+"installed and is in your PATH environment variable."
+msgstr ""
+"Extraction du numéro de version de WindowMaker impossible. Assurez-vous "
+"qu'il soit bien installé et qu'il soit dans votre PATH."
+
+#: ../../WPrefs.app/WPrefs.c:631
+msgid ""
+"Could not extract version from Window Maker. Make sure it is correctly "
+"installed and the path where it installed is in the PATH environment "
+"variable."
+msgstr ""
+"Extraction du numéro de version de WindowMaker impossible. Assurez-vous "
+"qu'il soit bien installé et qu'il soit dans votre PATH."
+
+#: ../../WPrefs.app/WPrefs.c:638
+#, c-format
+msgid ""
+"WPrefs only supports Window Maker 0.18.0 or newer.\n"
+"The version installed is %i.%i.%i\n"
+msgstr ""
+"WPrefs ne supporte que Window Maker 0.18.0 ou mieux.\n"
+"La version installé est %i.%i.%i\n"
+
+#: ../../WPrefs.app/WPrefs.c:645
+#, c-format
+msgid ""
+"Window Maker %i.%i.%i, which is installed in your system, is not fully "
+"supported by this version of WPrefs."
+msgstr ""
+"Window Maker %i.%i.%i, qui est installé sur votre système, n'est pas "
+"pleinement supporté par WPrefs."
+
+#: ../../WPrefs.app/WPrefs.c:647
+msgid "Warning"
+msgstr "Attention"
+
+#: ../../WPrefs.app/WPrefs.c:652
+msgid "could not run \"wmaker --global_defaults_path\"."
+msgstr "Lancement de «wmaker -base_globale_défaut» impossible."
+
+#: ../../WPrefs.app/WPrefs.c:674
+#, c-format
+msgid "Could not load global Window Maker domain (%s)."
+msgstr "Chargement du domaine globale Window Maker impossible (%s)."
+
+#: ../../WPrefs.app/WPrefs.c:923
+#, c-format
+msgid ""
+"bad speed value for option %s\n"
+". Using default Medium"
+msgstr ""
+"Mauvaise valeur de l'option %s.\n"
+"Utilise le défaut: Medium"
+
+#: ../../WPrefs.app/Appearance.c:928
+msgid "Select File"
+msgstr "Choisissez un Fichier"
+
+#: ../../WPrefs.app/Appearance.c:1258
+msgid "Titlebar of Focused Window"
+msgstr "Barre de Titre - avec Focus"
+
+#: ../../WPrefs.app/Appearance.c:1259
+msgid "Titlebar of Unfocused Windows"
+msgstr "Barre de Titre - sans Focus"
+
+#: ../../WPrefs.app/Appearance.c:1260
+msgid "Titlebar of Focused Window's Owner"
+msgstr "Barre de Titre - Parent"
+
+#: ../../WPrefs.app/Appearance.c:1261
+msgid "Window Resizebar"
+msgstr "Barre de Redimensionnement"
+
+#: ../../WPrefs.app/Appearance.c:1262
+msgid "Titlebar of Menus"
+msgstr "Barre de Titre - Menus"
+
+#: ../../WPrefs.app/Appearance.c:1263
+msgid "Menu Items"
+msgstr "Eléments de Menu"
+
+#: ../../WPrefs.app/Appearance.c:1264
+msgid "Icon Background"
+msgstr "Fond d'Icone"
+
+#: ../../WPrefs.app/Appearance.c:1282 ../../WPrefs.app/Appearance.c:1582
+msgid "Textures"
+msgstr "Textures"
+
+#: ../../WPrefs.app/Appearance.c:1313
+msgid "New"
+msgstr "Nouveau"
+
+#: ../../WPrefs.app/Appearance.c:1322
+msgid "Extract..."
+msgstr "Extraire..."
+
+#: ../../WPrefs.app/Appearance.c:1333
+msgid "Edit"
+msgstr "Editer"
+
+#: ../../WPrefs.app/Appearance.c:1342 ../../WPrefs.app/TexturePanel.c:1293
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../../WPrefs.app/Appearance.c:1518
+msgid "Appearance Preferences"
+msgstr "Préférences d'Apparence"
+
+#: ../../WPrefs.app/Appearance.c:1562
+msgid "Extract Texture"
+msgstr "Extraire une Texture"
+
+#: ../../WPrefs.app/Appearance.c:1598
+msgid "Extract"
+msgstr "Extraire"
+
+#: ../../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
+#, c-format
 msgid "could not load icon %s"
 msgstr "Icone %s introuvable."
 
-#: ../../WPrefs/Configurations.c:154 ../../WPrefs/Workspace.c:91
+#: ../../WPrefs.app/Configurations.c:156 ../../WPrefs.app/Workspace.c:85
+#, c-format
 msgid "could not process icon %s:"
 msgstr "Traitement de l'icone %s impossible:"
 
-#: ../../WPrefs/Configurations.c:179 ../../WPrefs/Workspace.c:158
+#: ../../WPrefs.app/Configurations.c:181 ../../WPrefs.app/Workspace.c:124
+#, c-format
 msgid "could not load image file %s"
-msgstr "hargement de l'image %s impossible."
+msgstr "Chargement de l'image %s impossible."
 
-#: ../../WPrefs/Configurations.c:193
+#: ../../WPrefs.app/Configurations.c:195
 msgid "Icon Slide Speed"
 msgstr "Vitesse du glissement des Icones"
 
-#: ../../WPrefs/Configurations.c:199
+#: ../../WPrefs.app/Configurations.c:201
 msgid "Shade Animation Speed"
 msgstr "Vitesse de la pliure des fenêtres"
 
-#: ../../WPrefs/Configurations.c:232 ../../WPrefs/Configurations.c:244 ../../WPrefs/Focus.c:310 ../../WPrefs/Focus.c:321 ../../WPrefs/MenuPreferences.c:135 ../../WPrefs/MenuPreferences.c:146 ../../WPrefs/MenuPreferences.c:174 ../../WPrefs/MenuPreferences.c:189 ../../WPrefs/MouseSettings.c:484 ../../WPrefs/MouseSettings.c:495 ../../WPrefs/MouseSettings.c:550 ../../WPrefs/MouseSettings.c:561 ../../WPrefs/MouseSettings.c:597 ../../WPrefs/MouseSettings.c:612 ../../WPrefs/MouseSettings.c:628 ../../WPrefs/WPrefs.c:393 ../../WPrefs/WPrefs.c:411
-msgid "could not load icon file %s"
-msgstr "Chargement de l'icone %s impossible."
-
-#: ../../WPrefs/Configurations.c:260
+#: ../../WPrefs.app/Configurations.c:262
 msgid "Titlebar Style"
 msgstr "Style des Barres de Titre"
 
-#: ../../WPrefs/Configurations.c:297
+#: ../../WPrefs.app/Configurations.c:299
 msgid "Animations and Sound"
 msgstr "Animations et Sons"
 
-#: ../../WPrefs/Configurations.c:303
+#: ../../WPrefs.app/Configurations.c:305
 msgid "Animations"
 msgstr "Animations"
 
-#: ../../WPrefs/Configurations.c:319
+#: ../../WPrefs.app/Configurations.c:321
 msgid "Superfluous"
 msgstr "Superflu"
 
-#: ../../WPrefs/Configurations.c:335
+#: ../../WPrefs.app/Configurations.c:337
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../../WPrefs/Configurations.c:352
+#: ../../WPrefs.app/Configurations.c:354
 msgid "Note: sound requires a module distributed separately"
 msgstr "Note: le son requière un module distribué séparément"
 
-#: ../../WPrefs/Configurations.c:362
+#: ../../WPrefs.app/Configurations.c:364
 msgid "Dithering colormap for 8bpp"
 msgstr "Tramage en 256 couleurs"
 
-#: ../../WPrefs/Configurations.c:367
+#: ../../WPrefs.app/Configurations.c:369
 msgid "Disable dithering in any visual/depth"
 msgstr "Désactiver le tramage dans toutes les résolutions"
 
-#: ../../WPrefs/Configurations.c:388
+#: ../../WPrefs.app/Configurations.c:390
 msgid "More colors for applications"
-msgstr "Plus de couleurs pour les applications"
+msgstr "Moins de couleurs pour Window Maker"
 
-#: ../../WPrefs/Configurations.c:395
+#: ../../WPrefs.app/Configurations.c:397
 msgid "More colors for WindowMaker"
-msgstr "Plus de couleurs pour WindowMaker"
+msgstr "Plus de couleurs pour Window Maker"
 
-#: ../../WPrefs/Configurations.c:448
+#: ../../WPrefs.app/Configurations.c:450
 msgid "Other Configurations"
 msgstr "Autres Configurations"
 
-#: ../../WPrefs/Expert.c:69
-msgid "Do not set non-WindowMaker specific parameters (do not use xset)"
-msgstr "Ne pas utiliser de paramètres non spécifiques à WindowMaker (ne pas utiliser xset)"
+#: ../../WPrefs.app/Expert.c:72
+msgid ""
+"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
+msgstr ""
+"Pas de mini-fenêtres (icones de fenêtres miniaturisées). Pour utiliser avec KDE/GNOME."
 
-#: ../../WPrefs/Expert.c:70
+#: ../../WPrefs.app/Expert.c:73
+msgid "Do not set non-WindowMaker specific parameters (do not use xset)"
+msgstr "Ne pas utiliser de paramètres non-spécifiques à Window Maker"
+
+#: ../../WPrefs.app/Expert.c:74
 msgid "Automatically save session when exiting WindowMaker"
 msgstr "Sauver automatiquement la session lors de la fermeture de WindowMaker"
 
-#: ../../WPrefs/Expert.c:71
-msgid "Use SaveUnders in icons, menus and other objects"
-msgstr "Utilise \"SauverSous\" pour les icones, menus et autres objets"
+#: ../../WPrefs.app/Expert.c:75
+msgid "Use SaveUnder in window frames, icons, menus and other objects"
+msgstr "Utilise «SauverSous» pour les icones, menus et autres objets"
 
-#: ../../WPrefs/Expert.c:100
+#: ../../WPrefs.app/Expert.c:76
+msgid "Disable cycling color highlighting of icons."
+msgstr "Ne pas utiliser le détourage coloré pour les icones."
+
+#: ../../WPrefs.app/Expert.c:108
 msgid "Expert User Preferences"
 msgstr "Préférences, Mode Expert"
 
-#: ../../WPrefs/Focus.c:79
+#: ../../WPrefs.app/Focus.c:81
+#, c-format
 msgid "bad option value %s for option FocusMode. Using default Manual"
 msgstr "Mauvaise valeur %s pour l'option Mode de Focus. Utilise le défaut: Manuel"
 
-#: ../../WPrefs/Focus.c:92
-msgid "bad option value %s for option ColormapMode. Using default Manual"
+#: ../../WPrefs.app/Focus.c:96
+#, c-format
+msgid "bad option value %s for option ColormapMode. Using default Auto"
 msgstr "Mauvaise valeur %s pour l'option Mode de Couleurs.Utilise le défaut: Manuel"
 
-#: ../../WPrefs/Focus.c:190
+#: ../../WPrefs.app/Focus.c:194
 msgid ""
 "Click on the window to set\n"
 "keyboard input focus."
@@ -107,7 +419,7 @@ msgstr ""
 "Cliquer sur la fenêtre pour\n"
 "obtenir le focus du clavier."
 
-#: ../../WPrefs/Focus.c:194
+#: ../../WPrefs.app/Focus.c:198
 msgid ""
 "Set keyboard input focus to\n"
 "the window under the mouse pointer,\n"
@@ -117,7 +429,7 @@ msgstr ""
 "la fenêtre placée sous la souris,\n"
 "fond d'écran compris."
 
-#: ../../WPrefs/Focus.c:199
+#: ../../WPrefs.app/Focus.c:203
 msgid ""
 "Set keyboard input focus to\n"
 "the window under the mouse pointer,\n"
@@ -127,675 +439,704 @@ msgstr ""
 "la fenêtre placée sous la souris,\n"
 "fond d'écran exclu."
 
-#: ../../WPrefs/Focus.c:243
+#: ../../WPrefs.app/Focus.c:247
 msgid "Input Focus Mode"
 msgstr "Mode de Focus du Clavier"
 
-#: ../../WPrefs/Focus.c:248
+#: ../../WPrefs.app/Focus.c:252
 msgid "Click window to focus"
-msgstr "Cliquer sur la fenêtre pour le focus"
+msgstr "Cliquer sur la fenêtre"
 
-#: ../../WPrefs/Focus.c:249
+#: ../../WPrefs.app/Focus.c:253
 msgid "Focus follows mouse"
 msgstr "le Focus suit la souris"
 
-#: ../../WPrefs/Focus.c:250
+#: ../../WPrefs.app/Focus.c:254
 msgid "\"Sloppy\" focus"
-msgstr "Focus \"Ramollo\""
+msgstr "Focus «Ramollo»"
 
-#: ../../WPrefs/Focus.c:265
+#: ../../WPrefs.app/Focus.c:269
 msgid "Install colormap in the window..."
-msgstr "Donner des couleurs à la fenêtre... "
+msgstr "Donner des couleurs à la fenêtre..."
 
-#: ../../WPrefs/Focus.c:270
+#: ../../WPrefs.app/Focus.c:274
 msgid "...that has the input focus."
 msgstr "...qui a le focus du clavier."
 
-#: ../../WPrefs/Focus.c:275
+#: ../../WPrefs.app/Focus.c:279
 msgid "...that is under the mouse pointer."
 msgstr "...qui est sous la souris."
 
-#: ../../WPrefs/Focus.c:284
+#: ../../WPrefs.app/Focus.c:288
 msgid "Automatic Window Raise Delay"
 msgstr "Délai de mise en avant de la fenêtre"
 
-#: ../../WPrefs/Focus.c:341
+#: ../../WPrefs.app/Focus.c:345
 msgid "msec"
 msgstr "msec"
 
-#: ../../WPrefs/Focus.c:358
-msgid "Do not let aplications receive the click used to focus windows."
+#: ../../WPrefs.app/Focus.c:362
+msgid "Do not let applications receive the click used to focus windows."
 msgstr "L'application ne reçoit pas le click utilisé pour le focus de la fenêtre."
 
-#: ../../WPrefs/Focus.c:364
+#: ../../WPrefs.app/Focus.c:368
 msgid "Automatically focus new windows."
 msgstr "Donner le focus aux nouvelles fenêtres."
 
-#: ../../WPrefs/Focus.c:385
+#: ../../WPrefs.app/Focus.c:389
 msgid "Window Focus Preferences"
 msgstr "Préférences de Focus des Fenêtres"
 
-#: ../../WPrefs/KeyboardSettings.c:72
+#: ../../WPrefs.app/Icons.c:180
+msgid "Icon Positioning"
+msgstr "Positionnement des Icones"
+
+#: ../../WPrefs.app/Icons.c:227
+msgid "Iconification Animation"
+msgstr "Animation d'Iconification"
+
+#: ../../WPrefs.app/Icons.c:238
+msgid "Shrinking/Zooming"
+msgstr "Zoom"
+
+#: ../../WPrefs.app/Icons.c:239
+msgid "Spinning/Twisting"
+msgstr "Tournoiement"
+
+#: ../../WPrefs.app/Icons.c:240
+msgid "3D-flipping"
+msgstr "Rotation 3D"
+
+#: ../../WPrefs.app/Icons.c:241
+msgid "None"
+msgstr "Aucune"
+
+#: ../../WPrefs.app/Icons.c:249
+msgid "Icon Display"
+msgstr "Affichage des Icones"
+
+#: ../../WPrefs.app/Icons.c:254
+msgid "Auto-arrange icons"
+msgstr "Arrangement automatique"
+
+#: ../../WPrefs.app/Icons.c:259
+msgid "Omnipresent miniwindows"
+msgstr "Mini-fenêtres omniprésentes"
+
+#: ../../WPrefs.app/Icons.c:267
+msgid "Icon Size"
+msgstr "Taille des Icones"
+
+#: ../../WPrefs.app/Icons.c:337
+msgid "Icon Preferences"
+msgstr "Préférences des Icones"
+
+#: ../../WPrefs.app/KeyboardSettings.c:72
 msgid "Initial Key Repeat"
-msgstr "Répétition des Touches Initial"
+msgstr "Répétition de Touche"
 
-#: ../../WPrefs/KeyboardSettings.c:113
+#: ../../WPrefs.app/KeyboardSettings.c:113
 msgid "Key Repeat Rate"
-msgstr "Taux de Répétition des Touches"
+msgstr "Taux de Répétition"
 
-#: ../../WPrefs/KeyboardSettings.c:153
+#: ../../WPrefs.app/KeyboardSettings.c:153
 msgid "Type here to test"
 msgstr "Ecrivez ici pour tester"
 
-#: ../../WPrefs/KeyboardSettings.c:172
+#: ../../WPrefs.app/KeyboardSettings.c:172
 msgid "Keyboard Preferences"
 msgstr "Préférences Clavier"
 
-#: ../../WPrefs/KeyboardShortcuts.c:161 ../../WPrefs/Menu.c:891 ../../WPrefs/MenuGuru.c:261
+#: ../../WPrefs.app/KeyboardShortcuts.c:183 ../../WPrefs.app/Menu.c:973
+#: ../../WPrefs.app/MenuGuru.c:263 ../../WPrefs.app/TexturePanel.c:1511
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../../WPrefs/KeyboardShortcuts.c:162
+#: ../../WPrefs.app/KeyboardShortcuts.c:184
 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
-msgstr "Tapez le raccourci souhaité ou clicquez sur Annuler pour arrêter la capture."
+msgstr "Tapez le raccourci souhaité ou cliquez sur Annuler pour arrêter la capture."
 
-#: ../../WPrefs/KeyboardShortcuts.c:180 ../../WPrefs/KeyboardShortcuts.c:372 ../../WPrefs/Menu.c:902 ../../WPrefs/Menu.c:1122
+#: ../../WPrefs.app/KeyboardShortcuts.c:204
+#: ../../WPrefs.app/KeyboardShortcuts.c:444 ../../WPrefs.app/Menu.c:985
+#: ../../WPrefs.app/Menu.c:1204
 msgid "Capture"
 msgstr "Capturer"
 
-#: ../../WPrefs/KeyboardShortcuts.c:181 ../../WPrefs/KeyboardShortcuts.c:379
+#: ../../WPrefs.app/KeyboardShortcuts.c:205
+#: ../../WPrefs.app/KeyboardShortcuts.c:451
 msgid "Click Capture to interactively define the shortcut key."
 msgstr "Cliquez sur Capturer pour définir interactivement le raccourci"
 
-#: ../../WPrefs/KeyboardShortcuts.c:297
+#: ../../WPrefs.app/KeyboardShortcuts.c:359
 msgid "Actions"
 msgstr "Actions"
 
-#: ../../WPrefs/KeyboardShortcuts.c:311
+#: ../../WPrefs.app/KeyboardShortcuts.c:375
 msgid "Open applications menu"
-msgstr "Ouvrir le menu de l'application"
+msgstr "Ouvrir le menu d'applications"
 
-#: ../../WPrefs/KeyboardShortcuts.c:312
+#: ../../WPrefs.app/KeyboardShortcuts.c:376
 msgid "Open window list menu"
 msgstr "Ouvrir la liste des fenêtres"
 
-#: ../../WPrefs/KeyboardShortcuts.c:313
+#: ../../WPrefs.app/KeyboardShortcuts.c:377
 msgid "Open window commands menu"
 msgstr "Ouvrir le menu de la fenêtre"
 
-#: ../../WPrefs/KeyboardShortcuts.c:314
+#: ../../WPrefs.app/KeyboardShortcuts.c:378
 msgid "Hide active application"
 msgstr "Cacher l'application active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:315
+#: ../../WPrefs.app/KeyboardShortcuts.c:379
 msgid "Miniaturize active window"
 msgstr "Miniaturiser la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:316
+#: ../../WPrefs.app/KeyboardShortcuts.c:380
 msgid "Close active window"
 msgstr "Fermer la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:317
+#: ../../WPrefs.app/KeyboardShortcuts.c:381
 msgid "Maximize active window"
 msgstr "Maximiser la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:318
+#: ../../WPrefs.app/KeyboardShortcuts.c:382
 msgid "Maximize active window vertically"
 msgstr "Maximiser la fenêtre active verticallement"
 
-#: ../../WPrefs/KeyboardShortcuts.c:319
+#: ../../WPrefs.app/KeyboardShortcuts.c:383
 msgid "Raise active window"
 msgstr "Mettre en avant la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:320
+#: ../../WPrefs.app/KeyboardShortcuts.c:384
 msgid "Lower active window"
 msgstr "Mettre en arrière la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:321
+#: ../../WPrefs.app/KeyboardShortcuts.c:385
 msgid "Raise/Lower window under mouse pointer"
-msgstr "Mettre en avant/arrière la fenêtre sous la souris"
+msgstr "Mettre en avant/arrière la fenêtre pointée"
 
-#: ../../WPrefs/KeyboardShortcuts.c:322
+#: ../../WPrefs.app/KeyboardShortcuts.c:386
 msgid "Shade active window"
 msgstr "Plier la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:323
+#: ../../WPrefs.app/KeyboardShortcuts.c:387
+msgid "Move/Resize active window"
+msgstr "Déplacer/Redimensionner la fenêtre active"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:388
 msgid "Select active window"
 msgstr "Sélectionner la fenêtre active"
 
-#: ../../WPrefs/KeyboardShortcuts.c:324
+#: ../../WPrefs.app/KeyboardShortcuts.c:389
 msgid "Focus next window"
 msgstr "Donner le focus à la fenêtre suivante"
 
-#: ../../WPrefs/KeyboardShortcuts.c:325
+#: ../../WPrefs.app/KeyboardShortcuts.c:390
 msgid "Focus previous window"
 msgstr "Donner le focus à la fenêtre précédente"
 
-#: ../../WPrefs/KeyboardShortcuts.c:326
+#: ../../WPrefs.app/KeyboardShortcuts.c:391
 msgid "Switch to next workspace"
 msgstr "Aller au Bureau suivant"
 
-#: ../../WPrefs/KeyboardShortcuts.c:327
+#: ../../WPrefs.app/KeyboardShortcuts.c:392
 msgid "Switch to previous workspace"
 msgstr "Aller au Bureau précédent"
 
-#: ../../WPrefs/KeyboardShortcuts.c:328
+#: ../../WPrefs.app/KeyboardShortcuts.c:393
 msgid "Switch to next ten workspaces"
 msgstr "Aller dix Bureaux en avant"
 
-#: ../../WPrefs/KeyboardShortcuts.c:329
+#: ../../WPrefs.app/KeyboardShortcuts.c:394
 msgid "Switch to previous ten workspaces"
 msgstr "Aller dix Bureaux en arrière"
 
-#: ../../WPrefs/KeyboardShortcuts.c:330
+#: ../../WPrefs.app/KeyboardShortcuts.c:395
 msgid "Switch to workspace 1"
 msgstr "Aller au Bureau 1"
 
-#: ../../WPrefs/KeyboardShortcuts.c:331
+#: ../../WPrefs.app/KeyboardShortcuts.c:396
 msgid "Switch to workspace 2"
 msgstr "Aller au Bureau 2"
 
-#: ../../WPrefs/KeyboardShortcuts.c:332
+#: ../../WPrefs.app/KeyboardShortcuts.c:397
 msgid "Switch to workspace 3"
 msgstr "Aller au Bureau 3"
 
-#: ../../WPrefs/KeyboardShortcuts.c:333
+#: ../../WPrefs.app/KeyboardShortcuts.c:398
 msgid "Switch to workspace 4"
 msgstr "Aller au Bureau 4"
 
-#: ../../WPrefs/KeyboardShortcuts.c:334
+#: ../../WPrefs.app/KeyboardShortcuts.c:399
 msgid "Switch to workspace 5"
 msgstr "Aller au Bureau 5"
 
-#: ../../WPrefs/KeyboardShortcuts.c:335
+#: ../../WPrefs.app/KeyboardShortcuts.c:400
 msgid "Switch to workspace 6"
-msgstr "Aller au Bureau 5"
+msgstr "Aller au Bureau 6"
 
-#: ../../WPrefs/KeyboardShortcuts.c:336
+#: ../../WPrefs.app/KeyboardShortcuts.c:401
 msgid "Switch to workspace 7"
 msgstr "Aller au Bureau 7"
 
-#: ../../WPrefs/KeyboardShortcuts.c:337
+#: ../../WPrefs.app/KeyboardShortcuts.c:402
 msgid "Switch to workspace 8"
 msgstr "Aller au Bureau 8"
 
-#: ../../WPrefs/KeyboardShortcuts.c:338
+#: ../../WPrefs.app/KeyboardShortcuts.c:403
 msgid "Switch to workspace 9"
 msgstr "Aller au Bureau 9"
 
-#: ../../WPrefs/KeyboardShortcuts.c:339
+#: ../../WPrefs.app/KeyboardShortcuts.c:404
 msgid "Switch to workspace 10"
 msgstr "Aller au Bureau 10"
 
-#: ../../WPrefs/KeyboardShortcuts.c:340
+#: ../../WPrefs.app/KeyboardShortcuts.c:405
+msgid "Shortcut for window 1"
+msgstr "Raccourci de la fenêtre 1"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:406
+msgid "Shortcut for window 2"
+msgstr "Raccourci de la fenêtre 2"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:407
+msgid "Shortcut for window 3"
+msgstr "Raccourci de la fenêtre 3"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:408
+msgid "Shortcut for window 4"
+msgstr "Raccourci de la fenêtre 4"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:409
 msgid "Raise Clip"
 msgstr "Mettre le Clip en avant"
 
-#: ../../WPrefs/KeyboardShortcuts.c:341
+#: ../../WPrefs.app/KeyboardShortcuts.c:410
 msgid "Lower Clip"
 msgstr "Mettre le Clip en arrière"
 
-#: ../../WPrefs/KeyboardShortcuts.c:342
+#: ../../WPrefs.app/KeyboardShortcuts.c:411
 msgid "Raise/Lower Clip"
 msgstr "Mettre le Clip en avant/arrière"
 
-#: ../../WPrefs/KeyboardShortcuts.c:355 ../../WPrefs/Menu.c:1111
+#: ../../WPrefs.app/KeyboardShortcuts.c:413
+msgid "Toggle keyboard language"
+msgstr "Changer la langue du clavier"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:427 ../../WPrefs.app/Menu.c:1193
 msgid "Shortcut"
 msgstr "Raccourci"
 
-#: ../../WPrefs/KeyboardShortcuts.c:366
+#: ../../WPrefs.app/KeyboardShortcuts.c:438
 msgid "Clear"
-msgstr "Remettre à Zéro"
+msgstr "RAZ"
 
-#: ../../WPrefs/KeyboardShortcuts.c:427
+#: ../../WPrefs.app/KeyboardShortcuts.c:499
 msgid "Keyboard Shortcut Preferences"
 msgstr "Préférences de Raccourcis-Clavier"
 
-#: ../../WPrefs/Menu.c:364
+#: ../../WPrefs.app/Menu.c:404
 msgid "Window Manager"
 msgstr "Gestionnaire de Fenêtres"
 
-#: ../../WPrefs/Menu.c:366
+#: ../../WPrefs.app/Menu.c:406
 msgid "Program to open files"
 msgstr "Programme pour ouvrir les fichiers"
 
-#: ../../WPrefs/Menu.c:368 ../../WPrefs/Menu.c:1098
+#: ../../WPrefs.app/Menu.c:408 ../../WPrefs.app/Menu.c:1180
 msgid "Program to Run"
-msgstr "Programme pour Lancer"
+msgstr "Programme à Lancer"
 
-#: ../../WPrefs/Menu.c:418 ../../WPrefs/Menu.c:419
+#: ../../WPrefs.app/Menu.c:457 ../../WPrefs.app/Menu.c:458
+#, c-format
 msgid "New Command %i"
 msgstr "Nouvelle Commande %i"
 
-#: ../../WPrefs/Menu.c:426
+#: ../../WPrefs.app/Menu.c:465
 msgid "New Submenu"
 msgstr "Nouveau Sous-Menu"
 
-#: ../../WPrefs/Menu.c:431
+#: ../../WPrefs.app/Menu.c:470
 msgid "External Menu"
 msgstr "Menu Externe"
 
-#: ../../WPrefs/Menu.c:438
+#: ../../WPrefs.app/Menu.c:477
 msgid "Workspaces"
 msgstr "Bureaux"
 
-#: ../../WPrefs/Menu.c:982 ../../WPrefs/Menu.c:997
+#: ../../WPrefs.app/Menu.c:1064 ../../WPrefs.app/Menu.c:1079
 msgid "Commands"
 msgstr "Commandes"
 
-#: ../../WPrefs/Menu.c:983 ../../WPrefs/Menu.c:998
+#: ../../WPrefs.app/Menu.c:1065 ../../WPrefs.app/Menu.c:1080
 msgid "Add Command"
 msgstr "Ajouter une Commande"
 
-#: ../../WPrefs/Menu.c:984 ../../WPrefs/Menu.c:999
+#: ../../WPrefs.app/Menu.c:1066 ../../WPrefs.app/Menu.c:1081
 msgid "Add Submenu"
 msgstr "Ajouter un Sous-Menu"
 
-#: ../../WPrefs/Menu.c:985 ../../WPrefs/Menu.c:1000
+#: ../../WPrefs.app/Menu.c:1067 ../../WPrefs.app/Menu.c:1082
 msgid "Add External Menu"
 msgstr "Ajouter un Sous-Menu Externe"
 
-#: ../../WPrefs/Menu.c:986 ../../WPrefs/Menu.c:1001
+#: ../../WPrefs.app/Menu.c:1068 ../../WPrefs.app/Menu.c:1083
 msgid "Add Workspace Menu"
 msgstr "Ajouter le Menu des Bureaux"
 
-#: ../../WPrefs/Menu.c:987 ../../WPrefs/Menu.c:1002
+#: ../../WPrefs.app/Menu.c:1069 ../../WPrefs.app/Menu.c:1084
 msgid "Remove Item"
 msgstr "Supprimer un Elément"
 
-#: ../../WPrefs/Menu.c:988 ../../WPrefs/Menu.c:1003
+#: ../../WPrefs.app/Menu.c:1070 ../../WPrefs.app/Menu.c:1085
 msgid "Cut Item"
 msgstr "Couper un Elément"
 
-#: ../../WPrefs/Menu.c:989 ../../WPrefs/Menu.c:1004
+#: ../../WPrefs.app/Menu.c:1071 ../../WPrefs.app/Menu.c:1086
 msgid "Copy Item"
 msgstr "Copier un Elément"
 
-#: ../../WPrefs/Menu.c:990 ../../WPrefs/Menu.c:1005
+#: ../../WPrefs.app/Menu.c:1072 ../../WPrefs.app/Menu.c:1087
 msgid "Paste Item"
 msgstr "Coller un Elément"
 
-#: ../../WPrefs/Menu.c:1034
+#: ../../WPrefs.app/Menu.c:1116
 msgid "Label"
 msgstr "Etiquette"
 
-#: ../../WPrefs/Menu.c:1047
+#: ../../WPrefs.app/Menu.c:1129
 msgid "Command"
 msgstr "Commande"
 
-#: ../../WPrefs/Menu.c:1052
+#: ../../WPrefs.app/Menu.c:1134
 msgid "Run Program"
 msgstr "Lancer le Programme"
 
-#: ../../WPrefs/Menu.c:1053
+#: ../../WPrefs.app/Menu.c:1135
 msgid "Arrange Icons"
 msgstr "Ranger les Icones"
 
-#: ../../WPrefs/Menu.c:1054
+#: ../../WPrefs.app/Menu.c:1136
 msgid "Hide Others"
 msgstr "Cacher les autres"
 
-#: ../../WPrefs/Menu.c:1055
+#: ../../WPrefs.app/Menu.c:1137
 msgid "Show All Windows"
 msgstr "Montrer toutes les Fenêtres"
 
-#: ../../WPrefs/Menu.c:1056
+#: ../../WPrefs.app/Menu.c:1138
 msgid "Exit WindowMaker"
-msgstr "Sortir de WindowMaker"
+msgstr "Sortir de Window Maker"
 
-#: ../../WPrefs/Menu.c:1057
+#: ../../WPrefs.app/Menu.c:1139
 msgid "Exit X Session"
 msgstr "Sortir de la Session X"
 
-#: ../../WPrefs/Menu.c:1058
+#: ../../WPrefs.app/Menu.c:1140
 msgid "Start window manager"
 msgstr "Démarrer un Gestionnaire de Fenêtres"
 
-#: ../../WPrefs/Menu.c:1059
+#: ../../WPrefs.app/Menu.c:1141
 msgid "Restart WindowMaker"
 msgstr "Redémarrer WindowMaker"
 
-#: ../../WPrefs/Menu.c:1060
+#: ../../WPrefs.app/Menu.c:1142
 msgid "Save Session"
 msgstr "Sauver la Session"
 
-#: ../../WPrefs/Menu.c:1061
+#: ../../WPrefs.app/Menu.c:1143
 msgid "Clear Session"
 msgstr "Nettoyer la Session"
 
-#: ../../WPrefs/Menu.c:1062
+#: ../../WPrefs.app/Menu.c:1144
 msgid "Refresh Screen"
 msgstr "Rafraîchir l'Ecran"
 
-#: ../../WPrefs/Menu.c:1063
+#: ../../WPrefs.app/Menu.c:1145
 msgid "Info Panel"
 msgstr "Panneau d'Info"
 
-#: ../../WPrefs/Menu.c:1064
+#: ../../WPrefs.app/Menu.c:1146
 msgid "Legal Panel"
-msgstr "Panneau \"Légal\""
+msgstr "Panneau «Légal»"
 
-#: ../../WPrefs/Menu.c:1072
+#: ../../WPrefs.app/Menu.c:1154
 msgid "Open workspace menu"
 msgstr "Ouvrir le menu des Bureaux"
 
-#: ../../WPrefs/Menu.c:1079
+#: ../../WPrefs.app/Menu.c:1161
 msgid "No confirmation panel"
 msgstr "Pas de demande de confirmation"
 
-#: ../../WPrefs/Menu.c:1085
+#: ../../WPrefs.app/Menu.c:1167
 msgid "Menu Path/Directory List"
 msgstr "Liste des Chemins des Menus"
 
-#: ../../WPrefs/Menu.c:1130
+#: ../../WPrefs.app/Menu.c:1212
 msgid "Ask help to the Guru"
 msgstr "Demander de l'aide au Gourou"
 
-#: ../../WPrefs/Menu.c:1242
-msgid "The format of the current menu file (%s) is not supported by WPrefs. A new menu will be created."
-msgstr "Le format de fichier de menu courant (%s) n'est pas supporté par WPrefs. Un nouveau menu va être créé."
+#. if there is a localized plmenu for the tongue put it's filename here
+#: ../../WPrefs.app/Menu.c:1323 ../../WPrefs.app/Menu.c:1330
+#, c-format
+msgid "%s/Library/WindowMaker/plmenu"
+msgstr "%s/Library/WindowMaker/plmenu.fr"
 
-#: ../../WPrefs/Menu.c:1245 ../../WPrefs/WPrefs.c:565
-msgid "Warning"
-msgstr "Attention"
+#: ../../WPrefs.app/Menu.c:1339
+#, c-format
+msgid "Could not open default menu from '%s'"
+msgstr "Chargement du menu par défaut '%s' impossible."
 
-#: ../../WPrefs/Menu.c:1246 ../../WPrefs/MenuGuru.c:117 ../../WPrefs/MenuGuru.c:124 ../../WPrefs/MenuGuru.c:138 ../../WPrefs/MouseSettings.c:156 ../../WPrefs/Text.c:181 ../../WPrefs/WPrefs.c:527 ../../WPrefs/WPrefs.c:532 ../../WPrefs/WPrefs.c:543 ../../WPrefs/WPrefs.c:552 ../../WPrefs/WPrefs.c:558 ../../WPrefs/WPrefs.c:565 ../../WPrefs/WPrefs.c:587
-msgid "OK"
-msgstr "Ok"
-
-#: ../../WPrefs/Menu.c:1284
-msgid "Aplications Menu Definition"
+#: ../../WPrefs.app/Menu.c:1449
+msgid "Applications Menu Definition"
 msgstr "Définition du Menu des Applications"
 
-#: ../../WPrefs/MenuGuru.c:104
-msgid "Menu Guru - Select Type"
-msgstr "Gourou du menu - Choisir un Type"
-
-#: ../../WPrefs/MenuGuru.c:109 ../../WPrefs/MenuGuru.c:131 ../../WPrefs/MenuGuru.c:249
-msgid "Next"
-msgstr "Suivant"
-
-#: ../../WPrefs/MenuGuru.c:112
-msgid "Menu Guru - Select Menu File"
-msgstr "Gourou du Menu - Choisir un Fichier de Menu"
-
-#: ../../WPrefs/MenuGuru.c:120
-msgid "Menu Guru - Select Pipe Command"
-msgstr "Gourou du Menu - Choisir un Tube"
-
-#: ../../WPrefs/MenuGuru.c:127
-msgid "Menu Guru - Select Directories"
-msgstr "Gourou du Menu - Choisir les Répertoires"
-
-#: ../../WPrefs/MenuGuru.c:134
-msgid "Menu Guru - Select Command"
-msgstr "Gourou du Menu - Choisir la Commande"
-
-#: ../../WPrefs/MenuGuru.c:255
-msgid "Back"
-msgstr "Retour"
-
-#: ../../WPrefs/MenuGuru.c:269
-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 ""
-"Cette fonction va vous aider à créer un sous-menu dont le contenu est dans un autre fichier ou chargé dynamiquement.\n"
-"Que voulez-vous utiliser comme contenu du sous-menu?"
-
-#: ../../WPrefs/MenuGuru.c:277
-msgid "A file containing the menu definition in the plain text (non-property list) menu format."
-msgstr "Un fichier contenant le menu en formaté en texte (pas en liste de propriétés)."
-
-#: ../../WPrefs/MenuGuru.c:283
-msgid "The menu definition generated by a script/program read through a pipe."
-msgstr "Un menu dont le contenu est créé par un script/programme, lu à travers un tube."
-
-#: ../../WPrefs/MenuGuru.c:289
-msgid "The files in one or more directories."
-msgstr "Les fichiers dans un ou plusieurs répertoires."
-
-#: ../../WPrefs/MenuGuru.c:301
-msgid "Type the path for the menu file:"
-msgstr "Entrez le chemin vers le menu:"
-
-#: ../../WPrefs/MenuGuru.c:316
-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 "Le fichier de menu doit être formaté en texte. Ce format est décrit dans le fichier de menu inclus avec WindowMaker, probablement ~/GNUstep/Library/WindowMaker/menu.fr"
-
-#: ../../WPrefs/MenuGuru.c:326
-msgid "Type the command that will generate the menu definition:"
-msgstr "Tapez la commande qui va générer le menu:"
-
-#: ../../WPrefs/MenuGuru.c:336
-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, probably at ~/GNUstep/Library/WindowMaker/menu"
-msgstr "La commande doit générer un menu valide sur le sortie standard. Le menu doit être formaté en texte, décrit dans le fichier de menu inclus avec WindowMaker, probablement ~/GNUstep/Library/WindowMaker/menu.fr"
-
-#: ../../WPrefs/MenuGuru.c:348 ../../WPrefs/MenuGuru.c:370 ../../WPrefs/MenuGuru.c:392
-msgid "Type the path for the directory. You can type more than one path by separating them with spaces."
-msgstr "Entrez le chemin vers le répertoire. Vous pouvez taper plusieurs chemins en les séparant par des espaces."
-
-#: ../../WPrefs/MenuGuru.c:359 ../../WPrefs/MenuGuru.c:381 ../../WPrefs/MenuGuru.c:403
-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)."
-msgstr "Le menu créé contiendra un élément pour chaque fichier du répertoire. Les répertoires peuvent contenir des éxécutables ou des données (comme des images)."
-
-#: ../../WPrefs/MenuGuru.c:413
-msgid "If the directory contain data files, type the command used to open these files. Otherwise, leave it in blank."
-msgstr "Si le répertoire contient des données, tapez la commande utilisée pour ouvrir ces fichiers. Sinon, laissez en blanc."
-
-#: ../../WPrefs/MenuGuru.c:424
-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\"."
-msgstr "Chaque fichier du répertoire sera un élément et sera ouvert avec la commande fournie. Par exemple, si le répertoire contient des images et que la commande est \"xv -root\", chaque fichier du répertoire sera un élément tel que \"xv -root image\"."
-
-#: ../../WPrefs/MenuPreferences.c:112
+#: ../../WPrefs.app/MenuPreferences.c:112
 msgid "Menu Scrolling Speed"
 msgstr "Vitesse de Défilement des Menus"
 
-#: ../../WPrefs/MenuPreferences.c:161
+#: ../../WPrefs.app/MenuPreferences.c:161
 msgid "Submenu Alignment"
 msgstr "Alignement des Sous-Menus"
 
-#: ../../WPrefs/MenuPreferences.c:204
-msgid "Open submenus to the left if they don't fit inside the screen."
-msgstr "Ouvrir les sous-menus sur la gauche s'il ne tiennent pas dans l'écran."
+#: ../../WPrefs.app/MenuPreferences.c:204
+msgid ""
+"Always open submenus inside the screen, instead of scrolling.\n"
+"Note: this can be an annoyance at some circumstances."
+msgstr ""
+"Toujours ouvrir les sous-menus dans l'écran, au lieu de les faire apparaître.\n"
+"Note: Ca peut devenir énervant..."
 
-#: ../../WPrefs/MenuPreferences.c:209
+#: ../../WPrefs.app/MenuPreferences.c:209
 msgid "Scroll off-screen menus when pointer is moved over them."
 msgstr "Faire apparaître les menus quand la souris est sur eux."
 
-#: ../../WPrefs/MenuPreferences.c:229
+#: ../../WPrefs.app/MenuPreferences.c:229
 msgid "Menu Preferences"
 msgstr "Préférences des Menus"
 
-#: ../../WPrefs/MouseSettings.c:154 ../../WPrefs/Text.c:180 ../../WPrefs/WPrefs.c:527 ../../WPrefs/WPrefs.c:532 ../../WPrefs/WPrefs.c:541 ../../WPrefs/WPrefs.c:550 ../../WPrefs/WPrefs.c:558 ../../WPrefs/WPrefs.c:587
-msgid "Error"
-msgstr "Erreur"
+#: ../../WPrefs.app/MouseSettings.c:148
+msgid "Invalid mouse acceleration value. Must be a positive real value."
+msgstr "Valeur d'accélération de la souris invalide. Doit être un réel positif."
 
-#: ../../WPrefs/MouseSettings.c:155
-msgid "Invalid mouse acceleration threshold value. Must be the number of pixels to travel before accelerating."
-msgstr "Valeur invalide d'accélération de la souris. Doit être le nombre de pixels à traverser avant l'accélération."
+#: ../../WPrefs.app/MouseSettings.c:168
+msgid ""
+"Invalid mouse acceleration threshold value. Must be the number of pixels to "
+"travel before accelerating."
+msgstr ""
+"Valeur invalide d'accélération de la souris. Doit être le nombre de pixels "
+"à traverser avant l'accélération."
 
-#: ../../WPrefs/MouseSettings.c:209
+#: ../../WPrefs.app/MouseSettings.c:227
+#, c-format
 msgid "mouse button %s not supported by WPrefs."
 msgstr "le bouton %s de la souris n'est pas supporté par WPrefs."
 
-#: ../../WPrefs/MouseSettings.c:243 ../../WPrefs/MouseSettings.c:254 ../../WPrefs/MouseSettings.c:265
+#: ../../WPrefs.app/MouseSettings.c:263 ../../WPrefs.app/MouseSettings.c:276
+#: ../../WPrefs.app/MouseSettings.c:289
+#, c-format
 msgid "bad value %s for option %s"
 msgstr "mauvaise valeur %s pour l'option %s"
 
-#: ../../WPrefs/MouseSettings.c:325
-msgid "modifier key %s for option ModifierKey was not recognized. Using %s as default"
-msgstr "la touche %s pour l'option ToucheModificatrice n'est reconnu. Utilise le défaut: %s"
+#: ../../WPrefs.app/MouseSettings.c:349
+#, c-format
+msgid ""
+"modifier key %s for option ModifierKey was not recognized. Using %s as "
+"default"
+msgstr ""
+"la touche %s pour l'option ToucheModificatrice n'est reconnu. Utilise "
+"le défaut: %s"
 
-#: ../../WPrefs/MouseSettings.c:350
+#: ../../WPrefs.app/MouseSettings.c:374
 msgid "could not retrieve keyboard modifier mapping"
-msgstr "Emplacement de la touche de modificateur introuvable"
+msgstr "Emplacement de la touche de modificateur introuvable."
 
-#: ../../WPrefs/MouseSettings.c:443
+#: ../../WPrefs.app/MouseSettings.c:521
 msgid "Mouse Speed"
 msgstr "Vitesse de la Souris"
 
-#: ../../WPrefs/MouseSettings.c:510
+#: ../../WPrefs.app/MouseSettings.c:551
+msgid "Acceler.:"
+msgstr "Accélér.:"
+
+#: ../../WPrefs.app/MouseSettings.c:564
 msgid "Threshold:"
 msgstr "Seuil:"
 
-#: ../../WPrefs/MouseSettings.c:525
+#: ../../WPrefs.app/MouseSettings.c:579
 msgid "Double-Click Delay"
 msgstr "Délai du Double-Click"
 
-#: ../../WPrefs/MouseSettings.c:569
+#: ../../WPrefs.app/MouseSettings.c:623
 msgid "Test"
 msgstr "Test"
 
-#: ../../WPrefs/MouseSettings.c:579
+#: ../../WPrefs.app/MouseSettings.c:653
 msgid "Workspace Mouse Actions"
 msgstr "Actions de la Souris sur le Bureau"
 
-#: ../../WPrefs/MouseSettings.c:584
+#: ../../WPrefs.app/MouseSettings.c:658
 msgid "Disable mouse actions"
-msgstr "Désactiver les actions de la souris"
+msgstr "Désactiver les clicks"
 
-#: ../../WPrefs/MouseSettings.c:637
+#: ../../WPrefs.app/MouseSettings.c:711
 msgid "Applications menu"
-msgstr "Menu des Applications"
+msgstr "Applications"
 
-#: ../../WPrefs/MouseSettings.c:643
+#: ../../WPrefs.app/MouseSettings.c:717
 msgid "Window list menu"
 msgstr "Liste des Fenêtres"
 
-#: ../../WPrefs/MouseSettings.c:649
+#: ../../WPrefs.app/MouseSettings.c:723
 msgid "Select windows"
-msgstr "Séléctionner la Fenêtre"
+msgstr "Séléctionner"
 
-#: ../../WPrefs/MouseSettings.c:681
+#: ../../WPrefs.app/MouseSettings.c:758
 msgid "Mouse Grab Modifier"
 msgstr "Modificateur d'Action de la Souris"
 
-#: ../../WPrefs/MouseSettings.c:715
+#: ../../WPrefs.app/MouseSettings.c:789
+#, c-format
 msgid "could not create %s"
 msgstr "Création de %s impossible"
 
-#: ../../WPrefs/MouseSettings.c:731
+#: ../../WPrefs.app/MouseSettings.c:805
+#, c-format
 msgid "could not create temporary file %s"
 msgstr "Création du fichier temporaire %s impossible"
 
-#: ../../WPrefs/MouseSettings.c:756
+#: ../../WPrefs.app/MouseSettings.c:836
+#, c-format
 msgid "could not rename file %s to %s\n"
 msgstr "Changement de nom de %s à %s impossible\n"
 
-#: ../../WPrefs/MouseSettings.c:839
+#: ../../WPrefs.app/MouseSettings.c:920
 msgid "Mouse Preferences"
 msgstr "Préférences de la Souris"
 
-#: ../../WPrefs/Paths.c:82
+#: ../../WPrefs.app/NoMenuAlert.c:100
+msgid "Copy Default Menu"
+msgstr "Copier le Menu par Défaut"
+
+#: ../../WPrefs.app/NoMenuAlert.c:106
+msgid "Keep Current Menu"
+msgstr "Garder le menu en cours"
+
+#: ../../WPrefs.app/Paths.c:82
 msgid "bad value in option IconPath. Using default path list"
-msgstr "Mauvaise valeur pour CheminIcone. Utilise les chemins par défaut."
+msgstr "Mauvaise valeur pour IconPath. Utilise les chemins par défaut."
 
-#: ../../WPrefs/Paths.c:99
+#: ../../WPrefs.app/Paths.c:99
 msgid "bad value in option PixmapPath. Using default path list"
-msgstr "Mauvaise valeur pour CheminImages. Utilise les chemins par défaut."
+msgstr "Mauvaise valeur pour PixmapPath. Utilise les chemins par défaut."
 
-#: ../../WPrefs/Paths.c:301
+#: ../../WPrefs.app/Paths.c:302
 msgid "Icon Search Paths"
 msgstr "Chemins des Icones"
 
-#: ../../WPrefs/Paths.c:313 ../../WPrefs/Paths.c:349
+#: ../../WPrefs.app/Paths.c:314 ../../WPrefs.app/Paths.c:350
+#: ../../WPrefs.app/TexturePanel.c:1287
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../../WPrefs/Paths.c:320 ../../WPrefs/Paths.c:356
+#: ../../WPrefs.app/Paths.c:321 ../../WPrefs.app/Paths.c:357
 msgid "Remove"
 msgstr "Supprimer"
 
-#: ../../WPrefs/Paths.c:337
+#: ../../WPrefs.app/Paths.c:338
 msgid "Pixmap Search Paths"
 msgstr "Chemins des Images"
 
-#: ../../WPrefs/Paths.c:385
+#: ../../WPrefs.app/Paths.c:389
 msgid "Search Path Configuration"
 msgstr "Configuration des Chemins"
 
-#: ../../WPrefs/Preferences.c:142
+#: ../../WPrefs.app/Preferences.c:155
 msgid "Size Display"
 msgstr "Affichage de la Taille"
 
-#: ../../WPrefs/Preferences.c:147 ../../WPrefs/Preferences.c:163
+#: ../../WPrefs.app/Preferences.c:160 ../../WPrefs.app/Preferences.c:176
 msgid "Corner of screen"
 msgstr "Coin de l'écran"
 
-#: ../../WPrefs/Preferences.c:148 ../../WPrefs/Preferences.c:164
+#: ../../WPrefs.app/Preferences.c:161 ../../WPrefs.app/Preferences.c:177
 msgid "Center of screen"
 msgstr "Centre de l'écran"
 
-#: ../../WPrefs/Preferences.c:149 ../../WPrefs/Preferences.c:165
+#: ../../WPrefs.app/Preferences.c:162 ../../WPrefs.app/Preferences.c:178
 msgid "Center of resized window"
 msgstr "Centre de la fenêtre"
 
-#: ../../WPrefs/Preferences.c:150
+#: ../../WPrefs.app/Preferences.c:163
 msgid "Technical drawing-like"
 msgstr "Dessin des Bordures"
 
-#: ../../WPrefs/Preferences.c:158
+#: ../../WPrefs.app/Preferences.c:171
 msgid "Position Display"
 msgstr "Affichage de la Position"
 
-#: ../../WPrefs/Preferences.c:173
+#: ../../WPrefs.app/Preferences.c:186
 msgid "Show balloon text for..."
 msgstr "Montrer les Bulles d'Aide pour..."
 
-#: ../../WPrefs/Preferences.c:180
+#: ../../WPrefs.app/Preferences.c:193
 msgid "incomplete window titles"
 msgstr "les titres de fenêtres incomplets"
 
-#: ../../WPrefs/Preferences.c:181
+#: ../../WPrefs.app/Preferences.c:194
 msgid "miniwindow titles"
 msgstr "les titres des mini-fenêtres"
 
-#: ../../WPrefs/Preferences.c:182
+#: ../../WPrefs.app/Preferences.c:195
 msgid "application/dock icons"
 msgstr "les applications du Dock"
 
-#: ../../WPrefs/Preferences.c:195
-msgid "Raise window when switching focus with keyboard."
+#: ../../WPrefs.app/Preferences.c:208
+msgid "Raise window when switching focus with keyboard (CirculateRaise)."
 msgstr "Mettre en avant la fenêtre lors du changement de focus avec le clavier."
 
-#: ../../WPrefs/Preferences.c:215
+#: ../../WPrefs.app/Preferences.c:214
+msgid "Keep keyboard language status for each window."
+msgstr "Garder le mappage du clavier pour chaque fenêtre."
+
+#: ../../WPrefs.app/Preferences.c:235
 msgid "Miscellaneous Ergonomic Preferences"
 msgstr "Autres Préférences Ergonomiques"
 
-#: ../../WPrefs/Text.c:179
+#: ../../WPrefs.app/Text.c:179
+#, c-format
 msgid "Invalid font %s."
 msgstr "Police %s invalide."
 
-#: ../../WPrefs/Text.c:256
+#: ../../WPrefs.app/Text.c:256
 msgid "Set Font..."
 msgstr "Choisir la Police..."
 
-#: ../../WPrefs/Text.c:262
+#: ../../WPrefs.app/Text.c:262
 msgid "Window Title Font"
 msgstr "Police de Titre de Fenêtre"
 
-#: ../../WPrefs/Text.c:263
+#: ../../WPrefs.app/Text.c:263
 msgid "Menu Title Font"
 msgstr "Police de Titre de Menu"
 
-#: ../../WPrefs/Text.c:264
+#: ../../WPrefs.app/Text.c:264
 msgid "Menu Item Font"
 msgstr "Police d'Elément de Menu"
 
-#: ../../WPrefs/Text.c:265
+#: ../../WPrefs.app/Text.c:265
 msgid "Icon Title Font"
 msgstr "Police de Titre d'Icone"
 
-#: ../../WPrefs/Text.c:266
+#: ../../WPrefs.app/Text.c:266
 msgid "Clip Title Font"
 msgstr "Police de Titre du Clip"
 
-#: ../../WPrefs/Text.c:267
+#: ../../WPrefs.app/Text.c:267
 msgid "Geometry Display Font"
 msgstr "Police d'Affichage de la Géométrie"
 
-#: ../../WPrefs/Text.c:280
+#: ../../WPrefs.app/Text.c:280
 msgid ""
 "Sample Text\n"
 "abcdefghijklmnopqrstuvxywz\n"
@@ -807,338 +1148,348 @@ msgstr ""
 "ABCDEFGHIJKLMNOPQRSTUVXYWZ\n"
 "0123456789"
 
-#: ../../WPrefs/Text.c:285
+#: ../../WPrefs.app/Text.c:285
 msgid "Alignment"
 msgstr "Alignement"
 
-#: ../../WPrefs/Text.c:290
+#: ../../WPrefs.app/Text.c:290
 msgid "Left"
 msgstr "Gauche"
 
-#: ../../WPrefs/Text.c:296
+#: ../../WPrefs.app/Text.c:296 ../../WPrefs.app/TexturePanel.c:1494
 msgid "Center"
 msgstr "Centre"
 
-#: ../../WPrefs/Text.c:303
+#: ../../WPrefs.app/Text.c:303
 msgid "Right"
 msgstr "Droite"
 
-#: ../../WPrefs/Text.c:325
+#: ../../WPrefs.app/Text.c:325
 msgid "Text Preferences"
 msgstr "Préférences de Texte"
 
-#: ../../WPrefs/TextureAndColor.c:339
-msgid "Window Title Bar"
-msgstr "Barre de Titre de Fenêtre"
+#: ../../WPrefs.app/TexturePanel.c:601
+msgid "Could not load the selected file: "
+msgstr "Chargement du fichier séléctionné impossible: "
 
-#: ../../WPrefs/TextureAndColor.c:340
-msgid "Menu Title Bar"
-msgstr "Barre de Titre de Menu"
+#: ../../WPrefs.app/TexturePanel.c:678
+msgid "The selected file does not contain a supported image."
+msgstr "Le fichier séléctionné n'est pas une image supportée."
 
-#: ../../WPrefs/TextureAndColor.c:341
-msgid "Menu Items"
-msgstr "Eléments de Menu"
+#: ../../WPrefs.app/TexturePanel.c:1231
+msgid "Texture Panel"
+msgstr "Panneau de Texture"
 
-#: ../../WPrefs/TextureAndColor.c:342
-msgid "Workspace/Clip"
-msgstr "Bureau/Clip"
+#: ../../WPrefs.app/TexturePanel.c:1239
+msgid "Texture Name"
+msgstr "Nom de Texture"
 
-#: ../../WPrefs/TextureAndColor.c:343
-msgid "Icons"
-msgstr "Icones"
+#: ../../WPrefs.app/TexturePanel.c:1251
+msgid "Solid Color"
+msgstr "Couleur Unie"
 
-#: ../../WPrefs/TextureAndColor.c:354
-msgid "Focused Window"
-msgstr "Fenêtre avec le Focus"
+#: ../../WPrefs.app/TexturePanel.c:1252
+msgid "Gradient Texture"
+msgstr "Dégradé"
 
-#: ../../WPrefs/TextureAndColor.c:367 ../../WPrefs/TextureAndColor.c:398 ../../WPrefs/TextureAndColor.c:429
-msgid "Texture"
-msgstr "Texture"
+#: ../../WPrefs.app/TexturePanel.c:1253
+msgid "Simple Gradient Texture"
+msgstr "Dégradé Simple"
 
-#: ../../WPrefs/TextureAndColor.c:373 ../../WPrefs/TextureAndColor.c:404 ../../WPrefs/TextureAndColor.c:435
-msgid "Text Color"
-msgstr "Couleur du Texte"
+#: ../../WPrefs.app/TexturePanel.c:1254
+msgid "Textured Gradient"
+msgstr "Dégradé texturé"
 
-#: ../../WPrefs/TextureAndColor.c:378 ../../WPrefs/TextureAndColor.c:409 ../../WPrefs/TextureAndColor.c:440 ../../WPrefs/TextureAndColor.c:464 ../../WPrefs/TextureAndColor.c:530 ../../WPrefs/TextureAndColor.c:607
-msgid "Set..."
-msgstr "Choisir..."
+#: ../../WPrefs.app/TexturePanel.c:1255
+msgid "Image Texture"
+msgstr "Image"
 
-#: ../../WPrefs/TextureAndColor.c:385
-msgid "Unfocused Window"
-msgstr "Fenêtre sans le Focus"
+#: ../../WPrefs.app/TexturePanel.c:1263
+msgid "Default Color"
+msgstr "Couleur par Défaut"
 
-#: ../../WPrefs/TextureAndColor.c:416
-msgid "Owner of Focused Window"
-msgstr "Parent de la Fenêtre avec le Focus"
+#: ../../WPrefs.app/TexturePanel.c:1275
+msgid "Gradient Colors"
+msgstr "Couleurs du Dégradé"
 
-#: ../../WPrefs/TextureAndColor.c:449
-msgid "Unselected Items"
-msgstr "Eléments non Séléctionnés"
+#: ../../WPrefs.app/TexturePanel.c:1371
+msgid "Direction"
+msgstr "Direction"
 
-#: ../../WPrefs/TextureAndColor.c:459 ../../WPrefs/TextureAndColor.c:513
-msgid "Background"
-msgstr "Fond d'Ecran"
+#: ../../WPrefs.app/TexturePanel.c:1399
+msgid "Gradient"
+msgstr "Dégradé"
 
-#: ../../WPrefs/TextureAndColor.c:474
-msgid "Normal Text"
-msgstr "Texte Normal"
+#: ../../WPrefs.app/TexturePanel.c:1417
+msgid "Gradient Opacity"
+msgstr "Opacité du Dégradé"
 
-#: ../../WPrefs/TextureAndColor.c:484
-msgid "Disabled Text"
-msgstr "Texte Désactivé"
+#: ../../WPrefs.app/TexturePanel.c:1460
+msgid "Image"
+msgstr "Image"
 
-#: ../../WPrefs/TextureAndColor.c:493
-msgid "Selected Items"
-msgstr "Eléments Séléctionnés"
+#: ../../WPrefs.app/TexturePanel.c:1480
+msgid "Browse..."
+msgstr "Parcourir..."
 
-#: ../../WPrefs/TextureAndColor.c:503
-msgid "Text"
-msgstr "Texte"
+#: ../../WPrefs.app/TexturePanel.c:1492
+msgid "Tile"
+msgstr "Mosaïque"
 
-#: ../../WPrefs/TextureAndColor.c:521
-msgid "Menu Title Background"
-msgstr "Fond du Titre de Menu"
+#: ../../WPrefs.app/TexturePanel.c:1493
+msgid "Scale"
+msgstr "Echelle"
 
-#: ../../WPrefs/TextureAndColor.c:539
-msgid "Menu Title Text"
-msgstr "Texte du Titre de Menu"
+#: ../../WPrefs.app/TexturePanel.c:1495
+msgid "Maximize"
+msgstr "Maximiser"
 
-#: ../../WPrefs/TextureAndColor.c:551
-msgid "Workspace Background"
-msgstr "Fond de Bureau"
+#: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82
+msgid "Set"
+msgstr "Appliquer"
 
-#: ../../WPrefs/TextureAndColor.c:560
-msgid "Change"
-msgstr "Changer"
+#: ../../WPrefs.app/Themes.c:132
+msgid "Stop"
+msgstr "Stop"
 
-#: ../../WPrefs/TextureAndColor.c:566
-msgid "Clip Title Text"
-msgstr "Texte du Titre du Clip"
+#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:205
+#: ../../WPrefs.app/Themes.c:225
+msgid "Download"
+msgstr "Télécharger"
 
-#: ../../WPrefs/TextureAndColor.c:576
-msgid "Normal"
-msgstr "Normal"
+#: ../../WPrefs.app/Themes.c:173
+msgid "Save Current Theme"
+msgstr "Sauver le Theme en cours"
 
-#: ../../WPrefs/TextureAndColor.c:586
-msgid "Collapsed"
-msgstr "Refermé"
+#: ../../WPrefs.app/Themes.c:182
+msgid "Load"
+msgstr "Charger"
 
-#: ../../WPrefs/TextureAndColor.c:598
-msgid "Icon Background"
-msgstr "Fond d'Icone"
+#: ../../WPrefs.app/Themes.c:187
+msgid "Install"
+msgstr "Installer"
 
-#: ../../WPrefs/TextureAndColor.c:632
-msgid "Texture and Color Preferences"
-msgstr "Préférences de Couleurs et de Textures"
+#: ../../WPrefs.app/Themes.c:195
+msgid "Tile of The Day"
+msgstr "Tile of The Day"
 
-#: ../../WPrefs/WPrefs.c:194
-msgid "WindowMaker Preferences"
-msgstr "Préférences de WindowMaker"
+#: ../../WPrefs.app/Themes.c:215
+msgid "Bar of The Day"
+msgstr "Bar of the Day"
 
-#: ../../WPrefs/WPrefs.c:216
-msgid "Revert Page"
-msgstr "Défaire la Page"
+#: ../../WPrefs.app/Themes.c:252
+msgid "Themes"
+msgstr "Themes"
 
-#: ../../WPrefs/WPrefs.c:222
-msgid "Revert All"
-msgstr "Tout Défaire"
-
-#: ../../WPrefs/WPrefs.c:228
-msgid "Save"
-msgstr "Sauver"
-
-#: ../../WPrefs/WPrefs.c:234
-msgid "Close"
-msgstr "Fermer"
-
-#: ../../WPrefs/WPrefs.c:258
-msgid "Version %s for WindowMaker %s"
-msgstr "Version %s pour WindowMaker %s"
-
-#: ../../WPrefs/WPrefs.c:265
-msgid "Starting..."
-msgstr "Démarrage..."
-
-#: ../../WPrefs/WPrefs.c:271
-msgid ""
-"Programming/Design: Alfredo K. Kojima\n"
-"Artwork: Marco van Hylckama Vlieg"
-msgstr ""
-"Programmation/Conception: Alfredo K. Kojima\n"
-"Dessins: Marco van Hylckama Vlieg"
-
-#: ../../WPrefs/WPrefs.c:358
-msgid "could not locate image file %s\n"
-msgstr "Image %s introuvable\n"
-
-#: ../../WPrefs/WPrefs.c:476
-msgid "Loading WindowMaker configuration files..."
-msgstr "Lecture de la configuration de WindowMaker..."
-
-#: ../../WPrefs/WPrefs.c:480
-msgid "Initializing configuration panels..."
-msgstr "Initialisation des panneaux de configuration..."
-
-#: ../../WPrefs/WPrefs.c:526 ../../WPrefs/WPrefs.c:581
-msgid "WindowMaker domain (%s) is corrupted!"
-msgstr "Le domaine WindowMaker (%s) est corrompu!"
-
-#: ../../WPrefs/WPrefs.c:530 ../../WPrefs/WPrefs.c:585
-msgid "Could not load WindowMaker domain (%s) from defaults database."
-msgstr "Lecture du domaine WindowMaker (%s) impossible depuis la base par défaut."
-
-#: ../../WPrefs/WPrefs.c:538
-msgid "could not extract version information from WindowMaker"
-msgstr "Extraction du numéro de version de WindowMaker impossible."
-
-#: ../../WPrefs/WPrefs.c:539
-msgid "Make sure WindowMaker is in your search path."
-msgstr "Assurez-vous que WindowMaker est dans votre PATH."
-
-#: ../../WPrefs/WPrefs.c:542
-msgid "Could not extract version from WindowMaker. Make sure it is correctly installed."
-msgstr "Extraction du numéro de version de WindowMaker impossible. Assurez-vous qu'il soit bien installé."
-
-#: ../../WPrefs/WPrefs.c:551
-msgid "Error extracting version from WindowMaker. Make sure it is correctly installed."
-msgstr "Erreur lors de l'extraction du numéro de version de WindowMaker. Assurez-vous qu'il soit bien installé."
-
-#: ../../WPrefs/WPrefs.c:556
-msgid ""
-"WPrefs only supports WindowMaker 0.18.0 or newer.\n"
-"The version installed is %i.%i.%i\n"
-msgstr ""
-"WPrefs ne supporte que WindowMaker 0.18.0 ou mieux.\n"
-"La version installé est %i.%i.%i\n"
-
-#: ../../WPrefs/WPrefs.c:563
-msgid "WindowMaker %i.%i.%i, which is installed in your system, is not fully supported by this version of WPrefs."
-msgstr "WindowMaker %i.%i.%i, qui est installé sur votre système, n'est pas pleinement supporté par WPrefs."
-
-#: ../../WPrefs/WPrefs.c:570
-msgid "could not run \"wmaker -global_defaults_path\"."
-msgstr "Lancement de \"wmaker -base_globale_défaut\" impossible."
-
-#: ../../WPrefs/WPrefs.c:828
-msgid ""
-"bad speed value for option %s\n"
-". Using default Medium"
-msgstr ""
-"Mauvaise valeur de l'option %s.\n"
-"Utilise le défaut: Medium"
-
-#: ../../WPrefs/WindowHandling.c:108
+#: ../../WPrefs.app/WindowHandling.c:134
+#, c-format
 msgid "bad option value %s in WindowPlacement. Using default value"
-msgstr "Mauvaise valeur %s pour PlacementFenêtres. Utilise le défaut"
+msgstr "Mauvaise valeur %s pour WindowPlacement. Utilise le défaut"
 
-#: ../../WPrefs/WindowHandling.c:130
-msgid "invalid data in option WindowPlacementOrigin. Using default (0,0)"
-msgstr "Mauvaise valeur dans l'option OriginePlacementFenêtres. Utilise le défaut: (0,0)"
+#: ../../WPrefs.app/WindowHandling.c:156
+msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)"
+msgstr "Mauvaise valeur dans l'option WindowPlaceOrigin. Utilise le défaut: (0,0)"
 
-#: ../../WPrefs/WindowHandling.c:192
+#: ../../WPrefs.app/WindowHandling.c:223
 msgid "Window Placement"
 msgstr "Placement des Fenêtres"
 
-#: ../../WPrefs/WindowHandling.c:197
+#: ../../WPrefs.app/WindowHandling.c:228
 msgid "Automatic"
 msgstr "Automatique"
 
-#: ../../WPrefs/WindowHandling.c:198
+#: ../../WPrefs.app/WindowHandling.c:229
 msgid "Random"
 msgstr "Au Hasard"
 
-#: ../../WPrefs/WindowHandling.c:199
+#: ../../WPrefs.app/WindowHandling.c:230
 msgid "Manual"
 msgstr "Manuel"
 
-#: ../../WPrefs/WindowHandling.c:200
+#: ../../WPrefs.app/WindowHandling.c:231
 msgid "Cascade"
 msgstr "Cascade"
 
-#: ../../WPrefs/WindowHandling.c:206
+#: ../../WPrefs.app/WindowHandling.c:237
 msgid "Placement Origin"
 msgstr "Origine du Placement"
 
-#: ../../WPrefs/WindowHandling.c:260
+#: ../../WPrefs.app/WindowHandling.c:297
 msgid "Opaque Move"
 msgstr "Mouvement Opaque"
 
-#: ../../WPrefs/WindowHandling.c:296
+#: ../../WPrefs.app/WindowHandling.c:333
 msgid "When maximizing..."
 msgstr "Lors de la Maximisation..."
 
-#: ../../WPrefs/WindowHandling.c:301
-msgid "...do not resize over icons"
+#: ../../WPrefs.app/WindowHandling.c:338
+msgid "...do not cover icons"
 msgstr "...ne pas recouvrir les icones"
 
-#: ../../WPrefs/WindowHandling.c:306
-msgid "...do not resize over dock"
+#: ../../WPrefs.app/WindowHandling.c:344
+msgid "...do not cover dock"
 msgstr "...ne pas recouvrir le dock"
 
-#: ../../WPrefs/WindowHandling.c:319
-msgid "Keep transients above their owners"
-msgstr "Garder les boîtes de message au-dessus de leurs propriétaires"
+#: ../../WPrefs.app/WindowHandling.c:353
+msgid "Edge Resistance"
+msgstr "Résistance"
 
-#: ../../WPrefs/WindowHandling.c:346
+#: ../../WPrefs.app/WindowHandling.c:377
+msgid "Open dialogs in same workspace as their owners"
+msgstr "Ouvrir les dialogues dans le même bureau que leurs propriétaires"
+
+#: ../../WPrefs.app/WindowHandling.c:404
 msgid "Window Handling Preferences"
 msgstr "Préférences de Gestion des Fenêtres"
 
-#: ../../WPrefs/Workspace.c:171
+#: ../../WPrefs.app/Workspace.c:137
 msgid "Workspace Navigation"
 msgstr "Navigation entre Bureaux"
 
-#: ../../WPrefs/Workspace.c:232
+#: ../../WPrefs.app/Workspace.c:161
+msgid "drag windows between workspaces."
+msgstr "déplacer les fenêtres entre bureaux."
+
+#: ../../WPrefs.app/Workspace.c:186
+msgid ""
+"switch to first workspace when switching past the last workspace and "
+"vice-versa"
+msgstr ""
+"passer au premier bureau aprés le dernier bureau et vice-versa (les bureaux "
+"forment une boucle)."
+
+#: ../../WPrefs.app/Workspace.c:210
+msgid "create a new workspace when switching past the last workspace."
+msgstr "créer un nouveau bureau aprés le dernier bureau."
+
+#: ../../WPrefs.app/Workspace.c:218
 msgid "Dock/Clip"
 msgstr "Dock/Clip"
 
-#: ../../WPrefs/Workspace.c:278
-msgid "Auto-arrange icons"
-msgstr "Arranger automatiquement les Icones"
-
-#: ../../WPrefs/Workspace.c:283
-msgid "Omnipresent miniwindows"
-msgstr "Mini-Fenêtres Omniprésentes"
-
-#: ../../WPrefs/Workspace.c:291
-msgid "Icon Size"
-msgstr "Taille des Icones"
-
-#: ../../WPrefs/Workspace.c:367
+#: ../../WPrefs.app/Workspace.c:287
 msgid "Workspace Preferences"
 msgstr "Préférences de Bureau"
 
-#: ../../WPrefs/main.c:56
-msgid "usage: %s [options]\n"
-msgstr "usage: %s [options]\n"
+#: ../../WPrefs.app/MenuGuru.c:106
+msgid "Menu Guru - Select Type"
+msgstr "Gourou du menu - Choisir un Type"
 
-#: ../../WPrefs/main.c:57
-msgid "options:"
-msgstr "options:"
+#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133
+#: ../../WPrefs.app/MenuGuru.c:251
+msgid "Next"
+msgstr "Suivant"
 
-#: ../../WPrefs/main.c:58
-msgid " -display <display>\tdisplay to be used"
-msgstr " -display host:dpy\tdisplay à utiliser"
+#: ../../WPrefs.app/MenuGuru.c:114
+msgid "Menu Guru - Select Menu File"
+msgstr "Gourou du Menu - Choisir un Fichier de Menu"
 
-#: ../../WPrefs/main.c:59
-msgid " -version\t\tprint version number and exit"
-msgstr " -version\t\taffiche le numéro de version et quitte"
+#: ../../WPrefs.app/MenuGuru.c:122
+msgid "Menu Guru - Select Pipe Command"
+msgstr "Gourou du Menu - Choisir un Tube"
 
-#: ../../WPrefs/main.c:82
-msgid "too few arguments for %s"
-msgstr "Trop peu d'arguments pour %s"
+#: ../../WPrefs.app/MenuGuru.c:129
+msgid "Menu Guru - Select Directories"
+msgstr "Gourou du Menu - Choisir les Répertoires"
 
-#: ../../WPrefs/main.c:104
-msgid "X server does not support locale"
-msgstr "le Serveur X ne supporte pas les \"locale\""
+#: ../../WPrefs.app/MenuGuru.c:136
+msgid "Menu Guru - Select Command"
+msgstr "Gourou du Menu - Choisir la Commande"
 
-#: ../../WPrefs/main.c:107
-msgid "cannot set locale modifiers"
-msgstr "Modificateurs de \"locale\" inappliquables."
+#: ../../WPrefs.app/MenuGuru.c:257
+msgid "Back"
+msgstr "Retour"
 
-#: ../../WPrefs/main.c:113
-msgid "could not open display %s"
-msgstr "Ouverture du \"display\" \"%s\" impossible."
+#: ../../WPrefs.app/MenuGuru.c:271
+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 ""
+"Cette fonction va vous aider à créer un sous-menu dont le contenu est dans un "
+"autre fichier ou chargé dynamiquement.\n"
+"Que voulez-vous utiliser comme contenu du sous-menu?"
 
-#: ../../WPrefs/main.c:121
-msgid "could not initialize application"
-msgstr "Initialisation de l'application impossible."
+#: ../../WPrefs.app/MenuGuru.c:279
+msgid ""
+"A file containing the menu definition in the plain text (non-property list) "
+"menu format."
+msgstr ""
+"Un fichier contenant le menu en formaté en texte (pas en liste de "
+"propriétés)."
+
+#: ../../WPrefs.app/MenuGuru.c:285
+msgid "The menu definition generated by a script/program read through a pipe."
+msgstr "Un menu dont le contenu est créé par un script/programme, lu à travers un tube."
+
+#: ../../WPrefs.app/MenuGuru.c:291
+msgid "The files in one or more directories."
+msgstr "Les fichiers dans un ou plusieurs répertoires."
+
+#: ../../WPrefs.app/MenuGuru.c:303
+msgid "Type the path for the menu file:"
+msgstr "Entrez le chemin vers le menu:"
+
+#: ../../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 ""
+"Le fichier de menu doit être formaté en texte. Ce format est décrit dans "
+" le fichier de menu inclus avec WindowMaker, probablement "
+"~/GNUstep/Library/WindowMaker/menu.fr"
+
+#: ../../WPrefs.app/MenuGuru.c:328
+msgid "Type the command that will generate the menu definition:"
+msgstr "Tapez la commande qui va générer le menu:"
+
+#: ../../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"
+msgstr ""
+"La commande doit générer un menu valide sur le sortie standard. Le menu doit "
+"être formaté en texte, décrit dans le fichier de menu inclus avec "
+"WindowMaker, probablement ~/GNUstep/Library/WindowMaker/menu.fr"
+
+#: ../../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 ""
+"Entrez le chemin vers le répertoire. Vous pouvez taper plusieurs chemins "
+"en les séparant par des espaces."
+
+#: ../../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)."
+msgstr ""
+"Le menu créé contiendra un élément pour chaque fichier du répertoire. Les "
+"répertoires peuvent contenir des éxécutables ou des données (comme "
+"des images)."
+
+#: ../../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 ""
+"Si le répertoire contient des données, tapez la commande utilisée pour "
+"ouvrir ces fichiers. Sinon, laissez en blanc."
+
+#: ../../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\"."
+msgstr ""
+"Chaque fichier du répertoire sera un élément et sera ouvert avec la commande "
+"fournie. Par exemple, si le répertoire contient des images et que la "
+"commande est «xv -root», chaque fichier du répertoire sera un élément "
+"tel que «xv -root image»."
diff --git a/WPrefs.app/po/ko.po b/WPrefs.app/po/ko.po
index 3d6ce705..c81b2469 100644
--- a/WPrefs.app/po/ko.po
+++ b/WPrefs.app/po/ko.po
@@ -1,21 +1,311 @@
 # WPrefs.app po file for Korean.
 # Copyright (C) 1998 Free Software Foundation, Inc.
-# Byeong-Chan Kim <redhands@linux.sarang.net>, 1998.
+# Byeong-Chan Kim <redhands@linux.sarang.net>, 1999.
 # Update: CHOI Junho <cjh@kr.freebsd.org>, 1998/12.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.52.0\n"
-"POT-Creation-Date: 1999-04-10 02:43+0900\n"
-"PO-Revision-Date: 1999-04-10 01:30+0900\n"
+"POT-Creation-Date: 1999-04-21 11:40+0900\n"
+"PO-Revision-Date: 1999-04-21 11:43+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"
 
+#: ../../WPrefs.app/main.c:74
+#, c-format
+msgid "usage: %s [options]\n"
+msgstr "»ç¿ë¹ý: %s [¿É¼Ç]\n"
+
+#: ../../WPrefs.app/main.c:75
+msgid "options:"
+msgstr "¿É¼Ç:"
+
+#: ../../WPrefs.app/main.c:76
+msgid " -display <display>\tdisplay to be used"
+msgstr "-display <display>\t»ç¿ëÇÒ µð½ºÇ÷¹ÀÌ"
+
+#: ../../WPrefs.app/main.c:77
+msgid " --version\t\tprint version number and exit"
+msgstr "--version\t\t¹öÁ¯ Ãâ·ÂÈÄ Á¾·á"
+
+#: ../../WPrefs.app/main.c:78
+msgid " --help\t\tprint this message and exit"
+msgstr "--help\t\tÇöÀç ¸Þ½ÃÁö Ãâ·Â ÈÄ Á¾·á"
+
+#: ../../WPrefs.app/main.c:137
+#, c-format
+msgid "too few arguments for %s"
+msgstr "%s ÀÇ Àμö°¡ ³Ê¹« ÀûÀ½"
+
+#: ../../WPrefs.app/main.c:159
+msgid "X server does not support locale"
+msgstr "X ¼­¹ö°¡ ·ÎÄÉÀÏÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+
+#: ../../WPrefs.app/main.c:162
+msgid "cannot set locale modifiers"
+msgstr "·ÎÄÉÀÏ ¼öÁ¤ÀÚ(modifier)¸¦ ¼³Á¤ÇÒ ¼ö ¾øÀ½"
+
+#: ../../WPrefs.app/main.c:168
+#, c-format
+msgid "could not open display %s"
+msgstr "µð½ºÇ÷¹ÀÌ %s¸¦ ¿­ ¼ö ¾øÀ½"
+
+#: ../../WPrefs.app/main.c:176
+msgid "could not initialize application"
+msgstr "¾ÖÇø®ÄÉÀ̼ÇÀ» ÃʱâÈ­ ÇÒ ¼ö ¾øÀ½"
+
+#: ../../WPrefs.app/WPrefs.c:239
+msgid "Window Maker Preferences"
+msgstr "Window Maker ¼³Á¤"
+
+#: ../../WPrefs.app/WPrefs.c:263
+msgid "Revert Page"
+msgstr "ÆäÀÌÁö º¹±¸"
+
+#: ../../WPrefs.app/WPrefs.c:269
+msgid "Revert All"
+msgstr "¸ðµÎ º¹±¸"
+
+#: ../../WPrefs.app/WPrefs.c:275
+msgid "Save"
+msgstr "ÀúÀå"
+
+#: ../../WPrefs.app/Appearance.c:1593 ../../WPrefs.app/WPrefs.c:281
+msgid "Close"
+msgstr "´Ý±â"
+
+#: ../../WPrefs.app/WPrefs.c:299
+msgid "Window Maker Preferences Utility"
+msgstr "Window Maker ¼³Á¤ À¯Æ¿¸®Æ¼"
+
+#: ../../WPrefs.app/WPrefs.c:306
+#, c-format
+msgid "Version %s for Window Maker %s"
+msgstr "¹öÀü %s - Window Maker %s"
+
+#: ../../WPrefs.app/WPrefs.c:313
+msgid "Starting..."
+msgstr "½ÃÀÛÇÕ´Ï´Ù..."
+
+#: ../../WPrefs.app/WPrefs.c:319
+msgid ""
+"Programming/Design: Alfredo K. Kojima\n"
+"Artwork: Marco van Hylckama Vlieg\n"
+"More Programming: James Thompson"
+msgstr ""
+"ÇÁ·Î±×·¡¹Ö/µðÀÚÀÎ: Alfredo K. Kojima\n"
+"¾ÆÆ®¿÷: Macro van Hylckama Vlieg\n"
+"Ãß°¡ ÇÁ·Î±×·¡¹Ö: James Thompson"
+
+#: ../../WPrefs.app/WPrefs.c:407
+#, c-format
+msgid "could not locate image file %s\n"
+msgstr "À̹ÌÁö ÆÄÀÏ %s¸¦ ãÀ» ¼ö ¾øÀ½\n"
+
+#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246
+#: ../../WPrefs.app/Focus.c:314 ../../WPrefs.app/Focus.c:325
+#: ../../WPrefs.app/MenuPreferences.c:135
+#: ../../WPrefs.app/MenuPreferences.c:146
+#: ../../WPrefs.app/MenuPreferences.c:174
+#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:604
+#: ../../WPrefs.app/MouseSettings.c:615 ../../WPrefs.app/MouseSettings.c:671
+#: ../../WPrefs.app/MouseSettings.c:686 ../../WPrefs.app/MouseSettings.c:702
+#: ../../WPrefs.app/WPrefs.c:430 ../../WPrefs.app/WPrefs.c:447
+#, c-format
+msgid "could not load icon file %s"
+msgstr "¾ÆÀÌÄÜ ÆÄÀÏ %s¸¦ ÀÐÀ» ¼ö ¾øÀ½"
+
+#: ../../WPrefs.app/WPrefs.c:520
+#, c-format
+msgid "could not load image file %s:%s"
+msgstr "À̹ÌÁö ÆÄÀÏ %s¸¦ ÀÐÀ» ¼ö ¾øÀ½"
+
+#: ../../WPrefs.app/WPrefs.c:539
+msgid "Loading Window Maker configuration files..."
+msgstr "Window Maker ¼³Á¤ ÆÄÀÏÀ» Àд Áß..."
+
+#: ../../WPrefs.app/WPrefs.c:543
+msgid "Initializing configuration panels..."
+msgstr "¼³Á¤ ÆгΠÃʱâÈ­ Áß..."
+
+#: ../../WPrefs.app/WPrefs.c:574
+msgid ""
+"WPrefs is free software and is distributed WITHOUT ANY\n"
+"WARRANTY under the terms of the GNU General Public License.\n"
+"The icons in this program are licensed through the\n"
+"OpenContent License."
+msgstr ""
+"WPrefs´Â °ø°³ ¼ÒÇÁÆ®¿þ¾îÀ̸ç GNU General Public\n"
+"License¿¡ µû¶ó ¹èÆ÷¿¡ ´ëÇÑ ¾î¶°ÇÑ Ã¥ÀÓµµ °¡ÁöÁö\n"
+"¾Ê½À´Ï´Ù. ¾ÆÀÌÄÜÀº OpenContent License¸¦ µû¸¨´Ï´Ù."
+
+#: ../../WPrefs.app/WPrefs.c:605 ../../WPrefs.app/WPrefs.c:670
+#, c-format
+msgid "Window Maker domain (%s) is corrupted!"
+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"
+msgstr "¿¡·¯"
+
+#: ../../WPrefs.app/Menu.c:1342 ../../WPrefs.app/MenuGuru.c:119
+#: ../../WPrefs.app/MenuGuru.c:126 ../../WPrefs.app/MenuGuru.c:140
+#: ../../WPrefs.app/MouseSettings.c:149 ../../WPrefs.app/MouseSettings.c:169
+#: ../../WPrefs.app/Text.c:181 ../../WPrefs.app/TexturePanel.c:605
+#: ../../WPrefs.app/TexturePanel.c:679 ../../WPrefs.app/TexturePanel.c:1505
+#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:606
+#: ../../WPrefs.app/WPrefs.c:611 ../../WPrefs.app/WPrefs.c:622
+#: ../../WPrefs.app/WPrefs.c:634 ../../WPrefs.app/WPrefs.c:640
+#: ../../WPrefs.app/WPrefs.c:647 ../../WPrefs.app/WPrefs.c:671
+#: ../../WPrefs.app/WPrefs.c:676
+msgid "OK"
+msgstr "È®ÀÎ"
+
+#: ../../WPrefs.app/WPrefs.c:609
+#, c-format
+msgid "Could not load Window Maker domain (%s) from defaults database."
+msgstr "±âº» µ¥ÀÌÅͺ£À̽º¿¡¼­ Window Maker µµ¸ÞÀÎ(%s)À» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
+
+#: ../../WPrefs.app/WPrefs.c:617
+msgid "could not extract version information from Window Maker"
+msgstr "Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
+
+#: ../../WPrefs.app/WPrefs.c:618
+msgid "Make sure wmaker is in your search path."
+msgstr "wmaker°¡ °Ë»ö °æ·Î¿¡ ÀÖ´ÂÁö È®ÀÎÇϼ¼¿ä."
+
+#: ../../WPrefs.app/WPrefs.c:621
+msgid ""
+"Could not extract version from Window Maker. Make sure it is correctly "
+"installed and is in your PATH environment variable."
+msgstr ""
+"Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù. PATH ȯ°æ º¯¼ö¿¡ ÁöÁ¤µÈ °÷¿¡ "
+"Á¦´ë·Î ¼³Ä¡µÇ¾ú´ÂÁö È®ÀÎÇϼ¼¿ä."
+
+#: ../../WPrefs.app/WPrefs.c:631
+msgid ""
+"Could not extract version from Window Maker. Make sure it is correctly "
+"installed and the path where it installed is in the PATH environment "
+"variable."
+msgstr ""
+"Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù. PATH ȯ°æ º¯¼ö¿¡ ÁöÁ¤µÈ °÷¿¡ "
+"Á¦´ë·Î ¼³Ä¡µÇ¾ú´ÂÁö È®ÀÎÇϼ¼¿ä."
+
+#: ../../WPrefs.app/WPrefs.c:638
+#, c-format
+msgid ""
+"WPrefs only supports Window Maker 0.18.0 or newer.\n"
+"The version installed is %i.%i.%i\n"
+msgstr ""
+"WPrefs ´Â Window Maker 0.18.0 ÀÌ»ó¸¸À» Áö¿øÇÕ´Ï´Ù.\n"
+"¼³Ä¡µÈ ¹öÁ¯Àº %i.%i.%i ÀÔ´Ï´Ù.\n"
+
+#: ../../WPrefs.app/WPrefs.c:645
+#, c-format
+msgid ""
+"Window Maker %i.%i.%i, which is installed in your system, is not fully "
+"supported by this version of WPrefs."
+msgstr ""
+"½Ã½ºÅÛ¿¡ ¼³Ä¡µÈ Window Maker %i.%i.%i´Â WPrefs¿¡¼­ Á¦´ë·Î Áö¿øÇÏ´Â ¹öÀüÀÌ "
+"¾Æ´Õ´Ï´Ù."
+
+#: ../../WPrefs.app/WPrefs.c:647
+msgid "Warning"
+msgstr "°æ°í"
+
+#: ../../WPrefs.app/WPrefs.c:652
+msgid "could not run \"wmaker --global_defaults_path\"."
+msgstr "\"wmaker --global_defaults_path\"¸¦ ¼öÇàÇÒ ¼ö ¾ø½À´Ï´Ù."
+
+#: ../../WPrefs.app/WPrefs.c:674
+#, c-format
+msgid "Could not load global Window Maker domain (%s)."
+msgstr "Àü¿ª Window Maker µµ¸ÞÀÎ (%s)¸¦ ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù."
+
+#: ../../WPrefs.app/WPrefs.c:923
+#, c-format
+msgid ""
+"bad speed value for option %s\n"
+". Using default Medium"
+msgstr ""
+"¿É¼Ç %s¿¡ À߸øµÈ ¼Óµµ °ªÀ» ÁÖ¾ú½À´Ï´Ù.\n"
+"±âº»°ª MediumÀ» »ç¿ëÇÕ´Ï´Ù"
+
+#: ../../WPrefs.app/Appearance.c:928
+msgid "Select File"
+msgstr "ÆÄÀÏ ¼±ÅÃ"
+
+#: ../../WPrefs.app/Appearance.c:1258
+msgid "Titlebar of Focused Window"
+msgstr "È°¼º â ŸÀÌƲ¹Ù"
+
+#: ../../WPrefs.app/Appearance.c:1259
+msgid "Titlebar of Unfocused Windows"
+msgstr "ºñÈ°¼º â ŸÀÌƲ¹Ù"
+
+#: ../../WPrefs.app/Appearance.c:1260
+msgid "Titlebar of Focused Window's Owner"
+msgstr "È°¼º âÀÇ ºÎ¸ðâ ŸÀÌƲ¹Ù"
+
+#: ../../WPrefs.app/Appearance.c:1261
+msgid "Window Resizebar"
+msgstr "Å©±âÁ¶Á¤ ¹Ù"
+
+#: ../../WPrefs.app/Appearance.c:1262
+msgid "Titlebar of Menus"
+msgstr "¸Þ´º ŸÀÌƲ¹Ù"
+
+#: ../../WPrefs.app/Appearance.c:1263
+msgid "Menu Items"
+msgstr "¸Þ´º Ç׸ñ"
+
+#: ../../WPrefs.app/Appearance.c:1264
+msgid "Icon Background"
+msgstr "¾ÆÀÌÄÜ ¹è°æ"
+
+#: ../../WPrefs.app/Appearance.c:1282 ../../WPrefs.app/Appearance.c:1582
+msgid "Textures"
+msgstr "ÅؽºÃ³"
+
+#: ../../WPrefs.app/Appearance.c:1313
+msgid "New"
+msgstr "»ý¼º"
+
+#: ../../WPrefs.app/Appearance.c:1322
+msgid "Extract..."
+msgstr "̧̉"
+
+#: ../../WPrefs.app/Appearance.c:1333
+msgid "Edit"
+msgstr "ÆíÁý"
+
+#: ../../WPrefs.app/Appearance.c:1342 ../../WPrefs.app/TexturePanel.c:1293
+msgid "Delete"
+msgstr "Áö¿ò"
+
+#: ../../WPrefs.app/Appearance.c:1518
+msgid "Appearance Preferences"
+msgstr "ÀÛ¾÷°ø°£ ¼³Á¤"
+
+#: ../../WPrefs.app/Appearance.c:1562
+msgid "Extract Texture"
+msgstr "ÃßÃâµÈ ÅؽºÃ³"
+
+#: ../../WPrefs.app/Appearance.c:1598
+msgid "Extract"
+msgstr "̧̉"
+
 #: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148
-#: ../../WPrefs.app/MouseSettings.c:547 ../../WPrefs.app/WindowHandling.c:311
+#: ../../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
 #, c-format
@@ -40,20 +330,6 @@ msgstr "
 msgid "Shade Animation Speed"
 msgstr "½¦ÀÌµå ¾Ö´Ï¸ÞÀÌ¼Ç ¼Óµµ"
 
-#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246
-#: ../../WPrefs.app/Focus.c:314 ../../WPrefs.app/Focus.c:325
-#: ../../WPrefs.app/MenuPreferences.c:135
-#: ../../WPrefs.app/MenuPreferences.c:146
-#: ../../WPrefs.app/MenuPreferences.c:174
-#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:575
-#: ../../WPrefs.app/MouseSettings.c:586 ../../WPrefs.app/MouseSettings.c:650
-#: ../../WPrefs.app/MouseSettings.c:661 ../../WPrefs.app/MouseSettings.c:717
-#: ../../WPrefs.app/MouseSettings.c:732 ../../WPrefs.app/MouseSettings.c:748
-#: ../../WPrefs.app/WPrefs.c:411 ../../WPrefs.app/WPrefs.c:428
-#, c-format
-msgid "could not load icon file %s"
-msgstr "¾ÆÀÌÄÜ ÆÄÀÏ %s¸¦ ÀÐÀ» ¼ö ¾øÀ½"
-
 #: ../../WPrefs.app/Configurations.c:262
 msgid "Titlebar Style"
 msgstr "ŸÀÌƲ¹Ù ½ºÅ¸ÀÏ"
@@ -101,8 +377,7 @@ msgstr "
 #: ../../WPrefs.app/Expert.c:72
 msgid ""
 "Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME."
-msgstr ""
-"¾ÆÀÌÄÜ »ç¿ë ¾ÊÀ½. KDE/GNOME »ç¿ë½Ã."
+msgstr "¾ÆÀÌÄÜ »ç¿ë ¾ÊÀ½. KDE/GNOME »ç¿ë½Ã."
 
 #: ../../WPrefs.app/Expert.c:73
 msgid "Do not set non-WindowMaker specific parameters (do not use xset)"
@@ -270,8 +545,8 @@ msgstr "
 msgid "Keyboard Preferences"
 msgstr "Å°º¸µå ¼³Á¤"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:183 ../../WPrefs.app/Menu.c:962
-#: ../../WPrefs.app/MenuGuru.c:263 ../../WPrefs.app/TexturePanel.c:1508
+#: ../../WPrefs.app/KeyboardShortcuts.c:183 ../../WPrefs.app/Menu.c:973
+#: ../../WPrefs.app/MenuGuru.c:263 ../../WPrefs.app/TexturePanel.c:1511
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
@@ -280,8 +555,8 @@ msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
 msgstr "¿øÇÏ´Â ´ÜÃàÅ°¸¦ ´©¸£½Ê½Ã¿À. Ãë¼Ò¸¦ ´©¸£¸é ĸÃÄ°¡ Áߴܵ˴ϴÙ."
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:204
-#: ../../WPrefs.app/KeyboardShortcuts.c:444 ../../WPrefs.app/Menu.c:974
-#: ../../WPrefs.app/Menu.c:1193
+#: ../../WPrefs.app/KeyboardShortcuts.c:444 ../../WPrefs.app/Menu.c:985
+#: ../../WPrefs.app/Menu.c:1204
 msgid "Capture"
 msgstr "ĸÃÄ"
 
@@ -446,7 +721,7 @@ msgstr "Ŭ
 msgid "Toggle keyboard language"
 msgstr "Å°º¸µå ¾ð¾î ¼±ÅÃ"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:427 ../../WPrefs.app/Menu.c:1182
+#: ../../WPrefs.app/KeyboardShortcuts.c:427 ../../WPrefs.app/Menu.c:1193
 msgid "Shortcut"
 msgstr "´ÜÃàÅ°"
 
@@ -466,297 +741,154 @@ msgstr "â 
 msgid "Program to open files"
 msgstr "ÆÄÀÏÀ» ¿­ ÇÁ·Î±×·¥"
 
-#: ../../WPrefs.app/Menu.c:408 ../../WPrefs.app/Menu.c:1169
+#: ../../WPrefs.app/Menu.c:408 ../../WPrefs.app/Menu.c:1180
 msgid "Program to Run"
 msgstr "½ÇÇàÇÒ ÇÁ·Î±×·¥"
 
-#: ../../WPrefs.app/Menu.c:456 ../../WPrefs.app/Menu.c:457
+#: ../../WPrefs.app/Menu.c:457 ../../WPrefs.app/Menu.c:458
 #, c-format
 msgid "New Command %i"
 msgstr "»õ ¸í·É %i"
 
-#: ../../WPrefs.app/Menu.c:464
+#: ../../WPrefs.app/Menu.c:465
 msgid "New Submenu"
 msgstr "»õ ÇϺθ޴º"
 
-#: ../../WPrefs.app/Menu.c:469
+#: ../../WPrefs.app/Menu.c:470
 msgid "External Menu"
 msgstr "¿ÜºÎ ¸Þ´º"
 
-#: ../../WPrefs.app/Menu.c:476
+#: ../../WPrefs.app/Menu.c:477
 msgid "Workspaces"
 msgstr "ÀÛ¾÷ °ø°£"
 
-#: ../../WPrefs.app/Menu.c:1053 ../../WPrefs.app/Menu.c:1068
+#: ../../WPrefs.app/Menu.c:1064 ../../WPrefs.app/Menu.c:1079
 msgid "Commands"
 msgstr "¸í·É"
 
-#: ../../WPrefs.app/Menu.c:1054 ../../WPrefs.app/Menu.c:1069
+#: ../../WPrefs.app/Menu.c:1065 ../../WPrefs.app/Menu.c:1080
 msgid "Add Command"
 msgstr "¸í·É Ãß°¡"
 
-#: ../../WPrefs.app/Menu.c:1055 ../../WPrefs.app/Menu.c:1070
+#: ../../WPrefs.app/Menu.c:1066 ../../WPrefs.app/Menu.c:1081
 msgid "Add Submenu"
 msgstr "ÇϺθ޴º Ãß°¡"
 
-#: ../../WPrefs.app/Menu.c:1056 ../../WPrefs.app/Menu.c:1071
+#: ../../WPrefs.app/Menu.c:1067 ../../WPrefs.app/Menu.c:1082
 msgid "Add External Menu"
 msgstr "¿ÜºÎ ¸Þ´º Ãß°¡"
 
-#: ../../WPrefs.app/Menu.c:1057 ../../WPrefs.app/Menu.c:1072
+#: ../../WPrefs.app/Menu.c:1068 ../../WPrefs.app/Menu.c:1083
 msgid "Add Workspace Menu"
 msgstr "ÀÛ¾÷°ø°£ ¸Þ´º Ãß°¡"
 
-#: ../../WPrefs.app/Menu.c:1058 ../../WPrefs.app/Menu.c:1073
+#: ../../WPrefs.app/Menu.c:1069 ../../WPrefs.app/Menu.c:1084
 msgid "Remove Item"
 msgstr "Ç׸ñ »èÁ¦"
 
-#: ../../WPrefs.app/Menu.c:1059 ../../WPrefs.app/Menu.c:1074
+#: ../../WPrefs.app/Menu.c:1070 ../../WPrefs.app/Menu.c:1085
 msgid "Cut Item"
 msgstr "Ç׸ñ À߶󳻱â"
 
-#: ../../WPrefs.app/Menu.c:1060 ../../WPrefs.app/Menu.c:1075
+#: ../../WPrefs.app/Menu.c:1071 ../../WPrefs.app/Menu.c:1086
 msgid "Copy Item"
 msgstr "Ç׸ñ º¹»ç"
 
-#: ../../WPrefs.app/Menu.c:1061 ../../WPrefs.app/Menu.c:1076
+#: ../../WPrefs.app/Menu.c:1072 ../../WPrefs.app/Menu.c:1087
 msgid "Paste Item"
 msgstr "Ç׸ñ ºÙÀ̱â"
 
-#: ../../WPrefs.app/Menu.c:1105
+#: ../../WPrefs.app/Menu.c:1116
 msgid "Label"
 msgstr "·¹À̺í"
 
-#: ../../WPrefs.app/Menu.c:1118
+#: ../../WPrefs.app/Menu.c:1129
 msgid "Command"
 msgstr "¸í·É"
 
-#: ../../WPrefs.app/Menu.c:1123
+#: ../../WPrefs.app/Menu.c:1134
 msgid "Run Program"
 msgstr "ÇÁ·Î±×·¥ ½ÇÇà"
 
-#: ../../WPrefs.app/Menu.c:1124
+#: ../../WPrefs.app/Menu.c:1135
 msgid "Arrange Icons"
 msgstr "¾ÆÀÌÄÜ Á¤·Ä"
 
-#: ../../WPrefs.app/Menu.c:1125
+#: ../../WPrefs.app/Menu.c:1136
 msgid "Hide Others"
 msgstr "´Ù¸¥ â ¼û±â±â"
 
-#: ../../WPrefs.app/Menu.c:1126
+#: ../../WPrefs.app/Menu.c:1137
 msgid "Show All Windows"
 msgstr "¸ðµç â º¸À̱â"
 
-#: ../../WPrefs.app/Menu.c:1127
+#: ../../WPrefs.app/Menu.c:1138
 msgid "Exit WindowMaker"
 msgstr "Window Maker Á¾·á"
 
-#: ../../WPrefs.app/Menu.c:1128
+#: ../../WPrefs.app/Menu.c:1139
 msgid "Exit X Session"
 msgstr "X ¼¼¼Ç Á¾·á"
 
-#: ../../WPrefs.app/Menu.c:1129
+#: ../../WPrefs.app/Menu.c:1140
 msgid "Start window manager"
 msgstr "â °ü¸®ÀÚ ½ÃÀÛ "
 
-#: ../../WPrefs.app/Menu.c:1130
+#: ../../WPrefs.app/Menu.c:1141
 msgid "Restart WindowMaker"
 msgstr "Window Maker Àç½ÃÀÛ"
 
-#: ../../WPrefs.app/Menu.c:1131
+#: ../../WPrefs.app/Menu.c:1142
 msgid "Save Session"
 msgstr "¼¼¼Ç ÀúÀå"
 
-#: ../../WPrefs.app/Menu.c:1132
+#: ../../WPrefs.app/Menu.c:1143
 msgid "Clear Session"
 msgstr "¼¼¼Ç Áö¿ì±â"
 
-#: ../../WPrefs.app/Menu.c:1133
+#: ../../WPrefs.app/Menu.c:1144
 msgid "Refresh Screen"
 msgstr "´Ù½Ã ±×¸®±â"
 
-#: ../../WPrefs.app/Menu.c:1134
+#: ../../WPrefs.app/Menu.c:1145
 msgid "Info Panel"
 msgstr "Á¤º¸ ÆгÎ"
 
-#: ../../WPrefs.app/Menu.c:1135
+#: ../../WPrefs.app/Menu.c:1146
 msgid "Legal Panel"
 msgstr "¹ýÀû Á¤º¸ ÆгÎ"
 
-#: ../../WPrefs.app/Menu.c:1143
+#: ../../WPrefs.app/Menu.c:1154
 msgid "Open workspace menu"
 msgstr "ÀÛ¾÷°ø°£ ¸Þ´º ¿­±â"
 
-#: ../../WPrefs.app/Menu.c:1150
+#: ../../WPrefs.app/Menu.c:1161
 msgid "No confirmation panel"
 msgstr "È®ÀÎ ÆгΠ¾øÀ½"
 
-#: ../../WPrefs.app/Menu.c:1156
+#: ../../WPrefs.app/Menu.c:1167
 msgid "Menu Path/Directory List"
 msgstr "¸Þ´º °æ·Î/µð·ºÅ丮 ¸ñ·Ï"
 
-#: ../../WPrefs.app/Menu.c:1201
+#: ../../WPrefs.app/Menu.c:1212
 msgid "Ask help to the Guru"
 msgstr "Guru¿¡°Ô µµ¿ò ¿äû"
 
 #. if there is a localized plmenu for the tongue put it's filename here
-#: ../../WPrefs.app/Menu.c:1312 ../../WPrefs.app/Menu.c:1319
+#: ../../WPrefs.app/Menu.c:1323 ../../WPrefs.app/Menu.c:1330
 #, c-format
 msgid "%s/Library/WindowMaker/plmenu"
 msgstr "%s/Library/WindowMaker/plmenu.ko"
 
-#: ../../WPrefs.app/Menu.c:1328
+#: ../../WPrefs.app/Menu.c:1339
 #, c-format
 msgid "Could not open default menu from '%s'"
 msgstr "'%s'·Î ºÎÅÍ ±âº» ¸Þ´º¸¦ ¿­ ¼ö ¾øÀ½"
 
-#: ../../WPrefs.app/Menu.c:1331 ../../WPrefs.app/MouseSettings.c:149
-#: ../../WPrefs.app/MouseSettings.c:172 ../../WPrefs.app/Text.c:181
-#: ../../WPrefs.app/TexturePanel.c:603 ../../WPrefs.app/TexturePanel.c:674
-#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:587
-#: ../../WPrefs.app/WPrefs.c:592 ../../WPrefs.app/WPrefs.c:601
-#: ../../WPrefs.app/WPrefs.c:611 ../../WPrefs.app/WPrefs.c:621
-#: ../../WPrefs.app/WPrefs.c:652 ../../WPrefs.app/WPrefs.c:657
-msgid "Error"
-msgstr "¿¡·¯"
-
-#: ../../WPrefs.app/Menu.c:1331 ../../WPrefs.app/MenuGuru.c:119
-#: ../../WPrefs.app/MenuGuru.c:126 ../../WPrefs.app/MenuGuru.c:140
-#: ../../WPrefs.app/MouseSettings.c:151 ../../WPrefs.app/MouseSettings.c:174
-#: ../../WPrefs.app/Text.c:181 ../../WPrefs.app/TexturePanel.c:604
-#: ../../WPrefs.app/TexturePanel.c:676 ../../WPrefs.app/TexturePanel.c:1502
-#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:587
-#: ../../WPrefs.app/WPrefs.c:592 ../../WPrefs.app/WPrefs.c:603
-#: ../../WPrefs.app/WPrefs.c:615 ../../WPrefs.app/WPrefs.c:621
-#: ../../WPrefs.app/WPrefs.c:628 ../../WPrefs.app/WPrefs.c:652
-#: ../../WPrefs.app/WPrefs.c:657
-msgid "OK"
-msgstr "È®ÀÎ"
-
-#: ../../WPrefs.app/Menu.c:1438
+#: ../../WPrefs.app/Menu.c:1449
 msgid "Applications Menu Definition"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¸Þ´º Á¤ÀÇ"
 
-#: ../../WPrefs.app/MenuGuru.c:106
-msgid "Menu Guru - Select Type"
-msgstr "¸Þ´º Guru - ÇüŸ¦ ¼±ÅÃÇϼ¼¿ä"
-
-#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133
-#: ../../WPrefs.app/MenuGuru.c:251
-msgid "Next"
-msgstr "´ÙÀ½"
-
-#: ../../WPrefs.app/MenuGuru.c:114
-msgid "Menu Guru - Select Menu File"
-msgstr "¸Þ´º Guru - ¸Þ´º ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä"
-
-#: ../../WPrefs.app/MenuGuru.c:122
-msgid "Menu Guru - Select Pipe Command"
-msgstr "¸Þ´º Guru - ÆÄÀÌÇÁ ¸í·ÉÀ» ¼±ÅÃÇϼ¼¿ä"
-
-#: ../../WPrefs.app/MenuGuru.c:129
-msgid "Menu Guru - Select Directories"
-msgstr "¸Þ´º Guru - µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä"
-
-#: ../../WPrefs.app/MenuGuru.c:136
-msgid "Menu Guru - Select Command"
-msgstr "¸Þ´º Guru - ¸í·ÉÀ» ¼±ÅÃÇϼ¼¿ä"
-
-#: ../../WPrefs.app/MenuGuru.c:257
-msgid "Back"
-msgstr "¾ÕÀ¸·Î"
-
-#: ../../WPrefs.app/MenuGuru.c:271
-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 ""
-"ÀÌ °úÁ¤Àº ´Ù¸¥ ÆÄÀÏ¿¡ Á¤ÀÇ°¡ Àְųª ÀÚµ¿ÀûÀ¸·Î »ý¼ºµÇ´Â ÇϺθ޴º¸¦ ¸¸µå´Â µ¥ "
-"µµ¿òÀ» ÁÝ´Ï´Ù.\n"
-"ºÎ¸Þ´ºÀÇ ³»¿ëÀ¸·Î ¾î¶² °ÍÀ» »ç¿ëÇÏ°í ½Í½À´Ï±î?"
-
-#: ../../WPrefs.app/MenuGuru.c:279
-msgid ""
-"A file containing the menu definition in the plain text (non-property list) "
-"menu format."
-msgstr "¸Þ´º Á¤ÀǸ¦ º¸Åë ÅؽºÆ®·Î(Ư¼º ¾ø´Â ¸ñ·Ï) ¾´ ÆÄÀÏ."
-
-#: ../../WPrefs.app/MenuGuru.c:285
-msgid "The menu definition generated by a script/program read through a pipe."
-msgstr "½ºÅ©¸³Æ®/ÇÁ·Î±×·¥À¸·Î »ý¼ºÇÏ¿© ÆÄÀÌÇÁ·Î ÀоîµéÀÌ´Â ¸Þ´º Á¤ÀÇ."
-
-#: ../../WPrefs.app/MenuGuru.c:291
-msgid "The files in one or more directories."
-msgstr "Çϳª ÀÌ»óÀÇ µð·ºÅ丮ÀÇ ÆÄÀÏ."
-
-#: ../../WPrefs.app/MenuGuru.c:303
-msgid "Type the path for the menu file:"
-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 ""
-"¸Þ´º ÆÄÀÏÀÇ ³»¿ëÀº º¸Åë ÅؽºÆ®·Î µÈ ¸Þ´º ÆÄÀÏ Çü½ÄÀÇ ¸Þ´ºÀÔ´Ï´Ù. ÀÌ Çü½ÄÀº "
-"WindowMaker¿¡ Æ÷ÇÔµÈ ¸Þ´º ÆÄÀÏÀ» º¸¸é µÇ¸ç, º¸Åë "
-"~/GNUstep/Library/WindowMaker/menu.koÀÔ´Ï´Ù."
-
-#: ../../WPrefs.app/MenuGuru.c:328
-msgid "Type the command that will generate the menu definition:"
-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"
-msgstr ""
-"ÀÌ ¸í·ÉÀº À¯È¿ÇÑ ¸Þ´º Á¤ÀǸ¦ ¸¸µé¾î¼­ Ç¥ÁØ Ãâ·ÂÀ¸·Î ³»º¸³»¾ß ÇÕ´Ï´Ù. ÀÌ "
-"Á¤ÀÇ´Â º¸Åë ÅؽºÆ®·Î µÈ ¸Þ´º ÆÄÀÏ Çü½ÄÀ̾î¾ß Çϸç, WindowMaker¿¡ Æ÷ÇÔµÈ ¸Þ´º "
-"ÆÄÀÏ¿¡ ¼³¸íµÇ¾î ÀÖ½À´Ï´Ù. º¸Åë ~/GNUstep/Library/WindowMaker/menu.ko ÀÔ´Ï´Ù"
-
-#: ../../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 ""
-"µð·ºÅ丮ÀÇ °æ·Î¸¦ ÀÔ·ÂÇϼ¼¿ä. ºóÄ­À¸·Î ºÐ¸®Çؼ­ Çϳª ÀÌ»óÀÇ °æ·Î¸¦ ¾µ ¼ö "
-"ÀÖ½À´Ï´Ù."
-
-#: ../../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)."
-msgstr ""
-"»ý¼ºµÇ´Â ¸Þ´º´Â µð·ºÅ丮ÀÇ °¢ ÆÄÀÏ¿¡ ´ëÇØ Ç׸ñÀ» °®½À´Ï´Ù. µð·ºÅ丮¿¡´Â "
-"ÇÁ·Î±×·¥ ½ÇÇà ÆÄÀÏÀ̳ª µ¥ÀÌÅÍ ÆÄÀÏÀ» ³ÖÀ¸¸é µË´Ï´Ù.(jpeg À̹ÌÁö °°Àº °Íµé)"
-
-#: ../../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 ""
-"µð·ºÅ丮¿¡ µ¥ÀÌÅÍ ÆÄÀÏÀÌ ÀÖ´Â °æ¿ì, ÀÌ ÆÄÀÏÀ» ¿­±â À§ÇØ »ç¿ëÇÒ ¸í·ÉÀ» "
-"ÀÔ·ÂÇϼ¼¿ä. ±×·¸Áö ¾ÊÀ¸¸é ºóÄ­À¸·Î µÎ¼¼¿ä."
-
-#: ../../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\"."
-msgstr ""
-"µð·ºÅ丮ÀÇ °¢ ÆÄÀÏ¿¡´Â Ç׸ñÀÌ ÀÖÀ¸¸ç Á¦°øµÈ ¸í·ÉÀ¸·Î ¿­ ¼ö ÀÖ½À´Ï´Ù. ¿¹¸¦ "
-"µé¸é, ÀÌ µð·ºÅ丮¿¡ À̹ÌÁö ÆÄÀÏÀÌ ÀÖ°í ¸í·ÉÀÌ \"xv -root\"À̸é, µð·ºÅ丮ÀÇ "
-"°¢ ÆÄÀÏÀº \"xv -root À̹ÌÁöÆÄÀÏ\"°ú °°Àº ¸Þ´º Ç׸ñÀ» °®½À´Ï´Ù."
-
 #: ../../WPrefs.app/MenuPreferences.c:112
 msgid "Menu Scrolling Speed"
 msgstr "¸Þ´º ½ºÅ©·Ñ ¼Óµµ"
@@ -781,11 +913,11 @@ msgstr "È­
 msgid "Menu Preferences"
 msgstr "¸Þ´º ¼³Á¤"
 
-#: ../../WPrefs.app/MouseSettings.c:150
+#: ../../WPrefs.app/MouseSettings.c:148
 msgid "Invalid mouse acceleration value. Must be a positive real value."
 msgstr "À߸øµÈ ¸¶¿ì½º °¡¼Ó ÀÓ°èÄ¡ °ª. °¡¼Ó Àü¿¡ ¿òÁ÷ÀÏ Çȼ¿ÀÇ ¼ö¿©¾ß ÇÔ."
 
-#: ../../WPrefs.app/MouseSettings.c:173
+#: ../../WPrefs.app/MouseSettings.c:168
 msgid ""
 "Invalid mouse acceleration threshold value. Must be the number of pixels to "
 "travel before accelerating."
@@ -793,18 +925,18 @@ msgstr ""
 "À߸øµÈ ¸¶¿ì½º °¡¼Ó ÀÓ°èÄ¡ °ªÀÔ´Ï´Ù. °¡¼Ó Àü¿¡ ¿òÁ÷ÀÏ Çȼ¿ÀÇ ¼ö°¡ µÇ¾î¾ß "
 "ÇÕ´Ï´Ù."
 
-#: ../../WPrefs.app/MouseSettings.c:232
+#: ../../WPrefs.app/MouseSettings.c:227
 #, c-format
 msgid "mouse button %s not supported by WPrefs."
 msgstr "¸¶¿ì½º ¹öÆ° %s ´Â WPrefs¿¡¼­ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: ../../WPrefs.app/MouseSettings.c:268 ../../WPrefs.app/MouseSettings.c:281
-#: ../../WPrefs.app/MouseSettings.c:294
+#: ../../WPrefs.app/MouseSettings.c:263 ../../WPrefs.app/MouseSettings.c:276
+#: ../../WPrefs.app/MouseSettings.c:289
 #, c-format
 msgid "bad value %s for option %s"
 msgstr "%s ¿É¼Ç¿¡ À߸øµÈ °ª %s"
 
-#: ../../WPrefs.app/MouseSettings.c:362
+#: ../../WPrefs.app/MouseSettings.c:349
 #, c-format
 msgid ""
 "modifier key %s for option ModifierKey was not recognized. Using %s as "
@@ -813,73 +945,81 @@ msgstr ""
 "ModifierKey ÀÇ ¼öÁ¤ÀÚ Å° °ª %s ¸¦ ÀνÄÇÒ ¼ö ¾ø½À´Ï´Ù. ±âº»°ªÀÎ %s ¸¦ "
 "»ç¿ëÇÕ´Ï´Ù."
 
-#: ../../WPrefs.app/MouseSettings.c:387
+#: ../../WPrefs.app/MouseSettings.c:374
 msgid "could not retrieve keyboard modifier mapping"
 msgstr "Å°º¸µå ¼öÁ¤ÀÚ ¸ÅÇÎÀ» ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../../WPrefs.app/MouseSettings.c:534
+#: ../../WPrefs.app/MouseSettings.c:521
 msgid "Mouse Speed"
 msgstr "¸¶¿ì½º ¼Óµµ"
 
-#: ../../WPrefs.app/MouseSettings.c:597
+#: ../../WPrefs.app/MouseSettings.c:551
 msgid "Acceler.:"
 msgstr "°¡¼Ó.:"
 
-#: ../../WPrefs.app/MouseSettings.c:610
+#: ../../WPrefs.app/MouseSettings.c:564
 msgid "Threshold:"
 msgstr "ÀÓ°èÄ¡:"
 
-#: ../../WPrefs.app/MouseSettings.c:625
+#: ../../WPrefs.app/MouseSettings.c:579
 msgid "Double-Click Delay"
 msgstr "´õºí Ŭ¸¯ Áö¿¬"
 
-#: ../../WPrefs.app/MouseSettings.c:669
+#: ../../WPrefs.app/MouseSettings.c:623
 msgid "Test"
 msgstr "½ÃÇè"
 
-#: ../../WPrefs.app/MouseSettings.c:699
+#: ../../WPrefs.app/MouseSettings.c:653
 msgid "Workspace Mouse Actions"
 msgstr "ÀÛ¾÷°ø°£ ¸¶¿ì½º µ¿ÀÛ"
 
-#: ../../WPrefs.app/MouseSettings.c:704
+#: ../../WPrefs.app/MouseSettings.c:658
 msgid "Disable mouse actions"
 msgstr "¸¶¿ì½º µ¿ÀÛ »ç¿ë ¾ÊÀ½"
 
-#: ../../WPrefs.app/MouseSettings.c:757
+#: ../../WPrefs.app/MouseSettings.c:711
 msgid "Applications menu"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¸Þ´º"
 
-#: ../../WPrefs.app/MouseSettings.c:763
+#: ../../WPrefs.app/MouseSettings.c:717
 msgid "Window list menu"
 msgstr "â ¸ñ·Ï ¸Þ´º"
 
-#: ../../WPrefs.app/MouseSettings.c:769
+#: ../../WPrefs.app/MouseSettings.c:723
 msgid "Select windows"
 msgstr "â ¼±ÅÃ"
 
-#: ../../WPrefs.app/MouseSettings.c:804
+#: ../../WPrefs.app/MouseSettings.c:758
 msgid "Mouse Grab Modifier"
 msgstr "¸¶¿ì½º Àâ±â ¼öÁ¤ÀÚ(Modifier)"
 
-#: ../../WPrefs.app/MouseSettings.c:838
+#: ../../WPrefs.app/MouseSettings.c:789
 #, c-format
 msgid "could not create %s"
 msgstr "%s ¸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: ../../WPrefs.app/MouseSettings.c:854
+#: ../../WPrefs.app/MouseSettings.c:805
 #, c-format
 msgid "could not create temporary file %s"
 msgstr "Àӽà ÆÄÀÏ %s ¸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: ../../WPrefs.app/MouseSettings.c:879
+#: ../../WPrefs.app/MouseSettings.c:836
 #, c-format
 msgid "could not rename file %s to %s\n"
 msgstr "%s ÆÄÀϸíÀ» %s ·Î ¹Ù²Ü ¼ö ¾øÀ½\n"
 
-#: ../../WPrefs.app/MouseSettings.c:963
+#: ../../WPrefs.app/MouseSettings.c:920
 msgid "Mouse Preferences"
 msgstr "¸¶¿ì½º ¼³Á¤"
 
+#: ../../WPrefs.app/NoMenuAlert.c:100
+msgid "Copy Default Menu"
+msgstr "±âº» ¸Þ´º º¹»ç"
+
+#: ../../WPrefs.app/NoMenuAlert.c:106
+msgid "Keep Current Menu"
+msgstr "ÇöÀç ¸Þ´º À¯Áö"
+
 #: ../../WPrefs.app/Paths.c:82
 msgid "bad value in option IconPath. Using default path list"
 msgstr "IconPath ¿¡ À߸øµÈ °ª. ±âº» °æ·Î ¸ñ·Ï  »ç¿ë"
@@ -893,7 +1033,7 @@ msgid "Icon Search Paths"
 msgstr "¾ÆÀÌÄÜ °Ë»ö °æ·Î"
 
 #: ../../WPrefs.app/Paths.c:314 ../../WPrefs.app/Paths.c:350
-#: ../../WPrefs.app/TexturePanel.c:1284
+#: ../../WPrefs.app/TexturePanel.c:1287
 msgid "Add"
 msgstr "Ãß°¡"
 
@@ -1015,7 +1155,7 @@ msgstr "
 msgid "Left"
 msgstr "¿ÞÂÊ"
 
-#: ../../WPrefs.app/Text.c:296 ../../WPrefs.app/TexturePanel.c:1491
+#: ../../WPrefs.app/Text.c:296 ../../WPrefs.app/TexturePanel.c:1494
 msgid "Center"
 msgstr "Áß¾Ó"
 
@@ -1027,83 +1167,79 @@ msgstr "
 msgid "Text Preferences"
 msgstr "ÅؽºÆ® ¼³Á¤"
 
-#: ../../WPrefs.app/TexturePanel.c:600
+#: ../../WPrefs.app/TexturePanel.c:601
 msgid "Could not load the selected file: "
 msgstr "¼±ÅÃÇÑ ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾øÀ½: "
 
-#: ../../WPrefs.app/TexturePanel.c:675
+#: ../../WPrefs.app/TexturePanel.c:678
 msgid "The selected file does not contain a supported image."
 msgstr "¼±ÅÃÇÑ À̹ÌÁö ÆÄÀÏÀÇ Çü½ÄÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: ../../WPrefs.app/TexturePanel.c:1228
+#: ../../WPrefs.app/TexturePanel.c:1231
 msgid "Texture Panel"
 msgstr "ÅؽºÃ³ ÆгÎ"
 
-#: ../../WPrefs.app/TexturePanel.c:1236
+#: ../../WPrefs.app/TexturePanel.c:1239
 msgid "Texture Name"
 msgstr "ÅؽºÃ³ À̸§"
 
-#: ../../WPrefs.app/TexturePanel.c:1248
+#: ../../WPrefs.app/TexturePanel.c:1251
 msgid "Solid Color"
 msgstr "´Ü»ö"
 
-#: ../../WPrefs.app/TexturePanel.c:1249
+#: ../../WPrefs.app/TexturePanel.c:1252
 msgid "Gradient Texture"
 msgstr "±×·¡µð¾ðÆ® ÅؽºÃ³"
 
-#: ../../WPrefs.app/TexturePanel.c:1250
+#: ../../WPrefs.app/TexturePanel.c:1253
 msgid "Simple Gradient Texture"
 msgstr "°£°áÇÑ ±×·¡µð¾ðÆ® ÅؽºÃÄ"
 
-#: ../../WPrefs.app/TexturePanel.c:1251
+#: ../../WPrefs.app/TexturePanel.c:1254
 msgid "Textured Gradient"
 msgstr "ÅؽºÃÄ ±×·¡µð¾ðÆ®"
 
-#: ../../WPrefs.app/TexturePanel.c:1252
+#: ../../WPrefs.app/TexturePanel.c:1255
 msgid "Image Texture"
 msgstr "À̹ÌÁö ÅؽºÃ³"
 
-#: ../../WPrefs.app/TexturePanel.c:1260
+#: ../../WPrefs.app/TexturePanel.c:1263
 msgid "Default Color"
 msgstr "±âº»»ö"
 
-#: ../../WPrefs.app/TexturePanel.c:1272
+#: ../../WPrefs.app/TexturePanel.c:1275
 msgid "Gradient Colors"
 msgstr "±×·¡µð¾ðÆ® »ö"
 
-#: ../../WPrefs.app/Appearance.c:1225 ../../WPrefs.app/TexturePanel.c:1290
-msgid "Delete"
-msgstr "Áö¿ò"
-
-#: ../../WPrefs.app/TexturePanel.c:1368
+#: ../../WPrefs.app/TexturePanel.c:1371
 msgid "Direction"
 msgstr "¹æÇâ"
 
-#: ../../WPrefs.app/TexturePanel.c:1396
+#: ../../WPrefs.app/TexturePanel.c:1399
 msgid "Gradient"
 msgstr "±×·¡µð¾ðÆ®"
 
-#: ../../WPrefs.app/TexturePanel.c:1414
+#: ../../WPrefs.app/TexturePanel.c:1417
 msgid "Gradient Opacity"
 msgstr "±×·¡µð¾ðÆ® ºÒÅõ¸íµµ"
 
-#: ../../WPrefs.app/TexturePanel.c:1457
+#: ../../WPrefs.app/TexturePanel.c:1460
 msgid "Image"
 msgstr "À̹ÌÁö"
 
-#: ../../WPrefs.app/TexturePanel.c:1477
+#: ../../WPrefs.app/TexturePanel.c:1480
 msgid "Browse..."
 msgstr "ã±â..."
 
-#: ../../WPrefs.app/TexturePanel.c:1489
+#: ../../WPrefs.app/TexturePanel.c:1492
 msgid "Tile"
 msgstr "ŸÀÏ"
 
-#: ../../WPrefs.app/TexturePanel.c:1490
+#: ../../WPrefs.app/TexturePanel.c:1493
 msgid "Scale"
 msgstr "½ºÄÉÀÏ"
 
-#: ../../WPrefs.app/TexturePanel.c:1492
+#: ../../WPrefs.app/TexturePanel.c:1495
 msgid "Maximize"
 msgstr "ÃÖ´ëÈ­"
 
@@ -1144,153 +1280,6 @@ msgstr "
 msgid "Themes"
 msgstr "Å׸¶"
 
-#: ../../WPrefs.app/WPrefs.c:220
-msgid "Window Maker Preferences"
-msgstr "Window Maker ¼³Á¤"
-
-#: ../../WPrefs.app/WPrefs.c:244
-msgid "Revert Page"
-msgstr "ÆäÀÌÁö º¹±¸"
-
-#: ../../WPrefs.app/WPrefs.c:250
-msgid "Revert All"
-msgstr "¸ðµÎ º¹±¸"
-
-#: ../../WPrefs.app/WPrefs.c:256
-msgid "Save"
-msgstr "ÀúÀå"
-
-#: ../../WPrefs.app/Appearance.c:1468 ../../WPrefs.app/WPrefs.c:262
-msgid "Close"
-msgstr "´Ý±â"
-
-#: ../../WPrefs.app/WPrefs.c:280
-msgid "Window Maker Preferences Utility"
-msgstr "Window Maker ¼³Á¤ À¯Æ¿¸®Æ¼"
-
-#: ../../WPrefs.app/WPrefs.c:287
-#, c-format
-msgid "Version %s for Window Maker %s"
-msgstr "¹öÀü %s - Window Maker %s"
-
-#: ../../WPrefs.app/WPrefs.c:294
-msgid "Starting..."
-msgstr "½ÃÀÛÇÕ´Ï´Ù..."
-
-#: ../../WPrefs.app/WPrefs.c:300
-msgid ""
-"Programming/Design: Alfredo K. Kojima\n"
-"Artwork: Marco van Hylckama Vlieg\n"
-"More Programming: James Thompson"
-msgstr ""
-"ÇÁ·Î±×·¡¹Ö/µðÀÚÀÎ: Alfredo K. Kojima\n"
-"¾ÆÆ®¿÷: Macro van Hylckama Vlieg\n"
-"Ãß°¡ ÇÁ·Î±×·¡¹Ö: James Thompson"
-
-#: ../../WPrefs.app/WPrefs.c:388
-#, c-format
-msgid "could not locate image file %s\n"
-msgstr "À̹ÌÁö ÆÄÀÏ %s¸¦ ãÀ» ¼ö ¾øÀ½\n"
-
-#: ../../WPrefs.app/WPrefs.c:501
-#, c-format
-msgid "could not load image file %s:%s"
-msgstr "À̹ÌÁö ÆÄÀÏ %s¸¦ ÀÐÀ» ¼ö ¾øÀ½"
-
-#: ../../WPrefs.app/WPrefs.c:520
-msgid "Loading Window Maker configuration files..."
-msgstr "Window Maker ¼³Á¤ ÆÄÀÏÀ» Àд Áß..."
-
-#: ../../WPrefs.app/WPrefs.c:524
-msgid "Initializing configuration panels..."
-msgstr "¼³Á¤ ÆгΠÃʱâÈ­ Áß..."
-
-#: ../../WPrefs.app/WPrefs.c:555
-msgid ""
-"WPrefs is free software and is distributed WITHOUT ANY\n"
-"WARRANTY under the terms of the GNU General Public License.\n"
-"The icons in this program are licensed through the\n"
-"OpenContent License."
-msgstr ""
-"WPrefs´Â °ø°³ ¼ÒÇÁÆ®¿þ¾îÀ̸ç GNU General Public\n"
-"License¿¡ µû¶ó ¹èÆ÷¿¡ ´ëÇÑ ¾î¶°ÇÑ Ã¥ÀÓµµ °¡ÁöÁö\n"
-"¾Ê½À´Ï´Ù. ¾ÆÀÌÄÜÀº OpenContent License¸¦ µû¸¨´Ï´Ù."
-
-#: ../../WPrefs.app/WPrefs.c:586 ../../WPrefs.app/WPrefs.c:651
-#, c-format
-msgid "Window Maker domain (%s) is corrupted!"
-msgstr "Window Maker µµ¸ÞÀÎ(%s)ÀÌ ±úÁ³½À´Ï´Ù!"
-
-#: ../../WPrefs.app/WPrefs.c:590
-#, c-format
-msgid "Could not load Window Maker domain (%s) from defaults database."
-msgstr "±âº» µ¥ÀÌÅͺ£À̽º¿¡¼­ Window Maker µµ¸ÞÀÎ(%s)À» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù."
-
-#: ../../WPrefs.app/WPrefs.c:598
-msgid "could not extract version information from Window Maker"
-msgstr "Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
-
-#: ../../WPrefs.app/WPrefs.c:599
-msgid "Make sure wmaker is in your search path."
-msgstr "wmaker°¡ °Ë»ö °æ·Î¿¡ ÀÖ´ÂÁö È®ÀÎÇϼ¼¿ä."
-
-#: ../../WPrefs.app/WPrefs.c:602
-msgid ""
-"Could not extract version from Window Maker. Make sure it is correctly "
-"installed and is in your PATH environment variable."
-msgstr ""
-"Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù. PATH ȯ°æ º¯¼ö¿¡ ÁöÁ¤µÈ °÷¿¡ "
-"Á¦´ë·Î ¼³Ä¡µÇ¾ú´ÂÁö È®ÀÎÇϼ¼¿ä."
-
-#: ../../WPrefs.app/WPrefs.c:612
-msgid ""
-"Could not extract version from Window Maker. Make sure it is correctly "
-"installed and the path where it installed is in the PATH environment "
-"variable."
-msgstr ""
-"Window Maker¿¡¼­ ¹öÀü Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù. PATH ȯ°æ º¯¼ö¿¡ ÁöÁ¤µÈ °÷¿¡ "
-"Á¦´ë·Î ¼³Ä¡µÇ¾ú´ÂÁö È®ÀÎÇϼ¼¿ä."
-
-#: ../../WPrefs.app/WPrefs.c:619
-#, c-format
-msgid ""
-"WPrefs only supports Window Maker 0.18.0 or newer.\n"
-"The version installed is %i.%i.%i\n"
-msgstr ""
-"WPrefs ´Â Window Maker 0.18.0 ÀÌ»ó¸¸À» Áö¿øÇÕ´Ï´Ù.\n"
-"¼³Ä¡µÈ ¹öÁ¯Àº %i.%i.%i ÀÔ´Ï´Ù.\n"
-
-#: ../../WPrefs.app/WPrefs.c:626
-#, c-format
-msgid ""
-"Window Maker %i.%i.%i, which is installed in your system, is not fully "
-"supported by this version of WPrefs."
-msgstr ""
-"½Ã½ºÅÛ¿¡ ¼³Ä¡µÈ Window Maker %i.%i.%i´Â WPrefs¿¡¼­ Á¦´ë·Î Áö¿øÇÏ´Â ¹öÀüÀÌ "
-"¾Æ´Õ´Ï´Ù."
-
-#: ../../WPrefs.app/WPrefs.c:628
-msgid "Warning"
-msgstr "°æ°í"
-
-#: ../../WPrefs.app/WPrefs.c:633
-msgid "could not run \"wmaker --global_defaults_path\"."
-msgstr "\"wmaker --global_defaults_path\"¸¦ ¼öÇàÇÒ ¼ö ¾ø½À´Ï´Ù."
-
-#: ../../WPrefs.app/WPrefs.c:655
-#, c-format
-msgid "Could not load global Window Maker domain (%s)."
-msgstr "Àü¿ª Window Maker µµ¸ÞÀÎ (%s)¸¦ ÀоîµéÀÏ ¼ö ¾ø½À´Ï´Ù."
-
-#: ../../WPrefs.app/WPrefs.c:904
-#, c-format
-msgid ""
-"bad speed value for option %s\n"
-". Using default Medium"
-msgstr ""
-"¿É¼Ç %s¿¡ À߸øµÈ ¼Óµµ °ªÀ» ÁÖ¾ú½À´Ï´Ù.\n"
-"±âº»°ª MediumÀ» »ç¿ëÇÕ´Ï´Ù"
-
 #: ../../WPrefs.app/WindowHandling.c:134
 #, c-format
 msgid "bad option value %s in WindowPlacement. Using default value"
@@ -1346,9 +1335,8 @@ msgid "Edge Resistance"
 msgstr "°¡ÀåÀÚ¸® °É¸²"
 
 #: ../../WPrefs.app/WindowHandling.c:377
-#, fuzzy
 msgid "Open dialogs in same workspace as their owners"
-msgstr "¼ÒÀ¯ÀÚ À§¿¡¼­´Â ÀϽÃÀûÀ¸·Î âÀ» À¯Áö"
+msgstr "¼ÒÀ¯ÀÚ¿Í °°Àº ÀÛ¾÷ °ø°£¿¡¼­ ´ëȭâ ¿°"
 
 #: ../../WPrefs.app/WindowHandling.c:404
 msgid "Window Handling Preferences"
@@ -1381,101 +1369,122 @@ msgstr "Dock/Ŭ
 msgid "Workspace Preferences"
 msgstr "ÀÛ¾÷°ø°£ ¼³Á¤"
 
-#: ../../WPrefs.app/main.c:71
-#, c-format
-msgid "usage: %s [options]\n"
-msgstr "»ç¿ë¹ý: %s [¿É¼Ç]\n"
+#: ../../WPrefs.app/MenuGuru.c:106
+msgid "Menu Guru - Select Type"
+msgstr "¸Þ´º Guru - ÇüŸ¦ ¼±ÅÃÇϼ¼¿ä"
 
-#: ../../WPrefs.app/main.c:72
-msgid "options:"
-msgstr "¿É¼Ç:"
+#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133
+#: ../../WPrefs.app/MenuGuru.c:251
+msgid "Next"
+msgstr "´ÙÀ½"
 
-#: ../../WPrefs.app/main.c:73
-msgid " -display <display>\tdisplay to be used"
-msgstr "-display <display>\t»ç¿ëÇÒ µð½ºÇ÷¹ÀÌ"
+#: ../../WPrefs.app/MenuGuru.c:114
+msgid "Menu Guru - Select Menu File"
+msgstr "¸Þ´º Guru - ¸Þ´º ÆÄÀÏÀ» ¼±ÅÃÇϼ¼¿ä"
 
-#: ../../WPrefs.app/main.c:74
-msgid " --version\t\tprint version number and exit"
-msgstr "--version\t\t¹öÁ¯ Ãâ·ÂÈÄ Á¾·á"
+#: ../../WPrefs.app/MenuGuru.c:122
+msgid "Menu Guru - Select Pipe Command"
+msgstr "¸Þ´º Guru - ÆÄÀÌÇÁ ¸í·ÉÀ» ¼±ÅÃÇϼ¼¿ä"
 
-#: ../../WPrefs.app/main.c:75
-msgid " --help\t\tprint this message and exit"
-msgstr "--help\t\tÇöÀç ¸Þ½ÃÁö Ãâ·Â ÈÄ Á¾·á"
+#: ../../WPrefs.app/MenuGuru.c:129
+msgid "Menu Guru - Select Directories"
+msgstr "¸Þ´º Guru - µð·ºÅ丮¸¦ ¼±ÅÃÇϼ¼¿ä"
 
-#: ../../WPrefs.app/main.c:134
-#, c-format
-msgid "too few arguments for %s"
-msgstr "%s ÀÇ Àμö°¡ ³Ê¹« ÀûÀ½"
+#: ../../WPrefs.app/MenuGuru.c:136
+msgid "Menu Guru - Select Command"
+msgstr "¸Þ´º Guru - ¸í·ÉÀ» ¼±ÅÃÇϼ¼¿ä"
 
-#: ../../WPrefs.app/main.c:156
-msgid "X server does not support locale"
-msgstr "X ¼­¹ö°¡ ·ÎÄÉÀÏÀ» Áö¿øÇÏÁö ¾ÊÀ½"
+#: ../../WPrefs.app/MenuGuru.c:257
+msgid "Back"
+msgstr "¾ÕÀ¸·Î"
 
-#: ../../WPrefs.app/main.c:159
-msgid "cannot set locale modifiers"
-msgstr "·ÎÄÉÀÏ ¼öÁ¤ÀÚ(modifier)¸¦ ¼³Á¤ÇÒ ¼ö ¾øÀ½"
+#: ../../WPrefs.app/MenuGuru.c:271
+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 ""
+"ÀÌ °úÁ¤Àº ´Ù¸¥ ÆÄÀÏ¿¡ Á¤ÀÇ°¡ Àְųª ÀÚµ¿ÀûÀ¸·Î »ý¼ºµÇ´Â ÇϺθ޴º¸¦ ¸¸µå´Â µ¥ "
+"µµ¿òÀ» ÁÝ´Ï´Ù.\n"
+"ºÎ¸Þ´ºÀÇ ³»¿ëÀ¸·Î ¾î¶² °ÍÀ» »ç¿ëÇÏ°í ½Í½À´Ï±î?"
 
-#: ../../WPrefs.app/main.c:165
-#, c-format
-msgid "could not open display %s"
-msgstr "µð½ºÇ÷¹ÀÌ %s¸¦ ¿­ ¼ö ¾øÀ½"
+#: ../../WPrefs.app/MenuGuru.c:279
+msgid ""
+"A file containing the menu definition in the plain text (non-property list) "
+"menu format."
+msgstr "¸Þ´º Á¤ÀǸ¦ º¸Åë ÅؽºÆ®·Î(Ư¼º ¾ø´Â ¸ñ·Ï) ¾´ ÆÄÀÏ."
 
-#: ../../WPrefs.app/main.c:173
-msgid "could not initialize application"
-msgstr "¾ÖÇø®ÄÉÀ̼ÇÀ» ÃʱâÈ­ ÇÒ ¼ö ¾øÀ½"
+#: ../../WPrefs.app/MenuGuru.c:285
+msgid "The menu definition generated by a script/program read through a pipe."
+msgstr "½ºÅ©¸³Æ®/ÇÁ·Î±×·¥À¸·Î »ý¼ºÇÏ¿© ÆÄÀÌÇÁ·Î ÀоîµéÀÌ´Â ¸Þ´º Á¤ÀÇ."
 
-#: ../../WPrefs.app/Appearance.c:813
-msgid "Select File"
-msgstr "ÆÄÀÏ ¼±ÅÃ"
+#: ../../WPrefs.app/MenuGuru.c:291
+msgid "The files in one or more directories."
+msgstr "Çϳª ÀÌ»óÀÇ µð·ºÅ丮ÀÇ ÆÄÀÏ."
 
-#: ../../WPrefs.app/Appearance.c:1142
-msgid "Titlebar of Focused Window"
-msgstr "È°¼º â ŸÀÌƲ¹Ù"
+#: ../../WPrefs.app/MenuGuru.c:303
+msgid "Type the path for the menu file:"
+msgstr "¸Þ´º ÆÄÀÏÀÇ °æ·Î¸¦ ÀûÀ¸¼¼¿ä:"
 
-#: ../../WPrefs.app/Appearance.c:1143
-msgid "Titlebar of Unfocused Windows"
-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 ""
+"¸Þ´º ÆÄÀÏÀÇ ³»¿ëÀº º¸Åë ÅؽºÆ®·Î µÈ ¸Þ´º ÆÄÀÏ Çü½ÄÀÇ ¸Þ´ºÀÔ´Ï´Ù. ÀÌ Çü½ÄÀº "
+"WindowMaker¿¡ Æ÷ÇÔµÈ ¸Þ´º ÆÄÀÏÀ» º¸¸é µÇ¸ç, º¸Åë "
+"~/GNUstep/Library/WindowMaker/menu.koÀÔ´Ï´Ù."
 
-#: ../../WPrefs.app/Appearance.c:1144
-msgid "Titlebar of Focused Window's Owner"
-msgstr "È°¼º âÀÇ ºÎ¸ðâ ŸÀÌƲ¹Ù"
+#: ../../WPrefs.app/MenuGuru.c:328
+msgid "Type the command that will generate the menu definition:"
+msgstr "¸Þ´º Á¤ÀǸ¦ ¸¸µé¾î³¾ ¸í·ÉÀ» ÀÔ·ÂÇϼ¼¿ä:"
 
-#: ../../WPrefs.app/Appearance.c:1145
-msgid "Titlebar of Menus"
-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"
+msgstr ""
+"ÀÌ ¸í·ÉÀº À¯È¿ÇÑ ¸Þ´º Á¤ÀǸ¦ ¸¸µé¾î¼­ Ç¥ÁØ Ãâ·ÂÀ¸·Î ³»º¸³»¾ß ÇÕ´Ï´Ù. ÀÌ "
+"Á¤ÀÇ´Â º¸Åë ÅؽºÆ®·Î µÈ ¸Þ´º ÆÄÀÏ Çü½ÄÀ̾î¾ß Çϸç, WindowMaker¿¡ Æ÷ÇÔµÈ ¸Þ´º "
+"ÆÄÀÏ¿¡ ¼³¸íµÇ¾î ÀÖ½À´Ï´Ù. º¸Åë ~/GNUstep/Library/WindowMaker/menu.ko ÀÔ´Ï´Ù"
 
-#: ../../WPrefs.app/Appearance.c:1146
-msgid "Menu Items"
-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 ""
+"µð·ºÅ丮ÀÇ °æ·Î¸¦ ÀÔ·ÂÇϼ¼¿ä. ºóÄ­À¸·Î ºÐ¸®Çؼ­ Çϳª ÀÌ»óÀÇ °æ·Î¸¦ ¾µ ¼ö "
+"ÀÖ½À´Ï´Ù."
 
-#: ../../WPrefs.app/Appearance.c:1147
-msgid "Icon Background"
-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)."
+msgstr ""
+"»ý¼ºµÇ´Â ¸Þ´º´Â µð·ºÅ丮ÀÇ °¢ ÆÄÀÏ¿¡ ´ëÇØ Ç׸ñÀ» °®½À´Ï´Ù. µð·ºÅ丮¿¡´Â "
+"ÇÁ·Î±×·¥ ½ÇÇà ÆÄÀÏÀ̳ª µ¥ÀÌÅÍ ÆÄÀÏÀ» ³ÖÀ¸¸é µË´Ï´Ù.(jpeg À̹ÌÁö °°Àº °Íµé)"
 
-#: ../../WPrefs.app/Appearance.c:1165 ../../WPrefs.app/Appearance.c:1457
-msgid "Textures"
-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 ""
+"µð·ºÅ丮¿¡ µ¥ÀÌÅÍ ÆÄÀÏÀÌ ÀÖ´Â °æ¿ì, ÀÌ ÆÄÀÏÀ» ¿­±â À§ÇØ »ç¿ëÇÒ ¸í·ÉÀ» "
+"ÀÔ·ÂÇϼ¼¿ä. ±×·¸Áö ¾ÊÀ¸¸é ºóÄ­À¸·Î µÎ¼¼¿ä."
 
-#: ../../WPrefs.app/Appearance.c:1196
-msgid "New"
-msgstr "»ý¼º"
-
-#: ../../WPrefs.app/Appearance.c:1205
-msgid "Extract..."
-msgstr "̧̉"
-
-#: ../../WPrefs.app/Appearance.c:1216
-msgid "Edit"
-msgstr "ÆíÁý"
-
-#: ../../WPrefs.app/Appearance.c:1393
-msgid "Appearance Preferences"
-msgstr "ÀÛ¾÷°ø°£ ¼³Á¤"
-
-#: ../../WPrefs.app/Appearance.c:1437
-msgid "Extract Texture"
-msgstr "ÃßÃâµÈ ÅؽºÃ³"
-
-#: ../../WPrefs.app/Appearance.c:1473
-msgid "Extract"
-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\"."
+msgstr ""
+"µð·ºÅ丮ÀÇ °¢ ÆÄÀÏ¿¡´Â Ç׸ñÀÌ ÀÖÀ¸¸ç Á¦°øµÈ ¸í·ÉÀ¸·Î ¿­ ¼ö ÀÖ½À´Ï´Ù. ¿¹¸¦ "
+"µé¸é, ÀÌ µð·ºÅ丮¿¡ À̹ÌÁö ÆÄÀÏÀÌ ÀÖ°í ¸í·ÉÀÌ \"xv -root\"À̸é, µð·ºÅ丮ÀÇ "
+"°¢ ÆÄÀÏÀº \"xv -root À̹ÌÁöÆÄÀÏ\"°ú °°Àº ¸Þ´º Ç׸ñÀ» °®½À´Ï´Ù."
diff --git a/WPrefs.app/xpm/Makefile.in b/WPrefs.app/xpm/Makefile.in
index ec6a7e26..eb4019b5 100644
--- a/WPrefs.app/xpm/Makefile.in
+++ b/WPrefs.app/xpm/Makefile.in
@@ -109,9 +109,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/xpm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu WPrefs.app/xpm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -143,6 +143,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = WPrefs.app/xpm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu WPrefs.app/xpm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff --git a/WindowMaker/Styles/Autumn.style b/WindowMaker/Styles/Autumn.style
index 22789480..2398616a 100644
--- a/WindowMaker/Styles/Autumn.style
+++ b/WindowMaker/Styles/Autumn.style
@@ -1,5 +1,11 @@
 {
   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 = white;
   HighlightTextColor = black;
   ClipTitleColor = white;
@@ -16,7 +22,7 @@
   MenuDisabledColor = gray80;
   MenuTitleBack = (hgradient, firebrick, black);
   MenuTextBack = (hgradient, peru, black);
-  IconBack = (dgradient, "rgb:a6/a6/b6", "rgb:51/55/61");
+  IconBack = (dgradient, "#efb573", "#734221");
   IconTitleColor = white;
   IconTitleBack = "#8b0000";
   MenuStyle = normal;
diff --git a/configure.in b/configure.in
index 670d1571..97f4b90e 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ AC_INIT(src/WindowMaker.h)
 
 
 
-AM_INIT_AUTOMAKE(WindowMaker, 0.53.1)
+AM_INIT_AUTOMAKE(WindowMaker, 0.54.0)
 
 AM_PROG_LIBTOOL
 
diff --git a/po/README b/po/README
index 4364931a..b7ab4e4f 100644
--- a/po/README
+++ b/po/README
@@ -17,6 +17,7 @@ nl.po	Dutch			Roeland Mertens <roeland@zeus.rug.ac.be>
 gl.po	Galician		Xose Vazquez <xose@arrakis.es>
 fr.po	French			Bastien NOCERA <hadess@writeme.com>
 				Jean-Francois BIGNOLLES <bignolle@grif.fr>
+				Hadess <hadess@infonie.fr>
 it.po	Italian			Roberto Checozzo <croberto@aerre.it>
 ru.po	Russian			Alexey Vyskubov <alexey@alv.stud.pu.ru>
   				Michael Sobolev <mss@transas.com>
diff --git a/po/fr.po b/po/fr.po
index c23cb405..d5d62fbb 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,578 +1,741 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Date: 1998-08-24 14:42:31-0300\n"
-"From: Bastien NOCERA <hadess@writeme.com>\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 1999-04-22 07:08+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: French \n"
-"Content-Type: text/plain; charset=ISO8859-1\n"
-"Xgettext-Options: --default-domain=WindowMaker --add-comments --keyword=_\n"
-"Files: ../src/appicon.c ../src/defaults.c ../src/dialog.c ../src/dock.c ../src/dockedapp.c ../src/event.c ../src/framewin.c ../src/icon.c ../src/main.c ../src/menu.c ../src/misc.c ../src/pixmap.c ../src/proplist.c ../src/resources.c ../src/rootmenu.c ../src/screen.c ../src/session.c ../src/stacking.c ../src/startup.c ../src/switchmenu.c ../src/texture.c ../src/wdefaults.c ../src/window.c ../src/winmenu.c ../src/winspector.c ../src/workspace.c ../src/xutil.c\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: ENCODING\n"
 
-#: ../src/appicon.c:500 ../src/dialog.c:262 ../src/dialog.c:318 ../src/dock.c:2989 ../src/dockedapp.c:206 ../src/rootmenu.c:164 ../src/winspector.c:276 ../src/winspector.c:289
+#: ../src/appicon.c:541 ../src/dialog.c:223 ../src/dialog.c:279
+#: ../src/dock.c:3114 ../src/dockedapp.c:210 ../src/rootmenu.c:1743
+#: ../src/winspector.c:284 ../src/winspector.c:300
 msgid "Error"
 msgstr "Erreur."
 
-#: ../src/appicon.c:501
+#: ../src/appicon.c:542
 msgid "Could not open specified icon file"
 msgstr "Icone spécifié introuvable."
 
-#: ../src/appicon.c:522 ../src/dock.c:263 ../src/winmenu.c:85
-msgid "Kill Application"
-msgstr "Tuer l'application"
+#: ../src/appicon.c:543 ../src/dialog.c:122 ../src/dialog.c:223
+#: ../src/dialog.c:279 ../src/dialog.c:467 ../src/dialog.c:1476
+#: ../src/dock.c:473 ../src/dock.c:3115 ../src/dockedapp.c:211
+#: ../src/dockedapp.c:357 ../src/rootmenu.c:1747 ../src/winspector.c:285
+#: ../src/winspector.c:301
+msgid "OK"
+msgstr "OK"
 
-#: ../src/appicon.c:523 ../src/dock.c:264 ../src/winmenu.c:86
+#: ../src/appicon.c:570 ../src/dock.c:276
 msgid ""
-"This will kill the application.\n"
+" will be forcibly closed.\n"
 "Any unsaved changes will be lost.\n"
 "Please confirm."
 msgstr ""
-"L'application va être tuée.\n"
-"Les changements non sauvegardés seront perdus.\n"
-"Confirmez l'action."
+" va être tué.\n"
+"Tous les changements non sauvegardés seront perdus.\n"
+"Confirmez avec OK."
 
-#: ../src/appicon.c:538 ../src/dock.c:1017
-msgid "Unhide Here"
-msgstr "Montrer ici"
+#: ../src/appicon.c:576 ../src/dock.c:281 ../src/winmenu.c:124
+msgid "Kill Application"
+msgstr "Tuer l'application"
 
-#: ../src/appicon.c:539 ../src/dock.c:1019
-msgid "(Un)Hide"
-msgstr "Cacher/Montrer"
-
-#: ../src/appicon.c:540
-msgid "Set Icon..."
-msgstr "Associer un icone"
-
-#: ../src/appicon.c:541 ../src/dock.c:1023 ../src/winmenu.c:260
-msgid "Kill"
-msgstr "Tuer"
-
-#: ../src/defaults.c:572 ../src/screen.c:535 ../src/screen.c:643 ../src/screen.c:649
-msgid "could not read domain \"%s\" from defaults database"
-msgstr "Domaine \"%s\" introuvable dans la base par défaut."
-
-#: ../src/defaults.c:618 ../src/defaults.c:740 ../src/defaults.c:775 ../src/defaults.c:801
-msgid "Domain %s (%s) of defaults database is corrupted!"
-msgstr "Domaine %s (%s) de la base par défaut corrompu!"
-
-#: ../src/defaults.c:623 ../src/defaults.c:757 ../src/defaults.c:784 ../src/defaults.c:809
-msgid "could not load domain %s from user defaults database"
-msgstr "Domaine %s illisible depuis la base utilisateur par défaut."
-
-#: ../src/defaults.c:634 ../src/defaults.c:725
-msgid "Domain %s (%s) of global defaults database is corrupted!"
-msgstr "Domaine %s (%s) de la base globale par défaut est corrompu!"
-
-#: ../src/defaults.c:651 ../src/defaults.c:730
-msgid "could not load domain %s from global defaults database"
-msgstr "Domaine %s illisible depuis la base globale par défaut."
-
-#: ../src/defaults.c:1097
-msgid "can't convert \"%s\" to boolean for key \"%s\""
-msgstr "Conversion de \"%s\" en donnée booléenne pour la clé \"%s\" impossible."
-
-#: ../src/defaults.c:1102 ../src/defaults.c:1136 ../src/defaults.c:1168 ../src/defaults.c:1181 ../src/defaults.c:1196 ../src/defaults.c:1211 ../src/defaults.c:1282 ../src/defaults.c:1294 ../src/defaults.c:1353 ../src/defaults.c:1397 ../src/defaults.c:1439 ../src/defaults.c:1485 ../src/defaults.c:1531 ../src/defaults.c:1754 ../src/defaults.c:1768 ../src/defaults.c:1801 ../src/defaults.c:1813 ../src/defaults.c:1825 ../src/defaults.c:1849 ../src/defaults.c:1867 ../src/defaults.c:1880 ../src/defaults.c:1893 ../src/defaults.c:1930 ../src/defaults.c:1968 ../src/defaults.c:2032
-msgid "using default \"%s\" instead"
-msgstr "Utilise la valeur par défaut \"%s\" en remplacement."
-
-#: ../src/defaults.c:1133
-msgid "can't convert \"%s\" to integer for key \"%s\""
-msgstr "Conversion de \"%s\" en donnée entière pour la clé \"%s\" impossible."
-
-#: ../src/defaults.c:1163 ../src/defaults.c:1277 ../src/defaults.c:1749 ../src/defaults.c:1796 ../src/wdefaults.c:541 ../src/wdefaults.c:577
-msgid "Wrong option format for key \"%s\". Should be %s."
-msgstr "Mauvais format d'option pour la clé \"%s\". Devrait être %s."
-
-#: ../src/defaults.c:1176
-msgid "Incorrect number of elements in array for key \"%s\"."
-msgstr "Nombre incorrects d'éléments pour la clé \"%s\"."
-
-#: ../src/defaults.c:1191
-msgid "Wrong value for key \"%s\". Should be Coordinate."
-msgstr "Mauvaise valeur pour la clé \"%s\". Devrait être des Coordonnées."
-
-#: ../src/defaults.c:1206
-msgid "can't convert array to integers for \"%s\"."
-msgstr "Conversion vers des données entières pour la clé \"%s\" impossible."
-
-#: ../src/defaults.c:1345
-msgid "Invalid focus mode \"%s\". Should be Manual, Auto or Sloppy."
-msgstr "Mode de focus \"%s\" invalide. Devrait être Manual, Auto ou Sloppy."
-
-#: ../src/defaults.c:1348
-msgid "Invalid colormap focus mode \"%s\". Should be Manual or Auto."
-msgstr "Mode de focus des couleurs \"%s\" invalide. Devrait être Manuel ou Auto."
-
-#: ../src/defaults.c:1391
-msgid "Invalid window placement mode \"%s\". Should be Auto, Cascade, Random or Manual."
-msgstr "Mode de placement des fenêtres \"%s\" invalide. Devrait être Auto, Cascade, Random ou Manual."
-
-#: ../src/defaults.c:1433
-msgid "Invalid geometry display type \"%s\". Should be Center, Corner, Floating or Line."
-msgstr "Type d'affichage de la géométrie \"%s\" invalide. Devrait être Center, Corner, Floating ou Line."
-
-#: ../src/defaults.c:1480
-msgid "Invalid speed \"%s\". Should be UltraFast, Fast, Medium, Slow or UltraSlow."
-msgstr "Vitesse \"%s\" invalide. Devrait être UltraFast, Fast, Medium, Slow ou UltraSlow."
-
-#: ../src/defaults.c:1525
-msgid "Invalid mouse button \"%s\". Should be Left, Middle, Right or Button1 through Button5"
-msgstr "Bouton de souris \"%s\" invalide. Devrait être Left, Middle, Right ou de Button1 à Button5."
-
-#: ../src/defaults.c:1594 ../src/defaults.c:1625 ../src/defaults.c:1637 ../src/defaults.c:1679 ../src/defaults.c:1716
-msgid "\"%s\" is not a valid color name"
-msgstr "\"%s\" est un nom de couleur invalide."
-
-#: ../src/defaults.c:1606
-msgid "bad number of arguments in gradient specification"
-msgstr "Mauvais nombre d'arguments dans la spécification du dégradé."
-
-#: ../src/defaults.c:1652
-msgid "too few arguments in multicolor gradient specification"
-msgstr "Trop peu d'arguments dans la spécification du dégradé multicolore."
-
-#: ../src/defaults.c:1763
-msgid "Error in texture specification for key \"%s\""
-msgstr "Erreur dans la spécification de la texture de la clé \"%s\"."
-
-#: ../src/defaults.c:1809 ../src/defaults.c:1845
-msgid "Too few elements in array for key \"WorkspaceBack\"."
-msgstr "Trop peu d'éléments pour la clé \"WorkspaceBack\"."
-
-#: ../src/defaults.c:1821
-msgid "Wrong type for workspace background. Should be Texture."
-msgstr "Mauvais type de donnée pour le fond d'écran. Devrait être une Texture."
-
-#: ../src/defaults.c:1863
-msgid "Cannot get color entry for key \"WorkspaceBack\"."
-msgstr "Obtention de la couleur pour la clé \"WorkspaceBack\" impossible."
-
-#: ../src/defaults.c:1875
-msgid "key \"WorkspaceBack\" has invalid color \"%s\""
-msgstr "La clé \"WorkspaceBack\" a une couleur \"%s\" invalide."
-
-#: ../src/defaults.c:1889
-msgid "Cannot get file entry for key \"WorkspaceBack\"."
-msgstr "Obtention du fichier pour la clé  \"WorkspaceBack\" impossible."
-
-#: ../src/defaults.c:1907
-msgid "could not run \"%s\""
-msgstr "Ne peut pas lancer \"%s\"."
-
-#: ../src/defaults.c:1913
-msgid "could not find background image \"%s\""
-msgstr "Image \"%s\" pour le fond d'écran introuvable."
-
-#: ../src/defaults.c:1926
-msgid "Error in texture specification for key \"WorkspaceBack\""
-msgstr "Erreur dans la spécification de la texture pour la clé  \"WorkspaceBack\"."
-
-#: ../src/defaults.c:1963
-msgid "Invalid justification type \"%s\". Should be Left, Center or Right"
-msgstr "Type de justification \"%s\" invalide. Devrait être  Left, Center ou Right."
-
-#: ../src/defaults.c:1997
-msgid "could not load any usable font"
-msgstr "Aucune police utilisable chargeable."
-
-#: ../src/defaults.c:2027
-msgid "could not get color for key \"%s\""
-msgstr "Obtention de la couleur pour la clé \"%s\" impossible."
-
-#: ../src/defaults.c:2086 ../src/rootmenu.c:435
-msgid "%s:invalid key modifier \"%s\""
-msgstr "%s: modificateur de clé \"%s\" invalide."
-
-#: ../src/defaults.c:2098
-msgid "%s:invalid kbd shortcut specification \"%s\""
-msgstr "%s: spécification de raccourci-clavier \"%s\" invalide."
-
-#: ../src/defaults.c:2105
-msgid "%s:invalid key in shortcut \"%s\""
-msgstr "%s: touche invalide dans le raccourci \"%s\"."
-
-#: ../src/defaults.c:2201
-msgid "could not render texture for icon background"
-msgstr "Affichage de la texture de fond d'icone impossible."
-
-#: ../src/defaults.c:2546
-msgid "could not render texture for workspace background"
-msgstr "Affichage de la texture de fond d'écran impossible."
-
-#: ../src/dialog.c:67 ../src/dialog.c:79 ../src/dialog.c:162 ../src/dialog.c:498 ../src/dockedapp.c:349
-msgid "OK"
-msgstr "Ok"
-
-
-#: ../src/dialog.c:67 ../src/dialog.c:72 ../src/dialog.c:162 ../src/dialog.c:505 ../src/dockedapp.c:355
-msgid "Cancel"
-msgstr "Annuler"
-
-#: ../src/dialog.c:72 ../src/rootmenu.c:206
-msgid "Exit"
-msgstr "Quitter"
-
-#: ../src/dialog.c:84
+#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126
 msgid "Yes"
 msgstr "Oui"
 
-#: ../src/dialog.c:84
+#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126
 msgid "No"
 msgstr "Non"
 
-#: ../src/dialog.c:257
+#: ../src/appicon.c:595 ../src/dock.c:1109
+msgid "Unhide Here"
+msgstr "Montrer ici"
+
+#: ../src/appicon.c:596 ../src/appicon.c:621 ../src/dock.c:1111
+#: ../src/dock.c:1113 ../src/dock.c:3240 ../src/dock.c:3242
+#: ../src/winmenu.c:446
+msgid "Hide"
+msgstr "Cacher"
+
+#: ../src/appicon.c:597
+msgid "Set Icon..."
+msgstr "Associer un icone..."
+
+#: ../src/appicon.c:598 ../src/dock.c:1117 ../src/rootmenu.c:227
+#: ../src/rootmenu.c:241 ../src/winmenu.c:493
+msgid "Kill"
+msgstr "Tuer"
+
+#: ../src/appicon.c:619 ../src/dock.c:3238
+msgid "Unhide"
+msgstr "Montrer"
+
+#: ../src/defaults.c:808 ../src/startup.c:772 ../src/startup.c:790
+#: ../src/startup.c:796
+#, c-format
+msgid "could not read domain \"%s\" from defaults database"
+msgstr "Domaine «%s» introuvable dans la base par défaut."
+
+#: ../src/defaults.c:854 ../src/defaults.c:979 ../src/defaults.c:1018
+#: ../src/defaults.c:1048
+#, c-format
+msgid "Domain %s (%s) of defaults database is corrupted!"
+msgstr "Domaine %s (%s) de la base par défaut corrompu!"
+
+#: ../src/defaults.c:859 ../src/defaults.c:1000 ../src/defaults.c:1031
+#: ../src/defaults.c:1057
+#, c-format
+msgid "could not load domain %s from user defaults database"
+msgstr "Domaine %s illisible depuis la base utilisateur par défaut."
+
+#: ../src/defaults.c:870 ../src/defaults.c:964
+#, c-format
+msgid "Domain %s (%s) of global defaults database is corrupted!"
+msgstr "Domaine %s (%s) de la base globale par défaut est corrompu!"
+
+#: ../src/defaults.c:889 ../src/defaults.c:969
+#, c-format
+msgid "could not load domain %s from global defaults database"
+msgstr "Domaine %s illisible depuis la base globale par défaut."
+
+#: ../src/defaults.c:1277
+#, c-format
+msgid "wrong option value for key \"%s\". Should be one of %s"
+msgstr "Mauvaise valeur d'option pour la clé «%s». Devrait être parmi %s"
+
+#: ../src/defaults.c:1324
+#, c-format
+msgid "can't convert \"%s\" to boolean for key \"%s\""
+msgstr "Conversion de «%s» en donnée booléenne pour la clé \"%s\" impossible."
+
+#: ../src/defaults.c:1329 ../src/defaults.c:1363 ../src/defaults.c:1395
+#: ../src/defaults.c:1408 ../src/defaults.c:1423 ../src/defaults.c:1437
+#: ../src/defaults.c:1509 ../src/defaults.c:1521 ../src/defaults.c:1927
+#: ../src/defaults.c:1944 ../src/defaults.c:1957 ../src/defaults.c:1990
+#: ../src/defaults.c:2006 ../src/defaults.c:2037 ../src/defaults.c:2124
+#, c-format
+msgid "using default \"%s\" instead"
+msgstr "Utilise la valeur par défaut «%s» en remplacement."
+
+#: ../src/defaults.c:1360
+#, c-format
+msgid "can't convert \"%s\" to integer for key \"%s\""
+msgstr "Conversion de «%s» en donnée entière pour la clé «%s» impossible."
+
+#: ../src/defaults.c:1390 ../src/defaults.c:1504 ../src/defaults.c:1922
+#: ../src/defaults.c:1939 ../src/defaults.c:1985 ../src/defaults.c:2032
+#: ../src/wdefaults.c:546 ../src/wdefaults.c:582
+#, c-format
+msgid "Wrong option format for key \"%s\". Should be %s."
+msgstr "Mauvais format d'option pour la clé «%s». Devrait être %s."
+
+#: ../src/defaults.c:1403
+#, c-format
+msgid "Incorrect number of elements in array for key \"%s\"."
+msgstr "Nombre incorrects d'éléments pour la clé «%s»."
+
+#: ../src/defaults.c:1418
+#, c-format
+msgid "Wrong value for key \"%s\". Should be Coordinate."
+msgstr "Mauvaise valeur pour la clé «%s». Devrait être des Coordonnées."
+
+#: ../src/defaults.c:1433
+#, c-format
+msgid "can't convert array to integers for \"%s\"."
+msgstr "Conversion vers des données entières pour la clé «%s» impossible."
+
+#: ../src/defaults.c:1631 ../src/defaults.c:1663 ../src/defaults.c:1679
+#: ../src/defaults.c:1725 ../src/defaults.c:1765 ../src/defaults.c:1803
+#: ../src/defaults.c:1819
+#, c-format
+msgid "\"%s\" is not a valid color name"
+msgstr "«%s» est un nom de couleur invalide."
+
+#: ../src/defaults.c:1644
+msgid "bad number of arguments in gradient specification"
+msgstr "Mauvais nombre d'arguments dans la spécification du dégradé."
+
+#: ../src/defaults.c:1698
+msgid "too few arguments in multicolor gradient specification"
+msgstr "Trop peu d'arguments dans la spécification du dégradé multicolore."
+
+#: ../src/defaults.c:1792
+msgid "bad number of arguments in textured gradient specification"
+msgstr "Mauvais nombre d'arguments dans la spécification du dégradé texturé."
+
+#: ../src/defaults.c:1835
+#, c-format
+msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
+msgstr "Mauvaise valeur d'opacité pour la texture tgradient «%s». Devrait être [0..255]"
+
+#: ../src/defaults.c:1895
+#, c-format
+msgid "could not initialize library %s"
+msgstr "Ne peut pas initialiser la librairie %s"
+
+#: ../src/defaults.c:1898
+#, c-format
+msgid "could not find function %s::%s"
+msgstr "Function %s::%s introuvable"
+
+#: ../src/defaults.c:1905
+#, c-format
+msgid "invalid texture type %s"
+msgstr "Type de texture %s invalide"
+
+#: ../src/defaults.c:1952
+#, c-format
+msgid "Error in texture specification for key \"%s\""
+msgstr "Erreur dans la spécification de la texture pour la clé «%s»"
+
+#: ../src/defaults.c:2002
+msgid "Wrong type for workspace background. Should be a texture type."
+msgstr "Mauvais type de fond d'écran. Devrait être une texture."
+
+#: ../src/defaults.c:2050
+#, c-format
+msgid "Wrong type for background of workspace %i. Should be a texture."
+msgstr "Mauvais type de fond d'écran pour le bureau %i. Devrait être une texture."
+
+#: ../src/defaults.c:2091
+msgid "could not load any usable font!!!"
+msgstr "Aucune police utilisable chargeable."
+
+#: ../src/defaults.c:2119
+#, c-format
+msgid "could not get color for key \"%s\""
+msgstr "Obtention de la couleur pour la clé «%s» impossible."
+
+#: ../src/defaults.c:2179 ../src/rootmenu.c:493
+#, c-format
+msgid "%s:invalid key modifier \"%s\""
+msgstr "%s: modificateur de touche «%s» invalide."
+
+#: ../src/defaults.c:2191
+#, c-format
+msgid "%s:invalid kbd shortcut specification \"%s\""
+msgstr "%s: spécification de raccourci-clavier «%s» invalide."
+
+#: ../src/defaults.c:2198
+#, c-format
+msgid "%s:invalid key in shortcut \"%s\""
+msgstr "%s: touche invalide dans le raccourci «%s»."
+
+#: ../src/defaults.c:2224
+#, c-format
+msgid "%s: modifier key %s is not valid"
+msgstr "%s: modificateur de touche «%s» invalide."
+
+#: ../src/defaults.c:2258
+#, c-format
+msgid "could not load image in option %s: %s"
+msgstr "Ne peut pas charger l'image de l'option %s: %s"
+
+#: ../src/defaults.c:2340
+msgid "could not render texture for icon background"
+msgstr "Affichage de la texture de fond d'icone impossible."
+
+#: ../src/dialog.c:122 ../src/dialog.c:474 ../src/dock.c:473
+#: ../src/dockedapp.c:363 ../src/rootmenu.c:189 ../src/rootmenu.c:227
+#: ../src/rootmenu.c:241
+msgid "Cancel"
+msgstr "Annuler"
+
+#: ../src/dialog.c:218
 msgid "Could not open directory "
 msgstr "Ouverture du répertoire impossible."
 
-#: ../src/dialog.c:313
+#: ../src/dialog.c:274
 msgid "Could not load image file "
 msgstr "Lecture de l'image impossible."
 
-#: ../src/dialog.c:442
+#: ../src/dialog.c:411
 msgid "Directories"
 msgstr "Répertoires"
 
-#: ../src/dialog.c:451
+#: ../src/dialog.c:420
 msgid "Icons"
 msgstr "Icones"
 
-#: ../src/dialog.c:488
+#: ../src/dialog.c:457
 msgid "File Name:"
 msgstr "Nom de fichier:"
 
-#: ../src/dialog.c:511
+#: ../src/dialog.c:480
 msgid "Choose File"
 msgstr "Choissisez un fichier"
 
-#: ../src/dialog.c:521
+#: ../src/dialog.c:497 ../src/dialog.c:499
 msgid "Icon Chooser"
 msgstr "Sélectionneur d'icone"
 
-#: ../src/dock.c:207
+#: ../src/dialog.c:1400 ../src/startup.c:325
+msgid "cannot open connection for crashing dialog panel. Aborting."
+msgstr "Ouverture d'une connexion pour le panneau de crash impossible. Abandon."
+
+#: ../src/dialog.c:1426
+msgid "Fatal error"
+msgstr "Erreur fatale"
+
+#: ../src/dialog.c:1437
+#, c-format
+msgid ""
+"Window Maker received signal %i\n"
+"(%s)."
+msgstr ""
+"Window Maker a reçu le signal %i\n"
+"(%s)."
+
+#: ../src/dialog.c:1440
+#, c-format
+msgid "Window Maker received signal %i."
+msgstr "Window Maker a reçu le signal %i."
+
+#: ../src/dialog.c:1449
+msgid ""
+" This fatal error occured probably due to a bug. Please fill the included "
+"BUGFORM and report it to bugs@windowmaker.org."
+msgstr ""
+" Cette erreur est probablement apparue suite à un bug. Remplissez le "
+"formulaire BUGFORM et envoyez-le à bugs@windowmaker.org."
+
+#: ../src/dialog.c:1457
+msgid "What do you want to do now?"
+msgstr "Que voulez faire maintenant ?"
+
+#: ../src/dialog.c:1463
+msgid "Select action"
+msgstr "Choisissez une action"
+
+#: ../src/dialog.c:1464
+msgid "Abort and leave a core file"
+msgstr "Abandonner et créer un core dump"
+
+#: ../src/dialog.c:1465
+msgid "Restart Window Maker"
+msgstr "Redémarrer Window Maker"
+
+#: ../src/dialog.c:1466
+msgid "Start alternate window manager"
+msgstr "Démarrer un autre gestionnaire de fenêtres"
+
+#: ../src/dock.c:210
+#, c-format
 msgid "Type the name for workspace %i:"
 msgstr "Entrez un nom pour le Bureau %i:"
 
-#: ../src/dock.c:208 ../src/dock.c:996
+#: ../src/dock.c:211 ../src/dock.c:1088
 msgid "Rename Workspace"
 msgstr "Renommer le Bureau"
 
-#: ../src/dock.c:408
+#: ../src/dock.c:471
 msgid "Workspace Clip"
 msgstr "Clip pour le Bureau"
 
-#: ../src/dock.c:409
+#: ../src/dock.c:472
 msgid "All selected icons will be removed!"
 msgstr "Tous les icones séléctionnés vont être supprimés!"
 
-#: ../src/dock.c:458
+#: ../src/dock.c:519
 msgid "Keep Icon"
 msgstr "Garder l'icone"
 
-#: ../src/dock.c:459 ../src/dock.c:1923 ../src/dock.c:2039
+#: ../src/dock.c:520 ../src/dock.c:2022 ../src/dock.c:2151
 msgid "Type the command used to launch the application"
 msgstr "Entrez la commande utilisée pour lancer l'application"
 
-#: ../src/dock.c:820
+#: ../src/dock.c:901
+#, c-format
 msgid "could not launch application %s\n"
 msgstr "Lancement de l'application %s impossible.\n"
 
-#: ../src/dock.c:875
+#: ../src/dock.c:956
 msgid "could not create workspace submenu for Clip menu"
 msgstr "Création du sous-menu Bureau pour le menu du Clip impossible."
 
-#: ../src/dock.c:933
+#: ../src/dock.c:1019
 msgid "could not create options submenu for Clip menu"
 msgstr "Création du sous-menu Options pour le menu du Clip impossible."
 
-#: ../src/dock.c:937
-msgid "Floating Clip"
-msgstr "Clip flottant"
+#: ../src/dock.c:1023 ../src/dock.c:1077 ../src/winmenu.c:388
+msgid "Keep on top"
+msgstr "Garder au-dessus"
 
-#: ../src/dock.c:943
+#: ../src/dock.c:1029
 msgid "Collapsed"
 msgstr "Refermé"
 
-#: ../src/dock.c:949
+#: ../src/dock.c:1035
 msgid "AutoCollapse"
-msgstr "Auto-Fermeture"
+msgstr "Auto­Fermeture"
 
-#: ../src/dock.c:955
+#: ../src/dock.c:1041
+msgid "AutoRaiseLower"
+msgstr "Auto-Positionnement"
+
+#: ../src/dock.c:1047
 msgid "AutoAttract Icons"
 msgstr "Attirer les Icones"
 
-#: ../src/dock.c:961
+#: ../src/dock.c:1053
 msgid "Keep Attracted Icons"
-msgstr "Garder les Icones Attirés"
+msgstr "Garder les Icones"
 
-#: ../src/dock.c:985
-msgid "Floating Dock"
-msgstr "Dock flottant"
-
-#: ../src/dock.c:991
+#: ../src/dock.c:1083
 msgid "Clip Options"
-msgstr "Options du Clip"
+msgstr "Options de Clip"
 
-#: ../src/dock.c:998
+#: ../src/dock.c:1090
 msgid "(Un)Select Icon"
 msgstr "(Dé)Séléctionner l'Icone"
 
-#: ../src/dock.c:1000
+#: ../src/dock.c:1092
 msgid "(Un)Select All Icons"
 msgstr "(Dé)Séléctionner tous les Icones"
 
-#: ../src/dock.c:1003
+#: ../src/dock.c:1095
 msgid "Keep Icon(s)"
 msgstr "Garder le(s) Icone(s)"
 
-#: ../src/dock.c:1005
+#: ../src/dock.c:1097
 msgid "Move Icon(s) To"
 msgstr "Déplacer le(s) Icone(s) vers"
 
-#: ../src/dock.c:1010
+#: ../src/dock.c:1102
 msgid "Remove Icon(s)"
 msgstr "Supprimer le(s) Icone(s)"
 
-#: ../src/dock.c:1012
+#: ../src/dock.c:1104
 msgid "Attract Icons"
 msgstr "Attirer le(s) Icone(s)"
 
-#: ../src/dock.c:1015
+#: ../src/dock.c:1107
 msgid "Launch"
 msgstr "Lancer"
 
-#: ../src/dock.c:1021
+#: ../src/dock.c:1115
 msgid "Settings..."
 msgstr "Paramètres..."
 
-#: ../src/dock.c:1417 ../src/dock.c:1431 ../src/dock.c:1445 ../src/dock.c:1455
+#: ../src/dock.c:1500 ../src/dock.c:1514 ../src/dock.c:1528 ../src/dock.c:1538
+#, c-format
 msgid "bad value in docked icon state info %s"
-msgstr "mauvaise valeur dans l'information %s sur l'état de l'icone."
+msgstr "Mauvaise valeur dans l'information %s sur l'état de l'icone."
 
-#: ../src/dock.c:1463
+#: ../src/dock.c:1546
+#, c-format
 msgid "bad value in docked icon position %i,%i"
-msgstr "mauvaise valeur pour l'icone de position %i,%i."
+msgstr "Mauvaise valeur pour l'icone de position %i,%i."
 
-#: ../src/dock.c:1692
+#: ../src/dock.c:1789
 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
-msgstr "il y a trop d'icones dans le dock. Le surplus sera ignoré."
+msgstr "Il y a trop d'icones dans le dock. Le surplus sera ignoré."
 
 #. icon->forced_dock = 1;
-#: ../src/dock.c:1922 ../src/dock.c:2038
+#: ../src/dock.c:2021 ../src/dock.c:2150
 msgid "Dock Icon"
 msgstr "Docker l'icone"
 
-#: ../src/dock.c:2982 ../src/dock.c:2986
+#: ../src/dock.c:3107 ../src/dock.c:3111
+#, c-format
 msgid "Could not execute command \"%s\""
-msgstr "Exécution de la commande \"%s\" impossible."
+msgstr "Exécution de la commande «%s» impossible."
 
-#: ../src/dockedapp.c:128
+#: ../src/dockedapp.c:130
+#, c-format
 msgid "could not find icon %s, used in a docked application"
 msgstr "Icone %s, utilisé dans l'application dockée, introuvable."
 
-#: ../src/dockedapp.c:205
-msgid "Could not open specified icon file:%s"
+
+#: ../src/dockedapp.c:209
+#, c-format
+msgid "Could not open specified icon file: %s"
 msgstr "Ouverture de l'icone %s impossible."
 
-#: ../src/dockedapp.c:290
+#: ../src/dockedapp.c:211
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../src/dockedapp.c:298
 msgid "Start when WindowMaker is started"
 msgstr "Démarrer en même temps que WindowMaker"
 
-#: ../src/dockedapp.c:297
+#: ../src/dockedapp.c:305
 msgid "Application path and arguments"
 msgstr "Chemin de l'application et arguments"
 
-#: ../src/dockedapp.c:308
+#: ../src/dockedapp.c:316
 msgid "Command for files dropped with DND"
 msgstr "Commande pour les fichiers lâchés par DND"
 
-#: ../src/dockedapp.c:320
+#: ../src/dockedapp.c:328
+#, c-format
 msgid "%d will be replaced with the file name"
 msgstr "%d sera remplacé par le nom du fichier"
 
-#: ../src/dockedapp.c:324
+#: ../src/dockedapp.c:332
 msgid "DND support was not compiled in"
 msgstr "Le support du DND n'a pas été compilé"
 
-#: ../src/dockedapp.c:330
+#: ../src/dockedapp.c:338
 msgid "Icon Image"
 msgstr "Fichier Icone"
 
-#: ../src/dockedapp.c:342 ../src/winspector.c:1158
+#: ../src/dockedapp.c:350 ../src/winspector.c:1245
 msgid "Browse..."
 msgstr "Parcourir..."
 
-#: ../src/dockedapp.c:387
+#: ../src/dockedapp.c:395
 msgid "Docked Application Settings"
 msgstr "Paramètres de l'application dockée"
 
-#: ../src/event.c:465
-msgid "stack overflow: too many dead processes"
-msgstr "Débordement de la pile: trop de processus morts."
+#: ../src/framewin.c:489 ../src/framewin.c:565 ../src/menu.c:461
+#: ../src/texture.c:549
+#, c-format
+msgid "could not render texture: %s"
+msgstr "Affichage de la texture %s impossible"
 
-#: ../src/framewin.c:526
-msgid "could not render gradient: %s"
-msgstr "Affichage du dégradé %s impossible."
-
-#: ../src/framewin.c:542 ../src/framewin.c:557 ../src/framewin.c:568 ../src/framewin.c:575 ../src/framewin.c:582 ../src/icon.c:294 ../src/texture.c:496
+#: ../src/framewin.c:505 ../src/framewin.c:520 ../src/framewin.c:531
+#: ../src/framewin.c:538 ../src/framewin.c:545 ../src/icon.c:350
+#: ../src/menu.c:490
+#, c-format
 msgid "error rendering image:%s"
-msgstr "Erreur lors de l'affichage de l'image \"%s\"."
+msgstr "Erreur lors de l'affichage de l'image «%s»."
 
-#: ../src/icon.c:180 ../src/wdefaults.c:399
+#: ../src/framewin.c:588
+#, c-format
+msgid "error rendering image: %s"
+msgstr "Erreur lors de l'affichage de l'image «%s»."
+
+#: ../src/icon.c:229 ../src/wdefaults.c:416
+#, c-format
 msgid "error loading image file \"%s\""
-msgstr "Erreur dans le chargement de l'image \"%s\"."
+msgstr "Erreur dans le chargement de l'image «%s»."
 
-#: ../src/icon.c:612
+#: ../src/icon.c:477 ../src/icon.c:486
+#, c-format
+msgid "could not create directory %s"
+msgstr "Création du répertoire %s impossible."
+
+#: ../src/icon.c:753
+#, c-format
 msgid "could not find default icon \"%s\""
-msgstr "Icone par défaut \"%s\" introuvable."
+msgstr "Icone par défaut «%s» introuvable."
 
-#: ../src/icon.c:618
+#: ../src/icon.c:759
+#, c-format
 msgid "could not load default icon \"%s\":%s"
-msgstr "Chargement de l'icone par défaut \"%s\":%s"
+msgstr "Chargement de l'icone par défaut «%s» impossible:%s"
 
-#: ../src/main.c:169
-msgid "Restart failed!!!"
-msgstr "Redémarrage raté!!!"
-
-#: ../src/main.c:185
-msgid "%s aborted.\n"
-msgstr "%s annulé.\n"
-
-#: ../src/main.c:196
-msgid "usage: %s [-options]\n"
-msgstr "usage: %s [-options]\n"
-
-#: ../src/main.c:197
-msgid "options:"
-msgstr "options:"
-
-#: ../src/main.c:199
-msgid " -nocpp \t\tdisable preprocessing of configuration files"
-msgstr " -nocpp \t\tannule le pré-traitement des fichiers de configuration"
+#: ../src/main.c:198
+msgid "failed to restart Window Maker."
+msgstr "Redémarrage de Window Maker raté."
 
 #: ../src/main.c:201
-msgid " -nodock\t\tdo not open the application Dock"
-msgstr " -nodock\t\tne lance pas le Dock"
+#, c-format
+msgid "could not exec %s"
+msgstr "Exécution de %s impossible."
 
-#: ../src/main.c:202
-msgid " -noclip\t\tdo not open the workspace Clip"
-msgstr " -noclip\t\tne lance pas le Clip"
+#: ../src/main.c:250
+#, c-format
+msgid "%s aborted.\n"
+msgstr "%s abandonné.\n"
 
-#.
-#. puts(_(" -locale locale		locale to use"));
-#.
-#: ../src/main.c:206
-msgid " -visualid visualid\tvisual id of visual to use"
-msgstr " -visualid visualid\tvisual id du visuel à utiliser"
+#: ../src/main.c:261
+#, c-format
+msgid "Usage: %s [options]\n"
+msgstr "Usage: %s [-options]\n"
 
-#: ../src/main.c:207
+#: ../src/main.c:262
+msgid "The Window Maker window manager for the X window system"
+msgstr "Le gestionnaire de fenêtres Window Maker pour X"
+
+#: ../src/main.c:264
 msgid " -display host:dpy\tdisplay to use"
 msgstr " -display host:dpy\tdisplay à utiliser"
 
-#: ../src/main.c:208
-msgid " -version\t\tprint version and exit"
-msgstr " -version\t\taffiche le numéro de version et quitte"
+#: ../src/main.c:266
+msgid " --no-cpp \t\tdisable preprocessing of configuration files"
+msgstr " --no-cpp \t\tannule le pré-traitement des fichiers de configuration"
 
-#: ../src/main.c:220
+#: ../src/main.c:268
+msgid " --no-dock\t\tdo not open the application Dock"
+msgstr " --no-dock\t\tne lance pas le Dock"
+
+#: ../src/main.c:269
+msgid " --no-clip\t\tdo not open the workspace Clip"
+msgstr " --no-clip\t\tne lance pas le Clip"
+
+#.
+#. puts(_(" --locale locale		locale to use"));
+#.
+#: ../src/main.c:273
+msgid " --visual-id visualid\tvisual id of visual to use"
+msgstr " --visual-id visualid\tvisual id du visuel à utiliser"
+
+#: ../src/main.c:274
+msgid " --static\t\tdo not update or save configurations"
+msgstr " --static\t\tne pas mettre-à-jour ni sauver la configuration"
+
+#: ../src/main.c:276
+msgid " --synchronous\t\tturn on synchronous display mode"
+msgstr " --synchronous\t\tutilise un affichage synchrone"
+
+#: ../src/main.c:278
+msgid " --version\t\tprint version and exit"
+msgstr " --version\t\taffiche le numéro de version et quitte"
+
+#: ../src/main.c:279
+msgid " --help\t\t\tshow this message"
+msgstr " --help\t\taffiche ce message"
+
+#: ../src/main.c:291
+#, c-format
 msgid ""
-"could not find user GNUstep directory.\n"
-"Make sure you have installed WindowMaker correctly and run wmaker.inst"
+"could not find user GNUstep directory (%s).\n"
+"Make sure you have installed Window Maker correctly and run wmaker.inst"
 msgstr ""
 "Répertoire GNUstep de l'utilisateur introuvable.\n"
 "Assurez-vous d'avoir installer WindowMaker correctement et d'avoir lancer wmaker.inst"
 
-#: ../src/main.c:241
+#: ../src/main.c:309 ../src/main.c:314
+#, c-format
 msgid "%s:could not execute initialization script"
 msgstr "%s:exécution ratée du script d'initialisation."
 
-#: ../src/main.c:298 ../src/main.c:305 ../src/main.c:312
+#: ../src/main.c:331 ../src/main.c:336
+#, c-format
+msgid "%s:could not execute exit script"
+msgstr "%s:exécution ratée du script de sortie."
+
+#: ../src/main.c:405 ../src/main.c:412 ../src/main.c:420 ../src/main.c:436
+#, c-format
 msgid "too few arguments for %s"
 msgstr "Trop peu d'arguments pour %s."
 
-#: ../src/main.c:316
+#: ../src/main.c:424
+#, c-format
 msgid "bad value for visualid: \"%s\""
-msgstr "Mauvaise valeur de visualid: \"%s\""
+msgstr "Mauvaise valeur de visualid: «%s»"
 
-#: ../src/main.c:359
+#: ../src/main.c:444
+#, c-format
+msgid "%s: invalid argument '%s'\n"
+msgstr "%s: argument «%s» invalide\n"
+
+#: ../src/main.c:445
+#, c-format
+msgid "Try '%s --help' for more information\n"
+msgstr "Essayez '%s --help' pour plus d'informations\n"
+
+#: ../src/main.c:488
 msgid "X server does not support locale"
-msgstr "le Serveur X ne supporte pas les \"locale\""
+msgstr "le Serveur X ne supporte pas les locale"
 
-#: ../src/main.c:362
+#: ../src/main.c:491
 msgid "cannot set locale modifiers"
-msgstr "Modificateurs de \"locale\" inappliquables."
+msgstr "Modificateurs de locale inappliquables."
 
-#: ../src/main.c:376
+#: ../src/main.c:508
+#, c-format
 msgid "could not open display \"%s\""
-msgstr "Ouverture du \"display\" \"%s\" impossible."
+msgstr "Ouverture du display «%s» impossible."
 
-#: ../src/menu.c:285
+#: ../src/menu.c:297
 msgid "wrealloc() failed while trying to add menu item"
 msgstr "Echec de wrealloc() pendant l'ajout d'un élément de menu."
 
-#: ../src/misc.c:70
+#: ../src/misc.c:71
+#, c-format
 msgid "could not define value for %s for cpp"
-msgstr "Définition de la valeur \"%s\" pour cpp impossible."
+msgstr "Définition de la valeur %s pour cpp impossible."
 
-#: ../src/misc.c:100
+#: ../src/misc.c:101
+#, c-format
 msgid "could not get password entry for UID %i"
 msgstr "Mot de passe de l'UID %i introuvable."
 
-#: ../src/misc.c:124
+#: ../src/misc.c:125
+#, c-format
 msgid "your machine is misconfigured. HOSTNAME is set to %s"
 msgstr "Votre machine est mal configurée. HOSTNAME a pour valeur %s."
 
-#: ../src/misc.c:130
+#: ../src/misc.c:131
+#, c-format
 msgid "your machine is misconfigured. HOST is set to %s"
 msgstr "Votre machine est mal configurée. HOST a pour valeur %s."
 
-#: ../src/misc.c:709
+#: ../src/misc.c:772
 msgid "selection timed-out"
 msgstr "La sélection n'est plus valable."
 
-#: ../src/misc.c:723
+#: ../src/misc.c:788
 msgid "Program Arguments"
 msgstr "Arguments du programme"
 
-#: ../src/misc.c:742
+#: ../src/misc.c:789
 msgid "Enter command arguments:"
 msgstr "Entrez les arguments de la commande:"
 
-#: ../src/misc.c:763
+#: ../src/misc.c:887
 msgid "unable to get dropped data from DND drop"
 msgstr "Obtention des données du DND impossible."
 
-#: ../src/misc.c:771
+#: ../src/misc.c:895
 msgid "error getting dropped data from DND drop"
 msgstr "Erreur pendant l'acquisition des données du DND."
 
-#: ../src/misc.c:777
+#: ../src/misc.c:901
 msgid "out of memory while getting data from DND drop"
 msgstr "Plus de mémoire pendant l'acquisition des données du DND."
 
-#: ../src/misc.c:821 ../src/misc.c:940
+#: ../src/misc.c:946 ../src/misc.c:1081
+#, c-format
 msgid "out of memory during expansion of \"%s\""
-msgstr "Plus de mémoire pendant l'expansion de \"%s\"."
+msgstr "Plus de mémoire pendant l'expansion de «%s»."
 
-#: ../src/misc.c:875
+#: ../src/misc.c:1000
 msgid "out of memory during expansion of \"%w\""
-msgstr "Plus de mémoire pendant l'expansion de \"%w\"."
+msgstr "Plus de mémoire pendant l'expansion de «%w»."
 
-#: ../src/misc.c:894
+#: ../src/misc.c:1018
+msgid "out of memory during expansion of \"%W\""
+msgstr "Plus de mémoire pendant l'expansion de «%W»."
+
+
+#: ../src/misc.c:1034
 msgid "out of memory during expansion of \"%a\""
-msgstr "Plus de mémoire pendant l'expansion de \"%a\"."
+msgstr "Plus de mémoire pendant l'expansion de «%a»."
 
-#: ../src/misc.c:916
+#: ../src/misc.c:1060
+#, c-format
 msgid "out of memory during expansion of \"%d\""
-msgstr "Plus de mémoire pendant l'expansion de \"%d\"."
+msgstr "Plus de mémoire pendant l'expansion de «%d»."
 
-#: ../src/misc.c:928
+#: ../src/misc.c:1074
 msgid "selection not available"
 msgstr "Sélection indisponible."
 
-#: ../src/misc.c:1006 ../src/misc.c:1012
+#: ../src/misc.c:1146 ../src/misc.c:1152
+#, c-format
 msgid "bad window name value in %s state info"
 msgstr "Nom de fenêtre incorrecte dans les informations sur %s."
 
+#: ../src/misc.c:1407
+msgid "could not send message to background image helper"
+msgstr "Envoi de messages vers le gestionnaire de fond d'écran impossible."
+
 #: ../src/pixmap.c:235
+#, c-format
 msgid "could not load mask bitmap file \"%s\". Won't use mask"
-msgstr "Chargement du fichier de masque \"%s\" impossible. Aucun masque ne sera utilisé."
+msgstr "Chargement du fichier de masque «%s» impossible. Aucun masque ne sera utilisé."
 
 #: ../src/proplist.c:180
 msgid "unterminated string"
@@ -608,21 +771,26 @@ msgstr "Erreur lors de l'analyse de la cl
 
 #: ../src/proplist.c:332
 msgid "missing = in dictionary entry"
-msgstr "\"=\" manquant dans l'entrée du dictionnaire."
+msgstr "«=» manquant dans l'entrée du dictionnaire."
 
 #: ../src/proplist.c:351
 msgid "missing ; in dictionary entry"
-msgstr "\";\" manquant dans l'entrée du dictionnaire."
+msgstr "«;» manquant dans l'entrée du dictionnaire."
 
 #: ../src/proplist.c:432
-msgid "was expecting a string, dictionary, data or array."
-msgstr "Attendait une chaîne, un dictionnaire, une donnée ou un tableau."
+msgid ""
+"was expecting a string, dictionary, data or array. If it's a string, try "
+"enclosing it with \"."
+msgstr ""
+"Attendait une chaîne, un dictionnaire, une donnée ou un  tableau. Si c'est "
+"une chaîne, essayez de l'encadrer avec des \"."
 
 #: ../src/proplist.c:434
 msgid "Comments are not allowed inside WindowMaker owned domain files."
 msgstr "Les commentaires ne sont pas autorisés dans les fichiers de domaine appartenant à WindowMaker."
 
 #: ../src/proplist.c:453
+#, c-format
 msgid "could not open domain file %s"
 msgstr "Ouverture du fichier de domaine %s impossible."
 
@@ -631,11 +799,13 @@ msgid "extra data after end of file"
 msgstr "Surplus de donnée à la fin du fichier."
 
 #: ../src/resources.c:71
+#, c-format
 msgid "The following character sets are missing in %s:"
 msgstr "Les jeux de caractères suivants manquent dans %s:"
 
 #: ../src/resources.c:76
-msgid "The string \"%s\" will be used in place."
+#, c-format
+msgid "The string \"%s\" will be used in place"
 msgstr "La chaîne \"%s\" sera utilisée à la place"
 
 #: ../src/resources.c:78
@@ -643,238 +813,390 @@ msgid "of any characters from those sets."
 msgstr "de tous les caractères de ces jeux."
 
 #: ../src/resources.c:81
+#, c-format
 msgid "could not create font set %s. Trying fixed"
-msgstr "Création du jeu de caractères %s impossible. Essaye \"fixed\"."
+msgstr "Création du jeu de caractères %s impossible. Essaye fixed."
 
 #: ../src/resources.c:98
+#, c-format
 msgid "could not load font %s. Trying fixed"
-msgstr "Chargement de la police %s impossible. Essaye \"fixed\"."
+msgstr "Chargement de la police %s impossible. Essaye fixed."
 
 #: ../src/resources.c:136
+#, c-format
 msgid "could not parse color \"%s\""
-msgstr "Analyse de la couleur \"%s\" impossible."
+msgstr "Analyse de la couleur «%s» impossible."
 
 #: ../src/resources.c:140
+#, c-format
 msgid "could not allocate color \"%s\""
-msgstr "Allocation de la couleur \"%s\" impossible."
+msgstr "Allocation de la couleur «%s» impossible."
 
-#: ../src/rootmenu.c:162
-msgid "Program \"%s\" not found or cannot be executed."
-msgstr "Le programme \"%s\" non trouvé ou ne peut pas être exécuté."
+#: ../src/rootmenu.c:187 ../src/rootmenu.c:189
+msgid "Exit"
+msgstr "Quitter"
 
-#: ../src/rootmenu.c:207
+#: ../src/rootmenu.c:188
 msgid "Exit window manager?"
 msgstr "Sortir de WindowMaker?"
 
-#: ../src/rootmenu.c:227
+#: ../src/rootmenu.c:224
 msgid "Close X session"
 msgstr "Fermer la session X"
 
-#: ../src/rootmenu.c:228
+#: ../src/rootmenu.c:225
 msgid ""
 "Close Window System session?\n"
-"(all applications will be closed)"
+"Kill might close applications with unsaved data."
 msgstr ""
 "Fermer la session X-Window\n"
 "(toutes les applications seront fermées)"
 
-#: ../src/rootmenu.c:230
-msgid "Exiting...\n"
-msgstr "Sort...\n"
+#.
+#. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
+#. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
+#.
+#: ../src/rootmenu.c:227 ../src/winmenu.c:486
+msgid "Close"
+msgstr "Fermer"
 
-#: ../src/rootmenu.c:449
+#: ../src/rootmenu.c:238
+msgid "Kill X session"
+msgstr "Tuer la session X"
+
+#: ../src/rootmenu.c:239
+msgid ""
+"Kill Window System session?\n"
+"(all applications will be closed)"
+msgstr ""
+"Tuer la session X?\n"
+"(toutes les applications seront fermées)"
+
+#: ../src/rootmenu.c:506
+#, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
-msgstr "%s: spécification de raccourci-clavier \"%s\" invalide pour l'entrée %s."
+msgstr "%s: spécification de raccourci-clavier «%s» invalide pour l'entrée %s."
 
-#: ../src/rootmenu.c:457
+#: ../src/rootmenu.c:514
+#, c-format
 msgid "%s:invalid key in shortcut \"%s\" for entry %s"
-msgstr "%s: touche invalide dans le raccourci \"%s\" pour l'entrée %s."
+msgstr "%s: touche invalide dans le raccourci «%s» pour l'entrée %s."
 
-#: ../src/rootmenu.c:510
+#: ../src/rootmenu.c:567
+#, c-format
 msgid "%s: unmatched '\"' in menu file"
 msgstr "%s: problème de '\"' dans le fichier de menu."
 
-#: ../src/rootmenu.c:559
+#: ../src/rootmenu.c:617
+#, c-format
 msgid "%s: missing command"
 msgstr "%s: commande manquante."
 
-#: ../src/rootmenu.c:592
+#: ../src/rootmenu.c:650
+#, c-format
 msgid "invalid OPEN_MENU specification: %s"
 msgstr "spécification de OPEN_MENU invalide: %s"
 
-#: ../src/rootmenu.c:657
+#: ../src/rootmenu.c:698
+#, c-format
 msgid "%s:could not stat menu"
 msgstr "%s:échec de stat() pour le menu."
 
-#: ../src/rootmenu.c:665
-msgid "%s:could not stat menu :%s"
+#: ../src/rootmenu.c:706
+#, c-format
+msgid "%s:could not stat menu:%s"
 msgstr "%s: échec de stat() pour le menu: %s"
 
-#: ../src/rootmenu.c:683
+#: ../src/rootmenu.c:724
+#, c-format
 msgid "too many parameters in OPEN_MENU: %s"
 msgstr "trop de paramétres pour OPEN_MENU: %s"
 
-#: ../src/rootmenu.c:719
-msgid "There are more than one WORKSPACE_MENU commands in the applications menu. Only one is allowed."
-msgstr "Il y a plus d'une déclaration WORKSPACE_MENU dans le menu. Une seule est autorisée."
+#: ../src/rootmenu.c:760
+msgid ""
+"There are more than one WORKSPACE_MENU commands in the applications menu. "
+"Only one is allowed."
+msgstr ""
+"Il y a plus d'une déclaration WORKSPACE_MENU dans le menu. Une seule "
+"est autorisée."
 
-#: ../src/rootmenu.c:748 ../src/rootmenu.c:766
+#: ../src/rootmenu.c:789 ../src/rootmenu.c:807
+#, c-format
 msgid "%s:missing parameter for menu command \"%s\""
-msgstr "%s:paramètre manquant pour la commande de menu \"%s\"."
+msgstr "%s:paramètre manquant pour la commande de menu «%s»."
 
-#: ../src/rootmenu.c:829
+#: ../src/rootmenu.c:870
+#, c-format
 msgid "%s:unknown command \"%s\" in menu config."
-msgstr "%s:commande \"%s\" inconnue dans le fichier de configuration."
+msgstr "%s:commande «%s» inconnue dans le fichier du menu."
 
-#: ../src/rootmenu.c:837
+#: ../src/rootmenu.c:878
+#, c-format
 msgid "%s:can't add shortcut for entry \"%s\""
-msgstr "%s:ne peut pas ajouter le raccourci pour l'entrée \"%s\"."
+msgstr "%s:ne peut pas ajouter le raccourci pour l'entrée «%s»."
 
-#: ../src/rootmenu.c:974
+#: ../src/rootmenu.c:1015
+#, c-format
 msgid "%s:maximal line size exceeded in menu config: %s"
 msgstr "%s:ligne trop longue lors de la configuration du menu: %s"
 
-#: ../src/rootmenu.c:996 ../src/rootmenu.c:1088 ../src/rootmenu.c:1189
+#: ../src/rootmenu.c:1037 ../src/rootmenu.c:1129 ../src/rootmenu.c:1230
+#, c-format
 msgid "%s:missing command in menu config: %s"
 msgstr "%s:commande manquante lors de la configuration du menu: %s"
 
-#: ../src/rootmenu.c:1026
+#: ../src/rootmenu.c:1067
+#, c-format
 msgid "%s:syntax error in menu file:END declaration missing"
 msgstr "%s:erreur de syntaxe dans le fichier de menu: déclaration END manquante."
 
-#: ../src/rootmenu.c:1055 ../src/rootmenu.c:1154
+#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1195
 msgid "could not make arguments for menu file preprocessor"
 msgstr "Création des arguments pour le pré-processeur impossible."
 
-#: ../src/rootmenu.c:1061 ../src/rootmenu.c:1161
+#: ../src/rootmenu.c:1102 ../src/rootmenu.c:1202
+#, c-format
 msgid "%s:could not open/preprocess menu file"
 msgstr "%s:Ouverture/Traitement du fichier de menu impossible."
 
-#: ../src/rootmenu.c:1073 ../src/rootmenu.c:1174
+#: ../src/rootmenu.c:1114 ../src/rootmenu.c:1215
+#, c-format
 msgid "%s:could not open menu file"
 msgstr "%s:Ouverture du fichier de menu impossible."
 
-#: ../src/rootmenu.c:1100
+#: ../src/rootmenu.c:1141
+#, c-format
 msgid "%s:invalid menu file. MENU command is missing"
 msgstr "%s:fichier de menu invalide. Déclaration MENU manquante."
 
-#: ../src/rootmenu.c:1109
+#: ../src/rootmenu.c:1150
 msgid "error reading preprocessed menu data"
 msgstr "Erreur lors de la lecture du menu pré-traité."
 
-#: ../src/rootmenu.c:1201
+#: ../src/rootmenu.c:1242
+#, c-format
 msgid "%s:no title given for the root menu"
 msgstr "%s:aucun titre donné pour le menu principal."
 
-#: ../src/rootmenu.c:1255 ../src/rootmenu.c:1318 ../src/rootmenu.c:1362
+#: ../src/rootmenu.c:1325 ../src/rootmenu.c:1392 ../src/rootmenu.c:1436
+#, c-format
 msgid "out of memory while constructing directory menu %s"
 msgstr "Plus de mémoire pendant de la création du sous-menu %s."
 
-#: ../src/rootmenu.c:1265
+#: ../src/rootmenu.c:1335
+#, c-format
 msgid "%s:could not stat file \"%s\" in menu directory"
-msgstr "%s:échec de stat() sur le fichier \"%s\" dans le répertoire du menu."
+msgstr "%s:échec de stat() sur le fichier «%s» dans le répertoire du menu."
 
-#: ../src/rootmenu.c:1411
+#: ../src/rootmenu.c:1490
 msgid "Commands"
 msgstr "Commandes"
 
-#: ../src/rootmenu.c:1413
+#: ../src/rootmenu.c:1493
+msgid "Restart"
+msgstr "Redémarrer"
+
+#: ../src/rootmenu.c:1494
 msgid "Exit..."
 msgstr "Sortir..."
 
-#: ../src/rootmenu.c:1477
-msgid "%s:could not find menu file \"%s\""
-msgstr "%s:Fichier de menu \"%s\" introuvable."
+#: ../src/rootmenu.c:1539
+#, c-format
+msgid "could not find menu file \"%s\" referenced in WMRootMenu"
+msgstr "Fichier de menu «%s» référencé dans WMRootMenu introuvable."
 
-#: ../src/rootmenu.c:1484
-msgid "%s:could not access menu \"%s\""
-msgstr "%s:Accéssion au menu \"%s\" impossible."
+#: ../src/rootmenu.c:1546
+#, c-format
+msgid "could not access menu \"%s\" referenced in WMRootMenu"
+msgstr "Fichier de menu «%s» référencé dans WMRootMenu inaccessible."
 
-#: ../src/rootmenu.c:1510 ../src/rootmenu.c:1565
+#: ../src/rootmenu.c:1557
+#, c-format
+msgid ""
+"using default menu file \"%s\" as the menu referenced in WMRootMenu could "
+"not be found "
+msgstr ""
+"Utilise le menu par défaut «%s» étant donné que le menu référencé dans "
+"WMRootMenu n'a pas pû être trouvé."
+
+#: ../src/rootmenu.c:1580 ../src/rootmenu.c:1656
+#, c-format
 msgid "%s:format error in root menu configuration \"%s\""
-msgstr "%s:erreur de formatage lors de la configuration du menu \"%s\"."
+msgstr "%s:erreur de formatage lors de la configuration du menu «%s»."
 
-#: ../src/screen.c:111
-msgid "it seems that there already is a window manager running"
-msgstr "Il semblerait qu'un gestionnaire de fenêtres soit déjà actif."
+#: ../src/rootmenu.c:1744
+msgid ""
+"The applications menu could not be loaded.Look at the console output for a "
+"detaileddescription of the errors"
+msgstr ""
+"Le menu n'a pas pû être chargé. Regardez la sortie de la console pour une "
+"description détaillée des erreurs"
 
-#: ../src/screen.c:394
-msgid "could not load logo image for panels"
-msgstr "Chargement des logos pour les fenêtres de messages impossible."
+#: ../src/screen.c:436
+#, c-format
+msgid "could not load logo image for panels: %s"
+msgstr "Chargement des logos pour les fenêtres de messages impossible: %s"
 
-#: ../src/screen.c:397
+#: ../src/screen.c:440
+#, c-format
 msgid "error making logo image for panel:%s"
 msgstr "Erreur lors de la création de logo pour la fenêtre de message:%s"
 
-#: ../src/screen.c:544
-msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
-msgstr "La taille des icones est configurée à %i, mais c'est trop petit. Utilise 16, à la place.\n"
-
-#: ../src/screen.c:587
+#: ../src/screen.c:726
+#, c-format
 msgid "could not initialize graphics library context: %s"
-msgstr "Initialisation du contexte de la librairie graphique impossible: %s"
+msgstr "Initialisation de la librairie graphique impossible: %s"
 
-#: ../src/session.c:113 ../src/wdefaults.c:559 ../src/winspector.c:335
+#: ../src/screen.c:757
+msgid "could not do initialization of WINGs widget set"
+msgstr "Initialisation de la librairie WINGs impossible."
+
+#: ../src/screen.c:1091
+#, c-format
+msgid "could not save session state in %s"
+msgstr "Sauvegarde de la session dans %s impossible."
+
+#: ../src/session.c:182 ../src/wdefaults.c:564 ../src/winspector.c:348
+#, c-format
 msgid "can't convert \"%s\" to boolean"
-msgstr "Conversion de \"%s\" en donnée booléenne impossible."
+msgstr "Conversion de «%s» en booléen impossible."
 
-#: ../src/stacking.c:88
+#: ../src/session.c:981
+msgid "out of memory while saving session state"
+msgstr "Plus de mémoire pendant le sauvegarde de session."
+
+#: ../src/session.c:1072
+msgid "end of memory while saving session state"
+msgstr "Plus de mémoire pendant le sauvegarde de session."
+
+#. This is not fatal but can mean the session manager exited.
+#. * If the session manager exited normally we would get a
+#. * Die message, so this probably means an abnormal exit.
+#. * If the sm was the last client of session, then we'll die
+#. * anyway, otherwise we can continue doing our stuff.
+#.
+#: ../src/session.c:1206
+msgid "connection to the session manager was lost"
+msgstr "La connexion vers le gestionnaire de session a été perdue."
+
+#: ../src/stacking.c:73
 msgid "could not get window list!!"
 msgstr "Obtention de la liste des fenêtres impossible!!"
 
-#: ../src/startup.c:163
+#: ../src/startup.c:194
+#, c-format
 msgid "internal X error: %s\n"
 msgstr "erreur X interne: %s\n"
 
-#: ../src/startup.c:225
+#: ../src/startup.c:259
+#, c-format
 msgid "got signal %i (%s) - restarting\n"
 msgstr "Signal %i (%s) reçu - redémarre.\n"
 
-#: ../src/startup.c:227
+#: ../src/startup.c:261
+#, c-format
 msgid "got signal %i - restarting\n"
 msgstr "Signal %i reçu - redémarre.\n"
 
-#: ../src/startup.c:240
-msgid "%s: Received signal SIGTERM. Exiting..."
-msgstr "%s: Signal SIGTERM reçu. Quitte..."
+#: ../src/startup.c:275
+#, c-format
+msgid "got signal %i (%s) - exiting...\n"
+msgstr "Signal %i (%s) reçu. Quitte...\n"
 
-#: ../src/startup.c:251
+#: ../src/startup.c:277
+#, c-format
+msgid "got signal %i - exiting...\n"
+msgstr "Signal %i reçu - Quitte...\n"
+
+#: ../src/startup.c:290
+#, c-format
 msgid "got signal %i (%s)\n"
 msgstr "Signal %i (%s) reçu.\n"
 
-#: ../src/startup.c:253
+#: ../src/startup.c:292
+#, c-format
 msgid "got signal %i\n"
 msgstr "Signal %i reçu.\n"
 
-#: ../src/startup.c:258
-msgid "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
-msgstr "Crashé pendant un nettoyage post-crash. Suspension immédiate."
+#: ../src/startup.c:303
+msgid ""
+"crashed while trying to do some post-crash cleanup. Aborting immediatelly."
+msgstr ""
+"Crashé pendant un nettoyage post-crash. Suspension immédiate."
 
-#: ../src/startup.c:267
-msgid "trying to start alternative window manager..."
+#. we try to restart Window Maker
+#: ../src/startup.c:337
+msgid "trying to restart Window Maker..."
+msgstr "Tente de relancer Window Maker..."
+
+#: ../src/startup.c:342
+msgid "trying to start alternate window manager..."
 msgstr "Tente de lancer un autre gestionnaire de fenêtres..."
 
-#: ../src/switchmenu.c:124
+#: ../src/startup.c:347
+msgid "failed to start alternate window manager. Aborting."
+msgstr "Démarrage d'un autre gestionnaire de fenêtres impossible. Abandonne."
+
+#: ../src/startup.c:349
+msgid ""
+"a fatal error has occured, probably due to a bug. Please fill the included "
+"BUGFORM and report it."
+msgstr ""
+" Cette erreur est probablement apparue suite à un bug. Remplissez le "
+"formulaire BUGFORM et envoyez-le à bugs@windowmaker.org."
+
+#: ../src/startup.c:782
+#, c-format
+msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
+msgstr "La taille des icones est configurée à %i, mais c'est trop petit. Utilise 16, à la place.\n"
+
+#: ../src/startup.c:821
+msgid "it seems that there is already a window manager running"
+msgstr "Il semblerait qu'un gestionnaire de fenêtres soit déjà actif."
+
+#: ../src/startup.c:827
+#, c-format
+msgid "could not manage screen %i"
+msgstr "Gestion de l'écran %i impossible."
+
+#: ../src/startup.c:887
+msgid "could not manage any screen"
+msgstr "Aucun écran ne peut être géré."
+
+#: ../src/switchmenu.c:114
 msgid "Windows"
 msgstr "Fenêtres"
 
-#: ../src/texture.c:260
+#: ../src/texture.c:290 ../src/texture.c:334
+#, c-format
 msgid "image file \"%s\" used as texture could not be found."
-msgstr "Image \"%s\" utilisée comme texture introuvable."
+msgstr "Image «%s» utilisée comme texture introuvable."
 
-#: ../src/texture.c:266
+#: ../src/texture.c:296 ../src/texture.c:340
+#, c-format
 msgid "could not load texture pixmap \"%s\":%s"
-msgstr "Chargement de la texture \"%s\" impossible:%s"
+msgstr "Chargement de la texture «%s» impossible:%s"
 
-#: ../src/texture.c:362 ../src/texture.c:492
-msgid "could not render texture: %s"
-msgstr "Affichage de la texture impossible: %s"
+#: ../src/texture.c:400
+#, c-format
+msgid "library \"%s\" cound not be opened."
+msgstr "La librairie «%s» n'a pas pû être ouverte."
 
-#: ../src/wdefaults.c:393
+#: ../src/texture.c:409
+#, c-format
+msgid "function \"%s\" not found in library \"%s\""
+msgstr "Fonction «%s» introuvable dans la librairie «%s»"
+
+#: ../src/texture.c:416
+msgid "function textures not supported on this system, sorry."
+msgstr "Les plug-ins de textures ne sont pas supportés par ce système, désolé."
+
+#: ../src/wdefaults.c:410
+#, c-format
 msgid "could not find icon file \"%s\""
-msgstr "Icone \"%s\" introuvable."
+msgstr "Icone «%s» introuvable."
 
-#: ../src/window.c:1900 ../src/window.c:2039
+#: ../src/window.c:2539 ../src/window.c:2673
 msgid ""
 "the NumLock, ScrollLock or similar key seems to be turned on.\n"
 "Turn it off or some mouse actions and keyboard shortcuts will not work."
@@ -882,92 +1204,128 @@ msgstr ""
 "NumLock, ScrollLock ou une touche similaire semble activée.\n"
 "Désactivez-la ou certaines actions du clavier et de la souris ne fonctionneront pas."
 
-#: ../src/winmenu.c:182
-msgid "could not create workspace submenu for window menu"
-msgstr "Création du sous-menu Bureau pour le menu de fenêtres impossible."
+#: ../src/winmenu.c:125
+msgid ""
+"This will kill the application.\n"
+"Any unsaved changes will be lost.\n"
+"Please confirm."
+msgstr ""
+"L'application va être tuée.\n"
+"Les changements non sauvegardés seront perdus.\n"
+"Confirmez l'action."
 
-#: ../src/winmenu.c:204
-msgid "(Un)Maximize"
-msgstr "(Dé)Maximiser"
+#: ../src/winmenu.c:252 ../src/winmenu.c:260
+msgid "Set Shortcut"
+msgstr "Attribuer un Raccourci"
 
-#: ../src/winmenu.c:212
+#: ../src/winmenu.c:338 ../src/winmenu.c:384
+msgid "could not create submenu for window menu"
+msgstr "Création du sous-menu pour le menu de fenêtres impossible."
+
+#: ../src/winmenu.c:393
+msgid "Keep at bottom"
+msgstr "Garder en-dessous"
+
+#: ../src/winmenu.c:398 ../src/winspector.c:1147
+msgid "Omnipresent"
+msgstr "Omniprésente"
+
+#.
+#. * Warning: If you make some change that affects the order of the
+#. * entries, you must update the command #defines in the top of
+#. * this file.
+#.
+#: ../src/winmenu.c:421 ../src/winmenu.c:556
+msgid "Maximize"
+msgstr "Maximiser"
+
+#: ../src/winmenu.c:429 ../src/winmenu.c:542
 msgid "Miniaturize"
 msgstr "Miniaturiser"
 
-#: ../src/winmenu.c:221
-msgid "(Un)Shade"
-msgstr "(Dé)Plier"
+#: ../src/winmenu.c:438 ../src/winmenu.c:573
+msgid "Shade"
+msgstr "Plier"
 
-#: ../src/winmenu.c:229
-msgid "Hide"
-msgstr "Cacher"
+#: ../src/winmenu.c:454
+msgid "Resize/Move"
+msgstr "Déplacer/Dimensionner"
 
-#: ../src/winmenu.c:236
-msgid "Hide Others"
-msgstr "Cacher les autres"
-
-#: ../src/winmenu.c:238
+#: ../src/winmenu.c:462
 msgid "Select"
 msgstr "Séléctionner"
 
-#: ../src/winmenu.c:246
+#: ../src/winmenu.c:470
 msgid "Move To"
 msgstr "Déplacer vers"
 
-#: ../src/winmenu.c:251
+#: ../src/winmenu.c:475
 msgid "Attributes..."
 msgstr "Attributs..."
 
-#: ../src/winmenu.c:253
-msgid "Close"
-msgstr "Fermer"
+#: ../src/winmenu.c:477
+msgid "Options"
+msgstr "Options"
 
-#: ../src/winspector.c:274
+#: ../src/winmenu.c:537
+msgid "Deminiaturize"
+msgstr "Déminiaturiser"
+
+#: ../src/winmenu.c:551
+msgid "Unmaximize"
+msgstr "Démaximiser"
+
+#: ../src/winmenu.c:568
+msgid "Unshade"
+msgstr "Déplier"
+
+#: ../src/winspector.c:282
+#, c-format
 msgid "Could not find icon \"%s\" specified for this window"
-msgstr "Icone \"%s\" introuvable pour cette fenêtre."
+msgstr "Icone «%s» introuvable pour cette fenêtre."
 
-#: ../src/winspector.c:287
+#: ../src/winspector.c:298
+#, c-format
 msgid "Could not open specified icon \"%s\":%s"
-msgstr "Icone spécifié \"%s\" introuvable:%s"
+msgstr "Icone spécifié «%s» introuvable:%s"
 
-#: ../src/winspector.c:958
+#: ../src/winspector.c:1022
 msgid "Save"
 msgstr "Sauver"
 
-#: ../src/winspector.c:964
+#: ../src/winspector.c:1030
 msgid "Apply"
 msgstr "Appliquer"
 
-#: ../src/winspector.c:970
-msgid "Revert"
-msgstr "Défaire"
+#: ../src/winspector.c:1036
+msgid "Reload"
+msgstr "Recharger"
 
-#. *** window spec ***
-#: ../src/winspector.c:979 ../src/winspector.c:987
+#: ../src/winspector.c:1045 ../src/winspector.c:1055
 msgid "Window Specification"
 msgstr "Spécification de la fenêtre"
 
-#: ../src/winspector.c:980
+#: ../src/winspector.c:1046
 msgid "Window Attributes"
 msgstr "Attributs de la fenêtre"
 
-#: ../src/winspector.c:981
+#: ../src/winspector.c:1047
 msgid "Advanced Options"
 msgstr "Options Avancées"
 
-#: ../src/winspector.c:982
+#: ../src/winspector.c:1048
 msgid "Icon and Initial Workspace"
 msgstr "Icone et Bureau Initial"
 
-#: ../src/winspector.c:983
+#: ../src/winspector.c:1049
 msgid "Application Specific"
 msgstr "Spécifique à l'application"
 
-#: ../src/winspector.c:995
+#: ../src/winspector.c:1063
 msgid "Defaults for all windows"
 msgstr "Défauts pour toutes les fenêtres"
 
-#: ../src/winspector.c:1031
+#: ../src/winspector.c:1106
 msgid ""
 "The configuration will apply to all\n"
 "windows that have their WM_CLASS property set to the above selected\n"
@@ -977,134 +1335,147 @@ msgstr ""
 "les fenêtres dont la propriété WM_CLASS coïncide avec le nom séléctionné\n"
 "ci-dessus, lors de la sauvegarde."
 
-#: ../src/winspector.c:1038
+#: ../src/winspector.c:1113
 msgid "Attributes"
 msgstr "Attributs"
 
-#: ../src/winspector.c:1048
-msgid "Disable titlebar"
+#: ../src/winspector.c:1123
+msgid "Disable Titlebar"
 msgstr "Désactiver la barre de titre"
 
-#: ../src/winspector.c:1052
-msgid "Disable resizebar"
+#: ../src/winspector.c:1127
+msgid "Disable Resizebar"
 msgstr "Désactiver la barre de redimensionnement"
 
-#: ../src/winspector.c:1056
-msgid "Disable close button"
+#: ../src/winspector.c:1131
+msgid "Disable Close Button"
 msgstr "Désactiver le bouton de fermeture"
 
-#: ../src/winspector.c:1060
-msgid "Disable miniaturize button"
+#: ../src/winspector.c:1135
+msgid "Disable Miniaturize Button"
 msgstr "Désactiver le bouton de miniaturisation"
 
-#: ../src/winspector.c:1064
-msgid "Keep on top"
-msgstr "Garder au-dessus"
+#: ../src/winspector.c:1139
+msgid "Keep on Top / Floating"
+msgstr "Garder au-dessus / Flottante"
 
-#: ../src/winspector.c:1068
-msgid "Omnipresent"
-msgstr "Omniprésente"
+#: ../src/winspector.c:1143
+msgid "Keep at Bottom / Sunken"
+msgstr "Garder en-dessous / Coulée"
 
-#: ../src/winspector.c:1072
+#: ../src/winspector.c:1151
 msgid "Start Miniaturized"
 msgstr "Lancer Miniaturisée"
 
-#: ../src/winspector.c:1076
-msgid "Skip window list"
+#: ../src/winspector.c:1155
+msgid "Start Maximized"
+msgstr "Lancer Maximisée"
+
+#: ../src/winspector.c:1159
+msgid "Skip Window List"
 msgstr "Passe la liste des fenêtres"
 
-#: ../src/winspector.c:1090
+#: ../src/winspector.c:1173
 msgid "Advanced"
 msgstr "Avancés"
 
-#: ../src/winspector.c:1100
+#: ../src/winspector.c:1183
 msgid "Ignore HideOthers"
-msgstr "Ignore \"Cacher les Autres\""
+msgstr "Ignore «Cacher les Autres»"
 
-#: ../src/winspector.c:1104
-msgid "Don't bind keyboard shortcuts"
+#: ../src/winspector.c:1187
+msgid "Don't Bind Keyboard Shortcuts"
 msgstr "Ne pas associer de raccourcis-clavier"
 
-#: ../src/winspector.c:1108
-msgid "Don't bind mouse clicks"
+#: ../src/winspector.c:1191
+msgid "Don't Bind Mouse Clicks"
 msgstr "Ne pas associer de clicks de souris"
 
-#: ../src/winspector.c:1112
-msgid "Keep inside screen"
+#: ../src/winspector.c:1195
+msgid "Keep Inside Screen"
 msgstr "Garder dans l'écran"
 
-#: ../src/winspector.c:1116
-msgid "Don't let it take focus"
-msgstr "Ne prend pas le \"focus\""
+#: ../src/winspector.c:1199
+msgid "Don't Let It Take Focus"
+msgstr "Ne prend pas le focus"
 
-#: ../src/winspector.c:1120
+#: ../src/winspector.c:1203
 msgid "Don't Save Session"
 msgstr "Exclure des Sauvegardes de Sessions"
 
-#: ../src/winspector.c:1124
+#: ../src/winspector.c:1207
 msgid "Emulate Application Icon"
-msgstr "Emuler le \"AppIcon\""
+msgstr "Emuler le AppIcon"
 
-#: ../src/winspector.c:1139
-msgid "Enable the \"Don't bind...\" options to allow the application to receive all mouse or keyboard events."
-msgstr "Activer les options \"Ne pas associer...\" pour que l'application reçoive tous les évenements clavier ou souris."
+#: ../src/winspector.c:1211
+msgid "Full Screen Maximization"
+msgstr "Maximisation Plein Ecran"
 
-#: ../src/winspector.c:1146
+#: ../src/winspector.c:1226
+msgid ""
+"Enable the \"Don't bind...\" options to allow the application to receive all "
+"mouse or keyboard events."
+msgstr ""
+"Activer les options \"Ne pas associer...\" pour que  l'application reçoive "
+"tous les évenements clavier ou souris."
+
+#: ../src/winspector.c:1233
 msgid "Miniwindow Image"
 msgstr "Image de la Mini-Fenêtre"
 
-#: ../src/winspector.c:1164
+#: ../src/winspector.c:1252
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: ../src/winspector.c:1169
-msgid "Icon file name:"
+#: ../src/winspector.c:1267
+msgid "Icon File Name:"
 msgstr "Nom de l'icone:"
 
-#: ../src/winspector.c:1179
+#: ../src/winspector.c:1279
 msgid "Ignore client supplied icon"
 msgstr "Ignorer l'icone fourni"
 
-#: ../src/winspector.c:1185
+#: ../src/winspector.c:1286
 msgid "Initial Workspace"
 msgstr "Bureau initial"
 
-#: ../src/winspector.c:1191
+#: ../src/winspector.c:1291
 msgid "Nowhere in particular"
 msgstr "Nulle part en particulier"
 
-#: ../src/winspector.c:1222
+#: ../src/winspector.c:1309
 msgid "Application Wide"
 msgstr "Pour toute l'Application"
 
-#: ../src/winspector.c:1232
+#: ../src/winspector.c:1319
 msgid "Start Hidden"
 msgstr "Démarrer Cachée"
 
-#: ../src/winspector.c:1236
-msgid "No application icon"
-msgstr "Pas de \"AppIcon\""
+#: ../src/winspector.c:1323
+msgid "No Application Icon"
+msgstr "Pas de AppIcon"
 
-#: ../src/workspace.c:89 ../src/workspace.c:90 ../src/workspace.c:390
+#: ../src/workspace.c:106 ../src/workspace.c:107 ../src/workspace.c:655
+#, c-format
 msgid "Workspace %i"
 msgstr "Bureau %i"
 
-#: ../src/workspace.c:439
+#: ../src/workspace.c:712
 msgid "Workspaces"
 msgstr "Bureaux"
 
-#: ../src/workspace.c:441
+#: ../src/workspace.c:714
 msgid "could not create Workspace menu"
 msgstr "Création du menu de Bureau impossible."
 
-#: ../src/workspace.c:448
+#: ../src/workspace.c:721
 msgid "New"
 msgstr "Nouveau"
 
-#: ../src/workspace.c:449
+#: ../src/workspace.c:722
 msgid "Destroy Last"
 msgstr "Détruire le Dernier"
 
-#: ../src/xutil.c:220
+#: ../src/xutil.c:228
 msgid "invalid data in selection"
 msgstr "Données invalides dans la séléction."
diff --git a/po/ko.po b/po/ko.po
index e0aa779e..630576d8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,37 +1,38 @@
 # Window Maker po file for korean.
 # Copyright (C) 1998 Free Software Foundation, Inc.
-# Byeong-Chan Kim <redhands@linux.sarang.net>, 1998.
+# Byeong-Chan Kim <redhands@linux.sarang.net>, 1999.
 # Update: CHOI Junho <cjh@kr.freebsd.org>, 1998/12.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: 0.52.0\n"
-"POT-Creation-Date: 1999-04-10 01:12+0900\n"
-"PO-Revision-Date: 1999-04-10 01:30+0900\n"
+"POT-Creation-Date: 1999-04-21 11:27+0900\n"
+"PO-Revision-Date: 1999-04-21 11:43+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:540 ../src/dialog.c:216 ../src/dialog.c:272
-#: ../src/dock.c:3079 ../src/dockedapp.c:210 ../src/rootmenu.c:1741
-#: ../src/winspector.c:283 ../src/winspector.c:299
+#: ../src/appicon.c:541 ../src/dialog.c:223 ../src/dialog.c:279
+#: ../src/dock.c:3116 ../src/dockedapp.c:210 ../src/rootmenu.c:1743
+#: ../src/winspector.c:284 ../src/winspector.c:300
 msgid "Error"
 msgstr "¿À·ù"
 
-#: ../src/appicon.c:541
+#: ../src/appicon.c:542
 msgid "Could not open specified icon file"
 msgstr "ÁöÁ¤ÇÑ ¾ÆÀÌÄÜÀ» ¿­Áö ¸øÇÔ."
 
-#: ../src/appicon.c:542 ../src/dialog.c:115 ../src/dialog.c:216
-#: ../src/dialog.c:272 ../src/dialog.c:460 ../src/dock.c:438
-#: ../src/dock.c:3080 ../src/dockedapp.c:210 ../src/dockedapp.c:354
-#: ../src/rootmenu.c:1745 ../src/winspector.c:284 ../src/winspector.c:300
+#: ../src/appicon.c:543 ../src/dialog.c:122 ../src/dialog.c:223
+#: ../src/dialog.c:279 ../src/dialog.c:467 ../src/dialog.c:1476
+#: ../src/dock.c:475 ../src/dock.c:3117 ../src/dockedapp.c:211
+#: ../src/dockedapp.c:357 ../src/rootmenu.c:1747 ../src/winspector.c:285
+#: ../src/winspector.c:301
 msgid "OK"
 msgstr "È®ÀÎ"
 
-#: ../src/appicon.c:569 ../src/dock.c:281
+#: ../src/appicon.c:570 ../src/dock.c:276
 msgid ""
 " will be forcibly closed.\n"
 "Any unsaved changes will be lost.\n"
@@ -41,358 +42,408 @@ msgstr ""
 "ÀúÀåÇÏÁö ¾ÊÀº º¯°æ »çÇ×Àº ÀÒ°Ô µË´Ï´Ù.\n"
 "°è¼Ó ÇϽðڽÀ´Ï±î?"
 
-#: ../src/appicon.c:575 ../src/dock.c:286 ../src/winmenu.c:124
+#: ../src/appicon.c:576 ../src/dock.c:281 ../src/winmenu.c:124
 msgid "Kill Application"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç Á¾·á"
 
-#: ../src/appicon.c:576 ../src/dock.c:287 ../src/winmenu.c:126
+#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126
 msgid "Yes"
 msgstr "¿¹"
 
-#: ../src/appicon.c:576 ../src/dock.c:287 ../src/winmenu.c:126
+#: ../src/appicon.c:577 ../src/dock.c:282 ../src/winmenu.c:126
 msgid "No"
 msgstr "¾Æ´Ï¿À"
 
-#: ../src/appicon.c:594 ../src/dock.c:1074
+#: ../src/appicon.c:595 ../src/dock.c:1111
 msgid "Unhide Here"
 msgstr "¼û±ä °Í ÀÌ°÷¿¡ º¸ÀÓ"
 
-#: ../src/appicon.c:595 ../src/appicon.c:620 ../src/dock.c:1076
-#: ../src/dock.c:1078 ../src/dock.c:3205 ../src/dock.c:3207
+#: ../src/appicon.c:596 ../src/appicon.c:621 ../src/dock.c:1113
+#: ../src/dock.c:1115 ../src/dock.c:3242 ../src/dock.c:3244
 #: ../src/winmenu.c:446
 msgid "Hide"
 msgstr "¼û±è"
 
-#: ../src/appicon.c:596
+#: ../src/appicon.c:597
 msgid "Set Icon..."
 msgstr "¾ÆÀÌÄÜ ÁöÁ¤..."
 
-#: ../src/appicon.c:597 ../src/dock.c:1082 ../src/rootmenu.c:226
-#: ../src/rootmenu.c:240 ../src/winmenu.c:493
+#: ../src/appicon.c:598 ../src/dock.c:1119 ../src/rootmenu.c:227
+#: ../src/rootmenu.c:241 ../src/winmenu.c:493
 msgid "Kill"
 msgstr "Á¾·á"
 
-#: ../src/appicon.c:618 ../src/dock.c:3203
+#: ../src/appicon.c:619 ../src/dock.c:3240
 msgid "Unhide"
 msgstr "(¾È)¼û±è"
 
-#: ../src/defaults.c:780 ../src/startup.c:735 ../src/startup.c:753
-#: ../src/startup.c:759
+#: ../src/defaults.c:808 ../src/startup.c:772 ../src/startup.c:790
+#: ../src/startup.c:796
 #, c-format
 msgid "could not read domain \"%s\" from defaults database"
 msgstr "±âº» µ¥ÀÌÅͺ£À̽º¿¡¼­ µµ¸ÞÀÎ \"%s\"¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/defaults.c:826 ../src/defaults.c:950 ../src/defaults.c:989
-#: ../src/defaults.c:1019
+#: ../src/defaults.c:854 ../src/defaults.c:979 ../src/defaults.c:1018
+#: ../src/defaults.c:1048
 #, c-format
 msgid "Domain %s (%s) of defaults database is corrupted!"
 msgstr "±âº» µ¥ÀÌÅͺ£À̽ºÀÇ µµ¸ÞÀÎ %s (%s)ÀÌ ±úÁ³½À´Ï´Ù!"
 
-#: ../src/defaults.c:831 ../src/defaults.c:971 ../src/defaults.c:1002
-#: ../src/defaults.c:1028
+#: ../src/defaults.c:859 ../src/defaults.c:1000 ../src/defaults.c:1031
+#: ../src/defaults.c:1057
 #, c-format
 msgid "could not load domain %s from user defaults database"
 msgstr "»ç¿ëÀÚ ±âº» µ¥ÀÌÅͺ£À̽º¿¡¼­ µµ¸ÞÀÎ %s¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/defaults.c:842 ../src/defaults.c:935
+#: ../src/defaults.c:870 ../src/defaults.c:964
 #, c-format
 msgid "Domain %s (%s) of global defaults database is corrupted!"
 msgstr "Àü¿ª ±âº» µ¥ÀÌÅͺ£À̽ºÀÇ µµ¸ÞÀÎ %s (%s)´Â ±úÁ³½À´Ï´Ù!"
 
-#: ../src/defaults.c:861 ../src/defaults.c:940
+#: ../src/defaults.c:889 ../src/defaults.c:969
 #, c-format
 msgid "could not load domain %s from global defaults database"
 msgstr "Àü¿ª ±âº» µ¥ÀÌÅͺ£À̽º¿¡¼­ µµ¸ÞÀÎ %s¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/defaults.c:1340
+#: ../src/defaults.c:1277
 #, c-format
 msgid "wrong option value for key \"%s\". Should be one of %s"
 msgstr "Å° \"%s\"ÀÇ ¿É¼Ç Æ÷¸ËÀÌ À߸øµÊ. %sÁß ÇϳªÀ̾î¾ß ÇÕ´Ï´Ù"
 
-#: ../src/defaults.c:1387
+#: ../src/defaults.c:1324
 #, c-format
 msgid "can't convert \"%s\" to boolean for key \"%s\""
 msgstr "\"%s\"¸¦ Å° \"%s\"¿¡ ´ëÇØ ºÎ¿ï °ªÀ¸·Î º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/defaults.c:1392 ../src/defaults.c:1426 ../src/defaults.c:1458
-#: ../src/defaults.c:1471 ../src/defaults.c:1486 ../src/defaults.c:1500
-#: ../src/defaults.c:1572 ../src/defaults.c:1584 ../src/defaults.c:1990
-#: ../src/defaults.c:2007 ../src/defaults.c:2020 ../src/defaults.c:2053
-#: ../src/defaults.c:2069 ../src/defaults.c:2100 ../src/defaults.c:2188
+#: ../src/defaults.c:1329 ../src/defaults.c:1363 ../src/defaults.c:1395
+#: ../src/defaults.c:1408 ../src/defaults.c:1423 ../src/defaults.c:1437
+#: ../src/defaults.c:1509 ../src/defaults.c:1521 ../src/defaults.c:1927
+#: ../src/defaults.c:1944 ../src/defaults.c:1957 ../src/defaults.c:1990
+#: ../src/defaults.c:2006 ../src/defaults.c:2037 ../src/defaults.c:2124
 #, c-format
 msgid "using default \"%s\" instead"
 msgstr "±âº»°ªÀÎ \"%s\" ¸¦ ´ë½Å »ç¿ëÇÔ"
 
-#: ../src/defaults.c:1423
+#: ../src/defaults.c:1360
 #, c-format
 msgid "can't convert \"%s\" to integer for key \"%s\""
 msgstr "\"%s\"¸¦ Å° \"%s\"¿¡ ´ëÇØ Á¤¼ö°ªÀ¸·Î º¯È¯ÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/defaults.c:1453 ../src/defaults.c:1567 ../src/defaults.c:1985
-#: ../src/defaults.c:2002 ../src/defaults.c:2048 ../src/defaults.c:2095
+#: ../src/defaults.c:1390 ../src/defaults.c:1504 ../src/defaults.c:1922
+#: ../src/defaults.c:1939 ../src/defaults.c:1985 ../src/defaults.c:2032
 #: ../src/wdefaults.c:546 ../src/wdefaults.c:582
 #, c-format
 msgid "Wrong option format for key \"%s\". Should be %s."
 msgstr "\"%s\" Å°ÀÇ ¿É¼Ç Æ÷¸ËÀÌ À߸øµÊ. %s À̾î¾ß ÇÕ´Ï´Ù."
 
-#: ../src/defaults.c:1466
+#: ../src/defaults.c:1403
 #, c-format
 msgid "Incorrect number of elements in array for key \"%s\"."
 msgstr "Å° \"%s\"¿¡ ´ëÇÑ ¹è¿­ÀÇ ¿ø¼Ò ¼ö°¡ À߸øµÇ¾ú½À´Ï´Ù."
 
-#: ../src/defaults.c:1481
+#: ../src/defaults.c:1418
 #, c-format
 msgid "Wrong value for key \"%s\". Should be Coordinate."
 msgstr "\"%s\" Å° °ªÀÌ À߸øµÊ. ÁÂÇ¥°¡ µÇ¾î¾ß ÇÕ´Ï´Ù."
 
-#: ../src/defaults.c:1496
+#: ../src/defaults.c:1433
 #, c-format
 msgid "can't convert array to integers for \"%s\"."
 msgstr "\"%s\"¿¡ ´ëÇØ ¹è¿­À» Á¤¼ö°ªÀ¸·Î º¯È¯ÇÒ ¼ö ¾øÀ½."
 
-#: ../src/defaults.c:1694 ../src/defaults.c:1726 ../src/defaults.c:1742
-#: ../src/defaults.c:1788 ../src/defaults.c:1828 ../src/defaults.c:1866
-#: ../src/defaults.c:1882
+#: ../src/defaults.c:1631 ../src/defaults.c:1663 ../src/defaults.c:1679
+#: ../src/defaults.c:1725 ../src/defaults.c:1765 ../src/defaults.c:1803
+#: ../src/defaults.c:1819
 #, c-format
 msgid "\"%s\" is not a valid color name"
 msgstr "\"%s\" ´Â ¿Ã¹Ù¸¥ »ö»ó¸íÀÌ ¾Æ´Ô"
 
-#: ../src/defaults.c:1707
+#: ../src/defaults.c:1644
 msgid "bad number of arguments in gradient specification"
 msgstr "±×·¡µð¾ðÆ® ÁöÁ¤½Ã ÀμöÀÇ ¼ö°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: ../src/defaults.c:1761
+#: ../src/defaults.c:1698
 msgid "too few arguments in multicolor gradient specification"
 msgstr "´ÙÁß»ö ±×·¡µð¾ðÆ® ÁöÁ¤½Ã ÀμöÀÇ ¼ö°¡ ³Ê¹« Àû½À´Ï´Ù"
 
-#: ../src/defaults.c:1855
+#: ../src/defaults.c:1792
 msgid "bad number of arguments in textured gradient specification"
 msgstr "±×·¡µð¾ðÆ® ÁöÁ¤½Ã ÀμöÀÇ ¼ö°¡ À߸øµÇ¾ú½À´Ï´Ù"
 
-#: ../src/defaults.c:1898
+#: ../src/defaults.c:1835
 #, c-format
 msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
 msgstr "tgradient ÅؽºÃ³ \"%s\"¿¡ ¸ðÈ£ÇÑ °ªÀÌ ÀÖ½À´Ï´Ù. [0..255]¿©¾ß ÇÕ´Ï´Ù."
 
-#: ../src/defaults.c:1958
+#: ../src/defaults.c:1895
 #, c-format
 msgid "could not initialize library %s"
 msgstr "%s ¶óÀ̺귯¸®¸¦ ÃʱâÈ­ ÇÒ¼ö ¾øÀ½"
 
-#: ../src/defaults.c:1961
+#: ../src/defaults.c:1898
 #, c-format
 msgid "could not find function %s::%s"
 msgstr "%s ÇÔ¼ö¸¦ ãÁö ¸øÇÔ::%s"
 
-#: ../src/defaults.c:1968
+#: ../src/defaults.c:1905
 #, c-format
 msgid "invalid texture type %s"
 msgstr "À߸øµÈ ÅؽºÃ³ À¯Çü %s"
 
-#: ../src/defaults.c:2015
+#: ../src/defaults.c:1952
 #, c-format
 msgid "Error in texture specification for key \"%s\""
 msgstr "Å° \"%s\"ÀÇ ÅؽºÃ³ ÁöÁ¤¿¡ ¿À·ù°¡ ÀÖ½À´Ï´Ù"
 
-#: ../src/defaults.c:2065
+#: ../src/defaults.c:2002
 msgid "Wrong type for workspace background. Should be a texture type."
 msgstr "ÀÛ¾÷°ø°£ ¹è°æ Á¾·ù°¡ À߸øµÇ¾ú½À´Ï´Ù. ÅؽºÃ³¿©¾ß ÇÕ´Ï´Ù."
 
-#: ../src/defaults.c:2113
+#: ../src/defaults.c:2050
 #, c-format
 msgid "Wrong type for background of workspace %i. Should be a texture."
 msgstr "ÀÛ¾÷°ø°£ ¹è°æ Á¾·ù°¡ À߸øµÇ¾ú½À´Ï´Ù. ÅؽºÃ³¿©¾ß ÇÕ´Ï´Ù."
 
-#: ../src/defaults.c:2154
+#: ../src/defaults.c:2091
 msgid "could not load any usable font!!!"
 msgstr "»ç¿ë °¡´ÉÇÑ ±Û²ÃÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù!!!"
 
-#: ../src/defaults.c:2183
+#: ../src/defaults.c:2119
 #, c-format
 msgid "could not get color for key \"%s\""
 msgstr "Å° \"%s\"ÀÇ »öÀ» ¾òÀ» ¼ö ¾øÀ½"
 
-#: ../src/defaults.c:2242 ../src/rootmenu.c:491
+#: ../src/defaults.c:2179 ../src/rootmenu.c:493
 #, c-format
 msgid "%s:invalid key modifier \"%s\""
 msgstr "%s:À߸øµÈ Å° ¼öÁ¤ÀÚ \"%s\""
 
-#: ../src/defaults.c:2254
+#: ../src/defaults.c:2191
 #, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\""
 msgstr "%s:À߸øµÈ Å°º¸µå ´ÜÃàÅ° ÁöÁ¤ \"%s\""
 
-#: ../src/defaults.c:2261
+#: ../src/defaults.c:2198
 #, c-format
 msgid "%s:invalid key in shortcut \"%s\""
 msgstr "%s:»¡¸®°¡±â \"%s\"¿¡ À߸øµÈ Å°"
 
-#: ../src/defaults.c:2287
+#: ../src/defaults.c:2224
 #, c-format
 msgid "%s: modifier key %s is not valid"
 msgstr "%s: À߸øµÈ ¼öÁ¤ÀÚ Å° %s"
 
-#: ../src/defaults.c:2321
+#: ../src/defaults.c:2258
 #, c-format
 msgid "could not load image in option %s: %s"
 msgstr "%s ¿É¼ÇÀÇ À̹ÌÁö¸¦ ÀÐÁö ¸øÇÔ: %s"
 
-#: ../src/defaults.c:2403
+#: ../src/defaults.c:2340
 msgid "could not render texture for icon background"
 msgstr "¾ÆÀÌÄÜ ¹è°æÀÇ ÅؽºÃ³¸¦ ±×¸± ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/dialog.c:115 ../src/dialog.c:467 ../src/dock.c:438
-#: ../src/dockedapp.c:360 ../src/rootmenu.c:188 ../src/rootmenu.c:226
-#: ../src/rootmenu.c:240
+#: ../src/dialog.c:122 ../src/dialog.c:474 ../src/dock.c:475
+#: ../src/dockedapp.c:363 ../src/rootmenu.c:189 ../src/rootmenu.c:227
+#: ../src/rootmenu.c:241
 msgid "Cancel"
 msgstr "Ãë¼Ò"
 
-#: ../src/dialog.c:211
+#: ../src/dialog.c:218
 msgid "Could not open directory "
 msgstr "µð·ºÅ丮¸¦ ¿­ ¼ö ¾øÀ½ "
 
-#: ../src/dialog.c:267
+#: ../src/dialog.c:274
 msgid "Could not load image file "
 msgstr "À̹ÌÁö ÆÄÀÏÀ» ÀÐÀ» ¼ö ¾øÀ½ "
 
-#: ../src/dialog.c:404
+#: ../src/dialog.c:411
 msgid "Directories"
 msgstr "µð·ºÅ丮"
 
-#: ../src/dialog.c:413
+#: ../src/dialog.c:420
 msgid "Icons"
 msgstr "¾ÆÀÌÄÜ"
 
-#: ../src/dialog.c:450
+#: ../src/dialog.c:457
 msgid "File Name:"
 msgstr "ÆÄÀϸí:"
 
-#: ../src/dialog.c:473
+#: ../src/dialog.c:480
 msgid "Choose File"
 msgstr "ÆÄÀÏ ¼±ÅÃ"
 
-#: ../src/dialog.c:490 ../src/dialog.c:492
+#: ../src/dialog.c:497 ../src/dialog.c:499
 msgid "Icon Chooser"
 msgstr "¾ÆÀÌÄÜ ¼±Åñâ"
 
-#: ../src/dock.c:215
+#: ../src/dialog.c:1400 ../src/startup.c:325
+msgid "cannot open connection for crashing dialog panel. Aborting."
+msgstr ""
+
+#: ../src/dialog.c:1426
+msgid "Fatal error"
+msgstr "Ä¡¸íÀû ¿À·ù"
+
+#: ../src/dialog.c:1437
+#, c-format
+msgid ""
+"Window Maker received signal %i\n"
+"(%s)."
+msgstr ""
+"À©µµ¿ì ¸ÞÀÌÄ¿°¡ %i ½ÅÈ£¸¦ ¹ÞÀ½\n"
+"(%s)."
+
+#: ../src/dialog.c:1440
+#, c-format
+msgid "Window Maker received signal %i."
+msgstr "À©µµ¿ì ¸ÞÀÌÄ¿°¡ %i ½ÅÈ£¸¦ ¹ÞÀ½."
+
+#: ../src/dialog.c:1449
+msgid ""
+" This fatal error occured probably due to a bug. Please fill the included "
+"BUGFORM and report it to bugs@windowmaker.org."
+msgstr ""
+"¹ö±×·Î ÀÎÇØ Ä¡¸íÀûÀÎ ¿À·ù°¡ ¹ß»ýÇß½À´Ï´Ù. BUGFORMÀ» ÀÛ¼ºÇÏ¿© "
+"bugs@windowmaker.org·Î º¸³»ÁÖ½Ã±æ ºÎŹµå¸³´Ï´Ù."
+
+#: ../src/dialog.c:1457
+msgid "What do you want to do now?"
+msgstr "Áö±Ý ¹«¾ùÀ» ÇÏ°í ½ÍÀ¸½Å°¡¿ä?"
+
+#: ../src/dialog.c:1463
+msgid "Select action"
+msgstr "¼±Åà µ¿ÀÛ"
+
+#: ../src/dialog.c:1464
+msgid "Abort and leave a core file"
+msgstr "core ÆÄÀÏÀ» ³²±â°í Á¾·áÇÔ"
+
+#: ../src/dialog.c:1465
+msgid "Restart Window Maker"
+msgstr "Window Maker Àç½ÃÀÛ"
+
+#: ../src/dialog.c:1466
+msgid "Start alternate window manager"
+msgstr "´ëü¿ë â °ü¸®ÀÚ¸¦ ½ÃÀÛ..."
+
+#: ../src/dock.c:210
 #, c-format
 msgid "Type the name for workspace %i:"
 msgstr "ÀÛ¾÷°ø°£ %i ÀÇ À̸§À» ÀÔ·ÂÇϼ¼¿ä:"
 
-#: ../src/dock.c:216 ../src/dock.c:1053
+#: ../src/dock.c:211 ../src/dock.c:1090
 msgid "Rename Workspace"
 msgstr "ÀÛ¾÷°ø°£ À̸§ ¹Ù²Þ"
 
-#: ../src/dock.c:436
+#: ../src/dock.c:473
 msgid "Workspace Clip"
 msgstr "ÀÛ¾÷°ø°£ Ŭ¸³"
 
-#: ../src/dock.c:437
+#: ../src/dock.c:474
 msgid "All selected icons will be removed!"
 msgstr "¼±ÅÃÇÑ ¸ðµç ¾ÆÀÌÄÜÀÌ ¾ø¾îÁú °ÍÀÔ´Ï´Ù!!"
 
-#: ../src/dock.c:484
+#: ../src/dock.c:521
 msgid "Keep Icon"
 msgstr "¾ÆÀÌÄÜ À¯Áö"
 
-#: ../src/dock.c:485 ../src/dock.c:1987 ../src/dock.c:2116
+#: ../src/dock.c:522 ../src/dock.c:2024 ../src/dock.c:2153
 msgid "Type the command used to launch the application"
 msgstr "¾ÖÇø®ÄÉÀ̼ÇÀ» ½ÇÇàÇشµ¥ ÇÊ¿äÇÑ ¸í·ÉÀ» ÀÔ·ÂÇÕ´Ï´Ù"
 
-#: ../src/dock.c:866
+#: ../src/dock.c:903
 #, c-format
 msgid "could not launch application %s\n"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç %sÀ» ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù\n"
 
-#: ../src/dock.c:921
+#: ../src/dock.c:958
 msgid "could not create workspace submenu for Clip menu"
 msgstr "Ŭ¸³ ¸Þ´º¸¦ À§ÇÑ ÀÛ¾÷°ø°£ ÇϺθ޴º¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/dock.c:984
+#: ../src/dock.c:1021
 msgid "could not create options submenu for Clip menu"
 msgstr "Ŭ¸³ ¸Þ´º¸¦ À§ÇÑ ¿É¼Ç ÇϺθ޴º¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/dock.c:988 ../src/dock.c:1042 ../src/winmenu.c:388
+#: ../src/dock.c:1025 ../src/dock.c:1079 ../src/winmenu.c:388
 msgid "Keep on top"
 msgstr "Ç×»ó À§·Î"
 
-#: ../src/dock.c:994
+#: ../src/dock.c:1031
 msgid "Collapsed"
 msgstr "¾ÆÀÌÄÜ ¼û±è"
 
-#: ../src/dock.c:1000
+#: ../src/dock.c:1037
 msgid "AutoCollapse"
 msgstr "ÀÚµ¿ ¼û±è"
 
-#: ../src/dock.c:1006
+#: ../src/dock.c:1043
 msgid "AutoRaiseLower"
 msgstr "ÀÚµ¿ ¿Ã¸²/³»¸²"
 
-#: ../src/dock.c:1012
+#: ../src/dock.c:1049
 msgid "AutoAttract Icons"
 msgstr "¾ÆÀÌÄÜ ÀÚµ¿ ¸ðÀ½"
 
-#: ../src/dock.c:1018
+#: ../src/dock.c:1055
 msgid "Keep Attracted Icons"
 msgstr "¸ðÀº ¾ÆÀÌÄÜ À¯Áö"
 
-#: ../src/dock.c:1048
+#: ../src/dock.c:1085
 msgid "Clip Options"
 msgstr "Ŭ¸³ ¿É¼Ç"
 
-#: ../src/dock.c:1055
+#: ../src/dock.c:1092
 msgid "(Un)Select Icon"
 msgstr "¾ÆÀÌÄÜ (¾È)¼±ÅÃ"
 
-#: ../src/dock.c:1057
+#: ../src/dock.c:1094
 msgid "(Un)Select All Icons"
 msgstr "¸ðµç ¾ÆÀÌÄÜ (¾È)¼±ÅÃ"
 
-#: ../src/dock.c:1060
+#: ../src/dock.c:1097
 msgid "Keep Icon(s)"
 msgstr "¾ÆÀÌÄÜ À¯Áö"
 
-#: ../src/dock.c:1062
+#: ../src/dock.c:1099
 msgid "Move Icon(s) To"
 msgstr "¾ÆÀÌÄÜ ¿Å±è :"
 
-#: ../src/dock.c:1067
+#: ../src/dock.c:1104
 msgid "Remove Icon(s)"
 msgstr "¾ÆÀÌÄÜ ¾ø¾Ú"
 
-#: ../src/dock.c:1069
+#: ../src/dock.c:1106
 msgid "Attract Icons"
 msgstr "¾ÆÀÌÄÜ ¸ðÀ½"
 
-#: ../src/dock.c:1072
+#: ../src/dock.c:1109
 msgid "Launch"
 msgstr "½ÇÇà"
 
-#: ../src/dock.c:1080
+#: ../src/dock.c:1117
 msgid "Settings..."
 msgstr "¼³Á¤..."
 
-#: ../src/dock.c:1465 ../src/dock.c:1479 ../src/dock.c:1493 ../src/dock.c:1503
+#: ../src/dock.c:1502 ../src/dock.c:1516 ../src/dock.c:1530 ../src/dock.c:1540
 #, c-format
 msgid "bad value in docked icon state info %s"
 msgstr "Dock ¾ÆÀÌÄÜÀÇ »óÅÂÁ¤º¸¿¡ À߸øµÈ °ª %s"
 
-#: ../src/dock.c:1511
+#: ../src/dock.c:1548
 #, c-format
 msgid "bad value in docked icon position %i,%i"
 msgstr "Dock ¾ÆÀÌÄÜÀÇ À§Ä¡°ª %i,%i ´Â À߸øµÈ °ª"
 
-#: ../src/dock.c:1754
+#: ../src/dock.c:1791
 msgid "there are too many icons stored in dock. Ignoring what doesn't fit"
 msgstr "Dock ¿¡ µé¾î°£ ¾ÆÀÌÄÜÀÌ ³Ê¹« ¸¹À½. ¸ÂÁö ¾Ê´Â °ÍÀº ¹«½ÃÇÕ´Ï´Ù"
 
 #. icon->forced_dock = 1;
-#: ../src/dock.c:1986 ../src/dock.c:2115
+#: ../src/dock.c:2023 ../src/dock.c:2152
 msgid "Dock Icon"
 msgstr "Dock ¾ÆÀÌÄÜ"
 
-#: ../src/dock.c:3072 ../src/dock.c:3076
+#: ../src/dock.c:3109 ../src/dock.c:3113
 #, c-format
 msgid "Could not execute command \"%s\""
 msgstr "\"%s\" ¸í·ÉÀ» ½ÇÇàÇÒ ¼ö ¾øÀ½."
@@ -404,132 +455,147 @@ msgstr "
 
 #: ../src/dockedapp.c:209
 #, c-format
-msgid "Could not open specified icon file:%s"
-msgstr "ÁöÁ¤µÈ ¾ÆÀÌÄÜ ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½:%s"
+msgid "Could not open specified icon file: %s"
+msgstr "ÁöÁ¤µÈ ¾ÆÀÌÄÜ ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½: %s"
 
-#: ../src/dockedapp.c:295
+#: ../src/dockedapp.c:211
+msgid "Ignore"
+msgstr "¹«½Ã"
+
+#: ../src/dockedapp.c:298
 msgid "Start when WindowMaker is started"
 msgstr "Window Maker¸¦ ½ÇÇàÇÒ¶§ ½ÃÀÛÇÔ"
 
-#: ../src/dockedapp.c:302
+#: ../src/dockedapp.c:305
 msgid "Application path and arguments"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç °æ·Î¿Í Àμö"
 
-#: ../src/dockedapp.c:313
+#: ../src/dockedapp.c:316
 msgid "Command for files dropped with DND"
 msgstr "µå·¢¿£µå·ÓÀ¸·Î ½ÇÇàÇÒ ¸í·É¾î"
 
-#: ../src/dockedapp.c:325
+#: ../src/dockedapp.c:328
 #, c-format
 msgid "%d will be replaced with the file name"
 msgstr "%d´Â ÆÄÀÏ À̸§À¸·Î ´ëüÇÕ´Ï´Ù"
 
-#: ../src/dockedapp.c:329
+#: ../src/dockedapp.c:332
 msgid "DND support was not compiled in"
 msgstr "ÄÄÆÄÀϽà DND Áö¿øÀÌ Æ÷ÇÔµÇÁö ¾Ê¾Ò½À´Ï´Ù"
 
-#: ../src/dockedapp.c:335
+#: ../src/dockedapp.c:338
 msgid "Icon Image"
 msgstr "¾ÆÀÌÄÜ À̹ÌÁö"
 
-#: ../src/dockedapp.c:347 ../src/winspector.c:1244
+#: ../src/dockedapp.c:350 ../src/winspector.c:1245
 msgid "Browse..."
 msgstr "ã±â..."
 
-#: ../src/dockedapp.c:392
+#: ../src/dockedapp.c:395
 msgid "Docked Application Settings"
 msgstr "Dock ¾ÖÇø®ÄÉÀÌ¼Ç ¼³Á¤"
 
-#: ../src/framewin.c:489
+#: ../src/framewin.c:489 ../src/framewin.c:565 ../src/menu.c:461
+#: ../src/texture.c:549
 #, c-format
-msgid "could not render gradient: %s"
-msgstr "±×·¡µð¾ðÆ®¸¦ Ç¥ÇöÇÏÁö ¸øÇÔ: %s"
+msgid "could not render texture: %s"
+msgstr "ÅؽºÃ³ ·»´õ¸µÀ» ÇÒ ¼ö ¾øÀ½: %s"
 
 #: ../src/framewin.c:505 ../src/framewin.c:520 ../src/framewin.c:531
-#: ../src/framewin.c:538 ../src/framewin.c:545 ../src/icon.c:296
-#: ../src/texture.c:678
+#: ../src/framewin.c:538 ../src/framewin.c:545 ../src/icon.c:350
+#: ../src/menu.c:490
 #, c-format
 msgid "error rendering image:%s"
-msgstr "À̹ÌÁö ·»´õ¸µ ¿¡·¯:%s"
+msgstr "À̹ÌÁö ·»´õ¸µ ¿À·ù:%s"
 
-#: ../src/icon.c:182 ../src/wdefaults.c:416
+#: ../src/framewin.c:588
+#, c-format
+msgid "error rendering image: %s"
+msgstr "À̹ÌÁö ·»´õ¸µ ¿À·ù: %s"
+
+#: ../src/icon.c:229 ../src/wdefaults.c:416
 #, c-format
 msgid "error loading image file \"%s\""
-msgstr "À̹ÌÁö ÆÄÀÏ \"%s\"¸¦ Àд Áß ¿¡·¯"
+msgstr "À̹ÌÁö ÆÄÀÏ \"%s\"¸¦ Àд Áß ¿À·ù"
 
-#: ../src/icon.c:423 ../src/icon.c:432
+#: ../src/icon.c:477 ../src/icon.c:486
 #, c-format
 msgid "could not create directory %s"
 msgstr "µð·ºÅ丮 %s¸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: ../src/icon.c:699
+#: ../src/icon.c:753
 #, c-format
 msgid "could not find default icon \"%s\""
 msgstr "±âº» ¾ÆÀÌÄÜ \"%s\"¸¦ ãÁö ¸øÇÔ"
 
-#: ../src/icon.c:705
+#: ../src/icon.c:759
 #, c-format
 msgid "could not load default icon \"%s\":%s"
 msgstr "±âº» ¾ÆÀÌÄÜ \"%s\"¸¦ ÀÐÁö ¸øÇÔ:%s"
 
-#: ../src/main.c:195
-msgid "could not exec window manager"
-msgstr "â °ü¸®ÀÚ¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½"
+#: ../src/main.c:198
+msgid "failed to restart Window Maker."
+msgstr "À©µµ¿ì ¸ÞÀÌÄ¿ Àç½ÃÀÛ ½ÇÆÐ."
 
-#: ../src/main.c:196
-msgid "Restart failed!!!"
-msgstr "Àç½ÃÀÛ ½ÇÆÐ!!!"
+#: ../src/main.c:201
+#, c-format
+msgid "could not exec %s"
+msgstr "%s¸¦ ½ÇÇàÇÒ ¼ö ¾øÀ½"
 
-#: ../src/main.c:243
+#: ../src/main.c:250
 #, c-format
 msgid "%s aborted.\n"
 msgstr "%s´Â ÁߴܵǾú½À´Ï´Ù.\n"
 
-#: ../src/main.c:254
+#: ../src/main.c:261
 #, c-format
 msgid "Usage: %s [options]\n"
 msgstr "»ç¿ë¹ý: %s [-¿É¼Ç]\n"
 
-#: ../src/main.c:255
+#: ../src/main.c:262
 msgid "The Window Maker window manager for the X window system"
 msgstr "¿¢½º À©µµ¿ì ½Ã½ºÅÛ¿ë À©µµ¿ì ¸ÞÀÌÄ¿ â °ü¸®ÀÚ"
 
-#: ../src/main.c:257
+#: ../src/main.c:264
 msgid " -display host:dpy\tdisplay to use"
 msgstr " -display È£½ºÆ®:µð½ºÇ÷¹ÀÌ\t»ç¿ëÇÒ µð½ºÇ÷¹ÀÌ"
 
-#: ../src/main.c:259
+#: ../src/main.c:266
 msgid " --no-cpp \t\tdisable preprocessing of configuration files"
 msgstr " --no-cpp \t\t¼³Á¤ÆÄÀÏÀÇ Àü󸮸¦ ÇÏÁö ¾ÊÀ½"
 
-#: ../src/main.c:261
+#: ../src/main.c:268
 msgid " --no-dock\t\tdo not open the application Dock"
 msgstr " --no-dock\t\t¾ÖÇø®ÄÉÀÌ¼Ç DockÀ» ¿­Áö ¾ÊÀ½"
 
-#: ../src/main.c:262
+#: ../src/main.c:269
 msgid " --no-clip\t\tdo not open the workspace Clip"
 msgstr " --no-clip\t\tÀÛ¾÷°ø°£ Ŭ¸³À» ¿­Áö ¾ÊÀ½"
 
 #.
 #. puts(_(" --locale locale		locale to use"));
 #.
-#: ../src/main.c:266
+#: ../src/main.c:273
 msgid " --visual-id visualid\tvisual id of visual to use"
 msgstr " --visual-id ºñÁÖ¾óID\t»ç¿ëÇÒ ºñÁÖ¾óÀÇ ºñÁÖ¾ó ID"
 
-#: ../src/main.c:267
+#: ../src/main.c:274
 msgid " --static\t\tdo not update or save configurations"
 msgstr " --static\t\t¼³Á¤À» °»½ÅÇϰųª ÀúÀåÇÏÁö ¾Ê´Â´Ù"
 
-#: ../src/main.c:268
+#: ../src/main.c:276
+msgid " --synchronous\t\tturn on synchronous display mode"
+msgstr "--synchronous\t\tµð½ºÇ÷¹ÀÌ µ¿±âÈ­ »ç¿ë"
+
+#: ../src/main.c:278
 msgid " --version\t\tprint version and exit"
 msgstr " --version\t\t¹öÀüÀ» Ç¥½ÃÇÏ°í Á¾·á"
 
-#: ../src/main.c:269
+#: ../src/main.c:279
 msgid " --help\t\t\tshow this message"
 msgstr " --help\t\t\tÀÌ È­¸éÀ» º¸¿©ÁÜ"
 
-#: ../src/main.c:281
+#: ../src/main.c:291
 #, c-format
 msgid ""
 "could not find user GNUstep directory (%s).\n"
@@ -538,129 +604,129 @@ msgstr ""
 "»ç¿ëÀÚ GNUstep µð·ºÅ丮(%s)¸¦ ãÀ»¼ö ¾ø½À´Ï´Ù.\n"
 "Window Maker°¡ Á¦´ë·Î ¼³Ä¡µÇ¾ú´ÂÁö ´Ù½Ã È®ÀÎ ÈÄ wmaker.inst ¸¦ ½ÇÇàÇϽʽÿÀ"
 
-#: ../src/main.c:300
+#: ../src/main.c:309 ../src/main.c:314
 #, c-format
 msgid "%s:could not execute initialization script"
 msgstr "%s:ÃʱâÈ­ ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: ../src/main.c:317
+#: ../src/main.c:331 ../src/main.c:336
 #, c-format
 msgid "%s:could not execute exit script"
 msgstr "%s:Á¾·á ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: ../src/main.c:378 ../src/main.c:385 ../src/main.c:393 ../src/main.c:409
+#: ../src/main.c:405 ../src/main.c:412 ../src/main.c:420 ../src/main.c:436
 #, c-format
 msgid "too few arguments for %s"
 msgstr "%s¸¦ À§ÇÑ ÀÎÀÚ°¡ ºÎÁ·ÇÕ´Ï´Ù"
 
-#: ../src/main.c:397
+#: ../src/main.c:424
 #, c-format
 msgid "bad value for visualid: \"%s\""
 msgstr "ºñÁÖ¾ó ID¿¡ À߸øµÈ °ª: \"%s\""
 
-#: ../src/main.c:417
+#: ../src/main.c:444
 #, c-format
 msgid "%s: invalid argument '%s'\n"
 msgstr "%s: À߸øµÈ ÀÎÀÚ '%s'\n"
 
-#: ../src/main.c:418
+#: ../src/main.c:445
 #, c-format
 msgid "Try '%s --help' for more information\n"
 msgstr "´õ ¸¹Àº Á¤º¸¸¦ ¿øÇϽøé '%s --help' ÇϽñ⠹ٶø´Ï´Ù.\n"
 
-#: ../src/main.c:461
+#: ../src/main.c:488
 msgid "X server does not support locale"
 msgstr "X ¼­¹ö°¡ ·ÎÄÉÀÏÀ» Áö¿øÇÏÁö ¾Ê½À´Ï´Ù"
 
-#: ../src/main.c:464
+#: ../src/main.c:491
 msgid "cannot set locale modifiers"
 msgstr "·ÎÄÉÀÏ ¼öÁ¤ÀÚ(modifier)¸¦ ¼³Á¤ÇÒ ¼ö ¾øÀ½"
 
-#: ../src/main.c:481
+#: ../src/main.c:508
 #, c-format
 msgid "could not open display \"%s\""
 msgstr "\"%s\" µð½ºÇ÷¹À̸¦ ¿­Áö ¸øÇÔ."
 
-#: ../src/menu.c:288
+#: ../src/menu.c:297
 msgid "wrealloc() failed while trying to add menu item"
 msgstr "¸Þ´º ¾ÆÀÌÅÛ Ãß°¡ ½ÃµµÁß wrealloc() ½ÇÆÐ"
 
-#: ../src/misc.c:69
+#: ../src/misc.c:71
 #, c-format
 msgid "could not define value for %s for cpp"
 msgstr "cppÀÇ %s¸¦ À§ÇÑ °ªÀÌ Á¤ÀǵÇÁö ¾ÊÀ½"
 
-#: ../src/misc.c:99
+#: ../src/misc.c:101
 #, c-format
 msgid "could not get password entry for UID %i"
 msgstr "UID %iÀÇ ¾ÏÈ£ Ç׸ñ¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/misc.c:123
+#: ../src/misc.c:125
 #, c-format
 msgid "your machine is misconfigured. HOSTNAME is set to %s"
 msgstr "½Ã½ºÅÛ ¼³Á¤ÀÌ À߸øµÇ¾ú½À´Ï´Ù. HOSTNAMEÀ» %s·Î ¼³Á¤ÇÕ´Ï´Ù"
 
-#: ../src/misc.c:129
+#: ../src/misc.c:131
 #, c-format
 msgid "your machine is misconfigured. HOST is set to %s"
 msgstr "½Ã½ºÅÛ ¼³Á¤ÀÌ À߸øµÇ¾ú½À´Ï´Ù. HOST¸¦ %s·Î ¼³Á¤ÇÕ´Ï´Ù"
 
-#: ../src/misc.c:770
+#: ../src/misc.c:772
 msgid "selection timed-out"
 msgstr "¼±Åýð£ ÃÊ°ú"
 
-#: ../src/misc.c:786
+#: ../src/misc.c:788
 msgid "Program Arguments"
 msgstr "ÇÁ·Î±×·¥ Àμö"
 
-#: ../src/misc.c:787
+#: ../src/misc.c:789
 msgid "Enter command arguments:"
 msgstr "¸í·É¾î Àμö¸¦ ÀÔ·ÂÇϼ¼¿ä:"
 
-#: ../src/misc.c:885
+#: ../src/misc.c:887
 msgid "unable to get dropped data from DND drop"
 msgstr "DND µå·Ó¿¡¼­ ¶³¾î¶ß¸° µ¥ÀÌÅ͸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/misc.c:893
+#: ../src/misc.c:895
 msgid "error getting dropped data from DND drop"
 msgstr "DND µå·Ó¿¡¼­ ¶³¾î¶ß¸° µ¥ÀÌÅ͸¦ ¾ò´Âµ¥ ¿À·ù°¡ ¹ß»ýÇÏ¿´½À´Ï´Ù"
 
-#: ../src/misc.c:899
+#: ../src/misc.c:901
 msgid "out of memory while getting data from DND drop"
 msgstr "DND µå·Ó¿¡¼­ ¶³¾î¶ß¸° µ¥ÀÌÅ͸¦ ¾ò´Âµ¥ ¸Þ¸ð¸®°¡ ºÎÁ·ÇÕ´Ï´Ù"
 
-#: ../src/misc.c:944 ../src/misc.c:1079
+#: ../src/misc.c:946 ../src/misc.c:1081
 #, c-format
 msgid "out of memory during expansion of \"%s\""
 msgstr "\"%s\" È®Àå Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/misc.c:998
+#: ../src/misc.c:1000
 msgid "out of memory during expansion of \"%w\""
 msgstr "\"%w\" È®Àå Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/misc.c:1016
+#: ../src/misc.c:1018
 msgid "out of memory during expansion of \"%W\""
 msgstr "\"%W\" È®Àå Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/misc.c:1032
+#: ../src/misc.c:1034
 msgid "out of memory during expansion of \"%a\""
 msgstr "\"%a\" È®Àå Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/misc.c:1058
+#: ../src/misc.c:1060
 #, c-format
 msgid "out of memory during expansion of \"%d\""
 msgstr "\"%d\" È®Àå Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/misc.c:1072
+#: ../src/misc.c:1074
 msgid "selection not available"
 msgstr "¼±Åà ºÒ°¡´É"
 
-#: ../src/misc.c:1144 ../src/misc.c:1150
+#: ../src/misc.c:1146 ../src/misc.c:1152
 #, c-format
 msgid "bad window name value in %s state info"
 msgstr "»óÅ Á¤º¸ %sÀÇ Ã¢ À̸§ÀÌ À߸øµÊ"
 
-#: ../src/misc.c:1405
+#: ../src/misc.c:1407
 msgid "could not send message to background image helper"
 msgstr "¹è°æ À̹ÌÁö \"%s\" ¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
@@ -710,8 +776,11 @@ msgid "missing ; in dictionary entry"
 msgstr "»çÀü ¿£Æ®¸®¿¡ ;°¡ ºüÁ® ÀÖ½À´Ï´Ù"
 
 #: ../src/proplist.c:432
-msgid "was expecting a string, dictionary, data or array."
-msgstr "´Â ¹®ÀÚ¿­, »çÀü, µ¥ÀÌÅÍ ¶Ç´Â ¹è¿­ÀÌ ÇÊ¿äÇÕ´Ï´Ù"
+msgid ""
+"was expecting a string, dictionary, data or array. If it's a string, try "
+"enclosing it with \"."
+msgstr ""
+"´Â ¹®ÀÚ¿­, »çÀü, µ¥ÀÌÅÍ ¶Ç´Â ¹è¿­ÀÌ ÇÊ¿äÇÕ´Ï´Ù. ¹®ÀÚ¿­À̶ó¸é \"·Î ¹­À¸½Ê½Ã¿À."
 
 #: ../src/proplist.c:434
 msgid "Comments are not allowed inside WindowMaker owned domain files."
@@ -760,19 +829,19 @@ msgstr "
 msgid "could not allocate color \"%s\""
 msgstr "»ö \"%s\"À» ÇÒ´çÇÒ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:186 ../src/rootmenu.c:188
+#: ../src/rootmenu.c:187 ../src/rootmenu.c:189
 msgid "Exit"
 msgstr "Á¾·á"
 
-#: ../src/rootmenu.c:187
+#: ../src/rootmenu.c:188
 msgid "Exit window manager?"
 msgstr "â °ü¸®ÀÚ¸¦ Á¾·áÇϽðڽÀ´Ï±î?"
 
-#: ../src/rootmenu.c:223
+#: ../src/rootmenu.c:224
 msgid "Close X session"
 msgstr "X ¼¼¼Ç ´Ý±â"
 
-#: ../src/rootmenu.c:224
+#: ../src/rootmenu.c:225
 msgid ""
 "Close Window System session?\n"
 "Kill might close applications with unsaved data."
@@ -784,15 +853,15 @@ msgstr ""
 #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL);
 #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr));
 #.
-#: ../src/rootmenu.c:226 ../src/winmenu.c:486
+#: ../src/rootmenu.c:227 ../src/winmenu.c:486
 msgid "Close"
 msgstr "´Ý±â"
 
-#: ../src/rootmenu.c:237
+#: ../src/rootmenu.c:238
 msgid "Kill X session"
 msgstr "X ¼¼¼Ç Á¾·á"
 
-#: ../src/rootmenu.c:238
+#: ../src/rootmenu.c:239
 msgid ""
 "Kill Window System session?\n"
 "(all applications will be closed)"
@@ -800,47 +869,47 @@ msgstr ""
 "À©µµ¿ì ½Ã½ºÅÛ ¼¼¼ÇÀ» Á¾·áÇÏ°Ú½À´Ï±î?\n"
 "(¸ðµç ¾ÖÇø®ÄÉÀ̼ÇÀÌ Á¾·áµË´Ï´Ù)"
 
-#: ../src/rootmenu.c:504
+#: ../src/rootmenu.c:506
 #, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s"
 msgstr "%s: À߸øµÈ Å°º¸µå ´ÜÃàÅ° ÁöÁ¤ \"%s\"(¿£Æ®¸® %s)"
 
-#: ../src/rootmenu.c:512
+#: ../src/rootmenu.c:514
 #, c-format
 msgid "%s:invalid key in shortcut \"%s\" for entry %s"
 msgstr "%s: »¡¸®°¡±â \"%s\"(¿£Æ®¸® %s)¿¡ À߸øµÈ Å°"
 
-#: ../src/rootmenu.c:565
+#: ../src/rootmenu.c:567
 #, c-format
 msgid "%s: unmatched '\"' in menu file"
 msgstr "%s: ¸Þ´º ÆÄÀÏÀÇ '\"' ¦ÀÌ ¸ÂÁö ¾ÊÀ½"
 
-#: ../src/rootmenu.c:615
+#: ../src/rootmenu.c:617
 #, c-format
 msgid "%s: missing command"
 msgstr "%s: ¸í·É¾î°¡ ¾øÀ½"
 
-#: ../src/rootmenu.c:648
+#: ../src/rootmenu.c:650
 #, c-format
 msgid "invalid OPEN_MENU specification: %s"
 msgstr "OPEN_MENU ÁöÁ¤ÀÌ À߸øµÊ: %s"
 
-#: ../src/rootmenu.c:696
+#: ../src/rootmenu.c:698
 #, c-format
 msgid "%s:could not stat menu"
 msgstr "%s: ¸Þ´º ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:704
+#: ../src/rootmenu.c:706
 #, c-format
 msgid "%s:could not stat menu:%s"
 msgstr "%s: ¸Þ´º ÆÄÀÏ¿¡ Á¢±ÙÇÒ ¼ö ¾øÀ½ :%s"
 
-#: ../src/rootmenu.c:722
+#: ../src/rootmenu.c:724
 #, c-format
 msgid "too many parameters in OPEN_MENU: %s"
 msgstr "OPEN_MENU¿¡ Àμö°¡ ³Ê¹« ¸¹À½: %s"
 
-#: ../src/rootmenu.c:758
+#: ../src/rootmenu.c:760
 msgid ""
 "There are more than one WORKSPACE_MENU commands in the applications menu. "
 "Only one is allowed."
@@ -848,97 +917,97 @@ msgstr ""
 "¾ÖÇø®ÄÉÀÌ¼Ç ¸Þ´º¿¡ WORKSPACE_MENU ¸í·ÉÀÌ µÑ ÀÌ»ó ÀÖ½À´Ï´Ù. Çϳª¸¸ ÀÖ¾î¾ß "
 "ÇÕ´Ï´Ù. "
 
-#: ../src/rootmenu.c:787 ../src/rootmenu.c:805
+#: ../src/rootmenu.c:789 ../src/rootmenu.c:807
 #, c-format
 msgid "%s:missing parameter for menu command \"%s\""
 msgstr "%s: ¸Þ´º ¸í·É¾î \"%s\" ÀÇ Àμö°¡ ºüÁ³À½"
 
-#: ../src/rootmenu.c:868
+#: ../src/rootmenu.c:870
 #, c-format
 msgid "%s:unknown command \"%s\" in menu config."
 msgstr "%s:¸Þ´º ¼³Á¤ÀÇ \"%s\" ¸í·ÉÀ» ¾Ë ¼ö ¾øÀ½."
 
-#: ../src/rootmenu.c:876
+#: ../src/rootmenu.c:878
 #, c-format
 msgid "%s:can't add shortcut for entry \"%s\""
 msgstr "%s: ¿£Æ®¸® \"%s\"¿¡ »¡¸®°¡±â¸¦ Ãß°¡ÇÒ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:1013
+#: ../src/rootmenu.c:1015
 #, c-format
 msgid "%s:maximal line size exceeded in menu config: %s"
 msgstr "%s:¸Þ´º ¼³Á¤ÀÇ ÃÖ´ë ÁÙ¼ö¸¦ ÃÊ°úÇÔ: %s"
 
-#: ../src/rootmenu.c:1035 ../src/rootmenu.c:1127 ../src/rootmenu.c:1228
+#: ../src/rootmenu.c:1037 ../src/rootmenu.c:1129 ../src/rootmenu.c:1230
 #, c-format
 msgid "%s:missing command in menu config: %s"
 msgstr "%s:¸Þ´º ¼³Á¤¿¡¼­ ¸í·ÉÀ» ãÀ» ¼ö ¾øÀ½: %s"
 
-#: ../src/rootmenu.c:1065
+#: ../src/rootmenu.c:1067
 #, c-format
 msgid "%s:syntax error in menu file:END declaration missing"
 msgstr "%s:¸Þ´ºÆÄÀÏ ¹®¹ý¿¡·¯:END ¼±¾ð¹® ¾øÀ½"
 
-#: ../src/rootmenu.c:1094 ../src/rootmenu.c:1193
+#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1195
 msgid "could not make arguments for menu file preprocessor"
 msgstr "¸Þ´º ÆÄÀÏ Àü󸮱⸦ À§ÇÑ Àμö¸¦ ¸¸µé ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:1100 ../src/rootmenu.c:1200
+#: ../src/rootmenu.c:1102 ../src/rootmenu.c:1202
 #, c-format
 msgid "%s:could not open/preprocess menu file"
 msgstr "%s: ¸Þ´º ÆÄÀÏÀ» ¿­°Å³ª Àüó¸®ÇÒ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:1112 ../src/rootmenu.c:1213
+#: ../src/rootmenu.c:1114 ../src/rootmenu.c:1215
 #, c-format
 msgid "%s:could not open menu file"
 msgstr "%s:¸Þ´º ÆÄÀÏÀ» ¿­ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:1139
+#: ../src/rootmenu.c:1141
 #, c-format
 msgid "%s:invalid menu file. MENU command is missing"
 msgstr "%s:À߸øµÈ ¸Þ´º ÆÄÀÏ. MENU ¸í·ÉÀÌ ºüÁ³½À´Ï´Ù"
 
-#: ../src/rootmenu.c:1148
+#: ../src/rootmenu.c:1150
 msgid "error reading preprocessed menu data"
 msgstr "Àüó¸®µÈ ¸Þ´º µ¥ÀÌÅ͸¦ Àдµ¥ ¿À·ù"
 
-#: ../src/rootmenu.c:1240
+#: ../src/rootmenu.c:1242
 #, c-format
 msgid "%s:no title given for the root menu"
 msgstr "%s:ÃÖ»óÀ§ ¸Þ´º¿¡ Á¦¸ñÀÌ ¾ø½À´Ï´Ù"
 
-#: ../src/rootmenu.c:1323 ../src/rootmenu.c:1390 ../src/rootmenu.c:1434
+#: ../src/rootmenu.c:1325 ../src/rootmenu.c:1392 ../src/rootmenu.c:1436
 #, c-format
 msgid "out of memory while constructing directory menu %s"
 msgstr "µð·ºÅ丮 ¸Þ´º %s »ý¼º Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/rootmenu.c:1333
+#: ../src/rootmenu.c:1335
 #, c-format
 msgid "%s:could not stat file \"%s\" in menu directory"
 msgstr "%s: ¸Þ´º µð·ºÅ丮ÀÇ ÆÄÀÏ \"%s\"¿¡ Á¢±ÙÇÒ ¼ö ¾øÀ½"
 
-#: ../src/rootmenu.c:1488
+#: ../src/rootmenu.c:1490
 msgid "Commands"
 msgstr "¸í·É¾î"
 
-#: ../src/rootmenu.c:1491
+#: ../src/rootmenu.c:1493
 msgid "Restart"
 msgstr "Àç½ÃÀÛ"
 
-#: ../src/rootmenu.c:1492
+#: ../src/rootmenu.c:1494
 msgid "Exit..."
 msgstr "Á¾·á..."
 
-#: ../src/rootmenu.c:1537
+#: ../src/rootmenu.c:1539
 #, c-format
 msgid "could not find menu file \"%s\" referenced in WMRootMenu"
 msgstr "WMRootMenu¿¡¼­ ÂüÁ¶ÇÏ´Â ¸Þ´º ÆÄÀÏ \"%s\"¸¦ ãÀ» ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/rootmenu.c:1544
+#: ../src/rootmenu.c:1546
 #, c-format
 msgid "could not access menu \"%s\" referenced in WMRootMenu"
 msgstr "WMRootMenu¿¡¼­ ÂüÁ¶ÇÏ´Â ¸Þ´º \"%s\"¿¡ Á¢±ÙÇÒ ¼ö ¾ø½À´Ï´Ù"
 
-#: ../src/rootmenu.c:1555
+#: ../src/rootmenu.c:1557
 #, c-format
 msgid ""
 "using default menu file \"%s\" as the menu referenced in WMRootMenu could "
@@ -947,51 +1016,51 @@ msgstr ""
 "WMRootMenu¿¡¼­ ÂüÁ¶ÇÏ´Â ¸Þ´º ÆÄÀÏÀ» ãÀ» ¼ö ¾øÀ¸¹Ç·Î \"%s\"¸¦ ±âº» ¸Þ´º "
 "ÆÄÀÏ·Î »ç¿ëÇÕ´Ï´Ù"
 
-#: ../src/rootmenu.c:1578 ../src/rootmenu.c:1654
+#: ../src/rootmenu.c:1580 ../src/rootmenu.c:1656
 #, c-format
 msgid "%s:format error in root menu configuration \"%s\""
 msgstr "%s: ÃÖ»óÀ§ ¸Þ´º ¼³Á¤ \"%s\"ÀÇ Çü½Ä ¿À·ù"
 
-#: ../src/rootmenu.c:1742
+#: ../src/rootmenu.c:1744
 msgid ""
 "The applications menu could not be loaded.Look at the console output for a "
 "detaileddescription of the errors"
 msgstr ""
 
-#: ../src/screen.c:433
+#: ../src/screen.c:436
 #, c-format
 msgid "could not load logo image for panels: %s"
 msgstr "Æгο¡ ¾²ÀÏ ·Î°í À̹ÌÁö¸¦ ÀÐÁö ¸øÇÔ: %s"
 
-#: ../src/screen.c:437
+#: ../src/screen.c:440
 #, c-format
 msgid "error making logo image for panel:%s"
 msgstr "Æгο¡ ¾²ÀÏ ·Î°í À̹ÌÁö¸¦ ¸¸µéÁö ¸øÇÔ:%s"
 
-#: ../src/screen.c:710
+#: ../src/screen.c:728
 #, c-format
 msgid "could not initialize graphics library context: %s"
 msgstr "±×·¡ÇÈ ¶óÀ̺귯¸® ȯ°æÀ» ÃʱâÈ­ ÇÒ¼ö ¾øÀ½: %s"
 
-#: ../src/screen.c:741
+#: ../src/screen.c:759
 msgid "could not do initialization of WINGs widget set"
 msgstr "%s: ÃʱâÈ­ ½ºÅ©¸³Æ®¸¦ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù."
 
-#: ../src/screen.c:1073
+#: ../src/screen.c:1093
 #, c-format
 msgid "could not save session state in %s"
 msgstr "%sÀÇ ¼¼¼Ç »óŸ¦ ÀúÀåÇÏÁö ¸øÇÔ"
 
-#: ../src/session.c:182 ../src/wdefaults.c:564 ../src/winspector.c:347
+#: ../src/session.c:182 ../src/wdefaults.c:564 ../src/winspector.c:348
 #, c-format
 msgid "can't convert \"%s\" to boolean"
 msgstr "\"%s\"¸¦ ºÎ¿ï °ªÀ¸·Î ¹Ù²Ü ¼ö ¾øÀ½"
 
-#: ../src/session.c:873
+#: ../src/session.c:981
 msgid "out of memory while saving session state"
 msgstr "¼¼¼Ç »óŸ¦ ÀúÀåÇÏ´Â Áß ¸Þ¸ð¸® ºÎÁ·"
 
-#: ../src/session.c:964
+#: ../src/session.c:1072
 msgid "end of memory while saving session state"
 msgstr "¼¼¼Ç »óŸ¦ ÀúÀåÇÏ´Â Áß ¸Þ¸ð¸® ºÎÁ·"
 
@@ -1001,15 +1070,15 @@ msgstr "
 #. * If the sm was the last client of session, then we'll die
 #. * anyway, otherwise we can continue doing our stuff.
 #.
-#: ../src/session.c:1098
+#: ../src/session.c:1206
 msgid "connection to the session manager was lost"
 msgstr "¼¼¼Ç °ü¸®ÀÚÀÇ ¿¬°áÀÌ ²÷¾îÁ³½À´Ï´Ù"
 
-#: ../src/stacking.c:72
+#: ../src/stacking.c:73
 msgid "could not get window list!!"
 msgstr "â ¸ñ·Ï¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù!!"
 
-#: ../src/startup.c:195
+#: ../src/startup.c:194
 #, c-format
 msgid "internal X error: %s\n"
 msgstr "X ³»ºÎ ¿¡·¯: %s\n"
@@ -1024,33 +1093,46 @@ msgstr "%i (%s) 
 msgid "got signal %i - restarting\n"
 msgstr "%i ½ÅÈ£ °¨Áö - Àç½Ãµ¿ÇÔ\n"
 
-#: ../src/startup.c:276
+#: ../src/startup.c:275
 #, c-format
 msgid "got signal %i (%s) - exiting...\n"
 msgstr "%i (%s) ½ÅÈ£ °¨Áö - Á¾·áÇÔ...\n"
 
-#: ../src/startup.c:278
+#: ../src/startup.c:277
 #, c-format
 msgid "got signal %i - exiting...\n"
 msgstr "%i ½ÅÈ£ °¨Áö - Á¾·áÇÔ...\n"
 
-#: ../src/startup.c:291
+#: ../src/startup.c:290
 #, c-format
 msgid "got signal %i (%s)\n"
 msgstr "%i (%s) ½ÅÈ£ °¨Áö\n"
 
-#: ../src/startup.c:293
+#: ../src/startup.c:292
 #, c-format
 msgid "got signal %i\n"
 msgstr "%i ½ÅÈ£ °¨Áö\n"
 
-#: ../src/startup.c:299
+#: ../src/startup.c:303
 msgid ""
 "crashed while trying to do some post-crash cleanup. Aborting immediatelly."
 msgstr ""
 "ºñÁ¤»ó Á¾·áÈÄ Ã³¸®¸¦ ÇÏ·Á´Â µ¿¾È¿¡ ºñÁ¤»ó Á¾·áµÇ¾ú½À´Ï´Ù. Áï½Ã Á¾·áÇÕ´Ï´Ù."
 
-#: ../src/startup.c:310
+#. we try to restart Window Maker
+#: ../src/startup.c:337
+msgid "trying to restart Window Maker..."
+msgstr "À©µµ¿ì ¸ÞÀÌÄ¿ Àç½ÃÀÛ..."
+
+#: ../src/startup.c:342
+msgid "trying to start alternate window manager..."
+msgstr "´ëü¿ë â °ü¸®ÀÚ ½ÇÇàÇÔ..."
+
+#: ../src/startup.c:347
+msgid "failed to start alternate window manager. Aborting."
+msgstr "´ëü¿ë â °ü¸®ÀÚ¸¦ ½ÇÇà ½ÇÆÐ. Á¾·á."
+
+#: ../src/startup.c:349
 msgid ""
 "a fatal error has occured, probably due to a bug. Please fill the included "
 "BUGFORM and report it."
@@ -1058,27 +1140,21 @@ msgstr ""
 "Ä¡¸íÀûÀÎ ¿À·ù ¹ß»ý, ¾Æ¸¶µµ ¹ö±×ÀÎ °Í °°½À´Ï´Ù. BUGFORMÀ» ÀÛ¼ºÇØ º¸³»Áֽñæ "
 "ºÎŹµå¸³´Ï´Ù."
 
-#. restart another window manager so that the X session doesn't
-#. * go to space
-#: ../src/startup.c:317
-msgid "trying to start alternative window manager..."
-msgstr "´ëü¿ë â °ü¸®ÀÚ¸¦ ½ÃÀÛÇÏ°Ú½À´Ï´Ù..."
-
-#: ../src/startup.c:745
+#: ../src/startup.c:782
 #, c-format
 msgid "icon size is configured to %i, but it's too small. Using 16, instead\n"
 msgstr "ÁöÁ¤µÈ ¾ÆÀÌÄÜ Å©±â(%i)°¡ ³Ê¹« ÀÛÀ½. ´ë½Å 16À¸·Î ¹Ù²ß´Ï´Ù\n"
 
-#: ../src/startup.c:789
-msgid "it seems that there already is a window manager running"
+#: ../src/startup.c:821
+msgid "it seems that there is already a window manager running"
 msgstr "ÀÌ¹Ì ´Ù¸¥ â °ü¸®ÀÚ°¡ µ¿ÀÛÇÏ°í ÀÖ´Â °Í °°½À´Ï´Ù"
 
-#: ../src/startup.c:795
+#: ../src/startup.c:827
 #, c-format
 msgid "could not manage screen %i"
 msgstr "È­¸é %i¸¦ Á¦¾îÇÒ ¼ö ¾øÀ½"
 
-#: ../src/startup.c:855
+#: ../src/startup.c:887
 msgid "could not manage any screen"
 msgstr "¸ðµç È­¸éÀ» Á¦¾îÇÒ ¼ö ¾øÀ½"
 
@@ -1086,41 +1162,36 @@ msgstr "
 msgid "Windows"
 msgstr "â"
 
-#: ../src/texture.c:294 ../src/texture.c:338
+#: ../src/texture.c:290 ../src/texture.c:334
 #, c-format
 msgid "image file \"%s\" used as texture could not be found."
 msgstr "ÅؽºÃ³·Î »ç¿ëÇÏ´Â À̹ÌÁö ÆÄÀÏ \"%s\"À» ãÀ» ¼ö ¾ø½À´Ï´Ù."
 
-#: ../src/texture.c:300 ../src/texture.c:344
+#: ../src/texture.c:296 ../src/texture.c:340
 #, c-format
 msgid "could not load texture pixmap \"%s\":%s"
 msgstr "ÅؽºÃ³ ÇȽº¸Ê \"%s\"À» ¿­ ¼ö°¡ ¾øÀ½: %s"
 
-#: ../src/texture.c:404
+#: ../src/texture.c:400
 #, c-format
 msgid "library \"%s\" cound not be opened."
 msgstr "\"%s\" ¶óÀ̺귯¸®¸¦ ¿­ ¼ö ¾øÀ½."
 
-#: ../src/texture.c:413
+#: ../src/texture.c:409
 #, c-format
 msgid "function \"%s\" not found in library \"%s\""
 msgstr "\"%s\" ÇÔ¼ö°¡ \"%s\" ¶óÀ̺귯¸®¿¡ ¾øÀ½"
 
-#: ../src/texture.c:420
+#: ../src/texture.c:416
 msgid "function textures not supported on this system, sorry."
 msgstr "ÀÌ ½Ã½ºÅÛÀº ÅؽºÃÄ ÇÔ¼ö¸¦ Áö¿øÇÏÁö ¾Ê½À´Ï´Ù."
 
-#: ../src/texture.c:552 ../src/texture.c:674
-#, c-format
-msgid "could not render texture: %s"
-msgstr "ÅؽºÃ³ ·»´õ¸µÀ» ÇÒ ¼ö ¾øÀ½: %s"
-
 #: ../src/wdefaults.c:410
 #, c-format
 msgid "could not find icon file \"%s\""
 msgstr "¾ÆÀÌÄÜ ÆÄÀÏ \"%s\"À» ãÁö ¸øÇß½À´Ï´Ù"
 
-#: ../src/window.c:2499 ../src/window.c:2631
+#: ../src/window.c:2539 ../src/window.c:2673
 msgid ""
 "the NumLock, ScrollLock or similar key seems to be turned on.\n"
 "Turn it off or some mouse actions and keyboard shortcuts will not work."
@@ -1150,7 +1221,7 @@ msgstr "â 
 msgid "Keep at bottom"
 msgstr "Ç×»ó ¾Æ·¡·Î/°¡¶ó¾ÉÀ½"
 
-#: ../src/winmenu.c:398 ../src/winspector.c:1146
+#: ../src/winmenu.c:398 ../src/winspector.c:1147
 msgid "Omnipresent"
 msgstr "Ç×»ó º¸ÀÓ"
 
@@ -1203,53 +1274,53 @@ msgstr "
 msgid "Unshade"
 msgstr "º¸ÀÓ"
 
-#: ../src/winspector.c:281
+#: ../src/winspector.c:282
 #, c-format
 msgid "Could not find icon \"%s\" specified for this window"
 msgstr "ÀÌ Ã¢¿¡¼­ ÁöÁ¤ÇÑ ¾ÆÀÌÄÜ \"%s\"À» ãÀ» ¼ö ¾øÀ½"
 
-#: ../src/winspector.c:297
+#: ../src/winspector.c:298
 #, c-format
 msgid "Could not open specified icon \"%s\":%s"
 msgstr "ÁöÁ¤µÈ ¾ÆÀÌÄÜ \"%s\"À» ¿­ ¼ö ¾øÀ½:%s"
 
-#: ../src/winspector.c:1021
+#: ../src/winspector.c:1022
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: ../src/winspector.c:1029
+#: ../src/winspector.c:1030
 msgid "Apply"
 msgstr "Àû¿ë"
 
-#: ../src/winspector.c:1035
+#: ../src/winspector.c:1036
 msgid "Reload"
 msgstr "´Ù½ÃÀбâ"
 
-#: ../src/winspector.c:1044 ../src/winspector.c:1054
+#: ../src/winspector.c:1045 ../src/winspector.c:1055
 msgid "Window Specification"
 msgstr "â ¼±ÅÃ"
 
-#: ../src/winspector.c:1045
+#: ../src/winspector.c:1046
 msgid "Window Attributes"
 msgstr "â ¼Ó¼º"
 
-#: ../src/winspector.c:1046
+#: ../src/winspector.c:1047
 msgid "Advanced Options"
 msgstr "°í±Þ ¿É¼Ç"
 
-#: ../src/winspector.c:1047
+#: ../src/winspector.c:1048
 msgid "Icon and Initial Workspace"
 msgstr "¾ÆÀÌÄÜ°ú Ãʱâ ÀÛ¾÷°ø°£"
 
-#: ../src/winspector.c:1048
+#: ../src/winspector.c:1049
 msgid "Application Specific"
 msgstr "¾ÖÇø®ÄÉÀ̼ǿ¡ µû¶ó ´Ù¸¥ ¼³Á¤"
 
-#: ../src/winspector.c:1062
+#: ../src/winspector.c:1063
 msgid "Defaults for all windows"
 msgstr "¸ðµç âÀÇ ±âº»°ªÀ¸·Î"
 
-#: ../src/winspector.c:1105
+#: ../src/winspector.c:1106
 msgid ""
 "The configuration will apply to all\n"
 "windows that have their WM_CLASS property set to the above selected\n"
@@ -1259,83 +1330,83 @@ msgstr ""
 "À§¿¡¼­ ÁöÁ¤ÇÑ À̸§À¸·Î µÇ¾î ÀÖ´Â\n"
 "¸ðµç â¿¡ ±× ¼³Á¤ÀÌ Àû¿ëµË´Ï´Ù."
 
-#: ../src/winspector.c:1112
+#: ../src/winspector.c:1113
 msgid "Attributes"
 msgstr "¼Ó¼º"
 
-#: ../src/winspector.c:1122
+#: ../src/winspector.c:1123
 msgid "Disable Titlebar"
 msgstr "Á¦¸ñ ¹Ù ¾ø¾Ú"
 
-#: ../src/winspector.c:1126
+#: ../src/winspector.c:1127
 msgid "Disable Resizebar"
 msgstr "Å©±âÁ¶Á¤ ¹Ù ¾ø¾Ú"
 
-#: ../src/winspector.c:1130
+#: ../src/winspector.c:1131
 msgid "Disable Close Button"
 msgstr "´Ý±â ¹öÆ° ¾ø¾Ú"
 
-#: ../src/winspector.c:1134
+#: ../src/winspector.c:1135
 msgid "Disable Miniaturize Button"
 msgstr "ÃÖ¼ÒÈ­ ¹öÆ° ¾ø¾Ú"
 
-#: ../src/winspector.c:1138
+#: ../src/winspector.c:1139
 msgid "Keep on Top / Floating"
 msgstr "Ç×»ó À§·Î / ¶ä"
 
-#: ../src/winspector.c:1142
+#: ../src/winspector.c:1143
 msgid "Keep at Bottom / Sunken"
 msgstr "Ç×»ó ¾Æ·¡·Î / °¡¶ó¾ÉÀ½"
 
-#: ../src/winspector.c:1150
+#: ../src/winspector.c:1151
 msgid "Start Miniaturized"
 msgstr "ÃÖ¼ÒÈ­ÇÏ¿© ½ÇÇà"
 
-#: ../src/winspector.c:1154
+#: ../src/winspector.c:1155
 msgid "Start Maximized"
 msgstr "ÃÖ´ëÈ­ÇÏ¿© ½ÇÇà"
 
-#: ../src/winspector.c:1158
+#: ../src/winspector.c:1159
 msgid "Skip Window List"
 msgstr "â ¸ñ·Ï¿¡ ³ªÅ¸³ªÁö ¾ÊÀ½"
 
-#: ../src/winspector.c:1172
+#: ../src/winspector.c:1173
 msgid "Advanced"
 msgstr "°í±Þ Ç׸ñ"
 
-#: ../src/winspector.c:1182
+#: ../src/winspector.c:1183
 msgid "Ignore HideOthers"
 msgstr "´Ù¸¥ °Íµé ¼û±è ¹«½ÃÇÔ"
 
-#: ../src/winspector.c:1186
+#: ../src/winspector.c:1187
 msgid "Don't Bind Keyboard Shortcuts"
 msgstr "Å°º¸µå ´ÜÃàÅ° »ç¿ë ¾ÈÇÔ"
 
-#: ../src/winspector.c:1190
+#: ../src/winspector.c:1191
 msgid "Don't Bind Mouse Clicks"
 msgstr "¸¶¿ì½º Ŭ¸¯ »ç¿ë ¾ÈÇÔ"
 
-#: ../src/winspector.c:1194
+#: ../src/winspector.c:1195
 msgid "Keep Inside Screen"
 msgstr "Ç×»ó È­¸é¾È¿¡ À§Ä¡"
 
-#: ../src/winspector.c:1198
+#: ../src/winspector.c:1199
 msgid "Don't Let It Take Focus"
 msgstr "È°¼ºÈ­ ¾ÈµÊ"
 
-#: ../src/winspector.c:1202
+#: ../src/winspector.c:1203
 msgid "Don't Save Session"
 msgstr "¼¼¼ÇÀ» ÀúÀåÇÏÁö ¾ÊÀ½"
 
-#: ../src/winspector.c:1206
+#: ../src/winspector.c:1207
 msgid "Emulate Application Icon"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¾ÆÀÌÄÜ Èä³»³»±â"
 
-#: ../src/winspector.c:1210
+#: ../src/winspector.c:1211
 msgid "Full Screen Maximization"
 msgstr "Àüü È­¸é ÃÖ´ëÈ­"
 
-#: ../src/winspector.c:1225
+#: ../src/winspector.c:1226
 msgid ""
 "Enable the \"Don't bind...\" options to allow the application to receive all "
 "mouse or keyboard events."
@@ -1343,60 +1414,60 @@ msgstr ""
 "¾ÖÇø®ÄÉÀ̼ÇÀÌ ¸ðµç ¸¶¿ì½º¿Í Å°º¸µå À̺¥Æ®¸¦ ¹Þµµ·Ï \"... »ç¿ë ¾ÈÇÔ\" ¿É¼ÇÀ» "
 "»ç¿ë °¡´ÉÇϵµ·Ï ÇÕ´Ï´Ù."
 
-#: ../src/winspector.c:1232
+#: ../src/winspector.c:1233
 msgid "Miniwindow Image"
 msgstr "¾ÆÀÌÄÜ À̹ÌÁö"
 
-#: ../src/winspector.c:1251
+#: ../src/winspector.c:1252
 msgid "Update"
 msgstr "°»½Å"
 
-#: ../src/winspector.c:1266
+#: ../src/winspector.c:1267
 msgid "Icon File Name:"
 msgstr "¾ÆÀÌÄÜ ÆÄÀϸí:"
 
-#: ../src/winspector.c:1278
+#: ../src/winspector.c:1279
 msgid "Ignore client supplied icon"
 msgstr "Ŭ¶óÀ̾ðÆ® Á¦°ø ¾ÆÀÌÄÜ ¹«½ÃÇÔ"
 
-#: ../src/winspector.c:1285
+#: ../src/winspector.c:1286
 msgid "Initial Workspace"
 msgstr "Ãʱâ ÀÛ¾÷°ø°£"
 
-#: ../src/winspector.c:1290
+#: ../src/winspector.c:1291
 msgid "Nowhere in particular"
 msgstr "Ưº°ÇÑ ¼³Á¤ ¾øÀ½"
 
-#: ../src/winspector.c:1308
+#: ../src/winspector.c:1309
 msgid "Application Wide"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¿ÍÀ̵å"
 
-#: ../src/winspector.c:1318
+#: ../src/winspector.c:1319
 msgid "Start Hidden"
 msgstr "¼û°Ü¼­ ½ÇÇà"
 
-#: ../src/winspector.c:1322
+#: ../src/winspector.c:1323
 msgid "No Application Icon"
 msgstr "¾ÖÇø®ÄÉÀÌ¼Ç ¾ÆÀÌÄÜ ¾øÀ½"
 
-#: ../src/workspace.c:102 ../src/workspace.c:103 ../src/workspace.c:480
+#: ../src/workspace.c:106 ../src/workspace.c:107 ../src/workspace.c:655
 #, c-format
 msgid "Workspace %i"
 msgstr "ÀÛ¾÷°ø°£ %i"
 
-#: ../src/workspace.c:537
+#: ../src/workspace.c:712
 msgid "Workspaces"
 msgstr "ÀÛ¾÷°ø°£"
 
-#: ../src/workspace.c:539
+#: ../src/workspace.c:714
 msgid "could not create Workspace menu"
 msgstr "ÀÛ¾÷°ø°£ ¸Þ´º¸¦ ¸¸µé¼ö ¾øÀ½"
 
-#: ../src/workspace.c:546
+#: ../src/workspace.c:721
 msgid "New"
 msgstr "»õ ÀÛ¾÷°ø°£ ¸¸µë"
 
-#: ../src/workspace.c:547
+#: ../src/workspace.c:722
 msgid "Destroy Last"
 msgstr "¸¶Áö¸· ÀÛ¾÷°ø°£ ¾ø¾Ú"
 
diff --git a/src/kwm.c b/src/kwm.c
index 25d1f5ba..4d7df00d 100644
--- a/src/kwm.c
+++ b/src/kwm.c
@@ -780,6 +780,7 @@ void
 wKWMCheckClientInitialState(WWindow *wwin)
 {
     long val;
+    WArea area;
 
     if (getSimpleHint(wwin->client_win, _XA_KWM_WIN_STICKY, &val) && val) {
 
@@ -793,6 +794,17 @@ wKWMCheckClientInitialState(WWindow *wwin)
 
 	wwin->flags.maximized = MAX_VERTICAL|MAX_HORIZONTAL;
     }
+    if (getAreaHint(wwin->client_win, _XA_KWM_WIN_GEOMETRY_RESTORE, &area)
+	&& (wwin->old_geometry.x != area.x1
+	    || wwin->old_geometry.y != area.y1
+	    || wwin->old_geometry.width != area.x2 - area.x1
+	    || wwin->old_geometry.height != area.y2 - area.y1)) {
+
+	wwin->old_geometry.x = area.x1;
+	wwin->old_geometry.y = area.y1;
+	wwin->old_geometry.width = area.x2 - area.x1;
+	wwin->old_geometry.height = area.y2 - area.y1;
+    }
 }
 
 
diff --git a/src/moveres.c b/src/moveres.c
index 2f782262..79fc9d07 100644
--- a/src/moveres.c
+++ b/src/moveres.c
@@ -120,7 +120,7 @@ showPosition(WWindow *wwin, int x, int y)
     int fw, fh;
 
     if (wPreferences.move_display == WDIS_NEW) {
-#if 0
+#if 1
         int width = wwin->frame->core->width;
         int height = wwin->frame->core->height;
 
@@ -160,7 +160,7 @@ static void
 cyclePositionDisplay(WWindow *wwin, int x, int y, int w, int h)
 {
     WScreen *scr = wwin->screen_ptr;
-    
+
     wPreferences.move_display++;
     wPreferences.move_display %= NUM_DISPLAYS;
     
@@ -176,7 +176,6 @@ cyclePositionDisplay(WWindow *wwin, int x, int y, int w, int h)
 	    moveGeometryDisplayCentered(scr, x + w/2, y + h/2);
 	}
 	XMapRaised(dpy, scr->geometry_display);
-	showPosition(wwin, x, y);
     }
 }
 
@@ -1071,6 +1070,11 @@ updateWindowPosition(WWindow *wwin, MoveData *data, Bool doResistance,
 	newY = data->calcY;
 
     if (data->realX != newX || data->realY != newY) {
+
+	if (wPreferences.move_display == WDIS_NEW
+	    && !scr->selected_windows) {
+	    showPosition(wwin, data->realX, data->realY);
+	}
 	if (opaqueMove) {
 	    doWindowMove(wwin, scr->selected_windows,
 			 newX - wwin->frame_x,
@@ -1097,12 +1101,6 @@ updateWindowPosition(WWindow *wwin, MoveData *data, Bool doResistance,
 	}
 
 	if (!scr->selected_windows) {
-
-	    if (wPreferences.move_display == WDIS_NEW) {
-
-		showPosition(wwin, data->realX, data->realY);
-		
-	    }
 	    showPosition(wwin, newX, newY);
 	}
     }
@@ -1450,6 +1448,14 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
     rimg = InitGhostWindowMove(scr);
 #endif
 
+    if (wPreferences.opaque_move && !wPreferences.use_saveunders) {
+	XSetWindowAttributes attr;
+
+	attr.save_under = True;
+	XChangeWindowAttributes(dpy, wwin->frame->core->window,
+				CWSaveUnder, &attr);
+    }
+
     initMoveData(wwin, &moveData);
 
     moveData.mouseX = ev->xmotion.x_root;
@@ -1495,9 +1501,20 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 			       moveData.realY - wwin->frame_y);
 		}
 
-		cyclePositionDisplay(wwin, moveData.realX, moveData.realY, 
+		if (wPreferences.move_display == WDIS_NEW
+		    && !scr->selected_windows) {
+		    showPosition(wwin, moveData.realX, moveData.realY);
+		    XUngrabServer(dpy);
+		}
+		cyclePositionDisplay(wwin, moveData.realX, moveData.realY,
 				     moveData.winWidth, moveData.winHeight);
 
+		if (wPreferences.move_display == WDIS_NEW
+		    && !scr->selected_windows) {
+		    XGrabServer(dpy);
+		    showPosition(wwin, moveData.realX, moveData.realY);
+		}
+
 		if (!opaqueMove) {
                     drawFrames(wwin, scr->selected_windows,
                                moveData.realX - wwin->frame_x,
@@ -1518,6 +1535,11 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 		if (!warped && !wPreferences.no_autowrap) {
 		    int oldWorkspace = scr->current_workspace;
 
+		    if (wPreferences.move_display == WDIS_NEW
+			&& !scr->selected_windows) {
+			showPosition(wwin, moveData.realX, moveData.realY);
+			XUngrabServer(dpy);
+		    }
 		    if (!opaqueMove) {
 			drawFrames(wwin, scr->selected_windows, 
 				   moveData.realX - wwin->frame_x,
@@ -1530,12 +1552,17 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 			    updateMoveData(wwin, &moveData);
 			warped = 1;
 		    }
-
 		    if (!opaqueMove) {
-			drawFrames(wwin, scr->selected_windows,
+			drawFrames(wwin, scr->selected_windows, 
 				   moveData.realX - wwin->frame_x,
 				   moveData.realY - wwin->frame_y);
 		    }
+		    if (wPreferences.move_display == WDIS_NEW
+			&& !scr->selected_windows) {
+			XSync(dpy, False);
+			showPosition(wwin, moveData.realX, moveData.realY);
+			XGrabServer(dpy);
+		    }
 		} else {
 		    warped = 0;
 		}
@@ -1556,8 +1583,12 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 		if (started && !opaqueMove)
 		    drawFrames(wwin, scr->selected_windows, 0, 0);
 
-		if (!opaqueMove)
+		if (!opaqueMove || (wPreferences.move_display==WDIS_NEW
+				    && !scr->selected_windows)) {
 		    XGrabServer(dpy);
+		    if (wPreferences.move_display==WDIS_NEW)
+			showPosition(wwin, moveData.realX, moveData.realY);
+		}
 	    }
 	    break;
 
@@ -1621,6 +1652,14 @@ wMouseMoveWindow(WWindow *wwin, XEvent *ev)
 	}
     }
 
+    if (wPreferences.opaque_move && !wPreferences.use_saveunders) {
+	XSetWindowAttributes attr;
+
+	attr.save_under = False;
+	XChangeWindowAttributes(dpy, wwin->frame->core->window,
+				CWSaveUnder, &attr);
+    }
+
     freeMoveData(&moveData);
 
     return 0;
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 743088e2..50d5cb2f 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -1722,8 +1722,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
 	    if (keyboard)
 		wMenuMapAt(menu, 0, 0, True);
 	    else
-		wMenuMapCopyAt(menu, x-menu->frame->core->width/2, 
-			       y-menu->frame->top_width/2);
+		wMenuMapCopyAt(menu, x-menu->frame->core->width/2, y);
 	}
 	return;
     }
@@ -1769,8 +1768,7 @@ OpenRootMenu(WScreen *scr, int x, int y, int keyboard)
 	scr->root_menu = menu;
     }
     if (menu) {
-	wMenuMapAt(menu, x-menu->frame->core->width/2, y-menu->frame->top_width/2,
-		   keyboard);
+	wMenuMapAt(menu, x-menu->frame->core->width/2, y, keyboard);
     }
     
     if (scr->flags.root_menu_changed_shortcuts)
diff --git a/src/switchmenu.c b/src/switchmenu.c
index 4488ebbd..def973ec 100644
--- a/src/switchmenu.c
+++ b/src/switchmenu.c
@@ -102,12 +102,12 @@ OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard)
 		if (keyboard)
 		    wMenuMapAt(switchmenu, 0, 0, True);
 		else
-		    wMenuMapCopyAt(switchmenu, x-switchmenu->frame->core->width/2,
-			       y-switchmenu->frame->top_width/2);
+		    wMenuMapCopyAt(switchmenu, 
+				   x-switchmenu->frame->core->width/2, y);
 	    }
 	} else {
-	    wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2,
-		       y-switchmenu->frame->top_width/2, keyboard);
+	    wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y,
+		       keyboard);
 	}
 	return;
     }
@@ -125,8 +125,8 @@ OpenSwitchMenu(WScreen *scr, int x, int y, int keyboard)
     if (switchmenu) {
 	if (!switchmenu->flags.realized)
 	    wMenuRealize(switchmenu);
-	wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2,
-		   y-switchmenu->frame->top_width/2, keyboard);
+	wMenuMapAt(switchmenu, x-switchmenu->frame->core->width/2, y, 
+		   keyboard);
     }
 }
 
diff --git a/src/wconfig.h.in b/src/wconfig.h.in
index 457147ed..e460df73 100644
--- a/src/wconfig.h.in
+++ b/src/wconfig.h.in
@@ -363,7 +363,7 @@
 #define MENU_SELECT_DELAY 200
 
 /* delay for jumpback of scrolled menus */
-#define MENU_JUMP_BACK_DELAY 	200
+#define MENU_JUMP_BACK_DELAY 	300
 
 /* *** animation speed constants *** */