Window Maker 0.95.8

A few new entries were translated.

.gitignore

@@ -87,6 +87,28 @@ WINGs/WUtil.pc
 
 wrlib/libwraster.map
 
+WindowMaker/menu
+WindowMaker/menu.bg
+WindowMaker/menu.fi
+WindowMaker/menu.fy
+WindowMaker/menu.hu
+WindowMaker/menu.ko
+WindowMaker/menu.nl
+WindowMaker/menu.ro
+WindowMaker/menu.sk
+WindowMaker/menu.zh_TW
+WindowMaker/plmenu
+WindowMaker/plmenu.bg
+WindowMaker/plmenu.es
+WindowMaker/plmenu.fi
+WindowMaker/plmenu.fy
+WindowMaker/plmenu.ja
+WindowMaker/plmenu.ko
+WindowMaker/plmenu.nl
+WindowMaker/plmenu.ro
+WindowMaker/plmenu.sk
+WindowMaker/plmenu.zh_TW
+
 WindowMaker/Defaults/WMRootMenu
 WindowMaker/Defaults/WMState
 WindowMaker/Defaults/WMWindowAttributes
@@ -95,3 +117,5 @@ WindowMaker/IconSets/Default.iconset
 
 # Some text editors generate backup files
 *~
+
+.pc

ChangeLog

@@ -1,3 +1,95 @@
+Changes since version 0.95.7:
+.............................
+
+- Build on Ubuntu 14.04
+  (Johann Haarhoff <johann@haarhoff.org.za>)
+- Window Maker 0.95.7 Debian files
+- create_appicon_from_dock checks if no_appicon flag is set
+- New applications do not create Cached Icon
+- Remove unused argument in save_appicon
+- Avoid recreate Cached icon moving between docks
+- Avoid create again a docked application cache icon
+- save the icon filename instead the full path
+- Remove cache icon when detached
+- usermenu.c Avoid compiler warnings
+- Enable usermenu
+  (Rodolfo García Peñas (kix) <kix@kix.es>)
+- wmaker: fixed infinite loop in switching within group
+  (Satya Mishra <qufgmx@gmail.com>)
+- wmaker: Print error dialog when attempting to delete an in-use workspace.
+  (Doug Torrance <dtorrance@piedmont.edu>)
+- debian: Ignore missing documentation for --runstatedir.
+- debian: Use dh_autoreconf.
+- debian: Simplify debian/rules.
+- debian: Fix typo occured. (Thanks, lintian.)
+- debian: wmaker manpage moved from 1x to 1.
+  (Andreas Metzler <ametzler@bebt.de>)
+- debian: Add wmiv to wmaker package.
+- debian: Add version 0.95.6-1.2 entry to changelog.
+- debian: Update with final version of 0.95.7-1 packaging.
+- wmaker: Maintain sorting of windows by workspace in switch menu.
+- debian: Update with version 0.95.7-2 packaging.
+- wmaker: Update copyright years in info panel.
+- wmaker: Remove prototype for unused get_right_position_on_screen function.
+- wmaker: Fix typos (used codespell).
+- wmaker: Add option for window snap to top edge to maximize to full screen.
+- wmaker: Use window placement settings on other workspaces.
+- wmaker: Add keyboard shortcuts for keeping window on top or at bottom.
+- wmaker: Display keyboard shortcuts for remaining options in window menu.
+- wmaker: Fix whitespace in menu.h; passes checkpatch.pl inspection.
+- wmaker: Implement basic menu shading.
+  (Doug Torrance <dtorrance@piedmont.edu>)
+- Translations: Dutch language files updated
+- Translations: Frisian language files updated
+  (Alwin <translations@ziggo.nl>)
+- wmlib: Add pkg-config file.
+- wmlib: Remove install-exec-local target.
+- WPrefs: Code formatting in TexturePanel.c; minimizes checkpatch.pl warnings.
+- WPrefs: Add support for fpixmap ("fillscale") texture.
+- check-doc: Ignore runstatedir in check-cmdline-options-doc.sh
+- check-doc: Ignore with-aix-soname in check-cmdline-options-doc.sh
+- debian: Remove 56_ignore_runstatedir.diff.
+- debian: Update with version 0.95.7-3 packaging.
+- debian: Update with version 0.95.7-4 packaging.
+- debian: Update with version 0.95.7-5 packaging.
+- debian: Update with version 0.95.7-6 packaging.
+- wmmenugen: Fix segfault; argv[argc] doesn't exist.
+  (Doug Torrance <dtorrance@piedmont.edu>)
+- getstyle: fix wcopy_file paths
+  (Alexandru Lazar <alazar@startmail.com>)
+- wmaker: fix stacking order of dock and fullscreen
+- wmaker: allow alt+tabbed windows over fullscreen
+  (Bjørn Mork <bjorn@mork.no>)
+- WPrefs: Update path for Debian menu
+- Use wprefs_bindir output variable to set WPrefs path in menus.
+- Remove WindowMaker/mkMakefile script.
+- Don't try and add removed file mkMakefile to distribution tarball.
+- Look for plmenu in build directory when creating WMRootMenu.
+- debian: Update with version 0.95.7-7 packaging.
+- configure: Use PKG_PROG_PKG_CONFIG macro to allow cross building.
+  (Doug Torrance <dtorrance@piedmont.edu>)
+- Trivial cleanup: Removed unused defines.
+  (Roman Dobosz <gryf73@gmail.com>)
+- Added 'head' parameter to wMaximizeWindow
+- Added wGetHeadRelativeToCurrentHead function
+- Added option for ability to move half-maximized between heads.
+- Added possibility for half-maximized windows to move across the screens.
+- Fixed wrong (re)stored dimensions for unmaximized window.
+  (gryf <gryf73@gmail.com>)
+- Bugfix for moving windows between heads.
+- New option for enabling alternative half-maximized window movement.
+- Alternative way for traversing half-maximized windows.
+- New option for moving mouse pointer along with half-maximized windows.
+- Implementation for moving mouse pointer within the maximized window.
+- Refactoring handleMaximize() function
+- Removed trailing whitespaces from readme files.
+- Fixed couple of compilator warning and removed unused macros.
+  (Roman Dobosz <gryf73@gmail.com>)
+- wmaker: Do not place icons under the dock
+  (Cyrus Rahman <crahman@gmail.com>)
+- debian: Update with version 0.95.7-8 packaging.
+  (Doug Torrance <dtorrance@piedmont.edu>)
+
 Changes since version 0.95.6:
 .............................
 
@@ -396,6 +488,51 @@ Changes since version 0.95.6:
 - debian: Import version 0.95.6-1.
 - debian: Import version 0.95.6-1.1.
   (Doug Torrance <dtorrance@monmouthcollege.edu>)
+- Import of (partly outdated) Ukrainian translations.
+  (Martin Dietze <mdietze@gmail.com>)
+- Add folder with fedora .spec file
+  (Alexey I. Froloff <raorn@raorn.name>)
+- make: Add Ukrainian translation files to EXTRA_DIST.
+- wmiv: Add long command line options --help and --version.
+- wmiv: Improve help text.
+- doc: Add manpage for wmiv.
+  (Doug Torrance <dtorrance@monmouthcollege.edu>)
+- wmaker: replaced old email address with the official one
+- WINGs: Updated news with the API changes that occured between 0.95.6 and
+  0.95.7
+- WINGs: ran spell checker on the NEWS file
+- WINGs: fix non-portable int conversion for printf in font panel size handling
+- WRaster: fix unused variable warning when XShm extention is not enabled
+  (Christophe CURIS <christophe.curis@free.fr>)
+- New translation into Frisian for Window Maker
+  (Alwin <translations@ziggo.nl>)
+- wrlib: fixed gcc version needed for deprecated attribute support
+- Configure: increased the version of Automake requested
+  (Christophe CURIS <christophe.curis@free.fr>)
+- configure: Fix output of libdir directory in summary
+  (Josip Deanovic <djosip+news@linuxpages.net>)
+- wmaker: fix detection of legacy Apercu configuration keywords
+- WPrefs: fix conversion of old "Apercu" setting to the new keywords
+  (Christophe CURIS <christophe.curis@free.fr>)
+- wmaker: Allow window snapping and linked workspaces simultaneously.
+- wmaker: Allow configuration of window snapping detect distances.
+- WPrefs: Add ability to set integer values in Expert panel
+- WPrefs: Add snap edge and corner detect to Expert panel.
+  (Doug Torrance <dtorrance@monmouthcollege.edu>)
+- Translations: Dutch updates for WPrefs
+- Translations: Frisian updates for WPrefs
+  (Alwin <translations@ziggo.nl>)
+- configure: fixed incorrect variable name that prevented --disable-xdnd to
+  work
+  (Rodolfo García Peñas (kix) <kix@kix.es>)
+- Revert "wmaker: fix clearing of window attribute that was not saved properly"
+- Disable pager by default
+  (Carlos R. Mafra <crmafra@gmail.com>)
+- Allow using keypad Enter to commit move/resize
+- Allow using numpad Enter key in dialogs for confirmation
+  (Amadeusz Sławiński <amade@asmblr.net>)
+- Window Maker 0.95.7
+  (Carlos R. Mafra <crmafra@gmail.com>)
 
 
 Changes since version 0.95.5:

Makefile.am

@@ -21,8 +21,8 @@ config-paths.h: Makefile
 	@echo '/* where shared data is stored */' >> $@
 	@echo '#define PKGDATADIR "$(datadir)/WindowMaker"' >> $@
 	@echo '' >> $@
-	@echo '/* where the configuration is stored */' >> $@
-	@echo '#define SYSCONFDIR "$(sysconfdir)"' >> $@
+	@echo '/* where the global defaults are stored */' >> $@
+	@echo '#define DEFSDATADIR "$(defsdatadir)"' >> $@
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -106,6 +106,8 @@ configure-documentation:
 		--ignore-prg 'enable-shared,enable-static # should be in INSTALL' \
 		--ignore-prg 'disable-option-checking,enable-fast-install # should be in INSTALL' \
 		--ignore-prg 'disable-libtool-lock,with-pic,with-gnu-ld,with-sysroot # for libtool' \
+		--ignore-prg 'runstatedir #new in autoconf 2.70, backported in Debian' \
+		--ignore-prg 'with-aix-soname #new in libtool 2.4.4' \
 		--ignore-prg 'with-x # no use, it would not work without X'
 
 .PHONY: configure-documentation

NEWS

@@ -1,7 +1,231 @@
-
 NEWS for veteran Window Maker users
 -----------------------------------
 
+-- 0.95.8
+
+Move pointer with maximized windows
+-----------------------------------
+
+Implementation for moving mouse pointer within the maximized window.
+
+Mouse pointer can be now moved together with window if keyboard was used for
+arrange maximized windows on screen. This feature can be turned on in WPrefs.app
+in Expert tab by selecting "Move mouse pointer with half maximized windows.", or
+setting "PointerWithHalfMaxWindows" to "Yes" on ~/GNUstep/Defaults/WindowMaker
+file.
+
+
+Alternative way for traverse half-maximized windows
+---------------------------------------------------
+
+For now, there could be three possible state of the window while using
+half-maximized feature. Unmaximized window have its state saved during that
+process, which was use to unmaximize it. For example, if there is a window,
+which is maximized on the half left side of the screen, and while requesting
+left-half-maximized, it become unmaximized with size and dimension restored to
+original state.
+
+By setting "AlternativeHalfMaximized" option to "Yes"
+~/GNUstep/Defaults/WindowMaker config file (or by using WPrefs.app and option
+"Alternative transitions between states for half maximized windows."), there
+would be slightly different change in window "traverse". Given layout depicted
+below:
+
+ ┌┬────────────────────┬┐
+ ├┘ ┌───────┐          ├┤
+ │  ├───────┤          ├┤
+ │  │       │          ├┤
+ │  │       │          ├┤
+ │  └───────┘          └┤
+ ├┬┐                    │
+ └┴┴────────────────────┘
+
+Window can be moved using keyboard shortcut right-half-maximize:
+
+ ┌┬─────────┬──────────┬┐
+ ├┘         ├──────────┼┤
+ │          │          ├┤
+ │          │          ├┤
+ │          │          ├┤
+ │          │          ├┤
+ ├┬┐        └──────────┘│
+ └┴┴────────────────────┘
+
+Further invoking right-half-maximize will do nothing. Note, that window always
+can be unmaximzied using appropriate keyboard shortcut or by selecting
+"Unmaximize" from window menu.
+
+Going to opposite direction by invoking left-half-maximize, will make the window
+maximized in both, vertical and horizontal directions:
+
+ ┌─────────────────────┬┐
+ ├─────────────────────┼┤
+ │                     ├┤
+ │                     ├┤
+ │                     ├┤
+ │                     ├┤
+ ├┬┬───────────────────┘│
+ └┴┴────────────────────┘
+
+Further invoking left-half-maximize, will make the window maximized in half left
+side od the screen:
+
+ ┌──────────┬──────────┬┐
+ ├──────────┤          ├┤
+ │          │          ├┤
+ │          │          ├┤
+ │          │          ├┤
+ │          │          └┤
+ ├┬┬────────┘           │
+ └┴┴────────────────────┘
+
+And again, further invoking left-half-maximize, will do nothing in this mode.
+
+This change affects all possible half-maximized window state also quarters.
+Issuing bottom-left-corner will take lower left quarter of the screen (nothing
+is new so far):
+
+ ┌┬────────────────────┬┐
+ ├┘                    ├┤
+ │                     ├┤
+ ├──────────┐          ├┤
+ ├──────────┤          ├┤
+ │          │          └┤
+ ├┬┬────────┘           │
+ └┴┴────────────────────┘
+
+Issuing bottom-right-corner again will change window state to bottom half
+maximized:
+
+ ┌┬────────────────────┬┐
+ ├┘                    ├┤
+ │                     ├┤
+ ├─────────────────────┼┤
+ ├─────────────────────┼┤
+ │                     ├┤
+ ├┬┬───────────────────┘│
+ └┴┴────────────────────┘
+
+Invoking bottom-right-corner again:
+
+ ┌┬────────────────────┬┐
+ ├┘                    ├┤
+ │                     ├┤
+ │          ┌──────────┼┤
+ │          ├──────────┼┤
+ │          │          ├┤
+ ├┬┐        └──────────┘│
+ └┴┴────────────────────┘
+
+Issuing bottom-right-corner again will have no effect.
+
+
+Move half-maximized windows between the screens
+-----------------------------------------------
+
+New option was introduced to allow change of behaviour of half-maximize windows
+in multiple displays environment. In such environment it is more natural that
+half maximized windows would travel from one screen to another. Now it is
+possible to make that happen by setting an option
+"MoveHalfMaximizedWindowsBetweenScreens" to "Yes" in
+~/GNUstep/Defaults/WindowMaker config file, or by checking "Allow move
+half-maximized windows between multiple screens." in 'Expert User Preferences"
+tab in WPrefs.app.
+
+For example, given there are two screens in layout where one display is on the
+left and second display is on the right with window on first screen:
+
+ ┌┬────────────────┬─────────────────┬┐
+ ├┘ ┌───────┐      │                 ├┤
+ │  ├───────┤      │                 ├┤
+ │  │       │      │                 ├┤
+ │  │       │      │                 ├┤
+ │  └───────┘      │                 └┤
+ ├┬┐               ├┬┬┐               │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+It can be right-half-maximized (using previously defined key combination), so it
+become:
+
+ ┌┬───────┬────────┬─────────────────┬┐
+ ├┘       ├────────┤                 ├┤
+ │        │        │                 ├┤
+ │        │        │                 ├┤
+ │        │        │                 ├┤
+ │        │        │                 └┤
+ ├┬┐      └────────┼┬┬┐               │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+In this example there is an assumption that WindowMaker is configured, that
+maximized windows wont cover mini icons nor dock.
+
+Without setting new option to true, issuing another right-half-maximize will
+restore window dimensions and position to the original state (like on the first
+figure). With new option set to true it will move window to second screen like:
+
+ ┌┬────────────────┬────────┬────────┬┐
+ ├┘                ├────────┤        ├┤
+ │                 │        │        ├┤
+ │                 │        │        ├┤
+ │                 │        │        ├┤
+ │                 │        │        └┤
+ ├┬┐               ├┬┬┬─────┘         │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+Another activation of right-half-maxmimize:
+
+ ┌┬────────────────┬────────┬────────┬┐
+ ├┘                │        ├────────┼┤
+ │                 │        │        ├┤
+ │                 │        │        ├┤
+ │                 │        │        ├┤
+ │                 │        │        ├┤
+ ├┬┐               ├┬┬┐     └────────┘│
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+And final activation of right-half-maxmimize:
+
+ ┌┬────────────────┬───────┬─────────┬┐
+ ├┘                ├───────┤         ├┤
+ │                 │       │         ├┤
+ │                 │       │         ├┤
+ │                 ├───────┘         ├┤
+ │                 │                 └┤
+ ├┬┐               ├┬┬┐               │
+ └┴┴───────────────┴┴┴┴───────────────┘
+
+Where window is restored its size (but not position, since it it on different
+head now). Moving window in directions like left-half-maximize,
+top-half-maximize and bottom-half-maximize will behave in similar way depending
+on the layout of displays.
+
+Note, that only windows that are half-maximized vertically or horizontally can
+be moved to another screen due to the fact, that direction of movement of
+quarter-maximized windows is ambiguous. As for vertical/horizontal-maximize,
+since doesn't move the window but only stretch it vertically/horizontally this
+feature also doesn't apply.
+
+
+Snapping a window to the top
+----------------------------
+
+You can now choose whether snapping a window to the top edge of the screen
+maximizes it to the top half (the previous and default behavior) or to the
+full screen by setting "SnapToTopMaximizesFullscreen" to "NO" or "YES",
+respectively.  This setting can also be changed by unchecking or checking
+"Snapping a window to the top maximizes it to the full screen" in the
+"Expert User Preferences" tab in WPrefs.app.
+
+Global defaults directory configuration
+---------------------------------------
+
+You can now configure the global defaults directory, where the system
+WindowMaker, WMRootMenu, etc. files are stored, by running
+    ./configure --with-defsdatadir=/path/to/defaults
+at build time.  The previous method, which only partially worked, involved
+defining the GLOBAL_DEFAULTS_SUBDIR macro.  This is no longer available.
+Note that the default location is ${sysconfdir}/WindowMaker.
+
 -- 0.95.7
 
 Window snapping

WINGs/po/fy.po

@@ -1,14 +1,14 @@
 # Translation into Western Frisian for Window Maker
-# Copyright (C) 2015 Window Maker Developers Team
+# Copyright (C) 2015-2016 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wmaker-0.95.6+\n"
+"Project-Id-Version: wmaker-0.95.7+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-14 16:10+0200\n"
-"PO-Revision-Date: 2015-06-14 00:00+0000\n"
+"POT-Creation-Date: 2016-01-21 16:19+0100\n"
+"PO-Revision-Date: 2016-01-21 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Western Frisian\n"
 "Language: fy\n"
@@ -99,7 +99,7 @@ msgstr "foartidich bestânsein, ferwachte in nije rigel nei '\\'"
 #, c-format
 msgid "reached end of file while searching '*/' for comment started at line %d"
 msgstr ""
-"bestânsein berikt by sykje nei '*/' foar kommentaar begûnen op rigel %d"
+"bestânsein berikt by sykjen nei '*/' foar kommentaar begûnen op rigel %d"
 
 #: ../../WINGs/menuparser.c:344
 msgid "missing closing double-quote before end-of-line"
@@ -111,7 +111,7 @@ msgstr "ûntbrekkend slutend inkeld oanhelteken foar rigelein"
 
 #: ../../WINGs/menuparser.c:380
 msgid "too many nested macro expansions, breaking loop"
-msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"
+msgstr "te folle neske makro-útwurkingen, syklus ôfbrutsen"
 
 #: ../../WINGs/menuparser.c:439
 #, c-format
@@ -140,7 +140,7 @@ msgstr "ûntbrekkende slutende '%c' yn bestânsnammeopjefte"
 
 #: ../../WINGs/menuparser.c:503
 msgid "too many nested #include's"
-msgstr "te folle neste #include's"
+msgstr "te folle neske #include's"
 
 #: ../../WINGs/menuparser.c:568
 #, c-format
@@ -150,11 +150,11 @@ msgstr "koe bestân \"%s\" net fine foar #include"
 #: ../../WINGs/menuparser.c:589
 #, c-format
 msgid "missing macro name argument to #%s"
-msgstr "ûntbrekkend makronammeargumint by #%s"
+msgstr "ûntbrekkend makronamme-argumint by #%s"
 
 #: ../../WINGs/menuparser.c:600
 msgid "too many nested #if sequences"
-msgstr "te folle neste #if-rigen"
+msgstr "te folle neske #if-rigen"
 
 #: ../../WINGs/menuparser.c:626 ../../WINGs/menuparser.c:643
 #, c-format
@@ -168,7 +168,7 @@ msgstr "gjin makronamme fûn foar #define"
 #: ../../WINGs/menuparser_macros.c:187
 #, c-format
 msgid "premature end of file while reading arg-list for macro \"%s\""
-msgstr "foartidich bestânsein by ynlêze arg.-list foar makro \"%s\""
+msgstr "foartidich bestânsein by ynlêzen arg.-list foar makro \"%s\""
 
 #: ../../WINGs/menuparser_macros.c:194
 #, c-format
@@ -196,7 +196,7 @@ msgstr ""
 #: ../../WINGs/menuparser_macros.c:253
 #, c-format
 msgid "macro \"%s\" already defined, ignoring redefinition"
-msgstr "makro \"%s\" al definiearre, negearret werdefiniearje"
+msgstr "makro \"%s\" al definiearre, negearret werdefiniearjen"
 
 #: ../../WINGs/menuparser_macros.c:346
 #, c-format
@@ -225,7 +225,7 @@ msgstr "te folle arguminten foar makro \"%s\", ferwachte allinnich %d"
 #: ../../WINGs/menuparser_macros.c:530
 #, c-format
 msgid "premature end of line while searching for arguments to macro \"%s\""
-msgstr "foartidich rigelein by sykje nei arguminten by makro \"%s\""
+msgstr "foartidich rigelein by sykjen nei arguminten by makro \"%s\""
 
 #: ../../WINGs/menuparser_macros.c:536
 #, c-format
@@ -345,7 +345,7 @@ msgstr "koe grutte foar bestân '%s' net krije"
 #: ../../WINGs/proplist.c:1531
 #, c-format
 msgid "error reading from file '%s'"
-msgstr "flater by ynlêze bestân '%s'"
+msgstr "flater by ynlêzen bestân '%s'"
 
 #: ../../WINGs/proplist.c:1578
 #, c-format
@@ -355,32 +355,32 @@ msgstr "%s:koe menubestân net iepenje"
 #: ../../WINGs/proplist.c:1660
 #, c-format
 msgid "mkstemp (%s) failed"
-msgstr "oanmeitsje unyk tydlik bestân (%s) mislearre"
+msgstr "oanmeitsjen unyk tydlik bestân (%s) mislearre"
 
 #: ../../WINGs/proplist.c:1670
 #, c-format
 msgid "mktemp (%s) failed"
-msgstr "oanmeitsje tydlik bestân (%s) mislearre"
+msgstr "oanmeitsjen tydlik bestân (%s) mislearre"
 
 #: ../../WINGs/proplist.c:1677
 #, c-format
 msgid "open (%s) failed"
-msgstr "iepenje (%s) mislearre"
+msgstr "iepenjen (%s) mislearre"
 
 #: ../../WINGs/proplist.c:1684
 #, c-format
 msgid "writing to file: %s failed"
-msgstr "skriuwe nei bestân: %s mislearre"
+msgstr "skriuwen nei bestân: %s mislearre"
 
 #: ../../WINGs/proplist.c:1693
 #, c-format
 msgid "fclose (%s) failed"
-msgstr "ôfslute stream (%s) mislearre"
+msgstr "ôfsluten stream (%s) mislearre"
 
 #: ../../WINGs/proplist.c:1701
 #, c-format
 msgid "rename ('%s' to '%s') failed"
-msgstr "omneame ('%s' nei '%s') mislearre"
+msgstr "omneamen ('%s' nei '%s') mislearre"
 
 #: ../../WINGs/proplist.c:1772
 #, c-format
@@ -395,7 +395,7 @@ msgstr "fariabele GNUSTEP_USER_ROOT, definiearre mei ûnjildich paad, net brûkt
 #: ../../WINGs/userdefaults.c:210 ../../WINGs/userdefaults.c:225
 #, c-format
 msgid "cannot read domain from file '%s' when syncing"
-msgstr "kin domeinbestân '%s' net ynlêze by syngronisearje"
+msgstr "kin domeinbestân '%s' net ynlêze by syngronisearjen"
 
 #: ../../WINGs/dragcommon.c:60
 #, c-format
@@ -414,11 +414,11 @@ msgstr "net-stipe ferzje %i foar XDND-berjocht by binnen gean"
 
 #: ../../WINGs/dragsource.c:163
 msgid "XDND selection lost during drag operation..."
-msgstr "XDND-seleksje ferlern by fersleephanneling..."
+msgstr "XDND-seleksje ferlern ûnder fersleephanneling..."
 
 #: ../../WINGs/dragsource.c:758
 msgid "could not get XDND version for target of drop"
-msgstr "koe XDND-ferzje net krije foar doel fan ferslepe"
+msgstr "koe XDND-ferzje net krije foar doel fan ferslepen"
 
 #: ../../WINGs/dragsource.c:774
 msgid "could not get ownership of XDND selection"
@@ -456,7 +456,7 @@ msgstr "Kleuren"
 
 #: ../../WINGs/wcolorpanel.c:568 ../../WINGs/wcolorpanel.c:2720
 msgid "Brightness"
-msgstr "Helderheid"
+msgstr "Helderens"
 
 #: ../../WINGs/wcolorpanel.c:570 ../../WINGs/wcolorpanel.c:644
 #: ../../WINGs/wcolorpanel.c:675 ../../WINGs/wcolorpanel.c:706
@@ -558,7 +558,7 @@ msgstr "Nij..."
 msgid ""
 "Color Panel: Could not create directory %s needed to store configurations"
 msgstr ""
-"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarje, net oanmeitsje"
+"Kleurepaniel: Koe map %s, nedich om ynstellingen te bewarjen, net oanmeitsje"
 
 #. Delete the file, it doesn't belong here
 #: ../../WINGs/wcolorpanel.c:1176 ../../WINGs/wcolorpanel.c:3073
@@ -568,7 +568,7 @@ msgstr "Bestânsflater"
 
 #: ../../WINGs/wcolorpanel.c:1177
 msgid "Could not create ColorPanel configuration directory"
-msgstr "Koe ynstellingenmap Kleurepaniel net oanmeitsje"
+msgstr "Koe ynstellingemap Kleurepaniel net oanmeitsje"
 
 #: ../../WINGs/wcolorpanel.c:1178 ../../WINGs/wcolorpanel.c:3074
 #: ../../WINGs/wcolorpanel.c:3079 ../../WINGs/wcolorpanel.c:3104
@@ -593,7 +593,7 @@ msgstr "Fersêding"
 
 #: ../../WINGs/wcolorpanel.c:2788
 msgid "Hue"
-msgstr "Tinte"
+msgstr "Tint"
 
 #: ../../WINGs/wcolorpanel.c:3012
 msgid "Open Palette"
@@ -610,7 +610,7 @@ msgstr "kin bestân %s net ferwiderje"
 
 #: ../../WINGs/wcolorpanel.c:3078
 msgid "Couldn't remove file from Configuration Directory !"
-msgstr "Koe bestân net ferwiderje út ynstellingenmap!"
+msgstr "Koe bestân net ferwiderje út ynstellingemap!"
 
 #: ../../WINGs/wcolorpanel.c:3103
 msgid "Rename"
@@ -737,12 +737,12 @@ msgstr "Bestân"
 #: ../../WINGs/wfilepanel.c:719
 #, c-format
 msgid "Removing %s failed: %s"
-msgstr "Ferwiderje %s mislearre: %s"
+msgstr "Ferwiderjen %s mislearre: %s"
 
 #: ../../WINGs/wfilepanel.c:751
 #, c-format
 msgid "An error occurred browsing '%s'."
-msgstr "Der trede in flater op by blêdzje troch '%s'."
+msgstr "Der trede in flater op by blêdzjen troch '%s'."
 
 #: ../../WINGs/wfilepanel.c:754
 #, c-format
@@ -799,7 +799,7 @@ msgstr "Koe biblioteek 'lettertype ynstelle' net inisjalisearje\n"
 #: ../../WINGs/widgets.c:446
 #, c-format
 msgid "WINGs: could not load widget images file: %s"
-msgstr "WINGs: Koe ôfbyldingenbestân bestjoeringseleminten net lade: %s"
+msgstr "WINGs: Koe ôfbyldingebestân bestjoeringseleminten net lade: %s"
 
 #: ../../WINGs/widgets.c:542
 #, c-format
@@ -824,7 +824,7 @@ msgstr "0   inch"
 
 #: ../../WINGs/wtextfield.c:494
 msgid "only left alignment is supported in textfields"
-msgstr "allinnich lofts rjochtsje wurdt stipe yn tekstfjilden"
+msgstr "allinnich lofts rjochtsjen wurdt stipe yn tekstfjilden"
 
 #: ../../WINGs/wwindow.c:160
 msgid "window title conversion error... using STRING encoding"
@@ -833,42 +833,3 @@ msgstr "finstertitelomsettingsflater... brûkt STRING-kodearring"
 #: ../../WINGs/wwindow.c:181
 msgid "icon title conversion error... using STRING encoding"
 msgstr "ikoantitelomsettingsflater... brûkt STRING-kodearring"
-
-# Keep next entries for wmaker-0.95.6
-msgid "Could not open input file \"%s\""
-msgstr "Koe ynfierbestân \"%s\" net iepenje"
-
-msgid "Could not create target file \"%s\""
-msgstr "Koe doelbestân \"%s\" net oanmeitsje"
-
-msgid "An error occured browsing '%s'."
-msgstr "Der trede in flater op by blêdzje troch '%s'."
-
-msgid ""
-"invalid characted '%c' in arg-list for macro \"%s\" while expecting "
-"parameter name"
-msgstr ""
-"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte "
-"parameternamme"
-
-msgid ""
-"invalid characted '%c' in arg-list for macro \"%s\" while expecting ',' "
-"or ')'"
-msgstr ""
-"ûnjildich letterteken '%c' yn arg.-list foar makro \"%s\", ferwachte ',' "
-"of ')'"
-
-msgid "unknow directive '#%s'"
-msgstr "ûnbekende oanwizing '#%s'"
-
-msgid "found #%s but have no matching #if"
-msgstr "#%s fûn, mar hat gjin bybehearrende #if"
-
-msgid "too many nested includes"
-msgstr "te folle neste #include's"
-
-msgid "could not find file \"%s\" for include"
-msgstr "koe bestân \"%s\" net fine foar #include"
-
-msgid "too many nested macro expansion, breaking loop"
-msgstr "te folle neste makro-útwurkingen, syklus ôfbrutsen"

WINGs/userdefaults.c

@@ -103,17 +103,14 @@ char *wdefaultspathfordomain(const char *domain)
 }
 
 /* XXX: doesn't quite belong to *user*defaults.c */
-#ifndef GLOBAL_DEFAULTS_SUBDIR
-#define GLOBAL_DEFAULTS_SUBDIR "WindowMaker"
-#endif
 char *wglobaldefaultspathfordomain(const char *domain)
 {
 	char *t = NULL;
 	size_t len;
 
-	len = strlen( SYSCONFDIR ) + strlen( GLOBAL_DEFAULTS_SUBDIR ) + strlen(domain) + 3;
+	len = strlen(DEFSDATADIR) + strlen(domain) + 2;
 	t = wmalloc(len);
-	snprintf(t, len, "%s/%s/%s", SYSCONFDIR, GLOBAL_DEFAULTS_SUBDIR, domain);
+	snprintf(t, len, "%s/%s", DEFSDATADIR, domain);
 
 	return t;
 }

WINGs/wcolorpanel.c

@@ -67,9 +67,6 @@ static unsigned char Cursor_bits[] = {
 	0x00, 0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x70
 };
 
-/* Cursor shape-mask */
-#define Cursor_shape_width 32
-#define Cursor_shape_height 32
 static unsigned char Cursor_shape_bits[] = {
 	0x00, 0x7e, 0x00, 0x00, 0xc0, 0x81, 0x03, 0x00, 0x20, 0x00, 0x04, 0x00, 0x10, 0x00, 0x08,
 	0x00, 0x08, 0x00, 0x10, 0x00, 0x04, 0x00, 0x20, 0x00, 0x02, 0x00, 0x40, 0x00, 0x02, 0x00,

WINGs/wfontpanel.c

@@ -700,7 +700,7 @@ static void typefaceClick(WMWidget * w, void *data)
 
 	WM_ITERATE_ARRAY(face->sizes, size, i) {
 		if (size != NULL) {
-			int size_int = (int) size;
+			int size_int = (intptr_t) size;
 
 			sprintf(buffer, "%i", size_int);
 
@@ -802,7 +802,7 @@ static void setFontPanelFontName(FontPanel * panel, const char *family, const ch
 		char buffer[32];
 
 		if (vsize != NULL) {
-			int size_int = (int) vsize;
+			int size_int = (intptr_t) vsize;
 
 			sprintf(buffer, "%i", size_int);
 

WINGs/wsplitview.c

@@ -41,9 +41,6 @@ typedef struct W_SplitView {
 /* TODO: rewrite --Dan */
 #define _GetSubviewsCount() WMGetArrayItemCount(sPtr->subviews)
 
-#define _AddPSubviewStruct(P) \
-    (WMAddToArray(sPtr->subviews,((void*)P)))
-
 #define _GetPSubviewStructAt(i) \
     ((W_SplitViewSubview*)WMGetFromArray(sPtr->subviews,(i)))
 

WPrefs.app/Expert.c

@@ -97,6 +97,18 @@ static const struct {
 	{ N_("Distance from corner to begin window snap."),
 	  /* default: */ 10, OPTION_WMAKER_INT, "SnapCornerDetect" },
 
+	{ N_("Snapping a window to the top maximizes it to the full screen."),
+	  /* default: */ False, OPTION_WMAKER, "SnapToTopMaximizesFullscreen" },
+
+	{ N_("Allow move half-maximized windows between multiple screens."),
+	  /* default: */ False, OPTION_WMAKER, "MoveHalfMaximizedWindowsBetweenScreens" },
+
+	{ N_("Alternative transitions between states for half maximized windows."),
+	  /* default: */ False, OPTION_WMAKER, "AlternativeHalfMaximized" },
+
+	{ N_("Move mouse pointer with half maximized windows."),
+	  /* default: */ False, OPTION_WMAKER, "PointerWithHalfMaxWindows" },
+
 	{ N_("Open dialogs in the same workspace as their owners."),
 	  /* default: */ False, OPTION_WMAKER, "OpenTransientOnOwnerWorkspace" }
 

WPrefs.app/KeyboardShortcuts.c

@@ -89,6 +89,8 @@ static const struct {
 	{ "LBCMaximizeKey", N_("Maximize active window left bottom corner") },
 	{ "RBCMaximizeKey", N_("Maximize active window right bottom corner") },
 	{ "MaximusKey",     N_("Maximus: Tiled maximization ") },
+	{ "KeepOnTopKey",   N_("Toggle window on top status") },
+	{ "KeepAtBottomKey",N_("Toggle window at bottom status") },
 	{ "OmnipresentKey", N_("Toggle window omnipresent status") },
 	{ "RaiseKey",       N_("Raise active window") },
 	{ "LowerKey",       N_("Lower active window") },

WPrefs.app/Menu.c

@@ -506,7 +506,7 @@ static void createPanel(_Panel * p)
 		WMSetScrollViewContentView(sview, WMWidgetView(pad));
 
 		data = putNewItem(panel, pad, ExternalInfo, _("Debian Menu"));
-		data->param.pipe.command = "/etc/X11/WindowMaker/menu.hook";
+		data->param.pipe.command = "/etc/GNUstep/Defaults/menu.hook";
 
 		data = putNewItem(panel, pad, PipeInfo, _("RedHat Menu"));
 		data->param.pipe.command = "wmconfig --output wmaker";

WPrefs.app/TexturePanel.c

@@ -117,16 +117,21 @@ typedef struct _TexturePanel {
 
 } _TexturePanel;
 
-#define TYPE_SOLID	0
-#define TYPE_GRADIENT	1
-#define TYPE_SGRADIENT	2
-#define TYPE_TGRADIENT	3
-#define TYPE_PIXMAP	4
+enum {
+	TYPE_SOLID,
+	TYPE_GRADIENT,
+	TYPE_SGRADIENT,
+	TYPE_TGRADIENT,
+	TYPE_PIXMAP
+};
 
-#define PTYPE_TILE	0
-#define PTYPE_SCALE	1
-#define PTYPE_CENTER	2
-#define PTYPE_MAXIMIZE	3
+enum {
+	PTYPE_TILE,
+	PTYPE_SCALE,
+	PTYPE_CENTER,
+	PTYPE_MAXIMIZE,
+	PTYPE_FILL
+};
 
 /*
  *--------------------------------------------------------------------------
@@ -136,7 +141,7 @@ typedef struct _TexturePanel {
 
 /************/
 
-static void updateGradButtons(TexturePanel * panel)
+static void updateGradButtons(TexturePanel *panel)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -180,7 +185,7 @@ static void updateGradButtons(TexturePanel * panel)
 	}
 }
 
-static void updateTGradImage(TexturePanel * panel)
+static void updateTGradImage(TexturePanel *panel)
 {
 	RImage *image, *gradient;
 	WMPixmap *pixmap;
@@ -201,19 +206,17 @@ static void updateTGradImage(TexturePanel * panel)
 	to.green = WMGreenComponentOfColor(color) >> 8;
 	to.blue = WMBlueComponentOfColor(color) >> 8;
 
-	if (panel->image->width < 141 || panel->image->height < 91) {
+	if (panel->image->width < 141 || panel->image->height < 91)
 		image = RMakeTiledImage(panel->image, 141, 91);
-	} else {
+	else
 		image = RCloneImage(panel->image);
-	}
 
-	if (WMGetButtonSelected(panel->dirhB)) {
+	if (WMGetButtonSelected(panel->dirhB))
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RHorizontalGradient);
-	} else if (WMGetButtonSelected(panel->dirvB)) {
+	else if (WMGetButtonSelected(panel->dirvB))
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RVerticalGradient);
-	} else {
+	else
 		gradient = RRenderGradient(image->width, image->height, &from, &to, RDiagonalGradient);
-	}
 
 	RCombineImagesWithOpaqueness(image, gradient, WMGetSliderValue(panel->topaS));
 	RReleaseImage(gradient);
@@ -225,7 +228,7 @@ static void updateTGradImage(TexturePanel * panel)
 	RReleaseImage(image);
 }
 
-static void updateSGradButtons(TexturePanel * panel)
+static void updateSGradButtons(TexturePanel *panel)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -264,7 +267,7 @@ static void updateSGradButtons(TexturePanel * panel)
 
 /*********** Gradient ************/
 
-static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSVColor * hsv)
+static void updateSVSlider(WMSlider *sPtr, Bool saturation, WMFont *font, RHSVColor *hsv)
 {
 	RImage *image;
 	WMPixmap *pixmap;
@@ -312,7 +315,7 @@ static void updateSVSlider(WMSlider * sPtr, Bool saturation, WMFont * font, RHSV
 	WMReleasePixmap(pixmap);
 }
 
-static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv)
+static void updateHueSlider(WMSlider *sPtr, WMFont *font, RHSVColor *hsv)
 {
 	RColor *colors[8];
 	RImage *image;
@@ -353,7 +356,7 @@ static void updateHueSlider(WMSlider * sPtr, WMFont * font, RHSVColor * hsv)
 		wfree(colors[i]);
 }
 
-static void sliderChangeCallback(WMWidget * w, void *data)
+static void sliderChangeCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	RHSVColor hsv;
@@ -417,9 +420,8 @@ static void sliderChangeCallback(WMWidget * w, void *data)
 	}
 	colors[i] = NULL;
 
-	if (panel->gimage != None) {
+	if (panel->gimage != None)
 		XFreePixmap(WMScreenDisplay(scr), panel->gimage);
-	}
 
 	image = RRenderMultiGradient(30, i * WMGetListItemHeight(panel->gcolL), colors, RVerticalGradient);
 	RConvertImage(WMScreenRContext(scr), image, &panel->gimage);
@@ -432,7 +434,7 @@ static void sliderChangeCallback(WMWidget * w, void *data)
 	updateGradButtons(panel);
 }
 
-static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text, int state, WMRect * rect)
+static void paintGradListItem(WMList *lPtr, int index, Drawable d, char *text, int state, WMRect *rect)
 {
 	TexturePanel *panel = (TexturePanel *) WMGetHangedData(lPtr);
 	WMScreen *scr = WMWidgetScreen(lPtr);
@@ -465,7 +467,7 @@ static void paintGradListItem(WMList * lPtr, int index, Drawable d, char *text,
 	WMReleaseColor(gray);
 }
 
-static void gradAddCallback(WMWidget * w, void *data)
+static void gradAddCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -489,7 +491,7 @@ static void gradAddCallback(WMWidget * w, void *data)
 	WMSetButtonEnabled(panel->okB, WMGetListNumberOfRows(panel->gcolL) > 1);
 }
 
-static void gradClickCallback(WMWidget * w, void *data)
+static void gradClickCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -511,7 +513,7 @@ static void gradClickCallback(WMWidget * w, void *data)
 	sliderChangeCallback(panel->gsatS, panel);
 }
 
-static void gradDeleteCallback(WMWidget * w, void *data)
+static void gradDeleteCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMListItem *item;
@@ -545,7 +547,7 @@ static void gradDeleteCallback(WMWidget * w, void *data)
 
 /*************** Simple Gradient ***************/
 
-static void colorWellObserver(void *self, WMNotification * n)
+static void colorWellObserver(void *self, WMNotification *n)
 {
 	/* Parameter not used, but tell the compiler that it is ok */
 	(void) n;
@@ -553,7 +555,7 @@ static void colorWellObserver(void *self, WMNotification * n)
 	updateSGradButtons(self);
 }
 
-static void opaqChangeCallback(WMWidget * w, void *data)
+static void opaqChangeCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 
@@ -565,7 +567,7 @@ static void opaqChangeCallback(WMWidget * w, void *data)
 
 /****************** Image ******************/
 
-static void updateImage(TexturePanel * panel, const char *path)
+static void updateImage(TexturePanel *panel, const char *path)
 {
 	WMScreen *scr = WMWidgetScreen(panel->win);
 	RImage *image;
@@ -613,12 +615,12 @@ static void updateImage(TexturePanel * panel, const char *path)
 	}
 }
 
-static void browseImageCallback(WMWidget * w, void *data)
+static void browseImageCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	WMOpenPanel *opanel;
 	WMScreen *scr = WMWidgetScreen(w);
-	static char *ipath = NULL;
+	static char *ipath;
 
 	opanel = WMGetOpenPanel(scr);
 	WMSetFilePanelCanChooseDirectories(opanel, False);
@@ -670,18 +672,17 @@ static void browseImageCallback(WMWidget * w, void *data)
 	}
 }
 
-static void buttonCallback(WMWidget * w, void *data)
+static void buttonCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 
-	if (w == panel->okB) {
+	if (w == panel->okB)
 		(*panel->okAction) (panel->okData);
-	} else {
+	else
 		(*panel->cancelAction) (panel->cancelData);
-	}
 }
 
-static void changeTypeCallback(WMWidget * w, void *data)
+static void changeTypeCallback(WMWidget *w, void *data)
 {
 	TexturePanel *panel = (TexturePanel *) data;
 	int newType;
@@ -731,7 +732,7 @@ static void changeTypeCallback(WMWidget * w, void *data)
  * Public functions
  *--------------------------------------------------------------------------
  */
-void ShowTexturePanel(TexturePanel * panel)
+void ShowTexturePanel(TexturePanel *panel)
 {
 	Display *dpy = WMScreenDisplay(WMWidgetScreen(panel->win));
 	Screen *scr = DefaultScreenOfDisplay(dpy);
@@ -742,24 +743,24 @@ void ShowTexturePanel(TexturePanel * panel)
 	WMMapWidget(panel->win);
 }
 
-void HideTexturePanel(TexturePanel * panel)
+void HideTexturePanel(TexturePanel *panel)
 {
 	WMUnmapWidget(panel->win);
 }
 
-void SetTexturePanelOkAction(TexturePanel * panel, WMCallback * action, void *clientData)
+void SetTexturePanelOkAction(TexturePanel *panel, WMCallback *action, void *clientData)
 {
 	panel->okAction = action;
 	panel->okData = clientData;
 }
 
-void SetTexturePanelCancelAction(TexturePanel * panel, WMCallback * action, void *clientData)
+void SetTexturePanelCancelAction(TexturePanel *panel, WMCallback *action, void *clientData)
 {
 	panel->cancelAction = action;
 	panel->cancelData = clientData;
 }
 
-void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList * texture)
+void SetTexturePanelTexture(TexturePanel *panel, const char *name, WMPropList *texture)
 {
 	WMScreen *scr = WMWidgetScreen(panel->win);
 	char *str, *type;
@@ -775,9 +776,8 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		return;
 
 	p = WMGetFromPLArray(texture, 0);
-	if (!p) {
+	if (!p)
 		goto bad_texture;
-	}
 	type = WMGetFromPLString(p);
 
 	/*............................................... */
@@ -786,11 +786,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SOLID);
 
 		p = WMGetFromPLArray(texture, 1);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->defcW, color);
@@ -803,11 +802,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_SGRADIENT);
 
 		p = WMGetFromPLArray(texture, 1);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->tcol1W, color);
@@ -815,11 +813,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMReleaseColor(color);
 
 		p = WMGetFromPLArray(texture, 2);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->tcol2W, color);
@@ -846,11 +843,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMSetSliderValue(panel->topaS, i);
 
 		p = WMGetFromPLArray(texture, 3);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->tcol1W, color);
@@ -858,11 +854,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMReleaseColor(color);
 
 		p = WMGetFromPLArray(texture, 4);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->tcol2W, color);
@@ -873,9 +868,9 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 
 		if (panel->imageFile)
 			wfree(panel->imageFile);
-		if ((panel->imageFile = wfindfileinarray(panel->pathList,
-							 WMGetFromPLString(WMGetFromPLArray(texture, 1)))) !=
-		    NULL) {
+		panel->imageFile = wfindfileinarray(panel->pathList,
+						    WMGetFromPLString(WMGetFromPLArray(texture, 1)));
+		if (panel->imageFile != NULL) {
 
 			panel->image = RLoadImage(WMScreenRContext(scr), panel->imageFile, 0);
 			updateTGradImage(panel);
@@ -899,11 +894,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		WMSetPopUpButtonSelectedItem(panel->typeP, TYPE_GRADIENT);
 
 		p = WMGetFromPLArray(texture, 1);
-		if (!p) {
+		if (!p)
 			str = "black";
-		} else {
+		else
 			str = WMGetFromPLString(p);
-		}
 		color = WMCreateNamedColor(scr, str, False);
 
 		WMSetColorWellColor(panel->defcW, color);
@@ -915,11 +909,10 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 			XColor xcolor;
 
 			p = WMGetFromPLArray(texture, i);
-			if (!p) {
+			if (!p)
 				str = "black";
-			} else {
+			else
 				str = WMGetFromPLString(p);
-			}
 
 			XParseColor(WMScreenDisplay(scr), WMScreenRContext(scr)->cmap, str, &xcolor);
 
@@ -953,6 +946,9 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 		case 'M':
 			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_MAXIMIZE);
 			break;
+		case 'F':
+			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_FILL);
+			break;
 		default:
 		case 'T':
 			WMSetPopUpButtonSelectedItem(panel->arrP, PTYPE_TILE);
@@ -1001,13 +997,13 @@ void SetTexturePanelTexture(TexturePanel * panel, const char *name, WMPropList *
 
 }
 
-char *GetTexturePanelTextureName(TexturePanel * panel)
+char *GetTexturePanelTextureName(TexturePanel *panel)
 {
 	return WMGetTextFieldText(panel->nameT);
 
 }
 
-WMPropList *GetTexturePanelTexture(TexturePanel * panel)
+WMPropList *GetTexturePanelTexture(TexturePanel *panel)
 {
 	WMPropList *prop = NULL;
 	WMColor *color;
@@ -1038,6 +1034,10 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
 			prop = WMCreatePLArray(WMCreatePLString("mpixmap"),
 					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
 			break;
+		case PTYPE_FILL:
+			prop = WMCreatePLArray(WMCreatePLString("fpixmap"),
+					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
+			break;
 		case PTYPE_CENTER:
 			prop = WMCreatePLArray(WMCreatePLString("cpixmap"),
 					       WMCreatePLString(panel->imageFile), WMCreatePLString(str), NULL);
@@ -1104,13 +1104,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
 		color = WMGetColorWellColor(panel->defcW);
 		str = WMGetColorRGBDescription(color);
 
-		if (WMGetButtonSelected(panel->dirdB)) {
+		if (WMGetButtonSelected(panel->dirdB))
 			prop = WMCreatePLArray(WMCreatePLString("mdgradient"), WMCreatePLString(str), NULL);
-		} else if (WMGetButtonSelected(panel->dirvB)) {
+		else if (WMGetButtonSelected(panel->dirvB))
 			prop = WMCreatePLArray(WMCreatePLString("mvgradient"), WMCreatePLString(str), NULL);
-		} else {
+		else
 			prop = WMCreatePLArray(WMCreatePLString("mhgradient"), WMCreatePLString(str), NULL);
-		}
 		wfree(str);
 
 		for (i = 0; i < WMGetListNumberOfRows(panel->gcolL); i++) {
@@ -1131,12 +1130,12 @@ WMPropList *GetTexturePanelTexture(TexturePanel * panel)
 	return prop;
 }
 
-void SetTexturePanelPixmapPath(TexturePanel * panel, WMPropList * array)
+void SetTexturePanelPixmapPath(TexturePanel *panel, WMPropList *array)
 {
 	panel->pathList = array;
 }
 
-TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
+TexturePanel *CreateTexturePanel(WMWindow *keyWindow)
 /*CreateTexturePanel(WMScreen *scr)*/
 {
 	TexturePanel *panel;
@@ -1407,6 +1406,7 @@ TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
 	WMAddPopUpButtonItem(panel->arrP, _("Scale"));
 	WMAddPopUpButtonItem(panel->arrP, _("Center"));
 	WMAddPopUpButtonItem(panel->arrP, _("Maximize"));
+	WMAddPopUpButtonItem(panel->arrP, _("Fill"));
 	WMSetPopUpButtonSelectedItem(panel->arrP, 0);
 
 	WMMapSubwidgets(panel->imageF);
@@ -1475,7 +1475,7 @@ TexturePanel *CreateTexturePanel(WMWindow * keyWindow)
 
 char *ProgName = "test";
 
-void testOKButton(WMWidget * self, void *data)
+void testOKButton(WMWidget *self, void *data)
 {
 	char *test;
 	Display *dpy;
@@ -1504,13 +1504,13 @@ void testOKButton(WMWidget * self, void *data)
 
 }
 
-void testCancelButton(WMWidget * self, void *data)
+void testCancelButton(WMWidget *self, void *data)
 {
 	wwarning("Exiting test....");
 	exit(0);
 }
 
-void wAbort()
+void wAbort(void)
 {
 	exit(1);
 }

WPrefs.app/po/nl.po

@@ -1,14 +1,14 @@
 # New translation into Dutch for Window Maker
-# Copyright (C) 2014-2015 Window Maker Developers Team
+# Copyright (C) 2014-2016 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wmaker-0.95.6+\n"
+"Project-Id-Version: wmaker-0.95.7+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-26 21:39+0200\n"
-"PO-Revision-Date: 2015-06-26 00:00+0000\n"
+"POT-Creation-Date: 2017-03-10 10:56+0100\n"
+"PO-Revision-Date: 2017-03-10 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Dutch\n"
 "Language: nl\n"
@@ -92,7 +92,7 @@ msgstr "Cliptitel, ingeschoven"
 msgid "Left"
 msgstr "Links"
 
-#: ../../WPrefs.app/Appearance.c:111 ../../WPrefs.app/TexturePanel.c:1408
+#: ../../WPrefs.app/Appearance.c:111 ../../WPrefs.app/TexturePanel.c:1407
 #: ../../WPrefs.app/WindowHandling.c:93 ../../WPrefs.app/Workspace.c:189
 msgid "Center"
 msgstr "Centreren"
@@ -165,7 +165,7 @@ msgstr "[Achtergrond]"
 msgid "Workspace Background"
 msgstr "Werkruimteachtergrond"
 
-#: ../../WPrefs.app/Appearance.c:562 ../../WPrefs.app/TexturePanel.c:885
+#: ../../WPrefs.app/Appearance.c:562 ../../WPrefs.app/TexturePanel.c:880
 #, c-format
 msgid "could not load file '%s': %s"
 msgstr "kon bestand '%s' niet laden: %s"
@@ -284,7 +284,7 @@ msgstr "Bewerken"
 msgid "Edit the highlighted texture."
 msgstr "Bewerk de uitgelichte textuur."
 
-#: ../../WPrefs.app/Appearance.c:1946 ../../WPrefs.app/TexturePanel.c:1219
+#: ../../WPrefs.app/Appearance.c:1946 ../../WPrefs.app/TexturePanel.c:1218
 msgid "Delete"
 msgstr "Wissen"
 
@@ -540,8 +540,8 @@ msgstr "Negeer decoratiehints voor GTK-programma's."
 
 #. default:
 #: ../../WPrefs.app/Expert.c:50
-msgid "Disable workspace pager."
-msgstr "Schakel werkruimtevolger uit."
+msgid "Enable workspace pager."
+msgstr "Schakel werkruimtevolger in."
 
 #. default:
 #: ../../WPrefs.app/Expert.c:53
@@ -611,23 +611,43 @@ msgstr "Maximaliseer (duw) 'n venster tegen kant of hoek door verslepen."
 #. default:
 #: ../../WPrefs.app/Expert.c:94
 msgid "Distance from edge to begin window snap."
-msgstr "Afstand vanaf kant waar venster duwen begint."
+msgstr "Afstand vanaf kant waar venster opduwen begint."
 
 #. default:
 #: ../../WPrefs.app/Expert.c:97
 msgid "Distance from corner to begin window snap."
-msgstr "Afstand vanaf hoek waar venster duwen begint."
+msgstr "Afstand vanaf hoek waar venster opduwen begint."
 
 #. default:
 #: ../../WPrefs.app/Expert.c:100
+msgid "Snapping a window to the top maximizes it to the full screen."
+msgstr "Venster duwen tegen de bovenkant, maximaliseert 't schermvullend."
+
+#. default:
+#: ../../WPrefs.app/Expert.c:103
+msgid "Allow move half-maximized windows between multiple screens."
+msgstr "Sta verplaatsen halfgemaximaliseerde vensters toe tussen schermen."
+
+#. default:
+#: ../../WPrefs.app/Expert.c:106
+msgid "Alternative transitions between states for half maximized windows."
+msgstr "Andere staten van overgang voor halfgemaximaliseerde vensters."
+
+#. default:
+#: ../../WPrefs.app/Expert.c:109
+msgid "Move mouse pointer with half maximized windows."
+msgstr "Verplaats muispijl met halfgemaximaliseerde vensters."
+
+#. default:
+#: ../../WPrefs.app/Expert.c:112
 msgid "Open dialogs in the same workspace as their owners."
 msgstr "Open dialogen in dezelfde werkruimte als hun eigenaren."
 
-#: ../../WPrefs.app/Expert.c:310
+#: ../../WPrefs.app/Expert.c:322
 msgid "Expert User Preferences"
 msgstr "Voorkeuren voor ervaren gebruikers"
 
-#: ../../WPrefs.app/Expert.c:312
+#: ../../WPrefs.app/Expert.c:324
 msgid ""
 "Options for people who know what they're doing...\n"
 "Also has some other misc. options."
@@ -951,278 +971,286 @@ msgid "Maximus: Tiled maximization "
 msgstr "Maximus: tegelmaximalisering "
 
 #: ../../WPrefs.app/KeyboardShortcuts.c:92
+msgid "Toggle window on top status"
+msgstr "Schakel 'venster bovenop houden' in/uit"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:93
+msgid "Toggle window at bottom status"
+msgstr "Schakel 'venster onderop houden' in/uit"
+
+#: ../../WPrefs.app/KeyboardShortcuts.c:94
 msgid "Toggle window omnipresent status"
 msgstr "Schakel 'venster alomtegenwoordig' in/uit"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:93
+#: ../../WPrefs.app/KeyboardShortcuts.c:95
 msgid "Raise active window"
 msgstr "Verhoog actief venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:94
+#: ../../WPrefs.app/KeyboardShortcuts.c:96
 msgid "Lower active window"
 msgstr "Verlaag actief venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:95
+#: ../../WPrefs.app/KeyboardShortcuts.c:97
 msgid "Raise/Lower window under mouse pointer"
 msgstr "Verhoog/verlaag venster onder muispijl"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:96
+#: ../../WPrefs.app/KeyboardShortcuts.c:98
 msgid "Shade active window"
 msgstr "Rol actief venster op"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:97
+#: ../../WPrefs.app/KeyboardShortcuts.c:99
 msgid "Move/Resize active window"
 msgstr "Verplaats/vergroot actief venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:98
+#: ../../WPrefs.app/KeyboardShortcuts.c:100
 msgid "Select active window"
 msgstr "Selecteer actief venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:99
+#: ../../WPrefs.app/KeyboardShortcuts.c:101
 msgid "Focus next window"
 msgstr "Focus volgend venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:100
+#: ../../WPrefs.app/KeyboardShortcuts.c:102
 msgid "Focus previous window"
 msgstr "Focus vorig venster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:101
+#: ../../WPrefs.app/KeyboardShortcuts.c:103
 msgid "Focus next group window"
 msgstr "Focus volgend groepsvenster"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:102
+#: ../../WPrefs.app/KeyboardShortcuts.c:104
 msgid "Focus previous group window"
 msgstr "Focus vorig groepsvenster"
 
 #. Workspace Related
-#: ../../WPrefs.app/KeyboardShortcuts.c:105
+#: ../../WPrefs.app/KeyboardShortcuts.c:107
 msgid "Open workspace pager"
 msgstr "Open werkruimtevolger"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:106
+#: ../../WPrefs.app/KeyboardShortcuts.c:108
 msgid "Switch to next workspace"
 msgstr "Schakel naar volgende werkruimte"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:107
+#: ../../WPrefs.app/KeyboardShortcuts.c:109
 msgid "Switch to previous workspace"
 msgstr "Schakel naar vorige werkruimte"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:108
+#: ../../WPrefs.app/KeyboardShortcuts.c:110
 msgid "Switch to last used workspace"
 msgstr "Schakel n. laatst gebruikte werkruimte"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:109
+#: ../../WPrefs.app/KeyboardShortcuts.c:111
 msgid "Switch to next ten workspaces"
 msgstr "Schakel 10 werkruimten verder"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:110
+#: ../../WPrefs.app/KeyboardShortcuts.c:112
 msgid "Switch to previous ten workspaces"
 msgstr "Schakel 10 werkruimten terug"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:111
+#: ../../WPrefs.app/KeyboardShortcuts.c:113
 msgid "Switch to workspace 1"
 msgstr "Schakel naar werkruimte 1"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:112
+#: ../../WPrefs.app/KeyboardShortcuts.c:114
 msgid "Switch to workspace 2"
 msgstr "Schakel naar werkruimte 2"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:113
+#: ../../WPrefs.app/KeyboardShortcuts.c:115
 msgid "Switch to workspace 3"
 msgstr "Schakel naar werkruimte 3"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:114
+#: ../../WPrefs.app/KeyboardShortcuts.c:116
 msgid "Switch to workspace 4"
 msgstr "Schakel naar werkruimte 4"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:115
+#: ../../WPrefs.app/KeyboardShortcuts.c:117
 msgid "Switch to workspace 5"
 msgstr "Schakel naar werkruimte 5"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:116
+#: ../../WPrefs.app/KeyboardShortcuts.c:118
 msgid "Switch to workspace 6"
 msgstr "Schakel naar werkruimte 6"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:117
+#: ../../WPrefs.app/KeyboardShortcuts.c:119
 msgid "Switch to workspace 7"
 msgstr "Schakel naar werkruimte 7"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:118
+#: ../../WPrefs.app/KeyboardShortcuts.c:120
 msgid "Switch to workspace 8"
 msgstr "Schakel naar werkruimte 8"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:119
+#: ../../WPrefs.app/KeyboardShortcuts.c:121
 msgid "Switch to workspace 9"
 msgstr "Schakel naar werkruimte 9"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:120
+#: ../../WPrefs.app/KeyboardShortcuts.c:122
 msgid "Switch to workspace 10"
 msgstr "Schakel naar werkruimte 10"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:121
+#: ../../WPrefs.app/KeyboardShortcuts.c:123
 msgid "Move window to next workspace"
 msgstr "Verpl. venster n. volgende werkruimte"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:122
+#: ../../WPrefs.app/KeyboardShortcuts.c:124
 msgid "Move window to previous workspace"
 msgstr "Verpl. venster n. vorige werkruimte"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:123
+#: ../../WPrefs.app/KeyboardShortcuts.c:125
 msgid "Move window to last used workspace"
 msgstr "Verpl. venster n. laatst gebruikte werkr."
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:124
+#: ../../WPrefs.app/KeyboardShortcuts.c:126
 msgid "Move window to next ten workspaces"
 msgstr "Verpl. venster 10 werkruimten verder"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:125
+#: ../../WPrefs.app/KeyboardShortcuts.c:127
 msgid "Move window to previous ten workspaces"
 msgstr "Verpl. venster 10 werkruimten terug"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:126
+#: ../../WPrefs.app/KeyboardShortcuts.c:128
 msgid "Move window to workspace 1"
 msgstr "Verplaats venster naar werkruimte 1"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:127
+#: ../../WPrefs.app/KeyboardShortcuts.c:129
 msgid "Move window to workspace 2"
 msgstr "Verplaats venster naar werkruimte 2"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:128
+#: ../../WPrefs.app/KeyboardShortcuts.c:130
 msgid "Move window to workspace 3"
 msgstr "Verplaats venster naar werkruimte 3"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:129
+#: ../../WPrefs.app/KeyboardShortcuts.c:131
 msgid "Move window to workspace 4"
 msgstr "Verplaats venster naar werkruimte 4"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:130
+#: ../../WPrefs.app/KeyboardShortcuts.c:132
 msgid "Move window to workspace 5"
 msgstr "Verplaats venster naar werkruimte 5"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:131
+#: ../../WPrefs.app/KeyboardShortcuts.c:133
 msgid "Move window to workspace 6"
 msgstr "Verplaats venster naar werkruimte 6"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:132
+#: ../../WPrefs.app/KeyboardShortcuts.c:134
 msgid "Move window to workspace 7"
 msgstr "Verplaats venster naar werkruimte 7"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:133
+#: ../../WPrefs.app/KeyboardShortcuts.c:135
 msgid "Move window to workspace 8"
 msgstr "Verplaats venster naar werkruimte 8"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:134
+#: ../../WPrefs.app/KeyboardShortcuts.c:136
 msgid "Move window to workspace 9"
 msgstr "Verplaats venster naar werkruimte 9"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:135
+#: ../../WPrefs.app/KeyboardShortcuts.c:137
 msgid "Move window to workspace 10"
 msgstr "Verplaats venster naar werkruimte 10"
 
 #. Window Selection
-#: ../../WPrefs.app/KeyboardShortcuts.c:138
+#: ../../WPrefs.app/KeyboardShortcuts.c:140
 msgid "Shortcut for window 1"
 msgstr "Sneltoets voor venster 1"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:139
+#: ../../WPrefs.app/KeyboardShortcuts.c:141
 msgid "Shortcut for window 2"
 msgstr "Sneltoets voor venster 2"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:140
+#: ../../WPrefs.app/KeyboardShortcuts.c:142
 msgid "Shortcut for window 3"
 msgstr "Sneltoets voor venster 3"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:141
+#: ../../WPrefs.app/KeyboardShortcuts.c:143
 msgid "Shortcut for window 4"
 msgstr "Sneltoets voor venster 4"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:142
+#: ../../WPrefs.app/KeyboardShortcuts.c:144
 msgid "Shortcut for window 5"
 msgstr "Sneltoets voor venster 5"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:143
+#: ../../WPrefs.app/KeyboardShortcuts.c:145
 msgid "Shortcut for window 6"
 msgstr "Sneltoets voor venster 6"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:144
+#: ../../WPrefs.app/KeyboardShortcuts.c:146
 msgid "Shortcut for window 7"
 msgstr "Sneltoets voor venster 7"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:145
+#: ../../WPrefs.app/KeyboardShortcuts.c:147
 msgid "Shortcut for window 8"
 msgstr "Sneltoets voor venster 8"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:146
+#: ../../WPrefs.app/KeyboardShortcuts.c:148
 msgid "Shortcut for window 9"
 msgstr "Sneltoets voor venster 9"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:147
+#: ../../WPrefs.app/KeyboardShortcuts.c:149
 msgid "Shortcut for window 10"
 msgstr "Sneltoets voor venster 10"
 
 #. Misc.
-#: ../../WPrefs.app/KeyboardShortcuts.c:150
+#: ../../WPrefs.app/KeyboardShortcuts.c:152
 msgid "Launch new instance of application"
 msgstr "Start nieuw exemplaar van programma op"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:151
+#: ../../WPrefs.app/KeyboardShortcuts.c:153
 msgid "Switch to Next Screen/Monitor"
 msgstr "Schakel naar volgend scherm/monitor"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:152
+#: ../../WPrefs.app/KeyboardShortcuts.c:154
 msgid "Run application"
 msgstr "Voer programma uit"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:153
+#: ../../WPrefs.app/KeyboardShortcuts.c:155
 msgid "Raise/Lower Dock"
 msgstr "Verhoog/verlaag Dok"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:154
+#: ../../WPrefs.app/KeyboardShortcuts.c:156
 msgid "Raise/Lower Clip"
 msgstr "Verhoog/verlaag Clip"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:156
+#: ../../WPrefs.app/KeyboardShortcuts.c:158
 msgid "Toggle keyboard language"
 msgstr "Wissel toetsenbordtaal"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:373 ../../WPrefs.app/Menu.c:274
+#: ../../WPrefs.app/KeyboardShortcuts.c:375 ../../WPrefs.app/Menu.c:274
 #: ../../WPrefs.app/TexturePanel.c:1425
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:375
+#: ../../WPrefs.app/KeyboardShortcuts.c:377
 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing."
 msgstr ""
 "Druk op de verlangde sneltoets(en), of klik Annuleren om opnemen te stoppen."
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:394
-#: ../../WPrefs.app/KeyboardShortcuts.c:564 ../../WPrefs.app/Menu.c:284
+#: ../../WPrefs.app/KeyboardShortcuts.c:396
+#: ../../WPrefs.app/KeyboardShortcuts.c:566 ../../WPrefs.app/Menu.c:284
 #: ../../WPrefs.app/Menu.c:732
 msgid "Capture"
 msgstr "Opnemen"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:395
-#: ../../WPrefs.app/KeyboardShortcuts.c:572
+#: ../../WPrefs.app/KeyboardShortcuts.c:397
+#: ../../WPrefs.app/KeyboardShortcuts.c:574
 msgid "Click on Capture to interactively define the shortcut key."
 msgstr "Klik op Opnemen om interactief de sneltoets te bepalen."
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:521
+#: ../../WPrefs.app/KeyboardShortcuts.c:523
 msgid "Actions"
 msgstr "Acties"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:548
+#: ../../WPrefs.app/KeyboardShortcuts.c:550
 msgid "Shortcut"
 msgstr "Sneltoets"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:558 ../../WPrefs.app/Menu.c:738
+#: ../../WPrefs.app/KeyboardShortcuts.c:560 ../../WPrefs.app/Menu.c:738
 msgid "Clear"
 msgstr "Wissen"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:613
+#: ../../WPrefs.app/KeyboardShortcuts.c:615
 msgid "Keyboard Shortcut Preferences"
 msgstr "Sneltoetsvoorkeuren"
 
-#: ../../WPrefs.app/KeyboardShortcuts.c:615
+#: ../../WPrefs.app/KeyboardShortcuts.c:617
 msgid ""
 "Change the keyboard shortcuts for actions such\n"
 "as changing workspaces and opening menus."
@@ -1630,7 +1658,7 @@ msgstr "Waarschuwing"
 
 #: ../../WPrefs.app/Menu.c:1442 ../../WPrefs.app/Menu.c:1475
 #: ../../WPrefs.app/MouseSettings.c:156 ../../WPrefs.app/MouseSettings.c:176
-#: ../../WPrefs.app/TexturePanel.c:583 ../../WPrefs.app/TexturePanel.c:661
+#: ../../WPrefs.app/TexturePanel.c:585 ../../WPrefs.app/TexturePanel.c:663
 #: ../../WPrefs.app/TexturePanel.c:1419 ../../WPrefs.app/WPrefs.c:617
 #: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:641
 #: ../../WPrefs.app/WPrefs.c:653 ../../WPrefs.app/WPrefs.c:659
@@ -1645,8 +1673,8 @@ msgid "Could not open default menu from '%s'"
 msgstr "Kon standaardmenu niet openen uit '%s'"
 
 #: ../../WPrefs.app/Menu.c:1475 ../../WPrefs.app/MouseSettings.c:154
-#: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:583
-#: ../../WPrefs.app/TexturePanel.c:659 ../../WPrefs.app/WPrefs.c:617
+#: ../../WPrefs.app/MouseSettings.c:173 ../../WPrefs.app/TexturePanel.c:585
+#: ../../WPrefs.app/TexturePanel.c:661 ../../WPrefs.app/WPrefs.c:617
 #: ../../WPrefs.app/WPrefs.c:621 ../../WPrefs.app/WPrefs.c:638
 #: ../../WPrefs.app/WPrefs.c:649 ../../WPrefs.app/WPrefs.c:659
 #: ../../WPrefs.app/WPrefs.c:699 ../../WPrefs.app/WPrefs.c:703
@@ -1932,7 +1960,7 @@ msgid "Icon Search Paths"
 msgstr "Icoonzoekpaden"
 
 #: ../../WPrefs.app/Paths.c:261 ../../WPrefs.app/Paths.c:292
-#: ../../WPrefs.app/TexturePanel.c:1213
+#: ../../WPrefs.app/TexturePanel.c:1212
 msgid "Add"
 msgstr "Toevoegen"
 
@@ -2091,103 +2119,107 @@ msgstr ""
 "Verschillende instellingen zoals ballontekst,\n"
 "verhouding van weergaven enz."
 
-#: ../../WPrefs.app/TexturePanel.c:293
+#: ../../WPrefs.app/TexturePanel.c:296
 msgid "Saturation"
 msgstr "Verzadiging"
 
-#: ../../WPrefs.app/TexturePanel.c:295
+#: ../../WPrefs.app/TexturePanel.c:298
 msgid "Brightness"
 msgstr "Helderheid"
 
-#: ../../WPrefs.app/TexturePanel.c:340 ../../WPrefs.app/TexturePanel.c:346
+#: ../../WPrefs.app/TexturePanel.c:343 ../../WPrefs.app/TexturePanel.c:349
 msgid "Hue"
 msgstr "Tint"
 
-#: ../../WPrefs.app/TexturePanel.c:580
+#: ../../WPrefs.app/TexturePanel.c:582
 msgid "Could not load the selected file: "
 msgstr "Kon 't geselecteerde bestand niet laden: "
 
-#: ../../WPrefs.app/TexturePanel.c:630
+#: ../../WPrefs.app/TexturePanel.c:632
 msgid "Open Image"
 msgstr "Open afbeelding"
 
-#: ../../WPrefs.app/TexturePanel.c:660
+#: ../../WPrefs.app/TexturePanel.c:662
 msgid "The selected file does not contain a supported image."
 msgstr "'t Geselecteerde bestand bevat geen ondersteunde afbeelding."
 
-#: ../../WPrefs.app/TexturePanel.c:999
+#: ../../WPrefs.app/TexturePanel.c:995
 #, c-format
 msgid "error creating texture %s"
 msgstr "fout bij aanmaken textuur %s"
 
-#: ../../WPrefs.app/TexturePanel.c:1158
+#: ../../WPrefs.app/TexturePanel.c:1157
 msgid "Texture Panel"
 msgstr "Texturen"
 
-#: ../../WPrefs.app/TexturePanel.c:1165
+#: ../../WPrefs.app/TexturePanel.c:1164
 msgid "Texture Name"
 msgstr "Textuurnaam"
 
-#: ../../WPrefs.app/TexturePanel.c:1177
+#: ../../WPrefs.app/TexturePanel.c:1176
 msgid "Solid Color"
 msgstr "Effenkleur"
 
-#: ../../WPrefs.app/TexturePanel.c:1178
+#: ../../WPrefs.app/TexturePanel.c:1177
 msgid "Gradient Texture"
 msgstr "Kleurverloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1179
+#: ../../WPrefs.app/TexturePanel.c:1178
 msgid "Simple Gradient Texture"
 msgstr "Eenvoudig kleurverloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1180
+#: ../../WPrefs.app/TexturePanel.c:1179
 msgid "Textured Gradient"
 msgstr "Getextureerd kleurverloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1181
+#: ../../WPrefs.app/TexturePanel.c:1180
 msgid "Image Texture"
 msgstr "Afbeeldingstextuur"
 
-#: ../../WPrefs.app/TexturePanel.c:1189
+#: ../../WPrefs.app/TexturePanel.c:1188
 msgid "Default Color"
 msgstr "Standaardkleur"
 
-#: ../../WPrefs.app/TexturePanel.c:1201
+#: ../../WPrefs.app/TexturePanel.c:1200
 msgid "Gradient Colors"
 msgstr "Kleurverloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1290
+#: ../../WPrefs.app/TexturePanel.c:1289
 msgid "Direction"
 msgstr "Richting"
 
-#: ../../WPrefs.app/TexturePanel.c:1318
+#: ../../WPrefs.app/TexturePanel.c:1317
 msgid "Gradient"
 msgstr "Verloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1334
+#: ../../WPrefs.app/TexturePanel.c:1333
 msgid "Gradient Opacity"
 msgstr "Doorzichtigheidsverloop"
 
-#: ../../WPrefs.app/TexturePanel.c:1374
+#: ../../WPrefs.app/TexturePanel.c:1373
 msgid "Image"
 msgstr "Afbeelding"
 
-#: ../../WPrefs.app/TexturePanel.c:1394
+#: ../../WPrefs.app/TexturePanel.c:1393
 msgid "Browse..."
 msgstr "Bladeren..."
 
-#: ../../WPrefs.app/TexturePanel.c:1406
+#: ../../WPrefs.app/TexturePanel.c:1405
 msgid "Tile"
 msgstr "Tegelen"
 
-#: ../../WPrefs.app/TexturePanel.c:1407
+#: ../../WPrefs.app/TexturePanel.c:1406
 msgid "Scale"
 msgstr "Schalen"
 
-#: ../../WPrefs.app/TexturePanel.c:1409
+#: ../../WPrefs.app/TexturePanel.c:1408
 msgid "Maximize"
 msgstr "Maximaliseren"
 
+#: ../../WPrefs.app/TexturePanel.c:1409
+msgid "Fill"
+msgstr "Vullen"
+
 #: ../../WPrefs.app/WPrefs.c:212 ../../WPrefs.app/WPrefs.c:282
 msgid "Window Maker Preferences"
 msgstr "Window Maker-voorkeuren"
@@ -2632,88 +2664,3 @@ msgstr "%s wordt voor zowel %s als %s gebruikt"
 
 #~ msgid "Bar of The Day"
 #~ msgstr "Balk van de dag"
-
-# Keep next entries for wmaker-0.95.6
-msgid "Open dialogs in the same workspace as their owners"
-msgstr "Open dialogen in dezelfde werkruimte als hun eigenaren"
-
-msgid "Before auto-raise"
-msgstr "Vanzelf verhogen na"
-
-msgid "msec"
-msgstr "ms"
-
-msgid "Manual:  Click on the window to set keyboard input focus."
-msgstr "Handmatig:  Klik op 't venster om toetsenbordinvoerfocus te geven"
-
-msgid ""
-"Auto:  Set keyboard input focus to the window under the mouse pointer."
-msgstr ""
-"Vanzelf:  Geef toetsenbord-\n"
-"invoerfocus aan 't venster onder de muispijl"
-
-msgid "Install colormap in the window..."
-msgstr "Installeer kleurenkaart uit 't venster..."
-
-msgid "...that has the input focus."
-msgstr "...dat de invoerfocus heeft"
-
-msgid "...that's under the mouse pointer."
-msgstr "...dat onder de muispijl zit"
-
-msgid "Do not let applications receive the click used to focus windows."
-msgstr "Laat programma's niet de vensterfocusklik ontvangen"
-
-msgid "Automatically focus new windows."
-msgstr "Focus nieuwe vensters vanzelf"
-
-msgid ""
-"Raise window when switching\n"
-"focus with keyboard."
-msgstr "Verhoog venster bij focus wisselen met toetsenbord"
-
-msgid "could not execute command \"%s\""
-msgstr "kon commando \"%s\" niet uitvoeren"
-
-msgid "Disable AppIcon bounce."
-msgstr "Schakel stuiteren icoon uit"
-
-msgid "Bounce AppIcon when the application wants attention."
-msgstr "Stuiter als 't programma aandacht wil"
-
-msgid "Raise AppIcons when bouncing."
-msgstr "Verhoog icoon bij stuiteren"
-
-msgid "Placement Origin"
-msgstr "Begin:"
-
-msgid "...do not cover icons"
-msgstr "...iconen niet bedekken"
-
-msgid "...do not cover dock"
-msgstr "...Dok niet bedekken"
-
-msgid ""
-"Mod+Wheel\n"
-"resize increment"
-msgstr ""
-"Vergrootstap\n"
-"'Mod'+wiel"
-
-msgid "Wrap to the first workspace from the last workspace."
-msgstr "Omslaan naar de eerste werkruimte, vanaf de laatste werkruimte"
-
-msgid "Switch workspaces while dragging windows."
-msgstr "Van werkruimte wisselen bij vensters verslepen"
-
-msgid "Automatically create new workspaces."
-msgstr "Vanzelf nieuwe werkruimten aanmaken"
-
-msgid "miniwindow apercus"
-msgstr "miniaturen"
-
-msgid "Yes, don't ask again."
-msgstr "Ja, vraag niet weer"
-
-msgid "Maximize a window to side or corner by dragging."
-msgstr "Maximaliseer 'n venster tegen zijkant of hoek door verslepen."

WindowMaker/Defaults/Makefile.am

@@ -1,6 +1,3 @@
-
-defsdatadir = $(sysconfdir)/WindowMaker
-
 defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL
 
 wpexecbindir = @wprefs_bindir@
@@ -23,5 +20,5 @@ WMState: $(srcdir)/WMState.in
 	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState ; \
 	chmod 644 WMState
 
-WMRootMenu: $(srcdir)/../plmenu
-	$(AM_V_GEN)cp -f $(srcdir)/../plmenu WMRootMenu
+WMRootMenu: ./../plmenu
+	$(AM_V_GEN)cp -f ./../plmenu WMRootMenu

WindowMaker/Makefile.am

@@ -1,64 +1,79 @@
-SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes
+SUBDIRS = Backgrounds . Defaults IconSets Icons Pixmaps Styles Themes
 
 prefsdatadir = $(pkgdatadir)
 
-prefsdata_DATA =\
-	appearance.menu\
-	autostart.sh\
-	background.menu\
-	exitscript.sh\
+wpexecbindir = @wprefs_bindir@
+
+# menus which need generated to have correct path to WPrefs
+GENERATED_MENUS =\
 	menu\
 	menu.bg\
+	menu.fi\
+	menu.fy\
+	menu.hu\
+	menu.ko\
+	menu.nl\
+	menu.ro\
+	menu.sk\
+	menu.zh_TW\
+	plmenu\
+	plmenu.bg\
+	plmenu.es\
+	plmenu.fi\
+	plmenu.fy\
+	plmenu.ja\
+	plmenu.ko\
+	plmenu.nl\
+	plmenu.ro\
+	plmenu.sk\
+	plmenu.zh_TW
+
+# menus which do not mention WPrefs
+NONGENERATED_MENUS =\
 	menu.ca\
 	menu.cz\
 	menu.da\
 	menu.de\
 	menu.el\
 	menu.es\
-	menu.fi\
 	menu.fr\
-	menu.fy\
 	menu.gl\
 	menu.he\
 	menu.hr\
-	menu.hu\
 	menu.it\
 	menu.ja\
-	menu.ko\
-	menu.nl\
 	menu.no\
 	menu.pl\
 	menu.pt\
-	menu.ro\
 	menu.ru\
 	menu.se\
-	menu.sk\
 	menu.sl\
 	menu.tr\
 	menu.zh_CN\
-	menu.zh_TW\
-	plmenu\
-	plmenu.bg\
 	plmenu.da\
 	plmenu.de\
-	plmenu.es\
-	plmenu.fi\
 	plmenu.fr\
-	plmenu.fy\
 	plmenu.hr\
 	plmenu.it\
-	plmenu.ja\
-	plmenu.ko\
-	plmenu.nl\
 	plmenu.pl\
-	plmenu.ro\
-	plmenu.sk\
-	plmenu.zh_CN\
-	plmenu.zh_TW\
+	plmenu.zh_CN
+
+dist_prefsdata_DATA =\
+	appearance.menu\
+	autostart.sh\
+	background.menu\
+	exitscript.sh\
 	README\
 	README.themes\
-	wmmacros
+	wmmacros\
+	$(NONGENERATED_MENUS)
 
-EXTRA_DIST = $(prefsdata_DATA) mkMakefile
+nodist_prefsdata_DATA = $(GENERATED_MENUS)
 
+EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
 
+CLEANFILES = $(GENERATED_MENUS)
+
+$(GENERATED_MENUS):
+	$(AM_V_GEN)sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" \
+		$(srcdir)/$@.in > $@

WindowMaker/menu.bg.in

@@ -209,7 +209,7 @@
 		"Фон" 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 #wprefs#
 	"Изглед" END
 
 	"Изход"	MENU

WindowMaker/menu.fi.in

@@ -202,7 +202,7 @@
 		"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 #wprefs#
 	"Ulkonäkö" END
 
 	"Lopeta"	MENU

WindowMaker/menu.fy

@@ -1,224 +0,0 @@
-/*
- * Hoofdmenu-uitwerking voor WindowMaker
- *
- * Opmaak is:
- *
- * <Titel> [SHORTCUT <Sneltoets>] <Commando> <Parameters>
- *
- * <Titel> is elke tekenreeks te gebruiken als titel. Moet tussen " staan als het
- * 	spaties heeft.
- * 
- * SHORTCUT geeft een sneltoets op voor die ingang. <Sneltoets> heeft
- * dezelfde opmaak als de sneltoetsopties in het
- * $HOME/GNUstep/Defaults/WindowMaker bestand, zoals RootMenuKey of MiniaturizeKey.
- *
- * U kunt geen sneltoets opgeven voor een MENU- of OPEN_MENU-onderdeel.
- * 
- * <Commando> een van de geldige commando's: 
- *	MENU - begint (sub)menubepaling
- *	END  - beëindigt (sub)menubepaling
- *	OPEN_MENU - opent een menu uit een bestand, 'pipe' of map(pen)inhoud,
- *		    en gaat eventueel elk vooraf met een commando.
- *	WORKSPACE_MENU - voegt een submenu voor werkruimtehandelingen toe. Slechts één
- *		    workspace_menu is toegestaan. 		
- *	EXEC <programma> - voert een extern programma uit
- *	SHEXEC <commando> - voert een 'shell'-commando uit (zoals gimp > /dev/null)
- *	EXIT - sluit de vensterbeheerder af
- *	RESTART [<vensterbeheerder>] - herstart WindowMaker, of start een andere
- *			vensterbeheerder
- *	REFRESH - vernieuwt het bureaublad
- *	ARRANGE_ICONS - herschikt de iconen in de werkruimte
- *	SHUTDOWN - doodt alle cliënten (en sluit de X Window-sessie af)
- *	SHOW_ALL - plaatst alle vensters in de werkruimte terug
- *	HIDE_OTHERS - verbergt alle vensters in de werkruimte, behalve die
- *		focus heeft (of de laatste die focus had)
- *	SAVE_SESSION - slaat de huidige staat van het bureaublad op, inbegrepen
- *		       alle lopende programma's, al hun 'hints' (afmetingen,
- *		       positie op het scherm, werkruimte waarin ze leven, Dok
- *		       of Clip van waaruit ze werden opgestart, en indien
- *		       geminiaturiseerd, opgerold of verborgen). Slaat tevens de actuele
- *		       werkruimte van de gebruiker op. Alles zal worden hersteld bij elke
- *		       start van windowmaker, tot een andere SAVE_SESSION of
- *		       CLEAR_SESSION wordt gebruikt. Als SaveSessionOnExit = Yes; in
- *		       het WindowMaker-domeinbestand, dan wordt opslaan automatisch
- *		       gedaan bij elke windowmaker-afsluiting, en wordt een
- *		       SAVE_SESSION of CLEAR_SESSION overschreven (zie hierna).
- *	CLEAR_SESSION - wist een eerder opgeslagen sessie. Dit zal geen
- *		       effect hebben als SaveSessionOnExit is True.
- *	INFO - toont het Infopaneel
- *
- * OPEN_MENU-opmaak:
- *   1. Menuafhandeling uit bestand.
- *	// opent bestand.menu, dat een geldig menubestand moet bevatten, en voegt
- *	// het in op de huidige plaats
- *	OPEN_MENU bestand.menu
- *   2. Menuafhandeling uit pipe.
- *	// opent commando en gebruikt zeen 'stdout' om een menu aan te maken.
- *	// Commando-output moet een geldige menubeschrijving zijn.
- *	// De ruimte tussen '|' en het commando zelf is optioneel.
- *      // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
- *	// bij openen. Dat zou traag kunnen werken.
- *	OPEN_MENU | commando
- *      OPEN_MENU || commando
- *   3. Mapafhandeling.
- *	// Opent een of meer mappen en maakt een menu aan, met daarin alle
- *	// submappen en uitvoerbare bestanden alfabetisch
- *	// gesorteerd.
- *	OPEN_MENU /een/map [/een/andere/map ...]
- *   4. Mapafhandeling met commando.
- *	// Opent een of meer mappen en maakt een menu aan, met daarin alle
- *	// submappen en leesbare bestanden alfabetisch gesorteerd,
- *	// elk van hen voorafgegaan met commando.
- *	OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
- *		Opties:
- * 			-noext 	haal alles vanaf de laatste punt in de
- *				bestandsnaam eraf
- *
- * <Parameters> is het uit te voeren programma.
- *
- * ** Commandoregelopties in EXEC:
- * %s - wordt vervangen door de actuele selectie
- * %a(titel[,aanwijzing]) - opent een invoerveld met de opgegeven titel en de
- *			optionele aanwijzing, en wordt vervangen door wat u intypt
- * %w - wordt vervangen door XID voor het actuele gefocust venster
- * %W - wordt vervangen door het nummer van de actuele werkruimte
- * 
- * U kunt speciale karakters (zoals % en ") uitschakelen met het \-teken:
- * vb.: xterm -T "\"Hallo Wereld\""
- *
- * U kunt ook ontsnappingstekens gebruiken, zoals \n
- *
- * Elke MENU-declaratie moet één gekoppelde END-declaratie op het eind hebben.
- *
- * Voorbeeld:
- *
- * "Test" MENU
- *	"XTerm" EXEC xterm
- *		// maakt een submenu met de inhoud van /usr/openwin/bin aan
- *	"XView-progr" OPEN_MENU "/usr/openwin/bin"
- *		// enige X11-programma's in verschillende mappen
- *	"X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
- *		// enige achtergrondafbeeldingen instellen
- *	"Achtergrond" OPEN_MENU -noext $HOME/afbeeldingen /usr/share/images WITH wmsetbg -u -t
- *		// voegt het style.menu in met dit onderdeel
- *	"Stijl" OPEN_MENU style.menu
- * "Test" END
- */
-
-#include "wmmacros"
-
-"Programma's" MENU
-	"Ynfo" MENU
-		"Ynfopaniel" INFO_PANEL
-		"Juridyske ynfo" LEGAL_PANEL
-		"Systeemconsole" EXEC xconsole
-		"Systeembelêsting" SHEXEC xosview || xload
-		"Proseslist" EXEC xterm -e top
-		"Hantliedingbrowser" EXEC xman
-	"Ynfo" END
-	"Utfiere..." SHEXEC %a(Utfiere,Typ út te fiere kommando:)
-	"XTerm" EXEC xterm -sb 
-	"Mozilla Firefox" EXEC firefox
-	"Wurkromten" WORKSPACE_MENU
-	"Programma's" MENU
-		"Gimp" SHEXEC gimp >/dev/null
-  		"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
-		"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
-		"Abiword" EXEC abiword
-		"Dia" EXEC dia
-		"OpenOffice.org" MENU
-			"OpenOffice.org" EXEC ooffice
-			"Writer" EXEC oowriter
-			"Rekkenblêd" EXEC oocalc
-			"Draw" EXEC oodraw
-			"Impress" EXEC ooimpress
-		"OpenOffice.org" END 
-
-		"Tekstbewurkers" MENU
-			"XEmacs" EXEC xemacs
-			"Emacs" EXEC emacs
-			"XJed" EXEC xjed 
-			"VI" EXEC xterm -e vi
-			"GVIM" EXEC gvim
-			"NEdit" EXEC nedit
-			"Xedit" EXEC xedit
-		"Tekstbewurkers" END
-
-		"Multymedia" MENU
-			"XMMS" MENU
-				"XMMS" EXEC xmms
-				"XMMS ôfspylje/poazje" EXEC xmms -t
-				"XMMS stopje" EXEC xmms -s
-			"XMMS" END
-			"Xine fideospeler" EXEC xine
-			"MPlayer" EXEC mplayer
-		"Multymedia" END
-	"Programma's" END
-
-	"Helpmiddels" MENU
-		"Rekkenmasine" EXEC xcalc
-		"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
-		"Lettertypekiezer" EXEC xfontsel
-		"Fergrutsje" EXEC wmagnify
-		"Kleurekaart" EXEC xcmap
-		"X-programma deadzje" EXEC xkill
-	"Helpmiddels" END
-
-	"Seleksje" MENU
-		"Kopiearje" SHEXEC echo '%s' | wxcopy
-		"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
-		"Navigearje" EXEC netscape %s
-		"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
-	"Seleksje" END
-
-	"Kommando's" MENU
-		"Oare ferbergje" HIDE_OTHERS
-		"Alles toane" SHOW_ALL
-		"Ikoanen skikke" ARRANGE_ICONS
-		"Fernije" REFRESH
-		"Ofskoattelje" EXEC xlock -allowroot -usefirst
-	"Kommando's" END
-
-	"Uterlik" MENU
-		"Tema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
-		"Stilen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
-		"Ikoanensets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
-		"Eftergrûn" MENU
-			"Effen" MENU
-				"Swart" WS_BACK '(solid, black)'
-				"Blau"  WS_BACK '(solid, "#505075")'
-				"Indigo" WS_BACK '(solid, "#243e6c")'
-				"Marineblau" WS_BACK '(solid, "#224477")'
-				"Poarper" WS_BACK '(solid, "#554466")'
-				"Weet"  WS_BACK '(solid, "wheat4")'
-				"Donkergriis"  WS_BACK '(solid, "#333340")'
-				"Wynread" WS_BACK '(solid, "#400020")'
-				"Effen" END
-			"Kleurferrin" MENU
-				"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
-				"Loft" WS_BACK '(vgradient, blue4, white)'
-    			"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
-				"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
-			    "Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
-    			"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
-    			"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
-    			"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
-			"Kleurferrin" END
-			"Ofbyldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
-		"Eftergrûn" END
-		"Tema bewarje" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
-		"Iconenset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanensetnamme,Fier bestânsnamme yn:)"
-		"Foarkarrenhelpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
-	"Uterlik" END
-
-	"Sesje" MENU
-		"Sesje bewarje" SAVE_SESSION
-		"Sesje wiskje" CLEAR_SESSION
-		"Window Maker werstarte" RESTART
-		"BlackBox starte" RESTART blackbox
-		"IceWM starte" RESTART icewm
-		"Ofslute"  EXIT
-	"Sesje" END
-"Programma's" END
-
-

WindowMaker/menu.fy.in

@@ -0,0 +1,224 @@
+/*
+ * Haadmenu-útwurking foar WindowMaker
+ *
+ * Opmaak is:
+ *
+ * <Titel> [SHORTCUT <Fluchtoets>] <Kommando> <Parameters>
+ *
+ * <Titel> is elke tekenrige te brûken as titel. Moat tusken " stean as it
+ * 	spaasjes hat.
+ * 
+ * SHORTCUT jout in fluchtoets op foar dy yngong. <Fluchtoets> hat
+ * deselde opmaak as de fluchtoetsopsjes yn it
+ * $HOME/GNUstep/Defaults/WindowMaker bestân, sa as RootMenuKey of MiniaturizeKey.
+ *
+ * Jo kinne gjin fluchtoets opjaan foar in MENU- of OPEN_MENU-ûnderdiel.
+ * 
+ * <Kommando> ien fan 'e jildige kommando's: 
+ *	MENU - begjint (sub)menubepaling
+ *	END  - beëiniget (sub)menubepaling
+ *	OPEN_MENU - iepenet in menu út in bestân, 'pipe' of map(pen)ynhâld,
+ *		    en giet eventueel elk foarôf mei in kommando.
+ *	WORKSPACE_MENU - foeget in submenu foar wurkromtehannelingen ta. Mar ien
+ *		    workspace_menu is tastien. 		
+ *	EXEC <programma> - fiert in ekstern programma út
+ *	SHEXEC <kommando> - fiert in 'shell'-kommando út (sa as gimp > /dev/null)
+ *	EXIT - slút de finsterbehearder ôf
+ *	RESTART [<finsterbehearder>] - werstart WindowMaker, of start in oare
+ *			finsterbehearder
+ *	REFRESH - fernijt it buroblêd
+ *	ARRANGE_ICONS - werskikt de ikoanen yn 'e wurkromte
+ *	SHUTDOWN - deadet alle kliïnten (en slút de X Window-sesje ôf)
+ *	SHOW_ALL - pleatst alle finsters yn 'e wurkromte werom
+ *	HIDE_OTHERS - ferberget alle finsters yn 'e wurkromte, útsein dy't
+ *		fokus hat (of de lêste dy't fokus hie)
+ *	SAVE_SESSION - bewaret de hjoeddeiske steat fan it buroblêd, ynsletten
+ *		       alle rinnende programma's, al har 'hints' (ôfmjittingen,
+ *		       posysje op it skerm, wurkromte dêr't se yn libje, Dok
+ *		       of Klip fan wêrút se opstart waarden, en wannear
+ *		       miniaturisearre, oprôle of ferburgen). Bewaret teffens de aktuele
+ *		       wurkromte fan 'e brûker. Alles sil wersteld wurde by elke
+ *		       start fan windowmaker, oant in oare SAVE_SESSION of
+ *		       CLEAR_SESSION brûkt wurdt. As SaveSessionOnExit = Yes; yn
+ *		       it WindowMaker-domeinbestân, dan wurdt bewarjen automatysk
+ *		       dien by elke windowmaker-ôfsluting, en wurdt in
+ *		       SAVE_SESSION of CLEAR_SESSION oerskreaun (sjoch hjirnei).
+ *	CLEAR_SESSION - wisket in earder bewarre sesje. Dit sil gjin
+ *		       effekt hawwe as SaveSessionOnExit is True.
+ *	INFO - toant it Ynfopaniel
+ *
+ * OPEN_MENU-opmaak:
+ *   1. Menu-ôfhanneling út bestân.
+ *	// iepenet bestân.menu, dat in jildich menubestân befetsje moat, en foeget
+ *	// it yn op 'e hjoeddeiske plak
+ *	OPEN_MENU bestân.menu
+ *   2. Menu-ôfhanneling út pipe.
+ *	// iepenet kommando en brûkt syn 'stdout' om in menu oan te meitsjen.
+ *	// Kommando-output moat in jildige menubeskriuwing wêze.
+ *	// De romte tusken '|' en it kommando sels is opsjoneel.
+ *      // Brûk '||' yn plak fan '|' as jo it menu altiten bywurkje wolle
+ *	// by iepenjen. Dat soe traach wurkje kinne.
+ *	OPEN_MENU | kommando
+ *      OPEN_MENU || kommando
+ *   3. Mapôfhanneling.
+ *	// Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
+ *	// submappen en útfierbere bestannen alfabetysk
+ *	// sortearre.
+ *	OPEN_MENU /in/map [/in/oare/map ...]
+ *   4. Mapôfhanneling mei kommando.
+ *	// Iepenet ien of mear mappen en makket in menu oan, mei dêryn alle
+ *	// submappen en lêsbere bestannen alfabetysk sortearre,
+ *	// elk fan har foarôfgien mei kommando.
+ *	OPEN_MENU [opsjes] /in/map [/in/oare/map ...] WITH kommando -opsjes
+ *		Opsjes:
+ * 			-noext 	lit alles fan 'e lêste punt yn 'e
+ *				bestânsnamme ôf wei
+ *
+ * <Parameters> is it út te fieren programma.
+ *
+ * ** Kommandorigelopsjes yn EXEC:
+ * %s - wurdt ferfongen troch de aktuele seleksje
+ * %a(titel[,oanwizing]) - iepenet in ynfierfjild mei de opjûne titel en de
+ *			opsjonele oanwizing, en wurdt ferfongen troch wat jo yntype
+ * %w - wurdt ferfongen troch XID foar it aktuele fokust finster
+ * %W - wurdt ferfongen troch it nûmer fan 'e aktuele wurkromte
+ * 
+ * Jo kinne spesjale karakters (sa as % en ") útskeakelje mei it \-teken:
+ * fb.: xterm -T "\"Hallo Wrâld\""
+ *
+ * Jo kinne ek ûntsnappingstekens brûke, sa as \n
+ *
+ * Elke MENU-deklaraasje moat ien keppele END-deklaraasje op it ein hawwe.
+ *
+ * Foarbyld:
+ *
+ * "Test" MENU
+ *	"XTerm" EXEC xterm
+ *		// makket in submenu mei de ynhâld fan /usr/openwin/bin oan
+ *	"XView-progr" OPEN_MENU "/usr/openwin/bin"
+ *		// wat X11-programma's yn ferskate mappen
+ *	"X11-progr" OPEN_MENU /usr/X11/bin $HOME/bin/X11
+ *		// wat eftergrûnôfbyldingen ynstelle
+ *	"Eftergrûn" OPEN_MENU -noext $HOME/ôfbyldingen /usr/share/images WITH wmsetbg -u -t
+ *		// foeget it style.menu yn mei dit ûnderdiel
+ *	"Styl" OPEN_MENU style.menu
+ * "Test" END
+ */
+
+#include "wmmacros"
+
+"Programma's" MENU
+	"Ynfo" MENU
+		"Ynfopaniel" INFO_PANEL
+		"Juridyske ynfo" LEGAL_PANEL
+		"Systeemconsole" EXEC xconsole
+		"Systeembelêsting" SHEXEC xosview || xload
+		"Proseslist" EXEC xterm -e top
+		"Hantliedingblêder" EXEC xman
+	"Ynfo" END
+	"Utfiere..." SHEXEC %a(Utfiere,Typ út te fieren kommando:)
+	"XTerm" EXEC xterm -sb 
+	"Mozilla Firefox" EXEC firefox
+	"Wurkromten" WORKSPACE_MENU
+	"Programma's" MENU
+		"Gimp" SHEXEC gimp >/dev/null
+  		"Ghostview" EXEC ghostview %a(GhostView,Fier te besjen bestân yn)
+		"Xpdf" EXEC xpdf %a(Xpdf,Fier te besjen PDF yn)
+		"Abiword" EXEC abiword
+		"Dia" EXEC dia
+		"OpenOffice.org" MENU
+			"OpenOffice.org" EXEC ooffice
+			"Writer" EXEC oowriter
+			"Rekkenblêd" EXEC oocalc
+			"Draw" EXEC oodraw
+			"Impress" EXEC ooimpress
+		"OpenOffice.org" END 
+
+		"Tekstbewurkers" MENU
+			"XEmacs" EXEC xemacs
+			"Emacs" EXEC emacs
+			"XJed" EXEC xjed 
+			"VI" EXEC xterm -e vi
+			"GVIM" EXEC gvim
+			"NEdit" EXEC nedit
+			"Xedit" EXEC xedit
+		"Tekstbewurkers" END
+
+		"Multymedia" MENU
+			"XMMS" MENU
+				"XMMS" EXEC xmms
+				"XMMS ôfspylje/skoftsje" EXEC xmms -t
+				"XMMS stopje" EXEC xmms -s
+			"XMMS" END
+			"Xine fideospiler" EXEC xine
+			"MPlayer" EXEC mplayer
+		"Multymedia" END
+	"Programma's" END
+
+	"Helpmiddels" MENU
+		"Rekkenmasine" EXEC xcalc
+		"Finstereigenskippen" SHEXEC xprop | xmessage -center -title 'xprop' -file -
+		"Lettertypekiezer" EXEC xfontsel
+		"Fergrutsje" EXEC wmagnify
+		"Kleurekaart" EXEC xcmap
+		"X-programma deadzje" EXEC xkill
+	"Helpmiddels" END
+
+	"Seleksje" MENU
+		"Kopiearje" SHEXEC echo '%s' | wxcopy
+		"E-maile nei" EXEC xterm -name mail -T "Pine" -e pine %s
+		"Navigearje" EXEC netscape %s
+		"Sykje yn hantlieding" SHEXEC MANUAL_SEARCH(%s)
+	"Seleksje" END
+
+	"Kommando's" MENU
+		"Oare ferbergje" HIDE_OTHERS
+		"Alles toane" SHOW_ALL
+		"Ikoanen skikke" ARRANGE_ICONS
+		"Fernije" REFRESH
+		"Beskoattelje" EXEC xlock -allowroot -usefirst
+	"Kommando's" END
+
+	"Uterlik" MENU
+		"Tema's" OPEN_MENU -noext THEMES_DIR $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle
+		"Stilen" OPEN_MENU -noext STYLES_DIR $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle
+		"Ikoanesets" OPEN_MENU -noext ICON_SETS_DIR $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons
+		"Eftergrûn" MENU
+			"Effen" MENU
+				"Swart" WS_BACK '(solid, black)'
+				"Blau"  WS_BACK '(solid, "#505075")'
+				"Indigo" WS_BACK '(solid, "#243e6c")'
+				"Marineblau" WS_BACK '(solid, "#224477")'
+				"Poarper" WS_BACK '(solid, "#554466")'
+				"Weet"  WS_BACK '(solid, "wheat4")'
+				"Donkergriis"  WS_BACK '(solid, "#333340")'
+				"Wynread" WS_BACK '(solid, "#400020")'
+				"Effen" END
+			"Kleurferrin" MENU
+				"Sinneûndergong" WS_BACK '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'
+				"Loft" WS_BACK '(vgradient, blue4, white)'
+    			"Blautinten" WS_BACK '(vgradient, "#7080a5", "#101020")'
+				"Indigotinten" WS_BACK '(vgradient, "#746ebc", "#242e4c")'
+			    "Poarpertinten" WS_BACK '(vgradient, "#654c66", "#151426")'
+    			"Weettinten" WS_BACK '(vgradient, "#a09060", "#302010")'
+    			"Griistinten" WS_BACK '(vgradient, "#636380", "#131318")'
+    			"Wynreadtinten" WS_BACK '(vgradient, "#600040", "#180010")'
+			"Kleurferrin" END
+			"Ofbyldingen" OPEN_MENU -noext BACKGROUNDS_DIR $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t
+		"Eftergrûn" END
+		"Tema bewarje" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Temanamme,Fier bestânsnamme yn:)"
+		"Ikoaneset bewarje" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Ikoanesetnamme,Fier bestânsnamme yn:)"
+		"Foarkarrehelpmiddel" EXEC #wprefs#
+	"Uterlik" END
+
+	"Sesje" MENU
+		"Sesje bewarje" SAVE_SESSION
+		"Sesje wiskje" CLEAR_SESSION
+		"Window Maker werstarte" RESTART
+		"BlackBox starte" RESTART blackbox
+		"IceWM starte" RESTART icewm
+		"Ofslute"  EXIT
+	"Sesje" END
+"Programma's" END
+
+

WindowMaker/menu.hu.in

@@ -204,7 +204,7 @@
 		"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 #wprefs#
 	"Megjelenés" END
 
 	"Kilépés"	MENU

WindowMaker/menu.in

@@ -208,7 +208,7 @@
 		"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 #wprefs#
 	"Appearance" END
 
 	"Session" MENU

WindowMaker/menu.ko.in

@@ -163,7 +163,7 @@
 		"세션 지움" CLEAR_SESSION
 	"창 관 리" END
 	"작업환경" MENU
-		"설    정" SHEXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf
+		"설    정" SHEXEC #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

WindowMaker/menu.nl.in

@@ -53,7 +53,7 @@
  *	// het in op de huidige plaats
  *	OPEN_MENU bestand.menu
  *   2. Menuafhandeling uit pipe.
- *	// opent commando en gebruikt zeen 'stdout' om een menu aan te maken.
+ *	// opent commando en gebruikt zijn 'stdout' om een menu aan te maken.
  *	// Commando-output moet een geldige menubeschrijving zijn.
  *	// De ruimte tussen '|' en het commando zelf is optioneel.
  *      // Gebruik '||' in plaats van '|' als u het menu altijd wilt bijwerken
@@ -71,8 +71,8 @@
  *	// elk van hen voorafgegaan met commando.
  *	OPEN_MENU [opties] /een/map [/een/andere/map ...] WITH commando -opties
  *		Opties:
- * 			-noext 	haal alles vanaf de laatste punt in de
- *				bestandsnaam eraf
+ * 			-noext 	laat alles vanaf de laatste punt in de
+ *				bestandsnaam weg
  *
  * <Parameters> is het uit te voeren programma.
  *
@@ -208,7 +208,7 @@
 		"Achtergrond" END
 		"Thema opslaan" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(Themanaam,Voer bestandsnaam in:)"
 		"Iconenset opslaan" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(Iconensetnaam,Voer bestandsnaam in:)"
-		"Voorkeurenhulpmiddel" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
+		"Voorkeurenhulpmiddel" EXEC #wprefs#
 	"Uiterlijk" END
 
 	"Sessie" MENU

WindowMaker/menu.ro.in

@@ -202,7 +202,7 @@
 		"Fundal" END
 		"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 #wprefs#
 	"Configurare" END
 
 	"Ieşire" MENU

WindowMaker/menu.sk.in

@@ -216,7 +216,7 @@
 		"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 #wprefs#
 	"Vzhľad" END
 
 	"Koniec" MENU

WindowMaker/menu.zh_TW.in

@@ -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 #wprefs#
 	"外觀" END
 
 	"離開"	MENU

WindowMaker/mkMakefile

@@ -1,63 +0,0 @@
-#!/bin/sh
-
-#
-# Creates a Makefile.am file containing all the stuff to install 
-# wmaker data
-#
-
-
-
-
-DIRS="Backgrounds Defaults IconSets Icons Pixmaps Styles Themes"
-
-FILE=Makefile.am
-
-spit() {
-	echo -n "$*" >> $FILE
-}
-
-spitln() {
-	echo "$*" >> $FILE
-}
-
-
-
-rm -f $FILE
-
-
-
-
-spitln SUBDIRS = $DIRS
-spitln
-spitln prefsdatadir = '$(pkgdatadir)'
-spitln
-
-
-EXCEPT="Makefile.am Makefile.in Makefile mkMakefile $FILE"
-
-spit prefsdata_DATA =
-
-FILES=`ls -1|grep -v \~`
-FILES=`echo $FILES`
-
-for f in $FILES; do
-	ok=1
-	for i in $EXCEPT; do
-		if test "$i" = "$f"; then
-			ok=0	
-			break
-		fi
-	done	
-	if [ -f $f -a $ok = 1 ]; then
-		spitln \\
-		spit "	$f"
-	fi
-done
-
-
-spitln
-spitln
-
-spitln EXTRA_DIST = '$(prefsdata_DATA)' mkMakefile
-spitln
-spitln

WindowMaker/plmenu.bg.in

@@ -94,7 +94,7 @@
    ),
   ("Запази темата", 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, "#wprefs#")
   ),
  ("Изход",
   ("Рестартиране", RESTART),

WindowMaker/plmenu.es.in

@@ -94,7 +94,7 @@
    ),   
   ("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, "#wprefs#")
   ), 
  ("Salir",
   ("Reiniciar", RESTART),

WindowMaker/plmenu.fi.in

@@ -357,7 +357,7 @@
 		(
 		"Asetukset",
 		EXEC,
-		"/usr/local/GNUstep/Applications/WPrefs.app/WPrefs"
+		"#wprefs#"
 		)
 	),
 	(

WindowMaker/plmenu.fy.in

@@ -5,9 +5,9 @@
   ("Systeemconsole", EXEC, "xconsole"),
   ("Systeembelêsting", SHEXEC, "xosview || xload"),
   ("Proseslist", EXEC, "xterm -e top"),
-  ("Hantliedingbrowser", EXEC, "xman")
+  ("Hantliedingblêder", EXEC, "xman")
  ),
- ("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fiere kommando:)"),
+ ("Utfiere...", SHEXEC, "%a(Utfiere,Typ út te fieren kommando:)"),
  ("XTerm", EXEC, "xterm -sb"),
  ("Mozilla Firefox", EXEC, "firefox"),
  ("Wurkromten", WORKSPACE_MENU),
@@ -36,10 +36,10 @@
   ("Multymedia",
    ("XMMS",
     ("XMMS", EXEC, "xmms"),
-    ("XMMS ôfspylje/poazje", EXEC, "xmms -t"),
+    ("XMMS ôfspylje/skoftsje", EXEC, "xmms -t"),
     ("XMMS stopje", EXEC, "xmms -s")
    ),
-   ("Xine fideospeler", EXEC, "xine"),
+   ("Xine fideospiler", EXEC, "xine"),
    ("MPlayer", EXEC, "mplayer")
   )
  ),
@@ -62,12 +62,12 @@
   ("Alles toane", SHOW_ALL),
   ("Ikoanen skikke", ARRANGE_ICONS),
   ("Fernije", REFRESH),
-  ("Ofskoattelje", EXEC, "xlock -allowroot -usefirst")
+  ("Beskoattelje", EXEC, "xlock -allowroot -usefirst")
  ),
  ("Uterlik",
   ("Tema's", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
   ("Stilen", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-  ("Ikoanensets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+  ("Ikoanesets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
   ("Eftergrûn",
    ("Effen",
 	("Swart", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
@@ -92,8 +92,8 @@
    ("Ofbyldingen", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
    ),
    ("Tema bewarje", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Temanamme)\""),
-   ("Ikoanenset bewarje", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanensetnamme)\""),
-   ("Foarkarrenhelpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Ikoaneset bewarje", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Ikoanesetnamme)\""),
+   ("Foarkarrehelpmiddel", EXEC, "#wprefs#")
    ),
    ("Sesje",
     ("Sesje bewarje", SAVE_SESSION),

WindowMaker/plmenu.in

@@ -93,7 +93,7 @@
    ),
    ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
    ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Preferences Utility", EXEC, "#wprefs#")
    ),
    ("Session",
     ("Save Session", SAVE_SESSION),

WindowMaker/plmenu.ja.in

@@ -94,7 +94,7 @@
    ),   
   ("設定をテーマとしてセーブ", 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, "#wprefs#")
   ), 
  ("終了",
   ("再起動", RESTART),

WindowMaker/plmenu.ko.in

@@ -63,7 +63,7 @@
   ),
  ("작업공간", WORKSPACE_MENU),
  ("작업환경",
-  ("설    정", SHEXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs || wmakerconf"),
+  ("설    정", SHEXEC, "#wprefs# || wmakerconf"),
   ("테    마", OPEN_MENU, "-noext /usr/share/WindowMaker/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"),

WindowMaker/plmenu.nl.in

@@ -93,7 +93,7 @@
    ),
    ("Thema opslaan", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Themanaam)\""),
    ("Iconenset opslaan", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconensetnaam)\""),
-   ("Voorkeurenhulpmiddel", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+   ("Voorkeurenhulpmiddel", EXEC, "#wprefs#")
    ),
    ("Sessie",
     ("Sessie opslaan", SAVE_SESSION),

WindowMaker/plmenu.ro.in

@@ -94,7 +94,7 @@
    ),   
   ("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, "#wprefs#")
   ), 
  ("Ieşire",
   ("Repornire", RESTART),

WindowMaker/plmenu.sk.in

@@ -94,7 +94,7 @@
    ),   
   ("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, "#wprefs#")
   ), 
  ("Koniec",
   ("Reštartovať", RESTART),

WindowMaker/plmenu.zh_TW.in

@@ -92,7 +92,7 @@
    ),
   ("儲存主題", 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, "#wprefs#")
   ),
  ("離開",
   ("重新啟動", RESTART),

configure.ac

@@ -34,7 +34,7 @@ AC_PREREQ([2.69])
 
 dnl Configuration for Autoconf and Automake
 dnl =======================================
-AC_INIT([WindowMaker],[0.95.7],[wmaker-dev@lists.windowmaker.org],[WindowMaker],[http://www.windowmaker.org/])
+AC_INIT([WindowMaker],[0.95.8],[wmaker-dev@lists.windowmaker.org],[WindowMaker],[http://www.windowmaker.org/])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 
@@ -71,7 +71,7 @@ dnl 6. If any interfaces have been removed or changed since the last
 dnl public release, then set age to 0.
 dnl
 dnl libwraster
-WRASTER_CURRENT=5
+WRASTER_CURRENT=6
 WRASTER_REVISION=0
 WRASTER_AGE=0
 WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
@@ -447,7 +447,8 @@ WM_TYPE_SIGNAL
 
 dnl pkg-config
 dnl ==========
-AC_CHECK_PROG([PKGCONFIG], [pkg-config], [pkg-config])
+PKG_PROG_PKG_CONFIG
+AS_IF([test -z "$PKG_CONFIG"],[AC_MSG_ERROR([pkg-config is required.])])
 
 
 
@@ -612,7 +613,7 @@ dnl FontConfig
 dnl ==========
 dnl libWINGS uses FcPatternDel from libfontconfig
 AC_MSG_CHECKING([for fontconfig library])
-FCLIBS=`$PKGCONFIG fontconfig --libs`
+FCLIBS=`$PKG_CONFIG fontconfig --libs`
 if test "x$FCLIBS" = "x" ; then
         AC_MSG_RESULT([not found])
 else
@@ -627,8 +628,8 @@ dnl =============================
 xft=yes
 XFTLIBS=""
 
-if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then
-        XFTCONFIG="$PKGCONFIG xft"
+if test "x$PKG_CONFIG" != x -a "`$PKG_CONFIG xft; echo $?`" = 0; then
+        XFTCONFIG="$PKG_CONFIG xft"
         pkgconfig_xft=yes
 else
         AC_CHECK_PROG(XFTCONFIG, xft-config, xft-config)
@@ -678,8 +679,8 @@ AC_ARG_ENABLE(pango, AS_HELP_STRING([--enable-pango], [enable Pango text layout
 PANGOFLAGS=
 PANGOLIBS=
 if test "$pango" = yes; then
-	PANGOLIBS=`$PKGCONFIG pangoxft --libs`
-	PANGOFLAGS=`$PKGCONFIG pangoxft --cflags`
+	PANGOLIBS=`$PKG_CONFIG pangoxft --libs`
+	PANGOFLAGS=`$PKG_CONFIG pangoxft --cflags`
 	if test "x$PANGOLIBS" = "x" ; then
 	        AC_MSG_RESULT([not found])
 	else
@@ -866,6 +867,21 @@ AS_IF([test "x$with_gnustepdir" = "x"],
 AC_SUBST([wprefs_datadir])dnl
 AC_SUBST([wprefs_bindir])dnl
 
+dnl Support for DEFSDATADIR option
+dnl ============================
+AC_ARG_WITH([defsdatadir],
+    [AS_HELP_STRING([--with-defsdatadir=PATH], [specify where global defaults are located [SYSCONFDIR/WindowMaker]])],
+    [AS_CASE([$withval],
+        [yes|no], [AC_MSG_ERROR([bad value '$withval' for --with-defsdatadir, expected a path]) ],
+        [/*],  [], dnl Absolute path, ok
+        [\$*], [], dnl Assumes it starts with a reference to $prefix or a similar variable, ok
+        [AC_MSG_ERROR([bad path '$withval' for defsdatadir, expecting an absolute path])])],
+    [with_defsdatadir=""])
+
+AS_IF([test "x$with_defsdatadir" != "x"],
+    [defsdatadir="$with_defsdatadir"],
+    [defsdatadir='${sysconfdir}/WindowMaker'])
+AC_SUBST([defsdatadir])dnl
 
 dnl Enable User Defined Menu thing
 dnl ==============================

debian/README.Debian

@@ -17,7 +17,7 @@ and remove other exec lines if present.  I have done my best to
 overcome certain glitches and gotchas regarding Window Maker
 installation. /usr/bin/wmaker is a shell script that tries to
 make sure things are properly set up.  Take a look at it to see what's
-going on.  Please read wmaker(1x).
+going on.  Please read wmaker(1).
 
 
 Other sources for documentation
@@ -33,7 +33,7 @@ Other sources for documentation
   ftp://ftp.windowmaker.org/pub/wmaker/docs/
 
   Please note the manual documents version 0.10.x of Window Maker, and
-  many features/changes have occured since then.  To find out what has
+  many features/changes have occurred since then.  To find out what has
   changed, please read file:/usr/share/doc/wmaker/NEWS.gz and
   file:/usr/share/doc/wmaker/changelog.gz.  A new version of this manual is
   being developed.  If you want to contribute to the manual please
@@ -108,7 +108,7 @@ IF YOU ARE UPGRADING FROM 0.17.5 or earlier
     the NEWS file and the ChangeLog.  If you don't have problems
     upgrading, consider it a gift from the gods.  PLEASE NOTE: WPrefs
     is a work in progress.  SAVE YOUR CONFIGURATION. READ THE READMEs.
-  * Please note that WPrefs' Menu Guru REQUIERES a menu in "Property
+  * Please note that WPrefs' Menu Guru REQUIRES a menu in "Property
     List" format to work properly.  It's very likely that you have an
     old format menu.  There's a script called wm-oldmenu2new alongside
     this file that converts your menu to the new format.  It's a hack,

debian/README.build

@@ -1,78 +0,0 @@
-Building Window Maker for Debian
---------------------------------
-
-* The patches
-
-  debian/rules scans debian/patches/ for files named *.diff and these
-  are sorted _alphabetically_ before being applied.
-
-  You can apply these patches by calling
-
-  	$ debian/rules patch-wmaker-stamp
-
-  and remove them with
-
-  	$ debian/rules unpatch-wmaker
-
-  Why are some patches in debian/patches and others are stored in the
-  debian .diff?
-  
-	  For starters I (still) dislike the idea of doing:
-
-		$ dpkg -x package.dsc
-
-	  and being left with something that is not the source from
-	  which the package is built.  It makes NMUs harder for both the
-	  NMUer and the maintainer, mostly because people tend to get it
-	  wrong (since it's undocumented).  I use CVS for (almost all
-	  of) my packages, and I like to be able to take a look at the
-	  source used to build certain release of a package _without_
-	  having to check out that release.  On the other hand, I try to
-	  send patches upstream, and over the years I've learned that
-	  Debian's source package format is really not the best thing to
-	  use in this context.  Merging between debian's source and
-	  upstream's (after accepting patches) is messy.
-
-	  The system used by this package is a compromise between these
-	  two things: "most" of the patches are applied directly by just
-	  unpacking the Debian sources, and some are left out.  The
-	  things that are left out (those stored in debian/patches) are
-	  in general things that should go upstream.  Things that aren't
-	  really Debian specific.  Security fixes, patches submitted
-	  upstream by other people, that kind of thing.  This keeps the
-	  patches nicely separated, makes it easy to send the upstream,
-	  to take them out and to update them if that becomes necessary.
-	  In general, if it's Debian specific, patch the sources
-	  directly.  If it should go upstream, put it in debian/patches.
-
-  The easiest way to generate patches is to use CVS.  Patches coming out
-  of 'cvs diff -u whaterver/you.modded' will just work if you put them
-  in debian/patches.  If you can't use CVS for whatever reason, just:
-
-  $ diff -u wmaker.orig wmaker > your.patch
-
-  will do the right thing.
-
-* Building options
-
-  The following make variables are used to pass options to the configure
-  script:
-
-	XLOCALE  := --disable-locale
-	MODELOCK := --enable-modelock
-
-	XINERAMA := --enable-xinerama
-
-	(*) These are not used by default
-
-  Since these are make variables, you can do something like:
-
-  	$ SOUND=--disable-sound debian/rules build
-
-  If you want to build a debugging version, this will do it:
-
-  $ export DEB_BUILD_OPTIONS=nostrip,debug,noopt
-  $ fakeroot debian/rules binary
-
--- 
-vim: tw=72 ft=text

debian/changelog

@@ -1,3 +1,141 @@
+wmaker (0.95.7-8) unstable; urgency=medium
+
+  * debian/control
+    - Add libwmaker1 to libwmaker-dev Depends (Closes: #857164).
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Wed, 08 Mar 2017 10:59:29 -0500
+
+wmaker (0.95.7-7) unstable; urgency=medium
+
+  * Add missing license information to debian/copyright.
+  * Fix segfault in wmmenugen (Closes: #844783).
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Sat, 19 Nov 2016 10:35:50 -0500
+
+wmaker (0.95.7-6) unstable; urgency=medium
+
+  * Split wxcopy and wxpaste into new wmaker-utils package (Closes: #78119).
+  * Restore libwmaker packages.
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Wed, 09 Mar 2016 00:08:43 -0500
+
+wmaker (0.95.7-5) unstable; urgency=medium
+
+  * Clean up debian/copyright. Add some files which were missed in the LGPL
+    paragraph and bump its version to 2+.  Restore debian/* paragraph.
+  * Remove useless debian/*.changelog-upstream files.
+  * Remove out of date file README.build.
+  * Drop wmaker-dbg package in favor of automatically generated wmaker-dbgsym.
+  * New file debian/wmaker-common.maintscript; removes obsolete config files
+    (Closes: #726075).
+  * Do not use buggy --enable-randr configure option (Closes: #816993).
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Mon, 07 Mar 2016 11:04:33 -0500
+
+wmaker (0.95.7-4) unstable; urgency=medium
+
+  * Update Vcs-Browser to use https; fixes vcs-field-uses-insecure-uri Lintian
+    warning.
+  * Fix typo in README.Debian; fixes spelling-error-in-readme-debian Lintian
+    warning.
+  * Enable all hardening flags; fixes hardening-no-{bindnow,pie} Lintian
+    warnings.
+  * Bump Standards-Version to 3.9.7, no changes required.
+  * 57_ignore_with-aix-soname.diff: Ignore missing documentation for
+    --with-aix-soname in INSTALL-WMAKER (Closes: #814213).
+
+ -- Doug Torrance <dtorrance@piedmont.edu>  Fri, 12 Feb 2016 22:27:08 -0500
+
+wmaker (0.95.7-3) unstable; urgency=low
+
+  * Patch back libwraster symbol version to LIBWRASTER3. Temporarily mark
+    RDrawLine@LIBWRASTER3 with a dep >= 0.95.7-3~ to force lockstep upgrades
+    from broken 0.95.7-2. Closes: #811304
+
+ -- Andreas Metzler <ametzler@debian.org>  Wed, 20 Jan 2016 20:19:27 +0100
+
+wmaker (0.95.7-2) unstable; urgency=medium
+
+  [ Andreas Metzler ]
+  * Drop unused (since at least 0.95.0+20111028-1) b-d on grep-dctrl.
+  * Upload to unstable.
+
+  [ Doug Torrance ]
+  * Switch Build-Depends from libtiff5-dev to libtiff-dev for possible future
+    libtiff transitions; also allows backports to earlier releases, e.g.,
+    wheezy/precise.
+  * The theme that was removed in version 0.92.0-6 has been reintroduced as an
+    option, now named "DebianLegacy".  Because it now contains two themes, the
+    directory debian/debianfiles/Theme has been renamed to Themes.  The file
+    Debian.theme.txt in this directory, which actually describes the
+    DebianLegacy theme but was never removed, has been renamed to
+    DebianLegacy.txt.  A corresponding paragraph has been added to
+    debian/copyright. (Closes: #393143)
+
+ -- Andreas Metzler <ametzler@debian.org>  Sat, 16 Jan 2016 17:53:44 +0100
+
+wmaker (0.95.7-1) experimental; urgency=medium
+
+  [ Rodolfo García Peñas (kix) ]
+  * New upstream version 0.95.7.
+  * debian/changelog, removed debian files (lintian warning).
+  * Updated debian/libwings3.symbols.
+  * Updated libwraster5.symbols
+  * Changed the test for the update-menu command in these files to avoid
+    a lintian warning (command-with-path-in-maintainer-script):
+    * debian/wmaker.postrm
+    * debian/wmaker-common.postrm
+  * Removed the Encoding field in debian/debianfiles/wmaker-common.desktop
+    to avoid a lintian warning (desktop-entry-contains-encoding-key).
+  * Updated debian/rules to include pango support (--enable-pango).
+  * Updated all debian/patches only with quilt refresh.
+  * Updated some debian files because the manpages are moved from
+    section 1x to 1:
+    * debian/patches/51_wmaker_man.diff
+    * debian/wmaker-common.manpages
+    * debian/wmaker.install
+    * debian/wmaker.manpages
+  * Removed upstream file FAQ.I18N in debian/wmaker-common.docs.
+
+  [ Andreas Metzler ]
+  * 56_ignore_runstatedir.diff: Ignore missing documentation for --runstatedir
+    in INSTALL.
+  * Use dh_autoreconf instead of invoking autogen.sh in the configure target.
+  * Simplify debian/rules and use dh_auto_configure, especially for handling
+    dpkg-buildflags.
+  * wmaker manpage was also moved from section 1x to 1. Fix pointer in
+    README.Debian and update-alternatives slave link.
+
+  [ Doug Torrance ]
+  * Switch maintenance to Debian Window Maker Team with kix, Andreas, and
+    myself as uploaders.
+  * Tidy up packaging using wrap-and-sort.
+  * Remove Breaks/Replaces wmaker (<< 0.95.0+20111028-3); this version is no
+    longer in Debian.
+  * Switch Depends to wmaker-common (= ${source:Version}) so common files
+    are also updated on upgrade.
+  * Add Vcs-* fields to debian/control.
+  * Update Format field in debian/copyright.
+  * Update debian/watch from sepwatch project.
+  * Remove files from debian/source/options which are handled now by
+    dh-autoreconf.  Add distros directory (present in upstream git but not
+    tarball) and doc files modified during build.
+  * Add multiarch support.  In particular, add Multi-Arch fields to
+    debian/control, add wildcards for multiarch triplets to debian/*.install,
+    and remove --libdir from dh_auto_configure in debian/rules.
+  * Use wildcards for locales in debian/wmaker-common.install for
+    maintainability.
+
+ -- Andreas Metzler <ametzler@debian.org>  Sun, 10 Jan 2016 11:38:11 +0100
+
+wmaker (0.95.6-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload, with maintainer approval.
+  * Pull 56_wrlib-add-support-for-release-5.1.0-of-the-libgif.patch from
+    upstream to allow building against giflib 5. Closes: #803292
+
+ -- Andreas Metzler <ametzler@debian.org>  Wed, 16 Dec 2015 19:16:51 +0100
+
 wmaker (0.95.6-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.

debian/control

@@ -1,20 +1,50 @@
 Source: wmaker
 Section: x11
 Priority: optional
-Maintainer: Rodolfo García Peñas (kix) <kix@debian.org>
-Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9), automake (>= 1:1.12), gettext,
- libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev,
- libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev,
- libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev,
- libxrandr-dev, dctrl-tools, autotools-dev
+Maintainer: Debian Window Maker Team <pkg-wmaker-devel@lists.alioth.debian.org>
+Uploaders: Rodolfo García Peñas (kix) <kix@debian.org>,
+           Andreas Metzler <ametzler@debian.org>,
+           Doug Torrance <dtorrance@piedmont.edu>
+Standards-Version: 3.9.7
+Build-Depends: automake (>= 1:1.12),
+               debhelper (>= 9),
+               dh-autoreconf,
+               gettext,
+               libfontconfig1-dev,
+               libgif-dev,
+               libjpeg-dev,
+               libpng-dev,
+               libsm-dev,
+               libtiff-dev,
+               libtool,
+               libx11-dev,
+               libxext-dev,
+               libxft-dev,
+               libxinerama-dev,
+               libxkbfile-dev,
+               libxmu-dev,
+               libxpm-dev,
+               libxrandr-dev,
+               libxrender-dev,
+               libxt-dev,
+               sharutils
 Homepage: http://windowmaker.org/
+Vcs-Browser: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-wmaker/wmaker.git
 
 Package: wmaker
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, wmaker-common (>= 0.95.0+20111028-3)
+Multi-Arch: foreign
+Depends: wmaker-common (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Provides: x-window-manager
-Suggests: wmaker-data, menu, x11-apps, x-terminal-emulator, desktop-base
+Suggests: desktop-base,
+          menu,
+          wmaker-data,
+          wmaker-utils,
+          x-terminal-emulator,
+          x11-apps
 Description: NeXTSTEP-like window manager for X
  Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
  very closely, and it is now an official GNU project. Window Maker (originally
@@ -25,10 +55,9 @@ Description: NeXTSTEP-like window manager for X
 
 Package: wmaker-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Suggests: wmaker
-Replaces: wmaker (<< 0.95.0+20111028-3)
-Breaks: wmaker (<< 0.95.0+20111028-3)
 Description: Window Maker - Architecture independent files
  Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
  very closely, and it is now an official GNU project. Window Maker (originally
@@ -39,12 +68,38 @@ Description: Window Maker - Architecture independent files
  .
  This package contains the architecture independent files.
 
+Package: wmaker-utils
+Architecture: any
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: wmaker (<< 0.95.7-6)
+Replaces: wmaker (<< 0.95.7-6)
+Description: Window Maker - Utilities
+ Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
+ very closely, and it is now an official GNU project. Window Maker (originally
+ named WindowMaker) is not overloaded with features, and it is easier to
+ configure than most other window managers. Its final goal is to produce a
+ window manager that doesn't require editing of configuration files.
+ Window Maker is fast and doesn't require tons of memory to run.
+ .
+ This package contains wxcopy and wxpaste, two utilities ordinarily shipped with
+ Window Maker but not depending on it or any of its libraries.  These
+ utilities allow users to interact with cut buffers on the command line.
+
 Package: libwraster-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
-Depends: libwraster5 (= ${binary:Version}), libc6-dev, libx11-dev,
- libxext-dev, libxpm-dev, libjpeg-dev, libpng-dev, libgif-dev,
- libtiff5-dev, ${misc:Depends}
+Depends: libc6-dev,
+         libgif-dev,
+         libjpeg-dev,
+         libpng-dev,
+         libtiff5-dev,
+         libwraster5 (= ${binary:Version}),
+         libx11-dev,
+         libxext-dev,
+         libxpm-dev,
+         ${misc:Depends}
 Breaks: libwraster3-dev
 Replaces: libwraster3-dev
 Description: Static libraries and headers of Window Maker rasterizer
@@ -57,8 +112,9 @@ Description: Static libraries and headers of Window Maker rasterizer
 
 Package: libwraster5
 Architecture: any
+Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Shared libraries of Window Maker rasterizer
  This library is used to manipulate images and convert them to
  a format that can be displayed through the X window system.
@@ -66,10 +122,17 @@ Description: Shared libraries of Window Maker rasterizer
 
 Package: libwings-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
-Depends: libc6-dev, libx11-dev, libxext-dev, libwraster-dev, libxft-dev,
- libfontconfig1-dev, libwutil5 (= ${binary:Version}),
- libwings3 (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-dev,
+         libfontconfig1-dev,
+         libwings3 (= ${binary:Version}),
+         libwraster-dev,
+         libwutil5 (= ${binary:Version}),
+         libx11-dev,
+         libxext-dev,
+         libxft-dev,
+         ${misc:Depends}
 Description: Window Maker's own widget set
  WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
  look and feel. Its API is inspired in OpenSTEP and its
@@ -80,8 +143,9 @@ Description: Window Maker's own widget set
 
 Package: libwutil5
 Architecture: any
+Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Window Maker's own widget set - utility library
  WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
  look and feel. Its API is inspired in OpenSTEP and its
@@ -94,8 +158,9 @@ Description: Window Maker's own widget set - utility library
 
 Package: libwings3
 Architecture: any
+Multi-Arch: same
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Window Maker's own widget set - runtime library
  WINGs Is Not GNUstep (WINGs) is a small widget set with the NeXTSTEP
  look and feel. Its API is inspired in OpenSTEP and its
@@ -106,20 +171,24 @@ Description: Window Maker's own widget set - runtime library
  .
  This package contains the libWINGs runtime library.
 
-Package: wmaker-dbg
+Package: libwmaker-dev
 Architecture: any
-Section: debug
-Priority: extra
-Depends: libwraster5 (= ${binary:Version}) | libwings3 (= ${binary:Version}) |
- libwutil5 (= ${binary:Version}) | wmaker (= ${binary:Version}),
- ${misc:Depends}
-Description: Debugging symbols for WindowMaker packages
- Written by Alfredo Kojima almost from scratch, resembles the NeXTStep look
- very closely, and it is now an official GNU project. Window Maker is not
- overloaded with features, and it is easier to configure than most other window
- managers. Its final goal is to produce a window manager that doesn't require
- editing of configuration files. Window Maker is fast and doesn't require tons
- of memory to run.
+Multi-Arch: same
+Section: libdevel
+Depends: libwmaker1 (= ${binary:Version}), libx11-dev, ${misc:Depends}
+Description: Static libraries and headers for Window Maker applications
+ Window Maker is a NeXTSTEP-like window manager for X.
  .
- This package contains debugging symbols for Window Maker and its core
- libraries (libWINGs, libWutils, libwraster).
+ This package contains libWMaker and header files, for building
+ Window Maker aware applications.
+
+Package: libwmaker1
+Architecture: any
+Multi-Arch: same
+Section: libs
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Runtime library for Window Maker applications
+ Window Maker is a NeXTSTEP-like window manager for X.
+ .
+ This package contains the libWMaker runtime library for Window Maker
+ aware applications.

debian/copyright

@@ -1,81 +1,45 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&pathrev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: wmaker
 Upstream-Contact: Window Maker developers mailing list <wmaker-dev@lists.windowmaker.org>
 Source: http://repo.or.cz/w/wmaker-crm.git
 
 Files: *
-Copyright: 1997, Alfredo Kengi Kojima <kojima@windowmaker.info>
-           2011, Carlos R. Mafra <crmafra@gmail.com>
+Copyright: 1991-1995 Free Software Foundation, Inc.
+	   1995 Spencer Kimball
+	   1995 Peter Mattis
+	   1995 Sun Microsystems, Inc.
+	   1996 Ben Wing
+	   1997 Shige Abe
+	   1997-2004, 2006 Alfredo Kengi Kojima <kojima@windowmaker.info>
+	   1998-2004, 2006 Dan Pascu
+	   1998 scottc
+	   1998 James Thompson
+	   1999-2000 Nwanua Elumeze
+	   2001-2016 Window Maker Team
+	   2008 Norayr Chilingaryan <chnorik@gmail.com>
+	   2008 Guido U. Draheim <guidod@gmx.de>
+	   2010-2011 Carlos R. Mafra <crmafra@gmail.com>
+	   2010 Tamas Tevesz <ice@extreme.hu>
+	   2011 Camille d'Alméras <camilledalmeras@yahoo.com>
+	   2012-2015 Christophe Curis
+	   2012 Daniel Déchelotte
+	   2012 Leandro Vital <leandro.vital@yahoo.com.br>
 License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
 
-Files: wrlib/*
-Copyright: 2000-2003, Alfredo Kengi Kojima <kojima@windowmaker.info>
-           2011, Carlos R. Mafra <crmafra@gmail.com>
-License: LGPL-2
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU Library General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/LGPL-2'.
+Files: m4/ax_pthread.m4
+Copyright: 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+	   2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+License: GPL-3+
 
-Files: debian/*
-Copyright: 1997, Neil A. Rubin <nar5@po.cwru.edu>
-           1997, Marcelo E. Magallon <mmagallo@debian.org>
-           2011, Rodolfo García Peñas (kix) <kix@kix.es>
-License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
- .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Files: m4/ld-version-script.m4
+Copyright: 2008-2015 Free Software Foundation, Inc.
+License: FSFULLR
+
+Files: util/common.h wmlib/* wrlib/*
+Copyright: 1997-2003 Alfredo Kengi Kojima <kojima@windowmaker.info>
+           1998-2004 Dan Pascu
+           2011 Carlos R. Mafra <crmafra@gmail.com>
+License: LGPL-2+
 
 Files: WindowMaker/Icons/BitchX.tiff WindowMaker/Icons/defaultAppIcon.tiff
        WindowMaker/Icons/GNUterm.tiff WindowMaker/Icons/defaultterm.tiff
@@ -110,6 +74,128 @@ Files: WindowMaker/Icons/GNUstepGlow.tiff WindowMaker/Icons/GNUstepGlow.xpm
        WINGs/Resources/Images.tiff WINGs/Resources/Images.xpm
        WINGs/Resources/defaultIcon.xpm WINGs/Resources/Images.xcf
 Copyright: 2000, Banlu Kemiyatorn
+License: WTFPL-1
+
+Files: debian/*
+Copyright: 1997, Neil A. Rubin <nar5@po.cwru.edu>
+           1997, Marcelo E. Magallon <mmagallo@debian.org>
+           2011, Rodolfo García Peñas (kix) <kix@kix.es>
+License: GPL-2+
+
+Files: debian/debianfiles/Themes/DebianLegacy.style
+       debian/debianfiles/Themes/DebianLegacy.txt
+       debian/debianfiles/Themes/DebianSwirl.jpg
+Copyright: 1999 Gary Burke <gfburke@earthlink.net>
+License: GPL-1+
+
+Files: WINGs/string.c
+Copyright: 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+License: Expat
+
+Files: wrlib/load_ppm.c
+Copyright: 1988 Jef Poskanzer
+	   1997-2003 Alfredo K. Kojima
+	   2014 Window Maker Team
+License: HPND and LGPL-2+
+
+License: Expat
+ Permission to use, copy, modify, and distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+License: FSFULLR
+ This file is free software; the Free Software Foundation gives unlimited
+ permission to copy and/or distribute it, with or without modifications, as
+ long as this notice is preserved.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
+
+License: GPL-2+
+ This program is free software; you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+License: GPL-3+
+ This program is free software: you can redistribute it
+ and/or modify it under the terms of the GNU General Public
+ License as published by the Free Software Foundation, either
+ version 3 of the License, or (at your option) any later
+ version.
+ .
+ This program is distributed in the hope that it will be
+ useful, but WITHOUT ANY WARRANTY; without even the implied
+ warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ PURPOSE.  See the GNU General Public License for more
+ details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this program.  If not, see
+ <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
+License: HPND
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted, provided
+ that the above copyright notice appear in all copies and that both that
+ copyright notice and this permission notice appear in supporting
+ documentation.  This software is provided "as is" without express or
+ implied warranty.
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU Library General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/LGPL-2'.
+
 License: WTFPL-1
  do What The Fuck you want to Public License
  .

debian/debianfiles/Themes/DebianLegacy.style

@@ -0,0 +1,28 @@
+{
+  TitleJustify = left;
+  WindowTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTitleFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
+  MenuTextFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  IconTitleFont = "-*-helvetica-medium-r-normal-*-8-*-*-*-*-*-*-*";
+  ClipTitleFont = "-*-helvetica-bold-r-normal-*-10-*-*-*-*-*-*-*";
+  DisplayFont = "-*-helvetica-medium-r-normal-*-12-*-*-*-*-*-*-*";
+  HighlightColor = white;
+  HighlightTextColor = black;
+  ClipTitleColor = black;
+  CClipTitleColor = "rgb:93/0d/29";
+  FTitleColor = white;
+  PTitleColor = white;
+  UTitleColor = black;
+  FTitleBack = (dgradient, "rgb:62/08/19", "rgb:85/0b/22");
+  PTitleBack = (dgradient, "rgb:51/50/55", "rgb:80/80/80");
+  UTitleBack = (dgradient, "rgb:8c/81/6d", "rgb:c6/b9/ae");
+  MenuTitleColor = white;
+  MenuTextColor = black;
+  MenuDisabledColor = gray40;
+  MenuTitleBack = (hgradient, "rgb:93/0d/29", "rgb:85/0b/22");
+  MenuTextBack = (hgradient, "rgb:c6/b9/ae", "rgb:ff/ff/ff");
+  WorkspaceBack = (spixmap,
+                   "/usr/share/WindowMaker/Backgrounds/DebianSwirl.jpg",
+		   "rgb:8c/81/65");
+  IconBack = (dgradient, "rgb:8c/81/6d", "rgb:c6/b9/ae");
+}

debian/debianfiles/wmaker-common.desktop

@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Window Maker
 Comment=This session logs you into Window Maker
 Exec=/usr/bin/wmaker

debian/libwings-dev.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/libwings-dev.install

@@ -1,11 +1,11 @@
-usr/include/WINGs/WUtil.h
-usr/include/WINGs/WINGs.h
-usr/include/WINGs/WINGsP.h
-usr/lib/pkgconfig/WINGs.pc
-usr/lib/pkgconfig/WUtil.pc
-usr/lib/libWINGs.a
-usr/lib/libWUtil.a
-usr/lib/libWUtil.so
-usr/lib/libWINGs.so
 usr/bin/get-wings-flags
 usr/bin/get-wutil-flags
+usr/include/WINGs/WINGs.h
+usr/include/WINGs/WINGsP.h
+usr/include/WINGs/WUtil.h
+usr/lib/*/libWINGs.a
+usr/lib/*/libWINGs.so
+usr/lib/*/libWUtil.a
+usr/lib/*/libWUtil.so
+usr/lib/*/pkgconfig/WINGs.pc
+usr/lib/*/pkgconfig/WUtil.pc

debian/libwings3.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/libwings3.install

@@ -1 +1 @@
-usr/lib/libWINGs.so.*
+usr/lib/*/libWINGs.so.*

debian/libwings3.symbols

@@ -118,6 +118,7 @@ libWINGs.so.3 libwings3 #MINVER#
  WMGetBrowserSelectedRowInColumn@Base 0.95.0
  WMGetButtonEnabled@Base 0.95.0
  WMGetButtonSelected@Base 0.95.0
+ WMGetButtonText@Base 0.95.7
  WMGetColorAlpha@Base 0.95.0
  WMGetColorPanel@Base 0.95.0
  WMGetColorPanelColor@Base 0.95.0
@@ -216,6 +217,7 @@ libWINGs.so.3 libwings3 #MINVER#
  WMGetViewScreenPosition@Base 0.95.0
  WMGetViewSize@Base 0.95.0
  WMGetWidgetBackgroundColor@Base 0.95.0
+ WMGetWidgetBackgroundPixmap@Base 0.95.7
  WMGrayColor@Base 0.95.0
  WMGreenComponentOfColor@Base 0.95.0
  WMGroupButtons@Base 0.95.0
@@ -465,6 +467,7 @@ libWINGs.so.3 libwings3 #MINVER#
  WMSetViewNextResponder@Base 0.95.0
  WMSetViewNotifySizeChanges@Base 0.95.0
  WMSetWidgetBackgroundColor@Base 0.95.0
+ WMSetWidgetBackgroundPixmap@Base 0.95.7
  WMSetWidgetDefaultBoldFont@Base 0.95.0
  WMSetWidgetDefaultFont@Base 0.95.0
  WMSetWindowAspectRatio@Base 0.95.0
@@ -570,6 +573,7 @@ libWINGs.so.3 libwings3 #MINVER#
  W_SetFocusOfTopLevel@Base 0.95.0
  W_SetPreeditPositon@Base 0.95.0
  W_SetViewBackgroundColor@Base 0.95.0
+ W_SetViewBackgroundPixmap@Base 0.95.7
  W_SetViewCursor@Base 0.95.0
 #MISSING: 0.95.5-1# W_SetXdndAwareProperty@Base 0.95.0
  W_TopLevelOfView@Base 0.95.0

debian/libwmaker-dev.examples

@@ -0,0 +1 @@
+test/wtest.c

debian/libwmaker-dev.install

@@ -0,0 +1,3 @@
+usr/include/WMaker.h
+usr/lib/*/libWMaker.a
+usr/lib/*/libWMaker.so

debian/libwmaker1.install

@@ -0,0 +1 @@
+usr/lib/*/libWMaker.so.*

debian/libwmaker1.symbols

@@ -0,0 +1,12 @@
+libWMaker.so.1 libwmaker1 #MINVER#
+ WMAppAddWindow@Base 0.95.7
+ WMAppCreateWithMain@Base 0.95.7
+ WMAppSetMainMenu@Base 0.95.7
+ WMHideApplication@Base 0.95.7
+ WMHideOthers@Base 0.95.7
+ WMMenuAddItem@Base 0.95.7
+ WMMenuAddSubmenu@Base 0.95.7
+ WMMenuCreate@Base 0.95.7
+ WMProcessEvent@Base 0.95.7
+ WMRealizeMenus@Base 0.95.7
+ WMSetWindowAttributes@Base 0.95.7

debian/libwraster-dev.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/libwraster-dev.install

@@ -1,5 +1,5 @@
-usr/include/wraster.h
-usr/lib/pkgconfig/wrlib.pc
-usr/lib/libwraster.so
-usr/lib/libwraster.a
 usr/bin/get-wraster-flags
+usr/include/wraster.h
+usr/lib/*/libwraster.a
+usr/lib/*/libwraster.so
+usr/lib/*/pkgconfig/wrlib.pc

debian/libwraster5.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/libwraster5.install

@@ -1 +1 @@
-usr/lib/libwraster.so.*
+usr/lib/*/libwraster.so.*

debian/libwraster5.symbols

@@ -1,60 +1,61 @@
 libwraster.so.5 libwraster5 #MINVER#
- LIBWRASTER3@LIBWRASTER3 0.95.0
- RBevelImage@LIBWRASTER3 0.95.0
- RBlurImage@LIBWRASTER3 0.95.0
- RClearImage@LIBWRASTER3 0.95.0
- RCloneImage@LIBWRASTER3 0.95.0
- RCombineArea@LIBWRASTER3 0.95.0
- RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.0
- RCombineImageWithColor@LIBWRASTER3 0.95.0
- RCombineImages@LIBWRASTER3 0.95.0
- RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.0
- RConvertImage@LIBWRASTER3 0.95.0
- RConvertImageMask@LIBWRASTER3 0.95.0
- RCopyArea@LIBWRASTER3 0.95.0
- RCreateContext@LIBWRASTER3 0.95.0
- RCreateImage@LIBWRASTER3 0.95.0
- RCreateImageFromDrawable@LIBWRASTER3 0.95.0
- RCreateImageFromXImage@LIBWRASTER3 0.95.0
- RCreateXImage@LIBWRASTER3 0.95.0
+ LIBWRASTER3@LIBWRASTER3 0.95.6
+ RBevelImage@LIBWRASTER3 0.95.6
+ RBlurImage@LIBWRASTER3 0.95.6
+ RClearImage@LIBWRASTER3 0.95.6
+ RCloneImage@LIBWRASTER3 0.95.6
+ RCombineAlpha@LIBWRASTER3 0.95.6
+ RCombineArea@LIBWRASTER3 0.95.6
+ RCombineAreaWithOpaqueness@LIBWRASTER3 0.95.6
+ RCombineImageWithColor@LIBWRASTER3 0.95.6
+ RCombineImages@LIBWRASTER3 0.95.6
+ RCombineImagesWithOpaqueness@LIBWRASTER3 0.95.6
+ RConvertImage@LIBWRASTER3 0.95.6
+ RConvertImageMask@LIBWRASTER3 0.95.6
+ RCopyArea@LIBWRASTER3 0.95.6
+ RCreateContext@LIBWRASTER3 0.95.6
+ RCreateImage@LIBWRASTER3 0.95.6
+ RCreateImageFromDrawable@LIBWRASTER3 0.95.6
+ RCreateImageFromXImage@LIBWRASTER3 0.95.6
+ RCreateXImage@LIBWRASTER3 0.95.6
  RDestroyContext@LIBWRASTER3 0.95.6
- RDestroyXImage@LIBWRASTER3 0.95.0
- RDrawLine@LIBWRASTER3 0.95.0
- RDrawLines@LIBWRASTER3 0.95.0
- RDrawSegments@LIBWRASTER3 0.95.0
- RErrorCode@LIBWRASTER3 0.95.0
- RFillImage@LIBWRASTER3 0.95.0
+ RDestroyXImage@LIBWRASTER3 0.95.6
+ RDrawLine@LIBWRASTER3 0.95.7-3~
+ RDrawLines@LIBWRASTER3 0.95.6
+ RDrawSegments@LIBWRASTER3 0.95.6
+ RErrorCode@LIBWRASTER3 0.95.6
+ RFillImage@LIBWRASTER3 0.95.6
  RFlipImage@LIBWRASTER3 0.95.6
- RGetClosestXColor@LIBWRASTER3 0.95.0
- RGetImageFileFormat@LIBWRASTER3 0.95.0
- RGetImageFromXPMData@LIBWRASTER3 0.95.0
- RGetPixel@LIBWRASTER3 0.95.0
- RGetSubImage@LIBWRASTER3 0.95.0
- RGetXImage@LIBWRASTER3 0.95.0
- RHSVtoRGB@LIBWRASTER3 0.95.0
- RLightImage@LIBWRASTER3 0.95.0
- RLoadImage@LIBWRASTER3 0.95.0
- RMakeCenteredImage@LIBWRASTER3 0.95.0
- RMakeTiledImage@LIBWRASTER3 0.95.0
- RMessageForError@LIBWRASTER3 0.95.0
- ROperateLine@LIBWRASTER3 0.95.0
- ROperateLines@LIBWRASTER3 0.95.0
- ROperatePixel@LIBWRASTER3 0.95.0
- ROperatePixels@LIBWRASTER3 0.95.0
+ RGetClosestXColor@LIBWRASTER3 0.95.6
+ RGetImageFileFormat@LIBWRASTER3 0.95.6
+ RGetImageFromXPMData@LIBWRASTER3 0.95.6
+ RGetPixel@LIBWRASTER3 0.95.6
+ RGetSubImage@LIBWRASTER3 0.95.6
+ RGetXImage@LIBWRASTER3 0.95.6
+ RHSVtoRGB@LIBWRASTER3 0.95.6
+ RLightImage@LIBWRASTER3 0.95.6
+ RLoadImage@LIBWRASTER3 0.95.6
+ RMakeCenteredImage@LIBWRASTER3 0.95.6
+ RMakeTiledImage@LIBWRASTER3 0.95.6
+ RMessageForError@LIBWRASTER3 0.95.6
+ ROperateLine@LIBWRASTER3 0.95.6
+ ROperateLines@LIBWRASTER3 0.95.6
+ ROperatePixel@LIBWRASTER3 0.95.6
+ ROperatePixels@LIBWRASTER3 0.95.6
  ROperateRectangle@LIBWRASTER3 0.95.6
- ROperateSegments@LIBWRASTER3 0.95.0
- RPutPixel@LIBWRASTER3 0.95.0
- RPutPixels@LIBWRASTER3 0.95.0
- RPutXImage@LIBWRASTER3 0.95.0
- RRGBtoHSV@LIBWRASTER3 0.95.0
- RReleaseImage@LIBWRASTER3 0.95.0
- RRenderGradient@LIBWRASTER3 0.95.0
- RRenderInterwovenGradient@LIBWRASTER3 0.95.0
- RRenderMultiGradient@LIBWRASTER3 0.95.0
- RRetainImage@LIBWRASTER3 0.95.0
- RRotateImage@LIBWRASTER3 0.95.0
- RSaveImage@LIBWRASTER3 0.95.0
- RScaleImage@LIBWRASTER3 0.95.0
+ ROperateSegments@LIBWRASTER3 0.95.6
+ RPutPixel@LIBWRASTER3 0.95.6
+ RPutPixels@LIBWRASTER3 0.95.6
+ RPutXImage@LIBWRASTER3 0.95.6
+ RRGBtoHSV@LIBWRASTER3 0.95.6
+ RReleaseImage@LIBWRASTER3 0.95.6
+ RRenderGradient@LIBWRASTER3 0.95.6
+ RRenderInterwovenGradient@LIBWRASTER3 0.95.6
+ RRenderMultiGradient@LIBWRASTER3 0.95.6
+ RRetainImage@LIBWRASTER3 0.95.6
+ RRotateImage@LIBWRASTER3 0.95.6
+ RSaveImage@LIBWRASTER3 0.95.6
+ RScaleImage@LIBWRASTER3 0.95.6
  RShutdown@LIBWRASTER3 0.95.6
- RSmoothScaleImage@LIBWRASTER3 0.95.0
- RSupportedFileFormats@LIBWRASTER3 0.95.0
+ RSmoothScaleImage@LIBWRASTER3 0.95.6
+ RSupportedFileFormats@LIBWRASTER3 0.95.6

debian/libwutil5.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/libwutil5.install

@@ -1 +1 @@
-usr/lib/libWUtil.so.*
+usr/lib/*/libWUtil.so.*

debian/patches/50_def_config_paths.diff

@@ -1,11 +1,11 @@
 Description: This patch changes the default config paths
 Author: Andreas Metzler <ametzler@debian.org>
 Last-Update: 2010-08-07
-Index: WindowMaker-0.95.6/src/wconfig.h.in
+Index: wmaker-crm/src/wconfig.h.in
 ===================================================================
---- WindowMaker-0.95.6.orig/src/wconfig.h.in
-+++ WindowMaker-0.95.6/src/wconfig.h.in
-@@ -122,7 +122,7 @@
+--- wmaker-crm.orig/src/wconfig.h.in
++++ wmaker-crm/src/wconfig.h.in
+@@ -116,7 +116,7 @@
   */
  
  /* list of paths to look for the config files, searched in order of appearance */

debian/patches/51_wmaker_man.diff

@@ -1,36 +0,0 @@
-Description: This patch includes the debian paths
-Author: Rodolfo García Peñas (kix) <kix@kix.es>
-Last-Update: 2011-08-16
-Index: WindowMaker-0.95.6/doc/wmaker.1x
-===================================================================
---- WindowMaker-0.95.6.orig/doc/wmaker.1x
-+++ WindowMaker-0.95.6/doc/wmaker.1x
-@@ -9,6 +9,9 @@ wmaker \- X11 window manager with a NEXT
- Window Maker is a X11 window manager with a NEXTSTEP look. It tries to
- emulate NeXT's look as much as possible, but it deviates from it as
- necessary.
-+.PP
-+\fIPlease note this manpage has been modified to reflect changes in the
-+Debian installation of Window Maker.\fP
- .SH "OPTIONS"
- .TP
- .B \-display host:display.screen
-@@ -78,7 +81,7 @@ Attribute Editor (right drag the applica
- Attributes) instead of modifying this file directly. There are just a
- few options not available using the Attributes Editor.
- .TP
--.B /usr/share/WindowMaker/Defaults/
-+.B /etc/GNUstep/Defaults/
- All the above-mentioned files are READ from here if not found except
- for WMState, which is COPIED from here. No matter where they are read
- from, if it's necessary to write configuration changes back into this
-@@ -106,6 +109,9 @@ and here, in that order. Unless, the ind
- .B ~/GNUstep/Library/WindowMaker/Pixmaps/
- Window Maker looks for \fBpixmaps\fP here
- .TP
-+.B ~/GNUstep/Library/Icons/
-+Window Maker looks for \fBicons\fP here
-+.TP
- .B ~/GNUstep/Library/WindowMaker/Backgrounds/
- Window Maker looks for backgrounds here
- .TP

debian/patches/53_Debian_WMState.diff

@@ -1,10 +1,10 @@
 Description: XTerm and WMPrefs debian configuration. Based on Marcelo E. Magallon <mmagallo@debian.org> diff patch.
 Author: Rodolfo García Peñas (kix) <kix@kix.es>
 Last-Update: 2012-01-09
-Index: WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in
+Index: wmaker-crm/WindowMaker/Defaults/WMState.in
 ===================================================================
---- WindowMaker-0.95.6.orig/WindowMaker/Defaults/WMState.in
-+++ WindowMaker-0.95.6/WindowMaker/Defaults/WMState.in
+--- wmaker-crm.orig/WindowMaker/Defaults/WMState.in
++++ wmaker-crm/WindowMaker/Defaults/WMState.in
 @@ -2,7 +2,7 @@
    Dock = {
      Applications = (

debian/patches/54_Debian_wmmacros.diff

@@ -1,8 +1,10 @@
 Description: Macros for user paths. Based on Marcelo E. Magallon <mmagallo@debian.org> diff patch.
 Author: Rodolfo García Peñas (kix) <kix@kix.es>
 Last-Update: 2012-01-09
---- a/WindowMaker/wmmacros
-+++ b/WindowMaker/wmmacros
+Index: wmaker-crm/WindowMaker/wmmacros
+===================================================================
+--- wmaker-crm.orig/WindowMaker/wmmacros
++++ wmaker-crm/WindowMaker/wmmacros
 @@ -22,7 +22,7 @@
  /*
   * SETSTYLE FILE - loads a style file 

debian/patches/55_ungif_problem.diff

@@ -1,11 +1,11 @@
 Description: Remove include ungif library (will use gif library)
 Author: Rodolfo García Peñas (kix) <kix@debian.org>
 Last-Update: 2014-10-09
-Index: WindowMaker-0.95.6/m4/wm_imgfmt_check.m4
+Index: wmaker-crm/m4/wm_imgfmt_check.m4
 ===================================================================
---- WindowMaker-0.95.6.orig/m4/wm_imgfmt_check.m4
-+++ WindowMaker-0.95.6/m4/wm_imgfmt_check.m4
-@@ -19,7 +19,7 @@
+--- wmaker-crm.orig/m4/wm_imgfmt_check.m4
++++ wmaker-crm/m4/wm_imgfmt_check.m4
+@@ -20,7 +20,7 @@
  # WM_IMGFMT_CHECK_GIF
  # -------------------
  #
@@ -14,7 +14,7 @@ Index: WindowMaker-0.95.6/m4/wm_imgfmt_check.m4
  # The check depends on variable 'enable_gif' being either:
  #   yes  - detect, fail if not found
  #   no   - do not detect, disable support
-@@ -37,7 +37,7 @@ AS_IF([test "x$enable_gif" = "xno"],
+@@ -38,7 +38,7 @@ AS_IF([test "x$enable_gif" = "xno"],
           wm_save_LIBS="$LIBS"
           dnl
           dnl We check first if one of the known libraries is available

debian/patches/60_fix_wraster_symbol_versioning.diff

@@ -0,0 +1,28 @@
+Description: Patch back libwraster symbol version to LIBWRASTER3.
+Author: Andreas Metzler <ametzler@debian.org>
+Bug-Debian: https://bugs.debian.org/811304
+Origin: vendor
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,6 +76,11 @@ WRASTER_REVISION=0
+ WRASTER_AGE=0
+ WRASTER_VERSION=$WRASTER_CURRENT:$WRASTER_REVISION:$WRASTER_AGE
+ AC_SUBST(WRASTER_VERSION)
++dnl After next soname bump drop this and use WRASTER_VERSION as argument
++dnl for generate-mapfile-from-header.sh
++dnl http://bugs.debian.org/811304
++WRASTER_SYMBOL_VERSION=3
++AC_SUBST([WRASTER_SYMBOL_VERSION])
+ dnl
+ dnl libWINGs
+ WINGS_CURRENT=4
+--- a/wrlib/Makefile.am
++++ b/wrlib/Makefile.am
+@@ -99,5 +99,5 @@ wrlib.pc: Makefile
+ if HAVE_LD_VERSION_SCRIPT
+ libwraster.map: $(include_HEADERS) $(top_srcdir)/script/generate-mapfile-from-header.sh
+ 	$(AM_V_GEN)$(top_srcdir)/script/generate-mapfile-from-header.sh \
+-		-n LIBWRASTER -v $(WRASTER_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
++		-n LIBWRASTER -v $(WRASTER_SYMBOL_VERSION) $(srcdir)/$(include_HEADERS) > libwraster.map
+ endif

debian/patches/series

@@ -1,5 +1,5 @@
 50_def_config_paths.diff
-51_wmaker_man.diff
 53_Debian_WMState.diff
 54_Debian_wmmacros.diff
 55_ungif_problem.diff
+60_fix_wraster_symbol_versioning.diff

debian/rules

@@ -1,14 +1,13 @@
 #!/usr/bin/make -f
 # export DH_VERBOSE=1
-export CFLAGS = `dpkg-buildflags --get CFLAGS`
-export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR="\\\"GNUstep/Defaults\\\""
-export LDFLAGS = `dpkg-buildflags --get LDFLAGS`
-export CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND += -Wall -DGLOBAL_DEFAULTS_SUBDIR=\"GNUstep/Defaults\"
 
 LINGUAS           := $(patsubst po/%.po, %, $(wildcard po/*.po))
 
-WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-xinerama 
-#not-enabled      --enable-usermenu --disable-shape --disable-shm --enable-xrandr
+WMAKER_OPTIONS := --disable-locale --enable-modelock --enable-pango --enable-xinerama
+#not-enabled      --enable-usermenu --disable-shape --disable-shm --enable-randr
 #not-enabled      --disable-xpm --disable-png --disable-jpeg --disable-gif --disable-tiff
 
 # Debian packages destination folder
@@ -17,31 +16,24 @@ DEBIAN_TMP        := debian/tmp
 # Be careful with the leading / because some of these values are going
 # to be hardcoded into the executables
 BASEDIR           := /usr
-CONFDIR           := /etc
 INCLUDEDIR        := $(BASEDIR)/include
 SHAREDIR          := $(BASEDIR)/share
-MANDIR            := $(SHAREDIR)/man
 NLSDIR            := $(SHAREDIR)/locale
 GNUSTEPDIR        := $(SHAREDIR)/lib/GNUstep/System
 WMSHAREDIR        := $(SHAREDIR)/WindowMaker
 PIXMAPDIR         := $(INCLUDEDIR)/X11/pixmaps
 
-COMMON_OPTIONS    := --prefix=$(BASEDIR)              \
-                     --mandir=$(MANDIR)               \
-                     --includedir=$(INCLUDEDIR)       \
-                     --sysconfdir=$(CONFDIR)          \
-                     --datadir=$(SHAREDIR)            \
-                     --with-nlsdir=$(NLSDIR)          \
+COMMON_OPTIONS    := --datadir=$(SHAREDIR)            \
+                     --with-localedir=$(NLSDIR)       \
                      --with-pixmapdir=$(PIXMAPDIR)    \
                      --with-gnustepdir=$(GNUSTEPDIR)
 
 %:
-	dh $@ --parallel --with autotools-dev 
+	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
-	./autogen.sh
-	LINGUAS="$(LINGUAS)" ./configure $(COMMON_OPTIONS) \
-	$(WMAKER_OPTIONS) $(shell dpkg-buildflags --export=configure)
+	env LINGUAS="$(LINGUAS)" dh_auto_configure --verbose -- \
+		$(COMMON_OPTIONS) $(WMAKER_OPTIONS)
 
 override_dh_installmenu:
 	dh_installmenu -a --noscripts
@@ -65,6 +57,3 @@ override_dh_install:
 
 	# Install files
 	dh_install
-
-override_dh_strip:
-	dh_strip --dbg-package=wmaker-dbg

debian/source/include-binaries

@@ -1 +1,2 @@
-debian/debianfiles/Theme/debian.tiff
+debian/debianfiles/Themes/DebianSwirl.jpg
+debian/debianfiles/Themes/debian.tiff

debian/source/options

@@ -1,2 +1,2 @@
 # Don't store changes on autogenerated files
-extend-diff-ignore = "(^|/)(compile|config\.sub|config\.guess|Makefile|configure|Makefile\.in|aclocal.m4|config.h.in|depcomp|INSTALL|install-sh|ltmain.sh|missing||libtool.m4|lt~obsolete.m4|ltoptions.m4|ltsugar.m4|ltversion.m4|.Po|WMRootMenu)$"
+extend-diff-ignore = "(^|/)(distros\/.+|INSTALL-WMAKER|README.i18n)$"

debian/watch

@@ -1,2 +1,3 @@
 version=3
-http://windowmaker.org/pub/source/release/WindowMaker-([\d+|\.]+).tar.gz
+http://windowmaker.org/ \
+(?:|.*/)WindowMaker(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)

debian/wmaker-common.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/wmaker-common.dirs

@@ -1,7 +1,7 @@
-etc/menu-methods
 etc/GNUstep/Defaults
+etc/menu-methods
 usr/bin
 usr/sbin
 usr/share/doc/wmaker
-usr/share/xsessions
 usr/share/doc/wmaker-common
+usr/share/xsessions

debian/wmaker-common.docs

@@ -1,12 +1,10 @@
 AUTHORS
 BUGFORM
 BUGS
+FAQ
 NEWS
 README
 TODO
-FAQ
-FAQ.I18N
-debian/debianfiles/Theme/Debian.theme.txt
 debian/copyright
-# Place wm-oldmenu2new under a more appropiate directory
+debian/debianfiles/Themes/DebianLegacy.txt
 util/wm-oldmenu2new

debian/wmaker-common.install

@@ -1,146 +1,45 @@
-usr/share/WindowMaker/autostart.sh
-usr/share/WindowMaker/exitscript.sh
-usr/share/locale/it/LC_MESSAGES/WPrefs.mo
-usr/share/locale/it/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/da/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/de/LC_MESSAGES/WPrefs.mo
-usr/share/locale/de/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/de/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/de/LC_MESSAGES/WINGs.mo
-usr/share/locale/ro/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/hy/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bg/LC_MESSAGES/WPrefs.mo
-usr/share/locale/bg/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bg/LC_MESSAGES/WINGs.mo
-usr/share/locale/nl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ja/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ja/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/pt/LC_MESSAGES/WPrefs.mo
-usr/share/locale/pt/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ru/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ru/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/no/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/zh_CN/LC_MESSAGES/WPrefs.mo
-usr/share/locale/zh_CN/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/be/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/sk/LC_MESSAGES/WPrefs.mo
-usr/share/locale/sk/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/sk/LC_MESSAGES/WINGs.mo
-usr/share/locale/ko/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ko/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/cs/LC_MESSAGES/WPrefs.mo
-usr/share/locale/cs/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/cs/LC_MESSAGES/WINGs.mo
-usr/share/locale/hr/LC_MESSAGES/WPrefs.mo
-usr/share/locale/hr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/gl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/hu/LC_MESSAGES/WPrefs.mo
-usr/share/locale/hu/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fr/LC_MESSAGES/WPrefs.mo
-usr/share/locale/fr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fr/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/fr/LC_MESSAGES/WINGs.mo
-usr/share/locale/sv/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/el/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/fi/LC_MESSAGES/WPrefs.mo
-usr/share/locale/fi/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/zh_TW/LC_MESSAGES/WPrefs.mo
-usr/share/locale/zh_TW/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/tr/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/es/LC_MESSAGES/WPrefs.mo
-usr/share/locale/es/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/es/LC_MESSAGES/wmgenmenu.mo
-usr/share/locale/ca/LC_MESSAGES/WPrefs.mo
-usr/share/locale/ca/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ca/LC_MESSAGES/WINGs.mo
-usr/share/locale/pl/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/et/LC_MESSAGES/WPrefs.mo
-usr/share/locale/et/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/ms/LC_MESSAGES/WindowMaker.mo
-usr/share/locale/bs/LC_MESSAGES/WindowMaker.mo
-usr/share/WindowMaker/menu.pt
-usr/share/WindowMaker/plmenu.ko
-usr/share/WindowMaker/menu.sk
-usr/share/WindowMaker/plmenu.de
-usr/share/WindowMaker/plmenu.bg
-usr/share/WindowMaker/plmenu.pl
-usr/share/WindowMaker/menu.ru
+README.WPrefs					usr/share/doc/wmaker
+README.WPrefs.po				usr/share/doc/wmaker
+README.definable-cursor				usr/share/doc/wmaker
+README.po					usr/share/doc/wmaker
+debian/debianfiles/Themes/Debian		usr/share/WindowMaker/Themes
+debian/debianfiles/Themes/DebianLegacy.style	usr/share/WindowMaker/Themes
+debian/debianfiles/Themes/DebianSwirl.jpg	usr/share/WindowMaker/Backgrounds
+debian/debianfiles/Themes/debian.tiff		usr/share/WindowMaker/Backgrounds
+debian/debianfiles/conf/WMRootMenu		etc/GNUstep/Defaults
+debian/debianfiles/conf/WMWindowAttributes	etc/GNUstep/Defaults
+debian/debianfiles/conf/WindowMaker		etc/GNUstep/Defaults
+debian/debianfiles/menu/wmappearance		etc/menu-methods
+debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
+debian/debianfiles/wmaker			usr/bin
+debian/debianfiles/wmaker-common.desktop	usr/share/xsessions
+etc/WindowMaker/WMGLOBAL			etc/GNUstep/Defaults
+etc/WindowMaker/WMState				etc/GNUstep/Defaults
+usr/share/WINGs/Images.tiff
+usr/share/WINGs/Images.xpm
+usr/share/WINGs/defaultIcon.tiff
+usr/share/WINGs/defaultIcon.xpm
+usr/share/WindowMaker/Backgrounds/BlueImage.jpeg
+usr/share/WindowMaker/IconSets/Default.iconset
 usr/share/WindowMaker/Icons/*.png
 usr/share/WindowMaker/Icons/*.tiff
 usr/share/WindowMaker/Icons/*.xpm
 usr/share/WindowMaker/Icons/README
-usr/share/WindowMaker/plmenu
-usr/share/WindowMaker/menu.es
-usr/share/WindowMaker/wmmacros
-usr/share/WindowMaker/menu.hu
-usr/share/WindowMaker/menu.he
-usr/share/WindowMaker/menu.sl
-usr/share/WindowMaker/menu
-usr/share/WindowMaker/Backgrounds/BlueImage.jpeg
-usr/share/WindowMaker/menu.nl
-usr/share/WindowMaker/plmenu.ja
-usr/share/WindowMaker/Styles/*.style
-usr/share/WindowMaker/menu.ro
-usr/share/WindowMaker/menu.bg
-usr/share/WindowMaker/menu.se
-usr/share/WindowMaker/background.menu
-usr/share/WindowMaker/menu.ca
-usr/share/WindowMaker/menu.hr
-usr/share/WindowMaker/menu.fr
-usr/share/WindowMaker/menu.cz
-usr/share/WindowMaker/menu.da
-usr/share/WindowMaker/menu.ko
-usr/share/WindowMaker/plmenu.sk
-usr/share/WindowMaker/plmenu.fi
-usr/share/WindowMaker/plmenu.it
-usr/share/WindowMaker/menu.ja
-usr/share/WindowMaker/menu.fi
-usr/share/WindowMaker/Themes/*.style
-usr/share/WindowMaker/plmenu.da
-usr/share/WindowMaker/plmenu.ro
-usr/share/WindowMaker/README.themes
-usr/share/WindowMaker/menu.de
-usr/share/WindowMaker/plmenu.es
-usr/share/WindowMaker/README
-usr/share/WindowMaker/plmenu.fr
-usr/share/WindowMaker/menu.no
-usr/share/WindowMaker/menu.it
-usr/share/WindowMaker/plmenu.hr
-usr/share/WindowMaker/IconSets/Default.iconset
-usr/share/WindowMaker/menu.pl
-usr/share/WindowMaker/menu.el
-usr/share/WindowMaker/menu.zh_TW
-usr/share/WindowMaker/plmenu.zh_CN
-usr/share/WindowMaker/plmenu.zh_TW
-usr/share/WindowMaker/menu.gl
-usr/share/WindowMaker/menu.tr
-usr/share/WindowMaker/menu.zh_CN
-usr/share/WindowMaker/Pixmaps/*.xpm
 usr/share/WindowMaker/Pixmaps/*.png
-usr/share/WINGs/defaultIcon.xpm
-usr/share/WINGs/defaultIcon.tiff
-usr/share/WINGs/Images.xpm
-usr/share/WINGs/Images.tiff
-usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
+usr/share/WindowMaker/Pixmaps/*.xpm
+usr/share/WindowMaker/README
+usr/share/WindowMaker/README.themes
+usr/share/WindowMaker/Styles/*.style
+usr/share/WindowMaker/Themes/*.style
+usr/share/WindowMaker/autostart.sh
+usr/share/WindowMaker/background.menu
+usr/share/WindowMaker/exitscript.sh
+usr/share/WindowMaker/menu
+usr/share/WindowMaker/menu.*
+usr/share/WindowMaker/plmenu
+usr/share/WindowMaker/plmenu.*
+usr/share/WindowMaker/wmmacros
 usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.tiff
+usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs.xpm
 usr/share/lib/GNUstep/System/Applications/WPrefs.app/tiff/*.tiff
-# Scripts
-debian/debianfiles/wmaker			usr/bin
-debian/debianfiles/upgrade-windowmaker-defaults usr/sbin
-# Theme
-debian/debianfiles/Theme/Debian			usr/share/WindowMaker/Themes
-debian/debianfiles/Theme/debian.tiff		usr/share/WindowMaker/Backgrounds
-# Configuration
-etc/WindowMaker/WMGLOBAL			etc/GNUstep/Defaults
-etc/WindowMaker/WMState				etc/GNUstep/Defaults
-debian/debianfiles/conf/WMWindowAttributes	etc/GNUstep/Defaults
-debian/debianfiles/conf/WMRootMenu		etc/GNUstep/Defaults
-debian/debianfiles/conf/WindowMaker		etc/GNUstep/Defaults
-debian/debianfiles/wmaker-common.desktop	usr/share/xsessions
-# Menu
-debian/debianfiles/menu/wmappearance		etc/menu-methods
-# READMES, from the temporal path (see README section in debian/rules)
-README.po					usr/share/doc/wmaker
-README.definable-cursor				usr/share/doc/wmaker
-README.WPrefs					usr/share/doc/wmaker
-README.WPrefs.po				usr/share/doc/wmaker
+usr/share/locale/*/LC_MESSAGES/*.mo

debian/wmaker-common.maintscript

@@ -0,0 +1,5 @@
+rm_conffile /etc/X11/WindowMaker/appearance.menu 0.95.7-5~
+rm_conffile /etc/X11/WindowMaker/menu.posthook 0.95.7-5~
+rm_conffile /etc/X11/WindowMaker/menu.prehook 0.95.7-5~
+mv_conffile /etc/X11/WindowMaker/background.menu /usr/share/WindowMaker/background.menu 0.95.7-5~
+mv_conffile /etc/X11/WindowMaker/wmmacros /usr/share/WindowMaker/wmmacros 0.95.7-5~

debian/wmaker-common.manpages

@@ -1,3 +1,3 @@
+doc/WindowMaker.1
 doc/upgrade-windowmaker-defaults.8
-doc/wmaker.1x
-doc/WindowMaker.1x
+doc/wmaker.1

debian/wmaker-common.postrm

@@ -12,7 +12,7 @@ case "$1" in
     done
   ;;
   purge)
-    if [ -x /usr/bin/update-menus ] ; then
+    if which update-menus >/dev/null 2>&1 ; then
       update-menus
       rm -f /etc/GNUstep/Defaults/menu.hook /etc/GNUstep/Defaults/appearance.menu
     fi

debian/wmaker-dbg.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/wmaker-utils.install

@@ -0,0 +1,8 @@
+usr/bin/wxcopy
+usr/bin/wxpaste
+usr/share/man/cs/man1/wxcopy.1
+usr/share/man/cs/man1/wxpaste.1
+usr/share/man/ru/man1/wxcopy.1
+usr/share/man/ru/man1/wxpaste.1
+usr/share/man/sk/man1/wxcopy.1
+usr/share/man/sk/man1/wxpaste.1

debian/wmaker-utils.manpages

@@ -0,0 +1,2 @@
+doc/wxcopy.1
+doc/wxpaste.1

debian/wmaker.changelog-upstream

@@ -1 +0,0 @@
-ChangeLog

debian/wmaker.dirs

@@ -1,2 +1,2 @@
-usr/lib/WindowMaker
 usr/lib/GNUstep/System/Applications/WPrefs.app
+usr/lib/WindowMaker

debian/wmaker.install

@@ -1,43 +1,35 @@
-usr/bin/wxcopy
-usr/bin/wmagnify
-usr/bin/wmmenugen
-usr/bin/wmgenmenu
-usr/bin/wmsetbg
-usr/bin/wdread
-usr/bin/wdwrite
+usr/bin/convertfonts usr/lib/WindowMaker
+usr/bin/geticonset
 usr/bin/getstyle
 usr/bin/seticons
-usr/bin/geticonset
 usr/bin/setstyle
-usr/bin/wxpaste
+usr/bin/wdread
+usr/bin/wdwrite
+usr/bin/wmagnify
 usr/bin/wmaker usr/lib/WindowMaker
-usr/bin/convertfonts usr/lib/WindowMaker
+usr/bin/wmgenmenu
+usr/bin/wmiv
+usr/bin/wmmenugen
+usr/bin/wmsetbg
 usr/share/lib/GNUstep/System/Applications/WPrefs.app/WPrefs usr/lib/GNUstep/System/Applications/WPrefs.app
-# Manpages - Locale specific
-usr/share/man/ru/man1/wxpaste.1x
-usr/share/man/ru/man1/geticonset.1x
-usr/share/man/ru/man1/seticons.1x
-usr/share/man/ru/man1/setstyle.1x
-usr/share/man/ru/man1/getstyle.1x
-usr/share/man/ru/man1/wdwrite.1x
-usr/share/man/ru/man1/wxcopy.1x
-usr/share/man/ru/man1/wmaker.1x
-usr/share/man/ru/man1/wmsetbg.1x
-usr/share/man/sk/man1/wxpaste.1x
-usr/share/man/sk/man1/geticonset.1x
-usr/share/man/sk/man1/seticons.1x
-usr/share/man/sk/man1/setstyle.1x
-usr/share/man/sk/man1/getstyle.1x
-usr/share/man/sk/man1/wdwrite.1x
-usr/share/man/sk/man1/wxcopy.1x
-usr/share/man/sk/man1/wmaker.1x
-usr/share/man/sk/man1/wmsetbg.1x
-usr/share/man/cs/man1/wxpaste.1x
-usr/share/man/cs/man1/geticonset.1x
-usr/share/man/cs/man1/seticons.1x
-usr/share/man/cs/man1/setstyle.1x
-usr/share/man/cs/man1/getstyle.1x
-usr/share/man/cs/man1/wdwrite.1x
-usr/share/man/cs/man1/wxcopy.1x
-usr/share/man/cs/man1/wmaker.1x
-usr/share/man/cs/man1/wmsetbg.1x
+usr/share/man/cs/man1/geticonset.1
+usr/share/man/cs/man1/getstyle.1
+usr/share/man/cs/man1/seticons.1
+usr/share/man/cs/man1/setstyle.1
+usr/share/man/cs/man1/wdwrite.1
+usr/share/man/cs/man1/wmaker.1
+usr/share/man/cs/man1/wmsetbg.1
+usr/share/man/ru/man1/geticonset.1
+usr/share/man/ru/man1/getstyle.1
+usr/share/man/ru/man1/seticons.1
+usr/share/man/ru/man1/setstyle.1
+usr/share/man/ru/man1/wdwrite.1
+usr/share/man/ru/man1/wmaker.1
+usr/share/man/ru/man1/wmsetbg.1
+usr/share/man/sk/man1/geticonset.1
+usr/share/man/sk/man1/getstyle.1
+usr/share/man/sk/man1/seticons.1
+usr/share/man/sk/man1/setstyle.1
+usr/share/man/sk/man1/wdwrite.1
+usr/share/man/sk/man1/wmaker.1
+usr/share/man/sk/man1/wmsetbg.1

debian/wmaker.manpages

@@ -1,14 +1,12 @@
-doc/wmgenmenu.1
+doc/WPrefs.1
+doc/geticonset.1
+doc/getstyle.1
+doc/seticons.1
+doc/setstyle.1
 doc/wdread.1
-doc/wmmenugen.1
-doc/geticonset.1x
-doc/getstyle.1x
-doc/seticons.1x
-doc/setstyle.1x
-doc/wdwrite.1x
-doc/wmagnify.1x
-doc/wmsetbg.1x
-doc/WPrefs.1x
-doc/wxcopy.1x
-doc/wxpaste.1x
+doc/wdwrite.1
+doc/wmagnify.1
+doc/wmgenmenu.1
 doc/wmiv.1
+doc/wmmenugen.1
+doc/wmsetbg.1

debian/wmaker.postinst

@@ -22,7 +22,7 @@ case "$1" in
     update-alternatives --install /usr/bin/x-window-manager \
         x-window-manager /usr/bin/wmaker 50 \
         --slave /usr/share/man/man1/x-window-manager.1.gz \
-        x-window-manager.1.gz /usr/share/man/man1/wmaker.1x.gz
+        x-window-manager.1.gz /usr/share/man/man1/wmaker.1.gz
 
     if [ -x /usr/bin/update-menus -a -x /usr/bin/install-menu ] ; then
         update-menus

debian/wmaker.postrm

@@ -3,7 +3,7 @@ set -e
 
 case "$1" in
   remove)
-    if [ -x /usr/bin/update-menus ] ; then
+    if which update-menus >/dev/null 2>&1 ; then
       update-menus
     fi
   ;;

doc/Makefile.am

@@ -35,8 +35,8 @@ wmaker.1: wmaker.in Makefile $(top_builddir)/config.h
 	$(AM_V_GEN)$(top_srcdir)/script/replace-ac-keywords.sh \
 		--header "$(top_builddir)/config.h" --filter "HAVE_INOTIFY" \
 		--filter "USE_ICCCM_WMREPLACE" \
-		-D"sysconfdir=$(sysconfdir)" --replace "sysconfdir" \
 		-D"pkgdatadir=$(pkgdatadir)" --replace "pkgdatadir" \
+		-D"defsdatadir=$(defsdatadir)" --replace "defsdatadir" \
 		-o "wmaker.1"  "$(srcdir)/wmaker.in"
 
 wmsetbg.1: wmsetbg.in Makefile $(top_builddir)/config.h

doc/build/Compilation.texi

@@ -449,6 +449,12 @@ Specific to @sc{Window Maker}, this option defines an additional path where @emp
 searched. Nothing will be installed there; the default path taken is @file{@emph{DATADIR}/pixmaps},
 where @var{DATADIR} is the path defined from @option{--datadir}.
 
+@item --with-defsdatadir=@i{DIR}
+Specific to @sc{Window Maker}, defines the directory where system configuration
+files, e.g., @file{WindowMaker}, @file{WMRootMenu}, etc., are installed.  The
+default value is @file{@emph{SYSCONFDIR}/WindowMaker}, where @var{SYSCONFDIR} is
+the path defined from @option{--sysconfdir}.
+
 @end table
 
 

doc/wmaker.in

@@ -85,7 +85,7 @@ Attribute Editor (right drag the application's title bar, select
 Attributes) instead of modifying this file directly. There are just a
 few options not available using the Attributes Editor.
 .TP
-.B @sysconfdir@/WindowMaker/Defaults/
+.B @defsdatadir@/
 All the above-mentioned files are READ from here if not found except
 for WMState, which is COPIED from here. No matter where they are read
 from, if it's necessary to write configuration changes back into this
@@ -107,12 +107,15 @@ might be shut down before the script is executed.
 .B ~/GNUstep/Library/WindowMaker/
 The menu file indicated in WMRootMenu is looked for here...
 .TP
-.B /etc/X11/WindowMaker/
+.B @pkgdatadir@/
 and here, in that order. Unless, the indicated path is an absolute path.
 .TP
 .B ~/GNUstep/Library/WindowMaker/Pixmaps/
 Window Maker looks for \fBpixmaps\fP here
 .TP
+.B ~/GNUstep/Library/Icons/
+Window Maker looks for \fBicons\fP here
+.TP
 .B ~/GNUstep/Library/WindowMaker/Backgrounds/
 Window Maker looks for backgrounds here
 .TP

po/nl.po

@@ -1,14 +1,14 @@
 # New translation into Dutch for Window Maker
-# Copyright (C) 2014-2015 Window Maker Developers Team
+# Copyright (C) 2014-2016 Window Maker Developers Team
 # This file is distributed under the same license as the windowmaker package.
 # Original by Alwin <translations@ziggo.nl>, 2014.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wmaker-0.95.6+\n"
+"Project-Id-Version: wmaker-0.95.7+\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-18 08:07+0200\n"
-"PO-Revision-Date: 2015-05-18 00:00+0000\n"
+"POT-Creation-Date: 2016-01-21 16:19+0100\n"
+"PO-Revision-Date: 2016-01-21 00:00+0000\n"
 "Last-Translator: Alwin <translations@ziggo.nl>\n"
 "Language-Team: Dutch\n"
 "Language: nl\n"
@@ -16,36 +16,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/actions.c:1059
+#: ../src/actions.c:1067
 #, c-format
 msgid "window \"%s\" has a severely broken WM_TRANSIENT_FOR hint"
 msgstr "venster \"%s\" heeft 'n ernstig beschadigde WM_TRANSIENT_FOR-hint"
 
-#: ../src/actions.c:1169
+#: ../src/actions.c:1177
 #, c-format
 msgid "creation of mini-preview failed for window \"%s\""
 msgstr "miniatuur aanmaken mislukt voor venster \"%s\""
 
-#: ../src/appicon.c:542 ../src/dialog.c:583 ../src/dock.c:3367
+#: ../src/appicon.c:539 ../src/dialog.c:583 ../src/dock.c:3370
 #: ../src/dockedapp.c:171 ../src/main.c:292 ../src/rootmenu.c:1670
-#: ../src/winspector.c:473 ../src/winspector.c:489
+#: ../src/winspector.c:472 ../src/winspector.c:488 ../src/workspace.c:150
 msgid "Error"
 msgstr "Fout"
 
-#: ../src/appicon.c:543
+#: ../src/appicon.c:540
 msgid "Could not open specified icon file"
 msgstr "Kon opgegeven icoonbestand niet openen"
 
-#: ../src/appicon.c:544 ../src/dialog.c:428 ../src/dialog.c:489
-#: ../src/dialog.c:583 ../src/dialog.c:994 ../src/dialog.c:1658
-#: ../src/dock.c:452 ../src/dock.c:459 ../src/dock.c:506 ../src/dock.c:3367
-#: ../src/dock.c:4498 ../src/dockedapp.c:172 ../src/dockedapp.c:345
-#: ../src/main.c:292 ../src/rootmenu.c:1673 ../src/winspector.c:473
-#: ../src/winspector.c:489 ../src/winspector.c:848
+#: ../src/appicon.c:541 ../src/dialog.c:428 ../src/dialog.c:489
+#: ../src/dialog.c:583 ../src/dialog.c:994 ../src/dialog.c:1660
+#: ../src/dock.c:452 ../src/dock.c:459 ../src/dock.c:506 ../src/dock.c:3370
+#: ../src/dock.c:4501 ../src/dockedapp.c:172 ../src/dockedapp.c:345
+#: ../src/main.c:292 ../src/rootmenu.c:1673 ../src/winspector.c:472
+#: ../src/winspector.c:488 ../src/winspector.c:821 ../src/workspace.c:150
 msgid "OK"
 msgstr "OK"
 
-#: ../src/appicon.c:574 ../src/dock.c:229
+#: ../src/appicon.c:571 ../src/dock.c:229
 msgid ""
 " will be forcibly closed.\n"
 "Any unsaved changes will be lost.\n"
@@ -55,41 +55,41 @@ msgstr ""
 "Niet-opgeslagen wijzigingen zullen verloren gaan.\n"
 "Bevestig a.u.b."
 
-#: ../src/appicon.c:581 ../src/dock.c:247 ../src/winmenu.c:253
+#: ../src/appicon.c:578 ../src/dock.c:247 ../src/winmenu.c:253
 msgid "Kill Application"
 msgstr "Programma doden"
 
-#: ../src/appicon.c:582 ../src/dock.c:248 ../src/winmenu.c:256
+#: ../src/appicon.c:579 ../src/dock.c:248 ../src/winmenu.c:256
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/appicon.c:582 ../src/dock.c:248 ../src/winmenu.c:256
+#: ../src/appicon.c:579 ../src/dock.c:248 ../src/winmenu.c:256
 msgid "No"
 msgstr "Nee"
 
-#: ../src/appicon.c:607 ../src/dock.c:1278 ../src/dock.c:3548
+#: ../src/appicon.c:604 ../src/dock.c:1278 ../src/dock.c:3551
 msgid "Unhide Here"
 msgstr "Hier terugplaatsen"
 
-#: ../src/appicon.c:608 ../src/appicon.c:632 ../src/dock.c:1280
-#: ../src/dock.c:1282 ../src/dock.c:3560 ../src/winmenu.c:88
+#: ../src/appicon.c:605 ../src/appicon.c:629 ../src/dock.c:1280
+#: ../src/dock.c:1282 ../src/dock.c:3563 ../src/winmenu.c:88
 msgid "Hide"
 msgstr "Verbergen"
 
-#: ../src/appicon.c:609 ../src/dock.c:1276 ../src/winmenu.c:94
+#: ../src/appicon.c:606 ../src/dock.c:1276 ../src/winmenu.c:94
 msgid "Launch"
 msgstr "Opstarten"
 
-#: ../src/appicon.c:610
+#: ../src/appicon.c:607
 msgid "Set Icon..."
 msgstr "Icoon instellen..."
 
-#: ../src/appicon.c:611 ../src/dock.c:1286 ../src/dock.c:1288
-#: ../src/dock.c:3578 ../src/rootmenu.c:233 ../src/winmenu.c:96
+#: ../src/appicon.c:608 ../src/dock.c:1286 ../src/dock.c:1288
+#: ../src/dock.c:3581 ../src/rootmenu.c:233 ../src/winmenu.c:96
 msgid "Kill"
 msgstr "Doden"
 
-#: ../src/appicon.c:630 ../src/dock.c:3558
+#: ../src/appicon.c:627 ../src/dock.c:3561
 msgid "Unhide"
 msgstr "Terugplaatsen"
 
@@ -114,34 +114,34 @@ msgstr "programmamenu: geheugentekort bij menu aanmaken voor venster %lx"
 msgid "appmenu: unknown version of WMMenu in window %lx: %s"
 msgstr "programmamenu: onbekende WMMenu-versie in venster %lx: %s"
 
-#: ../src/defaults.c:871
+#: ../src/defaults.c:881
 #, c-format
 msgid "Domain %s (%s) of global defaults database is corrupted!"
 msgstr "Domein %s (%s) uit algemene instellingendatabase is beschadigd!"
 
-#: ../src/defaults.c:875
+#: ../src/defaults.c:885
 #, c-format
 msgid "could not load domain %s from global defaults database"
 msgstr "kon domein %s niet laden uit algemene instellingendatabase"
 
-#: ../src/defaults.c:920 ../src/defaults.c:934
+#: ../src/defaults.c:930 ../src/defaults.c:944
 #, c-format
 msgid "invalid global menu file %s"
 msgstr "ongeldig algemeen menubestand %s"
 
-#: ../src/defaults.c:969 ../src/defaults.c:1048 ../src/defaults.c:1087
-#: ../src/defaults.c:1128
+#: ../src/defaults.c:979 ../src/defaults.c:1058 ../src/defaults.c:1097
+#: ../src/defaults.c:1138
 #, c-format
 msgid "Domain %s (%s) of defaults database is corrupted!"
 msgstr "Domein %s (%s) uit instellingendatabase is beschadigd!"
 
-#: ../src/defaults.c:973 ../src/defaults.c:1070 ../src/defaults.c:1114
-#: ../src/defaults.c:1138
+#: ../src/defaults.c:983 ../src/defaults.c:1080 ../src/defaults.c:1124
+#: ../src/defaults.c:1148
 #, c-format
 msgid "could not load domain %s from user defaults database"
 msgstr "kon domein %s niet laden uit gebruikers-instellingendatabase"
 
-#: ../src/defaults.c:1227
+#: ../src/defaults.c:1233
 msgid ""
 "your configuration is using old syntax for Mini-Preview settings; consider "
 "running WPrefs.app to update"
@@ -150,203 +150,203 @@ msgstr ""
 "WPrefs.app uit om bij te werken"
 
 #. --------------------------- Local -----------------------
-#: ../src/defaults.c:1336 ../src/defaults.c:1465 ../src/defaults.c:1560
-#: ../src/defaults.c:1968 ../src/defaults.c:1984 ../src/defaults.c:2029
-#: ../src/defaults.c:2078 ../src/defaults.c:2496 ../src/wdefaults.c:639
+#: ../src/defaults.c:1342 ../src/defaults.c:1471 ../src/defaults.c:1566
+#: ../src/defaults.c:1974 ../src/defaults.c:1990 ../src/defaults.c:2035
+#: ../src/defaults.c:2084 ../src/defaults.c:2502 ../src/wdefaults.c:639
 #: ../src/wdefaults.c:668
 #, c-format
 msgid "Wrong option format for key \"%s\". Should be %s."
 msgstr "Verkeerde optievorm voor 'key' \"%s\". Moet %s zijn."
 
-#: ../src/defaults.c:1338 ../src/defaults.c:1414 ../src/defaults.c:1442
-#: ../src/defaults.c:1469 ../src/defaults.c:1481 ../src/defaults.c:1495
-#: ../src/defaults.c:1509 ../src/defaults.c:1564 ../src/defaults.c:1576
-#: ../src/defaults.c:1972 ../src/defaults.c:1989 ../src/defaults.c:2001
-#: ../src/defaults.c:2034 ../src/defaults.c:2050 ../src/defaults.c:2083
-#: ../src/defaults.c:2166 ../src/defaults.c:2501 ../src/defaults.c:2512
+#: ../src/defaults.c:1344 ../src/defaults.c:1420 ../src/defaults.c:1448
+#: ../src/defaults.c:1475 ../src/defaults.c:1487 ../src/defaults.c:1501
+#: ../src/defaults.c:1515 ../src/defaults.c:1570 ../src/defaults.c:1582
+#: ../src/defaults.c:1978 ../src/defaults.c:1995 ../src/defaults.c:2007
+#: ../src/defaults.c:2040 ../src/defaults.c:2056 ../src/defaults.c:2089
+#: ../src/defaults.c:2172 ../src/defaults.c:2507 ../src/defaults.c:2518
 #, c-format
 msgid "using default \"%s\" instead"
 msgstr "gebruikt standaard \"%s\" in plaats daarvan"
 
-#: ../src/defaults.c:1365
+#: ../src/defaults.c:1371
 #, c-format
 msgid "wrong option value for key \"%s\"; got \"%s\", should be one of %s."
 msgstr ""
 "verkeerde optiewaarde voor 'key' \"%s\"; kreeg \"%s\", moet een van %s zijn."
 
-#: ../src/defaults.c:1410
+#: ../src/defaults.c:1416
 #, c-format
 msgid "can't convert \"%s\" to boolean for key \"%s\""
 msgstr "kan \"%s\" niet omzetten naar 'boolean' voor 'key' \"%s\""
 
-#: ../src/defaults.c:1440
+#: ../src/defaults.c:1446
 #, c-format
 msgid "can't convert \"%s\" to integer for key \"%s\""
 msgstr "kan \"%s\" niet omzetten naar 'integer' voor 'key' \"%s\""
 
-#: ../src/defaults.c:1477
+#: ../src/defaults.c:1483
 #, c-format
 msgid "Incorrect number of elements in array for key \"%s\"."
 msgstr "Onjuist aantal elementen in 'array' voor 'key' \"%s\"."
 
-#: ../src/defaults.c:1491
+#: ../src/defaults.c:1497
 #, c-format
 msgid "Wrong value for key \"%s\". Should be Coordinate."
 msgstr "Verkeerde waarde voor 'key' \"%s\". Moet coördinaat zijn."
 
-#: ../src/defaults.c:1505
+#: ../src/defaults.c:1511
 #, c-format
 msgid "can't convert array to integers for \"%s\"."
 msgstr "kan 'array' niet omzetten naar 'integers' voor \"%s\"."
 
-#: ../src/defaults.c:1682 ../src/defaults.c:1712 ../src/defaults.c:1728
-#: ../src/defaults.c:1757 ../src/defaults.c:1779 ../src/defaults.c:1830
-#: ../src/defaults.c:1869 ../src/defaults.c:1906 ../src/defaults.c:1922
+#: ../src/defaults.c:1688 ../src/defaults.c:1718 ../src/defaults.c:1734
+#: ../src/defaults.c:1763 ../src/defaults.c:1785 ../src/defaults.c:1836
+#: ../src/defaults.c:1875 ../src/defaults.c:1912 ../src/defaults.c:1928
 #, c-format
 msgid "\"%s\" is not a valid color name"
 msgstr "\"%s\" is geen geldige kleurnaam"
 
-#: ../src/defaults.c:1694 ../src/defaults.c:1745
+#: ../src/defaults.c:1700 ../src/defaults.c:1751
 msgid "bad number of arguments in gradient specification"
 msgstr "verkeerd aantal argumenten in kleurverloopopgave"
 
-#: ../src/defaults.c:1803
+#: ../src/defaults.c:1809
 msgid "too few arguments in multicolor gradient specification"
 msgstr "te weinig argumenten in meerkleurenverloopopgave"
 
-#: ../src/defaults.c:1895
+#: ../src/defaults.c:1901
 msgid "bad number of arguments in textured gradient specification"
 msgstr "verkeerd aantal argumenten in opgave getextureerd kleurverloop"
 
-#: ../src/defaults.c:1938
+#: ../src/defaults.c:1944
 #, c-format
 msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]"
 msgstr ""
 "verkeerde doorzichtigheidswaarde getext. kleurverloop \"%s\". Moet [0..255] "
 "zijn"
 
-#: ../src/defaults.c:1955
+#: ../src/defaults.c:1961
 #, c-format
 msgid "invalid texture type %s"
 msgstr "ongeldig textuurtype %s"
 
-#: ../src/defaults.c:1997
+#: ../src/defaults.c:2003
 #, c-format
 msgid "Error in texture specification for key \"%s\""
 msgstr "Fout in textuuropgave voor 'key' \"%s\""
 
-#: ../src/defaults.c:2046
+#: ../src/defaults.c:2052
 msgid "Wrong type for workspace background. Should be a texture type."
 msgstr "Verkeerd type voor werkruimteachtergrond. Moet 'n textuurtype zijn."
 
-#: ../src/defaults.c:2096
+#: ../src/defaults.c:2102
 #, c-format
 msgid "Wrong type for background of workspace %i. Should be a texture."
 msgstr ""
 "Verkeerd type voor achtergrond van werkruimte %i. Moet 'n textuur zijn."
 
-#: ../src/defaults.c:2137
+#: ../src/defaults.c:2143
 msgid "could not load any usable font!!!"
 msgstr "kon geen bruikbaar lettertype laden!!!"
 
-#: ../src/defaults.c:2162
+#: ../src/defaults.c:2168
 #, c-format
 msgid "could not get color for key \"%s\""
 msgstr "kon kleur niet krijgen voor 'key' \"%s\""
 
-#: ../src/defaults.c:2218 ../src/rootmenu.c:470
+#: ../src/defaults.c:2224 ../src/rootmenu.c:470
 #, c-format
 msgid "%s: invalid key modifier \"%s\""
 msgstr "%s: ongeldige toetsmodificator \"%s\""
 
-#: ../src/defaults.c:2230
+#: ../src/defaults.c:2236
 #, c-format
 msgid "%s:invalid kbd shortcut specification \"%s\""
 msgstr "%s:ongeldige sneltoetsopgave \"%s\""
 
-#: ../src/defaults.c:2236
+#: ../src/defaults.c:2242
 #, c-format
 msgid "%s:invalid key in shortcut \"%s\""
 msgstr "%s:ongeldige toets in snelkoppeling \"%s\""
 
-#: ../src/defaults.c:2261
+#: ../src/defaults.c:2267
 #, c-format
 msgid "%s: modifier key %s is not valid"
 msgstr "%s: modificatortoets %s is niet geldig"
 
-#: ../src/defaults.c:2368
+#: ../src/defaults.c:2374
 #, c-format
 msgid "failed to open bitmap file \"%s\""
 msgstr "openen bitmapbestand \"%s\" mislukt"
 
-#: ../src/defaults.c:2371
+#: ../src/defaults.c:2377
 #, c-format
 msgid "\"%s\" is not a valid bitmap file"
 msgstr "\"%s\" is geen geldig bitmapbestand"
 
-#: ../src/defaults.c:2374
+#: ../src/defaults.c:2380
 #, c-format
 msgid "out of memory reading bitmap file \"%s\""
 msgstr "geheugentekort bij inlezen bitmapbestand \"%s\""
 
-#: ../src/defaults.c:2412 ../src/defaults.c:2445
+#: ../src/defaults.c:2418 ../src/defaults.c:2451
 msgid "bad number of arguments in cursor specification"
 msgstr "verkeerd aantal argumenten in cursoropgave"
 
-#: ../src/defaults.c:2428
+#: ../src/defaults.c:2434
 #, c-format
 msgid "unknown builtin cursor name \"%s\""
 msgstr "onbekende ingebouwde cursornaam \"%s\""
 
-#: ../src/defaults.c:2455 ../src/defaults.c:2467
+#: ../src/defaults.c:2461 ../src/defaults.c:2473
 #, c-format
 msgid "could not find cursor bitmap file \"%s\""
 msgstr "kon cursorbitmapbestand \"%s\" niet vinden"
 
-#: ../src/defaults.c:2508
+#: ../src/defaults.c:2514
 #, c-format
 msgid "Error in cursor specification for key \"%s\""
 msgstr "Fout in cursoropgave voor 'key' \"%s\""
 
-#: ../src/defaults.c:2633
+#: ../src/defaults.c:2639
 msgid "could not render texture for icon background"
 msgstr "kon textuur voor icoonachtergrond niet weergeven"
 
-#: ../src/defaults.c:3109
+#: ../src/defaults.c:3115
 #, c-format
 msgid "Invalid arguments for background \"%s\""
 msgstr "Ongeldige argumenten voor achtergrond \"%s\""
 
-#: ../src/defaults.c:3346 ../src/defaults.c:3415
+#: ../src/defaults.c:3352 ../src/defaults.c:3421
 #, c-format
 msgid "Invalid arguments for option \"%s\""
 msgstr "Ongeldige argumenten voor optie \"%s\""
 
-#: ../src/defaults.c:3352 ../src/defaults.c:3421
+#: ../src/defaults.c:3358 ../src/defaults.c:3427
 #, c-format
 msgid "Could not find image \"%s\" for option \"%s\""
 msgstr "Kon afbeelding \"%s\" voor optie \"%s\" niet vinden"
 
-#: ../src/defaults.c:3357 ../src/defaults.c:3429
+#: ../src/defaults.c:3363 ../src/defaults.c:3435
 #, c-format
 msgid "Could not load image \"%s\" for option \"%s\""
 msgstr "Kon afbeelding \"%s\" voor optie \"%s\" niet laden"
 
-#: ../src/defaults.c:3367
+#: ../src/defaults.c:3373
 msgid "Invalid split sizes for switch panel back image."
 msgstr "Ongeldige deelafmetingen voor achterafbeelding schakelpaneel."
 
-#: ../src/defaults.c:3436
+#: ../src/defaults.c:3442
 #, c-format
 msgid "Invalid number of arguments for option \"%s\""
 msgstr "Ongeldig aantal argumenten voor optie \"%s\""
 
-#: ../src/defaults.c:3452
+#: ../src/defaults.c:3458
 #, c-format
 msgid "Value for option \"%s\" must be an array of 7 strings"
 msgstr "Waarde voor optie \"%s\" moet 'n 'array' van 7 'strings' zijn"
 
-#: ../src/defaults.c:3466
+#: ../src/defaults.c:3472
 #, c-format
 msgid "Invalid argument for option \"%s\" item %d"
 msgstr "Ongeldig argument voor optie \"%s\" item %d"
@@ -356,7 +356,7 @@ msgid "Save workspace state"
 msgstr "Werkruimtestaat opslaan"
 
 #: ../src/dialog.c:428 ../src/dialog.c:489 ../src/dialog.c:1001
-#: ../src/dock.c:506 ../src/dock.c:4498 ../src/dockedapp.c:350
+#: ../src/dock.c:506 ../src/dock.c:4501 ../src/dockedapp.c:350
 #: ../src/rootmenu.c:190 ../src/rootmenu.c:233
 msgid "Cancel"
 msgstr "Annuleren"
@@ -539,43 +539,43 @@ msgstr "Window Maker ontving signaal %i."
 #: ../src/dialog.c:1632
 #, c-format
 msgid ""
-" This fatal error occured probably due to a bug. Please fill the included "
+" This fatal error occurred probably due to a bug. Please fill the included "
 "BUGFORM and report it to %s."
 msgstr ""
 " Deze onherstelbare fout trad mogelijk op door 'n bug. Vul a.u.b. bijgaand "
 "BUGFORM in, en rapporteer 't aan %s."
 
-#: ../src/dialog.c:1639
+#: ../src/dialog.c:1641
 msgid "What do you want to do now?"
 msgstr "Wat wilt u nu doen?"
 
-#: ../src/dialog.c:1645
+#: ../src/dialog.c:1647
 msgid "Select action"
 msgstr "Actie selecteren"
 
-#: ../src/dialog.c:1646
+#: ../src/dialog.c:1648
 msgid "Abort and leave a core file"
 msgstr "Afbreken en geheugendump achterlaten"
 
-#: ../src/dialog.c:1647
+#: ../src/dialog.c:1649
 msgid "Restart Window Maker"
 msgstr "Window Maker herstarten"
 
-#: ../src/dialog.c:1648
+#: ../src/dialog.c:1650
 msgid "Start alternate window manager"
 msgstr "Andere vensterbeheerder starten"
 
-#: ../src/dock.c:181 ../src/menu.c:1767
+#: ../src/dock.c:181 ../src/menu.c:1774
 #, c-format
 msgid "Type the name for workspace %i:"
 msgstr "Typ de naam voor werkruimte %i:"
 
-#: ../src/dock.c:182 ../src/dock.c:1242 ../src/dock.c:1244 ../src/dock.c:3460
-#: ../src/menu.c:1771
+#: ../src/dock.c:182 ../src/dock.c:1242 ../src/dock.c:1244 ../src/dock.c:3463
+#: ../src/menu.c:1778
 msgid "Rename Workspace"
 msgstr "Werkruimte hernoemen"
 
-#: ../src/dock.c:447 ../src/dock.c:454 ../src/winspector.c:848
+#: ../src/dock.c:447 ../src/dock.c:454 ../src/winspector.c:821
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -603,7 +603,7 @@ msgstr ""
 msgid "Workspace Clip"
 msgstr "Werkruimteclip"
 
-#: ../src/dock.c:504 ../src/dock.c:4496
+#: ../src/dock.c:504 ../src/dock.c:4499
 msgid "Drawer"
 msgstr "Lade"
 
@@ -612,7 +612,7 @@ msgid "All selected icons will be removed!"
 msgstr "Alle geselecteerde iconen zullen worden verwijderd!"
 
 #. can be: Unselect all icons
-#: ../src/dock.c:547 ../src/dock.c:1256 ../src/dock.c:1258 ../src/dock.c:3498
+#: ../src/dock.c:547 ../src/dock.c:1256 ../src/dock.c:1258 ../src/dock.c:3501
 msgid "Keep Icon"
 msgstr "Icoon behouden"
 
@@ -686,15 +686,15 @@ msgstr "Ladeopties"
 msgid "Selected"
 msgstr "Geselecteerd"
 
-#: ../src/dock.c:1252 ../src/dock.c:1254 ../src/dock.c:3488
+#: ../src/dock.c:1252 ../src/dock.c:1254 ../src/dock.c:3491
 msgid "Select All Icons"
 msgstr "Alle iconen selecteren"
 
-#: ../src/dock.c:1261 ../src/dock.c:1263 ../src/dock.c:3508
+#: ../src/dock.c:1261 ../src/dock.c:1263 ../src/dock.c:3511
 msgid "Move Icon To"
 msgstr "Icoon verplaatsen naar"
 
-#: ../src/dock.c:1269 ../src/dock.c:1271 ../src/dock.c:3522
+#: ../src/dock.c:1269 ../src/dock.c:1271 ../src/dock.c:3525
 msgid "Remove Icon"
 msgstr "Icoon verwijderen"
 
@@ -727,48 +727,48 @@ msgstr "er zijn te veel iconen opgeslagen in Dok. Negeert wat niet past"
 msgid "Dock Icon"
 msgstr "Dokicoon"
 
-#: ../src/dock.c:3365
+#: ../src/dock.c:3368
 #, c-format
 msgid "Could not execute command \"%s\""
 msgstr "Kon commando \"%s\" niet uitvoeren"
 
-#: ../src/dock.c:3466
+#: ../src/dock.c:3469
 msgid "Toggle Omnipresent"
 msgstr "Alomtegenwoordig in-/uitschakelen"
 
-#: ../src/dock.c:3471 ../src/winmenu.c:115 ../src/winspector.c:96
+#: ../src/dock.c:3474 ../src/winmenu.c:115 ../src/winspector.c:96
 msgid "Omnipresent"
 msgstr "Alomtegenwoordig"
 
-#: ../src/dock.c:3486
+#: ../src/dock.c:3489
 msgid "Unselect All Icons"
 msgstr "Alle iconen deselecteren"
 
-#: ../src/dock.c:3496
+#: ../src/dock.c:3499
 msgid "Keep Icons"
 msgstr "Iconen behouden"
 
-#: ../src/dock.c:3506
+#: ../src/dock.c:3509
 msgid "Move Icons To"
 msgstr "Iconen verplaatsen naar"
 
-#: ../src/dock.c:3520
+#: ../src/dock.c:3523
 msgid "Remove Icons"
 msgstr "Iconen verwijderen"
 
-#: ../src/dock.c:3550
+#: ../src/dock.c:3553
 msgid "Bring Here"
 msgstr "Hier brengen"
 
-#: ../src/dock.c:3574
+#: ../src/dock.c:3577
 msgid "Remove drawer"
 msgstr "Lade verwijderen"
 
-#: ../src/dock.c:4497
+#: ../src/dock.c:4500
 msgid "All icons in this drawer will be detached!"
 msgstr "Alle iconen in deze lade zullen worden losgemaakt!"
 
-#: ../src/dock.c:4882
+#: ../src/dock.c:4885
 msgid "there are too many icons stored in drawer. Ignoring what doesn't fit"
 msgstr "er zijn te veel iconen opgeslagen in lade. Negeert wat niet past"
 
@@ -824,7 +824,7 @@ msgstr "XDnD-ondersteuning is niet ingecompileerd"
 msgid "Icon Image"
 msgstr "Icoonafbeelding"
 
-#: ../src/dockedapp.c:334 ../src/winspector.c:1426
+#: ../src/dockedapp.c:334 ../src/winspector.c:1383
 msgid "Browse..."
 msgstr "Bladeren..."
 
@@ -857,7 +857,7 @@ msgstr ""
 msgid "Inotify: Reading config files in defaults database."
 msgstr "Inotify: Inlezen configuratiebestanden uit instellingendatabase."
 
-#. an error has occured
+#. an error has occurred
 #: ../src/event.c:412
 msgid ""
 "select failed. The inotify instance will be closed. Changes to the defaults "
@@ -876,16 +876,16 @@ msgstr "Kreeg commando 'herconfigureren'"
 msgid "Got unknown command %s"
 msgstr "Kreeg onbekend commando %s"
 
-#: ../src/event.c:1807
+#: ../src/event.c:1828
 #, c-format
 msgid "exec %A(Run,Type command to run:)"
 msgstr "exec %A(Uitvoeren,Typ uit te voeren commando:)"
 
-#: ../src/event.c:1985
+#: ../src/event.c:2006
 msgid "another window manager is replacing us!"
 msgstr "'n andere vensterbeheerder vervangt ons!"
 
-#: ../src/framewin.c:660 ../src/framewin.c:750 ../src/menu.c:404
+#: ../src/framewin.c:660 ../src/framewin.c:750 ../src/menu.c:405
 #: ../src/texture.c:454
 #, c-format
 msgid "could not render texture: %s"
@@ -893,7 +893,7 @@ msgstr "kon textuur niet weergeven: %s"
 
 #: ../src/framewin.c:683 ../src/framewin.c:693 ../src/framewin.c:709
 #: ../src/framewin.c:720 ../src/framewin.c:727 ../src/framewin.c:733
-#: ../src/icon.c:311 ../src/menu.c:431
+#: ../src/icon.c:311 ../src/menu.c:432
 #, c-format
 msgid "error rendering image:%s"
 msgstr "fout bij weergeven afbeelding:%s"
@@ -1086,7 +1086,7 @@ msgstr "kan lokalisatiemodificators niet instellen"
 msgid "could not open display \"%s\""
 msgstr "kon scherm \"%s\" niet openen"
 
-#: ../src/menu.c:2350
+#: ../src/menu.c:2366
 #, c-format
 msgid "bad value in menus state info: %s"
 msgstr "verkeerde waarde in staatinfo menu's: %s"
@@ -1409,7 +1409,7 @@ msgstr "kon WINGs-besturingselementen niet initialiseren"
 msgid "could not save session state in %s"
 msgstr "kon sessiestaat niet opslaan in %s"
 
-#: ../src/session.c:147 ../src/wdefaults.c:655 ../src/winspector.c:526
+#: ../src/session.c:147 ../src/wdefaults.c:655 ../src/winspector.c:525
 #, c-format
 msgid "can't convert \"%s\" to boolean"
 msgstr "kan \"%s\" niet omzetten naar 'boolean'"
@@ -1488,7 +1488,7 @@ msgstr "fout bij laden afbeeldingsbestand \"%s\": %s"
 msgid "could not find default icon \"%s\""
 msgstr "kon standaardicoon \"%s\" niet vinden"
 
-#: ../src/window.c:2788 ../src/window.c:2950
+#: ../src/window.c:2786 ../src/window.c:2948
 msgid ""
 "The NumLock, ScrollLock or similar key seems to be turned on. Turn it off or "
 "some mouse actions and keyboard shortcuts will not work."
@@ -1496,7 +1496,7 @@ msgstr ""
 "De NumLock, ScrollLock of dergelijke toets lijkt te zijn ingeschakeld. "
 "Schakel 't uit, of sommige muisacties en sneltoetsen zullen niet werken."
 
-#: ../src/winmenu.c:84 ../src/winmenu.c:660
+#: ../src/winmenu.c:84 ../src/winmenu.c:663
 msgid "Maximize"
 msgstr "Maximaliseren"
 
@@ -1504,11 +1504,11 @@ msgstr "Maximaliseren"
 msgid "Other maximization"
 msgstr "Andere maximalisering"
 
-#: ../src/winmenu.c:86 ../src/winmenu.c:643
+#: ../src/winmenu.c:86 ../src/winmenu.c:646
 msgid "Miniaturize"
 msgstr "Miniaturiseren"
 
-#: ../src/winmenu.c:87 ../src/winmenu.c:679
+#: ../src/winmenu.c:87 ../src/winmenu.c:682
 msgid "Shade"
 msgstr "Oprollen"
 
@@ -1516,7 +1516,7 @@ msgstr "Oprollen"
 msgid "Resize/Move"
 msgstr "Vergroten/verplaatsen"
 
-#: ../src/winmenu.c:90 ../src/winmenu.c:696
+#: ../src/winmenu.c:90 ../src/winmenu.c:699
 msgid "Select"
 msgstr "Selecteren"
 
@@ -1602,23 +1602,23 @@ msgstr ""
 msgid "Set Shortcut"
 msgstr "Ingestelde sneltoets"
 
-#: ../src/winmenu.c:520 ../src/winmenu.c:545 ../src/winmenu.c:570
+#: ../src/winmenu.c:523 ../src/winmenu.c:548 ../src/winmenu.c:573
 msgid "could not create submenu for window menu"
 msgstr "kon submenu niet aanmaken voor venstermenu"
 
-#: ../src/winmenu.c:637
+#: ../src/winmenu.c:640
 msgid "Deminiaturize"
 msgstr "Deminiaturiseren"
 
-#: ../src/winmenu.c:653
+#: ../src/winmenu.c:656
 msgid "Unmaximize"
 msgstr "Demaximaliseren"
 
-#: ../src/winmenu.c:673
+#: ../src/winmenu.c:676
 msgid "Unshade"
 msgstr "Afrollen"
 
-#: ../src/winmenu.c:690
+#: ../src/winmenu.c:693
 msgid "Deselect"
 msgstr "Deselecteren"
 
@@ -1658,7 +1658,7 @@ msgstr "Verwijder de knop 'venster sluiten' van dit venster."
 
 #: ../src/winspector.c:83
 msgid "Disable miniaturize button"
-msgstr "Knop 'miniaturiseren' uitsch."
+msgstr "Knop 'miniaturiseren' uitschakelen"
 
 #: ../src/winspector.c:84
 msgid "Remove the `miniaturize window' button of the window."
@@ -1918,17 +1918,17 @@ msgstr ""
 "Gebruik 'n enkel gedeeld programma-icoon voor\n"
 "alle exemplaren van dit programma.\n"
 
-#: ../src/winspector.c:472
+#: ../src/winspector.c:471
 #, c-format
 msgid "Could not find icon \"%s\" specified for this window"
 msgstr "Kon icoon \"%s\", opgegeven voor dit venster, niet vinden"
 
-#: ../src/winspector.c:487
+#: ../src/winspector.c:486
 #, c-format
 msgid "Could not open specified icon \"%s\":%s"
 msgstr "Kon opgegeven icoon \"%s\" niet openen:%s"
 
-#: ../src/winspector.c:847
+#: ../src/winspector.c:820
 #, c-format
 msgid ""
 "Ignore client supplied icon is set, but icon filename textbox is empty. "
@@ -1937,16 +1937,16 @@ msgstr ""
 "Negeer cliënt geleverd icoon ingesteld, maar Bestandsnaam icoon is leeg. "
 "Gebruikt icoon cliënt"
 
-#: ../src/winspector.c:1034
+#: ../src/winspector.c:1007
 #, c-format
 msgid "Inspecting  %s.%s"
 msgstr "Inspecteer  %s.%s"
 
-#: ../src/winspector.c:1059
+#: ../src/winspector.c:1032
 msgid "Click in the window you wish to inspect."
 msgstr "Klik in 't venster dat u wilt inspecteren."
 
-#: ../src/winspector.c:1083
+#: ../src/winspector.c:1056
 msgid ""
 "The configuration will apply to all\n"
 "windows that have their WM_CLASS\n"
@@ -1958,116 +1958,111 @@ msgstr ""
 "hebben ingesteld op de bovenstaand\n"
 "geselecteerde naam, na opslaan."
 
-#: ../src/winspector.c:1103
+#: ../src/winspector.c:1076
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../src/winspector.c:1111
+#: ../src/winspector.c:1084
 msgid "Apply"
 msgstr "Toepassen"
 
-#: ../src/winspector.c:1117
+#: ../src/winspector.c:1090
 msgid "Reload"
 msgstr "Herladen"
 
-#: ../src/winspector.c:1126 ../src/winspector.c:1136
+#: ../src/winspector.c:1099 ../src/winspector.c:1109
 msgid "Window Specification"
 msgstr "Vensterspecificatie"
 
-#: ../src/winspector.c:1127
+#: ../src/winspector.c:1100
 msgid "Window Attributes"
 msgstr "Venstereigenschappen"
 
-#: ../src/winspector.c:1128
+#: ../src/winspector.c:1101
 msgid "Advanced Options"
 msgstr "Geavanceerde opties"
 
-#: ../src/winspector.c:1129
+#: ../src/winspector.c:1102
 msgid "Icon and Initial Workspace"
 msgstr "Icoon en initiële werkruimte"
 
-#: ../src/winspector.c:1130
+#: ../src/winspector.c:1103
 msgid "Application Specific"
 msgstr "Programmaspecifiek"
 
-#: ../src/winspector.c:1143
+#: ../src/winspector.c:1116
 msgid "Defaults for all windows"
 msgstr "Standaard voor alle vensters"
 
-#: ../src/winspector.c:1194
+#: ../src/winspector.c:1167
 msgid "Select window"
 msgstr "Venster selecteren"
 
-#: ../src/winspector.c:1338
+#: ../src/winspector.c:1311
 msgid "Attributes"
 msgstr "Eigenschappen"
 
-#: ../src/winspector.c:1355
-msgid ""
-"Shows the state that was asked by the application.\n"
-"You can use the checkbox on the right to change this setting;\n"
-"when it is grayed it means to follow application's choice."
-msgstr ""
-"Toont de staat die werd verzocht door 't programma. U kunt 't\n"
-"selectievakje rechts gebruiken, om deze instelling te wijzigen;\n"
-"indien grijs betekent dat: programmavoorkeur volgen."
-
-#: ../src/winspector.c:1382
+#: ../src/winspector.c:1339
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../src/winspector.c:1414
+#: ../src/winspector.c:1371
 msgid "Miniwindow Image"
 msgstr "Afbeelding minivenster"
 
-#: ../src/winspector.c:1431
+#: ../src/winspector.c:1388
 msgid "Icon filename:"
 msgstr "Bestandsnaam icoon:"
 
-#: ../src/winspector.c:1442
+#: ../src/winspector.c:1399
 msgid "Ignore client supplied icon"
 msgstr "Negeer door cliënt geleverd icoon"
 
-#: ../src/winspector.c:1448
+#: ../src/winspector.c:1405
 msgid "Initial Workspace"
 msgstr "Initiële werkruimte"
 
-#: ../src/winspector.c:1450
+#: ../src/winspector.c:1407
 msgid "The workspace to place the window when it's first shown."
 msgstr ""
 "De werkruimte om 't venster in te plaatsen,\n"
 "wanneer 't voor 't eerst wordt getoond."
 
-#: ../src/winspector.c:1456
+#: ../src/winspector.c:1413
 msgid "Nowhere in particular"
 msgstr "Nergens in 't bijzonder"
 
-#: ../src/winspector.c:1477
+#: ../src/winspector.c:1434
 msgid "Application Attributes"
 msgstr "Programma-eigenschappen"
 
-#: ../src/workspace.c:100 ../src/workspace.c:715
+#: ../src/workspace.c:101 ../src/workspace.c:721
 #, c-format
 msgid "Workspace %i"
 msgstr "Werkruimte %i"
 
-#: ../src/workspace.c:761
+#: ../src/workspace.c:148
+#, c-format
+msgid "Workspace \"%s\" in use; cannot delete"
+msgstr "Werkruimte \"%s\" in gebruik; kan niet verwijderen"
+
+#: ../src/workspace.c:767
 msgid "Workspaces"
 msgstr "Werkruimten"
 
-#: ../src/workspace.c:763
+#: ../src/workspace.c:769
 msgid "could not create Workspace menu"
 msgstr "kon werkruimtemenu niet aanmaken"
 
-#: ../src/workspace.c:770
+#: ../src/workspace.c:776
 msgid "New"
 msgstr "Nieuw"
 
-#: ../src/workspace.c:771
+#: ../src/workspace.c:777
 msgid "Destroy Last"
 msgstr "Laatste vernietigen"
 
-#: ../src/workspace.c:773
+#: ../src/workspace.c:779
 msgid "Last Used"
 msgstr "Laatst gebruikt"
 
@@ -2096,51 +2091,10 @@ msgstr "toets %s (0x%x) genereert zowel %s als %s, wat onzinnig is"
 msgid "Can't convert keymask 0x%04X to a shortcut label"
 msgstr "Kan 'keymask' 0x%04X niet omzetten naar sneltoetsbenaming"
 
-# Keep next entries for wmaker-0.95.6
-msgid "invalid menu file, MENU command is missing"
-msgstr "ongeldig menubestand, MENU-commando ontbreekt"
-
-msgid "no title given for the root menu"
-msgstr "geen titel opgegeven voor 't hoofdmenu"
-
-msgid "out of memory during expansion of \"%%w\""
-msgstr "geheugentekort bij uitwerken van \"%%w\""
-
-msgid "out of memory during expansion of \"%%W\""
-msgstr "geheugentekort bij uitwerken van \"%%W\""
-
-msgid "out of memory during expansion of \"%%a\""
-msgstr "geheugentekort bij uitwerken van \"%%a\""
-
-msgid "out of memory during expansion of \"%%d\""
-msgstr "geheugentekort bij uitwerken van \"%%d\""
-
-msgid "out of memory during expansion of \"%%s\""
-msgstr "geheugentekort bij uitwerken van \"%%s\""
-
-msgid "%s:could not open menu file"
-msgstr "%s:kon menubestand niet openen"
-
-msgid "Could not open directory "
-msgstr "Openen mislukt van map "
-
+# Keep next entry for wmaker-0.95.7
 msgid ""
-"could not add an inotify watch on path %s.Changes to the defaults "
-"database will require a restart to take effect."
+" This fatal error occured probably due to a bug. Please fill the included "
+"BUGFORM and report it to %s."
 msgstr ""
-"kon geen 'inotify watch' toevoegen op pad %s. Wijzigingen in de "
-"instellingendatabase zullen 'n herstart vereisen om te werken."
-
-msgid ""
-"Do not bind mouse actions, such as `Alt'+drag\n"
-"in the window (when alt is the modifier you have\n"
-"configured)."
-msgstr ""
-"Verbind muisacties niet, zoals 'Alt'+verslepen\n"
-"in 't venster (als Alt de modificator is die u\n"
-"heeft ingesteld)."
-
-msgid "The workspace to place the window when it'sfirst shown."
-msgstr ""
-"De werkruimte om 't venster in te plaatsen,\n"
-"wanneer 't voor 't eerst wordt getoond."
+" Deze onherstelbare fout trad mogelijk op door 'n bug. Vul a.u.b. "
+"bijgaand BUGFORM in, en rapporteer 't aan %s."