diff --git a/.gitignore b/.gitignore index ac19e65..c402d2b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ core-*.tar.* .build-*.log /i?86/ /x86_64/ +/compiz_primary-is-control.patch diff --git a/50-marco-navigation.xml b/50-marco-navigation.xml deleted file mode 100644 index 88ef92c..0000000 --- a/50-marco-navigation.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/50-marco-system.xml b/50-marco-system.xml deleted file mode 100644 index eaf5085..0000000 --- a/50-marco-system.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/50-marco-windows.xml b/50-marco-windows.xml deleted file mode 100644 index 5b62b66..0000000 --- a/50-marco-windows.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/comiz_mate_fork.patch b/comiz_mate_fork.patch deleted file mode 100644 index 9854b79..0000000 --- a/comiz_mate_fork.patch +++ /dev/null @@ -1,19604 +0,0 @@ -diff -upr compiz-0.8.8-orig/aclocal.m4 compiz-0.8.8/aclocal.m4 ---- compiz-0.8.8-orig/aclocal.m4 2011-03-30 11:33:33.000000000 +0200 -+++ compiz-0.8.8/aclocal.m4 2012-05-16 12:40:38.000000000 +0200 -@@ -19,40 +19,40 @@ You have another version of autoconf. I - If you have problems, you may need to regenerate the build system entirely. - To do so, use the procedure documented by the package, typically `autoreconf'.])]) - --dnl AM_GCONF_SOURCE_2 --dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas --dnl (i.e. pass to gconftool-2 --dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -+dnl AM_MATECONF_SOURCE_2 -+dnl Defines MATECONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -+dnl (i.e. pass to mateconftool-2 -+dnl Defines MATECONF_SCHEMA_FILE_DIR which is a filesystem directory where - dnl you should install foo.schemas files - dnl - --AC_DEFUN([AM_GCONF_SOURCE_2], -+AC_DEFUN([AM_MATECONF_SOURCE_2], - [ -- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source` - else -- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE - fi - -- AC_ARG_WITH([gconf-source], -- AC_HELP_STRING([--with-gconf-source=sourceaddress], -+ AC_ARG_WITH([mateconf-source], -+ AC_HELP_STRING([--with-mateconf-source=sourceaddress], - [Config database for installing schema files.]), -- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) -+ [MATECONF_SCHEMA_CONFIG_SOURCE="$withval"],) - -- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) -- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -+ AC_SUBST(MATECONF_SCHEMA_CONFIG_SOURCE) -+ AC_MSG_RESULT([Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation]) - -- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then -+ MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas' - fi - -- AC_ARG_WITH([gconf-schema-file-dir], -- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], -+ AC_ARG_WITH([mateconf-schema-file-dir], -+ AC_HELP_STRING([--with-mateconf-schema-file-dir=dir], - [Directory for installing schema files.]), -- [GCONF_SCHEMA_FILE_DIR="$withval"],) -+ [MATECONF_SCHEMA_FILE_DIR="$withval"],) - -- AC_SUBST(GCONF_SCHEMA_FILE_DIR) -- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -+ AC_SUBST(MATECONF_SCHEMA_FILE_DIR) -+ AC_MSG_RESULT([Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], -@@ -61,7 +61,7 @@ AC_DEFUN([AM_GCONF_SOURCE_2], - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) -- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -+ AM_CONDITIONAL([MATECONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) - ]) - - # Copyright (C) 1995-2002 Free Software Foundation, Inc. -Nur in compiz-0.8.8: autogen.sh. -Nur in compiz-0.8.8-orig: compiz-gconf.pc.in. -diff -upr compiz-0.8.8-orig/compiz-mateconf.pc.in compiz-0.8.8/compiz-mateconf.pc.in ---- compiz-0.8.8-orig/compiz-mateconf.pc.in 2012-08-26 11:09:57.819499032 +0200 -+++ compiz-0.8.8/compiz-mateconf.pc.in 2012-05-16 12:40:07.000000000 +0200 -@@ -0,0 +1,6 @@ -+prefix=@prefix@ -+xsltdir=@datarootdir@/compiz -+ -+Name: compiz-mateconf -+Description: MateConf plugin for compiz -+Version: @VERSION@ -diff -upr compiz-0.8.8-orig/config.h.in compiz-0.8.8/config.h.in ---- compiz-0.8.8-orig/config.h.in 2011-03-30 11:33:45.000000000 +0200 -+++ compiz-0.8.8/config.h.in 2012-05-16 12:40:08.000000000 +0200 -@@ -42,14 +42,14 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_MEMORY_H - --/* Define to 1 if metacity version >= 2.15.21 */ --#undef HAVE_METACITY_2_15_21 -+/* Define to 1 if marco version >= 2.15.21 */ -+#undef HAVE_MARCO_2_15_21 - --/* Define to 1 if metacity version >= 2.17.0 */ --#undef HAVE_METACITY_2_17_0 -+/* Define to 1 if marco version >= 2.17.0 */ -+#undef HAVE_MARCO_2_17_0 - --/* Define to 1 if metacity version >= 2.23.2 */ --#undef HAVE_METACITY_2_23_2 -+/* Define to 1 if marco version >= 2.23.2 */ -+#undef HAVE_MARCO_2_23_2 - - /* Define to 1 if you have the header file. */ - #undef HAVE_STDINT_H -@@ -127,17 +127,17 @@ - /* Build fuse plugin */ - #undef USE_FUSE - --/* Build gconf plugin */ --#undef USE_GCONF -+/* Build mateconf plugin */ -+#undef USE_MATECONF - - /* Build glib plugin */ - #undef USE_GLIB - --/* Build gnome settings module */ --#undef USE_GNOME -+/* Build mate settings module */ -+#undef USE_MATE - - /* Install custom keybindings */ --#undef USE_GNOME_KEYBINDINGS -+#undef USE_MATE_KEYBINDINGS - - /* Build gtk window decorator */ - #undef USE_GTK -@@ -157,8 +157,8 @@ - /* librsvg for SVG support */ - #undef USE_LIBRSVG - --/* Build metacity theme support */ --#undef USE_METACITY -+/* Build marco theme support */ -+#undef USE_MARCO - - /* Version number of package */ - #undef VERSION -diff -upr compiz-0.8.8-orig/configure compiz-0.8.8/configure ---- compiz-0.8.8-orig/configure 2011-03-30 11:33:36.000000000 +0200 -+++ compiz-0.8.8/configure 2012-05-16 12:40:42.000000000 +0200 -@@ -631,23 +631,23 @@ USE_KDE_FALSE - USE_KDE_TRUE - KDE_WINDOW_DECORATOR_LIBS - KDE_WINDOW_DECORATOR_CFLAGS --USE_GNOME_KEYBINDINGS_FALSE --USE_GNOME_KEYBINDINGS_TRUE --USE_GNOME_FALSE --USE_GNOME_TRUE --USE_METACITY_FALSE --USE_METACITY_TRUE -+USE_MATE_KEYBINDINGS_FALSE -+USE_MATE_KEYBINDINGS_TRUE -+USE_MATE_FALSE -+USE_MATE_TRUE -+USE_MARCO_FALSE -+USE_MARCO_TRUE - USE_GTK_FALSE - USE_GTK_TRUE - keybindingsdir - windowsettingslibdir - windowsettingsdatadir --GNOME_KEY_BINDINGS_LIBS --GNOME_KEY_BINDINGS_CFLAGS --GNOME_WINDOW_SETTINGS_LIBS --GNOME_WINDOW_SETTINGS_CFLAGS --METACITY_LIBS --METACITY_CFLAGS -+MATE_KEY_BINDINGS_LIBS -+MATE_KEY_BINDINGS_CFLAGS -+MATE_WINDOW_SETTINGS_LIBS -+MATE_WINDOW_SETTINGS_CFLAGS -+MARCO_LIBS -+MARCO_CFLAGS - GTK_WINDOW_DECORATOR_LIBS - GTK_WINDOW_DECORATOR_CFLAGS - USE_LIBRSVG_FALSE -@@ -671,15 +671,15 @@ DBUS_PLUGIN_TRUE - DBUS_LIBS - DBUS_CFLAGS - stylesheetdir --USE_GCONF_FALSE --USE_GCONF_TRUE --GCONF_SCHEMAS_INSTALL_FALSE --GCONF_SCHEMAS_INSTALL_TRUE --GCONF_SCHEMA_FILE_DIR --GCONF_SCHEMA_CONFIG_SOURCE --GCONFTOOL --GCONF_LIBS --GCONF_CFLAGS -+USE_MATECONF_FALSE -+USE_MATECONF_TRUE -+MATECONF_SCHEMAS_INSTALL_FALSE -+MATECONF_SCHEMAS_INSTALL_TRUE -+MATECONF_SCHEMA_FILE_DIR -+MATECONF_SCHEMA_CONFIG_SOURCE -+MATECONFTOOL -+MATECONF_LIBS -+MATECONF_CFLAGS - USE_GLIB_FALSE - USE_GLIB_TRUE - GLIB_LIBS -@@ -877,9 +877,9 @@ with_default_plugins - with_gl_cflags - with_gl_libs - enable_glib --enable_gconf --with_gconf_source --with_gconf_schema_file_dir -+enable_mateconf -+with_mateconf_source -+with_mateconf_schema_file_dir - enable_schemas_install - enable_dbus - enable_dbus_glib -@@ -888,9 +888,9 @@ enable_fuse - enable_annotate - enable_librsvg - enable_gtk --enable_metacity --enable_gnome --enable_gnome_keybindings -+enable_marco -+enable_mate -+enable_mate_keybindings - enable_kde - enable_kde4 - enable_kconfig -@@ -920,8 +920,8 @@ LIBPNG_CFLAGS - LIBPNG_LIBS - GLIB_CFLAGS - GLIB_LIBS --GCONF_CFLAGS --GCONF_LIBS -+MATECONF_CFLAGS -+MATECONF_LIBS - DBUS_CFLAGS - DBUS_LIBS - DBUS_GLIB_CFLAGS -@@ -934,12 +934,12 @@ LIBRSVG_CFLAGS - LIBRSVG_LIBS - GTK_WINDOW_DECORATOR_CFLAGS - GTK_WINDOW_DECORATOR_LIBS --METACITY_CFLAGS --METACITY_LIBS --GNOME_WINDOW_SETTINGS_CFLAGS --GNOME_WINDOW_SETTINGS_LIBS --GNOME_KEY_BINDINGS_CFLAGS --GNOME_KEY_BINDINGS_LIBS -+MARCO_CFLAGS -+MARCO_LIBS -+MATE_WINDOW_SETTINGS_CFLAGS -+MATE_WINDOW_SETTINGS_LIBS -+MATE_KEY_BINDINGS_CFLAGS -+MATE_KEY_BINDINGS_LIBS - KDE_WINDOW_DECORATOR_CFLAGS - KDE_WINDOW_DECORATOR_LIBS - KDE4_WINDOW_DECORATOR_CFLAGS -@@ -1574,7 +1574,7 @@ Optional Features: - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --disable-glib Disable glib plugin -- --disable-gconf Disable gconf plugin -+ --disable-mateconf Disable mateconf plugin - --disable-schemas-install - Disable the schemas installation - --disable-dbus Disable dbus plugin -@@ -1584,9 +1584,9 @@ Optional Features: - --disable-annotate Disable annotate plugin - --disable-librsvg Disable svg support - --disable-gtk Disable gtk window decorator -- --disable-metacity Disable metacity theme support -- --disable-gnome Disable gnome settings module -- --disable-gnome-keybindings Disable gnome keybindings -+ --disable-marco Disable marco theme support -+ --disable-mate Disable mate settings module -+ --disable-mate-keybindings Disable mate keybindings - --disable-kde Disable kde window decorator - --disable-kde4 Disable kde4 window decorator - --disable-kconfig Disable kconfig plugin -@@ -1600,9 +1600,9 @@ Optional Packages: - --with-default-plugins=PLUGINS - --with-gl-cflags=CFLAGS - --with-gl-libs=LIBS -- --with-gconf-source=sourceaddress -+ --with-mateconf-source=sourceaddress - Config database for installing schema files. -- --with-gconf-schema-file-dir=dir -+ --with-mateconf-schema-file-dir=dir - Directory for installing schema files. - --with-max-desktops Max reasonable desktops - -@@ -1635,9 +1635,9 @@ Some influential environment variables: - LIBPNG_LIBS linker flags for LIBPNG, overriding pkg-config - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config -- GCONF_CFLAGS -- C compiler flags for GCONF, overriding pkg-config -- GCONF_LIBS linker flags for GCONF, overriding pkg-config -+ MATECONF_CFLAGS -+ C compiler flags for MATECONF, overriding pkg-config -+ MATECONF_LIBS linker flags for MATECONF, overriding pkg-config - DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config - DBUS_LIBS linker flags for DBUS, overriding pkg-config - DBUS_GLIB_CFLAGS -@@ -1658,19 +1658,19 @@ Some influential environment variables: - C compiler flags for GTK_WINDOW_DECORATOR, overriding pkg-config - GTK_WINDOW_DECORATOR_LIBS - linker flags for GTK_WINDOW_DECORATOR, overriding pkg-config -- METACITY_CFLAGS -- C compiler flags for METACITY, overriding pkg-config -- METACITY_LIBS -- linker flags for METACITY, overriding pkg-config -- GNOME_WINDOW_SETTINGS_CFLAGS -- C compiler flags for GNOME_WINDOW_SETTINGS, overriding -+ MARCO_CFLAGS -+ C compiler flags for MARCO, overriding pkg-config -+ MARCO_LIBS -+ linker flags for MARCO, overriding pkg-config -+ MATE_WINDOW_SETTINGS_CFLAGS -+ C compiler flags for MATE_WINDOW_SETTINGS, overriding - pkg-config -- GNOME_WINDOW_SETTINGS_LIBS -- linker flags for GNOME_WINDOW_SETTINGS, overriding pkg-config -- GNOME_KEY_BINDINGS_CFLAGS -- C compiler flags for GNOME_KEY_BINDINGS, overriding pkg-config -- GNOME_KEY_BINDINGS_LIBS -- linker flags for GNOME_KEY_BINDINGS, overriding pkg-config -+ MATE_WINDOW_SETTINGS_LIBS -+ linker flags for MATE_WINDOW_SETTINGS, overriding pkg-config -+ MATE_KEY_BINDINGS_CFLAGS -+ C compiler flags for MATE_KEY_BINDINGS, overriding pkg-config -+ MATE_KEY_BINDINGS_LIBS -+ linker flags for MATE_KEY_BINDINGS, overriding pkg-config - KDE_WINDOW_DECORATOR_CFLAGS - C compiler flags for KDE_WINDOW_DECORATOR, overriding pkg-config - KDE_WINDOW_DECORATOR_LIBS -@@ -17446,46 +17446,46 @@ $as_echo "#define USE_GLIB 1" >>confdefs - - fi - --# Check whether --enable-gconf was given. --if test "${enable_gconf+set}" = set; then : -- enableval=$enable_gconf; use_gconf=$enableval -+# Check whether --enable-mateconf was given. -+if test "${enable_mateconf+set}" = set; then : -+ enableval=$enable_mateconf; use_mateconf=$enableval - else -- use_gconf=yes -+ use_mateconf=yes - fi - - --if test "x$use_gconf" = "xyes"; then -+if test "x$use_mateconf" = "xyes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5 --$as_echo_n "checking for GCONF... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATECONF" >&5 -+$as_echo_n "checking for MATECONF... " >&6; } - --if test -n "$GCONF_CFLAGS"; then -- pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS" -+if test -n "$MATECONF_CFLAGS"; then -+ pkg_cv_MATECONF_CFLAGS="$MATECONF_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mateconf-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mateconf-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0" 2>/dev/null` -+ pkg_cv_MATECONF_CFLAGS=`$PKG_CONFIG --cflags "mateconf-2.0" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$GCONF_LIBS"; then -- pkg_cv_GCONF_LIBS="$GCONF_LIBS" -+if test -n "$MATECONF_LIBS"; then -+ pkg_cv_MATECONF_LIBS="$MATECONF_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mateconf-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mateconf-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0" 2>/dev/null` -+ pkg_cv_MATECONF_LIBS=`$PKG_CONFIG --libs "mateconf-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -17505,22 +17505,22 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0" 2>&1` -+ MATECONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mateconf-2.0" 2>&1` - else -- GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0" 2>&1` -+ MATECONF_PKG_ERRORS=`$PKG_CONFIG --print-errors "mateconf-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$GCONF_PKG_ERRORS" >&5 -+ echo "$MATECONF_PKG_ERRORS" >&5 - -- as_fn_error $? "Package requirements (gconf-2.0) were not met: -+ as_fn_error $? "Package requirements (mateconf-2.0) were not met: - --$GCONF_PKG_ERRORS -+$MATECONF_PKG_ERRORS - - Consider adjusting the PKG_CONFIG_PATH environment variable if you - installed software in a non-standard prefix. - --Alternatively, you may set the environment variables GCONF_CFLAGS --and GCONF_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables MATECONF_CFLAGS -+and MATECONF_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details." "$LINENO" 5 - - elif test $pkg_failed = untried; then -@@ -17532,31 +17532,31 @@ as_fn_error $? "The pkg-config script co - is in your PATH or set the PKG_CONFIG environment variable to the full - path to pkg-config. - --Alternatively, you may set the environment variables GCONF_CFLAGS --and GCONF_LIBS to avoid the need to call pkg-config. -+Alternatively, you may set the environment variables MATECONF_CFLAGS -+and MATECONF_LIBS to avoid the need to call pkg-config. - See the pkg-config man page for more details. - - To get pkg-config, see . - See \`config.log' for more details" "$LINENO" 5; } - - else -- GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS -- GCONF_LIBS=$pkg_cv_GCONF_LIBS -+ MATECONF_CFLAGS=$pkg_cv_MATECONF_CFLAGS -+ MATECONF_LIBS=$pkg_cv_MATECONF_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } - - fi - -- # Extract the first word of "gconftool-2", so it can be a program name with args. --set dummy gconftool-2; ac_word=$2 -+ # Extract the first word of "mateconftool-2", so it can be a program name with args. -+set dummy mateconftool-2; ac_word=$2 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 - $as_echo_n "checking for $ac_word... " >&6; } --if test "${ac_cv_path_GCONFTOOL+set}" = set; then : -+if test "${ac_cv_path_MATECONFTOOL+set}" = set; then : - $as_echo_n "(cached) " >&6 - else -- case $GCONFTOOL in -+ case $MATECONFTOOL in - [\\/]* | ?:[\\/]*) -- ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path. -+ ac_cv_path_MATECONFTOOL="$MATECONFTOOL" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -@@ -17566,7 +17566,7 @@ do - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext" -+ ac_cv_path_MATECONFTOOL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -@@ -17574,57 +17574,57 @@ done - done - IFS=$as_save_IFS - -- test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no" -+ test -z "$ac_cv_path_MATECONFTOOL" && ac_cv_path_MATECONFTOOL="no" - ;; - esac - fi --GCONFTOOL=$ac_cv_path_GCONFTOOL --if test -n "$GCONFTOOL"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5 --$as_echo "$GCONFTOOL" >&6; } -+MATECONFTOOL=$ac_cv_path_MATECONFTOOL -+if test -n "$MATECONFTOOL"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MATECONFTOOL" >&5 -+$as_echo "$MATECONFTOOL" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } - fi - - -- if test x"$GCONFTOOL" = xno; then -- as_fn_error $? "gconftool-2 executable not found in your path - should be installed with GConf" "$LINENO" 5 -+ if test x"$MATECONFTOOL" = xno; then -+ as_fn_error $? "mateconftool-2 executable not found in your path - should be installed with MateConf" "$LINENO" 5 - fi - fi - - -- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then -- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` -+ if test "x$MATECONF_SCHEMA_INSTALL_SOURCE" = "x"; then -+ MATECONF_SCHEMA_CONFIG_SOURCE=`mateconftool-2 --get-default-source` - else -- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE -+ MATECONF_SCHEMA_CONFIG_SOURCE=$MATECONF_SCHEMA_INSTALL_SOURCE - fi - - --# Check whether --with-gconf-source was given. --if test "${with_gconf_source+set}" = set; then : -- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval" -+# Check whether --with-mateconf-source was given. -+if test "${with_mateconf_source+set}" = set; then : -+ withval=$with_mateconf_source; MATECONF_SCHEMA_CONFIG_SOURCE="$withval" - fi - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 --$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5 -+$as_echo "Using config source $MATECONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; } - -- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then -- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' -+ if test "x$MATECONF_SCHEMA_FILE_DIR" = "x"; then -+ MATECONF_SCHEMA_FILE_DIR='$(sysconfdir)/mateconf/schemas' - fi - - --# Check whether --with-gconf-schema-file-dir was given. --if test "${with_gconf_schema_file_dir+set}" = set; then : -- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval" -+# Check whether --with-mateconf-schema-file-dir was given. -+if test "${with_mateconf_schema_file_dir+set}" = set; then : -+ withval=$with_mateconf_schema_file_dir; MATECONF_SCHEMA_FILE_DIR="$withval" - fi - - - -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 --$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&5 -+$as_echo "Using $MATECONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; } - - # Check whether --enable-schemas-install was given. - if test "${enable_schemas_install+set}" = set; then : -@@ -17635,26 +17635,26 @@ if test "${enable_schemas_install+set}" - fi - - if test "$enable_schemas_install" != no; then -- GCONF_SCHEMAS_INSTALL_TRUE= -- GCONF_SCHEMAS_INSTALL_FALSE='#' -+ MATECONF_SCHEMAS_INSTALL_TRUE= -+ MATECONF_SCHEMAS_INSTALL_FALSE='#' - else -- GCONF_SCHEMAS_INSTALL_TRUE='#' -- GCONF_SCHEMAS_INSTALL_FALSE= -+ MATECONF_SCHEMAS_INSTALL_TRUE='#' -+ MATECONF_SCHEMAS_INSTALL_FALSE= - fi - - - -- if test "x$use_gconf" = "xyes"; then -- USE_GCONF_TRUE= -- USE_GCONF_FALSE='#' -+ if test "x$use_mateconf" = "xyes"; then -+ USE_MATECONF_TRUE= -+ USE_MATECONF_FALSE='#' - else -- USE_GCONF_TRUE='#' -- USE_GCONF_FALSE= -+ USE_MATECONF_TRUE='#' -+ USE_MATECONF_FALSE= - fi - --if test "$use_gconf" = yes; then -+if test "$use_mateconf" = yes; then - --$as_echo "#define USE_GCONF 1" >>confdefs.h -+$as_echo "#define USE_MATECONF 1" >>confdefs.h - - fi - -@@ -18170,27 +18170,27 @@ else - fi - - --# Check whether --enable-metacity was given. --if test "${enable_metacity+set}" = set; then : -- enableval=$enable_metacity; use_metacity=$enableval -+# Check whether --enable-marco was given. -+if test "${enable_marco+set}" = set; then : -+ enableval=$enable_marco; use_marco=$enableval - else -- use_metacity=yes -+ use_marco=yes - fi - - --# Check whether --enable-gnome was given. --if test "${enable_gnome+set}" = set; then : -- enableval=$enable_gnome; use_gnome=$enableval -+# Check whether --enable-mate was given. -+if test "${enable_mate+set}" = set; then : -+ enableval=$enable_mate; use_mate=$enableval - else -- use_gnome=yes -+ use_mate=yes - fi - - --# Check whether --enable-gnome-keybindings was given. --if test "${enable_gnome_keybindings+set}" = set; then : -- enableval=$enable_gnome_keybindings; use_gnome_keybindings=$enableval -+# Check whether --enable-mate-keybindings was given. -+if test "${enable_mate_keybindings+set}" = set; then : -+ enableval=$enable_mate_keybindings; use_mate_keybindings=$enableval - else -- use_gnome_keybindings=yes -+ use_mate_keybindings=yes - fi - - -@@ -18329,38 +18329,38 @@ else - have_libwnck_2_19_4=no - fi - -- if test "x$use_metacity" = "xyes"; then -+ if test "x$use_marco" = "xyes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for METACITY" >&5 --$as_echo_n "checking for METACITY... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MARCO" >&5 -+$as_echo_n "checking for MARCO... " >&6; } - --if test -n "$METACITY_CFLAGS"; then -- pkg_cv_METACITY_CFLAGS="$METACITY_CFLAGS" -+if test -n "$MARCO_CFLAGS"; then -+ pkg_cv_MARCO_CFLAGS="$MARCO_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetacity-private\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmetacity-private") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmarco-private\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmarco-private") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_METACITY_CFLAGS=`$PKG_CONFIG --cflags "libmetacity-private" 2>/dev/null` -+ pkg_cv_MARCO_CFLAGS=`$PKG_CONFIG --cflags "libmarco-private" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$METACITY_LIBS"; then -- pkg_cv_METACITY_LIBS="$METACITY_LIBS" -+if test -n "$MARCO_LIBS"; then -+ pkg_cv_MARCO_LIBS="$MARCO_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetacity-private\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmetacity-private") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmarco-private\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmarco-private") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_METACITY_LIBS=`$PKG_CONFIG --libs "libmetacity-private" 2>/dev/null` -+ pkg_cv_MARCO_LIBS=`$PKG_CONFIG --libs "libmarco-private" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18380,89 +18380,89 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- METACITY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmetacity-private" 2>&1` -+ MARCO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libmarco-private" 2>&1` - else -- METACITY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmetacity-private" 2>&1` -+ MARCO_PKG_ERRORS=`$PKG_CONFIG --print-errors "libmarco-private" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$METACITY_PKG_ERRORS" >&5 -+ echo "$MARCO_PKG_ERRORS" >&5 - -- use_metacity=no -+ use_marco=no - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- use_metacity=no -+ use_marco=no - else -- METACITY_CFLAGS=$pkg_cv_METACITY_CFLAGS -- METACITY_LIBS=$pkg_cv_METACITY_LIBS -+ MARCO_CFLAGS=$pkg_cv_MARCO_CFLAGS -+ MARCO_LIBS=$pkg_cv_MARCO_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- use_metacity=yes -+ use_marco=yes - fi - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.15.21\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.15.21") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmarco-private >= 2.15.21\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmarco-private >= 2.15.21") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- have_metacity_2_15_21=yes -+ have_marco_2_15_21=yes - else -- have_metacity_2_15_21=no -+ have_marco_2_15_21=no - fi - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.17.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.17.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmarco-private >= 2.17.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmarco-private >= 2.17.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- have_metacity_2_17_0=yes -+ have_marco_2_17_0=yes - else -- have_metacity_2_17_0=no -+ have_marco_2_17_0=no - fi - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmetacity-private >= 2.23.2\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "libmetacity-private >= 2.23.2") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmarco-private >= 2.23.2\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "libmarco-private >= 2.23.2") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- have_metacity_2_23_2=yes -+ have_marco_2_23_2=yes - else -- have_metacity_2_23_2=no -+ have_marco_2_23_2=no - fi - fi - -- if test "x$use_gnome" = "xyes"; then -+ if test "x$use_mate" = "xyes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_WINDOW_SETTINGS" >&5 --$as_echo_n "checking for GNOME_WINDOW_SETTINGS... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATE_WINDOW_SETTINGS" >&5 -+$as_echo_n "checking for MATE_WINDOW_SETTINGS... " >&6; } - --if test -n "$GNOME_WINDOW_SETTINGS_CFLAGS"; then -- pkg_cv_GNOME_WINDOW_SETTINGS_CFLAGS="$GNOME_WINDOW_SETTINGS_CFLAGS" -+if test -n "$MATE_WINDOW_SETTINGS_CFLAGS"; then -+ pkg_cv_MATE_WINDOW_SETTINGS_CFLAGS="$MATE_WINDOW_SETTINGS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GNOME_WINDOW_SETTINGS_CFLAGS=`$PKG_CONFIG --cflags "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0" 2>/dev/null` -+ pkg_cv_MATE_WINDOW_SETTINGS_CFLAGS=`$PKG_CONFIG --cflags "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$GNOME_WINDOW_SETTINGS_LIBS"; then -- pkg_cv_GNOME_WINDOW_SETTINGS_LIBS="$GNOME_WINDOW_SETTINGS_LIBS" -+if test -n "$MATE_WINDOW_SETTINGS_LIBS"; then -+ pkg_cv_MATE_WINDOW_SETTINGS_LIBS="$MATE_WINDOW_SETTINGS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GNOME_WINDOW_SETTINGS_LIBS=`$PKG_CONFIG --libs "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0" 2>/dev/null` -+ pkg_cv_MATE_WINDOW_SETTINGS_LIBS=`$PKG_CONFIG --libs "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18482,59 +18482,59 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GNOME_WINDOW_SETTINGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0" 2>&1` -+ MATE_WINDOW_SETTINGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0" 2>&1` - else -- GNOME_WINDOW_SETTINGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0" 2>&1` -+ MATE_WINDOW_SETTINGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$GNOME_WINDOW_SETTINGS_PKG_ERRORS" >&5 -+ echo "$MATE_WINDOW_SETTINGS_PKG_ERRORS" >&5 - -- use_gnome=no -+ use_mate=no - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- use_gnome=no -+ use_mate=no - else -- GNOME_WINDOW_SETTINGS_CFLAGS=$pkg_cv_GNOME_WINDOW_SETTINGS_CFLAGS -- GNOME_WINDOW_SETTINGS_LIBS=$pkg_cv_GNOME_WINDOW_SETTINGS_LIBS -+ MATE_WINDOW_SETTINGS_CFLAGS=$pkg_cv_MATE_WINDOW_SETTINGS_CFLAGS -+ MATE_WINDOW_SETTINGS_LIBS=$pkg_cv_MATE_WINDOW_SETTINGS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- use_gnome=yes -+ use_mate=yes - fi - fi - -- if test "x$use_gnome_keybindings" = "xyes"; then -+ if test "x$use_mate_keybindings" = "xyes"; then - - pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_KEY_BINDINGS" >&5 --$as_echo_n "checking for GNOME_KEY_BINDINGS... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MATE_KEY_BINDINGS" >&5 -+$as_echo_n "checking for MATE_KEY_BINDINGS... " >&6; } - --if test -n "$GNOME_KEY_BINDINGS_CFLAGS"; then -- pkg_cv_GNOME_KEY_BINDINGS_CFLAGS="$GNOME_KEY_BINDINGS_CFLAGS" -+if test -n "$MATE_KEY_BINDINGS_CFLAGS"; then -+ pkg_cv_MATE_KEY_BINDINGS_CFLAGS="$MATE_KEY_BINDINGS_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keybindings\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-keybindings") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mate-keybindings\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mate-keybindings") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GNOME_KEY_BINDINGS_CFLAGS=`$PKG_CONFIG --cflags "gnome-keybindings" 2>/dev/null` -+ pkg_cv_MATE_KEY_BINDINGS_CFLAGS=`$PKG_CONFIG --cflags "mate-keybindings" 2>/dev/null` - else - pkg_failed=yes - fi - else - pkg_failed=untried - fi --if test -n "$GNOME_KEY_BINDINGS_LIBS"; then -- pkg_cv_GNOME_KEY_BINDINGS_LIBS="$GNOME_KEY_BINDINGS_LIBS" -+if test -n "$MATE_KEY_BINDINGS_LIBS"; then -+ pkg_cv_MATE_KEY_BINDINGS_LIBS="$MATE_KEY_BINDINGS_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-keybindings\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gnome-keybindings") 2>&5 -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mate-keybindings\""; } >&5 -+ ($PKG_CONFIG --exists --print-errors "mate-keybindings") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then -- pkg_cv_GNOME_KEY_BINDINGS_LIBS=`$PKG_CONFIG --libs "gnome-keybindings" 2>/dev/null` -+ pkg_cv_MATE_KEY_BINDINGS_LIBS=`$PKG_CONFIG --libs "mate-keybindings" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -18554,36 +18554,36 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GNOME_KEY_BINDINGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnome-keybindings" 2>&1` -+ MATE_KEY_BINDINGS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mate-keybindings" 2>&1` - else -- GNOME_KEY_BINDINGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnome-keybindings" 2>&1` -+ MATE_KEY_BINDINGS_PKG_ERRORS=`$PKG_CONFIG --print-errors "mate-keybindings" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -- echo "$GNOME_KEY_BINDINGS_PKG_ERRORS" >&5 -+ echo "$MATE_KEY_BINDINGS_PKG_ERRORS" >&5 - -- use_gnome_keybindings=no -+ use_mate_keybindings=no - elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -- use_gnome_keybindings=no -+ use_mate_keybindings=no - else -- GNOME_KEY_BINDINGS_CFLAGS=$pkg_cv_GNOME_KEY_BINDINGS_CFLAGS -- GNOME_KEY_BINDINGS_LIBS=$pkg_cv_GNOME_KEY_BINDINGS_LIBS -+ MATE_KEY_BINDINGS_CFLAGS=$pkg_cv_MATE_KEY_BINDINGS_CFLAGS -+ MATE_KEY_BINDINGS_LIBS=$pkg_cv_MATE_KEY_BINDINGS_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- use_gnome_keybindings=yes -+ use_mate_keybindings=yes - fi - fi - -- windowsettingsdatadir=`pkg-config --variable=prefix gnome-window-settings-2.0`/share -- windowsettingslibdir=`pkg-config --variable=libdir gnome-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir gnome-keybindings` -+ windowsettingsdatadir=`pkg-config --variable=prefix mate-window-settings-2.0`/share -+ windowsettingslibdir=`pkg-config --variable=libdir mate-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir mate-keybindings` - else -- use_metacity="no" -- use_gnome="no" -+ use_marco="no" -+ use_mate="no" - fi - else -- use_metacity="no" -- use_gnome="no" -+ use_marco="no" -+ use_mate="no" - fi - - -@@ -18614,60 +18614,60 @@ $as_echo "#define HAVE_LIBWNCK_2_19_4 1" - fi - fi - -- if test "x$use_metacity" = "xyes"; then -- USE_METACITY_TRUE= -- USE_METACITY_FALSE='#' -+ if test "x$use_marco" = "xyes"; then -+ USE_MARCO_TRUE= -+ USE_MARCO_FALSE='#' - else -- USE_METACITY_TRUE='#' -- USE_METACITY_FALSE= -+ USE_MARCO_TRUE='#' -+ USE_MARCO_FALSE= - fi - --if test "$use_metacity" = yes; then -+if test "$use_marco" = yes; then - --$as_echo "#define USE_METACITY 1" >>confdefs.h -+$as_echo "#define USE_MARCO 1" >>confdefs.h - -- if test "$have_metacity_2_15_21" = yes; then -+ if test "$have_marco_2_15_21" = yes; then - --$as_echo "#define HAVE_METACITY_2_15_21 1" >>confdefs.h -+$as_echo "#define HAVE_MARCO_2_15_21 1" >>confdefs.h - - fi -- if test "$have_metacity_2_17_0" = yes; then -+ if test "$have_marco_2_17_0" = yes; then - --$as_echo "#define HAVE_METACITY_2_17_0 1" >>confdefs.h -+$as_echo "#define HAVE_MARCO_2_17_0 1" >>confdefs.h - - fi -- if test "$have_metacity_2_23_2" = yes; then -+ if test "$have_marco_2_23_2" = yes; then - --$as_echo "#define HAVE_METACITY_2_23_2 1" >>confdefs.h -+$as_echo "#define HAVE_MARCO_2_23_2 1" >>confdefs.h - - fi - fi - -- if test "x$use_gnome" = "xyes"; then -- USE_GNOME_TRUE= -- USE_GNOME_FALSE='#' -+ if test "x$use_mate" = "xyes"; then -+ USE_MATE_TRUE= -+ USE_MATE_FALSE='#' - else -- USE_GNOME_TRUE='#' -- USE_GNOME_FALSE= -+ USE_MATE_TRUE='#' -+ USE_MATE_FALSE= - fi - --if test "$use_gnome" = yes; then -+if test "$use_mate" = yes; then - --$as_echo "#define USE_GNOME 1" >>confdefs.h -+$as_echo "#define USE_MATE 1" >>confdefs.h - - fi - -- if test "x$use_gnome_keybindings" = "xyes"; then -- USE_GNOME_KEYBINDINGS_TRUE= -- USE_GNOME_KEYBINDINGS_FALSE='#' -+ if test "x$use_mate_keybindings" = "xyes"; then -+ USE_MATE_KEYBINDINGS_TRUE= -+ USE_MATE_KEYBINDINGS_FALSE='#' - else -- USE_GNOME_KEYBINDINGS_TRUE='#' -- USE_GNOME_KEYBINDINGS_FALSE= -+ USE_MATE_KEYBINDINGS_TRUE='#' -+ USE_MATE_KEYBINDINGS_FALSE= - fi - --if test "$use_gnome_keybindings" = yes; then -+if test "$use_mate_keybindings" = yes; then - --$as_echo "#define USE_GNOME_KEYBINDINGS 1" >>confdefs.h -+$as_echo "#define USE_MATE_KEYBINDINGS 1" >>confdefs.h - - fi - -@@ -19033,7 +19033,7 @@ fi - ac_config_commands="$ac_config_commands include/compiz-common.h" - - --ac_config_files="$ac_config_files compiz.pc compiz-cube.pc compiz-scale.pc compiz-gconf.pc compiz-kconfig.pc Makefile src/Makefile libdecoration/Makefile libdecoration/libdecoration.pc include/Makefile plugins/Makefile images/Makefile gtk/Makefile gtk/window-decorator/Makefile gtk/gnome/Makefile kde/Makefile kde/window-decorator/Makefile kde/window-decorator-kde4/Makefile po/Makefile.in metadata/Makefile" -+ac_config_files="$ac_config_files compiz.pc compiz-cube.pc compiz-scale.pc compiz-mateconf.pc compiz-kconfig.pc Makefile src/Makefile libdecoration/Makefile libdecoration/libdecoration.pc include/Makefile plugins/Makefile images/Makefile gtk/Makefile gtk/window-decorator/Makefile gtk/mate/Makefile kde/Makefile kde/window-decorator/Makefile kde/window-decorator-kde4/Makefile po/Makefile.in metadata/Makefile" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -19170,12 +19170,12 @@ if test -z "${USE_GLIB_TRUE}" && test -z - as_fn_error $? "conditional \"USE_GLIB\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then -- as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. -+if test -z "${MATECONF_SCHEMAS_INSTALL_TRUE}" && test -z "${MATECONF_SCHEMAS_INSTALL_FALSE}"; then -+ as_fn_error $? "conditional \"MATECONF_SCHEMAS_INSTALL\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${USE_GCONF_TRUE}" && test -z "${USE_GCONF_FALSE}"; then -- as_fn_error $? "conditional \"USE_GCONF\" was never defined. -+if test -z "${USE_MATECONF_TRUE}" && test -z "${USE_MATECONF_FALSE}"; then -+ as_fn_error $? "conditional \"USE_MATECONF\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${DBUS_PLUGIN_TRUE}" && test -z "${DBUS_PLUGIN_FALSE}"; then -@@ -19202,16 +19202,16 @@ if test -z "${USE_GTK_TRUE}" && test -z - as_fn_error $? "conditional \"USE_GTK\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${USE_METACITY_TRUE}" && test -z "${USE_METACITY_FALSE}"; then -- as_fn_error $? "conditional \"USE_METACITY\" was never defined. -+if test -z "${USE_MARCO_TRUE}" && test -z "${USE_MARCO_FALSE}"; then -+ as_fn_error $? "conditional \"USE_MARCO\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${USE_GNOME_TRUE}" && test -z "${USE_GNOME_FALSE}"; then -- as_fn_error $? "conditional \"USE_GNOME\" was never defined. -+if test -z "${USE_MATE_TRUE}" && test -z "${USE_MATE_FALSE}"; then -+ as_fn_error $? "conditional \"USE_MATE\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi --if test -z "${USE_GNOME_KEYBINDINGS_TRUE}" && test -z "${USE_GNOME_KEYBINDINGS_FALSE}"; then -- as_fn_error $? "conditional \"USE_GNOME_KEYBINDINGS\" was never defined. -+if test -z "${USE_MATE_KEYBINDINGS_TRUE}" && test -z "${USE_MATE_KEYBINDINGS_FALSE}"; then -+ as_fn_error $? "conditional \"USE_MATE_KEYBINDINGS\" was never defined. - Usually this means the macro was only invoked conditionally." "$LINENO" 5 - fi - if test -z "${USE_KDE_TRUE}" && test -z "${USE_KDE_FALSE}"; then -@@ -20197,7 +20197,7 @@ do - "compiz.pc") CONFIG_FILES="$CONFIG_FILES compiz.pc" ;; - "compiz-cube.pc") CONFIG_FILES="$CONFIG_FILES compiz-cube.pc" ;; - "compiz-scale.pc") CONFIG_FILES="$CONFIG_FILES compiz-scale.pc" ;; -- "compiz-gconf.pc") CONFIG_FILES="$CONFIG_FILES compiz-gconf.pc" ;; -+ "compiz-mateconf.pc") CONFIG_FILES="$CONFIG_FILES compiz-mateconf.pc" ;; - "compiz-kconfig.pc") CONFIG_FILES="$CONFIG_FILES compiz-kconfig.pc" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; -@@ -20208,7 +20208,7 @@ do - "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;; - "gtk/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/Makefile" ;; - "gtk/window-decorator/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/window-decorator/Makefile" ;; -- "gtk/gnome/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gnome/Makefile" ;; -+ "gtk/mate/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/mate/Makefile" ;; - "kde/Makefile") CONFIG_FILES="$CONFIG_FILES kde/Makefile" ;; - "kde/window-decorator/Makefile") CONFIG_FILES="$CONFIG_FILES kde/window-decorator/Makefile" ;; - "kde/window-decorator-kde4/Makefile") CONFIG_FILES="$CONFIG_FILES kde/window-decorator-kde4/Makefile" ;; -@@ -21812,7 +21812,7 @@ fi - echo "" - echo "the following optional plugins will be compiled:" - echo " glib: $use_glib" --echo " gconf: $use_gconf" -+echo " mateconf: $use_mateconf" - echo " kconfig: $use_kconfig" - echo " dbus: $use_dbus" - echo " annotate: $use_annotate" -@@ -21822,8 +21822,8 @@ echo " fuse: $use_fuse" - echo "" - echo "and the following optional features will be compiled:" - echo " gtk: $use_gtk" --echo " metacity: $use_metacity" --echo " gnome: $use_gnome" -+echo " marco: $use_marco" -+echo " mate: $use_mate" - echo " kde: $use_kde" - echo " kde4: $use_kde4" - echo "" -diff -upr compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac ---- compiz-0.8.8-orig/configure.ac 2011-03-30 11:22:47.000000000 +0200 -+++ compiz-0.8.8/configure.ac 2012-05-16 12:47:10.000000000 +0200 -@@ -182,24 +182,24 @@ if test "$use_glib" = yes; then - AC_DEFINE(USE_GLIB, 1, [Build glib plugin]) - fi - --AC_ARG_ENABLE(gconf, -- [ --disable-gconf Disable gconf plugin], -- [use_gconf=$enableval], [use_gconf=yes]) -+AC_ARG_ENABLE(mateconf, -+ [ --disable-mateconf Disable mateconf plugin], -+ [use_mateconf=$enableval], [use_mateconf=yes]) - --if test "x$use_gconf" = "xyes"; then -- PKG_CHECK_MODULES(GCONF, gconf-2.0) -+if test "x$use_mateconf" = "xyes"; then -+ PKG_CHECK_MODULES(MATECONF, mateconf-2.0) - -- AC_PATH_PROG(GCONFTOOL, gconftool-2, no) -- if test x"$GCONFTOOL" = xno; then -- AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) -+ AC_PATH_PROG(MATECONFTOOL, mateconftool-2, no) -+ if test x"$MATECONFTOOL" = xno; then -+ AC_MSG_ERROR([mateconftool-2 executable not found in your path - should be installed with MateConf]) - fi - fi - --AM_GCONF_SOURCE_2 -+AM_MATECONF_SOURCE_2 - --AM_CONDITIONAL(USE_GCONF, test "x$use_gconf" = "xyes") --if test "$use_gconf" = yes; then -- AC_DEFINE(USE_GCONF, 1, [Build gconf plugin]) -+AM_CONDITIONAL(USE_MATECONF, test "x$use_mateconf" = "xyes") -+if test "$use_mateconf" = yes; then -+ AC_DEFINE(USE_MATECONF, 1, [Build mateconf plugin]) - fi - - stylesheetdir=$datadir/compiz -@@ -286,17 +286,17 @@ AC_ARG_ENABLE(gtk, - [ --disable-gtk Disable gtk window decorator], - [use_gtk=$enableval], [use_gtk=yes]) - --AC_ARG_ENABLE(metacity, -- [ --disable-metacity Disable metacity theme support], -- [use_metacity=$enableval], [use_metacity=yes]) -- --AC_ARG_ENABLE(gnome, -- [ --disable-gnome Disable gnome settings module], -- [use_gnome=$enableval], [use_gnome=yes]) -- --AC_ARG_ENABLE(gnome-keybindings, -- [ --disable-gnome-keybindings Disable gnome keybindings], -- [use_gnome_keybindings=$enableval], [use_gnome_keybindings=yes]) -+AC_ARG_ENABLE(marco, -+ [ --disable-marco Disable marco theme support], -+ [use_marco=$enableval], [use_marco=yes]) -+ -+AC_ARG_ENABLE(mate, -+ [ --disable-mate Disable mate settings module], -+ [use_mate=$enableval], [use_mate=yes]) -+ -+AC_ARG_ENABLE(mate-keybindings, -+ [ --disable-mate-keybindings Disable mate keybindings], -+ [use_mate_keybindings=$enableval], [use_mate_keybindings=yes]) - - if test "x$use_gtk" = "xyes"; then - PKG_CHECK_MODULES(GTK_WINDOW_DECORATOR, -@@ -320,38 +320,38 @@ if test "x$use_gtk" = "xyes"; then - PKG_CHECK_EXISTS(libwnck-1.0 >= 2.19.4, - [have_libwnck_2_19_4=yes], [have_libwnck_2_19_4=no]) - -- if test "x$use_metacity" = "xyes"; then -- PKG_CHECK_MODULES(METACITY, libmetacity-private, -- [use_metacity=yes], [use_metacity=no]) -- PKG_CHECK_EXISTS(libmetacity-private >= 2.15.21, -- [have_metacity_2_15_21=yes], [have_metacity_2_15_21=no]) -- PKG_CHECK_EXISTS(libmetacity-private >= 2.17.0, -- [have_metacity_2_17_0=yes], [have_metacity_2_17_0=no]) -- PKG_CHECK_EXISTS(libmetacity-private >= 2.23.2, -- [have_metacity_2_23_2=yes], [have_metacity_2_23_2=no]) -+ if test "x$use_marco" = "xyes"; then -+ PKG_CHECK_MODULES(MARCO, libmarco-private, -+ [use_marco=yes], [use_marco=no]) -+ PKG_CHECK_EXISTS(libmarco-private >= 2.15.21, -+ [have_marco_2_15_21=yes], [have_marco_2_15_21=no]) -+ PKG_CHECK_EXISTS(libmarco-private >= 2.17.0, -+ [have_marco_2_17_0=yes], [have_marco_2_17_0=no]) -+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, -+ [have_marco_2_23_2=yes], [have_marco_1_2_0=no]) - fi - -- if test "x$use_gnome" = "xyes"; then -- PKG_CHECK_MODULES(GNOME_WINDOW_SETTINGS, -- gnome-window-settings-2.0 gnome-desktop-2.0 gconf-2.0, -- [use_gnome=yes], [use_gnome=no]) -+ if test "x$use_mate" = "xyes"; then -+ PKG_CHECK_MODULES(MATE_WINDOW_SETTINGS, -+ mate-window-settings-2.0 mate-desktop-2.0 mateconf-2.0, -+ [use_mate=yes], [use_mate=no]) - fi - -- if test "x$use_gnome_keybindings" = "xyes"; then -- PKG_CHECK_MODULES(GNOME_KEY_BINDINGS, -- gnome-keybindings, -- [use_gnome_keybindings=yes], [use_gnome_keybindings=no]) -+ if test "x$use_mate_keybindings" = "xyes"; then -+ PKG_CHECK_MODULES(MATE_KEY_BINDINGS, -+ mate-keybindings, -+ [use_mate_keybindings=yes], [use_mate_keybindings=no]) - fi - -- windowsettingsdatadir=`pkg-config --variable=prefix gnome-window-settings-2.0`/share -- windowsettingslibdir=`pkg-config --variable=libdir gnome-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir gnome-keybindings` -+ windowsettingsdatadir=`pkg-config --variable=prefix mate-window-settings-2.0`/share -+ windowsettingslibdir=`pkg-config --variable=libdir mate-window-settings-2.0` keybindingsdir=`pkg-config --variable=keysdir mate-keybindings` - else -- use_metacity="no" -- use_gnome="no" -+ use_marco="no" -+ use_mate="no" - fi - else -- use_metacity="no" -- use_gnome="no" -+ use_marco="no" -+ use_mate="no" - fi - - AC_SUBST(windowsettingsdatadir) -@@ -371,31 +371,31 @@ if test "$use_gtk" = yes; then - fi - fi - --AM_CONDITIONAL(USE_METACITY, test "x$use_metacity" = "xyes") --if test "$use_metacity" = yes; then -- AC_DEFINE(USE_METACITY, 1, [Build metacity theme support]) -- if test "$have_metacity_2_15_21" = yes; then -- AC_DEFINE(HAVE_METACITY_2_15_21, 1, -- [Define to 1 if metacity version >= 2.15.21]) -+AM_CONDITIONAL(USE_MARCO, test "x$use_marco" = "xyes") -+if test "$use_marco" = yes; then -+ AC_DEFINE(USE_MARCO, 1, [Build marco theme support]) -+ if test "$have_marco_2_15_21" = yes; then -+ AC_DEFINE(HAVE_MARCO_2_15_21, 1, -+ [Define to 1 if marco version >= 2.15.21]) - fi -- if test "$have_metacity_2_17_0" = yes; then -- AC_DEFINE(HAVE_METACITY_2_17_0, 1, -- [Define to 1 if metacity version >= 2.17.0]) -+ if test "$have_marco_2_17_0" = yes; then -+ AC_DEFINE(HAVE_MARCO_2_17_0, 1, -+ [Define to 1 if marco version >= 2.17.0]) - fi -- if test "$have_metacity_2_23_2" = yes; then -- AC_DEFINE(HAVE_METACITY_2_23_2, 1, -- [Define to 1 if metacity version >= 2.23.2]) -+ if test "$have_marco_1_2_0" = yes; then -+ AC_DEFINE(HAVE_MARCO_1_2_0, 1, -+ [Define to 1 if marco version >= 1.2.0]) - fi - fi - --AM_CONDITIONAL(USE_GNOME, test "x$use_gnome" = "xyes") --if test "$use_gnome" = yes; then -- AC_DEFINE(USE_GNOME, 1, [Build gnome settings module]) -+AM_CONDITIONAL(USE_MATE, test "x$use_mate" = "xyes") -+if test "$use_mate" = yes; then -+ AC_DEFINE(USE_MATE, 1, [Build mate settings module]) - fi - --AM_CONDITIONAL(USE_GNOME_KEYBINDINGS, test "x$use_gnome_keybindings" = "xyes") --if test "$use_gnome_keybindings" = yes; then -- AC_DEFINE(USE_GNOME_KEYBINDINGS, 1, [Install custom keybindings]) -+AM_CONDITIONAL(USE_MATE_KEYBINDINGS, test "x$use_mate_keybindings" = "xyes") -+if test "$use_mate_keybindings" = yes; then -+ AC_DEFINE(USE_MATE_KEYBINDINGS, 1, [Install custom keybindings]) - fi - - AC_ARG_ENABLE(kde, -@@ -617,7 +617,7 @@ AC_OUTPUT([ - compiz.pc - compiz-cube.pc - compiz-scale.pc --compiz-gconf.pc -+compiz-mateconf.pc - compiz-kconfig.pc - Makefile - src/Makefile -@@ -628,7 +628,7 @@ plugins/Makefile - images/Makefile - gtk/Makefile - gtk/window-decorator/Makefile --gtk/gnome/Makefile -+gtk/mate/Makefile - kde/Makefile - kde/window-decorator/Makefile - kde/window-decorator-kde4/Makefile -@@ -639,7 +639,7 @@ metadata/Makefile - echo "" - echo "the following optional plugins will be compiled:" - echo " glib: $use_glib" --echo " gconf: $use_gconf" -+echo " mateconf: $use_mateconf" - echo " kconfig: $use_kconfig" - echo " dbus: $use_dbus" - echo " annotate: $use_annotate" -@@ -649,8 +649,8 @@ echo " fuse: $use_fuse" - echo "" - echo "and the following optional features will be compiled:" - echo " gtk: $use_gtk" --echo " metacity: $use_metacity" --echo " gnome: $use_gnome" -+echo " marco: $use_marco" -+echo " mate: $use_mate" - echo " kde: $use_kde" - echo " kde4: $use_kde4" - echo "" -Nur in compiz-0.8.8-orig/gtk: gnome. -diff -upr compiz-0.8.8-orig/gtk/Makefile.am compiz-0.8.8/gtk/Makefile.am ---- compiz-0.8.8-orig/gtk/Makefile.am 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/gtk/Makefile.am 2012-05-16 12:40:04.000000000 +0200 -@@ -1 +1 @@ --SUBDIRS = window-decorator gnome -+SUBDIRS = window-decorator mate -diff -upr compiz-0.8.8-orig/gtk/Makefile.in compiz-0.8.8/gtk/Makefile.in ---- compiz-0.8.8-orig/gtk/Makefile.in 2011-03-30 11:33:34.000000000 +0200 -+++ compiz-0.8.8/gtk/Makefile.in 2012-05-16 12:40:11.000000000 +0200 -@@ -136,11 +136,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -148,10 +148,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -192,8 +192,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -293,7 +293,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - windowsettingsdatadir = @windowsettingsdatadir@ - windowsettingslibdir = @windowsettingslibdir@ --SUBDIRS = window-decorator gnome -+SUBDIRS = window-decorator mate - all: all-recursive - - .SUFFIXES: -diff -upr compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in ---- compiz-0.8.8-orig/gtk/mate/50-compiz-desktop-key.xml.in 2012-08-26 10:31:56.022793583 +0200 -+++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in 2012-05-16 12:40:05.000000000 +0200 -@@ -0,0 +1,16 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -upr compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in compiz-0.8.8/gtk/mate/50-compiz-key.xml.in ---- compiz-0.8.8-orig/gtk/mate/50-compiz-key.xml.in 2012-08-26 10:32:14.013982632 +0200 -+++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in 2012-05-16 12:40:05.000000000 +0200 -@@ -0,0 +1,25 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff -upr compiz-0.8.8-orig/gtk/mate/compiz.desktop.in compiz-0.8.8/gtk/mate/compiz.desktop.in ---- compiz-0.8.8-orig/gtk/mate/compiz.desktop.in 2012-08-26 10:32:19.551040899 +0200 -+++ compiz-0.8.8/gtk/mate/compiz.desktop.in 2012-05-16 12:40:05.000000000 +0200 -@@ -0,0 +1,15 @@ -+[Desktop Entry] -+Type=Application -+Encoding=UTF-8 -+_Name=Compiz -+Exec=compiz -+NoDisplay=true -+# name of loadable control center module -+X-MATE-WMSettingsModule=compiz -+# autostart phase -+X-MATE-Autostart-Phase=WindowManager -+X-MATE-Provides=windowmanager -+# name we put on the WM spec check window -+X-MATE-WMName=compiz -+# back compat only -+X-MateWMSettingsLibrary=compiz -diff -upr compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c ---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2012-08-26 10:32:25.191100291 +0200 -+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2012-05-16 12:40:10.000000000 +0200 -@@ -0,0 +1,559 @@ -+/* -+ * Copyright © 2005 Novell, Inc. -+ * -+ * Permission to use, copy, modify, distribute, and sell this software -+ * and its documentation for any purpose is hereby granted without -+ * fee, provided that the above copyright notice appear in all copies -+ * and that both that copyright notice and this permission notice -+ * appear in supporting documentation, and that the name of -+ * Novell, Inc. not be used in advertising or publicity pertaining to -+ * distribution of the software without specific, written prior permission. -+ * Novell, Inc. makes no representations about the suitability of this -+ * software for any purpose. It is provided "as is" without express or -+ * implied warranty. -+ * -+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN -+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * Author: David Reveman -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "compiz-window-manager.h" -+ -+#define COMPIZ_CLICK_TO_FOCUS_KEY \ -+ "/apps/compiz/general/allscreens/options/click_to_focus" -+ -+#define COMPIZ_AUTORAISE_KEY \ -+ "/apps/compiz/general/allscreens/options/autoraise" -+ -+#define COMPIZ_AUTORAISE_DELAY_KEY \ -+ "/apps/compiz/general/allscreens/options/autoraise_delay" -+ -+#define COMPIZ_MOUSE_MOVE_KEY \ -+ "/apps/compiz/plugins/move/allscreens/options/initiate_button" -+ -+#define MATECONF_DIR "/apps/marco/general" -+ -+#define COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY \ -+ MATECONF_DIR "/action_double_click_titlebar" -+ -+#define COMPIZ_USE_SYSTEM_FONT_KEY \ -+ MATECONF_DIR "/titlebar_uses_system_font" -+ -+#define COMPIZ_TITLEBAR_FONT_KEY \ -+ MATECONF_DIR "/titlebar_font" -+ -+#define COMPIZ_THEME_KEY \ -+ MATECONF_DIR "/theme" -+ -+enum { -+ DOUBLE_CLICK_NONE, -+ DOUBLE_CLICK_SHADE, -+ DOUBLE_CLICK_MAXIMIZE, -+ DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, -+ DOUBLE_CLICK_MAXIMIZE_VERTICALLY, -+ DOUBLE_CLICK_MINIMIZE, -+ DOUBLE_CLICK_RAISE, -+ DOUBLE_CLICK_LOWER, -+ DOUBLE_CLICK_MENU -+}; -+ -+static const struct { -+ unsigned int action; -+ const char *value; -+} double_click_actions [] = { -+ { DOUBLE_CLICK_NONE, "none" }, -+ { DOUBLE_CLICK_SHADE, "toggle_shade" }, -+ { DOUBLE_CLICK_MAXIMIZE, "toggle_maximize" }, -+ { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, "toggle_maximize_horizontally" }, -+ { DOUBLE_CLICK_MAXIMIZE_VERTICALLY, "toggle_maximize_vertically" }, -+ { DOUBLE_CLICK_MINIMIZE, "minimize" }, -+ { DOUBLE_CLICK_RAISE, "raise" }, -+ { DOUBLE_CLICK_LOWER, "lower" }, -+ { DOUBLE_CLICK_MENU, "menu" } -+}; -+ -+static MateWindowManagerClass *parent_class; -+ -+struct _CompizWindowManagerPrivate { -+ MateConfClient *mateconf; -+ gchar *font; -+ gchar *theme; -+ gchar *mouse_modifier; -+}; -+ -+static void -+value_changed (MateConfClient *client, -+ const gchar *key, -+ MateConfValue *value, -+ void *data) -+{ -+ CompizWindowManager *wm; -+ -+ wm = COMPIZ_WINDOW_MANAGER (data); -+ -+ mate_window_manager_settings_changed (MATE_WINDOW_MANAGER (wm)); -+} -+ -+/* this function is called when the shared lib is loaded */ -+GObject * -+window_manager_new (int expected_interface_version) -+{ -+ GObject *wm; -+ -+ if (expected_interface_version != MATE_WINDOW_MANAGER_INTERFACE_VERSION) -+ { -+ g_warning ("Compiz window manager module wasn't compiled with the " -+ "current version of mate-control-center"); -+ return NULL; -+ } -+ -+ wm = g_object_new (compiz_window_manager_get_type (), NULL); -+ -+ return wm; -+} -+ -+static void -+compiz_change_settings (MateWindowManager *wm, -+ const MateWMSettings *settings) -+{ -+ CompizWindowManager *cwm; -+ -+ cwm = COMPIZ_WINDOW_MANAGER (wm); -+ -+ if (settings->flags & MATE_WM_SETTING_FONT) -+ mateconf_client_set_string (cwm->p->mateconf, -+ COMPIZ_TITLEBAR_FONT_KEY, -+ settings->font, NULL); -+ -+ if (settings->flags & MATE_WM_SETTING_MOUSE_FOCUS) -+ mateconf_client_set_bool (cwm->p->mateconf, -+ COMPIZ_CLICK_TO_FOCUS_KEY, -+ settings->focus_follows_mouse == FALSE, -+ NULL); -+ -+ if (settings->flags & MATE_WM_SETTING_AUTORAISE) -+ mateconf_client_set_bool (cwm->p->mateconf, -+ COMPIZ_AUTORAISE_KEY, -+ settings->autoraise, NULL); -+ -+ if (settings->flags & MATE_WM_SETTING_AUTORAISE_DELAY) -+ mateconf_client_set_int (cwm->p->mateconf, -+ COMPIZ_AUTORAISE_DELAY_KEY, -+ settings->autoraise_delay, NULL); -+ -+ if (settings->flags & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER) -+ { -+ char *value; -+ -+ value = g_strdup_printf ("<%s>Button1", settings->mouse_move_modifier); -+ mateconf_client_set_string (cwm->p->mateconf, -+ COMPIZ_MOUSE_MOVE_KEY, -+ value, NULL); -+ g_free (value); -+ } -+ -+ if (settings->flags & MATE_WM_SETTING_THEME) -+ mateconf_client_set_string (cwm->p->mateconf, -+ COMPIZ_THEME_KEY, -+ settings->theme, NULL); -+ -+ if (settings->flags & MATE_WM_SETTING_DOUBLE_CLICK_ACTION) -+ { -+ const char *action = NULL; -+ unsigned int i; -+ -+ for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++) -+ { -+ if (settings->double_click_action == -+ double_click_actions[i].action) -+ { -+ action = double_click_actions[i].value; -+ break; -+ } -+ } -+ -+ if (action) -+ mateconf_client_set_string (cwm->p->mateconf, -+ COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY, -+ action, NULL); -+ } -+} -+ -+static void -+compiz_get_settings (MateWindowManager *wm, -+ MateWMSettings *settings) -+{ -+ CompizWindowManager *cwm; -+ int to_get; -+ -+ cwm = COMPIZ_WINDOW_MANAGER (wm); -+ -+ to_get = settings->flags; -+ settings->flags = 0; -+ -+ if (to_get & MATE_WM_SETTING_FONT) -+ { -+ char *str; -+ -+ str = mateconf_client_get_string (cwm->p->mateconf, -+ COMPIZ_TITLEBAR_FONT_KEY, -+ NULL); -+ -+ if (!str) -+ str = g_strdup ("Sans Bold 12"); -+ -+ if (cwm->p->font) -+ g_free (cwm->p->font); -+ -+ cwm->p->font = str; -+ -+ settings->font = cwm->p->font; -+ -+ settings->flags |= MATE_WM_SETTING_FONT; -+ } -+ -+ if (to_get & MATE_WM_SETTING_MOUSE_FOCUS) -+ { -+ settings->focus_follows_mouse = -+ mateconf_client_get_bool (cwm->p->mateconf, -+ COMPIZ_CLICK_TO_FOCUS_KEY, NULL) == FALSE; -+ -+ settings->flags |= MATE_WM_SETTING_MOUSE_FOCUS; -+ } -+ -+ if (to_get & MATE_WM_SETTING_AUTORAISE) -+ { -+ settings->autoraise = mateconf_client_get_bool (cwm->p->mateconf, -+ COMPIZ_AUTORAISE_KEY, -+ NULL); -+ -+ settings->flags |= MATE_WM_SETTING_AUTORAISE; -+ } -+ -+ if (to_get & MATE_WM_SETTING_AUTORAISE_DELAY) -+ { -+ settings->autoraise_delay = -+ mateconf_client_get_int (cwm->p->mateconf, -+ COMPIZ_AUTORAISE_DELAY_KEY, -+ NULL); -+ -+ settings->flags |= MATE_WM_SETTING_AUTORAISE_DELAY; -+ } -+ -+ if (to_get & MATE_WM_SETTING_MOUSE_MOVE_MODIFIER) -+ { -+ const char *new; -+ char *str; -+ -+ str = mateconf_client_get_string (cwm->p->mateconf, -+ COMPIZ_MOUSE_MOVE_KEY, -+ NULL); -+ -+ if (str == NULL) -+ str = g_strdup (""); -+ -+ if (strncmp (str, "", 7) == 0) -+ new = "Super"; -+ else if (strncmp (str, "", 5) == 0) -+ new = "Alt"; -+ else if (strncmp (str, "", 6) == 0) -+ new = "Meta"; -+ else if (strncmp (str, "", 7) == 0) -+ new = "Hyper"; -+ else if (strncmp (str, "", 9) == 0) -+ new = "Control"; -+ else -+ new = NULL; -+ -+ if (cwm->p->mouse_modifier) -+ g_free (cwm->p->mouse_modifier); -+ -+ cwm->p->mouse_modifier = g_strdup (new ? new : ""); -+ -+ g_free (str); -+ -+ settings->mouse_move_modifier = cwm->p->mouse_modifier; -+ -+ settings->flags |= MATE_WM_SETTING_MOUSE_MOVE_MODIFIER; -+ } -+ -+ if (to_get & MATE_WM_SETTING_THEME) -+ { -+ char *str; -+ -+ str = mateconf_client_get_string (cwm->p->mateconf, -+ COMPIZ_THEME_KEY, -+ NULL); -+ -+ if (str == NULL) -+ str = g_strdup ("Atlanta"); -+ -+ g_free (cwm->p->theme); -+ cwm->p->theme = str; -+ settings->theme = cwm->p->theme; -+ -+ settings->flags |= MATE_WM_SETTING_THEME; -+ } -+ -+ if (to_get & MATE_WM_SETTING_DOUBLE_CLICK_ACTION) -+ { -+ char *str; -+ -+ settings->double_click_action = DOUBLE_CLICK_MAXIMIZE; -+ -+ str = mateconf_client_get_string (cwm->p->mateconf, -+ COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY, -+ NULL); -+ -+ if (str) -+ { -+ unsigned int i; -+ -+ for (i = 0; i < G_N_ELEMENTS (double_click_actions); i++) -+ { -+ if (strcmp (str, double_click_actions[i].value) == 0) -+ { -+ settings->double_click_action = -+ double_click_actions[i].action; -+ break; -+ } -+ } -+ } -+ -+ settings->flags |= MATE_WM_SETTING_DOUBLE_CLICK_ACTION; -+ } -+} -+ -+static int -+compiz_get_settings_mask (MateWindowManager *wm) -+{ -+ return MATE_WM_SETTING_MASK; -+} -+ -+static GList * -+add_themes_from_dir (GList *current_list, -+ const char *path) -+{ -+ DIR *theme_dir; -+ struct dirent *entry; -+ char *theme_file_path; -+ GList *node; -+ gboolean found = FALSE; -+ -+ if (!(g_file_test (path, G_FILE_TEST_EXISTS) && -+ g_file_test (path, G_FILE_TEST_IS_DIR))) -+ { -+ return current_list; -+ } -+ -+ theme_dir = opendir (path); -+ -+ /* If this is NULL, then we couldn't open ~/.themes. The test above -+ * only checks existence, not wether we can really read it.*/ -+ if (theme_dir == NULL) -+ return current_list; -+ -+ for (entry = readdir (theme_dir); entry; entry = readdir (theme_dir)) -+ { -+ theme_file_path = -+ g_build_filename (path, entry->d_name, -+ "marco-1/marco-theme-1.xml", NULL); -+ -+ if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) -+ { -+ -+ for (node = current_list; node && !found; node = node->next) -+ found = strcmp (node->data, entry->d_name) == 0; -+ -+ if (!found) -+ current_list = g_list_prepend (current_list, -+ g_strdup (entry->d_name)); -+ } -+ -+ found = FALSE; -+ -+ g_free (theme_file_path); -+ } -+ -+ closedir (theme_dir); -+ -+ return current_list; -+} -+ -+static GList * -+compiz_get_theme_list (MateWindowManager *wm) -+{ -+ GList *themes = NULL; -+ char *home_dir_themes; -+ -+ home_dir_themes = g_build_filename (g_get_home_dir (), ".themes", NULL); -+ -+ themes = add_themes_from_dir (themes, MARCO_THEME_DIR); -+ themes = add_themes_from_dir (themes, "/usr/share/themes"); -+ themes = add_themes_from_dir (themes, home_dir_themes); -+ -+ g_free (home_dir_themes); -+ -+ return themes; -+} -+ -+static char * -+compiz_get_user_theme_folder (MateWindowManager *wm) -+{ -+ return g_build_filename (g_get_home_dir (), ".themes", NULL); -+} -+ -+static void -+compiz_get_double_click_actions (MateWindowManager *wm, -+ const MateWMDoubleClickAction **actions_p, -+ int *n_actions_p) -+{ -+ static gboolean initialized = FALSE; -+ static MateWMDoubleClickAction actions[] = { -+ { DOUBLE_CLICK_NONE, N_("None") }, -+ { DOUBLE_CLICK_SHADE, N_("Shade") }, -+ { DOUBLE_CLICK_MAXIMIZE, N_("Maximize") }, -+ { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Horizontally") }, -+ { DOUBLE_CLICK_MAXIMIZE_HORIZONTALLY, N_("Maximize Vertically") }, -+ { DOUBLE_CLICK_MINIMIZE, N_("Minimize") }, -+ { DOUBLE_CLICK_RAISE, N_("Raise") }, -+ { DOUBLE_CLICK_LOWER, N_("Lower") }, -+ { DOUBLE_CLICK_MENU, N_("Window Menu") } -+ }; -+ -+ if (!initialized) -+ { -+ unsigned int i; -+ -+ for (i = 0; i < G_N_ELEMENTS (actions); i++) -+ actions[i].human_readable_name = _(actions[i].human_readable_name); -+ -+ initialized = TRUE; -+ } -+ -+ *actions_p = actions; -+ *n_actions_p = (int) G_N_ELEMENTS (actions); -+} -+ -+static void -+compiz_window_manager_init (CompizWindowManager *cwm, -+ CompizWindowManagerClass *class) -+{ -+ cwm->p = g_new0 (CompizWindowManagerPrivate, 1); -+ cwm->p->mateconf = mateconf_client_get_default (); -+ cwm->p->mouse_modifier = NULL; -+ cwm->p->font = NULL; -+ cwm->p->theme = NULL; -+ -+ mateconf_client_add_dir (cwm->p->mateconf, -+ "/apps/compiz", -+ MATECONF_CLIENT_PRELOAD_ONELEVEL, -+ NULL); -+ -+ mateconf_client_add_dir (cwm->p->mateconf, -+ MATECONF_DIR, -+ MATECONF_CLIENT_PRELOAD_ONELEVEL, -+ NULL); -+ -+ -+ g_signal_connect (G_OBJECT (cwm->p->mateconf), -+ "value_changed", -+ G_CALLBACK (value_changed), -+ cwm); -+} -+ -+static void -+compiz_window_manager_finalize (GObject *object) -+{ -+ CompizWindowManager *cwm; -+ -+ g_return_if_fail (object != NULL); -+ g_return_if_fail (IS_COMPIZ_WINDOW_MANAGER (object)); -+ -+ cwm = COMPIZ_WINDOW_MANAGER (object); -+ -+ g_signal_handlers_disconnect_by_func (G_OBJECT (cwm->p->mateconf), -+ G_CALLBACK (value_changed), -+ cwm); -+ -+ if (cwm->p->mouse_modifier) -+ g_free (cwm->p->mouse_modifier); -+ -+ if (cwm->p->font) -+ g_free (cwm->p->font); -+ -+ if (cwm->p->theme) -+ g_free (cwm->p->theme); -+ -+ g_object_unref (G_OBJECT (cwm->p->mateconf)); -+ g_free (cwm->p); -+ -+ G_OBJECT_CLASS (parent_class)->finalize (object); -+} -+ -+static void -+compiz_window_manager_class_init (CompizWindowManagerClass *class) -+{ -+ GObjectClass *object_class; -+ MateWindowManagerClass *wm_class; -+ -+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -+ textdomain (GETTEXT_PACKAGE); -+ -+ object_class = G_OBJECT_CLASS (class); -+ wm_class = MATE_WINDOW_MANAGER_CLASS (class); -+ -+ object_class->finalize = compiz_window_manager_finalize; -+ -+ wm_class->change_settings = compiz_change_settings; -+ wm_class->get_settings = compiz_get_settings; -+ wm_class->get_settings_mask = compiz_get_settings_mask; -+ wm_class->get_user_theme_folder = compiz_get_user_theme_folder; -+ wm_class->get_theme_list = compiz_get_theme_list; -+ wm_class->get_double_click_actions = compiz_get_double_click_actions; -+ -+ parent_class = g_type_class_peek_parent (class); -+} -+ -+GType -+compiz_window_manager_get_type (void) -+{ -+ static GType compiz_window_manager_type = 0; -+ -+ if (!compiz_window_manager_type) -+ { -+ static GTypeInfo compiz_window_manager_info = { -+ sizeof (CompizWindowManagerClass), -+ NULL, -+ NULL, -+ (GClassInitFunc) compiz_window_manager_class_init, -+ NULL, -+ NULL, -+ sizeof (CompizWindowManager), -+ 0, -+ (GInstanceInitFunc) compiz_window_manager_init, -+ NULL -+ }; -+ -+ compiz_window_manager_type = -+ g_type_register_static (mate_window_manager_get_type (), -+ "CompizWindowManager", -+ &compiz_window_manager_info, 0); -+ } -+ -+ return compiz_window_manager_type; -+} -diff -upr compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h compiz-0.8.8/gtk/mate/compiz-window-manager.h ---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.h 2012-08-26 10:32:31.896170867 +0200 -+++ compiz-0.8.8/gtk/mate/compiz-window-manager.h 2012-05-16 12:40:05.000000000 +0200 -@@ -0,0 +1,39 @@ -+#ifndef COMPIZ_WINDOW_MANAGER_H -+#define COMPIZ_WINDOW_MANAGER_H -+ -+#include -+ -+#include "mate-window-manager.h" -+ -+#define COMPIZ_WINDOW_MANAGER(obj) \ -+ G_TYPE_CHECK_INSTANCE_CAST (obj, compiz_window_manager_get_type (), \ -+ CompizWindowManager) -+ -+#define COMPIZ_WINDOW_MANAGER_CLASS(klass) \ -+ G_TYPE_CHECK_CLASS_CAST (klass, compiz_window_manager_get_type (), \ -+ MarcoWindowManagerClass) -+ -+#define IS_COMPIZ_WINDOW_MANAGER(obj) \ -+ G_TYPE_CHECK_INSTANCE_TYPE (obj, compiz_window_manager_get_type ()) -+ -+ -+typedef struct _CompizWindowManager CompizWindowManager; -+typedef struct _CompizWindowManagerClass CompizWindowManagerClass; -+typedef struct _CompizWindowManagerPrivate CompizWindowManagerPrivate; -+ -+struct _CompizWindowManager { -+ MateWindowManager parent; -+ CompizWindowManagerPrivate *p; -+}; -+ -+struct _CompizWindowManagerClass { -+ MateWindowManagerClass klass; -+}; -+ -+GType -+compiz_window_manager_get_type (void); -+ -+GObject * -+window_manager_new (int expected_interface_version); -+ -+#endif -diff -upr compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in compiz-0.8.8/gtk/mate/compiz-wm.desktop.in ---- compiz-0.8.8-orig/gtk/mate/compiz-wm.desktop.in 2012-08-26 10:33:11.143584345 +0200 -+++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in 2012-05-16 12:40:06.000000000 +0200 -@@ -0,0 +1,17 @@ -+[Desktop Entry] -+Type=Application -+Encoding=UTF-8 -+_Name=Compiz -+Exec=compiz -+# name of loadable control center module -+X-MATE-WMSettingsModule=compiz -+# autostart phase -+X-MATE-Autostart-Phase=WindowManager -+X-MATE-Provides=windowmanager -+# name we put on the WM spec check window -+X-MATE-WMName=compiz -+# back compat only -+X-MateWMSettingsLibrary=compiz -+ -+[Window Manager] -+SessionManaged=false -diff -upr compiz-0.8.8-orig/gtk/mate/Makefile.am compiz-0.8.8/gtk/mate/Makefile.am ---- compiz-0.8.8-orig/gtk/mate/Makefile.am 2012-08-26 10:33:11.142584335 +0200 -+++ compiz-0.8.8/gtk/mate/Makefile.am 2012-05-16 12:40:06.000000000 +0200 -@@ -0,0 +1,97 @@ -+moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings -+ -+if USE_MATE -+libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) -+libcompiz_la_LIBADD = @MATE_WINDOW_SETTINGS_LIBS@ -+libcompiz_la_SOURCES = \ -+ compiz-window-manager.c \ -+ compiz-window-manager.h -+libcompiz_module = libcompiz.la -+ -+desktopfilesdir = $(DESTDIR)$(datadir)/applications -+desktopfiles_in_files = compiz.desktop.in -+desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop) -+ -+wmpropertiesdir = $(DESTDIR)$(windowsettingsdatadir)/mate/wm-properties -+wmproperties_in_files = compiz-wm.desktop.in -+wmproperties_files = $(wmproperties_in_files:.desktop.in=.desktop) -+ -+@INTLTOOL_DESKTOP_RULE@ -+ -+if USE_MATE_KEYBINDINGS -+ -+xmldir = $(DESTDIR)$(keybindingsdir) -+xml_in_files = 50-compiz-desktop-key.xml.in 50-compiz-key.xml.in -+xml_files = $(xml_in_files:.xml.in=.xml) -+ -+@INTLTOOL_XML_NOMERGE_RULE@ -+ -+endif -+ -+install-exec-local: -+ if mkdir -p $(moduledir) && test -w $(moduledir); then ( \ -+ $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \ -+ $(moduledir) \ -+ ); \ -+ fi -+ -+install-data-local: -+ if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \ -+ $(INSTALL) -m 644 $(desktopfiles_files) \ -+ $(desktopfilesdir) \ -+ ); \ -+ fi -+ if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \ -+ $(INSTALL) -m 644 $(wmproperties_files) \ -+ $(wmpropertiesdir) \ -+ ); \ -+ fi -+ -+if USE_MATE_KEYBINDINGS -+ if mkdir -p $(xmldir) && test -w $(xmldir); then ( \ -+ $(INSTALL) -m 644 $(xml_files) \ -+ $(xmldir) \ -+ ); \ -+ fi -+endif -+ -+uninstall-local: -+ if test -w $(moduledir); then ( \ -+ rm -f $(moduledir)/libcompiz.* \ -+ ); \ -+ fi -+ if test -w $(desktopfilesdir); then ( \ -+ rm -f $(desktopfilesdir)/compiz.desktop \ -+ ); \ -+ fi -+ if test -w $(wmpropertiesdir); then ( \ -+ rm -f $(wmpropertiesdir)/compiz-wm.desktop \ -+ ); \ -+ fi -+if USE_MATE_KEYBINDINGS -+ if test -w $(xmldir); then ( \ -+ rm -f $(xmldir)/50-compiz*key.xml \ -+ ); \ -+ fi -+endif -+endif -+ -+INCLUDES = @MATE_WINDOW_SETTINGS_CFLAGS@ \ -+ -DMARCO_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ -+ -DLOCALEDIR="\"@datadir@/locale"\" -+ -+noinst_LTLIBRARIES = \ -+ $(libcompiz_module) -+ -+noinst_DATA = \ -+ $(desktopfiles_files) \ -+ $(wmproperties_files) \ -+ $(xml_files) -+ -+EXTRA_DIST = \ -+ $(desktopfiles_in_files) \ -+ $(wmproperties_in_files) \ -+ $(xml_in_files) -+ -+DISTCLEANFILES = \ -+ $(noinst_DATA) -diff -upr compiz-0.8.8-orig/gtk/mate/Makefile.in compiz-0.8.8/gtk/mate/Makefile.in ---- compiz-0.8.8-orig/gtk/mate/Makefile.in 2012-08-26 10:33:11.142584335 +0200 -+++ compiz-0.8.8/gtk/mate/Makefile.in 2012-05-16 12:40:11.000000000 +0200 -@@ -0,0 +1,655 @@ -+# Makefile.in generated by automake 1.11.1 from Makefile.am. -+# @configure_input@ -+ -+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -+# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -+# Inc. -+# This Makefile.in is free software; the Free Software Foundation -+# gives unlimited permission to copy and/or distribute it, -+# with or without modifications, as long as this notice is preserved. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -+# PARTICULAR PURPOSE. -+ -+@SET_MAKE@ -+ -+ -+VPATH = @srcdir@ -+pkgdatadir = $(datadir)/@PACKAGE@ -+pkgincludedir = $(includedir)/@PACKAGE@ -+pkglibdir = $(libdir)/@PACKAGE@ -+pkglibexecdir = $(libexecdir)/@PACKAGE@ -+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -+install_sh_DATA = $(install_sh) -c -m 644 -+install_sh_PROGRAM = $(install_sh) -c -+install_sh_SCRIPT = $(install_sh) -c -+INSTALL_HEADER = $(INSTALL_DATA) -+transform = $(program_transform_name) -+NORMAL_INSTALL = : -+PRE_INSTALL = : -+POST_INSTALL = : -+NORMAL_UNINSTALL = : -+PRE_UNINSTALL = : -+POST_UNINSTALL = : -+build_triplet = @build@ -+host_triplet = @host@ -+subdir = gtk/mate -+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -+am__aclocal_m4_deps = $(top_srcdir)/configure.ac -+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ -+ $(ACLOCAL_M4) -+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -+CONFIG_HEADER = $(top_builddir)/config.h -+CONFIG_CLEAN_FILES = -+CONFIG_CLEAN_VPATH_FILES = -+LTLIBRARIES = $(noinst_LTLIBRARIES) -+libcompiz_la_DEPENDENCIES = -+am__libcompiz_la_SOURCES_DIST = compiz-window-manager.c \ -+ compiz-window-manager.h -+@USE_MATE_TRUE@am_libcompiz_la_OBJECTS = compiz-window-manager.lo -+libcompiz_la_OBJECTS = $(am_libcompiz_la_OBJECTS) -+libcompiz_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -+ $(libcompiz_la_LDFLAGS) $(LDFLAGS) -o $@ -+@USE_MATE_TRUE@am_libcompiz_la_rpath = -+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -+depcomp = $(SHELL) $(top_srcdir)/depcomp -+am__depfiles_maybe = depfiles -+am__mv = mv -f -+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+CCLD = $(CC) -+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ -+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -+ $(LDFLAGS) -o $@ -+SOURCES = $(libcompiz_la_SOURCES) -+DIST_SOURCES = $(am__libcompiz_la_SOURCES_DIST) -+DATA = $(noinst_DATA) -+ETAGS = etags -+CTAGS = ctags -+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -+ACLOCAL = @ACLOCAL@ -+ALL_LINGUAS = @ALL_LINGUAS@ -+AMTAR = @AMTAR@ -+ANNOTATE_CFLAGS = @ANNOTATE_CFLAGS@ -+ANNOTATE_LIBS = @ANNOTATE_LIBS@ -+AR = @AR@ -+AUTOCONF = @AUTOCONF@ -+AUTOHEADER = @AUTOHEADER@ -+AUTOMAKE = @AUTOMAKE@ -+AWK = @AWK@ -+CATALOGS = @CATALOGS@ -+CATOBJEXT = @CATOBJEXT@ -+CC = @CC@ -+CCDEPMODE = @CCDEPMODE@ -+CFLAGS = @CFLAGS@ -+COMPIZ_CFLAGS = @COMPIZ_CFLAGS@ -+COMPIZ_LIBS = @COMPIZ_LIBS@ -+COMPIZ_REQUIRES = @COMPIZ_REQUIRES@ -+COMPIZ_VERSION_MAJOR = @COMPIZ_VERSION_MAJOR@ -+COMPIZ_VERSION_MICRO = @COMPIZ_VERSION_MICRO@ -+COMPIZ_VERSION_MINOR = @COMPIZ_VERSION_MINOR@ -+CPP = @CPP@ -+CPPFLAGS = @CPPFLAGS@ -+CXX = @CXX@ -+CXXCPP = @CXXCPP@ -+CXXDEPMODE = @CXXDEPMODE@ -+CXXFLAGS = @CXXFLAGS@ -+CYGPATH_W = @CYGPATH_W@ -+DATADIRNAME = @DATADIRNAME@ -+DBUS_CFLAGS = @DBUS_CFLAGS@ -+DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@ -+DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@ -+DBUS_LIBS = @DBUS_LIBS@ -+DCOPIDL = @DCOPIDL@ -+DCOPIDL2CPP = @DCOPIDL2CPP@ -+DECORATION_CFLAGS = @DECORATION_CFLAGS@ -+DECORATION_LIBS = @DECORATION_LIBS@ -+DECORATION_REQUIRES = @DECORATION_REQUIRES@ -+DEFS = @DEFS@ -+DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ -+DUMPBIN = @DUMPBIN@ -+ECHO_C = @ECHO_C@ -+ECHO_N = @ECHO_N@ -+ECHO_T = @ECHO_T@ -+EGREP = @EGREP@ -+EXEEXT = @EXEEXT@ -+FGREP = @FGREP@ -+FUSE_CFLAGS = @FUSE_CFLAGS@ -+FUSE_LIBS = @FUSE_LIBS@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ -+GLIB_CFLAGS = @GLIB_CFLAGS@ -+GLIB_LIBS = @GLIB_LIBS@ -+GL_CFLAGS = @GL_CFLAGS@ -+GL_LIBS = @GL_LIBS@ -+GMOFILES = @GMOFILES@ -+GMSGFMT = @GMSGFMT@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ -+GREP = @GREP@ -+GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ -+GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_SCRIPT = @INSTALL_SCRIPT@ -+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -+INSTOBJEXT = @INSTOBJEXT@ -+INTLLIBS = @INTLLIBS@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+INTLTOOL_MERGE = @INTLTOOL_MERGE@ -+INTLTOOL_PERL = @INTLTOOL_PERL@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+KCONFIG_CFLAGS = @KCONFIG_CFLAGS@ -+KCONFIG_LIBS = @KCONFIG_LIBS@ -+KDE4_CFLAGS = @KDE4_CFLAGS@ -+KDE4_LIBS = @KDE4_LIBS@ -+KDE4_WINDOW_DECORATOR_CFLAGS = @KDE4_WINDOW_DECORATOR_CFLAGS@ -+KDE4_WINDOW_DECORATOR_LIBS = @KDE4_WINDOW_DECORATOR_LIBS@ -+KDE_CFLAGS = @KDE_CFLAGS@ -+KDE_KCFG_DIR = @KDE_KCFG_DIR@ -+KDE_KCONFIG_DIR = @KDE_KCONFIG_DIR@ -+KDE_LIBS = @KDE_LIBS@ -+KDE_WINDOW_DECORATOR_CFLAGS = @KDE_WINDOW_DECORATOR_CFLAGS@ -+KDE_WINDOW_DECORATOR_LIBS = @KDE_WINDOW_DECORATOR_LIBS@ -+LD = @LD@ -+LDFLAGS = @LDFLAGS@ -+LIBOBJS = @LIBOBJS@ -+LIBPNG_CFLAGS = @LIBPNG_CFLAGS@ -+LIBPNG_LIBS = @LIBPNG_LIBS@ -+LIBRSVG_CFLAGS = @LIBRSVG_CFLAGS@ -+LIBRSVG_LIBS = @LIBRSVG_LIBS@ -+LIBS = @LIBS@ -+LIBTOOL = @LIBTOOL@ -+LIPO = @LIPO@ -+LN_S = @LN_S@ -+LTLIBOBJS = @LTLIBOBJS@ -+MAINT = @MAINT@ -+MAKEINFO = @MAKEINFO@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ -+MKDIR_P = @MKDIR_P@ -+MKINSTALLDIRS = @MKINSTALLDIRS@ -+MSGFMT = @MSGFMT@ -+MSGFMT_OPTS = @MSGFMT_OPTS@ -+MSGMERGE = @MSGMERGE@ -+NM = @NM@ -+NMEDIT = @NMEDIT@ -+OBJDUMP = @OBJDUMP@ -+OBJEXT = @OBJEXT@ -+OTOOL = @OTOOL@ -+OTOOL64 = @OTOOL64@ -+PACKAGE = @PACKAGE@ -+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -+PACKAGE_NAME = @PACKAGE_NAME@ -+PACKAGE_STRING = @PACKAGE_STRING@ -+PACKAGE_TARNAME = @PACKAGE_TARNAME@ -+PACKAGE_URL = @PACKAGE_URL@ -+PACKAGE_VERSION = @PACKAGE_VERSION@ -+PATH_SEPARATOR = @PATH_SEPARATOR@ -+PKG_CONFIG = @PKG_CONFIG@ -+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ -+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ -+POFILES = @POFILES@ -+POSUB = @POSUB@ -+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ -+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ -+QDBUSXML2CPP = @QDBUSXML2CPP@ -+QT4_MOC = @QT4_MOC@ -+QT_MOC = @QT_MOC@ -+RANLIB = @RANLIB@ -+SED = @SED@ -+SET_MAKE = @SET_MAKE@ -+SHELL = @SHELL@ -+STRIP = @STRIP@ -+USE_NLS = @USE_NLS@ -+VERSION = @VERSION@ -+XGETTEXT = @XGETTEXT@ -+XSLTPROC = @XSLTPROC@ -+abs_builddir = @abs_builddir@ -+abs_srcdir = @abs_srcdir@ -+abs_top_builddir = @abs_top_builddir@ -+abs_top_srcdir = @abs_top_srcdir@ -+ac_ct_CC = @ac_ct_CC@ -+ac_ct_CXX = @ac_ct_CXX@ -+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -+am__include = @am__include@ -+am__leading_dot = @am__leading_dot@ -+am__quote = @am__quote@ -+am__tar = @am__tar@ -+am__untar = @am__untar@ -+bindir = @bindir@ -+build = @build@ -+build_alias = @build_alias@ -+build_cpu = @build_cpu@ -+build_os = @build_os@ -+build_vendor = @build_vendor@ -+builddir = @builddir@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+default_plugins = @default_plugins@ -+docdir = @docdir@ -+dvidir = @dvidir@ -+exec_prefix = @exec_prefix@ -+host = @host@ -+host_alias = @host_alias@ -+host_cpu = @host_cpu@ -+host_os = @host_os@ -+host_vendor = @host_vendor@ -+htmldir = @htmldir@ -+imagedir = @imagedir@ -+includedir = @includedir@ -+infodir = @infodir@ -+install_sh = @install_sh@ -+kcfgdir = @kcfgdir@ -+keybindingsdir = @keybindingsdir@ -+libdir = @libdir@ -+libexecdir = @libexecdir@ -+localedir = @localedir@ -+localstatedir = @localstatedir@ -+mandir = @mandir@ -+metadatadir = @metadatadir@ -+mkdir_p = @mkdir_p@ -+oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ -+plugindir = @plugindir@ -+prefix = @prefix@ -+program_transform_name = @program_transform_name@ -+psdir = @psdir@ -+sbindir = @sbindir@ -+sharedstatedir = @sharedstatedir@ -+srcdir = @srcdir@ -+stylesheetdir = @stylesheetdir@ -+sysconfdir = @sysconfdir@ -+target_alias = @target_alias@ -+top_build_prefix = @top_build_prefix@ -+top_builddir = @top_builddir@ -+top_srcdir = @top_srcdir@ -+windowsettingsdatadir = @windowsettingsdatadir@ -+windowsettingslibdir = @windowsettingslibdir@ -+moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings -+@USE_MATE_TRUE@libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir) -+@USE_MATE_TRUE@libcompiz_la_LIBADD = @MATE_WINDOW_SETTINGS_LIBS@ -+@USE_MATE_TRUE@libcompiz_la_SOURCES = \ -+@USE_MATE_TRUE@ compiz-window-manager.c \ -+@USE_MATE_TRUE@ compiz-window-manager.h -+ -+@USE_MATE_TRUE@libcompiz_module = libcompiz.la -+@USE_MATE_TRUE@desktopfilesdir = $(DESTDIR)$(datadir)/applications -+@USE_MATE_TRUE@desktopfiles_in_files = compiz.desktop.in -+@USE_MATE_TRUE@desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop) -+@USE_MATE_TRUE@wmpropertiesdir = $(DESTDIR)$(windowsettingsdatadir)/mate/wm-properties -+@USE_MATE_TRUE@wmproperties_in_files = compiz-wm.desktop.in -+@USE_MATE_TRUE@wmproperties_files = $(wmproperties_in_files:.desktop.in=.desktop) -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@xmldir = $(DESTDIR)$(keybindingsdir) -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@xml_in_files = 50-compiz-desktop-key.xml.in 50-compiz-key.xml.in -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@xml_files = $(xml_in_files:.xml.in=.xml) -+INCLUDES = @MATE_WINDOW_SETTINGS_CFLAGS@ \ -+ -DMARCO_THEME_DIR=\""$(windowsettingsdatadir)/themes"\" \ -+ -DLOCALEDIR="\"@datadir@/locale"\" -+ -+noinst_LTLIBRARIES = \ -+ $(libcompiz_module) -+ -+noinst_DATA = \ -+ $(desktopfiles_files) \ -+ $(wmproperties_files) \ -+ $(xml_files) -+ -+EXTRA_DIST = \ -+ $(desktopfiles_in_files) \ -+ $(wmproperties_in_files) \ -+ $(xml_in_files) -+ -+DISTCLEANFILES = \ -+ $(noinst_DATA) -+ -+all: all-am -+ -+.SUFFIXES: -+.SUFFIXES: .c .lo .o .obj -+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -+ @for dep in $?; do \ -+ case '$(am__configure_deps)' in \ -+ *$$dep*) \ -+ ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ -+ && { if test -f $@; then exit 0; else break; fi; }; \ -+ exit 1;; \ -+ esac; \ -+ done; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu gtk/mate/Makefile'; \ -+ $(am__cd) $(top_srcdir) && \ -+ $(AUTOMAKE) --gnu gtk/mate/Makefile -+.PRECIOUS: Makefile -+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+ @case '$?' in \ -+ *config.status*) \ -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ -+ *) \ -+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ -+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ -+ esac; -+ -+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+ -+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) -+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -+$(am__aclocal_m4_deps): -+ -+clean-noinstLTLIBRARIES: -+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) -+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \ -+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ -+ test "$$dir" != "$$p" || dir=.; \ -+ echo "rm -f \"$${dir}/so_locations\""; \ -+ rm -f "$${dir}/so_locations"; \ -+ done -+libcompiz.la: $(libcompiz_la_OBJECTS) $(libcompiz_la_DEPENDENCIES) -+ $(libcompiz_la_LINK) $(am_libcompiz_la_rpath) $(libcompiz_la_OBJECTS) $(libcompiz_la_LIBADD) $(LIBS) -+ -+mostlyclean-compile: -+ -rm -f *.$(OBJEXT) -+ -+distclean-compile: -+ -rm -f *.tab.c -+ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compiz-window-manager.Plo@am__quote@ -+ -+.c.o: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c $< -+ -+.c.obj: -+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` -+ -+.c.lo: -+@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -+@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -+ -+mostlyclean-libtool: -+ -rm -f *.lo -+ -+clean-libtool: -+ -rm -rf .libs _libs -+ -+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ mkid -fID $$unique -+tags: TAGS -+ -+TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ set x; \ -+ here=`pwd`; \ -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ shift; \ -+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ -+ test -n "$$unique" || unique=$$empty_fix; \ -+ if test $$# -gt 0; then \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ "$$@" $$unique; \ -+ else \ -+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ -+ $$unique; \ -+ fi; \ -+ fi -+ctags: CTAGS -+CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ -+ $(TAGS_FILES) $(LISP) -+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ -+ unique=`for i in $$list; do \ -+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ -+ done | \ -+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ -+ END { if (nonempty) { for (i in files) print i; }; }'`; \ -+ test -z "$(CTAGS_ARGS)$$unique" \ -+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ -+ $$unique -+ -+GTAGS: -+ here=`$(am__cd) $(top_builddir) && pwd` \ -+ && $(am__cd) $(top_srcdir) \ -+ && gtags -i $(GTAGS_ARGS) "$$here" -+ -+distclean-tags: -+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -+ -+distdir: $(DISTFILES) -+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ -+ list='$(DISTFILES)'; \ -+ dist_files=`for file in $$list; do echo $$file; done | \ -+ sed -e "s|^$$srcdirstrip/||;t" \ -+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ -+ case $$dist_files in \ -+ */*) $(MKDIR_P) `echo "$$dist_files" | \ -+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ -+ sort -u` ;; \ -+ esac; \ -+ for file in $$dist_files; do \ -+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ -+ if test -d $$d/$$file; then \ -+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ -+ if test -d "$(distdir)/$$file"; then \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ -+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ -+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ -+ fi; \ -+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ -+ else \ -+ test -f "$(distdir)/$$file" \ -+ || cp -p $$d/$$file "$(distdir)/$$file" \ -+ || exit 1; \ -+ fi; \ -+ done -+check-am: all-am -+check: check-am -+all-am: Makefile $(LTLIBRARIES) $(DATA) -+installdirs: -+install: install-am -+install-exec: install-exec-am -+install-data: install-data-am -+uninstall: uninstall-am -+ -+install-am: all-am -+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -+ -+installcheck: installcheck-am -+install-strip: -+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ -+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ -+ `test -z '$(STRIP)' || \ -+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -+mostlyclean-generic: -+ -+clean-generic: -+ -+distclean-generic: -+ -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) -+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -+ -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) -+ -+maintainer-clean-generic: -+ @echo "This command is intended for maintainers to use" -+ @echo "it deletes files that may require special tools to rebuild." -+@USE_MATE_FALSE@uninstall-local: -+@USE_MATE_FALSE@install-data-local: -+@USE_MATE_FALSE@install-exec-local: -+clean: clean-am -+ -+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \ -+ mostlyclean-am -+ -+distclean: distclean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+distclean-am: clean-am distclean-compile distclean-generic \ -+ distclean-tags -+ -+dvi: dvi-am -+ -+dvi-am: -+ -+html: html-am -+ -+html-am: -+ -+info: info-am -+ -+info-am: -+ -+install-data-am: install-data-local -+ -+install-dvi: install-dvi-am -+ -+install-dvi-am: -+ -+install-exec-am: install-exec-local -+ -+install-html: install-html-am -+ -+install-html-am: -+ -+install-info: install-info-am -+ -+install-info-am: -+ -+install-man: -+ -+install-pdf: install-pdf-am -+ -+install-pdf-am: -+ -+install-ps: install-ps-am -+ -+install-ps-am: -+ -+installcheck-am: -+ -+maintainer-clean: maintainer-clean-am -+ -rm -rf ./$(DEPDIR) -+ -rm -f Makefile -+maintainer-clean-am: distclean-am maintainer-clean-generic -+ -+mostlyclean: mostlyclean-am -+ -+mostlyclean-am: mostlyclean-compile mostlyclean-generic \ -+ mostlyclean-libtool -+ -+pdf: pdf-am -+ -+pdf-am: -+ -+ps: ps-am -+ -+ps-am: -+ -+uninstall-am: uninstall-local -+ -+.MAKE: install-am install-strip -+ -+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ -+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ -+ distclean-compile distclean-generic distclean-libtool \ -+ distclean-tags distdir dvi dvi-am html html-am info info-am \ -+ install install-am install-data install-data-am \ -+ install-data-local install-dvi install-dvi-am install-exec \ -+ install-exec-am install-exec-local install-html \ -+ install-html-am install-info install-info-am install-man \ -+ install-pdf install-pdf-am install-ps install-ps-am \ -+ install-strip installcheck installcheck-am installdirs \ -+ maintainer-clean maintainer-clean-generic mostlyclean \ -+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ -+ pdf pdf-am ps ps-am tags uninstall uninstall-am \ -+ uninstall-local -+ -+ -+@USE_MATE_TRUE@@INTLTOOL_DESKTOP_RULE@ -+ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@@INTLTOOL_XML_NOMERGE_RULE@ -+ -+@USE_MATE_TRUE@install-exec-local: -+@USE_MATE_TRUE@ if mkdir -p $(moduledir) && test -w $(moduledir); then ( \ -+@USE_MATE_TRUE@ $(LIBTOOL) --mode=install $(INSTALL) $(libcompiz_module) \ -+@USE_MATE_TRUE@ $(moduledir) \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+ -+@USE_MATE_TRUE@install-data-local: -+@USE_MATE_TRUE@ if mkdir -p $(desktopfilesdir) && test -w $(desktopfilesdir); then ( \ -+@USE_MATE_TRUE@ $(INSTALL) -m 644 $(desktopfiles_files) \ -+@USE_MATE_TRUE@ $(desktopfilesdir) \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+@USE_MATE_TRUE@ if mkdir -p $(wmpropertiesdir) && test -w $(wmpropertiesdir); then ( \ -+@USE_MATE_TRUE@ $(INSTALL) -m 644 $(wmproperties_files) \ -+@USE_MATE_TRUE@ $(wmpropertiesdir) \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ if mkdir -p $(xmldir) && test -w $(xmldir); then ( \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ $(INSTALL) -m 644 $(xml_files) \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ $(xmldir) \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ ); \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ fi -+ -+@USE_MATE_TRUE@uninstall-local: -+@USE_MATE_TRUE@ if test -w $(moduledir); then ( \ -+@USE_MATE_TRUE@ rm -f $(moduledir)/libcompiz.* \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+@USE_MATE_TRUE@ if test -w $(desktopfilesdir); then ( \ -+@USE_MATE_TRUE@ rm -f $(desktopfilesdir)/compiz.desktop \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+@USE_MATE_TRUE@ if test -w $(wmpropertiesdir); then ( \ -+@USE_MATE_TRUE@ rm -f $(wmpropertiesdir)/compiz-wm.desktop \ -+@USE_MATE_TRUE@ ); \ -+@USE_MATE_TRUE@ fi -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ if test -w $(xmldir); then ( \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ rm -f $(xmldir)/50-compiz*key.xml \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ ); \ -+@USE_MATE_KEYBINDINGS_TRUE@@USE_MATE_TRUE@ fi -+ -+# Tell versions [3.59,3.63) of GNU make to not export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2010-10-18 07:56:02.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 12:40:35.000000000 +0200 -@@ -43,8 +43,8 @@ - #include - #include - --#ifdef USE_GCONF --#include -+#ifdef USE_MATECONF -+#include - #endif - - #ifdef USE_DBUS_GLIB -@@ -79,72 +79,72 @@ - #include - #include - --#ifdef USE_METACITY --#include -+#ifdef USE_MARCO -+#include - #endif - --#define METACITY_GCONF_DIR "/apps/metacity/general" -+#define MARCO_MATECONF_DIR "/apps/marco/general" - - #define COMPIZ_USE_SYSTEM_FONT_KEY \ -- METACITY_GCONF_DIR "/titlebar_uses_system_font" -+ MARCO_MATECONF_DIR "/titlebar_uses_system_font" - - #define COMPIZ_TITLEBAR_FONT_KEY \ -- METACITY_GCONF_DIR "/titlebar_font" -+ MARCO_MATECONF_DIR "/titlebar_font" - - #define COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY \ -- METACITY_GCONF_DIR "/action_double_click_titlebar" -+ MARCO_MATECONF_DIR "/action_double_click_titlebar" - - #define COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY \ -- METACITY_GCONF_DIR "/action_middle_click_titlebar" -+ MARCO_MATECONF_DIR "/action_middle_click_titlebar" - - #define COMPIZ_RIGHT_CLICK_TITLEBAR_KEY \ -- METACITY_GCONF_DIR "/action_right_click_titlebar" -+ MARCO_MATECONF_DIR "/action_right_click_titlebar" - --#define COMPIZ_GCONF_DIR1 "/apps/compiz/plugins/decoration/allscreens/options" -+#define COMPIZ_MATECONF_DIR1 "/apps/compiz/plugins/decoration/allscreens/options" - - #define COMPIZ_SHADOW_RADIUS_KEY \ -- COMPIZ_GCONF_DIR1 "/shadow_radius" -+ COMPIZ_MATECONF_DIR1 "/shadow_radius" - - #define COMPIZ_SHADOW_OPACITY_KEY \ -- COMPIZ_GCONF_DIR1 "/shadow_opacity" -+ COMPIZ_MATECONF_DIR1 "/shadow_opacity" - - #define COMPIZ_SHADOW_COLOR_KEY \ -- COMPIZ_GCONF_DIR1 "/shadow_color" -+ COMPIZ_MATECONF_DIR1 "/shadow_color" - - #define COMPIZ_SHADOW_OFFSET_X_KEY \ -- COMPIZ_GCONF_DIR1 "/shadow_x_offset" -+ COMPIZ_MATECONF_DIR1 "/shadow_x_offset" - - #define COMPIZ_SHADOW_OFFSET_Y_KEY \ -- COMPIZ_GCONF_DIR1 "/shadow_y_offset" -+ COMPIZ_MATECONF_DIR1 "/shadow_y_offset" - - #define META_THEME_KEY \ -- METACITY_GCONF_DIR "/theme" -+ MARCO_MATECONF_DIR "/theme" - - #define META_BUTTON_LAYOUT_KEY \ -- METACITY_GCONF_DIR "/button_layout" -+ MARCO_MATECONF_DIR "/button_layout" - --#define GCONF_DIR "/apps/gwd" -+#define MATECONF_DIR "/apps/gwd" - - #define USE_META_THEME_KEY \ -- GCONF_DIR "/use_metacity_theme" -+ MATECONF_DIR "/use_marco_theme" - - #define META_THEME_OPACITY_KEY \ -- GCONF_DIR "/metacity_theme_opacity" -+ MATECONF_DIR "/marco_theme_opacity" - - #define META_THEME_SHADE_OPACITY_KEY \ -- GCONF_DIR "/metacity_theme_shade_opacity" -+ MATECONF_DIR "/marco_theme_shade_opacity" - - #define META_THEME_ACTIVE_OPACITY_KEY \ -- GCONF_DIR "/metacity_theme_active_opacity" -+ MATECONF_DIR "/marco_theme_active_opacity" - - #define META_THEME_ACTIVE_SHADE_OPACITY_KEY \ -- GCONF_DIR "/metacity_theme_active_shade_opacity" -+ MATECONF_DIR "/marco_theme_active_shade_opacity" - - #define BLUR_TYPE_KEY \ -- GCONF_DIR "/blur_type" -+ MATECONF_DIR "/blur_type" - - #define WHEEL_ACTION_KEY \ -- GCONF_DIR "/mouse_wheel_action" -+ MATECONF_DIR "/mouse_wheel_action" - - #define DBUS_DEST "org.freedesktop.compiz" - #define DBUS_PATH "/org/freedesktop/compiz/decoration/allscreens" -@@ -283,7 +283,7 @@ static gushort shadow_color[3] = { - static gint shadow_offset_x = SHADOW_OFFSET_X; - static gint shadow_offset_y = SHADOW_OFFSET_Y; - --#ifdef USE_METACITY -+#ifdef USE_MARCO - static double meta_opacity = META_OPACITY; - static gboolean meta_shade_opacity = META_SHADE_OPACITY; - static double meta_active_opacity = META_ACTIVE_OPACITY; -@@ -1318,7 +1318,7 @@ draw_window_decoration (decor_t *d) - } - } - --#ifdef USE_METACITY -+#ifdef USE_MARCO - static void - decor_update_meta_window_property (decor_t *d, - MetaTheme *theme, -@@ -1405,7 +1405,7 @@ meta_get_corner_radius (const MetaFrameG - int *bottom_right_radius) - { - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - *top_left_radius = fgeom->top_left_corner_rounded_radius; - *top_right_radius = fgeom->top_right_corner_rounded_radius; - *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius; -@@ -1626,7 +1626,7 @@ meta_function_to_type (MetaButtonFunctio - case META_BUTTON_FUNCTION_CLOSE: - return META_BUTTON_TYPE_CLOSE; - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - case META_BUTTON_FUNCTION_SHADE: - return META_BUTTON_TYPE_SHADE; - case META_BUTTON_FUNCTION_ABOVE: -@@ -1684,7 +1684,7 @@ meta_button_state_for_button_type (decor - case META_BUTTON_TYPE_MENU: - return meta_button_state (d->button_states[BUTTON_MENU]); - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - case META_BUTTON_TYPE_SHADE: - return meta_button_state (d->button_states[BUTTON_SHADE]); - case META_BUTTON_TYPE_ABOVE: -@@ -1785,7 +1785,7 @@ meta_get_decoration_geometry (decor_t * - if (d->state & WNCK_WINDOW_STATE_SHADED) - *flags |= META_FRAME_SHADED; - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - if (d->state & WNCK_WINDOW_STATE_ABOVE) - *flags |= META_FRAME_ABOVE; - #endif -@@ -1885,7 +1885,7 @@ meta_draw_window_decoration (decor_t *d) - bg_color = style->bg[GTK_STATE_NORMAL]; - bg_alpha = 1.0; - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - if (frame_style->window_background_color) - { - meta_color_spec_render (frame_style->window_background_color, -@@ -2772,7 +2772,7 @@ get_button_position (decor_t *d, - return TRUE; - } - --#ifdef USE_METACITY -+#ifdef USE_MARCO - - #define TOP_RESIZE_HEIGHT 2 - #define RESIZE_EXTENDS 15 -@@ -2926,7 +2926,7 @@ meta_get_button_position (decor_t *d, - MetaTheme *theme; - GdkRectangle clip; - --#ifdef HAVE_METACITY_2_15_21 -+#ifdef HAVE_MARCO_2_15_21 - MetaButtonSpace *space; - #else - GdkRectangle *space; -@@ -2971,7 +2971,7 @@ meta_get_button_position (decor_t *d, - space = &fgeom.close_rect; - break; - --#if defined (HAVE_METACITY_2_17_0) && defined (HAVE_LIBWNCK_2_18_1) -+#if defined (HAVE_MARCO_2_17_0) && defined (HAVE_LIBWNCK_2_18_1) - case BUTTON_SHADE: - if (!meta_button_present (&button_layout, META_BUTTON_FUNCTION_SHADE)) - return FALSE; -@@ -3014,7 +3014,7 @@ meta_get_button_position (decor_t *d, - return FALSE; - } - --#ifdef HAVE_METACITY_2_15_21 -+#ifdef HAVE_MARCO_2_15_21 - if (!space->clickable.width && !space->clickable.height) - return FALSE; - -@@ -3366,7 +3366,7 @@ calc_decoration_size (decor_t *d, - return FALSE; - } - --#ifdef USE_METACITY -+#ifdef USE_MARCO - - static void - meta_calc_button_size (decor_t *d) -@@ -5753,13 +5753,13 @@ get_titlebar_font (void) - return titlebar_font; - } - --#ifdef USE_GCONF -+#ifdef USE_MATECONF - static void --titlebar_font_changed (GConfClient *client) -+titlebar_font_changed (MateConfClient *client) - { - gchar *str; - -- str = gconf_client_get_string (client, -+ str = mateconf_client_get_string (client, - COMPIZ_TITLEBAR_FONT_KEY, - NULL); - if (!str) -@@ -5774,7 +5774,7 @@ titlebar_font_changed (GConfClient *clie - } - - static void --titlebar_click_action_changed (GConfClient *client, -+titlebar_click_action_changed (MateConfClient *client, - const gchar *key, - int *action_value, - int default_value) -@@ -5783,7 +5783,7 @@ titlebar_click_action_changed (GConfClie - - *action_value = default_value; - -- action = gconf_client_get_string (client, key, NULL); -+ action = mateconf_client_get_string (client, key, NULL); - if (action) - { - if (strcmp (action, "toggle_shade") == 0) -@@ -5810,13 +5810,13 @@ titlebar_click_action_changed (GConfClie - } - - static void --wheel_action_changed (GConfClient *client) -+wheel_action_changed (MateConfClient *client) - { - gchar *action; - - wheel_action = WHEEL_ACTION_DEFAULT; - -- action = gconf_client_get_string (client, WHEEL_ACTION_KEY, NULL); -+ action = mateconf_client_get_string (client, WHEEL_ACTION_KEY, NULL); - if (action) - { - if (strcmp (action, "shade") == 0) -@@ -5829,7 +5829,7 @@ wheel_action_changed (GConfClient *clien - } - #endif - --#ifdef USE_METACITY -+#ifdef USE_MARCO - static MetaButtonFunction - meta_button_function_from_string (const char *str) - { -@@ -5842,7 +5842,7 @@ meta_button_function_from_string (const - else if (strcmp (str, "close") == 0) - return META_BUTTON_FUNCTION_CLOSE; - --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - else if (strcmp (str, "shade") == 0) - return META_BUTTON_FUNCTION_SHADE; - else if (strcmp (str, "above") == 0) -@@ -5866,7 +5866,7 @@ meta_button_opposite_function (MetaButto - { - switch (ofwhat) - { --#ifdef HAVE_METACITY_2_17_0 -+#ifdef HAVE_MARCO_2_17_0 - case META_BUTTON_FUNCTION_SHADE: - return META_BUTTON_FUNCTION_UNSHADE; - case META_BUTTON_FUNCTION_UNSHADE: -@@ -5897,7 +5897,7 @@ meta_initialize_button_layout (MetaButto - { - layout->left_buttons[i] = META_BUTTON_FUNCTION_LAST; - layout->right_buttons[i] = META_BUTTON_FUNCTION_LAST; --#ifdef HAVE_METACITY_2_23_2 -+#ifdef HAVE_MARCO_2_23_2 - layout->left_buttons_has_spacer[i] = FALSE; - layout->right_buttons_has_spacer[i] = FALSE; - #endif -@@ -5931,7 +5931,7 @@ meta_update_button_layout (const char *v - while (buttons[b] != NULL) - { - f = meta_button_function_from_string (buttons[b]); --#ifdef HAVE_METACITY_2_23_2 -+#ifdef HAVE_MARCO_2_23_2 - if (i > 0 && strcmp("spacer", buttons[b]) == 0) - { - new_layout.left_buttons_has_spacer[i - 1] = TRUE; -@@ -5978,7 +5978,7 @@ meta_update_button_layout (const char *v - while (buttons[b] != NULL) - { - f = meta_button_function_from_string (buttons[b]); --#ifdef HAVE_METACITY_2_23_2 -+#ifdef HAVE_MARCO_2_23_2 - if (i > 0 && strcmp("spacer", buttons[b]) == 0) - { - new_layout.right_buttons_has_spacer[i - 1] = TRUE; -@@ -6031,7 +6031,7 @@ meta_update_button_layout (const char *v - for (j = 0; j < i; j++) - { - rtl_layout.right_buttons[j] = new_layout.left_buttons[i - j - 1]; --#ifdef HAVE_METACITY_2_23_2 -+#ifdef HAVE_MARCO_2_23_2 - if (j == 0) - rtl_layout.right_buttons_has_spacer[i - 1] = - new_layout.left_buttons_has_spacer[i - j - 1]; -@@ -6048,7 +6048,7 @@ meta_update_button_layout (const char *v - for (j = 0; j < i; j++) - { - rtl_layout.left_buttons[j] = new_layout.right_buttons[i - j - 1]; --#ifdef HAVE_METACITY_2_23_2 -+#ifdef HAVE_MARCO_2_23_2 - if (j == 0) - rtl_layout.left_buttons_has_spacer[i - 1] = - new_layout.right_buttons_has_spacer[i - j - 1]; -@@ -6074,7 +6074,7 @@ update_border_extents (gint text_height) - (text_height < 17) ? 17 : text_height; - } - --#ifdef USE_METACITY -+#ifdef USE_MARCO - static void - meta_update_border_extents (gint text_height) - { -@@ -6169,7 +6169,7 @@ decorations_changed (WnckScreen *screen) - if (d->decorated) - { - --#ifdef USE_METACITY -+#ifdef USE_MARCO - if (d->draw == draw_window_decoration || - d->draw == meta_draw_window_decoration) - d->draw = theme_draw_window_decoration; -@@ -6201,16 +6201,16 @@ style_changed (GtkWidget *widget) - decorations_changed (screen); - } - --#ifdef USE_GCONF -+#ifdef USE_MATECONF - static gboolean --shadow_settings_changed (GConfClient *client) -+shadow_settings_changed (MateConfClient *client) - { - double radius, opacity; - int offset; - gchar *color; - gboolean changed = FALSE; - -- radius = gconf_client_get_float (client, -+ radius = mateconf_client_get_float (client, - COMPIZ_SHADOW_RADIUS_KEY, - NULL); - radius = MAX (0.0, MIN (radius, 48.0)); -@@ -6220,7 +6220,7 @@ shadow_settings_changed (GConfClient *cl - changed = TRUE; - } - -- opacity = gconf_client_get_float (client, -+ opacity = mateconf_client_get_float (client, - COMPIZ_SHADOW_OPACITY_KEY, - NULL); - opacity = MAX (0.0, MIN (opacity, 6.0)); -@@ -6230,7 +6230,7 @@ shadow_settings_changed (GConfClient *cl - changed = TRUE; - } - -- color = gconf_client_get_string (client, -+ color = mateconf_client_get_string (client, - COMPIZ_SHADOW_COLOR_KEY, - NULL); - if (color) -@@ -6248,7 +6248,7 @@ shadow_settings_changed (GConfClient *cl - g_free (color); - } - -- offset = gconf_client_get_int (client, -+ offset = mateconf_client_get_int (client, - COMPIZ_SHADOW_OFFSET_X_KEY, - NULL); - offset = MAX (-16, MIN (offset, 16)); -@@ -6258,7 +6258,7 @@ shadow_settings_changed (GConfClient *cl - changed = TRUE; - } - -- offset = gconf_client_get_int (client, -+ offset = mateconf_client_get_int (client, - COMPIZ_SHADOW_OFFSET_Y_KEY, - NULL); - offset = MAX (-16, MIN (offset, 16)); -@@ -6272,7 +6272,7 @@ shadow_settings_changed (GConfClient *cl - } - - static gboolean --blur_settings_changed (GConfClient *client) -+blur_settings_changed (MateConfClient *client) - { - gchar *type; - int new_type = blur_type; -@@ -6280,7 +6280,7 @@ blur_settings_changed (GConfClient *clie - if (cmdline_options & CMDLINE_BLUR) - return FALSE; - -- type = gconf_client_get_string (client, -+ type = mateconf_client_get_string (client, - BLUR_TYPE_KEY, - NULL); - -@@ -6306,16 +6306,16 @@ blur_settings_changed (GConfClient *clie - } - - static gboolean --theme_changed (GConfClient *client) -+theme_changed (MateConfClient *client) - { - --#ifdef USE_METACITY -+#ifdef USE_MARCO - gboolean use_meta_theme; - - if (cmdline_options & CMDLINE_THEME) - return FALSE; - -- use_meta_theme = gconf_client_get_bool (client, -+ use_meta_theme = mateconf_client_get_bool (client, - USE_META_THEME_KEY, - NULL); - -@@ -6323,7 +6323,7 @@ theme_changed (GConfClient *client) - { - gchar *theme; - -- theme = gconf_client_get_string (client, -+ theme = mateconf_client_get_string (client, - META_THEME_KEY, - NULL); - -@@ -6372,14 +6372,14 @@ theme_changed (GConfClient *client) - } - - static gboolean --theme_opacity_changed (GConfClient *client) -+theme_opacity_changed (MateConfClient *client) - { - --#ifdef USE_METACITY -+#ifdef USE_MARCO - gboolean shade_opacity, changed = FALSE; - gdouble opacity; - -- opacity = gconf_client_get_float (client, -+ opacity = mateconf_client_get_float (client, - META_THEME_OPACITY_KEY, - NULL); - -@@ -6392,7 +6392,7 @@ theme_opacity_changed (GConfClient *clie - - if (opacity < 1.0) - { -- shade_opacity = gconf_client_get_bool (client, -+ shade_opacity = mateconf_client_get_bool (client, - META_THEME_SHADE_OPACITY_KEY, - NULL); - -@@ -6404,7 +6404,7 @@ theme_opacity_changed (GConfClient *clie - } - } - -- opacity = gconf_client_get_float (client, -+ opacity = mateconf_client_get_float (client, - META_THEME_ACTIVE_OPACITY_KEY, - NULL); - -@@ -6418,7 +6418,7 @@ theme_opacity_changed (GConfClient *clie - if (opacity < 1.0) - { - shade_opacity = -- gconf_client_get_bool (client, -+ mateconf_client_get_bool (client, - META_THEME_ACTIVE_SHADE_OPACITY_KEY, - NULL); - -@@ -6438,13 +6438,13 @@ theme_opacity_changed (GConfClient *clie - } - - static gboolean --button_layout_changed (GConfClient *client) -+button_layout_changed (MateConfClient *client) - { - --#ifdef USE_METACITY -+#ifdef USE_MARCO - gchar *button_layout; - -- button_layout = gconf_client_get_string (client, -+ button_layout = mateconf_client_get_string (client, - META_BUTTON_LAYOUT_KEY, - NULL); - -@@ -6470,16 +6470,16 @@ button_layout_changed (GConfClient *clie - } - - static void --value_changed (GConfClient *client, -+value_changed (MateConfClient *client, - const gchar *key, -- GConfValue *value, -+ MateConfValue *value, - void *data) - { - gboolean changed = FALSE; - - if (strcmp (key, COMPIZ_USE_SYSTEM_FONT_KEY) == 0) - { -- if (gconf_client_get_bool (client, -+ if (mateconf_client_get_bool (client, - COMPIZ_USE_SYSTEM_FONT_KEY, - NULL) != use_system_font) - { -@@ -6694,27 +6694,27 @@ init_settings (WnckScreen *screen) - GdkColormap *colormap; - AtkObject *switcher_label_obj; - --#ifdef USE_GCONF -- GConfClient *gconf; -+#ifdef USE_MATECONF -+ MateConfClient *mateconf; - -- gconf = gconf_client_get_default (); -+ mateconf = mateconf_client_get_default (); - -- gconf_client_add_dir (gconf, -- GCONF_DIR, -- GCONF_CLIENT_PRELOAD_ONELEVEL, -+ mateconf_client_add_dir (mateconf, -+ MATECONF_DIR, -+ MATECONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - -- gconf_client_add_dir (gconf, -- METACITY_GCONF_DIR, -- GCONF_CLIENT_PRELOAD_ONELEVEL, -+ mateconf_client_add_dir (mateconf, -+ MARCO_MATECONF_DIR, -+ MATECONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - -- gconf_client_add_dir (gconf, -- COMPIZ_GCONF_DIR1, -- GCONF_CLIENT_PRELOAD_ONELEVEL, -+ mateconf_client_add_dir (mateconf, -+ COMPIZ_MATECONF_DIR1, -+ MATECONF_CLIENT_PRELOAD_ONELEVEL, - NULL); - -- g_signal_connect (G_OBJECT (gconf), -+ g_signal_connect (G_OBJECT (mateconf), - "value_changed", - G_CALLBACK (value_changed), - screen); -@@ -6838,39 +6838,39 @@ init_settings (WnckScreen *screen) - - pango_context = gtk_widget_create_pango_context (style_window); - --#ifdef USE_GCONF -- use_system_font = gconf_client_get_bool (gconf, -+#ifdef USE_MATECONF -+ use_system_font = mateconf_client_get_bool (mateconf, - COMPIZ_USE_SYSTEM_FONT_KEY, - NULL); -- theme_changed (gconf); -- theme_opacity_changed (gconf); -- button_layout_changed (gconf); -+ theme_changed (mateconf); -+ theme_opacity_changed (mateconf); -+ button_layout_changed (mateconf); - #endif - - update_style (style_window); - --#ifdef USE_GCONF -- titlebar_font_changed (gconf); -+#ifdef USE_MATECONF -+ titlebar_font_changed (mateconf); - #endif - - update_titlebar_font (); - --#ifdef USE_GCONF -- titlebar_click_action_changed (gconf, -+#ifdef USE_MATECONF -+ titlebar_click_action_changed (mateconf, - COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY, - &double_click_action, - DOUBLE_CLICK_ACTION_DEFAULT); -- titlebar_click_action_changed (gconf, -+ titlebar_click_action_changed (mateconf, - COMPIZ_MIDDLE_CLICK_TITLEBAR_KEY, - &middle_click_action, - MIDDLE_CLICK_ACTION_DEFAULT); -- titlebar_click_action_changed (gconf, -+ titlebar_click_action_changed (mateconf, - COMPIZ_RIGHT_CLICK_TITLEBAR_KEY, - &right_click_action, - RIGHT_CLICK_ACTION_DEFAULT); -- wheel_action_changed (gconf); -- shadow_settings_changed (gconf); -- blur_settings_changed (gconf); -+ wheel_action_changed (mateconf); -+ shadow_settings_changed (mateconf); -+ blur_settings_changed (mateconf); - #endif - - (*theme_update_border_extents) (text_height); -@@ -6890,7 +6890,7 @@ main (int argc, char *argv[]) - gint i, j, status; - gboolean replace = FALSE; - --#ifdef USE_METACITY -+#ifdef USE_MARCO - char *meta_theme = NULL; - #endif - -@@ -6924,7 +6924,7 @@ main (int argc, char *argv[]) - cmdline_options |= CMDLINE_BLUR; - } - --#ifdef USE_METACITY -+#ifdef USE_MARCO - else if (strcmp (argv[i], "--opacity") == 0) - { - if (argc > ++i) -@@ -6947,7 +6947,7 @@ main (int argc, char *argv[]) - meta_active_shade_opacity = FALSE; - cmdline_options |= CMDLINE_ACTIVE_OPACITY_SHADE; - } -- else if (strcmp (argv[i], "--metacity-theme") == 0) -+ else if (strcmp (argv[i], "--marco-theme") == 0) - { - if (argc > ++i) - meta_theme = argv[i]; -@@ -6962,12 +6962,12 @@ main (int argc, char *argv[]) - "[--replace] " - "[--blur none|titlebar|all] " - --#ifdef USE_METACITY -+#ifdef USE_MARCO - "[--opacity OPACITY] " - "[--no-opacity-shade] " - "[--active-opacity OPACITY] " - "[--no-active-opacity-shade] " -- "[--metacity-theme THEME] " -+ "[--marco-theme THEME] " - #endif - - "[--help]" -@@ -6983,7 +6983,7 @@ main (int argc, char *argv[]) - theme_get_event_window_position = get_event_window_position; - theme_get_button_position = get_button_position; - --#ifdef USE_METACITY -+#ifdef USE_MARCO - if (meta_theme) - { - meta_theme_set_current (meta_theme, TRUE); -diff -upr compiz-0.8.8-orig/gtk/window-decorator/gwd.schemas.in compiz-0.8.8/gtk/window-decorator/gwd.schemas.in ---- compiz-0.8.8-orig/gtk/window-decorator/gwd.schemas.in 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/gwd.schemas.in 2012-05-16 12:40:06.000000000 +0200 -@@ -1,4 +1,4 @@ -- -+ - - - /schemas/apps/gwd/blur_type -@@ -12,14 +12,14 @@ - - - -- /schemas/apps/gwd/use_metacity_theme -- /apps/gwd/use_metacity_theme -+ /schemas/apps/gwd/use_marco_theme -+ /apps/gwd/use_marco_theme - gwd - bool - true - -- Use metacity theme -- Use metacity theme when drawing window decorations -+ Use marco theme -+ Use marco theme when drawing window decorations - - - -@@ -34,48 +34,48 @@ - - - -- /schemas/apps/gwd/metacity_theme_opacity -- /apps/gwd/metacity_theme_opacity -+ /schemas/apps/gwd/marco_theme_opacity -+ /apps/gwd/marco_theme_opacity - gwd - float - 0.75 - -- Metacity theme opacity -- Opacity to use for metacity theme decorations -+ Marco theme opacity -+ Opacity to use for marco theme decorations - - - -- /schemas/apps/gwd/metacity_theme_shade_opacity -- /apps/gwd/metacity_theme_shade_opacity -+ /schemas/apps/gwd/marco_theme_shade_opacity -+ /apps/gwd/marco_theme_shade_opacity - gwd - bool - true - -- Metacity theme opacity shade -- Shade windows with metacity theme decorations from opaque to translucent -+ Marco theme opacity shade -+ Shade windows with marco theme decorations from opaque to translucent - - - -- /schemas/apps/gwd/metacity_theme_active_opacity -- /apps/gwd/metacity_theme_active_opacity -+ /schemas/apps/gwd/marco_theme_active_opacity -+ /apps/gwd/marco_theme_active_opacity - gwd - float - 1.0 - -- Metacity theme active window opacity -- Opacity to use for active windows with metacity theme decorations -+ Marco theme active window opacity -+ Opacity to use for active windows with marco theme decorations - - - -- /schemas/apps/gwd/metacity_theme_active_shade_opacity -- /apps/gwd/metacity_theme_active_shade_opacity -+ /schemas/apps/gwd/marco_theme_active_shade_opacity -+ /apps/gwd/marco_theme_active_shade_opacity - gwd - bool - true - -- Metacity theme active window opacity shade -- Shade active windows with metacity theme decorations from opaque to translucent -+ Marco theme active window opacity shade -+ Shade active windows with marco theme decorations from opaque to translucent - - - -- -+ -diff -upr compiz-0.8.8-orig/gtk/window-decorator/Makefile.am compiz-0.8.8/gtk/window-decorator/Makefile.am ---- compiz-0.8.8-orig/gtk/window-decorator/Makefile.am 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/Makefile.am 2012-05-16 12:40:06.000000000 +0200 -@@ -1,7 +1,7 @@ - if USE_GTK - --if USE_METACITY --metacitylibs = @METACITY_LIBS@ -+if USE_MARCO -+marcolibs = @MARCO_LIBS@ - endif - - gtk_window_decorator_DEPENDENCIES = \ -@@ -9,17 +9,17 @@ gtk_window_decorator_DEPENDENCIES = \ - gtk_window_decorator_LDADD = \ - $(top_builddir)/libdecoration/libdecoration.la \ - @GTK_WINDOW_DECORATOR_LIBS@ \ -- @GCONF_LIBS@ \ -+ @MATECONF_LIBS@ \ - @DBUS_GLIB_LIBS@ \ -- $(metacitylibs) -+ $(marcolibs) - - gtk_window_decorator_SOURCES = \ - gtk-window-decorator.c - gtk_window_decorator_program = gtk-window-decorator - endif - --if USE_GCONF --schemadir = $(GCONF_SCHEMA_FILE_DIR) -+if USE_MATECONF -+schemadir = $(MATECONF_SCHEMA_FILE_DIR) - schema_in_files = gwd.schemas.in - schema_files = $(schema_in_files:.schemas.in=.schemas) - schema_DATA = $(schema_files) -@@ -28,15 +28,15 @@ schema_DATA = $(schema_files) - - install-data-local: - if test -z "$(DESTDIR)" ; then \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ -+ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ - fi - endif - - INCLUDES = \ - -I$(top_srcdir)/include \ - @GTK_WINDOW_DECORATOR_CFLAGS@ \ -- @METACITY_CFLAGS@ \ -- @GCONF_CFLAGS@ \ -+ @MARCO_CFLAGS@ \ -+ @MATECONF_CFLAGS@ \ - @DBUS_GLIB_CFLAGS@ \ - -DALL_LINGUAS="\"@ALL_LINGUAS@\"" \ - -DLOCALEDIR="\"@datadir@/locale"\" -diff -upr compiz-0.8.8-orig/gtk/window-decorator/Makefile.in compiz-0.8.8/gtk/window-decorator/Makefile.in ---- compiz-0.8.8-orig/gtk/window-decorator/Makefile.in 2011-03-30 11:33:34.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/Makefile.in 2012-05-16 12:40:12.000000000 +0200 -@@ -144,11 +144,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -156,10 +156,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -200,8 +200,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -301,30 +301,30 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - windowsettingsdatadir = @windowsettingsdatadir@ - windowsettingslibdir = @windowsettingslibdir@ --@USE_GTK_TRUE@@USE_METACITY_TRUE@metacitylibs = @METACITY_LIBS@ -+@USE_GTK_TRUE@@USE_MARCO_TRUE@marcolibs = @MARCO_LIBS@ - @USE_GTK_TRUE@gtk_window_decorator_DEPENDENCIES = \ - @USE_GTK_TRUE@ $(top_builddir)/libdecoration/libdecoration.la - - @USE_GTK_TRUE@gtk_window_decorator_LDADD = \ - @USE_GTK_TRUE@ $(top_builddir)/libdecoration/libdecoration.la \ - @USE_GTK_TRUE@ @GTK_WINDOW_DECORATOR_LIBS@ \ --@USE_GTK_TRUE@ @GCONF_LIBS@ \ -+@USE_GTK_TRUE@ @MATECONF_LIBS@ \ - @USE_GTK_TRUE@ @DBUS_GLIB_LIBS@ \ --@USE_GTK_TRUE@ $(metacitylibs) -+@USE_GTK_TRUE@ $(marcolibs) - - @USE_GTK_TRUE@gtk_window_decorator_SOURCES = \ - @USE_GTK_TRUE@ gtk-window-decorator.c - - @USE_GTK_TRUE@gtk_window_decorator_program = gtk-window-decorator --@USE_GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) --@USE_GCONF_TRUE@schema_in_files = gwd.schemas.in --@USE_GCONF_TRUE@schema_files = $(schema_in_files:.schemas.in=.schemas) --@USE_GCONF_TRUE@schema_DATA = $(schema_files) -+@USE_MATECONF_TRUE@schemadir = $(MATECONF_SCHEMA_FILE_DIR) -+@USE_MATECONF_TRUE@schema_in_files = gwd.schemas.in -+@USE_MATECONF_TRUE@schema_files = $(schema_in_files:.schemas.in=.schemas) -+@USE_MATECONF_TRUE@schema_DATA = $(schema_files) - INCLUDES = \ - -I$(top_srcdir)/include \ - @GTK_WINDOW_DECORATOR_CFLAGS@ \ -- @METACITY_CFLAGS@ \ -- @GCONF_CFLAGS@ \ -+ @MARCO_CFLAGS@ \ -+ @MATECONF_CFLAGS@ \ - @DBUS_GLIB_CFLAGS@ \ - -DALL_LINGUAS="\"@ALL_LINGUAS@\"" \ - -DLOCALEDIR="\"@datadir@/locale"\" -@@ -586,7 +586,7 @@ distclean-generic: - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." --@USE_GCONF_FALSE@install-data-local: -+@USE_MATECONF_FALSE@install-data-local: - clean: clean-am - - clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am -@@ -675,12 +675,12 @@ uninstall-am: uninstall-binPROGRAMS unin - uninstall-schemaDATA - - --@USE_GCONF_TRUE@@INTLTOOL_SCHEMAS_RULE@ -+@USE_MATECONF_TRUE@@INTLTOOL_SCHEMAS_RULE@ - --@USE_GCONF_TRUE@install-data-local: --@USE_GCONF_TRUE@ if test -z "$(DESTDIR)" ; then \ --@USE_GCONF_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ --@USE_GCONF_TRUE@ fi -+@USE_MATECONF_TRUE@install-data-local: -+@USE_MATECONF_TRUE@ if test -z "$(DESTDIR)" ; then \ -+@USE_MATECONF_TRUE@ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ -+@USE_MATECONF_TRUE@ fi - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff -upr compiz-0.8.8-orig/gtk/window-decorator/TODO compiz-0.8.8/gtk/window-decorator/TODO ---- compiz-0.8.8-orig/gtk/window-decorator/TODO 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/TODO 2012-05-16 12:40:05.000000000 +0200 -@@ -3,4 +3,4 @@ - - * Plugin with SVG-based theme support - --* Plugin that supports old metacity themes -\ Kein Zeilenumbruch am Dateiende. -+* Plugin that supports old marco themes -\ Kein Zeilenumbruch am Dateiende. -diff -upr compiz-0.8.8-orig/images/Makefile.in compiz-0.8.8/images/Makefile.in ---- compiz-0.8.8-orig/images/Makefile.in 2011-03-30 11:33:34.000000000 +0200 -+++ compiz-0.8.8/images/Makefile.in 2012-05-16 12:40:09.000000000 +0200 -@@ -120,11 +120,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -132,10 +132,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -176,8 +176,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/include/Makefile.in compiz-0.8.8/include/Makefile.in ---- compiz-0.8.8-orig/include/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/include/Makefile.in 2012-05-16 12:40:11.000000000 +0200 -@@ -124,11 +124,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -136,10 +136,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -180,8 +180,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/INSTALL compiz-0.8.8/INSTALL ---- compiz-0.8.8-orig/INSTALL 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/INSTALL 2012-05-16 12:40:07.000000000 +0200 -@@ -1,5 +1,5 @@ - compiz uses libstartup-notification which is available at --ftp://ftp.gnome.org/pub/GNOME/sources/startup-notification/ -+ftp://ftp.gnome.org/pub/MATE/sources/startup-notification/ - - compiz uses automake, in order to generate the Makefiles for compiz use: - -diff -upr compiz-0.8.8-orig/kde/Makefile.in compiz-0.8.8/kde/Makefile.in ---- compiz-0.8.8-orig/kde/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/kde/Makefile.in 2012-05-16 12:40:11.000000000 +0200 -@@ -136,11 +136,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -148,10 +148,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -192,8 +192,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/kde/window-decorator/Makefile.in compiz-0.8.8/kde/window-decorator/Makefile.in ---- compiz-0.8.8-orig/kde/window-decorator/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/kde/window-decorator/Makefile.in 2012-05-16 12:40:12.000000000 +0200 -@@ -138,11 +138,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -150,10 +150,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -194,8 +194,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/kde/window-decorator-kde4/Makefile.in compiz-0.8.8/kde/window-decorator-kde4/Makefile.in ---- compiz-0.8.8-orig/kde/window-decorator-kde4/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/kde/window-decorator-kde4/Makefile.in 2012-05-16 12:40:12.000000000 +0200 -@@ -144,11 +144,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -156,10 +156,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -200,8 +200,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/libdecoration/Makefile.in compiz-0.8.8/libdecoration/Makefile.in ---- compiz-0.8.8-orig/libdecoration/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/libdecoration/Makefile.in 2012-05-16 12:40:11.000000000 +0200 -@@ -144,11 +144,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -156,10 +156,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -200,8 +200,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/Makefile.am compiz-0.8.8/Makefile.am ---- compiz-0.8.8-orig/Makefile.am 2011-03-30 11:33:59.000000000 +0200 -+++ compiz-0.8.8/Makefile.am 2012-05-16 12:40:08.000000000 +0200 -@@ -8,14 +8,14 @@ EXTRA_DIST = \ - compiz.pc.in \ - compiz-cube.pc.in \ - compiz-scale.pc.in \ -- compiz-gconf.pc.in -+ compiz-mateconf.pc.in - - DISTCLEANFILES = \ - po/stamp-it \ - po/.intltool-merge-cache - --if USE_GCONF --gconfdata = compiz-gconf.pc -+if USE_MATECONF -+mateconfdata = compiz-mateconf.pc - endif - - if USE_KCONFIG -@@ -27,7 +27,7 @@ pkgconfig_DATA = \ - compiz.pc \ - compiz-cube.pc \ - compiz-scale.pc \ -- $(gconfdata) \ -+ $(mateconfdata) \ - $(kconfigdata) - - # Some custom targets to make it easier to release things. -diff -upr compiz-0.8.8-orig/Makefile.in compiz-0.8.8/Makefile.in ---- compiz-0.8.8-orig/Makefile.in 2011-03-30 11:34:02.000000000 +0200 -+++ compiz-0.8.8/Makefile.in 2012-05-16 12:40:17.000000000 +0200 -@@ -37,7 +37,7 @@ host_triplet = @host@ - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/compiz-cube.pc.in \ -- $(srcdir)/compiz-gconf.pc.in $(srcdir)/compiz-kconfig.pc.in \ -+ $(srcdir)/compiz-mateconf.pc.in $(srcdir)/compiz-kconfig.pc.in \ - $(srcdir)/compiz-scale.pc.in $(srcdir)/compiz.pc.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ -@@ -51,7 +51,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h - CONFIG_CLEAN_FILES = compiz.pc compiz-cube.pc compiz-scale.pc \ -- compiz-gconf.pc compiz-kconfig.pc -+ compiz-mateconf.pc compiz-kconfig.pc - CONFIG_CLEAN_VPATH_FILES = - SOURCES = - DIST_SOURCES = -@@ -179,11 +179,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -191,10 +191,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -235,8 +235,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -345,20 +345,20 @@ EXTRA_DIST = \ - compiz.pc.in \ - compiz-cube.pc.in \ - compiz-scale.pc.in \ -- compiz-gconf.pc.in -+ compiz-mateconf.pc.in - - DISTCLEANFILES = \ - po/stamp-it \ - po/.intltool-merge-cache - --@USE_GCONF_TRUE@gconfdata = compiz-gconf.pc -+@USE_MATECONF_TRUE@mateconfdata = compiz-mateconf.pc - @USE_KCONFIG_TRUE@kconfigdata = compiz-kconfig.pc - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = \ - compiz.pc \ - compiz-cube.pc \ - compiz-scale.pc \ -- $(gconfdata) \ -+ $(mateconfdata) \ - $(kconfigdata) - - -@@ -435,7 +435,7 @@ compiz-cube.pc: $(top_builddir)/config.s - cd $(top_builddir) && $(SHELL) ./config.status $@ - compiz-scale.pc: $(top_builddir)/config.status $(srcdir)/compiz-scale.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --compiz-gconf.pc: $(top_builddir)/config.status $(srcdir)/compiz-gconf.pc.in -+compiz-mateconf.pc: $(top_builddir)/config.status $(srcdir)/compiz-mateconf.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - compiz-kconfig.pc: $(top_builddir)/config.status $(srcdir)/compiz-kconfig.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ -Nur in compiz-0.8.8-orig/metadata: gconf.xml.in. -Nur in compiz-0.8.8-orig/metadata: gnomecompat.xml.in. -diff -upr compiz-0.8.8-orig/metadata/Makefile.am compiz-0.8.8/metadata/Makefile.am ---- compiz-0.8.8-orig/metadata/Makefile.am 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/metadata/Makefile.am 2012-05-16 12:40:07.000000000 +0200 -@@ -10,9 +10,9 @@ xml_in_files = \ - decoration.xml.in \ - fade.xml.in \ - fs.xml.in \ -- gconf.xml.in \ -+ mateconf.xml.in \ - glib.xml.in \ -- gnomecompat.xml.in \ -+ matecompat.xml.in \ - ini.xml.in \ - inotify.xml.in \ - kconfig.xml.in \ -@@ -43,8 +43,8 @@ core.xml.in: core.xml.in.in Makefile - - @INTLTOOL_XML_RULE@ - --if USE_GCONF --schemadir = $(GCONF_SCHEMA_FILE_DIR) -+if USE_MATECONF -+schemadir = $(MATECONF_SCHEMA_FILE_DIR) - schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files)) - schema_DATA = $(schema_files) - -@@ -81,10 +81,10 @@ noinst_DATA = \ - $(kde_config_files) - - install-data-local: --if USE_GCONF --if GCONF_SCHEMAS_INSTALL -+if USE_MATECONF -+if MATECONF_SCHEMAS_INSTALL - if test -z "$(DESTDIR)" ; then \ -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ -+ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ - fi - endif - endif -diff -upr compiz-0.8.8-orig/metadata/Makefile.in compiz-0.8.8/metadata/Makefile.in ---- compiz-0.8.8-orig/metadata/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/metadata/Makefile.in 2012-05-16 12:40:12.000000000 +0200 -@@ -121,11 +121,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -133,10 +133,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -177,8 +177,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -290,9 +290,9 @@ xml_in_files = \ - decoration.xml.in \ - fade.xml.in \ - fs.xml.in \ -- gconf.xml.in \ -+ mateconf.xml.in \ - glib.xml.in \ -- gnomecompat.xml.in \ -+ matecompat.xml.in \ - ini.xml.in \ - inotify.xml.in \ - kconfig.xml.in \ -@@ -315,10 +315,10 @@ xml_in_files = \ - - xml_files = $(xml_in_files:.xml.in=.xml) - xml_DATA = $(xml_files) --@USE_GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR) --@USE_GCONF_TRUE@schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files)) --@USE_GCONF_TRUE@schema_DATA = $(schema_files) --@USE_GCONF_TRUE@schemas_stylesheets = schemas.xslt -+@USE_MATECONF_TRUE@schemadir = $(MATECONF_SCHEMA_FILE_DIR) -+@USE_MATECONF_TRUE@schema_files = $(patsubst %.xml.in,compiz-%.schemas,$(xml_in_files)) -+@USE_MATECONF_TRUE@schema_DATA = $(schema_files) -+@USE_MATECONF_TRUE@schemas_stylesheets = schemas.xslt - @USE_KCONFIG_TRUE@kde_kcfgdir = $(DESTDIR)$(KDE_KCFG_DIR) - @USE_KCONFIG_TRUE@kde_kcfg_files = $(patsubst %.xml.in,compiz-%.kcfg,$(xml_in_files)) - @USE_KCONFIG_TRUE@kde_kcfg_stylesheets = kcfg.xslt -@@ -610,9 +610,9 @@ core.xml.in: core.xml.in.in Makefile - - @INTLTOOL_XML_RULE@ - --@USE_GCONF_TRUE@%.schemas: $(xml_files) --@USE_GCONF_TRUE@ xsltproc -o $@ --param defaultPlugins "'$(default_plugins)'" \ --@USE_GCONF_TRUE@ $(srcdir)/schemas.xslt $(subst compiz-,,$*).xml -+@USE_MATECONF_TRUE@%.schemas: $(xml_files) -+@USE_MATECONF_TRUE@ xsltproc -o $@ --param defaultPlugins "'$(default_plugins)'" \ -+@USE_MATECONF_TRUE@ $(srcdir)/schemas.xslt $(subst compiz-,,$*).xml - - @USE_KCONFIG_TRUE@%.kcfg: $(xml_files) - @USE_KCONFIG_TRUE@ xsltproc -o $@ $(srcdir)/kcfg.xslt $(subst compiz-,,$*).xml; -@@ -622,9 +622,9 @@ core.xml.in: core.xml.in.in Makefile - @USE_KCONFIG_TRUE@ $(kde_kcfg_files) > $@; - - install-data-local: --@GCONF_SCHEMAS_INSTALL_TRUE@@USE_GCONF_TRUE@ if test -z "$(DESTDIR)" ; then \ --@GCONF_SCHEMAS_INSTALL_TRUE@@USE_GCONF_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA); \ --@GCONF_SCHEMAS_INSTALL_TRUE@@USE_GCONF_TRUE@ fi -+@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_MATECONF_TRUE@ if test -z "$(DESTDIR)" ; then \ -+@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_MATECONF_TRUE@ MATECONF_CONFIG_SOURCE=$(MATECONF_SCHEMA_CONFIG_SOURCE) $(MATECONFTOOL) --makefile-install-rule $(schema_DATA); \ -+@MATECONF_SCHEMAS_INSTALL_TRUE@@USE_MATECONF_TRUE@ fi - @USE_KCONFIG_TRUE@ if mkdir -p $(kde_kcfgdir) && test -w $(kde_kcfgdir); then ( \ - @USE_KCONFIG_TRUE@ $(INSTALL) -m 644 $(kde_kcfg_files) $(kde_kcfgdir) \ - @USE_KCONFIG_TRUE@ ); \ -diff -upr compiz-0.8.8-orig/metadata/matecompat.xml.in compiz-0.8.8/metadata/matecompat.xml.in ---- compiz-0.8.8-orig/metadata/matecompat.xml.in 2012-08-26 10:35:32.096074898 +0200 -+++ compiz-0.8.8/metadata/matecompat.xml.in 2012-05-16 12:40:07.000000000 +0200 -@@ -0,0 +1,52 @@ -+ -+ -+ <_short>Mate Compatibility -+ <_long>Options that keep Compiz compatible to the Mate desktop environment -+ General -+ -+ -+ -+ -+ <_short>Commands -+ -+ -+ -+ -+ <_short>Run terminal command -+ -+ -+ -+ -+ -+ -diff -upr compiz-0.8.8-orig/metadata/mateconf.xml.in compiz-0.8.8/metadata/mateconf.xml.in ---- compiz-0.8.8-orig/metadata/mateconf.xml.in 2012-08-26 10:35:37.398131111 +0200 -+++ compiz-0.8.8/metadata/mateconf.xml.in 2012-05-16 12:40:07.000000000 +0200 -@@ -0,0 +1,18 @@ -+ -+ -+ <_short>MateConf -+ <_long>MateConf Control Backend -+ -+ -+ glib -+ -+ -+ decoration -+ wobbly -+ fade -+ cube -+ scale -+ -+ -+ -+ -diff -upr compiz-0.8.8-orig/metadata/schemas.xslt compiz-0.8.8/metadata/schemas.xslt ---- compiz-0.8.8-orig/metadata/schemas.xslt 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/metadata/schemas.xslt 2012-05-16 12:40:09.000000000 +0200 -@@ -29,13 +29,13 @@ - /apps/compiz - - -- -+ - - - - - -- -+ - - - -@@ -120,7 +120,7 @@ - - - -- -+ - - - -diff -upr compiz-0.8.8-orig/plugins/fade.c compiz-0.8.8/plugins/fade.c ---- compiz-0.8.8-orig/plugins/fade.c 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/plugins/fade.c 2012-05-16 12:40:16.000000000 +0200 -@@ -770,7 +770,7 @@ fadeInitDisplay (CompPlugin *p, - matchInit (&fd->alwaysFadeWindowMatch); - matchAddExp (&fd->alwaysFadeWindowMatch, 0, "title=gksu"); - matchAddExp (&fd->alwaysFadeWindowMatch, 0, "title=x-session-manager"); -- matchAddExp (&fd->alwaysFadeWindowMatch, 0, "title=gnome-session"); -+ matchAddExp (&fd->alwaysFadeWindowMatch, 0, "title=mate-session"); - matchUpdate (d, &fd->alwaysFadeWindowMatch); - - WRAP (fd, d, handleEvent, fadeHandleEvent); -Nur in compiz-0.8.8-orig/plugins: gconf.c. -diff -upr compiz-0.8.8-orig/plugins/glib.c compiz-0.8.8/plugins/glib.c ---- compiz-0.8.8-orig/plugins/glib.c 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/plugins/glib.c 2012-05-16 12:40:09.000000000 +0200 -@@ -37,7 +37,7 @@ typedef struct _GLibWatch { - CompDisplay *display; - } GLibWatch; - --typedef struct _GConfDisplay { -+typedef struct _MateConfDisplay { - HandleEventProc handleEvent; - CompTimeoutHandle timeoutHandle; - CompTimeoutHandle wakeupTimeoutHandle; -Nur in compiz-0.8.8-orig/plugins: gnomecompat.c. -diff -upr compiz-0.8.8-orig/plugins/ini.c compiz-0.8.8/plugins/ini.c ---- compiz-0.8.8-orig/plugins/ini.c 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/plugins/ini.c 2012-05-16 12:40:17.000000000 +0200 -@@ -22,7 +22,7 @@ - * - * Author: Mike Dransfield - * -- * Some code taken from gconf.c by : -+ * Some code taken from mateconf.c by : - * David Reveman - */ - -diff -upr compiz-0.8.8-orig/plugins/Makefile.am compiz-0.8.8/plugins/Makefile.am ---- compiz-0.8.8-orig/plugins/Makefile.am 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/plugins/Makefile.am 2012-05-16 12:40:08.000000000 +0200 -@@ -71,8 +71,8 @@ libobs_la_SOURCES = obs.c - libcommands_la_LDFLAGS = -module -avoid-version -no-undefined - libcommands_la_SOURCES = commands.c - --libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined --libgnomecompat_la_SOURCES = gnomecompat.c -+libmatecompat_la_LDFLAGS = -module -avoid-version -no-undefined -+libmatecompat_la_SOURCES = matecompat.c - - if USE_LIBRSVG - libsvg_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la -@@ -98,11 +98,11 @@ libglib_la_SOURCES = glib.c - libglib_module = libglib.la - endif - --if USE_GCONF --libgconf_la_LDFLAGS = -module -avoid-version -no-undefined --libgconf_la_LIBADD = @GCONF_LIBS@ --libgconf_la_SOURCES = gconf.c --libgconf_module = libgconf.la -+if USE_MATECONF -+libmateconf_la_LDFLAGS = -module -avoid-version -no-undefined -+libmateconf_la_LIBADD = @MATECONF_LIBS@ -+libmateconf_la_SOURCES = mateconf.c -+libmateconf_module = libmateconf.la - endif - - if USE_KCONFIG -@@ -137,7 +137,7 @@ INCLUDES = \ - @LIBPNG_CFLAGS@ \ - @LIBRSVG_CFLAGS@ \ - @ANNOTATE_CFLAGS@ \ -- @GCONF_CFLAGS@ \ -+ @MATECONF_CFLAGS@ \ - @KCONFIG_CFLAGS@ \ - @DBUS_CFLAGS@ \ - @GLIB_CFLAGS@ \ -@@ -155,7 +155,7 @@ moduledir = $(plugindir) - - module_LTLIBRARIES = \ - $(libglib_module) \ -- $(libgconf_module) \ -+ $(libmateconf_module) \ - $(libkconfig_module) \ - libdecoration.la \ - libwobbly.la \ -@@ -180,7 +180,7 @@ module_LTLIBRARIES = \ - libini.la \ - libobs.la \ - libcommands.la \ -- libgnomecompat.la \ -+ libmatecompat.la \ - $(libsvg_module) \ - $(libannotate_module) \ - $(libinotify_module) \ -diff -upr compiz-0.8.8-orig/plugins/Makefile.in compiz-0.8.8/plugins/Makefile.in ---- compiz-0.8.8-orig/plugins/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/plugins/Makefile.in 2012-05-16 12:40:16.000000000 +0200 -@@ -125,14 +125,14 @@ libfs_la_LINK = $(LIBTOOL) --tag=CC $(AM - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(libfs_la_LDFLAGS) \ - $(LDFLAGS) -o $@ - @FUSE_PLUGIN_TRUE@am_libfs_la_rpath = -rpath $(moduledir) --libgconf_la_DEPENDENCIES = --am__libgconf_la_SOURCES_DIST = gconf.c --@USE_GCONF_TRUE@am_libgconf_la_OBJECTS = gconf.lo --libgconf_la_OBJECTS = $(am_libgconf_la_OBJECTS) --libgconf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+libmateconf_la_DEPENDENCIES = -+am__libmateconf_la_SOURCES_DIST = mateconf.c -+@USE_MATECONF_TRUE@am_libmateconf_la_OBJECTS = mateconf.lo -+libmateconf_la_OBJECTS = $(am_libmateconf_la_OBJECTS) -+libmateconf_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libgconf_la_LDFLAGS) $(LDFLAGS) -o $@ --@USE_GCONF_TRUE@am_libgconf_la_rpath = -rpath $(moduledir) -+ $(libmateconf_la_LDFLAGS) $(LDFLAGS) -o $@ -+@USE_MATECONF_TRUE@am_libmateconf_la_rpath = -rpath $(moduledir) - libglib_la_DEPENDENCIES = - am__libglib_la_SOURCES_DIST = glib.c - @USE_GLIB_TRUE@am_libglib_la_OBJECTS = glib.lo -@@ -141,12 +141,12 @@ libglib_la_LINK = $(LIBTOOL) --tag=CC $( - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(libglib_la_LDFLAGS) $(LDFLAGS) -o $@ - @USE_GLIB_TRUE@am_libglib_la_rpath = -rpath $(moduledir) --libgnomecompat_la_LIBADD = --am_libgnomecompat_la_OBJECTS = gnomecompat.lo --libgnomecompat_la_OBJECTS = $(am_libgnomecompat_la_OBJECTS) --libgnomecompat_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ -+libmatecompat_la_LIBADD = -+am_libmatecompat_la_OBJECTS = matecompat.lo -+libmatecompat_la_OBJECTS = $(am_libmatecompat_la_OBJECTS) -+libmatecompat_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ -- $(libgnomecompat_la_LDFLAGS) $(LDFLAGS) -o $@ -+ $(libmatecompat_la_LDFLAGS) $(LDFLAGS) -o $@ - libini_la_LIBADD = - am_libini_la_OBJECTS = ini.lo - libini_la_OBJECTS = $(am_libini_la_OBJECTS) -@@ -291,8 +291,8 @@ SOURCES = $(libannotate_la_SOURCES) $(li - $(libclone_la_SOURCES) $(libcommands_la_SOURCES) \ - $(libcube_la_SOURCES) $(libdbus_la_SOURCES) \ - $(libdecoration_la_SOURCES) $(libfade_la_SOURCES) \ -- $(libfs_la_SOURCES) $(libgconf_la_SOURCES) \ -- $(libglib_la_SOURCES) $(libgnomecompat_la_SOURCES) \ -+ $(libfs_la_SOURCES) $(libmateconf_la_SOURCES) \ -+ $(libglib_la_SOURCES) $(libmatecompat_la_SOURCES) \ - $(libini_la_SOURCES) $(libinotify_la_SOURCES) \ - $(libkconfig_la_SOURCES) $(libminimize_la_SOURCES) \ - $(libmove_la_SOURCES) $(libobs_la_SOURCES) \ -@@ -308,8 +308,8 @@ DIST_SOURCES = $(am__libannotate_la_SOUR - $(libcommands_la_SOURCES) $(libcube_la_SOURCES) \ - $(am__libdbus_la_SOURCES_DIST) $(libdecoration_la_SOURCES) \ - $(libfade_la_SOURCES) $(am__libfs_la_SOURCES_DIST) \ -- $(am__libgconf_la_SOURCES_DIST) $(am__libglib_la_SOURCES_DIST) \ -- $(libgnomecompat_la_SOURCES) $(libini_la_SOURCES) \ -+ $(am__libmateconf_la_SOURCES_DIST) $(am__libglib_la_SOURCES_DIST) \ -+ $(libmatecompat_la_SOURCES) $(libini_la_SOURCES) \ - $(am__libinotify_la_SOURCES_DIST) \ - $(am__libkconfig_la_SOURCES_DIST) $(libminimize_la_SOURCES) \ - $(libmove_la_SOURCES) $(libobs_la_SOURCES) \ -@@ -373,11 +373,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -385,10 +385,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -429,8 +429,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -@@ -581,8 +581,8 @@ libobs_la_LDFLAGS = -module -avoid-versi - libobs_la_SOURCES = obs.c - libcommands_la_LDFLAGS = -module -avoid-version -no-undefined - libcommands_la_SOURCES = commands.c --libgnomecompat_la_LDFLAGS = -module -avoid-version -no-undefined --libgnomecompat_la_SOURCES = gnomecompat.c -+libmatecompat_la_LDFLAGS = -module -avoid-version -no-undefined -+libmatecompat_la_SOURCES = matecompat.c - @USE_LIBRSVG_TRUE@libsvg_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la - @USE_LIBRSVG_TRUE@libsvg_la_LDFLAGS = -module -avoid-version -no-undefined - @USE_LIBRSVG_TRUE@libsvg_la_LIBADD = \ -@@ -599,10 +599,10 @@ libgnomecompat_la_SOURCES = gnomecompat. - @USE_GLIB_TRUE@libglib_la_LIBADD = @GLIB_LIBS@ - @USE_GLIB_TRUE@libglib_la_SOURCES = glib.c - @USE_GLIB_TRUE@libglib_module = libglib.la --@USE_GCONF_TRUE@libgconf_la_LDFLAGS = -module -avoid-version -no-undefined --@USE_GCONF_TRUE@libgconf_la_LIBADD = @GCONF_LIBS@ --@USE_GCONF_TRUE@libgconf_la_SOURCES = gconf.c --@USE_GCONF_TRUE@libgconf_module = libgconf.la -+@USE_MATECONF_TRUE@libmateconf_la_LDFLAGS = -module -avoid-version -no-undefined -+@USE_MATECONF_TRUE@libmateconf_la_LIBADD = @MATECONF_LIBS@ -+@USE_MATECONF_TRUE@libmateconf_la_SOURCES = mateconf.c -+@USE_MATECONF_TRUE@libmateconf_module = libmateconf.la - @USE_KCONFIG_TRUE@libkconfig_la_LDFLAGS = -module -avoid-version -no-undefined - @USE_KCONFIG_TRUE@libkconfig_la_LIBADD = @KCONFIG_LIBS@ - @USE_KCONFIG_TRUE@libkconfig_la_SOURCES = kconfig.cpp -@@ -623,7 +623,7 @@ INCLUDES = \ - @LIBPNG_CFLAGS@ \ - @LIBRSVG_CFLAGS@ \ - @ANNOTATE_CFLAGS@ \ -- @GCONF_CFLAGS@ \ -+ @MATECONF_CFLAGS@ \ - @KCONFIG_CFLAGS@ \ - @DBUS_CFLAGS@ \ - @GLIB_CFLAGS@ \ -@@ -640,7 +640,7 @@ INCLUDES = \ - moduledir = $(plugindir) - module_LTLIBRARIES = \ - $(libglib_module) \ -- $(libgconf_module) \ -+ $(libmateconf_module) \ - $(libkconfig_module) \ - libdecoration.la \ - libwobbly.la \ -@@ -665,7 +665,7 @@ module_LTLIBRARIES = \ - libini.la \ - libobs.la \ - libcommands.la \ -- libgnomecompat.la \ -+ libmatecompat.la \ - $(libsvg_module) \ - $(libannotate_module) \ - $(libinotify_module) \ -@@ -754,12 +754,12 @@ libfade.la: $(libfade_la_OBJECTS) $(libf - $(libfade_la_LINK) -rpath $(moduledir) $(libfade_la_OBJECTS) $(libfade_la_LIBADD) $(LIBS) - libfs.la: $(libfs_la_OBJECTS) $(libfs_la_DEPENDENCIES) - $(libfs_la_LINK) $(am_libfs_la_rpath) $(libfs_la_OBJECTS) $(libfs_la_LIBADD) $(LIBS) --libgconf.la: $(libgconf_la_OBJECTS) $(libgconf_la_DEPENDENCIES) -- $(libgconf_la_LINK) $(am_libgconf_la_rpath) $(libgconf_la_OBJECTS) $(libgconf_la_LIBADD) $(LIBS) -+libmateconf.la: $(libmateconf_la_OBJECTS) $(libmateconf_la_DEPENDENCIES) -+ $(libmateconf_la_LINK) $(am_libmateconf_la_rpath) $(libmateconf_la_OBJECTS) $(libmateconf_la_LIBADD) $(LIBS) - libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES) - $(libglib_la_LINK) $(am_libglib_la_rpath) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS) --libgnomecompat.la: $(libgnomecompat_la_OBJECTS) $(libgnomecompat_la_DEPENDENCIES) -- $(libgnomecompat_la_LINK) -rpath $(moduledir) $(libgnomecompat_la_OBJECTS) $(libgnomecompat_la_LIBADD) $(LIBS) -+libmatecompat.la: $(libmatecompat_la_OBJECTS) $(libmatecompat_la_DEPENDENCIES) -+ $(libmatecompat_la_LINK) -rpath $(moduledir) $(libmatecompat_la_OBJECTS) $(libmatecompat_la_LIBADD) $(LIBS) - libini.la: $(libini_la_OBJECTS) $(libini_la_DEPENDENCIES) - $(libini_la_LINK) -rpath $(moduledir) $(libini_la_OBJECTS) $(libini_la_LIBADD) $(LIBS) - libinotify.la: $(libinotify_la_OBJECTS) $(libinotify_la_DEPENDENCIES) -@@ -814,9 +814,9 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decoration.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fade.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fuse.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gconf.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mateconf.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glib.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnomecompat.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/matecompat.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ini.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inotify.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kconfig.Plo@am__quote@ -diff -upr compiz-0.8.8-orig/plugins/matecompat.c compiz-0.8.8/plugins/matecompat.c ---- compiz-0.8.8-orig/plugins/matecompat.c 2012-08-26 10:36:32.747718553 +0200 -+++ compiz-0.8.8/plugins/matecompat.c 2012-05-16 12:40:09.000000000 +0200 -@@ -0,0 +1,344 @@ -+/* -+ * Copyright © 2009 Danny Baumann -+ * -+ * Permission to use, copy, modify, distribute, and sell this software -+ * and its documentation for any purpose is hereby granted without -+ * fee, provided that the above copyright notice appear in all copies -+ * and that both that copyright notice and this permission notice -+ * appear in supporting documentation, and that the name of -+ * Danny Baumann not be used in advertising or publicity pertaining to -+ * distribution of the software without specific, written prior permission. -+ * Danny Baumann makes no representations about the suitability of this -+ * software for any purpose. It is provided "as is" without express or -+ * implied warranty. -+ * -+ * DANNY BAUMANN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN -+ * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * Author: Danny Baumann -+ */ -+ -+#include -+ -+static CompMetadata mateMetadata; -+ -+static int displayPrivateIndex; -+ -+#define MATE_DISPLAY_OPTION_MAIN_MENU_KEY 0 -+#define MATE_DISPLAY_OPTION_RUN_DIALOG_KEY 1 -+#define MATE_DISPLAY_OPTION_SCREENSHOT_CMD 2 -+#define MATE_DISPLAY_OPTION_RUN_SCREENSHOT_KEY 3 -+#define MATE_DISPLAY_OPTION_WINDOW_SCREENSHOT_CMD 4 -+#define MATE_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY 5 -+#define MATE_DISPLAY_OPTION_TERMINAL_CMD 6 -+#define MATE_DISPLAY_OPTION_RUN_TERMINAL_KEY 7 -+#define MATE_DISPLAY_OPTION_NUM 8 -+ -+typedef struct _MateDisplay { -+ CompOption opt[MATE_DISPLAY_OPTION_NUM]; -+ -+ Atom panelActionAtom; -+ Atom panelMainMenuAtom; -+ Atom panelRunDialogAtom; -+} MateDisplay; -+ -+#define GET_MATE_DISPLAY(d) \ -+ ((MateDisplay *) (d)->base.privates[displayPrivateIndex].ptr) -+#define MATE_DISPLAY(d) \ -+ MateDisplay *gd = GET_MATE_DISPLAY (d) -+ -+#define NUM_OPTIONS(d) (sizeof ((d)->opt) / sizeof (CompOption)) -+ -+static Bool -+runDispatch (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ CompScreen *s; -+ Window xid; -+ -+ xid = getIntOptionNamed (option, nOption, "root", 0); -+ s = findScreenAtDisplay (d, xid); -+ -+ if (s) -+ { -+ MATE_DISPLAY (d); -+ -+ runCommand (s, gd->opt[action->priv.val].value.s); -+ } -+ -+ return TRUE; -+} -+ -+static void -+panelAction (CompDisplay *d, -+ CompOption *option, -+ int nOption, -+ Atom actionAtom) -+{ -+ Window xid; -+ CompScreen *s; -+ XEvent event; -+ Time time; -+ -+ MATE_DISPLAY (d); -+ -+ xid = getIntOptionNamed (option, nOption, "root", 0); -+ s = findScreenAtDisplay (d, xid); -+ -+ if (!s) -+ return; -+ -+ time = getIntOptionNamed (option, nOption, "time", CurrentTime); -+ -+ /* we need to ungrab the keyboard here, otherwise the panel main -+ menu won't popup as it wants to grab the keyboard itself */ -+ XUngrabKeyboard (d->display, time); -+ -+ event.type = ClientMessage; -+ event.xclient.window = s->root; -+ event.xclient.message_type = gd->panelActionAtom; -+ event.xclient.format = 32; -+ event.xclient.data.l[0] = actionAtom; -+ event.xclient.data.l[1] = time; -+ event.xclient.data.l[2] = 0; -+ event.xclient.data.l[3] = 0; -+ event.xclient.data.l[4] = 0; -+ -+ XSendEvent (d->display, s->root, FALSE, StructureNotifyMask, &event); -+} -+ -+static Bool -+showMainMenu (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ MATE_DISPLAY (d); -+ -+ panelAction (d, option, nOption, gd->panelMainMenuAtom); -+ -+ return TRUE; -+} -+ -+static Bool -+showRunDialog (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ MATE_DISPLAY (d); -+ -+ panelAction (d, option, nOption, gd->panelRunDialogAtom); -+ -+ return TRUE; -+} -+static const CompMetadataOptionInfo mateDisplayOptionInfo[] = { -+ { "main_menu_key", "key", 0, showMainMenu, 0 }, -+ { "run_key", "key", 0, showRunDialog, 0 }, -+ { "command_screenshot", "string", 0, 0, 0 }, -+ { "run_command_screenshot_key", "key", 0, runDispatch, 0 }, -+ { "command_window_screenshot", "string", 0, 0, 0 }, -+ { "run_command_window_screenshot_key", "key", 0, runDispatch, 0 }, -+ { "command_terminal", "string", 0, 0, 0 }, -+ { "run_command_terminal_key", "key", 0, runDispatch, 0 } -+}; -+ -+static CompBool -+mateInitDisplay (CompPlugin *p, -+ CompDisplay *d) -+{ -+ MateDisplay *gd; -+ int opt, index; -+ -+ if (!checkPluginABI ("core", CORE_ABIVERSION)) -+ return FALSE; -+ -+ gd = malloc (sizeof (MateDisplay)); -+ if (!gd) -+ return FALSE; -+ -+ if (!compInitDisplayOptionsFromMetadata (d, -+ &mateMetadata, -+ mateDisplayOptionInfo, -+ gd->opt, -+ MATE_DISPLAY_OPTION_NUM)) -+ { -+ free (gd); -+ return FALSE; -+ } -+ -+ opt = MATE_DISPLAY_OPTION_RUN_SCREENSHOT_KEY; -+ gd->opt[opt].value.action.priv.val = MATE_DISPLAY_OPTION_SCREENSHOT_CMD; -+ -+ opt = MATE_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY; -+ index = MATE_DISPLAY_OPTION_WINDOW_SCREENSHOT_CMD; -+ gd->opt[opt].value.action.priv.val = index; -+ -+ opt = MATE_DISPLAY_OPTION_RUN_TERMINAL_KEY; -+ gd->opt[opt].value.action.priv.val = MATE_DISPLAY_OPTION_TERMINAL_CMD; -+ -+ gd->panelActionAtom = -+ XInternAtom (d->display, "_MATE_PANEL_ACTION", FALSE); -+ gd->panelMainMenuAtom = -+ XInternAtom (d->display, "_MATE_PANEL_ACTION_MAIN_MENU", FALSE); -+ gd->panelRunDialogAtom = -+ XInternAtom (d->display, "_MATE_PANEL_ACTION_RUN_DIALOG", FALSE); -+ -+ d->base.privates[displayPrivateIndex].ptr = gd; -+ -+ return TRUE; -+} -+ -+static void -+mateFiniDisplay (CompPlugin *p, -+ CompDisplay *d) -+{ -+ MATE_DISPLAY (d); -+ -+ compFiniDisplayOptions (d, gd->opt, MATE_DISPLAY_OPTION_NUM); -+ -+ free (gd); -+} -+ -+static CompOption * -+mateGetDisplayOptions (CompPlugin *p, -+ CompDisplay *d, -+ int *count) -+{ -+ MATE_DISPLAY (d); -+ -+ *count = NUM_OPTIONS (gd); -+ return gd->opt; -+} -+ -+static CompBool -+mateSetDisplayOption (CompPlugin *p, -+ CompDisplay *d, -+ const char *name, -+ CompOptionValue *value) -+{ -+ CompOption *o; -+ -+ MATE_DISPLAY (d); -+ -+ o = compFindOption (gd->opt, NUM_OPTIONS (gd), name, NULL); -+ if (!o) -+ return FALSE; -+ -+ return compSetDisplayOption (d, o, value); -+} -+ -+static CompBool -+mateInitObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static InitPluginObjectProc dispTab[] = { -+ (InitPluginObjectProc) 0, /* InitCore */ -+ (InitPluginObjectProc) mateInitDisplay -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o)); -+} -+ -+static void -+mateFiniObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static FiniPluginObjectProc dispTab[] = { -+ (FiniPluginObjectProc) 0, /* FiniCore */ -+ (FiniPluginObjectProc) mateFiniDisplay -+ }; -+ -+ DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o)); -+} -+ -+static CompOption * -+mateGetObjectOptions (CompPlugin *p, -+ CompObject *o, -+ int *count) -+{ -+ static GetPluginObjectOptionsProc dispTab[] = { -+ (GetPluginObjectOptionsProc) 0, /* GetCoreOptions */ -+ (GetPluginObjectOptionsProc) mateGetDisplayOptions -+ }; -+ -+ *count = 0; -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), -+ (void *) count, (p, o, count)); -+} -+ -+static CompBool -+mateSetObjectOption (CompPlugin *p, -+ CompObject *o, -+ const char *name, -+ CompOptionValue *value) -+{ -+ static SetPluginObjectOptionProc dispTab[] = { -+ (SetPluginObjectOptionProc) 0, /* SetCoreOption */ -+ (SetPluginObjectOptionProc) mateSetDisplayOption, -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), FALSE, -+ (p, o, name, value)); -+} -+ -+static Bool -+mateInit (CompPlugin *p) -+{ -+ if (!compInitPluginMetadataFromInfo (&mateMetadata, -+ p->vTable->name, -+ mateDisplayOptionInfo, -+ MATE_DISPLAY_OPTION_NUM, 0, 0)) -+ return FALSE; -+ -+ displayPrivateIndex = allocateDisplayPrivateIndex (); -+ if (displayPrivateIndex < 0) -+ { -+ compFiniMetadata (&mateMetadata); -+ return FALSE; -+ } -+ -+ compAddMetadataFromFile (&mateMetadata, p->vTable->name); -+ -+ return TRUE; -+} -+ -+static void -+mateFini (CompPlugin *p) -+{ -+ freeDisplayPrivateIndex (displayPrivateIndex); -+ compFiniMetadata (&mateMetadata); -+} -+ -+static CompMetadata * -+mateGetMetadata (CompPlugin *p) -+{ -+ return &mateMetadata; -+} -+ -+static CompPluginVTable mateVTable = { -+ "matecompat", -+ mateGetMetadata, -+ mateInit, -+ mateFini, -+ mateInitObject, -+ mateFiniObject, -+ mateGetObjectOptions, -+ mateSetObjectOption -+}; -+ -+CompPluginVTable * -+getCompPluginInfo20070830 (void) -+{ -+ return &mateVTable; -+} -diff -upr compiz-0.8.8-orig/plugins/mateconf.c compiz-0.8.8/plugins/mateconf.c ---- compiz-0.8.8-orig/plugins/mateconf.c 2012-08-26 10:36:32.746718542 +0200 -+++ compiz-0.8.8/plugins/mateconf.c 2012-05-16 12:40:15.000000000 +0200 -@@ -0,0 +1,849 @@ -+/* -+ * Copyright © 2005 Novell, Inc. -+ * -+ * Permission to use, copy, modify, distribute, and sell this software -+ * and its documentation for any purpose is hereby granted without -+ * fee, provided that the above copyright notice appear in all copies -+ * and that both that copyright notice and this permission notice -+ * appear in supporting documentation, and that the name of -+ * Novell, Inc. not be used in advertising or publicity pertaining to -+ * distribution of the software without specific, written prior permission. -+ * Novell, Inc. makes no representations about the suitability of this -+ * software for any purpose. It is provided "as is" without express or -+ * implied warranty. -+ * -+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN -+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR -+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS -+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, -+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION -+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ * -+ * Author: David Reveman -+ */ -+ -+#define _GNU_SOURCE -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+ -+#include -+ -+static CompMetadata mateconfMetadata; -+ -+#define APP_NAME "compiz" -+ -+/* From mateconf-internal.h. Bleah. */ -+int mateconf_value_compare (const MateConfValue *value_a, -+ const MateConfValue *value_b); -+ -+static int corePrivateIndex; -+ -+typedef struct _MateConfCore { -+ MateConfClient *client; -+ guint cnxn; -+ -+ CompTimeoutHandle reloadHandle; -+ -+ InitPluginForObjectProc initPluginForObject; -+ SetOptionForPluginProc setOptionForPlugin; -+} MateConfCore; -+ -+#define GET_MATECONF_CORE(c) \ -+ ((MateConfCore *) (c)->base.privates[corePrivateIndex].ptr) -+ -+#define MATECONF_CORE(c) \ -+ MateConfCore *gc = GET_MATECONF_CORE (c) -+ -+ -+static gchar * -+mateconfGetKey (CompObject *object, -+ const gchar *plugin, -+ const gchar *option) -+{ -+ const gchar *type; -+ gchar *key, *name, *objectName; -+ -+ type = compObjectTypeName (object->type); -+ if (strcmp (type, "display") == 0) -+ type = "allscreens"; -+ -+ name = compObjectName (object); -+ if (name) -+ { -+ objectName = g_strdup_printf ("%s%s", type, name); -+ free (name); -+ } -+ else -+ objectName = g_strdup (type); -+ -+ if (strcmp (plugin, "core") == 0) -+ key = g_strjoin ("/", "/apps", APP_NAME, "general", objectName, -+ "options", option, NULL); -+ else -+ key = g_strjoin ("/", "/apps", APP_NAME, "plugins", plugin, objectName, -+ "options", option, NULL); -+ -+ g_free (objectName); -+ -+ return key; -+} -+ -+static MateConfValueType -+mateconfTypeFromCompType (CompOptionType type) -+{ -+ switch (type) { -+ case CompOptionTypeBool: -+ case CompOptionTypeBell: -+ return MATECONF_VALUE_BOOL; -+ case CompOptionTypeInt: -+ return MATECONF_VALUE_INT; -+ case CompOptionTypeFloat: -+ return MATECONF_VALUE_FLOAT; -+ case CompOptionTypeString: -+ case CompOptionTypeColor: -+ case CompOptionTypeKey: -+ case CompOptionTypeButton: -+ case CompOptionTypeEdge: -+ case CompOptionTypeMatch: -+ return MATECONF_VALUE_STRING; -+ case CompOptionTypeList: -+ return MATECONF_VALUE_LIST; -+ default: -+ break; -+ } -+ -+ return MATECONF_VALUE_INVALID; -+} -+ -+static void -+mateconfSetValue (CompObject *object, -+ CompOptionValue *value, -+ CompOptionType type, -+ MateConfValue *gvalue) -+{ -+ switch (type) { -+ case CompOptionTypeBool: -+ mateconf_value_set_bool (gvalue, value->b); -+ break; -+ case CompOptionTypeInt: -+ mateconf_value_set_int (gvalue, value->i); -+ break; -+ case CompOptionTypeFloat: -+ mateconf_value_set_float (gvalue, value->f); -+ break; -+ case CompOptionTypeString: -+ mateconf_value_set_string (gvalue, value->s); -+ break; -+ case CompOptionTypeColor: { -+ gchar *color; -+ -+ color = colorToString (value->c); -+ mateconf_value_set_string (gvalue, color); -+ -+ free (color); -+ } break; -+ case CompOptionTypeKey: { -+ gchar *action; -+ -+ while (object && object->type != COMP_OBJECT_TYPE_DISPLAY) -+ object = object->parent; -+ -+ if (!object) -+ return; -+ -+ action = keyActionToString (GET_CORE_DISPLAY (object), &value->action); -+ mateconf_value_set_string (gvalue, action); -+ -+ free (action); -+ } break; -+ case CompOptionTypeButton: { -+ gchar *action; -+ -+ while (object && object->type != COMP_OBJECT_TYPE_DISPLAY) -+ object = object->parent; -+ -+ if (!object) -+ return; -+ -+ action = buttonActionToString (GET_CORE_DISPLAY (object), -+ &value->action); -+ mateconf_value_set_string (gvalue, action); -+ -+ free (action); -+ } break; -+ case CompOptionTypeEdge: { -+ gchar *edge; -+ -+ edge = edgeMaskToString (value->action.edgeMask); -+ mateconf_value_set_string (gvalue, edge); -+ -+ free (edge); -+ } break; -+ case CompOptionTypeBell: -+ mateconf_value_set_bool (gvalue, value->action.bell); -+ break; -+ case CompOptionTypeMatch: { -+ gchar *match; -+ -+ match = matchToString (&value->match); -+ mateconf_value_set_string (gvalue, match); -+ -+ free (match); -+ } break; -+ default: -+ break; -+ } -+} -+ -+static void -+mateconfSetOption (CompObject *object, -+ CompOption *o, -+ const gchar *plugin) -+{ -+ MateConfValueType type = mateconfTypeFromCompType (o->type); -+ MateConfValue *gvalue, *existingValue = NULL; -+ gchar *key; -+ -+ MATECONF_CORE (&core); -+ -+ if (type == MATECONF_VALUE_INVALID) -+ return; -+ -+ key = mateconfGetKey (object, plugin, o->name); -+ -+ existingValue = mateconf_client_get (gc->client, key, NULL); -+ gvalue = mateconf_value_new (type); -+ -+ if (o->type == CompOptionTypeList) -+ { -+ GSList *node, *list = NULL; -+ MateConfValue *gv; -+ int i; -+ -+ type = mateconfTypeFromCompType (o->value.list.type); -+ -+ for (i = 0; i < o->value.list.nValue; i++) -+ { -+ gv = mateconf_value_new (type); -+ mateconfSetValue (object, &o->value.list.value[i], -+ o->value.list.type, gv); -+ list = g_slist_append (list, gv); -+ } -+ -+ mateconf_value_set_list_type (gvalue, type); -+ mateconf_value_set_list (gvalue, list); -+ -+ if (!existingValue || mateconf_value_compare (existingValue, gvalue)) -+ mateconf_client_set (gc->client, key, gvalue, NULL); -+ -+ for (node = list; node; node = node->next) -+ mateconf_value_free ((MateConfValue *) node->data); -+ -+ g_slist_free (list); -+ } -+ else -+ { -+ mateconfSetValue (object, &o->value, o->type, gvalue); -+ -+ if (!existingValue || mateconf_value_compare (existingValue, gvalue)) -+ mateconf_client_set (gc->client, key, gvalue, NULL); -+ } -+ -+ mateconf_value_free (gvalue); -+ -+ if (existingValue) -+ mateconf_value_free (existingValue); -+ -+ g_free (key); -+} -+ -+static Bool -+mateconfGetValue (CompObject *object, -+ CompOptionValue *value, -+ CompOptionType type, -+ MateConfValue *gvalue) -+ -+{ -+ if (type == CompOptionTypeBool && -+ gvalue->type == MATECONF_VALUE_BOOL) -+ { -+ value->b = mateconf_value_get_bool (gvalue); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeInt && -+ gvalue->type == MATECONF_VALUE_INT) -+ { -+ value->i = mateconf_value_get_int (gvalue); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeFloat && -+ gvalue->type == MATECONF_VALUE_FLOAT) -+ { -+ value->f = mateconf_value_get_float (gvalue); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeString && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const char *str; -+ -+ str = mateconf_value_get_string (gvalue); -+ if (str) -+ { -+ value->s = strdup (str); -+ if (value->s) -+ return TRUE; -+ } -+ } -+ else if (type == CompOptionTypeColor && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const gchar *color; -+ -+ color = mateconf_value_get_string (gvalue); -+ -+ if (stringToColor (color, value->c)) -+ return TRUE; -+ } -+ else if (type == CompOptionTypeKey && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const gchar *action; -+ -+ action = mateconf_value_get_string (gvalue); -+ -+ while (object && object->type != COMP_OBJECT_TYPE_DISPLAY) -+ object = object->parent; -+ -+ if (!object) -+ return FALSE; -+ -+ stringToKeyAction (GET_CORE_DISPLAY (object), action, &value->action); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeButton && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const gchar *action; -+ -+ action = mateconf_value_get_string (gvalue); -+ -+ while (object && object->type != COMP_OBJECT_TYPE_DISPLAY) -+ object = object->parent; -+ -+ if (!object) -+ return FALSE; -+ -+ stringToButtonAction (GET_CORE_DISPLAY (object), action, -+ &value->action); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeEdge && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const gchar *edge; -+ -+ edge = mateconf_value_get_string (gvalue); -+ -+ value->action.edgeMask = stringToEdgeMask (edge); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeBell && -+ gvalue->type == MATECONF_VALUE_BOOL) -+ { -+ value->action.bell = mateconf_value_get_bool (gvalue); -+ return TRUE; -+ } -+ else if (type == CompOptionTypeMatch && -+ gvalue->type == MATECONF_VALUE_STRING) -+ { -+ const gchar *match; -+ -+ match = mateconf_value_get_string (gvalue); -+ -+ matchInit (&value->match); -+ matchAddFromString (&value->match, match); -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static Bool -+mateconfReadOptionValue (CompObject *object, -+ MateConfEntry *entry, -+ CompOption *o, -+ CompOptionValue *value) -+{ -+ MateConfValue *gvalue; -+ -+ gvalue = mateconf_entry_get_value (entry); -+ if (!gvalue) -+ return FALSE; -+ -+ compInitOptionValue (value); -+ -+ if (o->type == CompOptionTypeList && -+ gvalue->type == MATECONF_VALUE_LIST) -+ { -+ MateConfValueType type; -+ GSList *list; -+ int i, n; -+ -+ type = mateconf_value_get_list_type (gvalue); -+ if (mateconfTypeFromCompType (o->value.list.type) != type) -+ return FALSE; -+ -+ list = mateconf_value_get_list (gvalue); -+ n = g_slist_length (list); -+ -+ value->list.value = NULL; -+ value->list.nValue = 0; -+ value->list.type = o->value.list.type; -+ -+ if (n) -+ { -+ value->list.value = malloc (sizeof (CompOptionValue) * n); -+ if (value->list.value) -+ { -+ for (i = 0; i < n; i++) -+ { -+ if (!mateconfGetValue (object, -+ &value->list.value[i], -+ o->value.list.type, -+ (MateConfValue *) list->data)) -+ break; -+ -+ value->list.nValue++; -+ -+ list = g_slist_next (list); -+ } -+ -+ if (value->list.nValue != n) -+ { -+ compFiniOptionValue (value, o->type); -+ return FALSE; -+ } -+ } -+ } -+ } -+ else -+ { -+ if (!mateconfGetValue (object, value, o->type, gvalue)) -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+static void -+mateconfGetOption (CompObject *object, -+ CompOption *o, -+ const char *plugin) -+{ -+ MateConfEntry *entry; -+ gchar *key; -+ -+ MATECONF_CORE (&core); -+ -+ key = mateconfGetKey (object, plugin, o->name); -+ -+ entry = mateconf_client_get_entry (gc->client, key, NULL, TRUE, NULL); -+ if (entry) -+ { -+ CompOptionValue value; -+ -+ if (mateconfReadOptionValue (object, entry, o, &value)) -+ { -+ (*core.setOptionForPlugin) (object, plugin, o->name, &value); -+ compFiniOptionValue (&value, o->type); -+ } -+ else -+ { -+ mateconfSetOption (object, o, plugin); -+ } -+ -+ mateconf_entry_free (entry); -+ } -+ -+ g_free (key); -+} -+ -+static CompBool -+mateconfReloadObjectTree (CompObject *object, -+ void *closure); -+ -+static CompBool -+mateconfReloadObjectsWithType (CompObjectType type, -+ CompObject *parent, -+ void *closure) -+{ -+ compObjectForEach (parent, type, mateconfReloadObjectTree, closure); -+ -+ return TRUE; -+} -+ -+static CompBool -+mateconfReloadObjectTree (CompObject *object, -+ void *closure) -+{ -+ CompPlugin *p = (CompPlugin *) closure; -+ CompOption *option; -+ int nOption; -+ -+ option = (*p->vTable->getObjectOptions) (p, object, &nOption); -+ while (nOption--) -+ mateconfGetOption (object, option++, p->vTable->name); -+ -+ compObjectForEachType (object, mateconfReloadObjectsWithType, closure); -+ -+ return TRUE; -+} -+ -+static Bool -+mateconfReload (void *closure) -+{ -+ CompPlugin *p; -+ -+ MATECONF_CORE (&core); -+ -+ for (p = getPlugins (); p; p = p->next) -+ { -+ if (!p->vTable->getObjectOptions) -+ continue; -+ -+ mateconfReloadObjectTree (&core.base, (void *) p); -+ } -+ -+ gc->reloadHandle = 0; -+ -+ return FALSE; -+} -+ -+static Bool -+mateconfSetOptionForPlugin (CompObject *object, -+ const char *plugin, -+ const char *name, -+ CompOptionValue *value) -+{ -+ CompBool status; -+ -+ MATECONF_CORE (&core); -+ -+ UNWRAP (gc, &core, setOptionForPlugin); -+ status = (*core.setOptionForPlugin) (object, plugin, name, value); -+ WRAP (gc, &core, setOptionForPlugin, mateconfSetOptionForPlugin); -+ -+ if (status && !gc->reloadHandle) -+ { -+ CompPlugin *p; -+ -+ p = findActivePlugin (plugin); -+ if (p && p->vTable->getObjectOptions) -+ { -+ CompOption *option; -+ int nOption; -+ -+ option = (*p->vTable->getObjectOptions) (p, object, &nOption); -+ option = compFindOption (option, nOption, name, 0); -+ if (option) -+ mateconfSetOption (object, option, p->vTable->name); -+ } -+ } -+ -+ return status; -+} -+ -+static CompBool -+mateconfInitPluginForObject (CompPlugin *p, -+ CompObject *o) -+{ -+ CompBool status; -+ -+ MATECONF_CORE (&core); -+ -+ UNWRAP (gc, &core, initPluginForObject); -+ status = (*core.initPluginForObject) (p, o); -+ WRAP (gc, &core, initPluginForObject, mateconfInitPluginForObject); -+ -+ if (status && p->vTable->getObjectOptions) -+ { -+ CompOption *option; -+ int nOption; -+ -+ option = (*p->vTable->getObjectOptions) (p, o, &nOption); -+ while (nOption--) -+ mateconfGetOption (o, option++, p->vTable->name); -+ } -+ -+ return status; -+} -+ -+/* MULTIDPYERROR: only works with one or less displays present */ -+static void -+mateconfKeyChanged (MateConfClient *client, -+ guint cnxn_id, -+ MateConfEntry *entry, -+ gpointer user_data) -+{ -+ CompPlugin *plugin; -+ CompObject *object; -+ CompOption *option = NULL; -+ int nOption = 0; -+ gchar **token; -+ int objectIndex = 4; -+ -+ token = g_strsplit (entry->key, "/", 8); -+ -+ if (g_strv_length (token) < 7) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ if (strcmp (token[0], "") != 0 || -+ strcmp (token[1], "apps") != 0 || -+ strcmp (token[2], APP_NAME) != 0) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ if (strcmp (token[3], "general") == 0) -+ { -+ plugin = findActivePlugin ("core"); -+ } -+ else -+ { -+ if (strcmp (token[3], "plugins") != 0 || g_strv_length (token) < 8) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ objectIndex = 5; -+ plugin = findActivePlugin (token[4]); -+ } -+ -+ if (!plugin) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ object = compObjectFind (&core.base, COMP_OBJECT_TYPE_DISPLAY, NULL); -+ if (!object) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ if (strncmp (token[objectIndex], "screen", 6) == 0) -+ { -+ object = compObjectFind (object, COMP_OBJECT_TYPE_SCREEN, -+ token[objectIndex] + 6); -+ if (!object) -+ { -+ g_strfreev (token); -+ return; -+ } -+ } -+ else if (strcmp (token[objectIndex], "allscreens") != 0) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ if (strcmp (token[objectIndex + 1], "options") != 0) -+ { -+ g_strfreev (token); -+ return; -+ } -+ -+ if (plugin->vTable->getObjectOptions) -+ option = (*plugin->vTable->getObjectOptions) (plugin, object, -+ &nOption); -+ -+ option = compFindOption (option, nOption, token[objectIndex + 2], 0); -+ if (option) -+ { -+ CompOptionValue value; -+ -+ if (mateconfReadOptionValue (object, entry, option, &value)) -+ { -+ (*core.setOptionForPlugin) (object, -+ plugin->vTable->name, -+ option->name, -+ &value); -+ -+ compFiniOptionValue (&value, option->type); -+ } -+ } -+ -+ g_strfreev (token); -+} -+ -+static void -+mateconfSendGLibNotify (CompScreen *s) -+{ -+ Display *dpy = s->display->display; -+ XEvent xev; -+ -+ xev.xclient.type = ClientMessage; -+ xev.xclient.display = dpy; -+ xev.xclient.format = 32; -+ -+ xev.xclient.message_type = XInternAtom (dpy, "_COMPIZ_GLIB_NOTIFY", 0); -+ xev.xclient.window = s->root; -+ -+ memset (xev.xclient.data.l, 0, sizeof (xev.xclient.data.l)); -+ -+ XSendEvent (dpy, -+ s->root, -+ FALSE, -+ SubstructureRedirectMask | SubstructureNotifyMask, -+ &xev); -+} -+ -+static Bool -+mateconfInitCore (CompPlugin *p, -+ CompCore *c) -+{ -+ MateConfCore *gc; -+ -+ if (!checkPluginABI ("core", CORE_ABIVERSION)) -+ return FALSE; -+ -+ gc = malloc (sizeof (MateConfCore)); -+ if (!gc) -+ return FALSE; -+ -+ g_type_init (); -+ -+ gc->client = mateconf_client_get_default (); -+ -+ mateconf_client_add_dir (gc->client, "/apps/" APP_NAME, -+ MATECONF_CLIENT_PRELOAD_NONE, NULL); -+ -+ gc->reloadHandle = compAddTimeout (0, 0, mateconfReload, 0); -+ -+ gc->cnxn = mateconf_client_notify_add (gc->client, "/apps/" APP_NAME, -+ mateconfKeyChanged, c, NULL, NULL); -+ -+ WRAP (gc, c, initPluginForObject, mateconfInitPluginForObject); -+ WRAP (gc, c, setOptionForPlugin, mateconfSetOptionForPlugin); -+ -+ c->base.privates[corePrivateIndex].ptr = gc; -+ -+ return TRUE; -+} -+ -+static void -+mateconfFiniCore (CompPlugin *p, -+ CompCore *c) -+{ -+ MATECONF_CORE (c); -+ -+ UNWRAP (gc, c, initPluginForObject); -+ UNWRAP (gc, c, setOptionForPlugin); -+ -+ if (gc->reloadHandle) -+ compRemoveTimeout (gc->reloadHandle); -+ -+ if (gc->cnxn) -+ mateconf_client_notify_remove (gc->client, gc->cnxn); -+ -+ mateconf_client_remove_dir (gc->client, "/apps/" APP_NAME, NULL); -+ mateconf_client_clear_cache (gc->client); -+ -+ free (gc); -+} -+ -+static Bool -+mateconfInitScreen (CompPlugin *p, -+ CompScreen *s) -+{ -+ mateconfSendGLibNotify (s); -+ -+ return TRUE; -+} -+ -+static CompBool -+mateconfInitObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static InitPluginObjectProc dispTab[] = { -+ (InitPluginObjectProc) mateconfInitCore, -+ (InitPluginObjectProc) 0, /* InitDisplay */ -+ (InitPluginObjectProc) mateconfInitScreen -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o)); -+} -+ -+static void -+mateconfFiniObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static FiniPluginObjectProc dispTab[] = { -+ (FiniPluginObjectProc) mateconfFiniCore -+ }; -+ -+ DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o)); -+} -+ -+static Bool -+mateconfInit (CompPlugin *p) -+{ -+ if (!compInitPluginMetadataFromInfo (&mateconfMetadata, p->vTable->name, -+ 0, 0, 0, 0)) -+ return FALSE; -+ -+ corePrivateIndex = allocateCorePrivateIndex (); -+ if (corePrivateIndex < 0) -+ { -+ compFiniMetadata (&mateconfMetadata); -+ return FALSE; -+ } -+ -+ compAddMetadataFromFile (&mateconfMetadata, p->vTable->name); -+ -+ return TRUE; -+} -+ -+static void -+mateconfFini (CompPlugin *p) -+{ -+ freeCorePrivateIndex (corePrivateIndex); -+ compFiniMetadata (&mateconfMetadata); -+} -+ -+static CompMetadata * -+mateconfGetMetadata (CompPlugin *plugin) -+{ -+ return &mateconfMetadata; -+} -+ -+CompPluginVTable mateconfVTable = { -+ "mateconf", -+ mateconfGetMetadata, -+ mateconfInit, -+ mateconfFini, -+ mateconfInitObject, -+ mateconfFiniObject, -+ 0, /* GetObjectOptions */ -+ 0 /* SetObjectOption */ -+}; -+ -+CompPluginVTable * -+getCompPluginInfo20070830 (void) -+{ -+ return &mateconfVTable; -+} -diff -upr compiz-0.8.8-orig/po/af.po compiz-0.8.8/po/af.po ---- compiz-0.8.8-orig/po/af.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/af.po 2012-05-16 12:40:30.000000000 +0200 -@@ -14,53 +14,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Werkskerm" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -75,38 +75,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -118,11 +118,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -732,7 +732,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Opdragte:" -@@ -1614,12 +1614,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1630,57 +1630,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Opdrag '%1'" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Opdrag '%1'" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/ar.po compiz-0.8.8/po/ar.po ---- compiz-0.8.8-orig/po/ar.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ar.po 2012-05-16 12:40:29.000000000 +0200 -@@ -17,53 +17,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "سطح المكتب" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "إدارة النواÙد" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "بدون" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "ظل" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "تكبير" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "تكبير Ø£Ùقي" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "تكبير عمودي" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "تقليص" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "زيادة" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "نقصان" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -78,38 +78,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -121,11 +121,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -716,7 +716,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1571,12 +1571,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1587,55 +1587,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/bg.po compiz-0.8.8/po/bg.po ---- compiz-0.8.8-orig/po/bg.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/bg.po 2012-05-16 12:40:33.000000000 +0200 -@@ -19,57 +19,57 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=0;\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Работен плот" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Мениджър на прозорци" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 -+#: ../gtk/mate/compiz-window-manager.c:426 - #: ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Без избор" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "СÑнка" - --#: ../gtk/gnome/compiz-window-manager.c:428 -+#: ../gtk/mate/compiz-window-manager.c:428 - #: ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "УголемÑване" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Хоризонтално макÑимизиране" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Вертикално макÑимизиране" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "ÐамалÑване" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Издигане" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Снижаване" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -86,38 +86,38 @@ msgid "Blur type" - msgstr "Тип размиване" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "ПрозрачноÑÑ‚ на Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ† при тема на Metacity" -+msgid "Marco theme active window opacity" -+msgstr "ПрозрачноÑÑ‚ на Ð°ÐºÑ‚Ð¸Ð²Ð½Ð¸Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€ÐµÑ† при тема на Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "ПрозрачноÑÑ‚ на темата на Metacity" -+msgid "Marco theme opacity" -+msgstr "ПрозрачноÑÑ‚ на темата на Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "ПрозрачноÑÑ‚ за декорациите от темите на Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "ПрозрачноÑÑ‚ за декорациите от темите на Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - # Can't find bulgarian word for titlebar. -@@ -130,12 +130,12 @@ msgid "Type of blur used for window deco - msgstr "Вид замъглÑване използван за декорациите на прозорците" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "използвай темата на Metacity" -+msgid "Use marco theme" -+msgstr "използвай темата на Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Използвай Metacity темата при риÑуване на декорациите на прозорците" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Използвай Marco темата при риÑуване на декорациите на прозорците" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -834,7 +834,7 @@ msgstr "" - "извикана" - - #: ../metadata/commands.xml.in.h:63 --#: ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Команда: " -@@ -1750,12 +1750,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1766,56 +1766,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Стартиране в терминал" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "Диалог за изпълнÑване на програма" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "ИзпълнÑване на команда в терминала" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Команда за заÑнемане на екрана" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Покажи главното меню" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Покажи диалога за изпълнÑване на програма" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Показване на главното меню" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Снимай екрана" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Снимай прозорец" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Команда в терминала" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Команден ред за заÑнемане на прозореца" - -diff -upr compiz-0.8.8-orig/po/bn_IN.po compiz-0.8.8/po/bn_IN.po ---- compiz-0.8.8-orig/po/bn_IN.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/bn_IN.po 2012-05-16 12:40:32.000000000 +0200 -@@ -16,58 +16,58 @@ msgstr "" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "ডেসà§à¦•à¦Ÿà¦ª" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "উইনà§à¦¡à§‹ পরিচালনা" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "কমপিজ" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "কিছৠনা" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "চেদ" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "উইনà§à¦¡à§‹à¦Ÿà¦¿à¦•à§‡ অনà§à¦­à§‚মিকভাবে বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "উইনà§à¦¡à§‹à¦Ÿà¦¿à¦•à§‡ উলà§à¦²à¦®à§à¦¬à¦­à¦¾à¦¬à§‡ বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "ছোট করা হয়েছে" - - # সà§à¦¬à§Ÿà¦‚কà§à¦°à§€à§Ÿ --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à§€à§Ÿ আপডেট" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -82,38 +82,38 @@ msgid "Blur type" - msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° পà§à¦°à¦•à§ƒà¦¤à¦¿" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "মেটাসিটি বিষয় সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à¦° অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "মেটাসিটি বিষয় সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à¦° অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° শেড" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "মেটাসিটি বিষয় অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "মেটাসিটি বিষয় অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° শেড" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à§Ÿ বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° জনà§à¦¯ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£à§‡ বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° জনà§à¦¯ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "অসà§à¦¬à¦šà§à¦› থেকে অরà§à¦§à¦¸à§à¦¬à¦šà§à¦› মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ শেড সকà§à¦°à¦¿à§Ÿà¦•à¦°à¦£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "অসà§à¦¬à¦šà§à¦› থেকে অরà§à¦§à¦¸à§à¦¬à¦šà§à¦› মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ শেড সকà§à¦°à¦¿à§Ÿà¦•à¦°à¦£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -125,11 +125,11 @@ msgid "Type of blur used for window deco - msgstr "উইনà§à¦¡à§‹ অলঙà§à¦•à¦°à¦£à§‡à¦° সময় অসà§à¦ªà¦·à§à¦Ÿà¦¤à¦¾à¦° পà§à¦°à¦•à¦¾à¦°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "মেটাসিটি বিষয় বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "উইনà§à¦¡à§‹ অলঙà§à¦•à¦°à¦£ করার সময় মেটাসিটি বিষয় বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -807,7 +807,7 @@ msgstr "যখন run_command8 চাও - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "যখন run_command9 চাওয়া হবে তখন শেলে নিরà§à¦¦à§‡à¦¶ লাইনটি সমà§à¦ªà¦¾à¦¦à¦¨ করা হবে" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "কমানà§à¦¡ '%1'" -@@ -1740,13 +1740,13 @@ msgstr "ইউজারসà§à¦ªà§‡à¦¸ à - msgid "Userspace file system" - msgstr "ইউজারসà§à¦ªà§‡à¦¸ ফাইল সিসà§à¦Ÿà§‡à¦®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf নিয়নà§à¦¤à§à¦°à¦£ বà§à¦¯à¦¾à¦•à¦à¦¨à§à¦¡" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf নিয়নà§à¦¤à§à¦°à¦£ বà§à¦¯à¦¾à¦•à¦à¦¨à§à¦¡" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1756,58 +1756,58 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib পà§à¦°à¦§à¦¾à¦¨ লà§à¦ª সমরà§à¦¥à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "à¦à¦•à¦Ÿà¦¿ টারà§à¦®à¦¿à¦¨à¦¾à¦² খà§à¦²à§à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "ডায়ালগ চালনা করা" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "পà§à¦°à¦§à¦¾à¦¨ মেনৠপà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "চালনা করার অনà§à¦ªà§à¦°à§Ÿà§‹à¦— ডায়ালগ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "পà§à¦°à¦§à¦¾à¦¨ তালিকা পà§à¦°à¦¦à¦°à§à¦¶à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "à¦à¦•à¦Ÿà¦¿ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিন" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "উইনà§à¦¡à§‹à¦° à¦à¦•à¦Ÿà¦¿ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিন" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "উইনà§à¦¡à§‹ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিরà§à¦¦à§‡à¦¶ লাইন" - -diff -upr compiz-0.8.8-orig/po/bn.po compiz-0.8.8/po/bn.po ---- compiz-0.8.8-orig/po/bn.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/bn.po 2012-05-16 12:40:32.000000000 +0200 -@@ -16,59 +16,59 @@ msgstr "" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "ডেসà§à¦•à¦Ÿà¦ª" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "উইনà§à¦¡à§‹ পরিচালনা" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "কমপিজ" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "কিছৠনা" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "সà§à¦•à§à¦¯à¦¾à¦¨à¦¾à¦°" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "উইনà§à¦¡à§‹à¦Ÿà¦¿à¦•à§‡ অনà§à¦­à§‚মিকভাবে বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "উইনà§à¦¡à§‹à¦Ÿà¦¿à¦•à§‡ উলà§à¦²à¦®à§à¦¬à¦­à¦¾à¦¬à§‡ বড় করা" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "ছোট করা হয়েছে" - - # সà§à¦¬à§Ÿà¦‚কà§à¦°à§€à§Ÿ --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à§€à§Ÿ আপডেট" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -83,38 +83,38 @@ msgid "Blur type" - msgstr "অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° পà§à¦°à¦•à§ƒà¦¤à¦¿" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "মেটাসিটি বিষয় সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à¦° অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "মেটাসিটি বিষয় সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à¦° অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° শেড" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "মেটাসিটি বিষয় অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "মেটাসিটি বিষয় অসà§à¦¬à¦šà§à¦›à¦¤à¦¾à¦° শেড" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ সকà§à¦°à¦¿à§Ÿ উইনà§à¦¡à§‹à§Ÿ বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° জনà§à¦¯ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£à§‡ বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° জনà§à¦¯ অসà§à¦¬à¦šà§à¦›à¦¤à¦¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "অসà§à¦¬à¦šà§à¦› থেকে অরà§à¦§à¦¸à§à¦¬à¦šà§à¦› মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ শেড সকà§à¦°à¦¿à§Ÿà¦•à¦°à¦£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "অসà§à¦¬à¦šà§à¦› থেকে অরà§à¦§à¦¸à§à¦¬à¦šà§à¦› মেটাসিটি বিষয় অলঙà§à¦•à¦°à¦£ সহ শেড সকà§à¦°à¦¿à§Ÿà¦•à¦°à¦£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -126,11 +126,11 @@ msgid "Type of blur used for window deco - msgstr "উইনà§à¦¡à§‹ অলঙà§à¦•à¦°à¦£à§‡à¦° সময় অসà§à¦ªà¦·à§à¦Ÿà¦¤à¦¾à¦° পà§à¦°à¦•à¦¾à¦°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "মেটাসিটি বিষয় বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "উইনà§à¦¡à§‹ অলঙà§à¦•à¦°à¦£ করার সময় মেটাসিটি বিষয় বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -817,7 +817,7 @@ msgstr "যখন run_command8 চাও - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "যখন run_command9 চাওয়া হবে তখন শেলে নিরà§à¦¦à§‡à¦¶ লাইনটি সমà§à¦ªà¦¾à¦¦à¦¨ করা হবে" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "কমানà§à¦¡ '%1'" -@@ -1750,13 +1750,13 @@ msgstr "ইউজারসà§à¦ªà§‡à¦¸ à - msgid "Userspace file system" - msgstr "ইউজারসà§à¦ªà§‡à¦¸ ফাইল সিসà§à¦Ÿà§‡à¦®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf নিয়নà§à¦¤à§à¦°à¦£ বà§à¦¯à¦¾à¦•à¦à¦¨à§à¦¡" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf নিয়নà§à¦¤à§à¦°à¦£ বà§à¦¯à¦¾à¦•à¦à¦¨à§à¦¡" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1766,58 +1766,58 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib পà§à¦°à¦§à¦¾à¦¨ লà§à¦ª সমরà§à¦¥à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "à¦à¦•à¦Ÿà¦¿ টারà§à¦®à¦¿à¦¨à¦¾à¦² খà§à¦²à§à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "ডায়ালগ চালনা করা" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "পà§à¦°à¦§à¦¾à¦¨ মেনৠপà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "চালনা করার অনà§à¦ªà§à¦°à§Ÿà§‹à¦— ডায়ালগ পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করা" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "পà§à¦°à¦§à¦¾à¦¨ তালিকা পà§à¦°à¦¦à¦°à§à¦¶à¦¨" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "à¦à¦•à¦Ÿà¦¿ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিন" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "উইনà§à¦¡à§‹à¦° à¦à¦•à¦Ÿà¦¿ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিন" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "কমানà§à¦¡ লাইন পারà§à¦¸ করতে সমসà§à¦¯à¦¾à¥¤" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "উইনà§à¦¡à§‹ সà§à¦•à§à¦°à¦¿à¦¨à¦¶à¦Ÿ নিরà§à¦¦à§‡à¦¶ লাইন" - -diff -upr compiz-0.8.8-orig/po/bs.po compiz-0.8.8/po/bs.po ---- compiz-0.8.8-orig/po/bs.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/bs.po 2012-05-16 12:40:31.000000000 +0200 -@@ -19,57 +19,57 @@ msgstr "" - "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" - "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Desktop postavke" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Windhoek" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nijedan" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Vrijednost" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Windhoek" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -86,38 +86,38 @@ msgid "Blur type" - msgstr "&Postavi filter" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -129,11 +129,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -744,7 +744,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1636,12 +1636,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1652,55 +1652,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/ca.po compiz-0.8.8/po/ca.po ---- compiz-0.8.8-orig/po/ca.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ca.po 2012-05-16 12:40:33.000000000 +0200 -@@ -18,60 +18,60 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Escriptori" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Menú de la finestra" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Cap" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Canvia la mida" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "Minimitzades" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximitza la finestra horitzontalment" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximitza la finestra verticalment" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimitzades" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Elevació automàtica" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -90,44 +90,44 @@ msgstr "Velocitat de plegament" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Redueix l'opacitat de la finestra" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "Maximitza la finestra activa horitzontalment" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "Tema opacitat" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "Tema opacitat ombra" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Opacitat d'utilitzar finestres actives amb el Metacity tema per decoracions" -+"Opacitat d'utilitzar finestres actives amb el Marco tema per decoracions" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacitat d´utilitzar per Metacity tema per decoracions" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacitat d´utilitzar per Marco tema per decoracions" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Finestres actives amb ombra i amb el tema Metacity per decoracions desde " -+"Finestres actives amb ombra i amb el tema Marco per decoracions desde " - "opac al translucíd" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Finestra amb ombra amb el tema Metacity per decoracions desde opac fins a " -+"Finestra amb ombra amb el tema Marco per decoracions desde opac fins a " - "translucíd" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -139,12 +139,12 @@ msgid "Type of blur used for window deco - msgstr "Tipus de blur utilizat en decoracions de finestres" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Utilitzar el tema Metacity" -+msgid "Use marco theme" -+msgstr "Utilitzar el tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Utilitzar el tema Metacity quan dibuixes decoracions de finestres" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Utilitzar el tema Marco quan dibuixes decoracions de finestres" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -916,7 +916,7 @@ msgstr "" - "Línia d'ordres que s'executarà a l'intèrpret d'ordres en invocar run_command%" - "d" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Ordre" -@@ -1842,12 +1842,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1858,57 +1858,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Diàleg d'execució" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Línia d'ordres de captura de pantalla" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Línia d'ordres de captura de pantalla" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Mostra el menú principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Mostra el diàleg d'execució de l'aplicació" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Mostra el menú principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Fes una captura de pantalla" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Fes una captura de pantalla d'una finestra" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Línia d'ordres de captura de pantalla" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Línia d'ordres de captura de pantalla de finestra" - -diff -upr compiz-0.8.8-orig/po/cs.po compiz-0.8.8/po/cs.po ---- compiz-0.8.8-orig/po/cs.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/cs.po 2012-05-16 12:40:34.000000000 +0200 -@@ -21,58 +21,58 @@ msgstr "" - "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Plocha" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Správce oken" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nic" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Měřítko" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximalizovat" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximalizovat okno horizontálnÄ›" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximalizovat okno vertikálnÄ›" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimalizované" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automaticky do popÅ™edí" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -87,38 +87,38 @@ msgid "Blur type" - msgstr "Typ rozmazání" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Průhlednost aktivního okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "Průhlednost stínu aktivního okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Průhlednost tématu metacity" -+msgid "Marco theme opacity" -+msgstr "Průhlednost tématu marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Průhlednost stínu tématu metacity" -+msgid "Marco theme opacity shade" -+msgstr "Průhlednost stínu tématu marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Průhlednost pro aktivní okna s tématem metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Průhlednost pro aktivní okna s tématem marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Průhlednost pro témata metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Průhlednost pro témata marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -130,12 +130,12 @@ msgid "Type of blur used for window deco - msgstr "Typ rozmazání použitého pro dekoraci oken" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Použít téma metacity" -+msgid "Use marco theme" -+msgstr "Použít téma marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Použít téma metacity pro vykreslování dekorací oken" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Použít téma marco pro vykreslování dekorací oken" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -771,7 +771,7 @@ msgstr "Příkaz, který se vykoná, pok - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Příkaz, který se vykoná, pokud je v shellu volán run_command9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Příkaz" -@@ -1652,13 +1652,13 @@ msgstr "Uživatelský souborový systém - msgid "Userspace file system" - msgstr "Uživatelský souborový systém" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "Gconf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Kontrolní backend GConf" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Kontrolní backend MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1668,56 +1668,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Podpora hlavního napojení na GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Otevřít terminál" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Spustit dialog" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Příkaz pro otevÅ™ení terminálu" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Screenshot command line" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Zobrazit hlavní nabídku" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Zobrazit dialog spouÅ¡tÄ›ní aplikace" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Zobrazit hlavní nabídku" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Pořídit snímek obrazovky" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Pořídit snímek okna" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Příkaz pro otevÅ™ení terminálu" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Window screenshot command line" - -diff -upr compiz-0.8.8-orig/po/cy.po compiz-0.8.8/po/cy.po ---- compiz-0.8.8-orig/po/cy.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/cy.po 2012-05-16 12:40:31.000000000 +0200 -@@ -17,56 +17,56 @@ msgstr "" - "Plural-Forms: nplurals=5; plural=(n == 0 ? 0 : n == 1 ? 1 : n < 6 ? 2 : n == " - "6 ? 3 : 4);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Windhoek" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Gwerth" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Windhoek" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -83,38 +83,38 @@ msgid "Blur type" - msgstr "Hepgor\n" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -126,11 +126,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -745,7 +745,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Gorchymyn '%1'" -@@ -1644,12 +1644,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1660,58 +1660,58 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Gwall wrth ddadansoddi'r llinell gorchymyn." - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "Gwall wrth ddadansoddi'r llinell gorchymyn." - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Gwall wrth ddadansoddi'r llinell gorchymyn." - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/da.po compiz-0.8.8/po/da.po ---- compiz-0.8.8-orig/po/da.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/da.po 2012-05-16 12:40:33.000000000 +0200 -@@ -18,60 +18,60 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Skrivebord" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Vinduesmenu" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ingen" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Skygge" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "Maksimer" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maksimer Vandret" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maksimer Lodret" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimer" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Hæv" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Sink" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -88,39 +88,39 @@ msgstr "Blue type" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Formindsk vinduets uigennemsigtighed" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "Maksimer det aktive vindue i bredden" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity tema gennemsigtighed" -+msgid "Marco theme opacity" -+msgstr "Marco tema gennemsigtighed" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity tema gennemsigtigheds skygge" -+msgid "Marco theme opacity shade" -+msgstr "Marco tema gennemsigtigheds skygge" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -132,11 +132,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Brug Metacity tema" -+msgid "Use marco theme" -+msgstr "Brug Marco tema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -881,7 +881,7 @@ msgstr "Kommandolinje, der skal køres i - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Kommandolinje, der skal køres i Shell, nÃ¥r kør_kommando%d aktiveres" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Kommando" -@@ -1801,12 +1801,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1817,57 +1817,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Dialogboksen Kør" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Kommandolinje til skærmbillede" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Kommandolinje til skærmbillede" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Vis hovedmenu" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Vis dialogboksen til kørsel af program" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Vis hovedmenuen" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Tag et skærmbillede" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Tag et skærmbillede af et vindue" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Kommandolinje til skærmbillede" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Kommandolinje til vindueskærmbillede" - -diff -upr compiz-0.8.8-orig/po/de.po compiz-0.8.8/po/de.po ---- compiz-0.8.8-orig/po/de.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/de.po 2012-05-16 12:40:34.000000000 +0200 -@@ -18,54 +18,54 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Desktop" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Fensterverwaltung" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Keine" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Aufrollen" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximieren" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Horizontal maximieren" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Vertikal maximieren" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimieren" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Hervorheben" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - #, fuzzy - msgid "Lower" - msgstr "Niedrig" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -83,43 +83,43 @@ msgstr "Unschärfetyp" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" --msgstr "Metacity-Theme Undurchsichtigkeit des aktiven Fensters" -+msgid "Marco theme active window opacity" -+msgstr "Marco-Theme Undurchsichtigkeit des aktiven Fensters" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" --msgstr "Metacity Theme Transparenzschatten des aktiven Fensters" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco Theme Transparenzschatten des aktiven Fensters" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Undurchsichtigkeit bei Metacity-Theme" -+msgid "Marco theme opacity" -+msgstr "Undurchsichtigkeit bei Marco-Theme" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity-Theme Transparenzschatten" -+msgid "Marco theme opacity shade" -+msgstr "Marco-Theme Transparenzschatten" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opazität für aktive Fenster mit Metacity-Dekoration" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opazität für aktive Fenster mit Marco-Dekoration" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Undurchsichtigkeit für Metacity-Dekorationen" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Undurchsichtigkeit für Marco-Dekorationen" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Abstufung aktiver Fenster mit Metacity-Dekoration von undurchsichtig nach " -+"Abstufung aktiver Fenster mit Marco-Dekoration von undurchsichtig nach " - "durchsichtig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Abstufung Fenster mit Metacity-Dekoration von undurchsichtig nach " -+"Abstufung Fenster mit Marco-Dekoration von undurchsichtig nach " - "durchsichtig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -131,12 +131,12 @@ msgid "Type of blur used for window deco - msgstr "Unschärfetyp für Fensterdekoration" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Metacity-Thema verwenden" -+msgid "Use marco theme" -+msgstr "Marco-Thema verwenden" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Metacity-Thema für das Zeichnen der Fensterdekoration verwenden" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Marco-Thema für das Zeichnen der Fensterdekoration verwenden" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -844,7 +844,7 @@ msgstr "" - "Die Kommandozeile, die bei Ausführung von run_command9 in der Shell " - "ausgeführt wird" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Kommando" -@@ -1736,13 +1736,13 @@ msgstr "Benutzerbereichs-Dateisystem" - msgid "Userspace file system" - msgstr "Benutzerbereichs-Dateisystem" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf-Backend" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf-Backend" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1752,56 +1752,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib-Mainloop-Unterstützung" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome Kompatibilität" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate Kompatibilität" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Einen Terminalemulator öffnen" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Optionen die die Kompatibilität von Compiz zu Gnome gewährleisten" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Optionen die die Kompatibilität von Compiz zu Mate gewährleisten" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Dialogfeld Ausführen" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Kommandozeile für Terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Kommandozeile für Bildschirmfoto" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Hauptmenü anzeigen" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Dialogfeld 'Anwendung ausführen' anzeigen" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Hauptmenü anzeigen" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Bildschirmfoto aufnehmen" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Bildschirmfoto von Fenster aufnehmen" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Kommandozeile für Terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Kommandozeile für Fenster-Bildschirmfoto " - -diff -upr compiz-0.8.8-orig/po/el.po compiz-0.8.8/po/el.po ---- compiz-0.8.8-orig/po/el.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/el.po 2012-05-16 12:40:32.000000000 +0200 -@@ -19,53 +19,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Επιφάνεια εÏγασίας" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ΔιαχείÏηση ΠαÏαθÏÏου" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Κανένα" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Σκίαση" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Μεγιστοποίησε" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Μεγιστοποίηση ΟÏιζόντια" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Μεγιστοποίηση Κάθετα" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Ελαχιστοποίηση" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "ΑνÏψωση" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "ΧαμηλότεÏο" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -82,43 +82,43 @@ msgid "Blur type" - msgstr "Είδος θολώματος" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Αδιαφάνεια θέματος ενεÏÎ³Î¿Ï Ï€Î±ÏαθÏÏου του Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Αδιαφάνεια θέματος ενεÏÎ³Î¿Ï Ï€Î±ÏαθÏÏου του Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Σκίαση αδιαφάνειας θέματος ενεÏÎ³Î¿Ï Ï€Î±ÏαθÏÏου του Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Σκίαση αδιαφάνειας θέματος ενεÏÎ³Î¿Ï Ï€Î±ÏαθÏÏου του Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Αδιαφάνεια θέματος του Metacity" -+msgid "Marco theme opacity" -+msgstr "Αδιαφάνεια θέματος του Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Σκίαση αδιαφάνειας θέματος του Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Σκίαση αδιαφάνειας θέματος του Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Αδιαφάνεια για χÏήση στα ενεÏγά παÏάθυÏα με θέματα διακοσμήσεων του metacity" -+"Αδιαφάνεια για χÏήση στα ενεÏγά παÏάθυÏα με θέματα διακοσμήσεων του marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Αδιαφάνεια για χÏήση στα θέματα διακοσμήσεων του metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Αδιαφάνεια για χÏήση στα θέματα διακοσμήσεων του marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Σκίαση ενεÏγών παÏαθÏÏων με θέματα διακοσμήσεων του metacity από αδιαφανές " -+"Σκίαση ενεÏγών παÏαθÏÏων με θέματα διακοσμήσεων του marco από αδιαφανές " - "σε διάφανο" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Σκίαση παÏαθÏÏων με θέματα διακοσμήσεων του metacity από αδιαφανές σε διάφανο" -+"Σκίαση παÏαθÏÏων με θέματα διακοσμήσεων του marco από αδιαφανές σε διάφανο" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -129,13 +129,13 @@ msgid "Type of blur used for window deco - msgstr "Είδος θολώματος για χÏήση στις διακοσμήσεις παÏαθÏÏων" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "ΧÏήση θέματος του metacity" -+msgid "Use marco theme" -+msgstr "ΧÏήση θέματος του marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" --"ΧÏήση θέματος του metacity όταν ζωγÏαφίζονται οι διακοσμήσεις παÏαθÏÏων" -+"ΧÏήση θέματος του marco όταν ζωγÏαφίζονται οι διακοσμήσεις παÏαθÏÏων" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -809,7 +809,7 @@ msgid "Command line to be executed in sh - msgstr "" - "ΓÏαμμή εντολών για εκτέλεση σε κέλυφος όταν επικαλεσθεί το Ï„Ïέξιμο_εντολής9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Εντολές" - -@@ -1692,13 +1692,13 @@ msgstr "ΣÏστημα ΑÏχείων Us - msgid "Userspace file system" - msgstr "ΣÏστημα αÏχείων χÏήστη" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "ΚÏÏια ΕφαÏμογή Ελέγχου του GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "ΚÏÏια ΕφαÏμογή Ελέγχου του MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1708,57 +1708,57 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "ΚÏÏιος βÏόγχος υποστήÏιξης GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Συμβατότητα με Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Συμβατότητα με Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Ανοιγμα ενός τεÏματικοÏ" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - "Επιλογές που διατηÏοÏν το Compiz συμβατό με το πεÏιβάλλον επιφάνειας " --"εÏγασίας Gnome" -+"εÏγασίας Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "ΤÏέξιμο Διαλόγου" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "ΤÏέξε εντολή τεÏματικοÏ" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "ΓÏαμμή εντολών αÏπαγής οθόνης" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Εμφάνιση ΚÏÏιου ΜενοÏ" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Εμφάνιση διαλόγου ΤÏεξίματος ΕφαÏμογής" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Εμφάνιση του κÏÏιου μενοÏ" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "ΤÏάβα μια αÏπαγή οθόνης" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ΤÏάβα μια αÏπαγή οθόνης ενός παÏαθÏÏου" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "ΓÏαμμή εντολών τεÏματικοÏ" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ΓÏαμμή εντολών αÏπαγής οθόνης παÏαθÏÏου" - -diff -upr compiz-0.8.8-orig/po/en_GB.po compiz-0.8.8/po/en_GB.po ---- compiz-0.8.8-orig/po/en_GB.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/en_GB.po 2012-05-16 12:40:32.000000000 +0200 -@@ -17,61 +17,61 @@ msgstr "" - "Content-Transfer-Encoding: 8-bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Desktop" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Window Manager" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Scanner" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "&Shrink Windows" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "&Shrink Windows" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "&Shrink Windows" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "&Shrink Windows" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "AutoYast" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -89,39 +89,39 @@ msgstr "Suspend" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "&Delete Windows completely" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "&Delete Windows completely" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -133,11 +133,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -765,7 +765,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Command: " -@@ -1705,12 +1705,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1721,61 +1721,61 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "&Tone Dialling" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Error parsing command line." - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "Error parsing command line." - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - #, fuzzy - msgid "Show Main Menu" - msgstr "&Show Boot Menu" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - #, fuzzy - msgid "Show the main menu" - msgstr "&Show Boot Menu" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Error parsing command line." - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/en_US.po compiz-0.8.8/po/en_US.po ---- compiz-0.8.8-orig/po/en_US.po 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/po/en_US.po 2012-05-16 12:40:31.000000000 +0200 -@@ -15,54 +15,54 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4616 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Previous" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4597 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,38 +77,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -120,11 +120,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4405 -@@ -717,7 +717,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1588,12 +1588,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1604,55 +1604,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/es.po compiz-0.8.8/po/es.po ---- compiz-0.8.8-orig/po/es.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/es.po 2012-05-16 12:40:34.000000000 +0200 -@@ -16,53 +16,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Escritorio" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Ventana de Gestión" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ninguno" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Tonalidad" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximizada" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Maximizar ventana horizontalmente" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Maximizar ventana verticalmente" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimizar" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Elevación automática" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Bajar" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -79,43 +79,43 @@ msgid "Blur type" - msgstr "Tipo de difuminado" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacidad de la ventana activa del tema de Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacidad de la ventana activa del tema de Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Opacidad de sombra de la ventana activa del tema de Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Opacidad de sombra de la ventana activa del tema de Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacidad del tema de Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacidad del tema de Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Opacidad de sombra del tema de Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Opacidad de sombra del tema de Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Opacidad al utilizar las ventanas activas con decoraciones del tema metacity" -+"Opacidad al utilizar las ventanas activas con decoraciones del tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacidad a utilizar para las decoraciones tema metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacidad a utilizar para las decoraciones tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - "Sombra de las ventanas activas con decoraciones de opaco a transparente del " --"tema metacity " -+"tema marco " - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Sombra ventanas con decoraciones de opaco a transparente del tema metacity" -+"Sombra ventanas con decoraciones de opaco a transparente del tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -126,12 +126,12 @@ msgid "Type of blur used for window deco - msgstr "Tipo de difuminado usado para decoraciones de ventana" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Usar el tema Metacity" -+msgid "Use marco theme" -+msgstr "Usar el tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Usar el tema Metacity para dibujar las decoraciones de ventana" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Usar el tema Marco para dibujar las decoraciones de ventana" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -809,7 +809,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Línea de comandos que se ejecuta en el shell cuando run_command9 es invocado" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Comandos" - -@@ -1698,12 +1698,12 @@ msgstr "Sistema de Archivos del Espacio - msgid "Userspace file system" - msgstr "Sistema de archivos del espacio de usuario" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "Herramienta de control de Gconf" - - #: ../metadata/glib.xml.in.h:1 -@@ -1714,55 +1714,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "soporte de loop principal de GLib " - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Compatibilidad de Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Compatibilidad de Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Abrir terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Opciones que mantienen a Compiz compatible con Gnome" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Opciones que mantienen a Compiz compatible con Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Ejecutar diálogo" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Ejecutar comando de terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Línea de comandos de captura de pantalla" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Mostrar menú principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Mostrar el cuadro de diálogo de ejecución de aplicación" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Muestra el menú principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Capturar la pantalla" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Toma una captura de pantalla de una ventana" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Línea de comandos para abrir Terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Línea de comandos de captura de ventana" - -diff -upr compiz-0.8.8-orig/po/et.po compiz-0.8.8/po/et.po ---- compiz-0.8.8-orig/po/et.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/et.po 2012-05-16 12:40:33.000000000 +0200 -@@ -15,59 +15,59 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Töölauad" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Aken" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Puudub" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Vali &pilt" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "Mitteaktiivne vajutatud:" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Töölaua efektid" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Mitteaktiivne vajutatud:" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -85,38 +85,38 @@ msgstr "Kiirus:" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Kas kasutada animeeritud aknaid?" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -128,11 +128,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -758,7 +758,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Käsku pole antud" -@@ -1695,12 +1695,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1711,63 +1711,63 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "Käivitatakse terminalis" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "Häälestusdialoog" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Käsku pole antud" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "Käsku pole antud" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - #, fuzzy - msgid "Show Main Menu" - msgstr "Peamenüü" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - #, fuzzy - msgid "Show Run Application dialog" - msgstr "Käivita rakendus" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - #, fuzzy - msgid "Show the main menu" - msgstr "Teenuse URI näitamine" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Käsku pole antud" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/eu.po compiz-0.8.8/po/eu.po ---- compiz-0.8.8-orig/po/eu.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/eu.po 2012-05-16 12:40:31.000000000 +0200 -@@ -17,54 +17,54 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Mahaigaina" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Leiho kudeatzailea" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Bat ere ez" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Itzala" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximizatu" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Horizontalki maximizatu" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Bertikalki maximizatu" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Ikonotu" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Goratu" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - #, fuzzy - msgid "Lower" - msgstr "Azpian" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -80,44 +80,44 @@ msgid "Blur type" - msgstr "Lausotze mota" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity gaian leiho aktiboko opakutasuna" -+msgid "Marco theme active window opacity" -+msgstr "Marco gaian leiho aktiboko opakutasuna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity gaian leiho aktiboko opakotasun itzala" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco gaian leiho aktiboko opakotasun itzala" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity gaiaren opakutasuna" -+msgid "Marco theme opacity" -+msgstr "Marco gaiaren opakutasuna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity gaiaren opakotasun itzala" -+msgid "Marco theme opacity shade" -+msgstr "Marco gaiaren opakotasun itzala" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Metacity gaiaren dekorazioaetan erabili beharreko opakutasuna leiho " -+"Marco gaiaren dekorazioaetan erabili beharreko opakutasuna leiho " - "aktiborako" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Metacity gaiaren dekorazioaetan erabili beharreko opakutasuna" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Marco gaiaren dekorazioaetan erabili beharreko opakutasuna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Itzaldu leiho aktiboa metacity dekorazio gaia erabiliz, opakutik " -+"Itzaldu leiho aktiboa marco dekorazio gaia erabiliz, opakutik " - "transluzidora." - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Itzaldu leihoak metacity dekorazio gaia erabiliz, opakutik transluzidora." -+"Itzaldu leihoak marco dekorazio gaia erabiliz, opakutik transluzidora." - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -128,12 +128,12 @@ msgid "Type of blur used for window deco - msgstr "Leiho dekoraziorako lausotze mota" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Erabili metacity gaia" -+msgid "Use marco theme" -+msgstr "Erabili marco gaia" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Erabili metacity gaia leiho dekorazioa marraztean" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Erabili marco gaia leiho dekorazioa marraztean" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -734,7 +734,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Shellean exekutatu beharreko komando lerroa exekutatu_9komandoa abiaraztean" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Komandoak" - -@@ -1604,13 +1604,13 @@ msgstr "Erabiltzailearen-espazio Fitxate - msgid "Userspace file system" - msgstr "Erabiltzailearen-espazio fitxategi sistema" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf kontrol tresna" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf kontrol tresna" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1620,55 +1620,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib loop nagusiaren euskarria" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome bateragarritasuna" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate bateragarritasuna" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Terminala zabaldu" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Compiz Gnome mahaigain inguruneaz bateragarriak egiten duten aukerak" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Compiz Mate mahaigain inguruneaz bateragarriak egiten duten aukerak" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Exekuzio elkarrizketa" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Terminal komandoa exekutatu" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Pantaila-argazkia komando lerroa" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Ikus Menu Nagusia" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Ikus aplikazio exekuzio elkarrizketa" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Ikus menu nagusia" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Egin pantaila-argazkia" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Egin pantaila-argazkia leiho batena" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Terminal komando lerroa" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Leiho pantaila -argazki komando lerroa" - -diff -upr compiz-0.8.8-orig/po/fi.po compiz-0.8.8/po/fi.po ---- compiz-0.8.8-orig/po/fi.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/fi.po 2012-05-16 12:40:34.000000000 +0200 -@@ -22,53 +22,53 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Työpöytä" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Ikkunoiden hallinta" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ei mitään" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Näytä rullattuna" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Suurenna" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Suurenna vaakatasossa" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Suurenna pystytasossa" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Pienennä" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Nosta" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Laske" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -84,45 +84,45 @@ msgid "Blur type" - msgstr "Sumennustyyppi" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" --"Aktiivisen Metacity-ikkunan läpinäkyvyysMetacity-teeman aktiivisen ikkunan " -+"Aktiivisen Marco-ikkunan läpinäkyvyysMarco-teeman aktiivisen ikkunan " - "läpinäkyvyys" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity-teeman aktiivisen ikkunan läpinäkyvyyden varjo" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco-teeman aktiivisen ikkunan läpinäkyvyyden varjo" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity-teeman läpinäkyvyys" -+msgid "Marco theme opacity" -+msgstr "Marco-teeman läpinäkyvyys" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity-teeman läpinäkyvyyden varjo" -+msgid "Marco theme opacity shade" -+msgstr "Marco-teeman läpinäkyvyyden varjo" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Läpinäkyvyys aktiivisessa ikkunassa käytettäessä Metacity-teemaa kehyksineen" -+"Läpinäkyvyys aktiivisessa ikkunassa käytettäessä Marco-teemaa kehyksineen" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Metacity-teeman kehyksiin käytettävä läpinäkyvyys" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Marco-teeman kehyksiin käytettävä läpinäkyvyys" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Varjosta aktiiviset ikkunat Metacity-teemaa kehyksineen käytettäessä " -+"Varjosta aktiiviset ikkunat Marco-teemaa kehyksineen käytettäessä " - "läpikuultamattomasta läpikuultavaan" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Varjosta ikkunat Metacity-teemaa kehyksineen käytettäessä " -+"Varjosta ikkunat Marco-teemaa kehyksineen käytettäessä " - "läpikuultamattomasta läpikuultavaan" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -134,12 +134,12 @@ msgid "Type of blur used for window deco - msgstr "Sumennustyyppi ikkunan kehyksille" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Käytä Metacity-teemaa" -+msgid "Use marco theme" -+msgstr "Käytä Marco-teemaa" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Käytä Metacity-teemaa ikkunoiden kehyksissä" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Käytä Marco-teemaa ikkunoiden kehyksissä" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -730,7 +730,7 @@ msgstr "Suoritettava komentorivi, kun ru - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Suoritettava komentorivi, kun run_command9 suoritetaan" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Komennot" - -@@ -1599,13 +1599,13 @@ msgstr "Käyttäjätilan tiedostojärjes - msgid "Userspace file system" - msgstr "Käyttäjätilan tiedostojärjestelmä" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf-tietokannan hallinta" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf-tietokannan hallinta" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1615,57 +1615,57 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib-pääsilmukan tuki" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome-yhteensopivuus" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate-yhteensopivuus" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Avaa pääte" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" --"Valinnat, joilla Compiz pidetään yhteensopivana Gnome-työpöytäympäristön " -+"Valinnat, joilla Compiz pidetään yhteensopivana Mate-työpöytäympäristön " - "kanssa" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Suorita komento -valintaikkuna" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Suorita päätekomento" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Kuvakaappauksen komento" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Näytä päävalikko" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Näytä Suorita komento -valintaikkuna" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Näytä päävalikko" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Ota kuvankaappaus" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Ota kuvankaappaus ikkunasta" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Päätteen komentorivi" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Ikkunan kuvakaappauksen komento" - -diff -upr compiz-0.8.8-orig/po/fr.po compiz-0.8.8/po/fr.po ---- compiz-0.8.8-orig/po/fr.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/fr.po 2012-05-16 12:40:32.000000000 +0200 -@@ -20,53 +20,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Bureau" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Gestion des Fenêtres" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Aucun" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Ombrer" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximiser" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Maximiser horizontalement" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Maximiser verticalement" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimiser" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Augmenter" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Diminuer" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -83,44 +83,44 @@ msgid "Blur type" - msgstr "Type de flou" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacité de la fenêtre active du thème Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacité de la fenêtre active du thème Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Nuance de l'opacité de la fenêtre active du thème Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Nuance de l'opacité de la fenêtre active du thème Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacité du thème Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacité du thème Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Nuance de l'opacité du thème Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Nuance de l'opacité du thème Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - "Opacité à utiliser pour les fenêtres actives avec les décorations des thèmes " --"Metacity" -+"Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacité à utiliser pour les décorations des thèmes Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacité à utiliser pour les décorations des thèmes Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Nuancer les fenêtres actives avec les décorations du thème Metacity, " -+"Nuancer les fenêtres actives avec les décorations du thème Marco, " - "d'opaque à transparent" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Nuancer les fenêtres avec les décorations du thème Metacity, d'opaque à " -+"Nuancer les fenêtres avec les décorations du thème Marco, d'opaque à " - "transparent" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -132,12 +132,12 @@ msgid "Type of blur used for window deco - msgstr "Type de flou utilisé pour les décorations des fenêtres" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Utiliser le thème Metacity" -+msgid "Use marco theme" -+msgstr "Utiliser le thème Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Utiliser le thème Metacity pour dessiner les décorations de fenêtres" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Utiliser le thème Marco pour dessiner les décorations de fenêtres" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -835,7 +835,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Ligne de commande à exécuter dans le shell lorsque run_command9 est appelé" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Commandes" - -@@ -1723,13 +1723,13 @@ msgstr "Système de fichier de l'Espace - msgid "Userspace file system" - msgstr "Système de fichier de l'espace utilisateur" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Backend de contrôle GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Backend de contrôle MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1739,56 +1739,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Support de la boucle principale GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Compatibilité avec Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Compatibilité avec Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Ouvrir un terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" --"Options qui rendent Compiz compatible avec l'environnement de bureau Gnome" -+"Options qui rendent Compiz compatible avec l'environnement de bureau Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Boîte de dialogue d'exécution" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Commande pour lancer le Terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Ligne de commande de capture d'écran" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Afficher le menu principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Afficher la boîte de dialogue d'exécution de l'application" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Afficher le menu principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Faire une capture d'écran" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Faire une capture d'écran d'une fenêtre" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Commande à lancer pour le Terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Ligne de commande de capture de fenêtre" - -diff -upr compiz-0.8.8-orig/po/gl.po compiz-0.8.8/po/gl.po ---- compiz-0.8.8-orig/po/gl.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/gl.po 2012-05-16 12:40:32.000000000 +0200 -@@ -22,53 +22,53 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Lokalize 0.3\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Escritorio" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Xestión de Fiestras" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ningún" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Sombra" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximizar" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Maximizar Horizontalmente" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Maximizar Verticalmente" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimizar" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Elevar" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Baixar" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -85,42 +85,42 @@ msgid "Blur type" - msgstr "Tipo de desenfoque" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacidade da xanela activa no tema metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacidade da xanela activa no tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Opacidade da sombra da xanela activa no tema metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Opacidade da sombra da xanela activa no tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacidade do tema Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacidade do tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Opacidade da sombra do tema Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Opacidade da sombra do tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opacidade a empregar para xanelas activas con decoracións metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opacidade a empregar para xanelas activas con decoracións marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacidade a empregar para decoracións metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacidade a empregar para decoracións marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Escurecer decoración de xanelas activas con temas metacity de opaco cara " -+"Escurecer decoración de xanelas activas con temas marco de opaco cara " - "transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Sombrear decoración de xanelas con temas metacity de opaco cara transparente" -+"Sombrear decoración de xanelas con temas marco de opaco cara transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -131,12 +131,12 @@ msgid "Type of blur used for window deco - msgstr "Tipo de desenfoque empregado para as decoracións" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Empregar tema metacity" -+msgid "Use marco theme" -+msgstr "Empregar tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Empregar tema metacity ao debuxar as decoracións das xanelas" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Empregar tema marco ao debuxar as decoracións das xanelas" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -823,7 +823,7 @@ msgstr "" - "Liña de comando a ser executada na consola cando executar_comando9 sexa " - "accionado" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Comandos" - -@@ -1699,13 +1699,13 @@ msgstr "Sistema de Ficheiros en Espazo d - msgid "Userspace file system" - msgstr "Sistema de ficheiros en espazo de usuario" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "Configurador de GNoME (GConf)" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Xestor de Configuracións GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "Configurador de GNoME (MateConf)" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Xestor de Configuracións MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1715,57 +1715,57 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Soporte ao bucle principal de GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Compatibilidade con Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Compatibilidade con Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Abrir unha terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - "Opcións para manter a compatibilidade de Compiz co entorno de escritorio " --"Gnome" -+"Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Diálogo de Execución" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Executar comando de terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Capturar pantalla da liña de comando" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Amosar Menú Principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Amosar caixa de diálogo Executar Aplicativo" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Amosar o menú principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Facer unha capturar pantalla" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Facer captura de pantalla dunha xanela" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Liña de comando do terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Liña de comando para captura de pantalla de xanelas" - -diff -upr compiz-0.8.8-orig/po/gu.po compiz-0.8.8/po/gu.po ---- compiz-0.8.8-orig/po/gu.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/gu.po 2012-05-16 12:40:32.000000000 +0200 -@@ -18,58 +18,58 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" - "X-Generator: KBabel 1.11.4\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "ડેસà«àª•àªŸà«‹àªª" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "વિનà«àª¡à«‹ વà«àª¯àªµàª¸à«àª¥àª¾àªªàª¨" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "કંઈ નહિં" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "માપદંડ" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "મહતà«àª¤àª® કરો" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "વિનà«àª¡à«‹àª¨à«‡ આડી રીતે મહતà«àª¤àª® બનાવો" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "વિનà«àª¡à«‹àª¨à«‡ ઊભી રીતે મહતà«àª¤àª® બનાવો" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "નà«àª¯à«‚નતમ કરેલ" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "આપોઆપ-વધારો" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -84,32 +84,32 @@ msgid "Blur type" - msgstr "àªàª¾àª‚ખાપણાનો પà«àª°àª•àª¾àª°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "મેટાસીટી થીમ સકà«àª°àª¿àª¯ વિનà«àª¡à«‹ અપારદરà«àª¶àª•àª¤àª¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "મેટાસીટી થીમ સકà«àª°àª¿àª¯ વિનà«àª¡à«‹ અપારદરà«àª¶àª•àª¤àª¾ છાયા" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "મેટાસીટી થીમ અપારદરà«àª¶àª•àª¤àª¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "મેટાસીટી થીમ અપારદરà«àª¶àª•àª¤àª¾ છાયા" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "મેટાસીટી થીમ શણગારો સાથે સકà«àª°àª¿àª¯ વિનà«àª¡à«‹ માટે વાપરવાની અપારદરà«àª¶àª•àª¤àª¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "મેટાસીટી થીમ શણગારો માટે વાપરવાની અપારદરà«àª¶àª•àª¤àª¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - "સકà«àª°àª¿àª¯ વિનà«àª¡à«‹àª¨à«‡ મેટાસીટી થીમ શણગારો વડે અપારદરà«àª¶àª•àª®àª¾àª‚થી દૃશà«àª¯àª®àª¾àª¨àª®àª¾àª‚ લાવવા માટે છાયાંકિત " -@@ -117,7 +117,7 @@ msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - "વિનà«àª¡à«‹àª¨à«‡ મેટાસીટી થીમ શણગારો વડે અપારદરà«àª¶àª•àª®àª¾àª‚થી દૃશà«àª¯àª®àª¾àª¨àª®àª¾àª‚ લાવવા માટે છાયાંકિત કરો" - -@@ -130,11 +130,11 @@ msgid "Type of blur used for window deco - msgstr "વિનà«àª¡à«‹ શણગારો માટે વપરાતા àªàª¾àª‚ખાપણાનો પà«àª°àª•àª¾àª°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "મેટાસીટી થીમ વાપરો" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "જà«àª¯àª¾àª°à«‡ વિનà«àª¡à«‹ શણગારો દોરી રહà«àª¯àª¾ હોય તà«àª¯àª¾àª°à«‡ મેટાસીટી થીમ વાપરો" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -769,7 +769,7 @@ msgstr "શેલમાં ચલાવà - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "શેલમાં ચલાવવાનà«àª‚ આદેશ વાકà«àª¯ જà«àª¯àª¾àª°à«‡ run_command9 બોલાવવામાં આવે" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "આદેશો :" -@@ -1662,13 +1662,13 @@ msgstr "વપરાશકરà«àª¤àª¾àª - msgid "Userspace file system" - msgstr "વપરાશકરà«àª¤àª¾àªœàª—à«àª¯àª¾ ફાઈલ સિસà«àªŸàª®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf નિયંતà«àª°àª£ બેકેનà«àª¡" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf નિયંતà«àª°àª£ બેકેનà«àª¡" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1678,57 +1678,57 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib મà«àª–à«àª¯ લà«àªª આધાર" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "ટરà«àª®àª¿àª¨àª² ખોલો" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "સંવાદ ચલાવો" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "આદેશ '%1'" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "સà«àª•à«àª°à«€àª¨àª¶à«‹àªŸ આદેશ વાકà«àª¯" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "મà«àª–à«àª¯ મેનૠબતાવો" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "કારà«àª¯àª•à«àª°àª® ચલાવો સંવાદ બતાવો" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "મà«àª–à«àª¯ મેનૠબતાવો" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "ફોટો લો" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "વિનà«àª¡à«‹àª¨à«‹ ફોટો લો" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "આદેશ '%1'" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "વિનà«àª¡à«‹ સà«àª•à«àª°à«€àª¨àª¶à«‹àªŸ આદેશ વાકà«àª¯" - -diff -upr compiz-0.8.8-orig/po/he.po compiz-0.8.8/po/he.po ---- compiz-0.8.8-orig/po/he.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/he.po 2012-05-16 12:40:33.000000000 +0200 -@@ -16,59 +16,59 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=0;\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "שולחן עבודה" - - # Label text --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ניהול חלונות" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "קומפיז" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "לל×" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "גלול" - - # button text --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "הגדל למקסימו×" - - # button text --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "הרחב למקסימו×" - - # button text --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "הגבה למקסימו×" - - # button text --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "מזער" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "העלה" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "תחתון" - - # Label text --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -84,40 +84,40 @@ msgstr "סוג טשטוש" - - # Radio button for using an entire (Windows) partition for Linux - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "×טימות חלון פעיל על פי ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Marco theme active window opacity" -+msgstr "×טימות חלון פעיל על פי ערכת ×”× ×•×©× ×©×œ Marco" - - # Radio button for using an entire (Windows) partition for Linux - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "הצללת ×טימות חלון פעיל על פי ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "הצללת ×טימות חלון פעיל על פי ערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "×טימות ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Marco theme opacity" -+msgstr "×טימות ערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "הצללת ×טימות ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Marco theme opacity shade" -+msgstr "הצללת ×טימות ערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "×טימות עבור חלונות ×¤×¢×™×œ×™× ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "×טימות עבור חלונות ×¤×¢×™×œ×™× ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "×טימות עבור מסגרות של ערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "×טימות עבור מסגרות של ערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" --msgstr "הצללת חלונות ×¤×¢×™×œ×™× ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Metacity מ××˜×•× ×œ×©×§×•×£" -+msgstr "הצללת חלונות ×¤×¢×™×œ×™× ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Marco מ××˜×•× ×œ×©×§×•×£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" --msgstr "הצללת חלונות ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Metacity מ××˜×•× ×œ×©×§×•×£" -+"Shade windows with marco theme decorations from opaque to translucent" -+msgstr "הצללת חלונות ×¢× ×ž×¡×’×¨×•×ª של ערכת ×”× ×•×©× ×©×œ Marco מ××˜×•× ×œ×©×§×•×£" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -128,12 +128,12 @@ msgid "Type of blur used for window deco - msgstr "סוג טשטוש עבור מסגרות חלון" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "השתמש בערכת ×”× ×•×©× ×©×œ Metacity" -+msgid "Use marco theme" -+msgstr "השתמש בערכת ×”× ×•×©× ×©×œ Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "השתמש בערכת ×”× ×•×©× ×©×œ Metacity בעת ציור מסגרות חלון" -+msgid "Use marco theme when drawing window decorations" -+msgstr "השתמש בערכת ×”× ×•×©× ×©×œ Marco בעת ציור מסגרות חלון" - - # button text - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -737,7 +737,7 @@ msgstr "שורת הפקודה שתופע - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "שורת הפקודה שתופעל בעת הרצת פקודה9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "פקודות" - -@@ -1627,12 +1627,12 @@ msgstr "מערכת ×§×‘×¦×™× ×‘×ž×¨×—×‘ - msgid "Userspace file system" - msgstr "מערכת ×§×‘×¦×™× ×‘×ž×¨×—×‘ המשתמש" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf " -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf " - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "תשתית בקרה של Gconf" - - #: ../metadata/glib.xml.in.h:1 -@@ -1643,55 +1643,55 @@ msgstr "GLib " - msgid "GLib main loop support" - msgstr "תמיכה בלול××” ר×שית של GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "ת×ימות לגנו×" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "פתח מסוף" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "×פשרויות להבטחת ת×ימות קומפיז לסביבת שולחן העבודה גנו×" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "די×לוג הרץ" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "הרץ פקודת מסוף" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "שורת פקודה ×œ×¦×™×œ×•× ×ž×¡×š" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "הצג תפריט ר×שי" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "הצג די×לוג הרץ יישו×" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "הצג ×ת התפריט הר×שי" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "צור ×¦×™×œ×•× ×ž×¡×š" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "צור ×¦×™×œ×•× ×ž×¡×š של חלון" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "שורת פקודה עבור מסוף" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "שורת פקודה ×œ×¦×™×œ×•× ×ž×¡×š של חלון" - -diff -upr compiz-0.8.8-orig/po/hi.po compiz-0.8.8/po/hi.po ---- compiz-0.8.8-orig/po/hi.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/hi.po 2012-05-16 12:40:33.000000000 +0200 -@@ -17,61 +17,61 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" - "X-Generator: KBabel 1.11.4\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "डेसकà¥à¤Ÿà¤¾à¤ª" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "विनà¥à¤¡à¥‹ मैनेजर" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "कà¥à¤› नहीं" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "सà¥à¤•à¥ˆà¤¨à¤°" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "windows" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "विंडो कà¥à¤·à¥ˆà¤¤à¤¿à¤œ रूप से अधिकतम करें" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "विंडो लंबवत रूप से अधिकतम करें" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "windows" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "सà¥à¤µà¤šà¤¾à¤²à¤¿à¤¤" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -88,38 +88,38 @@ msgid "Blur type" - msgstr "छोडं दिया \n" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "मेटासिटी थीम सकà¥à¤°à¤¿à¤¯ विंडो अपारदरà¥à¤¶à¤¿à¤¤à¤¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "मेटासिटी थीम सकà¥à¤°à¤¿à¤¯ विंडो अपारदरà¥à¤¶à¤¿à¤¤à¤¾ छाया" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "मेटासिटी थीम अपारदरà¥à¤¶à¤¿à¤¤à¤¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "मेटासिटी थीम अपारदरà¥à¤¶à¤¿à¤¤à¤¾ छाया" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "मेटासिटी थीम सजावट के साथ सकà¥à¤°à¤¿à¤¯ विंडो के लिठपà¥à¤°à¤¯à¥‹à¤— करने के लिठअपारदरà¥à¤¶à¤¿à¤¤à¤¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "मेटासिटी थीम सजावट के लिठपà¥à¤°à¤¯à¥‹à¤— के लिठअपारदरà¥à¤¶à¤¿à¤¤à¤¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "अपारदरà¥à¤¶à¥€ से पारभासी में मेटासिटी थीम सजावट के साथ छाया सकà¥à¤°à¤¿à¤¯ विंडो" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "अपारदरà¥à¤¶à¥€ से पारभासी में मेटासिटी थीम सजावट के साथ छाया विंडो" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -131,11 +131,11 @@ msgid "Type of blur used for window deco - msgstr "विंडो सजावट के लिठपà¥à¤°à¤¯à¥à¤•à¥à¤¤ बà¥à¤²à¤° का पà¥à¤°à¤•à¤¾à¤°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "मेटासिटी थीम का उपयोग करें" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "विंडो सजवाट खींचने के दौरान मेटासिटी थीम का उपयोग करें" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -853,7 +853,7 @@ msgstr "कमांड लाइन ज - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "कमांड लाइन जिसे शेल में चलाया जाना है जब run_command9 को बà¥à¤²à¤¾à¤¯à¤¾ जाता है" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "कमांड:" -@@ -1793,13 +1793,13 @@ msgstr "यूजरसà¥à¤ªà¥‡à¤¸ फà - msgid "Userspace file system" - msgstr "यूजरसà¥à¤ªà¥‡à¤¸ फाइल सिसà¥à¤Ÿà¤®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf नियंतà¥à¤°à¤£ बैकेंड" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf नियंतà¥à¤°à¤£ बैकेंड" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1809,59 +1809,59 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib मà¥à¤–à¥à¤¯ लूप समरà¥à¤¥à¤¨" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "टरà¥à¤®à¤¿à¤¨à¤² खोलें" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "टोण डायलिनà¥à¤• (&T)" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "कमाडं लैन पारà¥à¤¸ करने परà¥à¤¡ खराबी आ गया।" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "कमाडं लैन पारà¥à¤¸ करने परà¥à¤¡ खराबी आ गया।" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "दिखाà¤à¤ मà¥à¤–à¥à¤¯ मेनू" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "रन अनà¥à¤ªà¥à¤°à¤¯à¥‹à¤— संवाद दिखाà¤à¤" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "मà¥à¤–à¥à¤¯ मेनू दिखाà¤à¤" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "सà¥à¤•à¥à¤°à¥€à¤¨à¤¶à¥‰à¤Ÿ का चितà¥à¤° लें" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "विंडो का सà¥à¤•à¥à¤°à¥€à¤¨à¤¶à¥‰à¤Ÿ लें" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "कमाडं लैन पारà¥à¤¸ करने परà¥à¤¡ खराबी आ गया।" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "विंडो सà¥à¤•à¥à¤°à¥€à¤¨à¤¶à¥‰à¤Ÿ कमांड लाइन" - -diff -upr compiz-0.8.8-orig/po/hr.po compiz-0.8.8/po/hr.po ---- compiz-0.8.8-orig/po/hr.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/hr.po 2012-05-16 12:40:33.000000000 +0200 -@@ -18,59 +18,59 @@ msgstr "" - "Plural-Forms: nplurals=4; plural=(n != 1);\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Radna povrÅ¡ina" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Upravitelj Prozora" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "NiÅ¡ta" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Skener" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "&Smanji Windowse" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maksimiziraj prozor horizontalno" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maksimiziraj prozor vertikalno" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "&Smanji Windowse" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automatsko prikazivanje" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -89,39 +89,39 @@ msgstr "Brzina:" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" --msgstr "Transparentnost Metacity teme prozora" -+msgid "Marco theme active window opacity" -+msgstr "Transparentnost Marco teme prozora" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "&ObriÅ¡i Windows kompletno" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -133,11 +133,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -767,7 +767,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Naredba: " -@@ -1694,12 +1694,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1710,58 +1710,58 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "Pokreni u terminalu" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Naredba: " - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Naredba: " - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/hu.po compiz-0.8.8/po/hu.po ---- compiz-0.8.8-orig/po/hu.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/hu.po 2012-05-16 12:40:31.000000000 +0200 -@@ -3,7 +3,7 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. - # - # Kalman Kemenczy , 2006, 2007. --# Gabor Kelemen , 2007. -+# Gabor Kelemen , 2007. - # KAMI911 , 2007-2008. - msgid "" - msgstr "" -@@ -20,53 +20,53 @@ msgstr "" - "X-Launchpad-Export-Date: 2007-12-04 10:00+0000\n" - "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,490,-1\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Asztal" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Ablakkezelés" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Egyik sem" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Felgördítés" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximalizálás" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Ablak maximalizálása vízszintesen" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Ablak maximalizálása függÅ‘legesen" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Kis méret" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Növelés" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Alacsony" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -81,38 +81,38 @@ msgid "Blur type" - msgstr "Elmosás típusa" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Aktív ablak átlátszatlansága" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "Felgördített aktív ablak átlátszatlansága" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "Ablak átlátszatlansága" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "Felgördített ablak átlátszatlansága" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "Az aktív ablak átlátszatlansága a díszítÅ‘ elemekhez" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "Az ablak átlátszatlansága a díszítÅ‘ elemekhez" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "Felgördített aktív ablak átlátszatlansága a díszítÅ‘ elemeknél" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "Felgördített ablak átlátszatlansága a díszítÅ‘ elemeknél" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -124,12 +124,12 @@ msgid "Type of blur used for window deco - msgstr "Az elmosás típusa a díszítÅ‘ elemekhez" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Metacity téma alkalmazása" -+msgid "Use marco theme" -+msgstr "Marco téma alkalmazása" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Metacity téma alkalmazása az ablakdíszítések rajzolásakor" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Marco téma alkalmazása az ablakdíszítések rajzolásakor" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -720,7 +720,7 @@ msgstr "A run_command8 által elindítot - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "A run_command9 által elindított parancs" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Parancs" - -@@ -1592,13 +1592,13 @@ msgstr "Felhasználói módú fájlrends - msgid "Userspace file system" - msgstr "Felhasználói módú fájlrendszer" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf vezérlés kiszolgálója" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf vezérlés kiszolgálója" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1608,56 +1608,56 @@ msgstr "Glib" - msgid "GLib main loop support" - msgstr "Glib fÅ‘ciklus támogatása" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome kompatibilitás" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate kompatibilitás" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Terminál megnyitása" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" --"Beállítás, amely a Compizt kompatibilissá teszi a Gnome asztali környezettel" -+"Beállítás, amely a Compizt kompatibilissá teszi a Mate asztali környezettel" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Párbeszéd futtatása" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Parancs futtatása terminálban" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "KépernyÅ‘kép parancssor" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "FÅ‘menü megjelenítése" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "„Alkalmazás futtatása†párbeszédablak megjelenítése" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "FÅ‘menü megjelenítése" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "KépernyÅ‘kép készítése" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "KépernyÅ‘kép készítése az ablakról" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Terminál parancssor" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Ablak képernyÅ‘kép parancssor" - -diff -upr compiz-0.8.8-orig/po/id.po compiz-0.8.8/po/id.po ---- compiz-0.8.8-orig/po/id.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/id.po 2012-05-16 12:40:31.000000000 +0200 -@@ -17,54 +17,54 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Desktop" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -80,38 +80,38 @@ msgid "Blur type" - msgstr "Kecepatan:" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -123,11 +123,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -737,7 +737,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1621,12 +1621,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1637,56 +1637,56 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "Jalankan dalam terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/it.po compiz-0.8.8/po/it.po ---- compiz-0.8.8-orig/po/it.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/it.po 2012-05-16 12:40:32.000000000 +0200 -@@ -52,16 +52,16 @@ msgstr "" - - # (ndt) qui non capisco se si riferisca al desktop intero - # (comprese la barra superiore e inferiore) o solo alla 'scrivania' --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Desktop" - - # (ndt) messo al plurale, alla fine non è relativo a una sola finestra --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Gestione finestre" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - -@@ -77,23 +77,23 @@ msgstr "Sfuma" - msgid "Maximize" - msgstr "Massimizzato" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Massimizza orizzontalmente" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Massimizza verticalmente" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimizza" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Solleva" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Abbassa" - -@@ -113,39 +113,39 @@ msgid "Blur type" - msgstr "Tipo di sfocatura" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacità finestra attiva tema Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacità finestra attiva tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Sfumatura opacità finestra attiva tema Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Sfumatura opacità finestra attiva tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacità tema Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacità tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Sfumatura opacità tema Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Sfumatura opacità tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opacità da usare per le finestre attive con il tema Metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opacità da usare per le finestre attive con il tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacità da usare per le decorazioni del tema Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacità da usare per le decorazioni del tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" --msgstr "Sfuma le finestre attive con il tema Metacity da opache a traslucide" -+msgstr "Sfuma le finestre attive con il tema Marco da opache a traslucide" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" --msgstr "Sfuma le finestre con il tema Metacity da opache a traslucide" -+"Shade windows with marco theme decorations from opaque to translucent" -+msgstr "Sfuma le finestre con il tema Marco da opache a traslucide" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -156,12 +156,12 @@ msgid "Type of blur used for window deco - msgstr "Tipo di sfocatura da usare con le decorazioni delle finestre" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Usa il tema Metacity" -+msgid "Use marco theme" -+msgstr "Usa il tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Usa il tema Metacity per le decorazioni delle finestre" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Usa il tema Marco per le decorazioni delle finestre" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4408 - #: ../metadata/core.xml.in.h:9 -@@ -851,7 +851,7 @@ msgstr "" - "Riga di comando da eseguire nella shell quando viene invocato run_command9" - - #: ../plugins/commands/commands.xml.in.h:63 --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:1 -+#: ../plugins/matecompat/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Comandi" - -@@ -1763,13 +1763,13 @@ msgstr "File system nello spazio utente" - msgid "Userspace file system" - msgstr "File system nello spazio utente" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Backend per il controllo GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Backend per il controllo MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1780,55 +1780,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Supporto ciclo main GLib" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Compatibilità GNOME" -+#: ../plugins/matecompat/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Compatibilità MATE" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:3 -+#: ../plugins/matecompat/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Apre un terminale" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Opzioni che mantengono Compiz compatibile con l'ambiente grafico GNOME" -+#: ../plugins/matecompat/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Opzioni che mantengono Compiz compatibile con l'ambiente grafico MATE" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:5 -+#: ../plugins/matecompat/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Finestra di dialogo «Esegui applicazione»" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:6 -+#: ../plugins/matecompat/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Comando esecuzione terminale" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:7 -+#: ../plugins/matecompat/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Riga di comando per cattura schermata" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:8 -+#: ../plugins/matecompat/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Mostra menù principale" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:9 -+#: ../plugins/matecompat/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Mostra finestra di dialogo «Esegui applicazione»" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:10 -+#: ../plugins/matecompat/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Mostra il menù principale" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:11 -+#: ../plugins/matecompat/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Cattura schermata" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:12 -+#: ../plugins/matecompat/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Cattura un'istantanea di una finestra" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:13 -+#: ../plugins/matecompat/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Riga di comando terminale" - --#: ../plugins/gnomecompat/gnomecompat.xml.in.h:14 -+#: ../plugins/matecompat/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Riga di comando cattura schermata finestra" - -diff -upr compiz-0.8.8-orig/po/ja.po compiz-0.8.8/po/ja.po ---- compiz-0.8.8-orig/po/ja.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ja.po 2012-05-16 12:40:29.000000000 +0200 -@@ -16,55 +16,55 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "デスクトップ" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ウィンドウ管ç†" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 -+#: ../gtk/mate/compiz-window-manager.c:426 - #: ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "ãªã—" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "シェード" - --#: ../gtk/gnome/compiz-window-manager.c:428 -+#: ../gtk/mate/compiz-window-manager.c:428 - #: ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "最大化" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "水平方å‘ã«æœ€å¤§åŒ–" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "åž‚ç›´æ–¹å‘ã«æœ€å¤§åŒ–" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "最å°åŒ–" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "最å‰é¢ã¸" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "最後é¢ã¸" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -79,36 +79,36 @@ msgid "Blur type" - msgstr "ブラーã®ç¨®é¡ž" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity テーマã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã®ä¸é€æ˜Žåº¦" -+msgid "Marco theme active window opacity" -+msgstr "Marco テーマã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã®ä¸é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity テーマã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã®åŠé€æ˜Žã‚·ã‚§ãƒ¼ãƒ‰" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco テーマã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã®åŠé€æ˜Žã‚·ã‚§ãƒ¼ãƒ‰" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity テーマã®ä¸é€æ˜Žåº¦" -+msgid "Marco theme opacity" -+msgstr "Marco テーマã®ä¸é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity テーマã®åŠé€æ˜Žã‚·ã‚§ãƒ¼ãƒ‰" -+msgid "Marco theme opacity shade" -+msgstr "Marco テーマã®åŠé€æ˜Žã‚·ã‚§ãƒ¼ãƒ‰" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Metacity テーマ装飾ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã«ä½¿ç”¨ã™ã‚‹ä¸é€æ˜Žåº¦" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Marco テーマ装飾ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウã«ä½¿ç”¨ã™ã‚‹ä¸é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Metacity テーマ装飾ã«ä½¿ç”¨ã™ã‚‹ä¸é€æ˜Žåº¦" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Marco テーマ装飾ã«ä½¿ç”¨ã™ã‚‹ä¸é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 --msgid "Shade active windows with metacity theme decorations from opaque to translucent" --msgstr "Metacity テーマ装飾ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウをä¸é€æ˜Žã‹ã‚‰é€æ˜Žã«ã‚·ã‚§ãƒ¼ãƒ‰ã•ã›ã‚‹" -+msgid "Shade active windows with marco theme decorations from opaque to translucent" -+msgstr "Marco テーマ装飾ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–・ウィンドウをä¸é€æ˜Žã‹ã‚‰é€æ˜Žã«ã‚·ã‚§ãƒ¼ãƒ‰ã•ã›ã‚‹" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 --msgid "Shade windows with metacity theme decorations from opaque to translucent" --msgstr "Metacity テーマ装飾ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’ä¸é€æ˜Žã‹ã‚‰é€æ˜Žã«ã‚·ã‚§ãƒ¼ãƒ‰ã•ã›ã‚‹" -+msgid "Shade windows with marco theme decorations from opaque to translucent" -+msgstr "Marco テーマ装飾ã®ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ã‚’ä¸é€æ˜Žã‹ã‚‰é€æ˜Žã«ã‚·ã‚§ãƒ¼ãƒ‰ã•ã›ã‚‹" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -119,12 +119,12 @@ msgid "Type of blur used for window deco - msgstr "ウィンドウ装飾用ã®ãƒ–ラーã®ç¨®é¡ž" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Metacity テーマを使用" -+msgid "Use marco theme" -+msgstr "Marco テーマを使用" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "ウィンドウ装飾をæç”»ã™ã‚‹éš›ã« Metacity テーマを使用" -+msgid "Use marco theme when drawing window decorations" -+msgstr "ウィンドウ装飾をæç”»ã™ã‚‹éš›ã« Marco テーマを使用" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -639,7 +639,7 @@ msgid "Command line to be executed in sh - msgstr "コマンド 9 を実行 ã®å‘¼ã³å‡ºã—時ã«ã‚·ã‚§ãƒ«ã§å®Ÿè¡Œã•ã‚Œã‚‹ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³" - - #: ../metadata/commands.xml.in.h:63 --#: ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "コマンド" - -@@ -1500,13 +1500,13 @@ msgstr "ユーザ空間ファイルシ゠- msgid "Userspace file system" - msgstr "ユーザ空間ファイルシステム" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf 制御ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf 制御ãƒãƒƒã‚¯ã‚¨ãƒ³ãƒ‰" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1516,55 +1516,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib main loop サãƒãƒ¼ãƒˆ" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome 互æ›æ€§" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate 互æ›æ€§" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "端末を開ã" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Compiz ã« Gnome デスクトップ環境ã¨ã®äº’æ›æ€§ã‚’ä¿ãŸã›ã‚‹ã‚ªãƒ—ション" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Compiz ã« Mate デスクトップ環境ã¨ã®äº’æ›æ€§ã‚’ä¿ãŸã›ã‚‹ã‚ªãƒ—ション" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "アプリケーション実行ダイアログ" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "端末起動コマンド" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "スクリーンショットã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "メインメニューã®è¡¨ç¤º" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "\"アプリケーションã®å®Ÿè¡Œ\"ダイアログã®è¡¨ç¤º" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "メインメニューã®è¡¨ç¤º" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "スクリーンショットを撮る" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ウィンドウã®ã‚¹ã‚¯ãƒªãƒ¼ãƒ³ã‚·ãƒ§ãƒƒãƒˆã‚’撮る" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "端末起動コマンドライン" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ウィンドウ・スクリーンショットã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³" - -diff -upr compiz-0.8.8-orig/po/ka.po compiz-0.8.8/po/ka.po ---- compiz-0.8.8-orig/po/ka.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ka.po 2012-05-16 12:40:30.000000000 +0200 -@@ -16,53 +16,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,38 +77,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -120,11 +120,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -710,7 +710,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1565,12 +1565,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1581,55 +1581,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/km.po compiz-0.8.8/po/km.po ---- compiz-0.8.8-orig/po/km.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/km.po 2012-05-16 12:40:33.000000000 +0200 -@@ -15,61 +15,61 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "ផ្ទៃážáž»" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "កម្មវិធីគ្រប់គ្រងបង្អួច" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "គ្មាន" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "ម៉ាស៊ីន​ស្កáŸáž“" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "បន្ážáž™â€‹áž‘ំហំ​ភាគ​របស់​វ៉ីនដូ​" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "បន្ážáž™â€‹áž‘ំហំ​ភាគ​របស់​វ៉ីនដូ​" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "បន្ážáž™â€‹áž‘ំហំ​ភាគ​របស់​វ៉ីនដូ​" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "បន្ážáž™â€‹áž‘ំហំ​ភាគ​របស់​វ៉ីនដូ​" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "AutoYast" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -87,39 +87,39 @@ msgstr "បាន​ជ្រើស" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "លុប​វ៉ីនដូ​ទាំង​ស្រុង" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "លុប​វ៉ីនដូ​ទាំង​ស្រុង" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -131,11 +131,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -760,7 +760,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "ពាក្យបញ្ជា ៖ " -@@ -1704,12 +1704,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1720,62 +1720,62 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "ážšážáŸ‹â€‹áž€áŸ’នុង​ស្ážáž¶áž“ីយ" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "ការ​ហៅ​ឮ​សម្លáŸáž„" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "មាន​កំហុស ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ញែក​បន្ទាážáŸ‹â€‹áž–ាក្យ​បញ្ជា​។" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "មាន​កំហុស ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ញែក​បន្ទាážáŸ‹â€‹áž–ាក្យ​បញ្ជា​។" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - #, fuzzy - msgid "Show Main Menu" - msgstr "បង្កើážáž˜áŸ‰ážºáž“ុយ​ចាប់ផ្ដើម" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - #, fuzzy - msgid "Show the main menu" - msgstr "បង្កើážáž˜áŸ‰ážºáž“ុយ​ចាប់ផ្ដើម" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "មាន​កំហុស ážážŽáŸˆâ€‹áž–áŸáž›â€‹áž€áŸ†áž–ុង​ញែក​បន្ទាážáŸ‹â€‹áž–ាក្យ​បញ្ជា​។" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/ko.po compiz-0.8.8/po/ko.po ---- compiz-0.8.8-orig/po/ko.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ko.po 2012-05-16 12:40:31.000000000 +0200 -@@ -19,53 +19,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "ë°ìŠ¤í¬íƒ‘" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ì°½ 관리" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "컴피즈" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "ì—†ìŒ" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "ë§ì•„올리기" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "최대화" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "가로로 최대화" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "세로로 최대화" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "최소화" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "올림" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "내림" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -80,38 +80,38 @@ msgid "Blur type" - msgstr "í림 형태" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "í™œì„±í™”ëœ ì°½ì˜ ë©”íƒ€ì‹œí‹° 테마 투명ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "í™œì„±í™”ëœ ì°½ì˜ ë©”íƒ€ì‹œí‹° 테마 ê·¸ë¦¼ìž íˆ¬ëª…ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "메타시티 테마 투명ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "메타시티 테마 ê·¸ë¦¼ìž íˆ¬ëª…ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "메타시티 테마를 가진 í™œì„±í™”ëœ ì°½ì—ì„œ 사용할 투명ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "메타시티 í…Œë§ˆì— ì‚¬ìš©í•  투명ë„" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "메타시티 테마를 사용하는 í™œì„±í™”ëœ ì°½ì˜ ê·¸ë¦¼ìž íˆ¬ëª…ë„를설정합니다." - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "메타시티 테마를 사용하는 ì°½ì˜ ê·¸ë¦¼ìž íˆ¬ëª…ë„를 설정합니다." - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -123,11 +123,11 @@ msgid "Type of blur used for window deco - msgstr "ì°½ 장ì‹ì—ì„œ 사용할 í림 íš¨ê³¼ì˜ í˜•íƒœ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "메타시티 테마를 사용합니다." - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "ì°½ 장ì‹ì„ 그릴 ë•Œ 메타시티 테마를 사용합니다." - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -714,7 +714,7 @@ msgstr "명령 8ì„ ì„ íƒí–ˆì„ ë•Œ 실 - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "명령 9를 ì„ íƒí–ˆì„ ë•Œ ì‹¤í–‰ë  ì‰˜ 명령행" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "명령" - -@@ -1571,13 +1571,13 @@ msgstr "ì‚¬ìš©ìž ê³µê°„ íŒŒì¼ ì‹œìŠ¤í… - msgid "Userspace file system" - msgstr "ì‚¬ìš©ìž ê³µê°„ íŒŒì¼ ì‹œìŠ¤í…œ" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf 컨트롤 백엔드" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf 컨트롤 백엔드" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1587,55 +1587,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib ë©”ì¸ ë£¨í”„ 지ì›" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "그놈 호환성" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "í„°ë¯¸ë„ ì—´ê¸°" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "Compizê°€ 그놈 ë°ìŠ¤í¬íƒ‘ í™˜ê²½ì— í˜¸í™˜ë  ìˆ˜ 있게 하는 옵션" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "프로그램 실행창" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "í„°ë¯¸ë„ ì‹¤í–‰ 명령" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "스í¬ë¦°ìƒ· 명령행" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "주 메뉴 보기" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "프로그램 ì‹¤í–‰ì°½ì„ ë³´ìž„" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "주 메뉴 보기" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "스í¬ë¦°ìƒ· ì°ê¸°" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ì°½ 스í¬ë¦°ìƒ· ì°ê¸°" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "í„°ë¯¸ë„ ëª…ë ¹í–‰" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ì°½ 스í¬ë¦°ìƒ· 명령행" - -diff -upr compiz-0.8.8-orig/po/lo.po compiz-0.8.8/po/lo.po ---- compiz-0.8.8-orig/po/lo.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/lo.po 2012-05-16 12:40:30.000000000 +0200 -@@ -14,53 +14,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=n != 1;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -75,38 +75,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -118,11 +118,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -708,7 +708,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1563,12 +1563,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1579,55 +1579,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/lt.po compiz-0.8.8/po/lt.po ---- compiz-0.8.8-orig/po/lt.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/lt.po 2012-05-16 12:40:33.000000000 +0200 -@@ -19,61 +19,61 @@ msgstr "" - "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" - "100<10 || n%100>=20) ? 1 : 2;\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Darbastaliai" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Window Manager" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nieko" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Skeneris" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "&Suspausti Windows" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "&Suspausti Windows" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "&Suspausti Windows" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "&Suspausti Windows" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "AutomatinÄ—" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -91,39 +91,39 @@ msgstr "Praleistas\n" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "VisiÅ¡kai &iÅ¡trinti Windows" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "VisiÅ¡kai &iÅ¡trinti Windows" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -135,11 +135,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -772,7 +772,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Komanda:" -@@ -1712,12 +1712,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1728,59 +1728,59 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "Paleisti terminale" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "KomandinÄ—s eilutÄ—s nagrinÄ—jimo klaida." - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "KomandinÄ—s eilutÄ—s nagrinÄ—jimo klaida." - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "KomandinÄ—s eilutÄ—s nagrinÄ—jimo klaida." - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/mk.po compiz-0.8.8/po/mk.po ---- compiz-0.8.8-orig/po/mk.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/mk.po 2012-05-16 12:40:30.000000000 +0200 -@@ -15,53 +15,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=3; plural=(n>1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,38 +77,38 @@ msgid "Blur type" - msgstr "ПоÑтави филтер" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -120,11 +120,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -717,7 +717,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1575,12 +1575,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1591,55 +1591,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/mr.po compiz-0.8.8/po/mr.po ---- compiz-0.8.8-orig/po/mr.po 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/po/mr.po 2012-05-16 12:40:31.000000000 +0200 -@@ -15,54 +15,54 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4616 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "सà¥à¤¥à¤¾à¤¨à¤¿à¤• वेळ" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4597 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,38 +77,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -120,11 +120,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4405 -@@ -740,7 +740,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "आजà¥à¤žà¤¾:" -@@ -1625,12 +1625,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1641,57 +1641,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "आजà¥à¤žà¤¾ '%1'" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "आजà¥à¤žà¤¾ '%1'" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/nb.po compiz-0.8.8/po/nb.po ---- compiz-0.8.8-orig/po/nb.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/nb.po 2012-05-16 12:40:31.000000000 +0200 -@@ -18,57 +18,57 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Skrivebord" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "VindushÃ¥ndtering" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ingen" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Skyggelegg" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maksimer" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maksimer vindu horisontalt" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maksimer vindu vertikalt" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimert" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Auto-hev" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -84,42 +84,42 @@ msgid "Blur type" - msgstr "Sløringstype" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Dekkevne for aktive vinduer med Metacity-tema" -+msgid "Marco theme active window opacity" -+msgstr "Dekkevne for aktive vinduer med Marco-tema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Dekkevne for aktive vinduer med Metacity-tema som er rullet opp" -+msgid "Marco theme active window opacity shade" -+msgstr "Dekkevne for aktive vinduer med Marco-tema som er rullet opp" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Dekkevne for Metacity-tema" -+msgid "Marco theme opacity" -+msgstr "Dekkevne for Marco-tema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Dekkevne ved opprulling med Metacity-tema" -+msgid "Marco theme opacity shade" -+msgstr "Dekkevne ved opprulling med Marco-tema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Dekkevne Ã¥ bruke for aktive vinduer med Metacity temadekorasjoner" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Dekkevne Ã¥ bruke for aktive vinduer med Marco temadekorasjoner" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Dekkevne Ã¥ bruke for Metacity temadekorasjoner" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Dekkevne Ã¥ bruke for Marco temadekorasjoner" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Skyggelegg aktive vinuder med Metacity temadekorasjoner fra fulldekkende til " -+"Skyggelegg aktive vinuder med Marco temadekorasjoner fra fulldekkende til " - "gjennomsiktig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Skyggelegg vinduer med Metacity temadekorasjoner fra fulldekkende til " -+"Skyggelegg vinduer med Marco temadekorasjoner fra fulldekkende til " - "gjennomsiktig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -131,12 +131,12 @@ msgid "Type of blur used for window deco - msgstr "Type sløring som brukes for vindusdekorasjoner" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Bruk Metacity-tema" -+msgid "Use marco theme" -+msgstr "Bruk Marco-tema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Bruk Metacity-tema nÃ¥r vindusdekorasjoner tegnes" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Bruk Marco-tema nÃ¥r vindusdekorasjoner tegnes" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -834,7 +834,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Kommandolinje som skal kjøres i konsoll nÃ¥r kjør_kommando9 blir innhentet" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Kommando" -@@ -1714,12 +1714,12 @@ msgstr "Filsystem pÃ¥ brukeromrÃ¥de" - msgid "Userspace file system" - msgstr "Filsystem pÃ¥ brukerens omrÃ¥de" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "Gconf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "Gconf kontrollmotor" - - #: ../metadata/glib.xml.in.h:1 -@@ -1731,56 +1731,56 @@ msgstr "Glib" - msgid "GLib main loop support" - msgstr "Glib støtte for hovedløkke" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Ã…pne en terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Kjør-dialog" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Kommandolinje for terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Kommandolinje for skjermbilde" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Vis hovedmeny" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Vis \"Kjør program\"-dialog" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Vis hovedmenyen" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Ta et skjermbilde" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Ta et skjermbilde av et vindu" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Kommandolinje for terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Kommandolinje for skjermbilde av vindu" - -diff -upr compiz-0.8.8-orig/po/nl.po compiz-0.8.8/po/nl.po ---- compiz-0.8.8-orig/po/nl.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/nl.po 2012-05-16 12:40:32.000000000 +0200 -@@ -24,59 +24,59 @@ msgstr "" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Bureaublad" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Venster Beheer" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Geen" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Schaal" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximaliseer" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximaliseer venster horizontaal" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximaliseer venster verticaal" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Geminimaliseerd" - - # /usr/lib/YaST2/clients/dialup_dev_cfg.ycp:80 --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automatisch naar de voorgrond" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -93,43 +93,43 @@ msgid "Blur type" - msgstr "Vervaging type" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity thema actief venster opaciteit" -+msgid "Marco theme active window opacity" -+msgstr "Marco thema actief venster opaciteit" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity thema actief venster opaciteit schaduw" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco thema actief venster opaciteit schaduw" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity thema opaciteit" -+msgid "Marco theme opacity" -+msgstr "Marco thema opaciteit" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity thema opaciteit schaduw" -+msgid "Marco theme opacity shade" -+msgstr "Marco thema opaciteit schaduw" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Opaciteit te gebruiken voor actieve vensters met metacity thema decoratie" -+"Opaciteit te gebruiken voor actieve vensters met marco thema decoratie" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opaciteit te gebruiken voor metacity thema decoratie" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opaciteit te gebruiken voor marco thema decoratie" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Actieve vensters oprollen met metacity thema decoratie's van ondoorzichtig " -+"Actieve vensters oprollen met marco thema decoratie's van ondoorzichtig " - "tot doorzichtig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Actieve vensters oprollen met metacity thema decoratie's van ondoorzichtig " -+"Actieve vensters oprollen met marco thema decoratie's van ondoorzichtig " - "tot doorzichtig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -141,12 +141,12 @@ msgid "Type of blur used for window deco - msgstr "Type vervaging gebruikt voor venster decoratie" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Gebruik metacity thema" -+msgid "Use marco theme" -+msgstr "Gebruik marco thema" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Gebruik metacity thema voor venster decoratie" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Gebruik marco thema voor venster decoratie" - - # /usr/lib/YaST2/clients/lan_inetd_custom.ycp:770 - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -855,7 +855,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Command regel die uitgevoerd moet worden als start_command9 aangeroepen wordt" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Opdracht" -@@ -1756,12 +1756,12 @@ msgstr "Gebruikers bestandssyteem" - msgid "Userspace file system" - msgstr "Gebruikers bestandssysteem" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "Gconf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "Gconf gecontrolleerde backend" - - #: ../metadata/glib.xml.in.h:1 -@@ -1772,57 +1772,57 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib main loop ondersteuning" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Een terminal openen" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - - # /usr/lib/YaST2/clients/dialup_dev_cfg.ycp:336 --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Uitvoeren dialoog" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Terminal commando regel" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Schermafdruk commodo regel" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Toon Hoofdmenu" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Toon start applicatie dialoog venster" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Toon hoofdmenu" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Maak een schermafdruk" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Maak een schermafdruk van een venster" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Terminal commando regel" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Venster schermafdruk commando" - -diff -upr compiz-0.8.8-orig/po/or.po compiz-0.8.8/po/or.po ---- compiz-0.8.8-orig/po/or.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/or.po 2012-05-16 12:40:32.000000000 +0200 -@@ -17,58 +17,58 @@ msgstr "" - "X-Poedit-Language: Oriya\n" - "X-Poedit-Country: India\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "ଡେସà­à¬•à¬Ÿà¬ª" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ଉଇଣà­à¬¡à­‹ ପà­à¬°à¬¬à¬¨à­à¬§à¬¨" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "କମà­à¬ªà¬¿à¬œ" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "କିଛିନାହିà¬" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "ମାପକ" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "ସରà­à¬¬à¬¾à¬§à¬¿à¬• କର" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "ଉଇଣà­à¬¡à­‹à¬•à­ ଦିଗବଳୀଯଭାବରେ ସରà­à¬¬à¬¾à¬§à¬¿à¬• କର" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "ଦଣà­à¬¡à¬°à­à¬ªà¬°à­‡ ଉଇଣà­à¬¡à­‹à¬•à­ ସରà­à¬¬à¬¾à¬§à¬¿à¬• କର" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "ନà­à¬¯à­à¬¨à¬¤à¬®à¬¹à­‹à¬‡à¬¥à¬¿à¬¬à¬¾" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "ସà­à¬¬à¬¤à¬ƒ-ଉତà­à¬¥à¬¾à¬¨" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -83,38 +83,38 @@ msgid "Blur type" - msgstr "ଅସà­à¬ªà¬·à­à¬Ÿ ପà­à¬°à¬•à¬¾à¬°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "ମେଟାସିଟି ଥିମ ସକà­à¬°à¬¿à¬¯ ଉଇଣà­à¬¡à­‹ ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "ମେଟାସିଟି ଥିମ ସକà­à¬°à¬¿à¬¯ ଉଇଣà­à¬¡à­‹ ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾ ଛାଯା" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "ମେଟାସିଟି ଥିମ ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "ମେଟାସିଟି ଥିମ ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾ ଛାଯା" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "ମେଟାସିଟି ଥିମ ଅଳଂକରଣଗà­à¬¡à¬¿à¬• ସହିତ ସକà­à¬°à¬¿à¬¯ ଉଇଣà­à¬¡à­‹ ପାଇଠଉପୟୋଗ କରାୟିବାକୠଥିବା ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "ମେଟାସିଟି ଥିମ ଅଳଂକରଣଗà­à¬¡à¬¿à¬• ପାଇଠଉପୟୋଗ କରାୟିବାକୠଥିବା ଅସà­à¬¬à¬šà­à¬›à¬¤à¬¾" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "ମେଟାସିଟି ଥିମ ଅଳଙà­à¬•à¬°à¬£à¬—à­à¬¡à¬¿à¬• ସହିତ ଛାଯା ସକà­à¬°à¬¿à¬¯ ଉଇଣà­à¬¡à­‹ ଅସà­à¬¬à¬šà­à¬›à¬°à­ ସà­à¬¬à¬šà­à¬› ପରà­à­Ÿà­à¬¯à¬¨à­à¬¤ " - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "ମେଟାସିଟି ଥିମ ଅଳଙà­à¬•à¬°à¬£à¬—à­à¬¡à¬¿à¬• ସହିତ ଛାଯା, ସକà­à¬°à¬¿à¬¯ ଉଇଣà­à¬¡à­‹ ଅସà­à¬¬à¬šà­à¬›à¬°à­ ସà­à¬¬à¬šà­à¬› ପରà­à­Ÿà­à¬¯à¬¨à­à¬¤ " - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -126,11 +126,11 @@ msgid "Type of blur used for window deco - msgstr "ଉଇଣà­à¬¡à­‹ ଅଳଙà­à¬•à¬°à¬£à¬—à­à¬¡à¬¿à¬• ପାଇଠଉପୟୋଗ ହୋଉଥିବା ଅସà­à¬ªà¬·à­à¬Ÿà¬¤à¬¾à¬° ପà­à¬°à¬•à¬¾à¬°" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "ମେଟାସିଟି ଥିମ ଉପୟୋଗକର" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "ଉଇଣà­à¬¡à­‹ ଅଳଙà­à¬•à¬°à¬£à¬—à­à¬¡à¬¿à¬•à­ ଅଂକନ କରିବା ବେଳେ ମେଟାସିଟି ଥିମ ଉପୟୋଗ କର" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -777,7 +777,7 @@ msgstr "ସେଲରେ କାରà­à­Ÿà - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "ସେଲରେ କାରà­à­Ÿà­à¬¯à¬•à¬¾à¬°à­€ ହେବାକୠଥିବା ଆଦେଶ ରେଖା ୟେବେ ଚଳାଅ_ଆଦେଶ୯ ଡକାୟାଇଥାଠ" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "ଆଦେଶ" -@@ -1647,12 +1647,12 @@ msgstr "ଉପୟୋଗକରà­à¬¤à­à¬ - msgid "Userspace file system" - msgstr "ଉପୟୋଗକରà­à¬¤à­à¬¤à¬¾à¬…ନà­à¬¤à¬° ଫାଇଲ ସିଷà­à¬Ÿà¬®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "Gକନà­à¬«" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "ଜିକନà­à¬« ନିଯନà­à¬¤à­à¬°à¬£ ବà­à¬¯à¬¾à¬•à¬à¬£à­à¬¡" - - #: ../metadata/glib.xml.in.h:1 -@@ -1663,56 +1663,56 @@ msgstr "ଜିଲିବà­" - msgid "GLib main loop support" - msgstr "ଜିଲିବୠମୂଖà­à¬¯ ଲà­à¬ª ସମରà­à¬¥à¬¨" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "ଗୋଟିଠଟରà­à¬®à¬¿à¬¨à¬¾à¬² ଖୋଲ" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "ଚଳାଅ ଡାà¬à¬²à¬—" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "ଟରà­à¬®à¬¿à¬¨à¬¾à¬² ଆଦେଶ ରେଖା" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "ସà­à¬•à­à¬°à¬¿à¬¨à¬¸à¬Ÿ ଆଦେଶ ରେଖା" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "ମୂଖà­à¬¯ ମେନୠଦେଖାଅ" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "ଚାଳାଅ ପà­à¬°à¬¯à­‹à¬— ଡାà¬à¬²à¬—କୠଦେଖାଅ" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "ମୂଖà­à¬¯ ମେନà­à¬•à­ ଦେଖାଅ" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "ଗୋଟିଠସà­à¬•à­à¬°à¬¿à¬¨à¬¸à¬Ÿ ନିଅ" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ଗୋଟିଠଉଇଣà­à¬¡à­‹à¬° ସà­à¬•à­à¬°à¬¿à¬¨à¬¸à¬Ÿ ନିଅ" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "ଟରà­à¬®à¬¿à¬¨à¬¾à¬² ଆଦେଶ ରେଖା" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ଉଇଣà­à¬¡à­‹ ସà­à¬•à­à¬°à¬¿à¬¨à¬¸à¬Ÿ ଆଦେଶ ରେଖା" - -diff -upr compiz-0.8.8-orig/po/pa.po compiz-0.8.8/po/pa.po ---- compiz-0.8.8-orig/po/pa.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/pa.po 2012-05-16 12:40:33.000000000 +0200 -@@ -19,61 +19,61 @@ msgstr "" - "Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: KAider 0.1\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "ਵੇਹੜਾ" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "à¨à¨°à©‹à¨–ਾ ਪਰਬੰਧਕ" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "ਕੰਮਪਿਜ਼" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "ਕੋਈ ਨਹੀਂ" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "ਸੰਭਾਲੋ" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "Window&s ਸਮੇਟੋ" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Window&s ਸਮੇਟੋ" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Window&s ਸਮੇਟੋ" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Window&s ਸਮੇਟੋ" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "ਸਵੈ-ਚਾਲਤ" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -91,39 +91,39 @@ msgstr "ਚà©à¨£à©‡" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "Win&dows ਭਾਗ ਹਟਾਓ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "Win&dows ਭਾਗ ਹਟਾਓ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "ਮੇਟਾਸਿਟੀ ਥੀਮ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "ਮੇਟਾਸਿਟੀ ਥੀਮ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨ ਸ਼ੇਡ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "à¨à¨•à¨Ÿà¨¿à¨µ ਵਿੰਡੋ ਲਈ ਮੇਟਾਸਿਟੀ ਥੀਮ ਸਜਾਵਟ ਨਾਲ ਵਰਤਣ ਲਈ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "ਮੇਟਾਸਿਟੀ ਥੀਮ ਸਜਾਵਟ ਲਈ ਵਰਤਣ ਵਾਸਤੇ ਧà©à©°à¨¦à¨²à¨¾à¨ªà¨¨" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "ਧà©à©°à¨¦à¨²à©‡à¨ªà¨¨ ਤੋਂ ਪਾਰਦਰਸ਼ ਲਈ ਸ਼ੈਡ à¨à¨•à¨Ÿà¨¿à¨µ ਵਿੰਡੋ ਮੇਟਾਸਿਟੀ ਥੀਮ ਸਜਾਵਟ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "ਧà©à©°à¨¦à¨²à©‡à¨ªà¨¨ ਤੋਂ ਪਾਰਦਰਸ਼ ਲਈ ਵਿੰਡੋ ਸ਼ੈਡੋ ਮੇਟਾਸਿਟੀ ਥੀਮ ਸਜਾਵਟ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -135,11 +135,11 @@ msgid "Type of blur used for window deco - msgstr "ਵਿੰਡੋ ਸਜਾਵਟ ਲਈ ਵਰਤਣ ਲਈ ਬਲਰ ਦੀ ਟਾਈਪ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "ਮੇਟਾਸਿਟੀ ਥੀਮ ਵਰਤੋਂ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "ਵਿੰਡੋ ਸਜਾਵਟ ਡਰਾਇੰਗ ਦੌਰਾਨ ਮੇਟਾਸਿਟੀ ਥੀਮ ਵਰਤੋਂ" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -834,7 +834,7 @@ msgstr "ਜਦੋਂ run_command8 ਹੋ - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "ਜਦੋਂ run_command9 ਹੋਵੇ ਤਾਂ ਸ਼ੈਲ ਵਿੱਚ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "ਕਮਾਂਡ: " -@@ -1778,13 +1778,13 @@ msgstr "ਯੂਜ਼ਰ-ਸਪੇਸ ਫ - msgid "Userspace file system" - msgstr "ਯੂਜ਼ਰ-ਸਪੇਸ ਫਾਇਲ ਸਿਸਟਮ" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf ਕੰਟਰੋਲ ਬੈਕà¨à¨‚ਡ" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf ਕੰਟਰੋਲ ਬੈਕà¨à¨‚ਡ" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1794,61 +1794,61 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib ਮੇਨ ਲੂਪ ਸਹਿਯੋਗ" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "ਇੱਕ ਟਰਮੀਨਲ ਖੋਲà©à¨¹à©‹" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - #, fuzzy - msgid "Run Dialog" - msgstr "ਟੋਨ ਡਾਇਲ(&T)" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "ਕਮਾਂਡ ਲਾਇਨ ਨੂੰ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "ਕਮਾਂਡ ਲਾਇਨ ਨੂੰ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - #, fuzzy - msgid "Show Main Menu" - msgstr "ਬੂਟ ਸੂਚੀ ਵੇਖਾਓ(&S)" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "à¨à¨ªà¨²à©€à¨•à©‡à¨¸à¨¼à¨¨ ਚਲਾਓ ਡਾਈਲਾਗ ਵੇਖੋ" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - #, fuzzy - msgid "Show the main menu" - msgstr "ਬੂਟ ਸੂਚੀ ਵੇਖਾਓ(&S)" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "ਇੱਕ ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ਇੱਕ ਵਿੰਡੋ ਦਾ ਇੱਕ ਸਕਰੀਨ-ਸ਼ਾਟ ਲਵੋ" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "ਕਮਾਂਡ ਲਾਇਨ ਨੂੰ ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ।" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ਵਿੰਡੋ ਸਕਰੀਨ-ਸ਼ਾਟ ਕਮਾਂਡ ਲਾਈਨ" - -diff -upr compiz-0.8.8-orig/po/pl.po compiz-0.8.8/po/pl.po ---- compiz-0.8.8-orig/po/pl.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/pl.po 2012-05-16 12:40:33.000000000 +0200 -@@ -18,53 +18,53 @@ msgstr "" - "|| n%100>=20) ? 1 : 2);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Pulpit" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ZarzÄ…dzanie oknem" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Brak" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "ZwiÅ„" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maksymalizuj" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Maksymalizuj okno w poziomie" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Maksymalizuj okno w pionie" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimalizuj" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "WysuÅ„ " - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Zaniż" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -80,42 +80,42 @@ msgid "Blur type" - msgstr "Typ rozmycia" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Nieprzezroczystość aktywnego okna z motywem Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Nieprzezroczystość aktywnego okna z motywem Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Nieprzezroczystość cienia aktywnego okna z motywem Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Nieprzezroczystość cienia aktywnego okna z motywem Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Nieprzezroczystość motywu Metacity" -+msgid "Marco theme opacity" -+msgstr "Nieprzezroczystość motywu Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "NieprzezroczystoÅ›c cienia motywu Metacity" -+msgid "Marco theme opacity shade" -+msgstr "NieprzezroczystoÅ›c cienia motywu Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Nieprzezroczystość dla aktywnych okien z dekoracjami motywu Metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Nieprzezroczystość dla aktywnych okien z dekoracjami motywu Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Nieprezroczystość dekoracji motywu Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Nieprezroczystość dekoracji motywu Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Cieniuj aktywne okna z motywem Metacity od nieprzezroczystych do " -+"Cieniuj aktywne okna z motywem Marco od nieprzezroczystych do " - "półprzezroczystych" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Cieniuj okna z dekoracjami motywu metacity od nieprzezroczystych do " -+"Cieniuj okna z dekoracjami motywu marco od nieprzezroczystych do " - "przejrzystych" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -127,12 +127,12 @@ msgid "Type of blur used for window deco - msgstr "Typ rozmycia używany dla dekoracji okien" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Używaj motywu Metacity" -+msgid "Use marco theme" -+msgstr "Używaj motywu Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Używaj motywu Metacity podczas rysowania dekoracji okien" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Używaj motywu Marco podczas rysowania dekoracji okien" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -719,7 +719,7 @@ msgstr "Polecenie do wykonania w powÅ‚oc - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Polecenie do wykonania w powÅ‚oce po wywoÅ‚aniu skrótu 9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Polecenia" - -@@ -1601,13 +1601,13 @@ msgstr "System plików użytkownika" - msgid "Userspace file system" - msgstr "System plików użytkownika" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "Gconf" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Wsteczna kontrola GConf" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Wsteczna kontrola MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1617,56 +1617,56 @@ msgstr "Glib" - msgid "GLib main loop support" - msgstr "Wsparcie głównego wÄ™zÅ‚a GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Kompatybilność z Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Kompatybilność z Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Otwiera terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" --"Opcje, które zapewniajÄ… kompatybilność Compiza ze Å›rodowiskiem pulpitu Gnome" -+"Opcje, które zapewniajÄ… kompatybilność Compiza ze Å›rodowiskiem pulpitu Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Dialog Uruchom" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Polecenie terminala" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Polecenie zrzutu ekranu" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "WyÅ›wietl menu główne" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "WyÅ›wietl okno dialogowe \"Uruchom program\"" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "WyÅ›wietl menu główne" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Pobierz zrzut ekranu" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Pobierz zrzut okna" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Polecenie terminala" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Polecenie zrzutu okna" - -diff -upr compiz-0.8.8-orig/po/POTFILES.in compiz-0.8.8/po/POTFILES.in ---- compiz-0.8.8-orig/po/POTFILES.in 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/po/POTFILES.in 2012-05-16 12:40:08.000000000 +0200 -@@ -1,8 +1,8 @@ --gtk/gnome/50-compiz-desktop-key.xml.in --gtk/gnome/50-compiz-key.xml.in --gtk/gnome/compiz.desktop.in --gtk/gnome/compiz-window-manager.c --gtk/gnome/compiz-wm.desktop.in -+gtk/mate/50-compiz-desktop-key.xml.in -+gtk/mate/50-compiz-key.xml.in -+gtk/mate/compiz.desktop.in -+gtk/mate/compiz-window-manager.c -+gtk/mate/compiz-wm.desktop.in - gtk/window-decorator/gwd.schemas.in - gtk/window-decorator/gtk-window-decorator.c - metadata/annotate.xml.in -@@ -15,9 +15,9 @@ metadata/dbus.xml.in - metadata/decoration.xml.in - metadata/fade.xml.in - metadata/fs.xml.in --metadata/gconf.xml.in -+metadata/mateconf.xml.in - metadata/glib.xml.in --metadata/gnomecompat.xml.in -+metadata/matecompat.xml.in - metadata/ini.xml.in - metadata/inotify.xml.in - metadata/kconfig.xml.in -diff -upr compiz-0.8.8-orig/po/pt_BR.po compiz-0.8.8/po/pt_BR.po ---- compiz-0.8.8-orig/po/pt_BR.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/pt_BR.po 2012-05-16 12:40:32.000000000 +0200 -@@ -20,57 +20,57 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Ambiente de trabalho" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Gerenciamento de janelas" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nenhum" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Dimensionar" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximizar" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximizar Janela Horizontalmente" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximizar Janela Verticalmente" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimizado" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Elevação Automática" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -86,42 +86,42 @@ msgid "Blur type" - msgstr "Tipo de desfocagem" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacidade da janela ativa no tema metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacidade da janela ativa no tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Opacidade da sombra da janela ativa no tema metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Opacidade da sombra da janela ativa no tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacidade do tema Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacidade do tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Opacidade da sombra do tema Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Opacidade da sombra do tema Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opacidade a ser usada para janelas ativas com decorações metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opacidade a ser usada para janelas ativas com decorações marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacidade a ser usada para decorações metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacidade a ser usada para decorações marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Sombrear decoração de janelas ativas com temas metacity de opaco para " -+"Sombrear decoração de janelas ativas com temas marco de opaco para " - "transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Sombrear decoração de janelas com temas metacity de opaco para transparente" -+"Sombrear decoração de janelas com temas marco de opaco para transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -132,12 +132,12 @@ msgid "Type of blur used for window deco - msgstr "Tipo de desfocagem usado para as decorações" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Usar tema metacity" -+msgid "Use marco theme" -+msgstr "Usar tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Usar tema metacity ao desenhar as decorações das janelas" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Usar tema marco ao desenhar as decorações das janelas" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -824,7 +824,7 @@ msgstr "Linha de comando a ser executada - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Linha de comando a ser executada quando run_command9 for acionado" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Comando" -@@ -1706,13 +1706,13 @@ msgstr "Sistema de arquivos Userspace" - msgid "Userspace file system" - msgstr "Sistema de arquivos userspace" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Programa interno de controle do GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Programa interno de controle do MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1722,56 +1722,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Suporte ao loop principal do GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Abrir um terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Caixa de Diálogo Executar" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Linha de comando do terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Capturar tela a partir da linha de comando" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Mostrar Menu Principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Mostrar caixa de diálogo Executar Aplicativo" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Mostrar o menu principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Efetuar uma captura de tela" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Efetuar captura de tela de uma janela" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Linha de comando do terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Linha de comando para captura de tela de janelas" - -diff -upr compiz-0.8.8-orig/po/pt.po compiz-0.8.8/po/pt.po ---- compiz-0.8.8-orig/po/pt.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/pt.po 2012-05-16 12:40:31.000000000 +0200 -@@ -18,53 +18,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Ambiente de trabalho" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Gestão de Janelas" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nenhum" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Encolher" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximizar" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Maximizar Horizontalmente" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Maximizar Verticalmente" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Minimizar" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Elevar" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "Baixar" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -79,42 +79,42 @@ msgid "Blur type" - msgstr "Tipo de desfocagem" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacidade da janela activa no tema metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacidade da janela activa no tema marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Opacidade da sombra da janela activa no tema do metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Opacidade da sombra da janela activa no tema do marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacidade do tema do metacity" -+msgid "Marco theme opacity" -+msgstr "Opacidade do tema do marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Opacidade da sombra do tema do metacity" -+msgid "Marco theme opacity shade" -+msgstr "Opacidade da sombra do tema do marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opacidade a usar para janelas activas com decorações metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opacidade a usar para janelas activas com decorações marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacidade a usar para decorações do metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacidade a usar para decorações do marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Sombrear decoração de janelas activas com temas metacity de opaco para " -+"Sombrear decoração de janelas activas com temas marco de opaco para " - "transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Sombrear decoração de janelas com temas metacity de opaco para transparente" -+"Sombrear decoração de janelas com temas marco de opaco para transparente" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -125,12 +125,12 @@ msgid "Type of blur used for window deco - msgstr "Tipo de desfocagem usado para as decorações" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Usar tema do metacity" -+msgid "Use marco theme" -+msgstr "Usar tema do marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Usar tema do metacity ao desenhar as decorações das janelas" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Usar tema do marco ao desenhar as decorações das janelas" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -805,7 +805,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Linha de comando a ser executada no shell quando run_command9 for acionado" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Comandos" - -@@ -1678,13 +1678,13 @@ msgstr "Sistema de Ficheiros Userspace" - msgid "Userspace file system" - msgstr "Sistema de ficheiros userspace" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Backend de controlo do GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Backend de controlo do MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1694,55 +1694,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Suprte ao loop principal do GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Compatibilidade Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Compatibilidade Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Abrir um terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Opções que mantêm o Compiz compatível com o ambiente de trabalho Gnome" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Opções que mantêm o Compiz compatível com o ambiente de trabalho Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Caixa de Diálogo Executar" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "Executar comando de terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Linha de comando para capturar ecrã" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Mostrar Menu Principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Mostrar caixa de diálogo Executar Aplicativo" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Mostrar o menu principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Efetuar uma captura de tela" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Efetuar captura de tela de uma janela" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Linha de comando do terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Linha de comando para captura de tela de janelas" - -diff -upr compiz-0.8.8-orig/po/ro.po compiz-0.8.8/po/ro.po ---- compiz-0.8.8-orig/po/ro.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ro.po 2012-05-16 12:40:32.000000000 +0200 -@@ -16,59 +16,59 @@ msgstr "" - "20)) ? 1 : 2);;\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Birou" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Gestiune ferestre" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nimic" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "UmbreÈ™te" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "Tipul providerului" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximizează fereastra orizontal" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximizează fereastra vertical" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Tipul providerului" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Autoridicare" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - #, fuzzy - msgid "Lower" - msgstr "Joasă" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -85,44 +85,44 @@ msgid "Blur type" - msgstr "Tip estompare" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Opacitatea ferestrei active în tematica Metacity" -+msgid "Marco theme active window opacity" -+msgstr "Opacitatea ferestrei active în tematica Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Umbrirea opacității ferestrei active în tematica Metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Umbrirea opacității ferestrei active în tematica Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Opacitate în tematica Metacity" -+msgid "Marco theme opacity" -+msgstr "Opacitate în tematica Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Umbrirea opacității în tematica Metacity" -+msgid "Marco theme opacity shade" -+msgstr "Umbrirea opacității în tematica Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - "Opacitatea de utilizat pentru ferestrele active cu decoraÈ›iile tematicii " --"Metacity" -+"Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacitatea de utilizat pentru decoraÈ›iile tematicii Metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacitatea de utilizat pentru decoraÈ›iile tematicii Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"UmbreÈ™te ferestrele active cu decoraÈ›iile tematicii Metacity de la opac la " -+"UmbreÈ™te ferestrele active cu decoraÈ›iile tematicii Marco de la opac la " - "străveziu" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"UmbreÈ™te ferestrele cu decoraÈ›iile tematicii Metacity de la opac la străveziu" -+"UmbreÈ™te ferestrele cu decoraÈ›iile tematicii Marco de la opac la străveziu" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -133,12 +133,12 @@ msgid "Type of blur used for window deco - msgstr "Tip de estompare utilizată pentru decorare ferestre" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Utilizare tematică Metacity" -+msgid "Use marco theme" -+msgstr "Utilizare tematică Marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Utilizare tematică Metacity la desenarea decoraÈ›iilor ferestrelor" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Utilizare tematică Marco la desenarea decoraÈ›iilor ferestrelor" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -839,7 +839,7 @@ msgid "Command line to be executed in sh - msgstr "" - "Linia de comandă de executat în consolă cînd este invocată „rulează_comandă9â€" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Comandă" -@@ -1725,13 +1725,13 @@ msgstr "Sistem de fiÈ™iere în spaÈ›iul - msgid "Userspace file system" - msgstr "Sistem de fiÈ™iere în spaÈ›iul utilizatorului (fuse)" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Suport control GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Suport control MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1741,56 +1741,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Suport buclă principală GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Deschide o consolă" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Dialog ececuÈ›ie" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Linie de comandă în terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Linie de comandă pentru captură de ecran" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "AfiÈ™are meniu principal" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "AfiÈ™are dialog de lansare aplicaÈ›ie" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "AfiÈ™ează meniul principal" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Fă o captură de ecran" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Face captura unei ferestre" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Linie de comandă în terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Linie de comandă pentru captură fereastră" - -diff -upr compiz-0.8.8-orig/po/ru.po compiz-0.8.8/po/ru.po ---- compiz-0.8.8-orig/po/ru.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ru.po 2012-05-16 12:40:31.000000000 +0200 -@@ -22,53 +22,53 @@ msgstr "" - "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Рабочий Ñтол" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Управление Окнами" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ðикакой" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Свернуть в заголовок" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Развернуть" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Развернуть в ширину" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Развернуть в выÑоту" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Свернуть" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Развернуть" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "ОпуÑтить" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -85,42 +85,42 @@ msgid "Blur type" - msgstr "Тип размытиÑ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "ПрозрачноÑÑ‚ÑŒ активного окна темы metacity" -+msgid "Marco theme active window opacity" -+msgstr "ПрозрачноÑÑ‚ÑŒ активного окна темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Затенение прозрачноÑти активного окна темы metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Затенение прозрачноÑти активного окна темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "ПрозрачноÑÑ‚ÑŒ темы metacity" -+msgid "Marco theme opacity" -+msgstr "ПрозрачноÑÑ‚ÑŒ темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Затенение прозрачноÑти темы metacity" -+msgid "Marco theme opacity shade" -+msgstr "Затенение прозрачноÑти темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "ПрозрачноÑÑ‚ÑŒ активных окон Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "ПрозрачноÑÑ‚ÑŒ активных окон Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "ПрозрачноÑÑ‚ÑŒ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ÐºÐ¾Ð½ темы metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "ПрозрачноÑÑ‚ÑŒ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾ÐºÐ¾Ð½ темы marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"ЗатенÑÑ‚ÑŒ активные окна Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы Ð´Ð»Ñ metacity от непрозрачного до " -+"ЗатенÑÑ‚ÑŒ активные окна Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы Ð´Ð»Ñ marco от непрозрачного до " - "полупрозрачного" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"ЗатенÑÑ‚ÑŒ окна Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы Ð´Ð»Ñ metacity от непрозрачного до " -+"ЗатенÑÑ‚ÑŒ окна Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸ÐµÐ¼ темы Ð´Ð»Ñ marco от непрозрачного до " - "полупрозрачного" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -132,12 +132,12 @@ msgid "Type of blur used for window deco - msgstr "Тип размытиÑ, иÑпользуемый Ð´Ð»Ñ Ð¾Ñ„Ð¾Ñ€Ð¼Ð»ÐµÐ½Ð¸Ð¹ окна" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "ИÑпользовать тему metacity" -+msgid "Use marco theme" -+msgstr "ИÑпользовать тему marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "ИÑпользовать тему metacity при отриÑовке декораций окон" -+msgid "Use marco theme when drawing window decorations" -+msgstr "ИÑпользовать тему marco при отриÑовке декораций окон" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -815,7 +815,7 @@ msgid "Command line to be executed in sh - msgstr "" - "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±ÑƒÐ´ÐµÑ‚ выполнена в оболочке при вызове run_command9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Команды" - -@@ -1710,13 +1710,13 @@ msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема - msgid "Userspace file system" - msgstr "Ð¤Ð°Ð¹Ð»Ð¾Ð²Ð°Ñ ÑиÑтема в пользовательÑком проÑтранÑтве (fuse)" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Управление GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Управление MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1726,56 +1726,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Поддержка оÑновного цикла GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "СовмеÑтимоÑÑ‚ÑŒ Ñ Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "СовмеÑтимоÑÑ‚ÑŒ Ñ Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Открыть в терминале" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" --"Опции, поддерживающие ÑовмеÑтимоÑÑ‚ÑŒ Compiz Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸ÐµÐ¼ рабочего Ñтола Gnome" -+"Опции, поддерживающие ÑовмеÑтимоÑÑ‚ÑŒ Compiz Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸ÐµÐ¼ рабочего Ñтола Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Диалоговое окно запуÑка" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "ЗапуÑтить команду в терминале" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока Ñнимка Ñкрана" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Отобразить главное меню" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Отображение диалогового окна запуÑка приложениÑ" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Отображение главного меню" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Сделать Ñнимок Ñкрана" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Сделать Ñнимок окна" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока терминала" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "ÐšÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока Ñнимка окна" - -diff -upr compiz-0.8.8-orig/po/sk.po compiz-0.8.8/po/sk.po ---- compiz-0.8.8-orig/po/sk.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/sk.po 2012-05-16 12:40:32.000000000 +0200 -@@ -16,58 +16,58 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Pracovná plocha" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Správa okien" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Žiadna" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Tieň" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "MaximalizovaÅ¥" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "MaximalizovaÅ¥ okno vodorovne" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "MaximalizovaÅ¥ okno zvisle" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimalizované" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automaticky do popredia" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - #, fuzzy - msgid "Lower" - msgstr "Nízke" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -82,42 +82,42 @@ msgid "Blur type" - msgstr "Typ rozostrenia" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "PriehľadnosÅ¥ aktívneho okna témy metacity" -+msgid "Marco theme active window opacity" -+msgstr "PriehľadnosÅ¥ aktívneho okna témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Tieň aktívneho okna témy metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Tieň aktívneho okna témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "PriehľadnosÅ¥ témy metacity" -+msgid "Marco theme opacity" -+msgstr "PriehľadnosÅ¥ témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Tieň témy metacity" -+msgid "Marco theme opacity shade" -+msgstr "Tieň témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "PriehľadnosÅ¥ pre aktívne okná s dekoráciami témy metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "PriehľadnosÅ¥ pre aktívne okná s dekoráciami témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "PriehľadnosÅ¥ s dekoráciami témy metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "PriehľadnosÅ¥ s dekoráciami témy marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"VytieňovaÅ¥ aktívne okná s dekoráciou témy metacity z nepriehľadnej do " -+"VytieňovaÅ¥ aktívne okná s dekoráciou témy marco z nepriehľadnej do " - "priehľadnej." - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"VytieňovaÅ¥ okná s dekoráciou témy metacity z nepriehľadnej do priehľadnej." -+"VytieňovaÅ¥ okná s dekoráciou témy marco z nepriehľadnej do priehľadnej." - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -128,12 +128,12 @@ msgid "Type of blur used for window deco - msgstr "Typ rozostrenia použitej na dekoráciu okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "PoužiÅ¥ tému metacity" -+msgid "Use marco theme" -+msgstr "PoužiÅ¥ tému marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "PoužiÅ¥ tému metacity pri vykresľovaní dekorácií okna" -+msgid "Use marco theme when drawing window decorations" -+msgstr "PoužiÅ¥ tému marco pri vykresľovaní dekorácií okna" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -745,7 +745,7 @@ msgstr "Príkaz, ktorý sa vykoná, ak s - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Príkaz, ktorý sa vykoná, ak sa v shelli volá run_command9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Príkaz" -@@ -1635,13 +1635,13 @@ msgstr "Používateľský súborový sys - msgid "Userspace file system" - msgstr "Používateľský súborový systém" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "Backend pre riadenie GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "Backend pre riadenie MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1651,56 +1651,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Podpora hlavného napojenia na GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "OtvoriÅ¥ terminál" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "SpustiÅ¥ Dialóg" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Príkaz pre terminál" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Príkaz pre snímanie obrazovky" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "ZobraziÅ¥ Hlavnú ponuku" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "ZobraziÅ¥ dialóg spustenia aplikácie" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "ZobraziÅ¥ hlavné menu" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "ZosnímaÅ¥ obrazovku" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "ZosnímaÅ¥ okno" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Príkaz pre terminál" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Príkazový na zosnímania okna" - -diff -upr compiz-0.8.8-orig/po/sl.po compiz-0.8.8/po/sl.po ---- compiz-0.8.8-orig/po/sl.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/sl.po 2012-05-16 12:40:33.000000000 +0200 -@@ -19,60 +19,60 @@ msgstr "" - "%100==4 ? 2 : 3);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Namizje" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Upravljalnik oken" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "brez izbire" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "ZasenÄi" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "&SkrÄite Windows" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "&SkrÄite Windows" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "&SkrÄite Windows" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "&SkrÄite Windows" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Samodejno" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -89,40 +89,40 @@ msgstr "Izbran(i)" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" --msgstr "Metacity tema motnost aktivnega okna" -+msgid "Marco theme active window opacity" -+msgstr "Marco tema motnost aktivnega okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" --msgstr "Metacity tema motnost sence aktivnega okna" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco tema motnost sence aktivnega okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity tema motnost" -+msgid "Marco theme opacity" -+msgstr "Marco tema motnost" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity tema motnost senca" -+msgid "Marco theme opacity shade" -+msgstr "Marco tema motnost senca" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Motnost za aktivna okna z metacity temo dekoracij" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Motnost za aktivna okna z marco temo dekoracij" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Motnost za metacity temo dekoracij" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Motnost za marco temo dekoracij" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" --msgstr "ZasenÄi aktivna okna z metacity temo dekoracij od motne do prozorne" -+msgstr "ZasenÄi aktivna okna z marco temo dekoracij od motne do prozorne" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" --msgstr "ZasenÄi okna z metacity temo dekoracij od motne do prozorne" -+"Shade windows with marco theme decorations from opaque to translucent" -+msgstr "ZasenÄi okna z marco temo dekoracij od motne do prozorne" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -133,12 +133,12 @@ msgid "Type of blur used for window deco - msgstr "Tip neaktivnosti uporabljen za dekoracije okna" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Uporabi metacity temo" -+msgid "Use marco theme" -+msgstr "Uporabi marco temo" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Uporabi metacity temo ko riÅ¡eÅ¡ dekoracije okna" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Uporabi marco temo ko riÅ¡eÅ¡ dekoracije okna" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -750,7 +750,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Ukaz: " -@@ -1705,12 +1705,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1721,59 +1721,59 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - #, fuzzy - msgid "Open a terminal" - msgstr "Zaženi v terminalu" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Napaka pri razÄlenitvi ukazne vrstice." - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "Napaka pri razÄlenitvi ukazne vrstice." - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Napaka pri razÄlenitvi ukazne vrstice." - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/sr.po compiz-0.8.8/po/sr.po ---- compiz-0.8.8-orig/po/sr.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/sr.po 2012-05-16 12:40:33.000000000 +0200 -@@ -21,27 +21,27 @@ msgstr "" - - # Headline for X11 configuration screen: - # The user selects screen resolution and color depth. --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - #, fuzzy - msgid "Desktop" - msgstr "Setovanja Desktop-a" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - #, fuzzy - msgid "Window Management" - msgstr "Window Manager" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Nema" - - # label of an output field --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" -@@ -49,44 +49,44 @@ msgstr "Senka" - - # button text - # button text --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - #, fuzzy - msgid "Maximize" - msgstr "&Smanji Windowse" - - # button text - # button text --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "&Smanji Windowse" - - # button text - # button text --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "&Smanji Windowse" - - # button text - # button text --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "&Smanji Windowse" - - # ComboBox item - # Combobox item --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automatski" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - #, fuzzy -@@ -105,40 +105,40 @@ msgstr "Vrsta zamućivanja" - # Radio button for using an entire (Windows) partition for Linux - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "&ObriÅ¡i Windows kompletno" - - # Radio button for using an entire (Windows) partition for Linux - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "&ObriÅ¡i Windows kompletno" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -150,11 +150,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - # button text -@@ -798,7 +798,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Komanda :" -@@ -1812,12 +1812,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1828,58 +1828,58 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "GreÅ¡ka, niste uneli ispravno komandu." - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - #, fuzzy - msgid "Screenshot command line" - msgstr "GreÅ¡ka, niste uneli ispravno komandu." - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "GreÅ¡ka, niste uneli ispravno komandu." - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/sv.po compiz-0.8.8/po/sv.po ---- compiz-0.8.8-orig/po/sv.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/sv.po 2012-05-16 12:40:32.000000000 +0200 -@@ -19,58 +19,58 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.0.2\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Skrivbord" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Fönsterhantering" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Ingen" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - #, fuzzy - msgid "Shade" - msgstr "Skala" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Maximera" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Maximera fönster horisontellt" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Maximera fönster vertikalt" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Minimerat" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Automatisk höjning" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -87,43 +87,43 @@ msgstr "Suddighets typ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 - #, fuzzy --msgid "Metacity theme active window opacity" --msgstr "Metacitys aktiva tema opacitet" -+msgid "Marco theme active window opacity" -+msgstr "Marcos aktiva tema opacitet" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 - #, fuzzy --msgid "Metacity theme active window opacity shade" --msgstr "Metacitys aktiva tema opacitets skugga" -+msgid "Marco theme active window opacity shade" -+msgstr "Marcos aktiva tema opacitets skugga" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity tema opacitet" -+msgid "Marco theme opacity" -+msgstr "Marco tema opacitet" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity tema opacitet skugga" -+msgid "Marco theme opacity shade" -+msgstr "Marco tema opacitet skugga" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "Opacitet pÃ¥ aktiva fönster med metacity tema dekorationer" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "Opacitet pÃ¥ aktiva fönster med marco tema dekorationer" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Opacitet pÃ¥ metacity tema dekorationer" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Opacitet pÃ¥ marco tema dekorationer" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Skugga aktiva fönster med metacity tema dekorationer frÃ¥n opact " -+"Skugga aktiva fönster med marco tema dekorationer frÃ¥n opact " - "tillgenomskinlig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Skugga fönster med metacity tema dekorationer frÃ¥n opact till genomskinlig" -+"Skugga fönster med marco tema dekorationer frÃ¥n opact till genomskinlig" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - #, fuzzy -@@ -135,13 +135,13 @@ msgid "Type of blur used for window deco - msgstr "Typ av suddighet att använda för fönster dekorationer" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Använd metacity tema" -+msgid "Use marco theme" -+msgstr "Använd marco tema" - - # De syftar nog pÃ¥ fönsterramarna. - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Använd metacity tema vid ritande av fönsterramar" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Använd marco tema vid ritande av fönsterramar" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -834,7 +834,7 @@ msgstr "Kommandorad som ska köras i ett - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Kommandorad som ska köras i ett skal när run_command9 anropas" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Kommando" -@@ -1722,14 +1722,14 @@ msgstr "Användarutrymmes filsystem" - msgid "Userspace file system" - msgstr "Användarutrymmes filsystem" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" - --#: ../metadata/gconf.xml.in.h:2 -+#: ../metadata/mateconf.xml.in.h:2 - #, fuzzy --msgid "GConf Control Backend" --msgstr "GConf kontrollbackend" -+msgid "MateConf Control Backend" -+msgstr "MateConf kontrollbackend" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1740,56 +1740,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib huvudloop stöd" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Öppna en terminal" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Kördialog" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Kommandorad för terminal" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Kommandorad för skärmbild" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Visa huvudmeny" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Visa dialogen Kör program" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Visa huvudmenyn" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Ta en skärmbild" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Ta en skärmbild av ett fönster" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Kommandorad för terminal" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Kommandorad för fönsterskärmbild" - -diff -upr compiz-0.8.8-orig/po/ta.po compiz-0.8.8/po/ta.po ---- compiz-0.8.8-orig/po/ta.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/ta.po 2012-05-16 12:40:30.000000000 +0200 -@@ -16,53 +16,53 @@ msgstr "" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "நிழலாகà¯à®•à¯" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "பெரிதாகà¯à®•à¯" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "சிறிதாகà¯à®•à¯" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "உயரà¯à®¤à¯à®¤à¯" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,38 +77,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -120,11 +120,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -729,7 +729,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1586,12 +1586,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1602,55 +1602,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/tr.po compiz-0.8.8/po/tr.po ---- compiz-0.8.8-orig/po/tr.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/tr.po 2012-05-16 12:40:32.000000000 +0200 -@@ -24,65 +24,65 @@ msgstr "" - "X-Generator: Pootle 1.1.0\n" - - # clients/inst_sw_single.ycp:146 --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "Masaüstü" - - # clients/inst_sw_single.ycp:188 --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "Pencere Yönetimi" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "Hiçbiri" - - # menuentries/menuentry_scanner.ycp:36 --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Gölgelendir" - - # clients/inst_target_part.ycp:387 --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Büyüt" - - # clients/inst_target_part.ycp:387 --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - #, fuzzy - msgid "Maximize Horizontally" - msgstr "Pencereyi Yatay Olarak Büyüt" - - # clients/inst_target_part.ycp:387 --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - #, fuzzy - msgid "Maximize Vertically" - msgstr "Pencereyi Dikey Olarak Büyüt" - - # clients/inst_target_part.ycp:387 --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - #, fuzzy - msgid "Minimize" - msgstr "Küçültülmüş" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - #, fuzzy - msgid "Raise" - msgstr "Otomatik-Yükselt" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - #, fuzzy - msgid "Lower" - msgstr "Düşük" - - # clients/inst_sw_single.ycp:188 --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -99,43 +99,43 @@ msgstr "BulanıklaÅŸtırma tipi" - - # include/partitioning/auto_part_ui.ycp:147 - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity teması etkin pencere matlığı" -+msgid "Marco theme active window opacity" -+msgstr "Marco teması etkin pencere matlığı" - - # include/partitioning/auto_part_ui.ycp:147 - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity teması etkin pencere matlık gölgesi" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco teması etkin pencere matlık gölgesi" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity teması matlığı" -+msgid "Marco theme opacity" -+msgstr "Marco teması matlığı" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity teması matlık gölgesi" -+msgid "Marco theme opacity shade" -+msgstr "Marco teması matlık gölgesi" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" --"Etkin pencereler ve Metacity tema dekorasyonları için kullanılacak matlık" -+"Etkin pencereler ve Marco tema dekorasyonları için kullanılacak matlık" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "Metacity dekorasyonları için kullanılacak matlık" -+msgid "Opacity to use for marco theme decorations" -+msgstr "Marco dekorasyonları için kullanılacak matlık" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Etkin pencereleri metacity dekorasyonu ile matlıktan ÅŸeffaflığa doÄŸru gölgele" -+"Etkin pencereleri marco dekorasyonu ile matlıktan ÅŸeffaflığa doÄŸru gölgele" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Pencereleri metacity dekorasyonu ile matlıktan ÅŸeffaflığa doÄŸru gölgele" -+"Pencereleri marco dekorasyonu ile matlıktan ÅŸeffaflığa doÄŸru gölgele" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -146,12 +146,12 @@ msgid "Type of blur used for window deco - msgstr "Pencere dekorasyonları için kullanılacak bulanıklaÅŸtırma tipi" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "Metacity teması kullan" -+msgid "Use marco theme" -+msgstr "Marco teması kullan" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "Pencere dekorasyonlarını oluÅŸtururken metacity temasını kullan" -+msgid "Use marco theme when drawing window decorations" -+msgstr "Pencere dekorasyonlarını oluÅŸtururken marco temasını kullan" - - # clients/inst_target_part.ycp:404 - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -868,7 +868,7 @@ msgid "Command line to be executed in sh - msgstr "Komut9_çalıştır çaÄŸrıldığında kabukta çalıştırılacak komut" - - # clients/support_registration.ycp:66 --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Komut" -@@ -1789,13 +1789,13 @@ msgstr "Kullanıcı Alanı Dosya Sistemi - msgid "Userspace file system" - msgstr "Kullanıcıya ait dosya sistemi" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf Denetim Arka Ucu" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf Denetim Arka Ucu" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1805,56 +1805,56 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib ana döngü desteÄŸi" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Bir konsol aç" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Çalıştırma Penceresi" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Uçbirim komut satırı" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Ekran görüntüsü komut satırı" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "Ana Menüyü Göster" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Uygulama Çalıştırma Penceresini Göster" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Ana menüyü göster" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Ekran görüntüsü al" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Bir pencerenin ekran görüntüsünü al" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Uçbirim komut satırı" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Pencere ekran görüntüsü alma komutu" - -diff -upr compiz-0.8.8-orig/po/uk.po compiz-0.8.8/po/uk.po ---- compiz-0.8.8-orig/po/uk.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/uk.po 2012-05-16 12:40:32.000000000 +0200 -@@ -19,53 +19,53 @@ msgstr "" - "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "СтільницÑ" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²Ñ–ÐºÐ½Ð°Ð¼Ð¸" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "ÐÑ–Ñкий" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "Згорнути у заголовок" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "Розгорнути" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "Розгорнути в ширину" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "Розгорнути у виÑоту" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "Згорнути" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "Розгорнути" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "ОпуÑтити" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -80,41 +80,41 @@ msgid "Blur type" - msgstr "Тип розмиваннÑ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "ПрозоріÑÑ‚ÑŒ активного вікна теми metacity" -+msgid "Marco theme active window opacity" -+msgstr "ПрозоріÑÑ‚ÑŒ активного вікна теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Ð—Ð°Ñ‚ÑŒÐ¼Ð°Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾ÑÑ‚Ñ– активного вікна теми metacity" -+msgid "Marco theme active window opacity shade" -+msgstr "Ð—Ð°Ñ‚ÑŒÐ¼Ð°Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾ÑÑ‚Ñ– активного вікна теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "ПрозоріÑÑ‚ÑŒ теми metacity" -+msgid "Marco theme opacity" -+msgstr "ПрозоріÑÑ‚ÑŒ теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Ð—Ð°Ñ‚ÑŒÐ¼Ð°Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾ÑÑ‚Ñ– теми metacity" -+msgid "Marco theme opacity shade" -+msgstr "Ð—Ð°Ñ‚ÑŒÐ¼Ð°Ñ€ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ð·Ð¾Ñ€Ð¾ÑÑ‚Ñ– теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "ПрозоріÑÑ‚ÑŒ активних вікон у виглÑді теми metacity" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "ПрозоріÑÑ‚ÑŒ активних вікон у виглÑді теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "ПрозоріÑÑ‚ÑŒ при викориÑтанні декорацій теми metacity" -+msgid "Opacity to use for marco theme decorations" -+msgstr "ПрозоріÑÑ‚ÑŒ при викориÑтанні декорацій теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" --"Затьмарювати активні вікна з темою metacity від непрозорого до прозорого" -+"Затьмарювати активні вікна з темою marco від непрозорого до прозорого" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" --"Затьмарювати активні вікна з темою metacity від непрозорого до прозорого" -+"Затьмарювати активні вікна з темою marco від непрозорого до прозорого" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -125,12 +125,12 @@ msgid "Type of blur used for window deco - msgstr "Тип розмиваннÑ, що викориÑтовуєтьÑÑ Ð´Ð»Ñ Ð´ÐµÐºÐ¾Ñ€Ð°Ñ†Ñ–Ñ— вікна" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "ВикориÑтовувати теми metacity" -+msgid "Use marco theme" -+msgstr "ВикориÑтовувати теми marco" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "ВикориÑтовувати теми metacity Ð´Ð»Ñ Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐºÐ¾Ñ€Ð°Ñ†Ñ–Ñ— вікна " -+msgid "Use marco theme when drawing window decorations" -+msgstr "ВикориÑтовувати теми marco Ð´Ð»Ñ Ð¼Ð°Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð´ÐµÐºÐ¾Ñ€Ð°Ñ†Ñ–Ñ— вікна " - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -793,7 +793,7 @@ msgstr "Команда, Ñку буде - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "Команда, Ñку буде виконано в оболонці при виклику run_command9" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "Команди " - -@@ -1665,13 +1665,13 @@ msgstr "Файлова ÑиÑтема у - msgid "Userspace file system" - msgstr "Файлова ÑиÑтема у проÑторі (fuse)" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ MateConf" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1681,55 +1681,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "Підтримка оÑновного циклу GLib" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Працює з Gnome" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Працює з Mate" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "Відкрити термінал" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "Параметри, що підтримують ÑуміÑніÑÑ‚ÑŒ Compiz з оточеннÑм Ñтільниці Gnome" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "Параметри, що підтримують ÑуміÑніÑÑ‚ÑŒ Compiz з оточеннÑм Ñтільниці Mate" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "Діалогове вікно запуÑку" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "ЗапуÑтити команду в терміналі" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "Командний Ñ€Ñдок знімка екрана" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "&Показувати Головне меню" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "Показати діалог запуÑку заÑтоÑунків" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "Показувати головне меню" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "Зробити знімок екрану" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "Зробити знімок вікна" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "Командний Ñ€Ñдок терміналу" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "Командний Ñ€Ñдок знімка вікна" - -diff -upr compiz-0.8.8-orig/po/vi.po compiz-0.8.8/po/vi.po ---- compiz-0.8.8-orig/po/vi.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/vi.po 2012-05-16 12:40:29.000000000 +0200 -@@ -17,53 +17,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=1; plural=0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -78,38 +78,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -121,11 +121,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -711,7 +711,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "" - -@@ -1566,12 +1566,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1582,55 +1582,55 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/xh.po compiz-0.8.8/po/xh.po ---- compiz-0.8.8-orig/po/xh.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/xh.po 2012-05-16 12:40:30.000000000 +0200 -@@ -14,53 +14,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -75,38 +75,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -118,11 +118,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -732,7 +732,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Umyalelo:" -@@ -1611,12 +1611,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1627,57 +1627,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Umyalelo '%1'" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Umyalelo '%1'" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/po/zh_CN.po compiz-0.8.8/po/zh_CN.po ---- compiz-0.8.8-orig/po/zh_CN.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/zh_CN.po 2012-05-16 12:40:34.000000000 +0200 -@@ -16,54 +16,54 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "æ¡Œé¢" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "窗å£ç®¡ç†" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "æ— " - - # 此功能完全ä¸èƒ½ç”¨è°ƒæ•´å¤§å°æ¥æ述，我找这个功能找了N久，æ‰å‘现：调整大å°ï¼ = =ï¼› --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "阴影" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "最大化" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "水平方å‘最大化" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "åž‚ç›´æ–¹å‘最大化" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "最å°åŒ–" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "å‡èµ·" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "é™ä¸‹" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -78,39 +78,39 @@ msgid "Blur type" - msgstr "模糊类型" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity主题活动窗å£é€æ˜Žåº¦" -+msgid "Marco theme active window opacity" -+msgstr "Marco主题活动窗å£é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity 主题活动窗å£ä¸é€æ˜Žé˜´å½±" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco 主题活动窗å£ä¸é€æ˜Žé˜´å½±" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity主题é€æ˜Žåº¦" -+msgid "Marco theme opacity" -+msgstr "Marco主题é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity主题阴影" -+msgid "Marco theme opacity shade" -+msgstr "Marco主题阴影" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "以Metacity主题为装饰器的活动窗å£ä½¿ç”¨çš„é€æ˜Žåº¦" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "以Marco主题为装饰器的活动窗å£ä½¿ç”¨çš„é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "metacity主题装饰器使用的é€æ˜Žåº¦" -+msgid "Opacity to use for marco theme decorations" -+msgstr "marco主题装饰器使用的é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" --msgstr "以metacity主题装饰器为活动窗å£æ·»åŠ é€æ˜Žæ¸å˜æ•ˆæžœ" -+msgstr "以marco主题装饰器为活动窗å£æ·»åŠ é€æ˜Žæ¸å˜æ•ˆæžœ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" --msgstr "以metacity主题装饰器为窗å£æ·»åŠ é€æ˜Žæ¸å˜æ•ˆæžœ" -+"Shade windows with marco theme decorations from opaque to translucent" -+msgstr "以marco主题装饰器为窗å£æ·»åŠ é€æ˜Žæ¸å˜æ•ˆæžœ" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -121,12 +121,12 @@ msgid "Type of blur used for window deco - msgstr "窗å£è£…饰使用的模糊类型" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "使用metacity主题" -+msgid "Use marco theme" -+msgstr "使用marco主题" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "绘制窗å£è£…饰时使用metacity主题" -+msgid "Use marco theme when drawing window decorations" -+msgstr "绘制窗å£è£…饰时使用marco主题" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -711,7 +711,7 @@ msgstr "调用run_command8æ—¶è¦åœ¨shell - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "调用run_command9æ—¶è¦åœ¨shell中执行的命令行" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "命令" - -@@ -1566,13 +1566,13 @@ msgstr "用户空间文件系统" - msgid "Userspace file system" - msgstr "用户空间文件系统" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf控制åŽç«¯" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf控制åŽç«¯" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1582,55 +1582,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib主循环支æŒ" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome兼容性" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate兼容性" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "打开一个终端窗å£" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "使Compiz兼容Gnomeæ¡Œé¢çŽ¯å¢ƒçš„选项" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "使Compiz兼容Mateæ¡Œé¢çŽ¯å¢ƒçš„选项" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "è¿è¡Œå¯¹è¯æ¡†" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "è¿è¡Œç»ˆç«¯å‘½ä»¤" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "截å±å‘½ä»¤è¡Œ" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "显示主èœå•" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "显示è¿è¡Œåº”用程åºå¯¹è¯æ¡†" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "显示主èœå•" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "æ‹æ‘„截å±" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "æ‹æ‘„窗å£æˆªå±" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "终端命令行" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "窗å£æˆªå±å‘½ä»¤è¡Œ" - -diff -upr compiz-0.8.8-orig/po/zh_TW.po compiz-0.8.8/po/zh_TW.po ---- compiz-0.8.8-orig/po/zh_TW.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/zh_TW.po 2012-05-16 12:40:34.000000000 +0200 -@@ -16,53 +16,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "X-Generator: Pootle 1.1.0\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "æ¡Œé¢" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "視窗管ç†å“¡" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "Compiz" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "ç„¡" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "é™°å½±" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "最大化" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "將視窗水平最大化" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "將視窗垂直最大化" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "最å°åŒ–" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "å‰æ™¯è¦–窗" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "低" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -77,39 +77,39 @@ msgid "Blur type" - msgstr "柔化方å¼" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" --msgstr "Metacity 佈景主題使用中的視窗é€æ˜Žåº¦" -+msgid "Marco theme active window opacity" -+msgstr "Marco 佈景主題使用中的視窗é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" --msgstr "Metacity 佈景主題使用中的視窗陰影é€æ˜Žåº¦" -+msgid "Marco theme active window opacity shade" -+msgstr "Marco 佈景主題使用中的視窗陰影é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" --msgstr "Metacity 佈景主題é€æ˜Žåº¦" -+msgid "Marco theme opacity" -+msgstr "Marco 佈景主題é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" --msgstr "Metacity 佈景主題的陰影é€æ˜Žåº¦" -+msgid "Marco theme opacity shade" -+msgstr "Marco 佈景主題的陰影é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" --msgstr "使用 Metacity 視窗管ç†å“¡æ™‚，作用中視窗的é€æ˜Žåº¦ã€‚" -+msgid "Opacity to use for active windows with marco theme decorations" -+msgstr "使用 Marco 視窗管ç†å“¡æ™‚，作用中視窗的é€æ˜Žåº¦ã€‚" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" --msgstr "使用 Metacity 佈景主題的é€æ˜Žåº¦" -+msgid "Opacity to use for marco theme decorations" -+msgstr "使用 Marco 佈景主題的é€æ˜Žåº¦" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" --msgstr "使用 Metacity 佈景主題，從ä¸é€æ˜Žåˆ°åŠé€æ˜Žçš„作用中視窗陰影" -+msgstr "使用 Marco 佈景主題，從ä¸é€æ˜Žåˆ°åŠé€æ˜Žçš„作用中視窗陰影" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" --msgstr "使用 Metacity 佈景主題，並添加從é€æ˜Žåˆ°ä¸é€æ˜Žçš„漸變效果。" -+"Shade windows with marco theme decorations from opaque to translucent" -+msgstr "使用 Marco 佈景主題，並添加從é€æ˜Žåˆ°ä¸é€æ˜Žçš„漸變效果。" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 - msgid "Title bar mouse wheel action" -@@ -120,12 +120,12 @@ msgid "Type of blur used for window deco - msgstr "é‡å°è¦–窗è£é£¾çš„模糊方å¼" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" --msgstr "使用 metacity 主題" -+msgid "Use marco theme" -+msgstr "使用 marco 主題" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" --msgstr "給視窗è£é£¾å¼•æ“ŽæŒ‡å®šä½¿ç”¨ metacity 佈景主題" -+msgid "Use marco theme when drawing window decorations" -+msgstr "給視窗è£é£¾å¼•æ“ŽæŒ‡å®šä½¿ç”¨ marco 佈景主題" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 - #: ../metadata/core.xml.in.in.h:12 -@@ -710,7 +710,7 @@ msgstr "當shell指令8è¨­å®šä¹‹å¾Œï¼Œå° - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "當shell指令9設定之後，將會在shellè£é¢åŸ·è¡Œé€™å€‹æŒ‡ä»¤ã€‚" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - msgid "Commands" - msgstr "é è¨­æŒ‡ä»¤(Commands)" - -@@ -1565,13 +1565,13 @@ msgstr "使用者紀錄放置ä½ç½®" - msgid "Userspace file system" - msgstr "使用者的紀錄放置ä½ç½®" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" --msgstr "GConf" -- --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" --msgstr "GConf 控制å°" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" -+msgstr "MateConf" -+ -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" -+msgstr "MateConf 控制å°" - - #: ../metadata/glib.xml.in.h:1 - msgid "GLib" -@@ -1581,55 +1581,55 @@ msgstr "GLib" - msgid "GLib main loop support" - msgstr "GLib main loop支æ´ã€‚(GLib為一個補助GTK+的函å¼åº«)" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" --msgstr "Gnome的相容性" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" -+msgstr "Mate的相容性" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "開啟一個終端機執行" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" --msgstr "使Compiz能與Gnomeæ¡Œé¢ç’°å¢ƒç›¸å®¹çš„環境設定" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" -+msgstr "使Compiz能與Mateæ¡Œé¢ç’°å¢ƒç›¸å®¹çš„環境設定" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "執行å°è©±æ–¹å¡Š" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - msgid "Run terminal command" - msgstr "執行終端機指令" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "螢幕擷å–指令" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "顯示主功能表" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "顯示執行應用程å¼å°è©±æ–¹å¡Š" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "顯示主功能表" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "æ“·å–螢幕畫é¢" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "æ“·å–視窗螢幕畫é¢" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - msgid "Terminal command line" - msgstr "終端機的指令" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "視窗螢幕擷å–指令" - -diff -upr compiz-0.8.8-orig/po/zu.po compiz-0.8.8/po/zu.po ---- compiz-0.8.8-orig/po/zu.po 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/po/zu.po 2012-05-16 12:40:30.000000000 +0200 -@@ -14,53 +14,53 @@ msgstr "" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../gtk/gnome/50-compiz-desktop-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-desktop-key.xml.in.h:1 - msgid "Desktop" - msgstr "" - --#: ../gtk/gnome/50-compiz-key.xml.in.h:1 -+#: ../gtk/mate/50-compiz-key.xml.in.h:1 - msgid "Window Management" - msgstr "" - --#: ../gtk/gnome/compiz.desktop.in.h:1 -+#: ../gtk/mate/compiz.desktop.in.h:1 - msgid "Compiz" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 -+#: ../gtk/mate/compiz-window-manager.c:426 ../metadata/scale.xml.in.h:25 - #: ../metadata/wobbly.xml.in.h:16 - msgid "None" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:427 -+#: ../gtk/mate/compiz-window-manager.c:427 - #: ../gtk/window-decorator/gtk-window-decorator.c:4625 - msgid "Shade" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 -+#: ../gtk/mate/compiz-window-manager.c:428 ../metadata/place.xml.in.h:9 - msgid "Maximize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:429 -+#: ../gtk/mate/compiz-window-manager.c:429 - msgid "Maximize Horizontally" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:430 -+#: ../gtk/mate/compiz-window-manager.c:430 - msgid "Maximize Vertically" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:431 -+#: ../gtk/mate/compiz-window-manager.c:431 - msgid "Minimize" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:432 -+#: ../gtk/mate/compiz-window-manager.c:432 - msgid "Raise" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:433 -+#: ../gtk/mate/compiz-window-manager.c:433 - msgid "Lower" - msgstr "" - --#: ../gtk/gnome/compiz-window-manager.c:434 -+#: ../gtk/mate/compiz-window-manager.c:434 - #: ../gtk/window-decorator/gtk-window-decorator.c:4606 - #: ../metadata/core.xml.in.in.h:100 - msgid "Window Menu" -@@ -75,38 +75,38 @@ msgid "Blur type" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:3 --msgid "Metacity theme active window opacity" -+msgid "Marco theme active window opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:4 --msgid "Metacity theme active window opacity shade" -+msgid "Marco theme active window opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:5 --msgid "Metacity theme opacity" -+msgid "Marco theme opacity" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:6 --msgid "Metacity theme opacity shade" -+msgid "Marco theme opacity shade" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:7 --msgid "Opacity to use for active windows with metacity theme decorations" -+msgid "Opacity to use for active windows with marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:8 --msgid "Opacity to use for metacity theme decorations" -+msgid "Opacity to use for marco theme decorations" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:9 - msgid "" --"Shade active windows with metacity theme decorations from opaque to " -+"Shade active windows with marco theme decorations from opaque to " - "translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:10 - msgid "" --"Shade windows with metacity theme decorations from opaque to translucent" -+"Shade windows with marco theme decorations from opaque to translucent" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:11 -@@ -118,11 +118,11 @@ msgid "Type of blur used for window deco - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:13 --msgid "Use metacity theme" -+msgid "Use marco theme" - msgstr "" - - #: ../gtk/window-decorator/gwd.schemas.in.h:14 --msgid "Use metacity theme when drawing window decorations" -+msgid "Use marco theme when drawing window decorations" - msgstr "" - - #: ../gtk/window-decorator/gtk-window-decorator.c:4414 -@@ -732,7 +732,7 @@ msgstr "" - msgid "Command line to be executed in shell when run_command9 is invoked" - msgstr "" - --#: ../metadata/commands.xml.in.h:63 ../metadata/gnomecompat.xml.in.h:1 -+#: ../metadata/commands.xml.in.h:63 ../metadata/matecompat.xml.in.h:1 - #, fuzzy - msgid "Commands" - msgstr "Amakhomandi:" -@@ -1611,12 +1611,12 @@ msgstr "" - msgid "Userspace file system" - msgstr "" - --#: ../metadata/gconf.xml.in.h:1 --msgid "GConf" -+#: ../metadata/mateconf.xml.in.h:1 -+msgid "MateConf" - msgstr "" - --#: ../metadata/gconf.xml.in.h:2 --msgid "GConf Control Backend" -+#: ../metadata/mateconf.xml.in.h:2 -+msgid "MateConf Control Backend" - msgstr "" - - #: ../metadata/glib.xml.in.h:1 -@@ -1627,57 +1627,57 @@ msgstr "" - msgid "GLib main loop support" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:2 --msgid "Gnome Compatibility" -+#: ../metadata/matecompat.xml.in.h:2 -+msgid "Mate Compatibility" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:3 -+#: ../metadata/matecompat.xml.in.h:3 - msgid "Open a terminal" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:4 --msgid "Options that keep Compiz compatible to the Gnome desktop environment" -+#: ../metadata/matecompat.xml.in.h:4 -+msgid "Options that keep Compiz compatible to the Mate desktop environment" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:5 -+#: ../metadata/matecompat.xml.in.h:5 - msgid "Run Dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:6 -+#: ../metadata/matecompat.xml.in.h:6 - #, fuzzy - msgid "Run terminal command" - msgstr "Ikhomandi '%1'" - --#: ../metadata/gnomecompat.xml.in.h:7 -+#: ../metadata/matecompat.xml.in.h:7 - msgid "Screenshot command line" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:8 -+#: ../metadata/matecompat.xml.in.h:8 - msgid "Show Main Menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:9 -+#: ../metadata/matecompat.xml.in.h:9 - msgid "Show Run Application dialog" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:10 -+#: ../metadata/matecompat.xml.in.h:10 - msgid "Show the main menu" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:11 -+#: ../metadata/matecompat.xml.in.h:11 - msgid "Take a screenshot" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:12 -+#: ../metadata/matecompat.xml.in.h:12 - msgid "Take a screenshot of a window" - msgstr "" - --#: ../metadata/gnomecompat.xml.in.h:13 -+#: ../metadata/matecompat.xml.in.h:13 - #, fuzzy - msgid "Terminal command line" - msgstr "Ikhomandi '%1'" - --#: ../metadata/gnomecompat.xml.in.h:14 -+#: ../metadata/matecompat.xml.in.h:14 - msgid "Window screenshot command line" - msgstr "" - -diff -upr compiz-0.8.8-orig/src/Makefile.in compiz-0.8.8/src/Makefile.in ---- compiz-0.8.8-orig/src/Makefile.in 2011-03-30 11:33:35.000000000 +0200 -+++ compiz-0.8.8/src/Makefile.in 2012-05-16 12:40:12.000000000 +0200 -@@ -126,11 +126,11 @@ EXEEXT = @EXEEXT@ - FGREP = @FGREP@ - FUSE_CFLAGS = @FUSE_CFLAGS@ - FUSE_LIBS = @FUSE_LIBS@ --GCONFTOOL = @GCONFTOOL@ --GCONF_CFLAGS = @GCONF_CFLAGS@ --GCONF_LIBS = @GCONF_LIBS@ --GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ --GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ -+MATECONFTOOL = @MATECONFTOOL@ -+MATECONF_CFLAGS = @MATECONF_CFLAGS@ -+MATECONF_LIBS = @MATECONF_LIBS@ -+MATECONF_SCHEMA_CONFIG_SOURCE = @MATECONF_SCHEMA_CONFIG_SOURCE@ -+MATECONF_SCHEMA_FILE_DIR = @MATECONF_SCHEMA_FILE_DIR@ - GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ - GLIB_CFLAGS = @GLIB_CFLAGS@ - GLIB_LIBS = @GLIB_LIBS@ -@@ -138,10 +138,10 @@ GL_CFLAGS = @GL_CFLAGS@ - GL_LIBS = @GL_LIBS@ - GMOFILES = @GMOFILES@ - GMSGFMT = @GMSGFMT@ --GNOME_KEY_BINDINGS_CFLAGS = @GNOME_KEY_BINDINGS_CFLAGS@ --GNOME_KEY_BINDINGS_LIBS = @GNOME_KEY_BINDINGS_LIBS@ --GNOME_WINDOW_SETTINGS_CFLAGS = @GNOME_WINDOW_SETTINGS_CFLAGS@ --GNOME_WINDOW_SETTINGS_LIBS = @GNOME_WINDOW_SETTINGS_LIBS@ -+MATE_KEY_BINDINGS_CFLAGS = @MATE_KEY_BINDINGS_CFLAGS@ -+MATE_KEY_BINDINGS_LIBS = @MATE_KEY_BINDINGS_LIBS@ -+MATE_WINDOW_SETTINGS_CFLAGS = @MATE_WINDOW_SETTINGS_CFLAGS@ -+MATE_WINDOW_SETTINGS_LIBS = @MATE_WINDOW_SETTINGS_LIBS@ - GREP = @GREP@ - GTK_WINDOW_DECORATOR_CFLAGS = @GTK_WINDOW_DECORATOR_CFLAGS@ - GTK_WINDOW_DECORATOR_LIBS = @GTK_WINDOW_DECORATOR_LIBS@ -@@ -182,8 +182,8 @@ LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ --METACITY_CFLAGS = @METACITY_CFLAGS@ --METACITY_LIBS = @METACITY_LIBS@ -+MARCO_CFLAGS = @MARCO_CFLAGS@ -+MARCO_LIBS = @MARCO_LIBS@ - MKDIR_P = @MKDIR_P@ - MKINSTALLDIRS = @MKINSTALLDIRS@ - MSGFMT = @MSGFMT@ -diff -upr compiz-0.8.8-orig/src/session.c compiz-0.8.8/src/session.c ---- compiz-0.8.8-orig/src/session.c 2010-05-21 13:18:14.000000000 +0200 -+++ compiz-0.8.8/src/session.c 2012-05-16 12:40:09.000000000 +0200 -@@ -341,8 +341,8 @@ getSessionClientId (CompSessionClientIdT - - return NULL; - } --/* ice connection handling taken and updated from gnome-ice.c -- * original gnome-ice.c code written by Tom Tromey -+/* ice connection handling taken and updated from mate-ice.c -+ * original mate-ice.c code written by Tom Tromey - */ - - /* This is called when data is available on an ICE connection. */ -diff -upr compiz-0.8.8-orig/src/window.c compiz-0.8.8/src/window.c ---- compiz-0.8.8-orig/src/window.c 2011-03-30 10:22:33.000000000 +0200 -+++ compiz-0.8.8/src/window.c 2012-05-16 12:40:34.000000000 +0200 -@@ -4996,7 +4996,7 @@ setWindowUserTime (CompWindow *w, - } - - /* -- * Macros from metacity -+ * Macros from marco - * - * Xserver time can wraparound, thus comparing two timestamps needs to - * take this into account. Here's a little macro to help out. If no -diff -upr compiz-0.8.8-orig/TODO compiz-0.8.8/TODO ---- compiz-0.8.8-orig/TODO 2010-05-21 13:17:43.000000000 +0200 -+++ compiz-0.8.8/TODO 2012-05-16 12:40:07.000000000 +0200 -@@ -16,7 +16,7 @@ KDE: - - * Remove glib dependency from place plugin - --* QT/KDE configuration plugin similar to the gconf plugin -+* QT/KDE configuration plugin similar to the mateconf plugin - - * QT/KDE decoration program - diff --git a/compiz-0.8.6-unloadpluginfix.patch b/compiz-0.8.6-unloadpluginfix.patch deleted file mode 100644 index 8c81cdc..0000000 --- a/compiz-0.8.6-unloadpluginfix.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upNr compiz-0.8.6.orign/include/compiz-core.h compiz-0.8.6/include/compiz-core.h ---- compiz-0.8.6.orign/include/compiz-core.h 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/include/compiz-core.h 2010-03-30 14:48:59.055172395 +0200 -@@ -27,6 +27,7 @@ - #define _COMPIZ_CORE_H - - #include -+#include - - #define CORE_ABIVERSION 20091102 - -diff -upNr compiz-0.8.6.orign/plugins/mateconf.c compiz-0.8.6/plugins/mateconf.c ---- compiz-0.8.6.orign/plugins/mateconf.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/plugins/mateconf.c 2010-03-30 14:48:59.056187055 +0200 -@@ -802,6 +802,8 @@ mateconfFiniObject (CompPlugin *p, - static Bool - mateconfInit (CompPlugin *p) - { -+ dlopen ("libmateconf-2.so.4", RTLD_LAZY); -+ - if (!compInitPluginMetadataFromInfo (&mateconfMetadata, p->vTable->name, - 0, 0, 0, 0)) - return FALSE; -diff -upNr compiz-0.8.6.orign/plugins/glib.c compiz-0.8.6/plugins/glib.c ---- compiz-0.8.6.orign/plugins/glib.c 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/plugins/glib.c 2010-03-30 14:48:59.056187055 +0200 -@@ -197,6 +197,8 @@ glibInitDisplay (CompPlugin *p, - { - GLibDisplay *gd; - -+ dlopen ("libglib-2.0.so.0", RTLD_LAZY); -+ - if (!checkPluginABI ("core", CORE_ABIVERSION)) - return FALSE; - diff --git a/compiz-0.8.6-wall.patch b/compiz-0.8.6-wall.patch deleted file mode 100644 index dbfec57..0000000 --- a/compiz-0.8.6-wall.patch +++ /dev/null @@ -1,5003 +0,0 @@ -diff -upNr compiz-0.8.6.orign/metadata/Makefile.am compiz-0.8.6/metadata/Makefile.am ---- compiz-0.8.6.orign/metadata/Makefile.am 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/metadata/Makefile.am 2010-03-30 14:53:23.499283857 +0200 -@@ -31,6 +31,7 @@ xml_in_files = \ - video.xml.in \ - water.xml.in \ - wobbly.xml.in \ -+ wall.xml.in \ - zoom.xml.in - xml_files = $(xml_in_files:.xml.in=.xml) - xml_DATA = $(xml_files) -diff -upNr compiz-0.8.6.orign/metadata/wall.xml.in compiz-0.8.6/metadata/wall.xml.in ---- compiz-0.8.6.orign/metadata/wall.xml.in 1970-01-01 01:00:00.000000000 +0100 -+++ compiz-0.8.6/metadata/wall.xml.in 2010-03-30 14:53:23.499283857 +0200 -@@ -0,0 +1,357 @@ -+ -+ -+ -+ <_short>Desktop Wall -+ <_long>Desktop Wall Plugin -+ Desktop -+ largedesktop -+ -+ -+ decoration -+ -+ -+ wobbly -+ fade -+ -+ -+ -+ -+ <_short>Viewport Switch Preview -+ -+ -+ -+ -+ -+ -+ -+ -+ <_short>Background Gradient -+ -+ -+ -+ -+ -+ -+ <_short>Thumb Gradient -+ -+ -+ -+ -+ -+ <_short>Highlight Gradient -+ -+ -+ -+ -+ -+ <_short>Arrow Colors -+ -+ -+ -+ -+ -+ -+ <_short>Viewport Switching -+ -+ -+ -+ -+ -+ <_short>Bindings -+ -+ <_short>Move within wall -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ <_short>Move with window within wall -+ -+ -+ -+ -+ -+ -+ <_short>Edge flipping -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ <_short>Viewport Switching -+ -+ -+ -+ <_short>Edge Flipping -+ -+ -+ -+ -+ -+ -+ -diff -upNr compiz-0.8.6.orign/plugins/Makefile.am compiz-0.8.6/plugins/Makefile.am ---- compiz-0.8.6.orign/plugins/Makefile.am 2010-03-28 14:15:35.000000000 +0200 -+++ compiz-0.8.6/plugins/Makefile.am 2010-03-30 14:53:23.499283857 +0200 -@@ -74,6 +74,9 @@ libcommands_la_SOURCES = commands.c - libmatecompat_la_LDFLAGS = -module -avoid-version -no-undefined - libmatecompat_la_SOURCES = matecompat.c - -+libwall_la_LDFLAGS = -module -avoid-version -no-undefined `pkg-config --libs cairo` -+libwall_la_SOURCES = wall.c wall_options.c -+ - if USE_LIBRSVG - libsvg_la_DEPENDENCIES = $(top_builddir)/libdecoration/libdecoration.la - libsvg_la_LDFLAGS = -module -avoid-version -no-undefined -@@ -149,7 +152,8 @@ INCLUDES = \ - -DIMAGEDIR=\"$(imagedir)\" \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -- -DMETADATADIR=\"$(metadatadir)\" -+ -DMETADATADIR=\"$(metadatadir)\" \ -+ `pkg-config --cflags cairo` - - moduledir = $(plugindir) - -@@ -181,6 +185,7 @@ module_LTLIBRARIES = \ - libobs.la \ - libcommands.la \ - libmatecompat.la \ -+ libwall.la \ - $(libsvg_module) \ - $(libannotate_module) \ - $(libinotify_module) \ -diff -upNr compiz-0.8.6.orign/plugins/wall.c compiz-0.8.6/plugins/wall.c ---- compiz-0.8.6.orign/plugins/wall.c 1970-01-01 01:00:00.000000000 +0100 -+++ compiz-0.8.6/plugins/wall.c 2010-03-30 14:54:31.256187250 +0200 -@@ -0,0 +1,2264 @@ -+/** -+ * -+ * Compiz wall plugin -+ * -+ * wall.c -+ * -+ * Copyright (c) 2006 Robert Carr -+ * -+ * Authors: -+ * Robert Carr -+ * Dennis Kasprzyk -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version 2 -+ * of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ **/ -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include "wall_options.h" -+ -+#include -+ -+#include -+#include -+ -+#define PI 3.14159265359f -+#define VIEWPORT_SWITCHER_SIZE 100 -+#define ARROW_SIZE 33 -+ -+#define WIN_X(w) ((w)->attrib.x - (w)->input.left) -+#define WIN_Y(w) ((w)->attrib.y - (w)->input.top) -+#define WIN_W(w) ((w)->width + (w)->input.left + (w)->input.right) -+#define WIN_H(w) ((w)->height + (w)->input.top + (w)->input.bottom) -+ -+#define getColorRGBA(name, _display) \ -+ r = wallGet##name##Red(_display) / 65535.0f;\ -+ g = wallGet##name##Green(_display) / 65535.0f; \ -+ b = wallGet##name##Blue(_display) / 65535.0f; \ -+ a = wallGet##name##Alpha(_display) / 65535.0f -+ -+static int WallDisplayPrivateIndex; -+static int WallCorePrivateIndex; -+ -+/* Enums */ -+typedef enum -+{ -+ Up = 0, -+ Left, -+ Down, -+ Right -+} Direction; -+ -+typedef enum -+{ -+ NoTransformation, -+ MiniScreen, -+ Sliding -+} ScreenTransformation; -+ -+typedef struct _WallCairoContext -+{ -+ Pixmap pixmap; -+ CompTexture texture; -+ -+ cairo_surface_t *surface; -+ cairo_t *cr; -+ -+ int width; -+ int height; -+} WallCairoContext; -+ -+typedef struct _WallCore -+{ -+ ObjectAddProc objectAdd; -+ SetOptionForPluginProc setOptionForPlugin; -+} WallCore; -+ -+typedef struct _WallDisplay -+{ -+ int screenPrivateIndex; -+ -+ HandleEventProc handleEvent; -+ MatchExpHandlerChangedProc matchExpHandlerChanged; -+ MatchPropertyChangedProc matchPropertyChanged; -+} WallDisplay; -+ -+typedef struct _WallScreen -+{ -+ int windowPrivateIndex; -+ -+ DonePaintScreenProc donePaintScreen; -+ PaintOutputProc paintOutput; -+ PaintScreenProc paintScreen; -+ PreparePaintScreenProc preparePaintScreen; -+ PaintTransformedOutputProc paintTransformedOutput; -+ PaintWindowProc paintWindow; -+ WindowGrabNotifyProc windowGrabNotify; -+ WindowUngrabNotifyProc windowUngrabNotify; -+ ActivateWindowProc activateWindow; -+ -+ Bool moving; /* Used to track miniview movement */ -+ Bool showPreview; -+ -+ float curPosX; -+ float curPosY; -+ int gotoX; -+ int gotoY; -+ int direction; /* >= 0 : direction arrow angle, < 0 : no direction */ -+ -+ int boxTimeout; -+ int boxOutputDevice; -+ -+ int grabIndex; -+ int timer; -+ -+ Window moveWindow; -+ -+ CompWindow *grabWindow; -+ -+ Bool focusDefault; -+ -+ ScreenTransformation transform; -+ CompOutput *currOutput; -+ -+ WindowPaintAttrib mSAttribs; -+ float mSzCamera; -+ -+ int firstViewportX; -+ int firstViewportY; -+ int viewportWidth; -+ int viewportHeight; -+ int viewportBorder; -+ -+ int moveWindowX; -+ int moveWindowY; -+ -+ WallCairoContext switcherContext; -+ WallCairoContext thumbContext; -+ WallCairoContext highlightContext; -+ WallCairoContext arrowContext; -+} WallScreen; -+ -+typedef struct _WallWindow -+{ -+ Bool isSliding; -+} WallWindow; -+ -+/* Helpers */ -+#define WALL_CORE(c) PLUGIN_CORE(c, Wall, w) -+#define WALL_DISPLAY(d) PLUGIN_DISPLAY(d, Wall, w) -+#define WALL_SCREEN(s) PLUGIN_SCREEN(s, Wall, w) -+#define WALL_WINDOW(w) PLUGIN_WINDOW(w, Wall, w) -+ -+#define GET_SCREEN \ -+ CompScreen *s; \ -+ Window xid; \ -+ xid = getIntOptionNamed(option, nOption, "root", 0);\ -+ s = findScreenAtDisplay(d, xid); \ -+ if (!s) \ -+ return FALSE; -+ -+#define sigmoid(x) (1.0f / (1.0f + exp (-5.5f * 2 * ((x) - 0.5)))) -+#define sigmoidProgress(x) ((sigmoid (x) - sigmoid (0)) / \ -+ (sigmoid (1) - sigmoid (0))) -+ -+ -+static void -+wallClearCairoLayer (cairo_t *cr) -+{ -+ cairo_save (cr); -+ cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); -+ cairo_paint (cr); -+ cairo_restore (cr); -+} -+ -+static void -+wallDrawSwitcherBackground (CompScreen *s) -+{ -+ cairo_t *cr; -+ cairo_pattern_t *pattern; -+ float outline = 2.0f; -+ int width, height, radius; -+ float r, g, b, a; -+ int i, j; -+ -+ WALL_SCREEN (s); -+ -+ cr = ws->switcherContext.cr; -+ wallClearCairoLayer (cr); -+ -+ width = ws->switcherContext.width - outline; -+ height = ws->switcherContext.height - outline; -+ -+ cairo_save (cr); -+ cairo_translate (cr, outline / 2.0f, outline / 2.0f); -+ -+ /* set the pattern for the switcher's background */ -+ pattern = cairo_pattern_create_linear (0, 0, width, height); -+ getColorRGBA (BackgroundGradientBaseColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 0.00f, r, g, b, a); -+ getColorRGBA (BackgroundGradientHighlightColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 0.65f, r, g, b, a); -+ getColorRGBA (BackgroundGradientShadowColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 0.85f, r, g, b, a); -+ cairo_set_source (cr, pattern); -+ -+ /* draw the border's shape */ -+ radius = wallGetEdgeRadius (s->display); -+ if (radius) -+ { -+ cairo_arc (cr, radius, radius, radius, PI, 1.5f * PI); -+ cairo_arc (cr, radius + width - 2 * radius, -+ radius, radius, 1.5f * PI, 2.0 * PI); -+ cairo_arc (cr, width - radius, height - radius, radius, 0, PI / 2.0f); -+ cairo_arc (cr, radius, height - radius, radius, PI / 2.0f, PI); -+ } -+ else -+ cairo_rectangle (cr, 0, 0, width, height); -+ -+ cairo_close_path (cr); -+ -+ /* apply pattern to background... */ -+ cairo_fill_preserve (cr); -+ -+ /* ... and draw an outline */ -+ cairo_set_line_width (cr, outline); -+ getColorRGBA (OutlineColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_stroke(cr); -+ -+ cairo_pattern_destroy (pattern); -+ cairo_restore (cr); -+ -+ cairo_save (cr); -+ for (i = 0; i < s->vsize; i++) -+ { -+ cairo_translate (cr, 0.0, ws->viewportBorder); -+ cairo_save (cr); -+ for (j = 0; j < s->hsize; j++) -+ { -+ cairo_translate (cr, ws->viewportBorder, 0.0); -+ -+ /* this cuts a hole into our background */ -+ cairo_set_operator (cr, CAIRO_OPERATOR_OVER); -+ cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0); -+ cairo_rectangle (cr, 0, 0, ws->viewportWidth, ws->viewportHeight); -+ -+ cairo_fill_preserve (cr); -+ cairo_set_operator (cr, CAIRO_OPERATOR_XOR); -+ cairo_fill (cr); -+ -+ cairo_translate (cr, ws->viewportWidth, 0.0); -+ } -+ cairo_restore(cr); -+ -+ cairo_translate (cr, 0.0, ws->viewportHeight); -+ } -+ cairo_restore (cr); -+} -+ -+static void -+wallDrawThumb (CompScreen *s) -+{ -+ cairo_t *cr; -+ cairo_pattern_t *pattern; -+ float r, g, b, a; -+ float outline = 2.0f; -+ int width, height; -+ -+ WALL_SCREEN(s); -+ -+ cr = ws->thumbContext.cr; -+ wallClearCairoLayer (cr); -+ -+ width = ws->thumbContext.width - outline; -+ height = ws->thumbContext.height - outline; -+ -+ cairo_translate (cr, outline / 2.0f, outline / 2.0f); -+ -+ pattern = cairo_pattern_create_linear (0, 0, width, height); -+ getColorRGBA (ThumbGradientBaseColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 0.0f, r, g, b, a); -+ getColorRGBA (ThumbGradientHighlightColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 1.0f, r, g, b, a); -+ -+ /* apply the pattern for thumb background */ -+ cairo_set_source (cr, pattern); -+ cairo_rectangle (cr, 0, 0, width, height); -+ cairo_fill_preserve (cr); -+ -+ cairo_set_line_width (cr, outline); -+ getColorRGBA (OutlineColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_stroke (cr); -+ -+ cairo_pattern_destroy (pattern); -+ -+ cairo_restore (cr); -+} -+ -+static void -+wallDrawHighlight(CompScreen *s) -+{ -+ cairo_t *cr; -+ cairo_pattern_t *pattern; -+ int width, height; -+ float r, g, b, a; -+ float outline = 2.0f; -+ -+ -+ WALL_SCREEN(s); -+ -+ cr = ws->highlightContext.cr; -+ wallClearCairoLayer (cr); -+ -+ width = ws->highlightContext.width - outline; -+ height = ws->highlightContext.height - outline; -+ -+ cairo_translate (cr, outline / 2.0f, outline / 2.0f); -+ -+ pattern = cairo_pattern_create_linear (0, 0, width, height); -+ getColorRGBA (ThumbHighlightGradientBaseColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 0.0f, r, g, b, a); -+ getColorRGBA (ThumbHighlightGradientShadowColor, s->display); -+ cairo_pattern_add_color_stop_rgba (pattern, 1.0f, r, g, b, a); -+ -+ /* apply the pattern for thumb background */ -+ cairo_set_source (cr, pattern); -+ cairo_rectangle (cr, 0, 0, width, height); -+ cairo_fill_preserve (cr); -+ -+ cairo_set_line_width (cr, outline); -+ getColorRGBA (OutlineColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_stroke (cr); -+ -+ cairo_pattern_destroy (pattern); -+ -+ cairo_restore (cr); -+} -+ -+static void -+wallDrawArrow (CompScreen *s) -+{ -+ cairo_t *cr; -+ float outline = 2.0f; -+ float r, g, b, a; -+ -+ WALL_SCREEN(s); -+ -+ cr = ws->arrowContext.cr; -+ wallClearCairoLayer (cr); -+ -+ cairo_translate (cr, outline / 2.0f, outline / 2.0f); -+ -+ /* apply the pattern for thumb background */ -+ cairo_set_line_width (cr, outline); -+ -+ /* draw top part of the arrow */ -+ getColorRGBA (ArrowBaseColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_move_to (cr, 15, 0); -+ cairo_line_to (cr, 30, 30); -+ cairo_line_to (cr, 15, 24.5); -+ cairo_line_to (cr, 15, 0); -+ cairo_fill (cr); -+ -+ /* draw bottom part of the arrow */ -+ getColorRGBA (ArrowShadowColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_move_to (cr, 15, 0); -+ cairo_line_to (cr, 0, 30); -+ cairo_line_to (cr, 15, 24.5); -+ cairo_line_to (cr, 15, 0); -+ cairo_fill (cr); -+ -+ /* draw the arrow outline */ -+ getColorRGBA (OutlineColor, s->display); -+ cairo_set_source_rgba (cr, r, g, b, a); -+ cairo_move_to (cr, 15, 0); -+ cairo_line_to (cr, 30, 30); -+ cairo_line_to (cr, 15, 24.5); -+ cairo_line_to (cr, 0, 30); -+ cairo_line_to (cr, 15, 0); -+ cairo_stroke (cr); -+ -+ cairo_restore (cr); -+} -+ -+static void -+wallSetupCairoContext (CompScreen *s, -+ WallCairoContext *context) -+{ -+ XRenderPictFormat *format; -+ Screen *screen; -+ int width, height; -+ -+ screen = ScreenOfDisplay (s->display->display, s->screenNum); -+ -+ width = context->width; -+ height = context->height; -+ -+ initTexture (s, &context->texture); -+ -+ format = XRenderFindStandardFormat (s->display->display, -+ PictStandardARGB32); -+ -+ context->pixmap = XCreatePixmap (s->display->display, s->root, -+ width, height, 32); -+ -+ if (!bindPixmapToTexture(s, &context->texture, context->pixmap, -+ width, height, 32)) -+ { -+ compLogMessage ("wall", CompLogLevelError, -+ "Couldn't create cairo context for switcher"); -+ } -+ -+ context->surface = -+ cairo_xlib_surface_create_with_xrender_format (s->display->display, -+ context->pixmap, -+ screen, format, -+ width, height); -+ -+ context->cr = cairo_create (context->surface); -+ wallClearCairoLayer (context->cr); -+} -+ -+static void -+wallDestroyCairoContext (CompScreen *s, -+ WallCairoContext *context) -+{ -+ if (context->cr) -+ cairo_destroy (context->cr); -+ -+ if (context->surface) -+ cairo_surface_destroy (context->surface); -+ -+ finiTexture (s, &context->texture); -+ -+ if (context->pixmap) -+ XFreePixmap (s->display->display, context->pixmap); -+} -+ -+static Bool -+wallCheckDestination (CompScreen *s, -+ int destX, -+ int destY) -+{ -+ if (s->x - destX < 0) -+ return FALSE; -+ -+ if (s->x - destX >= s->hsize) -+ return FALSE; -+ -+ if (s->y - destY >= s->vsize) -+ return FALSE; -+ -+ if (s->y - destY < 0) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+wallReleaseMoveWindow (CompScreen *s) -+{ -+ CompWindow *w; -+ WALL_SCREEN (s); -+ -+ w = findWindowAtScreen (s, ws->moveWindow); -+ if (w) -+ syncWindowPosition (w); -+ -+ ws->moveWindow = 0; -+} -+ -+static void -+wallComputeTranslation (CompScreen *s, -+ float *x, -+ float *y) -+{ -+ float dx, dy, elapsed, duration; -+ -+ WALL_SCREEN (s); -+ -+ duration = wallGetSlideDuration (s->display) * 1000.0; -+ if (duration != 0.0) -+ elapsed = 1.0 - (ws->timer / duration); -+ else -+ elapsed = 1.0; -+ -+ if (elapsed < 0.0) -+ elapsed = 0.0; -+ if (elapsed > 1.0) -+ elapsed = 1.0; -+ -+ /* Use temporary variables to you can pass in &ps->cur_x */ -+ dx = (ws->gotoX - ws->curPosX) * elapsed + ws->curPosX; -+ dy = (ws->gotoY - ws->curPosY) * elapsed + ws->curPosY; -+ -+ *x = dx; -+ *y = dy; -+} -+ -+/* movement remainder that gets ignored for direction calculation */ -+#define IGNORE_REMAINDER 0.05 -+ -+static void -+wallDetermineMovementAngle (CompScreen *s) -+{ -+ int angle; -+ float dx, dy; -+ -+ WALL_SCREEN (s); -+ -+ dx = ws->gotoX - ws->curPosX; -+ dy = ws->gotoY - ws->curPosY; -+ -+ if (dy > IGNORE_REMAINDER) -+ angle = (dx > IGNORE_REMAINDER) ? 135 : -+ (dx < -IGNORE_REMAINDER) ? 225 : 180; -+ else if (dy < -IGNORE_REMAINDER) -+ angle = (dx > IGNORE_REMAINDER) ? 45 : -+ (dx < -IGNORE_REMAINDER) ? 315 : 0; -+ else -+ angle = (dx > IGNORE_REMAINDER) ? 90 : -+ (dx < -IGNORE_REMAINDER) ? 270 : -1; -+ -+ ws->direction = angle; -+} -+ -+static Bool -+wallMoveViewport (CompScreen *s, -+ int x, -+ int y, -+ Window moveWindow) -+{ -+ WALL_SCREEN (s); -+ -+ if (!x && !y) -+ return FALSE; -+ -+ if (otherScreenGrabExist (s, "move", "switcher", "group-drag", "wall", NULL)) -+ return FALSE; -+ -+ if (!wallCheckDestination (s, x, y)) -+ return FALSE; -+ -+ if (ws->moveWindow != moveWindow) -+ { -+ CompWindow *w; -+ -+ wallReleaseMoveWindow (s); -+ w = findWindowAtScreen (s, moveWindow); -+ if (w) -+ { -+ if (!(w->type & (CompWindowTypeDesktopMask | -+ CompWindowTypeDockMask))) -+ { -+ if (!(w->state & CompWindowStateStickyMask)) -+ { -+ ws->moveWindow = w->id; -+ ws->moveWindowX = w->attrib.x; -+ ws->moveWindowY = w->attrib.y; -+ raiseWindow (w); -+ } -+ } -+ } -+ } -+ -+ if (!ws->moving) -+ { -+ ws->curPosX = s->x; -+ ws->curPosY = s->y; -+ } -+ ws->gotoX = s->x - x; -+ ws->gotoY = s->y - y; -+ -+ wallDetermineMovementAngle (s); -+ -+ if (!ws->grabIndex) -+ ws->grabIndex = pushScreenGrab (s, s->invisibleCursor, "wall"); -+ -+ moveScreenViewport (s, x, y, TRUE); -+ -+ ws->moving = TRUE; -+ ws->focusDefault = TRUE; -+ ws->boxOutputDevice = outputDeviceForPoint (s, pointerX, pointerY); -+ -+ if (wallGetShowSwitcher (s->display)) -+ ws->boxTimeout = wallGetPreviewTimeout (s->display) * 1000; -+ else -+ ws->boxTimeout = 0; -+ -+ ws->timer = wallGetSlideDuration (s->display) * 1000; -+ -+ damageScreen (s); -+ -+ return TRUE; -+} -+ -+static void -+wallHandleEvent (CompDisplay *d, -+ XEvent *event) -+{ -+ WALL_DISPLAY (d); -+ -+ switch (event->type) { -+ case ClientMessage: -+ if (event->xclient.message_type == d->desktopViewportAtom) -+ { -+ int dx, dy; -+ CompScreen *s; -+ -+ s = findScreenAtDisplay (d, event->xclient.window); -+ if (!s) -+ break; -+ -+ if (otherScreenGrabExist (s, "switcher", "wall", NULL)) -+ break; -+ -+ dx = event->xclient.data.l[0] / s->width - s->x; -+ dy = event->xclient.data.l[1] / s->height - s->y; -+ -+ if (!dx && !dy) -+ break; -+ -+ wallMoveViewport (s, -dx, -dy, None); -+ } -+ break; -+ } -+ -+ UNWRAP (wd, d, handleEvent); -+ (*d->handleEvent) (d, event); -+ WRAP (wd, d, handleEvent, wallHandleEvent); -+} -+ -+static void -+wallActivateWindow (CompWindow *w) -+{ -+ CompScreen *s = w->screen; -+ -+ WALL_SCREEN (s); -+ -+ if (w->placed && !otherScreenGrabExist (s, "wall", "switcher", NULL)) -+ { -+ int dx, dy; -+ -+ defaultViewportForWindow (w, &dx, &dy); -+ dx -= s->x; -+ dy -= s->y; -+ -+ if (dx || dy) -+ { -+ wallMoveViewport (s, -dx, -dy, None); -+ ws->focusDefault = FALSE; -+ } -+ } -+ -+ UNWRAP (ws, s, activateWindow); -+ (*s->activateWindow) (w); -+ WRAP (ws, s, activateWindow, wallActivateWindow); -+} -+ -+static void -+wallCheckAmount (CompScreen *s, -+ int dx, -+ int dy, -+ int *amountX, -+ int *amountY) -+{ -+ *amountX = -dx; -+ *amountY = -dy; -+ -+ if (wallGetAllowWraparound (s->display)) -+ { -+ if ((s->x + dx) < 0) -+ *amountX = -(s->hsize + dx); -+ else if ((s->x + dx) >= s->hsize) -+ *amountX = s->hsize - dx; -+ -+ if ((s->y + dy) < 0) -+ *amountY = -(s->vsize + dy); -+ else if ((s->y + dy) >= s->vsize) -+ *amountY = s->vsize - dy; -+ } -+} -+ -+static Bool -+wallInitiate (CompScreen *s, -+ int dx, -+ int dy, -+ Window win, -+ CompAction *action, -+ CompActionState state) -+{ -+ int amountX, amountY; -+ -+ WALL_SCREEN (s); -+ -+ wallCheckAmount (s, dx, dy, &amountX, &amountY); -+ if (!wallMoveViewport (s, amountX, amountY, win)) -+ return TRUE; -+ -+ if (state & CompActionStateInitKey) -+ action->state |= CompActionStateTermKey; -+ -+ if (state & CompActionStateInitButton) -+ action->state |= CompActionStateTermButton; -+ -+ ws->showPreview = wallGetShowSwitcher (s->display); -+ -+ return TRUE; -+} -+ -+static Bool -+wallTerminate (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ CompScreen *s; -+ -+ for (s = d->screens; s; s = s->next) -+ { -+ WALL_SCREEN (s); -+ -+ if (ws->showPreview) -+ { -+ ws->showPreview = FALSE; -+ damageScreen (s); -+ } -+ } -+ -+ if (action) -+ action->state &= ~(CompActionStateTermKey | CompActionStateTermButton); -+ -+ return FALSE; -+} -+ -+static Bool -+wallInitiateFlip (CompScreen *s, -+ Direction direction, -+ Bool dnd) -+{ -+ int dx, dy; -+ int amountX, amountY; -+ -+ if (otherScreenGrabExist (s, "wall", "move", "group-drag", NULL)) -+ return FALSE; -+ -+ if (dnd) -+ { -+ if (!wallGetEdgeflipDnd (s)) -+ return FALSE; -+ -+ if (otherScreenGrabExist (s, "wall", NULL)) -+ return FALSE; -+ } -+ else if (otherScreenGrabExist (s, "wall", "group-drag", NULL)) -+ { -+ /* not wall or group means move */ -+ if (!wallGetEdgeflipMove (s)) -+ return FALSE; -+ -+ WALL_SCREEN (s); -+ -+ if (!ws->grabWindow) -+ return FALSE; -+ -+ /* bail out if window is sticky */ -+ if (ws->grabWindow->state & CompWindowStateStickyMask) -+ return FALSE; -+ } -+ else if (otherScreenGrabExist (s, "wall", NULL)) -+ { -+ /* move was ruled out before, so we have group */ -+ if (!wallGetEdgeflipDnd (s)) -+ return FALSE; -+ } -+ else if (!wallGetEdgeflipPointer (s)) -+ return FALSE; -+ -+ switch (direction) { -+ case Left: -+ dx = -1; dy = 0; -+ break; -+ case Right: -+ dx = 1; dy = 0; -+ break; -+ case Up: -+ dx = 0; dy = -1; -+ break; -+ case Down: -+ dx = 0; dy = 1; -+ break; -+ default: -+ dx = 0; dy = 0; -+ break; -+ } -+ -+ wallCheckAmount (s, dx, dy, &amountX, &amountY); -+ if (wallMoveViewport (s, amountX, amountY, None)) -+ { -+ int offsetX, offsetY; -+ int warpX, warpY; -+ -+ if (dx < 0) -+ { -+ offsetX = s->width - 10; -+ warpX = pointerX + s->width; -+ } -+ else if (dx > 0) -+ { -+ offsetX = 1- s->width; -+ warpX = pointerX - s->width; -+ } -+ else -+ { -+ offsetX = 0; -+ warpX = lastPointerX; -+ } -+ -+ if (dy < 0) -+ { -+ offsetY = s->height - 10; -+ warpY = pointerY + s->height; -+ } -+ else if (dy > 0) -+ { -+ offsetY = 1- s->height; -+ warpY = pointerY - s->height; -+ } -+ else -+ { -+ offsetY = 0; -+ warpY = lastPointerY; -+ } -+ -+ warpPointer (s, offsetX, offsetY); -+ lastPointerX = warpX; -+ lastPointerY = warpY; -+ } -+ -+ return TRUE; -+} -+ -+static Bool -+wallLeft (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiate (s, -1, 0, None, action, state); -+} -+ -+static Bool -+wallRight (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiate (s, 1, 0, None, action, state); -+} -+ -+static Bool -+wallUp (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiate (s, 0, -1, None, action, state); -+} -+ -+static Bool -+wallDown (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiate (s, 0, 1, None, action, state); -+} -+ -+static Bool -+wallNext (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ int amountX, amountY; -+ GET_SCREEN; -+ -+ if ((s->x == s->hsize - 1) && (s->y == s->vsize - 1)) -+ { -+ amountX = -(s->hsize - 1); -+ amountY = -(s->vsize - 1); -+ } -+ else if (s->x == s->hsize - 1) -+ { -+ amountX = -(s->hsize - 1); -+ amountY = 1; -+ } -+ else -+ { -+ amountX = 1; -+ amountY = 0; -+ } -+ -+ return wallInitiate (s, amountX, amountY, None, action, state); -+} -+ -+static Bool -+wallPrev (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ int amountX, amountY; -+ GET_SCREEN; -+ -+ if ((s->x == 0) && (s->y == 0)) -+ { -+ amountX = s->hsize - 1; -+ amountY = s->vsize - 1; -+ } -+ else if (s->x == 0) -+ { -+ amountX = s->hsize - 1; -+ amountY = -1; -+ } -+ else -+ { -+ amountX = -1; -+ amountY = 0; -+ } -+ -+ return wallInitiate (s, amountX, amountY, None, action, state); -+} -+ -+static Bool -+wallFlipLeft (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiateFlip (s, Left, (state & CompActionStateInitEdgeDnd)); -+} -+ -+static Bool -+wallFlipRight (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiateFlip (s, Right, (state & CompActionStateInitEdgeDnd)); -+} -+ -+static Bool -+wallFlipUp (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiateFlip (s, Up, (state & CompActionStateInitEdgeDnd)); -+} -+ -+static Bool -+wallFlipDown (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ -+ return wallInitiateFlip (s, Down, (state & CompActionStateInitEdgeDnd)); -+} -+ -+static Bool -+wallLeftWithWindow (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ Window win = getIntOptionNamed (option, nOption, "window", 0); -+ -+ return wallInitiate (s, -1, 0, win, action, state); -+} -+ -+static Bool -+wallRightWithWindow (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ Window win = getIntOptionNamed (option, nOption, "window", 0); -+ -+ return wallInitiate (s, 1, 0, win, action, state); -+} -+ -+static Bool -+wallUpWithWindow (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ Window win = getIntOptionNamed (option, nOption, "window", 0); -+ -+ return wallInitiate (s, 0, -1, win, action, state); -+} -+ -+static Bool -+wallDownWithWindow (CompDisplay *d, -+ CompAction *action, -+ CompActionState state, -+ CompOption *option, -+ int nOption) -+{ -+ GET_SCREEN; -+ Window win = getIntOptionNamed (option, nOption, "window", 0); -+ -+ return wallInitiate (s, 0, 1, win, action, state); -+} -+ -+static inline void -+wallDrawQuad (CompMatrix *matrix, BOX *box) -+{ -+ glTexCoord2f (COMP_TEX_COORD_X (matrix, box->x1), -+ COMP_TEX_COORD_Y (matrix, box->y2)); -+ glVertex2i (box->x1, box->y2); -+ glTexCoord2f (COMP_TEX_COORD_X (matrix, box->x2), -+ COMP_TEX_COORD_Y (matrix, box->y2)); -+ glVertex2i (box->x2, box->y2); -+ glTexCoord2f (COMP_TEX_COORD_X (matrix, box->x2), -+ COMP_TEX_COORD_Y (matrix, box->y1)); -+ glVertex2i (box->x2, box->y1); -+ glTexCoord2f (COMP_TEX_COORD_X (matrix, box->x1), -+ COMP_TEX_COORD_Y (matrix, box->y1)); -+ glVertex2i (box->x1, box->y1); -+} -+ -+static void -+wallDrawCairoTextureOnScreen (CompScreen *s) -+{ -+ float centerX, centerY; -+ float width, height; -+ float topLeftX, topLeftY; -+ float border; -+ int i, j; -+ CompMatrix matrix; -+ BOX box; -+ -+ WALL_SCREEN(s); -+ -+ glDisableClientState (GL_TEXTURE_COORD_ARRAY); -+ glEnable (GL_BLEND); -+ -+ centerX = s->outputDev[ws->boxOutputDevice].region.extents.x1 + -+ (s->outputDev[ws->boxOutputDevice].width / 2.0f); -+ centerY = s->outputDev[ws->boxOutputDevice].region.extents.y1 + -+ (s->outputDev[ws->boxOutputDevice].height / 2.0f); -+ -+ border = (float) ws->viewportBorder; -+ width = (float) ws->switcherContext.width; -+ height = (float) ws->switcherContext.height; -+ -+ topLeftX = centerX - floor (width / 2.0f); -+ topLeftY = centerY - floor (height / 2.0f); -+ -+ ws->firstViewportX = topLeftX + border; -+ ws->firstViewportY = topLeftY + border; -+ -+ if (!ws->moving) -+ { -+ double left, timeout; -+ -+ timeout = wallGetPreviewTimeout (s->display) * 1000.0f; -+ left = (timeout > 0) ? (float) ws->boxTimeout / timeout : 1.0f; -+ -+ if (left < 0) -+ left = 0.0f; -+ else if (left > 0.5) -+ left = 1.0f; -+ else -+ left = 2 * left; -+ -+ screenTexEnvMode (s, GL_MODULATE); -+ -+ glColor4f (left, left, left, left); -+ glTranslatef (0.0f,0.0f, -(1 - left)); -+ -+ ws->mSzCamera = -(1 - left); -+ } -+ else -+ ws->mSzCamera = 0.0f; -+ -+ /* draw background */ -+ -+ matrix = ws->switcherContext.texture.matrix; -+ matrix.x0 -= topLeftX * matrix.xx; -+ matrix.y0 -= topLeftY * matrix.yy; -+ -+ box.x1 = topLeftX; -+ box.x2 = box.x1 + width; -+ box.y1 = topLeftY; -+ box.y2 = box.y1 + height; -+ -+ enableTexture (s, &ws->switcherContext.texture, COMP_TEXTURE_FILTER_FAST); -+ glBegin (GL_QUADS); -+ wallDrawQuad (&matrix, &box); -+ glEnd (); -+ disableTexture (s, &ws->switcherContext.texture); -+ -+ /* draw thumb */ -+ width = (float) ws->thumbContext.width; -+ height = (float) ws->thumbContext.height; -+ -+ enableTexture (s, &ws->thumbContext.texture, COMP_TEXTURE_FILTER_FAST); -+ glBegin (GL_QUADS); -+ for (i = 0; i < s->hsize; i++) -+ { -+ for (j = 0; j < s->vsize; j++) -+ { -+ if (i == ws->gotoX && j == ws->gotoY && ws->moving) -+ continue; -+ -+ box.x1 = i * (width + border); -+ box.x1 += topLeftX + border; -+ box.x2 = box.x1 + width; -+ box.y1 = j * (height + border); -+ box.y1 += topLeftY + border; -+ box.y2 = box.y1 + height; -+ -+ matrix = ws->thumbContext.texture.matrix; -+ matrix.x0 -= box.x1 * matrix.xx; -+ matrix.y0 -= box.y1 * matrix.yy; -+ -+ wallDrawQuad (&matrix, &box); -+ } -+ } -+ glEnd (); -+ disableTexture (s, &ws->thumbContext.texture); -+ -+ if (ws->moving || ws->showPreview) -+ { -+ /* draw highlight */ -+ int aW, aH; -+ -+ box.x1 = s->x * (width + border) + topLeftX + border; -+ box.x2 = box.x1 + width; -+ box.y1 = s->y * (height + border) + topLeftY + border; -+ box.y2 = box.y1 + height; -+ -+ matrix = ws->highlightContext.texture.matrix; -+ matrix.x0 -= box.x1 * matrix.xx; -+ matrix.y0 -= box.y1 * matrix.yy; -+ -+ enableTexture (s, &ws->highlightContext.texture, -+ COMP_TEXTURE_FILTER_FAST); -+ glBegin (GL_QUADS); -+ wallDrawQuad (&matrix, &box); -+ glEnd (); -+ disableTexture (s, &ws->highlightContext.texture); -+ -+ /* draw arrow */ -+ if (ws->direction >= 0) -+ { -+ enableTexture (s, &ws->arrowContext.texture, -+ COMP_TEXTURE_FILTER_GOOD); -+ -+ aW = ws->arrowContext.width; -+ aH = ws->arrowContext.height; -+ -+ /* if we have a viewport preview we just paint the -+ arrow outside the switcher */ -+ if (wallGetMiniscreen (s->display)) -+ { -+ width = (float) ws->switcherContext.width; -+ height = (float) ws->switcherContext.height; -+ -+ switch (ws->direction) -+ { -+ /* top left */ -+ case 315: -+ box.x1 = topLeftX - aW - border; -+ box.y1 = topLeftY - aH - border; -+ break; -+ /* up */ -+ case 0: -+ box.x1 = topLeftX + width / 2.0f - aW / 2.0f; -+ box.y1 = topLeftY - aH - border; -+ break; -+ /* top right */ -+ case 45: -+ box.x1 = topLeftX + width + border; -+ box.y1 = topLeftY - aH - border; -+ break; -+ /* right */ -+ case 90: -+ box.x1 = topLeftX + width + border; -+ box.y1 = topLeftY + height / 2.0f - aH / 2.0f; -+ break; -+ /* bottom right */ -+ case 135: -+ box.x1 = topLeftX + width + border; -+ box.y1 = topLeftY + height + border; -+ break; -+ /* down */ -+ case 180: -+ box.x1 = topLeftX + width / 2.0f - aW / 2.0f; -+ box.y1 = topLeftY + height + border; -+ break; -+ /* bottom left */ -+ case 225: -+ box.x1 = topLeftX - aW - border; -+ box.y1 = topLeftY + height + border; -+ break; -+ /* left */ -+ case 270: -+ box.x1 = topLeftX - aW - border; -+ box.y1 = topLeftY + height / 2.0f - aH / 2.0f; -+ break; -+ default: -+ break; -+ } -+ } -+ else -+ { -+ /* arrow is visible (no preview is painted over it) */ -+ box.x1 = s->x * (width + border) + topLeftX + border; -+ box.x1 += width / 2 - aW / 2; -+ box.y1 = s->y * (height + border) + topLeftY + border; -+ box.y1 += height / 2 - aH / 2; -+ } -+ -+ box.x2 = box.x1 + aW; -+ box.y2 = box.y1 + aH; -+ -+ glTranslatef (box.x1 + aW / 2, box.y1 + aH / 2, 0.0f); -+ glRotatef (ws->direction, 0.0f, 0.0f, 1.0f); -+ glTranslatef (-box.x1 - aW / 2, -box.y1 - aH / 2, 0.0f); -+ -+ matrix = ws->arrowContext.texture.matrix; -+ matrix.x0 -= box.x1 * matrix.xx; -+ matrix.y0 -= box.y1 * matrix.yy; -+ -+ glBegin (GL_QUADS); -+ wallDrawQuad (&matrix, &box); -+ glEnd (); -+ -+ disableTexture (s, &ws->arrowContext.texture); -+ } -+ } -+ -+ glDisable (GL_BLEND); -+ glEnableClientState (GL_TEXTURE_COORD_ARRAY); -+ screenTexEnvMode (s, GL_REPLACE); -+ glColor4usv (defaultColor); -+} -+ -+static void -+wallPaintScreen (CompScreen *s, -+ CompOutput *outputs, -+ int numOutputs, -+ unsigned int mask) -+{ -+ WALL_SCREEN (s); -+ -+ if (ws->moving && numOutputs > 1 && wallGetMmmode(s) == MmmodeSwitchAll) -+ { -+ outputs = &s->fullscreenOutput; -+ numOutputs = 1; -+ } -+ -+ UNWRAP (ws, s, paintScreen); -+ (*s->paintScreen) (s, outputs, numOutputs, mask); -+ WRAP (ws, s, paintScreen, wallPaintScreen); -+} -+ -+static Bool -+wallPaintOutput (CompScreen *s, -+ const ScreenPaintAttrib *sAttrib, -+ const CompTransform *transform, -+ Region region, -+ CompOutput *output, -+ unsigned int mask) -+{ -+ Bool status; -+ -+ WALL_SCREEN (s); -+ -+ ws->transform = NoTransformation; -+ if (ws->moving) -+ mask |= PAINT_SCREEN_TRANSFORMED_MASK | -+ PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK; -+ -+ UNWRAP (ws, s, paintOutput); -+ status = (*s->paintOutput) (s, sAttrib, transform, region, output, mask); -+ WRAP (ws, s, paintOutput, wallPaintOutput); -+ -+ if (wallGetShowSwitcher (s->display) && -+ (ws->moving || ws->showPreview || ws->boxTimeout) && -+ (output->id == ws->boxOutputDevice || output == &s->fullscreenOutput)) -+ { -+ CompTransform sTransform = *transform; -+ -+ transformToScreenSpace (s, output, -DEFAULT_Z_CAMERA, &sTransform); -+ -+ glPushMatrix (); -+ glLoadMatrixf (sTransform.m); -+ -+ wallDrawCairoTextureOnScreen (s); -+ -+ glPopMatrix (); -+ -+ if (wallGetMiniscreen (s->display)) -+ { -+ int i, j; -+ float mw, mh; -+ -+ mw = ws->viewportWidth; -+ mh = ws->viewportHeight; -+ -+ ws->transform = MiniScreen; -+ ws->mSAttribs.xScale = mw / s->width; -+ ws->mSAttribs.yScale = mh / s->height; -+ ws->mSAttribs.opacity = OPAQUE * (1.0 + ws->mSzCamera); -+ ws->mSAttribs.saturation = COLOR; -+ -+ for (j = 0; j < s->vsize; j++) -+ { -+ for (i = 0; i < s->hsize; i++) -+ { -+ float mx, my; -+ unsigned int msMask; -+ -+ mx = ws->firstViewportX + -+ (i * (ws->viewportWidth + ws->viewportBorder)); -+ my = ws->firstViewportY + -+ (j * (ws->viewportHeight + ws->viewportBorder)); -+ -+ ws->mSAttribs.xTranslate = mx / output->width; -+ ws->mSAttribs.yTranslate = -my / output->height; -+ -+ ws->mSAttribs.brightness = 0.4f * BRIGHT; -+ -+ if (i == s->x && j == s->y && ws->moving) -+ ws->mSAttribs.brightness = BRIGHT; -+ -+ if ((ws->boxTimeout || ws->showPreview) && -+ !ws->moving && i == s->x && j == s->y) -+ { -+ ws->mSAttribs.brightness = BRIGHT; -+ } -+ -+ setWindowPaintOffset (s, (s->x - i) * s->width, -+ (s->y - j) * s->height); -+ -+ msMask = mask | PAINT_SCREEN_TRANSFORMED_MASK; -+ (*s->paintTransformedOutput) (s, sAttrib, transform, -+ region, output, msMask); -+ -+ -+ } -+ } -+ ws->transform = NoTransformation; -+ setWindowPaintOffset (s, 0, 0); -+ } -+ } -+ -+ return status; -+} -+ -+static void -+wallPreparePaintScreen (CompScreen *s, -+ int msSinceLastPaint) -+{ -+ WALL_SCREEN (s); -+ -+ if (!ws->moving && !ws->showPreview && ws->boxTimeout) -+ ws->boxTimeout -= msSinceLastPaint; -+ -+ if (ws->timer) -+ ws->timer -= msSinceLastPaint; -+ -+ if (ws->moving) -+ { -+ wallComputeTranslation (s, &ws->curPosX, &ws->curPosY); -+ -+ if (ws->moveWindow) -+ { -+ CompWindow *w; -+ -+ w = findWindowAtScreen (s, ws->moveWindow); -+ if (w) -+ { -+ float dx, dy; -+ -+ dx = ws->gotoX - ws->curPosX; -+ dy = ws->gotoY - ws->curPosY; -+ -+ moveWindowToViewportPosition (w, -+ ws->moveWindowX - s->width * dx, -+ ws->moveWindowY - s->height * dy, -+ TRUE); -+ } -+ } -+ } -+ -+ if (ws->moving && ws->curPosX == ws->gotoX && ws->curPosY == ws->gotoY) -+ { -+ ws->moving = FALSE; -+ ws->timer = 0; -+ -+ if (ws->moveWindow) -+ wallReleaseMoveWindow (s); -+ else if (ws->focusDefault) -+ { -+ int i; -+ for (i = 0; i < s->maxGrab; i++) -+ if (s->grabs[i].active) -+ if (strcmp(s->grabs[i].name, "switcher") == 0) -+ break; -+ -+ /* only focus default window if switcher is not active */ -+ if (i == s->maxGrab) -+ focusDefaultWindow (s); -+ } -+ } -+ -+ UNWRAP (ws, s, preparePaintScreen); -+ (*s->preparePaintScreen) (s, msSinceLastPaint); -+ WRAP (ws, s, preparePaintScreen, wallPreparePaintScreen); -+} -+ -+static void -+wallPaintTransformedOutput (CompScreen *s, -+ const ScreenPaintAttrib *sAttrib, -+ const CompTransform *transform, -+ Region region, -+ CompOutput *output, -+ unsigned int mask) -+{ -+ WALL_SCREEN (s); -+ Bool clear = (mask & PAINT_SCREEN_CLEAR_MASK); -+ -+ if (ws->transform == MiniScreen) -+ { -+ CompTransform sTransform = *transform; -+ -+ mask &= ~PAINT_SCREEN_CLEAR_MASK; -+ -+ /* move each screen to the correct output position */ -+ -+ matrixTranslate (&sTransform, -+ -(float) output->region.extents.x1 / -+ (float) output->width, -+ (float) output->region.extents.y1 / -+ (float) output->height, 0.0f); -+ matrixTranslate (&sTransform, 0.0f, 0.0f, -DEFAULT_Z_CAMERA); -+ -+ matrixTranslate (&sTransform, -+ ws->mSAttribs.xTranslate, -+ ws->mSAttribs.yTranslate, -+ ws->mSzCamera); -+ -+ /* move origin to top left */ -+ matrixTranslate (&sTransform, -0.5f, 0.5f, 0.0f); -+ matrixScale (&sTransform, -+ ws->mSAttribs.xScale, ws->mSAttribs.yScale, 1.0); -+ -+ /* revert prepareXCoords region shift. -+ Now all screens display the same */ -+ matrixTranslate (&sTransform, 0.5f, 0.5f, DEFAULT_Z_CAMERA); -+ matrixTranslate (&sTransform, -+ (float) output->region.extents.x1 / -+ (float) output->width, -+ -(float) output->region.extents.y2 / -+ (float) output->height, 0.0f); -+ -+ UNWRAP (ws, s, paintTransformedOutput); -+ (*s->paintTransformedOutput) (s, sAttrib, &sTransform, -+ &s->region, output, mask); -+ WRAP (ws, s, paintTransformedOutput, wallPaintTransformedOutput); -+ return; -+ } -+ -+ UNWRAP (ws, s, paintTransformedOutput); -+ -+ if (!ws->moving) -+ (*s->paintTransformedOutput) (s, sAttrib, transform, -+ region, output, mask); -+ -+ mask &= ~PAINT_SCREEN_CLEAR_MASK; -+ -+ if (ws->moving) -+ { -+ ScreenTransformation oldTransform = ws->transform; -+ CompTransform sTransform = *transform; -+ float xTranslate, yTranslate; -+ float px, py; -+ int tx, ty; -+ Bool movingX, movingY; -+ -+ if (clear) -+ clearTargetOutput (s->display, GL_COLOR_BUFFER_BIT); -+ -+ ws->transform = Sliding; -+ ws->currOutput = output; -+ -+ px = ws->curPosX; -+ py = ws->curPosY; -+ -+ movingX = ((int) floor (px)) != ((int) ceil (px)); -+ movingY = ((int) floor (py)) != ((int) ceil (py)); -+ -+ if (movingY) -+ { -+ ty = ceil (py) - s->y; -+ yTranslate = fmod (py, 1) - 1; -+ -+ matrixTranslate (&sTransform, 0.0f, yTranslate, 0.0f); -+ -+ if (movingX) -+ { -+ tx = ceil (px) - s->x; -+ xTranslate = 1 - fmod (px, 1); -+ -+ setWindowPaintOffset (s, (s->x - ceil(px)) * s->width, -+ (s->y - ceil(py)) * s->height); -+ -+ matrixTranslate (&sTransform, xTranslate, 0.0f, 0.0f); -+ -+ (*s->paintTransformedOutput) (s, sAttrib, &sTransform, -+ &output->region, output, mask); -+ -+ matrixTranslate (&sTransform, -xTranslate, 0.0f, 0.0f); -+ } -+ -+ tx = floor (px) - s->x; -+ xTranslate = -fmod (px, 1); -+ -+ setWindowPaintOffset (s, (s->x - floor(px)) * s->width, -+ (s->y - ceil(py)) * s->height); -+ -+ matrixTranslate (&sTransform, xTranslate, 0.0f, 0.0f); -+ -+ (*s->paintTransformedOutput) (s, sAttrib, &sTransform, -+ &output->region, output, mask); -+ matrixTranslate (&sTransform, -xTranslate, -yTranslate, 0.0f); -+ } -+ -+ ty = floor (py) - s->y; -+ yTranslate = fmod (py, 1); -+ -+ matrixTranslate (&sTransform, 0.0f, yTranslate, 0.0f); -+ -+ if (movingX) -+ { -+ tx = ceil (px) - s->x; -+ xTranslate = 1 - fmod (px, 1); -+ -+ setWindowPaintOffset (s, (s->x - ceil(px)) * s->width, -+ (s->y - floor(py)) * s->height); -+ -+ matrixTranslate (&sTransform, xTranslate, 0.0f, 0.0f); -+ -+ (*s->paintTransformedOutput) (s, sAttrib, &sTransform, -+ &output->region, output, mask); -+ -+ matrixTranslate (&sTransform, -xTranslate, 0.0f, 0.0f); -+ } -+ -+ tx = floor (px) - s->x; -+ xTranslate = -fmod (px, 1); -+ -+ setWindowPaintOffset (s, (s->x - floor(px)) * s->width, -+ (s->y - floor(py)) * s->height); -+ -+ matrixTranslate (&sTransform, xTranslate, 0.0f, 0.0f); -+ (*s->paintTransformedOutput) (s, sAttrib, &sTransform, -+ &output->region, output, mask); -+ -+ setWindowPaintOffset (s, 0, 0); -+ ws->transform = oldTransform; -+ } -+ -+ WRAP (ws, s, paintTransformedOutput, wallPaintTransformedOutput); -+} -+ -+static Bool -+wallPaintWindow (CompWindow *w, -+ const WindowPaintAttrib *attrib, -+ const CompTransform *transform, -+ Region region, -+ unsigned int mask) -+{ -+ Bool status; -+ CompScreen *s = w->screen; -+ -+ WALL_SCREEN (s); -+ -+ if (ws->transform == MiniScreen) -+ { -+ WindowPaintAttrib pA = *attrib; -+ -+ pA.opacity = attrib->opacity * -+ ((float) ws->mSAttribs.opacity / OPAQUE); -+ pA.brightness = attrib->brightness * -+ ((float) ws->mSAttribs.brightness / BRIGHT); -+ pA.saturation = attrib->saturation * -+ ((float) ws->mSAttribs.saturation / COLOR); -+ -+ if (!pA.opacity || !pA.brightness) -+ mask |= PAINT_WINDOW_NO_CORE_INSTANCE_MASK; -+ -+ UNWRAP (ws, s, paintWindow); -+ status = (*s->paintWindow) (w, &pA, transform, region, mask); -+ WRAP (ws, s, paintWindow, wallPaintWindow); -+ } -+ else if (ws->transform == Sliding) -+ { -+ CompTransform wTransform; -+ -+ WALL_WINDOW (w); -+ -+ if (!ww->isSliding) -+ { -+ matrixGetIdentity (&wTransform); -+ transformToScreenSpace (s, ws->currOutput, -DEFAULT_Z_CAMERA, -+ &wTransform); -+ mask |= PAINT_WINDOW_TRANSFORMED_MASK; -+ } -+ else -+ { -+ wTransform = *transform; -+ } -+ -+ UNWRAP (ws, s, paintWindow); -+ status = (*s->paintWindow) (w, attrib, &wTransform, region, mask); -+ WRAP (ws, s, paintWindow, wallPaintWindow); -+ } -+ else -+ { -+ UNWRAP (ws, s, paintWindow); -+ status = (*s->paintWindow) (w, attrib, transform, region, mask); -+ WRAP (ws, s, paintWindow, wallPaintWindow); -+ } -+ -+ return status; -+} -+ -+static void -+wallDonePaintScreen (CompScreen *s) -+{ -+ WALL_SCREEN (s); -+ -+ if (ws->moving || ws->showPreview || ws->boxTimeout) -+ { -+ ws->boxTimeout = MAX (0, ws->boxTimeout); -+ damageScreen (s); -+ } -+ -+ if (!ws->moving && !ws->showPreview && ws->grabIndex) -+ { -+ removeScreenGrab (s, ws->grabIndex, NULL); -+ ws->grabIndex = 0; -+ } -+ -+ UNWRAP (ws, s, donePaintScreen); -+ (*s->donePaintScreen) (s); -+ WRAP (ws, s, donePaintScreen, wallDonePaintScreen); -+ -+} -+ -+static void -+wallCreateCairoContexts (CompScreen *s, -+ Bool initial) -+{ -+ int width, height; -+ -+ WALL_SCREEN (s); -+ -+ ws->viewportWidth = VIEWPORT_SWITCHER_SIZE * -+ (float) wallGetPreviewScale (s->display) / 100.0f; -+ ws->viewportHeight = ws->viewportWidth * -+ (float) s->height / (float) s->width; -+ ws->viewportBorder = wallGetBorderWidth (s->display); -+ -+ width = s->hsize * (ws->viewportWidth + ws->viewportBorder) + -+ ws->viewportBorder; -+ height = s->vsize * (ws->viewportHeight + ws->viewportBorder) + -+ ws->viewportBorder; -+ -+ wallDestroyCairoContext (s, &ws->switcherContext); -+ ws->switcherContext.width = width; -+ ws->switcherContext.height = height; -+ wallSetupCairoContext (s, &ws->switcherContext); -+ wallDrawSwitcherBackground (s); -+ -+ wallDestroyCairoContext (s, &ws->thumbContext); -+ ws->thumbContext.width = ws->viewportWidth; -+ ws->thumbContext.height = ws->viewportHeight; -+ wallSetupCairoContext (s, &ws->thumbContext); -+ wallDrawThumb (s); -+ -+ wallDestroyCairoContext (s, &ws->highlightContext); -+ ws->highlightContext.width = ws->viewportWidth; -+ ws->highlightContext.height = ws->viewportHeight; -+ wallSetupCairoContext (s, &ws->highlightContext); -+ wallDrawHighlight (s); -+ -+ if (initial) -+ { -+ ws->arrowContext.width = ARROW_SIZE; -+ ws->arrowContext.height = ARROW_SIZE; -+ wallSetupCairoContext (s, &ws->arrowContext); -+ wallDrawArrow (s); -+ } -+} -+ -+static void -+wallDisplayOptionChanged (CompDisplay *display, -+ CompOption *opt, -+ WallDisplayOptions num) -+{ -+ CompScreen *s; -+ -+ switch(num) -+ { -+ case WallDisplayOptionOutlineColor: -+ for (s = display->screens; s; s = s->next) -+ { -+ wallDrawSwitcherBackground (s); -+ wallDrawHighlight (s); -+ wallDrawThumb (s); -+ } -+ break; -+ -+ case WallDisplayOptionEdgeRadius: -+ case WallDisplayOptionBackgroundGradientBaseColor: -+ case WallDisplayOptionBackgroundGradientHighlightColor: -+ case WallDisplayOptionBackgroundGradientShadowColor: -+ for (s = display->screens; s; s = s->next) -+ wallDrawSwitcherBackground (s); -+ break; -+ -+ case WallDisplayOptionBorderWidth: -+ case WallDisplayOptionPreviewScale: -+ for (s = display->screens; s; s = s->next) -+ wallCreateCairoContexts (s, FALSE); -+ break; -+ -+ case WallDisplayOptionThumbGradientBaseColor: -+ case WallDisplayOptionThumbGradientHighlightColor: -+ for (s = display->screens; s; s = s->next) -+ wallDrawThumb (s); -+ break; -+ -+ case WallDisplayOptionThumbHighlightGradientBaseColor: -+ case WallDisplayOptionThumbHighlightGradientShadowColor: -+ for (s = display->screens; s; s = s->next) -+ wallDrawHighlight (s); -+ break; -+ -+ case WallDisplayOptionArrowBaseColor: -+ case WallDisplayOptionArrowShadowColor: -+ for (s = display->screens; s; s = s->next) -+ wallDrawArrow (s); -+ break; -+ -+ case WallDisplayOptionNoSlideMatch: -+ for (s = display->screens; s; s = s->next) -+ { -+ CompWindow *w; -+ -+ for (w = s->windows; w; w = w->next) -+ { -+ WALL_WINDOW (w); -+ ww->isSliding = !matchEval (wallGetNoSlideMatch (display), w); -+ } -+ } -+ break; -+ -+ default: -+ break; -+ } -+} -+ -+static Bool -+wallSetOptionForPlugin (CompObject *o, -+ const char *plugin, -+ const char *name, -+ CompOptionValue *value) -+{ -+ Bool status; -+ -+ WALL_CORE (&core); -+ -+ UNWRAP (wc, &core, setOptionForPlugin); -+ status = (*core.setOptionForPlugin) (o, plugin, name, value); -+ WRAP (wc, &core, setOptionForPlugin, wallSetOptionForPlugin); -+ -+ if (status && o->type == COMP_OBJECT_TYPE_SCREEN) -+ { -+ if (strcmp (plugin, "core") == 0) -+ if (strcmp (name, "hsize") == 0 || strcmp (name, "vsize") == 0) -+ { -+ CompScreen *s = (CompScreen *) o; -+ -+ wallCreateCairoContexts (s, FALSE); -+ } -+ } -+ -+ return status; -+} -+ -+static void -+wallMatchExpHandlerChanged (CompDisplay *d) -+{ -+ CompScreen *s; -+ -+ WALL_DISPLAY (d); -+ -+ UNWRAP (wd, d, matchExpHandlerChanged); -+ (*d->matchExpHandlerChanged) (d); -+ WRAP (wd, d, matchExpHandlerChanged, wallMatchExpHandlerChanged); -+ -+ for (s = d->screens; s; s = s->next) -+ { -+ CompWindow *w; -+ -+ for (w = s->windows; w; w = w->next) -+ { -+ WALL_WINDOW (w); -+ -+ ww->isSliding = !matchEval (wallGetNoSlideMatch (d), w); -+ } -+ } -+} -+ -+static void -+wallMatchPropertyChanged (CompDisplay *d, -+ CompWindow *w) -+{ -+ WALL_DISPLAY (d); -+ WALL_WINDOW (w); -+ -+ UNWRAP (wd, d, matchPropertyChanged); -+ (*d->matchPropertyChanged) (d, w); -+ WRAP (wd, d, matchPropertyChanged, wallMatchPropertyChanged); -+ -+ ww->isSliding = !matchEval (wallGetNoSlideMatch (d), w); -+} -+ -+static void -+wallWindowGrabNotify (CompWindow *w, -+ int x, -+ int y, -+ unsigned int state, -+ unsigned int mask) -+{ -+ WALL_SCREEN (w->screen); -+ -+ if (!ws->grabWindow) -+ ws->grabWindow = w; -+ -+ UNWRAP (ws, w->screen, windowGrabNotify); -+ (*w->screen->windowGrabNotify) (w, x, y, state, mask); -+ WRAP (ws, w->screen, windowGrabNotify, wallWindowGrabNotify); -+} -+ -+static void -+wallWindowUngrabNotify (CompWindow *w) -+{ -+ WALL_SCREEN (w->screen); -+ -+ if (w == ws->grabWindow) -+ ws->grabWindow = NULL; -+ -+ UNWRAP (ws, w->screen, windowUngrabNotify); -+ (*w->screen->windowUngrabNotify) (w); -+ WRAP (ws, w->screen, windowUngrabNotify, wallWindowUngrabNotify); -+} -+ -+static void -+wallWindowAdd (CompScreen *s, -+ CompWindow *w) -+{ -+ WALL_WINDOW (w); -+ -+ ww->isSliding = !matchEval (wallGetNoSlideMatch (s->display), w); -+} -+ -+static void -+wallObjectAdd (CompObject *parent, -+ CompObject *object) -+{ -+ static ObjectAddProc dispTab[] = { -+ (ObjectAddProc) 0, /* CoreAdd */ -+ (ObjectAddProc) 0, /* DisplayAdd */ -+ (ObjectAddProc) 0, /* ScreenAdd */ -+ (ObjectAddProc) wallWindowAdd -+ }; -+ -+ WALL_CORE (&core); -+ -+ UNWRAP (wc, &core, objectAdd); -+ (*core.objectAdd) (parent, object); -+ WRAP (wc, &core, objectAdd, wallObjectAdd); -+ -+ DISPATCH (object, dispTab, ARRAY_SIZE (dispTab), (parent, object)); -+} -+ -+static Bool -+wallInitCore (CompPlugin *p, -+ CompCore *c) -+{ -+ WallCore *wc; -+ -+ if (!checkPluginABI ("core", CORE_ABIVERSION)) -+ return FALSE; -+ -+ wc = malloc (sizeof (WallCore)); -+ if (!wc) -+ return FALSE; -+ -+ WallDisplayPrivateIndex = allocateDisplayPrivateIndex (); -+ if (WallDisplayPrivateIndex < 0) -+ { -+ free (wc); -+ return FALSE; -+ } -+ -+ WRAP (wc, c, setOptionForPlugin, wallSetOptionForPlugin); -+ WRAP (wc, c, objectAdd, wallObjectAdd); -+ -+ c->base.privates[WallCorePrivateIndex].ptr = wc; -+ -+ return TRUE; -+} -+ -+static void -+wallFiniCore (CompPlugin *p, -+ CompCore *c) -+{ -+ WALL_CORE (c); -+ -+ UNWRAP (wc, c, setOptionForPlugin); -+ UNWRAP (wc, c, objectAdd); -+ -+ freeDisplayPrivateIndex (WallDisplayPrivateIndex); -+ -+ free (wc); -+} -+ -+static Bool -+wallInitDisplay (CompPlugin *p, -+ CompDisplay *d) -+{ -+ WallDisplay *wd; -+ -+ wd = malloc (sizeof (WallDisplay)); -+ if (!wd) -+ return FALSE; -+ -+ wd->screenPrivateIndex = allocateScreenPrivateIndex (d); -+ if (wd->screenPrivateIndex < 0) -+ { -+ free (wd); -+ return FALSE; -+ } -+ -+ wallSetLeftKeyInitiate (d, wallLeft); -+ wallSetLeftKeyTerminate (d, wallTerminate); -+ wallSetRightKeyInitiate (d, wallRight); -+ wallSetRightKeyTerminate (d, wallTerminate); -+ wallSetUpKeyInitiate (d, wallUp); -+ wallSetUpKeyTerminate (d, wallTerminate); -+ wallSetDownKeyInitiate (d, wallDown); -+ wallSetDownKeyTerminate (d, wallTerminate); -+ wallSetNextKeyInitiate (d, wallNext); -+ wallSetNextKeyTerminate (d, wallTerminate); -+ wallSetPrevKeyInitiate (d, wallPrev); -+ wallSetPrevKeyTerminate (d, wallTerminate); -+ wallSetLeftButtonInitiate (d, wallLeft); -+ wallSetLeftButtonTerminate (d, wallTerminate); -+ wallSetRightButtonInitiate (d, wallRight); -+ wallSetRightButtonTerminate (d, wallTerminate); -+ wallSetUpButtonInitiate (d, wallUp); -+ wallSetUpButtonTerminate (d, wallTerminate); -+ wallSetDownButtonInitiate (d, wallDown); -+ wallSetDownButtonTerminate (d, wallTerminate); -+ wallSetNextButtonInitiate (d, wallNext); -+ wallSetNextButtonTerminate (d, wallTerminate); -+ wallSetPrevButtonInitiate (d, wallPrev); -+ wallSetPrevButtonTerminate (d, wallTerminate); -+ wallSetLeftWindowKeyInitiate (d, wallLeftWithWindow); -+ wallSetLeftWindowKeyTerminate (d, wallTerminate); -+ wallSetRightWindowKeyInitiate (d, wallRightWithWindow); -+ wallSetRightWindowKeyTerminate (d, wallTerminate); -+ wallSetUpWindowKeyInitiate (d, wallUpWithWindow); -+ wallSetUpWindowKeyTerminate (d, wallTerminate); -+ wallSetDownWindowKeyInitiate (d, wallDownWithWindow); -+ wallSetDownWindowKeyTerminate (d, wallTerminate); -+ wallSetFlipLeftEdgeInitiate (d, wallFlipLeft); -+ wallSetFlipRightEdgeInitiate (d, wallFlipRight); -+ wallSetFlipUpEdgeInitiate (d, wallFlipUp); -+ wallSetFlipDownEdgeInitiate (d, wallFlipDown); -+ -+ wallSetEdgeRadiusNotify (d, wallDisplayOptionChanged); -+ wallSetBorderWidthNotify (d, wallDisplayOptionChanged); -+ wallSetPreviewScaleNotify (d, wallDisplayOptionChanged); -+ wallSetOutlineColorNotify (d, wallDisplayOptionChanged); -+ wallSetBackgroundGradientBaseColorNotify (d, wallDisplayOptionChanged); -+ wallSetBackgroundGradientHighlightColorNotify (d, wallDisplayOptionChanged); -+ wallSetBackgroundGradientShadowColorNotify (d, wallDisplayOptionChanged); -+ wallSetThumbGradientBaseColorNotify (d, wallDisplayOptionChanged); -+ wallSetThumbGradientHighlightColorNotify (d, wallDisplayOptionChanged); -+ wallSetThumbHighlightGradientBaseColorNotify (d, wallDisplayOptionChanged); -+ wallSetThumbHighlightGradientShadowColorNotify (d, -+ wallDisplayOptionChanged); -+ wallSetArrowBaseColorNotify (d, wallDisplayOptionChanged); -+ wallSetArrowShadowColorNotify (d, wallDisplayOptionChanged); -+ wallSetNoSlideMatchNotify (d, wallDisplayOptionChanged); -+ -+ WRAP (wd, d, handleEvent, wallHandleEvent); -+ WRAP (wd, d, matchExpHandlerChanged, wallMatchExpHandlerChanged); -+ WRAP (wd, d, matchPropertyChanged, wallMatchPropertyChanged); -+ -+ d->base.privates[WallDisplayPrivateIndex].ptr = wd; -+ -+ return TRUE; -+} -+ -+static void -+wallFiniDisplay (CompPlugin *p, -+ CompDisplay *d) -+{ -+ WALL_DISPLAY (d); -+ -+ UNWRAP (wd, d, handleEvent); -+ UNWRAP (wd, d, matchExpHandlerChanged); -+ UNWRAP (wd, d, matchPropertyChanged); -+ -+ freeScreenPrivateIndex (d, wd->screenPrivateIndex); -+ free (wd); -+} -+ -+static Bool -+wallInitScreen (CompPlugin *p, -+ CompScreen *s) -+{ -+ WallScreen *ws; -+ -+ WALL_DISPLAY (s->display); -+ -+ ws = malloc (sizeof (WallScreen)); -+ if (!ws) -+ return FALSE; -+ -+ ws->windowPrivateIndex = allocateWindowPrivateIndex (s); -+ if (ws->windowPrivateIndex < 0) -+ { -+ free (ws); -+ return FALSE; -+ } -+ -+ ws->timer = 0; -+ ws->boxTimeout = 0; -+ ws->grabIndex = 0; -+ -+ ws->moving = FALSE; -+ ws->showPreview = FALSE; -+ ws->focusDefault = TRUE; -+ ws->moveWindow = None; -+ ws->grabWindow = NULL; -+ -+ ws->transform = NoTransformation; -+ ws->direction = -1; -+ -+ memset (&ws->switcherContext, 0, sizeof (WallCairoContext)); -+ memset (&ws->thumbContext, 0, sizeof (WallCairoContext)); -+ memset (&ws->highlightContext, 0, sizeof (WallCairoContext)); -+ memset (&ws->arrowContext, 0, sizeof (WallCairoContext)); -+ -+ WRAP (ws, s, paintScreen, wallPaintScreen); -+ WRAP (ws, s, paintOutput, wallPaintOutput); -+ WRAP (ws, s, donePaintScreen, wallDonePaintScreen); -+ WRAP (ws, s, paintTransformedOutput, wallPaintTransformedOutput); -+ WRAP (ws, s, preparePaintScreen, wallPreparePaintScreen); -+ WRAP (ws, s, paintWindow, wallPaintWindow); -+ WRAP (ws, s, windowGrabNotify, wallWindowGrabNotify); -+ WRAP (ws, s, windowUngrabNotify, wallWindowUngrabNotify); -+ WRAP (ws, s, activateWindow, wallActivateWindow); -+ -+ s->base.privates[wd->screenPrivateIndex].ptr = ws; -+ -+ wallCreateCairoContexts (s, TRUE); -+ -+ return TRUE; -+} -+ -+static void -+wallFiniScreen (CompPlugin *p, -+ CompScreen *s) -+{ -+ WALL_SCREEN (s); -+ -+ if (ws->grabIndex) -+ removeScreenGrab (s, ws->grabIndex, NULL); -+ -+ wallDestroyCairoContext (s, &ws->switcherContext); -+ wallDestroyCairoContext (s, &ws->thumbContext); -+ wallDestroyCairoContext (s, &ws->highlightContext); -+ wallDestroyCairoContext (s, &ws->arrowContext); -+ -+ UNWRAP (ws, s, paintScreen); -+ UNWRAP (ws, s, paintOutput); -+ UNWRAP (ws, s, donePaintScreen); -+ UNWRAP (ws, s, paintTransformedOutput); -+ UNWRAP (ws, s, preparePaintScreen); -+ UNWRAP (ws, s, paintWindow); -+ UNWRAP (ws, s, windowGrabNotify); -+ UNWRAP (ws, s, windowUngrabNotify); -+ UNWRAP (ws, s, activateWindow); -+ -+ freeWindowPrivateIndex (s, ws->windowPrivateIndex); -+ -+ free(ws); -+} -+ -+static CompBool -+wallInitWindow (CompPlugin *p, -+ CompWindow *w) -+{ -+ WallWindow *ww; -+ -+ WALL_SCREEN (w->screen); -+ -+ ww = malloc (sizeof (WallWindow)); -+ if (!ww) -+ return FALSE; -+ -+ ww->isSliding = TRUE; -+ -+ w->base.privates[ws->windowPrivateIndex].ptr = ww; -+ -+ return TRUE; -+} -+ -+static void -+wallFiniWindow (CompPlugin *p, -+ CompWindow *w) -+{ -+ WALL_WINDOW (w); -+ -+ free (ww); -+} -+ -+static CompBool -+wallInitObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static InitPluginObjectProc dispTab[] = { -+ (InitPluginObjectProc) wallInitCore, -+ (InitPluginObjectProc) wallInitDisplay, -+ (InitPluginObjectProc) wallInitScreen, -+ (InitPluginObjectProc) wallInitWindow -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o)); -+} -+ -+static void -+wallFiniObject (CompPlugin *p, -+ CompObject *o) -+{ -+ static FiniPluginObjectProc dispTab[] = { -+ (FiniPluginObjectProc) wallFiniCore, -+ (FiniPluginObjectProc) wallFiniDisplay, -+ (FiniPluginObjectProc) wallFiniScreen, -+ (FiniPluginObjectProc) wallFiniWindow -+ }; -+ -+ DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o)); -+} -+ -+static Bool -+wallInit (CompPlugin *p) -+{ -+ dlopen ("libcairo.so.2", RTLD_LAZY); -+ WallCorePrivateIndex = allocateCorePrivateIndex (); -+ if (WallCorePrivateIndex < 0) -+ return FALSE; -+ -+ return TRUE; -+} -+ -+static void -+wallFini (CompPlugin *p) -+{ -+ freeCorePrivateIndex (WallCorePrivateIndex); -+} -+ -+CompPluginVTable wallVTable = { -+ "wall", -+ 0, -+ wallInit, -+ wallFini, -+ wallInitObject, -+ wallFiniObject, -+ 0, -+ 0 -+}; -+ -+CompPluginVTable* -+getCompPluginInfo (void) -+{ -+ return &wallVTable; -+} -diff -upNr compiz-0.8.6.orign/plugins/wall_options.c compiz-0.8.6/plugins/wall_options.c ---- compiz-0.8.6.orign/plugins/wall_options.c 1970-01-01 01:00:00.000000000 +0100 -+++ compiz-0.8.6/plugins/wall_options.c 2010-03-30 14:53:23.509344956 +0200 -@@ -0,0 +1,1949 @@ -+/* -+ * This file is autogenerated with bcop: -+ * The Compiz option code generator -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#include -+#include -+#include -+ -+#include -+ -+#include "wall_options.h" -+ -+static int WallOptionsDisplayPrivateIndex; -+ -+static CompMetadata wallOptionsMetadata; -+ -+static CompPluginVTable *wallPluginVTable = NULL; -+CompPluginVTable wallOptionsVTable; -+ -+#define WALL_OPTIONS_DISPLAY(d) PLUGIN_DISPLAY(d, WallOptions, o) -+#define WALL_OPTIONS_SCREEN(s) PLUGIN_SCREEN(s, WallOptions, o) -+ -+typedef struct _WallOptionsDisplay -+{ -+ int screenPrivateIndex; -+ -+ CompOption opt[WallDisplayOptionNum]; -+ wallDisplayOptionChangeNotifyProc notify[WallDisplayOptionNum]; -+} WallOptionsDisplay; -+ -+typedef struct _WallOptionsScreen -+{ -+ CompOption opt[WallScreenOptionNum]; -+ wallScreenOptionChangeNotifyProc notify[WallScreenOptionNum]; -+} WallOptionsScreen; -+ -+Bool wallGetShowSwitcher (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionShowSwitcher].value.b; -+} -+ -+CompOption * wallGetShowSwitcherOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionShowSwitcher]; -+} -+ -+void wallSetShowSwitcherNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionShowSwitcher] = notify; -+} -+ -+Bool wallGetMiniscreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionMiniscreen].value.b; -+} -+ -+CompOption * wallGetMiniscreenOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionMiniscreen]; -+} -+ -+void wallSetMiniscreenNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionMiniscreen] = notify; -+} -+ -+float wallGetPreviewTimeout (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionPreviewTimeout].value.f; -+} -+ -+CompOption * wallGetPreviewTimeoutOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPreviewTimeout]; -+} -+ -+void wallSetPreviewTimeoutNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionPreviewTimeout] = notify; -+} -+ -+int wallGetPreviewScale (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionPreviewScale].value.i; -+} -+ -+CompOption * wallGetPreviewScaleOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPreviewScale]; -+} -+ -+void wallSetPreviewScaleNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionPreviewScale] = notify; -+} -+ -+int wallGetEdgeRadius (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionEdgeRadius].value.i; -+} -+ -+CompOption * wallGetEdgeRadiusOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionEdgeRadius]; -+} -+ -+void wallSetEdgeRadiusNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionEdgeRadius] = notify; -+} -+ -+int wallGetBorderWidth (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBorderWidth].value.i; -+} -+ -+CompOption * wallGetBorderWidthOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionBorderWidth]; -+} -+ -+void wallSetBorderWidthNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionBorderWidth] = notify; -+} -+ -+unsigned short * wallGetOutlineColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionOutlineColor].value.c; -+} -+ -+unsigned short wallGetOutlineColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionOutlineColor].value.c[0]; -+} -+ -+unsigned short wallGetOutlineColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionOutlineColor].value.c[1]; -+} -+ -+unsigned short wallGetOutlineColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionOutlineColor].value.c[2]; -+} -+ -+unsigned short wallGetOutlineColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionOutlineColor].value.c[3]; -+} -+ -+CompOption * wallGetOutlineColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionOutlineColor]; -+} -+ -+void wallSetOutlineColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionOutlineColor] = notify; -+} -+ -+unsigned short * wallGetBackgroundGradientBaseColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientBaseColor].value.c; -+} -+ -+unsigned short wallGetBackgroundGradientBaseColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientBaseColor].value.c[0]; -+} -+ -+unsigned short wallGetBackgroundGradientBaseColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientBaseColor].value.c[1]; -+} -+ -+unsigned short wallGetBackgroundGradientBaseColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientBaseColor].value.c[2]; -+} -+ -+unsigned short wallGetBackgroundGradientBaseColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientBaseColor].value.c[3]; -+} -+ -+CompOption * wallGetBackgroundGradientBaseColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionBackgroundGradientBaseColor]; -+} -+ -+void wallSetBackgroundGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionBackgroundGradientBaseColor] = notify; -+} -+ -+unsigned short * wallGetBackgroundGradientHighlightColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientHighlightColor].value.c; -+} -+ -+unsigned short wallGetBackgroundGradientHighlightColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientHighlightColor].value.c[0]; -+} -+ -+unsigned short wallGetBackgroundGradientHighlightColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientHighlightColor].value.c[1]; -+} -+ -+unsigned short wallGetBackgroundGradientHighlightColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientHighlightColor].value.c[2]; -+} -+ -+unsigned short wallGetBackgroundGradientHighlightColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientHighlightColor].value.c[3]; -+} -+ -+CompOption * wallGetBackgroundGradientHighlightColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionBackgroundGradientHighlightColor]; -+} -+ -+void wallSetBackgroundGradientHighlightColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionBackgroundGradientHighlightColor] = notify; -+} -+ -+unsigned short * wallGetBackgroundGradientShadowColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientShadowColor].value.c; -+} -+ -+unsigned short wallGetBackgroundGradientShadowColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientShadowColor].value.c[0]; -+} -+ -+unsigned short wallGetBackgroundGradientShadowColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientShadowColor].value.c[1]; -+} -+ -+unsigned short wallGetBackgroundGradientShadowColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientShadowColor].value.c[2]; -+} -+ -+unsigned short wallGetBackgroundGradientShadowColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionBackgroundGradientShadowColor].value.c[3]; -+} -+ -+CompOption * wallGetBackgroundGradientShadowColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionBackgroundGradientShadowColor]; -+} -+ -+void wallSetBackgroundGradientShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionBackgroundGradientShadowColor] = notify; -+} -+ -+unsigned short * wallGetThumbGradientBaseColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientBaseColor].value.c; -+} -+ -+unsigned short wallGetThumbGradientBaseColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientBaseColor].value.c[0]; -+} -+ -+unsigned short wallGetThumbGradientBaseColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientBaseColor].value.c[1]; -+} -+ -+unsigned short wallGetThumbGradientBaseColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientBaseColor].value.c[2]; -+} -+ -+unsigned short wallGetThumbGradientBaseColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientBaseColor].value.c[3]; -+} -+ -+CompOption * wallGetThumbGradientBaseColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionThumbGradientBaseColor]; -+} -+ -+void wallSetThumbGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionThumbGradientBaseColor] = notify; -+} -+ -+unsigned short * wallGetThumbGradientHighlightColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientHighlightColor].value.c; -+} -+ -+unsigned short wallGetThumbGradientHighlightColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientHighlightColor].value.c[0]; -+} -+ -+unsigned short wallGetThumbGradientHighlightColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientHighlightColor].value.c[1]; -+} -+ -+unsigned short wallGetThumbGradientHighlightColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientHighlightColor].value.c[2]; -+} -+ -+unsigned short wallGetThumbGradientHighlightColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbGradientHighlightColor].value.c[3]; -+} -+ -+CompOption * wallGetThumbGradientHighlightColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionThumbGradientHighlightColor]; -+} -+ -+void wallSetThumbGradientHighlightColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionThumbGradientHighlightColor] = notify; -+} -+ -+unsigned short * wallGetThumbHighlightGradientBaseColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientBaseColor].value.c; -+} -+ -+unsigned short wallGetThumbHighlightGradientBaseColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientBaseColor].value.c[0]; -+} -+ -+unsigned short wallGetThumbHighlightGradientBaseColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientBaseColor].value.c[1]; -+} -+ -+unsigned short wallGetThumbHighlightGradientBaseColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientBaseColor].value.c[2]; -+} -+ -+unsigned short wallGetThumbHighlightGradientBaseColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientBaseColor].value.c[3]; -+} -+ -+CompOption * wallGetThumbHighlightGradientBaseColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionThumbHighlightGradientBaseColor]; -+} -+ -+void wallSetThumbHighlightGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionThumbHighlightGradientBaseColor] = notify; -+} -+ -+unsigned short * wallGetThumbHighlightGradientShadowColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientShadowColor].value.c; -+} -+ -+unsigned short wallGetThumbHighlightGradientShadowColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientShadowColor].value.c[0]; -+} -+ -+unsigned short wallGetThumbHighlightGradientShadowColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientShadowColor].value.c[1]; -+} -+ -+unsigned short wallGetThumbHighlightGradientShadowColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientShadowColor].value.c[2]; -+} -+ -+unsigned short wallGetThumbHighlightGradientShadowColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionThumbHighlightGradientShadowColor].value.c[3]; -+} -+ -+CompOption * wallGetThumbHighlightGradientShadowColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionThumbHighlightGradientShadowColor]; -+} -+ -+void wallSetThumbHighlightGradientShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionThumbHighlightGradientShadowColor] = notify; -+} -+ -+unsigned short * wallGetArrowBaseColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowBaseColor].value.c; -+} -+ -+unsigned short wallGetArrowBaseColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowBaseColor].value.c[0]; -+} -+ -+unsigned short wallGetArrowBaseColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowBaseColor].value.c[1]; -+} -+ -+unsigned short wallGetArrowBaseColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowBaseColor].value.c[2]; -+} -+ -+unsigned short wallGetArrowBaseColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowBaseColor].value.c[3]; -+} -+ -+CompOption * wallGetArrowBaseColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionArrowBaseColor]; -+} -+ -+void wallSetArrowBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionArrowBaseColor] = notify; -+} -+ -+unsigned short * wallGetArrowShadowColor (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowShadowColor].value.c; -+} -+ -+unsigned short wallGetArrowShadowColorRed (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowShadowColor].value.c[0]; -+} -+ -+unsigned short wallGetArrowShadowColorGreen (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowShadowColor].value.c[1]; -+} -+ -+unsigned short wallGetArrowShadowColorBlue (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowShadowColor].value.c[2]; -+} -+ -+unsigned short wallGetArrowShadowColorAlpha (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionArrowShadowColor].value.c[3]; -+} -+ -+CompOption * wallGetArrowShadowColorOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionArrowShadowColor]; -+} -+ -+void wallSetArrowShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionArrowShadowColor] = notify; -+} -+ -+Bool wallGetAllowWraparound (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionAllowWraparound].value.b; -+} -+ -+CompOption * wallGetAllowWraparoundOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionAllowWraparound]; -+} -+ -+void wallSetAllowWraparoundNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionAllowWraparound] = notify; -+} -+ -+float wallGetSlideDuration (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return od->opt[WallDisplayOptionSlideDuration].value.f; -+} -+ -+CompOption * wallGetSlideDurationOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionSlideDuration]; -+} -+ -+void wallSetSlideDurationNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionSlideDuration] = notify; -+} -+ -+CompMatch * wallGetNoSlideMatch (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNoSlideMatch].value.match; -+} -+ -+CompOption * wallGetNoSlideMatchOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNoSlideMatch]; -+} -+ -+void wallSetNoSlideMatchNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionNoSlideMatch] = notify; -+} -+ -+CompAction * wallGetLeftKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftKey].value.action; -+} -+ -+void wallSetLeftKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftKey].value.action.initiate = init; -+} -+ -+void wallSetLeftKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetLeftKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftKey]; -+} -+ -+void wallSetLeftKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionLeftKey] = notify; -+} -+ -+CompAction * wallGetLeftButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftButton].value.action; -+} -+ -+void wallSetLeftButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftButton].value.action.initiate = init; -+} -+ -+void wallSetLeftButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetLeftButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftButton]; -+} -+ -+void wallSetLeftButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionLeftButton] = notify; -+} -+ -+CompAction * wallGetRightKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightKey].value.action; -+} -+ -+void wallSetRightKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightKey].value.action.initiate = init; -+} -+ -+void wallSetRightKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetRightKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightKey]; -+} -+ -+void wallSetRightKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionRightKey] = notify; -+} -+ -+CompAction * wallGetRightButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightButton].value.action; -+} -+ -+void wallSetRightButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightButton].value.action.initiate = init; -+} -+ -+void wallSetRightButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetRightButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightButton]; -+} -+ -+void wallSetRightButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionRightButton] = notify; -+} -+ -+CompAction * wallGetUpKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpKey].value.action; -+} -+ -+void wallSetUpKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpKey].value.action.initiate = init; -+} -+ -+void wallSetUpKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetUpKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpKey]; -+} -+ -+void wallSetUpKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionUpKey] = notify; -+} -+ -+CompAction * wallGetUpButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpButton].value.action; -+} -+ -+void wallSetUpButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpButton].value.action.initiate = init; -+} -+ -+void wallSetUpButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetUpButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpButton]; -+} -+ -+void wallSetUpButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionUpButton] = notify; -+} -+ -+CompAction * wallGetDownKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownKey].value.action; -+} -+ -+void wallSetDownKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownKey].value.action.initiate = init; -+} -+ -+void wallSetDownKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetDownKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownKey]; -+} -+ -+void wallSetDownKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionDownKey] = notify; -+} -+ -+CompAction * wallGetDownButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownButton].value.action; -+} -+ -+void wallSetDownButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownButton].value.action.initiate = init; -+} -+ -+void wallSetDownButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetDownButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownButton]; -+} -+ -+void wallSetDownButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionDownButton] = notify; -+} -+ -+CompAction * wallGetNextKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNextKey].value.action; -+} -+ -+void wallSetNextKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionNextKey].value.action.initiate = init; -+} -+ -+void wallSetNextKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionNextKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetNextKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNextKey]; -+} -+ -+void wallSetNextKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionNextKey] = notify; -+} -+ -+CompAction * wallGetNextButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNextButton].value.action; -+} -+ -+void wallSetNextButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionNextButton].value.action.initiate = init; -+} -+ -+void wallSetNextButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionNextButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetNextButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionNextButton]; -+} -+ -+void wallSetNextButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionNextButton] = notify; -+} -+ -+CompAction * wallGetPrevKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPrevKey].value.action; -+} -+ -+void wallSetPrevKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionPrevKey].value.action.initiate = init; -+} -+ -+void wallSetPrevKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionPrevKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetPrevKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPrevKey]; -+} -+ -+void wallSetPrevKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionPrevKey] = notify; -+} -+ -+CompAction * wallGetPrevButton (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPrevButton].value.action; -+} -+ -+void wallSetPrevButtonInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionPrevButton].value.action.initiate = init; -+} -+ -+void wallSetPrevButtonTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionPrevButton].value.action.terminate = term; -+} -+ -+CompOption * wallGetPrevButtonOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionPrevButton]; -+} -+ -+void wallSetPrevButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionPrevButton] = notify; -+} -+ -+CompAction * wallGetLeftWindowKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftWindowKey].value.action; -+} -+ -+void wallSetLeftWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftWindowKey].value.action.initiate = init; -+} -+ -+void wallSetLeftWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionLeftWindowKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetLeftWindowKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionLeftWindowKey]; -+} -+ -+void wallSetLeftWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionLeftWindowKey] = notify; -+} -+ -+CompAction * wallGetRightWindowKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightWindowKey].value.action; -+} -+ -+void wallSetRightWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightWindowKey].value.action.initiate = init; -+} -+ -+void wallSetRightWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionRightWindowKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetRightWindowKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionRightWindowKey]; -+} -+ -+void wallSetRightWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionRightWindowKey] = notify; -+} -+ -+CompAction * wallGetUpWindowKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpWindowKey].value.action; -+} -+ -+void wallSetUpWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpWindowKey].value.action.initiate = init; -+} -+ -+void wallSetUpWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionUpWindowKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetUpWindowKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionUpWindowKey]; -+} -+ -+void wallSetUpWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionUpWindowKey] = notify; -+} -+ -+CompAction * wallGetDownWindowKey (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownWindowKey].value.action; -+} -+ -+void wallSetDownWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownWindowKey].value.action.initiate = init; -+} -+ -+void wallSetDownWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionDownWindowKey].value.action.terminate = term; -+} -+ -+CompOption * wallGetDownWindowKeyOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionDownWindowKey]; -+} -+ -+void wallSetDownWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionDownWindowKey] = notify; -+} -+ -+CompAction * wallGetFlipLeftEdge (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipLeftEdge].value.action; -+} -+ -+void wallSetFlipLeftEdgeInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipLeftEdge].value.action.initiate = init; -+} -+ -+void wallSetFlipLeftEdgeTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipLeftEdge].value.action.terminate = term; -+} -+ -+CompOption * wallGetFlipLeftEdgeOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipLeftEdge]; -+} -+ -+void wallSetFlipLeftEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionFlipLeftEdge] = notify; -+} -+ -+CompAction * wallGetFlipRightEdge (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipRightEdge].value.action; -+} -+ -+void wallSetFlipRightEdgeInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipRightEdge].value.action.initiate = init; -+} -+ -+void wallSetFlipRightEdgeTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipRightEdge].value.action.terminate = term; -+} -+ -+CompOption * wallGetFlipRightEdgeOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipRightEdge]; -+} -+ -+void wallSetFlipRightEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionFlipRightEdge] = notify; -+} -+ -+CompAction * wallGetFlipUpEdge (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipUpEdge].value.action; -+} -+ -+void wallSetFlipUpEdgeInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipUpEdge].value.action.initiate = init; -+} -+ -+void wallSetFlipUpEdgeTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipUpEdge].value.action.terminate = term; -+} -+ -+CompOption * wallGetFlipUpEdgeOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipUpEdge]; -+} -+ -+void wallSetFlipUpEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionFlipUpEdge] = notify; -+} -+ -+CompAction * wallGetFlipDownEdge (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipDownEdge].value.action; -+} -+ -+void wallSetFlipDownEdgeInitiate (CompDisplay *d, CompActionCallBackProc init) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipDownEdge].value.action.initiate = init; -+} -+ -+void wallSetFlipDownEdgeTerminate (CompDisplay *d, CompActionCallBackProc term) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->opt[WallDisplayOptionFlipDownEdge].value.action.terminate = term; -+} -+ -+CompOption * wallGetFlipDownEdgeOption (CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[WallDisplayOptionFlipDownEdge]; -+} -+ -+void wallSetFlipDownEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ od->notify[WallDisplayOptionFlipDownEdge] = notify; -+} -+ -+int wallGetMmmode (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return os->opt[WallScreenOptionMmmode].value.i; -+} -+ -+CompOption * wallGetMmmodeOption (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return &os->opt[WallScreenOptionMmmode]; -+} -+ -+void wallSetMmmodeNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ os->notify[WallScreenOptionMmmode] = notify; -+} -+ -+Bool wallGetEdgeflipPointer (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return os->opt[WallScreenOptionEdgeflipPointer].value.b; -+} -+ -+CompOption * wallGetEdgeflipPointerOption (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return &os->opt[WallScreenOptionEdgeflipPointer]; -+} -+ -+void wallSetEdgeflipPointerNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ os->notify[WallScreenOptionEdgeflipPointer] = notify; -+} -+ -+Bool wallGetEdgeflipMove (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return os->opt[WallScreenOptionEdgeflipMove].value.b; -+} -+ -+CompOption * wallGetEdgeflipMoveOption (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return &os->opt[WallScreenOptionEdgeflipMove]; -+} -+ -+void wallSetEdgeflipMoveNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ os->notify[WallScreenOptionEdgeflipMove] = notify; -+} -+ -+Bool wallGetEdgeflipDnd (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return os->opt[WallScreenOptionEdgeflipDnd].value.b; -+} -+ -+CompOption * wallGetEdgeflipDndOption (CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return &os->opt[WallScreenOptionEdgeflipDnd]; -+} -+ -+void wallSetEdgeflipDndNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ os->notify[WallScreenOptionEdgeflipDnd] = notify; -+} -+ -+CompOption * wallGetDisplayOption (CompDisplay *d, WallDisplayOptions num) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ return &od->opt[num]; -+} -+ -+CompOption * wallGetScreenOption (CompScreen *s, WallScreenOptions num) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ return &os->opt[num]; -+} -+ -+static const CompMetadataOptionInfo wallOptionsDisplayOptionInfo[] = { -+ { "show_switcher", "bool", 0, 0, 0 }, -+ { "miniscreen", "bool", 0, 0, 0 }, -+ { "preview_timeout", "float", "0.02.0", 0, 0 }, -+ { "preview_scale", "int", "0400", 0, 0 }, -+ { "edge_radius", "int", "020", 0, 0 }, -+ { "border_width", "int", "030", 0, 0 }, -+ { "outline_color", "color", 0, 0, 0 }, -+ { "background_gradient_base_color", "color", 0, 0, 0 }, -+ { "background_gradient_highlight_color", "color", 0, 0, 0 }, -+ { "background_gradient_shadow_color", "color", 0, 0, 0 }, -+ { "thumb_gradient_base_color", "color", 0, 0, 0 }, -+ { "thumb_gradient_highlight_color", "color", 0, 0, 0 }, -+ { "thumb_highlight_gradient_base_color", "color", 0, 0, 0 }, -+ { "thumb_highlight_gradient_shadow_color", "color", 0, 0, 0 }, -+ { "arrow_base_color", "color", 0, 0, 0 }, -+ { "arrow_shadow_color", "color", 0, 0, 0 }, -+ { "allow_wraparound", "bool", 0, 0, 0 }, -+ { "slide_duration", "float", "0.05.0", 0, 0 }, -+ { "no_slide_match", "match", 0, 0, 0 }, -+ { "left_key", "key", 0, 0, 0 }, -+ { "left_button", "button", 0, 0, 0 }, -+ { "right_key", "key", 0, 0, 0 }, -+ { "right_button", "button", 0, 0, 0 }, -+ { "up_key", "key", 0, 0, 0 }, -+ { "up_button", "button", 0, 0, 0 }, -+ { "down_key", "key", 0, 0, 0 }, -+ { "down_button", "button", 0, 0, 0 }, -+ { "next_key", "key", 0, 0, 0 }, -+ { "next_button", "button", 0, 0, 0 }, -+ { "prev_key", "key", 0, 0, 0 }, -+ { "prev_button", "button", 0, 0, 0 }, -+ { "left_window_key", "key", 0, 0, 0 }, -+ { "right_window_key", "key", 0, 0, 0 }, -+ { "up_window_key", "key", 0, 0, 0 }, -+ { "down_window_key", "key", 0, 0, 0 }, -+ { "flip_left_edge", "edge", 0, 0, 0 }, -+ { "flip_right_edge", "edge", 0, 0, 0 }, -+ { "flip_up_edge", "edge", 0, 0, 0 }, -+ { "flip_down_edge", "edge", 0, 0, 0 }, -+}; -+ -+static Bool wallOptionsSetDisplayOption (CompPlugin *plugin, CompDisplay *d, const char *name, CompOptionValue *value) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ CompOption *o; -+ int index; -+ -+ o = compFindOption (od->opt, WallDisplayOptionNum, name, &index); -+ -+ if (!o) -+ return FALSE; -+ -+ switch (index) -+ { -+ case WallDisplayOptionShowSwitcher: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionShowSwitcher]) -+ (*od->notify[WallDisplayOptionShowSwitcher]) (d, o, WallDisplayOptionShowSwitcher); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionMiniscreen: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionMiniscreen]) -+ (*od->notify[WallDisplayOptionMiniscreen]) (d, o, WallDisplayOptionMiniscreen); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionPreviewTimeout: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionPreviewTimeout]) -+ (*od->notify[WallDisplayOptionPreviewTimeout]) (d, o, WallDisplayOptionPreviewTimeout); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionPreviewScale: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionPreviewScale]) -+ (*od->notify[WallDisplayOptionPreviewScale]) (d, o, WallDisplayOptionPreviewScale); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionEdgeRadius: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionEdgeRadius]) -+ (*od->notify[WallDisplayOptionEdgeRadius]) (d, o, WallDisplayOptionEdgeRadius); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionBorderWidth: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionBorderWidth]) -+ (*od->notify[WallDisplayOptionBorderWidth]) (d, o, WallDisplayOptionBorderWidth); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionOutlineColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionOutlineColor]) -+ (*od->notify[WallDisplayOptionOutlineColor]) (d, o, WallDisplayOptionOutlineColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionBackgroundGradientBaseColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionBackgroundGradientBaseColor]) -+ (*od->notify[WallDisplayOptionBackgroundGradientBaseColor]) (d, o, WallDisplayOptionBackgroundGradientBaseColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionBackgroundGradientHighlightColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionBackgroundGradientHighlightColor]) -+ (*od->notify[WallDisplayOptionBackgroundGradientHighlightColor]) (d, o, WallDisplayOptionBackgroundGradientHighlightColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionBackgroundGradientShadowColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionBackgroundGradientShadowColor]) -+ (*od->notify[WallDisplayOptionBackgroundGradientShadowColor]) (d, o, WallDisplayOptionBackgroundGradientShadowColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionThumbGradientBaseColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionThumbGradientBaseColor]) -+ (*od->notify[WallDisplayOptionThumbGradientBaseColor]) (d, o, WallDisplayOptionThumbGradientBaseColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionThumbGradientHighlightColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionThumbGradientHighlightColor]) -+ (*od->notify[WallDisplayOptionThumbGradientHighlightColor]) (d, o, WallDisplayOptionThumbGradientHighlightColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionThumbHighlightGradientBaseColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionThumbHighlightGradientBaseColor]) -+ (*od->notify[WallDisplayOptionThumbHighlightGradientBaseColor]) (d, o, WallDisplayOptionThumbHighlightGradientBaseColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionThumbHighlightGradientShadowColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionThumbHighlightGradientShadowColor]) -+ (*od->notify[WallDisplayOptionThumbHighlightGradientShadowColor]) (d, o, WallDisplayOptionThumbHighlightGradientShadowColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionArrowBaseColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionArrowBaseColor]) -+ (*od->notify[WallDisplayOptionArrowBaseColor]) (d, o, WallDisplayOptionArrowBaseColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionArrowShadowColor: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionArrowShadowColor]) -+ (*od->notify[WallDisplayOptionArrowShadowColor]) (d, o, WallDisplayOptionArrowShadowColor); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionAllowWraparound: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionAllowWraparound]) -+ (*od->notify[WallDisplayOptionAllowWraparound]) (d, o, WallDisplayOptionAllowWraparound); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionSlideDuration: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionSlideDuration]) -+ (*od->notify[WallDisplayOptionSlideDuration]) (d, o, WallDisplayOptionSlideDuration); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionNoSlideMatch: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionNoSlideMatch]) -+ (*od->notify[WallDisplayOptionNoSlideMatch]) (d, o, WallDisplayOptionNoSlideMatch); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionLeftKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionLeftKey]) -+ (*od->notify[WallDisplayOptionLeftKey]) (d, o, WallDisplayOptionLeftKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionLeftButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionLeftButton]) -+ (*od->notify[WallDisplayOptionLeftButton]) (d, o, WallDisplayOptionLeftButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionRightKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionRightKey]) -+ (*od->notify[WallDisplayOptionRightKey]) (d, o, WallDisplayOptionRightKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionRightButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionRightButton]) -+ (*od->notify[WallDisplayOptionRightButton]) (d, o, WallDisplayOptionRightButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionUpKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionUpKey]) -+ (*od->notify[WallDisplayOptionUpKey]) (d, o, WallDisplayOptionUpKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionUpButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionUpButton]) -+ (*od->notify[WallDisplayOptionUpButton]) (d, o, WallDisplayOptionUpButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionDownKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionDownKey]) -+ (*od->notify[WallDisplayOptionDownKey]) (d, o, WallDisplayOptionDownKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionDownButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionDownButton]) -+ (*od->notify[WallDisplayOptionDownButton]) (d, o, WallDisplayOptionDownButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionNextKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionNextKey]) -+ (*od->notify[WallDisplayOptionNextKey]) (d, o, WallDisplayOptionNextKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionNextButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionNextButton]) -+ (*od->notify[WallDisplayOptionNextButton]) (d, o, WallDisplayOptionNextButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionPrevKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionPrevKey]) -+ (*od->notify[WallDisplayOptionPrevKey]) (d, o, WallDisplayOptionPrevKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionPrevButton: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionPrevButton]) -+ (*od->notify[WallDisplayOptionPrevButton]) (d, o, WallDisplayOptionPrevButton); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionLeftWindowKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionLeftWindowKey]) -+ (*od->notify[WallDisplayOptionLeftWindowKey]) (d, o, WallDisplayOptionLeftWindowKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionRightWindowKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionRightWindowKey]) -+ (*od->notify[WallDisplayOptionRightWindowKey]) (d, o, WallDisplayOptionRightWindowKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionUpWindowKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionUpWindowKey]) -+ (*od->notify[WallDisplayOptionUpWindowKey]) (d, o, WallDisplayOptionUpWindowKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionDownWindowKey: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionDownWindowKey]) -+ (*od->notify[WallDisplayOptionDownWindowKey]) (d, o, WallDisplayOptionDownWindowKey); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionFlipLeftEdge: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionFlipLeftEdge]) -+ (*od->notify[WallDisplayOptionFlipLeftEdge]) (d, o, WallDisplayOptionFlipLeftEdge); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionFlipRightEdge: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionFlipRightEdge]) -+ (*od->notify[WallDisplayOptionFlipRightEdge]) (d, o, WallDisplayOptionFlipRightEdge); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionFlipUpEdge: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionFlipUpEdge]) -+ (*od->notify[WallDisplayOptionFlipUpEdge]) (d, o, WallDisplayOptionFlipUpEdge); -+ return TRUE; -+ } -+ break; -+ case WallDisplayOptionFlipDownEdge: -+ if (compSetDisplayOption (d, o, value)) -+ { -+ if (od->notify[WallDisplayOptionFlipDownEdge]) -+ (*od->notify[WallDisplayOptionFlipDownEdge]) (d, o, WallDisplayOptionFlipDownEdge); -+ return TRUE; -+ } -+ break; -+ default: -+ break; -+ } -+ return FALSE; -+} -+ -+static CompOption * wallOptionsGetDisplayOptions (CompPlugin *plugin, CompDisplay *d, int *count) -+{ -+ WALL_OPTIONS_DISPLAY(d); -+ if (!od) -+ { -+ *count = 0; -+ return NULL; -+ } -+ *count = WallDisplayOptionNum; -+ return od->opt; -+} -+ -+static const CompMetadataOptionInfo wallOptionsScreenOptionInfo[] = { -+ { "mmmode", "int", "01", 0, 0 }, -+ { "edgeflip_pointer", "bool", 0, 0, 0 }, -+ { "edgeflip_move", "bool", 0, 0, 0 }, -+ { "edgeflip_dnd", "bool", 0, 0, 0 }, -+}; -+ -+static Bool wallOptionsSetScreenOption (CompPlugin *plugin, CompScreen *s, const char *name, CompOptionValue *value) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ CompOption *o; -+ int index; -+ -+ o = compFindOption (os->opt, WallScreenOptionNum, name, &index); -+ -+ if (!o) -+ return FALSE; -+ -+ switch (index) -+ { -+ case WallScreenOptionMmmode: -+ if (compSetScreenOption (s, o, value)) -+ { -+ if (os->notify[WallScreenOptionMmmode]) -+ (*os->notify[WallScreenOptionMmmode]) (s, o, WallScreenOptionMmmode); -+ return TRUE; -+ } -+ break; -+ case WallScreenOptionEdgeflipPointer: -+ if (compSetScreenOption (s, o, value)) -+ { -+ if (os->notify[WallScreenOptionEdgeflipPointer]) -+ (*os->notify[WallScreenOptionEdgeflipPointer]) (s, o, WallScreenOptionEdgeflipPointer); -+ return TRUE; -+ } -+ break; -+ case WallScreenOptionEdgeflipMove: -+ if (compSetScreenOption (s, o, value)) -+ { -+ if (os->notify[WallScreenOptionEdgeflipMove]) -+ (*os->notify[WallScreenOptionEdgeflipMove]) (s, o, WallScreenOptionEdgeflipMove); -+ return TRUE; -+ } -+ break; -+ case WallScreenOptionEdgeflipDnd: -+ if (compSetScreenOption (s, o, value)) -+ { -+ if (os->notify[WallScreenOptionEdgeflipDnd]) -+ (*os->notify[WallScreenOptionEdgeflipDnd]) (s, o, WallScreenOptionEdgeflipDnd); -+ return TRUE; -+ } -+ break; -+ default: -+ break; -+ } -+ return FALSE; -+} -+ -+static CompOption * wallOptionsGetScreenOptions (CompPlugin *plugin, CompScreen *s, int *count) -+{ -+ WALL_OPTIONS_SCREEN(s); -+ if (!os) -+ { -+ *count = 0; -+ return NULL; -+ } -+ *count = WallScreenOptionNum; -+ return os->opt; -+} -+ -+static Bool wallOptionsInitScreen (CompPlugin *p, CompScreen *s) -+{ -+ WallOptionsScreen *os; -+ -+ WALL_OPTIONS_DISPLAY (s->display); -+ -+ os = calloc (1, sizeof(WallOptionsScreen)); -+ if (!os) -+ return FALSE; -+ -+ s->base.privates[od->screenPrivateIndex].ptr = os; -+ -+ if (!compInitScreenOptionsFromMetadata (s, &wallOptionsMetadata, wallOptionsScreenOptionInfo, os->opt, WallScreenOptionNum)) -+ { -+ free (os); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+static void wallOptionsFiniScreen (CompPlugin *p, CompScreen *s) -+{ -+ WALL_OPTIONS_SCREEN (s); -+ WALL_OPTIONS_DISPLAY (s->display); -+ -+ -+ compFiniScreenOptions (s, os->opt, WallScreenOptionNum); -+ -+ free (os); -+ s->base.privates[od->screenPrivateIndex].ptr = NULL; -+} -+ -+static Bool wallOptionsInitDisplay (CompPlugin *p, CompDisplay *d) -+{ -+ WallOptionsDisplay *od; -+ -+ -+ od = calloc (1, sizeof(WallOptionsDisplay)); -+ if (!od) -+ return FALSE; -+ -+ od->screenPrivateIndex = allocateScreenPrivateIndex(d); -+ if (od->screenPrivateIndex < 0) -+ { -+ free(od); -+ return FALSE; -+ } -+ -+ d->base.privates[WallOptionsDisplayPrivateIndex].ptr = od; -+ -+ if (!compInitDisplayOptionsFromMetadata (d, &wallOptionsMetadata, wallOptionsDisplayOptionInfo, od->opt, WallDisplayOptionNum)) -+ { -+ free (od); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ -+static void wallOptionsFiniDisplay (CompPlugin *p, CompDisplay *d) -+{ -+ WALL_OPTIONS_DISPLAY (d); -+ -+ freeScreenPrivateIndex(d, od->screenPrivateIndex); -+ -+ compFiniDisplayOptions (d, od->opt, WallDisplayOptionNum); -+ -+ free (od); -+ d->base.privates[WallOptionsDisplayPrivateIndex].ptr = NULL; -+} -+ -+static Bool wallOptionsInit (CompPlugin *p) -+{ -+ WallOptionsDisplayPrivateIndex = allocateDisplayPrivateIndex(); -+ if (WallOptionsDisplayPrivateIndex < 0) -+ return FALSE; -+ -+ if (!compInitPluginMetadataFromInfo (&wallOptionsMetadata, "wall",wallOptionsDisplayOptionInfo, WallDisplayOptionNum, wallOptionsScreenOptionInfo, WallScreenOptionNum)) -+ return FALSE; -+ -+ compAddMetadataFromFile (&wallOptionsMetadata, "wall"); -+ if (wallPluginVTable && wallPluginVTable->init) -+ return wallPluginVTable->init (p); -+ return TRUE; -+} -+ -+static void wallOptionsFini (CompPlugin *p) -+{ -+ if (wallPluginVTable && wallPluginVTable->fini) -+ wallPluginVTable->fini (p); -+ -+ if (WallOptionsDisplayPrivateIndex >= 0) -+ freeDisplayPrivateIndex (WallOptionsDisplayPrivateIndex); -+ -+ compFiniMetadata (&wallOptionsMetadata); -+} -+ -+static CompBool wallOptionsInitObject (CompPlugin *p, CompObject *o) -+{ -+ static InitPluginObjectProc dispTab[] = { -+ (InitPluginObjectProc) 0, -+ (InitPluginObjectProc) wallOptionsInitDisplay, -+ (InitPluginObjectProc) wallOptionsInitScreen -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o)); -+} -+ -+static void wallOptionsFiniObject (CompPlugin *p, CompObject *o) -+{ -+ static FiniPluginObjectProc dispTab[] = { -+ (FiniPluginObjectProc) 0, -+ (FiniPluginObjectProc) wallOptionsFiniDisplay, -+ (FiniPluginObjectProc) wallOptionsFiniScreen -+ }; -+ -+ DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o)); -+} -+ -+static CompBool wallOptionsInitObjectWrapper (CompPlugin *p, CompObject *o) -+{ -+ CompBool rv = TRUE; -+ rv = wallOptionsInitObject (p, o); -+ if (wallPluginVTable->initObject) -+ rv &= wallPluginVTable->initObject (p, o); -+ return rv; -+} -+ -+static void wallOptionsFiniObjectWrapper (CompPlugin *p, CompObject *o) -+{ -+ if (wallPluginVTable->finiObject) -+ wallPluginVTable->finiObject (p, o); -+ wallOptionsFiniObject (p, o); -+} -+ -+static CompOption * wallOptionsGetObjectOptions (CompPlugin *p, CompObject *o, int *count) -+{ -+ static GetPluginObjectOptionsProc dispTab[] = { -+ (GetPluginObjectOptionsProc) 0, -+ (GetPluginObjectOptionsProc) wallOptionsGetDisplayOptions, -+ (GetPluginObjectOptionsProc) wallOptionsGetScreenOptions -+ }; -+ -+ *count = 0; -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), -+ NULL, (p, o, count)); -+} -+ -+static CompBool wallOptionsSetObjectOption (CompPlugin *p, CompObject *o, const char *name, CompOptionValue *value) -+{ -+ static SetPluginObjectOptionProc dispTab[] = { -+ (SetPluginObjectOptionProc) 0, -+ (SetPluginObjectOptionProc) wallOptionsSetDisplayOption, -+ (SetPluginObjectOptionProc) wallOptionsSetScreenOption -+ }; -+ -+ RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), FALSE, -+ (p, o, name, value)); -+} -+ -+static CompMetadata * -+wallOptionsGetMetadata (CompPlugin *plugin) -+{ -+ return &wallOptionsMetadata; -+} -+ -+CompPluginVTable *getCompPluginInfo20070830 (void) -+{ -+ if (!wallPluginVTable) -+ { -+ wallPluginVTable = getCompPluginInfo (); -+ memcpy(&wallOptionsVTable, wallPluginVTable, sizeof(CompPluginVTable)); -+ wallOptionsVTable.getMetadata = wallOptionsGetMetadata; -+ wallOptionsVTable.init = wallOptionsInit; -+ wallOptionsVTable.fini = wallOptionsFini; -+ wallOptionsVTable.initObject = wallOptionsInitObjectWrapper; -+ wallOptionsVTable.finiObject = wallOptionsFiniObjectWrapper; -+ wallOptionsVTable.getObjectOptions = wallOptionsGetObjectOptions; -+ wallOptionsVTable.setObjectOption = wallOptionsSetObjectOption; -+ -+ } -+ return &wallOptionsVTable; -+} -+ -diff -upNr compiz-0.8.6.orign/plugins/wall_options.h compiz-0.8.6/plugins/wall_options.h ---- compiz-0.8.6.orign/plugins/wall_options.h 1970-01-01 01:00:00.000000000 +0100 -+++ compiz-0.8.6/plugins/wall_options.h 2010-03-30 14:53:23.510343112 +0200 -@@ -0,0 +1,375 @@ -+/* -+ * This file is autogenerated with bcop: -+ * The Compiz option code generator -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ */ -+ -+#ifndef _WALL_OPTIONS_H -+#define _WALL_OPTIONS_H -+ -+#include -+ -+COMPIZ_BEGIN_DECLS -+ -+CompPluginVTable * getCompPluginInfo (void); -+ -+typedef enum -+{ -+ WallDisplayOptionShowSwitcher, -+ WallDisplayOptionMiniscreen, -+ WallDisplayOptionPreviewTimeout, -+ WallDisplayOptionPreviewScale, -+ WallDisplayOptionEdgeRadius, -+ WallDisplayOptionBorderWidth, -+ WallDisplayOptionOutlineColor, -+ WallDisplayOptionBackgroundGradientBaseColor, -+ WallDisplayOptionBackgroundGradientHighlightColor, -+ WallDisplayOptionBackgroundGradientShadowColor, -+ WallDisplayOptionThumbGradientBaseColor, -+ WallDisplayOptionThumbGradientHighlightColor, -+ WallDisplayOptionThumbHighlightGradientBaseColor, -+ WallDisplayOptionThumbHighlightGradientShadowColor, -+ WallDisplayOptionArrowBaseColor, -+ WallDisplayOptionArrowShadowColor, -+ WallDisplayOptionAllowWraparound, -+ WallDisplayOptionSlideDuration, -+ WallDisplayOptionNoSlideMatch, -+ WallDisplayOptionLeftKey, -+ WallDisplayOptionLeftButton, -+ WallDisplayOptionRightKey, -+ WallDisplayOptionRightButton, -+ WallDisplayOptionUpKey, -+ WallDisplayOptionUpButton, -+ WallDisplayOptionDownKey, -+ WallDisplayOptionDownButton, -+ WallDisplayOptionNextKey, -+ WallDisplayOptionNextButton, -+ WallDisplayOptionPrevKey, -+ WallDisplayOptionPrevButton, -+ WallDisplayOptionLeftWindowKey, -+ WallDisplayOptionRightWindowKey, -+ WallDisplayOptionUpWindowKey, -+ WallDisplayOptionDownWindowKey, -+ WallDisplayOptionFlipLeftEdge, -+ WallDisplayOptionFlipRightEdge, -+ WallDisplayOptionFlipUpEdge, -+ WallDisplayOptionFlipDownEdge, -+ WallDisplayOptionNum -+} WallDisplayOptions; -+ -+typedef void (*wallDisplayOptionChangeNotifyProc) (CompDisplay *display, CompOption *opt, WallDisplayOptions num); -+ -+CompOption *wallGetDisplayOption (CompDisplay *d, WallDisplayOptions num); -+ -+typedef enum -+{ -+ WallScreenOptionMmmode, -+ WallScreenOptionEdgeflipPointer, -+ WallScreenOptionEdgeflipMove, -+ WallScreenOptionEdgeflipDnd, -+ WallScreenOptionNum -+} WallScreenOptions; -+ -+typedef void (*wallScreenOptionChangeNotifyProc) (CompScreen *screen, CompOption *opt, WallScreenOptions num); -+ -+CompOption *wallGetScreenOption (CompScreen *s, WallScreenOptions num); -+ -+typedef enum -+{ -+ MmmodeSwitchAll = 0, -+ MmmodeSwitchSeparately = 1, -+} WallMmmodeEnum; -+ -+Bool wallGetShowSwitcher (CompDisplay *d); -+CompOption * wallGetShowSwitcherOption (CompDisplay *d); -+void wallSetShowSwitcherNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+Bool wallGetMiniscreen (CompDisplay *d); -+CompOption * wallGetMiniscreenOption (CompDisplay *d); -+void wallSetMiniscreenNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+float wallGetPreviewTimeout (CompDisplay *d); -+CompOption * wallGetPreviewTimeoutOption (CompDisplay *d); -+void wallSetPreviewTimeoutNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+int wallGetPreviewScale (CompDisplay *d); -+CompOption * wallGetPreviewScaleOption (CompDisplay *d); -+void wallSetPreviewScaleNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+int wallGetEdgeRadius (CompDisplay *d); -+CompOption * wallGetEdgeRadiusOption (CompDisplay *d); -+void wallSetEdgeRadiusNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+int wallGetBorderWidth (CompDisplay *d); -+CompOption * wallGetBorderWidthOption (CompDisplay *d); -+void wallSetBorderWidthNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetOutlineColor (CompDisplay *d); -+unsigned short wallGetOutlineColorRed (CompDisplay *d); -+unsigned short wallGetOutlineColorGreen (CompDisplay *d); -+unsigned short wallGetOutlineColorBlue (CompDisplay *d); -+unsigned short wallGetOutlineColorAlpha (CompDisplay *d); -+CompOption * wallGetOutlineColorOption (CompDisplay *d); -+void wallSetOutlineColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetBackgroundGradientBaseColor (CompDisplay *d); -+unsigned short wallGetBackgroundGradientBaseColorRed (CompDisplay *d); -+unsigned short wallGetBackgroundGradientBaseColorGreen (CompDisplay *d); -+unsigned short wallGetBackgroundGradientBaseColorBlue (CompDisplay *d); -+unsigned short wallGetBackgroundGradientBaseColorAlpha (CompDisplay *d); -+CompOption * wallGetBackgroundGradientBaseColorOption (CompDisplay *d); -+void wallSetBackgroundGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetBackgroundGradientHighlightColor (CompDisplay *d); -+unsigned short wallGetBackgroundGradientHighlightColorRed (CompDisplay *d); -+unsigned short wallGetBackgroundGradientHighlightColorGreen (CompDisplay *d); -+unsigned short wallGetBackgroundGradientHighlightColorBlue (CompDisplay *d); -+unsigned short wallGetBackgroundGradientHighlightColorAlpha (CompDisplay *d); -+CompOption * wallGetBackgroundGradientHighlightColorOption (CompDisplay *d); -+void wallSetBackgroundGradientHighlightColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetBackgroundGradientShadowColor (CompDisplay *d); -+unsigned short wallGetBackgroundGradientShadowColorRed (CompDisplay *d); -+unsigned short wallGetBackgroundGradientShadowColorGreen (CompDisplay *d); -+unsigned short wallGetBackgroundGradientShadowColorBlue (CompDisplay *d); -+unsigned short wallGetBackgroundGradientShadowColorAlpha (CompDisplay *d); -+CompOption * wallGetBackgroundGradientShadowColorOption (CompDisplay *d); -+void wallSetBackgroundGradientShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetThumbGradientBaseColor (CompDisplay *d); -+unsigned short wallGetThumbGradientBaseColorRed (CompDisplay *d); -+unsigned short wallGetThumbGradientBaseColorGreen (CompDisplay *d); -+unsigned short wallGetThumbGradientBaseColorBlue (CompDisplay *d); -+unsigned short wallGetThumbGradientBaseColorAlpha (CompDisplay *d); -+CompOption * wallGetThumbGradientBaseColorOption (CompDisplay *d); -+void wallSetThumbGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetThumbGradientHighlightColor (CompDisplay *d); -+unsigned short wallGetThumbGradientHighlightColorRed (CompDisplay *d); -+unsigned short wallGetThumbGradientHighlightColorGreen (CompDisplay *d); -+unsigned short wallGetThumbGradientHighlightColorBlue (CompDisplay *d); -+unsigned short wallGetThumbGradientHighlightColorAlpha (CompDisplay *d); -+CompOption * wallGetThumbGradientHighlightColorOption (CompDisplay *d); -+void wallSetThumbGradientHighlightColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetThumbHighlightGradientBaseColor (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientBaseColorRed (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientBaseColorGreen (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientBaseColorBlue (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientBaseColorAlpha (CompDisplay *d); -+CompOption * wallGetThumbHighlightGradientBaseColorOption (CompDisplay *d); -+void wallSetThumbHighlightGradientBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetThumbHighlightGradientShadowColor (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientShadowColorRed (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientShadowColorGreen (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientShadowColorBlue (CompDisplay *d); -+unsigned short wallGetThumbHighlightGradientShadowColorAlpha (CompDisplay *d); -+CompOption * wallGetThumbHighlightGradientShadowColorOption (CompDisplay *d); -+void wallSetThumbHighlightGradientShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetArrowBaseColor (CompDisplay *d); -+unsigned short wallGetArrowBaseColorRed (CompDisplay *d); -+unsigned short wallGetArrowBaseColorGreen (CompDisplay *d); -+unsigned short wallGetArrowBaseColorBlue (CompDisplay *d); -+unsigned short wallGetArrowBaseColorAlpha (CompDisplay *d); -+CompOption * wallGetArrowBaseColorOption (CompDisplay *d); -+void wallSetArrowBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+unsigned short * wallGetArrowShadowColor (CompDisplay *d); -+unsigned short wallGetArrowShadowColorRed (CompDisplay *d); -+unsigned short wallGetArrowShadowColorGreen (CompDisplay *d); -+unsigned short wallGetArrowShadowColorBlue (CompDisplay *d); -+unsigned short wallGetArrowShadowColorAlpha (CompDisplay *d); -+CompOption * wallGetArrowShadowColorOption (CompDisplay *d); -+void wallSetArrowShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+Bool wallGetAllowWraparound (CompDisplay *d); -+CompOption * wallGetAllowWraparoundOption (CompDisplay *d); -+void wallSetAllowWraparoundNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+float wallGetSlideDuration (CompDisplay *d); -+CompOption * wallGetSlideDurationOption (CompDisplay *d); -+void wallSetSlideDurationNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompMatch * wallGetNoSlideMatch (CompDisplay *d); -+CompOption * wallGetNoSlideMatchOption (CompDisplay *d); -+void wallSetNoSlideMatchNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetLeftKey (CompDisplay *d); -+void wallSetLeftKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetLeftKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetLeftKeyOption (CompDisplay *d); -+void wallSetLeftKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetLeftButton (CompDisplay *d); -+void wallSetLeftButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetLeftButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetLeftButtonOption (CompDisplay *d); -+void wallSetLeftButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetRightKey (CompDisplay *d); -+void wallSetRightKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetRightKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetRightKeyOption (CompDisplay *d); -+void wallSetRightKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetRightButton (CompDisplay *d); -+void wallSetRightButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetRightButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetRightButtonOption (CompDisplay *d); -+void wallSetRightButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetUpKey (CompDisplay *d); -+void wallSetUpKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetUpKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetUpKeyOption (CompDisplay *d); -+void wallSetUpKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetUpButton (CompDisplay *d); -+void wallSetUpButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetUpButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetUpButtonOption (CompDisplay *d); -+void wallSetUpButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetDownKey (CompDisplay *d); -+void wallSetDownKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetDownKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetDownKeyOption (CompDisplay *d); -+void wallSetDownKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetDownButton (CompDisplay *d); -+void wallSetDownButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetDownButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetDownButtonOption (CompDisplay *d); -+void wallSetDownButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetNextKey (CompDisplay *d); -+void wallSetNextKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetNextKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetNextKeyOption (CompDisplay *d); -+void wallSetNextKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetNextButton (CompDisplay *d); -+void wallSetNextButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetNextButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetNextButtonOption (CompDisplay *d); -+void wallSetNextButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetPrevKey (CompDisplay *d); -+void wallSetPrevKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetPrevKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetPrevKeyOption (CompDisplay *d); -+void wallSetPrevKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetPrevButton (CompDisplay *d); -+void wallSetPrevButtonInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetPrevButtonTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetPrevButtonOption (CompDisplay *d); -+void wallSetPrevButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetLeftWindowKey (CompDisplay *d); -+void wallSetLeftWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetLeftWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetLeftWindowKeyOption (CompDisplay *d); -+void wallSetLeftWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetRightWindowKey (CompDisplay *d); -+void wallSetRightWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetRightWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetRightWindowKeyOption (CompDisplay *d); -+void wallSetRightWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetUpWindowKey (CompDisplay *d); -+void wallSetUpWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetUpWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetUpWindowKeyOption (CompDisplay *d); -+void wallSetUpWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetDownWindowKey (CompDisplay *d); -+void wallSetDownWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetDownWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetDownWindowKeyOption (CompDisplay *d); -+void wallSetDownWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetFlipLeftEdge (CompDisplay *d); -+void wallSetFlipLeftEdgeInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetFlipLeftEdgeTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetFlipLeftEdgeOption (CompDisplay *d); -+void wallSetFlipLeftEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetFlipRightEdge (CompDisplay *d); -+void wallSetFlipRightEdgeInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetFlipRightEdgeTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetFlipRightEdgeOption (CompDisplay *d); -+void wallSetFlipRightEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetFlipUpEdge (CompDisplay *d); -+void wallSetFlipUpEdgeInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetFlipUpEdgeTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetFlipUpEdgeOption (CompDisplay *d); -+void wallSetFlipUpEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+CompAction * wallGetFlipDownEdge (CompDisplay *d); -+void wallSetFlipDownEdgeInitiate (CompDisplay *d, CompActionCallBackProc init); -+void wallSetFlipDownEdgeTerminate (CompDisplay *d, CompActionCallBackProc term); -+CompOption * wallGetFlipDownEdgeOption (CompDisplay *d); -+void wallSetFlipDownEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify); -+ -+int wallGetMmmode (CompScreen *s); -+CompOption * wallGetMmmodeOption (CompScreen *s); -+void wallSetMmmodeNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify); -+ -+Bool wallGetEdgeflipPointer (CompScreen *s); -+CompOption * wallGetEdgeflipPointerOption (CompScreen *s); -+void wallSetEdgeflipPointerNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify); -+ -+Bool wallGetEdgeflipMove (CompScreen *s); -+CompOption * wallGetEdgeflipMoveOption (CompScreen *s); -+void wallSetEdgeflipMoveNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify); -+ -+Bool wallGetEdgeflipDnd (CompScreen *s); -+CompOption * wallGetEdgeflipDndOption (CompScreen *s); -+void wallSetEdgeflipDndNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify); -+ -+#ifndef GENERIC_PRIVATE_DEFINES -+#define GENERIC_PRIVATE_DEFINES -+ -+#define GET_PLUGIN_CORE(object, plugin) \ -+ ((plugin##Core *) (object)->base.privates[plugin##CorePrivateIndex].ptr) -+#define PLUGIN_CORE(object, plugin, prefix) \ -+ plugin##Core * prefix##c = GET_PLUGIN_CORE (object, plugin) -+ -+#define GET_PLUGIN_DISPLAY(object, plugin) \ -+ ((plugin##Display *) \ -+ (object)->base.privates[plugin##DisplayPrivateIndex].ptr) -+#define PLUGIN_DISPLAY(object, plugin, prefix) \ -+ plugin##Display * prefix##d = GET_PLUGIN_DISPLAY (object, plugin) -+ -+#define GET_PLUGIN_SCREEN(object, parent, plugin) \ -+ ((plugin##Screen *) \ -+ (object)->base.privates[(parent)->screenPrivateIndex].ptr) -+#define PLUGIN_SCREEN(object, plugin, prefix) \ -+ plugin##Screen * prefix##s = \ -+ GET_PLUGIN_SCREEN (object, \ -+ GET_PLUGIN_DISPLAY ((object)->display, plugin), plugin) -+ -+#define GET_PLUGIN_WINDOW(object, parent, plugin) \ -+ ((plugin##Window *) \ -+ (object)->base.privates[(parent)->windowPrivateIndex].ptr) -+#define PLUGIN_WINDOW(object, plugin, prefix) \ -+ plugin##Window * prefix##w = \ -+ GET_PLUGIN_WINDOW (object, \ -+ GET_PLUGIN_SCREEN ((object)->screen, \ -+ GET_PLUGIN_DISPLAY ((object)->screen->display, plugin), plugin), plugin) -+ -+#endif -+ -+COMPIZ_END_DECLS -+ -+#endif diff --git a/compiz-0.88_incorrect-fsf-address.patch b/compiz-0.88_incorrect-fsf-address.patch deleted file mode 100644 index c2ec160..0000000 --- a/compiz-0.88_incorrect-fsf-address.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -upr compiz-0.8.8-orig/plugins/place.c compiz-0.8.8/plugins/place.c ---- compiz-0.8.8-orig/plugins/place.c 2010-10-18 07:56:02.000000000 +0200 -+++ compiz-0.8.8/plugins/place.c 2012-09-26 11:19:31.056809174 +0200 -@@ -16,8 +16,8 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- * 02111-1307, USA. -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+ * 02110-1301, USA. - */ - - #include diff --git a/compiz-mate-gtk b/compiz-mate-gtk deleted file mode 100644 index a0656fc..0000000 --- a/compiz-mate-gtk +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -function runCompiz() { - gtk-window-decorator & - if ( [ -e /usr/lib/compizconfig/backends/libmateconf.so ] || [ -e /usr/lib64/compizconfig/backends/libmateconf.so ] ) - then - exec compiz --ignore-desktop-hints ccp $@ - else - exec compiz --ignore-desktop-hints glib mateconf matecompat $@ - fi -} - -ISSW=`glxinfo | grep "Software Rasterizer" -c` - -# Try with direct rendering -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Try again with indirect rendering -export LIBGL_ALWAYS_INDIRECT=1 - -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Fall back to marco -exec marco $@ diff --git a/compiz-mate-gtk.desktop b/compiz-mate-gtk.desktop deleted file mode 100644 index 280ebad..0000000 --- a/compiz-mate-gtk.desktop +++ /dev/null @@ -1,8 +0,0 @@ - -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Compiz -TryExec=compiz-mate-gtk -Exec=compiz-mate-gtk -NoDisplay=true diff --git a/compiz.spec b/compiz.spec deleted file mode 100644 index 1e2749f..0000000 --- a/compiz.spec +++ /dev/null @@ -1,387 +0,0 @@ -%global core_plugins blur clone cube dbus decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher video water wobbly zoom fs obs commands wall glib annotate svg - -%global mate_plugins matecompat - -# List of plugins passed to ./configure. The order is important - -%global plugins core,glib,dbus,png,svg,video,screenshot,decoration,clone,place,fade,minimize,move,resize,switcher,scale,wall,obs - - -Name: compiz -URL: http://www.compiz.org -License: GPLv2+ and LGPLv2+ and MIT -Group: User Interface/Desktops -Version: 0.8.8 -Release: 14%{?dist} -Epoch: 1 -Summary: OpenGL window and compositing manager - -# libdrm is not available on these arches -ExcludeArch: s390 s390x - -Requires: system-logos -Requires: glx-utils -# this is an inverse require which is needed for build without gtk-windows-decorator -Requires: emerald - -BuildRequires: libX11-devel -BuildRequires: libdrm-devel -BuildRequires: libwnck-devel -BuildRequires: libXfixes-devel -BuildRequires: libXrandr-devel -BuildRequires: libXrender-devel -BuildRequires: libXcomposite-devel -BuildRequires: libXdamage-devel -BuildRequires: libXext-devel -BuildRequires: libXt-devel -BuildRequires: libSM-devel -BuildRequires: libICE-devel -BuildRequires: libXmu-devel -BuildRequires: mate-conf-devel -BuildRequires: desktop-file-utils -BuildRequires: intltool -BuildRequires: gettext -BuildRequires: dbus-devel -BuildRequires: dbus-glib-devel -BuildRequires: librsvg2-devel -BuildRequires: mesa-libGLU-devel -BuildRequires: fuse-devel -BuildRequires: cairo-devel -BuildRequires: libtool -BuildRequires: libxslt-devel - - -Source0: http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2 -Source2: compiz-mate-emerald -Source3: compiz-mate-emerald.desktop -Source4: compiz-xfce-emerald -Source5: compiz-xfce-emerald.desktop -Source6: compiz-lxde-emerald -Source7: compiz-lxde-emerald.desktop -Source8: compiz-plugins-main_plugin-matecompat.svg - -# fork gnome to mate -Patch0: comiz_mate_fork.patch -# fix http://forums.mate-desktop.org/viewtopic.php?f=8&t=818 -#Patch1: compiz_gtk_window_decoration_button_placement.patch -#Patch2: compiz_windows-decorator.patch -# Patches that are not upstream -Patch3: composite-cube-logo.patch -Patch4: fedora-logo.patch -Patch5: redhat-logo.patch -Patch6: compiz-0.8.6-wall.patch -Patch7: compiz-0.8.6-unloadpluginfix.patch -Patch8: no-more-mate-wm-settings.patch -Patch9: compiz-0.88_incorrect-fsf-address.patch -Patch10: compiz-disable-child-window-clipping.patch -Patch11: compiz-add-cursor-theme-support.patch -#Patch12: compiz-fix-gtk-window-decorator-no-argb-crash.patch -Patch13: compiz_fix-no-border-window-shadow.patch -Patch14: compiz_draw_dock_shadows_on_desktop.patch -Patch15: compiz_optional-fbo.patch -Patch16: compiz_call_glxwaitx_before_drawing.patch -Patch17: compiz_always_unredirect_screensaver_on_nvidia.patch -#Patch18: compiz_hide_tooltip_on_decorator.patch -Patch19: compiz_fullscreen_stacking_fixes.patch -Patch20: compiz_damage-report-non-empty.patch -Patch21: compiz_stacking.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=909657 -Patch22: compiz_primary-is-control.patch - - -%description -Compiz is one of the first OpenGL-accelerated compositing window -managers for the X Window System. The integration allows it to perform -compositing effects in window management, such as a minimization -effect and a cube work space. Compiz is an OpenGL compositing manager -that use Compiz use EXT_texture_from_pixmap OpenGL extension for -binding redirected top-level windows to texture objects. - -%package devel -Summary: Development packages for compiz -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} -Requires: pkgconfig -Requires: libXcomposite-devel libXfixes-devel libXdamage-devel libXrandr-devel -Requires: libXinerama-devel libICE-devel libSM-devel libxml2-devel -Requires: libxslt-devel startup-notification-devel - -%description devel -The compiz-devel package includes the header files, -and developer docs for the compiz package. - -Install compiz-devel if you want to develop plugins for the compiz -windows and compositing manager. - -%package mate -Summary: Compiz mate integration bits -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description mate -The compiz-mate package contains matecompat plugin -and a compiz start script for mate. - -%package xfce -Summary: Compiz mate integration bits -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description xfce -The compiz-xfce package contains a compiz start script -for xfce. - -%package lxde -Summary: Compiz mate integration bits -Group: User Interface/Desktops -Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} - -%description lxde -The compiz-lxde package contains a compiz start script -for lxde. - - -%prep -%setup -q -%patch0 -p1 -b .comiz_mate_fork -#%patch1 -p1 -b .compiz_gtk_window_decoration_button -#%patch2 -p1 -b .compiz_windows-decorator -%patch3 -p1 -b .composite-cube-logo -%if 0%{?fedora} -%patch4 -p1 -b .fedora-logo -%else -%patch5 -p1 -b .redhat-logo -%endif -%patch6 -p1 -b .wall -%patch7 -p1 -b .unloadfix -%patch8 -p1 -b .mate-wm-settings -%patch9 -p1 -b .incorrect-fsf-address -%patch11 -p1 -b .cursor-theme-support -#%patch12 -p1 -b .gtk-window-decorator-no-argb-crash -%patch13 -p1 -b .no-border-window-shadow -%patch14 -p1 -b .draw_dock_shadows -%patch15 -p1 -b .fbo -%patch16 -p1 -b .glxwaitx_before_drawing -%patch17 -p1 -b .always_unredirect_screensaver -#%patch18 -p1 -b .tooltip_on_decorator -%patch19 -p1 -b .fullscreen_stacking -%patch20 -p1 -b .damage-report -%patch21 -p1 -b .stacking -%patch22 -p1 -b .primary-is-control - - -%build - -libtoolize -aclocal -autoconf -automake -%configure \ - --disable-mateconf \ - --enable-dbus \ - --enable-librsvg \ - --disable-gtk \ - --disable-marco \ - --enable-mate \ - --with-default-plugins=%{plugins} \ - --disable-mate-keybindings \ - --disable-kde \ - --disable-kde4 \ - --disable-kconfig - - -make %{?_smp_mflags} imagedir=%{_datadir}/pixmaps - - -%install -make DESTDIR=$RPM_BUILD_ROOT install || exit 1 - -install %SOURCE2 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE4 $RPM_BUILD_ROOT%{_bindir} -install %SOURCE6 $RPM_BUILD_ROOT%{_bindir} - -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE3 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE5 -desktop-file-install --vendor="" \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %SOURCE7 - -# matecompat icon -mkdir -p $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps -cp -f %SOURCE8 $RPM_BUILD_ROOT%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg - -rm $RPM_BUILD_ROOT%{_datadir}/compiz/kconfig.xml -rm $RPM_BUILD_ROOT%{_datadir}/compiz/mateconf.xml -rm $RPM_BUILD_ROOT%{_datadir}/applications/compiz.desktop - -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' - -%find_lang %{name} - -cat %{name}.lang > core-files.txt - -for f in %{core_plugins}; do - echo %{_libdir}/compiz/lib$f.so - echo %{_datadir}/compiz/$f.xml -done >> core-files.txt - -for f in %{mate_plugins}; do - echo %{_libdir}/compiz/lib$f.so - echo %{_datadir}/compiz/$f.xml -done >> mate-files.txt - - -%check -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-mate-emerald.desktop -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-xfce-emerald.desktop -desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/compiz-lxde-emerald.desktop - - -%post -/sbin/ldconfig -/bin/touch --no-create %{_datadir}/compiz &>/dev/null || : -/bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/compiz &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || : -fi -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/compiz &>/dev/null || : -/usr/bin/gtk-update-icon-cache %{_datadir}/ccsm/icons/hicolor/scalable/apps &>/dev/null || : - - - -%files -f core-files.txt -%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README TODO NEWS -%{_bindir}/compiz -%{_libdir}/libdecoration.so.* -%dir %{_libdir}/compiz -%dir %{_datadir}/compiz -%{_datadir}/compiz/*.png -%{_datadir}/compiz/core.xml - -%files mate -f mate-files.txt -%{_bindir}/compiz-mate-emerald -%{_datadir}/applications/compiz-mate-emerald.desktop -%{_datadir}/ccsm/icons/hicolor/scalable/apps/plugin-matecompat.svg - -%files xfce -%{_bindir}/compiz-xfce-emerald -%{_datadir}/applications/compiz-xfce-emerald.desktop - -%files lxde -%{_bindir}/compiz-lxde-emerald -%{_datadir}/applications/compiz-lxde-emerald.desktop - -%files devel -%{_libdir}/pkgconfig/compiz.pc -%{_libdir}/pkgconfig/libdecoration.pc -%{_libdir}/pkgconfig/compiz-cube.pc -%{_libdir}/pkgconfig/compiz-scale.pc -%{_includedir}/compiz/ -%{_libdir}/libdecoration.so - - -%changelog -* Sun Feb 10 2013 Wolfgang Ulbrich - 1:0.8.8-14 -- add compiz_primary-is-control.patch -- this will set all default configurations to pimary key -- change compiz-wall.patch for set primary is control key -- fix (#909657) - -* Fri Jan 04 2013 Wolfgang Ulbrich - 1:0.8.8-13 -- add require emerald again - -* Tue Dec 25 2012 Wolfgang Ulbrich - 1:0.8.8-12 -- remove require emerald until it is in fedora stable - -* Sat Dec 22 2012 Wolfgang Ulbrich - 1:0.8.8-11 -- do some major changes -- disable mateconf and use libini text file configuration backend -- remove mateconf from scriptlet section -- move glib annotate svg plugins to core package -- disable gtk-windows-decorator -- drop compiz-mate-gtk compiz session script -- disable gtk-windows-decorator patches -- disable marco/metacity -- disable mate/gnome -- disable mate/gnome keybindings -- insert compiz-mate-emerald compiz session script -- insert compiz-xfce-emerald compiz session script -- insert compiz-lxde-emerald compiz session script -- add emerald as require -- add matecompat icon -- add icon cache scriptlets - - -* Sun Dec 02 2012 Wolfgang Ulbrich - 1:0.8.8-10 -- add %%global plugins_schemas again - -* Sun Dec 02 2012 Wolfgang Ulbrich - 1:0.8.8-9 -- revert scriptlet change - -* Sun Dec 02 2012 Wolfgang Ulbrich - 1:0.8.8-8 -- add %%global plugins_schemas -- change mateconf scriptlets -- remove (Requires(post): desktop-file-utils) -- add some patches from Jasmine Hassan jasmine.aura@gmail.com -- remove (noreplace) from mateconf schema directory -- add desktop-file-validate -- disable mate keybindings for the moment - -* Fri Oct 05 2012 Leigh Scott - 1:0.8.8-7 -- remove and obsolete compiz-kconfig schema - -* Fri Oct 05 2012 Wolfgang Ulbrich - 0.8.8-6 -- remove update update-desktop-database from %%post mate -- remove (noreplace) from mateconf schema dir -- remove Requires(post): desktop-file-utils -- add epoch tags - -* Wed Sep 26 2012 Wolfgang Ulbrich - 0.8.8-5 -- change compiz-0.88_incorrect-fsf-address.patch - -* Wed Sep 26 2012 Wolfgang Ulbrich - 0.8.8-4 -- remove upstreamed patches -- own include dir -- add compiz-mate-gtk source and compiz-mate-gtk.desktop file -- add keybinding sources -- change %%define to %%global entries -- rename no-more-gnome-wm-settings.patch to no-more-mate-wm-settings.patch -- add compiz-0.88_incorrect-fsf-address.patch -- clean up build section - -* Sun Sep 16 2012 Wolfgang Ulbrich - 0.8.8-3 -- add isa tags -- remove kde stuff -- remove obsolete beryl stuff -- add comiz_mate_fork.patch -- remove %%defattr(-, root, root) -- add compiz_gtk_window_decoration_button_placement.patch -- enable some compiz keybindings - -* Tue May 15 2012 Wolfgang Ulbrich - 0.8.8-2 -- add compiz_mate_fix.patch - -* Tue May 15 2012 Wolfgang Ulbrich - 0.8.8-1 -- build for mate - -* Sun May 06 2012 Andrew Wyatt - 0.8.8-1 -- Update to latest stable release - -* Tue Nov 30 2010 leigh scott - 0.8.6-6 -- add more upstream gdk fixes - diff --git a/compiz_gtk_window_decoration_button_placement.patch b/compiz_gtk_window_decoration_button_placement.patch deleted file mode 100644 index b204bec..0000000 --- a/compiz_gtk_window_decoration_button_placement.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -upr compiz-0.8.8-orig/configure.ac compiz-0.8.8/configure.ac ---- compiz-0.8.8-orig/configure.ac 2012-09-16 10:04:18.000000000 +0200 -+++ compiz-0.8.8/configure.ac 2012-09-16 10:10:26.095872922 +0200 -@@ -323,12 +323,12 @@ if test "x$use_gtk" = "xyes"; then - if test "x$use_marco" = "xyes"; then - PKG_CHECK_MODULES(MARCO, libmarco-private, - [use_marco=yes], [use_marco=no]) -- PKG_CHECK_EXISTS(libmarco-private >= 2.15.21, -+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, - [have_marco_2_15_21=yes], [have_marco_2_15_21=no]) -- PKG_CHECK_EXISTS(libmarco-private >= 2.17.0, -+ PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, - [have_marco_2_17_0=yes], [have_marco_2_17_0=no]) - PKG_CHECK_EXISTS(libmarco-private >= 1.2.0, -- [have_marco_2_23_2=yes], [have_marco_1_2_0=no]) -+ [have_marco_2_23_2=yes], [have_marco_2_23_2=no]) - fi - - if test "x$use_mate" = "xyes"; then -@@ -382,8 +382,8 @@ if test "$use_marco" = yes; then - AC_DEFINE(HAVE_MARCO_2_17_0, 1, - [Define to 1 if marco version >= 2.17.0]) - fi -- if test "$have_marco_1_2_0" = yes; then -- AC_DEFINE(HAVE_MARCO_1_2_0, 1, -+ if test "$have_marco_2_23_2" = yes; then -+ AC_DEFINE(HAVE_MARCO_2_23_2, 1, - [Define to 1 if marco version >= 1.2.0]) - fi - fi -diff -upr compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c compiz-0.8.8/gtk/mate/compiz-window-manager.c ---- compiz-0.8.8-orig/gtk/mate/compiz-window-manager.c 2012-09-16 10:04:18.000000000 +0200 -+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2012-09-16 10:12:15.613373978 +0200 -@@ -370,7 +370,7 @@ add_themes_from_dir (GList *current_list - { - theme_file_path = - g_build_filename (path, entry->d_name, -- "marco-1/marco-theme-1.xml", NULL); -+ "metacity-1/metacity-theme-1.xml", NULL); - - if (g_file_test (theme_file_path, G_FILE_TEST_EXISTS)) - { diff --git a/compiz_windows-decorator.patch b/compiz_windows-decorator.patch deleted file mode 100644 index dd1d434..0000000 --- a/compiz_windows-decorator.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -upr compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c ---- compiz-0.8.8-orig/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 12:40:35.000000000 +0200 -+++ compiz-0.8.8/gtk/window-decorator/gtk-window-decorator.c 2012-05-16 13:55:44.000000000 +0200 -@@ -1318,7 +1318,7 @@ draw_window_decoration (decor_t *d) - } - } - --#ifdef USE_MARCO -+ - static void - decor_update_meta_window_property (decor_t *d, - MetaTheme *theme, -@@ -1405,17 +1405,16 @@ meta_get_corner_radius (const MetaFrameG - int *bottom_right_radius) - { - --#ifdef HAVE_MARCO_2_17_0 -+#ifdef HAVE_MARCO_1_2_0 - *top_left_radius = fgeom->top_left_corner_rounded_radius; - *top_right_radius = fgeom->top_right_corner_rounded_radius; - *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius; - *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius; - #else -- *top_left_radius = fgeom->top_left_corner_rounded ? 5 : 0; -- *top_right_radius = fgeom->top_right_corner_rounded ? 5 : 0; -- *bottom_left_radius = fgeom->bottom_left_corner_rounded ? 5 : 0; -- *bottom_right_radius = fgeom->bottom_right_corner_rounded ? 5 : 0; --#endif -+ *top_left_radius = fgeom->top_left_corner_rounded_radius; -+ *top_right_radius = fgeom->top_right_corner_rounded_radius; -+ *bottom_left_radius = fgeom->bottom_left_corner_rounded_radius; -+ *bottom_right_radius = fgeom->bottom_right_corner_rounded_radius; - - } - diff --git a/composite-cube-logo.patch b/composite-cube-logo.patch deleted file mode 100644 index 0ac0f80..0000000 --- a/composite-cube-logo.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -up compiz-0ec3ec/plugins/cube.c~ compiz-0ec3ec/plugins/cube.c ---- compiz-0ec3ec/plugins/cube.c~ 2007-07-23 16:20:42.000000000 -0400 -+++ compiz-0ec3ec/plugins/cube.c 2007-08-15 17:45:18.000000000 -0400 -@@ -1272,11 +1272,27 @@ cubePaintTop (CompScreen *s, - - if (cs->invert == 1 && size == 4 && cs->texture.name) - { -+ glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE); -+ -+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_INTERPOLATE); -+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_RGB, GL_TEXTURE0); -+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE1_RGB, GL_PRIMARY_COLOR); -+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE2_RGB, GL_TEXTURE0); -+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_RGB, GL_SRC_COLOR); -+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND1_RGB, GL_SRC_COLOR); -+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND2_RGB, GL_SRC_ALPHA); -+ -+ glTexEnvf (GL_TEXTURE_ENV, GL_COMBINE_ALPHA, GL_REPLACE); -+ glTexEnvf (GL_TEXTURE_ENV, GL_SOURCE0_ALPHA, GL_PREVIOUS); -+ glTexEnvf (GL_TEXTURE_ENV, GL_OPERAND0_ALPHA, GL_SRC_ALPHA); -+ - enableTexture (s, &cs->texture, COMP_TEXTURE_FILTER_GOOD); - glTexCoordPointer (2, GL_FLOAT, 0, cs->tc); - glDrawArrays (GL_TRIANGLE_FAN, 0, cs->nVertices >> 1); - disableTexture (s, &cs->texture); - glDisableClientState (GL_TEXTURE_COORD_ARRAY); -+ -+ glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - } - else - { diff --git a/fedora-logo.patch b/fedora-logo.patch deleted file mode 100644 index 37b1390..0000000 --- a/fedora-logo.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xml.in ---- compiz-0.8.2.orign/metadata/cube.xml.in 2009-02-15 10:10:23.000000000 +0100 -+++ compiz-0.8.2/metadata/cube.xml.in 2009-05-25 22:54:03.060114649 +0200 -@@ -92,9 +92,9 @@ - <_short>Cube Color - <_long>Color of top and bottom sides of the cube - -- 0xfefe -- 0xffff -- 0xc7c7 -+ 0x0000 -+ 0x1919 -+ 0x4a4a - - - -@@ -110,7 +110,7 @@ - string - file;image; - -- freedesktop -+ /usr/share/pixmaps/fedora-logo - - - - -@@ -110,7 +110,7 @@ - string - file;image; - -- freedesktop -+ /usr/share/pixmaps/redhat/shadowman-transparent - - -