[packages/WindowMaker.git] / WindowMaker-vfmg.patch

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")\r
  ),\r
  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),\r
- ("XTerm", EXEC, "xterm -sb"),\r
- ("Mozilla Firefox", EXEC, "firefox"),\r
+ ("XTerm", EXEC, "xterm"),\r
+ ("ATerm", EXEC, "aterm"),\r
  ("Workspaces", WORKSPACE_MENU),\r
- ("Applications",\r
-  ("Gimp", SHEXEC, "gimp >/dev/null"),\r
-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),\r
-  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),\r
-  ("Abiword", EXEC, "abiword"),\r
-  ("Dia", EXEC, "dia"),\r
-  ("OpenOffice.org",\r
-   ("OpenOffice.org", EXEC, "ooffice"),\r
-   ("Writer", EXEC, "oowriter"),\r
-   ("Spreadsheet", EXEC, "oocalc"),\r
-   ("Draw", EXEC, "oodraw"),\r
-   ("Impress", EXEC, "ooimpress")\r
-  ),\r
-  ("Editors",\r
-   ("XEmacs", EXEC, "xemacs"),\r
-   ("Emacs", EXEC, "emacs"),\r
-   ("XJed", EXEC, "xjed"),\r
-   ("VI", EXEC, "xterm -e vi"),\r
-   ("GVIM", EXEC, "gvim"),\r
-   ("NEdit", EXEC, "nedit"),\r
-   ("Xedit", EXEC, "xedit")\r
-  ),\r
-  ("Multimedia",\r
-   ("XMMS", \r
-    ("XMMS", EXEC, "xmms"),\r
-    ("XMMS play/pause", EXEC, "xmms -t"),\r
-    ("XMMS stop", EXEC, "xmms -s")\r
-   ),\r
-   ("Xine video player", EXEC, "xine"),\r
-   ("MPlayer", EXEC, "mplayer")\r
-  )\r
- ),\r
- ("Utils",\r
-  ("Calculator", EXEC, "xcalc"),\r
-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),\r
-  ("Font Chooser", EXEC, "xfontsel"),\r
-  ("Magnify", EXEC, "wmagnify"),\r
-  ("Colormap", EXEC, "xcmap"),\r
-  ("Kill X Application", EXEC, "xkill")\r
- ),\r
+ ("Applications", OPEN_MENU, "| vfmg wmaker-old "),\r
  ("Selection",\r
   ("Copy", SHEXEC, "echo '%s' | wxcopy"),\r
   ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),\r
@@ -93,7 +54,7 @@
    ),   \r
    ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),\r
    ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),\r
-   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")\r
+   ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")\r
    ), \r
    ("Session",\r
     ("Save Session", SAVE_SESSION),\r
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:)"),
- ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("XTerm", EXEC, "xterm"),
+ ("ATerm", EXEC, "aterm"),
  ("Arbeitsflächen", WORKSPACE_MENU),
- ("Anwendungen",
-  ("Grafik",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X File Manager", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(Zu betrachtende Datei:)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Editoren",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Verschiedenes",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Werkzeuge",
-  ("Taschenrechner", EXEC, "xcalc"),
-  ("Fenstereigenschaften", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Schriftartwähler", EXEC, "xfontsel"),
-  ("Terminalemulator", EXEC, "xminicom"),
-  ("Vergrößern", EXEC, "xmag"),
-  ("Colormap", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Zwischenablage", EXEC, "xclipboard")
-  ),
+ ("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)
   ),
  ("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"),
+  ("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"),
   ("Hintergrund",
    ("Einfarbig",
     ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,10 +52,11 @@
     ("Grau schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
     ("Weinfarben schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
     ),
-   ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds /home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ("Bilder", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),   
-  ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
-  ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
+  ("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/Applications/WPrefs.app/WPrefs")
   ), 
  ("Beenden",
   ("Neustart", RESTART),
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")
   ),
  ("Ejecutar...", 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"),
  ("Espacio de Trabajo", WORKSPACE_MENU),
- ("Aplicaciones",
-  ("Graficas",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("Explorador de Archivos", EXEC, "xfm"),
-  ("OffiX", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(Escribe el archivo que desees ver:)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Escribe el archivo PDF que desees ver:)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Editores",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Varios",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Utilidadess",
-  ("Calculadora", EXEC, "xcalc"),
-  ("Propiedades de las ventanas", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Seleccionar fuente", EXEC, "xfontsel"),
-  ("Emulador de terminal", EXEC, "xminicom"),
-  ("Usar la lupa", EXEC, "xmag"),
-  ("Mapa de colores", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Portapapeles", EXEC, "xclipboard")
-  ),
+ ("Aplicaciones", OPEN_MENU, "| vfmg wmaker-old "),
  ("Seleccion",
   ("Copiar", SHEXEC, "echo '%s' | wxcopy"),
   ("Enviar por correo", EXEC, "xterm -name mail -T Pine -e pine %s"),
@@ -66,9 +28,9 @@
   ("Borrar sesion", CLEAR_SESSION)
   ),
  ("Apariencia",
-  ("Temas", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("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#/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",
     ("Negro", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,11 +52,11 @@
     ("Sombras grises",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
     ("Sombras vino",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
     ),
-   ("Imagenes", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ("Imagenes", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),   
   ("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/Applications/WPrefs.app/WPrefs")
+  ("Preferencias", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ), 
  ("Salir",
   ("Reiniciar", RESTART),
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:)"),
-  ("Terminal X", EXEC, "xterm -sb"),
-  ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+  ("XTerm", EXEC, "xterm"),
+  ("ATerm", EXEC, "aterm"),
   ("Bureau", WORKSPACE_MENU),
-  ("Applications",
-	("Graphismes",
-          ("Gimp", SHEXEC, "gimp >/dev/null"),
-          ("XV", EXEC, "xv"),
-          ("XPaint", EXEC, "xpaint"),
-          ("XFig", EXEC, "xfig")
-         ),
-	("Xfm", EXEC, "xfm"),
-        ("OffiX Files", EXEC, "files"),
-        ("LyX", EXEC , "lyx"),
-        ("Netscape", EXEC, "netscape"),
-        ("Ghostview", EXEC, "ghostview %a(Entrez un fichier)"),
-        ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)"),
-        ("TkDesk", EXEC, "tkdesk")
-   ),
-  ("Editeurs",
-    ("XFte", EXEC, "xfte"),
-    ("XEmacs", SHEXEC, "xemacs || emacs"),
-    ("XJed", EXEC, "xjed"),
-    ("NEdit", EXEC, "nedit"),
-    ("Xedit", EXEC, "xedit"),
-    ("VI", EXEC, "xterm -e vi")
-  ),
- ("Divers",
-   ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-   ("Xplaycd", EXEC, "xplaycd"),
-   ("Xmixer", EXEC, "xmixer")
-  ),
- ("Utilitaires",
-   ("Calculatrice", EXEC, "xcalc"),
-   ("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")
-  ),
+ ("Applications", OPEN_MENU, "| vfmg wmaker-old "),
  ("Sélection",
    ("Copier", SHEXEC, "echo '%s' | wxcopy"),
    ("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"),
-   ("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"),
+   ("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é",
        ("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\")'")
       ),
-     ("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:)\"")  
+   ("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:)\""),
Commit	Line	Data
2ac920bc	1	diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu WindowMaker-0.91.0/WindowMaker/plmenu
	2	--- WindowMaker-0.91.0.orig/WindowMaker/plmenu 2004-10-23 05:49:23.000000000 +0200
	3	+++ WindowMaker-0.91.0/WindowMaker/plmenu 2004-11-02 00:53:48.486359400 +0100
	4	@@ -8,49 +8,10 @@
	5	("Manual Browser", EXEC, "xman")\r
89f11e57 JR	6	),\r
89f11e57 JR	7	("Run...", SHEXEC, "%a(Run,Type command to run:)"),\r
2ac920bc	8	- ("XTerm", EXEC, "xterm -sb"),\r
89f11e57	9	- ("Mozilla Firefox", EXEC, "firefox"),\r
2ac920bc	10	+ ("XTerm", EXEC, "xterm"),\r
2ac920bc	11	+ ("ATerm", EXEC, "aterm"),\r
89f11e57 JR	12	("Workspaces", WORKSPACE_MENU),\r
	13	- ("Applications",\r
	14	- ("Gimp", SHEXEC, "gimp >/dev/null"),\r
	15	- ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),\r
	16	- ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),\r
	17	- ("Abiword", EXEC, "abiword"),\r
	18	- ("Dia", EXEC, "dia"),\r
	19	- ("OpenOffice.org",\r
	20	- ("OpenOffice.org", EXEC, "ooffice"),\r
	21	- ("Writer", EXEC, "oowriter"),\r
	22	- ("Spreadsheet", EXEC, "oocalc"),\r
	23	- ("Draw", EXEC, "oodraw"),\r
	24	- ("Impress", EXEC, "ooimpress")\r
	25	- ),\r
	26	- ("Editors",\r
	27	- ("XEmacs", EXEC, "xemacs"),\r
	28	- ("Emacs", EXEC, "emacs"),\r
	29	- ("XJed", EXEC, "xjed"),\r
	30	- ("VI", EXEC, "xterm -e vi"),\r
	31	- ("GVIM", EXEC, "gvim"),\r
	32	- ("NEdit", EXEC, "nedit"),\r
	33	- ("Xedit", EXEC, "xedit")\r
	34	- ),\r
	35	- ("Multimedia",\r
	36	- ("XMMS", \r
	37	- ("XMMS", EXEC, "xmms"),\r
	38	- ("XMMS play/pause", EXEC, "xmms -t"),\r
	39	- ("XMMS stop", EXEC, "xmms -s")\r
	40	- ),\r
	41	- ("Xine video player", EXEC, "xine"),\r
	42	- ("MPlayer", EXEC, "mplayer")\r
	43	- )\r
	44	- ),\r
	45	- ("Utils",\r
	46	- ("Calculator", EXEC, "xcalc"),\r
	47	- ("Window Properties", SHEXEC, "xprop \| xmessage -center -title 'xprop' -file -"),\r
	48	- ("Font Chooser", EXEC, "xfontsel"),\r
	49	- ("Magnify", EXEC, "wmagnify"),\r
	50	- ("Colormap", EXEC, "xcmap"),\r
	51	- ("Kill X Application", EXEC, "xkill")\r
	52	- ),\r
f77e15e9	53	+ ("Applications", OPEN_MENU, "\| vfmg wmaker-old "),\r
89f11e57 JR	54	("Selection",\r
	55	("Copy", SHEXEC, "echo '%s' \| wxcopy"),\r
	56	("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),\r
2ac920bc	57	@@ -93,7 +54,7 @@
89f11e57 JR	58	), \r
	59	("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),\r
	60	("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),\r
	61	- ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")\r
	62	+ ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Apps/WPrefs.app/WPrefs")\r
	63	), \r
	64	("Session",\r
	65	("Save Session", SAVE_SESSION),\r
2ac920bc	66	diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.de WindowMaker-0.91.0/WindowMaker/plmenu.de
	67	--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.de 2004-10-17 08:28:07.000000000 +0200
	68	+++ WindowMaker-0.91.0/WindowMaker/plmenu.de 2004-11-02 00:54:02.439238240 +0100
	69	@@ -8,48 +8,10 @@
	70	("Man-Page-Betrachter", EXEC, "xman")
	71	),
	72	("Ausführen...", SHEXEC, "%a(Ausführen,Auszuführender Befehl:)"),
	73	- ("XTerm", EXEC, "xterm -sb"),
	74	- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
	75	+ ("XTerm", EXEC, "xterm"),
	76	+ ("ATerm", EXEC, "aterm"),
89f11e57	77	("Arbeitsflächen", WORKSPACE_MENU),
c5f39caf	78	- ("Anwendungen",
	79	- ("Grafik",
	80	- ("Gimp", SHEXEC, "gimp >/dev/null"),
	81	- ("XV", EXEC, "xv"),
	82	- ("XPaint", EXEC, "xpaint"),
	83	- ("XFig", EXEC, "xfig")
	84	- ),
	85	- ("X File Manager", EXEC, "xfm"),
	86	- ("OffiX Files", EXEC, "files"),
	87	- ("LyX", EXEC, "lyx"),
	88	- ("Netscape", EXEC, "netscape"),
	89	- ("Ghostview", EXEC, "ghostview %a(Zu betrachtende Datei:)"),
	90	- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
	91	- ("TkDesk", EXEC, "tkdesk")
	92	- ),
	93	- ("Editoren",
	94	- ("XFte", EXEC, "xfte"),
	95	- ("XEmacs", SHEXEC, "xemacs \|\| emacs"),
	96	- ("XJed", EXEC, "xjed"),
	97	- ("NEdit", EXEC, "nedit"),
	98	- ("Xedit", EXEC, "xedit"),
	99	- ("VI", EXEC, "xterm -e vi")
	100	- ),
	101	- ("Verschiedenes",
	102	- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
	103	- ("Xplaycd", EXEC, "xplaycd"),
	104	- ("Xmixer", EXEC, "xmixer")
	105	- ),
	106	- ("Werkzeuge",
	107	- ("Taschenrechner", EXEC, "xcalc"),
	108	- ("Fenstereigenschaften", SHEXEC, "xprop \| xmessage -center -title 'xprop' -file -"),
89f11e57	109	- ("Schriftartwähler", EXEC, "xfontsel"),
c5f39caf	110	- ("Terminalemulator", EXEC, "xminicom"),
89f11e57	111	- ("Vergrößern", EXEC, "xmag"),
c5f39caf	112	- ("Colormap", EXEC, "xcmap"),
	113	- ("XKill", EXEC, "xkill"),
	114	- ("ASClock", EXEC, "asclock -shape"),
	115	- ("Zwischenablage", EXEC, "xclipboard")
	116	- ),
f77e15e9	117	+ ("Anwendungen", OPEN_MENU, "\| vfmg wmaker-old "),
c5f39caf	118	("Auswahl",
	119	("Kopieren", SHEXEC, "echo '%s' \| wxcopy"),
	120	("Mail an", EXEC, "xterm -name mail -T Pine -e pine %s"),
	121	@@ -66,9 +28,9 @@
89f11e57	122	("Gespeicherte Sitzung löschen", CLEAR_SESSION)
c5f39caf	123	),
	124	("Erscheinungsbild",
	125	- ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes /home/mawa/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
	126	- ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles /home/mawa/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
89f11e57	127	- ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets /home/mawa/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
c5f39caf	128	+ ("Themen", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
c5f39caf	129	+ ("Stile", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
89f11e57	130	+ ("Iconsätze", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
c5f39caf	131	("Hintergrund",
	132	("Einfarbig",
	133	("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
	134	@@ -90,10 +52,11 @@
	135	("Grau schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
	136	("Weinfarben schattiert", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
	137	),
	138	- ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds /home/mawa/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	139	+ ("Bilder", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	140	),
	141	- ("Thema speichern", SHEXEC, "getstyle -t /home/mawa/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
	142	- ("Iconsatz speichern", SHEXEC, "geticonset /home/mawa/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
	143	+ ("Thema speichern", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
bda2f23a	144	+ ("Iconsatz speichern", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\""),
89f11e57	145	+ ("Einstellung", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
c5f39caf	146	),
	147	("Beenden",
	148	("Neustart", RESTART),
2ac920bc	149	diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.es WindowMaker-0.91.0/WindowMaker/plmenu.es
	150	--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.es 2004-10-23 05:50:00.000000000 +0200
	151	+++ WindowMaker-0.91.0/WindowMaker/plmenu.es 2004-11-02 00:54:17.672922368 +0100
	152	@@ -8,48 +8,10 @@
	153	("Paginas del Manual", EXEC, "xman")
	154	),
	155	("Ejecutar...", SHEXEC, "%a(Run,Type command to run:)"),
	156	- ("XTerm", EXEC, "xterm -sb"),
	157	- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
	158	+ ("XTerm", EXEC, "xterm"),
	159	+ ("ATerm", EXEC, "aterm"),
c5f39caf	160	("Espacio de Trabajo", WORKSPACE_MENU),
	161	- ("Aplicaciones",
	162	- ("Graficas",
	163	- ("Gimp", SHEXEC, "gimp >/dev/null"),
	164	- ("XV", EXEC, "xv"),
	165	- ("XPaint", EXEC, "xpaint"),
	166	- ("XFig", EXEC, "xfig")
	167	- ),
	168	- ("Explorador de Archivos", EXEC, "xfm"),
	169	- ("OffiX", EXEC, "files"),
	170	- ("LyX", EXEC, "lyx"),
	171	- ("Netscape", EXEC, "netscape"),
	172	- ("Ghostview", EXEC, "ghostview %a(Escribe el archivo que desees ver:)"),
	173	- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Escribe el archivo PDF que desees ver:)"),
	174	- ("TkDesk", EXEC, "tkdesk")
	175	- ),
	176	- ("Editores",
	177	- ("XFte", EXEC, "xfte"),
	178	- ("XEmacs", SHEXEC, "xemacs \|\| emacs"),
	179	- ("XJed", EXEC, "xjed"),
	180	- ("NEdit", EXEC, "nedit"),
	181	- ("Xedit", EXEC, "xedit"),
	182	- ("VI", EXEC, "xterm -e vi")
	183	- ),
	184	- ("Varios",
	185	- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
	186	- ("Xplaycd", EXEC, "xplaycd"),
	187	- ("Xmixer", EXEC, "xmixer")
	188	- ),
	189	- ("Utilidadess",
	190	- ("Calculadora", EXEC, "xcalc"),
	191	- ("Propiedades de las ventanas", SHEXEC, "xprop \| xmessage -center -title 'xprop' -file -"),
	192	- ("Seleccionar fuente", EXEC, "xfontsel"),
	193	- ("Emulador de terminal", EXEC, "xminicom"),
	194	- ("Usar la lupa", EXEC, "xmag"),
	195	- ("Mapa de colores", EXEC, "xcmap"),
	196	- ("XKill", EXEC, "xkill"),
	197	- ("ASClock", EXEC, "asclock -shape"),
	198	- ("Portapapeles", EXEC, "xclipboard")
	199	- ),
f77e15e9	200	+ ("Aplicaciones", OPEN_MENU, "\| vfmg wmaker-old "),
c5f39caf	201	("Seleccion",
	202	("Copiar", SHEXEC, "echo '%s' \| wxcopy"),
	203	("Enviar por correo", EXEC, "xterm -name mail -T Pine -e pine %s"),
	204	@@ -66,9 +28,9 @@
	205	("Borrar sesion", CLEAR_SESSION)
	206	),
	207	("Apariencia",
	208	- ("Temas", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
	209	- ("Estilos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
	210	- ("Grupos de iconos", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
	211	+ ("Temas", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
89f11e57	212	+ ("Estilos", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
c5f39caf	213	+ ("Grupos de iconos", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
	214	("Papel Tapiz",
	215	("Solido",
	216	("Negro", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
	217	@@ -90,11 +52,11 @@
	218	("Sombras grises", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
	219	("Sombras vino", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
	220	),
	221	- ("Imagenes", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	222	+ ("Imagenes", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	223	),
	224	("Guardar tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
	225	("Guardar iconos", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
89f11e57 JR	226	- ("Preferencias", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
89f11e57 JR	227	+ ("Preferencias", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
c5f39caf	228	),
	229	("Salir",
	230	("Reiniciar", RESTART),
2ac920bc	231	diff -ur WindowMaker-0.91.0.orig/WindowMaker/plmenu.fr WindowMaker-0.91.0/WindowMaker/plmenu.fr
	232	--- WindowMaker-0.91.0.orig/WindowMaker/plmenu.fr 2004-10-17 08:28:07.000000000 +0200
	233	+++ WindowMaker-0.91.0/WindowMaker/plmenu.fr 2004-11-02 00:54:41.222342312 +0100
	234	@@ -8,48 +8,10 @@
	235	("Butineur d'aide", EXEC, "xman")
	236	),
	237	("Démarrer...", SHEXEC, "%a(Démarrer,Tapez une commande à démarrer:)"),
	238	- ("Terminal X", EXEC, "xterm -sb"),
	239	- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
	240	+ ("XTerm", EXEC, "xterm"),
	241	+ ("ATerm", EXEC, "aterm"),
c5f39caf	242	("Bureau", WORKSPACE_MENU),
	243	- ("Applications",
	244	- ("Graphismes",
	245	- ("Gimp", SHEXEC, "gimp >/dev/null"),
	246	- ("XV", EXEC, "xv"),
	247	- ("XPaint", EXEC, "xpaint"),
	248	- ("XFig", EXEC, "xfig")
	249	- ),
	250	- ("Xfm", EXEC, "xfm"),
	251	- ("OffiX Files", EXEC, "files"),
	252	- ("LyX", EXEC , "lyx"),
	253	- ("Netscape", EXEC, "netscape"),
	254	- ("Ghostview", EXEC, "ghostview %a(Entrez un fichier)"),
	255	- ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Entrez un fichier PDF)"),
	256	- ("TkDesk", EXEC, "tkdesk")
	257	- ),
	258	- ("Editeurs",
	259	- ("XFte", EXEC, "xfte"),
	260	- ("XEmacs", SHEXEC, "xemacs \|\| emacs"),
	261	- ("XJed", EXEC, "xjed"),
	262	- ("NEdit", EXEC, "nedit"),
	263	- ("Xedit", EXEC, "xedit"),
	264	- ("VI", EXEC, "xterm -e vi")
	265	- ),
	266	- ("Divers",
	267	- ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
	268	- ("Xplaycd", EXEC, "xplaycd"),
	269	- ("Xmixer", EXEC, "xmixer")
	270	- ),
	271	- ("Utilitaires",
	272	- ("Calculatrice", EXEC, "xcalc"),
89f11e57 JR	273	- ("Propriétés de la fenêtre", SHEXEC, "xprop \| xmessage -center -title 'xprop' -file -"),
89f11e57 JR	274	- ("Sélecteur de polices", EXEC, "xfontsel"),
c5f39caf	275	- ("Emulateur de terminal", EXEC, "xminicom"),
	276	- ("Loupe", EXEC, "xmag"),
	277	- ("Carte des couleurs", EXEC, "xcmap"),
	278	- ("XKill", EXEC, "xkill"),
	279	- ("ASClock", EXEC, "asclock -shape"),
89f11e57	280	- ("Sélections", EXEC, "xclipboard")
c5f39caf	281	- ),
f77e15e9	282	+ ("Applications", OPEN_MENU, "\| vfmg wmaker-old "),
89f11e57	283	("Sélection",
c5f39caf	284	("Copier", SHEXEC, "echo '%s' \| wxcopy"),
89f11e57	285	("Envoyer à", EXEC, "xterm -name mail -T Pine -e pine %s"),
c5f39caf	286	@@ -66,9 +28,9 @@
	287	("Effacer la session", CLEAR_SESSION)
	288	),
	289	("Apparence",
89f11e57	290	- ("Thèmes", OPEN_MENU, "-noext /opt/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
c5f39caf	291	- ("Styles", OPEN_MENU, "-noext /opt/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
89f11e57 JR	292	- ("Jeu d'icônes", OPEN_MENU, "-noext /opt/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
89f11e57 JR	293	+ ("Thèmes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
c5f39caf	294	+ ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
89f11e57 JR	295	+ ("Jeu d'icônes", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
	296	("Fond d'écran",
	297	("Unifié",
c5f39caf	298	("Noir", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
c5f39caf	299	@@ -88,10 +50,11 @@
89f11e57 JR	300	("Dégradés de Gris", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
89f11e57 JR	301	("Dégradés de Bordeau", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
c5f39caf	302	),
	303	- ("Images", OPEN_MENU, "-noext /opt/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	304	+ ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
	305	),
89f11e57 JR	306	("Sauver le thème", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes /\"%a(Nom du thème,Entrez un nom de fichier:)\""),
	307	- ("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:)\"")
	308	+ ("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:)\""),
	309