X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=WindowMaker-vfmg.patch;h=90c8b0a5dfef9d8ce84bdb4e309d18291ed182cf;hb=6331ff30ed15d35f0d10853b0f2eda585ce4ffd3;hp=927bf0770a0425cd2792f4ea281a99fa08774fd1;hpb=28f8dbd87e9083118f04e83be951a4234b78f545;p=packages%2FWindowMaker.git

diff --git a/WindowMaker-vfmg.patch b/WindowMaker-vfmg.patch
index 927bf07..90c8b0a 100644
--- a/WindowMaker-vfmg.patch
+++ b/WindowMaker-vfmg.patch
@@ -1,80 +1,80 @@
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu WindowMaker-CVS-20040321/WindowMaker/plmenu
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu	2002-05-11 02:44:03.000000000 +0200
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu	2004-07-04 21:56:20.000000000 +0200
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu WindowMaker-0.91.0/WindowMaker/plmenu
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu	2004-10-23 05:49:23.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu	2004-11-02 00:53:48.486359400 +0100
 @@ -8,49 +8,10 @@
-   ("Manual Browser", EXEC, "xman")
-   ),
-  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
-- ("XTerm", EXEC, "xterm -sb"),
-- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
-+ ("XTerm", EXEC, "xterm"),
-+ ("ATerm", EXEC, "aterm"),
-  ("Workspaces", WORKSPACE_MENU),
-- ("Applications",
--  ("Graphics",
--   ("Gimp", SHEXEC, "gimp >/dev/null"),
--   ("XV", EXEC, "xv"),
--   ("XPaint", EXEC, "xpaint"),
--   ("XFig", EXEC, "xfig")
--   ),
--  ("X File Manager", EXEC, "xfm"),
--  ("OffiX Files", EXEC, "files"),
--  ("LyX", EXEC, "lyx"),
--  ("Netscape", EXEC, "netscape"),
--  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
--  ("TkDesk", EXEC, "tkdesk")
--  ),
-- ("Editors",
--  ("XFte", EXEC, "xfte"),
--  ("XEmacs", EXEC, "xemacs"),
--  ("Emacs", EXEC, "emacs"),
--  ("XJed", EXEC, "xjed"),
--  ("NEdit", EXEC, "nedit"),
--  ("Xedit", EXEC, "xedit"),
--  ("VI", EXEC, "xterm -e vi")
--  ),
-- ("Miscellaneous",
--  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
--  ("Xplaycd", EXEC, "xplaycd"),
--  ("Xmixer", EXEC, "xmixer")
--  ),
-- ("Utils",
--  ("Calculator", EXEC, "xcalc"),
--  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--  ("Font Chooser", EXEC, "xfontsel"),
--  ("Terminal Emulator", EXEC, "xminicom"),
--  ("Magnify", EXEC, "xmag"),
--  ("Colormap", EXEC, "xcmap"),
--  ("XKill", EXEC, "xkill"),
--  ("ASClock", EXEC, "asclock -shape"),
--  ("Clipboard", EXEC, "xclipboard")
--  ),
-+ ("Applications", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
-  ("Selection",
-   ("Copy", SHEXEC, "echo '%s' | wxcopy"),
-   ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-@@ -95,7 +56,7 @@
-    ),   
-   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Preferences Utility", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs")
-+  ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
-   ), 
-  ("Exit",
-   ("Restart", RESTART),
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.de WindowMaker-CVS-20040321/WindowMaker/plmenu.de
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.de	2000-01-04 22:45:57.000000000 +0100
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu.de	2004-07-04 22:28:15.835496688 +0200
+   ("Manual Browser", EXEC, "xman")
+  ),
+  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
+- ("XTerm", EXEC, "xterm -sb"),
+- ("Mozilla Firefox", EXEC, "firefox"),
++ ("XTerm", EXEC, "xterm"),
++ ("ATerm", EXEC, "aterm"),
+  ("Workspaces", WORKSPACE_MENU),
+- ("Applications",
+-  ("Gimp", SHEXEC, "gimp >/dev/null"),
+-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+-  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
+-  ("Abiword", EXEC, "abiword"),
+-  ("Dia", EXEC, "dia"),
+-  ("OpenOffice.org",
+-   ("OpenOffice.org", EXEC, "ooffice"),
+-   ("Writer", EXEC, "oowriter"),
+-   ("Spreadsheet", EXEC, "oocalc"),
+-   ("Draw", EXEC, "oodraw"),
+-   ("Impress", EXEC, "ooimpress")
+-  ),
+-  ("Editors",
+-   ("XEmacs", EXEC, "xemacs"),
+-   ("Emacs", EXEC, "emacs"),
+-   ("XJed", EXEC, "xjed"),
+-   ("VI", EXEC, "xterm -e vi"),
+-   ("GVIM", EXEC, "gvim"),
+-   ("NEdit", EXEC, "nedit"),
+-   ("Xedit", EXEC, "xedit")
+-  ),
+-  ("Multimedia",
+-   ("XMMS", 
+-    ("XMMS", EXEC, "xmms"),
+-    ("XMMS play/pause", EXEC, "xmms -t"),
+-    ("XMMS stop", EXEC, "xmms -s")
+-   ),
+-   ("Xine video player", EXEC, "xine"),
+-   ("MPlayer", EXEC, "mplayer")
+-  )
+- ),
+- ("Utils",
+-  ("Calculator", EXEC, "xcalc"),
+-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-  ("Font Chooser", EXEC, "xfontsel"),
+-  ("Magnify", EXEC, "wmagnify"),
+-  ("Colormap", EXEC, "xcmap"),
+-  ("Kill X Application", EXEC, "xkill")
+- ),
++ ("Applications", OPEN_MENU, "| vfmg wmaker-old "),
+  ("Selection",
+   ("Copy", SHEXEC, "echo '%s' | wxcopy"),
+   ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
+@@ -93,7 +54,7 @@
+    ),   
+    ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+    ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+-   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++   ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
+    ), 
+    ("Session",
+     ("Save Session", SAVE_SESSION),
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.de WindowMaker-0.91.0/WindowMaker/plmenu.de
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.de	2004-10-17 08:28:07.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu.de	2004-11-02 00:54:02.439238240 +0100
 @@ -8,48 +8,10 @@
    ("Man-Page-Betrachter", EXEC, "xman")
    ),
-  ("Ausführen...", SHEXEC, "%a(Ausführen,Auszuführender Befehl:)"),
+  ("Ausführen...", SHEXEC, "%a(Ausführen,Auszuführender Befehl:)"),
 - ("XTerm", EXEC, "xterm -sb"),
 - ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
 + ("XTerm", EXEC, "xterm"),
 + ("ATerm", EXEC, "aterm"),
-  ("Arbeitsflächen", WORKSPACE_MENU),
+  ("Arbeitsflächen", WORKSPACE_MENU),
 - ("Anwendungen",
 -  ("Grafik",
 -   ("Gimp", SHEXEC, "gimp >/dev/null"),
@@ -106,28 +106,28 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.de WindowMaker-CVS-20
 - ("Werkzeuge",
 -  ("Taschenrechner", EXEC, "xcalc"),
 -  ("Fenstereigenschaften", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--  ("Schriftartwähler", EXEC, "xfontsel"),
+-  ("Schriftartwähler", EXEC, "xfontsel"),
 -  ("Terminalemulator", EXEC, "xminicom"),
--  ("Vergrößern", EXEC, "xmag"),
+-  ("Vergrößern", EXEC, "xmag"),
 -  ("Colormap", EXEC, "xcmap"),
 -  ("XKill", EXEC, "xkill"),
 -  ("ASClock", EXEC, "asclock -shape"),
 -  ("Zwischenablage", EXEC, "xclipboard")
 -  ),
-+ ("Anwendungen", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
++ ("Anwendungen", OPEN_MENU, "| vfmg wmaker-old "),
   ("Auswahl",
    ("Kopieren", SHEXEC, "echo '%s' | wxcopy"),
    ("Mail an", EXEC, "xterm -name mail -T Pine -e pine %s"),
 @@ -66,9 +28,9 @@
-   ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
+   ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
    ),
   ("Erscheinungsbild",
 -  ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes /home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
 -  ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles /home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
--  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+-  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
 +  ("Themen", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
 +  ("Stile", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+  ("Iconsätze", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++  ("Iconsätze", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
    ("Hintergrund",
     ("Einfarbig",
      ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -141,14 +141,14 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.de WindowMaker-CVS-20
 -  ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
 -  ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
 +  ("Thema speichern", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
-+  ("Iconsatz speichern", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
-+  ("Einstellung", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
++  ("Iconsatz speichern", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\""),
++  ("Einstellung", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
    ), 
   ("Beenden",
    ("Neustart", RESTART),
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.es WindowMaker-CVS-20040321/WindowMaker/plmenu.es
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.es	2000-06-16 02:16:35.000000000 +0200
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu.es	2004-07-04 22:15:33.665364160 +0200
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.es WindowMaker-0.91.0/WindowMaker/plmenu.es
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.es	2004-10-23 05:50:00.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu.es	2004-11-02 00:54:17.672922368 +0100
 @@ -8,48 +8,10 @@
    ("Paginas del Manual", EXEC, "xman")
    ),
@@ -197,7 +197,7 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.es WindowMaker-CVS-20
 -  ("ASClock", EXEC, "asclock -shape"),
 -  ("Portapapeles", EXEC, "xclipboard")
 -  ),
-+ ("Aplicaciones", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
++ ("Aplicaciones", OPEN_MENU, "| vfmg wmaker-old "),
   ("Seleccion",
    ("Copiar", SHEXEC, "echo '%s' | wxcopy"),
    ("Enviar por correo", EXEC, "xterm -name mail -T Pine -e pine %s"),
@@ -209,7 +209,7 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.es WindowMaker-CVS-20
 -  ("Estilos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
 -  ("Grupos de iconos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
 +  ("Temas", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+  ("Estilos", OPEN_MENU, "-noext #wmdatadir#/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++  ("Estilos", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
 +  ("Grupos de iconos", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
    ("Papel Tapiz",
     ("Solido",
@@ -223,18 +223,18 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.es WindowMaker-CVS-20
     ),   
    ("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
    ("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Preferencias", EXEC, "/usr/local/GNUstep/Apps/WPrefs.app/WPrefs")
-+  ("Preferencias", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
+-  ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++  ("Preferencias", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
    ), 
   ("Salir",
    ("Reiniciar", RESTART),
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.fr WindowMaker-CVS-20040321/WindowMaker/plmenu.fr
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.fr	1999-05-29 23:41:26.000000000 +0200
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu.fr	2004-07-04 22:29:44.279051224 +0200
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.fr WindowMaker-0.91.0/WindowMaker/plmenu.fr
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.fr	2004-10-17 08:28:07.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu.fr	2004-11-02 00:54:41.222342312 +0100
 @@ -8,48 +8,10 @@
      ("Butineur d'aide", EXEC, "xman")
     ),
-   ("Démarrer...", SHEXEC, "%a(Démarrer,Tapez une commande à démarrer:)"),
+   ("Démarrer...", SHEXEC, "%a(Démarrer,Tapez une commande à démarrer:)"),
 -  ("Terminal X", EXEC, "xterm -sb"),
 -  ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
 +  ("XTerm", EXEC, "xterm"),
@@ -270,48 +270,49 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.fr WindowMaker-CVS-20
 -  ),
 - ("Utilitaires",
 -   ("Calculatrice", EXEC, "xcalc"),
--   ("Propriétés de la fenêtre", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--   ("Sélecteur de polices", EXEC, "xfontsel"),
+-   ("Propriétés de la fenêtre", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-   ("Sélecteur de polices", EXEC, "xfontsel"),
 -   ("Emulateur de terminal", EXEC, "xminicom"),
 -   ("Loupe", EXEC, "xmag"),
 -   ("Carte des couleurs", EXEC, "xcmap"),
 -   ("XKill", EXEC, "xkill"),
 -   ("ASClock", EXEC, "asclock -shape"),
--   ("Sélections", EXEC, "xclipboard")
+-   ("Sélections", EXEC, "xclipboard")
 -  ),
-+ ("Applications", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
-  ("Sélection",
++ ("Applications", OPEN_MENU, "| vfmg wmaker-old "),
+  ("Sélection",
     ("Copier", SHEXEC, "echo '%s' | wxcopy"),
-    ("Envoyer à", EXEC, "xterm -name mail -T Pine -e pine %s"),
+    ("Envoyer à", EXEC, "xterm -name mail -T Pine -e pine %s"),
 @@ -66,9 +28,9 @@
     ("Effacer la session", CLEAR_SESSION)
    ),
   ("Apparence",
--   ("Thèmes", OPEN_MENU, "-noext /opt/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+-   ("Thèmes", OPEN_MENU, "-noext /opt/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
 -   ("Styles", OPEN_MENU, "-noext /opt/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
--   ("Jeu d'icônes", OPEN_MENU, "-noext /opt/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-+   ("Thèmes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+-   ("Jeu d'icônes", OPEN_MENU, "-noext /opt/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++   ("Thèmes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
 +   ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+   ("Jeu d'icônes", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-    ("Fond d'écran",
-      ("Unifié",
++   ("Jeu d'icônes", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+    ("Fond d'écran",
+      ("Unifié",
         ("Noir", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
 @@ -88,10 +50,11 @@
-        ("Dégradés de Gris",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-        ("Dégradés de Bordeau", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+        ("Dégradés de Gris",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+        ("Dégradés de Bordeau", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
        ),
 -     ("Images", OPEN_MENU, "-noext /opt/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
 +     ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
        ),
-    ("Sauver le thème", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes /\"%a(Nom du thème,Entrez un nom de fichier:)\""),
-    ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\"")  
-+  ("Préférence", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
+    ("Sauver le thème", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes /\"%a(Nom du thème,Entrez un nom de fichier:)\""),
+-   ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\"")  
++   ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\""),
++   ("Préférence", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
    ),
   ("Quitter",
-    ("Redémarrer", RESTART),
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it WindowMaker-CVS-20040321/WindowMaker/plmenu.it
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it	2000-01-04 22:45:57.000000000 +0100
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu.it	2004-07-04 22:32:29.197979736 +0200
+    ("Redémarrer", RESTART),
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.it WindowMaker-0.91.0/WindowMaker/plmenu.it
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.it	2004-10-17 08:28:07.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu.it	2004-11-02 00:54:55.474175704 +0100
 @@ -8,48 +8,10 @@
    ("Ricerca Manuali", EXEC, "xman")
    ),
@@ -349,9 +350,9 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it WindowMaker-CVS-20
 -  ("Xplaycd", EXEC, "xplaycd"),
 -  ("Xmixer", EXEC, "xmixer")
 -  ),
-- ("Utilità",
+- ("Utilità",
 -  ("Calcolatrice", EXEC, "xcalc"),
--  ("Proprietà finestra", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-  ("Proprietà finestra", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
 -  ("Selezione Font", EXEC, "xfontsel"),
 -  ("Emulatore di terminale", EXEC, "xminicom"),
 -  ("Lente", EXEC, "xmag"),
@@ -360,7 +361,7 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it WindowMaker-CVS-20
 -  ("ASClock", EXEC, "asclock -shape"),
 -  ("Clipboard", EXEC, "xclipboard")
 -  ),
-+ ("Programmi", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
++ ("Programmi", OPEN_MENU, "| vfmg wmaker-old "),
   ("Selezione",
    ("Copia", EXEC, "echo '%s' | wxcopy"),
    ("Spedisci a...", EXEC, "xterm -name mail -T Pine -e pine %s"),
@@ -371,9 +372,9 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it WindowMaker-CVS-20
 -  ("Temi", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
 -  ("Stili", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
 -  ("Set di Icone", OPEN_MENU, "-noext /usr/X11R6/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-+  ("Temi", OPEN_MENU, "-noext #wmdatadir#/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-+  ("Stili", OPEN_MENU, "-noext #wmdatadir#/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-+  ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++  ("Temi", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
++  ("Stili", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++  ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
    ("Sfondo",
     ("Tinta unita",
      ("Nero", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -387,42 +388,45 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.it WindowMaker-CVS-20
 -  ("Salva il tema", EXEC, "getstyle -t ~/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""),
 -  ("Salva il set icone", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\"")
 +  ("Salva il tema", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Nome Tema)\""),
-+  ("Salva il set icone", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\"")
-+  ("Preferezioni", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
++  ("Salva il set icone", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\""),
++  ("Preferezioni", EXEC, "/usr/lib/GNUstep/Applicationss/WPrefs.app/WPrefs")
    ), 
   ("Esci",
    ("Riavvia", RESTART),
-diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20040321/WindowMaker/plmenu.pl
---- WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl	2000-01-04 22:45:57.000000000 +0100
-+++ WindowMaker-CVS-20040321/WindowMaker/plmenu.pl	2004-07-04 22:32:59.267408488 +0200
-@@ -1,11 +1,11 @@
+diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.pl WindowMaker-0.91.0/WindowMaker/plmenu.pl
+--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.pl	2004-10-17 08:28:07.000000000 +0200
++++ WindowMaker-0.91.0/WindowMaker/plmenu.pl	2004-11-02 00:55:13.612418272 +0100
+@@ -1,135 +1,40 @@
  ("WindowMaker",
  	("Informacja",
 -		("Informacja o WMaker...", INFO_PANEL),
--		("Legalno¶æ...",           LEGAL_PANEL),
+-		("Legalność...",           LEGAL_PANEL),
 -		("Konsola Systemu",        EXEC, "xconsole"),
--		("Obci±¿enie Systemu",     EXEC, "xosview || xload"),
--		("Lista Procesów",         EXEC, "xterm -T 'Lista Procesów' -e top"),
--		("Przegl±darka Manuali",   EXEC, "xman")
+-		("Obciążenie Systemu",     EXEC, "xosview || xload"),
+-		("Lista Procesów",         EXEC, "xterm -T 'Lista Procesów' -e top"),
+-		("Przeglądarka Manuali",   EXEC, "xman")
 +		("Informacja o WindowMakerze...", INFO_PANEL),
 +		("Informacja o licencji...",           LEGAL_PANEL),
 +		("Konsola systemu",        EXEC, "xconsole"),
-+		("Obci±¿enie systemu",     SHEXEC, "xosview || xload"),
-+		("Lista procesów",         EXEC, "xterm -T 'Lista procesów' -e top"),
-+		("Przegl±darka manuali",   EXEC, "xman")
++		("Obciążenie systemu",     SHEXEC, "xosview || xload"),
++		("Lista procesów",         EXEC, "xterm -T 'Lista procesów' -e top"),
++		("Przeglądarka manuali",   EXEC, "xman")
  	),
  	
  	("Konfiguracja",	
-@@ -15,121 +15,25 @@
+-		("Edycja menu",       EXEC, "xterm -T 'Edycja menu' -e vi $HOME/GNUstep/Library/WindowMaker/menu"),
++		("Edycja menu",       EXEC, "xterm -T 'Edycja menu' -e vi $HOME/GNUstep/Library/Defaults/WMRootMenu"),
+ 		("Ustawienie fontów", EXEC, "xterm -T 'Ustawienie fontów' -e vi $HOME/GNUstep/Defaults/WMGLOBAL"),
+ 		("Konfiguracja",      EXEC, "xterm -T 'Konfiguracja' -e vi $HOME/GNUstep/Defaults/WindowMaker")
  	),
  	
  	("Uruchom...", EXEC, "%a(Uruchom,Wpisz komende do uruchomienia:)"),
--	("Terminal",   EXEC, "xterm -T 'Mój ulubiony terminal' -sb"),
+-	("Terminal",   EXEC, "xterm -T 'Mój ulubiony terminal' -sb"),
 -	("Edytor",     EXEC, "xterm -T 'Moj ulubiony edytor' -e vi %a(Edytor,Podaj plik do edycji:)"),
-+	("XTerm", EXEC, "xterm"),
-+	("ATerm", EXEC, "aterm"),
++	("XTerm",   EXEC, "xterm"),
++	("ATerm",   EXEC, "aterm"),
  	("Pulpity",    WORKSPACE_MENU),
--	
+ 	
 -	("Aplikacje",
 -		("Grafika",
 -			("Gimp",        EXEC, "gimp > /dev/null"),
@@ -449,7 +453,7 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20
 -	),
 -	
 -	("Internet",
--		("Przegl±darki",
+-		("Przeglądarki",
 -			("Netscape", EXEC, "netscape"), 
 -			("Arena",    EXEC, "arena"),
 -			("Lynx",     EXEC, "xterm -e lynx %a(Lynx,Podaj URL:)")
@@ -481,7 +485,7 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20
 -		("VI",      EXEC, "xterm -e vi")
 -	),
 -	
--	("D¼wiêk",
+-	("Dźwięk",
 -		("Xmcd",    EXEC, "xmcd 2> /dev/null"),
 -		("Xplaycd", EXEC, "xplaycd"),
 -		("Xmixer",  EXEC, "xmixer")
@@ -504,13 +508,13 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20
 -    	("XBill",     EXEC, "xbill")
 -    ),
 -	
--	("U¿ytki",
+-	("Użytki",
 -		("Kalkulator",          EXEC, "xcalc"),
 -		("Zegarek",             EXEC, "xclock"),
 -		("Opcje Okna",          EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--		("Przegl±darka Fontów", EXEC, "xfontsel"),
--		("Szk³o Powiêkszaj±ce", EXEC, "xmag"),
--		("Mapa Kolorów",        EXEC, "xcmap"),
+-		("Przeglądarka Fontów", EXEC, "xfontsel"),
+-		("Szkło Powiększające", EXEC, "xmag"),
+-		("Mapa Kolorów",        EXEC, "xcmap"),
 -		("XKill",               EXEC, "xkill"),
 -		("Clipboard",           EXEC, "xclipboard")
 -	),
@@ -520,21 +524,21 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20
 -		("Poczta do ...",          EXEC, "xterm -name mail -T 'Pine' -e pine %s"),
 -		("Serfuj do ...",          EXEC, "netscape %s"),
 -		("Pobierz Manual ...",     EXEC, "MANUAL_SEARCH(%s)"),
--		("Po³±cz siê z ...",       EXEC, "telnet %s"),
+-		("Połącz się z ...",       EXEC, "telnet %s"),
 -		("Pobierz plik z FTP ...", EXEC, "ftp %s")
 -	),
 -
 -	("Ekran",
--		("Ukryj Pozosta³e",         HIDE_OTHERS),
--		("Poka¿ wszystko",          SHOW_ALL),
--		("Uporz±dkowanie icon",     ARRANGE_ICONS),
--		("Odswie¿",                 REFRESH),
+-		("Ukryj Pozostałe",         HIDE_OTHERS),
+-		("Pokaż wszystko",          SHOW_ALL),
+-		("Uporządkowanie icon",     ARRANGE_ICONS),
+-		("Odswież",                 REFRESH),
 -		("Zablokuj",                EXEC, "xlock -allowroot -usefirst"),
 -		("Zachowaj Sesje",          SAVE_SESSION),
--		("Wyczy¶æ zachowan± sesje", CLEAR_SESSION)
+-		("Wyczyść zachowaną sesje", CLEAR_SESSION)
 -	),
 -
-+	("Aplikacje", OPEN_MENU, "| vfmg -i -f -x -c wmaker-old "),
++	("Aplikacje", OPEN_MENU, "| vfmg wmaker-old "),
 +	("Zaznaczenie",
 +		("Kopiuj",                  SHEXEC, "echo '%s' | wxcopy"),
 +  		("Poczta do ...",          EXEC, "xterm -name mail -T 'Pine' -e pine %s"),
@@ -542,28 +546,29 @@ diff -urN WindowMaker-CVS-20040321.orig/WindowMaker/plmenu.pl WindowMaker-CVS-20
 +		("Szukaj w manualach ...",     SHEXEC, "MANUAL_SEARCH(%s)")
 +  	),
 +  	("Ekran",
-+		("Ukryj pozosta³e",         HIDE_OTHERS),
-+  		("Poka¿ wszystko",          SHOW_ALL),
-+		("Uporz±dkuj ikony",     ARRANGE_ICONS),
-+		("Od¶wie¿",                 REFRESH),
++		("Ukryj pozostałe",         HIDE_OTHERS),
++  		("Pokaż wszystko",          SHOW_ALL),
++		("Uporządkuj ikony",     ARRANGE_ICONS),
++		("Odśwież",                 REFRESH),
 +  		("Zablokuj",                EXEC, "xlock -allowroot -usefirst"),
-+		("Zachowaj sesjê",          SAVE_SESSION),
-+		("Wyczy¶æ zachowan± sesjê", CLEAR_SESSION)
++		("Zachowaj sesję",          SAVE_SESSION),
++		("Wyczyść zachowaną sesję", CLEAR_SESSION)
 +  	),
- 	("Wygl±d",
+ 	("Wygląd",
  		("Tematy",          OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
  		("Style",           OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-@@ -155,10 +59,11 @@
+@@ -155,10 +60,11 @@
      			("Cieniowany Szary",      EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, '#636380', '#131318')'"),
      			("Cieniowany Winnny",     EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, '#600040', '#180010')'")
  			),
 -			("Obrazki", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t)")
 +			("Obrazki", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
  		),
--		("Zaoamiêtanie Tematu",        EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/'%a(Nazwa tematu,Wpisz nazwe pliku:)'"),
-+		("Zapamiêtanie Tematu",        EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/'%a(Nazwa tematu,Wpisz nazwe pliku:)'"),
- 		("Zapamiêtanie Ustawieñ Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'")
-+		("Ustawienia", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")
+-		("Zaoamiętanie Tematu",        EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/'%a(Nazwa tematu,Wpisz nazwe pliku:)'"),
+-		("Zapamiętanie Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'")
++		("Zapamiętanie Tematu",        EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/'%a(Nazwa tematu,Wpisz nazwe pliku:)'"),
++		("Zapamiętanie Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'"),
++		("Ustawienia", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
  	),
  
- 	("Wyj¶cie",
+ 	("Wyjście",