LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File WindowMaker-menu.patch of Package WindowMaker (Project X11:windowmanagers)

diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu WindowMaker-0.95.4/WindowMaker/menu
--- WindowMaker-0.95.4.old/WindowMaker/menu	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu	2014-04-10 06:40:00.508787124 -0700
@@ -111,72 +111,18 @@
 	"Info" MENU
 		"Info Panel" INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"System Console" EXEC xconsole
-		"System Load" SHEXEC xosview || xload
-		"Process List" EXEC xterm -e top
-		"Manual Browser" EXEC xman
 	"Info" END
 	"Run..." SHEXEC %a(Run,Type command to run:)
 	"XTerm" EXEC xterm -sb 
-	"Mozilla Firefox" EXEC firefox
 	"Workspaces" WORKSPACE_MENU
-	"Applications" MENU
-		"Gimp" SHEXEC gimp >/dev/null
-  		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
-		"Xpdf" EXEC xpdf %a(Xpdf,Enter PDF to view)
-		"Abiword" EXEC abiword
-		"Dia" EXEC dia
-		"OpenOffice.org" MENU
-			"OpenOffice.org" EXEC ooffice
-			"Writer" EXEC oowriter
-			"Spreadsheet" EXEC oocalc
-			"Draw" EXEC oodraw
-			"Impress" EXEC ooimpress
-		"OpenOffice.org" END 
-
-		"Editors" MENU
-			"XEmacs" EXEC xemacs
-			"Emacs" EXEC emacs
-			"XJed" EXEC xjed 
-			"VI" EXEC xterm -e vi
-			"GVIM" EXEC gvim
-			"NEdit" EXEC nedit
-			"Xedit" EXEC xedit
-		"Editors" END
-
-		"Multimedia" MENU
-			"XMMS" MENU
-				"XMMS" EXEC xmms
-				"XMMS play/pause" EXEC xmms -t
-				"XMMS stop" EXEC xmms -s
-			"XMMS" END
-			"Xine video player" EXEC xine
-			"MPlayer" EXEC mplayer
-		"Multimedia" END
-	"Applications" END
-
-	"Utils" MENU
-		"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
-	"Utils" END
-
-	"Selection" MENU
-		"Copy" SHEXEC echo '%s' | wxcopy
-		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navigate" EXEC netscape %s
-		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
-	"Selection" END
-
 	"Commands" MENU
 		"Hide Others" HIDE_OTHERS
 		"Show All" SHOW_ALL
 		"Arrange Icons" ARRANGE_ICONS
 		"Refresh" REFRESH
 		"Lock" EXEC xlock -allowroot -usefirst
+		"Save Session" SAVE_SESSION
+		"Clear Session" CLEAR_SESSION
 	"Commands" END
 
 	"Appearance" MENU
@@ -185,40 +131,37 @@
 		"Icon Sets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
 		"Background" MENU
 			"Solid" MENU
-				"Black" WS_BACK '(solid, black)'
-				"Blue"  WS_BACK '(solid, "#505075")'
+                        	"Black" WS_BACK '(solid, black)'
+                        	"Blue"  WS_BACK '(solid, "#505075")'
 				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Bluemarine" WS_BACK '(solid, "#224477")'
-				"Purple" WS_BACK '(solid, "#554466")'
-				"Wheat"  WS_BACK '(solid, "wheat4")'
-				"Dark Gray"  WS_BACK '(solid, "#333340")'
-				"Wine" WS_BACK '(solid, "#400020")'
-				"Solid" END
+				"Bleumarine" WS_BACK '(solid, "#224477")'
+                        	"Purple" WS_BACK '(solid, "#554466")'
+                        	"Wheat"  WS_BACK '(solid, "wheat4")'
+                        	"Dark Gray"  WS_BACK '(solid, "#333340")'
+                        	"Wine" WS_BACK '(solid, "#400020")'
+			"Solid" END
 			"Gradient" MENU
 				"Sunset" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
 				"Sky" WS_BACK '(vgradient, blue4, white)'
-    			"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
+    				"Blue Shades" WS_BACK '(vgradient, "#7080a5", "#101020")'
 				"Indigo Shades" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
+			    	"Purple Shades" WS_BACK '(vgradient, "#654c66", "#151426")'
+    				"Wheat Shades" WS_BACK '(vgradient, "#a09060", "#302010")'
+    				"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
+    				"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
 			"Gradient" END
 			"Images" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
 		"Background" END
 		"Save Theme" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
 		"Save IconSet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Preferences Utility" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Preferences Utility" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Appearance" END
-
-	"Session" MENU
-		"Save Session" SAVE_SESSION
-		"Clear Session" CLEAR_SESSION
-		"Restart Window Maker" RESTART
-		"Start BlackBox" RESTART blackbox
-		"Start IceWM" RESTART icewm
+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+	"SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
+	"Exit"	MENU
+		"Restart" RESTART
 		"Exit"  EXIT
-	"Session" END
+	"Exit" END
 "Applications" END
 
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.bg WindowMaker-0.95.4/WindowMaker/menu.bg
--- WindowMaker-0.95.4.old/WindowMaker/menu.bg	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.bg	2014-04-10 06:40:00.509787124 -0700
@@ -115,60 +115,10 @@
 	"Инфо" MENU
 		"Информационен панел..." INFO_PANEL
 		"Лицензионен панел..." LEGAL_PANEL
-		"Системна конзола" EXEC xconsole
-		"Натоварване на системата" SHEXEC xosview || xload
-		"Списък процеси" EXEC xterm -e top
-		"Ръководства" EXEC xman
 	"Инфо" END
 	"Стартирай..." SHEXEC %a(Run,Въведете команда, която да се стартира:)
 	"XTerm" EXEC xterm -sb
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Работни места" WORKSPACE_MENU
-	"Приложения" MENU
-		"Графични" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Графични" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape
-		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-		"TkDesk" EXEC tkdesk
-	"Приложения" END
-	"Редактори" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Редактори" END
-	"Разни" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Разни" END
-	"Инструменти" MENU
-		"Калкукатор" EXEC xcalc
-		"Свойства на прозореца" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Избор на шрифт" EXEC xfontsel
-		"Емулатор на терминал" EXEC xminicom
-		"Лупа" EXEC xmag
-		"Цветова палитра" EXEC xcmap
-		"XKill" EXEC xkill
-		"Clipboard" EXEC xclipboard
-	"Инструменти" END
-
-	"Избор" MENU
-		"Copy" SHEXEC echo '%s' | wxcopy
-		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navigate" EXEC netscape %s
-		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
-	"Избор" END
 
 	"Работно място" MENU
 		"Скрий другите" HIDE_OTHERS
@@ -209,14 +159,12 @@
 		"Фон" END
 		"Запази темата" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
 		"Запази колекцията иконки" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Пособие за настройки" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Пособие за настройки" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Изглед" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Изход"	MENU
 		"Рестартиране" RESTART
-		"Стартирай BlackBox" RESTART blackbox
-		"Стартирай kwm" RESTART kwm
-		"Стартирай IceWM" RESTART icewm
 		"Изход..."  EXIT
 	"Изход" END
 "Приложения" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ca WindowMaker-0.95.4/WindowMaker/menu.ca
--- WindowMaker-0.95.4.old/WindowMaker/menu.ca	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ca	2014-04-10 06:40:00.509787124 -0700
@@ -110,60 +110,9 @@
         "Informació" MENU
                 "Info Panel..." INFO_PANEL
                 "Legal..." LEGAL_PANEL
-                "Consola del Sistema" EXEC xconsole
-                "Càrrega del Sistema" SHEXEC xosview || xload
-                "Llista de Processos" EXEC xterm -e top
-                "Manual d'instruccions" EXEC xman
         "Informació" END
         "XTerm" EXEC xterm -sb 
-        "Rxvt" EXEC rxvt -bg black -fg white -fn fixed
         "Escriptoris" WORKSPACE_MENU
-        "Aplicacions" MENU
-                "Gràfics" MENU
-                        "Gimp" SHEXEC gimp >/dev/null
-                        "XV" EXEC xv
-                        "XPaint" EXEC xpaint
-                        "XFig" EXEC xfig
-                "Gràfics" END
-                "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
-        "Aplicacions" END
-        "Editors" MENU
-                "XFte" EXEC xfte
-                "XEmacs" SHEXEC xemacs || emacs
-                "XJed" EXEC xjed 
-                "NEdit" EXEC nedit
-                "Xedit" EXEC xedit
-                "VI" EXEC xterm -e vi
-        "Editors" END
-        "Miscel·lani" MENU
-                "Xmcd" SHEXEC xmcd 2> /dev/null
-                "Xplaycd" EXEC xplaycd
-                "Xmixer" EXEC xmixer
-        "Miscel·lani" END
-        "Utilitats" MENU
-                "Calculadora" EXEC xcalc
-                "Propietats de la finestra" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-                "Sel·lecciona una Font" EXEC xfontsel
-                "Emulador de Terminal" EXEC xminicom
-                "Lupa" EXEC xmag
-                "Mapa de Color" EXEC xcmap
-                "XKill" EXEC xkill
-                "Portapapers" EXEC xclipboard
-        "Utilitats" END
-
-        "Sel·lecció" MENU
-                "Copiar" SHEXEC echo '%s' | wxcopy
-                "Enviar a" EXEC xterm -name mail -T "Pine" -e pine %s
-                "Enviar al Navegador" EXEC netscape %s
-                "Buscar al Manual" SHEXEC MANUAL_SEARCH(%s)
-        "Sel·lecció" END
-
         "Escriptori" MENU
                 "Amagar Altres" HIDE_OTHERS
                 "Ensenyar Totes" SHOW_ALL
@@ -203,13 +152,13 @@
                 "Fons de pantalla" END
                 "Guardar Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
                 "Guardar Joc d'Icones" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+		"WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
         "Aparença" END
-
+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
         "Sortir"        MENU
                 "Rearrancar" RESTART
-                "Arrancar AfterStep" RESTART afterstep
                 "Sortir..."  EXIT
-                "Matar la Sessió..." SHUTDOWN
         "Sortir" END
 "Aplicacions" END
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.cs WindowMaker-0.95.4/WindowMaker/menu.cs
--- WindowMaker-0.95.4.old/WindowMaker/menu.cs	1969-12-31 16:00:00.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.cs	2014-04-10 06:40:00.509787124 -0700
@@ -0,0 +1,85 @@
+// Text bellow is in czech, encoding ISO8829-2.
+//
+// Definice hlavního menu pro WindowMaker
+//
+// Syntaxe:
+//
+// <Titulek> <Příkaz> <Parametry>
+//
+// <Titulek> je jakýkoli řetěz znaků. Pokud obsahuje mezery musí být
+// 	uzavřen do uvozovek (")
+//
+// <Příkaz> může být jeden z následujících:
+//	MENU - definice nové (sub)menu
+//	END  - konec definice nového menu
+//	EXEC <program> - provede se program
+//	EXIT - ukončí se WindowMaker
+//	RESTART [<window manager>] - restart WM nebo jiného správce oken
+//	REFRESH - obnoví okna na pracovní ploše
+//	ARRANGE_ICONS - srovná ikony
+//	SHUTDOWN - ukončí všechny klienty i X server
+//	WORKSPACE_MENU - přidá menu pro práci s pracovními plochami
+//	SHOW_ALL - obnoví všechna skrytá okna
+//	HIDE_OTHERS - skryje všechna okna (mimo zaměřeného, nebo toho, které
+//                    bylo naposledy zaměřeno)
+//
+// <Parameters> je program, který bude proveden.
+//
+// Každý příkaz MENU musí mít odpovídající END.
+// následující text je česky, kódován ISO8859-2.
+#include <wmmacros>
+
+"Hlavní menu" MENU
+	"Info" MENU
+		"Info Panel..." INFO_PANEL
+		"Legal" LEGAL_PANEL
+	"Info" END
+	"XTerm" EXEC xterm -sb
+	"Pracovní plochy" WORKSPACE_MENU
+	"Pracovní plocha" MENU
+                "Skrýt ostatní" HIDE_OTHERS
+                "Ukázat vše" SHOW_ALL
+                "Srovnat ikony" ARRANGE_ICONS
+                "Obnovit obrazovku" REFRESH
+                "Zamknout" EXEC xlock -allowroot -usefirst
+                "Uložit sezení" SAVE_SESSION
+                "Smazat sezení" CLEAR_SESSION
+        "Pracovní plocha" END
+        "Vzhled" MENU
+	        "Témata" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
+                "Styly" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
+                "Ikony" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
+                "Pozadí" MENU
+                        "Jedna barva" MENU
+                                "Černá" WS_BACK '(solid, black)'
+                                "Modrá"  WS_BACK '(solid, "#505075")'
+                                "Indigo" WS_BACK '(solid, "#243e6c")'
+			        "Purpurová" WS_BACK '(solid, "#554466")'
+			        "Šedozelená" WS_BACK '(solid, "#554466")'
+			        "Tmavě šedá" WS_BACK '(solid, "#333340")'
+			        "Vínová"  WS_BACK '(solid, "#400020")'
+                        "Jedna barva" END
+                        "Přechod barev" MENU
+                                "Západ slunce" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+                                "Obloha" WS_BACK '(vgradient, blue4, white)'
+                                "Odstíny modré" WS_BACK '(vgradient, "#7080a5", "#101020")'
+                                "Odstíny indiga" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+                                "Odstíny fialové" WS_BACK '(vgradient, "#654c66", "#151426")'
+                                "Odstíny žluté" WS_BACK '(vgradient, "#a09060", "#302010")'
+                                "Odstíny šedé" WS_BACK '(vgradient, "#636380", "#131318")'
+                                "Odstíny vínové" WS_BACK '(vgradient, "#600040", "#180010")'
+                        "Přechod barev" END
+                        "Obrázky" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
+                "Pozadí" END
+                "Uložit téma" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+                "Uložit sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
+                "Konfigurační nástroj" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+         "Vzhled" END
+         "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+         "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
+ 	 "Konec"  MENU
+// 'Restartovat' není opravdu příliš české slovo, najde někdo lepší ?
+		"Restartovat" RESTART
+		"Ukončit..."  EXIT
+	 "Konec" END
+"Hlavní menu" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.da WindowMaker-0.95.4/WindowMaker/menu.da
--- WindowMaker-0.95.4.old/WindowMaker/menu.da	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.da	2014-04-10 06:40:00.509787124 -0700
@@ -103,62 +103,10 @@
         "Info" MENU
                 "Info Panel..." INFO_PANEL
                 "Copyright..." LEGAL_PANEL
-                "Systemkonsol" EXEC xconsole
-                "Systembelastning" SHEXEC xosview || xload
-                "Procesliste" EXEC xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top
-                "Manualer" EXEC xman
         "Info" END
 	"Kør..." SHEXEC "%a(Kør,Indtast kommando der skal udføres:)"
         "XTerm" EXEC xterm -sb 
-        "Rxvt" EXEC rxvt -bg black -fg white 
         "Arbejdsborde" WORKSPACE_MENU
-        "Applikationer" MENU
-                "Grafik" MENU
-                        "Gimp" SHEXEC gimp >/dev/null
-                        "XV" EXEC xv
-                        "XPaint" EXEC xpaint
-                        "XFig" EXEC xfig
-                "Grafik" END
-                "X Filhåndtering" EXEC xfm
-                "OffiX Files" EXEC files
-                "LyX" EXEC lyx
-                "Netscape" EXEC netscape 
-                "Ghostview" EXEC ghostview %a(GhostView,Indtast filnavn)
-                "Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)
-                "TkDesk" EXEC tkdesk
-        "Applikationer" END
-        "Tekstbehandling" MENU
-                "XFte" EXEC xfte
-                "Emacs" SHEXEC xemacs || emacs
-                "XJed" EXEC xjed 
-                "NEdit" EXEC nedit
-                "Xedit" EXEC xedit
-                "VI" EXEC xterm -e vi
-        "Tekstbehandling" END
-        "Diverse" MENU
-                "Xmcd" SHEXEC xmcd 2> /dev/null
-                "Xplaycd" EXEC xplaycd
-                "Xmixer" EXEC xmixer
-        "Diverse" END
-        "Tilbehør" MENU
-                "Lommeregner" EXEC xcalc
-                "Vindues Egenskaber" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-                "Vælg skrifttype" EXEC xfontsel
-                "Terminalemulator" EXEC xminicom
-                "Forstørrelsesglas" EXEC xmag
-                "Farver" EXEC xcmap
-                "XKill" EXEC xkill
-                "ASClock" EXEC asclock -shape
-                "Udklipsbord" EXEC xclipboard
-        "Tilbehør" END
-
-        "Markeret" MENU
-                "Kopier" SHEXEC echo '%s' | wxcopy
-                "Send e-post til" EXEC xterm -name mail -T "Pine" -e pine %s
-                "Indtast URL" EXEC netscape %s
-                "Søg i manual" SHEXEC MANUAL_SEARCH(%s)
-        "Markeret" END
-
         "Arbejdsbord" MENU
                 "Skjul andre" HIDE_OTHERS
                 "Vis alle" SHOW_ALL
@@ -200,12 +148,10 @@
                 "Gem Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Tema navn,Indtast navn:)"
                 "Gem Ikonsæt" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonsæt navn,Indtast navn:)"
         "Udseende" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
         "Afslut" MENU
                 "Genstart" RESTART
-                "Start Blackbox" RESTART blackbox
-		"Start kwm" RESTART kwm
-		"Start IceWM" RESTART icewm
                 "Afslut..."  EXIT
         "Afslut" END
 "Applikationer" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.de WindowMaker-0.95.4/WindowMaker/menu.de
--- WindowMaker-0.95.4.old/WindowMaker/menu.de	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.de	2014-04-10 06:40:00.509787124 -0700
@@ -44,55 +44,9 @@
 	"Info" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-  		"Systemauslastung" SHEXEC xosview || xload
-              	"Prozeßtabelle" EXEC xterm -e top
-		"Anleitungen" EXEC xman
 	"Info" END
 	"XTerm" SHEXEC xterm -sb || color-xterm -sb || xterm -sb
-	"XJed"	EXEC xjed
 	"Arbeitsfläche" WORKSPACE_MENU
-	"Anwendungen" MENU
-		"Grafik" MENU
-			"Gimp" EXEC gimp
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafik" END
-		"X Dateimanager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape
-               	"Ghostview" EXEC ghostview %a(Ghostview)
-                "XDvi" EXEC xdvi %a(XDvi)
-               	"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat)
-  		"TkDesk" EXEC tkdesk
-	"Anwendungen" END
-	"Editoren" MENU
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editoren" END
-	"Sonstiges" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Sonstiges" END
-	"Hilfsmittel" MENU
-		"Taschenrechner" EXEC xcalc
-		"Schriftauswahl" EXEC xfontsel
-		"Lupe" EXEC xmag
-		"Farbtabelle" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-	"Hilfsmittel" END
-        "Markierung" MENU
-                "email an" EXEC xterm -name mail -T "Pine" -e pine %s
-                "Navigate" SHEXEC netscape -noraise -remote \
-                       'openURL(%s,new-window)' || netscape %s
-                "in Anleitung suchen" SHEXEC MANUAL_SEARCH(%s)
-	"Markierung" END
         "Arbeitsplatz" MENU
                 "Andere verstecken" HIDE_OTHERS
                 "Alle anzeigen" SHOW_ALL
@@ -108,17 +62,13 @@
 			"Dunkelgrau" WS_BACK '(solid, "#333340")'
 			"Wein" WS_BACK '(solid, "#400020")'
 		"Hintergrund" END
-#if (DEPTH>=8)
-// Einbinden einiger Farbverläufe für Anfänger und Faulpelze.
-// Nach dem Ändern muß 'RESTART' ausgeführt werden
-#include <gradients.menu>
-#endif
-		"Arbeitsplatz sichern" EXEC SAVE_WORKSPACE
+		"Arbeitsplatz sichern" SAVE_SESSION
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Arbeitsplatz" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Beenden"	MENU
 		"Neustart" RESTART
-		"AfterStep starten" RESTART afterstep
 		"Beenden..."  EXIT
-		"Sitzung beenden..." SHUTDOWN
 	"Beenden" END
 "Anwendungen" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.el WindowMaker-0.95.4/WindowMaker/menu.el
--- WindowMaker-0.95.4.old/WindowMaker/menu.el	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.el	2014-04-10 06:40:00.510787124 -0700
@@ -118,62 +118,10 @@
 	"Πληροφορίες" MENU
 		"Σχετικά..." INFO_PANEL
 		"Νομικά..." LEGAL_PANEL
-		"Κονσόλα Συστήματος" EXEC xconsole
-		"Εργασία Συστήματος" SHEXEC xosview || xload
-		"Λίστα Εργασιών" EXEC xterm -e top
-		"Βοήθεια" EXEC xman
 	"Πληροφορίες" END
 	"Εκτέλεση..." SHEXEC %a(Εκτέλεση,Γράψε την εντολή προς εκτέλεση:)
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn grfixed
 	"Επιφάνειες" WORKSPACE_MENU
-	"Προγράμματα" MENU
-		"Γραφικά" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Γραφικά" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(Αρχείο προς ανάγνωση)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Γράψε το PDF προς προβολή)
-  		"TkDesk" EXEC tkdesk
-	"Προγράμματα" END
-	"Κειμενογράφοι" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Κειμενογράφοι" END
-	"Διάφορα" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Διάφορα" END
-	"Εργαλεία" MENU
-		"Αριθμομηχανή" EXEC xcalc
-		"Ιδιότητες Παραθύρου" SHEXEC xprop | xmessage -center -title 'Ιδιότητες Παραθύρου' -file -
-		"Επιλογή Γραμματοσειράς" EXEC xfontsel
-		"Εξομοιωτής Τερματικού" EXEC xminicom
-		"Μεγέθυνση" EXEC xmag
-		"Χάρτης Χρωμάτων" EXEC xcmap
-		"Θανάτωση Παραθύρου" EXEC xkill
-		"Ρολόι" EXEC asclock -shape
-		"Πρόχειρο" EXEC xclipboard
-	"Εργαλεία" END
-
-	"Επιλογή" MENU
-		"Αντιγραφή" SHEXEC echo '%s' | wxcopy
-		"Ταχυδρόμηση Προς" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Εξερεύνηση στο διαδίκτυο" EXEC netscape %s
-		"Αναζήτηση Βοήθειας" EXEC MANUAL_SEARCH(%s)
-	"Επιλογή" END
-
 	"Επιφάνεια" MENU
 		"Απόκρυψη των Άλλων" HIDE_OTHERS
 		"Εμφάνιση Όλων" SHOW_ALL
@@ -213,13 +161,12 @@
 		"Παρασκήνιο" END
 		"Αποθήκευση Θέματος" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Όνομα Θέματος,Γράψε το όνομα του αρχείου:)"
 		"Αποθήκευση Ομάδας Εικονιδίων" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Όνομα Ομάδας,Γράψε το όνομα του αρχείου:)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPref
 	"Εμφάνιση" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Έξοδος" MENU
 		 "Επανεκκίνηση" RESTART
-		 "Εκκίνηση του BlackBox" RESTART blackbox
-		 "Εκκίνηση του kwm" RESTART kwm
-		 "Εκκίνηση του IceWM" RESTART icewm
 		 "Έξοδος..."  EXIT
 	"Έξοδος" END
 "Μενού" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.es WindowMaker-0.95.4/WindowMaker/menu.es
--- WindowMaker-0.95.4.old/WindowMaker/menu.es	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.es	2014-04-10 06:40:00.510787124 -0700
@@ -43,62 +43,9 @@
 	"Informacion ..." MENU
 		"Copyright..." SHEXEC xmessage -center -font variable -title \
 	'WindowMaker 'WM_VERSION -file ~/GNUstep/Library/WindowMaker/Copyright
-		"Carga del sistema" SHEXEC xosview || xload
-		"Lista de tarifas (top)" EXEC rxvt -ls -fg white -bg black -fn vga -e top
-		"Manual" EXEC xman
 	"Informacion ..." END
 
-        "Emuladores ..." MENU
-	        "Terminal X" EXEC xterm
-                "Emulador de Terminal" EXEC rxvt -ls -fg white -bg black -fn vga
-        "Emuladores ..." END
-
-	"Aplicaciones ..." MENU
-	
-		"Graficos ..." MENU
-			"Gimp" EXEC gimp
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Graficos ..." END
-     
-                "Editores ..." MENU
-	                "XEmacs" SHEXEC xemacs || emacs
-			"XJed" EXEC xjed
-			"NEdit" EXEC nedit
-			"Xedit" EXEC xedit
-			"VI" EXEC xterm -e vi
-	        "Editores ..." END
-		
-		"Multimedia ..." MENU
-	                "Xmcd" SHEXEC xmcd 2> /dev/null
-			"Xplaycd" EXEC xplaycd
-			"Xmixer" EXEC xmixer
-		"Multimedia ..." END
-		
-		"Utilidades ..." MENU
-	                "Calculadora" EXEC xcalc
-			"Selector de fuente" EXEC xfontsel
-			"Lupa" EXEC xmag
-			"Mapa de colores" EXEC xcmap
-			"XKill" EXEC xkill
-			"ASClock" EXEC asclock -shape
-			"Portapapeles" EXEC xclipboard
-		"Utilidades ..." END
-		
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Ghostview" EXEC ghostview
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-		"TkDesk" EXEC tkdesk
-	"Aplicaciones ..." END
-
-	"Internet ..." MENU
-		"Correo" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navegar" EXEC netscape %s
-		"Buscar en el manual" EXEC xterm -name manualBrowser -e man %s
-	"Internet ..." END
+	"Terminal X" EXEC xterm
 
 	"Configurar Area de Trabajo ..." MENU
 		"Fondo ..." MENU
@@ -119,21 +66,14 @@
 		"Alinear iconos" ARRANGE_ICONS
 		"Refrescar" REFRESH
 		"Salvapantallas" EXEC xlock -allowroot -usefirst
-		"Grabar Area de trabajo" EXEC SAVE_WORKSPACE
+		"Grabar Area de trabajo" SAVE_SESSION
 	"Configurar Area de Trabajo ..." END
-
         "Areas de Trabajo ..." WORKSPACE_MENU
-	
-#if (UID==0)	// Só o ve root ou usuarios con UID=0
-	"Sistema" MENU
-		// Panel de control
-		"Panel de control de RH" EXEC control-panel
-	"Sistema" END
-#endif
+        "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Salir ..."	MENU
 		"Reinicializar" RESTART
-		"Iniciar AfterStep" RESTART afterstep
 		"Salir"  EXIT
-		"Salir de la sesion" SHUTDOWN
 	"Salir ..." END
 "Menu Principal" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fi WindowMaker-0.95.4/WindowMaker/menu.fi
--- WindowMaker-0.95.4.old/WindowMaker/menu.fi	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.fi	2014-04-10 06:40:00.510787124 -0700
@@ -108,61 +108,10 @@
 	"Tietoja" MENU
 		"Tietoja..." INFO_PANEL
 		"Laillista" LEGAL_PANEL
-		"Järjestelmäkonsoli" EXEC xconsole
-		"Järjestelmän rasitus" SHEXEC xosview || xload
-		"Prosessiluettelo" EXEC xterm -e top
-		"Ohjeselain" EXEC xman
 	"Tietoja" END
 	"Käynnistä..." SHEXEC %a(Käynnistä,Kirjoita suoritettava komento:)
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Työtilat" WORKSPACE_MENU
-	"Sovellukset" MENU
-		"Grafiikka" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafiikka" END
-		"X Tiedostonhallinta" EXEC xfm
-		"OffiX Tiedostot" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(GhostView,Kirjoita näytettävän tiedoston nimi:)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)
-  		"TkDesk" EXEC tkdesk
-	"Sovellukset" END
-	"Editorit" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editorit" END
-	"Sekalaiset" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Sekalaiset" END
-	"Apuohjelmat" MENU
-		"Laskin" EXEC xcalc
-		"Ikkunan ominaisuudet" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Kirjasinlajivalitsin" EXEC xfontsel
-		"Pääte" EXEC xminicom
-		"Suurennuslasi" EXEC xmag
-		"Värikartta" EXEC xcmap
-		"XKill" EXEC xkill
-		"Leikepöytä" EXEC xclipboard
-	"Apuohjelmat" END
-
-	"Valinta" MENU
-		"Kopioi" SHEXEC echo '%s' | wxcopy
-		"Lähetä sähköpostina" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Selaa selaimella" EXEC netscape %s
-		"Etsi ohjeista" SHEXEC MANUAL_SEARCH(%s)
-	"Valinta" END
-
 	"Työtila" MENU
 		"Piilota muut" HIDE_OTHERS
 		"Näytä kaikki ikkunat" SHOW_ALL
@@ -202,14 +151,12 @@
 		"Taustat" END
 		"Tallenna teema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Teeman nimi,Kirjoita teematiedoston nimi:)"
 		"Tallenna kuvakkeet" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Kuvakesetin nimi,Kirjoita tiedostonnimi:)"
-		"Asetukset" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Asetukset" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Ulkonäkö" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Lopeta"	MENU
 		"Käynnistä WM uudelleen" RESTART
-		"Käynnistä BlackBox" RESTART blackbox
-		"Käynnistä kwm" RESTART kwm
-		"Käynnistä IceWM" RESTART icewm
 		"Lopeta"  EXIT
 	"Lopeta" END
 "Sovellukset" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fr WindowMaker-0.95.4/WindowMaker/menu.fr
--- WindowMaker-0.95.4.old/WindowMaker/menu.fr	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.fr	2014-04-10 06:40:00.510787124 -0700
@@ -154,61 +154,10 @@
 	"Informations" MENU
 		"Panneau d'informations" INFO_PANEL
 		"Panneau d'informations légales" LEGAL_PANEL
-		"Console système" EXEC xconsole
-		"Charge système" SHEXEC xosview || xload
-		"Liste des processus" EXEC xterm -e top
-		"Butineur d'aide" EXEC xman
 	"Informations" END
 	"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
 	"Bureaux" WORKSPACE_MENU
-	"Applications" MENU
-		"Graphismes" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Graphismes" END
-		"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
-	"Applications" END
-	"Editeurs" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editeurs" END
-	"Divers" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Divers" END
-	"Utilitaires" MENU
-		"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
-		"Sélections" EXEC xclipboard
-	"Utilitaires" END
-	
-	"Sélection" MENU
-		"Copier" SHEXEC echo '%s' | wxcopy
-		"Envoyer à" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Naviguer" EXEC netscape %s
-		"Rechercher dans le manuel" SHEXEC MANUAL_SEARCH(%s)
-	"Sélection" END
-	
 	"Bureau" MENU
 		"Cacher les autres fenêtres" HIDE_OTHERS
 		"Montrer toutes les fenêtres" SHOW_ALL
@@ -248,12 +197,13 @@
 		"Fond d'écran" END
 		"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:)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Apparence" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Quitter" MENU
 		"Redémarrer" RESTART
-		"Démarrer AfterStep" RESTART afterstep
 		"Quitter..." EXIT
-		"Tuer la session..." SHUTDOWN
 	"Quitter" END
 "Applications" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.gl WindowMaker-0.95.4/WindowMaker/menu.gl
--- WindowMaker-0.95.4.old/WindowMaker/menu.gl	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.gl	2014-04-10 06:40:00.510787124 -0700
@@ -45,56 +45,9 @@
 	"Información" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"Carga do sistema" SHEXEC xosview || xload
-		"Lista de tarefas" EXEC rxvt -ls -fg white -bg black -fn vga -e top
-		"Manual" EXEC xman
 	"Información" END
-	"Emulador Terminal" EXEC rxvt -ls -fg white -bg black -fn vga
-	"XJed"	EXEC xjed 
+	"X Terminal" EXEC xterm -sb
 	"Areas de Traballo" WORKSPACE_MENU
-	"Aplicacións" MENU
-		"Gráficos" MENU
-			"Gimp" EXEC gimp
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Gráficos" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-  		"TkDesk" EXEC tkdesk
-	"Aplicacións" END
-	"Editores" MENU
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editores" END
-	"Variedade" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Variedade" END
-	"Utiles" MENU
-		"Calculadora" EXEC xcalc
-		"Selector de fonte" EXEC xfontsel
-		"Lupa" EXEC xmag
-		"Mapa de cor" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Portapapeis" EXEC xclipboard
-	"Utiles" END
-
-	"Selección" MENU
-		"Correo" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navegar" EXEC netscape %s
-		"Buscar no manual" EXEC xterm -name manualBrowser -e man %s
-	"Selección" END
-
 	"Area Traballo" MENU
 		"Fondo" MENU
 			"Ningún" EXEC CLEARROOT
@@ -114,13 +67,13 @@
 		"Aliñar iconos" ARRANGE_ICONS
 		"Refrescar" REFRESH
 		"Fechar" EXEC xlock -allowroot -usefirst
-		"Grabar Area de traballo" EXEC SAVE_WORKSPACE
+		"Grabar Area de traballo" SAVE_SESSION
 	"Area Traballo" END
-	
+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Sair"	MENU
 		"Reinicializar" RESTART
-		"Iniciar AfterStep" RESTART afterstep
 		"Sair..."  EXIT
-		"Sair da sesión..." SHUTDOWN
 	"Sair" END
 "Aplicacións" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.he WindowMaker-0.95.4/WindowMaker/menu.he
--- WindowMaker-0.95.4.old/WindowMaker/menu.he	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.he	2014-04-10 06:49:50.406780111 -0700
@@ -97,60 +97,9 @@
 	"עדימ" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"System Load" SHEXEC xosview || xload
-		"Process List" EXEC xterm -e top
-		"Manual Browser" EXEC xman
 	"עדימ" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"הדובע יבחרמ" WORKSPACE_MENU
-	"םימושי" MENU
-		"הקיפרג" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"הקיפרג" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"פייקסטנ" 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
-	"םימושי" END
-	"םיכרוע" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"םיכרוע" END
-	"יללכ" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"יללכ" END
-	"םילכ" MENU
-		"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
-	"םילכ" END
-
-	"הריחב" MENU
-		"קתעה" SHEXEC echo '%s' | wxcopy
-		"...ל ראודה חלש" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navigate" EXEC netscape %s
-		"Search in Manual" SHEXEC MANUAL_SEARCH(%s)
-	"הריחב" END
-
 	"הדובע בחרמ" MENU
 		"םירחא אבחה" HIDE_OTHERS
 		"םלוכ הארה" SHOW_ALL
@@ -184,13 +133,13 @@
 		"עקר" END
 		"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)"
+		"WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"הארמ" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"האיצי"	MENU
 		"לוחתיא" RESTART
-		"AfterStepל רובע " RESTART afterstep
 		"...אצ"  EXIT
-		"...לוכה רוגסו אצ" SHUTDOWN
 	"האיצי" END
 "םימושי" END
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hr WindowMaker-0.95.4/WindowMaker/menu.hr
--- WindowMaker-0.95.4.old/WindowMaker/menu.hr	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.hr	2014-04-10 06:40:00.511787124 -0700
@@ -97,62 +97,9 @@
 	"Informacije" MENU
                 "Info Panel..." INFO_PANEL
                 "Legal..." LEGAL_PANEL
-                "Sistemska konzola" EXEC xconsole
-                "Opterećenje sistema" SHEXEC xosview || xload
-                "Lista procesa" EXEC xterm -e top
-                "Pretraživač manuala" EXEC xman
 	"Informacije" END
 	"XTerm u boji" EXEC nxterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
-	"Xisp" EXEX xisp
 	"Radni prostori" WORKSPACE_MENU
-	"Programi" MENU
-		"Grafika" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafika" END
-		"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
-	"Programi" END
-	"Editori" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editori" END
-	"Razno" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Razno" END
-	"Pomoćni programi" MENU
-		"Kalkulator" EXEC xcalc
-		"Informacije o prozoru" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Birač fontova" EXEC xfontsel
-		"Emulator Terminala" EXEC xminicom
-		"Povećalo" EXEC xmag
-		"Colormap" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"Pomoćni programi" END
-
-	"Odabir" MENU
-		"Kopiraj" SHEXEC echo '%s' | wxcopy
-		"Pošalji e-poštu" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Otvori web-stranicu" EXEC netscape %s
-		"Potraži u manualu" SHEXEC MANUAL_SEARCH(%s)
-	"Odabir" END
-
 	"Radni prostor" MENU
 		"Sakrij ostale" HIDE_OTHERS
 		"Pokaži sve" SHOW_ALL
@@ -186,12 +133,12 @@
 		"Pozadina" END
 		"Snimi temu" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
 		"Snimi set ikona" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
-	"Izgled" END
-
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+       	"Izgled" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Izlaz"	MENU
 		"Ponovo startaj" RESTART
-		"Startaj AfterStep" RESTART afterstep
 		"Izlaz"  EXIT
-		"Izlaz iz sessiona..." SHUTDOWN
 	"Izlaz" END
 "Programi" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hu WindowMaker-0.95.4/WindowMaker/menu.hu
--- WindowMaker-0.95.4.old/WindowMaker/menu.hu	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.hu	2014-04-10 06:40:00.511787124 -0700
@@ -111,62 +111,10 @@
 	"Infó" MENU
 		"Információs panel..." INFO_PANEL
 		"Jogi..." LEGAL_PANEL
-		"Rendszer konzol" EXEC xconsole
-		"Rendszer kihasználtság" SHEXEC xosview || xload
-		"Processz lista" EXEC xterm -e top
-		"Kézikönyv böngésző" EXEC xman
 	"Infó" END
 	"Futtatás..." SHEXEC %a(Futtatás,Írd be a futtatni kívánt programot:)
 	"X Terminál" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
-	"Gnome terminál" EXEC gnome-terminal --background black --foreground white --font -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1
 	"Munkafelületek" WORKSPACE_MENU
-	"Alkalmazások" MENU
-		"Grafika" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafika" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(GhostView,Kérem a fájl nevét)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Kérem a PDF fájl nevét)
-  		"TkDesk" EXEC tkdesk
-	"Alkalmazások" END
-	"Szerkesztők" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Szerkesztők" END
-	"Egyéb" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Egyéb" END
-	"Kellékek" MENU
-		"Számológép" EXEC xcalc
-		"Ablak jellemzők" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Font kiválasztás" EXEC xfontsel
-		"Terminál emuláció" EXEC xminicom
-		"Képernyőterület másolása" EXEC xmag
-		"Színtérkép" EXEC xcmap
-		"Program kilövése" EXEC xkill
-		"Vágólap" EXEC xclipboard
-	"Kellékek" END
-
-	"Kijelölés" MENU
-		"Másolás" SHEXEC echo '%s' | wxcopy
-		"Levél írása" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Netscape" EXEC netscape %s
-		"Keresés a Manuálokban" SHEXEC MANUAL_SEARCH(%s)
-	"Kijelölés" END
-
 	"Munkafelület" MENU
 		"Elrejtés" HIDE_OTHERS
 		"Mindent mutat" SHOW_ALL
@@ -204,14 +152,13 @@
 		"Háttér" END
 		"Téma mentése" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Téma neve,Add meg a téma fájl nevét:)"
 		"Ikonbeállítások mentése" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikonbeállítások mentése,Add meg a fájl nevét:)"
-		"Konfiguráló program" EXEC /usr/bin/WPrefs
+		"Konfiguráló program" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Megjelenés" END
 
+	"WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+	"SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Kilépés"	MENU
 		"Újraindítás" RESTART
-		"BlackBox indítása" RESTART blackbox
-		"kwm indítása" RESTART kwm
-		"IceWM indítása" RESTART icewm
 		"Kilépés..."  EXIT
 	"Kilépés" END
 "Alkalmazások" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.it WindowMaker-0.95.4/WindowMaker/menu.it
--- WindowMaker-0.95.4.old/WindowMaker/menu.it	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.it	2014-04-10 06:40:00.511787124 -0700
@@ -45,58 +45,9 @@
 	"Informazioni" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"Carico del Sistema" SHEXEC xosview || xload
-		"Lista dei Processi" EXEC xterm -e top
-		"Ricerca Manuali" EXEC xman
 	"Informazioni" END
 	"XTerm" SHEXEC xterm -sb || color-xterm -sb || xterm -sb
-	"XJed"	EXEC xjed 
 	"Area di lavoro" WORKSPACE_MENU
-	"Applicazioni" MENU
-		"Grafica" MENU
-			"Gimp" EXEC gimp
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafica" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(Ghostview)
-                "XDvi" EXEC xdvi %a(XDvi)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat)
-  		"TkDesk" EXEC tkdesk
-	"Applicazioni" END
-	"Editori" MENU
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editori" END
-	"Varie" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Varie" END
-	"Utilita'" MENU
-		"Calcolatore" EXEC xcalc
-		"Selezione Font" EXEC xfontsel
-		"Lente" EXEC xmag
-		"Mappa Colori" EXEC xcmap
-		"Assassinio X" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"Utilita'" END
-
-	"Selezione" MENU
-		"Invio posta a.." EXEC xterm -name mail -T "Pine" -e pine %s
-	        "Navigare" SHEXEC netscape -noraise -remote \
-			'openURL(%s,new-window)' || netscape %s
-		"Ricerca nei Manuali" SHEXEC MANUAL_SEARCH(%s)
-	"Selezione" END
-
 	"Area di lavoro" MENU
 		"Nascondi Altri" HIDE_OTHERS
 		"Mostra Tutti" SHOW_ALL
@@ -117,13 +68,13 @@
 // E' necessario rieiniziare dopo avere selezionato il gradiente.
 #include <gradients.menu>
 #endif
-		"Salva area di lavoro" EXEC SAVE_WORKSPACE
+		"Salva area di lavoro" SAVE_SESSION
 	"Area di lavoro" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	
 	"Uscire"	MENU
 		"Restart" RESTART
-		"Avviare AfterStep" RESTART afterstep
 		"Uscire..."  EXIT
-		"Uscire dalla sessione..." SHUTDOWN
 	"Uscire" END
 "Applicazioni" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ja WindowMaker-0.95.4/WindowMaker/menu.ja
--- WindowMaker-0.95.4.old/WindowMaker/menu.ja	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ja	2014-04-10 06:50:56.520779325 -0700
@@ -103,61 +103,8 @@
 	"情報" MENU
 		"Info パネル..." INFO_PANEL
 		"Legal パネル..." LEGAL_PANEL
-		"システム負荷" SHEXEC xosview || xload
-		"プロセス一覧" EXEC xterm -e top
-		"マニュアルブラウザ" EXEC xman
 	"情報" END
-	"KTerm" EXEC kterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white
 	"ワークスペース" WORKSPACE_MENU
-	"アプリケーション" MENU
-		"グラフィックス" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"グラフィックス" END
-		"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
-	"アプリケーション" END
-	"エディタ" MENU
-		"Mule" EXEC mule
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC kterm -e vi
-	"エディタ" END
-	"いろいろ" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"いろいろ" END
-	"ユーティリティ" MENU
-		"電卓" EXEC xcalc
-		"プロパティ表示" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"フォントセレクタ" EXEC xfontsel
-		"端末エミュレータ" EXEC xminicom
-		"眼鏡" EXEC xmag
-		"カラーマップ" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"ユーティリティー" END
-
-	"セレクション" MENU
-		"コピー" SHEXEC echo '%s' | wxcopy
-		"Mail To" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Netscape" EXEC netscape %s
-		"マニュアル検索" SHEXEC MANUAL_SEARCH(%s)
-	"セレクション" END
-
 	"ワークスペース" MENU
 		"他をハイド" HIDE_OTHERS
 		"全て表示" SHOW_ALL
@@ -191,13 +138,13 @@
 		"背景" END
 		"現在の設定をテーマとしてセーブ" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
 		"現在のアイコン集をセーブ" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"外観" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"終了"	MENU
 		"再起動" RESTART
-		"AfterStepを起動" RESTART afterstep
 		"終了..."  EXIT
-		"セッションを終了..." SHUTDOWN
 	"終了" END
 "アプリケーション" END
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ko WindowMaker-0.95.4/WindowMaker/menu.ko
--- WindowMaker-0.95.4.old/WindowMaker/menu.ko	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ko	2014-04-10 06:40:00.511787124 -0700
@@ -102,57 +102,7 @@
 	"정    보" MENU
 		"정보 패널" INFO_PANEL
 		"저작권 정보" LEGAL_PANEL
-		"시스템 로드" SHEXEC xosview || xload
-		"매뉴얼 찾기" EXEC xman
-		"프로세스목록" EXEC xterm -e top
 	"정    보" END
-	"한    텀" SHORTCUT SHIFT+META+H EXEC hanterm
-	"명 령 창" SHORTCUT SHIFT+META+C EXEC %a(실행할 명령:)
-	"입 력 기" SHORTCUT SHIFT+META+I SHEXEC ami || hanIM
-	"프로그램" MENU
-		"터 미 널" MENU
-			"한    텀" EXEC hanterm
-			"하얀한텀" SHORTCUT CONTROL+META+H EXEC hanterm -fg black -bg gray75
-			"관 리 자" SHORTCUT SHIFT+META+R EXEC hanterm -T 관리자 -n 관리자 -name root -e sudo su -
-			"엑 스 텀" SHEXEC nxterm || xterm
-		"터 미 널" END
-		"네트워크" MENU
-			"모 질 라" SHORTCUT SHIFT+META+N EXEC netscape
-			"유 즈 넷" EXEC hanterm -T 유즈넷 -n 유즈넷 -e slrn -C
-			"이 메 일" EXEC hanterm -T 이메일 -n 이메일 -e mutt
-			"나우누리" EXEC hanterm -T 나우누리 -n 나우누리 -e ztelnet nownuri.net
-			"하 이 텔" EXEC hanterm -T 하이텔 -n 하이텔 -e ztelnet home.hitel.net
-			"천 리 안" EXEC hanterm -T 천리안 -n 천리안 -e ztelnet chonllian.net
-			"가    우" SHEXEC gau || gaui
-		"네트워크" END 
-		"편 집 기" MENU
-			"VIM" EXEC hanterm -T VIM -n VIM -e vim
-			"이맥스" EXEC emacs
-			"피  코" EXEC hanterm -T 피코 -n 피코 -e pico
-		"편 집 기" END
-		"그 래 픽" MENU
-			"XV" EXEC xv
-			"GIMP" EXEC gimp
-			"GQview" EXEC gqview
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"그 래 픽" END
-		"도구모음" MENU
-			"계 산 기" EXEC xcalc
-			"창 속 성" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-			"글꼴보기" EXEC xfontsel
-			"돋 보 기" EXEC xmag
-			"컬 러 맵" EXEC xcmap
-			"강제종료" EXEC xkill
-			"클립보드" EXEC xclipboard
-		"도구모음" END
-		"멀티미디어" MENU
-			"믹    서" SHEXEC xmixer || hanterm -T AuMIX -n AuMix -e aumix
-			"MPEG 보기" EXEC mtv
-			"MP3 연주기" SHEXEC xmms || x11amp
-			"CD 연주기" EXEC xplaycd
-		"멀티미디어" END
-	"프로그램" END
 	"작업공간" WORKSPACE_MENU
 	"창 관 리" MENU
 		"다른창 숨김" HIDE_OTHERS
@@ -163,7 +113,7 @@
 		"세션 지움" CLEAR_SESSION
 	"창 관 리" END
 	"작업환경" MENU
-		"설    정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
+		"설    정" SHEXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
 		"테    마" OPEN_MENU -noext THEMES_DIR ~/GNUstep/Library/WindowMaker/Themes WITH setstyle
 		"테마저장" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(테마 이름,파일 이름을 입력하세요:)"
 		"아이콘셋" OPEN_MENU -noext ICON_SETS_DIR ~/GNUstep/Library/WindowMaker/IconSets WITH seticons
@@ -188,7 +138,6 @@
 				"타일형식" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
 				"가 운 데" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -e
 			"그    림" END
-#if (DEPTH>8)
 			"그래디언트" MENU
 				"Flag" WS_BACK '(mdgradient, green, red, white, green)'
 				"Sky" WS_BACK '(vgradient, blue4, white)'
@@ -199,21 +148,13 @@
 				"Grey Shades" WS_BACK '(vgradient, "#636380", "#131318")'
 				"Wine Shades" WS_BACK '(vgradient, "#600040", "#180010")'
 			"그래디언트" END
-#endif
 		"배경화면" END
 	"작업환경" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"화면잠금" SHORTCUT SHIFT+META+L EXEC xlock -allowroot -usefirst -nice +20
 	"종    료" MENU
 		"재 시 작" RESTART
-		"재 시 작" MENU
-			"BlackBox" RESTART blackbox
-			"KDE" RESTART kwm
-			"IceWM" RESTART icewm
-			"AfterStep" RESTART afterstep
-			"Enlightenment" RESTART enlightenment
-			"FVWM2" RESTART fvwm2
-		"재 시 작" END
 		"종    료" EXIT
-		"세션종료" SHUTDOWN
 	"종    료" END
 "윈도우메이커" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.nl WindowMaker-0.95.4/WindowMaker/menu.nl
--- WindowMaker-0.95.4.old/WindowMaker/menu.nl	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.nl	2014-04-10 06:40:00.512787124 -0700
@@ -35,48 +35,9 @@
 	"Info" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"Xosview" EXEC xosview
-		"Top"	EXEC xterm -e top
-		"Handleidingszoeker" EXEC xman
 	"Info" END
 	"XTerm" SHEXEC xterm -sb || color-xterm -sb || xterm -sb
-	"XJed"	EXEC xjed
 	"Werkplaatsen" WORKSPACE_MENU
-	"Applicaties" MENU
-		"Grafische toepassingen" MENU
-			"Gimp" EXEC gimp
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafische toepassingen" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape
-  		"Ghostview" EXEC ghostview
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread
-  		"TkDesk" EXEC tkdesk
-	"Applicaties" END
-	"Editors" MENU
-		"XEmacs" EXEC xemacs
-		"XJed" EXEC xjed
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editors" END
-	"Diverse" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Diverse" END
-	"Utils" MENU
-		"Calculator" EXEC xcalc
-		"Font Chooser" EXEC xfontsel
-		"Magnify" EXEC xmag
-		"Colormap" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock
-	"Utils" END
 	"Werkplaats" MENU
 		"Achtergrond" MENU
 			"-" 	EXEC CLEARROOT
@@ -97,12 +58,12 @@
 		"Herschik iconen" ARRANGE_ICONS
 		"Ververs" REFRESH
 		"Blokkeren" EXEC xlock -allowroot -usefirst
-		"Opslaan werkplaats" EXEC SAVE_WORKSPACE
+		"Opslaan werkplaats" SAVE_SESSION
 	"Werkplaats" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Exit"	MENU
 		"Herstart" RESTART
-		"Start AfterStep" RESTART afterstep
 		"Afsluiten..."  EXIT
-		"Afsluiten sessie..." SHUTDOWN
 	"Exit" END
 "Applicaties" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.no WindowMaker-0.95.4/WindowMaker/menu.no
--- WindowMaker-0.95.4.old/WindowMaker/menu.no	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.no	2014-04-10 06:40:00.512787124 -0700
@@ -100,58 +100,9 @@
 	"Info" MENU
 		"Lisens..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"System Belastning" SHEXEC xosview || xload
-		"Prosess Liste" EXEC xterm -e top
-		"Manual leser" EXEC stepman
 	"Info" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Arbeids-Områder" WORKSPACE_MENU
-	"Applikasjoner" MENU
-		"Grafikk" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafikk" END
-		"X Fil Behandler" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(Navnet på fila du vil se)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Skriv inn PDF\'en du ønsker)
-  		"TkDesk" EXEC tkdesk
-	"Applikasjoner" END
-	"Tekst Redigering" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Tekst Redigering" END
-	"Diverse" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Diverse" END
-	"Verktøy" MENU
-		"Kalkulator" EXEC xcalc
-		"Font Velger" EXEC xfontsel
-		"Forstørrelsesglass" EXEC xmag
-		"Fargekart" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"Verktøy" END
-
-	"Utvalg" MENU
-		"Kopier" SHEXEC echo '%s' | wxcopy
-		"Send e-mail" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Gå til (www)" EXEC netscape %s
-		"Søke i manualer" SHEXEC MANUAL_SEARCH(%s)
-	"UtValg" END
-
 	"Arbeidsområder" MENU
 		"Skjule andre" HIDE_OTHERS
 		"Vise alle" SHOW_ALL
@@ -183,12 +134,12 @@
 		"Bakgrunn" END
 		"Lagre Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
 		"Lagre Ikonsett" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Utseende" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Avslutt"	MENU
 		"Restart" RESTART
-		"Start Afterstep" RESTART afterstep
 		"Avslutt WindowMaker..."  EXIT 
-		"Avslutt X11..." SHUTDOWN
 	"Avslutt" END
 "Applikasjoner" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pl WindowMaker-0.95.4/WindowMaker/menu.pl
--- WindowMaker-0.95.4.old/WindowMaker/menu.pl	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.pl	2014-04-10 06:40:00.512787124 -0700
@@ -104,125 +104,12 @@
 	"Informacja" MENU
 		"Informacja o WMaker..." INFO_PANEL
 		"Legalność..."           LEGAL_PANEL
-		"Konsola Systemu"        EXEC xconsole
-		"Obciążenie Systemu"     EXEC xosview || xload
-		"Lista Procesów"         EXEC ULUB_TERM -T "Lista Procesów" -e top
-		"Przeglądarka Manuali"   EXEC xman
 	"Informacja" END
 	
-	"Konfiguracja" MENU	
-		"Edycja menu"       EXEC ULUB_TERM -T "Edycja menu" -e ULUB_EDYTOR $HOME/GNUstep/Library/WindowMaker/menu
-		"Ustawienie fontów" EXEC ULUB_TERM -T "Ustawienie fontów" -e ULUB_EDYTOR $HOME/GNUstep/Defaults/WMGLOBAL
-		"Konfiguracja"      EXEC ULUB_TERM -T "Konfiguracja" -e ULUB_EDYTOR $HOME/GNUstep/Defaults/WindowMaker
-	"Konfiguracja" END
-	
-	"Uruchom..." EXEC %a(Uruchom,Wpisz komende do uruchomienia:)
 	"Terminal"   EXEC ULUB_TERM -T "Mój ulubiony terminal" -sb 
-	"Edytor"     EXEC ULUB_TERM -T "Moj ulubiony edytor" -e ULUB_EDYTOR %a(Edytor,Podaj plik do edycji:)
+//	"Edytor"     EXEC ULUB_TERM -T "Moj ulubiony edytor" -e ULUB_EDYTOR %a(Edytor,Podaj plik do edycji:)
 	"Pulpity"    WORKSPACE_MENU
 	
-	"Aplikacje" MENU
-		"Grafika" MENU
-			"Gimp"        EXEC gimp >/dev/null
-			"XV"          EXEC xv
-			"XFig"        EXEC xfig
-			"XPaint"      EXEC xpaint
-			"Gnuplot"     EXEC ULUB_TERM -T "GNU plot" -e gnuplot
-			"Edytor ikon" EXEC bitmap
-		"Grafika" END
-		"Tekst" MENU
-			"LyX"                 EXEC lyx
-  			"Ghostview"           EXEC gv %a(GhostView,Wprowadz nazwe pliku *.ps *.pdf *.no:)
-  			"XDvi"                EXEC xdvi %a(XDvi,Wprowadz nazwe pliku *.dvi:)
-			"Acrobat"             EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)
-			"Xpdf"                EXEC xpdf %a(Xpdf,Wprowadz nazwe pliku *.pdf:)
-			"Arkusz kalkulacyjny" EXEC xspread
-		"Tekst" END
-		"X File Manager"     EXEC xfm
-		"OffiX Files"        EXEC files
-		"TkDesk"             EXEC tkdesk
-		"Midnight Commander" EXEC ULUB_TERM -T "Midnight Commander" -e mc
-		"X Gnu debbuger"     EXEC xxgdb
-		"Xwpe"               EXEC xwpe
-	"Aplikacje" END
-	
-	"Internet" MENU
-		"Przeglądarki" MENU
-			"Netscape" EXEC netscape 
-			"Arena"    EXEC arena
-			"Lynx"     EXEC ULUB_TERM -e lynx %a(Lynx,Podaj URL:)
-		"Przeglądarki" END
-		"Programy pocztowe" MENU
-			"Pine" EXEC ULUB_TERM -T "Program pocztowy Pine" -e pine 
-			"Elm"  EXEC ULUB_TERM -T "Program pocztowy Elm" -e elm
-			"Xmh"  EXEC xmh
-		"Programy pocztowe" END
-		"Emulator terminala" MENU
-			"Minicom" EXEC xminicom
-			"Seyon"   EXEC seyon
-		"Emulator terminala" END
-		"Telnet"     EXEC ULUB_TERM -e telnet %a(Telnet,Podaj nazwe hosta:)
-		"Ssh"        EXEC ULUB_TERM -e ssh %a(Ssh,Podaj nazwe hosta:)
-		"Ftp"        EXEC ULUB_TERM -e ftp %a(Ftp,Podaj nazwe hosta:)
-		"Irc"        EXEC ULUB_TERM -e irc %a(Irc,Podaj swoj pseudonim:)
-		"Ping"       EXEC ULUB_TERM -e ping %a(Ping,Podaj nazwe hosta:)
-		"Talk"       EXEC ULUB_TERM -e talk %a(Talk,Podaj nazwe uzytkownika, z ktorym chcesz nawiazac polaczenie:)
-	"Internet" END
-
-	"Editory" MENU
-		"XFte"    EXEC xfte
-		"XEmacs"  EXEC xemacs || emacs
-		"XJed"    EXEC xjed 
-		"NEdit"   EXEC nedit
-		"Xedit"   EXEC xedit
-		"Editres" EXEC editres
-		"VI"      EXEC ULUB_TERM -e vi
-	"Editory" END
-	
-	"Dźwięk" MENU
-		"CDPlay"  EXEC workbone
-		"Xmcd"    EXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer"  EXEC xmixer
-	"Dźwięk" END
-	
-    "Gry" MENU
-    	"Maze"      EXEC maze
-    	"Karty "    EXEC spider
-    	"Londownik" EXEC xlander
-    	"Szachy "   EXEC xboard
-    	"Xeyes"     EXEC xeyes -geometry 51x23
-    	"Xmahjongg" EXEC xmahjongg
-    	"Xlogo"     EXEC xlogo
-    	"Xroach"    EXEC xroach
-    	"Xtetris"   EXEC xtetris -color
-    	"Xvier"     EXEC xvier
-    	"Xgas"      EXEC xgas
-    	"Xkobo"     EXEC xkobo
-    	"xboing"    EXEC xboing -sound
-    	"XBill"     EXEC xbill
-    "Gry" END
-	
-	"Użytki" MENU
-		"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
-		"XKill"               EXEC xkill
-		"Clipboard"           EXEC xclipboard
-	"Użytki" END
-
-	"Selekcyjne" MENU
-		"Kopia"                  EXEC echo '%s' | wxcopy
-		"Poczta do ..."          EXEC ULUB_TERM -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
-		"Pobierz plik z FTP ..." EXEC ftp %s
-	"Selekcyjne" END
-
 	"Ekran" MENU
 		"Ukryj Pozostałe"         HIDE_OTHERS
 		"Pokaż wszystko"          SHOW_ALL
@@ -262,14 +149,12 @@
 		"Tło" END
 		"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:)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Wygląd" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Wyjście" MENU
 		"Przeładowanie"    RESTART
-		"Start BlackBox"   RESTART blackbox
-		"Start kwm"        RESTART kwm
-		"Start IceWM"      RESTART icewm
 		"Wyjście..."       EXIT
-		"Zabicie sesji..." SHUTDOWN
 	"Wyjście" END
 "WindowMaker" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pt WindowMaker-0.95.4/WindowMaker/menu.pt
--- WindowMaker-0.95.4.old/WindowMaker/menu.pt	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.pt	2014-04-10 06:40:00.512787124 -0700
@@ -106,61 +106,9 @@
 	"Informações" MENU
 		"Informações..." INFO_PANEL
 		"Informações Legais" LEGAL_PANEL
-		"Console do Sistema" EXEC xconsole
-		"Carga do Sistema" SHEXEC xosview || xload
-		"Lista de Processos" EXEC xterm -e top
-		"Leitor de Manual" EXEC xman
 	"Informações" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Áreas de Trabalho" WORKSPACE_MENU
-	"Aplicações" MENU
-		"Gráficos" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Gráficos" END
-		"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
-	"Aplicações" END
-	"Editores" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editores" END
-	"Diversos" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Diversos" END
-	"Utilitários" MENU
-		"Calculadora" EXEC xcalc
-		"Propriedades da Janela" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Seletor de Fontes" EXEC xfontsel
-		"Emulador de Terminal" EXEC xminicom
-		"Lente de Aumento" EXEC xmag
-		"Colormap" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"Utilitários" END
-
-	"Seleção" MENU
-		"Copiar" SHEXEC echo '%s' | wxcopy
-		"eMail Para" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navegar" EXEC netscape %s
-		"Procurar Manual" SHEXEC MANUAL_SEARCH(%s)
-	"Seleção" END
-
 	"Área de Trabalho" MENU
 		"Hide Outros" HIDE_OTHERS
 		"Mostrar Todos" SHOW_ALL
@@ -194,13 +142,14 @@
 		"Papéis de Parede" END
 		"Salvar Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Nome do Tema)"
 		"Salvar Configuração de Ícones" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Nome do Conjunto de Ícones)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Appearance" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Sair"	MENU
 		"Reiniciar" RESTART
-		"Iniciar AfterStep" RESTART afterstep
 		"Sair..."  EXIT
-		"Terminar Sessão..." SHUTDOWN
 	"Sair" END
 "Aplicações" END
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ro WindowMaker-0.95.4/WindowMaker/menu.ro
--- WindowMaker-0.95.4.old/WindowMaker/menu.ro	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ro	2014-04-10 06:40:00.512787124 -0700
@@ -108,61 +108,10 @@
 	"Informaţii" MENU
 		"Panou cu Informaţii" INFO_PANEL
 		"Panou cu Licenţa" LEGAL_PANEL
-		"Consola Sistem" EXEC xconsole
-		"Încărcarea Sistemului" SHEXEC xosview || xload
-		"Lista Proceselor" EXEC xterm -e top
-		"Navigator de Pagini Man" EXEC xman
 	"Informaţii" END
 	"Execută..." SHEXEC %a(Execută,Introduceţi o comandă:)
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn -misc-fixed-medium-*-*--*-*-*-*-*-*-iso8859-2 -fb -misc-fixed-medium-*-*--*-*-*-*-*-*-iso8859-2
 	"Spaţii de Lucru" WORKSPACE_MENU
-	"Aplicaţii" MENU
-		"Grafică" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafică" END
-		"Manager de Fişiere" EXEC xfm
-		"Fisiere OffiX" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(GhostView,Enter file to view)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Enter PDF to view)
-  		"TkDesk" EXEC tkdesk
-	"Aplicaţii" END
-	"Editoare" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Editoare" END
-	"Altele" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Altele" END
-	"Utilitare" MENU
-		"Calculator" EXEC xcalc
-		"Proprietăţile Ferestrei..." SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Navigator de Fonturi" EXEC xfontsel
-		"Emulator de Terminal" EXEC xminicom
-		"Lupă" EXEC xmag
-		"Culori" EXEC xcmap
-		"Omoară Fereastra..." EXEC xkill
-		"Clipboard" EXEC xclipboard
-	"Utilitare" END
-
-	"Selecţie" MENU
-		"Copiază" SHEXEC echo '%s' | wxcopy
-		"Poştă către" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navighează" EXEC netscape %s
-		"Caută în Manual" SHEXEC MANUAL_SEARCH(%s)
-	"Selecţie" END
-
 	"Spaţiu de Lucru" MENU
 		"Ascunde Celelalte" HIDE_OTHERS
 		"Arată Tot" SHOW_ALL
@@ -200,16 +149,14 @@
 			"Gradientat" END
 			"Imagini" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
 		"Fundal" END
-		"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+ 		"Salvează Tema" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
 		"Salvează Setul de Iconiţe" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
-		"Utilitar de Configurare" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Utilitar de Configurare" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Configurare" END
-
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 	"Ieşire" MENU
 		"Repornire" RESTART
-		"Porneşte BlackBox" RESTART blackbox
-		"Porneşte kwm" RESTART kwm
-		"Porneşte IceWM" RESTART icewm
 		"Ieşi"  EXIT
 	"Ieşire" END
 "Aplicaţii" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ru WindowMaker-0.95.4/WindowMaker/menu.ru
--- WindowMaker-0.95.4.old/WindowMaker/menu.ru	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.ru	2014-04-10 06:40:00.513787124 -0700
@@ -57,70 +57,19 @@
 	"Информация" MENU
 		"Info Panel..." INFO_PANEL
 		"Legal" LEGAL_PANEL
-		"Нагрузка Системы" SHEXEC xosview || xload
-		"Список Процессов" EXEC xterm -e top
-		"Просмотр Руководств" EXEC xman
 	"Информация" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
-	"XJed"	EXEC xjed 
 	"Рабочие места" WORKSPACE_MENU
-	"Приложения" MENU
-		"Графические" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Графические" END
-		"Менеджер файлов X" 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
-	"Приложения" END
-	"Редакторы" MENU
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Редакторы" END
-	"Разное" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Разное" END
-	"Утилиты" MENU
-		"Калькулятор" EXEC xcalc
-		"Выбрать шрифт" EXEC xfontsel
-		"Увеличитель" EXEC xmag
-		"Карта цветов" EXEC xcmap
-		"XKill" EXEC xkill
-		"Часы" EXEC asclock -shape
-		"Буфер обмена" EXEC xclipboard
-	"Утилиты" END
-
-	"Выделение" MENU
-		"Копировать" SHEXEC echo '%s' | wxcopy
-		"Отправить" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Искать в Интернет" EXEC netscape %s
-		"Искать в Руководствах" SHEXEC MANUAL_SEARCH(%s)
-	"Выделение" END
-
 	"Рабочее место" MENU
 		"Убрать остальные" HIDE_OTHERS
 		"Показать все" SHOW_ALL
 		"Упорядочить значки" ARRANGE_ICONS
 		"Обновить" REFRESH
 		"Запереть" EXEC xlock -allowroot -usefirst
-		"Сохранить Рабочее место" EXEC SAVE_WORKSPACE
+		"Сохранить Рабочее место" SAVE_SESSION
 	"Рабочее место" END
 
 	"Внешний вид" MENU
-/*		"Темы" OPEN_MENU themes.menu 
-*/
 		"Фон" MENU
 			"Однотонный" MENU
                         	"Черный" WS_BACK '(solid, black)'
@@ -136,12 +85,13 @@
 			"Градиент" END
 		"Фон" END
 		"Стили" OPEN_MENU styles.menu
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Внешний вид" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Выход"	MENU
 		"Перезапустить" RESTART
-		"Запустить Afterstep" RESTART afterstep
 		"Завершить работу..."  EXIT 
-		"Завершить сессию..." SHUTDOWN
 	"Выход" END
 "Приложения" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sk WindowMaker-0.95.4/WindowMaker/menu.sk
--- WindowMaker-0.95.4.old/WindowMaker/menu.sk	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.sk	2014-04-10 06:40:00.513787124 -0700
@@ -122,61 +122,10 @@
 	"Informácie" MENU
 		"Panel Info" INFO_PANEL
 		"Panel Legal" LEGAL_PANEL
-		"Systémová konzola" EXEC xconsole
-		"Zaťaženie systému" SHEXEC xosview || xload
-		"Zoznam procesov" EXEC xterm -e top
-		"Prehliadač manuálov" EXEC xman
 	"Informácie" END
 	"Spustiť..." SHEXEC %a(Spustiť,Zadajte príkaz:)
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Pracovné plochy" WORKSPACE_MENU
-	"Aplikácie" MENU
-		"Grafika" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafika" END
-		"Správca súborov Xfm" EXEC xfm
-		"Správca súborov OffiX" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(GhostView,Zadajte meno súboru)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(Acrobar,Zadajte meno PDF súboru)
-  		"TkDesk" EXEC tkdesk
-	"Aplikácie" END
-	"Editory" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VIM" EXEC xterm -e vim
-	"Editory" END
-	"Rôzne" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"CD prehrávač" EXEC xplaycd
-		"Mixer" EXEC xmixer
-	"Rôzne" END
-	"Nástroje" MENU
-		"Kalkulačka" EXEC xcalc
-		"Vlastnosti okien" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Výber fontu" EXEC xfontsel
-		"Emulátor terminálu" EXEC xminicom
-		"Lupa" EXEC xmag
-		"Paleta" EXEC xcmap
-		"Zabiť okno" EXEC xkill
-		"Nástenka" EXEC xclipboard
-	"Nástroje" END
-
-	"Výber" MENU
-		"Kopírovať" SHEXEC echo '%s' | wxcopy
-		"Poslať poštu" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Prehliadať web" EXEC netscape %s
-		"Hľadať v manuáli" SHEXEC MANUAL_SEARCH(%s)
-	"Výber" END
-
 	"Pracovná plocha" MENU
 		"Skryť ostatné" HIDE_OTHERS
 		"Zobraziť všetky" SHOW_ALL
@@ -216,14 +165,13 @@
 		"Pozadie" END
 		"Uložiť tému" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Meno témy,Zadajte názov súboru:)"
 		"Uložiť sadu ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Meno sady ikon,Zadajte názov súboru:)"
-		"Konfiguračný nástroj" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Konfiguračný nástroj" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Vzhľad" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Koniec" MENU
 		"Reštartovať" RESTART
-		"Spustiť BlackBox" RESTART blackbox
-		"Spustiť kwm" RESTART kwm
-		"Spustiť IceWM" RESTART icewm
 		"Koniec"  EXIT
 	"Koniec" END
 "Aplikácie" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sl WindowMaker-0.95.4/WindowMaker/menu.sl
--- WindowMaker-0.95.4.old/WindowMaker/menu.sl	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.sl	2014-04-10 06:40:00.513787124 -0700
@@ -105,61 +105,9 @@
 	"Informacije" MENU
 		"Informacije o programu..." INFO_PANEL
 		"Licenca..." LEGAL_PANEL
-		"Sistemska konzola" EXEC xconsole
-		"Obremenitev sistema" SHEXEC xosview || xload
-		"Seznam procesov" EXEC xterm -e top
-		"Pomoč (Iskalec man strani)" EXEC xman
 	"Informacije" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Delovni prostori" WORKSPACE_MENU
-	"Aplikacije" MENU
-		"Grafika" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Grafika" END
-		"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
-	"Aplikacije" END
-	"Urejevalniki besedil" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Urejevalniki besedil" END
-	"Drugo" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Drugo" END
-	"Uporabi programi" MENU
-		"Kalkulator" EXEC xcalc
-		"Lastnosti oken" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Pregled pisav" EXEC xfontsel
-		"Terminal emulator" EXEC xminicom
-		"Povecevalno steklo" EXEC xmag
-		"Barvna lestvica" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Odlagališče (clipboard)" EXEC xclipboard
-	"Uporabni programi" END
-
-	"Izbira" MENU
-		"Kopiraj" SHEXEC echo '%s' | wxcopy
-		"Pošlji po pošti" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Odpri WEB stran" EXEC netscape %s
-		"Poišči v navodilih" EXEC MANUAL_SEARCH(%s)
-	"Izbira" END
-
 	"Delovni prostor" MENU
 		"Skrij druge" HIDE_OTHERS
 		"Pokaži vse" SHOW_ALL
@@ -193,12 +141,13 @@
 		"Odzadje" END
 		"Shrani temo" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
 		"Shrani zbirko ikon" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"Izgled" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Izhod"	MENU
 		"Ponovno zaženi" RESTART
-		"Poženi AfterStep" RESTART afterstep
 		"Izhod..."  EXIT
-		"Izhod iz session..." SHUTDOWN
 	"Izhod" END
 "Aplikacije" END
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.tr WindowMaker-0.95.4/WindowMaker/menu.tr
--- WindowMaker-0.95.4.old/WindowMaker/menu.tr	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.tr	2014-04-10 06:40:00.513787124 -0700
@@ -91,61 +91,9 @@
 	"Bilgi" MENU
 		"Copyright..." EXEC xmessage -center -font variable -title \
 	'WindowMaker 'WM_VERSION -file $HOME/GNUstep/Library/WindowMaker/Copyright
-		"Sistem Konsolu" EXEC xconsole
-		"Sistem Yükü" SHEXEC xosview || xload
-		"Süreç Dökümü" EXEC xterm -e top
-		"Kılavuz Tarayıcısı" EXEC xman
 	"Bilgi" END
 	"XTerm" EXEC xterm -sb 
-	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
 	"Çalışma Alanları" WORKSPACE_MENU
-	"Uygulamalar" MENU
-		"Görüntü" MENU
-			"Gimp" SHEXEC gimp >/dev/null
-			"XV" EXEC xv
-			"XPaint" EXEC xpaint
-			"XFig" EXEC xfig
-		"Graphics" END
-		"X File Manager" EXEC xfm
-		"OffiX Files" EXEC files
-		"LyX" EXEC lyx
-		"Netscape" EXEC netscape 
-  		"Ghostview" EXEC ghostview %a(PS dosyasını girin)
-		"Acrobat" EXEC /usr/local/Acrobat3/bin/acroread %a(PDF dosyasını girin)
-  		"TkDesk" EXEC tkdesk
-	"Uygulamalar" END
-	"Düzenleyiciler" MENU
-		"XFte" EXEC xfte
-		"XEmacs" SHEXEC xemacs || emacs
-		"XJed" EXEC xjed 
-		"NEdit" EXEC nedit
-		"Xedit" EXEC xedit
-		"VI" EXEC xterm -e vi
-	"Düzenleyiciler" END
-	"Çeşitli" MENU
-		"Xmcd" SHEXEC xmcd 2> /dev/null
-		"Xplaycd" EXEC xplaycd
-		"Xmixer" EXEC xmixer
-	"Çeşitli" END
-	"Yardımcılar" MENU
-		"Hesap Makinası" EXEC xcalc
-		"Pencere Özellikleri" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Yazı tipi Tarayıcısı" EXEC xfontsel
-		"Terminal Öykümcüsü" EXEC xminicom
-		"Büyüteç" EXEC xmag
-		"Renk Tablosu" EXEC xcmap
-		"XKill" EXEC xkill
-		"ASClock" EXEC asclock -shape
-		"Clipboard" EXEC xclipboard
-	"Yardımcılar" END
-
-	"Seçim" MENU
-		"Kopyala" SHEXEC echo '%s' | wxcopy
-		"Mail ile gönder" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Ağ'da tara" EXEC netscape %s
-		"Kılavuzda ara" SHEXEC MANUAL_SEARCH(%s)
-	"Seçim" END
-
 	"Çalışma Alanı" MENU
 		"Diğerlerini Sakla" HIDE_OTHERS
 		"Hepsini Göster" SHOW_ALL
@@ -179,13 +127,15 @@
 		"Arkaplan" END
 		"Tema Sakla" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name)"
 		"Simge Kümesi Sakla" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name)"
+                "WPrefs" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+
 	"Görünüm" END
+        "WindowMaker" OPEN_MENU /etc/X11/WindowMaker/SuSE_wmapps
+        "SuSE" OPEN_MENU "| xdg_menu --format WindowMaker --charset UTF-8"
 
 	"Çıkış"	MENU
 		"Yeniden Başlat" RESTART
-		"AfterStep Başlat" RESTART afterstep
 		"Çıkış..."  EXIT
-		"Oturumu Kapat..." SHUTDOWN
 	"Çıkış" END
 "Ana Menü" END
 
diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW WindowMaker-0.95.4/WindowMaker/menu.zh_TW
--- WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/menu.zh_TW	2014-04-10 06:53:22.923777584 -0700
@@ -199,7 +199,7 @@
 		"背景" END
 		"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
 		"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
-		"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"偏好設定公用程式" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
 	"外觀" END
 
 	"離開"	MENU
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu WindowMaker-0.95.4/WindowMaker/plmenu
--- WindowMaker-0.95.4.old/WindowMaker/plmenu	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu	2014-04-10 06:40:00.517787124 -0700
@@ -1,106 +1,55 @@
 ("Applications",
  ("Info",
   ("Info Panel", INFO_PANEL),
-  ("Legal", LEGAL_PANEL),
-  ("System Console", EXEC, "xconsole"),
-  ("System Load", SHEXEC, "xosview || xload"),
-  ("Process List", EXEC, "xterm -e top"),
-  ("Manual Browser", EXEC, "xman")
- ),
+  ("Legal", LEGAL_PANEL)
+  ),
  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Mozilla Firefox", EXEC, "firefox"),
  ("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")
- ),
- ("Selection",
-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "mozilla %s"),
-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
- ),
  ("Commands",
   ("Hide Others", HIDE_OTHERS),
   ("Show All", SHOW_ALL),
   ("Arrange Icons", ARRANGE_ICONS),
   ("Refresh", REFRESH),
-  ("Lock", EXEC, "xlock -allowroot -usefirst")
- ),
+  ("Lock", EXEC, "xlock -allowroot -usefirst"),
+  ("Save Session", SAVE_SESSION),
+  ("Clear Session", CLEAR_SESSION)
+  ),
  ("Appearance",
   ("Themes", 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"),
   ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
   ("Background",
    ("Solid",
-	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+    ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+    ("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+    ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+    ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
+    ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+    ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+    ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+    ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
    ),
    ("Gradient",
-	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+    ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+    ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+    ("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+    ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+    ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+    ("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+    ("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+    ("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
    ),
    ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),
-   ("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")
-   ),
-   ("Session",
-    ("Save Session", SAVE_SESSION),
-    ("Clear Session", CLEAR_SESSION),
-	("Restart Window Maker", RESTART),
-	("Start BlackBox", RESTART, blackbox),
-	("Start IceWM", RESTART, icewm),
-	("Exit", EXIT)
-   )
+  ("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/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+  ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
+ ("Exit",
+  ("Restart", RESTART),
+  ("Exit", EXIT)
+ )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.bg WindowMaker-0.95.4/WindowMaker/plmenu.bg
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.bg	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.bg	2014-04-10 06:40:00.518787124 -0700
@@ -1,61 +1,10 @@
 ("Приложения",
  ("Инфо",
-  ("Информационен панел...", INFO_PANEL),
-  ("Лицензионен панел...", LEGAL_PANEL),
-  ("Системна конзола", EXEC, "xconsole"),
-  ("Натоварване на системата", SHEXEC, "xosview || xload"),
-  ("Списък на процесите", EXEC, "xterm -e top"),
-  ("Ръководства", EXEC, "xman")
+  ("Лицензионен панел...", LEGAL_PANEL)
   ),
  ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("Работни места", WORKSPACE_MENU),
- ("Приложения",
-  ("Графични",
-   ("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")
-  ),
- ("Редактори",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Разни",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Инструменти",
-  ("Калкулатор", EXEC, "xcalc"),
-  ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Избор на шрифт", EXEC, "xfontsel"),
-  ("Емулатор на терминал", EXEC, "xminicom"),
-  ("Лупа", EXEC, "xmag"),
-  ("Цветна палитра", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
- ("Избор",
-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "netscape %s"),
-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Работно място",
   ("Скрий другите", HIDE_OTHERS),
   ("Покажи всички", SHOW_ALL),
@@ -94,13 +43,12 @@
    ),
   ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
   ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+  ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Изход",
   ("Рестартиране", RESTART),
-  ("Стартирай BlackBox", RESTART, blackbox),
-  ("Стартирай kwm", RESTART, kwm),
-  ("Стартирай IceWM", RESTART, icewm),
   ("Изход...", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.cs WindowMaker-0.95.4/WindowMaker/plmenu.cs
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.cs	1969-12-31 16:00:00.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.cs	2014-04-10 06:40:00.513787124 -0700
@@ -0,0 +1,158 @@
+(
+"Hlavní menu",
+	(
+	"Info",
+		("Info Panel...", INFO_PANEL),
+		("Legal", LEGAL_PANEL)
+	),
+	("Spustit...", SHEXEC, "%a(Spustit, Zadajte příkaz:)"),
+	(
+	"XTerm",
+	EXEC,
+	"xterm -sb"
+	),
+	("Pracovní plochy", WORKSPACE_MENU),
+	(
+	"Pracovní plocha",
+                ("Skrýt ostatní", HIDE_OTHERS),
+                ("Ukázat vše", SHOW_ALL),
+                ("Srovnat ikony", ARRANGE_ICONS),
+                ("Obnovit obrazovku", REFRESH),
+                (
+                "Zamknout",
+                EXEC,
+                "xlock -allowroot -usefirst"
+                ),
+                ("Uložit sezení", SAVE_SESSION),
+                ("Smazat sezení", CLEAR_SESSION)
+        ),
+        (
+        "Vzhled",
+	        (
+	        "Témata",
+	        OPEN_MENU,
+	        "-noext #wmdatadir#/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
+	        ),
+                (
+                "Styly",
+                OPEN_MENU,
+                "-noext #wmdatadir#/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
+                ),
+                (
+                "Ikony",
+                OPEN_MENU,
+                "-noext #wmdatadir#/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
+                ),
+                (
+                "Pozadí",
+                        (
+                        "Jedna barva",
+                                (
+                                "Černá",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(solid, black)'"
+                                ),
+                                (
+                                "Modrá",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(solid, \"#505075\")'"
+                                ),
+                                (
+                                "Indigo",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(solid, \"#243e6c\")'"
+                                ),
+			        (
+			        "Purpurová",
+			        EXEC,
+			        "wdwrite WindowMaker WorkspaceBack  '(solid, \"#554466\")'"
+			        ),
+			        (
+			        "Šedozelená",
+			        EXEC,
+			        "wdwrite WindowMaker WorkspaceBack  '(solid, \"#554466\")'"
+			        ),
+			        (
+			        "Tmavě šedá",
+			        EXEC,
+			        "wdwrite WindowMaker WorkspaceBack  '(solid, \"#333340\")'"
+			        ),
+			        (
+			        "Vínová",
+			        EXEC,
+			        "wdwrite WindowMaker WorkspaceBack  '(solid, \"#400020\")'"
+			        )
+                        ),
+                        (
+                        "Přechod barev",
+                                (
+                                "Západ slunce",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"
+                                ),
+                                (
+                                "Obloha",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, blue4, white)'"
+                                ),
+                                (
+                                "Odstíny modré",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#7080a5\", \"#101020\")'"
+                                ),
+                                (
+                                "Odstíny indiga",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#746ebc\", \"#242e4c\")'"
+                                ),
+                                (
+                                "Odstíny fialové",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#654c66\", \"#151426\")'"
+                                ),
+                                (
+                                "Odstíny žluté",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#a09060\", \"#302010\")'"
+                                ),
+                                (
+                                "Odstíny šedé",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#636380\", \"#131318\")'"
+                                ),
+                                (
+                                "Odstíny vínové",
+                                EXEC,
+                                "wdwrite WindowMaker WorkspaceBack  '(vgradient, \"#600040\", \"#180010\")'"
+                                )
+                        ),
+                        (
+                        "Obrázky",
+                        OPEN_MENU,
+                        "-noext #wmdatadir#/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+                        )
+                ),
+                ("Uložit téma", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+                ("Uložit sadu ikon", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+                (
+                "Konfigurační nástroj",
+                EXEC,
+                "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
+                )
+         ),
+         (
+         "WindowMaker",
+         OPEN_MENU,
+         "/etc/X11/WindowMaker/SuSE_wmapps"
+         ),
+         (
+         "SuSE",
+         OPEN_MENU,
+         "| xdg_menu --format WindowMaker --charset UTF-8"
+         ),
+ 	 (
+ 	 "Konec",
+		("Restartovat", RESTART),
+		("Ukončit...", EXIT)
+	 )
+)
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.da WindowMaker-0.95.4/WindowMaker/plmenu.da
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.da	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.da	2014-04-10 06:40:00.514787124 -0700
@@ -3,23 +3,7 @@
         (
         "Info",
                 ("Info Panel...", INFO_PANEL),
-                ("Ophavsret...", LEGAL_PANEL),
-                (
-                "Systemkonsol",
-                EXEC,
-                "xconsole"
-                ),
-                ("Systembelastning", SHEXEC, "xosview || xload"),
-                (
-                "Procesliste",
-                EXEC,
-                "xterm -fg wheat -bg black -fn 6x10 -geometry 80x50 -e top"
-                ),
-                (
-                "Manualer",
-                EXEC,
-                "xman"
-                )
+                ("Ophavsret...", LEGAL_PANEL)
         ),
 	("Kør...", SHEXEC, "%a(Kør,Indtast kommando der skal udføres:)"),
         (
@@ -27,172 +11,8 @@
         EXEC,
         "xterm -sb"
         ),
-        (
-        "Rxvt",
-        EXEC,
-        "rxvt -bg black -fg white"
-        ),
         ("Arbejdsborde", WORKSPACE_MENU),
         (
-        "Applikationer",
-                (
-                "Grafik",
-                        ("Gimp", SHEXEC, "gimp >/dev/null"),
-                        (
-                        "XV",
-                        EXEC,
-                        "xv"
-                        ),
-                        (
-                        "XPaint",
-                        EXEC,
-                        "xpaint"
-                        ),
-                        (
-                        "XFig",
-                        EXEC,
-                        "xfig"
-                        )
-                ),
-                (
-                "X-filhåndtering",
-                EXEC,
-                "xfm"
-                ),
-                (
-                "OffiX Files",
-                EXEC,
-                "files"
-                ),
-                (
-                "LyX",
-                EXEC,
-                "lyx"
-                ),
-                (
-                "Netscape",
-                EXEC,
-                "netscape"
-                ),
-                (
-                "Ghostview",
-                EXEC,
-                "ghostview %a(GhostView,Indtast filnavn)"
-                ),
-                (
-                "Acrobat",
-                EXEC,
-                "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Indtast PDF-filnavn)"
-                ),
-                (
-                "TkDesk",
-                EXEC,
-                "tkdesk"
-                )
-        ),
-        (
-        "Tekstbehandling",
-                (
-                "XFte",
-                EXEC,
-                "xfte"
-                ),
-                ("Emacs", SHEXEC, "xemacs || emacs"),
-                (
-                "XJed",
-                EXEC,
-                "xjed"
-                ),
-                (
-                "NEdit",
-                EXEC,
-                "nedit"
-                ),
-                (
-                "Xedit",
-                EXEC,
-                "xedit"
-                ),
-                (
-                "VI",
-                EXEC,
-                "xterm -e vi"
-                )
-        ),
-        (
-        "Diverse",
-                ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-                (
-                "Xplaycd",
-                EXEC,
-                "xplaycd"
-                ),
-                (
-                "Xmixer",
-                EXEC,
-                "xmixer"
-                )
-        ),
-        (
-        "Tilbehør",
-                (
-                "Lommeregner",
-                EXEC,
-                "xcalc"
-                ),
-                ("Vinduesegenskaber", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-                (
-                "Vælg skrifttype",
-                EXEC,
-                "xfontsel"
-                ),
-                (
-                "Terminalemulator",
-                EXEC,
-                "xminicom"
-                ),
-                (
-                "Forstørrelsesglas",
-                EXEC,
-                "xmag"
-                ),
-                (
-                "Farver",
-                EXEC,
-                "xcmap"
-                ),
-                (
-                "XKill",
-                EXEC,
-                "xkill"
-                ),
-                (
-                "ASClock",
-                EXEC,
-                "asclock -shape"
-                ),
-                (
-                "Udklipsbord",
-                EXEC,
-                "xclipboard"
-                )
-        ),
-        (
-        "Markering",
-                ("Kopiér", SHEXEC, "echo '%s' | wxcopy"),
-                (
-                "Send e-post til",
-                EXEC,
-                "xterm -name mail -T Pine -e pine %s"
-                ),
-                (
-                "Indtast URL",
-                EXEC,
-                "netscape %s"
-                ),
-                ("Søg i manual", EXEC, "MANUAL_SEARCH(%s)")
-        ),
-        (
         "Arbejdsbord",
                 ("Skjul andre", HIDE_OTHERS),
                 ("Vis alle", SHOW_ALL),
@@ -211,17 +31,17 @@
                 (
                 "Temaer",
                 OPEN_MENU,
-                "-noext /usr/local/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
+                "-noext #wmdatadir#/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
                 ),
                 (
                 "Stil",
                 OPEN_MENU,
-                "-noext /usr/local/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
+                "-noext #wmdatadir#/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
                 ),
                 (
                 "Ikonsæt",
                 OPEN_MENU,
-                "-noext /usr/local/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
+                "-noext #wmdatadir#/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
                 ),
                 (
                 "Baggrund",
@@ -319,18 +139,18 @@
                         (
                         "Billeder",
                         OPEN_MENU,
-                        "-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+                        "-noext #wmdatadir#/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
                         )
                 ),
                 ("Gem Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Tema navn,Indtast navn:)"),
-                ("Gem Ikonsæt", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikonsæt navn,Indtast navn:)")
+                ("Gem Ikonsæt", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikonsæt navn,Indtast navn:)"),
+                ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
         ),
+        ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+        ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
         (
         "Afslut",
                 ("Genstart", RESTART),
-                ("Start Blackbox", RESTART, blackbox),
-		("Start kwm", RESTART, kwm),
-		("Start IceWM", RESTART, icewm),
                 ("Afslut...", EXIT)
         )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.de WindowMaker-0.95.4/WindowMaker/plmenu.de
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.de	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.de	2014-04-10 06:42:15.996785513 -0700
@@ -1,61 +1,11 @@
 ("Anwendungen",
  ("Info",
   ("Infokasten...", INFO_PANEL),
-  ("Rechtliches...", LEGAL_PANEL),
-  ("Systemkonsole", EXEC, "xconsole"),
-  ("Systemlast", SHEXEC, "xosview || xload"),
-  ("Prozessliste", EXEC, "xterm -e top"),
-  ("Man-Page-Betrachter", EXEC, "xman")
+  ("Rechtliches...", LEGAL_PANEL)
   ),
  ("Ausführen...", SHEXEC, "%a(Ausführen,Auszuführender Befehl:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("Arbeitsflächen", WORKSPACE_MENU),
- ("Anwendungen",
-  ("Grafik",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X File Manager", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(Zu betrachtende Datei:)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(PDF-Datei angeben)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Editoren",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Verschiedenes",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Werkzeuge",
-  ("Taschenrechner", EXEC, "xcalc"),
-  ("Fenstereigenschaften", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Schriftartwähler", EXEC, "xfontsel"),
-  ("Terminalemulator", EXEC, "xminicom"),
-  ("Vergrößern", EXEC, "xmag"),
-  ("Colormap", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Zwischenablage", EXEC, "xclipboard")
-  ),
- ("Auswahl",
-  ("Kopieren", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail an", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Mit Browser darstellen", EXEC, "netscape %s"),
-  ("In Man-Pages suchen", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Arbeitsfläche",
   ("Andere verbergen", HIDE_OTHERS),
   ("Alle zeigen", SHOW_ALL),
@@ -66,9 +16,9 @@
   ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
   ),
  ("Erscheinungsbild",
-  ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Themen", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Stile", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Iconsätze", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
   ("Hintergrund",
    ("Einfarbig",
     ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,16 +40,16 @@
     ("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)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ("Bilder", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds $(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),   
   ("Thema speichern", SHEXEC, "getstyle -t $(HOME)/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
   ("Iconsatz speichern", SHEXEC, "geticonset $(HOME)/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
-  ), 
+  ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+  ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Beenden",
   ("Neustart", RESTART),
-  ("BlackBox starten", RESTART, blackbox),
-  ("kwm starten", RESTART, kwm),
-  ("IceWM starten", RESTART, icewm),
   ("Beenden...", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.es WindowMaker-0.95.4/WindowMaker/plmenu.es
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.es	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.es	2014-04-10 06:40:00.514787124 -0700
@@ -1,61 +1,10 @@
 ("Aplicaciones",
  ("Informacion",
-  ("Panel de Informacion", INFO_PANEL),
-  ("Legal", LEGAL_PANEL),
-  ("Consola", EXEC, "xconsole"),
-  ("Carga del Sistema", SHEXEC, "xosview || xload"),
-  ("Lista de Procesos", EXEC, "xterm -e top"),
-  ("Paginas del Manual", EXEC, "xman")
+  ("Legal", LEGAL_PANEL)
   ),
  ("Ejecutar...", SHEXEC, "%a(Run,Type command to run:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("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")
-  ),
- ("Seleccion",
-  ("Copiar", SHEXEC, "echo '%s' | wxcopy"),
-  ("Enviar por correo", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navegar", EXEC, "netscape %s"),
-  ("Buscar en el manual", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Escritorio",
   ("Esconder otros", HIDE_OTHERS),
   ("Mostrar todos", SHOW_ALL),
@@ -66,9 +15,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,17 +39,16 @@
     ("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")
   ), 
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Salir",
   ("Reiniciar", RESTART),
-  ("Empezar BlackBox", RESTART, blackbox),
-  ("Empezar kwm", RESTART, kwm),
-  ("Empezar IceWM", RESTART, icewm),
   ("Salir", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fi WindowMaker-0.95.4/WindowMaker/plmenu.fi
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fi	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.fi	2014-04-10 06:40:00.514787124 -0700
@@ -3,27 +3,7 @@
 	(
 	"Tietoja",
 		("Tietoja...", INFO_PANEL),
-		("Laillista", LEGAL_PANEL),
-		(
-		"Järjestelmäkonsoli",
-		EXEC,
-		"xconsole"
-		),
-		(
-		"Järjestelmän rasitus",
-		EXEC,
-		"xosview || xload"
-		),
-		(
-		"Prosessiluettelo",
-		EXEC,
-		"xterm -e top"
-		),
-		(
-		"Ohjeselain",
-		EXEC,
-		"xman"
-		)
+		("Laillista", LEGAL_PANEL)
 	),
 	(
 	"Käynnistä...",
@@ -35,191 +15,8 @@
 	EXEC,
 	"xterm -sb"
 	),
-	(
-	"Rxvt",
-	EXEC,
-	"rxvt -bg black -fg white -fn fixed"
-	),
 	("Työtilat", WORKSPACE_MENU),
 	(
-	"Sovellukset",
-		(
-		"Grafiikka",
-			(
-			"Gimp",
-			EXEC,
-			"gimp >/dev/null"
-			),
-			(
-			"XV",
-			EXEC,
-			"xv"
-			),
-			(
-			"XPaint",
-			EXEC,
-			"xpaint"
-			),
-			(
-			"XFig",
-			EXEC,
-			"xfig"
-			)
-		),
-		(
-		"X Tiedostonhallinta",
-		EXEC,
-		"xfm"
-		),
-		(
-		"OffiX Tiedostot",
-		EXEC,
-		"files"
-		),
-		(
-		"LyX",
-		EXEC,
-		"lyx"
-		),
-		(
-		"Netscape",
-		EXEC,
-		"netscape"
-		),
-  		(
-  		"Ghostview",
-  		EXEC,
-  		"ghostview %a(GhostView,Kirjoita näytettävän tiedoston nimi:)"
-  		),
-		(
-		"Acrobat",
-		EXEC,
-		"/usr/local/Acrobat3/bin/acroread %a(Acrobat,Kirjoita näytettävän PDF-tiedoston nimi)"
-		),
-  		(
-  		"TkDesk",
-  		EXEC,
-  		"tkdesk"
-  		)
-	),
-	(
-	"Editorit",
-		(
-		"XFte",
-		EXEC,
-		"xfte"
-		),
-		(
-		"XEmacs",
-		EXEC,
-		"xemacs || emacs"
-		),
-		(
-		"XJed",
-		EXEC,
-		"xjed"
-		),
-		(
-		"NEdit",
-		EXEC,
-		"nedit"
-		),
-		(
-		"Xedit",
-		EXEC,
-		"xedit"
-		),
-		(
-		"VI",
-		EXEC,
-		"xterm -e vi"
-		)
-	),
-	(
-	"Sekalaiset",
-		(
-		"Xmcd",
-		EXEC,
-		"xmcd 2> /dev/null"
-		),
-		(
-		"Xplaycd",
-		EXEC,
-		"xplaycd"
-		),
-		(
-		"Xmixer",
-		EXEC,
-		"xmixer"
-		)
-	),
-	(
-	"Apuohjelmat",
-		(
-		"Laskin",
-		EXEC,
-		"xcalc"
-		),
-		(
-		"Ikkunan ominaisuudet",
-		EXEC,
-		"xprop | xmessage -center -title 'xprop' -file -"
-		),
-		(
-		"Kirjasinlajivalitsin",
-		EXEC,
-		"xfontsel"
-		),
-		(
-		"Pääte",
-		EXEC,
-		"xminicom"
-		),
-		(
-		"Suurennuslasi",
-		EXEC,
-		"xmag"
-		),
-		(
-		"Värikartta",
-		EXEC,
-		"xcmap"
-		),
-		(
-		"XKill",
-		EXEC,
-		"xkill"
-		),
-		(
-		"Leikepöytä",
-		EXEC,
-		"xclipboard"
-		)
-	),
-	(
-	"Valinta",
-		(
-		"Kopioi",
-		EXEC,
-		"echo '%s' | wxcopy"
-		),
-		(
-		"Lähetä sähköpostina",
-		EXEC,
-		"xterm -name mail -T \"Pine\" -e pine %s"
-		),
-		(
-		"Selaa selaimella",
-		EXEC,
-		"netscape %s"
-		),
-		(
-		"Etsi ohjeista",
-		EXEC,
-		"if ( man  %s  > /dev/null ); then man  %s  | xless;	else xmessage -center -title \"Manual Browser\" Sorry, but there is no manual page entry for  %s ...; fi"
-		)
-	),
-	(
 	"Työtila",
 		("Piilota muut", HIDE_OTHERS),
 		("Näytä kaikki ikkunat", SHOW_ALL),
@@ -238,17 +35,17 @@
 		(
 		"Teemat",
 		OPEN_MENU,
-		"-noext /usr/local/share/WindowMaker/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
+		"-noext #wmdatadir#/Themes  $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
 		),
 		(
 		"Tyylit",
 		OPEN_MENU,
-		"-noext /usr/local/share/WindowMaker/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
+		"-noext #wmdatadir#/Styles  $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
 		),
 		(
 		"Kuvakkeet",
 		OPEN_MENU,
-		"-noext /usr/local/share/WindowMaker/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
+		"-noext #wmdatadir#/IconSets  $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
 		),
 		(
 		"Taustat",
@@ -341,7 +138,7 @@
 			(
 			"Kuvat",
 			OPEN_MENU,
-			"-noext /usr/local/share/WindowMaker/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+			"-noext #wmdatadir#/Backgrounds  $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
 			)
 		),
 		(
@@ -357,15 +154,14 @@
 		(
 		"Asetukset",
 		EXEC,
-		"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
+		"/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
 		)
 	),
+        ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+	("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
 	(
 	"Lopeta",
 		("Käynnistä WM uudelleen", RESTART),
-		("Käynnistä BlackBox", RESTART, blackbox),
-		("Käynnistä kwm", RESTART, kwm),
-		("Käynnistä IceWM", RESTART, icewm),
 		("Lopeta", EXIT)
 	)
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fr WindowMaker-0.95.4/WindowMaker/plmenu.fr
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fr	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.fr	2014-04-10 06:43:34.349784582 -0700
@@ -1,61 +1,11 @@
 ("Applications",
   ("Informations",
     ("Panneau d'informations", INFO_PANEL),
-    ("Panneau d'informations légales", LEGAL_PANEL),
-    ("Console système", EXEC, "xconsole"),
-    ("Charge système", SHEXEC, "xosview || xload"),
-    ("Liste des processus", EXEC, "xterm -e top"),
-    ("Butineur d'aide", EXEC, "xman")
+    ("Panneau d'informations légales", LEGAL_PANEL)
    ),
   ("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"),
   ("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")
-  ),
- ("Sélection",
-   ("Copier", SHEXEC, "echo '%s' | wxcopy"),
-   ("Envoyer à", EXEC, "xterm -name mail -T Pine -e pine %s"),
-   ("Naviguer", EXEC, "netscape %s"),
-   ("Rechercher dans le manuel", SHEXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Bureaux",
    ("Cacher les autres fenêtres", HIDE_OTHERS),
    ("Montrer toutes les fenêtres", SHOW_ALL),
@@ -66,9 +16,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 /usr/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+   ("Styles", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+   ("Jeu d'icônes", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
    ("Fond d'écran",
      ("Unifié",
        ("Noir", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -88,15 +38,16 @@
        ("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 /usr/share/WindowMaker/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:)\""),
+   ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Quitter",
    ("Redémarrer", RESTART),
-   ("Démarrer AfterStep", RESTART, afterstep),
-   ("Quitter...", EXIT),
-   ("Tuer la session...", SHUTDOWN)
+   ("Quitter...", EXIT)
   )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.hr WindowMaker-0.95.4/WindowMaker/plmenu.hr
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.hr	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.hr	2014-04-10 06:43:50.233784393 -0700
@@ -3,77 +3,12 @@
   (
     Info,
     ("Info Panel...", INFO_PANEL),
-    (Legal..., LEGAL_PANEL),
-    ("Sistemska konzola", EXEC, xconsole),
-    ("Optere\346enje sistema", SHEXEC, "xosview || xload"),
-    ("Lista procesa", EXEC, "xterm -e top"),
-    ("Pretra\276iva\350 manuala", EXEC, xman)
+    (Legal..., LEGAL_PANEL)
   ),
   (Pokreni..., EXEC, "%a(Pokreni,Upi\271ite naredbu za pokrenuti:)"),
-  (NXTerm, EXEC, "nxterm -sb"),
-  (Rxvt, EXEC, rxvt),
-  (WMTerm, EXEC, "rxvt -wm"),
+  (XTerm, EXEC, "xterm -sb"),
   ("Radni prostori", WORKSPACE_MENU),
   (
-    Programi,
-    (
-      Grafika,
-      (Gimp, SHEXEC, "gimp >/dev/null"),
-      (XV, EXEC, xv),
-      (XPaint, EXEC, xpaint),
-      (XFig, EXEC, xfig)
-    ),
-    (FSViewer, EXEC, fsviewer),
-    ("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)
-  ),
-  (
-    Editori,
-    (XFte, EXEC, xfte),
-    (XEmacs, SHEXEC, "xemacs || emacs"),
-    (XJed, EXEC, xjed),
-    (NEdit, EXEC, nedit),
-    (Xedit, EXEC, xedit),
-    (VI, EXEC, "xterm -e vi")
-  ),
-  (
-    Razno,
-    (Xmcd, SHEXEC, "xmcd 2> /dev/null"),
-    (Xplaycd, EXEC, xplaycd),
-    (Xmixer, EXEC, xmixer)
-  ),
-  (
-    "Pomo\346ni programi",
-    (Kalkulator, EXEC, xcalc),
-    (
-      "Info o prozoru",
-      SHEXEC,
-      "xprop | xmessage -center -title 'xprop' -file -"
-    ),
-    ("Bira\350 fontova", EXEC, xfontsel),
-    ("Emulator terminala", EXEC, xminicom),
-    ("Pove\346alo", EXEC, xmag),
-    (Colormap, EXEC, xcmap),
-    (XKill, EXEC, xkill),
-    (WMClock, EXEC, "wmclock -24"),
-    (Clipboard, EXEC, xclipboard)
-  ),
-  (
-    Odabir,
-    (Kopiraj, SHEXEC, "echo '%s' | wxcopy"),
-    ("Po\271alji e-mail", EXEC, "xterm -name mail -T Pine -e pine %s"),
-    ("Otvori web", EXEC, "netscape %s"),
-    ("Potra\276i u manualu", EXEC, "MANUAL_SEARCH(%s)")
-  ),
-  (
     "Radni prostor",
     ("Sakrij ostale", HIDE_OTHERS),
     ("Poka\276i sve", SHOW_ALL),
@@ -88,17 +23,17 @@
     (
       Teme,
       OPEN_MENU,
-      "-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
+      "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"
     ),
     (
       Stilovi,
       OPEN_MENU,
-      "-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
+      "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"
     ),
     (
       "Setovi ikona",
       OPEN_MENU,
-      "-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
+      "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"
     ),
     (
       Pozadina,
@@ -191,27 +126,26 @@
       (
         Slike,
         OPEN_MENU,
-        "-noext /usr/local/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
+        "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"
       )
     ),
     (
-      "Snimi temu",
-      SHEXEC,
-      "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""
-    ),
-    (
       "Snimi set ikona",
       SHEXEC,
       "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""
-    )
+    ),
+    ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ),
+    (
+      "Snimi temu",
+      SHEXEC,
+      "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""
+    ),
+    ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+    ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
   (
     Izlaz,
     ("Ponovo startaj", RESTART),
-    ("Pokreni BlackBox", RESTART, blackbox),
-    ("Pokreni kwm", RESTART, kwm),
-    ("Pokreni IceWM", RESTART, icewm),
-    (Izlaz..., EXIT),
-    ("Ubij session...", SHUTDOWN)
+    (Izlaz..., EXIT)
   )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.it WindowMaker-0.95.4/WindowMaker/plmenu.it
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.it	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.it	2014-04-10 06:44:06.579784199 -0700
@@ -1,61 +1,11 @@
 ("Applicazioni",
  ("Informazioni",
   ("Info Panel...", INFO_PANEL),
-  ("Legal...", LEGAL_PANEL),
-  ("Console di sistema", EXEC, "xconsole"),
-  ("Carico del Sistema", EXEC, "xosview || xload"),
-  ("Lista dei Processi", EXEC, "xterm -e top"),
-  ("Ricerca Manuali", EXEC, "xman")
+  ("Legal...", LEGAL_PANEL)
   ),
  ("Esegui...", EXEC, "%a(Esegui,Scrivi il comando da eseguire:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("Workspace", WORKSPACE_MENU),
- ("Programmi",
-  ("Grafica",
-   ("Gimp", EXEC, "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(Ghostview, Scrivi il file da visualizzare)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acroread, Scrivi il file da visualizzare)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("Editor",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", EXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Varie",
-  ("Xmcd", EXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Utilità",
-  ("Calcolatrice", EXEC, "xcalc"),
-  ("Proprietà finestra", EXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Selezione Font", EXEC, "xfontsel"),
-  ("Emulatore di terminale", EXEC, "xminicom"),
-  ("Lente", EXEC, "xmag"),
-  ("Mappa Colori", EXEC, "xcmap"),
-  ("Assasino X", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
- ("Selezione",
-  ("Copia", EXEC, "echo '%s' | wxcopy"),
-  ("Spedisci a...", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Naviga", EXEC, "netscape %s"),
-  ("Cerca nei Manuali", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Workspace",
   ("Nascondi gli altri", HIDE_OTHERS),
   ("Mostra Tutti", SHOW_ALL),
@@ -66,9 +16,9 @@
   ("Cancella Sessione salvata", CLEAR_SESSION)
   ),
  ("Visualizzazione",
-  ("Temi", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-  ("Stili", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Set di Icone", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Temi", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("Stili", OPEN_MENU, "-noext #wmdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("Set di Icone", OPEN_MENU, "-noext #wmdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
   ("Sfondo",
    ("Tinta unita",
     ("Nero", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -90,17 +40,16 @@
     ("Sfumature Grigie",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
     ("Sfumature Vinaccia",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
     ),
-   ("Immagini", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ("Immagini", OPEN_MENU, "-noext #wmdatadir#/Backgrounds ~/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),   
   ("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 set icone", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(Nome IconSet)\""),
+  ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+  ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Esci",
   ("Riavvia", RESTART),
-  ("Avvia BlackBox", RESTART, blackbox),
-  ("Avvia kwm", RESTART, kwm),
-  ("Avvia IceWM", RESTART, icewm),
   ("Esci...", EXIT),
-  ("Uccidi sessione...", SHUTDOWN)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ja WindowMaker-0.95.4/WindowMaker/plmenu.ja
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ja	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ja	2014-04-10 06:44:22.655784007 -0700
@@ -1,44 +1,10 @@
 ("アプリケーション",
  ("情報",
-  ("Info パネル", INFO_PANEL),
-  ("Legal パネル", LEGAL_PANEL),
-  ("システムコンソール", EXEC, "xconsole"),
-  ("システム負荷", SHEXEC, "xosview || xload"),
-  ("プロセス一覧", EXEC, "xterm -e top"),
-  ("マニュアルブラウザ", EXEC, "xman")
+  ("Legal パネル", LEGAL_PANEL)
   ),
  ("コマンド実行", SHEXEC, "%a(Run,Type command to run:)"),
  ("KTerm", EXEC, "kterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white"),
  ("ワークスペース", WORKSPACE_MENU),
- ("アプリケーション",
-  ("グラフィックス",
-   ("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")
-  ),
- ("エディタ",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs || mule"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("いろいろ",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
  ("ユーティリティー",
   ("電卓", EXEC, "xcalc"),
   ("プロパティ表示", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
@@ -50,12 +16,6 @@
   ("ASClock", EXEC, "asclock -shape"),
   ("Clipboard", EXEC, "xclipboard")
   ),
- ("セレクション",
-  ("コピー", SHEXEC, "echo '%s' | wxcopy"),
-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navigate", EXEC, "netscape %s"),
-  ("マニュアル検索", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("ワークスペース",
   ("他をハイド", HIDE_OTHERS),
   ("全て表示", SHOW_ALL),
@@ -94,13 +54,12 @@
    ),   
   ("設定をテーマとしてセーブ", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
   ("現在のアイコンセットをセーブ", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-  ("設定ユーティリティ", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-  ), 
+  ("設定ユーティリティ", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+  ),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("終了",
   ("再起動", RESTART),
-  ("BlackBox をスタート", RESTART, blackbox),
-  ("kwm をスタート", RESTART, kwm),
-  ("IceWM をスタート", RESTART, icewm),
   ("終了", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ko WindowMaker-0.95.4/WindowMaker/plmenu.ko
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ko	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ko	2014-04-10 06:40:00.515787124 -0700
@@ -1,57 +1,7 @@
 ("윈도우메이커",
  ("정    보",
   ("정보 패널", INFO_PANEL),
-  ("저작권 정보", LEGAL_PANEL),
-  ("시스템 로드", SHEXEC, "xosview || xload"),
-  ("매뉴얼 찾기", EXEC, "xman"),
-  ("프로세스목록", EXEC, "xterm -e top")
-  ),
- ("한    텀", SHORTCUT, "SHIFT+META+H", EXEC, "hanterm"),
- ("명 령 창", SHORTCUT, "SHIFT+META+C", EXEC, "%a(실행할 명령:)"),
- ("입 력 기", SHORTCUT, "SHIFT+META+I", SHEXEC, "ami || hanIM"),
- ("프로그램",
-  ("터 미 널",
-   ("한    텀", EXEC, "hanterm"),
-   ("하얀한텀", SHORTCUT, "SHIFT+META+M", EXEC, "hanterm -fg black -bg gray75"),
-   ("관 리 자", SHORTCUT, "SHIFT+META+R", EXEC, "hanterm -T 관리자 -n 관리자 -name root -e su -"),
-   ("엑 스 텀", EXEC, "nxterm || xterm")
-   ),
-  ("네트워크",
-   ("모 질 라", SHORTCUT, "SHIFT+META+N", EXEC, "netscape"),
-   ("유 즈 넷", EXEC, "hanterm -T 유즈넷 -n 유즈넷 -e slrn -C"),
-   ("이 메 일", EXEC, "hanterm -T 이메일 -n 이메일 -e mutt"),
-   ("나우누리", EXEC, "hanterm -T 나우누리 -n 나우누리 -e ztelnet nownuri.net"),
-   ("하 이 텔", EXEC, "hanterm -T 하이텔 -n 하이텔 -e ztelnet home.hitel.net"),
-   ("천 리 안", EXEC, "hanterm -T 천리안 -n 천리안 -e ztelnet chonllian.net"),
-   ("가    우", SHEXEC, "gau || gaui")
-   ),
-  ("문서편집",
-   ("VIM", EXEC, "hanterm -T VIM -n VIM -e vim"),
-   ("피  코", EXEC, "hanterm -T 피코 -n 피코 -e pico"),
-   ("이맥스", EXEC, "emacs")
-   ),
-  ("그 래 픽",
-   ("XV", EXEC, "xv"),
-   ("GIMP", EXEC, "gimp"),
-   ("GQview", EXEC, "gqview"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("도구모음",
-   ("계 산 기", EXEC, "xcalc"),
-   ("창 속 성", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-   ("글꼴보기", EXEC, "xfontsel"),
-   ("돋 보 기", EXEC, "xmag"),
-   ("컬 러 맵", EXEC, "xcmap"),
-   ("강제종료", EXEC, "xkill"),
-   ("클립보드", EXEC, "xclipboard")
-   ),
-  ("멀티미디어",
-   ("믹    서", SHEXEC, "xmixer || hanterm -T AuMIX -n AuMix -e aumix"),
-   ("MPEG보기", EXEC, "mtv"),
-   ("MP3 연주기", SHEXEC, "xmms || x11amp"),
-   ("CD연주기", EXEC, "xplaycd")
-   )
+  ("저작권 정보", LEGAL_PANEL)
   ),
  ("창 관 리",
   ("다른창숨김", HIDE_OTHERS),
@@ -63,11 +13,11 @@
   ),
  ("작업공간", WORKSPACE_MENU),
  ("작업환경",
-  ("설    정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
-  ("테    마", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("설    정", SHEXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
+  ("테    마", OPEN_MENU, "-noext #wmdatadir#/Themes ~/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
   ("테마저장", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(테마 이름,파일 이름을 입력하세요:)\""),
-  ("스 타 일", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("아이콘셋", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("스 타 일", OPEN_MENU, "-noext #wmdatadir#/Styles ~/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("아이콘셋", OPEN_MENU, "-noext #wmdatadir#/IconSets ~/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
   ("아이콘셋저장", EXEC, "geticonset ~/GNUstep/Library/WindowMaker/IconSets/\"%a(아이콘셋 이름,파일 이름을 입력하세요:)\""),
   ("배경화면",
    ("단    색",
@@ -98,18 +48,10 @@
     )
    )
   ),
- ("화면잠금", SHORTCUT, "SHIFT+META+L", EXEC, "xlock -allowroot -usefirst"),
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("종    료",
   ("재 시 작", RESTART),
-  ("재 시 작",
-   ("BlackBox", RESTART, "blackbox"),
-   ("KDE", RESTART, "kwm"),
-   ("IceWM", RESTART, "icewm"),
-   ("AfterStep", RESTART, "afterstep"),
-   ("Enlightenment", RESTART, "enlightenment"),
-   ("FVWM2", RESTART, "fvwm2")
-   ),
-  ("종    료", EXIT),
-  ("새션종료", SHUTDOWN)
+  ("종    료", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.pl WindowMaker-0.95.4/WindowMaker/plmenu.pl
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.pl	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.pl	2014-04-10 06:40:00.515787124 -0700
@@ -1,125 +1,12 @@
 ("WindowMaker",
 	("Informacja",
 		("Informacja o WMaker...", INFO_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")
+		("Legalność...",           LEGAL_PANEL)
 	),
 	
-	("Konfiguracja",	
-		("Edycja menu",       EXEC, "xterm -T 'Edycja menu' -e vi $HOME/GNUstep/Library/WindowMaker/menu"),
-		("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:)"),
+	("Uruchom...", SHEXEC, "%a(Uruchom,Wpisz komende do uruchomienia:)"),
 	("Terminal",   EXEC, "xterm -T 'Mój ulubiony terminal' -sb"),
-	("Edytor",     EXEC, "xterm -T 'Moj ulubiony edytor' -e vi %a(Edytor,Podaj plik do edycji:)"),
 	("Pulpity",    WORKSPACE_MENU),
-	
-	("Aplikacje",
-		("Grafika",
-			("Gimp",        EXEC, "gimp > /dev/null"),
-			("XV",          EXEC, "xv"),
-			("XFig",        EXEC, "xfig"),
-			("XPaint",      EXEC, "xpaint"),
-			("Gnuplot",     EXEC, "xterm -T 'GNU plot' -e gnuplot"),
-			("Edytor ikon", EXEC, "bitmap")
-		),
-		("Tekst",
-			("LyX",                 EXEC, "lyx"),
-  			("Ghostview",           EXEC, "gv %a(Gv,Wprowadz nazwe pliku *.ps *.pdf *.no:)"),
-  			("XDvi",                EXEC, "xdvi %a(Xdvi,Wprowadz nazwe pliku *.dvi:)"),
-			("Acrobat",             EXEC, "/usr/local/Acrobat3/bin/acroread %a(Acrobat,Wprowadz nazwe pliku *.pdf:)"),
-			("Xpdf",                EXEC, "xpdf %a(Xpdf,Wprowadz nazwe pliku *.pdf:)"),
-			("Arkusz kalkulacyjny", EXEC, "xspread")
-		),
-		("X File Manager",     EXEC, "xfm"),
-		("OffiX Files",        EXEC, "files"),
-		("TkDesk",             EXEC, "tkdesk"),
-		("Midnight Commander", EXEC, "xterm -T 'Midnight Commander' -e mc"),
-		("X Gnu debbuger",     EXEC, "xxgdb"),
-		("Xwpe",               EXEC, "xwpe")
-	),
-	
-	("Internet",
-		("Przeglądarki",
-			("Netscape", EXEC, "netscape"), 
-			("Arena",    EXEC, "arena"),
-			("Lynx",     EXEC, "xterm -e lynx %a(Lynx,Podaj URL:)")
-		),
-		("Programy pocztowe",
-			("Pine", EXEC, "xterm -T 'Program pocztowy Pine' -e pine"),
-			("Elm",  EXEC, "xterm -T 'Program pocztowy Elm' -e elm"),
-			("Xmh",  EXEC, "xmh")
-		),
-		("Emulator terminala",
-			("Minicom", EXEC, "xminicom"),
-			("Seyon",   EXEC, "seyon")
-		),
-		("Telnet",     EXEC, "xterm -e telnet %a(Telnet,Podaj nazwe hosta:)"),
-		("Ssh",        EXEC, "xterm -e ssh %a(SSH,Podaj nazwe hosta:)"),
-		("Ftp",        EXEC, "xterm -e ftp %a(FTP,Podaj nazwe hosta:)"),
-		("Irc",        EXEC, "xterm -e irc %a(IRC,Podaj swoj pseudonim:)"),
-		("Ping",       EXEC, "xterm -e ping %a(Ping,Podaj nazwe hosta:)"),
-		("Talk",       EXEC, "xterm -e talk %a(Talk,Podaj nazwe uzytkownika, z ktorym chcesz nawiazac polaczenie:)")
-	),
-
-	("Editory",
-		("XFte",    EXEC, "xfte"),
-		("XEmacs",  EXEC, "xemacs || emacs"),
-		("XJed",    EXEC, "xjed "),
-		("NEdit",   EXEC, "nedit"),
-		("Xedit",   EXEC, "xedit"),
-		("Editres", EXEC, "editres"),
-		("VI",      EXEC, "xterm -e vi")
-	),
-	
-	("Dźwięk",
-		("Xmcd",    EXEC, "xmcd 2> /dev/null"),
-		("Xplaycd", EXEC, "xplaycd"),
-		("Xmixer",  EXEC, "xmixer")
-	),
-	
-    ("Gry",
-    	("Maze",      EXEC, "maze"),
-    	("Karty",     EXEC, "spider"),
-    	("Londownik", EXEC, "xlander"),
-    	("Szachy",    EXEC, "xboard"),
-    	("Xeyes",     EXEC, "xeyes -geometry 51x23"),
-    	("Xmahjongg", EXEC, "xmahjongg"),
-    	("Xlogo",     EXEC, "xlogo"),
-    	("Xroach",    EXEC, "xroach"),
-    	("Xtetris",   EXEC, "xtetris -color"),
-    	("Xvier",     EXEC, "xvier"),
-    	("Xgas",      EXEC, "xgas"),
-    	("Xkobo",     EXEC, "xkobo"),
-    	("xboing",    EXEC, "xboing -sound"),
-    	("XBill",     EXEC, "xbill")
-    ),
-	
-	("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"),
-		("XKill",               EXEC, "xkill"),
-		("Clipboard",           EXEC, "xclipboard")
-	),
-
-	("Selekcyjne",
-		("Kopia",                  EXEC, "echo '%s' | wxcopy"),
-		("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"),
-		("Pobierz plik z FTP ...", EXEC, "ftp %s")
-	),
-
 	("Ekran",
 		("Ukryj Pozostałe",         HIDE_OTHERS),
 		("Pokaż wszystko",          SHOW_ALL),
@@ -158,15 +45,13 @@
 			("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 Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'")
+		("Zapamiętanie Ustawień Ikon", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/'%a(Ustawienia ikon,Wpisz nazwe pliku:)'"),
+                ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
 	),
-
+        ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+        ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
 	("Wyjście",
 		("Przeładowanie",    RESTART),
-		("Start BlackBox",   RESTART, blackbox),
-		("Start kwm",        RESTART, kwm),
-		("Start IceWM",      RESTART, icewm),
-		("Wyjście...",       EXIT),
-		("Zabicie sesji...", SHUTDOWN)
+		("Wyjście...",       EXIT)
 	)
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ro WindowMaker-0.95.4/WindowMaker/plmenu.ro
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ro	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.ro	2014-04-10 06:40:00.516787124 -0700
@@ -1,61 +1,11 @@
 ("Aplicaţii",
  ("Informaţii",
   ("Panou cu Informaţii", INFO_PANEL),
-  ("Panou cu Licenţa", LEGAL_PANEL),
-  ("Consola Sistem", EXEC, "xconsole"),
-  ("Încărcarea Sistemului", SHEXEC, "xosview || xload"),
-  ("Lista de Procese", EXEC, "xterm -e top"),
-  ("Navigator de Pagini Man", EXEC, "xman")
+  ("Panou cu Licenţa", LEGAL_PANEL)
   ),
  ("Execută...", SHEXEC, "%a(Execută,Introduceţi o comandă:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -fg white -bg black -fn -misc-fixed-medium-*-*--*-*-*-*-*-*-iso8859-2 -fb -misc-fixed-medium-*-*--*-*-*-*-*-*-iso8859-2"),
  ("Spaţii de Lucru", WORKSPACE_MENU),
- ("Aplicaţii",
-  ("Grafică",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("Manager de Fişiere", EXEC, "xfm"),
-  ("Fişiere OffiX", 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")
-  ),
- ("Editoare",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("Altele",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("Utilitare",
-  ("Calculator", EXEC, "xcalc"),
-  ("Proprietăţile Ferestrei...", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Navigator de Fonturi", EXEC, "xfontsel"),
-  ("Emulator de Terminal", EXEC, "xminicom"),
-  ("Lupă", EXEC, "xmag"),
-  ("Culori", EXEC, "xcmap"),
-  ("Omoară fereastra...", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
- ("Selecţie",
-  ("Copiază", SHEXEC, "echo '%s' | wxcopy"),
-  ("Poştă către", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Navighează", EXEC, "netscape %s"),
-  ("Caută în Manual", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Spaţiu de Lucru",
   ("Ascunde Celelalte", HIDE_OTHERS),
   ("Arată celelalte", SHOW_ALL),
@@ -94,13 +44,12 @@
    ),   
   ("Salvează Tema", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
   ("Salvează Setul de Iconiţe", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-  ("Utilitar de Configurare", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+  ("Utilitar de Configurare", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ), 
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Ieşire",
   ("Repornire", RESTART),
-  ("Porneşte BlackBox", RESTART, blackbox),
-  ("Porneşte kwm", RESTART, kwm),
-  ("Porneşte IceWM", RESTART, icewm),
   ("Ieşi", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.sk WindowMaker-0.95.4/WindowMaker/plmenu.sk
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.sk	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.sk	2014-04-10 06:40:00.516787124 -0700
@@ -1,61 +1,11 @@
 ("Aplikácie",
  ("Info",
   ("Panel Info", INFO_PANEL),
-  ("Panel Legal", LEGAL_PANEL),
-  ("Systémová konzola", EXEC, "xconsole"),
-  ("Zaťaženie systému", SHEXEC, "xosview || xload"),
-  ("Zoznam procesov", EXEC, "xterm -e top"),
-  ("Prehliadač manuálov", EXEC, "xman")
+  ("Panel Legal", LEGAL_PANEL)
   ),
  ("Spustiť...", SHEXEC, "%a(Spustiť,Zadajte príkaz:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("Pracovné plochy", WORKSPACE_MENU),
- ("Aplikácie",
-  ("Grafika",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("Správca súborov Xfm", EXEC, "xfm"),
-  ("Správca súborov OffiX", 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")
-  ),
- ("Editory",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VIM", EXEC, "xterm -e vim")
-  ),
- ("Rôzne",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("CD prehrávač", EXEC, "xplaycd"),
-  ("Mixer", EXEC, "xmixer")
-  ),
- ("Nástroje",
-  ("Kalkulačka", EXEC, "xcalc"),
-  ("Vlastnosti okien", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Výber fontu", EXEC, "xfontsel"),
-  ("Emulátor terminálu", EXEC, "xminicom"),
-  ("Lupa", EXEC, "xmag"),
-  ("Paleta", EXEC, "xcmap"),
-  ("Zabiť okno", EXEC, "xkill"),
-  ("Hodiny", EXEC, "asclock -shape"),
-  ("Nástenka", EXEC, "xclipboard")
-  ),
- ("Výber",
-  ("Kopírovať", SHEXEC, "echo '%s' | wxcopy"),
-  ("Poslať poštu", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("Prehliadať web", EXEC, "netscape %s"),
-  ("Hľadať v manuáli", EXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("Pracovná plocha",
   ("Skryť ostatné", HIDE_OTHERS),
   ("Zobraziť všetky", SHOW_ALL),
@@ -94,13 +44,12 @@
    ),   
   ("Uložiť tému", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
   ("Uložiť sadu ikon", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-  ("Konfiguračný nástroj", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+  ("Konfiguračný nástroj", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ), 
+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("Koniec",
   ("Reštartovať", RESTART),
-  ("Spustiť BlackBox", RESTART, blackbox),
-  ("Spustiť kwm", RESTART, kwm),
-  ("Spustiť IceWM", RESTART, icewm),
   ("Koniec", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN	2014-04-10 06:46:13.072782695 -0700
@@ -1,63 +1,11 @@
 ("应用程序",
  ("信息",
   ("信息面板...", INFO_PANEL),
-  ("版权...", LEGAL_PANEL),
-  ("系统控制台", EXEC, "xconsole"),
-  ("系统负载", SHEXEC, "xosview || xload"),
-  ("进程列表", EXEC, "xterm -e top"),
-  ("手册浏览器", EXEC, "xman")
+  ("版权...", LEGAL_PANEL)
   ),
  ("运行...", SHEXEC, "%a(运行,要执行的命令:)"),
  ("XTerm", EXEC, "xterm -sb"),
- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
  ("工作空间", WORKSPACE_MENU),
- ("应用程序",
-  ("图形",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X 文件管理器", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(输入要查看的文件名)"),
-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(要查看的PDF文件名)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("编辑器",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("其它",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd"),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("工具",
-  ("计算器", EXEC, "xcalc"),
-  ("窗口属性", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -
-"),
-  ("字体选择", EXEC, "xfontsel"),
-  ("终端模拟器", EXEC, "xminicom"),
-  ("放大", EXEC, "xmag"),
-  ("颜色表", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("ASClock", EXEC, "asclock -shape"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
-
- ("选择",
-  ("复制", SHEXEC, "echo '%s' | wxcopy"),
-  ("发送邮件", EXEC, "xterm -name mail -T Pine -e pine %s"),
-  ("浏览", EXEC, "netscape %s"),
-  ("查找手册", SHEXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("工作空间",
   ("隐藏其他", HIDE_OTHERS),
   ("显示所有", SHOW_ALL),
@@ -95,13 +43,13 @@
    ("图像", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),   
   ("保存主题", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(主题名)\""),
-  ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(图标集名)\"")
-  ), 
+  ("保存图标集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(图标集名)\""),
+  ("WPrefs", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+  ),
+  ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+  ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("退出",
   ("重新启动", RESTART),
-  ("启动 BlackBox", RESTART, blackbox),
-  ("启动 kwm", RESTART, kwm),
-  ("启动 IceWM", RESTART, icewm),
   ("退出...", EXIT)
  )
 )
diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW
--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW	2013-01-09 13:42:39.000000000 -0800
+++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW	2014-04-10 06:46:46.022782303 -0700
@@ -1,59 +1,11 @@
 ("應用程式",
  ("資訊",
   ("資訊面板...", INFO_PANEL),
-  ("法律...", LEGAL_PANEL),
-  ("系統主控台", EXEC, "xconsole"),
-  ("系統負載", SHEXEC, "xosview || xload"),
-  ("行程清單", EXEC, "xterm -e top"),
-  ("手冊瀏覽器", EXEC, "xman")
+  ("法律...", LEGAL_PANEL)
   ),
  ("執行...", SHEXEC,"%a(執行,輸入執行的命令:)"),
- ("終端機", EXEC, "crxvt -ls -T 終端機 -n 終端機"),
+ ("終端機", EXEC, "xterm -sb"),
  ("工作區", WORKSPACE_MENU),
- ("應用程式",
-  ("影像處理",
-   ("Gimp", SHEXEC, "gimp >/dev/null"),
-   ("XV", EXEC, "xv"),
-   ("XPaint", EXEC, "xpaint"),
-   ("XFig", EXEC, "xfig")
-   ),
-  ("X 檔案管理員", EXEC, "xfm"),
-  ("OffiX Files", EXEC, "files"),
-  ("LyX", EXEC, "lyx"),
-  ("Netscape", EXEC, "netscape"),
-  ("Ghostview", EXEC, "ghostview %a(GhostView,輸入要檢視的檔案)"),
-  ("Acrobat", EXEC, "acroread %a(Acrobat,輸入要檢視的 PDF)"),
-  ("TkDesk", EXEC, "tkdesk")
-  ),
- ("編輯器",
-  ("XFte", EXEC, "xfte"),
-  ("XEmacs", SHEXEC, "xemacs || emacs"),
-  ("XJed", EXEC, "xjed"),
-  ("NEdit", EXEC, "nedit"),
-  ("Xedit", EXEC, "xedit"),
-  ("VI", EXEC, "xterm -e vi")
-  ),
- ("雜項",
-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
-  ("Xplaycd", EXEC, "xplaycd" ),
-  ("Xmixer", EXEC, "xmixer")
-  ),
- ("公用程式",
-  ("計算機", EXEC, "xcalc"),
-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
-  ("Font Chooser", EXEC, "xfontsel"),
-  ("終端機模擬器", EXEC, "xminicom"),
-  ("Magnify", EXEC, "xmag"),
-  ("Colormap", EXEC, "xcmap"),
-  ("XKill", EXEC, "xkill"),
-  ("Clipboard", EXEC, "xclipboard")
-  ),
- ("選取",
-  ("複製", SHEXEC, "echo '%s' | wxcopy"),
-  ("郵寄至", EXEC, "xterm -name mail -T \"Pine\" -e pine %s"),
-  ("Navigate", EXEC, "netscape %s"),
-  ("在手冊中搜尋", SHEXEC, "MANUAL_SEARCH(%s)")
-  ),
  ("工作區",
   ("隱藏其他", HIDE_OTHERS),
   ("全部顯示", SHOW_ALL),
@@ -92,13 +44,12 @@
    ),
   ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
   ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
-  ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+  ("偏好設定公用程式", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
   ),
+  ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
+  ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
  ("離開",
   ("重新啟動", RESTART),
-  ("啟動 BlackBox", RESTART, blackbox),
-  ("啟動 kwm", RESTART, kwm),
-  ("啟動 IceWM", RESTART, icewm),
   ("離開...", EXIT)
  )
 )