[mate-window-manager] Add latest commits/bugfixes from upstream
Dan Mashal
vicodan at fedoraproject.org
Mon Feb 18 20:10:51 UTC 2013
commit a5778b0c18e725481a606c9e52490c8bfdd50a66
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Mon Feb 18 12:09:17 2013 -0800
Add latest commits/bugfixes from upstream
mate-window-manager.spec | 8 +-
mwm_commits_rollup.patch | 3508 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 3515 insertions(+), 1 deletions(-)
---
diff --git a/mate-window-manager.spec b/mate-window-manager.spec
index 508afc9..c6d65a6 100644
--- a/mate-window-manager.spec
+++ b/mate-window-manager.spec
@@ -1,11 +1,13 @@
Name: mate-window-manager
Version: 1.5.3
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: MATE Desktop window manager
License: LGPLv2+ and GPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+Patch0: mwm_commits_rollup.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gsettings-desktop-schemas-devel
BuildRequires: gtk2-devel
@@ -35,6 +37,7 @@ Development files for mate-window-manager
%prep
%setup -q
+%patch0 -p1
NOCONFIGURE=1 ./autogen.sh
%build
@@ -110,6 +113,9 @@ fi
%changelog
+* Mon Feb 18 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-4
+- Add latest upstream commits
+
* Tue Jan 29 2013 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.3-3
- Add some configure flags
diff --git a/mwm_commits_rollup.patch b/mwm_commits_rollup.patch
new file mode 100644
index 0000000..402d037
--- /dev/null
+++ b/mwm_commits_rollup.patch
@@ -0,0 +1,3508 @@
+diff -uNrp a/autogen.sh b/autogen.sh
+--- a/autogen.sh 2013-01-13 13:28:39.000000000 -0800
++++ b/autogen.sh 2013-02-18 11:14:02.078839584 -0800
+@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
+
+ PKG_NAME="mate-window-manager"
+
+-(test -f $srcdir/configure.in) || {
++(test -f $srcdir/configure.ac) || {
+ echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
+ echo " top-level $PKG_NAME directory"
+ exit 1
+diff -uNrp a/configure.ac b/configure.ac
+--- a/configure.ac 1969-12-31 16:00:00.000000000 -0800
++++ b/configure.ac 2013-02-18 11:14:02.078839584 -0800
+@@ -0,0 +1,555 @@
++AC_PREREQ(2.50)
++
++m4_define([marco_major_version], [1])
++m4_define([marco_minor_version], [5])
++# Fibonacci sequence for micro version numbering:
++# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
++m4_define([marco_micro_version], [3])
++
++m4_define([marco_version],
++ [marco_major_version.marco_minor_version.marco_micro_version])
++AC_INIT([marco], [marco_version], [https://github.com/mate-desktop/mate-desktop-environment])
++
++AC_CONFIG_SRCDIR(src/core/display.c)
++AC_CONFIG_HEADERS(config.h)
++
++AM_INIT_AUTOMAKE
++AM_MAINTAINER_MODE
++
++# Honor aclocal flags
++AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
++
++GETTEXT_PACKAGE=marco
++AC_SUBST(GETTEXT_PACKAGE)
++AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
++
++IT_PROG_INTLTOOL([0.34.90])
++AC_PROG_CC
++AC_ISC_POSIX
++AC_HEADER_STDC
++AC_LIBTOOL_WIN32_DLL
++AM_PROG_LIBTOOL
++
++#### Integer sizes
++
++AC_CHECK_SIZEOF(char)
++AC_CHECK_SIZEOF(short)
++AC_CHECK_SIZEOF(long)
++AC_CHECK_SIZEOF(int)
++AC_CHECK_SIZEOF(void *)
++AC_CHECK_SIZEOF(long long)
++AC_CHECK_SIZEOF(__int64)
++
++## byte order
++AC_C_BIGENDIAN
++
++#### Warnings
++
++changequote(,)dnl
++if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wall" ;;
++ esac
++
++# case " $CFLAGS " in
++# *[\ \ ]-Wshadow[\ \ ]*) ;;
++# *) CFLAGS="$CFLAGS -Wshadow" ;;
++# esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wchar-subscripts[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wmissing-prototypes[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wnested-externs[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wnested-externs" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wpointer-arith[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wcast-align[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wcast-align" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-Wsign-compare[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -Wsign-compare" ;;
++ esac
++
++ if test "x$enable_ansi" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -ansi" ;;
++ esac
++
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) CFLAGS="$CFLAGS -pedantic" ;;
++ esac
++ fi
++fi
++changequote([,])dnl
++
++AC_MSG_CHECKING([which gtk+ version to compile against])
++AC_ARG_WITH([gtk],
++ AC_HELP_STRING([--with-gtk=2.0|3.0],
++ [which gtk+ version to compile against (default: 2.0)]),
++ [case "$with_gtk" in
++ 2.0|3.0) ;;
++ *) AC_MSG_ERROR([invalid gtk+ version specified]);;
++ esac],
++ [with_gtk=2.0])
++AC_MSG_RESULT([$with_gtk])
++
++case "$with_gtk" in
++ 2.0) GTK_API_VERSION=2.0
++ GTK_MIN_VERSION=2.20.0
++ CANBERRA_GTK=libcanberra-gtk
++ ;;
++ 3.0) GTK_API_VERSION=3.0
++ GTK_MIN_VERSION=2.90.0
++ CANBERRA_GTK=libcanberra-gtk3
++ ;;
++esac
++GIO_MIN_VERSION=2.25.10
++
++MARCO_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 $CANBERRA_GTK"
++AC_SUBST(GTK_API_VERSION)
++
++GLIB_GSETTINGS
++
++AC_ARG_ENABLE(verbose-mode,
++ AC_HELP_STRING([--disable-verbose-mode],
++ [disable marco's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
++ enable_verbose_mode=yes)
++
++if test x$enable_verbose_mode = xyes; then
++ AC_DEFINE(WITH_VERBOSE_MODE,1,[Build with verbose mode support])
++fi
++
++AC_ARG_ENABLE(sm,
++ AC_HELP_STRING([--disable-sm],
++ [disable marco's session management support, for embedded/size-sensitive custom non-MATE builds]),,
++ enable_sm=auto)
++
++AC_ARG_ENABLE(startup-notification,
++ AC_HELP_STRING([--disable-startup-notification],
++ [disable marco's startup notification support, for embedded/size-sensitive custom non-MATE builds]),,
++ enable_startup_notification=auto)
++
++AC_ARG_ENABLE(compositor,
++ AC_HELP_STRING([--disable-compositor],
++ [disable marco's compositing manager]),,
++ enable_compositor=auto)
++
++AC_ARG_ENABLE(xsync,
++ AC_HELP_STRING([--disable-xsync],
++ [disable marco's use of the XSync extension]),,
++ enable_xsync=auto)
++
++AC_ARG_ENABLE(render,
++ AC_HELP_STRING([--disable-render],
++ [disable marco's use of the RENDER extension]),,
++ enable_render=auto)
++
++AC_ARG_ENABLE(shape,
++ AC_HELP_STRING([--disable-shape],
++ [disable marco's use of the shaped window extension]),,
++ enable_shape=auto)
++
++## try definining HAVE_BACKTRACE
++AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
++
++AM_GLIB_GNU_GETTEXT
++
++## here we get the flags we'll actually use
++# GOptionEntry requires glib-2.6.0
++PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
++# gtk_window_set_icon_name requires gtk2+-2.60
++PKG_CHECK_MODULES(MARCO_MESSAGE, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
++PKG_CHECK_MODULES(MARCO_WINDOW_DEMO, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
++
++if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
++ echo "pangoxft found"
++else
++ AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
++fi
++
++# Unconditionally use this dir to avoid a circular dep with matecc
++MATE_KEYBINDINGS_KEYSDIR="${datadir}/mate-control-center/keybindings"
++AC_SUBST(MATE_KEYBINDINGS_KEYSDIR)
++
++STARTUP_NOTIFICATION_VERSION=0.7
++AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
++if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
++ have_startup_notification=yes
++else
++ have_startup_notification=no
++fi
++AC_MSG_RESULT($have_startup_notification)
++
++if test x$enable_startup_notification = xyes; then
++ have_startup_notification=yes
++ echo "startup-notification support forced on"
++elif test x$enable_startup_notification = xauto; then
++ true
++else
++ have_startup_notification=no
++fi
++
++if test x$have_startup_notification = xyes; then
++ echo "Building with libstartup-notification"
++ MARCO_PC_MODULES="$MARCO_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
++ AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
++else
++ echo "Building without libstartup-notification"
++fi
++
++## init this, it gets set either in the compositor check below
++## or the render-specific check later
++have_xrender=no
++
++XCOMPOSITE_VERSION=0.2
++if test x$enable_compositor = xyes; then
++ have_xcomposite=yes
++elif test x$enable_compositor = xauto; then
++ echo "Building compositing manager by default now."
++ have_xcomposite=yes
++else
++ have_xcomposite=no
++fi
++
++if test x$have_xcomposite = xyes; then
++ AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
++ if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_ERROR([no. Use --disable-compositor to disable.])
++ fi
++fi
++
++if test x$have_xcomposite = xyes; then
++ MARCO_PC_MODULES="$MARCO_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
++ AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
++ echo "Building with compositing manager"
++
++ ## force on render also
++ have_xrender=yes
++else
++ echo "Building without compositing manager"
++fi
++
++## if no compositor, still possibly enable render
++if test x$have_xcomposite = xno; then
++ XRENDER_VERSION=0.0
++ AC_MSG_CHECKING([xrender >= $XRENDER_VERSION])
++ if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then
++ have_xrender=yes
++ else
++ have_xrender=no
++ fi
++ AC_MSG_RESULT($have_xrender)
++
++ if test x$enable_render = xyes; then
++ have_xrender=yes
++ echo "Render support forced on"
++ elif test x$enable_render = xauto; then
++ true
++ else
++ have_xrender=no
++ fi
++
++ if test x$have_xrender = xyes; then
++ echo "Building with Render"
++ MARCO_PC_MODULES="$MARCO_PC_MODULES xrender >= $XRENDER_VERSION"
++ fi
++fi ## have_composite
++
++if test x$have_xrender = xyes; then
++ AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
++fi
++
++AC_MSG_CHECKING([Xcursor])
++if $PKG_CONFIG xcursor; then
++ have_xcursor=yes
++ else
++ have_xcursor=no
++ fi
++ AC_MSG_RESULT($have_xcursor)
++
++if test x$have_xcursor = xyes; then
++ echo "Building with Xcursor"
++ MARCO_PC_MODULES="$MARCO_PC_MODULES xcursor"
++ AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
++fi
++
++AC_MSG_CHECKING([libgtop])
++if $PKG_CONFIG libgtop-2.0; then
++ have_gtop=yes
++ else
++ have_gtop=no
++ fi
++ AC_MSG_RESULT($have_gtop)
++
++if test x$have_gtop = xyes; then
++ echo "Building with libgtop"
++ MARCO_PC_MODULES="$MARCO_PC_MODULES libgtop-2.0"
++ AC_DEFINE(HAVE_GTOP, , [Building with libgtop])
++fi
++
++PKG_CHECK_MODULES(MARCO, $MARCO_PC_MODULES)
++
++AC_PATH_XTRA
++
++ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++
++# Check for Xinerama extension (Solaris impl or Xfree impl)
++marco_save_cppflags="$CPPFLAGS"
++CPPFLAGS="$CPPFLAGS $X_CFLAGS"
++
++AC_ARG_ENABLE(xinerama,
++ AC_HELP_STRING([--disable-xinerama],
++ [disable marco's use of the Xinerama extension]),
++ try_xinerama=$enable_xinerama,try_xinerama=yes)
++
++use_solaris_xinerama=no
++use_xfree_xinerama=no
++if test "${try_xinerama}" != no; then
++ case "$host" in
++ *-*-solaris*)
++ # Check for solaris
++ use_solaris_xinerama=yes
++ AC_CHECK_LIB(Xext, XineramaGetInfo,
++ use_solaris_xinerama=yes, use_solaris_xinerama=no,
++ $ALL_X_LIBS)
++ if test "x$use_solaris_xinerama" = "xyes"; then
++ AC_CHECK_HEADER(X11/extensions/xinerama.h,
++ if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
++ X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
++ fi
++ AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
++ AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
++ use_solaris_xinerama=no,
++ [#include <X11/Xlib.h>])
++ fi
++ AC_MSG_CHECKING(for Xinerama support on Solaris)
++ AC_MSG_RESULT($use_solaris_xinerama);
++ ;;
++ *)
++ # Check for XFree
++ use_xfree_xinerama=yes
++ AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
++ [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
++ X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
++ if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
++ X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
++ fi
++ AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
++ AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
++ use_xfree_xinerama=no,
++ [#include <X11/Xlib.h>])],
++ use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
++ AC_MSG_CHECKING(for Xinerama support on XFree86)
++ AC_MSG_RESULT($use_xfree_xinerama);
++ ;;
++ esac
++fi
++
++CPPFLAGS="$marco_save_cppflags"
++
++SHAPE_LIBS=
++found_shape=no
++AC_CHECK_LIB(Xext, XShapeQueryExtension,
++ [AC_CHECK_HEADER(X11/extensions/shape.h,
++ SHAPE_LIBS=-lXext found_shape=yes)],
++ , $ALL_X_LIBS)
++
++if test x$enable_shape = xno; then
++ found_shape=no
++fi
++
++if test x$enable_shape = xyes; then
++ if test "$found_shape" = "no"; then
++ AC_MSG_ERROR([--enable-shape forced and Shape not found])
++ exit 1
++ fi
++fi
++
++if test "x$found_shape" = "xyes"; then
++ AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
++fi
++
++found_xkb=no
++AC_CHECK_LIB(X11, XkbQueryExtension,
++ [AC_CHECK_HEADER(X11/XKBlib.h,
++ found_xkb=yes)],
++ , $ALL_X_LIBS)
++
++if test "x$found_xkb" = "xyes"; then
++ AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
++fi
++
++
++RANDR_LIBS=
++found_randr=no
++AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
++ [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
++ RANDR_LIBS=-lXrandr found_randr=yes,,
++ [#include <X11/Xlib.h>])],
++ , -lXrender -lXext $ALL_X_LIBS)
++
++if test "x$found_randr" = "xyes"; then
++ AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
++fi
++
++XSYNC_LIBS=
++found_xsync=no
++AC_CHECK_LIB(Xext, XSyncQueryExtension,
++ [AC_CHECK_HEADER(X11/extensions/sync.h,
++ found_xsync=yes,,
++ [#include <X11/Xlib.h>])],
++ , $ALL_X_LIBS)
++
++if test x$enable_xsync = xno; then
++ found_xsync=no
++fi
++
++if test x$enable_xsync = xyes; then
++ if test "$found_xsync" = "no"; then
++ AC_MSG_ERROR([--enable-xsync forced and XSync not found])
++ exit 1
++ fi
++fi
++
++if test "x$found_xsync" = "xyes"; then
++ XSYNC_LIBS=-lXext
++ AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
++fi
++
++MARCO_LIBS="$MARCO_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
++MARCO_MESSAGE_LIBS="$MARCO_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++MARCO_WINDOW_DEMO_LIBS="$MARCO_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++MARCO_PROPS_LIBS="$MARCO_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
++
++found_sm=no
++case "$MARCO_LIBS" in
++ *-lSM*)
++ found_sm=yes
++ ;;
++ *)
++ AC_CHECK_LIB(SM, SmcSaveYourselfDone,
++ [AC_CHECK_HEADERS(X11/SM/SMlib.h,
++ MARCO_LIBS="-lSM -lICE $MARCO_LIBS" found_sm=yes)],
++ , $MARCO_LIBS)
++ ;;
++esac
++
++if test x$enable_sm = xno; then
++ found_sm=no
++fi
++
++if test x$enable_sm = xyes; then
++ if test "$found_sm" = "no"; then
++ AC_MSG_ERROR([--enable-sm forced and -lSM not found])
++ exit 1
++ fi
++fi
++
++if test "$found_sm" = "yes"; then
++ AC_DEFINE(HAVE_SM, , [Building with SM support])
++fi
++
++AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
++
++HOST_ALIAS=$host_alias
++AC_SUBST(HOST_ALIAS)
++
++AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
++
++if test x"$GDK_PIXBUF_CSOURCE" = xno; then
++ AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
++fi
++
++AC_SUBST(GDK_PIXBUF_CSOURCE)
++
++AC_PATH_PROG(MATEDIALOG, matedialog, no)
++if test x"$MATEDIALOG" = xno; then
++ AC_MSG_ERROR([matedialog not found in your path - needed for dialogs])
++fi
++
++AC_ARG_ENABLE(debug,
++ [ --enable-debug enable debugging],,
++ enable_debug=no)
++if test "x$enable_debug" = "xyes"; then
++ CFLAGS="$CFLAGS -g -O"
++fi
++
++# Warnings are there for a reason
++if test "x$GCC" = "xyes"; then
++ CFLAGS="$CFLAGS -Wall -ansi"
++ if test "x$enable_maintainer_mode" = "xyes"; then
++ CFLAGS="$CFLAGS"
++ fi
++fi
++
++# Use mate-doc-utils:
++MATE_DOC_INIT([0.8.0])
++
++AC_CONFIG_FILES([
++Makefile
++doc/Makefile
++doc/creating_themes/Makefile
++doc/man/Makefile
++src/Makefile
++src/wm-tester/Makefile
++src/libmarco-private.pc
++src/tools/Makefile
++src/themes/Makefile
++po/Makefile.in
++])
++
++AC_OUTPUT
++
++if test x$enable_verbose_mode = xno; then
++ echo "*** WARNING WARNING WARNING WARNING WARNING"
++ echo "*** Building without verbose mode"
++ echo "*** This means there's no way to debug marco problems."
++ echo "*** Please build normal desktop versions of marco"
++ echo "*** with verbose mode enabled so users can use it when they report bugs."
++fi
++
++dnl ==========================================================================
++echo "
++marco-$VERSION (using gtk+-${GTK_API_VERSION}):
++
++ prefix: ${prefix}
++ source code location: ${srcdir}
++ compiler: ${CC}
++
++ XFree86 Xinerama: ${use_xfree_xinerama}
++ Solaris Xinerama: ${use_solaris_xinerama}
++ Startup notification: ${have_startup_notification}
++ Compositing manager: ${have_xcomposite}
++ Session management: ${found_sm}
++ Shape extension: ${found_shape}
++ Resize-and-rotate: ${found_randr}
++ Xsync: ${found_xsync}
++ Render: ${have_xrender}
++ Xcursor: ${have_xcursor}
++"
+diff -uNrp a/configure.in b/configure.in
+--- a/configure.in 2013-01-13 13:28:38.000000000 -0800
++++ b/configure.in 1969-12-31 16:00:00.000000000 -0800
+@@ -1,555 +0,0 @@
+-AC_PREREQ(2.50)
+-
+-m4_define([marco_major_version], [1])
+-m4_define([marco_minor_version], [5])
+-# Fibonacci sequence for micro version numbering:
+-# 0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610, 987
+-m4_define([marco_micro_version], [3])
+-
+-m4_define([marco_version],
+- [marco_major_version.marco_minor_version.marco_micro_version])
+-AC_INIT([marco], [marco_version], [https://github.com/mate-desktop/mate-desktop-environment])
+-
+-AC_CONFIG_SRCDIR(src/core/display.c)
+-AC_CONFIG_HEADERS(config.h)
+-
+-AM_INIT_AUTOMAKE
+-AM_MAINTAINER_MODE
+-
+-# Honor aclocal flags
+-AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+-
+-GETTEXT_PACKAGE=marco
+-AC_SUBST(GETTEXT_PACKAGE)
+-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Name of default gettext domain])
+-
+-IT_PROG_INTLTOOL([0.34.90])
+-AC_PROG_CC
+-AC_ISC_POSIX
+-AC_HEADER_STDC
+-AC_LIBTOOL_WIN32_DLL
+-AM_PROG_LIBTOOL
+-
+-#### Integer sizes
+-
+-AC_CHECK_SIZEOF(char)
+-AC_CHECK_SIZEOF(short)
+-AC_CHECK_SIZEOF(long)
+-AC_CHECK_SIZEOF(int)
+-AC_CHECK_SIZEOF(void *)
+-AC_CHECK_SIZEOF(long long)
+-AC_CHECK_SIZEOF(__int64)
+-
+-## byte order
+-AC_C_BIGENDIAN
+-
+-#### Warnings
+-
+-changequote(,)dnl
+-if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wall" ;;
+- esac
+-
+-# case " $CFLAGS " in
+-# *[\ \ ]-Wshadow[\ \ ]*) ;;
+-# *) CFLAGS="$CFLAGS -Wshadow" ;;
+-# esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wchar-subscripts[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wmissing-declarations[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wmissing-prototypes[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wnested-externs[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wnested-externs" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wpointer-arith[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wcast-align[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wcast-align" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-Wsign-compare[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -Wsign-compare" ;;
+- esac
+-
+- if test "x$enable_ansi" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -ansi" ;;
+- esac
+-
+- case " $CFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) CFLAGS="$CFLAGS -pedantic" ;;
+- esac
+- fi
+-fi
+-changequote([,])dnl
+-
+-AC_MSG_CHECKING([which gtk+ version to compile against])
+-AC_ARG_WITH([gtk],
+- AC_HELP_STRING([--with-gtk=2.0|3.0],
+- [which gtk+ version to compile against (default: 2.0)]),
+- [case "$with_gtk" in
+- 2.0|3.0) ;;
+- *) AC_MSG_ERROR([invalid gtk+ version specified]);;
+- esac],
+- [with_gtk=2.0])
+-AC_MSG_RESULT([$with_gtk])
+-
+-case "$with_gtk" in
+- 2.0) GTK_API_VERSION=2.0
+- GTK_MIN_VERSION=2.20.0
+- CANBERRA_GTK=libcanberra-gtk
+- ;;
+- 3.0) GTK_API_VERSION=3.0
+- GTK_MIN_VERSION=2.90.0
+- CANBERRA_GTK=libcanberra-gtk3
+- ;;
+-esac
+-GIO_MIN_VERSION=2.25.10
+-
+-MARCO_PC_MODULES="gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 $CANBERRA_GTK"
+-AC_SUBST(GTK_API_VERSION)
+-
+-GLIB_GSETTINGS
+-
+-AC_ARG_ENABLE(verbose-mode,
+- AC_HELP_STRING([--disable-verbose-mode],
+- [disable marco's ability to do verbose logging, for embedded/size-sensitive custom builds]),,
+- enable_verbose_mode=yes)
+-
+-if test x$enable_verbose_mode = xyes; then
+- AC_DEFINE(WITH_VERBOSE_MODE,1,[Build with verbose mode support])
+-fi
+-
+-AC_ARG_ENABLE(sm,
+- AC_HELP_STRING([--disable-sm],
+- [disable marco's session management support, for embedded/size-sensitive custom non-MATE builds]),,
+- enable_sm=auto)
+-
+-AC_ARG_ENABLE(startup-notification,
+- AC_HELP_STRING([--disable-startup-notification],
+- [disable marco's startup notification support, for embedded/size-sensitive custom non-MATE builds]),,
+- enable_startup_notification=auto)
+-
+-AC_ARG_ENABLE(compositor,
+- AC_HELP_STRING([--disable-compositor],
+- [disable marco's compositing manager]),,
+- enable_compositor=auto)
+-
+-AC_ARG_ENABLE(xsync,
+- AC_HELP_STRING([--disable-xsync],
+- [disable marco's use of the XSync extension]),,
+- enable_xsync=auto)
+-
+-AC_ARG_ENABLE(render,
+- AC_HELP_STRING([--disable-render],
+- [disable marco's use of the RENDER extension]),,
+- enable_render=auto)
+-
+-AC_ARG_ENABLE(shape,
+- AC_HELP_STRING([--disable-shape],
+- [disable marco's use of the shaped window extension]),,
+- enable_shape=auto)
+-
+-## try definining HAVE_BACKTRACE
+-AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
+-
+-AM_GLIB_GNU_GETTEXT
+-
+-## here we get the flags we'll actually use
+-# GOptionEntry requires glib-2.6.0
+-PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.6.0)
+-# gtk_window_set_icon_name requires gtk2+-2.60
+-PKG_CHECK_MODULES(MARCO_MESSAGE, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
+-PKG_CHECK_MODULES(MARCO_WINDOW_DEMO, gtk+-$GTK_API_VERSION >= $GTK_MIN_VERSION)
+-
+-if $PKG_CONFIG --atleast-version 1.2.0 pangoxft; then
+- echo "pangoxft found"
+-else
+- AC_MSG_ERROR("Pango 1.2.0 or greater based on Xft2 is required")
+-fi
+-
+-# Unconditionally use this dir to avoid a circular dep with matecc
+-MATE_KEYBINDINGS_KEYSDIR="${datadir}/mate-control-center/keybindings"
+-AC_SUBST(MATE_KEYBINDINGS_KEYSDIR)
+-
+-STARTUP_NOTIFICATION_VERSION=0.7
+-AC_MSG_CHECKING([Startup notification library >= $STARTUP_NOTIFICATION_VERSION])
+-if $PKG_CONFIG --atleast-version $STARTUP_NOTIFICATION_VERSION libstartup-notification-1.0; then
+- have_startup_notification=yes
+-else
+- have_startup_notification=no
+-fi
+-AC_MSG_RESULT($have_startup_notification)
+-
+-if test x$enable_startup_notification = xyes; then
+- have_startup_notification=yes
+- echo "startup-notification support forced on"
+-elif test x$enable_startup_notification = xauto; then
+- true
+-else
+- have_startup_notification=no
+-fi
+-
+-if test x$have_startup_notification = xyes; then
+- echo "Building with libstartup-notification"
+- MARCO_PC_MODULES="$MARCO_PC_MODULES libstartup-notification-1.0 >= $STARTUP_NOTIFICATION_VERSION"
+- AC_DEFINE(HAVE_STARTUP_NOTIFICATION, , [Building with startup notification support])
+-else
+- echo "Building without libstartup-notification"
+-fi
+-
+-## init this, it gets set either in the compositor check below
+-## or the render-specific check later
+-have_xrender=no
+-
+-XCOMPOSITE_VERSION=0.2
+-if test x$enable_compositor = xyes; then
+- have_xcomposite=yes
+-elif test x$enable_compositor = xauto; then
+- echo "Building compositing manager by default now."
+- have_xcomposite=yes
+-else
+- have_xcomposite=no
+-fi
+-
+-if test x$have_xcomposite = xyes; then
+- AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
+- if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_ERROR([no. Use --disable-compositor to disable.])
+- fi
+-fi
+-
+-if test x$have_xcomposite = xyes; then
+- MARCO_PC_MODULES="$MARCO_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
+- AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
+- echo "Building with compositing manager"
+-
+- ## force on render also
+- have_xrender=yes
+-else
+- echo "Building without compositing manager"
+-fi
+-
+-## if no compositor, still possibly enable render
+-if test x$have_xcomposite = xno; then
+- XRENDER_VERSION=0.0
+- AC_MSG_CHECKING([xrender >= $XRENDER_VERSION])
+- if $PKG_CONFIG --atleast-version $XRENDER_VERSION xrender; then
+- have_xrender=yes
+- else
+- have_xrender=no
+- fi
+- AC_MSG_RESULT($have_xrender)
+-
+- if test x$enable_render = xyes; then
+- have_xrender=yes
+- echo "Render support forced on"
+- elif test x$enable_render = xauto; then
+- true
+- else
+- have_xrender=no
+- fi
+-
+- if test x$have_xrender = xyes; then
+- echo "Building with Render"
+- MARCO_PC_MODULES="$MARCO_PC_MODULES xrender >= $XRENDER_VERSION"
+- fi
+-fi ## have_composite
+-
+-if test x$have_xrender = xyes; then
+- AC_DEFINE(HAVE_RENDER, , [Building with Render extension support])
+-fi
+-
+-AC_MSG_CHECKING([Xcursor])
+-if $PKG_CONFIG xcursor; then
+- have_xcursor=yes
+- else
+- have_xcursor=no
+- fi
+- AC_MSG_RESULT($have_xcursor)
+-
+-if test x$have_xcursor = xyes; then
+- echo "Building with Xcursor"
+- MARCO_PC_MODULES="$MARCO_PC_MODULES xcursor"
+- AC_DEFINE(HAVE_XCURSOR, , [Building with Xcursor support])
+-fi
+-
+-AC_MSG_CHECKING([libgtop])
+-if $PKG_CONFIG libgtop-2.0; then
+- have_gtop=yes
+- else
+- have_gtop=no
+- fi
+- AC_MSG_RESULT($have_gtop)
+-
+-if test x$have_gtop = xyes; then
+- echo "Building with libgtop"
+- MARCO_PC_MODULES="$MARCO_PC_MODULES libgtop-2.0"
+- AC_DEFINE(HAVE_GTOP, , [Building with libgtop])
+-fi
+-
+-PKG_CHECK_MODULES(MARCO, $MARCO_PC_MODULES)
+-
+-AC_PATH_XTRA
+-
+-ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-
+-# Check for Xinerama extension (Solaris impl or Xfree impl)
+-marco_save_cppflags="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+-
+-AC_ARG_ENABLE(xinerama,
+- AC_HELP_STRING([--disable-xinerama],
+- [disable marco's use of the Xinerama extension]),
+- try_xinerama=$enable_xinerama,try_xinerama=yes)
+-
+-use_solaris_xinerama=no
+-use_xfree_xinerama=no
+-if test "${try_xinerama}" != no; then
+- case "$host" in
+- *-*-solaris*)
+- # Check for solaris
+- use_solaris_xinerama=yes
+- AC_CHECK_LIB(Xext, XineramaGetInfo,
+- use_solaris_xinerama=yes, use_solaris_xinerama=no,
+- $ALL_X_LIBS)
+- if test "x$use_solaris_xinerama" = "xyes"; then
+- AC_CHECK_HEADER(X11/extensions/xinerama.h,
+- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+- fi
+- AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
+- AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
+- use_solaris_xinerama=no,
+- [#include <X11/Xlib.h>])
+- fi
+- AC_MSG_CHECKING(for Xinerama support on Solaris)
+- AC_MSG_RESULT($use_solaris_xinerama);
+- ;;
+- *)
+- # Check for XFree
+- use_xfree_xinerama=yes
+- AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+- [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+- X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
+- if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+- X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+- fi
+- AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
+- AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
+- use_xfree_xinerama=no,
+- [#include <X11/Xlib.h>])],
+- use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
+- AC_MSG_CHECKING(for Xinerama support on XFree86)
+- AC_MSG_RESULT($use_xfree_xinerama);
+- ;;
+- esac
+-fi
+-
+-CPPFLAGS="$marco_save_cppflags"
+-
+-SHAPE_LIBS=
+-found_shape=no
+-AC_CHECK_LIB(Xext, XShapeQueryExtension,
+- [AC_CHECK_HEADER(X11/extensions/shape.h,
+- SHAPE_LIBS=-lXext found_shape=yes)],
+- , $ALL_X_LIBS)
+-
+-if test x$enable_shape = xno; then
+- found_shape=no
+-fi
+-
+-if test x$enable_shape = xyes; then
+- if test "$found_shape" = "no"; then
+- AC_MSG_ERROR([--enable-shape forced and Shape not found])
+- exit 1
+- fi
+-fi
+-
+-if test "x$found_shape" = "xyes"; then
+- AC_DEFINE(HAVE_SHAPE, , [Have the shape extension library])
+-fi
+-
+-found_xkb=no
+-AC_CHECK_LIB(X11, XkbQueryExtension,
+- [AC_CHECK_HEADER(X11/XKBlib.h,
+- found_xkb=yes)],
+- , $ALL_X_LIBS)
+-
+-if test "x$found_xkb" = "xyes"; then
+- AC_DEFINE(HAVE_XKB, , [Have keyboard extension library])
+-fi
+-
+-
+-RANDR_LIBS=
+-found_randr=no
+-AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+- [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+- RANDR_LIBS=-lXrandr found_randr=yes,,
+- [#include <X11/Xlib.h>])],
+- , -lXrender -lXext $ALL_X_LIBS)
+-
+-if test "x$found_randr" = "xyes"; then
+- AC_DEFINE(HAVE_RANDR, , [Have the Xrandr extension library])
+-fi
+-
+-XSYNC_LIBS=
+-found_xsync=no
+-AC_CHECK_LIB(Xext, XSyncQueryExtension,
+- [AC_CHECK_HEADER(X11/extensions/sync.h,
+- found_xsync=yes,,
+- [#include <X11/Xlib.h>])],
+- , $ALL_X_LIBS)
+-
+-if test x$enable_xsync = xno; then
+- found_xsync=no
+-fi
+-
+-if test x$enable_xsync = xyes; then
+- if test "$found_xsync" = "no"; then
+- AC_MSG_ERROR([--enable-xsync forced and XSync not found])
+- exit 1
+- fi
+-fi
+-
+-if test "x$found_xsync" = "xyes"; then
+- XSYNC_LIBS=-lXext
+- AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library])
+-fi
+-
+-MARCO_LIBS="$MARCO_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
+-MARCO_MESSAGE_LIBS="$MARCO_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-MARCO_WINDOW_DEMO_LIBS="$MARCO_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-MARCO_PROPS_LIBS="$MARCO_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-
+-found_sm=no
+-case "$MARCO_LIBS" in
+- *-lSM*)
+- found_sm=yes
+- ;;
+- *)
+- AC_CHECK_LIB(SM, SmcSaveYourselfDone,
+- [AC_CHECK_HEADERS(X11/SM/SMlib.h,
+- MARCO_LIBS="-lSM -lICE $MARCO_LIBS" found_sm=yes)],
+- , $MARCO_LIBS)
+- ;;
+-esac
+-
+-if test x$enable_sm = xno; then
+- found_sm=no
+-fi
+-
+-if test x$enable_sm = xyes; then
+- if test "$found_sm" = "no"; then
+- AC_MSG_ERROR([--enable-sm forced and -lSM not found])
+- exit 1
+- fi
+-fi
+-
+-if test "$found_sm" = "yes"; then
+- AC_DEFINE(HAVE_SM, , [Building with SM support])
+-fi
+-
+-AM_CONDITIONAL(HAVE_SM, test "$found_sm" = "yes")
+-
+-HOST_ALIAS=$host_alias
+-AC_SUBST(HOST_ALIAS)
+-
+-AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+-
+-if test x"$GDK_PIXBUF_CSOURCE" = xno; then
+- AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK])
+-fi
+-
+-AC_SUBST(GDK_PIXBUF_CSOURCE)
+-
+-AC_PATH_PROG(MATEDIALOG, matedialog, no)
+-if test x"$MATEDIALOG" = xno; then
+- AC_MSG_ERROR([matedialog not found in your path - needed for dialogs])
+-fi
+-
+-AC_ARG_ENABLE(debug,
+- [ --enable-debug enable debugging],,
+- enable_debug=no)
+-if test "x$enable_debug" = "xyes"; then
+- CFLAGS="$CFLAGS -g -O"
+-fi
+-
+-# Warnings are there for a reason
+-if test "x$GCC" = "xyes"; then
+- CFLAGS="$CFLAGS -Wall -ansi"
+- if test "x$enable_maintainer_mode" = "xyes"; then
+- CFLAGS="$CFLAGS"
+- fi
+-fi
+-
+-# Use mate-doc-utils:
+-MATE_DOC_INIT([0.8.0])
+-
+-AC_CONFIG_FILES([
+-Makefile
+-doc/Makefile
+-doc/creating_themes/Makefile
+-doc/man/Makefile
+-src/Makefile
+-src/wm-tester/Makefile
+-src/libmarco-private.pc
+-src/tools/Makefile
+-src/themes/Makefile
+-po/Makefile.in
+-])
+-
+-AC_OUTPUT
+-
+-if test x$enable_verbose_mode = xno; then
+- echo "*** WARNING WARNING WARNING WARNING WARNING"
+- echo "*** Building without verbose mode"
+- echo "*** This means there's no way to debug marco problems."
+- echo "*** Please build normal desktop versions of marco"
+- echo "*** with verbose mode enabled so users can use it when they report bugs."
+-fi
+-
+-dnl ==========================================================================
+-echo "
+-marco-$VERSION (using gtk+-${GTK_API_VERSION}):
+-
+- prefix: ${prefix}
+- source code location: ${srcdir}
+- compiler: ${CC}
+-
+- XFree86 Xinerama: ${use_xfree_xinerama}
+- Solaris Xinerama: ${use_solaris_xinerama}
+- Startup notification: ${have_startup_notification}
+- Compositing manager: ${have_xcomposite}
+- Session management: ${found_sm}
+- Shape extension: ${found_shape}
+- Resize-and-rotate: ${found_randr}
+- Xsync: ${found_xsync}
+- Render: ${have_xrender}
+- Xcursor: ${have_xcursor}
+-"
+diff -uNrp a/COPYING b/COPYING
+--- a/COPYING 2013-01-13 13:28:38.000000000 -0800
++++ b/COPYING 2013-02-18 11:14:02.075839108 -0800
+@@ -2,7 +2,7 @@
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+diff -uNrp a/distro/archlinux/mate-window-manager.install b/distro/archlinux/mate-window-manager.install
+--- a/distro/archlinux/mate-window-manager.install 1969-12-31 16:00:00.000000000 -0800
++++ b/distro/archlinux/mate-window-manager.install 2013-02-18 11:14:02.080839902 -0800
+@@ -0,0 +1,17 @@
++ pkgname=mate-window-manager
++
++post_install() {
++ usr/sbin/mateconfpkg --install ${pkgname}
++}
++
++pre_upgrade() {
++ pre_remove $1
++}
++
++post_upgrade() {
++ post_install $1
++}
++
++pre_remove() {
++ usr/sbin/mateconfpkg --uninstall ${pkgname}
++}
+diff -uNrp a/distro/archlinux/PKGBUILD b/distro/archlinux/PKGBUILD
+--- a/distro/archlinux/PKGBUILD 1969-12-31 16:00:00.000000000 -0800
++++ b/distro/archlinux/PKGBUILD 2013-02-18 11:14:02.080839902 -0800
+@@ -0,0 +1,37 @@
++pkgname=mate-window-manager
++pkgver=1.4.0
++pkgrel=1
++pkgdesc="A window manager for MATE"
++arch=(i686 x86_64)
++license=('GPL')
++depends=('mate-conf' 'mate-dialogs' 'libgtop' 'libwnck') # 'libcanberra' 'startup-notification'
++makedepends=('intltool' 'pkgconfig' 'mate-doc-utils')
++options=('!emptydirs' '!libtool')
++install=mate-window-manager.install
++url="http://matsusoft.com.ar/projects/mate/"
++groups=('mate')
++source=(metacity-restartstyle.patch)
++sha256sums=('ea2450ca3e4fb59166ec18ff4844cc61cb16865880dc6b125078a3ab47bf2caf')
++
++build() {
++ cd "${srcdir}/../../../"
++ ./autogen.sh \
++ --prefix=/usr \
++ --sysconfdir=/etc \
++ --localstatedir=/var \
++ --libexecdir=/usr/lib/mate-window-manager \
++ --disable-static \
++ --disable-startup-notification \
++ --disable-scrollkeeper || return 1
++ make || return 1
++}
++
++package() {
++ cd "${srcdir}/../../../"
++
++ make MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
++
++ install -m755 -d "${pkgdir}/usr/share/mateconf/schemas"
++ mateconf-merge-schema "${pkgdir}/usr/share/mateconf/schemas/${pkgname}.schemas" --domain ${pkgname} ${pkgdir}/etc/mateconf/schemas/*.schemas
++ rm -f ${pkgdir}/etc/mateconf/schemas/*.schemas
++}
+diff -uNrp a/po/en_AU.po b/po/en_AU.po
+--- a/po/en_AU.po 1969-12-31 16:00:00.000000000 -0800
++++ b/po/en_AU.po 2013-02-18 11:14:02.139849274 -0800
+@@ -0,0 +1,2132 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++#
++# Translators:
++# Michael Findlay <keltoiboy at gmail.com>, 2012.
++msgid ""
++msgstr ""
++"Project-Id-Version: MATE Desktop Environment\n"
++"Report-Msgid-Bugs-To: https://github.com/mate-desktop/\n"
++"POT-Creation-Date: 2011-12-28 10:53+0100\n"
++"PO-Revision-Date: 2012-10-03 10:21+0000\n"
++"Last-Translator: k3lt01 <keltoiboy at gmail.com>\n"
++"Language-Team: English (Australia) (http://www.transifex.com/projects/p/MATE/language/en_AU/)\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"Language: en_AU\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++
++#: ../src/50-marco-desktop-key.xml.in.h:1
++msgid "Desktop"
++msgstr "Desktop"
++
++#: ../src/50-marco-key.xml.in.h:1
++msgid "Window Management"
++msgstr "Window Management"
++
++#: ../src/core/bell.c:294
++msgid "Bell event"
++msgstr "Bell event"
++
++#: ../src/core/core.c:206
++#, c-format
++msgid "Unknown window information request: %d"
++msgstr "Unknown window information request: %d"
++
++#. Translators: %s is a window title
++#: ../src/core/delete.c:96
++#, c-format
++msgid "<tt>%s</tt> is not responding."
++msgstr "<tt>%s</tt> is not responding."
++
++#: ../src/core/delete.c:101
++msgid ""
++"You may choose to wait a short while for it to continue or force the "
++"application to quit entirely."
++msgstr "You may choose to wait a short while for it to continue or force the application to quit entirely."
++
++#: ../src/core/delete.c:110
++msgid "_Wait"
++msgstr "_Wait"
++
++#: ../src/core/delete.c:110
++msgid "_Force Quit"
++msgstr "_Force Quit"
++
++#: ../src/core/delete.c:208
++#, c-format
++msgid "Failed to get hostname: %s\n"
++msgstr "Failed to get hostname: %s\n"
++
++#: ../src/core/display.c:266
++#, c-format
++msgid "Missing %s extension required for compositing"
++msgstr "Missing %s extension required for compositing"
++
++#: ../src/core/display.c:344
++#, c-format
++msgid "Failed to open X Window System display '%s'\n"
++msgstr "Failed to open X Window System display '%s'\n"
++
++#: ../src/core/errors.c:272
++#, c-format
++msgid ""
++"Lost connection to the display '%s';\n"
++"most likely the X server was shut down or you killed/destroyed\n"
++"the window manager.\n"
++msgstr "Lost connection to the display '%s';\nmost likely the X server was shut down or you killed/destroyed\nthe window manager.\n"
++
++#: ../src/core/errors.c:279
++#, c-format
++msgid "Fatal IO error %d (%s) on display '%s'.\n"
++msgstr "Fatal IO error %d (%s) on display '%s'.\n"
++
++#: ../src/core/keybindings.c:680
++#, c-format
++msgid ""
++"Some other program is already using the key %s with modifiers %x as a "
++"binding\n"
++msgstr "Some other program is already using the key %s with modifiers %x as a binding\n"
++
++#. Displayed when a keybinding which is
++#. * supposed to launch a program fails.
++#.
++#: ../src/core/keybindings.c:2294
++#, c-format
++msgid ""
++"There was an error running <tt>%s</tt>:\n"
++"\n"
++"%s"
++msgstr "There was an error running <tt>%s</tt>:\n\n%s"
++
++#: ../src/core/keybindings.c:2383
++#, c-format
++msgid "No command %d has been defined.\n"
++msgstr "No command %d has been defined.\n"
++
++#: ../src/core/keybindings.c:3337
++#, c-format
++msgid "No terminal command has been defined.\n"
++msgstr "No terminal command has been defined.\n"
++
++#: ../src/core/main.c:131
++#, c-format
++msgid ""
++"marco %s\n"
++"Copyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., and others\n"
++"This is free software; see the source for copying conditions.\n"
++"There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
++msgstr "marco %s\nCopyright (C) 2001-%s Havoc Pennington, Red Hat, Inc., and others\nThis is free software; see the source for copying conditions.\nThere is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n"
++
++#: ../src/core/main.c:269
++msgid "Disable connection to session manager"
++msgstr "Disable connection to session manager"
++
++#: ../src/core/main.c:275
++msgid "Replace the running window manager with Marco"
++msgstr "Replace the running window manager with Marco"
++
++#: ../src/core/main.c:281
++msgid "Specify session management ID"
++msgstr "Specify session management ID"
++
++#: ../src/core/main.c:286
++msgid "X Display to use"
++msgstr "X Display to use"
++
++#: ../src/core/main.c:292
++msgid "Initialize session from savefile"
++msgstr "Initialise session from savefile"
++
++#: ../src/core/main.c:298
++msgid "Print version"
++msgstr "Print version"
++
++#: ../src/core/main.c:304
++msgid "Make X calls synchronous"
++msgstr "Make X calls synchronous"
++
++#: ../src/core/main.c:310
++msgid "Turn compositing on"
++msgstr "Turn compositing on"
++
++#: ../src/core/main.c:316
++msgid "Turn compositing off"
++msgstr "Turn compositing off"
++
++#: ../src/core/main.c:322
++msgid ""
++"Don't make fullscreen windows that are maximized and have no decorations"
++msgstr "Don't make fullscreen windows that are maximised and have no decorations"
++
++#: ../src/core/main.c:528
++#, c-format
++msgid "Failed to scan themes directory: %s\n"
++msgstr "Failed to scan themes directory: %s\n"
++
++#: ../src/core/main.c:544
++#, c-format
++msgid ""
++"Could not find a theme! Be sure %s exists and contains the usual themes.\n"
++msgstr "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
++
++#: ../src/core/main.c:603
++#, c-format
++msgid "Failed to restart: %s\n"
++msgstr "Failed to restart: %s\n"
++
++#. * We found it, but it was invalid. Complain.
++#. *
++#. * FIXME: This replicates the original behaviour, but in the future
++#. * we might consider reverting invalid keys to their original values.
++#. * (We know the old value, so we can look up a suitable string in
++#. * the symtab.)
++#. *
++#. * (Empty comment follows so the translators don't see this.)
++#.
++#.
++#: ../src/core/prefs.c:508 ../src/core/prefs.c:663
++#, c-format
++msgid "MateConf key '%s' is set to an invalid value\n"
++msgstr "MateConf key '%s' is set to an invalid value\n"
++
++#: ../src/core/prefs.c:589 ../src/core/prefs.c:832
++#, c-format
++msgid "%d stored in MateConf key %s is out of range %d to %d\n"
++msgstr "%d stored in MateConf key %s is out of range %d to %d\n"
++
++#: ../src/core/prefs.c:633 ../src/core/prefs.c:710 ../src/core/prefs.c:758
++#: ../src/core/prefs.c:822 ../src/core/prefs.c:1115 ../src/core/prefs.c:1131
++#: ../src/core/prefs.c:1148 ../src/core/prefs.c:1164
++#, c-format
++msgid "MateConf key \"%s\" is set to an invalid type\n"
++msgstr "MateConf key \"%s\" is set to an invalid type\n"
++
++#: ../src/core/prefs.c:1234
++msgid ""
++"Workarounds for broken applications disabled. Some applications may not "
++"behave properly.\n"
++msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
++
++#: ../src/core/prefs.c:1305
++#, c-format
++msgid "Could not parse font description \"%s\" from MateConf key %s\n"
++msgstr "Could not parse font description \"%s\" from MateConf key %s\n"
++
++#: ../src/core/prefs.c:1367
++#, c-format
++msgid ""
++"\"%s\" found in configuration database is not a valid value for mouse button"
++" modifier\n"
++msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
++
++#: ../src/core/prefs.c:1788
++#, c-format
++msgid "Error setting number of workspaces to %d: %s\n"
++msgstr "Error setting number of workspaces to %d: %s\n"
++
++#: ../src/core/prefs.c:1953 ../src/core/prefs.c:2456
++#, c-format
++msgid "Workspace %d"
++msgstr "Workspace %d"
++
++#: ../src/core/prefs.c:1983 ../src/core/prefs.c:2161
++#, c-format
++msgid ""
++"\"%s\" found in configuration database is not a valid value for keybinding "
++"\"%s\"\n"
++msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
++
++#: ../src/core/prefs.c:2537
++#, c-format
++msgid "Error setting name for workspace %d to \"%s\": %s\n"
++msgstr "Error setting name for workspace %d to \"%s\": %s\n"
++
++#: ../src/core/prefs.c:2741
++#, c-format
++msgid "Error setting compositor status: %s\n"
++msgstr "Error setting compositor status: %s\n"
++
++#: ../src/core/screen.c:357
++#, c-format
++msgid "Screen %d on display '%s' is invalid\n"
++msgstr "Screen %d on display '%s' is invalid\n"
++
++#: ../src/core/screen.c:373
++#, c-format
++msgid ""
++"Screen %d on display \"%s\" already has a window manager; try using the "
++"--replace option to replace the current window manager.\n"
++msgstr "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
++
++#: ../src/core/screen.c:400
++#, c-format
++msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
++msgstr "Could not acquire window manager selection on screen %d display \"%s\"\n"
++
++#: ../src/core/screen.c:458
++#, c-format
++msgid "Screen %d on display \"%s\" already has a window manager\n"
++msgstr "Screen %d on display \"%s\" already has a window manager\n"
++
++#: ../src/core/screen.c:668
++#, c-format
++msgid "Could not release screen %d on display \"%s\"\n"
++msgstr "Could not release screen %d on display \"%s\"\n"
++
++#. Translators: Please don't translate "Control", "Shift", etc, since these
++#. * are hardcoded (in gtk/gtkaccelgroup.c; it's not marco's fault).
++#. * "disabled" must also stay as it is.
++#.
++#: ../src/core/schema-bindings.c:169
++msgid ""
++"The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n"
++"\n"
++"The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
++msgstr "The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n\nThe parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
++
++#: ../src/core/schema-bindings.c:177
++msgid ""
++"The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n"
++"\n"
++"The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action.\n"
++"\n"
++"This keybinding may be reversed by holding down the \"shift\" key; therefore, \"shift\" cannot be one of the keys it uses."
++msgstr "The format looks like \"<Control>a\" or \"<Shift><Alt>F1\".\n\nThe parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action.\n\nThis keybinding may be reversed by holding down the \"shift\" key; therefore, \"shift\" cannot be one of the keys it uses."
++
++#: ../src/core/session.c:850 ../src/core/session.c:857
++#, c-format
++msgid "Could not create directory '%s': %s\n"
++msgstr "Could not create directory '%s': %s\n"
++
++#: ../src/core/session.c:867
++#, c-format
++msgid "Could not open session file '%s' for writing: %s\n"
++msgstr "Could not open session file '%s' for writing: %s\n"
++
++#: ../src/core/session.c:1008
++#, c-format
++msgid "Error writing session file '%s': %s\n"
++msgstr "Error writing session file '%s': %s\n"
++
++#: ../src/core/session.c:1013
++#, c-format
++msgid "Error closing session file '%s': %s\n"
++msgstr "Error closing session file '%s': %s\n"
++
++#: ../src/core/session.c:1143
++#, c-format
++msgid "Failed to parse saved session file: %s\n"
++msgstr "Failed to parse saved session file: %s\n"
++
++#: ../src/core/session.c:1192
++#, c-format
++msgid "<marco_session> attribute seen but we already have the session ID"
++msgstr "<marco_session> attribute seen but we already have the session ID"
++
++#: ../src/core/session.c:1205 ../src/core/session.c:1280
++#: ../src/core/session.c:1312 ../src/core/session.c:1384
++#: ../src/core/session.c:1444
++#, c-format
++msgid "Unknown attribute %s on <%s> element"
++msgstr "Unknown attribute %s on <%s> element"
++
++#: ../src/core/session.c:1222
++#, c-format
++msgid "nested <window> tag"
++msgstr "nested <window> tag"
++
++#: ../src/core/session.c:1464
++#, c-format
++msgid "Unknown element %s"
++msgstr "Unknown element %s"
++
++#: ../src/core/session.c:1816
++msgid ""
++"These windows do not support "save current setup" and will have to"
++" be restarted manually next time you log in."
++msgstr "These windows do not support "save current setup" and will have to be restarted manually next time you log in."
++
++#: ../src/core/util.c:101
++#, c-format
++msgid "Failed to open debug log: %s\n"
++msgstr "Failed to open debug log: %s\n"
++
++#: ../src/core/util.c:111
++#, c-format
++msgid "Failed to fdopen() log file %s: %s\n"
++msgstr "Failed to fdopen() log file %s: %s\n"
++
++#: ../src/core/util.c:117
++#, c-format
++msgid "Opened log file %s\n"
++msgstr "Opened log file %s\n"
++
++#: ../src/core/util.c:136 ../src/tools/marco-message.c:176
++#, c-format
++msgid "Marco was compiled without support for verbose mode\n"
++msgstr "Marco was compiled without support for verbose mode\n"
++
++#: ../src/core/util.c:236
++msgid "Window manager: "
++msgstr "Window manager: "
++
++#: ../src/core/util.c:388
++msgid "Bug in window manager: "
++msgstr "Bug in window manager: "
++
++#: ../src/core/util.c:421
++msgid "Window manager warning: "
++msgstr "Window manager warning: "
++
++#: ../src/core/util.c:449
++msgid "Window manager error: "
++msgstr "Window manager error: "
++
++#. Translators: This is the title used on dialog boxes
++#. eof all-keybindings.h
++#: ../src/core/util.c:570 ../src/marco.desktop.in.h:1
++#: ../src/marco-wm.desktop.in.h:1
++msgid "Marco"
++msgstr "Marco"
++
++#. first time through
++#: ../src/core/window.c:5660
++#, c-format
++msgid ""
++"Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
++"window as specified in the ICCCM.\n"
++msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
++
++#. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
++#. * authoritative source for that info. Some apps such as mplayer or
++#. * xine disable resize via MWM but not WM_NORMAL_HINTS, but that
++#. * leads to e.g. us not fullscreening their windows. Apps that set
++#. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
++#. * about these apps but make them work.
++#.
++#: ../src/core/window.c:6225
++#, c-format
++msgid ""
++"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
++"%d x %d and max size %d x %d; this doesn't make much sense.\n"
++msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
++
++#: ../src/core/window-props.c:244
++#, c-format
++msgid "Application set a bogus _NET_WM_PID %lu\n"
++msgstr "Application set a bogus _NET_WM_PID %lu\n"
++
++#. Translators: the title of a window from another machine
++#: ../src/core/window-props.c:388
++#, c-format
++msgid "%s (on %s)"
++msgstr "%s (on %s)"
++
++#. Simple case-- don't bother to look it up. It's root.
++#: ../src/core/window-props.c:420
++#, c-format
++msgid "%s (as superuser)"
++msgstr "%s (as superuser)"
++
++#. Translators: the title of a window owned by another user
++#. * on this machine
++#: ../src/core/window-props.c:438
++#, c-format
++msgid "%s (as %s)"
++msgstr "%s (as %s)"
++
++#. Translators: the title of a window owned by another user
++#. * on this machine, whose name we don't know
++#: ../src/core/window-props.c:444
++#, c-format
++msgid "%s (as another user)"
++msgstr "%s (as another user)"
++
++#: ../src/core/window-props.c:1430
++#, c-format
++msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
++msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
++
++#: ../src/core/xprops.c:155
++#, c-format
++msgid ""
++"Window 0x%lx has property %s\n"
++"that was expected to have type %s format %d\n"
++"and actually has type %s format %d n_items %d.\n"
++"This is most likely an application bug, not a window manager bug.\n"
++"The window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
++msgstr "Window 0x%lx has property %s\nthat was expected to have type %s format %d\nand actually has type %s format %d n_items %d.\nThis is most likely an application bug, not a window manager bug.\nThe window has title=\"%s\" class=\"%s\" name=\"%s\"\n"
++
++#: ../src/core/xprops.c:401
++#, c-format
++msgid "Property %s on window 0x%lx contained invalid UTF-8\n"
++msgstr "Property %s on window 0x%lx contained invalid UTF-8\n"
++
++#: ../src/core/xprops.c:484
++#, c-format
++msgid ""
++"Property %s on window 0x%lx contained invalid UTF-8 for item %d in the "
++"list\n"
++msgstr "Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"
++
++#: ../src/include/all-keybindings.h:88
++msgid "Switch to workspace 1"
++msgstr "Switch to workspace 1"
++
++#: ../src/include/all-keybindings.h:90
++msgid "Switch to workspace 2"
++msgstr "Switch to workspace 2"
++
++#: ../src/include/all-keybindings.h:92
++msgid "Switch to workspace 3"
++msgstr "Switch to workspace 3"
++
++#: ../src/include/all-keybindings.h:94
++msgid "Switch to workspace 4"
++msgstr "Switch to workspace 4"
++
++#: ../src/include/all-keybindings.h:96
++msgid "Switch to workspace 5"
++msgstr "Switch to workspace 5"
++
++#: ../src/include/all-keybindings.h:98
++msgid "Switch to workspace 6"
++msgstr "Switch to workspace 6"
++
++#: ../src/include/all-keybindings.h:100
++msgid "Switch to workspace 7"
++msgstr "Switch to workspace 7"
++
++#: ../src/include/all-keybindings.h:102
++msgid "Switch to workspace 8"
++msgstr "Switch to workspace 8"
++
++#: ../src/include/all-keybindings.h:104
++msgid "Switch to workspace 9"
++msgstr "Switch to workspace 9"
++
++#: ../src/include/all-keybindings.h:106
++msgid "Switch to workspace 10"
++msgstr "Switch to workspace 10"
++
++#: ../src/include/all-keybindings.h:108
++msgid "Switch to workspace 11"
++msgstr "Switch to workspace 11"
++
++#: ../src/include/all-keybindings.h:110
++msgid "Switch to workspace 12"
++msgstr "Switch to workspace 12"
++
++#: ../src/include/all-keybindings.h:122
++msgid "Switch to workspace on the left of the current workspace"
++msgstr "Switch to workspace on the left of the current workspace"
++
++#: ../src/include/all-keybindings.h:126
++msgid "Switch to workspace on the right of the current workspace"
++msgstr "Switch to workspace on the right of the current workspace"
++
++#: ../src/include/all-keybindings.h:130
++msgid "Switch to workspace above the current workspace"
++msgstr "Switch to workspace above the current workspace"
++
++#: ../src/include/all-keybindings.h:134
++msgid "Switch to workspace below the current workspace"
++msgstr "Switch to workspace below the current workspace"
++
++#: ../src/include/all-keybindings.h:150
++msgid "Move between windows of an application, using a popup window"
++msgstr "Move between windows of an application, using a popup window"
++
++#: ../src/include/all-keybindings.h:153
++msgid "Move backward between windows of an application, using a popup window"
++msgstr "Move backward between windows of an application, using a popup window"
++
++#: ../src/include/all-keybindings.h:157
++msgid "Move between windows, using a popup window"
++msgstr "Move between windows, using a popup window"
++
++#: ../src/include/all-keybindings.h:160
++msgid "Move backward between windows, using a popup window"
++msgstr "Move backward between windows, using a popup window"
++
++#: ../src/include/all-keybindings.h:163
++msgid "Move between panels and the desktop, using a popup window"
++msgstr "Move between panels and the desktop, using a popup window"
++
++#: ../src/include/all-keybindings.h:166
++msgid "Move backward between panels and the desktop, using a popup window"
++msgstr "Move backward between panels and the desktop, using a popup window"
++
++#: ../src/include/all-keybindings.h:171
++msgid "Move between windows of an application immediately"
++msgstr "Move between windows of an application immediately"
++
++#: ../src/include/all-keybindings.h:174
++msgid "Move backward between windows of an application immediately"
++msgstr "Move backward between windows of an application immediately"
++
++#: ../src/include/all-keybindings.h:177
++msgid "Move between windows immediately"
++msgstr "Move between windows immediately"
++
++#: ../src/include/all-keybindings.h:180
++msgid "Move backward between windows immediately"
++msgstr "Move backward between windows immediately"
++
++#: ../src/include/all-keybindings.h:183
++msgid "Move between panels and the desktop immediately"
++msgstr "Move between panels and the desktop immediately"
++
++#: ../src/include/all-keybindings.h:186
++msgid "Move backward between panels and the desktop immediately"
++msgstr "Move backward between panels and the desktop immediately"
++
++#: ../src/include/all-keybindings.h:191
++msgid "Hide all normal windows and set focus to the desktop"
++msgstr "Hide all normal windows and set focus to the desktop"
++
++#: ../src/include/all-keybindings.h:194
++msgid "Show the panel's main menu"
++msgstr "Show the panel's main menu"
++
++#: ../src/include/all-keybindings.h:197
++msgid "Show the panel's \"Run Application\" dialog box"
++msgstr "Show the panel's \"Run Application\" dialogue box"
++
++#: ../src/include/all-keybindings.h:238
++msgid "Take a screenshot"
++msgstr "Take a screenshot"
++
++#: ../src/include/all-keybindings.h:240
++msgid "Take a screenshot of a window"
++msgstr "Take a screenshot of a window"
++
++#: ../src/include/all-keybindings.h:242
++msgid "Run a terminal"
++msgstr "Run a terminal"
++
++#: ../src/include/all-keybindings.h:257
++msgid "Activate the window menu"
++msgstr "Activate the window menu"
++
++#: ../src/include/all-keybindings.h:260
++msgid "Toggle fullscreen mode"
++msgstr "Toggle fullscreen mode"
++
++#: ../src/include/all-keybindings.h:262
++msgid "Toggle maximization state"
++msgstr "Toggle maximisation state"
++
++#: ../src/include/all-keybindings.h:264
++msgid "Toggle whether a window will always be visible over other windows"
++msgstr "Toggle whether a window will always be visible over other windows"
++
++#: ../src/include/all-keybindings.h:266
++msgid "Maximize window"
++msgstr "Maximise window"
++
++#: ../src/include/all-keybindings.h:268
++msgid "Restore window"
++msgstr "Restore window"
++
++#: ../src/include/all-keybindings.h:270
++msgid "Toggle shaded state"
++msgstr "Toggle shaded state"
++
++#: ../src/include/all-keybindings.h:272
++msgid "Minimize window"
++msgstr "Minimise window"
++
++#: ../src/include/all-keybindings.h:274
++msgid "Close window"
++msgstr "Close window"
++
++#: ../src/include/all-keybindings.h:276
++msgid "Move window"
++msgstr "Move window"
++
++#: ../src/include/all-keybindings.h:278
++msgid "Resize window"
++msgstr "Resize window"
++
++#: ../src/include/all-keybindings.h:281
++msgid "Toggle whether window is on all workspaces or just one"
++msgstr "Toggle whether window is on all workspaces or just one"
++
++#: ../src/include/all-keybindings.h:285
++msgid "Move window to workspace 1"
++msgstr "Move window to workspace 1"
++
++#: ../src/include/all-keybindings.h:288
++msgid "Move window to workspace 2"
++msgstr "Move window to workspace 2"
++
++#: ../src/include/all-keybindings.h:291
++msgid "Move window to workspace 3"
++msgstr "Move window to workspace 3"
++
++#: ../src/include/all-keybindings.h:294
++msgid "Move window to workspace 4"
++msgstr "Move window to workspace 4"
++
++#: ../src/include/all-keybindings.h:297
++msgid "Move window to workspace 5"
++msgstr "Move window to workspace 5"
++
++#: ../src/include/all-keybindings.h:300
++msgid "Move window to workspace 6"
++msgstr "Move window to workspace 6"
++
++#: ../src/include/all-keybindings.h:303
++msgid "Move window to workspace 7"
++msgstr "Move window to workspace 7"
++
++#: ../src/include/all-keybindings.h:306
++msgid "Move window to workspace 8"
++msgstr "Move window to workspace 8"
++
++#: ../src/include/all-keybindings.h:309
++msgid "Move window to workspace 9"
++msgstr "Move window to workspace 9"
++
++#: ../src/include/all-keybindings.h:312
++msgid "Move window to workspace 10"
++msgstr "Move window to workspace 10"
++
++#: ../src/include/all-keybindings.h:315
++msgid "Move window to workspace 11"
++msgstr "Move window to workspace 11"
++
++#: ../src/include/all-keybindings.h:318
++msgid "Move window to workspace 12"
++msgstr "Move window to workspace 12"
++
++#: ../src/include/all-keybindings.h:330
++msgid "Move window one workspace to the left"
++msgstr "Move window one workspace to the left"
++
++#: ../src/include/all-keybindings.h:333
++msgid "Move window one workspace to the right"
++msgstr "Move window one workspace to the right"
++
++#: ../src/include/all-keybindings.h:336
++msgid "Move window one workspace up"
++msgstr "Move window one workspace up"
++
++#: ../src/include/all-keybindings.h:339
++msgid "Move window one workspace down"
++msgstr "Move window one workspace down"
++
++#: ../src/include/all-keybindings.h:342
++msgid "Raise window if it's covered by another window, otherwise lower it"
++msgstr "Raise window if it's covered by another window, otherwise lower it"
++
++#: ../src/include/all-keybindings.h:344
++msgid "Raise window above other windows"
++msgstr "Raise window above other windows"
++
++#: ../src/include/all-keybindings.h:346
++msgid "Lower window below other windows"
++msgstr "Lower window below other windows"
++
++#: ../src/include/all-keybindings.h:350
++msgid "Maximize window vertically"
++msgstr "Maximise window vertically"
++
++#: ../src/include/all-keybindings.h:354
++msgid "Maximize window horizontally"
++msgstr "Maximise window horizontally"
++
++#: ../src/include/all-keybindings.h:358
++msgid "Move window to north-west (top left) corner"
++msgstr "Move window to north-west (top left) corner"
++
++#: ../src/include/all-keybindings.h:361
++msgid "Move window to north-east (top right) corner"
++msgstr "Move window to north-east (top right) corner"
++
++#: ../src/include/all-keybindings.h:364
++msgid "Move window to south-west (bottom left) corner"
++msgstr "Move window to south-west (bottom left) corner"
++
++#: ../src/include/all-keybindings.h:367
++msgid "Move window to south-east (bottom right) corner"
++msgstr "Move window to south-east (bottom right) corner"
++
++#: ../src/include/all-keybindings.h:371
++msgid "Move window to north (top) side of screen"
++msgstr "Move window to north (top) side of screen"
++
++#: ../src/include/all-keybindings.h:374
++msgid "Move window to south (bottom) side of screen"
++msgstr "Move window to south (bottom) side of screen"
++
++#: ../src/include/all-keybindings.h:377
++msgid "Move window to east (right) side of screen"
++msgstr "Move window to east (right) side of screen"
++
++#: ../src/include/all-keybindings.h:380
++msgid "Move window to west (left) side of screen"
++msgstr "Move window to west (left) side of screen"
++
++#: ../src/include/all-keybindings.h:383
++msgid "Move window to center of screen"
++msgstr "Move window to centre of screen"
++
++#: ../src/marco.schemas.in.in.h:1
++msgid ""
++"(Not implemented) Navigation works in terms of applications not windows"
++msgstr "(Not implemented) Navigation works in terms of applications not windows"
++
++#: ../src/marco.schemas.in.in.h:2
++msgid ""
++"A font description string describing a font for window titlebars. The size "
++"from the description will only be used if the titlebar_font_size option is "
++"set to 0. Also, this option is disabled if the titlebar_uses_desktop_font "
++"option is set to true."
++msgstr "A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar_font_size option is set to 0. Also, this option is disabled if the titlebar_uses_desktop_font option is set to true."
++
++#: ../src/marco.schemas.in.in.h:3
++msgid "Action on title bar double-click"
++msgstr "Action on title bar double-click"
++
++#: ../src/marco.schemas.in.in.h:4
++msgid "Action on title bar middle-click"
++msgstr "Action on title bar middle-click"
++
++#: ../src/marco.schemas.in.in.h:5
++msgid "Action on title bar right-click"
++msgstr "Action on title bar right-click"
++
++#: ../src/marco.schemas.in.in.h:6
++msgid "Arrangement of buttons on the titlebar"
++msgstr "Arrangement of buttons on the titlebar"
++
++#: ../src/marco.schemas.in.in.h:7
++msgid ""
++"Arrangement of buttons on the titlebar. The value should be a string, such "
++"as \"menu:minimize,maximize,spacer,close\"; the colon separates the left "
++"corner of the window from the right corner, and the button names are comma-"
++"separated. Duplicate buttons are not allowed. Unknown button names are "
++"silently ignored so that buttons can be added in future marco versions "
++"without breaking older versions. A special spacer tag can be used to insert "
++"some space between two adjacent buttons."
++msgstr "Arrangement of buttons on the titlebar. The value should be a string, such as \"menu:minimise,maximise,spacer,close\"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future marco versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons."
++
++#: ../src/marco.schemas.in.in.h:8
++msgid "Automatically raises the focused window"
++msgstr "Automatically raises the focused window"
++
++#: ../src/marco.schemas.in.in.h:9
++msgid ""
++"Clicking a window while holding down this modifier key will move the window "
++"(left click), resize the window (middle click), or show the window menu "
++"(right click). The middle and right click operations may be swapped using "
++"the \"resize_with_right_button\" key. Modifier is expressed as "
++"\"<Alt>\" or \"<Super>\" for example."
++msgstr "Clicking a window while holding down this modifier key will move the window (left click), resize the window (middle click), or show the window menu (right click). The middle and right click operations may be swapped using the \"resize_with_right_button\" key. Modifier is expressed as \"<Alt>\" or \"<Super>\" for example."
++
++#: ../src/marco.schemas.in.in.h:10
++msgid "Commands to run in response to keybindings"
++msgstr "Commands to run in response to keybindings"
++
++#: ../src/marco.schemas.in.in.h:11
++msgid "Compositing Manager"
++msgstr "Compositing Manager"
++
++#: ../src/marco.schemas.in.in.h:12
++msgid "Control how new windows get focus"
++msgstr "Control how new windows get focus"
++
++#: ../src/marco.schemas.in.in.h:13
++msgid "Current theme"
++msgstr "Current theme"
++
++#: ../src/marco.schemas.in.in.h:14
++msgid "Delay in milliseconds for the auto raise option"
++msgstr "Delay in milliseconds for the auto raise option"
++
++#: ../src/marco.schemas.in.in.h:15
++msgid "Determines whether Marco is a compositing manager."
++msgstr "Determines whether Marco is a compositing manager."
++
++#: ../src/marco.schemas.in.in.h:16
++msgid ""
++"Determines whether applications or the system can generate audible 'beeps'; "
++"may be used in conjunction with 'visual bell' to allow silent 'beeps'."
++msgstr "Determines whether applications or the system can generate audible 'beeps'; may be used in conjunction with 'visual bell' to allow silent 'beeps'."
++
++#: ../src/marco.schemas.in.in.h:17
++msgid "Disable misfeatures that are required by old or broken applications"
++msgstr "Disable misfeatures that are required by old or broken applications"
++
++#: ../src/marco.schemas.in.in.h:18
++msgid "Enable Visual Bell"
++msgstr "Enable Visual Bell"
++
++#: ../src/marco.schemas.in.in.h:19
++msgid ""
++"If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
++"the focused window will be automatically raised after a delay specified by "
++"the auto_raise_delay key. This is not related to clicking on a window to "
++"raise it, nor to entering a window during drag-and-drop."
++msgstr "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then the focused window will be automatically raised after a delay specified by the auto_raise_delay key. This is not related to clicking on a window to raise it, nor to entering a window during drag-and-drop."
++
++#: ../src/marco.schemas.in.in.h:20
++msgid ""
++"If true, ignore the titlebar_font option, and use the standard application "
++"font for window titles."
++msgstr "If true, ignore the titlebar_font option, and use the standard application font for window titles."
++
++#: ../src/marco.schemas.in.in.h:21
++msgid ""
++"If true, marco will give the user less feedback by using wireframes, "
++"avoiding animations, or other means. This is a significant reduction in "
++"usability for many users, but may allow legacy applications to continue "
++"working, and may also be a useful tradeoff for terminal servers. However, "
++"the wireframe feature is disabled when accessibility is on."
++msgstr "If true, marco will give the user less feedback by using wireframes, avoiding animations, or other means. This is a significant reduction in usability for many users, but may allow legacy applications to continue working, and may also be a useful tradeoff for terminal servers. However, the wireframe feature is disabled when accessibility is on."
++
++#: ../src/marco.schemas.in.in.h:22
++msgid ""
++"If true, then Marco works in terms of applications rather than windows. The "
++"concept is a bit abstract, but in general an application-based setup is more"
++" like the Mac and less like Windows. When you focus a window in application-"
++"based mode, all the windows in the application will be raised. Also, in "
++"application-based mode, focus clicks are not passed through to windows in "
++"other applications. Application-based mode is, however, largely "
++"unimplemented at the moment."
++msgstr "If true, then Marco works in terms of applications rather than windows. The concept is a bit abstract, but in general an application-based setup is more like the Mac and less like Windows. When you focus a window in application-based mode, all the windows in the application will be raised. Also, in application-based mode, focus clicks are not passed through to windows in other applications. Application-based mode is, however, largely unimplemented at the moment."
++
++#: ../src/marco.schemas.in.in.h:23
++msgid "If true, trade off usability for less resource usage"
++msgstr "If true, trade off usability for less resource usage"
++
++#: ../src/marco.schemas.in.in.h:24
++msgid "Modifier to use for modified window click actions"
++msgstr "Modifier to use for modified window click actions"
++
++#: ../src/marco.schemas.in.in.h:25
++msgid "Name of workspace"
++msgstr "Name of workspace"
++
++#: ../src/marco.schemas.in.in.h:26
++msgid "Number of workspaces"
++msgstr "Number of workspaces"
++
++#: ../src/marco.schemas.in.in.h:27
++msgid ""
++"Number of workspaces. Must be more than zero, and has a fixed maximum to "
++"prevent making the desktop unusable by accidentally asking for too many "
++"workspaces."
++msgstr "Number of workspaces. Must be more than zero, and has a fixed maximum to prevent making the desktop unusable by accidentally asking for too many workspaces."
++
++#: ../src/marco.schemas.in.in.h:28
++msgid "Run a defined command"
++msgstr "Run a defined command"
++
++#: ../src/marco.schemas.in.in.h:29
++msgid ""
++"Set this to true to resize with the right button and show a menu with the "
++"middle button while holding down the key given in \"mouse_button_modifier\";"
++" set it to false to make it work the opposite way around."
++msgstr "Set this to true to resize with the right button and show a menu with the middle button while holding down the key given in \"mouse_button_modifier\"; set it to false to make it work the opposite way around."
++
++#: ../src/marco.schemas.in.in.h:30
++msgid ""
++"Setting this option to false can lead to buggy behavior, so users are "
++"strongly discouraged from changing it from the default of true. Many actions"
++" (e.g. clicking in the client area, moving or resizing the window) normally "
++"raise the window as a side-effect. Setting this option to false, which is "
++"strongly discouraged, will decouple raising from other user actions, and "
++"ignore raise requests generated by applications. See "
++"http://bugzilla.gnome.org/show_bug.cgi?id=445447#c6. Even when this option "
++"is false, windows can still be raised by an alt-left-click anywhere on the "
++"window, a normal click on the window decorations, or by special messages "
++"from pagers, such as activation requests from tasklist applets. This option "
++"is currently disabled in click-to-focus mode. Note that the list of ways to "
++"raise windows when raise_on_click is false does not include programmatic "
++"requests from applications to raise windows; such requests will be ignored "
++"regardless of the reason for the request. If you are an application "
++"developer and have a user complaining that your application does not work "
++"with this setting disabled, tell them it is _their_ fault for breaking their"
++" window manager and that they need to change this option back to true or "
++"live with the \"bug\" they requested."
++msgstr "Setting this option to false can lead to buggy behaviour, so users are strongly discouraged from changing it from the default of true. Many actions (e.g. clicking in the client area, moving or resizing the window) normally raise the window as a side-effect. Setting this option to false, which is strongly discouraged, will decouple raising from other user actions, and ignore raise requests generated by applications. See http://bugzilla.gnome.org/show_bug.cgi?id=445447#c6. Even when this option is false, windows can still be raised by an alt-left-click anywhere on the window, a normal click on the window decorations, or by special messages from pagers, such as activation requests from tasklist applets. This option is currently disabled in click-to-focus mode. Note that the list of ways to raise windows when raise_on_click is false does not include programmatic requests from applications to raise windows; such requests will be ignored regardless of the reason for the r
equest. If you are an application developer and have a user complaining that your application does not work with this setting disabled, tell them it is _their_ fault for breaking their window manager and that they need to change this option back to true or live with the \"bug\" they requested."
++
++#: ../src/marco.schemas.in.in.h:31
++msgid ""
++"Some applications disregard specifications in ways that result in window "
++"manager misfeatures. This option puts Marco in a rigorously correct mode, "
++"which gives a more consistent user interface, provided one does not need to "
++"run any misbehaving applications."
++msgstr "Some applications disregard specifications in ways that result in window manager misfeatures. This option puts Marco in a rigorously correct mode, which gives a more consistent user interface, provided one does not need to run any misbehaving applications."
++
++#: ../src/marco.schemas.in.in.h:32
++msgid "System Bell is Audible"
++msgstr "System Bell is Audible"
++
++#: ../src/marco.schemas.in.in.h:33
++msgid ""
++"Tells Marco how to implement the visual indication that the system bell or "
++"another application 'bell' indicator has been rung. Currently there are two "
++"valid values, \"fullscreen\", which causes a fullscreen white-black flash, "
++"and \"frame_flash\" which causes the titlebar of the application which sent "
++"the bell signal to flash. If the application which sent the bell is unknown "
++"(as is usually the case for the default \"system beep\"), the currently "
++"focused window's titlebar is flashed."
++msgstr "Tells Marco how to implement the visual indication that the system bell or another application 'bell' indicator has been rung. Currently there are two valid values, \"fullscreen\", which causes a fullscreen white-black flash, and \"frame_flash\" which causes the titlebar of the application which sent the bell signal to flash. If the application which sent the bell is unknown (as is usually the case for the default \"system beep\"), the currently focused window's titlebar is flashed."
++
++#: ../src/marco.schemas.in.in.h:34
++msgid ""
++"The /apps/marco/global_keybindings/run_command_N keys define keybindings "
++"that correspond to these commands. Pressing the keybinding for run_command_N"
++" will execute command_N."
++msgstr "The /apps/marco/global_keybindings/run_command_N keys define keybindings that correspond to these commands. Pressing the keybinding for run_command_N will execute command_N."
++
++#: ../src/marco.schemas.in.in.h:35
++msgid ""
++"The /apps/marco/global_keybindings/run_command_screenshot key defines a "
++"keybinding which causes the command specified by this setting to be invoked."
++msgstr "The /apps/marco/global_keybindings/run_command_screenshot key defines a keybinding which causes the command specified by this setting to be invoked."
++
++#: ../src/marco.schemas.in.in.h:36
++msgid ""
++"The /apps/marco/global_keybindings/run_command_window_screenshot key defines"
++" a keybinding which causes the command specified by this setting to be "
++"invoked."
++msgstr "The /apps/marco/global_keybindings/run_command_window_screenshot key defines a keybinding which causes the command specified by this setting to be invoked."
++
++#: ../src/marco.schemas.in.in.h:37
++msgid ""
++"The keybinding that runs the correspondingly-numbered command in "
++"/apps/marco/keybinding_commands The format looks like \"<Control>a\" "
++"or \"<Shift><Alt>F1\". The parser is fairly liberal and allows "
++"lower or upper case, and also abbreviations such as \"<Ctl>\" and "
++"\"<Ctrl>\". If you set the option to the special string \"disabled\", "
++"then there will be no keybinding for this action."
++msgstr "The keybinding that runs the correspondingly-numbered command in /apps/marco/keybinding_commands The format looks like \"<Control>a\" or \"<Shift><Alt>F1\". The parser is fairly liberal and allows lower or upper case, and also abbreviations such as \"<Ctl>\" and \"<Ctrl>\". If you set the option to the special string \"disabled\", then there will be no keybinding for this action."
++
++#: ../src/marco.schemas.in.in.h:38
++msgid "The name of a workspace."
++msgstr "The name of a workspace."
++
++#: ../src/marco.schemas.in.in.h:39
++msgid "The screenshot command"
++msgstr "The screenshot command"
++
++#: ../src/marco.schemas.in.in.h:40
++msgid ""
++"The theme determines the appearance of window borders, titlebar, and so "
++"forth."
++msgstr "The theme determines the appearance of window borders, titlebar, and so forth."
++
++#: ../src/marco.schemas.in.in.h:41
++msgid ""
++"The time delay before raising a window if auto_raise is set to true. The "
++"delay is given in thousandths of a second."
++msgstr "The time delay before raising a window if auto_raise is set to true. The delay is given in thousandths of a second."
++
++#: ../src/marco.schemas.in.in.h:42
++msgid ""
++"The window focus mode indicates how windows are activated. It has three "
++"possible values; \"click\" means windows must be clicked in order to focus "
++"them, \"sloppy\" means windows are focused when the mouse enters the window,"
++" and \"mouse\" means windows are focused when the mouse enters the window "
++"and unfocused when the mouse leaves the window."
++msgstr "The window focus mode indicates how windows are activated. It has three possible values; \"click\" means windows must be clicked in order to focus them, \"sloppy\" means windows are focused when the mouse enters the window, and \"mouse\" means windows are focused when the mouse enters the window and unfocused when the mouse leaves the window."
++
++#: ../src/marco.schemas.in.in.h:43
++msgid "The window screenshot command"
++msgstr "The window screenshot command"
++
++#: ../src/marco.schemas.in.in.h:44
++msgid ""
++"This option determines the effects of double-clicking on the title bar. "
++"Current valid options are 'toggle_shade', which will shade/unshade the "
++"window, 'toggle_maximize' which will maximize/unmaximize the window, "
++"'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will "
++"maximize/unmaximize the window in that direction only, 'minimize' which will"
++" minimize the window, 'shade' which will roll the window up, 'menu' which "
++"will display the window menu, 'lower' which will put the window behind all "
++"the others, and 'none' which will not do anything."
++msgstr "This option determines the effects of double-clicking on the title bar. Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximise' which will _maximise/unmaximise the window, 'toggle_maximise_horizontally' and 'toggle_maximise_vertically' which will _maximise/unmaximise the window in that direction only, 'minimise' which will minimise the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything."
++
++#: ../src/marco.schemas.in.in.h:45
++msgid ""
++"This option determines the effects of middle-clicking on the title bar. "
++"Current valid options are 'toggle_shade', which will shade/unshade the "
++"window, 'toggle_maximize' which will maximize/unmaximize the window, "
++"'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will "
++"maximize/unmaximize the window in that direction only, 'minimize' which will"
++" minimize the window, 'shade' which will roll the window up, 'menu' which "
++"will display the window menu, 'lower' which will put the window behind all "
++"the others, and 'none' which will not do anything."
++msgstr "This option determines the effects of middle-clicking on the title bar. Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximise' which will _maximise/unmaximise the window, 'toggle_maximise_horizontally' and 'toggle_maximise_vertically' which will _maximise/unmaximise the window in that direction only, 'minimise' which will minimise the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything."
++
++#: ../src/marco.schemas.in.in.h:46
++msgid ""
++"This option determines the effects of right-clicking on the title bar. "
++"Current valid options are 'toggle_shade', which will shade/unshade the "
++"window, 'toggle_maximize' which will maximize/unmaximize the window, "
++"'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will "
++"maximize/unmaximize the window in that direction only, 'minimize' which will"
++" minimize the window, 'shade' which will roll the window up, 'menu' which "
++"will display the window menu, 'lower' which will put the window behind all "
++"the others, and 'none' which will not do anything."
++msgstr "This option determines the effects of right-clicking on the title bar. Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximise' which will _maximise/unmaximise the window, 'toggle_maximise_horizontally' and 'toggle_maximise_vertically' which will _maximise/unmaximise the window in that direction only, 'minimise' which will minimise the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything."
++
++#: ../src/marco.schemas.in.in.h:47
++msgid ""
++"This option provides additional control over how newly created windows get "
++"focus. It has two possible values; \"smart\" applies the user's normal focus"
++" mode, and \"strict\" results in windows started from a terminal not being "
++"given focus."
++msgstr "This option provides additional control over how newly created windows get focus. It has two possible values; \"smart\" applies the user's normal focus mode, and \"strict\" results in windows started from a terminal not being given focus."
++
++#: ../src/marco.schemas.in.in.h:48
++msgid ""
++"Turns on a visual indication when an application or the system issues a "
++"'bell' or 'beep'; useful for the hard-of-hearing and for use in noisy "
++"environments."
++msgstr "Turns on a visual indication when an application or the system issues a 'bell' or 'beep'; useful for the hard-of-hearing and for use in noisy environments."
++
++#: ../src/marco.schemas.in.in.h:49
++msgid "Use standard system font in window titles"
++msgstr "Use standard system font in window titles"
++
++#: ../src/marco.schemas.in.in.h:50
++msgid "Visual Bell Type"
++msgstr "Visual Bell Type"
++
++#: ../src/marco.schemas.in.in.h:51
++msgid "Whether raising should be a side-effect of other user interactions"
++msgstr "Whether raising should be a side-effect of other user interactions"
++
++#: ../src/marco.schemas.in.in.h:52
++msgid "Whether to resize with the right button"
++msgstr "Whether to resize with the right button"
++
++#: ../src/marco.schemas.in.in.h:53
++msgid "Window focus mode"
++msgstr "Window focus mode"
++
++#: ../src/marco.schemas.in.in.h:54
++msgid "Window title font"
++msgstr "Window title font"
++
++#: ../src/tools/marco-message.c:150
++#, c-format
++msgid "Usage: %s\n"
++msgstr "Usage: %s\n"
++
++#: ../src/ui/frames.c:1124
++msgid "Close Window"
++msgstr "Close Window"
++
++#: ../src/ui/frames.c:1127
++msgid "Window Menu"
++msgstr "Window Menu"
++
++#: ../src/ui/frames.c:1130
++msgid "Minimize Window"
++msgstr "Minimise Window"
++
++#: ../src/ui/frames.c:1133
++msgid "Maximize Window"
++msgstr "Maximise Window"
++
++#: ../src/ui/frames.c:1136
++msgid "Restore Window"
++msgstr "Restore Window"
++
++#: ../src/ui/frames.c:1139
++msgid "Roll Up Window"
++msgstr "Roll Up Window"
++
++#: ../src/ui/frames.c:1142
++msgid "Unroll Window"
++msgstr "Unroll Window"
++
++#: ../src/ui/frames.c:1145
++msgid "Keep Window On Top"
++msgstr "Keep Window On Top"
++
++#: ../src/ui/frames.c:1148
++msgid "Remove Window From Top"
++msgstr "Remove Window From Top"
++
++#: ../src/ui/frames.c:1151
++msgid "Always On Visible Workspace"
++msgstr "Always On Visible Workspace"
++
++#: ../src/ui/frames.c:1154
++msgid "Put Window On Only One Workspace"
++msgstr "Put Window On Only One Workspace"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:65
++msgid "Mi_nimize"
++msgstr "Mi_nimise"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:67
++msgid "Ma_ximize"
++msgstr "Ma_ximise"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:69
++msgid "Unma_ximize"
++msgstr "Unma_ximise"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:71
++msgid "Roll _Up"
++msgstr "Roll _Up"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:73
++msgid "_Unroll"
++msgstr "_Unroll"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:75
++msgid "_Move"
++msgstr "_Move"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:77
++msgid "_Resize"
++msgstr "_Resize"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:79
++msgid "Move Titlebar On_screen"
++msgstr "Move Titlebar On_screen"
++
++#. separator
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:82 ../src/ui/menu.c:84
++msgid "Always on _Top"
++msgstr "Always on _Top"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:86
++msgid "_Always on Visible Workspace"
++msgstr "_Always on Visible Workspace"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:88
++msgid "_Only on This Workspace"
++msgstr "_Only on This Workspace"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:90
++msgid "Move to Workspace _Left"
++msgstr "Move to Workspace _Left"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:92
++msgid "Move to Workspace R_ight"
++msgstr "Move to Workspace R_ight"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:94
++msgid "Move to Workspace _Up"
++msgstr "Move to Workspace _Up"
++
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:96
++msgid "Move to Workspace _Down"
++msgstr "Move to Workspace _Down"
++
++#. separator
++#. Translators: Translate this string the same way as you do in libwnck!
++#: ../src/ui/menu.c:100
++msgid "_Close"
++msgstr "_Close"
++
++#: ../src/ui/menu.c:197
++#, c-format
++msgid "Workspace %d%n"
++msgstr "Workspace %d%n"
++
++#: ../src/ui/menu.c:207
++#, c-format
++msgid "Workspace 1_0"
++msgstr "Workspace 1_0"
++
++#: ../src/ui/menu.c:209
++#, c-format
++msgid "Workspace %s%d"
++msgstr "Workspace %s%d"
++
++#: ../src/ui/menu.c:387
++msgid "Move to Another _Workspace"
++msgstr "Move to Another _Workspace"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the shift key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:104
++msgid "Shift"
++msgstr "Shift"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the control key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:110
++msgid "Ctrl"
++msgstr "Ctrl"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the alt key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:116
++msgid "Alt"
++msgstr "Alt"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the meta key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:122
++msgid "Meta"
++msgstr "Meta"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the super key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:128
++msgid "Super"
++msgstr "Super"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the hyper key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:134
++msgid "Hyper"
++msgstr "Hyper"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the mod2 key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:140
++msgid "Mod2"
++msgstr "Mod2"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the mod3 key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:146
++msgid "Mod3"
++msgstr "Mod3"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the mod4 key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:152
++msgid "Mod4"
++msgstr "Mod4"
++
++#. This is the text that should appear next to menu accelerators
++#. * that use the mod5 key. If the text on this key isn't typically
++#. * translated on keyboards used for your language, don't translate
++#. * this.
++#.
++#: ../src/ui/metaaccellabel.c:158
++msgid "Mod5"
++msgstr "Mod5"
++
++#. Translators: This represents the size of a window. The first number is
++#. * the width of the window and the second is the height.
++#.
++#: ../src/ui/resizepopup.c:113
++#, c-format
++msgid "%d x %d"
++msgstr "%d x %d"
++
++#: ../src/ui/theme.c:255
++msgid "top"
++msgstr "top"
++
++#: ../src/ui/theme.c:257
++msgid "bottom"
++msgstr "bottom"
++
++#: ../src/ui/theme.c:259
++msgid "left"
++msgstr "left"
++
++#: ../src/ui/theme.c:261
++msgid "right"
++msgstr "right"
++
++#: ../src/ui/theme.c:288
++#, c-format
++msgid "frame geometry does not specify \"%s\" dimension"
++msgstr "frame geometry does not specify \"%s\" dimension"
++
++#: ../src/ui/theme.c:307
++#, c-format
++msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
++msgstr "frame geometry does not specify dimension \"%s\" for border \"%s\""
++
++#: ../src/ui/theme.c:344
++#, c-format
++msgid "Button aspect ratio %g is not reasonable"
++msgstr "Button aspect ratio %g is not reasonable"
++
++#: ../src/ui/theme.c:356
++#, c-format
++msgid "Frame geometry does not specify size of buttons"
++msgstr "Frame geometry does not specify size of buttons"
++
++#: ../src/ui/theme.c:1021
++#, c-format
++msgid "Gradients should have at least two colors"
++msgstr "Gradients should have at least two colours"
++
++#: ../src/ui/theme.c:1147
++#, c-format
++msgid ""
++"GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL]"
++" where NORMAL is the state; could not parse \"%s\""
++msgstr "GTK colour specification must have the state in brackets, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
++
++#: ../src/ui/theme.c:1161
++#, c-format
++msgid ""
++"GTK color specification must have a close bracket after the state, e.g. "
++"gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
++msgstr "GTK colour specification must have a close bracket after the state, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
++
++#: ../src/ui/theme.c:1172
++#, c-format
++msgid "Did not understand state \"%s\" in color specification"
++msgstr "Did not understand state \"%s\" in colour specification"
++
++#: ../src/ui/theme.c:1185
++#, c-format
++msgid "Did not understand color component \"%s\" in color specification"
++msgstr "Did not understand colour component \"%s\" in colour specification"
++
++#: ../src/ui/theme.c:1215
++#, c-format
++msgid ""
++"Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
++"format"
++msgstr "Blend format is \"blend/bg_colour/fg_colour/alpha\", \"%s\" does not fit the format"
++
++#: ../src/ui/theme.c:1226
++#, c-format
++msgid "Could not parse alpha value \"%s\" in blended color"
++msgstr "Could not parse alpha value \"%s\" in blended colour"
++
++#: ../src/ui/theme.c:1236
++#, c-format
++msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
++msgstr "Alpha value \"%s\" in blended colour is not between 0.0 and 1.0"
++
++#: ../src/ui/theme.c:1283
++#, c-format
++msgid "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
++msgstr "Shade format is \"shade/base_colour/factor\", \"%s\" does not fit the format"
++
++#: ../src/ui/theme.c:1294
++#, c-format
++msgid "Could not parse shade factor \"%s\" in shaded color"
++msgstr "Could not parse shade factor \"%s\" in shaded colour"
++
++#: ../src/ui/theme.c:1304
++#, c-format
++msgid "Shade factor \"%s\" in shaded color is negative"
++msgstr "Shade factor \"%s\" in shaded colour is negative"
++
++#: ../src/ui/theme.c:1333
++#, c-format
++msgid "Could not parse color \"%s\""
++msgstr "Could not parse colour \"%s\""
++
++#: ../src/ui/theme.c:1587
++#, c-format
++msgid "Coordinate expression contains character '%s' which is not allowed"
++msgstr "Coordinate expression contains character '%s' which is not allowed"
++
++#: ../src/ui/theme.c:1614
++#, c-format
++msgid ""
++"Coordinate expression contains floating point number '%s' which could not be"
++" parsed"
++msgstr "Coordinate expression contains floating point number '%s' which could not be parsed"
++
++#: ../src/ui/theme.c:1628
++#, c-format
++msgid "Coordinate expression contains integer '%s' which could not be parsed"
++msgstr "Coordinate expression contains integer '%s' which could not be parsed"
++
++#: ../src/ui/theme.c:1750
++#, c-format
++msgid ""
++"Coordinate expression contained unknown operator at the start of this text: "
++"\"%s\""
++msgstr "Coordinate expression contained unknown operator at the start of this text: \"%s\""
++
++#: ../src/ui/theme.c:1807
++#, c-format
++msgid "Coordinate expression was empty or not understood"
++msgstr "Coordinate expression was empty or not understood"
++
++#: ../src/ui/theme.c:1918 ../src/ui/theme.c:1928 ../src/ui/theme.c:1962
++#, c-format
++msgid "Coordinate expression results in division by zero"
++msgstr "Coordinate expression results in division by zero"
++
++#: ../src/ui/theme.c:1970
++#, c-format
++msgid ""
++"Coordinate expression tries to use mod operator on a floating-point number"
++msgstr "Coordinate expression tries to use mod operator on a floating-point number"
++
++#: ../src/ui/theme.c:2026
++#, c-format
++msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
++msgstr "Coordinate expression has an operator \"%s\" where an operand was expected"
++
++#: ../src/ui/theme.c:2035
++#, c-format
++msgid "Coordinate expression had an operand where an operator was expected"
++msgstr "Coordinate expression had an operand where an operator was expected"
++
++#: ../src/ui/theme.c:2043
++#, c-format
++msgid "Coordinate expression ended with an operator instead of an operand"
++msgstr "Coordinate expression ended with an operator instead of an operand"
++
++#: ../src/ui/theme.c:2053
++#, c-format
++msgid ""
++"Coordinate expression has operator \"%c\" following operator \"%c\" with no "
++"operand in between"
++msgstr "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"
++
++#: ../src/ui/theme.c:2200 ../src/ui/theme.c:2241
++#, c-format
++msgid "Coordinate expression had unknown variable or constant \"%s\""
++msgstr "Coordinate expression had unknown variable or constant \"%s\""
++
++#: ../src/ui/theme.c:2295
++#, c-format
++msgid "Coordinate expression parser overflowed its buffer."
++msgstr "Coordinate expression parser overflowed its buffer."
++
++#: ../src/ui/theme.c:2324
++#, c-format
++msgid "Coordinate expression had a close parenthesis with no open parenthesis"
++msgstr "Coordinate expression had a close parenthesis with no open parenthesis"
++
++#: ../src/ui/theme.c:2388
++#, c-format
++msgid ""
++"Coordinate expression had an open parenthesis with no close parenthesis"
++msgstr "Coordinate expression had an open parenthesis with no close parenthesis"
++
++#: ../src/ui/theme.c:2399
++#, c-format
++msgid "Coordinate expression doesn't seem to have any operators or operands"
++msgstr "Coordinate expression doesn't seem to have any operators or operands"
++
++#: ../src/ui/theme.c:2603 ../src/ui/theme.c:2623 ../src/ui/theme.c:2643
++#, c-format
++msgid "Theme contained an expression that resulted in an error: %s\n"
++msgstr "Theme contained an expression that resulted in an error: %s\n"
++
++#: ../src/ui/theme.c:4220
++#, c-format
++msgid ""
++"<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
++"specified for this frame style"
++msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"
++
++#: ../src/ui/theme.c:4728 ../src/ui/theme.c:4753
++#, c-format
++msgid "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
++msgstr "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
++
++#: ../src/ui/theme.c:4797
++#, c-format
++msgid "Failed to load theme \"%s\": %s\n"
++msgstr "Failed to load theme \"%s\": %s\n"
++
++#: ../src/ui/theme.c:4927 ../src/ui/theme.c:4934 ../src/ui/theme.c:4941
++#: ../src/ui/theme.c:4948 ../src/ui/theme.c:4955
++#, c-format
++msgid "No <%s> set for theme \"%s\""
++msgstr "No <%s> set for theme \"%s\""
++
++#: ../src/ui/theme.c:4963
++#, c-format
++msgid ""
++"No frame style set for window type \"%s\" in theme \"%s\", add a <window "
++"type=\"%s\" style_set=\"whatever\"/> element"
++msgstr "No frame style set for window type \"%s\" in theme \"%s\", add a <window type=\"%s\" style_set=\"whatever\"/> element"
++
++#: ../src/ui/theme.c:5406 ../src/ui/theme.c:5468 ../src/ui/theme.c:5531
++#, c-format
++msgid "User-defined constants must begin with a capital letter; \"%s\" does not"
++msgstr "User-defined constants must begin with a capital letter; \"%s\" does not"
++
++#: ../src/ui/theme.c:5414 ../src/ui/theme.c:5476 ../src/ui/theme.c:5539
++#, c-format
++msgid "Constant \"%s\" has already been defined"
++msgstr "Constant \"%s\" has already been defined"
++
++#. Translators: This means that an attribute which should have been found
++#. * on an XML element was not in fact found.
++#.
++#: ../src/ui/theme-parser.c:226
++#, c-format
++msgid "No \"%s\" attribute on element <%s>"
++msgstr "No \"%s\" attribute on element <%s>"
++
++#: ../src/ui/theme-parser.c:255 ../src/ui/theme-parser.c:273
++#, c-format
++msgid "Line %d character %d: %s"
++msgstr "Line %d character %d: %s"
++
++#: ../src/ui/theme-parser.c:437
++#, c-format
++msgid "Attribute \"%s\" repeated twice on the same <%s> element"
++msgstr "Attribute \"%s\" repeated twice on the same <%s> element"
++
++#: ../src/ui/theme-parser.c:461 ../src/ui/theme-parser.c:504
++#, c-format
++msgid "Attribute \"%s\" is invalid on <%s> element in this context"
++msgstr "Attribute \"%s\" is invalid on <%s> element in this context"
++
++#: ../src/ui/theme-parser.c:546
++#, c-format
++msgid "Could not parse \"%s\" as an integer"
++msgstr "Could not parse \"%s\" as an integer"
++
++#: ../src/ui/theme-parser.c:555 ../src/ui/theme-parser.c:610
++#, c-format
++msgid "Did not understand trailing characters \"%s\" in string \"%s\""
++msgstr "Did not understand trailing characters \"%s\" in string \"%s\""
++
++#: ../src/ui/theme-parser.c:565
++#, c-format
++msgid "Integer %ld must be positive"
++msgstr "Integer %ld must be positive"
++
++#: ../src/ui/theme-parser.c:573
++#, c-format
++msgid "Integer %ld is too large, current max is %d"
++msgstr "Integer %ld is too large, current max is %d"
++
++#: ../src/ui/theme-parser.c:601 ../src/ui/theme-parser.c:717
++#, c-format
++msgid "Could not parse \"%s\" as a floating point number"
++msgstr "Could not parse \"%s\" as a floating point number"
++
++#: ../src/ui/theme-parser.c:632 ../src/ui/theme-parser.c:660
++#, c-format
++msgid "Boolean values must be \"true\" or \"false\" not \"%s\""
++msgstr "Boolean values must be \"true\" or \"false\" not \"%s\""
++
++#: ../src/ui/theme-parser.c:687
++#, c-format
++msgid "Angle must be between 0.0 and 360.0, was %g\n"
++msgstr "Angle must be between 0.0 and 360.0, was %g\n"
++
++#: ../src/ui/theme-parser.c:750
++#, c-format
++msgid "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
++msgstr "Alpha must be between 0.0 (invisible) and 1.0 (fully opaque), was %g\n"
++
++#: ../src/ui/theme-parser.c:815
++#, c-format
++msgid ""
++"Invalid title scale \"%s\" (must be one of xx-"
++"small,x-small,small,medium,large,x-large,xx-large)\n"
++msgstr "Invalid title scale \"%s\" (must be one of xx-small,x-small,small,medium,large,x-large,xx-large)\n"
++
++#: ../src/ui/theme-parser.c:971 ../src/ui/theme-parser.c:1034
++#: ../src/ui/theme-parser.c:1068 ../src/ui/theme-parser.c:1171
++#, c-format
++msgid "<%s> name \"%s\" used a second time"
++msgstr "<%s> name \"%s\" used a second time"
++
++#: ../src/ui/theme-parser.c:983 ../src/ui/theme-parser.c:1080
++#: ../src/ui/theme-parser.c:1183
++#, c-format
++msgid "<%s> parent \"%s\" has not been defined"
++msgstr "<%s> parent \"%s\" has not been defined"
++
++#: ../src/ui/theme-parser.c:1093
++#, c-format
++msgid "<%s> geometry \"%s\" has not been defined"
++msgstr "<%s> geometry \"%s\" has not been defined"
++
++#: ../src/ui/theme-parser.c:1106
++#, c-format
++msgid "<%s> must specify either a geometry or a parent that has a geometry"
++msgstr "<%s> must specify either a geometry or a parent that has a geometry"
++
++#: ../src/ui/theme-parser.c:1148
++msgid "You must specify a background for an alpha value to be meaningful"
++msgstr "You must specify a background for an alpha value to be meaningful"
++
++#: ../src/ui/theme-parser.c:1215
++#, c-format
++msgid "Unknown type \"%s\" on <%s> element"
++msgstr "Unknown type \"%s\" on <%s> element"
++
++#: ../src/ui/theme-parser.c:1226
++#, c-format
++msgid "Unknown style_set \"%s\" on <%s> element"
++msgstr "Unknown style_set \"%s\" on <%s> element"
++
++#: ../src/ui/theme-parser.c:1234
++#, c-format
++msgid "Window type \"%s\" has already been assigned a style set"
++msgstr "Window type \"%s\" has already been assigned a style set"
++
++#: ../src/ui/theme-parser.c:1264 ../src/ui/theme-parser.c:1328
++#: ../src/ui/theme-parser.c:1554 ../src/ui/theme-parser.c:2775
++#: ../src/ui/theme-parser.c:2821 ../src/ui/theme-parser.c:2979
++#: ../src/ui/theme-parser.c:3171 ../src/ui/theme-parser.c:3209
++#: ../src/ui/theme-parser.c:3247 ../src/ui/theme-parser.c:3265
++#: ../src/ui/theme-parser.c:3281 ../src/ui/theme-parser.c:3319
++#, c-format
++msgid "Element <%s> is not allowed below <%s>"
++msgstr "Element <%s> is not allowed below <%s>"
++
++#: ../src/ui/theme-parser.c:1378 ../src/ui/theme-parser.c:1392
++#: ../src/ui/theme-parser.c:1437
++msgid ""
++"Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" "
++"for buttons"
++msgstr "Cannot specify both \"button_width\"/\"button_height\" and \"aspect_ratio\" for buttons"
++
++#: ../src/ui/theme-parser.c:1401
++#, c-format
++msgid "Distance \"%s\" is unknown"
++msgstr "Distance \"%s\" is unknown"
++
++#: ../src/ui/theme-parser.c:1446
++#, c-format
++msgid "Aspect ratio \"%s\" is unknown"
++msgstr "Aspect ratio \"%s\" is unknown"
++
++#: ../src/ui/theme-parser.c:1508
++#, c-format
++msgid "Border \"%s\" is unknown"
++msgstr "Border \"%s\" is unknown"
++
++#: ../src/ui/theme-parser.c:1819
++#, c-format
++msgid "No \"start_angle\" or \"from\" attribute on element <%s>"
++msgstr "No \"start_angle\" or \"from\" attribute on element <%s>"
++
++#: ../src/ui/theme-parser.c:1826
++#, c-format
++msgid "No \"extent_angle\" or \"to\" attribute on element <%s>"
++msgstr "No \"extent_angle\" or \"to\" attribute on element <%s>"
++
++#: ../src/ui/theme-parser.c:2066
++#, c-format
++msgid "Did not understand value \"%s\" for type of gradient"
++msgstr "Did not understand value \"%s\" for type of gradient"
++
++#: ../src/ui/theme-parser.c:2144 ../src/ui/theme-parser.c:2519
++#, c-format
++msgid "Did not understand fill type \"%s\" for <%s> element"
++msgstr "Did not understand fill type \"%s\" for <%s> element"
++
++#: ../src/ui/theme-parser.c:2311 ../src/ui/theme-parser.c:2394
++#: ../src/ui/theme-parser.c:2457
++#, c-format
++msgid "Did not understand state \"%s\" for <%s> element"
++msgstr "Did not understand state \"%s\" for <%s> element"
++
++#: ../src/ui/theme-parser.c:2321 ../src/ui/theme-parser.c:2404
++#, c-format
++msgid "Did not understand shadow \"%s\" for <%s> element"
++msgstr "Did not understand shadow \"%s\" for <%s> element"
++
++#: ../src/ui/theme-parser.c:2331
++#, c-format
++msgid "Did not understand arrow \"%s\" for <%s> element"
++msgstr "Did not understand arrow \"%s\" for <%s> element"
++
++#: ../src/ui/theme-parser.c:2631 ../src/ui/theme-parser.c:2727
++#, c-format
++msgid "No <draw_ops> called \"%s\" has been defined"
++msgstr "No <draw_ops> called \"%s\" has been defined"
++
++#: ../src/ui/theme-parser.c:2643 ../src/ui/theme-parser.c:2739
++#, c-format
++msgid "Including draw_ops \"%s\" here would create a circular reference"
++msgstr "Including draw_ops \"%s\" here would create a circular reference"
++
++#: ../src/ui/theme-parser.c:2854
++#, c-format
++msgid "Unknown position \"%s\" for frame piece"
++msgstr "Unknown position \"%s\" for frame piece"
++
++#: ../src/ui/theme-parser.c:2862
++#, c-format
++msgid "Frame style already has a piece at position %s"
++msgstr "Frame style already has a piece at position %s"
++
++#: ../src/ui/theme-parser.c:2879 ../src/ui/theme-parser.c:2954
++#, c-format
++msgid "No <draw_ops> with the name \"%s\" has been defined"
++msgstr "No <draw_ops> with the name \"%s\" has been defined"
++
++#: ../src/ui/theme-parser.c:2908
++#, c-format
++msgid "Unknown function \"%s\" for button"
++msgstr "Unknown function \"%s\" for button"
++
++#: ../src/ui/theme-parser.c:2917
++#, c-format
++msgid "Button function \"%s\" does not exist in this version (%d, need %d)"
++msgstr "Button function \"%s\" does not exist in this version (%d, need %d)"
++
++#: ../src/ui/theme-parser.c:2929
++#, c-format
++msgid "Unknown state \"%s\" for button"
++msgstr "Unknown state \"%s\" for button"
++
++#: ../src/ui/theme-parser.c:2937
++#, c-format
++msgid "Frame style already has a button for function %s state %s"
++msgstr "Frame style already has a button for function %s state %s"
++
++#: ../src/ui/theme-parser.c:3018
++#, c-format
++msgid "\"%s\" is not a valid value for focus attribute"
++msgstr "\"%s\" is not a valid value for focus attribute"
++
++#: ../src/ui/theme-parser.c:3027
++#, c-format
++msgid "\"%s\" is not a valid value for state attribute"
++msgstr "\"%s\" is not a valid value for state attribute"
++
++#: ../src/ui/theme-parser.c:3037
++#, c-format
++msgid "A style called \"%s\" has not been defined"
++msgstr "A style called \"%s\" has not been defined"
++
++#: ../src/ui/theme-parser.c:3058 ../src/ui/theme-parser.c:3081
++#, c-format
++msgid "\"%s\" is not a valid value for resize attribute"
++msgstr "\"%s\" is not a valid value for resize attribute"
++
++#: ../src/ui/theme-parser.c:3092
++#, c-format
++msgid ""
++"Should not have \"resize\" attribute on <%s> element for maximized/shaded "
++"states"
++msgstr "Should not have \"resize\" attribute on <%s> element for maximised/shaded states"
++
++#: ../src/ui/theme-parser.c:3106
++#, c-format
++msgid "Should not have \"resize\" attribute on <%s> element for maximized states"
++msgstr "Should not have \"resize\" attribute on <%s> element for maximised states"
++
++#: ../src/ui/theme-parser.c:3120 ../src/ui/theme-parser.c:3142
++#, c-format
++msgid "Style has already been specified for state %s resize %s focus %s"
++msgstr "Style has already been specified for state %s resize %s focus %s"
++
++#: ../src/ui/theme-parser.c:3131 ../src/ui/theme-parser.c:3153
++#, c-format
++msgid "Style has already been specified for state %s focus %s"
++msgstr "Style has already been specified for state %s focus %s"
++
++#: ../src/ui/theme-parser.c:3192
++msgid ""
++"Can't have a two draw_ops for a <piece> element (theme specified a draw_ops "
++"attribute and also a <draw_ops> element, or specified two elements)"
++msgstr "Can't have a two draw_ops for a <piece> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)"
++
++#: ../src/ui/theme-parser.c:3230
++msgid ""
++"Can't have a two draw_ops for a <button> element (theme specified a draw_ops"
++" attribute and also a <draw_ops> element, or specified two elements)"
++msgstr "Can't have a two draw_ops for a <button> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)"
++
++#: ../src/ui/theme-parser.c:3302
++msgid ""
++"Can't have a two draw_ops for a <menu_icon> element (theme specified a "
++"draw_ops attribute and also a <draw_ops> element, or specified two elements)"
++msgstr "Can't have a two draw_ops for a <menu_icon> element (theme specified a draw_ops attribute and also a <draw_ops> element, or specified two elements)"
++
++#: ../src/ui/theme-parser.c:3350
++#, c-format
++msgid "Outermost element in theme must be <metacity_theme> not <%s>"
++msgstr "Outermost element in theme must be <metacity_theme> not <%s>"
++
++#: ../src/ui/theme-parser.c:3370
++#, c-format
++msgid ""
++"Element <%s> is not allowed inside a name/author/date/description element"
++msgstr "Element <%s> is not allowed inside a name/author/date/description element"
++
++#: ../src/ui/theme-parser.c:3375
++#, c-format
++msgid "Element <%s> is not allowed inside a <constant> element"
++msgstr "Element <%s> is not allowed inside a <constant> element"
++
++#: ../src/ui/theme-parser.c:3387
++#, c-format
++msgid ""
++"Element <%s> is not allowed inside a distance/border/aspect_ratio element"
++msgstr "Element <%s> is not allowed inside a distance/border/aspect_ratio element"
++
++#: ../src/ui/theme-parser.c:3409
++#, c-format
++msgid "Element <%s> is not allowed inside a draw operation element"
++msgstr "Element <%s> is not allowed inside a draw operation element"
++
++#: ../src/ui/theme-parser.c:3419 ../src/ui/theme-parser.c:3461
++#: ../src/ui/theme-parser.c:3466 ../src/ui/theme-parser.c:3471
++#, c-format
++msgid "Element <%s> is not allowed inside a <%s> element"
++msgstr "Element <%s> is not allowed inside a <%s> element"
++
++#: ../src/ui/theme-parser.c:3693
++msgid "No draw_ops provided for frame piece"
++msgstr "No draw_ops provided for frame piece"
++
++#: ../src/ui/theme-parser.c:3708
++msgid "No draw_ops provided for button"
++msgstr "No draw_ops provided for button"
++
++#: ../src/ui/theme-parser.c:3770
++#, c-format
++msgid "No text is allowed inside element <%s>"
++msgstr "No text is allowed inside element <%s>"
++
++#: ../src/ui/theme-parser.c:3825 ../src/ui/theme-parser.c:3837
++#: ../src/ui/theme-parser.c:3849 ../src/ui/theme-parser.c:3861
++#: ../src/ui/theme-parser.c:3873
++#, c-format
++msgid "<%s> specified twice for this theme"
++msgstr "<%s> specified twice for this theme"
++
++#: ../src/ui/theme-parser.c:4149
++#, c-format
++msgid "Failed to find a valid file for theme %s\n"
++msgstr "Failed to find a valid file for theme %s\n"
++
++#: ../src/ui/theme-parser.c:4205
++#, c-format
++msgid "Theme file %s did not contain a root <metacity_theme> element"
++msgstr "Theme file %s did not contain a root <metacity_theme> element"
++
++#: ../src/ui/theme-viewer.c:75
++msgid "/_Windows"
++msgstr "/_Windows"
++
++#: ../src/ui/theme-viewer.c:76
++msgid "/Windows/tearoff"
++msgstr "/Windows/tearoff"
++
++#: ../src/ui/theme-viewer.c:77
++msgid "/Windows/_Dialog"
++msgstr "/Windows/_Dialogue"
++
++#: ../src/ui/theme-viewer.c:78
++msgid "/Windows/_Modal dialog"
++msgstr "/Windows/_Modal dialogue"
++
++#: ../src/ui/theme-viewer.c:79
++msgid "/Windows/_Utility"
++msgstr "/Windows/_Utility"
++
++#: ../src/ui/theme-viewer.c:80
++msgid "/Windows/_Splashscreen"
++msgstr "/Windows/_Splashscreen"
++
++#: ../src/ui/theme-viewer.c:81
++msgid "/Windows/_Top dock"
++msgstr "/Windows/_Top dock"
++
++#: ../src/ui/theme-viewer.c:82
++msgid "/Windows/_Bottom dock"
++msgstr "/Windows/_Bottom dock"
++
++#: ../src/ui/theme-viewer.c:83
++msgid "/Windows/_Left dock"
++msgstr "/Windows/_Left dock"
++
++#: ../src/ui/theme-viewer.c:84
++msgid "/Windows/_Right dock"
++msgstr "/Windows/_Right dock"
++
++#: ../src/ui/theme-viewer.c:85
++msgid "/Windows/_All docks"
++msgstr "/Windows/_All docks"
++
++#: ../src/ui/theme-viewer.c:86
++msgid "/Windows/Des_ktop"
++msgstr "/Windows/Des_ktop"
++
++#: ../src/ui/theme-viewer.c:244
++msgid "This is a sample message in a sample dialog"
++msgstr "This is a sample message in a sample dialogue"
++
++#: ../src/ui/theme-viewer.c:327
++#, c-format
++msgid "Fake menu item %d\n"
++msgstr "Fake menu item %d\n"
++
++#: ../src/ui/theme-viewer.c:361
++msgid "Border-only window"
++msgstr "Border-only window"
++
++#: ../src/ui/theme-viewer.c:363
++msgid "Bar"
++msgstr "Bar"
++
++#: ../src/ui/theme-viewer.c:380
++msgid "Normal Application Window"
++msgstr "Normal Application Window"
++
++#: ../src/ui/theme-viewer.c:384
++msgid "Dialog Box"
++msgstr "Dialogue Box"
++
++#: ../src/ui/theme-viewer.c:388
++msgid "Modal Dialog Box"
++msgstr "Modal Dialogue Box"
++
++#: ../src/ui/theme-viewer.c:392
++msgid "Utility Palette"
++msgstr "Utility Palette"
++
++#: ../src/ui/theme-viewer.c:396
++msgid "Torn-off Menu"
++msgstr "Torn-off Menu"
++
++#: ../src/ui/theme-viewer.c:400
++msgid "Border"
++msgstr "Border"
++
++#: ../src/ui/theme-viewer.c:728
++#, c-format
++msgid "Button layout test %d"
++msgstr "Button layout test %d"
++
++#: ../src/ui/theme-viewer.c:757
++#, c-format
++msgid "%g milliseconds to draw one window frame"
++msgstr "%g milliseconds to draw one window frame"
++
++#: ../src/ui/theme-viewer.c:800
++#, c-format
++msgid "Usage: marco-theme-viewer [THEMENAME]\n"
++msgstr "Usage: marco-theme-viewer [THEMENAME]\n"
++
++#: ../src/ui/theme-viewer.c:807
++#, c-format
++msgid "Error loading theme: %s\n"
++msgstr "Error loading theme: %s\n"
++
++#: ../src/ui/theme-viewer.c:813
++#, c-format
++msgid "Loaded theme \"%s\" in %g seconds\n"
++msgstr "Loaded theme \"%s\" in %g seconds\n"
++
++#: ../src/ui/theme-viewer.c:854
++msgid "Normal Title Font"
++msgstr "Normal Title Font"
++
++#: ../src/ui/theme-viewer.c:860
++msgid "Small Title Font"
++msgstr "Small Title Font"
++
++#: ../src/ui/theme-viewer.c:866
++msgid "Large Title Font"
++msgstr "Large Title Font"
++
++#: ../src/ui/theme-viewer.c:871
++msgid "Button Layouts"
++msgstr "Button Layouts"
++
++#: ../src/ui/theme-viewer.c:876
++msgid "Benchmark"
++msgstr "Benchmark"
++
++#: ../src/ui/theme-viewer.c:923
++msgid "Window Title Goes Here"
++msgstr "Window Title Goes Here"
++
++#: ../src/ui/theme-viewer.c:1027
++#, c-format
++msgid ""
++"Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
++"seconds wall clock time including X server resources (%g milliseconds per "
++"frame)\n"
++msgstr "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g seconds wall clock time including X server resources (%g milliseconds per frame)\n"
++
++#: ../src/ui/theme-viewer.c:1246
++msgid "position expression test returned TRUE but set error"
++msgstr "position expression test returned TRUE but set error"
++
++#: ../src/ui/theme-viewer.c:1248
++msgid "position expression test returned FALSE but didn't set error"
++msgstr "position expression test returned FALSE but didn't set error"
++
++#: ../src/ui/theme-viewer.c:1252
++msgid "Error was expected but none given"
++msgstr "Error was expected but none given"
++
++#: ../src/ui/theme-viewer.c:1254
++#, c-format
++msgid "Error %d was expected but %d given"
++msgstr "Error %d was expected but %d given"
++
++#: ../src/ui/theme-viewer.c:1260
++#, c-format
++msgid "Error not expected but one was returned: %s"
++msgstr "Error not expected but one was returned: %s"
++
++#: ../src/ui/theme-viewer.c:1264
++#, c-format
++msgid "x value was %d, %d was expected"
++msgstr "x value was %d, %d was expected"
++
++#: ../src/ui/theme-viewer.c:1267
++#, c-format
++msgid "y value was %d, %d was expected"
++msgstr "y value was %d, %d was expected"
++
++#: ../src/ui/theme-viewer.c:1332
++#, c-format
++msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
++msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
+diff -uNrp a/po/LINGUAS b/po/LINGUAS
+--- a/po/LINGUAS 2013-01-13 13:28:38.000000000 -0800
++++ b/po/LINGUAS 2013-02-18 11:14:02.095842285 -0800
+@@ -21,6 +21,7 @@ da
+ de
+ dz
+ el
++en_AU
+ en_CA
+ en_GB
+ en at shaw
+diff -uNrp a/po/POTFILES.in b/po/POTFILES.in
+--- a/po/POTFILES.in 2013-01-13 13:28:38.000000000 -0800
++++ b/po/POTFILES.in 2013-02-18 11:14:02.095842285 -0800
+@@ -1,7 +1,8 @@
+ # List of source files containing translatable strings.
+ # Please keep this file sorted alphabetically.
+ src/50-marco-desktop-key.xml.in
+-src/50-marco-key.xml.in
++src/50-marco-global-key.xml.in
++src/50-marco-window-key.xml.in
+ src/core/bell.c
+ src/core/core.c
+ src/core/delete.c
+@@ -26,4 +27,3 @@ src/ui/resizepopup.c
+ src/ui/theme.c
+ src/ui/theme-parser.c
+ src/ui/theme-viewer.c
+-
+diff -uNrp a/src/include/all-keybindings.h b/src/include/all-keybindings.h
+--- a/src/include/all-keybindings.h 2013-01-13 13:28:39.000000000 -0800
++++ b/src/include/all-keybindings.h 2013-02-18 11:14:02.276871037 -0800
+@@ -150,43 +150,43 @@ keybind (panel-run-dialog, handle_panel,
+ * irregularly shaped in marco.schemas.in. This will probably be fixed
+ * as well.
+ */
+-keybind (run-comman-1, handle_run_command, 0, 0)
+-keybind (run-comman-2, handle_run_command, 1, 0)
+-keybind (run-comman-3, handle_run_command, 2, 0)
+-keybind (run-comman-4, handle_run_command, 3, 0)
+-keybind (run-comman-5, handle_run_command, 4, 0)
+-keybind (run-comman-6, handle_run_command, 5, 0)
+-keybind (run-comman-7, handle_run_command, 6, 0)
+-keybind (run-comman-8, handle_run_command, 7, 0)
+-keybind (run-comman-9, handle_run_command, 8, 0)
+-keybind (run-comman-10, handle_run_command, 9, 0)
+-keybind (run-comman-11, handle_run_command, 10, 0)
+-keybind (run-comman-12, handle_run_command, 11, 0)
+-keybind (run-comman-13, handle_run_command, 12, 0)
+-keybind (run-comman-14, handle_run_command, 13, 0)
+-keybind (run-comman-15, handle_run_command, 14, 0)
+-keybind (run-comman-16, handle_run_command, 15, 0)
+-keybind (run-comman-17, handle_run_command, 16, 0)
+-keybind (run-comman-18, handle_run_command, 17, 0)
+-keybind (run-comman-19, handle_run_command, 18, 0)
+-keybind (run-comman-20, handle_run_command, 19, 0)
+-keybind (run-comman-21, handle_run_command, 20, 0)
+-keybind (run-comman-22, handle_run_command, 21, 0)
+-keybind (run-comman-23, handle_run_command, 22, 0)
+-keybind (run-comman-24, handle_run_command, 23, 0)
+-keybind (run-comman-25, handle_run_command, 24, 0)
+-keybind (run-comman-26, handle_run_command, 25, 0)
+-keybind (run-comman-27, handle_run_command, 26, 0)
+-keybind (run-comman-28, handle_run_command, 27, 0)
+-keybind (run-comman-29, handle_run_command, 28, 0)
+-keybind (run-comman-30, handle_run_command, 29, 0)
+-keybind (run-comman-31, handle_run_command, 30, 0)
+-keybind (run-comman-32, handle_run_command, 31, 0)
++keybind (run-command-1, handle_run_command, 0, 0)
++keybind (run-command-2, handle_run_command, 1, 0)
++keybind (run-command-3, handle_run_command, 2, 0)
++keybind (run-command-4, handle_run_command, 3, 0)
++keybind (run-command-5, handle_run_command, 4, 0)
++keybind (run-command-6, handle_run_command, 5, 0)
++keybind (run-command-7, handle_run_command, 6, 0)
++keybind (run-command-8, handle_run_command, 7, 0)
++keybind (run-command-9, handle_run_command, 8, 0)
++keybind (run-command-10, handle_run_command, 9, 0)
++keybind (run-command-11, handle_run_command, 10, 0)
++keybind (run-command-12, handle_run_command, 11, 0)
++keybind (run-command-13, handle_run_command, 12, 0)
++keybind (run-command-14, handle_run_command, 13, 0)
++keybind (run-command-15, handle_run_command, 14, 0)
++keybind (run-command-16, handle_run_command, 15, 0)
++keybind (run-command-17, handle_run_command, 16, 0)
++keybind (run-command-18, handle_run_command, 17, 0)
++keybind (run-command-19, handle_run_command, 18, 0)
++keybind (run-command-20, handle_run_command, 19, 0)
++keybind (run-command-21, handle_run_command, 20, 0)
++keybind (run-command-22, handle_run_command, 21, 0)
++keybind (run-command-23, handle_run_command, 22, 0)
++keybind (run-command-24, handle_run_command, 23, 0)
++keybind (run-command-25, handle_run_command, 24, 0)
++keybind (run-command-26, handle_run_command, 25, 0)
++keybind (run-command-27, handle_run_command, 26, 0)
++keybind (run-command-28, handle_run_command, 27, 0)
++keybind (run-command-29, handle_run_command, 28, 0)
++keybind (run-command-30, handle_run_command, 29, 0)
++keybind (run-command-31, handle_run_command, 30, 0)
++keybind (run-command-32, handle_run_command, 31, 0)
+
+-keybind (run-comman-screenshot, handle_run_command, 32, 0)
+-keybind (run-comman-window_screenshot, handle_run_command, 33, 0)
++keybind (run-command-screenshot, handle_run_command, 32, 0)
++keybind (run-command-window_screenshot, handle_run_command, 33, 0)
+
+-keybind (run-comman-terminal, handle_run_terminal, 0, 0)
++keybind (run-command-terminal, handle_run_terminal, 0, 0)
+
+ /* No description because this is undocumented */
+ keybind (set-spew-mark, handle_set_spew_mark, 0, 0)
+diff -uNrp a/src/org.mate.marco.gschema.xml b/src/org.mate.marco.gschema.xml
+--- a/src/org.mate.marco.gschema.xml 2013-01-13 13:28:39.000000000 -0800
++++ b/src/org.mate.marco.gschema.xml 2013-02-18 11:14:02.284872308 -0800
+@@ -31,7 +31,7 @@
+ <value nick="last" value="8"/>
+ </enum>
+
+- <schema id="org.mate.Marco" path="/apps/marco/">
++ <schema id="org.mate.Marco" path="/org/mate/marco/">
+ <child name="general" schema="org.mate.Marco.general"/>
+ <child name="workspace-names" schema="org.mate.Marco.workspace-names"/>
+ <child name="global-keybindings" schema="org.mate.Marco.global-keybindings"/>
+@@ -39,7 +39,7 @@
+ <child name="window-keybindings" schema="org.mate.Marco.window-keybindings"/>
+ </schema>
+
+- <schema id="org.mate.Marco.general" path="/apps/marco/general/">
++ <schema id="org.mate.Marco.general" path="/org/mate/marco/general/">
+ <key name="mouse-button-modifier" type="s">
+ <default>'<Alt>'</default>
+ <summary>Modifier to use for modified window click actions</summary>
+@@ -163,7 +163,7 @@
+ </key>
+ </schema>
+
+- <schema id="org.mate.Marco.workspace-names" path="/apps/marco/workspace-names/">
++ <schema id="org.mate.Marco.workspace-names" path="/org/mate/marco/workspace-names/">
+ <key name="name-1" type="s">
+ <default>''</default>
+ <summary>Name of workspace</summary>
+@@ -246,7 +246,7 @@
+ </key>
+ </schema>
+
+- <schema id="org.mate.Marco.global-keybindings" path="/apps/marco/global-keybindings/">
++ <schema id="org.mate.Marco.global-keybindings" path="/org/mate/marco/global-keybindings/">
+ <key name="run-command-1" type="s">
+ <default>'disabled'</default>
+ <summary>Run a defined command</summary>
+@@ -489,7 +489,7 @@
+ </key>
+ </schema>
+
+- <schema id="org.mate.Marco.keybinding-commands" path="/apps/marco/keybinding-commands/">
++ <schema id="org.mate.Marco.keybinding-commands" path="/org/mate/marco/keybinding-commands/">
+ <key name="command-1" type="s">
+ <default>' '</default>
+ <summary>Commands to run in response to keybindings</summary>
+@@ -507,7 +507,7 @@
+ </key>
+ </schema>
+
+- <schema id="org.mate.Marco.window-keybindings" path="/apps/marco/window-keybindings/">
++ <schema id="org.mate.Marco.window-keybindings" path="/org/mate/marco/window-keybindings/">
+ <key name="activate-window-menu" type="s">
+ <default>'<Alt>space'</default>
+ <summary>Activate the window menu</summary>
More information about the scm-commits
mailing list