rpms/compiz
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0ed08e0082
compiz/compiz_new_mate.patch

19013 lines
588 KiB
Diff
Raw Normal View History

add compiz_new_mate.patch
2013-04-24 11:07:00 +00:00
diff -uprN 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 2013-04-18 18:20:04.095732902 +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 >= 2.23.2,
+ [have_marco_2_23_2=yes], [have_marco_2_23_2=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_2_23_2" = yes; then
+ AC_DEFINE(HAVE_MARCO_2_23_2, 1,
+ [Define to 1 if marco version >= 2.23.2])
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 ""
diff -uprN compiz-0.8.8-orig/gtk/gnome/50-compiz-desktop-key.xml.in compiz-0.8.8/gtk/gnome/50-compiz-desktop-key.xml.in
--- compiz-0.8.8-orig/gtk/gnome/50-compiz-desktop-key.xml.in 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/50-compiz-desktop-key.xml.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
-
- <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_key"/>
-
- <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/main_menu_key"/>
-
- <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_screenshot_key"/>
-
- <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_window_screenshot_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
-
- <KeyListEntry name="/apps/compiz/plugins/gnomecompat/allscreens/options/run_command_terminal_key"/>
-
-</KeyListEntries>
diff -uprN compiz-0.8.8-orig/gtk/gnome/50-compiz-key.xml.in compiz-0.8.8/gtk/gnome/50-compiz-key.xml.in
--- compiz-0.8.8-orig/gtk/gnome/50-compiz-key.xml.in 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/50-compiz-key.xml.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<KeyListEntries _name="Window Management" wm_name="compiz" package="compiz">
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/close_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/raise_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/lower_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/maximize_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/unmaximize_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_horizontally_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_vertically_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_shaded_key"/>
-
- <KeyListEntry name="/apps/compiz/general/allscreens/options/window_menu_key"/>
-
- <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
-</KeyListEntries>
diff -uprN compiz-0.8.8-orig/gtk/gnome/compiz.desktop.in compiz-0.8.8/gtk/gnome/compiz.desktop.in
--- compiz-0.8.8-orig/gtk/gnome/compiz.desktop.in 2010-05-21 13:17:43.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/compiz.desktop.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-_Name=Compiz
-Exec=compiz
-NoDisplay=true
-# name of loadable control center module
-X-GNOME-WMSettingsModule=compiz
-# autostart phase
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-# name we put on the WM spec check window
-X-GNOME-WMName=compiz
-# back compat only
-X-GnomeWMSettingsLibrary=compiz
diff -uprN compiz-0.8.8-orig/gtk/gnome/compiz-window-manager.c compiz-0.8.8/gtk/gnome/compiz-window-manager.c
--- compiz-0.8.8-orig/gtk/gnome/compiz-window-manager.c 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/compiz-window-manager.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,559 +0,0 @@
-/*
- * 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 <davidr@novell.com>
- */
-
-#include <config.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <string.h>
-#include <gconf/gconf-client.h>
-#include <glib/gi18n.h>
-
-#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 GCONF_DIR "/apps/metacity/general"
-
-#define COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY \
- GCONF_DIR "/action_double_click_titlebar"
-
-#define COMPIZ_USE_SYSTEM_FONT_KEY \
- GCONF_DIR "/titlebar_uses_system_font"
-
-#define COMPIZ_TITLEBAR_FONT_KEY \
- GCONF_DIR "/titlebar_font"
-
-#define COMPIZ_THEME_KEY \
- GCONF_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 GnomeWindowManagerClass *parent_class;
-
-struct _CompizWindowManagerPrivate {
- GConfClient *gconf;
- gchar *font;
- gchar *theme;
- gchar *mouse_modifier;
-};
-
-static void
-value_changed (GConfClient *client,
- const gchar *key,
- GConfValue *value,
- void *data)
-{
- CompizWindowManager *wm;
-
- wm = COMPIZ_WINDOW_MANAGER (data);
-
- gnome_window_manager_settings_changed (GNOME_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 != GNOME_WINDOW_MANAGER_INTERFACE_VERSION)
- {
- g_warning ("Compiz window manager module wasn't compiled with the "
- "current version of gnome-control-center");
- return NULL;
- }
-
- wm = g_object_new (compiz_window_manager_get_type (), NULL);
-
- return wm;
-}
-
-static void
-compiz_change_settings (GnomeWindowManager *wm,
- const GnomeWMSettings *settings)
-{
- CompizWindowManager *cwm;
-
- cwm = COMPIZ_WINDOW_MANAGER (wm);
-
- if (settings->flags & GNOME_WM_SETTING_FONT)
- gconf_client_set_string (cwm->p->gconf,
- COMPIZ_TITLEBAR_FONT_KEY,
- settings->font, NULL);
-
- if (settings->flags & GNOME_WM_SETTING_MOUSE_FOCUS)
- gconf_client_set_bool (cwm->p->gconf,
- COMPIZ_CLICK_TO_FOCUS_KEY,
- settings->focus_follows_mouse == FALSE,
- NULL);
-
- if (settings->flags & GNOME_WM_SETTING_AUTORAISE)
- gconf_client_set_bool (cwm->p->gconf,
- COMPIZ_AUTORAISE_KEY,
- settings->autoraise, NULL);
-
- if (settings->flags & GNOME_WM_SETTING_AUTORAISE_DELAY)
- gconf_client_set_int (cwm->p->gconf,
- COMPIZ_AUTORAISE_DELAY_KEY,
- settings->autoraise_delay, NULL);
-
- if (settings->flags & GNOME_WM_SETTING_MOUSE_MOVE_MODIFIER)
- {
- char *value;
-
- value = g_strdup_printf ("<%s>Button1", settings->mouse_move_modifier);
- gconf_client_set_string (cwm->p->gconf,
- COMPIZ_MOUSE_MOVE_KEY,
- value, NULL);
- g_free (value);
- }
-
- if (settings->flags & GNOME_WM_SETTING_THEME)
- gconf_client_set_string (cwm->p->gconf,
- COMPIZ_THEME_KEY,
- settings->theme, NULL);
-
- if (settings->flags & GNOME_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)
- gconf_client_set_string (cwm->p->gconf,
- COMPIZ_DOUBLE_CLICK_TITLEBAR_KEY,
- action, NULL);
- }
-}
-
-static void
-compiz_get_settings (GnomeWindowManager *wm,
- GnomeWMSettings *settings)
-{
- CompizWindowManager *cwm;
- int to_get;
-
- cwm = COMPIZ_WINDOW_MANAGER (wm);
-
- to_get = settings->flags;
- settings->flags = 0;
-
- if (to_get & GNOME_WM_SETTING_FONT)
- {
- char *str;
-
- str = gconf_client_get_string (cwm->p->gconf,
- 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 |= GNOME_WM_SETTING_FONT;
- }
-
- if (to_get & GNOME_WM_SETTING_MOUSE_FOCUS)
- {
- settings->focus_follows_mouse =
- gconf_client_get_bool (cwm->p->gconf,
- COMPIZ_CLICK_TO_FOCUS_KEY, NULL) == FALSE;
-
- settings->flags |= GNOME_WM_SETTING_MOUSE_FOCUS;
- }
-
- if (to_get & GNOME_WM_SETTING_AUTORAISE)
- {
- settings->autoraise = gconf_client_get_bool (cwm->p->gconf,
- COMPIZ_AUTORAISE_KEY,
- NULL);
-
- settings->flags |= GNOME_WM_SETTING_AUTORAISE;
- }
-
- if (to_get & GNOME_WM_SETTING_AUTORAISE_DELAY)
- {
- settings->autoraise_delay =
- gconf_client_get_int (cwm->p->gconf,
- COMPIZ_AUTORAISE_DELAY_KEY,
- NULL);
-
- settings->flags |= GNOME_WM_SETTING_AUTORAISE_DELAY;
- }
-
- if (to_get & GNOME_WM_SETTING_MOUSE_MOVE_MODIFIER)
- {
- const char *new;
- char *str;
-
- str = gconf_client_get_string (cwm->p->gconf,
- COMPIZ_MOUSE_MOVE_KEY,
- NULL);
-
- if (str == NULL)
- str = g_strdup ("<Super>");
-
- if (strncmp (str, "<Super>", 7) == 0)
- new = "Super";
- else if (strncmp (str, "<Alt>", 5) == 0)
- new = "Alt";
- else if (strncmp (str, "<Meta>", 6) == 0)
- new = "Meta";
- else if (strncmp (str, "<Hyper>", 7) == 0)
- new = "Hyper";
- else if (strncmp (str, "<Control>", 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 |= GNOME_WM_SETTING_MOUSE_MOVE_MODIFIER;
- }
-
- if (to_get & GNOME_WM_SETTING_THEME)
- {
- char *str;
-
- str = gconf_client_get_string (cwm->p->gconf,
- 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 |= GNOME_WM_SETTING_THEME;
- }
-
- if (to_get & GNOME_WM_SETTING_DOUBLE_CLICK_ACTION)
- {
- char *str;
-
- settings->double_click_action = DOUBLE_CLICK_MAXIMIZE;
-
- str = gconf_client_get_string (cwm->p->gconf,
- 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 |= GNOME_WM_SETTING_DOUBLE_CLICK_ACTION;
- }
-}
-
-static int
-compiz_get_settings_mask (GnomeWindowManager *wm)
-{
- return GNOME_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,
- "metacity-1/metacity-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 (GnomeWindowManager *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, METACITY_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 (GnomeWindowManager *wm)
-{
- return g_build_filename (g_get_home_dir (), ".themes", NULL);
-}
-
-static void
-compiz_get_double_click_actions (GnomeWindowManager *wm,
- const GnomeWMDoubleClickAction **actions_p,
- int *n_actions_p)
-{
- static gboolean initialized = FALSE;
- static GnomeWMDoubleClickAction 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->gconf = gconf_client_get_default ();
- cwm->p->mouse_modifier = NULL;
- cwm->p->font = NULL;
- cwm->p->theme = NULL;
-
- gconf_client_add_dir (cwm->p->gconf,
- "/apps/compiz",
- GCONF_CLIENT_PRELOAD_ONELEVEL,
- NULL);
-
- gconf_client_add_dir (cwm->p->gconf,
- GCONF_DIR,
- GCONF_CLIENT_PRELOAD_ONELEVEL,
- NULL);
-
-
- g_signal_connect (G_OBJECT (cwm->p->gconf),
- "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->gconf),
- 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->gconf));
- g_free (cwm->p);
-
- G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-static void
-compiz_window_manager_class_init (CompizWindowManagerClass *class)
-{
- GObjectClass *object_class;
- GnomeWindowManagerClass *wm_class;
-
- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
- textdomain (GETTEXT_PACKAGE);
-
- object_class = G_OBJECT_CLASS (class);
- wm_class = GNOME_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 (gnome_window_manager_get_type (),
- "CompizWindowManager",
- &compiz_window_manager_info, 0);
- }
-
- return compiz_window_manager_type;
-}
diff -uprN compiz-0.8.8-orig/gtk/gnome/compiz-window-manager.h compiz-0.8.8/gtk/gnome/compiz-window-manager.h
--- compiz-0.8.8-orig/gtk/gnome/compiz-window-manager.h 2010-05-21 13:17:43.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/compiz-window-manager.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-#ifndef COMPIZ_WINDOW_MANAGER_H
-#define COMPIZ_WINDOW_MANAGER_H
-
-#include <glib-object.h>
-
-#include "gnome-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 (), \
- MetacityWindowManagerClass)
-
-#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 {
- GnomeWindowManager parent;
- CompizWindowManagerPrivate *p;
-};
-
-struct _CompizWindowManagerClass {
- GnomeWindowManagerClass klass;
-};
-
-GType
-compiz_window_manager_get_type (void);
-
-GObject *
-window_manager_new (int expected_interface_version);
-
-#endif
diff -uprN compiz-0.8.8-orig/gtk/gnome/compiz-wm.desktop.in compiz-0.8.8/gtk/gnome/compiz-wm.desktop.in
--- compiz-0.8.8-orig/gtk/gnome/compiz-wm.desktop.in 2010-05-21 13:17:43.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/compiz-wm.desktop.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-_Name=Compiz
-Exec=compiz
-# name of loadable control center module
-X-GNOME-WMSettingsModule=compiz
-# autostart phase
-X-GNOME-Autostart-Phase=WindowManager
-X-GNOME-Provides=windowmanager
-# name we put on the WM spec check window
-X-GNOME-WMName=compiz
-# back compat only
-X-GnomeWMSettingsLibrary=compiz
-
-[Window Manager]
-SessionManaged=false
diff -uprN compiz-0.8.8-orig/gtk/gnome/Makefile.am compiz-0.8.8/gtk/gnome/Makefile.am
--- compiz-0.8.8-orig/gtk/gnome/Makefile.am 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/gtk/gnome/Makefile.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-moduledir = $(DESTDIR)$(windowsettingslibdir)/window-manager-settings
-
-if USE_GNOME
-libcompiz_la_LDFLAGS = -export-dynamic -avoid-version -rpath $(moduledir)
-libcompiz_la_LIBADD = @GNOME_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)/gnome/wm-properties
-wmproperties_in_files = compiz-wm.desktop.in
-wmproperties_files = $(wmproperties_in_files:.desktop.in=.desktop)
-
-@INTLTOOL_DESKTOP_RULE@
-
-if USE_GNOME_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_GNOME_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_GNOME_KEYBINDINGS
- if test -w $(xmldir); then ( \
- rm -f $(xmldir)/50-compiz*key.xml \
- ); \
- fi
-endif
-endif
-
-INCLUDES = @GNOME_WINDOW_SETTINGS_CFLAGS@ \
- -DMETACITY_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 -uprN 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 2013-04-18 18:20:05.369745815 +0200
@@ -1 +1 @@
-SUBDIRS = window-decorator gnome
+SUBDIRS = window-decorator mate
diff -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/50-compiz-desktop-key.xml.in 2013-04-18 18:20:05.906751258 +0200
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries _name="Desktop" wm_name="compiz" package="compiz">
+
+ <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_key"/>
+
+ <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/main_menu_key"/>
+
+ <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_screenshot_key"/>
+
+ <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_window_screenshot_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/show_desktop_key"/>
+
+ <KeyListEntry name="/apps/compiz/plugins/matecompat/allscreens/options/run_command_terminal_key"/>
+
+</KeyListEntries>
diff -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/50-compiz-key.xml.in 2010-05-21 13:18:14.000000000 +0200
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<KeyListEntries _name="Window Management" wm_name="compiz" package="compiz">
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/close_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/raise_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/lower_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/maximize_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/unmaximize_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/minimize_window_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_horizontally_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_maximized_vertically_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/toggle_window_shaded_key"/>
+
+ <KeyListEntry name="/apps/compiz/general/allscreens/options/window_menu_key"/>
+
+ <KeyListEntry name="/apps/compiz/plugins/scale/allscreens/options/initiate_key"/>
+</KeyListEntries>
diff -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/compiz.desktop.in 2013-04-18 18:20:06.088753103 +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 -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/compiz-window-manager.c 2013-04-18 19:11:58.777183170 +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 <davidr@novell.com>
+ */
+
+#include <config.h>
+#include <sys/types.h>
+#include <dirent.h>
+#include <string.h>
+#include <mateconf/mateconf-client.h>
+#include <glib/gi18n.h>
+
+#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 ("<Super>");
+
+ if (strncmp (str, "<Super>", 7) == 0)
+ new = "Super";
+ else if (strncmp (str, "<Alt>", 5) == 0)
+ new = "Alt";
+ else if (strncmp (str, "<Meta>", 6) == 0)
+ new = "Meta";
+ else if (strncmp (str, "<Hyper>", 7) == 0)
+ new = "Hyper";
+ else if (strncmp (str, "<Control>", 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,
+ "metacity-1/metacity-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 -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/compiz-window-manager.h 2013-04-18 18:20:06.049752707 +0200
@@ -0,0 +1,39 @@
+#ifndef COMPIZ_WINDOW_MANAGER_H
+#define COMPIZ_WINDOW_MANAGER_H
+
+#include <glib-object.h>
+
+#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 -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/compiz-wm.desktop.in 2013-04-18 18:20:05.798750163 +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 -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/gtk/mate/Makefile.am 2013-04-18 18:20:05.954751744 +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 -uprN 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 2013-04-18 18:20:05.735749525 +0200
@@ -43,8 +43,8 @@
#include <gdk/gdkx.h>
#include <glib/gi18n.h>
-#ifdef USE_GCONF
-#include <gconf/gconf-client.h>
+#ifdef USE_MATECONF
+#include <mateconf/mateconf-client.h>
#endif
#ifdef USE_DBUS_GLIB
@@ -79,72 +79,72 @@
#include <sys/types.h>
#include <signal.h>
-#ifdef USE_METACITY
-#include <metacity-private/theme.h>
+#ifdef USE_MARCO
+#include <marco-private/theme.h>
#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 -uprN 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 2013-04-18 18:20:05.774749920 +0200
@@ -1,4 +1,4 @@
-<gconfschemafile>
+<mateconfschemafile>
<schemalist>
<schema>
<key>/schemas/apps/gwd/blur_type</key>
@@ -12,14 +12,14 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/gwd/use_metacity_theme</key>
- <applyto>/apps/gwd/use_metacity_theme</applyto>
+ <key>/schemas/apps/gwd/use_marco_theme</key>
+ <applyto>/apps/gwd/use_marco_theme</applyto>
<owner>gwd</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Use metacity theme</short>
- <long>Use metacity theme when drawing window decorations</long>
+ <short>Use marco theme</short>
+ <long>Use marco theme when drawing window decorations</long>
</locale>
</schema>
<schema>
@@ -34,48 +34,48 @@
</locale>
</schema>
<schema>
- <key>/schemas/apps/gwd/metacity_theme_opacity</key>
- <applyto>/apps/gwd/metacity_theme_opacity</applyto>
+ <key>/schemas/apps/gwd/marco_theme_opacity</key>
+ <applyto>/apps/gwd/marco_theme_opacity</applyto>
<owner>gwd</owner>
<type>float</type>
<default>0.75</default>
<locale name="C">
- <short>Metacity theme opacity</short>
- <long>Opacity to use for metacity theme decorations</long>
+ <short>Marco theme opacity</short>
+ <long>Opacity to use for marco theme decorations</long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/gwd/metacity_theme_shade_opacity</key>
- <applyto>/apps/gwd/metacity_theme_shade_opacity</applyto>
+ <key>/schemas/apps/gwd/marco_theme_shade_opacity</key>
+ <applyto>/apps/gwd/marco_theme_shade_opacity</applyto>
<owner>gwd</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Metacity theme opacity shade</short>
- <long>Shade windows with metacity theme decorations from opaque to translucent</long>
+ <short>Marco theme opacity shade</short>
+ <long>Shade windows with marco theme decorations from opaque to translucent</long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/gwd/metacity_theme_active_opacity</key>
- <applyto>/apps/gwd/metacity_theme_active_opacity</applyto>
+ <key>/schemas/apps/gwd/marco_theme_active_opacity</key>
+ <applyto>/apps/gwd/marco_theme_active_opacity</applyto>
<owner>gwd</owner>
<type>float</type>
<default>1.0</default>
<locale name="C">
- <short>Metacity theme active window opacity</short>
- <long>Opacity to use for active windows with metacity theme decorations</long>
+ <short>Marco theme active window opacity</short>
+ <long>Opacity to use for active windows with marco theme decorations</long>
</locale>
</schema>
<schema>
- <key>/schemas/apps/gwd/metacity_theme_active_shade_opacity</key>
update compiz_new_mate.patch
2013-05-26 13:37:08 +00:00
- <applyto>/apps/gwd/metacity_theme_active_shade_opacity</applyto>
+ <key>/schemas/apps/gwd/marco_theme_active_shade_opacity</key>
+ <applyto>/apps/gwd/marco_theme_active_shade_opacity</applyto>
<owner>gwd</owner>
<type>bool</type>
<default>true</default>
<locale name="C">
- <short>Metacity theme active window opacity shade</short>
- <long>Shade active windows with metacity theme decorations from opaque to translucent</long>
+ <short>Marco theme active window opacity shade</short>
+ <long>Shade active windows with marco theme decorations from opaque to translucent</long>
</locale>
</schema>
</schemalist>
-</gconfschemafile>
+</mateconfschemafile>
diff -uprN 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 2013-04-18 18:20:05.484746981 +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"\"
add compiz_new_mate.patch
2013-04-24 11:07:00 +00:00
diff -uprN 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 2013-04-18 19:11:59.095186386 +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 -uprN compiz-0.8.8-orig/metadata/gconf.xml.in compiz-0.8.8/metadata/gconf.xml.in
--- compiz-0.8.8-orig/metadata/gconf.xml.in 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/metadata/gconf.xml.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-<compiz>
- <plugin name="gconf">
- <_short>GConf</_short>
- <_long>GConf Control Backend</_long>
- <deps>
- <relation type="after">
- <plugin>glib</plugin>
- </relation>
- <relation type="before">
- <plugin>decoration</plugin>
- <plugin>wobbly</plugin>
- <plugin>fade</plugin>
- <plugin>cube</plugin>
- <plugin>scale</plugin>
- </relation>
- </deps>
- </plugin>
-</compiz>
diff -uprN compiz-0.8.8-orig/metadata/gnomecompat.xml.in compiz-0.8.8/metadata/gnomecompat.xml.in
--- compiz-0.8.8-orig/metadata/gnomecompat.xml.in 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/metadata/gnomecompat.xml.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-<compiz>
- <plugin name="gnomecompat">
- <_short>Gnome Compatibility</_short>
- <_long>Options that keep Compiz compatible to the Gnome desktop environment</_long>
- <category>General</category>
- <display>
- <option name="main_menu_key" type="key">
- <_short>Show Main Menu</_short>
- <_long>Show the main menu</_long>
- <default>&lt;Alt&gt;F1</default>
- </option>
- <option name="run_key" type="key">
- <_short>Run Dialog</_short>
- <_long>Show Run Application dialog</_long>
- <default>&lt;Alt&gt;F2</default>
- </option>
- <group>
- <_short>Commands</_short>
- <option name="command_screenshot" type="string">
- <_short>Screenshot command line</_short>
- <_long>Screenshot command line</_long>
- <default>gnome-screenshot</default>
- </option>
- <option name="run_command_screenshot_key" type="key">
- <_short>Take a screenshot</_short>
- <_long>Take a screenshot</_long>
- <default>Print</default>
- </option>
- <option name="command_window_screenshot" type="string">
- <_short>Window screenshot command line</_short>
- <_long>Window screenshot command line</_long>
- <default>gnome-screenshot --window</default>
- </option>
- <option name="run_command_window_screenshot_key" type="key">
- <_short>Take a screenshot of a window</_short>
- <_long>Take a screenshot of a window</_long>
- <default>&lt;Alt&gt;Print</default>
- </option>
- <_short>Run terminal command</_short>
- <option name="command_terminal" type="string">
- <_short>Terminal command line</_short>
- <_long>Terminal command line</_long>
- <default>gnome-terminal</default>
- </option>
- <option name="run_command_terminal_key" type="key">
- <_short>Open a terminal</_short>
- <_long>Open a terminal</_long>
- </option>
- </group>
- </display>
- </plugin>
-</compiz>
diff -uprN 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 2013-04-18 18:20:06.146753691 +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 -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/metadata/matecompat.xml.in 2013-04-18 18:20:06.280755049 +0200
@@ -0,0 +1,52 @@
+<compiz>
+ <plugin name="matecompat">
+ <_short>Mate Compatibility</_short>
+ <_long>Options that keep Compiz compatible to the Mate desktop environment</_long>
+ <category>General</category>
+ <display>
+ <option name="main_menu_key" type="key">
+ <_short>Show Main Menu</_short>
+ <_long>Show the main menu</_long>
+ <default>&lt;Alt&gt;F1</default>
+ </option>
+ <option name="run_key" type="key">
+ <_short>Run Dialog</_short>
+ <_long>Show Run Application dialog</_long>
+ <default>&lt;Alt&gt;F2</default>
+ </option>
+ <group>
+ <_short>Commands</_short>
+ <option name="command_screenshot" type="string">
+ <_short>Screenshot command line</_short>
+ <_long>Screenshot command line</_long>
+ <default>mate-screenshot</default>
+ </option>
+ <option name="run_command_screenshot_key" type="key">
+ <_short>Take a screenshot</_short>
+ <_long>Take a screenshot</_long>
+ <default>Print</default>
+ </option>
+ <option name="command_window_screenshot" type="string">
+ <_short>Window screenshot command line</_short>
+ <_long>Window screenshot command line</_long>
+ <default>mate-screenshot --window</default>
+ </option>
+ <option name="run_command_window_screenshot_key" type="key">
+ <_short>Take a screenshot of a window</_short>
+ <_long>Take a screenshot of a window</_long>
+ <default>&lt;Alt&gt;Print</default>
+ </option>
+ <_short>Run terminal command</_short>
+ <option name="command_terminal" type="string">
+ <_short>Terminal command line</_short>
+ <_long>Terminal command line</_long>
+ <default>mate-terminal</default>
+ </option>
+ <option name="run_command_terminal_key" type="key">
+ <_short>Open a terminal</_short>
+ <_long>Open a terminal</_long>
+ </option>
+ </group>
+ </display>
+ </plugin>
+</compiz>
diff -uprN 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 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/metadata/mateconf.xml.in 2013-04-18 18:20:06.188754116 +0200
@@ -0,0 +1,18 @@
+<compiz>
+ <plugin name="mateconf">
+ <_short>MateConf</_short>
+ <_long>MateConf Control Backend</_long>
+ <deps>
+ <relation type="after">
+ <plugin>glib</plugin>
+ </relation>
+ <relation type="before">
+ <plugin>decoration</plugin>
+ <plugin>wobbly</plugin>
+ <plugin>fade</plugin>
+ <plugin>cube</plugin>
+ <plugin>scale</plugin>
+ </relation>
+ </deps>
+ </plugin>
+</compiz>
diff -uprN 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 2013-04-18 18:20:06.339755647 +0200
@@ -29,13 +29,13 @@
<xsl:param name="appName">/apps/compiz</xsl:param>
<xsl:template match="/compiz">
- <gconfschemafile>
+ <mateconfschemafile>
<schemalist>
<xsl:for-each select="/compiz//option[not(@read_only='true') and not(@type='action')]">
<xsl:call-template name="dumpOption"/>
</xsl:for-each>
</schemalist>
- </gconfschemafile>
+ </mateconfschemafile>
</xsl:template>
<!-- generates the schema for an option -->
@@ -120,7 +120,7 @@
</schema>
</xsl:template>
- <!-- converts a compiz type to a gconf type -->
+ <!-- converts a compiz type to a mateconf type -->
<xsl:template name="printType">
<xsl:param name="type">
<xsl:value-of select="@type"/>
diff -uprN 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 2013-04-18 18:20:14.177835093 +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);
diff -uprN compiz-0.8.8-orig/plugins/gconf.c compiz-0.8.8/plugins/gconf.c
--- compiz-0.8.8-orig/plugins/gconf.c 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/plugins/gconf.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,849 +0,0 @@
-/*
- * 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 <davidr@novell.com>
- */
-
-#define _GNU_SOURCE
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <gconf/gconf-client.h>
-
-#include <compiz-core.h>
-
-static CompMetadata gconfMetadata;
-
-#define APP_NAME "compiz"
-
-/* From gconf-internal.h. Bleah. */
-int gconf_value_compare (const GConfValue *value_a,
- const GConfValue *value_b);
-
-static int corePrivateIndex;
-
-typedef struct _GConfCore {
- GConfClient *client;
- guint cnxn;
-
- CompTimeoutHandle reloadHandle;
-
- InitPluginForObjectProc initPluginForObject;
- SetOptionForPluginProc setOptionForPlugin;
-} GConfCore;
-
-#define GET_GCONF_CORE(c) \
- ((GConfCore *) (c)->base.privates[corePrivateIndex].ptr)
-
-#define GCONF_CORE(c) \
- GConfCore *gc = GET_GCONF_CORE (c)
-
-
-static gchar *
-gconfGetKey (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 GConfValueType
-gconfTypeFromCompType (CompOptionType type)
-{
- switch (type) {
- case CompOptionTypeBool:
- case CompOptionTypeBell:
- return GCONF_VALUE_BOOL;
- case CompOptionTypeInt:
- return GCONF_VALUE_INT;
- case CompOptionTypeFloat:
- return GCONF_VALUE_FLOAT;
- case CompOptionTypeString:
- case CompOptionTypeColor:
- case CompOptionTypeKey:
- case CompOptionTypeButton:
- case CompOptionTypeEdge:
- case CompOptionTypeMatch:
- return GCONF_VALUE_STRING;
- case CompOptionTypeList:
- return GCONF_VALUE_LIST;
- default:
- break;
- }
-
- return GCONF_VALUE_INVALID;
-}
-
-static void
-gconfSetValue (CompObject *object,
- CompOptionValue *value,
- CompOptionType type,
- GConfValue *gvalue)
-{
- switch (type) {
- case CompOptionTypeBool:
- gconf_value_set_bool (gvalue, value->b);
- break;
- case CompOptionTypeInt:
- gconf_value_set_int (gvalue, value->i);
- break;
- case CompOptionTypeFloat:
- gconf_value_set_float (gvalue, value->f);
- break;
- case CompOptionTypeString:
- gconf_value_set_string (gvalue, value->s);
- break;
- case CompOptionTypeColor: {
- gchar *color;
-
- color = colorToString (value->c);
- gconf_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);
- gconf_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);
- gconf_value_set_string (gvalue, action);
-
- free (action);
- } break;
- case CompOptionTypeEdge: {
- gchar *edge;
-
- edge = edgeMaskToString (value->action.edgeMask);
- gconf_value_set_string (gvalue, edge);
-
- free (edge);
- } break;
- case CompOptionTypeBell:
- gconf_value_set_bool (gvalue, value->action.bell);
- break;
- case CompOptionTypeMatch: {
- gchar *match;
-
- match = matchToString (&value->match);
- gconf_value_set_string (gvalue, match);
-
- free (match);
- } break;
- default:
- break;
- }
-}
-
-static void
-gconfSetOption (CompObject *object,
- CompOption *o,
- const gchar *plugin)
-{
- GConfValueType type = gconfTypeFromCompType (o->type);
- GConfValue *gvalue, *existingValue = NULL;
- gchar *key;
-
- GCONF_CORE (&core);
-
- if (type == GCONF_VALUE_INVALID)
- return;
-
- key = gconfGetKey (object, plugin, o->name);
-
- existingValue = gconf_client_get (gc->client, key, NULL);
- gvalue = gconf_value_new (type);
-
- if (o->type == CompOptionTypeList)
- {
- GSList *node, *list = NULL;
- GConfValue *gv;
- int i;
-
- type = gconfTypeFromCompType (o->value.list.type);
-
- for (i = 0; i < o->value.list.nValue; i++)
- {
- gv = gconf_value_new (type);
- gconfSetValue (object, &o->value.list.value[i],
- o->value.list.type, gv);
- list = g_slist_append (list, gv);
- }
-
- gconf_value_set_list_type (gvalue, type);
- gconf_value_set_list (gvalue, list);
-
- if (!existingValue || gconf_value_compare (existingValue, gvalue))
- gconf_client_set (gc->client, key, gvalue, NULL);
-
- for (node = list; node; node = node->next)
- gconf_value_free ((GConfValue *) node->data);
-
- g_slist_free (list);
- }
- else
- {
- gconfSetValue (object, &o->value, o->type, gvalue);
-
- if (!existingValue || gconf_value_compare (existingValue, gvalue))
- gconf_client_set (gc->client, key, gvalue, NULL);
- }
-
- gconf_value_free (gvalue);
-
- if (existingValue)
- gconf_value_free (existingValue);
-
- g_free (key);
-}
-
-static Bool
-gconfGetValue (CompObject *object,
- CompOptionValue *value,
- CompOptionType type,
- GConfValue *gvalue)
-
-{
- if (type == CompOptionTypeBool &&
- gvalue->type == GCONF_VALUE_BOOL)
- {
- value->b = gconf_value_get_bool (gvalue);
- return TRUE;
- }
- else if (type == CompOptionTypeInt &&
- gvalue->type == GCONF_VALUE_INT)
- {
- value->i = gconf_value_get_int (gvalue);
- return TRUE;
- }
- else if (type == CompOptionTypeFloat &&
- gvalue->type == GCONF_VALUE_FLOAT)
- {
- value->f = gconf_value_get_float (gvalue);
- return TRUE;
- }
- else if (type == CompOptionTypeString &&
- gvalue->type == GCONF_VALUE_STRING)
- {
- const char *str;
-
- str = gconf_value_get_string (gvalue);
- if (str)
- {
- value->s = strdup (str);
- if (value->s)
- return TRUE;
- }
- }
- else if (type == CompOptionTypeColor &&
- gvalue->type == GCONF_VALUE_STRING)
- {
- const gchar *color;
-
- color = gconf_value_get_string (gvalue);
-
- if (stringToColor (color, value->c))
- return TRUE;
- }
- else if (type == CompOptionTypeKey &&
- gvalue->type == GCONF_VALUE_STRING)
- {
- const gchar *action;
-
- action = gconf_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 == GCONF_VALUE_STRING)
- {
- const gchar *action;
-
- action = gconf_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 == GCONF_VALUE_STRING)
- {
- const gchar *edge;
-
- edge = gconf_value_get_string (gvalue);
-
- value->action.edgeMask = stringToEdgeMask (edge);
- return TRUE;
- }
- else if (type == CompOptionTypeBell &&
- gvalue->type == GCONF_VALUE_BOOL)
- {
- value->action.bell = gconf_value_get_bool (gvalue);
- return TRUE;
- }
- else if (type == CompOptionTypeMatch &&
- gvalue->type == GCONF_VALUE_STRING)
- {
- const gchar *match;
-
- match = gconf_value_get_string (gvalue);
-
- matchInit (&value->match);
- matchAddFromString (&value->match, match);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static Bool
-gconfReadOptionValue (CompObject *object,
- GConfEntry *entry,
- CompOption *o,
- CompOptionValue *value)
-{
- GConfValue *gvalue;
-
- gvalue = gconf_entry_get_value (entry);
- if (!gvalue)
- return FALSE;
-
- compInitOptionValue (value);
-
- if (o->type == CompOptionTypeList &&
- gvalue->type == GCONF_VALUE_LIST)
- {
- GConfValueType type;
- GSList *list;
- int i, n;
-
- type = gconf_value_get_list_type (gvalue);
- if (gconfTypeFromCompType (o->value.list.type) != type)
- return FALSE;
-
- list = gconf_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 (!gconfGetValue (object,
- &value->list.value[i],
- o->value.list.type,
- (GConfValue *) list->data))
- break;
-
- value->list.nValue++;
-
- list = g_slist_next (list);
- }
-
- if (value->list.nValue != n)
- {
- compFiniOptionValue (value, o->type);
- return FALSE;
- }
- }
- }
- }
- else
- {
- if (!gconfGetValue (object, value, o->type, gvalue))
- return FALSE;
- }
-
- return TRUE;
-}
-
-static void
-gconfGetOption (CompObject *object,
- CompOption *o,
- const char *plugin)
-{
- GConfEntry *entry;
- gchar *key;
-
- GCONF_CORE (&core);
-
- key = gconfGetKey (object, plugin, o->name);
-
- entry = gconf_client_get_entry (gc->client, key, NULL, TRUE, NULL);
- if (entry)
- {
- CompOptionValue value;
-
- if (gconfReadOptionValue (object, entry, o, &value))
- {
- (*core.setOptionForPlugin) (object, plugin, o->name, &value);
- compFiniOptionValue (&value, o->type);
- }
- else
- {
- gconfSetOption (object, o, plugin);
- }
-
- gconf_entry_free (entry);
- }
-
- g_free (key);
-}
-
-static CompBool
-gconfReloadObjectTree (CompObject *object,
- void *closure);
-
-static CompBool
-gconfReloadObjectsWithType (CompObjectType type,
- CompObject *parent,
- void *closure)
-{
- compObjectForEach (parent, type, gconfReloadObjectTree, closure);
-
- return TRUE;
-}
-
-static CompBool
-gconfReloadObjectTree (CompObject *object,
- void *closure)
-{
- CompPlugin *p = (CompPlugin *) closure;
- CompOption *option;
- int nOption;
-
- option = (*p->vTable->getObjectOptions) (p, object, &nOption);
- while (nOption--)
- gconfGetOption (object, option++, p->vTable->name);
-
- compObjectForEachType (object, gconfReloadObjectsWithType, closure);
-
- return TRUE;
-}
-
-static Bool
-gconfReload (void *closure)
-{
- CompPlugin *p;
-
- GCONF_CORE (&core);
-
- for (p = getPlugins (); p; p = p->next)
- {
- if (!p->vTable->getObjectOptions)
- continue;
-
- gconfReloadObjectTree (&core.base, (void *) p);
- }
-
- gc->reloadHandle = 0;
-
- return FALSE;
-}
-
-static Bool
-gconfSetOptionForPlugin (CompObject *object,
- const char *plugin,
- const char *name,
- CompOptionValue *value)
-{
- CompBool status;
-
- GCONF_CORE (&core);
-
- UNWRAP (gc, &core, setOptionForPlugin);
- status = (*core.setOptionForPlugin) (object, plugin, name, value);
- WRAP (gc, &core, setOptionForPlugin, gconfSetOptionForPlugin);
-
- 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)
- gconfSetOption (object, option, p->vTable->name);
- }
- }
-
- return status;
-}
-
-static CompBool
-gconfInitPluginForObject (CompPlugin *p,
- CompObject *o)
-{
- CompBool status;
-
- GCONF_CORE (&core);
-
- UNWRAP (gc, &core, initPluginForObject);
- status = (*core.initPluginForObject) (p, o);
- WRAP (gc, &core, initPluginForObject, gconfInitPluginForObject);
-
- if (status && p->vTable->getObjectOptions)
- {
- CompOption *option;
- int nOption;
-
- option = (*p->vTable->getObjectOptions) (p, o, &nOption);
- while (nOption--)
- gconfGetOption (o, option++, p->vTable->name);
- }
-
- return status;
-}
-
-/* MULTIDPYERROR: only works with one or less displays present */
-static void
-gconfKeyChanged (GConfClient *client,
- guint cnxn_id,
- GConfEntry *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 (gconfReadOptionValue (object, entry, option, &value))
- {
- (*core.setOptionForPlugin) (object,
- plugin->vTable->name,
- option->name,
- &value);
-
- compFiniOptionValue (&value, option->type);
- }
- }
-
- g_strfreev (token);
-}
-
-static void
-gconfSendGLibNotify (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
-gconfInitCore (CompPlugin *p,
- CompCore *c)
-{
- GConfCore *gc;
-
- if (!checkPluginABI ("core", CORE_ABIVERSION))
- return FALSE;
-
- gc = malloc (sizeof (GConfCore));
- if (!gc)
- return FALSE;
-
- g_type_init ();
-
- gc->client = gconf_client_get_default ();
-
- gconf_client_add_dir (gc->client, "/apps/" APP_NAME,
- GCONF_CLIENT_PRELOAD_NONE, NULL);
-
- gc->reloadHandle = compAddTimeout (0, 0, gconfReload, 0);
-
- gc->cnxn = gconf_client_notify_add (gc->client, "/apps/" APP_NAME,
- gconfKeyChanged, c, NULL, NULL);
-
- WRAP (gc, c, initPluginForObject, gconfInitPluginForObject);
- WRAP (gc, c, setOptionForPlugin, gconfSetOptionForPlugin);
-
- c->base.privates[corePrivateIndex].ptr = gc;
-
- return TRUE;
-}
-
-static void
-gconfFiniCore (CompPlugin *p,
- CompCore *c)
-{
- GCONF_CORE (c);
-
- UNWRAP (gc, c, initPluginForObject);
- UNWRAP (gc, c, setOptionForPlugin);
-
- if (gc->reloadHandle)
- compRemoveTimeout (gc->reloadHandle);
-
- if (gc->cnxn)
- gconf_client_notify_remove (gc->client, gc->cnxn);
-
- gconf_client_remove_dir (gc->client, "/apps/" APP_NAME, NULL);
- gconf_client_clear_cache (gc->client);
-
- free (gc);
-}
-
-static Bool
-gconfInitScreen (CompPlugin *p,
- CompScreen *s)
-{
- gconfSendGLibNotify (s);
-
- return TRUE;
-}
-
-static CompBool
-gconfInitObject (CompPlugin *p,
- CompObject *o)
-{
- static InitPluginObjectProc dispTab[] = {
- (InitPluginObjectProc) gconfInitCore,
- (InitPluginObjectProc) 0, /* InitDisplay */
- (InitPluginObjectProc) gconfInitScreen
- };
-
- RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o));
-}
-
-static void
-gconfFiniObject (CompPlugin *p,
- CompObject *o)
-{
- static FiniPluginObjectProc dispTab[] = {
- (FiniPluginObjectProc) gconfFiniCore
- };
-
- DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o));
-}
-
-static Bool
-gconfInit (CompPlugin *p)
-{
- if (!compInitPluginMetadataFromInfo (&gconfMetadata, p->vTable->name,
- 0, 0, 0, 0))
- return FALSE;
-
- corePrivateIndex = allocateCorePrivateIndex ();
- if (corePrivateIndex < 0)
- {
- compFiniMetadata (&gconfMetadata);
- return FALSE;
- }
-
- compAddMetadataFromFile (&gconfMetadata, p->vTable->name);
-
- return TRUE;
-}
-
-static void
-gconfFini (CompPlugin *p)
-{
- freeCorePrivateIndex (corePrivateIndex);
- compFiniMetadata (&gconfMetadata);
-}
-
-static CompMetadata *
-gconfGetMetadata (CompPlugin *plugin)
-{
- return &gconfMetadata;
-}
-
-CompPluginVTable gconfVTable = {
- "gconf",
- gconfGetMetadata,
- gconfInit,
- gconfFini,
- gconfInitObject,
- gconfFiniObject,
- 0, /* GetObjectOptions */
- 0 /* SetObjectOption */
-};
-
-CompPluginVTable *
-getCompPluginInfo20070830 (void)
-{
- return &gconfVTable;
-}
diff -uprN 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 2013-04-18 18:20:13.995833248 +0200
@@ -37,7 +37,7 @@ typedef struct _GLibWatch {
CompDisplay *display;
} GLibWatch;
-typedef struct _GConfDisplay {
+typedef struct _MateConfDisplay {
HandleEventProc handleEvent;
CompTimeoutHandle timeoutHandle;
CompTimeoutHandle wakeupTimeoutHandle;
diff -uprN compiz-0.8.8-orig/plugins/gnomecompat.c compiz-0.8.8/plugins/gnomecompat.c
--- compiz-0.8.8-orig/plugins/gnomecompat.c 2010-05-21 13:18:14.000000000 +0200
+++ compiz-0.8.8/plugins/gnomecompat.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,344 +0,0 @@
-/*
- * 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 <dannybaumann@web.de>
- */
-
-#include <compiz-core.h>
-
-static CompMetadata gnomeMetadata;
-
-static int displayPrivateIndex;
-
-#define GNOME_DISPLAY_OPTION_MAIN_MENU_KEY 0
-#define GNOME_DISPLAY_OPTION_RUN_DIALOG_KEY 1
-#define GNOME_DISPLAY_OPTION_SCREENSHOT_CMD 2
-#define GNOME_DISPLAY_OPTION_RUN_SCREENSHOT_KEY 3
-#define GNOME_DISPLAY_OPTION_WINDOW_SCREENSHOT_CMD 4
-#define GNOME_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY 5
-#define GNOME_DISPLAY_OPTION_TERMINAL_CMD 6
-#define GNOME_DISPLAY_OPTION_RUN_TERMINAL_KEY 7
-#define GNOME_DISPLAY_OPTION_NUM 8
-
-typedef struct _GnomeDisplay {
- CompOption opt[GNOME_DISPLAY_OPTION_NUM];
-
- Atom panelActionAtom;
- Atom panelMainMenuAtom;
- Atom panelRunDialogAtom;
-} GnomeDisplay;
-
-#define GET_GNOME_DISPLAY(d) \
- ((GnomeDisplay *) (d)->base.privates[displayPrivateIndex].ptr)
-#define GNOME_DISPLAY(d) \
- GnomeDisplay *gd = GET_GNOME_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)
- {
- GNOME_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;
-
- GNOME_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)
-{
- GNOME_DISPLAY (d);
-
- panelAction (d, option, nOption, gd->panelMainMenuAtom);
-
- return TRUE;
-}
-
-static Bool
-showRunDialog (CompDisplay *d,
- CompAction *action,
- CompActionState state,
- CompOption *option,
- int nOption)
-{
- GNOME_DISPLAY (d);
-
- panelAction (d, option, nOption, gd->panelRunDialogAtom);
-
- return TRUE;
-}
-static const CompMetadataOptionInfo gnomeDisplayOptionInfo[] = {
- { "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
-gnomeInitDisplay (CompPlugin *p,
- CompDisplay *d)
-{
- GnomeDisplay *gd;
- int opt, index;
-
- if (!checkPluginABI ("core", CORE_ABIVERSION))
- return FALSE;
-
- gd = malloc (sizeof (GnomeDisplay));
- if (!gd)
- return FALSE;
-
- if (!compInitDisplayOptionsFromMetadata (d,
- &gnomeMetadata,
- gnomeDisplayOptionInfo,
- gd->opt,
- GNOME_DISPLAY_OPTION_NUM))
- {
- free (gd);
- return FALSE;
- }
-
- opt = GNOME_DISPLAY_OPTION_RUN_SCREENSHOT_KEY;
- gd->opt[opt].value.action.priv.val = GNOME_DISPLAY_OPTION_SCREENSHOT_CMD;
-
- opt = GNOME_DISPLAY_OPTION_RUN_WINDOW_SCREENSHOT_KEY;
- index = GNOME_DISPLAY_OPTION_WINDOW_SCREENSHOT_CMD;
- gd->opt[opt].value.action.priv.val = index;
-
- opt = GNOME_DISPLAY_OPTION_RUN_TERMINAL_KEY;
- gd->opt[opt].value.action.priv.val = GNOME_DISPLAY_OPTION_TERMINAL_CMD;
-
- gd->panelActionAtom =
- XInternAtom (d->display, "_GNOME_PANEL_ACTION", FALSE);
- gd->panelMainMenuAtom =
- XInternAtom (d->display, "_GNOME_PANEL_ACTION_MAIN_MENU", FALSE);
- gd->panelRunDialogAtom =
- XInternAtom (d->display, "_GNOME_PANEL_ACTION_RUN_DIALOG", FALSE);
-
- d->base.privates[displayPrivateIndex].ptr = gd;
-
- return TRUE;
-}
-
-static void
-gnomeFiniDisplay (CompPlugin *p,
- CompDisplay *d)
-{
- GNOME_DISPLAY (d);
-
- compFiniDisplayOptions (d, gd->opt, GNOME_DISPLAY_OPTION_NUM);
-
- free (gd);
-}
-
-static CompOption *
-gnomeGetDisplayOptions (CompPlugin *p,
- CompDisplay *d,
- int *count)
-{
- GNOME_DISPLAY (d);
-
- *count = NUM_OPTIONS (gd);
- return gd->opt;
-}
-
-static CompBool
-gnomeSetDisplayOption (CompPlugin *p,
- CompDisplay *d,
- const char *name,
- CompOptionValue *value)
-{
- CompOption *o;
-
- GNOME_DISPLAY (d);
-
- o = compFindOption (gd->opt, NUM_OPTIONS (gd), name, NULL);
- if (!o)
- return FALSE;
-
- return compSetDisplayOption (d, o, value);
-}
-
-static CompBool
-gnomeInitObject (CompPlugin *p,
- CompObject *o)
-{
- static InitPluginObjectProc dispTab[] = {
- (InitPluginObjectProc) 0, /* InitCore */
- (InitPluginObjectProc) gnomeInitDisplay
- };
-
- RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), TRUE, (p, o));
-}
-
-static void
-gnomeFiniObject (CompPlugin *p,
- CompObject *o)
-{
- static FiniPluginObjectProc dispTab[] = {
- (FiniPluginObjectProc) 0, /* FiniCore */
- (FiniPluginObjectProc) gnomeFiniDisplay
- };
-
- DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), (p, o));
-}
-
-static CompOption *
-gnomeGetObjectOptions (CompPlugin *p,
- CompObject *o,
- int *count)
-{
- static GetPluginObjectOptionsProc dispTab[] = {
- (GetPluginObjectOptionsProc) 0, /* GetCoreOptions */
- (GetPluginObjectOptionsProc) gnomeGetDisplayOptions
- };
-
- *count = 0;
- RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab),
- (void *) count, (p, o, count));
-}
-
-static CompBool
-gnomeSetObjectOption (CompPlugin *p,
- CompObject *o,
- const char *name,
- CompOptionValue *value)
-{
- static SetPluginObjectOptionProc dispTab[] = {
- (SetPluginObjectOptionProc) 0, /* SetCoreOption */
- (SetPluginObjectOptionProc) gnomeSetDisplayOption,
- };
-
- RETURN_DISPATCH (o, dispTab, ARRAY_SIZE (dispTab), FALSE,
- (p, o, name, value));
-}
-
-static Bool
-gnomeInit (CompPlugin *p)
-{
- if (!compInitPluginMetadataFromInfo (&gnomeMetadata,
- p->vTable->name,
- gnomeDisplayOptionInfo,
- GNOME_DISPLAY_OPTION_NUM, 0, 0))
- return FALSE;
-
- displayPrivateIndex = allocateDisplayPrivateIndex ();
- if (displayPrivateIndex < 0)
- {
- compFiniMetadata (&gnomeMetadata);
- return FALSE;
- }
-
- compAddMetadataFromFile (&gnomeMetadata, p->vTable->name);
-
- return TRUE;
-}
-
-static void
-gnomeFini (CompPlugin *p)
-{
- freeDisplayPrivateIndex (displayPrivateIndex);
- compFiniMetadata (&gnomeMetadata);
-}
-
-static CompMetadata *
-gnomeGetMetadata (CompPlugin *p)
-{
- return &gnomeMetadata;
-}
-
-static CompPluginVTable gnomeVTable = {
- "gnomecompat",
- gnomeGetMetadata,
- gnomeInit,
- gnomeFini,
- gnomeInitObject,
- gnomeFiniObject,
- gnomeGetObjectOptions,
- gnomeSetObjectOption
-};
-
-CompPluginVTable *
-getCompPluginInfo20070830 (void)
-{
- return &gnomeVTable;
-}
diff -uprN 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 2013-04-18 18:20:14.285836188 +0200
@@ -22,7 +22,7 @@
*
* Author: Mike Dransfield <mike@blueroot.co.uk>
*
- * Some code taken from gconf.c by :
+ * Some code taken from mateconf.c by :
* David Reveman <davidr@novell.com>
*/
diff -uprN 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 2013-04-18 18:20:13.959832883 +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 -uprN compiz-0.8.8-orig/plugins/matecompat.c compiz-0.8.8/plugins/matecompat.c
--- compiz-0.8.8-orig/plugins/matecompat.c 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/plugins/matecompat.c 2013-04-18 18:20:14.225835580 +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 <dannybaumann@web.de>
+ */
+
+#include <compiz-core.h>
+
+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 -uprN compiz-0.8.8-orig/plugins/mateconf.c compiz-0.8.8/plugins/mateconf.c
--- compiz-0.8.8-orig/plugins/mateconf.c 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.8/plugins/mateconf.c 2013-04-18 18:20:14.053833836 +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 <davidr@novell.com>
+ */
+
+#define _GNU_SOURCE
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
+
+#include <glib.h>
+#include <glib/gprintf.h>
+#include <mateconf/mateconf-client.h>
+
+#include <compiz-core.h>
+
+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 -uprN 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 2013-04-18 18:20:13.243825626 +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 -uprN 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 2013-04-18 18:20:09.595788650 +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 -uprN 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 2013-04-18 18:20:07.890771368 +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 -uprN 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 2013-04-18 18:20:06.629758586 +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 "ইউজারস্পেস <20>
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 -uprN 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 2013-04-18 18:20:12.831821450 +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 "ইউজারস্পেস <20>
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 -uprN 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 2013-04-18 18:20:11.313806063 +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 -uprN 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 2013-04-18 18:20:09.472787403 +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 -uprN 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 2013-04-18 18:20:11.190804817 +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 -uprN 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 2013-04-18 18:20:13.909832377 +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 -uprN 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 2013-04-18 18:20:13.531828545 +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 -uprN 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 2013-04-18 18:20:07.750769949 +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 -uprN 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 2013-04-18 18:20:13.661829863 +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 -uprN 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 2013-04-18 18:20:10.107793839 +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 -uprN 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 2013-04-18 18:20:09.324785903 +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 -uprN 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 2013-04-18 18:20:07.583768256 +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 -uprN 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 2013-04-18 18:20:07.281765195 +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 -uprN 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 2013-04-18 18:20:08.416776699 +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 -uprN 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 2013-04-18 18:20:11.030803195 +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 -uprN 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 2013-04-18 18:20:09.206784707 +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 -uprN 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 2013-04-18 18:20:08.135773851 +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 -uprN 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 2013-04-18 18:20:07.147763837 +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 "શેલમાં ચલાવ<E0AABE>
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 "વપરાશકર્તા<E0AAA4><E0AABE>
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 -uprN 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 2013-04-18 18:20:10.488797701 +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 -uprN 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 2013-04-18 18:20:09.074783369 +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 -uprN 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 2013-04-18 18:20:08.936781970 +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 -uprN 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 2013-04-18 18:20:12.696820082 +0200
@@ -3,7 +3,7 @@
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
#
# Kalman Kemenczy <kkemenczy@novell.com>, 2006, 2007.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2007.
+# Gabor Kelemen <kelemeng@mate.hu>, 2007.
# KAMI911 <kami911@gmail.com>, 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 -uprN 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 2013-04-18 18:20:08.537777926 +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 -uprN 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 2013-04-18 18:20:13.112824298 +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 -uprN 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 2013-04-18 18:20:11.436807310 +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 "ユーザ空間ファイルシ<E383AB><E382B7>
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 -uprN 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 2013-04-18 18:20:13.786831130 +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 -uprN 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 2013-04-18 18:20:07.419766594 +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 -uprN 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 2013-04-18 18:20:09.979792542 +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 "사용자 공간 파일 시스<EC8B9C><EC8AA4>
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 -uprN 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 2013-04-18 18:20:08.004772523 +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 -uprN 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 2013-04-18 18:20:08.804780632 +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 -uprN 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 2013-04-18 18:20:06.496757238 +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 -uprN 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 2013-04-18 18:20:07.010762448 +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 -uprN 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 2013-04-18 18:20:10.866801533 +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 -uprN 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 2013-04-18 18:20:12.436817446 +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 -uprN 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 2013-04-18 18:20:08.666779233 +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 "ସେଲରେ କାର୍ୟ<E0AD8D>
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 "ଉପୟୋଗକର୍ତ୍<E0ACA4><E0AD8D>
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 -uprN 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 2013-04-18 18:20:09.739790109 +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 -uprN 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 2013-04-18 18:20:06.770760015 +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 -uprN 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 2013-04-18 18:20:08.291775432 +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 -uprN 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 2013-04-18 18:20:10.615798989 +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 -uprN 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 2013-04-18 18:20:10.741800266 +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 -uprN 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 2013-04-18 18:20:10.237795157 +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 -uprN 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 2013-04-18 18:20:12.308816149 +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 -uprN 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 2013-04-18 18:20:12.967822829 +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 -uprN 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 2013-04-18 18:20:11.881811821 +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 -uprN 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 2013-04-18 18:20:11.738810371 +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 -uprN 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 2013-04-18 18:20:12.569818794 +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 -uprN 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 2013-04-18 18:20:08.256775078 +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 -uprN 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 2013-04-18 18:20:13.380827015 +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 -uprN 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 2013-04-18 18:20:12.171814760 +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 -uprN 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 2013-04-18 18:20:06.884761171 +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 -uprN 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 2013-04-18 18:20:10.356796363 +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 -uprN 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 2013-04-18 18:20:11.591808881 +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 -uprN 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 2013-04-18 18:20:12.037813402 +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設定之後，<E5BE8C><EFBC8C>
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 -uprN 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 2013-04-18 18:20:09.857791305 +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 -uprN 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 2013-04-18 18:20:03.742729324 +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 -uprN 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 2013-04-18 18:20:03.807729982 +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
Reference in New Issue Copy Permalink