Updated some locate files (slovak and chinese).

WindowMaker/Makefile.am

@@ -9,9 +9,10 @@ prefsdata_DATA =\
 	exitscript.sh\
 	menu\
 	menu.ca\
+	menu.cn\
 	menu.cz\
-	menu.de\
 	menu.da\
+	menu.de\
 	menu.el\
 	menu.es\
 	menu.fi\
@@ -32,10 +33,11 @@ prefsdata_DATA =\
 	menu.tr\
 	menu.zh_TW.Big5\
 	plmenu\
+	plmenu.cn\
+	plmenu.dk\
 	plmenu.fr\
 	plmenu.hr\
-	plmenu.dk\
+	wmmacros\
-	wmmacros \
 	xtree.dat
 
 EXTRA_DIST = $(prefsdata_DATA) mkMakefile

WindowMaker/Makefile.in

@@ -92,7 +92,7 @@ SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
 
 prefsdatadir = $(pkgdatadir)
 
-prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cz 	menu.de 	menu.da 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_TW.Big5 	plmenu 	plmenu.fr 	plmenu.hr 	plmenu.dk 	wmmacros 	xtree.dat
+prefsdata_DATA =  	README 	README.themes 	autostart.sh 	exitscript.sh 	menu 	menu.ca 	menu.cn 	menu.cz 	menu.da 	menu.de 	menu.el 	menu.es 	menu.fi 	menu.fr 	menu.gl 	menu.he 	menu.hr 	menu.hu 	menu.it 	menu.ja 	menu.ko 	menu.nl 	menu.no 	menu.pt 	menu.ru 	menu.se 	menu.sl 	menu.tr 	menu.zh_TW.Big5 	plmenu 	plmenu.cn 	plmenu.dk 	plmenu.fr 	plmenu.hr 	wmmacros 	xtree.dat
 
 
 EXTRA_DIST = $(prefsdata_DATA) mkMakefile

WindowMaker/README

@@ -57,7 +57,9 @@ menu.sl Slovene		Alen Salamun <snowman@hal9000.medinet.si>
 menu.hu Hungarian	Csanaki Csaba <prew@mail.matav.hu>
 menu.ca Català		Carles Amig<F3> dj_fr3nd@hotmail.com
 menu.zh_TW.Big5 Chinese Li Wei Jih <lwj83@cs.ccu.edu.tw>
+menu.cn	Chinese	zh_CN.GB2312	Wang Jian <wangjian2@asiainfo.com>
 
 
 
 plmenu.dk Danish 	Birger Langkjer <birger.langkjer@image.dk>
+plmenu.cn Chinese zh_CN.GB2312	Wang Jian <wangjian2@asiainfo.com>

WindowMaker/menu.cn

@@ -0,0 +1,183 @@
+/*
+ * Root Menu definition for WindowMaker
+ *
+ * Syntax is:
+ *
+ * <Title> [SHORTCUT <Shortcut>] <Command> <Parameters>
+ *
+ * <Title> is any string to be used as title. Must be enclosed with " if it
+ * 	has spaces
+ * 
+ * SHORTCUT specifies a shortcut for that item. <Shortcut> has the
+ * same syntax of the shortcuts key options in the 
+ * $HOME/GNUstep/Defaults/WindowMaker file, such as RootMenuKey or MiniaturizeKey.
+ *
+ * You can't specify a shortcut for a MENU or OPEN_MENU entry.
+ * 
+ * <Command> one of the valid commands: 
+ *	MENU - starts (sub)menu definition
+ *	END  - end (sub)menu definition
+ *	OPEN_MENU - opens a menu from a file, pipe or directory(ies) contents
+ *		    and eventually precede each with a command.
+ *	WORKSPACE_MENU - adds a submenu for workspace operations. Only one
+ *		    workspace_menu is allowed. 		
+ *	EXEC <program> - executes an external program
+ *	EXIT - exits the window manager
+ *	RESTART [<window manager>] - restarts WindowMaker or start another
+ *			window manager
+ *	REFRESH - refreshes the desktop
+ *	ARRANGE_ICONS - rearranges the icons on the workspace
+ *	SHUTDOWN - kills all clients (and close the X window session)
+ *	SHOW_ALL - unhides all windows on workspace
+ *	HIDE_OTHERS - hides all windows on the workspace, except the
+ *		focused one (or the last one that received focus)
+ *	SAVE_SESSION - saves the current state of the desktop, which include
+ *		       all running applications, all their hints (geometry,
+ *		       position on screen, workspace they live on, the dock
+ *		       or clip from where they were launched, and
+ *		       if minimized, shaded or hidden. Also saves the current
+ *		       workspace the user is on. All will be restored on every
+ *		       start of windowmaker until another SAVE_SESSION or
+ *		       CLEAR_SESSION is used. If SaveSessionOnExit = Yes; in
+ *		       WindowMaker domain file, then saving is automatically
+ *		       done on every windowmaker exit, overwriting any
+ *		       SAVE_SESSION or CLEAR_SESSION (see below).
+ *	CLEAR_SESSION - clears any previous saved session. This will not have
+ *		       any effect if SaveSessionOnExit is True.
+ *	INFO - shows the Info Panel
+ *
+ * OPEN_MENU syntax:
+ *   1. File menu handling.
+ *	// opens file.menu which must contain a valid menu file and inserts
+ *	// it in current position
+ *	OPEN_MENU file.menu
+ *   2. Pipe menu handling.
+ *	// opens command and uses it's stdout to construct menu.
+ *	// Command's output must be a valid menu description.
+ *	// The space between '|' and command itself is optional.
+ *	OPEN_MENU | command
+ *   3. Directory handling.
+ *	// Opens one or more directories and construct a menu with all
+ *	// the subdirectories and executable files in them sorted
+ *	// alphabetically.
+ *	OPEN_MENU /some/dir [/some/other/dir ...]
+ *   4. Directory handling with command.
+ *	// Opens one or more directories and construct menu with all
+ *	// subdirectories and readable files in them sorted alphabetically,
+ *	// preceding each of them with command.
+ *	OPEN_MENU [options] /some/dir [/some/other/dir ...] WITH command -options
+ *		Options:
+ * 			-noext 	strip whatever is after the last dot in the
+ *				file name
+ *
+ * <Parameters> is the program to execute.
+ *
+ * ** Options for command line in EXEC:
+ * %s - substitute with current selection
+ * %a(title[,prompt]) - opens a input box with the specified title and the
+ *			optional prompt	and do substitution with what you typed
+ * %w - substitute with XID for the current focused window
+ * %W - substitute with the number of the current workspace
+ * 
+ * You can override special characters (as % and ") with the \ character:
+ * ex: xterm -T "\"Hello World\""
+ *
+ * You can also use character escapes, like \n
+ *
+ * Each MENU statement must have one mathching END statement at the end.
+ *
+ * Example:
+ *
+ * "Test" MENU
+ *	"XTerm" EXEC xterm
+ *		// creates a submenu with the contents of /usr/openwin/bin
+ *	"XView apps" OPEN_MENU "/usr/openwin/bin"
+ *		// some X11 apps in different directories
+ *	"X11 apps" OPEN_MENU /usr/X11/bin $HOME/bin/X11
+ *		// set some background images
+ *	"Background" OPEN_MENU -noext $HOME/images /usr/share/images WITH wmsetbg -u -t
+ *		// inserts the style.menu in this entry
+ *	"Style" OPEN_MENU style.menu
+ * "Test" END
+ */
+
+#include "wmmacros"
+
+"应用程序" MENU
+	"信息" MENU
+		"信息面板..." INFO_PANEL
+		"版权..." LEGAL_PANEL
+		"系统控制台" EXEC xconsole
+		"系统负载" EXEC xosview || xload
+		"进程列表" EXEC xterm -e top
+		"手册浏览器" EXEC xman
+	"信息" END
+	"运行..." EXEC %a(Run,Type command to run:)
+	"XTerm" EXEC xterm -sb 
+	"Rxvt" EXEC rxvt -bg black -fg white -fn fixed
+
+	"程序" OPEN_MENU | wmconfig --output wmaker 2>/dev/null
+
+	"工作空间" WORKSPACE_MENU
+
+	"选择" MENU
+		"复制" EXEC 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
+		"排列图标" ARRANGE_ICONS
+		"刷新" REFRESH
+		"锁住屏幕" EXEC xlock -allowroot -usefirst
+		"保存会话" SAVE_SESSION
+		"清除保存的会话" CLEAR_SESSION
+	"工作空间" END
+
+	"外观" MENU
+		"主题" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
+		"风格" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
+		"图标集" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
+		"背景" MENU
+			"单色" MENU
+                        	"黑" WS_BACK '(solid, black)'
+                        	"蓝"  WS_BACK '(solid, "#505075")'
+				"青" WS_BACK '(solid, "#243e6c")'
+				"深蓝" WS_BACK '(solid, "#180090")'
+                        	"紫" WS_BACK '(solid, "#554466")'
+                        	"淡黄"  WS_BACK '(solid, "wheat4")'
+                        	"深灰"  WS_BACK '(solid, "#333340")'
+                        	"酒红" WS_BACK '(solid, "#400020")'
+			"单色" END
+			"过渡色" MENU
+				"日落" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+				"天空" WS_BACK '(vgradient, blue4, white)'
+    				"蓝色阴影" WS_BACK '(vgradient, "#7080a5", "#101020")'
+				"青色阴影" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+			    	"紫色阴影" WS_BACK '(vgradient, "#654c66", "#151426")'
+    				"淡黄色阴影" WS_BACK '(vgradient, "#a09060", "#302010")'
+    				"灰色阴影" WS_BACK '(vgradient, "#636380", "#131318")'
+    				"酒红色阴影" WS_BACK '(vgradient, "#600040", "#180010")'
+			"过渡色" END
+			"图像" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
+		"背景" END
+		"保存主题" EXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Theme name,Enter file name:)"
+		"保存图标集" EXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(IconSet name,Enter file name:)"
+	"外观" END
+
+	"退出"	MENU
+		"重新启动" RESTART
+		"切换到..." MENU
+			"AfterStep"             RESTART /usr/X11R6/bin/RunWM.AfterStep
+			"Fvwm2 (Fvwm95外观)"   RESTART /usr/X11R6/bin/RunWM.Fvwm95
+			"Fvwm2 (MWM外观)"      RESTART /usr/X11R6/bin/RunWM.MWM
+		"切换到..." END                              
+		"退出..."  EXIT
+		"强制结束会话..." SHUTDOWN
+	"退出" END
+"应用程序" END
+
+

WindowMaker/plmenu.cn

@@ -0,0 +1,70 @@
+("应用程序",
+ ("信息",
+  ("信息面板...", INFO_PANEL),
+  ("版权...", LEGAL_PANEL),
+  ("系统控制台", EXEC, "xconsole"),
+  ("系统负载", EXEC, "xosview || xload"),
+  ("进程列表", EXEC, "xterm -e top"),
+  ("手册浏览器", EXEC, "xman")
+  ),
+ ("运行...", EXEC, "%a(Run,Type command to run:)"),
+ ("XTerm", EXEC, "xterm -sb"),
+ ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+ ("程序", OPEN_MENU, "| wmconfig --output wmaker 2>/dev/null"),
+ ("工作空间", WORKSPACE_MENU),
+ ("选择",
+  ("复制", EXEC, "echo '%s' | wxcopy"),
+  ("发送邮件", EXEC, "xterm -name mail -T Pine -e pine %s"),
+  ("浏览", EXEC, "netscape %s"),
+  ("查找手册", EXEC, "MANUAL_SEARCH(%s)")
+  ),
+ ("工作空间",
+  ("隐藏其他", HIDE_OTHERS),
+  ("显示所有", SHOW_ALL),
+  ("排列图标", ARRANGE_ICONS),
+  ("刷新", REFRESH),
+  ("锁住屏幕", EXEC, "xlock -allowroot -usefirst"),
+  ("保存会话", SAVE_SESSION),
+  ("清除保存的对话", CLEAR_SESSION)
+  ),
+ ("外观",
+  ("主题", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+  ("风格", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+  ("图标集", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("背景",
+   ("单色",
+    ("黑", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+    ("蓝",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+    ("青", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+    ("深蓝", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#180090\")'"),
+    ("紫", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+    ("淡黄", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+    ("深灰", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+    ("酒红", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+    ),
+   ("过渡色",
+    ("日落", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+    ("天空", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+    ("蓝色阴影",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+    ("青色阴影", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+    ("紫色阴影", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+    ("淡黄阴影",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+    ("灰色阴影",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+    ("酒红阴影",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+    ),
+   ("图像", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+   ),   
+  ("保存主题", EXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+  ("保存图标集", EXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\"")
+  ), 
+ ("退出",
+  ("重新启动", RESTART),
+  ("切换到...",
+    ("AfterStep", RESTART, "/usr/X11R6/bin/RunWM.AfterStep"),
+    ("Fvwm2 (Fvwm95外观)", RESTART, "/usr/X11R6/bin/RunWM.Fvwm95"),
+    ("Fvwm2 (MWM外观)", RESTART, "/usr/X11R6/bin/RunWM.MWM")
+  ),
+  ("退出...", EXIT),
+  ("强制结束会话...", SHUTDOWN)
+ )
+)

configure

@@ -2986,7 +2986,7 @@ fi
 
 
 
-supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN.GB2312"
+supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN.GB2312 sk"
 supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN.GB2312"
 
 for lang in $LINGUAS; do

configure.in

@@ -215,7 +215,7 @@ dnl ==================
 
 dnl List of supported locales
 dnl -------------------------
-supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN.GB2312"
+supported_locales="cs de es fr gl it ja ko nl no pt ru se tr fi hr el pl ro da zh_TW.Big5 zh_CN.GB2312 sk"
 supported_wprefs_locales="pt hr fr ko ja cs zh_TW.Big5 es zh_CN.GB2312"
 
 for lang in $LINGUAS; do

po/Makefile.am

@@ -6,7 +6,7 @@ CLEANFILES = $(CATALOGS) WindowMaker.pot
 
 EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po \
 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po da.po zh_TW.Big5.po\
-	zh_CN.GB2312.po
+	zh_CN.GB2312.po sk.po
 
 POTFILES  = \
 	$(top_builddir)/src/appicon.c \

po/Makefile.in

@@ -94,7 +94,7 @@ CATALOGS = @MOFILES@
 
 CLEANFILES = $(CATALOGS) WindowMaker.pot
 
-EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po da.po zh_TW.Big5.po 	zh_CN.GB2312.po
+EXTRA_DIST = cs.po de.po es.po fr.po gl.po ja.po ko.po nl.po pt.po se.po it.po 	no.po ru.po tr.po fi.po hr.po el.po pl.po ro.po da.po zh_TW.Big5.po 	zh_CN.GB2312.po sk.po
 
 
 POTFILES =  	$(top_builddir)/src/appicon.c 	$(top_builddir)/src/defaults.c 	$(top_builddir)/src/dialog.c 	$(top_builddir)/src/dock.c 	$(top_builddir)/src/dockedapp.c 	$(top_builddir)/src/event.c 	$(top_builddir)/src/framewin.c 	$(top_builddir)/src/icon.c 	$(top_builddir)/src/main.c 	$(top_builddir)/src/menu.c 	$(top_builddir)/src/misc.c 	$(top_builddir)/src/pixmap.c 	$(top_builddir)/src/proplist.c 	$(top_builddir)/src/resources.c 	$(top_builddir)/src/rootmenu.c 	$(top_builddir)/src/screen.c 	$(top_builddir)/src/session.c 	$(top_builddir)/src/stacking.c 	$(top_builddir)/src/startup.c 	$(top_builddir)/src/switchmenu.c 	$(top_builddir)/src/texture.c 	$(top_builddir)/src/wdefaults.c 	$(top_builddir)/src/window.c 	$(top_builddir)/src/winmenu.c 	$(top_builddir)/src/winspector.c 	$(top_builddir)/src/workspace.c 	$(top_builddir)/src/xutil.c 

po/README

@@ -31,6 +31,7 @@ ro.po	Romanian		Andrei Vuta <gigi_man@manag.pub.ro>
 dk.po	Danish			Birger Langkjer <langkjer@post3.tele.dk>
 zh_TW.Big5.po Chinese		Li Wei Jih <lwj83@cs.ccu.edu.tw>
 zh_CN.gb2312.po Chinese		Wang Jian <wangjian2@asiainfo.com>
+sk.po	Slovak			Milan Hromada <mhromada@elas.sk>
 
 
 

src/actions.c

@@ -928,6 +928,7 @@ wIconifyWindow(WWindow *wwin)
 	wwin->icon = wIconCreate(wwin);
     }
 
+    wwin->icon->mapped = 1;
     wwin->flags.miniaturized = 1;
     wwin->flags.mapped = 0;