Consistently use meta_grab_op_is_resizing() for _NET_WM_SYNC_REQUEST

In different places we checked the grab op differently when determing whether we are using _NET_WM_SYNC_REQUEST. This was somewhat covered up previously by the fact that we only had a sync alarm when using _NET_WM_SYNC_REQUEST, but that is no longer the case, so consistently use meta_grab_op_is_resizing() everywhere.
Distinguish "no delay" frames from spontaneous drawing
2013-01-30 15:47:52 -05:00 · 2013-01-30 15:47:52 -05:00 · 2013-01-30 15:47:52 -05:00 · 2013-01-30 15:47:52 -05:00 · 2013-01-30 15:47:52 -05:00 · 2013-01-30 15:47:52 -05:00
138 changed files with 16868 additions and 21410 deletions
--- a/.gitignore
+++ b/.gitignore
@ -75,20 +75,3 @@ src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
 src/mutter-plugins.pc
-doc/reference/*.args
-doc/reference/*.bak
-doc/reference/*.hierarchy
-doc/reference/*.interfaces
-doc/reference/*.prerequisites
-doc/reference/*.signals
-doc/reference/*.stamp
-doc/reference/html/
-doc/reference/xml/
-doc/reference/meta-decl-list.txt
-doc/reference/meta-decl.txt
-doc/reference/meta-overrides.txt
-doc/reference/meta-undeclared.txt
-doc/reference/meta-undocumented.txt
-doc/reference/meta-unused.txt
-doc/reference/meta-docs.sgml
-doc/reference/meta.types
--- a/Makefile.am
+++ b/Makefile.am
@ -4,5 +4,3 @@ SUBDIRS=src po doc
 EXTRA_DIST = HACKING MAINTAINERS rationales.txt

 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/stamp-it po/.intltool-merge-cache
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
--- a/115
+++ b/115
@ -1,118 +1,3 @@
-3.8.1
-=====
-* Fix crash when getting default font [Bastien; #696814]
-* Fix ungrabbing of keybindings [Rui; #697003]
-* Misc fixes and cleanups [Jasper, Simon; #697758]
-
-Contributors:
-  Jasper Lievisse Adriaanse, Rui Matos, Simon McVittie, Bastien Nocera
-
-Translations:
-  Guillaume Desmottes [fr], Shankar Prasad [kn], Bruce Cowan [en_GB],
-  Andika Triwidada [id], Yaron Shahrabani [he], Kjartan Maraas [nb],
-  Gheyret Kenji [ug]
-
-3.8.0
-=====
-* Address major memory leak when changing backgrounds [Ray; #696157]
-
-Contributors:
-  Ray Strode
-
-Translations:
-  Sandeep Sheshrao Shedmake [mr], Victor Ibragimov [tg], Gabor Kelemen [hu],
-  Ville-Pekka Vainio [fi], Rajesh Ranjan [hi], Dr.T.Vasudevan [ta],
-  ManojKumar Giri [or], Yuri Myasoedov [ru], Petr Kovar [cs],
-  Jiro Matsuzawa [ja], Krishnababu Krothapalli [te], Ani Peter [ml],
-  Inaki Larranaga Murgoitio [eu]
-
-3.7.92
-======
-* Build and improve reference docs [Tomeu; #676856, #695641, #695935]
-* Add tracking of whether there are fullscreen windows [Owen; 649748]
-* Misc bug fixes and cleanups [Adel, Giovanni, Owen, Jasper, Florian; #695269,
-  #695711, #694046, #695813, #695881, #676856, #696053, #682779, #696089,
-  #696091, #696087]
-
-Contributors:
-  Giovanni Campagna, Adel Gadllah, Florian Müllner, Jasper St. Pierre,
-  Tomeu Vizoso, Owen W. Taylor
-
-Translations:
-  Chao-Hsiung Liao [zh_HK, zh_TW], Rafael Ferreira [pt_BR],
-  Ihar Hrachyshka [be], Nilamdyuti Goswami [as], Matej Urbančič [sl],
-  Dimitris Spingos [el], Jan Kyselica [sk], Khaled Hosny [ar],
-  Мирослав Николић [sr, sr@latin], Duarte Loreto [pt], Sweta Kothari [gu],
-  Milo Casagrande [it], Changwoo Ryu [ko], Gil Forcada [ca],
-  Carles Ferrando [ca@valencia], Mattias Põldaru [et], Alexandre Franke [fr],
-  Ask H. Larsen [da], Rūdolfs Mazurs [lv], Nguyễn Thái Ngọc Duy [vi]
-
-3.7.91
-======
-* Fix windows being treated as remote after hostname changes [Ray; #688716]
-* Add meta_window_get_all_monitors() method [Adel; #646861]
-* Add grab API for externally defined accelerators [Florian; #643111]
-* Make session registration an explicit step [Ray; #694876]
-* Avoid unnecessary stage redraws [Adel; #694988, #695006]
-* Misc fixes [Giovanni, Ray, Jasper, Rui, Pavel, Owen; #694801, #694725,
-  #694641, #694393, #678917, #695093, #694837, #695135, #694771, #694321]
-
-Contributors:
-  Giovanni Campagna, Adel Gadllah, Rui Matos, Florian Müllner,
-  Jasper St. Pierre, Ray Strode, Owen Taylor, Pavel Vasin
-
-Translations:
-  Daniel Mustieles [es], Yaron Shahrabani [he], A S Alam [pa], Piotr Drąg [pl],
-  Gheyret Kenji [ug], Alexandre Franke [fr], Milo Casagrande [it],
-  Fran Diéguez [gl], Dimitris Spingos [el], Мирослав Николић [sr, sr@latin],
-  Chao-Hsiung Liao [zh_HK, zh_TW], Nguyễn Thái Ngọc Duy [vi],
-  Aurimas Černius [lt], Mario Blättermann [de], Kjartan Maraas [nb]
-
-3.7.90
-======
-* Support _NET_WM_OPAQUE_REGION [Jasper, Adel; #679901]
-* Add wrapper for XI2.3 pointer barriers [Jasper; #677215]
-* Update style of resize popups [Cosimo; #692741]
-* Implement compositor <-> application frame synchronization [Owen; #685463]
-* Handle animated backgrounds [Ray; #682427]
-* Add a new window group for override-redirect windows [Gayan; #633620]
-* Pass on pointer events on guard window to Clutter [Jasper; #681540]
-* Show correct shortcut in window menus [Giovanni; #694045]
-* Don't put minimized windows at the back of alt-tab [Jasper; #693991]
-* Misc bug fixes and cleanups [Jasper, Rico, Adel, Florian, Rui, Giovanni,
-  Owen; #692679, #693354, #690581, #693439, #692718, #693475, #693482, #693540,
-  #690580, #680990, #693833, #693922, #693854, #694224]
-
-Contributors:
-  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Rui Matos, Florian Müllner,
-  Gayan Perera, Jasper St. Pierre, Ray Strode, Owen Taylor, Rico Tzschichholz
-
-Translations:
-  Fran Diéguez [gl], A S Alam [pa], Alexandre Franke [fr], Aurimas Černius [lt],
-  Мирослав Николић [sr, sr@latin], Fran Diéguez [gl], Piotr Drąg [pl],
-  Luca Ferretti [it], Daniel Mustieles [es]
-
-3.7.5
-=====
-* Don't allow multiline window titles [Jon; #683056]
-* Make meta_window_located_on_workspace() public [Jasper; #691744]
-* Request XI2.3 [Colin; #692877]
-* Add meta_window_set_icon_geometry() method [Florian; #692997]
-* Require XFixes 5.0 [Jasper; #677215]
-* Change unredirection hints to match spec changes [Adel; #693064]
-* Improve unredict heuristicts [Adel; #683786]
-* Misc bug fixes and cleanups [Florian, Jasper, Adel; #691874, #679901,
-  #692952, #693042]
-
-Contributors:
-  Adel Gadllah, William Jon McCann, Florian Müllner, Jasper St. Pierre,
-  Colin Walters
-
-Translations:
-  Daniel Mustieles [es], Ihar Hrachyshka [be], Nilamdyuti Goswami [as],
-  Gheyret Kenji [ug], Kjartan Maraas [nb], Yaron Shahrabani [he],
-  Piotr Drąg [pl], Chao-Hsiung Liao [zh_HK,zh_TW], Milo Casagrande [it]
-
 3.7.4
 =====
 * Add support for bypass compositor hints [Adel; #683020]
--- a/configure.ac
+++ b/configure.ac
@ -1,8 +1,8 @@
 AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [8])
-m4_define([mutter_micro_version], [1])
+m4_define([mutter_minor_version], [7])
+m4_define([mutter_micro_version], [4])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@ -71,10 +71,10 @@ MUTTER_PC_MODULES="
   gio-2.0 >= 2.25.10
   pango >= 1.2.0
   cairo >= 1.10.0
-   gsettings-desktop-schemas >= 3.7.3
+   gsettings-desktop-schemas >= 3.3.0
   xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0
-   $CLUTTER_PACKAGE >= 1.13.5
-   cogl-1.0 >= 1.13.3
+   $CLUTTER_PACKAGE >= 1.13.2
+   cogl-1.0 >= 1.9.6
 "

 GLIB_GSETTINGS
@ -201,9 +201,6 @@ fi

 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

-PKG_CHECK_EXISTS([xi >= 1.6.99.1],
-                 AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))
-
 # This is used for plugins
 AC_SUBST(CLUTTER_PACKAGE)
 PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
@ -364,8 +361,6 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi

-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
-
 #### Warnings (last since -Werror can disturb other tests)

 # Stay command-line compatible with the gnome-common configure option. Here
@ -436,8 +431,6 @@ AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
-doc/reference/Makefile
-doc/reference/meta-docs.sgml
 src/Makefile
 src/wm-tester/Makefile
 src/libmutter.pc
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@ -1,4 +1,4 @@
-SUBDIRS = man reference
+SUBDIRS = man

 EXTRA_DIST=theme-format.txt dialogs.txt code-overview.txt \
 	how-to-get-focus-right.txt
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@ -1,166 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.6
-
-# This is a blank Makefile.am for using gtk-doc.
-# Copy this to your project's API docs directory and modify the variables to
-# suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples
-# of using the various options.
-
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=meta
-
-# Uncomment for versioned docs and specify the version of the module, e.g. '2'.
-#DOC_MODULE_VERSION=2
-
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# Directories containing the source code, relative to $(srcdir).
-# gtk-doc will search all .c and .h files beneath these paths
-# for inline comments documenting functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk ../../../gdk
-DOC_SOURCE_DIR=../../src/
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
-SCAN_OPTIONS=--rebuild-types
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
-MKDB_OPTIONS=--xml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkhtml
-MKHTML_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/src/*.h
-CFILE_GLOB=$(top_srcdir)/src/*.c
-
-# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
-# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-EXTRA_HFILES=
-
-# Header files or dirs to ignore when scanning. Use base file/dir names
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES= \
-	async-getprop.h \
-	atoms.h \
-	bell.h \
-	boxes-private.h \
-	clutter-utils.h \
-	cogl-utils.h \
-	compositor-private.h \
-	constraints.h \
-	core.h \
-	display-private.h \
-	draw-workspace.h \
-	edge-resistance.h \
-	eventqueue.h \
-	frame.h \
-	frames.h \
-	group-private.h \
-	group-props.h \
-	iconcache.h \
-	inlinepixbufs.h \
-	keybindings-private.h \
-	menu.h \
-	metaaccellabel.h \
-	meta-background-actor-private.h \
-	meta-background-group-private.h \
-	meta-module.h \
-	meta-plugin-manager.h \
-	meta-shadow-factory-private.h \
-	meta-texture-rectangle.h \
-	meta-texture-tower.h \
-	meta-window-actor-private.h \
-	meta-window-group.h \
-	meta-window-shape.h \
-	mutter-enum-types.h \
-	mutter-Xatomtype.h \
-	place.h \
-	preview-widget.h \
-	region-utils.h \
-	resizepopup.h \
-	screen-private.h \
-	session.h \
-	stack.h \
-	stack-tracker.h \
-	stamp-mutter-enum-types.h \
-	tabpopup.h \
-	theme.h \
-	theme-private.h \
-	tile-preview.h \
-	ui.h \
-	window-private.h \
-	window-props.h \
-	workspace-private.h \
-	xprops.h \
-	$(NULL)
-
-MKDB_OPTIONS+=--ignore-files="$(IGNORE_HFILES)"
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files= \
-	mutter-overview.xml \
-	running-mutter.xml \
-	$(NULL)
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files= \
-	mutter-overview.xml \
-	running-mutter.xml \
-	$(NULL)
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=$(MUTTER_CFLAGS)
-GTKDOC_LIBS=$(MUTTER_LIBS) $(top_builddir)/src/libmutter.la
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST +=
-
-# Files not to distribute
-# for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types
-# for --rebuild-sections in $(SCAN_OPTIONS) e.g. $(DOC_MODULE)-sections.txt
-DISTCLEANFILES = $(DOC_MODULES).types
-
-# Comment this out if you want 'make check' to test you doc status
-# and run some sanity checks
-if ENABLE_GTK_DOC
-TESTS_ENVIRONMENT = cd $(srcdir) && \
-  DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
-  SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir)
-#TESTS = $(GTKDOC_CHECK)
-endif
-
-include $(top_srcdir)/git.mk
--- a/doc/reference/meta-docs.sgml.in
+++ b/doc/reference/meta-docs.sgml.in
@ -1,59 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-               "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  <!ENTITY version "@VERSION@">
-]>
-<book id="index">
-  <bookinfo>
-    <title>Mutter Reference Manual</title>
-    <releaseinfo>
-      This document is for Mutter &version;.
-      The latest version of this documentation can be found on-line at
-      <ulink role="online-location" url="http://developer.gnome.org/meta/">http://developer.gnome.org/meta/</ulink>.
-    </releaseinfo>
-  </bookinfo>
-
-  <xi:include href="xml/mutter-overview.xml"/>
-  <xi:include href="xml/running-mutter.xml"/>
-
-  <part id="core-reference">
-    <title>Mutter Core Reference</title>
-    <xi:include href="xml/main.xml"/>
-    <xi:include href="xml/common.xml"/>
-    <xi:include href="xml/gradient.xml"/>
-    <xi:include href="xml/prefs.xml"/>
-    <xi:include href="xml/util.xml"/>
-    <xi:include href="xml/errors.xml"/>
-    <xi:include href="xml/meta-plugin.xml"/>
-    <xi:include href="xml/barrier.xml"/>
-    <xi:include href="xml/boxes.xml"/>
-    <xi:include href="xml/compositor.xml"/>
-    <xi:include href="xml/display.xml"/>
-    <xi:include href="xml/group.xml"/>
-    <xi:include href="xml/keybindings.xml"/>
-    <xi:include href="xml/meta-background-actor.xml"/>
-    <xi:include href="xml/meta-shadow-factory.xml"/>
-    <xi:include href="xml/meta-shaped-texture.xml"/>
-    <xi:include href="xml/meta-window-actor.xml"/>
-    <xi:include href="xml/screen.xml"/>
-    <xi:include href="xml/window.xml"/>
-    <xi:include href="xml/workspace.xml"/>
-  </part>
-
-  <chapter id="object-tree">
-    <title>Object Hierarchy</title>
-     <xi:include href="xml/tree_index.sgml"/>
-  </chapter>
-  <index id="api-index-full">
-    <title>API Index</title>
-    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
-  </index>
-  <index id="deprecated-api-index" role="deprecated">
-    <title>Index of deprecated API</title>
-    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
-  </index>
-
-  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
-</book>
--- a/doc/reference/meta-sections.txt
+++ b/doc/reference/meta-sections.txt
@ -1,667 +0,0 @@
-<SECTION>
-<FILE>barrier</FILE>
-<TITLE>MetaBarrier</TITLE>
-MetaBarrier
-MetaBarrierClass
-meta_barrier_is_active
-meta_barrier_destroy
-meta_barrier_release
-MetaBarrierDirection
-MetaBarrierEvent
-<SUBSECTION Standard>
-META_BARRIER
-META_BARRIER_CLASS
-META_BARRIER_GET_CLASS
-META_IS_BARRIER
-META_IS_BARRIER_CLASS
-META_TYPE_BARRIER
-META_TYPE_BARRIER_EVENT
-MetaBarrierPrivate
-meta_barrier_event_get_type
-meta_barrier_get_type
-</SECTION>
-
-<SECTION>
-<FILE>boxes</FILE>
-MetaRectangle
-MetaStrut
-MetaEdgeType
-MetaEdge
-meta_rectangle_copy
-meta_rectangle_free
-meta_rect
-meta_rectangle_area
-meta_rectangle_intersect
-meta_rectangle_equal
-meta_rectangle_union
-meta_rectangle_overlap
-meta_rectangle_vert_overlap
-meta_rectangle_horiz_overlap
-meta_rectangle_could_fit_rect
-meta_rectangle_contains_rect
-<SUBSECTION Standard>
-META_TYPE_RECTANGLE
-meta_rectangle_get_type
-</SECTION>
-
-<SECTION>
-<FILE>common</FILE>
-META_VIRTUAL_CORE_POINTER_ID
-META_VIRTUAL_CORE_KEYBOARD_ID
-MetaFrameFlags
-MetaMenuOp
-MetaWindowMenuFunc
-MetaGrabOp
-MetaCursor
-MetaFrameType
-MetaVirtualModifier
-MetaDirection
-MetaMotionDirection
-MetaSide
-MetaButtonFunction
-MAX_BUTTONS_PER_CORNER
-MetaButtonLayout
-MetaFrameBorders
-meta_frame_borders_clear
-META_ICON_WIDTH
-META_ICON_HEIGHT
-META_MINI_ICON_WIDTH
-META_MINI_ICON_HEIGHT
-META_DEFAULT_ICON_NAME
-META_PRIORITY_RESIZE
-META_PRIORITY_BEFORE_REDRAW
-META_PRIORITY_REDRAW
-META_PRIORITY_PREFS_NOTIFY
-POINT_IN_RECT
-MetaStackLayer
-MetaWindowMenu
-MetaResizePopup
-</SECTION>
-
-<SECTION>
-<FILE>compositor</FILE>
-MetaCompEffect
-MetaCompositor
-meta_compositor_new
-meta_compositor_destroy
-meta_compositor_manage_screen
-meta_compositor_unmanage_screen
-meta_compositor_window_shape_changed
-meta_compositor_process_event
-meta_compositor_filter_keybinding
-meta_compositor_add_window
-meta_compositor_remove_window
-meta_compositor_show_window
-meta_compositor_hide_window
-meta_compositor_switch_workspace
-meta_compositor_maximize_window
-meta_compositor_unmaximize_window
-meta_compositor_window_mapped
-meta_compositor_window_unmapped
-meta_compositor_sync_window_geometry
-meta_compositor_set_updates_frozen
-meta_compositor_queue_frame_drawn
-meta_compositor_sync_stack
-meta_compositor_sync_screen_size
-meta_compositor_flash_screen
-meta_get_stage_for_screen
-meta_get_overlay_group_for_screen
-meta_get_overlay_window
-meta_get_window_actors
-meta_get_window_group_for_screen
-meta_get_top_window_group_for_screen
-meta_disable_unredirect_for_screen
-meta_enable_unredirect_for_screen
-meta_set_stage_input_region
-meta_empty_stage_input_region
-</SECTION>
-
-<SECTION>
-<FILE>display</FILE>
-MetaTabList
-MetaTabShowType
-meta_XFree
-meta_display_get_compositor_version
-meta_display_get_xinput_opcode
-meta_display_supports_extended_barriers
-meta_display_get_xdisplay
-meta_display_get_compositor
-meta_display_get_screens
-meta_display_has_shape
-meta_display_screen_for_root
-meta_display_get_focus_window
-meta_display_xwindow_is_a_no_focus_window
-meta_display_get_damage_event_base
-meta_display_get_shape_event_base
-meta_display_xserver_time_is_before
-meta_display_get_last_user_time
-meta_display_get_current_time
-meta_display_get_current_time_roundtrip
-meta_display_get_ignored_modifier_mask
-meta_display_get_tab_list
-meta_display_get_tab_next
-meta_display_get_tab_current
-meta_display_begin_grab_op
-meta_display_end_grab_op
-meta_display_get_grab_op
-meta_display_add_keybinding
-meta_display_remove_keybinding
-meta_display_get_keybinding_action
-meta_display_set_input_focus_window
-meta_display_focus_the_no_focus_window
-meta_display_sort_windows_by_stacking
-meta_display_get_leader_window
-meta_display_add_ignored_crossing_serial
-meta_display_unmanage_screen
-meta_display_clear_mouse_mode
-MetaDisplay
-MetaDisplayClass
-<SUBSECTION Standard>
-META_DISPLAY
-META_DISPLAY_CLASS
-META_DISPLAY_GET_CLASS
-META_IS_DISPLAY
-META_IS_DISPLAY_CLASS
-META_TYPE_DISPLAY
-meta_display_get_type
-</SECTION>
-
-<SECTION>
-<FILE>errors</FILE>
-meta_error_trap_push
-meta_error_trap_pop
-meta_error_trap_push_with_return
-meta_error_trap_pop_with_return
-</SECTION>
-
-<SECTION>
-<FILE>gradient</FILE>
-MetaGradientType
-meta_gradient_create_simple
-meta_gradient_create_multi
-meta_gradient_create_interwoven
-meta_gradient_add_alpha
-</SECTION>
-
-<SECTION>
-<FILE>group</FILE>
-MetaGroup
-meta_window_get_group
-meta_window_compute_group
-meta_window_shutdown_group
-meta_window_group_leader_changed
-meta_display_lookup_group
-meta_group_list_windows
-meta_group_update_layers
-meta_group_get_startup_id
-meta_group_get_size
-meta_group_property_notify
-</SECTION>
-
-<SECTION>
-<FILE>keybindings</FILE>
-MetaKeyBinding
-META_TYPE_KEY_BINDING
-meta_key_binding_get_name
-meta_key_binding_get_modifiers
-meta_key_binding_get_mask
-meta_key_binding_is_builtin
-meta_keybindings_set_custom_handler
-meta_keybindings_switch_window
-meta_screen_ungrab_all_keys
-meta_screen_grab_all_keys
-</SECTION>
-
-<SECTION>
-<FILE>main</FILE>
-meta_get_option_context
-meta_init
-meta_run
-meta_get_replace_current_wm
-meta_set_wm_name
-meta_set_gnome_wm_keybindings
-MetaExitCode
-meta_exit
-meta_quit
-</SECTION>
-
-<SECTION>
-<FILE>meta-background</FILE>
-<TITLE>MetaBackground</TITLE>
-MetaBackgroundEffects
-MetaBackground
-MetaBackgroundClass
-meta_background_new
-meta_background_copy
-meta_background_load_gradient
-meta_background_load_color
-meta_background_load_still_frame
-meta_background_load_file_async
-meta_background_load_file_finish
-meta_background_get_filename
-meta_background_get_style
-meta_background_get_shading
-meta_background_get_color
-meta_background_get_second_color
-<SUBSECTION Standard>
-META_BACKGROUND
-META_BACKGROUND_CLASS
-META_BACKGROUND_GET_CLASS
-META_IS_BACKGROUND
-META_IS_BACKGROUND_CLASS
-META_TYPE_BACKGROUND
-MetaBackgroundPrivate
-meta_background_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-background-actor</FILE>
-<TITLE>MetaBackgroundActor</TITLE>
-MetaBackgroundActor
-MetaBackgroundActorClass
-meta_background_actor_new_for_screen
-MetaSnippetHook
-meta_background_actor_add_glsl_snippet
-meta_background_actor_set_uniform_float
-<SUBSECTION Standard>
-META_BACKGROUND_ACTOR
-META_BACKGROUND_ACTOR_CLASS
-META_BACKGROUND_ACTOR_GET_CLASS
-META_IS_BACKGROUND_ACTOR
-META_IS_BACKGROUND_ACTOR_CLASS
-META_TYPE_BACKGROUND_ACTOR
-MetaBackgroundActorPrivate
-meta_background_actor_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-background-group</FILE>
-<TITLE>MetaBackgroundGroup</TITLE>
-MetaBackgroundGroupClass
-meta_background_group_new
-<SUBSECTION Standard>
-META_BACKGROUND_GROUP
-META_BACKGROUND_GROUP_CLASS
-META_BACKGROUND_GROUP_GET_CLASS
-META_IS_BACKGROUND_GROUP
-META_IS_BACKGROUND_GROUP_CLASS
-META_TYPE_BACKGROUND_GROUP
-MetaBackgroundGroupPrivate
-meta_background_group_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-plugin</FILE>
-<TITLE>MetaPlugin</TITLE>
-MetaPlugin
-MetaPluginClass
-MetaPluginInfo
-meta_plugin_running
-meta_plugin_debug_mode
-meta_plugin_get_info
-MetaPluginVersion
-META_PLUGIN_DECLARE
-meta_plugin_switch_workspace_completed
-meta_plugin_minimize_completed
-meta_plugin_maximize_completed
-meta_plugin_unmaximize_completed
-meta_plugin_map_completed
-meta_plugin_destroy_completed
-MetaModalOptions
-meta_plugin_begin_modal
-meta_plugin_end_modal
-meta_plugin_get_screen
-meta_plugin_manager_set_plugin_type
-<SUBSECTION Standard>
-META_IS_PLUGIN
-META_IS_PLUGIN_CLASS
-META_PLUGIN
-META_PLUGIN_CLASS
-META_PLUGIN_GET_CLASS
-META_TYPE_PLUGIN
-MetaPluginPrivate
-meta_plugin_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-shadow-factory</FILE>
-MetaShadowParams
-meta_shadow_factory_get_default
-meta_shadow_factory_set_params
-meta_shadow_factory_get_params
-MetaShadowFactory
-MetaShadowFactoryClass
-<SUBSECTION Standard>
-META_IS_SHADOW_FACTORY
-META_IS_SHADOW_FACTORY_CLASS
-META_SHADOW_FACTORY
-META_SHADOW_FACTORY_CLASS
-META_SHADOW_FACTORY_GET_CLASS
-META_TYPE_SHADOW_FACTORY
-meta_shadow_factory_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-shaped-texture</FILE>
-<TITLE>MetaShapedTexture</TITLE>
-MetaShapedTexture
-MetaShapedTextureClass
-meta_shaped_texture_new
-meta_shaped_texture_set_create_mipmaps
-meta_shaped_texture_update_area
-meta_shaped_texture_set_pixmap
-meta_shaped_texture_get_texture
-meta_shaped_texture_set_mask_texture
-meta_shaped_texture_set_clip_region
-meta_shaped_texture_get_image
-<SUBSECTION Standard>
-META_IS_SHAPED_TEXTURE
-META_IS_SHAPED_TEXTURE_CLASS
-META_SHAPED_TEXTURE
-META_SHAPED_TEXTURE_CLASS
-META_SHAPED_TEXTURE_GET_CLASS
-META_TYPE_SHAPED_TEXTURE
-MetaShapedTexturePrivate
-meta_shaped_texture_get_type
-</SECTION>
-
-<SECTION>
-<FILE>meta-window-actor</FILE>
-<TITLE>MetaWindowActor</TITLE>
-MetaWindowActor
-MetaWindowActorClass
-meta_window_actor_get_x_window
-meta_window_actor_get_workspace
-meta_window_actor_get_meta_window
-meta_window_actor_get_texture
-meta_window_actor_is_override_redirect
-meta_window_actor_get_description
-meta_window_actor_showing_on_its_workspace
-meta_window_actor_is_destroyed
-<SUBSECTION Standard>
-META_IS_WINDOW_ACTOR
-META_IS_WINDOW_ACTOR_CLASS
-META_TYPE_WINDOW_ACTOR
-META_WINDOW_ACTOR
-META_WINDOW_ACTOR_CLASS
-META_WINDOW_ACTOR_GET_CLASS
-MetaWindowActorPrivate
-meta_window_actor_get_type
-</SECTION>
-
-<SECTION>
-<FILE>prefs</FILE>
-MetaPreference
-MetaPrefsChangedFunc
-meta_prefs_add_listener
-meta_prefs_remove_listener
-meta_prefs_init
-meta_prefs_override_preference_schema
-meta_preference_to_string
-meta_prefs_get_mouse_button_mods
-meta_prefs_get_mouse_button_resize
-meta_prefs_get_mouse_button_menu
-meta_prefs_get_focus_mode
-meta_prefs_get_focus_new_windows
-meta_prefs_get_attach_modal_dialogs
-meta_prefs_get_raise_on_click
-meta_prefs_get_theme
-meta_prefs_get_titlebar_font
-meta_prefs_get_num_workspaces
-meta_prefs_get_dynamic_workspaces
-meta_prefs_get_application_based
-meta_prefs_get_disable_workarounds
-meta_prefs_get_auto_raise
-meta_prefs_get_auto_raise_delay
-meta_prefs_get_focus_change_on_pointer_rest
-meta_prefs_get_gnome_accessibility
-meta_prefs_get_gnome_animations
-meta_prefs_get_edge_tiling
-meta_prefs_get_auto_maximize
-meta_prefs_get_button_layout
-meta_prefs_get_action_double_click_titlebar
-meta_prefs_get_action_middle_click_titlebar
-meta_prefs_get_action_right_click_titlebar
-meta_prefs_set_num_workspaces
-meta_prefs_get_workspace_name
-meta_prefs_change_workspace_name
-meta_prefs_get_cursor_theme
-meta_prefs_get_cursor_size
-meta_prefs_get_compositing_manager
-meta_prefs_get_force_fullscreen
-meta_prefs_set_force_fullscreen
-meta_prefs_get_workspaces_only_on_primary
-meta_prefs_get_no_tab_popup
-meta_prefs_set_no_tab_popup
-meta_prefs_get_draggable_border_width
-meta_prefs_get_ignore_request_hide_titlebar
-meta_prefs_set_ignore_request_hide_titlebar
-MetaKeyBindingAction
-MetaKeyBindingFlags
-MetaKeyCombo
-MetaKeyHandlerFunc
-meta_prefs_get_keybindings
-meta_prefs_get_keybinding_action
-meta_prefs_get_window_binding
-meta_prefs_get_overlay_binding
-meta_prefs_get_visual_bell
-meta_prefs_bell_is_audible
-meta_prefs_get_visual_bell_type
-MetaKeyHandler
-<SUBSECTION Standard>
-meta_key_binding_get_type
-</SECTION>
-
-<SECTION>
-<FILE>screen</FILE>
-MetaScreen
-MetaScreenClass
-meta_screen_get_screen_number
-meta_screen_get_display
-meta_screen_get_xroot
-meta_screen_get_size
-meta_screen_get_compositor_data
-meta_screen_set_compositor_data
-meta_screen_for_x_screen
-meta_screen_set_cm_selection
-meta_screen_unset_cm_selection
-meta_screen_get_startup_sequences
-meta_screen_get_workspaces
-meta_screen_get_n_workspaces
-meta_screen_get_workspace_by_index
-meta_screen_remove_workspace
-meta_screen_append_new_workspace
-meta_screen_get_active_workspace_index
-meta_screen_get_active_workspace
-meta_screen_get_n_monitors
-meta_screen_get_primary_monitor
-meta_screen_get_current_monitor
-meta_screen_get_monitor_geometry
-meta_screen_get_monitor_index_for_rect
-meta_screen_focus_default_window
-MetaScreenCorner
-meta_screen_override_workspace_layout
-<SUBSECTION Standard>
-META_IS_SCREEN
-META_IS_SCREEN_CLASS
-META_SCREEN
-META_SCREEN_CLASS
-META_SCREEN_GET_CLASS
-META_TYPE_SCREEN
-meta_screen_get_type
-</SECTION>
-
-<SECTION>
-<FILE>util</FILE>
-meta_is_verbose
-meta_set_verbose
-meta_is_debugging
-meta_set_debugging
-meta_is_syncing
-meta_set_syncing
-meta_set_replace_current_wm
-meta_debug_spew_real
-meta_verbose_real
-meta_bug
-meta_warning
-meta_fatal
-MetaDebugTopic
-meta_topic_real
-meta_add_verbose_topic
-meta_remove_verbose_topic
-meta_push_no_msg_prefix
-meta_pop_no_msg_prefix
-meta_unsigned_long_equal
-meta_unsigned_long_hash
-meta_frame_type_to_string
-meta_gravity_to_string
-_
-N_
-meta_g_utf8_strndup
-meta_free_gslist_and_elements
-meta_show_dialog
-meta_debug_spew
-meta_verbose
-meta_topic
-MetaLaterType
-meta_later_add
-meta_later_remove
-</SECTION>
-
-<SECTION>
-<FILE>window</FILE>
-MetaWindow
-MetaWindowClass
-MetaWindowType
-MetaMaximizeFlags
-meta_window_get_frame
-meta_window_has_focus
-meta_window_appears_focused
-meta_window_is_shaded
-meta_window_is_monitor_sized
-meta_window_is_override_redirect
-meta_window_is_skip_taskbar
-meta_window_get_rect
-meta_window_get_input_rect
-meta_window_get_outer_rect
-meta_window_get_screen
-meta_window_get_display
-meta_window_get_xwindow
-meta_window_get_window_type
-meta_window_get_window_type_atom
-meta_window_get_workspace
-meta_window_get_monitor
-meta_window_is_on_all_workspaces
-meta_window_located_on_workspace
-meta_window_is_hidden
-meta_window_activate
-meta_window_activate_with_workspace
-meta_window_get_description
-meta_window_get_wm_class
-meta_window_get_wm_class_instance
-meta_window_showing_on_its_workspace
-meta_window_get_gtk_application_id
-meta_window_get_gtk_unique_bus_name
-meta_window_get_gtk_application_object_path
-meta_window_get_gtk_window_object_path
-meta_window_get_gtk_app_menu_object_path
-meta_window_get_gtk_menubar_object_path
-meta_window_move
-meta_window_move_frame
-meta_window_move_resize_frame
-meta_window_move_to_monitor
-meta_window_resize
-meta_window_set_demands_attention
-meta_window_unset_demands_attention
-meta_window_get_startup_id
-meta_window_change_workspace_by_index
-meta_window_change_workspace
-meta_window_get_compositor_private
-meta_window_set_compositor_private
-meta_window_configure_notify
-meta_window_get_role
-meta_window_get_layer
-meta_window_find_root_ancestor
-meta_window_is_ancestor_of_transient
-MetaWindowForeachFunc
-meta_window_foreach_transient
-meta_window_foreach_ancestor
-meta_window_get_maximized
-meta_window_is_fullscreen
-meta_window_is_on_primary_monitor
-meta_window_requested_bypass_compositor
-meta_window_requested_dont_bypass_compositor
-meta_window_is_mapped
-meta_window_toplevel_is_mapped
-meta_window_get_icon_geometry
-meta_window_set_icon_geometry
-meta_window_maximize
-meta_window_unmaximize
-meta_window_minimize
-meta_window_unminimize
-meta_window_raise
-meta_window_lower
-meta_window_get_title
-meta_window_get_transient_for
-meta_window_get_transient_for_as_xid
-meta_window_delete
-meta_window_get_stable_sequence
-meta_window_get_user_time
-meta_window_get_pid
-meta_window_get_client_machine
-meta_window_is_remote
-meta_window_is_modal
-meta_window_is_attached_dialog
-meta_window_get_mutter_hints
-meta_window_get_frame_type
-meta_window_get_frame_bounds
-meta_window_get_tile_match
-meta_window_make_fullscreen
-meta_window_unmake_fullscreen
-meta_window_make_above
-meta_window_unmake_above
-meta_window_shade
-meta_window_unshade
-meta_window_stick
-meta_window_unstick
-meta_window_kill
-meta_window_focus
-meta_window_check_alive
-meta_window_get_work_area_current_monitor
-meta_window_get_work_area_for_monitor
-meta_window_get_work_area_all_monitors
-meta_window_begin_grab_op
-<SUBSECTION Standard>
-META_IS_WINDOW
-META_IS_WINDOW_CLASS
-META_TYPE_WINDOW
-META_WINDOW
-META_WINDOW_CLASS
-META_WINDOW_GET_CLASS
-meta_window_get_type
-</SECTION>
-
-<SECTION>
-<FILE>workspace</FILE>
-MetaWorkspace
-MetaWorkspaceClass
-meta_workspace_index
-meta_workspace_get_screen
-meta_workspace_list_windows
-meta_workspace_get_work_area_for_monitor
-meta_workspace_get_work_area_all_monitors
-meta_workspace_activate
-meta_workspace_activate_with_focus
-meta_workspace_update_window_hints
-meta_workspace_set_builtin_struts
-meta_workspace_get_neighbor
-<SUBSECTION Standard>
-META_IS_WORKSPACE
-META_IS_WORKSPACE_CLASS
-META_TYPE_WORKSPACE
-META_WORKSPACE
-META_WORKSPACE_CLASS
-META_WORKSPACE_GET_CLASS
-meta_workspace_get_type
-</SECTION>
-
--- a/doc/reference/mutter-overview.xml
+++ b/doc/reference/mutter-overview.xml
@ -1,15 +0,0 @@
-<part id="mutter-overview">
-
-  <title>Overview</title>
-
-  <partintro>
-
-    <para>Mutter is a GObject-based library for creating compositing window managers.</para>
-
-    <para>Compositors that wish to use Mutter must implement a subclass of #MetaPlugin and register it with meta_plugin_manager_set_plugin_type() before calling meta_init() but after g_type_init().</para>
-
-    <para>#MetaPlugin provides virtual functions that allow to override default behavior in the window management code, such as the effect to perform when a window is created or when switching workspaces.</para>
-
-  </partintro>
-
-</part>
--- a/doc/reference/running-mutter.xml
+++ b/doc/reference/running-mutter.xml
@ -1,100 +0,0 @@
-<part id="running-mutter">
-
-  <title>Running Mutter</title>
-
-  <partintro>
-
-    <section id="environment-variables">
-      <title>Environment Variables</title>
-
-      <para>
-        Mutter automatically checks environment variables during
-        its initialization. These environment variables are meant
-        as debug tools or overrides for default behaviours:
-      </para>
-
-      <variablelist>
-        <varlistentry>
-          <term>MUTTER_VERBOSE</term>
-          <listitem>
-            <para>Enable verbose mode, in which more information is printed to the console. Mutter needs to be built with the --enable-verbose-mode option (enabled by default). For more fine-grained control of the output, see meta_add_verbose_topic().</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DEBUG</term>
-          <listitem>
-            <para>Traps and prints X errors to the console.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_G_FATAL_WARNINGS</term>
-          <listitem>
-            <para>Causes any logging from the domains Mutter, Gtk, Gdk, Pango or GLib to terminate the process (only when using the log functions in GLib).</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_USE_LOGFILE</term>
-          <listitem>
-            <para>Log all messages to a temporary file.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DEBUG_XINERAMA</term>
-          <listitem>
-            <para>Log extra information about support of the XINERAMA extension.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DEBUG_SM</term>
-          <listitem>
-            <para>Log extra information about session management.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DEBUG_BUTTON_GRABS</term>
-          <listitem>
-            <para>Log extra information about button grabs.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_SYNC</term>
-          <listitem>
-            <para>Call XSync after each X call.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DISPLAY</term>
-          <listitem>
-            <para>Name of the X11 display to use.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>META_DISABLE_MIPMAPS</term>
-          <listitem>
-            <para>Disable use of mipmaps for the textures that back window pixmaps.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_USE_STATIC_GRAVITY</term>
-          <listitem>
-            <para>Enable support for clients with static bit-gravity.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_WM_CLASS_FILTER</term>
-          <listitem>
-            <para>Comma-separated list of WM_CLASS names to which to restrict Mutter to.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>MUTTER_DISABLE_FALLBACK_COLOR</term>
-          <listitem>
-            <para>Disable fallback for themed colors, for easier detection of typographical errors.</para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-    </section>
-
-  </partintro>
-</part>
--- a/po/LINGUAS
+++ b/po/LINGUAS
@ -80,7 +80,6 @@ sr@latin
 sv
 ta
 te
-tg
 th
 tk
 tr
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -4,7 +4,6 @@ src/50-mutter-navigation.xml.in
 src/50-mutter-system.xml.in
 src/50-mutter-windows.xml.in
 src/compositor/compositor.c
-src/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
--- a/po/ar.po
+++ b/po/ar.po
@ -4,14 +4,14 @@
 # Arafat Medini <lumina@silverpen.de>, 2003.
 # Abdulaziz Al-Arfaj <alarfaj0@yahoo.com>, 2004.
 # Djihed Afifi <djihed@gmail.com>, 2006.
-# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
+# Khaled Hosny <khaledhosny@eglug.org>, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
 # Anas Afif Emad <anas.e87@gmail.com>, 2008.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-09 22:48+0200\n"
-"PO-Revision-Date: 2013-03-09 22:48+0200\n"
+"POT-Creation-Date: 2012-12-24 13:14+0200\n"
+"PO-Revision-Date: 2012-12-24 13:17+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@ -167,8 +167,8 @@ msgid "Close window"
 msgstr "أغلق النّافذة"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "أخفِ النّافذة"
+msgid "Minimize window"
+msgstr "صغّر النّافذة"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -212,17 +212,13 @@ msgstr "المنظور مقسوم على اليسار"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:502
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "يعمل مدير مزج آخر على الشاشة %i والعرض \"%s\"."

-#: ../src/compositor/meta-background.c:1180
-msgid "background texture could not be created from file"
-msgstr ""
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "حدث جرس"
@ -255,28 +251,23 @@ msgstr "ا_نتظر"
 msgid "_Force Quit"
 msgstr "أ_جبر الإنهاء"

-#: ../src/core/display.c:402
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "الامتداد %s مفقود، لكنه مطلوب للتركيب"

-#: ../src/core/display.c:494
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "فشل فتح عرض نظام نوافذ إكس '%s'\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "يستعمل برنامج آخر المفتاح %s بالفعل مع المغيرين %x كرابط\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "‏\"%s\" ليس اختصارا صحيحا\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "عطّل الاتصال بمدير الجلسة"
@ -301,12 +292,12 @@ msgstr "ابدأ الجلسة من ملف محفوظ"
 msgid "Make X calls synchronous"
 msgstr "اجعل نداءات س متزامنة"

-#: ../src/core/main.c:533
+#: ../src/core/main.c:496
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "فشلت قراءة دليل السِمات : %s\n"

-#: ../src/core/main.c:549
+#: ../src/core/main.c:512
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -334,7 +325,7 @@ msgstr "اطبع الإصدارة"
 msgid "Mutter plugin to use"
 msgstr "ملحق مَتَر الذي سيُستخدم"

-#: ../src/core/prefs.c:1087
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -342,12 +333,12 @@ msgstr ""
 "عطّلت الحلول الجزئيّة للتطبيقات المعطوبة . ربما لن تتصرف بعض التطبيقات "
 "بسلامة.\n"

-#: ../src/core/prefs.c:1162
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "لا يمكن تحليل وصف الخط \"%s\" من مفتاح GSettings‏ %s\n"

-#: ../src/core/prefs.c:1228
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -355,7 +346,7 @@ msgid ""
 msgstr ""
 "\"%s\" الموجود في قاعدة بيانات الإعدادات ليس قيمة سليمة لمغير أزرار الفأرة\n"

-#: ../src/core/prefs.c:1780
+#: ../src/core/prefs.c:1757
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -364,17 +355,17 @@ msgstr ""
 "\"%s\" الموجود في قاعدة بيانات الإعدادات ليس قيمة سليمة لارتباط المفتاح \"%s"
 "\"\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "مساحة العمل %d"

-#: ../src/core/screen.c:674
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "الشاشة %d على العرض '%s' غير صحيحة\n"

-#: ../src/core/screen.c:690
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -383,18 +374,18 @@ msgstr ""
 "الشاشة %d على العرض \"%s\" لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل "
 "--replace لتحُلّ محلّ مدير النوافذ الحالي.\n"

-#: ../src/core/screen.c:717
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "لا يمكن الحصول على اختيار مدير النوافذ على الشاشة %d العرض \"%s\"\n"

-#: ../src/core/screen.c:795
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "الشاشة %d على العرض \"%s\" لها مدير نوافذ بالفعل\n"

-#: ../src/core/screen.c:980
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "لا يمكن ترك الشاشة %d على العرض \"%s\"\n"
@ -491,7 +482,7 @@ msgid "Window manager error: "
 msgstr "خطأ مدير النوافذ: "

 #. first time through
-#: ../src/core/window.c:7538
+#: ../src/core/window.c:7275
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -507,7 +498,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8262
+#: ../src/core/window.c:7941
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -516,22 +507,22 @@ msgstr ""
 "ضبطت النافذة %s تلميحة MWM يدل على انه لا يمكن تحجيمها، لكنها تضبط الحجم "
 "الأدنى %d x %d و الحجم الأقصى %d x %d، هذا ليس له أي معنى.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "ضبط التطبيق رمز NET_WM_PID غير مفهوم %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (على %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "نافذة WM_TRANSIENT_FOR  0x%lx غير صحيحة ل %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, fuzzy, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "نافذة WM_TRANSIENT_FOR  0x%lx غير صحيحة ل %s.\n"
@ -654,20 +645,10 @@ msgid ""
 msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
-msgid "Auto maximize nearly monitor sized windows"
-msgstr ""
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr ""
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
 msgstr ""

-#: ../src/org.gnome.mutter.gschema.xml.in.h:20
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr ""

@ -870,69 +851,69 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d × %d"

-#: ../src/ui/theme.c:235
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "أعلى"

-#: ../src/ui/theme.c:237
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "أسفل"

-#: ../src/ui/theme.c:239
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "يسار"

-#: ../src/ui/theme.c:241
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "يمين"

-#: ../src/ui/theme.c:269
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "هندسة الإطار لا تخصص البعد \"%s\""

-#: ../src/ui/theme.c:288
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "هندسة الإطار لا تخصص البعد \"%s\" للحد \"%s\""

-#: ../src/ui/theme.c:325
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "النسبة الجانبية للزر %g غير معقولة"

-#: ../src/ui/theme.c:337
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "هندسة الإطار لا تخصص حجم الأزرار"

-#: ../src/ui/theme.c:1050
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "يجب أن يكون للتّدرُّجات لونان على الأقل"

-#: ../src/ui/theme.c:1202
+#: ../src/ui/theme.c:1201
 #, fuzzy, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr ""
-"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال gtk:"
-"fg[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""
+"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال gtk:fg"
+"[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""

-#: ../src/ui/theme.c:1218
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr ""

-#: ../src/ui/theme.c:1232
+#: ../src/ui/theme.c:1231
 #, fuzzy, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -940,7 +921,7 @@ msgid ""
 msgstr ""
 "تهيئة التظليل هي \"تظليل/اللون_الأساسي/العامل\"، \"%s\" لا يناسب التهيئة"

-#: ../src/ui/theme.c:1277
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -949,158 +930,158 @@ msgstr ""
 "يجب أن تكون حالة تخصيصات ألوان جتك  في قوسان قائمان، مثال gtk:fg[NORMAL] "
 "NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""

-#: ../src/ui/theme.c:1291
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr ""
-"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال gtk:"
-"fg[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""
+"يحب أن يكون لتخصيص حالة ألوان جتك قوس غلق قائم بعد الحالة/ مثال gtk:fg"
+"[NORMAL]، NORMAL هنا هو الحالة، لا يمكن تحليل \"%s\""

-#: ../src/ui/theme.c:1302
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "لم تفهم الحالة \"%s\" في تخصيص الألوان"

-#: ../src/ui/theme.c:1315
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "لم يفهم جزء اللون \"%s\" في تخصيص اللون"

-#: ../src/ui/theme.c:1344
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "تهيئة الخلط \"blend/bg_color/fg_color/alpha\"، \"%s\"لا يناسب التهيئة"

-#: ../src/ui/theme.c:1355
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "لا يمكن تحليل قيمة الشفافية \"%s\" في اللون المخلط"

-#: ../src/ui/theme.c:1365
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "قيمة الشفافية \"%s\" في اللون المخلوط ليست بين 0.0 و 1.0"

-#: ../src/ui/theme.c:1412
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "تهيئة التظليل هي \"تظليل/اللون_الأساسي/العامل\"، \"%s\" لا يناسب التهيئة"

-#: ../src/ui/theme.c:1423
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "لا يمكن تحليل عامل التظليل \"%s\" في اللون المظلل"

-#: ../src/ui/theme.c:1433
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "عامل التظليل \"%s\" في اللون المظلل سلبي"

-#: ../src/ui/theme.c:1462
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "لا يمكن تحليل اللون \"%s\""

-#: ../src/ui/theme.c:1779
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "تعبير الإحداثيّات يحتوي على الرمز '%s' الممنوع"

-#: ../src/ui/theme.c:1806
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "تعبير الإحداثيّات يحتوي على عدد نقطة متغيرة '%s' تعذّر تحليله"

-#: ../src/ui/theme.c:1820
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "تعبير الإحداثيّات يحتوي على عدد صحيح '%s' تعذّر تحليله"

-#: ../src/ui/theme.c:1941
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "تعبير الإحداثيّات يحتوي على مقسوم مجهول عند بداية هذا النص: \"%s\""

-#: ../src/ui/theme.c:1998
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "تعبير الإحداثيّات فارغ أو لم يفهم"

-#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "تعبير الإحداثيّات ينتُج عند القسمة على صفر"

-#: ../src/ui/theme.c:2163
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "تعبير الإحداثيّاتيّات يحاول استعمال مقسوم mod على عدد فاصلة متحرّكة"

-#: ../src/ui/theme.c:2219
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "تعبير الإحداثيّات له مقسوم \"%s\" بالرغم من ترقبه قاسم"

-#: ../src/ui/theme.c:2228
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "تعبير الإحداثيّات له قاسم بالرغم من ترقبه لمقسوم"

-#: ../src/ui/theme.c:2236
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "انتهى تعبير الإحداثيّات بمقسوم عوضا عن قاسم"

-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "لتعبير الإحداثيّات مقسوم \"%c\" يتبع القاسم \"%c\" بدون قاسم بينهما"

-#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "كان لتعبير الإحداثيّات متغير أو ثابت \"%s\""

-#: ../src/ui/theme.c:2496
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "غمر محلّل تعبير الإحداثيّات مجاله"

-#: ../src/ui/theme.c:2525
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "كان لتعبير الإحداثيّات قوس غلق بدون قوس فتح"

-#: ../src/ui/theme.c:2589
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "كان لتعبير الإحداثيات قوس فتح بدون قوس غلق"

-#: ../src/ui/theme.c:2600
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "تعبير الإحداثيات لا يملك قاسمات و مقسومات"

-#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "احتوت السِمة على تعبير ادى الى خطأ: %s\n"

-#: ../src/ui/theme.c:4499
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1109,25 +1090,25 @@ msgstr ""
 "يجب تخصيص <button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> "
 "لأسلوب الإطار هذا"

-#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> مفقود"

-#: ../src/ui/theme.c:5083
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "فشل تحميل السِمة \"%s\": %s\n"

-#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
-#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "لا <%s> ضبط للسِمة \"%s\""

-#: ../src/ui/theme.c:5255
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1136,14 +1117,14 @@ msgstr ""
 "لا أسلوب إطار مضبوط لنوع النافذة \"%s\" في السِمة \"%s\"، اضف عنصر <window "
 "type=\"%s\" style_set=\"whatever\"/>"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "الثوابت المعرفة من طرف المستخدم يجب أن تبدأ بحروف كبيرة، \"%s\" لا يبدأ بذلك"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "عُرِّف الثابت \"%s\" بالفعل"
@ -1618,56 +1599,56 @@ msgstr "حد"
 msgid "Attached Modal Dialog"
 msgstr "صندوق حوار سائد"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "تجربة تصميم الأزرار %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g ملي ثانية لرسم إظار واحد للنافذة"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "الإستعمال: metacity-theme-viewer [THEMENAME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "خطأ عند تحميل السِمة: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "حُمِّلت السِمة \"%s\" في %g ثواني\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "خط عنوان عادي"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "خط عنوان صغير"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "خط عنوان كبير"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "تصاميم الأزرار"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "علامة إهتداء"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "عنوان النافذة يكون هنا"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1052
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1677,46 +1658,43 @@ msgstr ""
 "دفعت %d إطارات في %g ثوان بإتجاه العميل (%g ملي ثانية لكل إطار) و %g ثواني "
 "بوقت ساعة حائطية مع مصادر خادوم X (%g ملي ثانية لكل إطار)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1271
 msgid "position expression test returned TRUE but set error"
 msgstr "أرجع إختبار تعبير الموقع TRUE لكنه لم يكتشف الخطأ"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1273
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "أرجع إختبار تعبير الموقع خطأ لكنه لم يكتشف الخطأ"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1277
 msgid "Error was expected but none given"
 msgstr "تُرُقِّب خطأ لكن لم يعطى أي خطأ"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1279
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "تُرقّب %d لكن أعطى %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1285
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "لم يُترقب خطأ لكنه أرجع واحدًا: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "قيمة س كانت %d، تُرُقِّب %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1292
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "قيمة ص كانت %d، تُرُقَِب %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1357
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "حُلِّلت %d تعابير الإحداثيات في %g ثواني (بمعدّل %g ثوان)\n"

-#~ msgid "Minimize window"
-#~ msgstr "صغّر النّافذة"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "قائمة بملحقات المزج مفصولة بفاصلة"

--- a/po/as.po
+++ b/po/as.po
@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-01 15:50+0000\n"
-"PO-Revision-Date: 2013-03-07 19:33+0530\n"
+"POT-Creation-Date: 2013-01-11 15:23+0000\n"
+"PO-Revision-Date: 2013-01-16 14:25+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami@redhat.com>\n"
 "Language-Team: Assamese <kde-i18n-doc@kde.org>\n"
 "Language: as_IN\n"
@ -168,6 +168,7 @@ msgid "Close window"
 msgstr "উইন্ডো বন্ধ কৰক"

 #: ../src/50-mutter-windows.xml.in.h:9
+#| msgid "Resize window"
 msgid "Hide window"
 msgstr "উইন্ডোক লুকাওক"

@ -213,17 +214,13 @@ msgstr "বিভাজনক সোঁফালে দৰ্শন কৰক"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:507
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "অন্য মিশ্ৰণ ব্যৱস্থাপক ইতিমধ্যে চলি আছে পৰ্দা %i প্ৰদৰ্শন \"%s\"।"

-#: ../src/compositor/meta-background.c:1111
-msgid "background texture could not be created from file"
-msgstr "পটভূমিৰ ৰূপ ফাইলৰ পৰা সৃষ্টি কৰিব পৰা নগল"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "ঘন্টা ঘটনা"
@ -258,17 +255,17 @@ msgstr "অপেক্ষা কৰক (_W)"
 msgid "_Force Quit"
 msgstr "বলপূৰ্বক বন্ধ কৰক (_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "মিশ্ৰণৰ বাবে সন্ধানহিন %s সম্প্ৰসাৰনৰ প্ৰয়োজন"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X উইন্ডো চিস্টেম প্ৰদৰ্শন '%s'খোলিব পৰা নগল \n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -278,12 +275,6 @@ msgstr ""
 "ব্যৱহাৰ "
 "কৰি আছে\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" এটা বৈধ ত্বৰক নহয়\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "অধিবেশন ব্যৱস্থাপকৰ সৈতে সংযোগ বিচ্ছিন্ন কৰক"
@ -374,17 +365,17 @@ msgid ""
 msgstr ""
 "সংৰূপ ডাটাবেইচত উপলব্ধ \"%s\", \"%s\" কি-বাইন্ডিং ৰ ক্ষেত্ৰত বৈধ মান নহয়\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "কৰ্মস্থান %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "পৰ্দা %d প্ৰদৰ্শন '%s' ত অবৈধ\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -394,19 +385,19 @@ msgstr ""
 "উইন্ডো "
 "ব্যৱস্থাপক পৰিবৰ্তন কৰোঁতে --replace বিকল্প প্ৰয়োগ কৰক।\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "উইন্ডো ব্যৱস্থাপকৰ নিৰ্বাচন গ্ৰহণ কৰোঁতে ব্যৰ্থ পৰ্দা %d প্ৰদৰ্শন \"%s\"\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "পৰ্দা %d প্ৰদৰ্শন \"%s\" ৰ এটা উইন্ডো ব্যৱস্থাপক ইতিমধ্যে আছে\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "পৰ্দা %d মুক্ত কৰিব পৰা নগল প্ৰদৰ্শন \"%s\"\n"
@ -505,7 +496,7 @@ msgid "Window manager error: "
 msgstr "উইন্ডো ব্যৱস্থাপক ত্ৰুটি: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7279
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -521,7 +512,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7945
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -532,22 +523,22 @@ msgstr ""
 "বিশেষ "
 "এটা সংজ্ঞা নিদিয়ে।\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "এপ্লিকেচন দ্বাৰা ভুল _NET_WM_PID %lu নিৰ্ধাৰিত হৈছে\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s ৰ ওপৰত)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "অবৈধ WM_TRANSIENT_FOR উইন্ডো 0x%lx, %s ৰ বাবে নিৰ্ধাৰিত হৈছে।\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR window 0x%lx এ %s ৰ বাবে লুপ সৃষ্টি কৰিব।\n"
@ -701,16 +692,12 @@ msgid "Auto maximize nearly monitor sized windows"
 msgstr "মনিটৰৰ প্ৰায় সমান আকাৰৰ উইন্ডোসমূহক স্বচালিতভাৱে ডাঙৰ কৰক"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
-#| msgid ""
-#| "If enabled, monitor nearly monitor sized windows automatically get "
-#| "maximized when mapped."
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""
-"যদি সামৰ্থবান থাকে, আৰম্ভণিত মনিটৰৰ আকাৰৰ নতুন উইন্ডোসমূহ স্বচালিতভাৱে "
-"সৰ্বোচ্চ আকাৰ "
-"প্ৰাপ্ত কৰে।"
+"যদি সামৰ্থবান, মনিটৰৰ প্ৰায় সমান আকাৰৰ উইন্ডোসমূহ মেপ কৰোতে স্বচালিতভাৱে ডাঙৰ "
+"হয়।"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -919,7 +906,7 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
@ -1202,14 +1189,14 @@ msgstr ""
 "থীম \"%s\" ত উইন্ডো ধৰণ \"%s\" ৰ বাবে কোনো ফ্ৰেইম শৈলী সংহিত নাই, এটা <window "
 "type=\"%s\" style_set=\"whatever\"/> উপাদন যোগ কৰক"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5659 ../src/ui/theme.c:5721 ../src/ui/theme.c:5784
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "ব্যৱহাৰকাৰী-বিৱৰিত ধ্ৰুৱকসমূহ এটা ডাঙৰ ফলাৰ সৈতে আৰম্ভ হব লাগিব; \"%s\" নহয়"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5667 ../src/ui/theme.c:5729 ../src/ui/theme.c:5792
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "ধ্ৰুৱক \"%s\" ইতিমধ্যে বিৱৰিত"
@ -1698,56 +1685,56 @@ msgstr "প্ৰান্ত"
 msgid "Attached Modal Dialog"
 msgstr "সংযুক্ত মোডাল ডাইলগ"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "বুটাম বিন্যাসৰ পৰীক্ষা %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "এটা উইন্ডো ফ্ৰেইম আকিবলে %g মিলিছেকেণ্ড"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "ব্যৱহাৰপদ্ধতি: metacity-theme-viewer [THEMENAME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "থীম ল'ড কৰোতে ত্ৰুটি: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "\"%s\" থীম %g ছেকেণ্ডত ল'ড কৰা হৈছে\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "স্বাভাবিক শীৰ্ষক ফন্ট"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "সৰু শীৰ্ষক ফন্ট"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "ডাঙৰ শীৰ্ষক ফন্ট"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "বুটামৰ বিন্যাসসমূহ"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "ধাপ"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "উইন্ডো শীৰ্ষক ইয়াত যাব"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1760,39 +1747,39 @@ msgstr ""
 "অকাঁ "
 "হৈছিল\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr "অবস্থান অভিব্যক্তিৰ পৰীক্ষায়ে TRUE ঘুৰাই দিলেও ত্ৰুটি সংহিত হৈছে"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "অবস্থান অভিব্যক্তিৰ পৰীক্ষায়ে FALSE ঘুৰাই দিলেও ত্ৰুটি সংহিত নাই হোৱা"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "ত্ৰুটি প্ৰত্যাশিত আছিল কিন্তু কোনো এটা দিয়া হোৱা নাই"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "ত্ৰুটি %d প্ৰত্যাশিত আছিল কিন্তু %d প্ৰদান কৰা হৈছে"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "ত্ৰুটি প্ৰত্যাশিত নহয় কিন্তু প্ৰাপ্ত: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x ৰ মান %d, %d প্ৰত্যাশিত"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y ৰ মান %d, %d প্ৰত্যাশিত"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d অক্ষ অভিব্যক্তিসমূহ %g ছেকেণ্ডত বিশ্লেষণ কৰা হৈছে (গড় %g ছেকেণ্ড)\n"
--- a/po/be.po
+++ b/po/be.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-01 15:50+0000\n"
+"POT-Creation-Date: 2013-01-11 15:23+0000\n"
 "PO-Revision-Date: 2012-10-13 17:44+0300\n"
 "Last-Translator: Ігар Грачышка <ihar.hrachyshka@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
@ -206,7 +206,7 @@ msgstr "Падзяліць прагляд справа"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:507
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -214,10 +214,6 @@ msgid ""
 msgstr ""
 "Іншы кампазітны кіраўнік вокнаў ужо абслугоўвае экран %i дысплея \"%s\"."

-#: ../src/compositor/meta-background.c:1111
-msgid "background texture could not be created from file"
-msgstr "не ўдалося стварыць фонавую тэкстуру з файла"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Падзея з сігналам"
@ -251,18 +247,18 @@ msgstr "_Пачакаць"
 msgid "_Force Quit"
 msgstr "_Змусіць да выхаду"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr ""
 "Адсутнічае пашырэнне \"%s\", патрэбнае для ажыццяўлення кампазітнага вываду"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Не ўдалося адкрыць X-дысплей аконнай сістэмы \"%s\"\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -271,11 +267,6 @@ msgstr ""
 "Нейкая іншая праграма ўжо выкарыстоўвае як скарот клавішу %s з "
 "мадыфікатарамі %x\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" - гэта хібны клавіятурны скарот\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Выключыць злучэнне з кіраўніком сеансаў"
@ -368,17 +359,17 @@ msgstr ""
 "Значэнне \"%s\", знойдзенае ў базе канфігурацыйных даных, не азначае "
 "клавіятурны скарот \"%s\"\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "Прастора працы %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Экран %d на дысплеі \"%s\" хібны\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -387,19 +378,19 @@ msgstr ""
 "Экран %d на дысплеі \"%s\" ужо мае аконнага кіраўніка. Каб замяніць яго "
 "новым, дадайце опцыю --replace.\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Не ўдалося пераняць вылучэнне кіраўніка вокнаў для экрана %d дысплея \"%s\"\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Экран %d на дысплеі \"%s\" ужо мае кіраўніка вокнаў\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Не ўдалося вызваліць экран %d на дысплеі \"%s\"\n"
@ -499,7 +490,7 @@ msgid "Window manager error: "
 msgstr "Памылка кіраўніка вокнаў: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7279
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -515,7 +506,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7945
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -525,22 +516,22 @@ msgstr ""
 "памеру, але разам з гэтым прызначыла для сябе мінімальны памер %d x %d і "
 "максімальны памер %d x %d. Такія паводзіны не маюць сэнсу.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Праграма прызначыла памылковае значэнне _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (на %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Для %2$s вызначана хібнае акно WM_TRANSIENT_FOR 0x%1$lx.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR акно 0x%lx для %s стварыла б цыкл.\n"
@ -689,15 +680,13 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
-msgstr "Аўтаматычна максімалізаваць вокны, якія расцягнутыя амаль на ўвесь экран"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""
-"Калі ўключана, новыя вокны з памерам, блізкім да памераў манітора, будуць "
-"аўтаматычна максімалізавацца."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -906,7 +895,7 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
@ -1191,7 +1180,7 @@ msgstr ""
 "Стыль рамкі не вызначаны для вокнаў тыпу \"%s\" для матыву аздаблення \"%s"
 "\". Дадайце <window type=\"%s\" style_set=\"штосьці\"/>."

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5659 ../src/ui/theme.c:5721 ../src/ui/theme.c:5784
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@ -1199,7 +1188,7 @@ msgstr ""
 "Назвы канстантаў, вызначаных карыстальнікам, мусяць пачынацца з вялікай "
 "літары. \"%s\" не адпавядае гэтаму патрабаванню."

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5667 ../src/ui/theme.c:5729 ../src/ui/theme.c:5792
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Канстанта \"%s\" ужо азначана"
@ -1691,56 +1680,56 @@ msgstr "Аблямоўка"
 msgid "Attached Modal Dialog"
 msgstr "Прычапленае мадальнае дыялогавае акенца"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Выпрабаванне размяшчэння кнопак %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g мілісекунд, каб намаляваць адну рамку акна"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Правілы карыстання: metacity-theme-viewer [НАЗВА_МАТЫВУ]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Памылка загрузкі матыву аздаблення: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Матыў аздаблення \"%s\" загружаны за %g секунд\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "Звычайны шрыфт загалоўка"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "Маленькі шрыфт загалоўка"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "Вялікі шрыфт загалоўка"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "Размяшчэнне кнопак"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "Выпрабаванне"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "Месца для загалоўка акна"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1751,41 +1740,42 @@ msgstr ""
 "і %g секунд каляндарнага часу, уключна з рэсурсамі X-сервера (%g мілісекунд "
 "на рамку)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr "выпрабаванне выразу пазіцыі вярнула TRUE, але паведаміла аб памылцы"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr ""
 "выпрабаванне выразу пазіцыі вярнула FALSE, але не паведаміла аб памылцы"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "Чакалася памылка, але звесткі не атрыманыя"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Чакалася памылка %d, але атрымана %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Атрымана нечаканая памылка: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "X-значэнне было %d, а чакалася %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "Y-значэнне было %d, а чакалася %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d каардынатных выразаў разабраныя за %g секунд (у сярэднім %g секунд)\n"
+
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/en_GB.po
+++ b/po/en_GB.po
--- a/po/es.po
+++ b/po/es.po
@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-01 15:50+0000\n"
-"PO-Revision-Date: 2013-03-04 13:55+0100\n"
+"POT-Creation-Date: 2013-01-11 15:23+0000\n"
+"PO-Revision-Date: 2013-01-15 13:02+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "Language: \n"
@ -170,6 +170,7 @@ msgid "Close window"
 msgstr "Cerrar la ventana"

 #: ../src/50-mutter-windows.xml.in.h:9
+#| msgid "Resize window"
 msgid "Hide window"
 msgstr "Ocultar la ventana"

@ -215,7 +216,7 @@ msgstr "Ver división a la derecha"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:507
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -224,10 +225,6 @@ msgstr ""
 "Ya existe un gestor de composición ejecutándose en la monitor %i, pantalla «%"
 "s»."

-#: ../src/compositor/meta-background.c:1111
-msgid "background texture could not be created from file"
-msgstr "no se pudo crear la textura de fondo a partir de archivo"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Evento de campana"
@ -262,17 +259,17 @@ msgstr "_Esperar"
 msgid "_Force Quit"
 msgstr "_Forzar la salida"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Falta la extensión %s requerida para la composición"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -281,12 +278,6 @@ msgstr ""
 "Algún otro programa ya está usando la clave %s con el modificador %x como "
 "una vinculación\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» no es un acelerador válido\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"
@ -380,17 +371,17 @@ msgstr ""
 "«%s» encontrado en la base de datos de configuración no es un valor válido "
 "para la combinación de teclas «%s»\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "Área de trabajo %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -399,7 +390,7 @@ msgstr ""
 "La ventana %d en la pantalla «%s» ya tiene un gestor de ventanas, intente "
 "usar la opción «--replace» para reemplazar el gestor de ventanas activo.\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@ -407,12 +398,12 @@ msgstr ""
 "No se ha podido obtener la selección del gestor de ventanas en la ventana %d "
 "en la pantalla «%s»\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "La ventana %d en la pantalla «%s» ya tiene un gestor de ventanas\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "No se ha podido liberar el monitor %d en la pantalla «%s»\n"
@ -511,7 +502,7 @@ msgid "Window manager error: "
 msgstr "Error del gestor de ventanas: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7279
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -527,7 +518,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7945
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
@ -537,23 +528,23 @@ msgstr ""
 "redimensionable, pero configuró el tamaño mínimo a %d x %d y el tamaño "
 "máximo a %d x %d ; esto no tiene mucho sentido.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "La aplicación establecio un _NET_WM_PID %lu erróneo\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "WM_TRANSIENT_FOR no válido para la ventana 0x%lx especificada para %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR ventana 0x%lx para %s crearía un bucle.\n"
@ -711,11 +702,11 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""
-"Si está activada, las ventanas nuevas que inicialmente tienen el tamaño de "
-"la pantalla, se maximizan."
+"Si está activada, las ventanas cercanas al tamaño de la pantalla se "
+"maximizan automáticamente al mapearlas."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -924,7 +915,7 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
@ -1223,7 +1214,7 @@ msgstr ""
 "No hay un estilo de marco para el tipo de ventana «%s» en el tema «%s», añada "
 "un elemento <window type=\"%s\" style_set=\"whatever\"/>"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5659 ../src/ui/theme.c:5721 ../src/ui/theme.c:5784
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@ -1231,7 +1222,7 @@ msgstr ""
 "Las constantes definidas por el usuario deben comenzar con una letra "
 "mayúscula; «%s» no lo hace"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5667 ../src/ui/theme.c:5729 ../src/ui/theme.c:5792
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "La constante «%s» ya ha sido definida"
@ -1728,56 +1719,56 @@ msgstr "Borde"
 msgid "Attached Modal Dialog"
 msgstr "Diálogo modal adjunto"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Test de distribución de botones %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisegundos para dibujar un marco de ventana"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Uso: metacity-theme-viewer [NOMBRETEMA]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Ocurrió un error al cargar el tema:«%s»\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Se cargó el tema «%s» en %g segundos\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "Tipografía de título normal"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "Tipografía de título pequeña"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "Tipografía de título grande"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "Distribución de botones"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "Banco de pruebas"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "El título de la ventana va aquí"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1788,41 +1779,41 @@ msgstr ""
 "marco) y %g segundos de tiempo estándar incluyendo recursos del servidor X (%"
 "g milisegundos por marco)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr ""
 "prueba de expresión de la posición devolvió TRUE pero estableció un error"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr ""
 "prueba de expresión de la posición devolvió FASE pero no estableció un error"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "Se esperaba un error, pero no se dio ninguno"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Se esperaba el error %d pero se dio el %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "No se esperaba un error pero se devolvió uno: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "el valor x era %d, se esperaba %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "el valor y era %d, se esperaba %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
--- a/po/et.po
+++ b/po/et.po
@ -7,15 +7,15 @@
 #
 # Tõivo Leedjärv <toivo linux ee>, 2004.
 # Ivar Smolin <okul linux ee>, 2005, 2006, 2009–2011.
-# Mattias Põldaru <mahfiaz@gmail.com>, 2008–2011, 2012, 2013.
+# Mattias Põldaru <mahfiaz@gmail.com>, 2008–2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter MASTER\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-12 18:53+0000\n"
-"PO-Revision-Date: 2013-03-12 20:55+0300\n"
+"POT-Creation-Date: 2012-12-18 22:30+0000\n"
+"PO-Revision-Date: 2012-12-19 18:06+0300\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@ -132,8 +132,8 @@ msgstr "Varjatud oleku vahetamine"
 msgid "Close window"
 msgstr "Akna sulgemine"

-msgid "Hide window"
-msgstr "Peida aken"
+msgid "Minimize window"
+msgstr "Akna minimeerimine"

 msgid "Move window"
 msgstr "Akna liigutamine"
@ -173,9 +173,6 @@ msgid ""
 "\"."
 msgstr "Teine komposiithaldur juba töötab ekraani %i kuval \"%s\"."

-msgid "background texture could not be created from file"
-msgstr "failist polnud võimalik taustatekstuuri luua"
-
 msgid "Bell event"
 msgstr "Helina sündmus"

@ -217,10 +214,6 @@ msgstr ""
 "Mõni teine programm juba kasutab klahvi %s koos muuteklahvidega %x "
 "kiirklahvina\n"

-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" pole sobiv kiirklahv\n"
-
 msgid "Disable connection to session manager"
 msgstr "Seansihalduriga ühendumise keelamine"

@ -556,16 +549,6 @@ msgstr ""
 "Lohistatava äärise laius. Kui kujunduse nähtavatest ääristest ei piisa, "
 "lisatakse puuduoleva osa jaoks nähtamatu ääris."

-msgid "Auto maximize nearly monitor sized windows"
-msgstr "Peaaegu monitori suurused ekraanid maksimeeritakse automaatselt"
-
-msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr ""
-"Kui lubatud, maksimeeritakse automaatselt aknad, mis on avanedes monitori "
-"suurused."
-
 msgid "Select window from tab popup"
 msgstr "Akna valimine tabulaatori hüpikaknalt"

@ -1434,6 +1417,3 @@ msgstr "y väärtus oli %d, oodati väärtust %d"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n"
-
-#~ msgid "Minimize window"
-#~ msgstr "Akna minimeerimine"
--- a/po/eu.po
+++ b/po/eu.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/gl.po
+++ b/po/gl.po
@ -9,13 +9,13 @@
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013.
+# Fran Dieguez <frandieguez@gnome.org>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-04 13:55+0100\n"
-"PO-Revision-Date: 2013-03-04 14:20+0200\n"
+"POT-Creation-Date: 2012-12-24 22:58+0100\n"
+"PO-Revision-Date: 2012-12-24 23:03+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: gnome-l10n-gl@gnome.org\n"
 "Language: gl\n"
@ -170,8 +170,8 @@ msgid "Close window"
 msgstr "Pechar xanela"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Ocultar xanela"
+msgid "Minimize window"
+msgstr "Minimizar xanela"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -215,7 +215,7 @@ msgstr "Dividir vista á dereita"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:509
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -224,10 +224,6 @@ msgstr ""
 "Xa se está a executar outro xestor de composición na pantalla %i na "
 "visualización «%s»"

-#: ../src/compositor/meta-background.c:1180
-msgid "background texture could not be created from file"
-msgstr "a textura do fondo non puido crearse desde o ficheiro"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Evento de campá"
@ -262,17 +258,17 @@ msgstr "Espe_rar"
 msgid "_Force Quit"
 msgstr "_Forzar a saída"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Falta a extensión %s que se require para a composición"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -281,11 +277,6 @@ msgstr ""
 "Algún outro programa xa está usando a tecla %s cos modificadores %x como "
 "combinación\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» non é un acelerador correcto\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Desactivar a conexión ao xestor de sesión"
@ -310,12 +301,12 @@ msgstr "Inicializar sesión desde o ficheiro de salvagarda"
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan sincrónicas"

-#: ../src/core/main.c:533
+#: ../src/core/main.c:496
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Produciuse un erro ao dixitalizar o directorio de temas: %s\n"

-#: ../src/core/main.c:549
+#: ../src/core/main.c:512
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -346,7 +337,7 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Engadido de mutter que usar"

-#: ../src/core/prefs.c:1087
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -354,14 +345,14 @@ msgstr ""
 "Desactiváronse os arranxos para aplicativos danados. Pode que algúns "
 "aplicativos non se comporten correctamente.\n"

-#: ../src/core/prefs.c:1162
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "Non foi posíbel analizar a descrición do tipo de letra «%s» da chave "
 "GSettings %s\n"

-#: ../src/core/prefs.c:1228
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -370,7 +361,7 @@ msgstr ""
 "«%s» atopados na base de datos de configuración non é un valor correcto para "
 "o modificador do botón do rato\n"

-#: ../src/core/prefs.c:1780
+#: ../src/core/prefs.c:1757
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -379,17 +370,17 @@ msgstr ""
 "«%s» atopados na base de datos de configuración non é un valor correcto para "
 "a combinación de teclas «%s»\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -398,7 +389,7 @@ msgstr ""
 "A visualización %d na pantalla «%s» ten xa un xestor de xanelas, tente usar "
 "a opción --replace para substituír o xestor de xanelas.\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@ -406,12 +397,12 @@ msgstr ""
 "Non foi posíbel obter a selección do xestor de xanelas na pantalla %d na "
 "visualización «%s»\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "A visualización %d na pantalla «%s» ten xa un xestor de xanelas\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Non foi posíbel liberar a visualización %d na pantalla «%s»\n"
@ -508,7 +499,7 @@ msgid "Window manager error: "
 msgstr "Erro do xestor de xanelas: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7275
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -524,7 +515,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7941
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -534,23 +525,23 @@ msgstr ""
 "mais configurou o tamaño mínimo a %d x %d e o tamaño máximo a %d x %d, isto "
 "non ten moito sentido.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "O aplicativo configurou un _NET_WM_PID %lu falso\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (en %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "WM_TRANSIENT_FOR non válido para a xanela 0x%lx especificada para %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR xanela 0x%lx para %s crearía un bucle.\n"
@ -698,23 +689,10 @@ msgstr ""
 "son suficientes, engadiranse bordos invisíbeis para satisfacer este valor."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
-msgid "Auto maximize nearly monitor sized windows"
-msgstr ""
-"Maximizar automaticamente as xanelas que case teñan o tamaño da pantalla"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr ""
-"Se está activada, as xanelas novas que inicialmente teñan o tamaño da "
-"pantalla maximizaranse automaticamente."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
 msgstr "Seleccionar xanela da lapela emerxente"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:20
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "Cancelar lapela emerxente"

@ -917,53 +895,53 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:235
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "superior"

-#: ../src/ui/theme.c:237
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "inferior"

-#: ../src/ui/theme.c:239
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "esquerda"

-#: ../src/ui/theme.c:241
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "dereita"

-#: ../src/ui/theme.c:269
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "a xeometría do marco non especifica a dimensión «%s»"

-#: ../src/ui/theme.c:288
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "a xeometría do marco non especifica a dimensión «%s» para o bordo «%s»"

-#: ../src/ui/theme.c:325
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "A proporción de aspecto do botón %g non é razoábel"

-#: ../src/ui/theme.c:337
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "A xeometría do marco non especifica o tamaño dos botóns"

-#: ../src/ui/theme.c:1050
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "As gradacións deben ter polo menos dúas cores"

-#: ../src/ui/theme.c:1202
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@ -973,7 +951,7 @@ msgstr ""
 "entre parénteses, por exemplo: gtk:custom(foo,bar); non foi posíbel analizar "
 "«%s»."

-#: ../src/ui/theme.c:1218
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@ -982,7 +960,7 @@ msgstr ""
 "O carácter «%c» non é válido no parámetro «color_name» de «gtk:custom», só "
 "«A-Za-z0-9» son válidos"

-#: ../src/ui/theme.c:1232
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -991,7 +969,7 @@ msgstr ""
 "O formato de «gtk:custom» é «gtk:custom(nome_de_cor,nome_alternativo», «%s» "
 "non respecta o formato"

-#: ../src/ui/theme.c:1277
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -1000,7 +978,7 @@ msgstr ""
 "A especificación de cor do GTK debe ter o estado entre parénteses, exemplo. "
 "gtk:fg[NORMAL] onde NORMAL é o estado; non foi posíbel analizar «%s»"

-#: ../src/ui/theme.c:1291
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@ -1010,17 +988,17 @@ msgstr ""
 "estado, exemplo. gtk:fg[NORMAL] onde NORMAL é o estado; non foi posíbel "
 "analizar «%s»"

-#: ../src/ui/theme.c:1302
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Non se entende o estado «%s» na especificación da cor"

-#: ../src/ui/theme.c:1315
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Non se entende o compoñente de cor «%s» na especificación da cor"

-#: ../src/ui/theme.c:1344
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@ -1029,17 +1007,17 @@ msgstr ""
 "O formato de blend é «blend/bg_color/fg_color/alpha», «%s»non coincide co "
 "formato"

-#: ../src/ui/theme.c:1355
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Non foi posíbel analizar o valor alfa «%s» na cor mesturada"

-#: ../src/ui/theme.c:1365
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "O valor alfa «%s» na cor mesturada non está entre 0.0 e 1.0"

-#: ../src/ui/theme.c:1412
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@ -1047,28 +1025,28 @@ msgstr ""
 "O formato de sombreado é \"shade/base_color/factor\", «%s» non coincide co "
 "formato"

-#: ../src/ui/theme.c:1423
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Non foi posíbel analizar o factor de sombreado «%s» na cor sombreada"

-#: ../src/ui/theme.c:1433
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "O factor de sombreado «%s» na cor sombreada é negativo"

-#: ../src/ui/theme.c:1462
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Non foi posíbel analizar a cor «%s»"

-#: ../src/ui/theme.c:1779
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr ""
 "A expresión de coordenadas contén un carácter «%s» que non está permitido"

-#: ../src/ui/theme.c:1806
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@ -1077,14 +1055,14 @@ msgstr ""
 "A expresión de coordenadas contén un número de coma flotante «%s» que non "
 "foi posíbel analizar"

-#: ../src/ui/theme.c:1820
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "A expresión de coordenadas contén un enteiro «%s» que non foi posíbel "
 "analizar"

-#: ../src/ui/theme.c:1941
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@ -1093,17 +1071,17 @@ msgstr ""
 "A expresión de coordenadas contén un operador non válido ao inicio do seu "
 "texto: «%s»"

-#: ../src/ui/theme.c:1998
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "A expresión de coordenadas está baleira ou non se entendeu"

-#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "A expresión de coordenadas resultou nun erro de división por cero"

-#: ../src/ui/theme.c:2163
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@ -1111,25 +1089,25 @@ msgstr ""
 "A expresión de coordenadas tentou usar un operador mod cun número de coma "
 "flotante"

-#: ../src/ui/theme.c:2219
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "A expresión de coordenadas ten un operador «%s» onde se esperaba un operando"

-#: ../src/ui/theme.c:2228
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "A expresión de coordenadas ten un operando onde se esperaba un operador"

-#: ../src/ui/theme.c:2236
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "A expresión de coordenadas remata cun operador en vez dun operando"

-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@ -1138,42 +1116,42 @@ msgstr ""
 "A expresión de coordenadas ten un operador \"%c\" seguido do operador \"%c\" "
 "sen un operando entre eles"

-#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "A expresión de coordenadas ten unha variábel ou constante descoñecida «%s»"

-#: ../src/ui/theme.c:2496
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "O analizador da expresión de coordenadas desbordou o seu búfer."

-#: ../src/ui/theme.c:2525
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "A expresión de coordenadas ten unha paréntese pechada sen unha paréntese "
 "aberta"

-#: ../src/ui/theme.c:2589
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "A expresión de coordenadas ten unha paréntese aberta sen unha paréntese "
 "pechada"

-#: ../src/ui/theme.c:2600
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "A expresión de coordenadas non parece ter nin operadores nin operandos"

-#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "O tema contiña unha expresión que resultou ser un erro: %s\n"

-#: ../src/ui/theme.c:4499
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1182,24 +1160,24 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=\"whatever\"/> débese especificar "
 "para este estilo de marco"

-#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "Falta <frame state=«%s» resize=«%s» focus=«%s» style=\"whatever\"/>"

-#: ../src/ui/theme.c:5083
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Produciuse un erro ao cargar o tema «%s»: %s\n"

-#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
-#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Non se configurou <%s> para o tema «%s»"

-#: ../src/ui/theme.c:5255
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1208,7 +1186,7 @@ msgstr ""
 "Non hai un estilo de marco para o tipo de xanela «%s» no tema «%s», engada "
 "un elemento <window type=«%s» style_set=\"whatever\"/>"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@ -1216,7 +1194,7 @@ msgstr ""
 "As constantes definidas polo usuario deben comezar cunha letra maiúscula; "
 "«%s» non o fai"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "A constante «%s» xa foi definida"
@ -1709,56 +1687,56 @@ msgstr "Bordo"
 msgid "Attached Modal Dialog"
 msgstr "Diálogo modal adxunto"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Proba de disposición de botóns %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisegundos para debuxar un marco de xanela"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Uso: metacity-theme-viewer [NOMETEMA]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Produciuse un erro ao cargar o tema: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Cargouse o tema «%s» en %g segundos\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "Tipo de letra de título normal"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "Tipo de letra de título pequena"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "Tipo de letra de título grande"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "Disposición dos botóns"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "Banco de probas"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "O título da xanela vai aquí"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1052
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1769,50 +1747,47 @@ msgstr ""
 "marco) e %g segundos de tempo estándar incluíndo recursos do servidor X (%g "
 "milisegundos por marco)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1271
 msgid "position expression test returned TRUE but set error"
 msgstr ""
 "a proba de expresión da posición devolveu TRUE mais estabeleceu un erro"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1273
 msgid "position expression test returned FALSE but didn't set error"
 msgstr ""
 "a proba de expresión da posición devolveu FALSE mais estabeleceu un erro"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1277
 msgid "Error was expected but none given"
 msgstr "Esperábase un erro, mais non se deu ningún"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1279
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Esperábase un erro %d mais deuse %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1285
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Non se esperaba ningún erro mais devolveuse un: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "o valor x era %d, esperábase %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1292
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "o valor y era %d, esperábase %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1357
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d expresións de coordenadas interpretadas en %g segundos (%g segundos de "
 "media)\n"

-#~ msgid "Minimize window"
-#~ msgstr "Minimizar xanela"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Lista de separadas por comas dos complementos do compositor"

--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-03 08:27+0300\n"
-"PO-Revision-Date: 2013-04-03 08:28+0200\n"
+"POT-Creation-Date: 2012-12-26 19:50+0200\n"
+"PO-Revision-Date: 2012-12-26 19:50+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@ -164,8 +164,8 @@ msgid "Close window"
 msgstr "סגירת חלון"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "הסתרת החלון"
+msgid "Minimize window"
+msgstr "מזעור חלון"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -209,16 +209,12 @@ msgstr "פיצול הצפייה מימין"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid "Another compositing manager is already running on screen %i on display \"%s\"."
 msgstr "מנהל תצוגת חלונות אחר כבר פועל במסך %i בתצוגה „%s“."

-#: ../src/compositor/meta-background.c:1064
-msgid "background texture could not be created from file"
-msgstr "לא ניתן ליצור מרקם רקע מקובץ"
-
-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "אירוע פעמון"

@ -248,56 +244,51 @@ msgstr "ה_מתנה"
 msgid "_Force Quit"
 msgstr "_אילוץ סגירה"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Missing %s extension required for compositing"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Failed to open X Window System display '%s'\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid "Some other program is already using the key %s with modifiers %x as a binding\n"
 msgstr "תכנית אחרת כבר משתמשת במקש %s עם המקש %x כצירוף\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" אינו מקש האצה תקני\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Disable connection to session manager"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Replace the running window manager"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Specify session management ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "X Display to use"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Initialize session from savefile"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Make X calls synchronous"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:496
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Failed to scan themes directory: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:512
 #, c-format
 msgid "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
 msgstr "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -323,51 +314,51 @@ msgstr "Print version"
 msgid "Mutter plugin to use"
 msgstr "תוסף ה־mutter לשימוש"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid "Workarounds for broken applications disabled. Some applications may not behave properly.\n"
 msgstr "Workarounds for broken applications disabled. Some applications may not behave properly.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Could not parse font description \"%s\" from GSettings key %s\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"
 msgstr "\"%s\" found in configuration database is not a valid value for mouse button modifier\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1768
 #, c-format
 msgid "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"
 msgstr "\"%s\" found in configuration database is not a valid value for keybinding \"%s\"\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1865
 #, c-format
 msgid "Workspace %d"
 msgstr "סביבת עבודה %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Screen %d on display '%s' is invalid\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:674
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"
 msgstr "Screen %d on display \"%s\" already has a window manager; try using the --replace option to replace the current window manager.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:701
 #, c-format
 msgid "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "Could not acquire window manager selection on screen %d display \"%s\"\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Screen %d on display \"%s\" already has a window manager\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Could not release screen %d on display \"%s\"\n"
@ -426,45 +417,45 @@ msgstr "Unknown element %s"
 msgid "These windows do not support &quot;save current setup&quot; and will have to be restarted manually next time you log in."
 msgstr "חלונות אלו אינם תומכים ב&quot;שמירת ההגדרות הנוכחיות&quot;, ויהיה צורך באתחול ידני בכניסה הבאה שלך."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Failed to open debug log: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Failed to fdopen() log file %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Opened log file %s\n"

-#: ../src/core/util.c:119
+#: ../src/core/util.c:115
 #: ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter הודר ללא תמיכה במצב פירוט\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Window manager: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Bug in window manager: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Window manager warning: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Window manager error: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7277
 #, c-format
 msgid "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
 msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER window as specified in the ICCCM.\n"
@ -476,27 +467,27 @@ msgstr "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADE
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:7943
 #, c-format
 msgid "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "Window %s sets an MWM hint indicating it isn't resizable, but sets min size %d x %d and max size %d x %d; this doesn't make much sense.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Application set a bogus _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (מעל %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
@ -600,8 +591,8 @@ msgid "Auto maximize nearly monitor sized windows"
 msgstr "Auto maximize nearly monitor sized windows"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid "If enabled, new windows that are initially the size of the monitor automatically get maximized."
-msgstr "If enabled, new windows that are initially the size of the monitor automatically get maximized."
+msgid "If enabled, monitor nearly monitor sized windows automatically get maximized when mapped."
+msgstr "If enabled, monitor nearly monitor sized windows automatically get maximized when mapped."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -811,252 +802,252 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "top"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "bottom"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "left"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "right"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "frame geometry does not specify \"%s\" dimension"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "frame geometry does not specify dimension \"%s\" for border \"%s\""

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Button aspect ratio %g is not reasonable"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Frame geometry does not specify size of buttons"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradients should have at least two colors"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid "GTK custom color specification must have color name and fallback in parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr "GTK custom color specification must have color name and fallback in parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-_ are valid"
 msgstr "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-_ are valid"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not fit the format"
 msgstr "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid "GTK color specification must have a close bracket after the state, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK color specification must have a close bracket after the state, e.g. gtk:fg[NORMAL] where NORMAL is the state; could not parse \"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Did not understand state \"%s\" in color specification"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Did not understand color component \"%s\" in color specification"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the format"
 msgstr "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Could not parse alpha value \"%s\" in blended color"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Could not parse shade factor \"%s\" in shaded color"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Shade factor \"%s\" in shaded color is negative"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Could not parse color \"%s\""

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Coordinate expression contains character '%s' which is not allowed"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid "Coordinate expression contains floating point number '%s' which could not be parsed"
 msgstr "Coordinate expression contains floating point number '%s' which could not be parsed"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Coordinate expression contains integer '%s' which could not be parsed"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid "Coordinate expression contained unknown operator at the start of this text: \"%s\""
 msgstr "Coordinate expression contained unknown operator at the start of this text: \"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Coordinate expression was empty or not understood"

-#: ../src/ui/theme.c:2112
-#: ../src/ui/theme.c:2122
-#: ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2110
+#: ../src/ui/theme.c:2120
+#: ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Coordinate expression results in division by zero"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Coordinate expression tries to use mod operator on a floating-point number"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Coordinate expression has an operator \"%s\" where an operand was expected"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Coordinate expression had an operand where an operator was expected"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Coordinate expression ended with an operator instead of an operand"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"
 msgstr "Coordinate expression has operator \"%c\" following operator \"%c\" with no operand in between"

-#: ../src/ui/theme.c:2398
-#: ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2396
+#: ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Coordinate expression had unknown variable or constant \"%s\""

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Coordinate expression parser overflowed its buffer."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Coordinate expression had a close parenthesis with no open parenthesis"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Coordinate expression had an open parenthesis with no close parenthesis"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Coordinate expression doesn't seem to have any operators or operands"

-#: ../src/ui/theme.c:2814
-#: ../src/ui/theme.c:2834
-#: ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2812
+#: ../src/ui/theme.c:2832
+#: ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Theme contained an expression that resulted in an error: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"
 msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be specified for this frame style"

-#: ../src/ui/theme.c:5011
-#: ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5009
+#: ../src/ui/theme.c:5034
 #, c-format
 msgid "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Failed to load theme \"%s\": %s\n"

-#: ../src/ui/theme.c:5220
-#: ../src/ui/theme.c:5227
-#: ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241
-#: ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5218
+#: ../src/ui/theme.c:5225
+#: ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239
+#: ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "No <%s> set for theme \"%s\""

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid "No frame style set for window type \"%s\" in theme \"%s\", add a <window type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "No frame style set for window type \"%s\" in theme \"%s\", add a <window type=\"%s\" style_set=\"whatever\"/> element"

-#: ../src/ui/theme.c:5663
-#: ../src/ui/theme.c:5725
-#: ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5650
+#: ../src/ui/theme.c:5712
+#: ../src/ui/theme.c:5775
 #, c-format
 msgid "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "User-defined constants must begin with a capital letter; \"%s\" does not"

-#: ../src/ui/theme.c:5671
-#: ../src/ui/theme.c:5733
-#: ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5658
+#: ../src/ui/theme.c:5720
+#: ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Constant \"%s\" has already been defined"
@ -1428,7 +1419,7 @@ msgstr "מלל לא מורשה בתג <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> צוין פעמיים עבור ערכת נושא זו"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Failed to find a valid file for theme %s\n"
@ -1534,100 +1525,97 @@ msgstr "מסגרת"
 msgid "Attached Modal Dialog"
 msgstr "חלון חוסם מוצמד"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "בדיקת פריסת לחצנים %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g מילישניות לציור של מסגרת חלון אחת"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Usage: metacity-theme-viewer [THEMENAME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Error loading theme: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Loaded theme \"%s\" in %g seconds\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "גופן כותרת רגילה"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "גופן כותרת קטנה"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "גופן כותרת גדולה"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "פריסת לחצנים"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "מדידת ביצועים"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "כותרת החלון מופיעה כאן"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1052
 #, c-format
 msgid "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g seconds wall clock time including X server resources (%g milliseconds per frame)\n"
 msgstr "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g seconds wall clock time including X server resources (%g milliseconds per frame)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1271
 msgid "position expression test returned TRUE but set error"
 msgstr "position expression test returned TRUE but set error"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1273
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "position expression test returned FALSE but didn't set error"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1277
 msgid "Error was expected but none given"
 msgstr "Error was expected but none given"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1279
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Error %d was expected but %d given"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1285
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Error not expected but one was returned: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x value was %d, %d was expected"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1292
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y value was %d, %d was expected"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1357
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"

-#~ msgid "Minimize window"
-#~ msgstr "מזעור חלון"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Comma-separated list of compositor plugins"

--- a/po/hi.po
+++ b/po/hi.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/id.po
+++ b/po/id.po
--- a/po/it.po
+++ b/po/it.po
--- a/po/ja.po
+++ b/po/ja.po
--- a/po/kn.po
+++ b/po/kn.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/lv.po
+++ b/po/lv.po
--- a/po/ml.po
+++ b/po/ml.po
--- a/po/mr.po
+++ b/po/mr.po
--- a/po/nb.po
+++ b/po/nb.po
@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter 3.8.x\n"
+"Project-Id-Version: mutter 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-03 14:10+0200\n"
-"PO-Revision-Date: 2013-04-03 14:11+0200\n"
+"POT-Creation-Date: 2013-01-29 19:33+0100\n"
+"PO-Revision-Date: 2013-01-29 19:34+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@ -205,18 +205,14 @@ msgstr "Visning delt til høyre"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
 msgstr "En annen compositing manager kjører skjerm %i på display «%s»."

-#: ../src/compositor/meta-background.c:1064
-msgid "background texture could not be created from file"
-msgstr "bakgrunnstekstur kunne ikke lages fra fil"
-
-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Klokkehendelse"

@ -250,17 +246,17 @@ msgstr "_Vent"
 msgid "_Force Quit"
 msgstr "_Tvungen nedstenging"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Mangler utvidelsen %s som kreves for komposittfunksjon"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Feil under åpning av X Window System skjerm «%s»\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -269,41 +265,36 @@ msgstr ""
 "Et annet program bruker allerede nøkkelen %s med modifikatorer %x som "
 "binding\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» er ikke en gyldig aksellerator\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Deaktiver tilkobling til sesjonshåndtereren"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "Erstatt kjørende vindushåndterer"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "Oppgi sesjonshåndterings-ID"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "X-skjerm som skal brukes"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "Initier sesjonen fra en lagret fil"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "Gjør X-kall synkrone"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Feil under søk i temakatalog: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -333,7 +324,7 @@ msgstr "Skriv versjonsnummer"
 msgid "Mutter plugin to use"
 msgstr "Mutter-tillegg som skal brukes"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -341,12 +332,12 @@ msgstr ""
 "Funksjonalitet for å gå rundt ødelagte programmer er deaktivert. Noen "
 "programmer vil kanskje ikke oppføre seg korrekt.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Kunne ikke tolke skriftbeskrivelsen «%s» fra GSettings-nøkkel %s\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -355,7 +346,7 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for endring av "
 "musknapp\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -364,17 +355,17 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for "
 "tastaturbinding «%s»\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -383,19 +374,19 @@ msgstr ""
 "Skjerm %d på display «%s» har allerede en vindushåndterer; prøv å bruke "
 "flagget --replace for å erstatte aktiv vindushåndterer.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Kunne ikke hente utvalg fra vinduhåndterer på skjerm %d, display «%s»\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Skjerm %d på display «%s» har allerede en vinduhåndterer\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Kunne ikke slippe skjerm %d på display «%s»\n"
@ -455,44 +446,44 @@ msgstr ""
 "Disse vinduene støtter ikke &quot;lagre aktiv konfigurasjon&quot;og vil "
 "måtte startes på nytt manuelt neste gang du logger inn."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Feil under åpning av feilsøkingslogg: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "Feil under fdopen() av loggfil %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "Åpnet loggfil %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter er kompilert uten støtte for «verbose» modus\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "Vindushåndterer: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "Feil i vindushåndterer: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "Advarsel fra vindushåndterer: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "Feil i vindushåndterer: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7287
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -508,7 +499,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:7953
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -518,22 +509,22 @@ msgstr ""
 "men setter minste størrelse %d x %d og maks størrelse %d x %d; dette virker "
 "ikke fornuftig.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Programmet satte en feil _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (på %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Ugyldig WM_TRANSIENT_FOR vindu 0x%lx oppgitt for %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR vindu 0x%lx for %s ville skapt en løkke.\n"
@ -682,9 +673,9 @@ msgstr "Maksimer vinduer automatisk hvis de er nesten like store som skjermen"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr "Nye vinduer som i utgangspunktet er samme størrelse som skjermen vil automatisk bli maksimert hvis denne slås på."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -893,53 +884,53 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "topp"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "bunn"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "venstre"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "høyre"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "rammegeometrien spesifiserer ikke «%s»-dimensjon"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "rammegeometri spesifiserer ikke dimensjon «%s» for kant «%s»"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "Aspektrate %g for knapp er ikke fornuftig"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rammegeometrien spesifiserer ikke størrelse på knapper"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienter må ha minst to farger"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@ -948,7 +939,7 @@ msgstr ""
 "Egendefinert GTK-fargespesifikasjon må ha fargenavn og reserve i parantes, f."
 "eks gtk:custom(foo,bar); kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@ -957,7 +948,7 @@ msgstr ""
 "Ugyldig tegn «%c» i parameter color_name for gtk:custom, kun A-Za-z0-9-_ er "
 "gyldig"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -966,7 +957,7 @@ msgstr ""
 "Gtk:custom-format er «gtk:custom(color_name,fallback)», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -975,7 +966,7 @@ msgstr ""
 "GTK-fargespesifikasjon må ha tilstand i klammer, f.eks. gtk:fg[NORMAL], hvor "
 "NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@ -984,17 +975,17 @@ msgstr ""
 "GTK-fargespesifikasjon må ha en avsluttende klamme etter tilstanden, f.eks. "
 "gtk:fg[NORMAL], hvor NORMAL er tilstanden; kunne ikke lese «%s»"

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Forsto ikke tilstand «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Forsto ikke fargekomponent «%s» i fargespesifikasjonen"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@ -1003,56 +994,56 @@ msgstr ""
 "Blandingsformat er «blend/bg_color/fg_color/alpha», «%s» passer ikke i "
 "formatet"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Kunne ikke lese alpha-verdi «%s» i blandet farge"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Alpha-verdi «%s» i blandet farge er ikke mellom 0.0 og 1.0"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr ""
 "Skyggeformatet er «shade/base_color/factor», «%s» passer ikke i formatet"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Kunne ikke lese skyggefaktor «%s» i skyggelagt farge"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Skyggefaktor «%s» i skyggelagt farge er negativ"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Kunne ikke lese farge «%s»"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Koordinatuttrykk inneholder tegn «%s» som ikke er tillatt"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "Koordinatuttrykk inneholder flyttall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Koordinatuttrykk inneholder heltall «%s» som ikke kunne tolkes"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@ -1061,39 +1052,39 @@ msgstr ""
 "Koordinatuttrykket inneholdt en ukjent operator ved begynnelsen av denne "
 "teksten: «%s»"

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Koordinatuttrykket var tomt eller ble ikke forstått"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Koordinatuttrykket resulterer i divisjon med null"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "Koordinatuttrykket prøver å bruke mod-operator på et flyttall"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Koordinatuttrykket har en operator «%s» hvor en operand var ventet"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Koordinatuttrykket hadde en operand hvor en operator var ventet"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Koordinatuttrykket sluttet med en operator i stedet for en operand"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@ -1102,38 +1093,38 @@ msgstr ""
 "Koordinatuttrykket har en operator «%c» etter en operator «%c» og ingen "
 "operand mellom dem."

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "Koordinatuttrykket haddeen ukjent variabel eller konstant «%s»"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Tolkeren for koordinatuttrykk oversteg buffergrensen."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Koordinatuttrykket hadde en parantes slutt uten parantes start"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Koordinatuttrykket hadde en åpen parantes uten en avsluttende parantes"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Koordinatuttrykket ser ikke ut til å ha noen operatorer eller operander"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema inneholdt et uttrykk som resulterte i en feil: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1142,25 +1133,25 @@ msgstr ""
 "<button function=«%s» state=«%s» draw_ops=«ett-eller-annet»/> må "
 "spesifiseres for denne rammestilen"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Mangler <frame state=«%s» resize=«%s» focus=«%s» stil=«ett-eller-annet»/>"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Klarte ikke å laste tema «%s»: %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "<%s> er ikke satt for tema «%s»"

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1169,14 +1160,14 @@ msgstr ""
 "Ingen rammestil satt for vindutype «%s» i tema «%s», legg til et <window "
 "type=«%s» style_set=«ett-eller-annet»/>-element"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Brukerdefinerte konstanter må begynne med stor bokstav; «%s» gjør ikke det"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Konstant «%s» er allerede definert"
@ -1557,7 +1548,7 @@ msgstr "Ingen tekst er tillatt inne i element <%s>"
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> spesifisert to ganger for dette temaet"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Fant ikke en gyldig fil for tema %s\n"
@ -1663,56 +1654,56 @@ msgstr "Kant"
 msgid "Attached Modal Dialog"
 msgstr "Festet modal dialog"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Test av knappeplassering %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g millisekunder for å tegne en vindusramme"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Bruk: metacity-theme-viewer [TEMANAVN]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Feil under lasting av tema: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Lastet tema «%s» på %g sekunder\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "Normal tittelskrift"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "Liten tittelskrift"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "Stor tittelskrift"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "Knappeplasseringer"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "Ytelsestest"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "Vindutittel skal her"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1723,39 +1714,39 @@ msgstr ""
 "%g sekunder på klokken inklusive ressurser på X-tjener (%g millisekunder per "
 "ramme)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr "test av posisjonsuttrykk returnerte TRUE, men satte en feilkode"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "test av posisjonsuttrykk returnerte FALSE, men satte ikke en feilkode"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "Feil var ventet men ingen ble gitt"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Feil %d var ventet men %d ble gitt"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Feil ikke ventet men en ble returnert: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x-verdi var %d, %d var ventet"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y-verdi var %d, %d var ventet"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d koordinatuttrykk lest på %g sekunder (%g sekunder i snitt)\n"
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
@ -5,17 +5,19 @@
 #
 # Amanpreet_Singh <amanlinux@netscape.net>, 2004.
 # Amanpreet Singh Alam <amanlinux@netscape.net>, 2004.
+# Amanpreet Singh Alam <aalam@redhat.com>, 2004.
+# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
 # A S Alam <aalam@users.sf.net>, 2006.
 # A S Alam <aalam@users.sf.net>, 2007, 2009, 2010, 2011.
 # ASB <aalam@users.sf.net>, 2007.
-# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012, 2013.
+# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-01 15:50+0000\n"
-"PO-Revision-Date: 2013-03-03 07:09+0530\n"
+"POT-Creation-Date: 2012-12-13 21:38+0000\n"
+"PO-Revision-Date: 2012-12-25 08:50+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
@ -171,8 +173,8 @@ msgid "Close window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "ਵਿੰਡੋ ਓਹਲੇ"
+msgid "Minimize window"
+msgstr "ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -216,7 +218,7 @@ msgstr "ਸੱਜੇ ਪਾਸੇ ਵੰਡ ਵੇਖੋ"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:507
+#: ../src/compositor/compositor.c:492
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -225,10 +227,6 @@ msgstr ""
 "ਇੱਕ ਹੋਰ ਕੰਪੋਜ਼ਟਿੰਗ ਮੈਨੇਜਰ %i ਸਕਰੀਨ ਉੱਤੇ ਡਿਸਪਲੇਅ \"%s\" ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਚੱਲ "
 "ਰਿਹਾ ਹੈ।"

-#: ../src/compositor/meta-background.c:1111
-msgid "background texture could not be created from file"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਟੈਕਸਚਰ ਨੂੰ ਫਾਇਲ ਤੋਂ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "ਘੰਟੀ ਈਵੈਂਟ"
@ -240,6 +238,7 @@ msgstr "ਅਣਜਾਣ ਵਿੰਡੋ ਜਾਣਕਾਰੀ ਮੰਗ: %d"

 #: ../src/core/delete.c:111
 #, c-format
+#| msgid "%s is not responding."
 msgid "“%s” is not responding."
 msgstr "\"%s\" ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।"

@ -263,17 +262,17 @@ msgstr "ਉਡੀਕੋ(_W)"
 msgid "_Force Quit"
 msgstr "ਧੱਕੇ ਨਾਲ ਬੰਦ(_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:397
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "ਕੰਪੋਜ਼ਿਸ਼ਨਿੰਗ ਲਈ %s ਐਕਸਟੈਨਸ਼ਨ ਗੁੰਮ ਹੈ"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:494
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X ਵਿੰਡੋ ਸਿਸਟਮ ਡਿਸਪਲੇਅ '%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰਥ\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:860
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -281,12 +280,6 @@ msgid ""
 msgstr ""
 "ਕੋਈ ਹੋਰ ਪਰੋਗਰਾਮ %s ਸਵਿੱਚ ਨੂੰ %x ਸੋਧਕ ਨਾਲ ਪਹਿਲਾਂ ਹੀ ਜੋੜ ਵਾਂਗ ਵਰਤ ਰਿਹਾ ਹੈ\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" ਢੁੱਕਵਾਂ ਐਕਸਲੇਟਰ ਨਹੀਂ ਹੈ\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਯੋਗ"
@ -345,7 +338,7 @@ msgstr "ਵਰਜਨ ਛਾਪੋ"
 msgid "Mutter plugin to use"
 msgstr "ਵਰਤਣ ਲਈ ਮੁੱਟਰ ਪਲੱਗਇਨ"

-#: ../src/core/prefs.c:1087
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -353,13 +346,13 @@ msgstr ""
 "ਖਰਾਬ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਜੁਗਾੜ ਬੰਦ ਕੀਤਾ ਹੈ। ਕੁਝ ਐਪਲੀਕੇਸ਼ਨ ਚੰਗੀ ਤਰਾਂ ਕੰਮ ਨਹੀਂ ਕਰ ਸਕਦੇ "
 "ਹਨ।\n"

-#: ../src/core/prefs.c:1162
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "GSettings ਸਵਿੱਚ \"%2$s\" ਤੋਂ ਫੋਂਟ ਵੇਰਵੇ \"%1$s\" ਨੂੰ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ\n"

-#: ../src/core/prefs.c:1228
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -367,7 +360,7 @@ msgid ""
 msgstr ""
 "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਵਿੱਚ ਲੱਭੀ ਹੋਈ \"%s\" ਮਾਊਸ ਬਟਨ ਸੋਧਕ ਲਈ ਯੋਗ ਕੀਮਤ ਨਹੀਂ ਹੈ\n"

-#: ../src/core/prefs.c:1780
+#: ../src/core/prefs.c:1757
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -376,17 +369,17 @@ msgstr ""
 "ਸੰਰਚਨਾ ਡਾਟਾਬੇਸ ਵਿੱਚ  ਲੱਭੀ ਹੋਈ \"%s\" ਸਵਿੱਚ-ਬਾਈਡਿੰਗ \"%s\" ਲਈ ਯੋਗ ਕੀਮਤ ਨਹੀਂ "
 "ਹੈ\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "ਵਰਕਸਪੇਸ %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:659
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "ਡਿਸਪਲੇਅ '%2$s' ਉੱਤੇ ਸਕਰੀਨ %1$d ਗਲਤ ਹੈ\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:675
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -396,18 +389,18 @@ msgstr ""
 "--replace "
 "ਮੌਜੂਦਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਵਰਤੋਂ।\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:702
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "ਡਿਸਪਲੇਅ \"%2$s\" %1$d ਸਕਰੀਨ ਉੱਤੇ ਵਿੰਡੋ ਮੈਨੇਜਰ ਚੋਣ ਉਪਲੱਬਧ ਨਹੀਂ ਹੋ ਸਕੀ\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:757
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "ਡਿਸਪਲੇਅ \"%2$s\" ਉੱਤੇ ਸਕਰੀਨ %1$d ਕੋਲ ਪਹਿਲਾਂ ਹੀ ਵਿੰਡੋ ਮੈਨੇਜਰ ਹੈ\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:942
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "ਡਿਸਪਲੇਅ \"%2$s\" ਉੱਤੇ ਸਕਰੀਨ %1$d ਰੀਲਿਜ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ\n"
@ -505,7 +498,7 @@ msgid "Window manager error: "
 msgstr "ਵਿੰਡੋ ਮੈਨੇਜਰ ਗਲਤੀ: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7240
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -521,7 +514,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7905
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -531,22 +524,22 @@ msgstr ""
 "ਆਕਾਰ %d x %d ਅਤੇ "
 "ਵੱਧ ਤੋਂ ਵੱਧ ਆਕਾਰ %d x %d ਸੈੱਟ ਕਰਦਾ ਹੈ, ਪਰ ਇਹ ਦਾ ਜ਼ਿਆਦਾ ਮਤਲਬ ਨਹੀਂ ਹੈ।\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਨੇ ਇੱਕ ਫਰਜ਼ੀ _NET_WM_PID %lu ਦਿੱਤਾ ਹੈ\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s ਉੱਤੇ)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "ਗਲਤ WM_TRANSIENT_FOR ਵਿੰਡੋ 0x%lx %s ਲਈ ਦਿੱਤਾ ਗਿਆ ਹੈ।\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR ਵਿੰਡੋ 0x%lx %s ਲੂਪ ਬਣਾਏਗਾ।\n"
@ -672,6 +665,11 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "ਪੁਆਇੰਟਰ ਦੇ ਰੁਕਣ ਤੱਕ ਫੋਕਸ ਬਦਲਣ ਨੂੰ ਰੋਕੋ"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#| msgid ""
+#| "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
+#| "the focused window will be automatically raised after a delay specified "
+#| "by the auto_raise_delay key. This is not related to clicking on a window "
+#| "to raise it, nor to entering a window during drag-and-drop."
 msgid ""
 "If set to true, and the focus mode is either \"sloppy\" or \"mouse\" then "
 "the focus will not be changed immediately when entering a window, but only "
@ -695,23 +693,10 @@ msgstr ""
 "ਨੂੰ ਇਹ ਮੁੱਲ ਦੇ ਬਰਾਬਰ ਕਰਨ ਲਈ ਵਧਾਇਆ ਜਾਵੇਗਾ।"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
-msgid "Auto maximize nearly monitor sized windows"
-msgstr "ਲਗਭਗ ਮਾਨੀਟਰ ਆਕਾਰ ਦੀਆਂ ਵਿੰਡੋਜ਼ ਆਪਣੇ-ਆਪ ਵੱਧੋ-ਵੱਧੋ"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr ""
-"ਜੇ ਚਾਲੂ ਕੀਤਾ ਤਾਂ ਨਵੀਆਂ ਵਿੰਡੋਜ਼, ਜੋ ਕਿ ਸ਼ੁਰੂ ਵਿੱਚ ਮਾਨੀਟਰ ਦੇ ਆਕਾਰ ਦੀਆਂ ਹੁੰਦੀਆਂ "
-"ਹਨ, ਆਪਣੇ-ਆਪ ਵੱਧ ਤੋਂ "
-"ਵੱਧ ਹੋ ਜਾਣਗੀਆਂ।"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਤੋਂ ਵਿੰਡੋ ਚੁਣੋ"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:20
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਰੱਦ ਕਰੋ"

@ -914,53 +899,53 @@ msgstr "ਮਾਡ੫"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:235
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "ਉੱਤੇ"

-#: ../src/ui/theme.c:237
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "ਹੇਠਾਂ"

-#: ../src/ui/theme.c:239
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "ਖੱਬਾ"

-#: ../src/ui/theme.c:241
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "ਸੱਜਾ"

-#: ../src/ui/theme.c:269
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "ਫਰੇਮ ਜੁਮੈਟਰੀ \"%s\" ਮਾਪ ਨਹੀਂ ਦਰਸਾਉਦੀ ਹੈ"

-#: ../src/ui/theme.c:288
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "ਫਰੇਮ ਜੁਮੈਟਰੀ \"%2$s\" ਹਾਸ਼ੀਏ ਲਈ \"%1$s\" ਮਾਪ ਨਹੀਂ ਦਰਸਾਉਦੀ ਹੈ"

-#: ../src/ui/theme.c:325
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "ਤਲ ਆਕਾਰ ਅਨੁਪਾਤ %g ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ"

-#: ../src/ui/theme.c:337
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "ਫਰੇਮ ਜੁਮੈਟਰੀ ਬਟਨਾਂ ਦਾ ਆਕਾਰ ਨਹੀਂ ਦਰਸਾਉਦੀ"

-#: ../src/ui/theme.c:1050
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "ਢਾਲਵੇ ਲਈ ਘੱਟ ਤੋਂ ਘੱਟ ਦੋ ਰੰਗ ਚਾਹੀਦੇ ਹਨ"

-#: ../src/ui/theme.c:1202
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@ -970,7 +955,7 @@ msgstr ""
 "gtk:custom (foo,"
 "bar);  \"%s\" ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1218
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@ -980,7 +965,7 @@ msgstr ""
 "ਸ਼ਾਮਲ ਹੋ "
 "ਸਕਦੇ ਹਨ"

-#: ../src/ui/theme.c:1232
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -990,7 +975,7 @@ msgstr ""
 "ਫਿੱਟ "
 "ਨਹੀਂ ਹੈ"

-#: ../src/ui/theme.c:1277
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -1000,7 +985,7 @@ msgstr ""
 "ਜਿੱਥੇ ਸਾਧਾਰਨ  "
 "ਇੱਕ ਹਾਲਤ ਹੈ; \"%s\" ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1291
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@ -1010,60 +995,60 @@ msgstr ""
 "gtk:fg[ਸਾਧਾਰਨ] "
 "ਜਿੱਥੇ ਸਾਧਾਰਨ ਇੱਕ ਹਾਲਤ ਹੈ; \"%s\" ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1302
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "ਰੰਗ ਹਦਾਇਤ ਵਿੱਚ \"%s\" ਹਾਲਤ ਨੂੰ ਨਹੀਂ ਸਮਝਿਆ"

-#: ../src/ui/theme.c:1315
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "ਰੰਗ ਹਦਾਇਤ ਵਿੱਚ ਰੰਗ ਸੰਖੇਪ \"%s\" ਨੂੰ ਨਹੀਂ ਸਮਝਿਆ"

-#: ../src/ui/theme.c:1344
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "ਧੁੰਦਲੀ ਬਣਤਰ \"ਧੁੰਦਲੀ/bg_ਰੰਗ/ਐਲਫਾ, \"%s\" ਬਣਤਰ ਵਿੱਚ ਠੀਕ ਨਹੀਂ ਆਂਉਦੀ"

-#: ../src/ui/theme.c:1355
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "ਧੁੰਦਲੇ ਰੰਗ ਵਿੱਚ ਐਲਫਾ ਕੀਮਤ \"%s\" ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1365
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "ਧੁੰਦਲੇ ਰੰਗ ਵਿੱਚ ਐਲਫਾ ਕੀਮਤ \"%s\" 0.0 ਅਤੇ 1.0 ਵਿਚਕਾਰ ਨਹੀਂ ਹੈ"

-#: ../src/ui/theme.c:1412
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "ਰੰਗਤ ਬਣਤਰ \"ਰੰਗਤ/ਆਧਾਰ_ਰੰਗ/ਫੈਕਟਰ\" ਹੈ, \"%s\" ਬਣਤਰ ਵਿੱਚ ਠੀਕ ਨਹੀਂ ਆਉਦੀ"

-#: ../src/ui/theme.c:1423
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "ਛਾਇਆ ਰੰਗ ਵਿੱਚ ਰੰਗਤ ਫੈਕਟਰ \"%s\" ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1433
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "ਛਾਇਆ ਰੰਗ ਵਿੱਚ ਰੰਗਤ ਫੈਕਟਰ \"%s\" ਨਾਂਹਵਾਚਕ ਹੈ"

-#: ../src/ui/theme.c:1462
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "\"%s\" ਰੰਗ ਦੀ ਪਾਰਸ ਨਹੀਂ ਕਰ ਸਕਿਆ"

-#: ../src/ui/theme.c:1779
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਅੱਖਰ '%s' ਸ਼ਾਮਿਲ ਹੈ ਜਿਸ ਦੀ ਇਜਾਜ਼ਤ ਨਹੀਂ"

-#: ../src/ui/theme.c:1806
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@ -1072,13 +1057,13 @@ msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਦਸ਼ਮਲਵ ਅੰਕ '%s' ਸ਼ਾਮਿਲ ਹੈ ਜਿਸ ਦੀ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ "
 "ਸਕਦੀ"

-#: ../src/ui/theme.c:1820
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਪੂਰਨ ਅੰਕ '%s' ਸ਼ਾਮਿਲ ਹੈ ਜਿਸ ਦੀ ਪਾਰਸ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"

-#: ../src/ui/theme.c:1941
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@ -1086,42 +1071,42 @@ msgid ""
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਇਸ ਪਾਠ \"%s\" ਦੇ ਸ਼ੁਰੂ ਵਿੱਚ ਅਣਪਛਾਤਾ ਆਪ੍ਰੇਟਰ ਸ਼ਾਮਿਲ ਹੈ"

-#: ../src/ui/theme.c:1998
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਖਾਲੀ ਸੀ ਜਾਂ ਸਮਝਿਆ ਨਹੀਂ"

-#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਦੇ ਨਤੀਜੇ ਵਜੋਂ ਜੀਰੋ ਨਾਲ ਭਾਗ ਹੈ"

-#: ../src/ui/theme.c:2163
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਦਸ਼ਮਲਵ ਅੰਕ ਉੱਤੇ ਮਾਡ (mod) ਆਪ੍ਰੇਟਰ ਵਰਤਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰਦਾ ਹੈ"

-#: ../src/ui/theme.c:2219
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਆਪ੍ਰੇਟਰ \"%s\" ਹੈ ਜਿੱਥੇ ਪ੍ਰਭਾਵੀ ਅੰਕ ਦੀ ਉਮੀਦ ਸੀ"

-#: ../src/ui/theme.c:2228
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਪ੍ਰਭਾਵੀ ਅੰਕ ਸੀ ਜਿੱਥੇ ਆਪ੍ਰੇਟਰ ਦੀ ਉਮੀਦ ਸੀ"

-#: ../src/ui/theme.c:2236
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਦੀ ਸਮਾਪਤੀ ਆਪ੍ਰੇਟਰ ਨਾਲ ਹੁੰਦੀ ਹੈ ਨਾ ਕਿ ਪ੍ਰਭਾਵੀ ਅੰਕ ਨਾਲ"

-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@ -1131,39 +1116,39 @@ msgstr ""
 "ਬਾਅਦ ਆਪ੍ਰੇਟਰ \"%c"
 "\" ਹੈ "

-#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਅਣਪਛਾਤਾ ਅਸਥਿਰ ਜਾਂ ਸਥਿਰ \"%s\" ਸੀ"

-#: ../src/ui/theme.c:2496
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਪਾਰਸਰ ਦਾ ਬਫ਼ਰ ਓਵਰਫਲੋ ਹੋ ਗਿਆ ਹੈ।"

-#: ../src/ui/theme.c:2525
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਕੋਈ ਖੁੱਲੀ ਬਰੈਕਟ ਨਾ ਹੋਣ ਕਰਕੇ ਬੰਦ ਬਰੈਕਟ(parenthesis) "
 "ਸੀ"

-#: ../src/ui/theme.c:2589
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਕੋਈ ਬੰਦ ਬਰੈਕਟ ਨਾ ਹੋਣ ਕਰਕੇ ਖੁੱਲੀ ਬਰੈਕਟ ਸੀ"

-#: ../src/ui/theme.c:2600
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "ਕਰੋਆਡੀਨੇਟ ਐਕਸ਼ਪਰੈਸ਼ਨ ਵਿੱਚ ਕੋਈ ਵੀ ਆਪ੍ਰੇਟਰ ਜਾਂ ਪ੍ਰਭਾਵੀ ਅੰਕ ਨਹੀਂ ਦਿਸਦਾ"

-#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ਥੀਮ ਵਿੱਚ ਸਮੀਕਰਨ ਹੈ, ਜਿਸ ਦਾ ਨਤੀਜਾ ਹੈ ਗਲਤੀ: %s\n"

-#: ../src/ui/theme.c:4499
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1173,25 +1158,25 @@ msgstr ""
 "ਦੇਣਾ "
 "ਲਾਜ਼ਮੀ ਹੈ"

-#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> ਗੁੰਮ ਹੈ"

-#: ../src/ui/theme.c:5083
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ਥੀਮ \"%s\" ਲੋਡ ਕਰਨ ਲਈ ਅਸਫਲ: %s\n"

-#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
-#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ਥੀਮ \"%2$s\" ਲਈ <%1$s> ਨਹੀਂ ਸੈੱਟ ਕੀਤਾ"

-#: ../src/ui/theme.c:5255
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1201,13 +1186,13 @@ msgstr ""
 "window type="
 "\"%s\" style_set=\"whatever\"/> ਐਲੀਮੈਂਟ ਸ਼ਾਮਿਲ ਕਰੋ"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "ਯੂਜ਼ਰ ਰਾਹੀਂ ਪਰਭਾਸ਼ਿਤ ਸਥਿਰ ਵੱਡੇ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣ; \"%s\" ਨਹੀਂ ਹੁੰਦੇ"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "ਸਥਿਰ \"%s\" ਪਹਿਲਾਂ ਹੀ ਪਰਭਾਸ਼ਿਤ ਕੀਤਾ ਹੈ"
@ -1693,56 +1678,56 @@ msgstr "ਬਾਰਡਰ"
 msgid "Attached Modal Dialog"
 msgstr "ਮਾਡਲ ਡਾਈਲਾਗ ਅਟੈਚ ਹੈ"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "ਬਟਨ ਲੇਆਉਟ ਟੈਸਟ %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "ਇੱਕ ਵਿੰਡੋ ਫਰੇਮ ਉਲੀਕਣ ਲਈ %g ਮਿਲੀ ਸਕਿੰਟ"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "ਵਰਤੋਂ: metacity-theme-viewer [THEMENAME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "ਥੀਮ ਲੋਡ ਕਰਨ ਵਿੱਚ ਗਲਤੀ: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "ਥੀਮ \"%s\" ਨੂੰ ਲੋਡ ਕਰਨ ਵਿੱਚ ਲੱਗਾ ਸਮਾਂ %g ਸਕਿੰਟਾਂ ਵਿੱਚ \n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "ਸਾਧਾਰਨ ਟਾਇਟਲ ਫੋਂਟ"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "ਛੋਟੇ ਟਾਇਟਲ ਫੋਂਟ"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "ਵੱਡੇ ਟਾਇਟਲ ਫੋਂਟ"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "ਬਟਨ ਲੇਆਉਟ"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "ਬੈਂਚਮਾਰਕ"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:944
 msgid "Window Title Goes Here"
 msgstr "ਵਿੰਡੋ ਟਾਇਟਲ ਇੱਥੇ ਹੋਵੇਗਾ"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1047
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1753,46 +1738,43 @@ msgstr ""
 "ਸਰਵਰ ਸਮੇਤ %g "
 "ਸਕਿੰਟ ਕੰਧ ਘੜੀ ਸਮਾਂ (%g ਮਿਲੀ ਸਕਿੰਟ ਪ੍ਰਤੀ ਫਰੇਮ)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1266
 msgid "position expression test returned TRUE but set error"
 msgstr "ਸਥਿਤੀ ਕਥਨ ਜਾਂਚ ਨੇ ਜਵਾਬ ਠੀਕ(TRUE) ਦਿੱਤਾ ਪਰ ਗਲਤੀ ਕੱਢੀ ਹੈ"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1268
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "ਸਥਿਤੀ ਕਥਨ ਜਾਂਚ ਨੇ ਜਵਾਬ ਗਲਤ(FALSE) ਦਿੱਤਾ ਪਰ ਗਲਤੀ ਨਹੀਂ ਕੱਢੀ ਹੈ"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1272
 msgid "Error was expected but none given"
 msgstr "ਗਲਤੀ ਦੀ ਉਮੀਦ ਸੀ ਪਰ ਕੋਈ ਵਿਖਾਈ ਨਹੀਂ"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1274
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "ਗਲਤੀ %d ਦੀ ਉਮੀਦ ਸੀ ਪਰ ਵਿਖਾਈ %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1280
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "ਗਲਤੀ ਦੀ ਉਮੀਦ ਨਹੀਂ ਸੀ ਪਰ ਇੱਕ ਨਿਕਲੀ: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1284
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x ਕੀਮਤ %d ਹੈ, %d ਦੀ ਉਮੀਦ ਸੀ"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1287
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y ਕੀਮਤ %d ਸੀ, %d ਦੀ ਉਮੀਦ ਸੀ"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d ਕੋਆਰਡੀਨੇਟਰ ਸਮੀਕਰਨ ਪਾਰਸ %g ਸਕਿੰਟਾਂ ਵਿੱਚ ਕੀਤੀ (ਔਸਤਨ %g ਸਕਿੰਟ)\n"

-#~ msgid "Minimize window"
-#~ msgstr "ਵਿੰਡੋ ਘੱਟੋ-ਘੱਟ"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "ਕਾਮਿਆਂ ਨਾਲ ਵੱਖ ਕੀਤੀ ਕੰਪੋਜ਼ਿਤਰ ਪਲੱਗਇਨ ਦੀ ਲਿਸਟ"

--- a/po/pl.po
+++ b/po/pl.po
@ -9,14 +9,14 @@
 # Marek Stępień <marcoos@aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
-# Piotr Drąg <piotrdrag@gmail.com>, 2010-2013.
-# Aviary.pl <gnomepl@aviary.pl>, 2007-2013.
+# Piotr Drąg <piotrdrag@gmail.com>, 2010-2012.
+# Aviary.pl <gnomepl@aviary.pl>, 2007-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-02 01:52+0100\n"
-"PO-Revision-Date: 2013-03-02 01:53+0100\n"
+"POT-Creation-Date: 2012-12-26 21:39+0100\n"
+"PO-Revision-Date: 2012-12-26 21:40+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <gnomepl@aviary.pl>\n"
 "Language: pl\n"
@ -173,8 +173,8 @@ msgid "Close window"
 msgstr "Zamknięcie okna"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Ukrycie okna"
+msgid "Minimize window"
+msgstr "Minimalizacja okna"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -187,7 +187,7 @@ msgstr "Zmiana rozmiaru okna"
 #: ../src/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr ""
-"Przełączenie obecności okna na wszystkich obszarach roboczych lub jednym"
+"Przełączenie obecności okna na wszystkich obszarach roboczych lub jednym "

 #: ../src/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
@ -220,7 +220,7 @@ msgstr "Podział widoku po prawej"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:507
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -228,10 +228,6 @@ msgid ""
 msgstr ""
 "Inny menedżer składania jest już uruchomiony na podekranie %i ekranu \"%s\"."

-#: ../src/compositor/meta-background.c:1111
-msgid "background texture could not be created from file"
-msgstr "nie można utworzyć tekstury tła z pliku"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"
@ -264,18 +260,18 @@ msgstr "_Czekaj"
 msgid "_Force Quit"
 msgstr "_Zakończ"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Brak rozszerzenia %s, wymaganego przez składanie"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr ""
 "Otwarcie połączenia z ekranem \"%s\" systemu X Window się nie powiodło\n"

-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -284,14 +280,9 @@ msgstr ""
 "Skrótu klawiszowego z klawiszem %s i modyfikatorami %x używa już inny "
 "program\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" nie jest prawidłowym skrótem\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
-msgstr "Rozłącza połączenie z menedżerem sesji"
+msgstr "Wyłącza połączenie z menedżerem sesji"

 #: ../src/core/main.c:202
 msgid "Replace the running window manager"
@ -299,7 +290,7 @@ msgstr "Zastępuje uruchomionego menedżera okien"

 #: ../src/core/main.c:208
 msgid "Specify session management ID"
-msgstr "Podaje identyfikator zarządzania sesją"
+msgstr "Określa identyfikator zarządzania sesją"

 #: ../src/core/main.c:213
 msgid "X Display to use"
@ -313,12 +304,12 @@ msgstr "Inicjuje sesję z zapisanego pliku"
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"

-#: ../src/core/main.c:533
+#: ../src/core/main.c:496
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Przejrzenie katalogu z motywami się nie powiodło: %s\n"

-#: ../src/core/main.c:549
+#: ../src/core/main.c:512
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -374,7 +365,7 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo modyfikatora przycisku myszy\n"

-#: ../src/core/prefs.c:1780
+#: ../src/core/prefs.c:1768
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@ -383,17 +374,17 @@ msgstr ""
 "Wartość \"%s\", odnaleziona w bazie danych konfiguracji nie opisuje "
 "prawidłowo skrótu klawiszowego \"%s\"\n"

-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1865
 #, c-format
 msgid "Workspace %d"
 msgstr "Obszar roboczy %d"

-#: ../src/core/screen.c:673
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu \"%s\" jest nieprawidłowy\n"

-#: ../src/core/screen.c:689
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -402,7 +393,7 @@ msgstr ""
 "Na podekranie %d ekranu \"%s\" działa już menedżer okien. Aby zastąpić "
 "działającego menedżera okien, proszę spróbować użyć opcji --replace.\n"

-#: ../src/core/screen.c:716
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@ -410,12 +401,12 @@ msgstr ""
 "Nie można uzyskać zaznaczenia menedżera okien na podekranie %d ekranu \"%s"
 "\"\n"

-#: ../src/core/screen.c:794
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Na podekranie %d ekranu \"%s\" działa już menedżer okien\n"

-#: ../src/core/screen.c:979
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Nie można zwolnić podekranu %d ekranu \"%s\"\n"
@ -515,7 +506,7 @@ msgid "Window manager error: "
 msgstr "Błąd menedżera okien: "

 #. first time through
-#: ../src/core/window.c:7539
+#: ../src/core/window.c:7277
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -531,7 +522,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8263
+#: ../src/core/window.c:7943
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -541,23 +532,23 @@ msgstr ""
 "niezmienny, lecz jednocześnie ustawia minimalny rozmiar na %d x %d, a "
 "maksymalny rozmiar na %d x %d. To nie ma żadnego sensu.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Program ustawił błędną wartość _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr ""
 "Nieprawidłowa wartość WM_TRANSIENT_FOR dla okna 0x%lx określona w %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR okna 0x%lx dla %s utworzyłoby pętlę.\n"
@ -716,11 +707,11 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""
-"Jeśli jest włączone, to nowe okna o początkowym rozmiarze zbliżonym do "
-"rozmiaru monitora zostają automatycznie maksymalizowane."
+"Jeśli jest włączone, to okna o rozmiarze zbliżonym do rozmiaru monitora "
+"zostają automatycznie maksymalizowane podczas mapowania."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -929,54 +920,54 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:235
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "góra"

-#: ../src/ui/theme.c:237
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "dół"

-#: ../src/ui/theme.c:239
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "lewa"

-#: ../src/ui/theme.c:241
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "prawa"

-#: ../src/ui/theme.c:269
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\""

-#: ../src/ui/theme.c:288
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "Rozmiar ramki nie określa wymiaru \"%s\" dla krawędzi \"%s\""

-#: ../src/ui/theme.c:325
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr ""
 "Współczynnik proporcji przycisku %g nie mieści się w rozsądnych granicach"

-#: ../src/ui/theme.c:337
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Rozmiar ramki nie określa liczby przycisków"

-#: ../src/ui/theme.c:1050
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Gradienty powinny się składać co najmniej z dwóch kolorów"

-#: ../src/ui/theme.c:1202
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@ -986,7 +977,7 @@ msgstr ""
 "kolor zastępczy w nawiasach, np. gtk:custom(foo,bar); nie można przetworzyć "
 "\"%s\""

-#: ../src/ui/theme.c:1218
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@ -995,7 +986,7 @@ msgstr ""
 "Nieprawidłowy znak \"%c\" w parametrze nazwa_koloru opcji gtk:custom, tylko "
 "znaki A-Za-z0-9-_ są prawidłowe"

-#: ../src/ui/theme.c:1232
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -1004,7 +995,7 @@ msgstr ""
 "Formatem Gtk:custom jest \"gtk:custom(nazwa_koloru,kolor_zastępczy)\", \"%s"
 "\" nie pasuje do formatu"

-#: ../src/ui/theme.c:1277
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -1014,7 +1005,7 @@ msgstr ""
 "kwadratowych, np. gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie można "
 "przetworzyć \"%s\""

-#: ../src/ui/theme.c:1291
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@ -1024,17 +1015,17 @@ msgstr ""
 "nawias kwadratowy, np. gtk:fg[NORMAL], gdzie NORMAL jest nazwą stanu; nie "
 "można przetworzyć \"%s\""

-#: ../src/ui/theme.c:1302
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Niezrozumiały stan \"%s\" w specyfikacji koloru"

-#: ../src/ui/theme.c:1315
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Niezrozumiała definicja koloru \"%s\" w specyfikacji koloru"

-#: ../src/ui/theme.c:1344
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@ -1043,19 +1034,19 @@ msgstr ""
 "Formatem przenikania jest \"blend/bg_color/fg_color/alpha\", \"%s\" nie "
 "pasuje do formatu"

-#: ../src/ui/theme.c:1355
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Nie można przetworzyć wartości alfa \"%s\" w przenikającym kolorze"

-#: ../src/ui/theme.c:1365
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "Wartość alfa \"%s\" w przenikającym kolorze nie zawiera się pomiędzy 0,0 i "
 "1,0"

-#: ../src/ui/theme.c:1412
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@ -1063,29 +1054,29 @@ msgstr ""
 "Formatem przenikania jest \"shade/base_color/factor\", \"%s\" nie pasuje do "
 "formatu"

-#: ../src/ui/theme.c:1423
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr ""
 "Nie można przetworzyć współczynnika przenikania \"%s\" w przenikającym "
 "kolorze"

-#: ../src/ui/theme.c:1433
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Współczynnik przenikania \"%s\" w przenikającym kolorze jest ujemny"

-#: ../src/ui/theme.c:1462
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "Nie można przetworzyć koloru \"%s\""

-#: ../src/ui/theme.c:1779
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Wyrażenie określające współrzędne zawiera niedozwolony znak \"%s\""

-#: ../src/ui/theme.c:1806
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@ -1094,14 +1085,14 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę zmiennoprzecinkową \"%s\", "
 "której nie można przetworzyć"

-#: ../src/ui/theme.c:1820
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr ""
 "Wyrażenie określające współrzędne zawiera liczbę całkowitą \"%s\", której "
 "nie można przetworzyć"

-#: ../src/ui/theme.c:1941
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@ -1110,18 +1101,18 @@ msgstr ""
 "Wyrażenie określające współrzędne zawiera nieznany operator na początku "
 "tekstu: \"%s\""

-#: ../src/ui/theme.c:1998
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr ""
 "Wyrażenie określające współrzędne jest puste lub nie można go rozpoznać"

-#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Wyrażenie opisujące położenie zawiera dzielenie przez zero"

-#: ../src/ui/theme.c:2163
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@ -1129,7 +1120,7 @@ msgstr ""
 "Wyrażenie opisujące położenie używa operatora dzielenia modulo z liczbą "
 "zmiennoprzecinkową"

-#: ../src/ui/theme.c:2219
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
@ -1137,19 +1128,19 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera operator \"%s\" w miejscu, w którym "
 "oczekiwano operandu"

-#: ../src/ui/theme.c:2228
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera operand w miejscu, w którym oczekiwano "
 "operatora"

-#: ../src/ui/theme.c:2236
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Wyrażenie opisujące położenie kończy się operatorem zamiast operandem"

-#: ../src/ui/theme.c:2246
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@ -1158,43 +1149,43 @@ msgstr ""
 "Wyrażenie opisujące położenie zawiera operator \"%c\" bezpośrednio po "
 "operatorze \"%c\" bez rozdzielającego ich operandu"

-#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nieznaną zmienną lub stałą \"%s\""

-#: ../src/ui/theme.c:2496
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Parser wyrażeń określających współrzędne przepełnił swój bufor."

-#: ../src/ui/theme.c:2525
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias zamykający bez odpowiadającego "
 "mu nawiasu otwierającego"

-#: ../src/ui/theme.c:2589
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "Wyrażenie opisujące położenie zawiera nawias otwierający bez odpowiadającego "
 "mu nawiasu zamykającego"

-#: ../src/ui/theme.c:2600
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr ""
 "Wyrażenie opisujące położenie nie zawiera żadnych operatorów ani operandów"

-#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Motyw zawiera wyrażenie, przy którego obliczaniu wystąpił błąd: %s\n"

-#: ../src/ui/theme.c:4499
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1203,25 +1194,25 @@ msgstr ""
 "Przy tym stylu ramki należy podać <button function=\"%s\" state=\"%s\" "
 "draw_ops=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Brak <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5083
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "Wczytanie motywu \"%s\" się nie powiodło: %s\n"

-#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
-#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "Nie określono elementu <%s> dla motywu \"%s\""

-#: ../src/ui/theme.c:5255
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1230,7 +1221,7 @@ msgstr ""
 "Przy typie okna \"%s\" w motywie \"%s\" nie ustawiono stylu ramki. Należy "
 "dodać element <window type=\"%s\" style_set=\"cokolwiek\"/>"

-#: ../src/ui/theme.c:5662 ../src/ui/theme.c:5724 ../src/ui/theme.c:5787
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@ -1238,7 +1229,7 @@ msgstr ""
 "Stałe definiowane przez użytkownika powinny rozpoczynać się wielką literą, "
 "natomiast \"%s\" nie spełnia tego warunku"

-#: ../src/ui/theme.c:5670 ../src/ui/theme.c:5732 ../src/ui/theme.c:5795
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "Stała \"%s\" została już określona"
@ -1732,57 +1723,57 @@ msgstr "Krawędź"
 msgid "Attached Modal Dialog"
 msgstr "Dołączone modalne okno dialogowe"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Test układu przycisków %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisekundy do narysowania jednej ramki okna"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Użycie: metacity-theme-viewer [NAZWA_MOTYWU]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Błąd podczas wczytywania motywu: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Wczytano motyw \"%s\" w ciągu %g sekund\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "Zwykła czcionka tytułu"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "Mała czcionka tytułu"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "Duża czcionka tytułu"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "Układy przycisków"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "Test wydajności"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "Tutaj znajduje się tytuł okna"

 # FIXME - bełkot
-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1052
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1793,39 +1784,39 @@ msgstr ""
 "%g sekund rzeczywistych, włączając w to zasoby serwera X (%g milisekund na "
 "ramkę)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1271
 msgid "position expression test returned TRUE but set error"
 msgstr "Test wyrażenia pozycji zwrócił wartość PRAWDA, lecz ustawił błąd"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1273
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "Test wyrażenia pozycji zwrócił wartość FAŁSZ, lecz nie ustawił błędu"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1277
 msgid "Error was expected but none given"
 msgstr "Oczekiwano błędu, lecz nie otrzymano żadnego"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1279
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Oczekiwano błędu %d, lecz otrzymano %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1285
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Nie oczekiwano błędu, lecz został on zwrócony: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "Wartością X było %d, oczekiwano wartości %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1292
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "Wartością Y było %d, oczekiwano wartości %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1357
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-07 14:02+0000\n"
-"PO-Revision-Date: 2013-03-07 17:16+0100\n"
+"POT-Creation-Date: 2013-01-12 04:34+0000\n"
+"PO-Revision-Date: 2013-01-13 11:53+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
@ -215,7 +215,7 @@ msgstr "Poglej razdelek na desni"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:502
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -223,10 +223,6 @@ msgid ""
 msgstr ""
 "Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza \"%s\"."

-#: ../src/compositor/meta-background.c:1180
-msgid "background texture could not be created from file"
-msgstr "teksture ozadja iz datoteke ni mogoče ustvariti"
-
 #: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "Dogodek zvonjenja"
@ -261,29 +257,24 @@ msgstr "_Počakaj"
 msgid "_Force Quit"
 msgstr "_Vsili konec"

-#: ../src/core/display.c:402
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Manjka razširitev %s, ki je ključna za sestavljanje"

-#: ../src/core/display.c:494
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"

 # G:1 K:0 O:0
-#: ../src/core/keybindings.c:929
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "Tipko %s s spremenilnikom %x uporablja že nek drug program\n"

-#: ../src/core/keybindings.c:1129
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" ni veljaven pospeševalnik\n"
-
 #: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "Onemogoči povezavo z upravljalnikom sej"
@ -308,12 +299,12 @@ msgstr "Začni sejo iz shranjene datoteke"
 msgid "Make X calls synchronous"
 msgstr "Uskladi klice X"

-#: ../src/core/main.c:533
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Ni mogoče preiskati mape tem: %s\n"

-#: ../src/core/main.c:549
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -376,17 +367,17 @@ msgstr ""
 "bližnjico \"%s\"\n"

 # G:1 K:0 O:0
-#: ../src/core/prefs.c:1879
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "Delovna površina %d"

-#: ../src/core/screen.c:674
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"

-#: ../src/core/screen.c:690
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -395,19 +386,19 @@ msgstr ""
 "Zaslon %d na prikazu \"%s\" je že upravljan z upravljalnikom oken; "
 "poskušajte uporabiti možnost --replace za zamenjavo trenutnega.\n"

-#: ../src/core/screen.c:717
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr ""
 "Ni mogoče dobiti izbire upravljalnika oken na zaslonu %d prikaza \"%s\"\n"

-#: ../src/core/screen.c:795
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "Zaslon %d na prikazu \"%s\"  je že upravljan z upravljalnikom oken\n"

-#: ../src/core/screen.c:980
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Ni mogoče opustiti zaslona %d na prikazu \"%s\"\n"
@ -509,7 +500,7 @@ msgid "Window manager error: "
 msgstr "Napaka upravljalnika oken: "

 #. first time through
-#: ../src/core/window.c:7538
+#: ../src/core/window.c:7279
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -525,7 +516,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8262
+#: ../src/core/window.c:7945
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -535,22 +526,22 @@ msgstr ""
 "pa določi najmanjšo velikost na %d x %d in največjo na %d x %d; vrednost ni "
 "smiselna.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Program je nastavil pokvarjen _NET_WM_PID %lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Neveljaven WM_TRANSIENT_FOR za okno 0x%lx naveden za %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "Predmet WM_TRANSIENT_FOR okna 0x%lx za %s lahko ustvari zanko.\n"
@ -700,11 +691,11 @@ msgstr "Samodejno razpni okna, ki so skoraj enaka velikosti zaslona"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""
-"Izbrana možnost omogoča, da bodo okna, ki so skoraj tako velika, kot je "
-"velik zaslon, med preslikavo samodejno razpeta."
+"Izbrana možnost omogoča, da bodo okna, ki so skoraj tako velika kot je velik "
+"zaslon, samodejno razpeta med preslikavo."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
@ -931,7 +922,7 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"
@ -1711,56 +1702,56 @@ msgstr "Okvir"
 msgid "Attached Modal Dialog"
 msgstr "Pripeto modalno okno"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "Preizkus razporeditve gumbov %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g milisekund za risanje ene sličice okna"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Uporaba: metacity-theme-viewer [IMETEME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "Napaka med nalaganjem teme: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Tema \"%s\" naložena v %g sekundah\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "Običajna pisava naziva"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "Majhna pisava naziva"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "Velika pisava naziva"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "Razpored gumbov"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "Primerjalni preizkus"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "Tukaj je izpisan naziv okna"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1771,41 +1762,41 @@ msgstr ""
 "sekund v času stenske ure, upoštevajoč sredstva strežnika X (%g milisekund "
 "na sličico)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr ""
 "preizkus izjave položaja je vrnil logični PRAV, vendar je določil  tudi "
 "napako"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "preizkus izjave položaja je vrnil logični NAPAK in ni določil  napake"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "Pričakovana je napaka, vendar ni odziva"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Pričakovana je napaka %d, vrnjena pa je bila %d"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Napaka ni pričakovana, vendar je vrnjen odziv: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "vrednost x je %d, pričakovana pa je %d"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "vrednost y je %d, pričakovana pa je %d"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/ta.po
+++ b/po/ta.po
@ -7,17 +7,17 @@
 # Dinesh Nadarajah <n_dinesh@yahoo.com>, 2003.
 # Jayaradha N <jaya@pune.redhat.com>, 2004.
 # Felix <ifelix@redhat.com>, 2006.
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2010, 2011, 2012, 2013.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007, 2010, 2011, 2012.
 # Dr.T.vasudevan <agnihot3@gmail.com>, 2009.
 # I. Felix <ifelix@redhat.com>, 2009, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.gnome-2-26.ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-23 14:03+0530\n"
-"PO-Revision-Date: 2013-03-23 14:11+0530\n"
+"POT-Creation-Date: 2012-12-02 17:25+0530\n"
+"PO-Revision-Date: 2012-12-02 18:58+0530\n"
 "Last-Translator: Dr.T.Vasudevan <drtvasudevan@gmail.com>\n"
-"Language-Team: American English <<gnome-tamil-translation@googlegroups.com>>\n"
+"Language-Team: American English <gnome-tamil-translation@googlegroups.com>\n"
 "Language: en_US\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -70,62 +70,58 @@ msgid "Switch applications"
 msgstr "பயன்பாடுகளுக்கிடையே மாறவும்"

 #: ../src/50-mutter-navigation.xml.in.h:11
-msgid "Switch windows"
-msgstr "சாளரத்தை மாற்றுக"
-
-#: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Switch windows of an application"
 msgstr "ஒரு பயன்பாட்டின் சாளரங்களிடையே மாறவும்"

-#: ../src/50-mutter-navigation.xml.in.h:13
+#: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Switch system controls"
 msgstr "கணினி கட்டுப்பாடுகளை மாற்றவும்"

-#: ../src/50-mutter-navigation.xml.in.h:14
+#: ../src/50-mutter-navigation.xml.in.h:13
 msgid "Switch windows directly"
 msgstr "சாளரங்களிடையே உடனடியாக நகரவும்"

-#: ../src/50-mutter-navigation.xml.in.h:15
+#: ../src/50-mutter-navigation.xml.in.h:14
 msgid "Switch windows of an app directly"
 msgstr "ஒரு பயன்பாட்டின் சாளரங்களிடையே நேரடியாக நகரவும்"

-#: ../src/50-mutter-navigation.xml.in.h:16
+#: ../src/50-mutter-navigation.xml.in.h:15
 msgid "Switch system controls directly"
 msgstr "கணினி கட்டுப்பாடுகளை நேரடியாக மாற்றவும்"

-#: ../src/50-mutter-navigation.xml.in.h:17
+#: ../src/50-mutter-navigation.xml.in.h:16
 msgid "Hide all normal windows"
 msgstr "எல்லா வழக்கமான சாளரங்களையும் மறை"

-#: ../src/50-mutter-navigation.xml.in.h:18
+#: ../src/50-mutter-navigation.xml.in.h:17
 msgid "Switch to workspace 1"
 msgstr "பணியிடம் 1க்கு மாறு"

-#: ../src/50-mutter-navigation.xml.in.h:19
+#: ../src/50-mutter-navigation.xml.in.h:18
 msgid "Switch to workspace 2"
 msgstr "பணியிடம் 2 க்கு மாறு"

-#: ../src/50-mutter-navigation.xml.in.h:20
+#: ../src/50-mutter-navigation.xml.in.h:19
 msgid "Switch to workspace 3"
 msgstr "பணியிடம் 3 க்கு மாறு"

-#: ../src/50-mutter-navigation.xml.in.h:21
+#: ../src/50-mutter-navigation.xml.in.h:20
 msgid "Switch to workspace 4"
 msgstr "பணியிடம் 4 க்கு மாறு"

-#: ../src/50-mutter-navigation.xml.in.h:22
+#: ../src/50-mutter-navigation.xml.in.h:21
 msgid "Move to workspace left"
 msgstr "வேலையிடத்தை இடப்பக்கத்திற்கு நகர்த்தவும்"

-#: ../src/50-mutter-navigation.xml.in.h:23
+#: ../src/50-mutter-navigation.xml.in.h:22
 msgid "Move to workspace right"
 msgstr "வேலையிடத்தை வலப்பக்கத்திற்கு நகர்த்தவும்"

-#: ../src/50-mutter-navigation.xml.in.h:24
+#: ../src/50-mutter-navigation.xml.in.h:23
 msgid "Move to workspace above"
 msgstr "வேலையிடத்தை மேல்பக்கத்திற்கு நகர்த்தவும்"

-#: ../src/50-mutter-navigation.xml.in.h:25
+#: ../src/50-mutter-navigation.xml.in.h:24
 msgid "Move to workspace below"
 msgstr "வேலையிடத்தை கீழே நகர்த்தவும் "

@ -174,8 +170,8 @@ msgid "Close window"
 msgstr "சாளரம் மூடவும்"

 #: ../src/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "சாளரத்தை மறை "
+msgid "Minimize window"
+msgstr "சாளரத்தை சிறிதாக்கு"

 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
@ -221,7 +217,7 @@ msgstr "வலது பக்கத்தில் பிளந்து பா

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:492
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@ -229,11 +225,7 @@ msgid ""
 msgstr ""
 " %i திரையில் காட்சி \"%s\" இல் இன்னொரு சாளர மேலாளர் இயங்கிக்கொண்டு இருக்கிறது."

-#: ../src/compositor/meta-background.c:1191
-msgid "background texture could not be created from file"
-msgstr "கோப்பிலிருந்து பின் புல இழை நய அமைப்பை உருவாக்க முடியவில்லை."
-
-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "மணி நிகழ்ச்சி"

@ -268,17 +260,17 @@ msgstr "_காத்திரு"
 msgid "_Force Quit"
 msgstr "கட்டாய வெளியேற்றம் (_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:397
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "நீட்சி  %s  காணப்படவில்லை பவின் ஆக்கத்துக்கு அது அவசியம்"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:494
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X சாளர காட்சியை திறப்பதில் தோல்வி '%s'\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:860
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@ -286,41 +278,36 @@ msgid ""
 msgstr ""
 "விசை %s ஐ மாற்றி  %x ஓடு இணைத்து வேறு நிரல் பயன்படுத்திக்கொண்டிருக்கிறது\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "\"%s\" செல்லாத முடுக்கி\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
 msgstr "அமர்வு மேலாளருடன் இருக்கும் இணைப்பை முடக்கு"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "இயங்கும் சாளர மேலாளரை  மாற்றுக"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "அமர்வு மேலாண் எண்ணை குறிப்பிடு"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "பயன்படுத்த வேண்டிய X காட்சி"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "அமர்வை சேவ்பைல் இலிருந்து துவக்கு "

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "எக்ஸ் அழைப்புகளை ஒத்திசை."

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "கருப்பொருள் அடைவை வருடுவதில் தோல்வி: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -354,7 +341,7 @@ msgstr "அச்சு பதிப்பு"
 msgid "Mutter plugin to use"
 msgstr "பயன்படுத்த க்ளட்டர் செருகிகள்"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1079
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@ -362,14 +349,14 @@ msgstr ""
 "உடைந்த பயன்பாடுகளின் செயல்பாடு தடைசெய்யப்பட்டது, சில பயன்பாடுகள் சரியாக வேலை "
 "செய்யாது.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1154
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "எழுத்துரு விளக்கம் \"%s\" ஐ ஜிசெட்டிங்க்ஸ் விசையிலிருந்து பகுக்க முடியவில்லை %"
 "s\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1220
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@ -377,24 +364,24 @@ msgid ""
 msgstr ""
 "அமைப்பு பாங்கில் உள்ள \"%s\" சுட்டி பட்டன் மாற்றியில் செல்லாத மதிப்பு\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1757
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "\"%s\" அமைப்பு தரவுத்தளத்தில் உள்ள மதிப்பு செல்லாத கீபைன்டிங்\"%s\"\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1854
 #, c-format
 msgid "Workspace %d"
 msgstr "வேலையிடம் %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "திரை %d காட்சி '%s' இல் செல்லாது\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:668
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@ -403,18 +390,18 @@ msgstr ""
 "திரை %d காட்சி \"%s\" க்கு சாளர மேலாளர் உள்ளது; --replace தேர்வை பயன்படுத்தி "
 "தற்போதைய சாளரத்தை மாற்றவும்.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:695
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "திரையில் சாளர மேலாளர் தேர்வை பெறமுடியவில்லை %d காட்சி \"%s\"\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:750
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "திரை %d யின் காட்சி \"%s\" க்கு சாளர மேலாளர் ஏற்கெனவே உள்ளது\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:935
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "திரை %d ஐ விடுவிக்க முடியவில்லை \"%s\"\n"
@ -475,44 +462,44 @@ msgstr ""
 " &quot;தற்போதைய அமைப்பை சேமி&quot; செயலுக்கு ஆதரவு இல்லை மேலும் அடுத்த முறை "
 "உள்நுழையும் போது நீங்களாக துவக்க வேண்டும்"

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "பிழைதிருத்த பட்டியலை திறப்பதில் தோல்வி: %s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "fdopen() பதிவுக்கோப்பு தோல்வி %s: %s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "பதிவுக்கோப்பு திறக்கப்பட்டது %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "வெர்போஸ் ஆதரவு இல்லாமல் மட்டர் அமைக்கப்பட்டது\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "சாளர மேலாளர்:"

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "சாளர மேலாளரில் பிழை"

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "சாளர மேலாளர் எச்சரிக்கை:"

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "சாளர மேலாளர் பிழை"

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7240
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@ -529,7 +516,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:7905
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@ -539,22 +526,22 @@ msgstr ""
 "அதிக "
 "பட்ச அளவு %d x %d; பொருள் தரும்படி இல்லை.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "பயன்பாடு பொய்யான ஒரு _NET_WM_PID %lu ஐ அமைத்தது\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s மீது)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "செல்லாத WM_TRANSIENT_FOR சாளரம் 0x%lx இதற்கு குறிக்கப்பட்டது: %s.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR சாளரம் 0x%lx %s க்கு சுழல் நிகழ்வை உருவாக்கும்.\n"
@ -706,22 +693,10 @@ msgstr ""
 "இந்த மதிப்பை அடைய மறை விளிம்பு சேர்க்கப்படும்."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
-msgid "Auto maximize nearly monitor sized windows"
-msgstr "ஏறத்தாழ திரை அளவுள்ள சாளரங்களை தானியங்கியாக அதிக பட்ச அளவாக்கு"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:18
-msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
-msgstr ""
-"செயலாக்கினால், துவக்கத்தில் ஏறத்தாழ திரை அளவுள்ள புதிய சாளரங்கள் தானியங்கியாக "
-"அதிக பட்ச அளவாக்கப்படும்"
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Select window from tab popup"
 msgstr "கீற்றுத்துள்ளலிருந்து சாளரத்தை தேர்ந்தெடுக்கவும்."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:20
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "கீற்று துள்ளுவதை இரத்து செய்"

@ -924,53 +899,53 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:234
 msgid "top"
 msgstr "மேல்"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:236
 msgid "bottom"
 msgstr "கீழ்"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:238
 msgid "left"
 msgstr "இடது"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:240
 msgid "right"
 msgstr "வலது"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:268
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "சட்ட வடிவியல் \"%s\" அளவை குறிப்பிடவில்லை"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:287
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "\"%s\" ஓரத்திற்கு வடிவியல் \"%s\" அளவை குறிப்பிடவில்லை"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:324
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "பட்டன் அளவு விகிதம் %g சரியில்ல"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:336
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "சட்ட அளவு பட்டன் அளவை குறிப்பிடவில்லை"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1049
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "க்ரேடியன்டில் இரண்டு நிறங்களாவது இருக்க வேண்டும்"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1201
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@ -980,7 +955,7 @@ msgstr ""
 "அடைப்புக்குறிகளுக்குள்ளும்  "
 "கொண்டிருக்க வேண்டும் உம்  gtk:custom(foo,bar); \"%s\" ஐ பகுக்க முடியவில்லை"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1217
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@ -990,7 +965,7 @@ msgstr ""
 "A-Za-z0-9-"
 "_ ஆகியன மட்டுமே செல்லுபடியாகும்."

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1231
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@ -999,7 +974,7 @@ msgstr ""
 "ஜிடிகே:தனிப்பயன் ஒழுங்கு \"gtk:custom(color_name,fallback)\", \"%s\" இந்த "
 "ஒழுங்குக்கு பொருந்தாது"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1276
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@ -1009,7 +984,7 @@ msgstr ""
 "நிலையை "
 "குறிக்கும் பகுக்க முடியாது \"%s\""

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1290
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@ -1019,17 +994,17 @@ msgstr ""
 "NORMAL "
 "நிலையை குறிக்கும் பகுக்க முடியாது \"%s\""

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1301
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "நிலை \"%s\" வண்ண குறிப்பில் புரிந்துகொள்ள முடியவில்லை"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1314
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "நிலை \"%s\" வண்ண குறிப்பு பொருளில் புரிந்துகொள்ள முடியவில்லை"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1343
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@ -1038,18 +1013,18 @@ msgstr ""
 "வளைந்த அமைப்பு \"blend/bg_color/fg_color/alpha\", \"%s\" இந்த வடிவமைப்பிற்கு "
 "பொருந்தாது"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1354
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "ஆம்ஃபா மதிப்பை \"%s\" வளைந்த நிறத்தில் பகுக்க முடியவில்லை"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1364
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr ""
 "ஆல்ஃபா மதுப்பு \"%s\"வளைவு நிறத்தில் 0.0 க்கும் 1.0 க்கும் இடையில் இல்லை"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1411
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@ -1057,39 +1032,39 @@ msgstr ""
 "நிழல் வடிவமைப்பு \"shade/base_color/factor\", \"%s\" இந்த அமைப்பிற்கு "
 "பொருந்தாது"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1422
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "நிழல்விகிதத்தை \"%s\" நிறத்தோடு பகுக்க முடியாது"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1432
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "நிழல் விகிதம் \"%s\" முழுக்களாக உள்ளது "

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1461
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "\"%s\" நிறத்தை பகுக்க முடியவில்லை"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1778
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "அச்சுக்கள் எழுத்தால் குறிக்கப்பட்டுள்ளது '%s' க்கு அனுமதி இல்லை"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1805
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "அச்சுக்கள் பின்ன எண்ணால் குறிக்கப்பட்டுள்ளது '%s' ஐ பகுக்க முடியாது"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1819
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "அச்சுக்கள் இயல் எண்ணால் குறிக்கப்பட்டுள்ளது '%s' ஐ பகுக்க முடியாது"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1940
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@ -1097,41 +1072,41 @@ msgid ""
 msgstr ""
 "உரையின் துவக்கத்தில் அச்சின் கூற்றில் தெரியாத செயல் இடம்பெற்றுள்ளது \"%s\""

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1997
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "அச்சு கூற்று காலியாக உள்ளது அல்லது புரியவில்லை"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "அச்சு கூற்று பூஜ்ஜியத்தால் வகுத்தல் பிழையை தந்தது"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2162
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "அச்சு கூற்று mod ஆப்பரேட்டரை பின்ன எண்ணில் பயன்படுத்த முயல்கிறது"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2218
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr ""
 "அச்சு கூற்றில் ஆப்பரேட்டர் உள்ளது \"%s\" ஆப்பரன் எதிர்பார்க்கப்படுகிறது"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2227
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr ""
 "அச்சு கூற்றில் ஆப்பரன்ட் உள்ளது ஆனால் ஆப்பரேட்டர் எதிர்பார்க்கப்படுகிறது"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2235
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "அச்சு கூற்றில் ஆப்பரன்ட்டுக்கு பதில் ஆப்பரேட்டரால் முடிந்தது"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2245
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@ -1140,39 +1115,39 @@ msgstr ""
 "அச்சு கூற்றில்  \"%c\" ஆப்பரேட்டர் உள்ளது \"%c\" ஆப்பரேட்டருக்கு ஆப்பரன்ட் "
 "இல்லை"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "அச்சு கூற்றில் செல்லாத மாற்றி மற்றும் கான்ஸ்ட்டன் உள்ளது \"%s\""

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2495
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "ஆயத்தொலைவு தெரிவிப்பு பகுப்பி அதன் இடையகத்தை நிரப்பியது"

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2524
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr ""
 "அச்சு கூற்றில் மூடிய அடைப்புக்குறி உள்ளது ஆனால் திறந்த அடைப்புகுறி இல்லை"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2588
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr ""
 "அச்சு கூற்றில் திறந்த அடைப்புக்குறி உள்ளது ஆனால் மூடிய அடைப்புகுறி இல்லை"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "அச்சுக்கூற்றில் ஆப்பரன்ட் மற்றும் ஆப்பரேட்டர் காணப்படவில்லை"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "கருப்பொருளில் ஒரு கூற்று இருந்தது. அது பிழையை ஏற்படுத்தியது : %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4498
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@ -1182,25 +1157,25 @@ msgstr ""
 "பாணிக்கு "
 "குறிப்பிடப்பட வேண்டும்"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "காணவில்லை <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5082
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "கருப்பொருளை ஏற்றுவதில் தோல்வி \"%s\": %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "இல்லை<%s> கருப்பொருளுக்காக அமைக்கப்பட்டது \"%s\""

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5254
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@ -1209,7 +1184,7 @@ msgstr ""
 "சட்ட பாணி சாளர வகை இல்லை\"%s\" கருப்பொருளில் \"%s\", <window type=\"%s\" "
 "style_set=\"whatever\"/> உறுப்பை சேர்க்கவும்"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
@ -1217,7 +1192,7 @@ msgstr ""
 "பயனீட்டாளர்-குறிப்பிட்ட கான்ஸ்டன் பெரிய எழுத்தில் துவங்க வேண்டும்; \"%s\" "
 "இல்லை"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "கான்ஸ்டன் \"%s\" ஏற்கெனவே குறிப்பிடப்பட்டது"
@ -1600,7 +1575,7 @@ msgstr "உறுப்பிற்குள் உரை அனுமதி இ
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> இந்த கருப்பொருளுக்கு இரண்டுமுறை குறிப்பிட்டுள்ளது"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "%s கருத்துக்கு செல்லுபடியாகும் கோப்பு கண்டுபிடித்தல் தோல்வியுற்றது \n"
@ -1706,56 +1681,56 @@ msgstr "ஓரம்"
 msgid "Attached Modal Dialog"
 msgstr "இணைத்த மாதிரி உரையாடல்"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "பட்டன் உருவரை சோதனை %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "%g சாளரத்தை வரைய மில்லிசெக்கண்டு"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "பயன்பாடு: metacity-theme-viewer [THEMENAME]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "கருப்பொருளை ஏற்றுவதில் பிழை: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "கருப்பொருள்  \"%s\" %g செகண்டில்\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "இயல்பான தலைப்பு எழுத்துரு"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "சிறிய தலைப்பு எழுத்துரு"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "பெரிய தலைப்பு எழுத்துரு"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "பட்டன் உருவரை"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "நிர்ணயம்"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:944
 msgid "Window Title Goes Here"
 msgstr "சாளர தலைப்பு இங்கே"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1047
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@ -1766,46 +1741,43 @@ msgstr ""
 "சேவகனின் "
 "மூலத்தில் (%g மில்லி செகண்ட் சட்டத்திற்கு)\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1266
 msgid "position expression test returned TRUE but set error"
 msgstr "நிலை கூற்று சோதனை உண்மையை தந்தது ஆனால் பிழை"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1268
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "நிலை கூற்று சோதனை பொய்யை தந்தது ஆனால் பிழை"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1272
 msgid "Error was expected but none given"
 msgstr "பிழை எதிர்பார்க்கப்பட்டடு ஆனால் தரப்படவில்லை"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1274
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "பிழை %d எதிர்பார்க்கப்பட்டது %d தரப்படவில்லை"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1280
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "பிழை எதிர்பார்க்கப்பட்டடு ஆனால் தரப்படவில்லை: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1284
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x மதிப்பு %d, %d எதிர்பார்க்கப்பட்டது"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1287
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y மதிப்பு %d, %d எதிர்பார்க்கப்பட்டது"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1352
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d அச்சு கூற்று பகுக்கப்பட்டது %g செகண்டில் (%g சராசரி செகண்ட்)\n"

-#~ msgid "Minimize window"
-#~ msgstr "சாளரத்தை சிறிதாக்கு"
-
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "பல்வினையாக்கியின் சொருகிகளின் கமாவால் பிரித்த பட்டியல்."

--- a/po/te.po
+++ b/po/te.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/ug.po
+++ b/po/ug.po
@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2013-03-31 13:47+0000\n"
-"PO-Revision-Date: 2013-04-06 18:40+0900\n"
-"Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
+"POT-Creation-Date: 2013-01-11 15:23+0000\n"
+"PO-Revision-Date: 2011-08-08 16:52+0600\n"
+"Last-Translator: Sahran <sahran.ug@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@ -63,6 +63,7 @@ msgid "Switch windows"
 msgstr "كۆزنەكلەرنى ئالماشتۇرۇش"

 #: ../src/50-mutter-navigation.xml.in.h:12
+#| msgid "Move between windows of an application immediately"
 msgid "Switch windows of an application"
 msgstr "پروگراممىنىڭ كۆزنىكىنى ئالماشتۇرۇش"

@ -75,6 +76,7 @@ msgid "Switch windows directly"
 msgstr "كۆزنەكلەرنى بىۋاسىتە ئالماشتۇرۇش"

 #: ../src/50-mutter-navigation.xml.in.h:15
+#| msgid "Move between windows of an application immediately"
 msgid "Switch windows of an app directly"
 msgstr "بىر پروگراممىنىڭ كۆزنەكلىرىنى بىۋاسىتە ئالماشتۇرۇش"

@ -83,6 +85,7 @@ msgid "Switch system controls directly"
 msgstr "سىستېما تىزگىنلىرىنى بىۋاسىتە ئالماشتۇرۇش"

 #: ../src/50-mutter-navigation.xml.in.h:17
+#| msgid "Hide all normal windows and set focus to the desktop"
 msgid "Hide all normal windows"
 msgstr "بارلىق نورمال كۆزنەكلەرنى يوشۇرۇش"

@ -103,18 +106,22 @@ msgid "Switch to workspace 4"
 msgstr "4-خىزمەت رايونىغا ئالمىشىش"

 #: ../src/50-mutter-navigation.xml.in.h:22
+#| msgid "Move to Workspace _Left"
 msgid "Move to workspace left"
 msgstr "سولدىكى خىزمەت رايونىغا يۆتكەش"

 #: ../src/50-mutter-navigation.xml.in.h:23
+#| msgid "Move to Workspace R_ight"
 msgid "Move to workspace right"
 msgstr "ئوڭدىكى خىزمەت رايونىغا يۆتكەش"

 #: ../src/50-mutter-navigation.xml.in.h:24
+#| msgid "Move to Workspace _Left"
 msgid "Move to workspace above"
 msgstr "ئۇستىدىكى خىزمەت رايونىغا يۆتكەش"

 #: ../src/50-mutter-navigation.xml.in.h:25
+#| msgid "Move to Workspace _Down"
 msgid "Move to workspace below"
 msgstr "تۆۋەندىكى خىزمەت رايونىغا يۆتكەش"

@ -123,6 +130,7 @@ msgid "System"
 msgstr "سىستېما"

 #: ../src/50-mutter-system.xml.in.h:2
+#| msgid "Show the panel's main menu"
 msgid "Show the run command prompt"
 msgstr "بۇيرۇق قۇرىنى كۆرسىتىدۇ"

@ -163,6 +171,7 @@ msgid "Close window"
 msgstr "كۆزنەك ياپ"

 #: ../src/50-mutter-windows.xml.in.h:9
+#| msgid "Resize window"
 msgid "Hide window"
 msgstr "كۆزنەكنى يوشۇرۇش"

@ -175,10 +184,12 @@ msgid "Resize window"
 msgstr "كۆزنەك چوڭلۇقىنى ئۆزگەرتىش"

 #: ../src/50-mutter-windows.xml.in.h:12
+#| msgid "Toggle whether window is on all workspaces or just one"
 msgid "Toggle window on all workspaces or one"
 msgstr "كۆزنەكنى بارلىق خىزمەت رايونى ياكى بىرىگىلا ئالماشتۇرۇش"

 #: ../src/50-mutter-windows.xml.in.h:13
+#| msgid "Raise window if it's covered by another window, otherwise lower it"
 msgid "Raise window if covered, otherwise lower it"
 msgstr "كۆزنەك توسۇلۇپ قالغان بولسا كۆتۈرسۇن، بولمىسا پەسلەتسۇن"

@ -208,18 +219,14 @@ msgstr "كۆزنەكنىڭ ئوڭ تەرىپىدە كۆرسەتسۇن"

 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
-#: ../src/compositor/compositor.c:568
+#: ../src/compositor/compositor.c:512
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
 "\"."
-msgstr "كۆرسەتكۈچ «%2$s» نىڭدىكى ئېكران %1$i دا بۆلەك باشقۇرغۇچ ئىجرا قىلىنىۋاتىدۇ."
+msgstr "كۆرسەتكۈچ \"%2$s\" نىڭدىكى ئېكران %1$d دا بۆلەك باشقۇرغۇچ ئىجرا قىلىنىۋاتىدۇ."

-#: ../src/compositor/meta-background.c:1064
-msgid "background texture could not be created from file"
-msgstr "ھۆججەتتىن تەگلىك texture نى قۇرغىلى بولمايدۇ"
-
-#: ../src/core/bell.c:322
+#: ../src/core/bell.c:320
 msgid "Bell event"
 msgstr "قوڭغۇراق ھادىسىسى"

@ -230,6 +237,7 @@ msgstr "نامەلۇم كۆزنەك ئۇچۇرى ئىلتىماسى:%d"

 #: ../src/core/delete.c:111
 #, c-format
+#| msgid "<tt>%s</tt> is not responding."
 msgid "“%s” is not responding."
 msgstr "%s نىڭدىن جاۋاب كەلمەيۋاتىدۇ."

@ -251,59 +259,53 @@ msgstr "كۈت(_W)"
 msgid "_Force Quit"
 msgstr "مەجبۇرى ئاخىرلاشتۇر(_F)"

-#: ../src/core/display.c:401
+#: ../src/core/display.c:394
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "بىرىكتۈرۈش ئۈچۈن زۆرۈر بولغان كېڭەيتىلمە %s يوق"

-#: ../src/core/display.c:493
+#: ../src/core/display.c:491
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "‏X كۆزنەك سىستېمىسى كۆرسەتكۈچى ‹%s› نى ئېچىش مەغلۇپ بولدى\n"

-#: ../src/core/keybindings.c:935
+#: ../src/core/keybindings.c:876
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
 "binding\n"
 msgstr "باشقا پروگرامما %s كۇنۇپكىسى بىلەن سۈپەتلىگۈچى كۇنۇپكا %x نىڭ بىرىكمىسىنى ئىشلىتىۋاتىدۇ\n"

-#: ../src/core/keybindings.c:1135
-#, c-format
-#| msgid "\"%s\" is not a valid value for focus attribute"
-msgid "\"%s\" is not a valid accelerator\n"
-msgstr "«%s» ئىناۋەتلىك  تېزلەتكۈچ ئەمەس\n"
-
-#: ../src/core/main.c:197
+#: ../src/core/main.c:196
 msgid "Disable connection to session manager"
-msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى ئىناۋەتسىز قىل"
+msgstr "ئەڭگىمە باشقۇرغۇچقا باغلىنىشنى چەكلە"

-#: ../src/core/main.c:203
+#: ../src/core/main.c:202
 msgid "Replace the running window manager"
 msgstr "ئىجرا قىلىنىۋاتقان كۆزنەك باشقۇرغۇچنى ئالماشتۇر"

-#: ../src/core/main.c:209
+#: ../src/core/main.c:208
 msgid "Specify session management ID"
 msgstr "ئەڭگىمە باشقۇرغۇ ID سېنى بەلگىلە"

-#: ../src/core/main.c:214
+#: ../src/core/main.c:213
 msgid "X Display to use"
 msgstr "ئىشلىتىدىغان X كۆرسەتكۈچى"

-#: ../src/core/main.c:220
+#: ../src/core/main.c:219
 msgid "Initialize session from savefile"
 msgstr "ساقلانغان ھۆججەتتىن ئەڭگىمەنى دەسلەپلەشتۈرۈش"

-#: ../src/core/main.c:226
+#: ../src/core/main.c:225
 msgid "Make X calls synchronous"
 msgstr "X نى قەدەمداش قىلىپ ئىشلەت"

-#: ../src/core/main.c:534
+#: ../src/core/main.c:494
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "ئۆرنەكلەر مۇندەرىجىسىنى ئىزدەش مەغلۇپ بولدى: %s\n"

-#: ../src/core/main.c:550
+#: ../src/core/main.c:510
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@ -330,60 +332,61 @@ msgstr "نەشرىنى باس"
 msgid "Mutter plugin to use"
 msgstr "ئىشلىتىدىغان Mutter قىستۇرمىسى"

-#: ../src/core/prefs.c:1095
+#: ../src/core/prefs.c:1087
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr "بۇزۇلغان پروگراممىلارنى تۈزىتىش-ياخشىلاش ئىناۋەتسىز قىلىنغان. بەزى پروگراممىلار نورمال ئىشلىمەسلىكى مۇمكىن.\n"

-#: ../src/core/prefs.c:1170
+#: ../src/core/prefs.c:1162
 #, c-format
+#| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "GSettings ئاچقۇچى %s نىڭ تەركىبىدىكى فونت چۈشەندۈرۈشى «%s»نى تەھلىل قىلغىنى بولمىدى\n"

-#: ../src/core/prefs.c:1236
+#: ../src/core/prefs.c:1228
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
 "modifier\n"
 msgstr "سەپلىمە سانداندىن تېپىلغان «%s» چاشقىنەك توپچىسىنىڭ سۈپەتلىگۈچىسى ئۈچۈن ئىناۋەتسىز\n"

-#: ../src/core/prefs.c:1788
+#: ../src/core/prefs.c:1780
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
 "\"%s\"\n"
 msgstr "سەپلىمە ساندىنىدىن تېپىلغان «%s»، «%s» كۇنۇپكا باغلانمىسىنىڭ ئىناۋەتلىك قىممىتى ئەمەس\n"

-#: ../src/core/prefs.c:1887
+#: ../src/core/prefs.c:1877
 #, c-format
 msgid "Workspace %d"
 msgstr "خىزمەت بوشلۇقى %d"

-#: ../src/core/screen.c:691
+#: ../src/core/screen.c:658
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "كۆرسەتكۈچ ‹%2$s› دىكى ئېكران %1$d ئىناۋەتسىز\n"

-#: ../src/core/screen.c:707
+#: ../src/core/screen.c:674
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
 "replace option to replace the current window manager.\n"
 msgstr "كۆرسەتكۈچ «%2$s» دىكى ئېكران %1$d نىڭ كۆزنەك باشقۇرغۇسى بار؛ ھازىرقى كۆزنەك باشقۇرغۇنى ئالماشتۇرۇش ئۈچۈن --replace تاللانمىسىنى ئىشلىتىپ كۆرۈپ بېقىڭ.\n"

-#: ../src/core/screen.c:734
+#: ../src/core/screen.c:701
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
 msgstr "كۆرسەتكۈچ «%2$s» نىڭدىكى ئېكران %1$d دا كۆزنەك باشقۇرغۇنىڭ تاللانمىسىنى ئالغىلى بولمىدى\n"

-#: ../src/core/screen.c:812
+#: ../src/core/screen.c:770
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr "«%2$s» دىكى %1$d ئېكراندا بىر كۆزنەك باشقۇرغۇ  بار\n"

-#: ../src/core/screen.c:998
+#: ../src/core/screen.c:955
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "«%2$s» دىكى %1$d  ئېكراننى بوشاتقىلى بولمىدى\n"
@ -441,49 +444,49 @@ msgid ""
 "be restarted manually next time you log in."
 msgstr "بۇ كۆزنەكلەردە «ھازىرقى تەڭشەكنى ساقلاش» ئىقتىدارىنى ئىشلەتكىلى بولمايدۇ. كېيىن كىرگەندە يەنە قوزغىتىڭ."

-#: ../src/core/util.c:84
+#: ../src/core/util.c:80
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "سازلاش خاتىرىسىنى ئېچىش مەغلۇپ بولدى:%s\n"

-#: ../src/core/util.c:94
+#: ../src/core/util.c:90
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "خاتىرە ھۆججىتى %s غا  fdopen()  مەشغۇلاتى قىلغىلى بولمىدى:%s\n"

-#: ../src/core/util.c:100
+#: ../src/core/util.c:96
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "ئاچقان خاتىرە ھۆججەت %s\n"

-#: ../src/core/util.c:119 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter تەرجىمە-تەھرىرلىگەندە تەپسىلات قوللاش ھالىتى قوشۇلمىغان\n"

-#: ../src/core/util.c:264
+#: ../src/core/util.c:259
 msgid "Window manager: "
 msgstr "كۆزنەك باشقۇرغۇ: "

-#: ../src/core/util.c:412
+#: ../src/core/util.c:407
 msgid "Bug in window manager: "
 msgstr "كۆزنەك باشقۇرغۇدىكى كەمتۈك: "

-#: ../src/core/util.c:443
+#: ../src/core/util.c:438
 msgid "Window manager warning: "
 msgstr "كۆزنەك باشقۇرغۇ ئاگاھلاندۇرۇشى: "

-#: ../src/core/util.c:471
+#: ../src/core/util.c:466
 msgid "Window manager error: "
 msgstr "كۆزنەك باشقۇرغۇ خاتالىقى: "

 #. first time through
-#: ../src/core/window.c:7596
+#: ../src/core/window.c:7279
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
 "window as specified in the ICCCM.\n"
-msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېلىپتۇ.\n"
+msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM_CLIENT_LEADER كۆزنەكنى ئەمەس SM_CLIENT_ID نى ئۆزى بەلگىلىۋېتىپتۇ.\n"

 #. We ignore mwm_has_resize_func because WM_NORMAL_HINTS is the
 #. * authoritative source for that info. Some apps such as mplayer or
@ -492,29 +495,29 @@ msgstr "كۆزنەك %s  بەلگىلىمە ICCCM دا بەلگىلەنگەن WM
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:8320
+#: ../src/core/window.c:7945
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
 "%d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr "كۆزنەك %s نىڭدا MWM بەلگىلەنگەن بولۇپ، بۇ كۆزنەك چوڭلۇقىنى ئۆزگەرتكىلى بولمايدۇ دېگەن مەنىدە. بىراق ئەڭ كىچىك چوڭلۇقى%d x %d، ۋە ئەڭ كىچىك چوڭلۇقى %d x %d قىلىپ بەلگىلىنىپتۇ. بۇنىڭ ھېچقانداق ئەھمىيىتى يوق.\n"

-#: ../src/core/window-props.c:318
+#: ../src/core/window-props.c:274
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "پروگرامما بىر ساختا _NET_WM_PID نى بەلگىلىدى%lu\n"

-#: ../src/core/window-props.c:434
+#: ../src/core/window-props.c:393
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ھازىر %s نىڭ ئۈستىدە)"

-#: ../src/core/window-props.c:1517
+#: ../src/core/window-props.c:1448
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "%2$s  گە بەلگىلەنگەن ئۈنۈمسىز WM_TRANSIENT_FOR كۆزنەك 0x%1$lx بولىدۇ.\n"

-#: ../src/core/window-props.c:1528
+#: ../src/core/window-props.c:1459
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "%2$s نىڭ WM_TRANSIENT_FOR كۆزنەك0x%1$lx دەۋرىيلىك قۇرۇشى مۇمكىن.\n"
@ -584,14 +587,14 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
-msgstr "خىزمەت رايونلىرى جانلىق باشقۇرۇلسۇن"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there's a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
-msgstr "خىزمەت رايونلىرى جانلىق باشقۇرۇلامدۇ ياكى خىزمەت رايونلىرىنىڭ سانى مۇقىم بولامدۇ بەلگىلەيدۇ(خىزمەت رايونلىرىنىڭ سانى org.gnome.desktop.wm.preferences دېگەن ئاچقۇچتا بەلگىلىنىدۇ)"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
@ -605,7 +608,7 @@ msgstr "خىزمەت رايونى ئالماشتۇرۇشنىڭ ھەممە ئېك

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
-msgstr "بەتكۈچ سەكرىمىسۇن"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
@ -626,13 +629,13 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
-msgstr "سۆرەشكە بولىدىغان گىرۋەكنىڭ كەڭلىكى"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
-msgstr "سۆرەشكە بولىدىغان گىرۋەكنىڭ كەڭلىكى. ئۆرنەكتە كۆرسىتىلىۋاتقان گىرۋەكنىڭ كەڭلىكى بۇنىڭدىن كىچىك بولسا، كۆرسەتكىلى بولمايدىغان گىرۋەككە مۇشۇ قىممەتكە ماس كېلىدىغان قىلىپ قىممەت قوشۇلىدۇ."
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
@ -640,17 +643,18 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
-"If enabled, new windows that are initially the size of the monitor "
-"automatically get maximized."
+"If enabled, monitor nearly monitor sized windows automatically get maximized "
+"when mapped."
 msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:19
+#| msgid "Remove Window From Top"
 msgid "Select window from tab popup"
-msgstr "سەكرەپ چىققان بەتكۈچتىن كۆزنەك تاللىسۇن"
+msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:20
 msgid "Cancel tab popup"
-msgstr "سەكرەپ چىققان بەتكۈچنى ئەمەلدىن قالدۇر"
+msgstr ""

 #: ../src/tools/mutter-message.c:123
 #, c-format
@ -851,266 +855,266 @@ msgstr "Mod5"
 #. Translators: This represents the size of a window.  The first number is
 #. * the width of the window and the second is the height.
 #.
-#: ../src/ui/resizepopup.c:136
+#: ../src/ui/resizepopup.c:113
 #, c-format
 msgid "%d x %d"
 msgstr "%d x %d"

-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:235
 msgid "top"
 msgstr "چوققا"

-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:237
 msgid "bottom"
 msgstr "ئاستى"

-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:239
 msgid "left"
 msgstr "سول"

-#: ../src/ui/theme.c:242
+#: ../src/ui/theme.c:241
 msgid "right"
 msgstr "ئوڭ"

-#: ../src/ui/theme.c:270
+#: ../src/ui/theme.c:269
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى «%s» ئۆلچەمنى ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:289
+#: ../src/ui/theme.c:288
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى گىرۋەك «%2$s» نىڭ ئۆلچىمى «%1$s» ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:326
+#: ../src/ui/theme.c:325
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "توپچىنىڭ ئېگىزلىك ۋە كەڭلىك نىسبىتى %g مۇۋاپىق ئەمەس"

-#: ../src/ui/theme.c:338
+#: ../src/ui/theme.c:337
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "كاندۇكنىڭ گېئومېتىرىيىلىك شەكلى توپچىلارنىڭ چوڭلۇقىنى ئىپادىلىمەيدۇ"

-#: ../src/ui/theme.c:1051
+#: ../src/ui/theme.c:1050
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "تەدرىجىي ئۆزگىرىشتە ئاز دېگەندە ئىككى خىل رەڭ بولۇش كېرەك"

-#: ../src/ui/theme.c:1203
+#: ../src/ui/theme.c:1202
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
 "parentheses, e.g. gtk:custom(foo,bar); could not parse \"%s\""
 msgstr "GTK رەڭ ئۆلچىمىدە ھالەتتىن كېيىن چوقۇم رەڭ ئاتى ۋە زاپاس بولۇشى لازىم، مەسىلەن، gtk:custom(foo,bar) ھالەت؛ «%s» نى تەھلىل قىلالمايدۇ"

-#: ../src/ui/theme.c:1219
+#: ../src/ui/theme.c:1218
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
 "_ are valid"
 msgstr "gtk:custom نىڭ color_name پارامېتىرىدىكى ئىناۋەتسىز ھەرپ '%c'، پەقەت A-Za-z0-9-_  نىلا ئىشلەتكىلى بولىدۇ"

-#: ../src/ui/theme.c:1233
+#: ../src/ui/theme.c:1232
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
 "fit the format"
 msgstr "Gtk:custom نىڭ پىچىمى \"gtk:custom(color_name,fallback)\" بولۇپ، «%s» پىچىمغا توغرا كەلمەيدۇ"

-#: ../src/ui/theme.c:1278
+#: ../src/ui/theme.c:1277
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
 "where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتى چوقۇم gtk:fg[NORMAL] نىڭدەك تىرناق ئىچىگە ئېلىنىشى كېرەك؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

-#: ../src/ui/theme.c:1292
+#: ../src/ui/theme.c:1291
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
 "fg[NORMAL] where NORMAL is the state; could not parse \"%s\""
 msgstr "GTK رەڭ بەلگىلىمىسىنىڭ ھالىتىنىڭ ئارقىسىغا سول تىرناق يېزىلىشى كېرەك.  مەسىلەن gtk:fg[NORMAL] نىڭدەك بۇ يەردىكى «NORMAL» ھالەتنى بىلدۈرىدۇ؛ «%s» نى تەھلىل قىلغىلى بولمىدى."

-#: ../src/ui/theme.c:1303
+#: ../src/ui/theme.c:1302
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» ھالەتنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1316
+#: ../src/ui/theme.c:1315
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "رەڭ بەلگىلىمىسىدىكى «%s» رەڭ بۆلىكىنى چۈشەنگىلى بولمىدى"

-#: ../src/ui/theme.c:1345
+#: ../src/ui/theme.c:1344
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
 "format"
 msgstr "بىرىكمە رەڭنىڭ فورماتى \"blend/bg_color/fg_color/alpha\"،  «%s» بۇ پىچىمغا ماس كەلمىدى"

-#: ../src/ui/theme.c:1356
+#: ../src/ui/theme.c:1355
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "بىرىكمە رەڭدىكى ئالفا قىممىتى «%s» نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1366
+#: ../src/ui/theme.c:1365
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "بىرىكمە رەڭنىڭ ئالفا قىممىتى «%s» نىڭ دائىرىسى  0.0 ~1.0 ئىچىدە ئەمەس"

-#: ../src/ui/theme.c:1413
+#: ../src/ui/theme.c:1412
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
 msgstr "سايە پىچىمى «shade/base_color/factor»، «%s» بۇ پىچىمغا ماسلاشمىدى"

-#: ../src/ui/theme.c:1424
+#: ../src/ui/theme.c:1423
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "سايە رەڭگىدىكى سايە فاكتور «%s» نى تەھلىل قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1434
+#: ../src/ui/theme.c:1433
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "سايە رەڭگىدىكى سايە فاكتورى «%s» مەنپىي سان"

-#: ../src/ui/theme.c:1463
+#: ../src/ui/theme.c:1462
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "رەڭ «%s» نى ئانالىز قىلغىلى بولمىدى"

-#: ../src/ui/theme.c:1780
+#: ../src/ui/theme.c:1779
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە رۇخسەت قىلىنمىغان ھەرپ '‹%s› بار"

-#: ../src/ui/theme.c:1807
+#: ../src/ui/theme.c:1806
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
 "parsed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان كەسىر سان ‹%s› بار"

-#: ../src/ui/theme.c:1821
+#: ../src/ui/theme.c:1820
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە تەھلىل قىلغىلى بولمايدىغان پۈتۈن سان ‹%s› بار"

-#: ../src/ui/theme.c:1942
+#: ../src/ui/theme.c:1941
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
 "\"%s\""
 msgstr "كوئوردېنات ئىپادىسىنىڭ بېشىدا نامەلۇم ئەمەل بار: «%s»"

-#: ../src/ui/theme.c:1999
+#: ../src/ui/theme.c:1998
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "كوئوردېنات ئىپادىسى قۇرۇق ياكى چۈشىنىكسىز"

-#: ../src/ui/theme.c:2112 ../src/ui/theme.c:2122 ../src/ui/theme.c:2156
+#: ../src/ui/theme.c:2111 ../src/ui/theme.c:2121 ../src/ui/theme.c:2155
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "كوئوردېنات ئىپادىسى 0 نى بۆلگۈچى قىلغان"

-#: ../src/ui/theme.c:2164
+#: ../src/ui/theme.c:2163
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
 msgstr "كوئوردېنات ئىپادىسى كەسىر سانغا mod ئەمىلىنى ئىشلەتمەكچى"

-#: ../src/ui/theme.c:2220
+#: ../src/ui/theme.c:2219
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە سان كېلىدىغان يەردە ئەمەل «%s» بار ئىكەن"

-#: ../src/ui/theme.c:2229
+#: ../src/ui/theme.c:2228
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل كېلىدىغان يەردە سان بار ئىكەن"

-#: ../src/ui/theme.c:2237
+#: ../src/ui/theme.c:2236
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "كوئوردېنات ئىپادىسى سان بىلەن ئاياغلاشماي ئەمەل بىلەن ئاياغلاشقان"

-#: ../src/ui/theme.c:2247
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
 "operand in between"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل «%2$c» نىڭ ئارقىسىدىن ئەمەل «%1$c» كېلىپتۇ، ئارىلىقتا سان يوق ئىكەن"

-#: ../src/ui/theme.c:2398 ../src/ui/theme.c:2443
+#: ../src/ui/theme.c:2397 ../src/ui/theme.c:2442
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە نامەلۇم ئۆزگەرگۈچى ياكى تۇراقلىق سان «%s» بار ئىكەن"

-#: ../src/ui/theme.c:2497
+#: ../src/ui/theme.c:2496
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "كوئوردېنات ئىپادىسىنى تەھلىل قىلىۋاتقاندا يىغلەك تېشىپ كەتتى."

-#: ../src/ui/theme.c:2526
+#: ../src/ui/theme.c:2525
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى يېپىلغان تىرناققا ماس كېلىدىغان ئېچىلغان تىرناق يوق"

-#: ../src/ui/theme.c:2590
+#: ../src/ui/theme.c:2589
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدىكى ئېچىلغان تىرناققا ماس كېلىدىغان يېپىلغان تىرناق يوق"

-#: ../src/ui/theme.c:2601
+#: ../src/ui/theme.c:2600
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "كوئوردېنات ئىپادىسىنىڭ تەركىبىدە ئەمەل(قوشۇش، ئېلىش...) ياكى سان يوق"

-#: ../src/ui/theme.c:2814 ../src/ui/theme.c:2834 ../src/ui/theme.c:2854
+#: ../src/ui/theme.c:2813 ../src/ui/theme.c:2833 ../src/ui/theme.c:2853
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "ئۆرنەك تەركىبىدە خاتالىق چىقىرىدىغان ئىپادە بار: %s\n"

-#: ../src/ui/theme.c:4500
+#: ../src/ui/theme.c:4499
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
 "specified for this frame style"
 msgstr "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/>بۇ كۆزنەكنىڭ ئۇسلۇبى ئۈچۈن بەلگىلىنىشى زۆرۈر"

-#: ../src/ui/theme.c:5011 ../src/ui/theme.c:5036
+#: ../src/ui/theme.c:5010 ../src/ui/theme.c:5035
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr "<frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/> يوق"

-#: ../src/ui/theme.c:5084
+#: ../src/ui/theme.c:5083
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "ئۆرنەك «%s»  نى ئوقۇش مەغلۇپ بولدى: %s\n"

-#: ../src/ui/theme.c:5220 ../src/ui/theme.c:5227 ../src/ui/theme.c:5234
-#: ../src/ui/theme.c:5241 ../src/ui/theme.c:5248
+#: ../src/ui/theme.c:5219 ../src/ui/theme.c:5226 ../src/ui/theme.c:5233
+#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "ئۆرنەك «%2$s» نىڭ <%1$s> ئى بەلگىلەنمىگەن"

-#: ../src/ui/theme.c:5256
+#: ../src/ui/theme.c:5255
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
 "type=\"%s\" style_set=\"whatever\"/> element"
 msgstr "ئۆرنەك «%2$s» نىڭ ئىچىدىكى كۆزنەك تىپى <%1$s> نىڭ كاندۇك ئۇسلۇبى بەلگىلەنمىگەن. بىر <window type=\"%3$s\" style_set=\"whatever\"/> ئېلېمېنتى قوشۇڭ"

-#: ../src/ui/theme.c:5663 ../src/ui/theme.c:5725 ../src/ui/theme.c:5788
+#: ../src/ui/theme.c:5659 ../src/ui/theme.c:5721 ../src/ui/theme.c:5784
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr "ئىشلەتكۈچى بەلگىلىگەن تۇراقلىق مىقدار چوقۇم چوڭ ھەرپ بىلەن باشلانسۇن؛ «%s» بولمايدۇ"

-#: ../src/ui/theme.c:5671 ../src/ui/theme.c:5733 ../src/ui/theme.c:5796
+#: ../src/ui/theme.c:5667 ../src/ui/theme.c:5729 ../src/ui/theme.c:5792
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "تۇراقلىق سان «%s» غا ئېنىقلىما بېرىلگەن"
@ -1470,7 +1474,7 @@ msgstr "ئېلېمېنت <%s> نىڭ ئىچىدە تېكىست بولسا بول
 msgid "<%s> specified twice for this theme"
 msgstr "بۇ ئۆرنەك ئۈچۈن <%s> ئىككى قېتىم بەلگىلەنگەن"

-#: ../src/ui/theme-parser.c:4336
+#: ../src/ui/theme-parser.c:4334
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "ئۆرنەك %s  ئۈچۈن ئىناۋەتلىك ھۆججەتنى تېپىش مەغلۇپ بولدى\n"
@ -1576,96 +1580,96 @@ msgstr "گىرۋەك"
 msgid "Attached Modal Dialog"
 msgstr "قوشۇلغان Modal سۆزلەشكۈ"

-#: ../src/ui/theme-viewer.c:737
+#: ../src/ui/theme-viewer.c:739
 #, c-format
 msgid "Button layout test %d"
 msgstr "توپچا ئورۇنلاشتۇرۇلۇشىنى سىناش %d"

-#: ../src/ui/theme-viewer.c:766
+#: ../src/ui/theme-viewer.c:768
 #, c-format
 msgid "%g milliseconds to draw one window frame"
 msgstr "بىر كۆزنەك كاندۇكىنى سىزىشقا كەتكەن ۋاقىت %g مىللىسېكۇنت"

-#: ../src/ui/theme-viewer.c:811
+#: ../src/ui/theme-viewer.c:813
 #, c-format
 msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "ئىشلىتىش ئۇسۇلى: metacity-theme-viewer [ئۆرنەك ئاتى]\n"

-#: ../src/ui/theme-viewer.c:818
+#: ../src/ui/theme-viewer.c:820
 #, c-format
 msgid "Error loading theme: %s\n"
 msgstr "ئۆرنەك ئوقۇشتا خاتالىق كۆرۈلدى: %s\n"

-#: ../src/ui/theme-viewer.c:824
+#: ../src/ui/theme-viewer.c:826
 #, c-format
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "«%s» دېگەن ئۆرنەكنى %g سېكۇنتتا ئوقۇدى\n"

-#: ../src/ui/theme-viewer.c:869
+#: ../src/ui/theme-viewer.c:871
 msgid "Normal Title Font"
 msgstr "ئادەتتىكى ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:875
+#: ../src/ui/theme-viewer.c:877
 msgid "Small Title Font"
 msgstr "تارماق ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:881
+#: ../src/ui/theme-viewer.c:883
 msgid "Large Title Font"
 msgstr "ماۋزۇ خەت نۇسخىسى"

-#: ../src/ui/theme-viewer.c:886
+#: ../src/ui/theme-viewer.c:888
 msgid "Button Layouts"
 msgstr "توپچا جايلاشتۇرۇشلىرى"

-#: ../src/ui/theme-viewer.c:891
+#: ../src/ui/theme-viewer.c:893
 msgid "Benchmark"
 msgstr "ئاساسىي كۆرسەتكۈچ"

-#: ../src/ui/theme-viewer.c:947
+#: ../src/ui/theme-viewer.c:949
 msgid "Window Title Goes Here"
 msgstr "بۇ يەردە كۆزنەك ماۋزۇسى كۆرسىتىلىدۇ"

-#: ../src/ui/theme-viewer.c:1053
+#: ../src/ui/theme-viewer.c:1055
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
 "seconds wall clock time including X server resources (%g milliseconds per "
 "frame)\n"
-msgstr "%d دانە كاندۇك خېرىدار تەرەپتە %g سېكۇنتتا سىزىلدى(بىر كاندۇك ئۈچۈن %g مىللىسېكۇنت). ئەمەلىيەتتە X مۇلازىمېتىرىنىڭ مەنبەلىرىنىمۇ قوشۇپ %g سېكۇنت(بىر كاندۇكنى %g مىللىسېكۇنت) ۋاقىتتا سىزدى.\n"
+msgstr "在 %2$g 的客户端秒(每帧 %3$g 毫秒)和包括 X 服务器资源在内的 %4$g 秒时钟时间(每帧 %5$g 毫秒)内绘制 %1$d 帧\n"

-#: ../src/ui/theme-viewer.c:1273
+#: ../src/ui/theme-viewer.c:1275
 msgid "position expression test returned TRUE but set error"
 msgstr "ئورۇن ئىپادىسىنى سىناشتا TRUE قايتتى بىراق خاتالىق كۆرۈلدى"

-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1277
 msgid "position expression test returned FALSE but didn't set error"
 msgstr "ئورۇن ئىپادىسىنى سىناشتا FALSE قايتتى بىراق خاتالىق كۆرۈلمىدى"

-#: ../src/ui/theme-viewer.c:1279
+#: ../src/ui/theme-viewer.c:1281
 msgid "Error was expected but none given"
 msgstr "خاتالىق چىقىدىغان يەردە خاتالىق چىقمىدى"

-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1283
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "خاتالىق %d چىقىدىغان يەردە %d چىقتى"

-#: ../src/ui/theme-viewer.c:1287
+#: ../src/ui/theme-viewer.c:1289
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "خاتالىق چىقمايدىغان يەردە بىر خاتالىق چىقىپ قالدى: %s"

-#: ../src/ui/theme-viewer.c:1291
+#: ../src/ui/theme-viewer.c:1293
 #, c-format
 msgid "x value was %d, %d was expected"
 msgstr "x نىڭ قىممىتى %d ئىكەن، ئەسلى %d بولسا بولاتتى"

-#: ../src/ui/theme-viewer.c:1294
+#: ../src/ui/theme-viewer.c:1296
 #, c-format
 msgid "y value was %d, %d was expected"
 msgstr "y نىڭ قىممىتى %d ئىكەن، ئەسلى %d بولسا بولاتتى"

-#: ../src/ui/theme-viewer.c:1359
+#: ../src/ui/theme-viewer.c:1361
 #, c-format
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d كوئوردېنات ئىپادىسى %g سېكۇنتتا تەھلىل قىلىندى(%g ئوتتۇرىچە سېكۇنت)\n"
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -8,7 +8,6 @@ SUBDIRS=wm-tester tools compositor/plugins
 INCLUDES=								\
 	-DCLUTTER_ENABLE_EXPERIMENTAL_API				\
 	-DCOGL_ENABLE_EXPERIMENTAL_API					\
-	-DCOGL_ENABLE_EXPERIMENTAL_2_0_API                              \
 	$(MUTTER_CFLAGS)						\
 	-I$(srcdir)							\
 	-I$(srcdir)/core						\
@ -36,24 +35,17 @@ mutter_built_sources = \
 libmutter_la_SOURCES =				\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
-	core/barrier.c				\
-	meta/barrier.h				\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
 	core/boxes-private.h			\
 	meta/boxes.h				\
-	compositor/clutter-utils.c		\
-	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
 	compositor/cogl-utils.h			\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
-	compositor/meta-background.c		\
 	compositor/meta-background-actor.c	\
 	compositor/meta-background-actor-private.h	\
-	compositor/meta-background-group.c	\
-	compositor/meta-background-group-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@ -75,9 +67,7 @@ libmutter_la_SOURCES =				\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
 	meta/compositor.h			\
-	meta/meta-background.h			\
 	meta/meta-background-actor.h		\
-	meta/meta-background-group.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
@ -96,6 +86,8 @@ libmutter_la_SOURCES =				\
 	core/edge-resistance.h			\
 	core/errors.c				\
 	meta/errors.h				\
+	core/eventqueue.c			\
+	core/eventqueue.h			\
 	core/frame.c				\
 	core/frame.h				\
 	ui/gradient.c				\
@ -167,7 +159,6 @@ libmutter_la_LIBADD  = $(MUTTER_LIBS)
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
-	meta/barrier.h				\
 	meta/boxes.h				\
 	meta/common.h				\
 	meta/compositor-mutter.h		\
@ -179,8 +170,6 @@ libmutterinclude_base_headers =		\
 	meta/keybindings.h			\
 	meta/main.h				\
 	meta/meta-background-actor.h		\
-	meta/meta-background-group.h		\
-	meta/meta-background.h			\
 	meta/meta-plugin.h			\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
--- a/src/compositor/clutter-utils.c
+++ b/src/compositor/clutter-utils.c
@ -1,120 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Utilities for use with Cogl
- *
- * Copyright 2010 Red Hat, Inc.
- * Copyright 2010 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#include "clutter-utils.h"
-#include <math.h>
-
-/* This file uses pixel-aligned region computation to determine what
- * can be clipped out. This only really works if everything is aligned
- * to the pixel grid - not scaled or rotated and at integer offsets.
- *
- * (This could be relaxed - if we turned off filtering for unscaled
- * windows then windows would be, by definition aligned to the pixel
- * grid. And for rectangular windows without a shape, the outline that
- * we draw for an unrotated window is always a rectangle because we
- * don't use antialasing for the window boundary - with or without
- * filtering, with or without a scale. But figuring out exactly
- * what pixels will be drawn by the graphics system in these cases
- * gets tricky, so we just go for the easiest part - no scale,
- * and at integer offsets.)
- *
- * The way we check for pixel-aligned is by looking at the
- * transformation into screen space of the allocation box of an actor
- * and and checking if the corners are "close enough" to integral
- * pixel values.
- */
-
-/* The definition of "close enough" to integral pixel values is
- * equality when we convert to 24.8 fixed-point.
- */
-static inline int
-round_to_fixed (float x)
-{
-  return roundf (x * 256);
-}
-
-/* This helper function checks if (according to our fixed point precision)
- * the vertices @verts form a box of width @widthf and height @heightf
- * located at integral coordinates. These coordinates are returned
- * in @x_origin and @y_origin.
- */
-gboolean
-meta_actor_vertices_are_untransformed (ClutterVertex *verts,
-                                       float          widthf,
-                                       float          heightf,
-                                       int           *x_origin,
-                                       int           *y_origin)
-{
-  int width, height;
-  int v0x, v0y, v1x, v1y, v2x, v2y, v3x, v3y;
-  int x, y;
-
-  width = round_to_fixed (widthf); height = round_to_fixed (heightf);
-
-  v0x = round_to_fixed (verts[0].x); v0y = round_to_fixed (verts[0].y);
-  v1x = round_to_fixed (verts[1].x); v1y = round_to_fixed (verts[1].y);
-  v2x = round_to_fixed (verts[2].x); v2y = round_to_fixed (verts[2].y);
-  v3x = round_to_fixed (verts[3].x); v3y = round_to_fixed (verts[3].y);
-
-  /* Using shifting for converting fixed => int, gets things right for
-   * negative values. / 256. wouldn't do the same
-   */
-  x = v0x >> 8;
-  y = v0y >> 8;
-
-  /* At integral coordinates? */
-  if (x * 256 != v0x || y * 256 != v0y)
-    return FALSE;
-
-  /* Not scaled? */
-  if (v1x - v0x != width || v2y - v0y != height)
-    return FALSE;
-
-  /* Not rotated/skewed? */
-  if (v0x != v2x || v0y != v1y ||
-      v3x != v1x || v3y != v2y)
-    return FALSE;
-
-  *x_origin = x;
-  *y_origin = y;
-
-  return TRUE;
-}
-
-/* Check if an actor is "untransformed" - which actually means transformed by
- * at most a integer-translation. The integer translation, if any, is returned.
- */
-gboolean
-meta_actor_is_untransformed (ClutterActor *actor,
-                             int          *x_origin,
-                             int          *y_origin)
-{
-  gfloat widthf, heightf;
-  ClutterVertex verts[4];
-
-  clutter_actor_get_size (actor, &widthf, &heightf);
-  clutter_actor_get_abs_allocation_vertices (actor, verts);
-
-  return meta_actor_vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
-}
-
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@ -21,15 +21,14 @@
 * 02111-1307, USA.
 */

-#include <clutter/clutter.h>
 #include "cogl-utils.h"

 /**
 * meta_create_color_texture_4ub:
- * @red: red component
- * @green: green component
- * @blue: blue component
- * @alpha: alpha component
+ * @red:
+ * @green:
+ * @blue:
+ * @alpha:
 * @flags: Optional flags for the texture, or %COGL_TEXTURE_NONE;
 *   %COGL_TEXTURE_NO_SLICING is useful if the texture will be
 *   repeated to create a constant color fill, since hardware
@ -40,7 +39,7 @@
 *
 * Return value: (transfer full): a newly created Cogl texture
 */
-CoglTexture *
+CoglHandle
 meta_create_color_texture_4ub (guint8           red,
                               guint8           green,
                               guint8           blue,
@ -69,45 +68,43 @@ meta_create_color_texture_4ub (guint8           red,
 /* Based on gnome-shell/src/st/st-private.c:_st_create_texture_material.c */

 /**
- * meta_create_texture_pipeline:
+ * meta_create_texture_material:
 * @src_texture: (allow-none): texture to use initially for the layer
 *
- * Creates a pipeline with a single layer. Using a common template
+ * Creates a material with a single layer. Using a common template
 * allows sharing a shader for different uses in Mutter. To share the same
- * shader with all other pipelines that are just texture plus opacity
+ * shader with all other materials that are just texture plus opacity
 * would require Cogl fixes.
 * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
 *
- * Return value: (transfer full): a newly created #CoglPipeline
+ * Return value: (transfer full): a newly created Cogl material
 */
-CoglPipeline *
-meta_create_texture_pipeline (CoglTexture *src_texture)
+CoglHandle
+meta_create_texture_material (CoglHandle src_texture)
 {
-  static CoglPipeline *texture_pipeline_template = NULL;
-  CoglPipeline *pipeline;
+  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
+  CoglHandle material;

-  /* We use a pipeline that has a dummy texture as a base for all
-     texture pipelines. The idea is that only the Cogl texture object
+  /* We use a material that has a dummy texture as a base for all
+     texture materials. The idea is that only the Cogl texture object
     would be different in the children so it is likely that Cogl will
     be able to share GL programs between all the textures. */
-  if (G_UNLIKELY (texture_pipeline_template == NULL))
+  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
    {
-      CoglTexture *dummy_texture;
-      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      CoglHandle dummy_texture;

      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
                                                     COGL_TEXTURE_NONE);

-
-      texture_pipeline_template = cogl_pipeline_new (ctx);
-      cogl_pipeline_set_layer_texture (texture_pipeline_template, 0, dummy_texture);
-      cogl_object_unref (dummy_texture);
+      texture_material_template = cogl_material_new ();
+      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
+      cogl_handle_unref (dummy_texture);
    }

-  pipeline = cogl_pipeline_copy (texture_pipeline_template);
+  material = cogl_material_copy (texture_material_template);

-  if (src_texture != NULL)
-    cogl_pipeline_set_layer_texture (pipeline, 0, src_texture);
+  if (src_texture != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (material, 0, src_texture);

-  return pipeline;
+  return material;
 }
--- a/src/compositor/cogl-utils.h
+++ b/src/compositor/cogl-utils.h
@ -25,11 +25,11 @@

 #include <cogl/cogl.h>

-CoglTexture * meta_create_color_texture_4ub (guint8           red,
-                                             guint8           green,
-                                             guint8           blue,
-                                             guint8           alpha,
-                                             CoglTextureFlags flags);
-CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture);
+CoglHandle meta_create_color_texture_4ub (guint8           red,
+                                          guint8           green,
+                                          guint8           blue,
+                                          guint8           alpha,
+                                          CoglTextureFlags flags);
+CoglHandle meta_create_texture_material  (CoglHandle src_texture);

 #endif /* __META_COGL_UTILS_H__ */
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@ -38,8 +38,9 @@ struct _MetaCompScreen
 {
  MetaScreen            *screen;

-  ClutterActor          *stage, *window_group, *top_window_group, *overlay_group;
+  ClutterActor          *stage, *window_group, *overlay_group;
  ClutterActor          *background_actor;
+  ClutterActor		*hidden_group;
  GList                 *windows;
  GHashTable            *windows_by_xid;
  Window                 output;
@ -59,7 +60,6 @@ struct _MetaCompScreen
  MetaPluginManager *plugin_mgr;
 };

-/* Wait 2ms after vblank before starting to draw next frame */
 #define META_SYNC_DELAY 2

 void meta_switch_workspace_completed (MetaScreen    *screen);
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@ -1,76 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * SECTION:compositor
- * @Title: MetaCompositor
- * @Short_Description: Compositor API
- *
- * At a high-level, a window is not-visible or visible. When a
- * window is added (with meta_compositor_add_window()) it is not visible.
- * meta_compositor_show_window() indicates a transition from not-visible to
- * visible. Some of the reasons for this:
- *
- * - Window newly created
- * - Window is unminimized
- * - Window is moved to the current desktop
- * - Window was made sticky
- *
- * meta_compositor_hide_window() indicates that the window has transitioned from
- * visible to not-visible. Some reasons include:
- *
- * - Window was destroyed
- * - Window is minimized
- * - Window is moved to a different desktop
- * - Window no longer sticky.
- *
- * Note that combinations are possible - a window might have first
- * been minimized and then moved to a different desktop. The 'effect' parameter
- * to meta_compositor_show_window() and meta_compositor_hide_window() is a hint
- * as to the appropriate effect to show the user and should not
- * be considered to be indicative of a state change.
- *
- * When the active workspace is changed, meta_compositor_switch_workspace() is
- * called first, then meta_compositor_show_window() and
- * meta_compositor_hide_window() are called individually for each window
- * affected, with an effect of META_COMP_EFFECT_NONE.
- * If hiding windows will affect the switch workspace animation, the
- * compositor needs to delay hiding the windows until the switch
- * workspace animation completes.
- *
- * meta_compositor_maximize_window() and meta_compositor_unmaximize_window()
- * are transitions within the visible state. The window is resized __before__
- * the call, so it may be necessary to readjust the display based on the
- * old_rect to start the animation.
- *
- * meta_compositor_window_mapped() and meta_compositor_window_unmapped() are
- * notifications when the toplevel window (frame or client window) is mapped or
- * unmapped. That is, when the result of meta_window_toplevel_is_mapped()
- * changes. The main use of this is to drop resources when a window is unmapped.
- * A window will always be mapped before meta_compositor_show_window()
- * is called and will not be unmapped until after meta_compositor_hide_window()
- * is called. If the live_hidden_windows preference is set, windows will never
- * be unmapped.
- *
- * # Containers #
- *
- * There's three containers in the stage that can be used to place actors, here
- * are listed in the order in which they are painted:
- *
- * - window group, accessible with meta_get_window_group_for_screen()
- * - top window group, accessible with meta_get_top_window_group_for_screen()
- * - overlay group, accessible with meta_get_overlay_group_for_screen()
- *
- * Mutter will place actors representing windows in the window group, except for
- * override-redirect windows (ie. popups and menus) which will be placed in the
- * top window group. Mutter won't put any actors in the overlay group, but it's
- * intended for compositors to place there panel, dashes, status bars, etc.
- */
-
 #include <config.h>

 #include <clutter/x11/clutter-x11.h>

-#include "core.h"
 #include <meta/screen.h>
 #include <meta/errors.h>
 #include <meta/window.h>
@ -79,11 +12,10 @@
 #include "xprops.h"
 #include <meta/prefs.h>
 #include <meta/main.h>
-#include <meta/meta-background-actor.h>
-#include <meta/meta-background-group.h>
 #include <meta/meta-shadow-factory.h>
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
+#include "meta-background-actor-private.h"
 #include "window-private.h" /* to check window->hidden */
 #include "display-private.h" /* for meta_display_lookup_x_window() */
 #include <X11/extensions/shape.h>
@ -184,6 +116,21 @@ process_property_notify (MetaCompositor	*compositor,
 {
  MetaWindowActor *window_actor;

+  if (event->atom == compositor->atom_x_root_pixmap)
+    {
+      GSList *l;
+
+      for (l = meta_display_get_screens (compositor->display); l; l = l->next)
+        {
+	  MetaScreen  *screen = l->data;
+          if (event->window == meta_screen_get_xroot (screen))
+            {
+              meta_background_actor_update (screen);
+              return;
+            }
+        }
+    }
+
  if (window == NULL)
    return;

@ -216,8 +163,6 @@ get_output_window (MetaScreen *screen)
  xroot = meta_screen_get_xroot (screen);
  output = XCompositeGetOverlayWindow (xdisplay, xroot);

-  meta_core_add_old_event_mask (xdisplay, output, &mask);
-
  XISetMask (mask.mask, XI_KeyPress);
  XISetMask (mask.mask, XI_KeyRelease);
  XISetMask (mask.mask, XI_ButtonPress);
@ -290,20 +235,24 @@ meta_get_window_group_for_screen (MetaScreen *screen)
 }

 /**
- * meta_get_top_window_group_for_screen:
+ * meta_get_background_actor_for_screen:
 * @screen: a #MetaScreen
 *
- * Returns: (transfer none): The top window group corresponding to @screen
+ * Gets the actor that draws the root window background under the windows.
+ * The root window background automatically tracks the image or color set
+ * by the environment.
+ *
+ * Returns: (transfer none): The background actor corresponding to @screen
 */
 ClutterActor *
-meta_get_top_window_group_for_screen (MetaScreen *screen)
+meta_get_background_actor_for_screen (MetaScreen *screen)
 {
  MetaCompScreen *info = meta_screen_get_compositor_data (screen);

  if (!info)
    return NULL;

-  return info->top_window_group;
+  return info->background_actor;
 }

 /**
@ -518,28 +467,33 @@ meta_check_end_modal (MetaScreen *screen)
    }
 }

-static gboolean
-after_stage_paint (gpointer data)
+static void
+after_stage_paint (ClutterActor   *stage,
+                   MetaCompScreen *info)
 {
-  MetaCompScreen *info = (MetaCompScreen*) data;
  GList *l;

  for (l = info->windows; l; l = l->next)
    meta_window_actor_post_paint (l->data);
-
-  return TRUE;
 }

-static void
-redirect_windows (MetaCompositor *compositor,
-                  MetaScreen     *screen)
+void
+meta_compositor_manage_screen (MetaCompositor *compositor,
+                               MetaScreen     *screen)
 {
-  MetaDisplay *display       = meta_screen_get_display (screen);
-  Display     *xdisplay      = meta_display_get_xdisplay (display);
-  Window       xroot         = meta_screen_get_xroot (screen);
-  int          screen_number = meta_screen_get_screen_number (screen);
-  guint        n_retries;
-  guint        max_retries;
+  MetaCompScreen *info;
+  MetaDisplay    *display       = meta_screen_get_display (screen);
+  Display        *xdisplay      = meta_display_get_xdisplay (display);
+  int             screen_number = meta_screen_get_screen_number (screen);
+  Window          xroot         = meta_screen_get_xroot (screen);
+  Window          xwin;
+  gint            width, height;
+  guint           n_retries;
+  guint           max_retries;
+
+  /* Check if the screen is already managed */
+  if (meta_screen_get_compositor_data (screen))
+    return;

  if (meta_get_replace_current_wm ())
    max_retries = 5;
@ -572,21 +526,6 @@ redirect_windows (MetaCompositor *compositor,
      n_retries++;
      g_usleep (G_USEC_PER_SEC);
    }
-}
-
-void
-meta_compositor_manage_screen (MetaCompositor *compositor,
-                               MetaScreen     *screen)
-{
-  MetaCompScreen *info;
-  MetaDisplay    *display       = meta_screen_get_display (screen);
-  Display        *xdisplay      = meta_display_get_xdisplay (display);
-  Window          xwin;
-  gint            width, height;
-
-  /* Check if the screen is already managed */
-  if (meta_screen_get_compositor_data (screen))
-    return;

  info = g_new0 (MetaCompScreen, 1);
  /*
@ -607,11 +546,10 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  meta_screen_set_cm_selection (screen);

  info->stage = clutter_stage_new ();
+  g_signal_connect_after (info->stage, "paint",
+                          G_CALLBACK (after_stage_paint), info);

-  clutter_threads_add_repaint_func_full (CLUTTER_REPAINT_FLAGS_POST_PAINT,
-                                         after_stage_paint,
-                                         info, NULL);
-
+  /* Wait 6-ms after vblank before starting to draw next frame */
  clutter_stage_set_sync_delay (CLUTTER_STAGE (info->stage), META_SYNC_DELAY);

  meta_screen_get_size (screen, &width, &height);
@ -627,8 +565,6 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
    XWindowAttributes attr;

-    meta_core_add_old_event_mask (xdisplay, xwin, &mask);
-
    XISetMask (mask.mask, XI_KeyPress);
    XISetMask (mask.mask, XI_KeyRelease);
    XISetMask (mask.mask, XI_ButtonPress);
@ -648,12 +584,21 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
  }

  info->window_group = meta_window_group_new (screen);
-  info->top_window_group = meta_window_group_new (screen);
-  info->overlay_group = clutter_actor_new ();
+  info->background_actor = meta_background_actor_new_for_screen (screen);
+  info->overlay_group = clutter_group_new ();
+  info->hidden_group = clutter_group_new ();

-  clutter_actor_add_child (info->stage, info->window_group);
-  clutter_actor_add_child (info->stage, info->top_window_group);
-  clutter_actor_add_child (info->stage, info->overlay_group);
+  clutter_container_add (CLUTTER_CONTAINER (info->window_group),
+                         info->background_actor,
+                         NULL);
+
+  clutter_container_add (CLUTTER_CONTAINER (info->stage),
+                         info->window_group,
+                         info->overlay_group,
+			 info->hidden_group,
+                         NULL);
+
+  clutter_actor_hide (info->hidden_group);

  info->plugin_mgr = meta_plugin_manager_new (screen);

@ -685,13 +630,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
    }

  clutter_actor_show (info->overlay_group);
-
-  /* Map overlay window before redirecting windows offscreen so we catch their
-   * contents until we show the stage.
-   */
-  XMapWindow (xdisplay, info->output);
-
-  redirect_windows (compositor, screen);
+  clutter_actor_show (info->stage);
 }

 void
@ -806,21 +745,6 @@ meta_compositor_set_updates_frozen (MetaCompositor *compositor,
  meta_window_actor_set_updates_frozen (window_actor, updates_frozen);
 }

-void
-meta_compositor_queue_frame_drawn (MetaCompositor *compositor,
-                                   MetaWindow     *window,
-                                   gboolean        no_delay_frame)
-{
-  MetaWindowActor *window_actor;
-
-  DEBUG_TRACE ("meta_compositor_queue_frame_drawn\n");
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (!window_actor)
-    return;
-
-  meta_window_actor_queue_frame_drawn (window_actor, no_delay_frame);
-}
-
 static gboolean
 is_grabbed_event (MetaDisplay *display,
                  XEvent      *event)
@ -850,63 +774,11 @@ meta_compositor_window_shape_changed (MetaCompositor *compositor,
 {
  MetaWindowActor *window_actor;
  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  if (!window_actor)
-    return;
-
  meta_window_actor_update_shape (window_actor);
 }

-/* Clutter makes the assumption that there is only one X window
- * per stage, which is a valid assumption to make for a generic
- * application toolkit. As such, it will ignore any events sent
- * to the a stage that isn't its X window.
- *
- * When a user clicks on what she thinks is the wallpaper, she
- * is actually clicking on the guard window, which is an entirely
- * separate top-level override-redirect window in the hierarchy.
- * We want to recieve events on this guard window so that users
- * can right-click on the background actor. We do this by telling
- * Clutter a little white lie, by transforming clicks on the guard
- * window to become clicks on the stage window, allowing Clutter
- * to process the event normally.
- */
-static void
-maybe_spoof_guard_window_event_as_stage_event (MetaCompScreen *info,
-                                               XEvent         *event)
-{
-  MetaDisplay *display = meta_screen_get_display (info->screen);
-
-  if (event->type == GenericEvent &&
-      event->xcookie.extension == display->xinput_opcode)
-    {
-      XIEvent *input_event = (XIEvent *) event->xcookie.data;
-
-      /* Only care about pointer events for now. */
-      switch (input_event->evtype)
-        {
-        case XI_Motion:
-        case XI_ButtonPress:
-        case XI_ButtonRelease:
-          {
-            XIDeviceEvent *device_event = ((XIDeviceEvent *) input_event);
-            if (device_event->event == info->screen->guard_window)
-              {
-                Window xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
-                device_event->event = xwin;
-              }
-          }
-          break;
-        default:
-          break;
-        }
-    }
-}
-
 /**
 * meta_compositor_process_event: (skip)
- * @compositor: 
- * @event: 
- * @window: 
 *
 */
 gboolean
@ -953,8 +825,6 @@ meta_compositor_process_event (MetaCompositor *compositor,

 	  info = meta_screen_get_compositor_data (screen);

-          maybe_spoof_guard_window_event_as_stage_event (info, event);
-
 	  if (meta_plugin_manager_xevent_filter (info->plugin_mgr, event))
 	    {
 	      DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
@ -1110,11 +980,8 @@ static void
 sync_actor_stacking (MetaCompScreen *info)
 {
  GList *children;
-  GList *expected_window_node;
  GList *tmp;
  GList *old;
-  GList *backgrounds;
-  gboolean has_windows;
  gboolean reordered;

  /* NB: The first entries in the lists are stacked the lowest */
@ -1123,74 +990,60 @@ sync_actor_stacking (MetaCompScreen *info)
   * little effort to make sure we actually need to restack before
   * we go ahead and do it */

-  children = clutter_actor_get_children (info->window_group);
+  children = clutter_container_get_children (CLUTTER_CONTAINER (info->window_group));
  reordered = FALSE;

+  old = children;
+
  /* We allow for actors in the window group other than the actors we
   * know about, but it's up to a plugin to try and keep them stacked correctly
   * (we really need extra API to make that reliable.)
   */

-  /* First we collect a list of all backgrounds, and check if they're at the
-   * bottom. Then we check if the window actors are in the correct sequence */
-  backgrounds = NULL;
-  expected_window_node = info->windows;
-  for (old = children; old != NULL; old = old->next)
+  /* Of the actors we know, the bottom actor should be the background actor */
+
+  while (old && old->data != info->background_actor && !META_IS_WINDOW_ACTOR (old->data))
+    old = old->next;
+  if (old == NULL || old->data != info->background_actor)
    {
-      ClutterActor *actor = old->data;
-
-      if (META_IS_BACKGROUND_GROUP (actor) ||
-          META_IS_BACKGROUND_ACTOR (actor))
-        {
-          backgrounds = g_list_prepend (backgrounds, actor);
-
-          if (has_windows)
-            reordered = TRUE;
-        }
-      else if (META_IS_WINDOW_ACTOR (actor) && !reordered)
-        {
-          has_windows = TRUE;
-
-          if (expected_window_node != NULL && actor == expected_window_node->data)
-            expected_window_node = expected_window_node->next;
-          else
-            reordered = TRUE;
-        }
+      reordered = TRUE;
+      goto done_with_check;
    }

+  /* Then the window actors should follow in sequence */
+
+  old = old->next;
+  for (tmp = info->windows; tmp != NULL; tmp = tmp->next)
+    {
+      while (old && !META_IS_WINDOW_ACTOR (old->data))
+        old = old->next;
+
+      /* old == NULL: someone reparented a window out of the window group,
+       * order undefined, always restack */
+      if (old == NULL || old->data != tmp->data)
+        {
+          reordered = TRUE;
+          goto done_with_check;
+        }
+
+      old = old->next;
+    }
+
+ done_with_check:
+
  g_list_free (children);

  if (!reordered)
-    {
-      g_list_free (backgrounds);
-      return;
-    }
+    return;

-  /* reorder the actors by lowering them in turn to the bottom of the stack.
-   * windows first, then background.
-   *
-   * We reorder the actors even if they're not parented to the window group,
-   * to allow stacking to work with intermediate actors (eg during effects)
-   */
  for (tmp = g_list_last (info->windows); tmp != NULL; tmp = tmp->prev)
    {
-      ClutterActor *actor = tmp->data, *parent;
+      MetaWindowActor *window_actor = tmp->data;

-      parent = clutter_actor_get_parent (actor);
-      clutter_actor_set_child_below_sibling (parent, actor, NULL);
+      clutter_actor_lower_bottom (CLUTTER_ACTOR (window_actor));
    }

-  /* we prepended the backgrounds above so the last actor in the list
-   * should get lowered to the bottom last.
-   */
-  for (tmp = backgrounds; tmp != NULL; tmp = tmp->next)
-    {
-      ClutterActor *actor = tmp->data, *parent;
-
-      parent = clutter_actor_get_parent (actor);
-      clutter_actor_set_child_below_sibling (parent, actor, NULL);
-    }
-  g_list_free (backgrounds);
+  clutter_actor_lower_bottom (info->background_actor);
 }

 void
@ -1311,8 +1164,7 @@ meta_compositor_window_unmapped (MetaCompositor *compositor,

 void
 meta_compositor_sync_window_geometry (MetaCompositor *compositor,
-				      MetaWindow *window,
-                                      gboolean did_placement)
+				      MetaWindow *window)
 {
  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
  MetaScreen      *screen = meta_window_get_screen (window);
@ -1324,7 +1176,7 @@ meta_compositor_sync_window_geometry (MetaCompositor *compositor,
  if (!window_actor)
    return;

-  meta_window_actor_sync_actor_geometry (window_actor, did_placement);
+  meta_window_actor_sync_actor_position (window_actor);
 }

 void
@ -1346,6 +1198,8 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,

  XResizeWindow (xdisplay, xwin, width, height);

+  meta_background_actor_screen_size_changed (screen);
+
  meta_verbose ("Changed size for stage on screen %d to %dx%d\n",
 		meta_screen_get_screen_number (screen),
 		width, height);
@ -1367,21 +1221,12 @@ frame_callback (CoglOnscreen  *onscreen,

      if (presentation_time_cogl != 0)
        {
-          /* Cogl reports presentation in terms of its own clock, which is
-           * guaranteed to be in nanoseconds but with no specified base. The
-           * normal case with the open source GPU drivers on Linux 3.8 and
-           * newer is that the base of cogl_get_clock_time() is that of
-           * clock_gettime(CLOCK_MONOTONIC), so the same as g_get_monotonic_time),
-           * but there's no exposure of that through the API. clock_gettime()
-           * is fairly fast, so calling it twice and subtracting to get a
-           * nearly-zero number is acceptable, if a litle ugly.
-           */
          CoglContext *context = cogl_framebuffer_get_context (COGL_FRAMEBUFFER (onscreen));
-          gint64 current_cogl_time = cogl_get_clock_time (context);
-          gint64 current_monotonic_time = g_get_monotonic_time ();
+          gint64 current_time_cogl = cogl_get_clock_time (context);
+          gint64 now = g_get_monotonic_time ();

          presentation_time =
-            current_monotonic_time + (presentation_time_cogl - current_cogl_time) / 1000;
+            now + (presentation_time_cogl - current_time_cogl) / 1000;
        }
      else
        {
@ -1483,7 +1328,6 @@ on_shadow_factory_changed (MetaShadowFactory *factory,

 /**
 * meta_compositor_new: (skip)
- * @display:
 *
 */
 MetaCompositor *
@ -1528,7 +1372,6 @@ meta_compositor_new (MetaDisplay *display)

 /**
 * meta_get_overlay_window: (skip)
- * @screen: a #MetaScreen
 *
 */
 Window
@ -1573,45 +1416,45 @@ meta_enable_unredirect_for_screen (MetaScreen *screen)
 #define FLASH_TIME_MS 50

 static void
-flash_out_completed (ClutterTimeline *timeline,
-                     gboolean         is_finished,
-                     gpointer         user_data)
+flash_out_completed (ClutterAnimation *animation,
+                     ClutterActor     *flash)
 {
-  ClutterActor *flash = CLUTTER_ACTOR (user_data);
  clutter_actor_destroy (flash);
 }

+static void
+flash_in_completed (ClutterAnimation *animation,
+                    ClutterActor     *flash)
+{
+  clutter_actor_animate (flash, CLUTTER_EASE_IN_QUAD,
+                         FLASH_TIME_MS,
+                         "opacity", 0,
+                         "signal-after::completed", flash_out_completed, flash,
+                         NULL);
+}
+
 void
 meta_compositor_flash_screen (MetaCompositor *compositor,
                              MetaScreen     *screen)
 {
  ClutterActor *stage;
  ClutterActor *flash;
-  ClutterTransition *transition;
+  ClutterColor black = { 0, 0, 0, 255 };
  gfloat width, height;

  stage = meta_get_stage_for_screen (screen);
  clutter_actor_get_size (stage, &width, &height);

-  flash = clutter_actor_new ();
-  clutter_actor_set_background_color (flash, CLUTTER_COLOR_Black);
+  flash = clutter_rectangle_new_with_color (&black);
  clutter_actor_set_size (flash, width, height);
  clutter_actor_set_opacity (flash, 0);
-  clutter_actor_add_child (stage, flash);
+  clutter_container_add_actor (CLUTTER_CONTAINER (stage), flash);

-  clutter_actor_save_easing_state (flash);
-  clutter_actor_set_easing_mode (flash, CLUTTER_EASE_IN_QUAD);
-  clutter_actor_set_easing_duration (flash, FLASH_TIME_MS);
-  clutter_actor_set_opacity (flash, 192);
-
-  transition = clutter_actor_get_transition (flash, "opacity");
-  clutter_timeline_set_auto_reverse (CLUTTER_TIMELINE (transition), TRUE);
-  clutter_timeline_set_repeat_count (CLUTTER_TIMELINE (transition), 2);
-
-  g_signal_connect (transition, "stopped",
-                    G_CALLBACK (flash_out_completed), flash);
-
-  clutter_actor_restore_easing_state (flash);
+  clutter_actor_animate (flash, CLUTTER_EASE_OUT_QUAD,
+                         FLASH_TIME_MS,
+                         "opacity", 192,
+                         "signal-after::completed", flash_in_completed, flash,
+                         NULL);
 }

 /**
@ -1636,7 +1479,7 @@ meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,

  if (compositor->server_time_query_time == 0 ||
      (!compositor->server_time_is_monotonic_time &&
-       monotonic_time > compositor->server_time_query_time + 10*1000*1000)) /* 10 seconds */
+       monotonic_time > compositor->server_time_query_time + 10000000)) /* 10 seconds */
    {
      guint32 server_time = meta_display_get_current_time_roundtrip (display);
      gint64 server_time_usec = (gint64)server_time * 1000;
@ -1649,8 +1492,8 @@ meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
       * is under load and our processing of the server response is
       * delayed.
       */
-      if (server_time_usec > current_monotonic_time - 1000*1000 &&
-          server_time_usec < current_monotonic_time + 1000*1000)
+      if (server_time_usec > current_monotonic_time - 1000000 &&
+          server_time_usec < current_monotonic_time + 1000000)
        compositor->server_time_is_monotonic_time = TRUE;

      compositor->server_time_offset = server_time_usec - current_monotonic_time;
--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@ -9,6 +9,7 @@
 void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
                                                cairo_region_t      *visible_region);

-cairo_region_t *meta_background_actor_get_visible_region (MetaBackgroundActor *self);
+void meta_background_actor_update              (MetaScreen *screen);
+void meta_background_actor_screen_size_changed (MetaScreen *screen);

 #endif /* META_BACKGROUND_ACTOR_PRIVATE_H */
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
+ * meta-background-actor.c: Actor for painting the root window background
+ *
 * Copyright 2009 Sander Dijkhuis
 * Copyright 2010 Red Hat, Inc.
 *
@ -21,13 +23,6 @@
 * Portions adapted from gnome-shell/src/shell-global.c
 */

-/**
- * SECTION:meta-background-actor
- * @title: MetaBackgroundActor
- * @short_description: Actor for painting the root window background
- *
- */
-
 #include <config.h>

 #include <cogl/cogl-texture-pixmap-x11.h>
@ -39,23 +34,223 @@
 #include "cogl-utils.h"
 #include "compositor-private.h"
 #include <meta/errors.h>
-#include <meta/meta-background.h>
 #include "meta-background-actor-private.h"

+/* We allow creating multiple MetaBackgroundActors for the same MetaScreen to
+ * allow different rendering options to be set for different copies.
+ * But we want to share the same underlying CoglTexture for efficiency and
+ * to avoid driver bugs that might occur if we created multiple CoglTexturePixmaps
+ * for the same pixmap.
+ *
+ * This structure holds common information.
+ */
+typedef struct _MetaScreenBackground MetaScreenBackground;
+
+struct _MetaScreenBackground
+{
+  MetaScreen *screen;
+  GSList *actors;
+
+  float texture_width;
+  float texture_height;
+  CoglTexture *texture;
+  CoglMaterialWrapMode wrap_mode;
+  guint have_pixmap : 1;
+};
+
 struct _MetaBackgroundActorPrivate
 {
+  MetaScreenBackground *background;
+  CoglPipeline *pipeline;
+
  cairo_region_t *visible_region;
+  float dim_factor;
 };

+enum
+{
+  PROP_0,
+
+  PROP_DIM_FACTOR,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
 G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);

+static void set_texture                (MetaScreenBackground *background,
+                                        CoglHandle            texture);
+static void set_texture_to_stage_color (MetaScreenBackground *background);
+
+static void
+on_notify_stage_color (GObject              *stage,
+                       GParamSpec           *pspec,
+                       MetaScreenBackground *background)
+{
+  if (!background->have_pixmap)
+    set_texture_to_stage_color (background);
+}
+
+static void
+free_screen_background (MetaScreenBackground *background)
+{
+  set_texture (background, COGL_INVALID_HANDLE);
+
+  if (background->screen != NULL)
+    {
+      ClutterActor *stage = meta_get_stage_for_screen (background->screen);
+      g_signal_handlers_disconnect_by_func (stage,
+                                            (gpointer) on_notify_stage_color,
+                                            background);
+      background->screen = NULL;
+    }
+}
+
+static MetaScreenBackground *
+meta_screen_background_get (MetaScreen *screen)
+{
+  MetaScreenBackground *background;
+
+  background = g_object_get_data (G_OBJECT (screen), "meta-screen-background");
+  if (background == NULL)
+    {
+      ClutterActor *stage;
+
+      background = g_new0 (MetaScreenBackground, 1);
+
+      background->screen = screen;
+      g_object_set_data_full (G_OBJECT (screen), "meta-screen-background",
+                              background, (GDestroyNotify) free_screen_background);
+
+      stage = meta_get_stage_for_screen (screen);
+      g_signal_connect (stage, "notify::color",
+                        G_CALLBACK (on_notify_stage_color), background);
+
+      meta_background_actor_update (screen);
+    }
+
+  return background;
+}
+
+static void
+update_wrap_mode_of_actor (MetaBackgroundActor *self)
+{
+  MetaBackgroundActorPrivate *priv = self->priv;
+
+  cogl_pipeline_set_layer_wrap_mode (priv->pipeline, 0, priv->background->wrap_mode);
+}
+
+static void
+update_wrap_mode (MetaScreenBackground *background)
+{
+  GSList *l;
+  int width, height;
+
+  meta_screen_get_size (background->screen, &width, &height);
+
+  /* We turn off repeating when we have a full-screen pixmap to keep from
+   * getting artifacts from one side of the image sneaking into the other
+   * side of the image via bilinear filtering.
+   */
+  if (width == background->texture_width && height == background->texture_height)
+    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
+  else
+    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;
+
+  for (l = background->actors; l; l = l->next)
+    update_wrap_mode_of_actor (l->data);
+}
+
+static void
+set_texture_on_actor (MetaBackgroundActor *self)
+{
+  MetaBackgroundActorPrivate *priv = self->priv;
+  MetaDisplay *display = meta_screen_get_display (priv->background->screen);
+
+  /* This may trigger destruction of an old texture pixmap, which, if
+   * the underlying X pixmap is already gone has the tendency to trigger
+   * X errors inside DRI. For safety, trap errors */
+  meta_error_trap_push (display);
+  cogl_pipeline_set_layer_texture (priv->pipeline, 0, priv->background->texture);
+  meta_error_trap_pop (display);
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
+}
+
+static void
+set_texture (MetaScreenBackground *background,
+             CoglHandle            texture)
+{
+  MetaDisplay *display = meta_screen_get_display (background->screen);
+  GSList *l;
+
+  /* This may trigger destruction of an old texture pixmap, which, if
+   * the underlying X pixmap is already gone has the tendency to trigger
+   * X errors inside DRI. For safety, trap errors */
+  meta_error_trap_push (display);
+  if (background->texture != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (background->texture);
+      background->texture = COGL_INVALID_HANDLE;
+    }
+  meta_error_trap_pop (display);
+
+  if (texture != COGL_INVALID_HANDLE)
+    background->texture = cogl_handle_ref (texture);
+
+  background->texture_width = cogl_texture_get_width (background->texture);
+  background->texture_height = cogl_texture_get_height (background->texture);
+
+  for (l = background->actors; l; l = l->next)
+    set_texture_on_actor (l->data);
+
+  update_wrap_mode (background);
+}
+
+/* Sets our pipeline to paint with a 1x1 texture of the stage's background
+ * color; doing this when we have no pixmap allows the application to turn
+ * off painting the stage. There might be a performance benefit to
+ * painting in this case with a solid color, but the normal solid color
+ * case is a 1x1 root pixmap, so we'd have to reverse-engineer that to
+ * actually pick up the (small?) performance win. This is just a fallback.
+ */
+static void
+set_texture_to_stage_color (MetaScreenBackground *background)
+{
+  ClutterActor *stage = meta_get_stage_for_screen (background->screen);
+  ClutterColor color;
+  CoglHandle texture;
+
+  clutter_stage_get_color (CLUTTER_STAGE (stage), &color);
+
+  /* Slicing will prevent COGL from using hardware texturing for
+   * the tiled 1x1 pixmap, and will cause it to draw the window
+   * background in millions of separate 1x1 rectangles */
+  texture = meta_create_color_texture_4ub (color.red, color.green,
+                                           color.blue, 0xff,
+                                           COGL_TEXTURE_NO_SLICING);
+  set_texture (background, texture);
+  cogl_handle_unref (texture);
+}
+
 static void
 meta_background_actor_dispose (GObject *object)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
+  MetaBackgroundActorPrivate *priv = self->priv;

  meta_background_actor_set_visible_region (self, NULL);

+  if (priv->background != NULL)
+    {
+      priv->background->actors = g_slist_remove (priv->background->actors, self);
+      priv->background = NULL;
+    }
+
+  g_clear_pointer(&priv->pipeline, cogl_object_unref);
+
  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }

@ -65,15 +260,11 @@ meta_background_actor_get_preferred_width (ClutterActor *actor,
                                           gfloat       *min_width_p,
                                           gfloat       *natural_width_p)
 {
-  ClutterContent *content;
-  gfloat width;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  MetaBackgroundActorPrivate *priv = self->priv;
+  int width, height;

-  content = clutter_actor_get_content (actor);
-
-  if (content)
-    clutter_content_get_preferred_size (content, &width, NULL);
-  else
-    width = 0;
+  meta_screen_get_size (priv->background->screen, &width, &height);

  if (min_width_p)
    *min_width_p = width;
@ -88,15 +279,11 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
                                            gfloat       *natural_height_p)

 {
-  ClutterContent *content;
-  gfloat height;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  MetaBackgroundActorPrivate *priv = self->priv;
+  int width, height;

-  content = clutter_actor_get_content (actor);
-
-  if (content)
-    clutter_content_get_preferred_size (content, NULL, &height);
-  else
-    height = 0;
+  meta_screen_get_size (priv->background->screen, &width, &height);

  if (min_height_p)
    *min_height_p = height;
@ -104,19 +291,64 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
    *natural_height_p = height;
 }

+static void
+meta_background_actor_paint (ClutterActor *actor)
+{
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  MetaBackgroundActorPrivate *priv = self->priv;
+  guint8 opacity = clutter_actor_get_paint_opacity (actor);
+  guint8 color_component;
+  int width, height;
+
+  meta_screen_get_size (priv->background->screen, &width, &height);
+
+  color_component = (int)(0.5 + opacity * priv->dim_factor);
+
+  cogl_pipeline_set_color4ub (priv->pipeline,
+                              color_component,
+                              color_component,
+                              color_component,
+                              opacity);
+
+  cogl_set_source (priv->pipeline);
+
+  if (priv->visible_region)
+    {
+      int n_rectangles = cairo_region_num_rectangles (priv->visible_region);
+      int i;
+
+      for (i = 0; i < n_rectangles; i++)
+        {
+          cairo_rectangle_int_t rect;
+          cairo_region_get_rectangle (priv->visible_region, i, &rect);
+
+          cogl_rectangle_with_texture_coords (rect.x, rect.y,
+                                              rect.x + rect.width, rect.y + rect.height,
+                                              rect.x / priv->background->texture_width,
+                                              rect.y / priv->background->texture_height,
+                                              (rect.x + rect.width) / priv->background->texture_width,
+                                              (rect.y + rect.height) / priv->background->texture_height);
+        }
+    }
+  else
+    {
+      cogl_rectangle_with_texture_coords (0.0f, 0.0f,
+                                          width, height,
+                                          0.0f, 0.0f,
+                                          width / priv->background->texture_width,
+                                          height / priv->background->texture_height);
+    }
+}
+
 static gboolean
 meta_background_actor_get_paint_volume (ClutterActor       *actor,
                                        ClutterPaintVolume *volume)
 {
-  ClutterContent *content;
-  gfloat width, height;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
+  MetaBackgroundActorPrivate *priv = self->priv;
+  int width, height;

-  content = clutter_actor_get_content (actor);
-
-  if (!content)
-    return FALSE;
-
-  clutter_content_get_preferred_size (content, &width, &height);
+  meta_screen_get_size (priv->background->screen, &width, &height);

  clutter_paint_volume_set_width (volume, width);
  clutter_paint_volume_set_height (volume, height);
@ -124,48 +356,215 @@ meta_background_actor_get_paint_volume (ClutterActor       *actor,
  return TRUE;
 }

+static void
+meta_background_actor_set_dim_factor (MetaBackgroundActor *self,
+                                      gfloat               dim_factor)
+{
+  MetaBackgroundActorPrivate *priv = self->priv;
+
+  if (priv->dim_factor == dim_factor)
+    return;
+
+  priv->dim_factor = dim_factor;
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
+
+  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DIM_FACTOR]);
+}
+
+static void
+meta_background_actor_get_property(GObject         *object,
+                                   guint            prop_id,
+                                   GValue          *value,
+                                   GParamSpec      *pspec)
+{
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
+  MetaBackgroundActorPrivate *priv = self->priv;
+
+  switch (prop_id)
+    {
+    case PROP_DIM_FACTOR:
+      g_value_set_float (value, priv->dim_factor);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+meta_background_actor_set_property(GObject         *object,
+                                   guint            prop_id,
+                                   const GValue    *value,
+                                   GParamSpec      *pspec)
+{
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
+
+  switch (prop_id)
+    {
+    case PROP_DIM_FACTOR:
+      meta_background_actor_set_dim_factor (self, g_value_get_float (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
 static void
 meta_background_actor_class_init (MetaBackgroundActorClass *klass)
 {
  GObjectClass *object_class = G_OBJECT_CLASS (klass);
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
+  GParamSpec *pspec;

  g_type_class_add_private (klass, sizeof (MetaBackgroundActorPrivate));

  object_class->dispose = meta_background_actor_dispose;
+  object_class->get_property = meta_background_actor_get_property;
+  object_class->set_property = meta_background_actor_set_property;

  actor_class->get_preferred_width = meta_background_actor_get_preferred_width;
  actor_class->get_preferred_height = meta_background_actor_get_preferred_height;
+  actor_class->paint = meta_background_actor_paint;
  actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
+
+  /**
+   * MetaBackgroundActor:dim-factor:
+   *
+   * Factor to dim the background by, between 0.0 (black) and 1.0 (original
+   * colors)
+   */
+  pspec = g_param_spec_float ("dim-factor",
+                              "Dim factor",
+                              "Factor to dim the background by",
+                              0.0, 1.0,
+                              1.0,
+                              G_PARAM_READWRITE);
+  obj_props[PROP_DIM_FACTOR] = pspec;
+  g_object_class_install_property (object_class, PROP_DIM_FACTOR, pspec);
 }

 static void
 meta_background_actor_init (MetaBackgroundActor *self)
 {
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                            META_TYPE_BACKGROUND_ACTOR,
-                                            MetaBackgroundActorPrivate);
+  MetaBackgroundActorPrivate *priv;
+
+  priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+                                                   META_TYPE_BACKGROUND_ACTOR,
+                                                   MetaBackgroundActorPrivate);
+  priv->dim_factor = 1.0;
 }

 /**
 * meta_background_actor_new:
+ * @screen: the #MetaScreen
 *
- * Creates a new actor to draw the background for the given monitor.
- * This actor should be associated with a #MetaBackground using
- * clutter_actor_set_content()
+ * Creates a new actor to draw the background for the given screen.
 *
 * Return value: the newly created background actor
 */
 ClutterActor *
-meta_background_actor_new (void)
+meta_background_actor_new_for_screen (MetaScreen *screen)
 {
  MetaBackgroundActor *self;
+  MetaBackgroundActorPrivate *priv;
+
+  g_return_val_if_fail (META_IS_SCREEN (screen), NULL);

  self = g_object_new (META_TYPE_BACKGROUND_ACTOR, NULL);
+  priv = self->priv;
+
+  priv->background = meta_screen_background_get (screen);
+  priv->background->actors = g_slist_prepend (priv->background->actors, self);
+
+  /* A CoglMaterial and a CoglPipeline are the same thing */
+  priv->pipeline = (CoglPipeline*) meta_create_texture_material (NULL);
+
+  set_texture_on_actor (self);
+  update_wrap_mode_of_actor (self);

  return CLUTTER_ACTOR (self);
 }

+/**
+ * meta_background_actor_update:
+ * @screen: a #MetaScreen
+ *
+ * Refetches the _XROOTPMAP_ID property for the root window and updates
+ * the contents of the background actor based on that. There's no attempt
+ * to optimize out pixmap values that don't change (since a root pixmap
+ * could be replaced by with another pixmap with the same ID under some
+ * circumstances), so this should only be called when we actually receive
+ * a PropertyNotify event for the property.
+ */
+void
+meta_background_actor_update (MetaScreen *screen)
+{
+  MetaScreenBackground *background;
+  MetaDisplay *display;
+  MetaCompositor *compositor;
+  Atom type;
+  int format;
+  gulong nitems;
+  gulong bytes_after;
+  guchar *data;
+  Pixmap root_pixmap_id;
+
+  background = meta_screen_background_get (screen);
+  display = meta_screen_get_display (screen);
+  compositor = meta_display_get_compositor (display);
+
+  root_pixmap_id = None;
+  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
+                           meta_screen_get_xroot (screen),
+                           compositor->atom_x_root_pixmap,
+                           0, LONG_MAX,
+                           False,
+                           AnyPropertyType,
+                           &type, &format, &nitems, &bytes_after, &data) &&
+      type != None)
+  {
+     /* Got a property. */
+     if (type == XA_PIXMAP && format == 32 && nitems == 1)
+       {
+         /* Was what we expected. */
+         root_pixmap_id = *(Pixmap *)data;
+       }
+
+     XFree(data);
+  }
+
+  if (root_pixmap_id != None)
+    {
+      CoglHandle texture;
+      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      GError *error = NULL;
+
+      meta_error_trap_push (display);
+      texture = cogl_texture_pixmap_x11_new (ctx, root_pixmap_id, FALSE, &error);
+      meta_error_trap_pop (display);
+
+      if (texture != COGL_INVALID_HANDLE)
+        {
+          set_texture (background, texture);
+          cogl_handle_unref (texture);
+
+          background->have_pixmap = True;
+          return;
+        }
+      else
+        {
+          g_warning ("Failed to create background texture from pixmap: %s",
+                     error->message);
+          g_error_free (error);
+        }
+    }
+
+  background->have_pixmap = False;
+  set_texture_to_stage_color (background);
+}
+
 /**
 * meta_background_actor_set_visible_region:
 * @self: a #MetaBackgroundActor
@ -185,44 +584,120 @@ meta_background_actor_set_visible_region (MetaBackgroundActor *self,

  priv = self->priv;

-  g_clear_pointer (&priv->visible_region,
-                   (GDestroyNotify)
-                   cairo_region_destroy);
+  if (priv->visible_region)
+    {
+      cairo_region_destroy (priv->visible_region);
+      priv->visible_region = NULL;
+    }

  if (visible_region)
-    priv->visible_region = cairo_region_copy (visible_region);
+    {
+      cairo_rectangle_int_t screen_rect = { 0 };
+      meta_screen_get_size (priv->background->screen, &screen_rect.width, &screen_rect.height);
+
+      /* Doing the intersection here is probably unnecessary - MetaWindowGroup
+       * should never compute a visible area that's larger than the root screen!
+       * but it's not that expensive and adds some extra robustness.
+       */
+      priv->visible_region = cairo_region_create_rectangle (&screen_rect);
+      cairo_region_intersect (priv->visible_region, visible_region);
+    }
 }

 /**
- * meta_background_actor_get_visible_region:
- * @self: a #MetaBackgroundActor
+ * meta_background_actor_screen_size_changed:
+ * @screen: a #MetaScreen
 *
- * Return value (transfer full): a #cairo_region_t that represents the part of
- * the background not obscured by other #MetaBackgroundActor or
- * #MetaWindowActor objects.
+ * Called by the compositor when the size of the #MetaScreen changes
 */
-cairo_region_t *
-meta_background_actor_get_visible_region (MetaBackgroundActor *self)
+void
+meta_background_actor_screen_size_changed (MetaScreen *screen)
 {
-  MetaBackgroundActorPrivate *priv = self->priv;
-  ClutterActorBox content_box;
-  cairo_rectangle_int_t content_area = { 0 };
-  cairo_region_t *visible_region;
+  MetaScreenBackground *background = meta_screen_background_get (screen);
+  GSList *l;

-  g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);
+  update_wrap_mode (background);

-  if (!priv->visible_region)
-      return NULL;
-
-  clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
-
-  content_area.x = content_box.x1;
-  content_area.y = content_box.y1;
-  content_area.width = content_box.x2 - content_box.x1;
-  content_area.height = content_box.y2 - content_box.y1;
-
-  visible_region = cairo_region_create_rectangle (&content_area);
-  cairo_region_intersect (visible_region, priv->visible_region);
-
-  return visible_region;
+  for (l = background->actors; l; l = l->next)
+    clutter_actor_queue_relayout (l->data);
 }
+
+/**
+ * meta_background_actor_add_glsl_snippet:
+ * @actor: a #MetaBackgroundActor
+ * @hook: where to insert the code
+ * @declarations: GLSL declarations
+ * @code: GLSL code
+ * @is_replace: wheter Cogl code should be replaced by the custom shader
+ *
+ * Adds a GLSL snippet to the pipeline used for drawing the background.
+ * See #CoglSnippet for details.
+ */
+void
+meta_background_actor_add_glsl_snippet (MetaBackgroundActor *actor,
+                                        MetaSnippetHook      hook,
+                                        const char          *declarations,
+                                        const char          *code,
+                                        gboolean             is_replace)
+{
+  MetaBackgroundActorPrivate *priv;
+  CoglSnippet *snippet;
+
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
+
+  priv = actor->priv;
+
+  if (is_replace)
+    {
+      snippet = cogl_snippet_new (hook, declarations, NULL);
+      cogl_snippet_set_replace (snippet, code);
+    }
+  else
+    {
+      snippet = cogl_snippet_new (hook, declarations, code);
+    }
+
+  if (hook == META_SNIPPET_HOOK_VERTEX ||
+      hook == META_SNIPPET_HOOK_FRAGMENT)
+    cogl_pipeline_add_snippet (priv->pipeline, snippet);
+  else
+    cogl_pipeline_add_layer_snippet (priv->pipeline, 0, snippet);
+
+  cogl_object_unref (snippet);
+}
+
+/**
+ * meta_background_actor_set_uniform_float:
+ * @actor: a #MetaBackgroundActor
+ * @uniform_name:
+ * @n_components: number of components (for vector uniforms)
+ * @count: number of uniforms (for array uniforms)
+ * @uniform: (array length=uniform_length): the float values to set
+ * @uniform_length: the length of @uniform. Must be exactly @n_components x @count,
+ *                  and is provided mainly for language bindings.
+ *
+ * Sets a new GLSL uniform to the provided value. This is mostly
+ * useful in congiunction with meta_background_actor_add_glsl_snippet().
+ */
+
+void
+meta_background_actor_set_uniform_float (MetaBackgroundActor *actor,
+                                         const char          *uniform_name,
+                                         int                  n_components,
+                                         int                  count,
+                                         const float         *uniform,
+                                         int                  uniform_length)
+{
+  MetaBackgroundActorPrivate *priv;
+
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (actor));
+  g_return_if_fail (uniform_length == n_components * count);
+
+  priv = actor->priv;
+
+  cogl_pipeline_set_uniform_float (priv->pipeline,
+                                   cogl_pipeline_get_uniform_location (priv->pipeline,
+                                                                       uniform_name),
+                                   n_components, count, uniform);
+}
+
--- a/src/compositor/meta-background-group-private.h
+++ b/src/compositor/meta-background-group-private.h
@ -1,11 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef META_BACKGROUND_GROUP_PRIVATE_H
-#define META_BACKGROUND_GROUP_PRIVATE_H
-
-#include <meta/screen.h>
-#include <meta/meta-background-group.h>
-
-void meta_background_group_set_visible_region  (MetaBackgroundGroup *self,
-                                                cairo_region_t      *visible_region);
-#endif /* META_BACKGROUND_GROUP_PRIVATE_H */
--- a/src/compositor/meta-background-group.c
+++ b/src/compositor/meta-background-group.c
@ -1,110 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/**
- * SECTION:meta-background-group
- * @title: MetaBackgroundGroup
- * @short_description: Container for background actors
- *
- * This class is a subclass of ClutterActor with special handling for
- * MetaBackgroundActor/MetaBackgroundGroup when painting children.
- * It makes sure to only draw the parts of the backgrounds not
- * occluded by opaque windows.
- *
- * See #MetaWindowGroup for more information behind the motivation,
- * and details on implementation.
- */
-
-#include <config.h>
-
-#include "compositor-private.h"
-#include "clutter-utils.h"
-#include "meta-background-actor-private.h"
-#include "meta-background-group-private.h"
-
-G_DEFINE_TYPE (MetaBackgroundGroup, meta_background_group, CLUTTER_TYPE_ACTOR);
-
-struct _MetaBackgroundGroupPrivate
-{
-  gpointer dummy;
-};
-
-static void
-meta_background_group_dispose (GObject *object)
-{
-  G_OBJECT_CLASS (meta_background_group_parent_class)->dispose (object);
-}
-
-static gboolean
-meta_background_group_get_paint_volume (ClutterActor       *actor,
-                                        ClutterPaintVolume *volume)
-{
-  return clutter_paint_volume_set_from_allocation (volume, actor);
-}
-
-static void
-meta_background_group_class_init (MetaBackgroundGroupClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-
-  actor_class->get_paint_volume = meta_background_group_get_paint_volume;
-  object_class->dispose = meta_background_group_dispose;
-
-  g_type_class_add_private (klass, sizeof (MetaBackgroundGroupPrivate));
-}
-
-static void
-meta_background_group_init (MetaBackgroundGroup *self)
-{
-  self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                            META_TYPE_BACKGROUND_GROUP,
-                                            MetaBackgroundGroupPrivate);
-}
-
-/**
- * meta_background_group_set_visible_region:
- * @self: a #MetaBackgroundGroup
- * @visible_region: (allow-none): the parts of the background to paint
- *
- * Sets the area of the backgrounds that is unobscured by overlapping windows.
- * This is used to optimize and only paint the visible portions.
- */
-void
-meta_background_group_set_visible_region (MetaBackgroundGroup *self,
-                                          cairo_region_t      *region)
-{
-  GList *children, *l;
-
-  children = clutter_actor_get_children (CLUTTER_ACTOR (self));
-  for (l = children; l; l = l->next)
-    {
-      ClutterActor *actor = l->data;
-
-      if (META_IS_BACKGROUND_ACTOR (actor))
-        {
-          meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (actor), region);
-        }
-      else if (META_IS_BACKGROUND_GROUP (actor))
-        {
-          int x, y;
-
-          if (!meta_actor_is_untransformed (actor, &x, &y))
-            continue;
-
-          cairo_region_translate (region, -x, -y);
-          meta_background_group_set_visible_region (META_BACKGROUND_GROUP (actor), region);
-          cairo_region_translate (region, x, y);
-        }
-    }
-  g_list_free (children);
-}
-
-ClutterActor *
-meta_background_group_new (void)
-{
-  MetaBackgroundGroup *background_group;
-
-  background_group = g_object_new (META_TYPE_BACKGROUND_GROUP, NULL);
-
-  return CLUTTER_ACTOR (background_group);
-}
--- a/src/compositor/meta-background.c
+++ b/src/compositor/meta-background.c
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@ -21,13 +21,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:meta-plugin
- * @title: MetaPlugin
- * @short_description: Entry point for plugins
- *
- */
-
 #include <meta/meta-plugin.h>
 #include "meta-plugin-manager.h"
 #include <meta/screen.h>
--- a/src/compositor/meta-shadow-factory-private.h
+++ b/src/compositor/meta-shadow-factory-private.h
@ -40,7 +40,7 @@ typedef struct _MetaShadow MetaShadow;

 MetaShadow *meta_shadow_ref         (MetaShadow            *shadow);
 void        meta_shadow_unref       (MetaShadow            *shadow);
-CoglTexture*meta_shadow_get_texture (MetaShadow            *shadow);
+CoglHandle  meta_shadow_get_texture (MetaShadow            *shadow);
 void        meta_shadow_paint       (MetaShadow            *shadow,
                                     int                    window_x,
                                     int                    window_y,
--- a/src/compositor/meta-shadow-factory.c
+++ b/src/compositor/meta-shadow-factory.c
@ -1,5 +1,9 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
+ * MetaShadowFactory:
+ *
+ * Create and cache shadow textures for abritrary window shapes
+ *
 * Copyright 2010 Red Hat, Inc.
 *
 * This program is free software; you can redistribute it and/or
@ -17,13 +21,6 @@
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */
-
-/**
- * SECTION:meta-shadow-factory
- * @title: MetaShadowFactory
- * @short_description: Create and cache shadow textures for abritrary window shapes
- */
-
 #include <config.h>
 #include <math.h>
 #include <string.h>
@ -68,8 +65,8 @@ struct _MetaShadow

  MetaShadowFactory *factory;
  MetaShadowCacheKey key;
-  CoglTexture *texture;
-  CoglPipeline *pipeline;
+  CoglHandle texture;
+  CoglHandle material;

  /* The outer order is the distance the shadow extends outside the window
   * shape; the inner border is the unscaled portion inside the window
@ -178,8 +175,8 @@ meta_shadow_unref (MetaShadow *shadow)
        }

      meta_window_shape_unref (shadow->key.shape);
-      cogl_object_unref (shadow->texture);
-      cogl_object_unref (shadow->pipeline);
+      cogl_handle_unref (shadow->texture);
+      cogl_handle_unref (shadow->material);

      g_slice_free (MetaShadow, shadow);
    }
@ -221,10 +218,10 @@ meta_shadow_paint (MetaShadow     *shadow,
  int dest_y[4];
  int n_x, n_y;

-  cogl_pipeline_set_color4ub (shadow->pipeline,
+  cogl_material_set_color4ub (shadow->material,
                              opacity, opacity, opacity, opacity);

-  cogl_set_source (shadow->pipeline);
+  cogl_set_source (shadow->material);

  if (shadow->scale_width)
    {
@ -804,7 +801,7 @@ make_shadow (MetaShadow     *shadow,
  cairo_region_destroy (column_convolve_region);
  g_free (buffer);

-  shadow->pipeline = meta_create_texture_pipeline (shadow->texture);
+  shadow->material = meta_create_texture_material (shadow->texture);
 }

 static MetaShadowParams *
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@ -1,4 +1,8 @@
 /*
+ * shaped texture
+ *
+ * An actor to draw a masked texture.
+ *
 * Authored By Neil Roberts  <neil@linux.intel.com>
 * and Jasper St. Pierre <jstpierre@mecheye.net>
 *
@ -21,12 +25,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:meta-shaped-texture
- * @title: MetaShapedTexture
- * @short_description: An actor to draw a masked texture.
- */
-
 #include <config.h>

 #include <meta/meta-shaped-texture.h>
@ -66,10 +64,10 @@ struct _MetaShapedTexturePrivate
 {
  MetaTextureTower *paint_tower;
  Pixmap pixmap;
-  CoglTexturePixmapX11 *texture;
-  CoglTexture *mask_texture;
-  CoglPipeline *pipeline;
-  CoglPipeline *pipeline_unshaped;
+  CoglHandle texture;
+  CoglHandle mask_texture;
+  CoglHandle material;
+  CoglHandle material_unshaped;

  cairo_region_t *clip_region;

@ -103,8 +101,8 @@ meta_shaped_texture_init (MetaShapedTexture *self)
  priv = self->priv = META_SHAPED_TEXTURE_GET_PRIVATE (self);

  priv->paint_tower = meta_texture_tower_new ();
-  priv->texture = NULL;
-  priv->mask_texture = NULL;
+  priv->texture = COGL_INVALID_HANDLE;
+  priv->mask_texture = COGL_INVALID_HANDLE;
  priv->create_mipmaps = TRUE;
 }

@ -118,11 +116,23 @@ meta_shaped_texture_dispose (GObject *object)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;

-  g_clear_pointer (&priv->pipeline, cogl_object_unref);
-  g_clear_pointer (&priv->pipeline_unshaped, cogl_object_unref);
-  g_clear_pointer (&priv->texture, cogl_object_unref);
+  if (priv->material != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->material);
+      priv->material = COGL_INVALID_HANDLE;
+    }
+  if (priv->material_unshaped != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->material_unshaped);
+      priv->material_unshaped = COGL_INVALID_HANDLE;
+    }
+  if (priv->texture != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->texture);
+      priv->texture = COGL_INVALID_HANDLE;
+    }

-  meta_shaped_texture_set_mask_texture (self, NULL);
+  meta_shaped_texture_set_mask_texture (self, COGL_INVALID_HANDLE);
  meta_shaped_texture_set_clip_region (self, NULL);

  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
@ -133,14 +143,14 @@ meta_shaped_texture_paint (ClutterActor *actor)
 {
  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
  MetaShapedTexturePrivate *priv = stex->priv;
-  CoglTexture *paint_tex;
+  CoglHandle paint_tex;
  guint tex_width, tex_height;
  ClutterActorBox alloc;

-  static CoglPipeline *pipeline_template = NULL;
-  static CoglPipeline *pipeline_unshaped_template = NULL;
+  static CoglHandle material_template = COGL_INVALID_HANDLE;
+  static CoglHandle material_unshaped_template = COGL_INVALID_HANDLE;

-  CoglPipeline *pipeline;
+  CoglHandle material;

  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
    return;
@ -166,9 +176,9 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (priv->create_mipmaps)
    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
  else
-    paint_tex = COGL_TEXTURE (priv->texture);
+    paint_tex = priv->texture;

-  if (paint_tex == NULL)
+  if (paint_tex == COGL_INVALID_HANDLE)
    return;

  tex_width = priv->tex_width;
@ -177,51 +187,47 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;

-  if (priv->mask_texture == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
    {
      /* Use a single-layer texture if we don't have a mask. */

-      if (priv->pipeline_unshaped == NULL)
+      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
        {
-          if (G_UNLIKELY (pipeline_unshaped_template == NULL))
-            {
-              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-              pipeline_unshaped_template = cogl_pipeline_new (ctx);
-            }
+          if (G_UNLIKELY (material_unshaped_template == COGL_INVALID_HANDLE))
+            material_unshaped_template = cogl_material_new ();

-          priv->pipeline_unshaped = cogl_pipeline_copy (pipeline_unshaped_template);
+          priv->material_unshaped = cogl_material_copy (material_unshaped_template);
        }
-        pipeline = priv->pipeline_unshaped;
+        material = priv->material_unshaped;
    }
  else
    {
-      if (priv->pipeline == NULL)
+      if (priv->material == COGL_INVALID_HANDLE)
 	{
-	   if (G_UNLIKELY (pipeline_template == NULL))
+	   if (G_UNLIKELY (material_template == COGL_INVALID_HANDLE))
 	    {
-              CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
-	      pipeline_template =  cogl_pipeline_new (ctx);
-	      cogl_pipeline_set_layer_combine (pipeline_template, 1,
+	      material_template =  cogl_material_new ();
+	      cogl_material_set_layer_combine (material_template, 1,
 					   "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
 					   NULL);
 	    }
-	  priv->pipeline = cogl_pipeline_copy (pipeline_template);
+	  priv->material = cogl_material_copy (material_template);
 	}
-      pipeline = priv->pipeline;
+      material = priv->material;

-      cogl_pipeline_set_layer_texture (pipeline, 1, priv->mask_texture);
+      cogl_material_set_layer (material, 1, priv->mask_texture);
    }

-  cogl_pipeline_set_layer_texture (pipeline, 0, paint_tex);
+  cogl_material_set_layer (material, 0, paint_tex);

  {
    CoglColor color;
    guchar opacity = clutter_actor_get_paint_opacity (actor);
    cogl_color_set_from_4ub (&color, opacity, opacity, opacity, opacity);
-    cogl_pipeline_set_color (pipeline, &color);
+    cogl_material_set_color (material, &color);
  }

-  cogl_set_source (pipeline);
+  cogl_set_source (material);

  clutter_actor_get_allocation_box (actor, &alloc);

@ -286,18 +292,18 @@ meta_shaped_texture_pick (ClutterActor       *actor,
  MetaShapedTexturePrivate *priv = stex->priv;

  /* If there is no region then use the regular pick */
-  if (priv->mask_texture == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
    {
-      CoglTexture *paint_tex;
+      CoglHandle paint_tex;
      ClutterActorBox alloc;
      guint tex_width, tex_height;

-      paint_tex = COGL_TEXTURE (priv->texture);
+      paint_tex = priv->texture;

-      if (paint_tex == NULL)
+      if (paint_tex == COGL_INVALID_HANDLE)
        return;

      tex_width = cogl_texture_get_width (paint_tex);
@ -387,17 +393,17 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,

  if (create_mipmaps != priv->create_mipmaps)
    {
-      CoglTexture *base_texture;
+      CoglHandle base_texture;
      priv->create_mipmaps = create_mipmaps;
      base_texture = create_mipmaps ?
-        COGL_TEXTURE (priv->texture) : NULL;
+        priv->texture : COGL_INVALID_HANDLE;
      meta_texture_tower_set_base_texture (priv->paint_tower, base_texture);
    }
 }

 void
 meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
-                                      CoglTexture       *mask_texture)
+                                      CoglHandle         mask_texture)
 {
  MetaShapedTexturePrivate *priv;

@ -405,12 +411,16 @@ meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,

  priv = stex->priv;

-  g_clear_pointer (&priv->mask_texture, cogl_object_unref);
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->mask_texture);
+      priv->mask_texture = COGL_INVALID_HANDLE;
+    }

-  if (mask_texture != NULL)
+  if (mask_texture != COGL_INVALID_HANDLE)
    {
      priv->mask_texture = mask_texture;
-      cogl_object_ref (priv->mask_texture);
+      cogl_handle_ref (priv->mask_texture);
    }

  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
@ -428,11 +438,10 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,

  priv = stex->priv;

-  if (priv->texture == NULL)
+  if (priv->texture == COGL_INVALID_HANDLE)
    return;

-  cogl_texture_pixmap_x11_update_area (priv->texture,
-                                       x, y, width, height);
+  cogl_texture_pixmap_x11_update_area (priv->texture, x, y, width, height);

  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);

@ -440,8 +449,8 @@ meta_shaped_texture_update_area (MetaShapedTexture *stex,
 }

 static void
-set_cogl_texture (MetaShapedTexture    *stex,
-                  CoglTexturePixmapX11 *cogl_tex)
+set_cogl_texture (MetaShapedTexture *stex,
+                  CoglHandle         cogl_tex)
 {
  MetaShapedTexturePrivate *priv;
  guint width, height;
@ -450,21 +459,21 @@ set_cogl_texture (MetaShapedTexture    *stex,

  priv = stex->priv;

-  if (priv->texture != NULL)
-    cogl_object_unref (priv->texture);
+  if (priv->texture != COGL_INVALID_HANDLE)
+    cogl_handle_unref (priv->texture);

  priv->texture = cogl_tex;

-  if (priv->pipeline != NULL)
-    cogl_pipeline_set_layer_texture (priv->pipeline, 0, COGL_TEXTURE (cogl_tex));
+  if (priv->material != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (priv->material, 0, cogl_tex);

-  if (priv->pipeline_unshaped != NULL)
-    cogl_pipeline_set_layer_texture (priv->pipeline_unshaped, 0, COGL_TEXTURE (cogl_tex));
+  if (priv->material_unshaped != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (priv->material_unshaped, 0, cogl_tex);

-  if (cogl_tex != NULL)
+  if (cogl_tex != COGL_INVALID_HANDLE)
    {
-      width = cogl_texture_get_width (COGL_TEXTURE (cogl_tex));
-      height = cogl_texture_get_height (COGL_TEXTURE (cogl_tex));
+      width = cogl_texture_get_width (cogl_tex);
+      height = cogl_texture_get_height (cogl_tex);

      if (width != priv->tex_width ||
          height != priv->tex_height)
@ -477,7 +486,7 @@ set_cogl_texture (MetaShapedTexture    *stex,
    }
  else
    {
-      /* size changed to 0 going to an inavlid texture */
+      /* size changed to 0 going to an invalid handle */
      priv->tex_width = 0;
      priv->tex_height = 0;
      clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
@ -513,11 +522,10 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
      set_cogl_texture (stex, cogl_texture_pixmap_x11_new (ctx, pixmap, FALSE, NULL));
    }
  else
-    set_cogl_texture (stex, NULL);
+    set_cogl_texture (stex, COGL_INVALID_HANDLE);

  if (priv->create_mipmaps)
-    meta_texture_tower_set_base_texture (priv->paint_tower,
-                                         COGL_TEXTURE (priv->texture));
+    meta_texture_tower_set_base_texture (priv->paint_tower, priv->texture);
 }

 /**
@ -526,11 +534,11 @@ meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
 *
 * Returns: (transfer none): the unshaped texture
 */
-CoglTexture *
+CoglHandle
 meta_shaped_texture_get_texture (MetaShapedTexture *stex)
 {
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
-  return COGL_TEXTURE (stex->priv->texture);
+  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), COGL_INVALID_HANDLE);
+  return stex->priv->texture;
 }

 /**
@ -587,13 +595,13 @@ cairo_surface_t *
 meta_shaped_texture_get_image (MetaShapedTexture     *stex,
                               cairo_rectangle_int_t *clip)
 {
-  CoglTexture *texture, *mask_texture;
+  CoglHandle texture, mask_texture;
  cairo_rectangle_int_t texture_rect = { 0, 0, 0, 0 };
  cairo_surface_t *surface;

  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);

-  texture = COGL_TEXTURE (stex->priv->texture);
+  texture = stex->priv->texture;

  if (texture == NULL)
    return NULL;
@ -630,7 +638,7 @@ meta_shaped_texture_get_image (MetaShapedTexture     *stex,
    cogl_object_unref (texture);

  mask_texture = stex->priv->mask_texture;
-  if (mask_texture != NULL)
+  if (mask_texture != COGL_INVALID_HANDLE)
    {
      cairo_t *cr;
      cairo_surface_t *mask_surface;
--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@ -59,8 +59,8 @@ typedef struct
 struct _MetaTextureTower
 {
  int n_levels;
-  CoglTexture *textures[MAX_TEXTURE_LEVELS];
-  CoglOffscreen *fbos[MAX_TEXTURE_LEVELS];
+  CoglHandle textures[MAX_TEXTURE_LEVELS];
+  CoglHandle fbos[MAX_TEXTURE_LEVELS];
  Box invalid[MAX_TEXTURE_LEVELS];
 };

@ -93,7 +93,7 @@ meta_texture_tower_free (MetaTextureTower *tower)
 {
  g_return_if_fail (tower != NULL);

-  meta_texture_tower_set_base_texture (tower, NULL);
+  meta_texture_tower_set_base_texture (tower, COGL_INVALID_HANDLE);

  g_slice_free (MetaTextureTower, tower);
 }
@ -110,7 +110,7 @@ meta_texture_tower_free (MetaTextureTower *tower)
 */
 void
 meta_texture_tower_set_base_texture (MetaTextureTower *tower,
-                                     CoglTexture      *texture)
+                                     CoglHandle        texture)
 {
  int i;

@ -119,33 +119,33 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
  if (texture == tower->textures[0])
    return;

-  if (tower->textures[0] != NULL)
+  if (tower->textures[0] != COGL_INVALID_HANDLE)
    {
      for (i = 1; i < tower->n_levels; i++)
        {
-          if (tower->textures[i] != NULL)
+          if (tower->textures[i] != COGL_INVALID_HANDLE)
            {
-              cogl_object_unref (tower->textures[i]);
-              tower->textures[i] = NULL;
+              cogl_handle_unref (tower->textures[i]);
+              tower->textures[i] = COGL_INVALID_HANDLE;
            }

-          if (tower->fbos[i] != NULL)
+          if (tower->fbos[i] != COGL_INVALID_HANDLE)
            {
-              cogl_object_unref (tower->fbos[i]);
-              tower->fbos[i] = NULL;
+              cogl_handle_unref (tower->fbos[i]);
+              tower->fbos[i] = COGL_INVALID_HANDLE;
            }
        }

-      cogl_object_unref (tower->textures[0]);
+      cogl_handle_unref (tower->textures[0]);
    }

  tower->textures[0] = texture;

-  if (tower->textures[0] != NULL)
+  if (tower->textures[0] != COGL_INVALID_HANDLE)
    {
      int width, height;

-      cogl_object_ref (tower->textures[0]);
+      cogl_handle_ref (tower->textures[0]);

      width = cogl_texture_get_width (tower->textures[0]);
      height = cogl_texture_get_height (tower->textures[0]);
@ -186,7 +186,7 @@ meta_texture_tower_update_area (MetaTextureTower *tower,

  g_return_if_fail (tower != NULL);

-  if (tower->textures[0] == NULL)
+  if (tower->textures[0] == COGL_INVALID_HANDLE)
    return;

  texture_width = cogl_texture_get_width (tower->textures[0]);
@ -387,22 +387,22 @@ static gboolean
 texture_tower_revalidate_fbo (MetaTextureTower *tower,
                              int               level)
 {
-  CoglTexture *source_texture = tower->textures[level - 1];
+  CoglHandle source_texture = tower->textures[level - 1];
  int source_texture_width = cogl_texture_get_width (source_texture);
  int source_texture_height = cogl_texture_get_height (source_texture);
-  CoglTexture *dest_texture = tower->textures[level];
+  CoglHandle dest_texture = tower->textures[level];
  int dest_texture_width = cogl_texture_get_width (dest_texture);
  int dest_texture_height = cogl_texture_get_height (dest_texture);
  Box *invalid = &tower->invalid[level];
  CoglMatrix modelview;

-  if (tower->fbos[level] == NULL)
+  if (tower->fbos[level] == COGL_INVALID_HANDLE)
    tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);

-  if (tower->fbos[level] == NULL)
+  if (tower->fbos[level] == COGL_INVALID_HANDLE)
    return FALSE;

-  cogl_push_framebuffer (COGL_FRAMEBUFFER (tower->fbos[level]));
+  cogl_push_framebuffer (tower->fbos[level]);

  cogl_ortho (0, dest_texture_width, dest_texture_height, 0, -1., 1.);

@ -460,12 +460,12 @@ static void
 texture_tower_revalidate_client (MetaTextureTower *tower,
                                 int               level)
 {
-  CoglTexture *source_texture = tower->textures[level - 1];
+  CoglHandle source_texture = tower->textures[level - 1];
  int source_texture_width = cogl_texture_get_width (source_texture);
  int source_texture_height = cogl_texture_get_height (source_texture);
  guint source_rowstride;
  guchar *source_data;
-  CoglTexture *dest_texture = tower->textures[level];
+  CoglHandle dest_texture = tower->textures[level];
  int dest_texture_width = cogl_texture_get_width (dest_texture);
  int dest_texture_height = cogl_texture_get_height (dest_texture);
  int dest_x = tower->invalid[level].x1;
@ -575,28 +575,28 @@ texture_tower_revalidate (MetaTextureTower *tower,
 * rectangle (0, 0, 200, 200).
 *
 * Return value: the COGL texture handle to use for painting, or
- *  %NULL if no base texture has yet been set.
+ *  %COGL_INVALID_HANDLE if no base texture has yet been set.
 */
-CoglTexture *
+CoglHandle
 meta_texture_tower_get_paint_texture (MetaTextureTower *tower)
 {
  int texture_width, texture_height;
  int level;

-  g_return_val_if_fail (tower != NULL, NULL);
+  g_return_val_if_fail (tower != NULL, COGL_INVALID_HANDLE);

-  if (tower->textures[0] == NULL)
-    return NULL;
+  if (tower->textures[0] == COGL_INVALID_HANDLE)
+    return COGL_INVALID_HANDLE;

  texture_width = cogl_texture_get_width (tower->textures[0]);
  texture_height = cogl_texture_get_height (tower->textures[0]);

  level = get_paint_level(texture_width, texture_height);
  if (level < 0) /* singular paint matrix, scaled to nothing */
-    return NULL;
+    return COGL_INVALID_HANDLE;
  level = MIN (level, tower->n_levels - 1);

-  if (tower->textures[level] == NULL ||
+  if (tower->textures[level] == COGL_INVALID_HANDLE ||
      (tower->invalid[level].x2 != tower->invalid[level].x1 &&
       tower->invalid[level].y2 != tower->invalid[level].y1))
    {
@ -608,7 +608,7 @@ meta_texture_tower_get_paint_texture (MetaTextureTower *tower)
         texture_width = MAX (1, texture_width / 2);
         texture_height = MAX (1, texture_height / 2);

-         if (tower->textures[i] == NULL)
+         if (tower->textures[i] == COGL_INVALID_HANDLE)
           texture_tower_create_texture (tower, i, texture_width, texture_height);
       }

--- a/src/compositor/meta-texture-tower.h
+++ b/src/compositor/meta-texture-tower.h
@ -56,13 +56,13 @@ typedef struct _MetaTextureTower MetaTextureTower;
 MetaTextureTower *meta_texture_tower_new               (void);
 void              meta_texture_tower_free              (MetaTextureTower *tower);
 void              meta_texture_tower_set_base_texture  (MetaTextureTower *tower,
-                                                        CoglTexture      *texture);
+                                                        CoglHandle        texture);
 void              meta_texture_tower_update_area       (MetaTextureTower *tower,
                                                        int               x,
                                                        int               y,
                                                        int               width,
                                                        int               height);
-CoglTexture      *meta_texture_tower_get_paint_texture (MetaTextureTower *tower);
+CoglHandle        meta_texture_tower_get_paint_texture (MetaTextureTower *tower);

 G_BEGIN_DECLS

--- a/src/compositor/meta-window-actor-private.h
+++ b/src/compositor/meta-window-actor-private.h
@ -43,8 +43,7 @@ void meta_window_actor_get_shape_bounds (MetaWindowActor       *self,
                                          cairo_rectangle_int_t *bounds);

 gboolean meta_window_actor_effect_in_progress  (MetaWindowActor *self);
-void     meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
-                                                gboolean         did_placement);
+void     meta_window_actor_sync_actor_position (MetaWindowActor *self);
 void     meta_window_actor_sync_visibility     (MetaWindowActor *self);
 void     meta_window_actor_update_shape        (MetaWindowActor *self);
 void     meta_window_actor_update_opacity      (MetaWindowActor *self);
@ -52,8 +51,6 @@ void     meta_window_actor_mapped              (MetaWindowActor *self);
 void     meta_window_actor_unmapped            (MetaWindowActor *self);
 void     meta_window_actor_set_updates_frozen  (MetaWindowActor *self,
                                                gboolean         updates_frozen);
-void     meta_window_actor_queue_frame_drawn   (MetaWindowActor *self,
-                                                gboolean         no_delay_frame);

 cairo_region_t *meta_window_actor_get_obscured_region (MetaWindowActor *self);

--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@ -1,11 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * SECTION:meta-window-actor
- * @title: MetaWindowActor
- * @short_description: An actor representing a top-level window in the scene graph
- */
-
 #include <config.h>

 #include <math.h>
@ -73,11 +67,10 @@ struct _MetaWindowActorPrivate

  gchar *           desc;

-  /* A region that matches the shape of the window, including frame bounds */
+  /* If the window is shaped, a region that matches the shape */
  cairo_region_t   *shape_region;
-  /* The opaque region, from _NET_WM_OPAQUE_REGION, intersected with
-   * the shape region. */
-  cairo_region_t   *opaque_region;
+  /* A rectangular region with the visible extents of the window */
+  cairo_region_t   *bounding_region;
  /* The region we should clip to when painting the shadow */
  cairo_region_t   *shadow_clip;

@ -86,6 +79,7 @@ struct _MetaWindowActorPrivate

  gint              last_width;
  gint              last_height;
+  MetaFrameBorders  last_borders;

  gint              freeze_count;

@ -113,7 +107,6 @@ struct _MetaWindowActorPrivate

  guint		    needs_damage_all       : 1;
  guint		    received_damage        : 1;
-  guint             repaint_scheduled      : 1;

  /* If set, the client needs to be sent a _NET_WM_FRAME_DRAWN
   * client message using the most recent frame in ->frames */
@ -133,10 +126,6 @@ struct _MetaWindowActorPrivate
  guint             no_more_x_calls        : 1;

  guint             unredirected           : 1;
-
-  /* This is used to detect fullscreen windows that need to be unredirected */
-  guint             full_damage_frames_count;
-  guint             does_full_damage  : 1;
 };

 typedef struct _FrameData FrameData;
@ -180,9 +169,7 @@ static gboolean meta_window_actor_has_shadow (MetaWindowActor *self);

 static void meta_window_actor_handle_updates (MetaWindowActor *self);

-static void check_needs_reshape (MetaWindowActor *self);
-
-G_DEFINE_TYPE (MetaWindowActor, meta_window_actor, CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE (MetaWindowActor, meta_window_actor, CLUTTER_TYPE_GROUP);

 static void
 frame_data_free (FrameData *frame)
@ -366,7 +353,7 @@ meta_window_actor_constructed (GObject *object)
    {
      priv->actor = meta_shaped_texture_new ();

-      clutter_actor_add_child (CLUTTER_ACTOR (self), priv->actor);
+      clutter_container_add_actor (CLUTTER_CONTAINER (self), priv->actor);

      /*
       * Since we are holding a pointer to this actor independently of the
@ -388,14 +375,11 @@ meta_window_actor_constructed (GObject *object)
       * This is the case where existing window is gaining/loosing frame.
       * Just ensure the actor is top most (i.e., above shadow).
       */
-      clutter_actor_set_child_above_sibling (CLUTTER_ACTOR (self), priv->actor, NULL);
+      clutter_actor_raise_top (priv->actor);
    }

  meta_window_actor_update_opacity (self);
-
-  /* Start off with an empty region to maintain the invariant that
-     the shape region is always set */
-  priv->shape_region = cairo_region_create();
+  meta_window_actor_update_shape (self);
 }

 static void
@ -421,7 +405,7 @@ meta_window_actor_dispose (GObject *object)
  meta_window_actor_detach (self);

  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
-  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);
+  g_clear_pointer (&priv->bounding_region, cairo_region_destroy);
  g_clear_pointer (&priv->shadow_clip, cairo_region_destroy);

  g_clear_pointer (&priv->shadow_class, g_free);
@ -456,7 +440,6 @@ meta_window_actor_finalize (GObject *object)
  MetaWindowActor        *self = META_WINDOW_ACTOR (object);
  MetaWindowActorPrivate *priv = self->priv;

-  g_list_free_full (priv->frames, (GDestroyNotify) frame_data_free);
  g_free (priv->desc);

  G_OBJECT_CLASS (meta_window_actor_parent_class)->finalize (object);
@ -592,7 +575,16 @@ meta_window_actor_get_shape_bounds (MetaWindowActor       *self,
 {
  MetaWindowActorPrivate *priv = self->priv;

-  cairo_region_get_extents (priv->shape_region, bounds);
+  /* We need to be defensive here because there are corner cases
+   * where getting the shape fails on a window being destroyed
+   * and similar.
+   */
+  if (priv->shape_region)
+    cairo_region_get_extents (priv->shape_region, bounds);
+  else if (priv->bounding_region)
+    cairo_region_get_extents (priv->bounding_region, bounds);
+  else
+    bounds->x = bounds->y = bounds->width = bounds->height = 0;
 }

 static void
@ -792,7 +784,6 @@ meta_window_actor_has_shadow (MetaWindowActor *self)

 /**
 * meta_window_actor_get_x_window: (skip)
- * @self: a #MetaWindowActor
 *
 */
 Window
@ -806,7 +797,6 @@ meta_window_actor_get_x_window (MetaWindowActor *self)

 /**
 * meta_window_actor_get_meta_window:
- * @self: a #MetaWindowActor
 *
 * Gets the #MetaWindow object that the the #MetaWindowActor is displaying
 *
@ -820,7 +810,6 @@ meta_window_actor_get_meta_window (MetaWindowActor *self)

 /**
 * meta_window_actor_get_texture:
- * @self: a #MetaWindowActor
 *
 * Gets the ClutterActor that is used to display the contents of the window
 *
@ -834,7 +823,6 @@ meta_window_actor_get_texture (MetaWindowActor *self)

 /**
 * meta_window_actor_is_destroyed:
- * @self: a #MetaWindowActor
 *
 * Gets whether the X window that the actor was displaying has been destroyed
 *
@ -928,7 +916,7 @@ static void
 meta_window_actor_damage_all (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  CoglTexture *texture;
+  CoglHandle texture;

  if (!priv->needs_damage_all)
    return;
@ -944,7 +932,6 @@ meta_window_actor_damage_all (MetaWindowActor *self)
                                   cogl_texture_get_height (texture));

  priv->needs_damage_all = FALSE;
-  priv->repaint_scheduled = TRUE;
 }

 static void
@ -962,8 +949,8 @@ meta_window_actor_thaw (MetaWindowActor *self)
  if (self->priv->freeze_count)
    return;

-  /* We sometimes ignore moves and resizes on frozen windows */
-  meta_window_actor_sync_actor_geometry (self, FALSE);
+  /* We ignore moves and resizes on frozen windows */
+  meta_window_actor_sync_actor_position (self);

  /* We do this now since we might be going right back into the
   * frozen state */
@ -974,41 +961,17 @@ meta_window_actor_thaw (MetaWindowActor *self)
   * don't know what real damage has happened. */
  if (self->priv->needs_damage_all)
    meta_window_actor_damage_all (self);
-}
-
-void
-meta_window_actor_queue_frame_drawn (MetaWindowActor *self,
-                                     gboolean         no_delay_frame)
-{
-  MetaWindowActorPrivate *priv = self->priv;
-  FrameData *frame = g_slice_new0 (FrameData);
-
-  priv->needs_frame_drawn = TRUE;
-
-  frame->sync_request_serial = priv->window->sync_request_serial;
-
-  priv->frames = g_list_prepend (priv->frames, frame);
-
-  if (no_delay_frame)
+  else if (self->priv->needs_frame_drawn != 0)
    {
-      ClutterActor *stage = clutter_actor_get_stage (CLUTTER_ACTOR (self));
-      clutter_stage_skip_sync_delay (CLUTTER_STAGE (stage));
-    }
-
-  if (!priv->repaint_scheduled)
-    {
-      /* A frame was marked by the client without actually doing any
-       * damage, or while we had the window frozen (e.g. during an
-       * interactive resize.) We need to make sure that the
-       * pre_paint/post_paint functions get called, enabling us to
-       * send a _NET_WM_FRAME_DRAWN. We do a 1-pixel redraw to get
-       * consistent timing with non-empty frames.
+      /* A frame was marked by the client without actually doing any damage;
+       * we need to make sure that the pre_paint/post_paint functions
+       * get called, enabling us to send a _NET_WM_FRAME_DRAWN. We do a
+       * 1-pixel redraw to get consistent timing with non-empty frames.
       */
-      if (priv->mapped && !priv->needs_pixmap)
+      if (self->priv->mapped && !self->priv->needs_pixmap)
        {
          const cairo_rectangle_int_t clip = { 0, 0, 1, 1 };
-          clutter_actor_queue_redraw_with_clip (priv->actor, &clip);
-          priv->repaint_scheduled = TRUE;
+          clutter_actor_queue_redraw_with_clip (self->priv->actor, &clip);
        }
    }
 }
@ -1023,12 +986,6 @@ meta_window_actor_effect_in_progress (MetaWindowActor *self)
 	  self->priv->destroy_in_progress);
 }

-static gboolean
-is_frozen (MetaWindowActor *self)
-{
-  return self->priv->freeze_count ? TRUE : FALSE;
-}
-
 static void
 meta_window_actor_queue_create_pixmap (MetaWindowActor *self)
 {
@ -1039,9 +996,6 @@ meta_window_actor_queue_create_pixmap (MetaWindowActor *self)
  if (!priv->mapped)
    return;

-  if (is_frozen (self))
-    return;
-
  /* This will cause the compositor paint function to be run
   * if the actor is visible or a clone of the actor is visible.
   * if the actor isn't visible in any way, then we don't
@ -1132,7 +1086,7 @@ meta_window_actor_after_effects (MetaWindowActor *self)
    }

  meta_window_actor_sync_visibility (self);
-  meta_window_actor_sync_actor_geometry (self, FALSE);
+  meta_window_actor_sync_actor_position (self);

  if (!meta_window_is_mapped (priv->window))
    meta_window_actor_detach (self);
@ -1247,31 +1201,47 @@ gboolean
 meta_window_actor_should_unredirect (MetaWindowActor *self)
 {
  MetaWindow *metaWindow = meta_window_actor_get_meta_window (self);
+  MetaScreen *screen = meta_window_get_screen (metaWindow);
  MetaWindowActorPrivate *priv = self->priv;
+  int screen_width, screen_height;
+  MetaRectangle window_rect, monitor_rect;
+  int num_monitors = meta_screen_get_n_monitors (screen);
+  int i;

  if (meta_window_requested_dont_bypass_compositor (metaWindow))
    return FALSE;

+  if (!meta_window_is_override_redirect (metaWindow) &&
+      !meta_window_requested_bypass_compositor (metaWindow))
+    return FALSE;
+
  if (priv->opacity != 0xff)
    return FALSE;

-  if (metaWindow->has_shape)
-    return FALSE;
-
  if (priv->argb32 && !meta_window_requested_bypass_compositor (metaWindow))
    return FALSE;

-  if (!meta_window_is_monitor_sized (metaWindow))
+  if (metaWindow->has_shape)
    return FALSE;

-  if (meta_window_requested_bypass_compositor (metaWindow))
+  if (meta_window_requested_bypass_compositor (metaWindow) &&
+      meta_window_is_fullscreen (metaWindow))
    return TRUE;

-  if (meta_window_is_override_redirect (metaWindow))
+  meta_screen_get_size (screen, &screen_width, &screen_height);
+  meta_window_get_outer_rect (metaWindow, &window_rect);
+
+  if (window_rect.x == 0 && window_rect.y == 0 &&
+      window_rect.width == screen_width && window_rect.height == screen_height)
    return TRUE;

-  if (priv->does_full_damage)
-    return TRUE;
+  for (i = 0; i < num_monitors; i++)
+    {
+      meta_screen_get_monitor_geometry (screen , i, &monitor_rect);
+      if (monitor_rect.x == window_rect.x && monitor_rect.y == window_rect.y &&
+          monitor_rect.width == window_rect.width && monitor_rect.height == window_rect.height)
+        return TRUE;
+    }

  return FALSE;
 }
@ -1290,7 +1260,7 @@ meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state)
      meta_error_trap_push (display);
      XCompositeRedirectWindow (xdisplay, xwin, CompositeRedirectManual);
      meta_error_trap_pop (display);
-      meta_window_actor_detach (self);
+      meta_window_actor_queue_create_pixmap (self);
      self->priv->unredirected = FALSE;
    }
  else
@ -1352,31 +1322,28 @@ meta_window_actor_destroy (MetaWindowActor *self)
    clutter_actor_destroy (CLUTTER_ACTOR (self));
 }

+static gboolean
+is_frozen (MetaWindowActor *self)
+{
+  return self->priv->freeze_count ? TRUE : FALSE;
+}
+
 void
-meta_window_actor_sync_actor_geometry (MetaWindowActor *self,
-                                       gboolean         did_placement)
+meta_window_actor_sync_actor_position (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
  MetaRectangle window_rect;

-  /* Normally we want freezing a window to also freeze its position; this allows
-   * windows to atomically move and resize together, either under app control,
-   * or because the user is resizing from the left/top. But on initial placement
-   * we need to assign a position, since immediately after the window
-   * is shown, the map effect will go into effect and prevent further geometry
-   * updates.
-   */
-  if (is_frozen (self) && !did_placement)
-    return;
-
  meta_window_get_input_rect (priv->window, &window_rect);

+  if (is_frozen (self))
+    return;
+
  if (priv->last_width != window_rect.width ||
      priv->last_height != window_rect.height)
    {
      priv->size_changed = TRUE;
      meta_window_actor_queue_create_pixmap (self);
-      meta_window_actor_update_shape (self);

      priv->last_width = window_rect.width;
      priv->last_height = window_rect.height;
@ -1430,7 +1397,7 @@ meta_window_actor_show (MetaWindowActor   *self,
      event == 0 ||
      !start_simple_effect (self, event))
    {
-      clutter_actor_show (CLUTTER_ACTOR (self));
+      clutter_actor_show_all (CLUTTER_ACTOR (self));
      priv->redecorating = FALSE;
    }
 }
@ -1544,7 +1511,6 @@ meta_window_actor_new (MetaWindow *window)
  MetaWindowActorPrivate *priv;
  MetaFrame		 *frame;
  Window		  top_window;
-  ClutterActor           *window_group;

  frame = meta_window_get_frame (window);
  if (frame)
@ -1572,28 +1538,15 @@ meta_window_actor_new (MetaWindow *window)
  meta_window_actor_set_updates_frozen (self,
                                        meta_window_updates_are_frozen (priv->window));

-  /* If a window doesn't start off with updates frozen, we should
-   * we should send a _NET_WM_FRAME_DRAWN immediately after the first drawn.
-   */
-  if (priv->window->extended_sync_request_counter && !priv->updates_frozen)
-    meta_window_actor_queue_frame_drawn (self, FALSE);
-
-  meta_window_actor_sync_actor_geometry (self, priv->window->placed);
+  meta_window_actor_sync_actor_position (self);

  /* Hang our compositor window state off the MetaWindow for fast retrieval */
  meta_window_set_compositor_private (window, G_OBJECT (self));

-  if (window->layer == META_LAYER_OVERRIDE_REDIRECT)
-    window_group = info->top_window_group;
-  else
-    window_group = info->window_group;
-
-  clutter_actor_add_child (window_group, CLUTTER_ACTOR (self));
-
+  clutter_container_add_actor (CLUTTER_CONTAINER (info->window_group),
+			       CLUTTER_ACTOR (self));
  clutter_actor_hide (CLUTTER_ACTOR (self));

-  clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
-
  /* Initial position in the stack is arbitrary; stacking will be synced
   * before we first paint.
   */
@ -1630,6 +1583,55 @@ meta_window_actor_unmapped (MetaWindowActor *self)
  priv->needs_pixmap = FALSE;
 }

+static void
+meta_window_actor_update_bounding_region_and_borders (MetaWindowActor *self,
+                                                      int              width,
+                                                      int              height)
+{
+  MetaWindowActorPrivate *priv = self->priv;
+  MetaFrameBorders borders;
+  cairo_rectangle_int_t bounding_rectangle;
+
+  meta_frame_calc_borders (priv->window->frame, &borders);
+
+  bounding_rectangle.x = borders.invisible.left;
+  bounding_rectangle.y = borders.invisible.top;
+
+  width -= borders.invisible.left + borders.invisible.right;
+  height -= borders.invisible.top + borders.invisible.bottom;
+
+  bounding_rectangle.width = width;
+  bounding_rectangle.height = height;
+
+  if (priv->bounding_region != NULL)
+    {
+      cairo_rectangle_int_t old_bounding_rectangle;
+      cairo_region_get_extents (priv->bounding_region, &old_bounding_rectangle);
+
+      /* Because the bounding region doesn't include the invisible borders,
+       * we need to make sure that the border sizes haven't changed before
+       * short-circuiting early.
+       */
+      if (bounding_rectangle.width == old_bounding_rectangle.width &&
+          bounding_rectangle.height == old_bounding_rectangle.height &&
+          priv->last_borders.invisible.left == borders.invisible.left &&
+          priv->last_borders.invisible.right == borders.invisible.right &&
+          priv->last_borders.invisible.top == borders.invisible.top &&
+          priv->last_borders.invisible.bottom == borders.invisible.bottom)
+        return;
+    }
+
+  priv->last_borders = borders;
+
+  g_clear_pointer (&priv->bounding_region, cairo_region_destroy);
+
+  priv->bounding_region = cairo_region_create_rectangle (&bounding_rectangle);
+
+  meta_window_actor_update_shape (self);
+
+  g_signal_emit (self, signals[SIZE_CHANGED], 0);
+}
+
 /**
 * meta_window_actor_get_obscured_region:
 * @self: a #MetaWindowActor
@ -1645,8 +1647,13 @@ meta_window_actor_get_obscured_region (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

-  if (priv->back_pixmap && priv->opacity == 0xff)
-    return priv->opaque_region;
+  if (!priv->argb32 && priv->opacity == 0xff && priv->back_pixmap)
+    {
+      if (priv->shape_region)
+        return priv->shape_region;
+      else
+        return priv->bounding_region;
+    }
  else
    return NULL;
 }
@ -1794,7 +1801,7 @@ check_needs_pixmap (MetaWindowActor *self)

  if (priv->back_pixmap == None)
    {
-      CoglTexture *texture;
+      CoglHandle texture;

      meta_error_trap_push (display);

@ -1815,6 +1822,7 @@ check_needs_pixmap (MetaWindowActor *self)
      if (priv->back_pixmap == None)
        {
          meta_verbose ("Unable to get named pixmap for %p\n", self);
+          meta_window_actor_update_bounding_region_and_borders (self, 0, 0);
          goto out;
        }

@ -1832,19 +1840,12 @@ check_needs_pixmap (MetaWindowActor *self)
       * do it here.
       * See: http://bugzilla.clutter-project.org/show_bug.cgi?id=2236
       */
-      if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (COGL_TEXTURE_PIXMAP_X11 (texture))))
+      if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (texture)))
        g_warning ("NOTE: Not using GLX TFP!\n");

-      /* ::size-changed is supposed to refer to meta_window_get_outer_rect().
-       * Emitting it here works pretty much OK because a new value of the
-       * *input* rect (which is the outer rect with the addition of invisible
-       * borders) forces a new pixmap and we get here. In the rare case where
-       * a change to the window size was exactly balanced by a change to the
-       * invisible borders, we would miss emitting the signal. We would also
-       * emit spurious signals when we get a new pixmap without a new size,
-       * but that should be mostly harmless.
-       */
-      g_signal_emit (self, signals[SIZE_CHANGED], 0);
+      meta_window_actor_update_bounding_region_and_borders (self,
+                                                            cogl_texture_get_width (texture),
+                                                            cogl_texture_get_height (texture));
    }

  priv->needs_pixmap = FALSE;
@ -1901,17 +1902,25 @@ check_needs_shadow (MetaWindowActor *self)
  if (*shadow_location == NULL && should_have_shadow)
    {
      if (priv->shadow_shape == NULL)
-        priv->shadow_shape = meta_window_shape_new (priv->shape_region);
+        {
+          if (priv->shape_region)
+            priv->shadow_shape = meta_window_shape_new (priv->shape_region);
+          else if (priv->bounding_region)
+            priv->shadow_shape = meta_window_shape_new (priv->bounding_region);
+        }

-      MetaShadowFactory *factory = meta_shadow_factory_get_default ();
-      const char *shadow_class = meta_window_actor_get_shadow_class (self);
-      cairo_rectangle_int_t shape_bounds;
+      if (priv->shadow_shape != NULL)
+        {
+          MetaShadowFactory *factory = meta_shadow_factory_get_default ();
+          const char *shadow_class = meta_window_actor_get_shadow_class (self);
+          cairo_rectangle_int_t shape_bounds;

-      meta_window_actor_get_shape_bounds (self, &shape_bounds);
-      *shadow_location = meta_shadow_factory_get_shadow (factory,
-                                                         priv->shadow_shape,
-                                                         shape_bounds.width, shape_bounds.height,
-                                                         shadow_class, appears_focused);
+          meta_window_actor_get_shape_bounds (self, &shape_bounds);
+          *shadow_location = meta_shadow_factory_get_shadow (factory,
+                                                             priv->shadow_shape,
+                                                             shape_bounds.width, shape_bounds.height,
+                                                             shadow_class, appears_focused);
+        }
    }

  if (old_shadow != NULL)
@ -1923,29 +1932,11 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
                                  XDamageNotifyEvent *event)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  MetaCompScreen *info = meta_screen_get_compositor_data (priv->screen);

  priv->received_damage = TRUE;

-  if (meta_window_is_fullscreen (priv->window) && g_list_last (info->windows)->data == self && !priv->unredirected)
-    {
-      MetaRectangle window_rect;
-      meta_window_get_outer_rect (priv->window, &window_rect);
-
-      if (window_rect.x == event->area.x &&
-          window_rect.y == event->area.y &&
-          window_rect.width == event->area.width &&
-          window_rect.height == event->area.height)
-        priv->full_damage_frames_count++;
-      else
-        priv->full_damage_frames_count = 0;
-
-      if (priv->full_damage_frames_count >= 100)
-        priv->does_full_damage = TRUE;
-    }
-
  /* Drop damage event for unredirected windows */
-  if (priv->unredirected)
+  if (self->priv->unredirected)
    return;

  if (is_frozen (self))
@ -1976,7 +1967,6 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
                                   event->area.y,
                                   event->area.width,
                                   event->area.height);
-  priv->repaint_scheduled = TRUE;
 }

 void
@ -2106,13 +2096,13 @@ build_and_scan_frame_mask (MetaWindowActor       *self,
  MetaWindowActorPrivate *priv = self->priv;
  guchar *mask_data;
  guint tex_width, tex_height;
-  CoglTexture *paint_tex, *mask_texture;
+  CoglHandle paint_tex, mask_texture;
  int stride;
  cairo_t *cr;
  cairo_surface_t *surface;

  paint_tex = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
-  if (paint_tex == NULL)
+  if (paint_tex == COGL_INVALID_HANDLE)
    return;

  tex_width = cogl_texture_get_width (paint_tex);
@ -2181,7 +2171,7 @@ build_and_scan_frame_mask (MetaWindowActor       *self,

  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor),
                                        mask_texture);
-  cogl_object_unref (mask_texture);
+  cogl_handle_unref (mask_texture);

  g_free (mask_data);
 }
@ -2197,18 +2187,9 @@ check_needs_reshape (MetaWindowActor *self)
  cairo_rectangle_int_t client_area;
  gboolean needs_mask;

-  if (!priv->mapped)
-    return;
-
  if (!priv->needs_reshape)
    return;

-  if (priv->shadow_shape != NULL)
-    {
-      meta_window_shape_unref (priv->shadow_shape);
-      priv->shadow_shape = NULL;
-    }
-
  meta_frame_calc_borders (priv->window->frame, &borders);

  client_area.x = borders.total.left;
@ -2216,9 +2197,8 @@ check_needs_reshape (MetaWindowActor *self)
  client_area.width = priv->window->rect.width;
  client_area.height = priv->window->rect.height;

-  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), NULL);
+  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), COGL_INVALID_HANDLE);
  g_clear_pointer (&priv->shape_region, cairo_region_destroy);
-  g_clear_pointer (&priv->opaque_region, cairo_region_destroy);

 #ifdef HAVE_SHAPE
  if (priv->window->has_shape)
@ -2259,18 +2239,7 @@ check_needs_reshape (MetaWindowActor *self)

  needs_mask = (region != NULL) || (priv->window->frame != NULL);

-  if (region != NULL)
-    {
-      /* The shape we get back from the client may have coordinates
-       * outside of the frame. The X SHAPE Extension requires that
-       * the overall shape the client provides never exceeds the
-       * "bounding rectangle" of the window -- the shape that the
-       * window would have gotten if it was unshaped. In our case,
-       * this is simply the client area.
-       */
-      cairo_region_intersect_rectangle (region, &client_area);
-    }
-  else
+  if (region == NULL)
    {
      /* If we don't have a shape on the server, that means that
       * we have an implicit shape of one rectangle covering the
@ -2278,30 +2247,6 @@ check_needs_reshape (MetaWindowActor *self)
      region = cairo_region_create_rectangle (&client_area);
    }

-  /* The region at this point should be constrained to the
-   * bounds of the client rectangle. */
-
-  if (priv->argb32 && priv->window->opaque_region != NULL)
-    {
-      /* The opaque region is defined to be a part of the
-       * window which ARGB32 will always paint with opaque
-       * pixels. For these regions, we want to avoid painting
-       * windows and shadows beneath them.
-       *
-       * If the client gives bad coordinates where it does not
-       * fully paint, the behavior is defined by the specification
-       * to be undefined, and considered a client bug. In mutter's
-       * case, graphical glitches will occur.
-       */
-      priv->opaque_region = cairo_region_copy (priv->window->opaque_region);
-      cairo_region_translate (priv->opaque_region, client_area.x, client_area.y);
-      cairo_region_intersect (priv->opaque_region, region);
-    }
-  else if (priv->argb32)
-    priv->opaque_region = NULL;
-  else
-    priv->opaque_region = cairo_region_reference (region);
-
  if (needs_mask)
    {
      /* This takes the region, generates a mask using GTK+
@ -2313,6 +2258,20 @@ check_needs_reshape (MetaWindowActor *self)

  priv->shape_region = region;

+  /* Our "shape_region" is called the "bounding region" in the X Shape
+   * Extension Documentation.
+   *
+   * Our "bounding_region" is called the "bounding rectangle", which defines
+   * the shape of the window as if it the window was unshaped.
+   *
+   * The X Shape extension requires that the "bounding region" can never
+   * extend outside the "bounding rectangle", and says it must be implicitly
+   * clipped before rendering. The region we get back hasn't been clipped.
+   * We explicitly clip the region here.
+   */
+  if (priv->bounding_region != NULL)
+    cairo_region_intersect (priv->shape_region, priv->bounding_region);
+
  priv->needs_reshape = FALSE;
  meta_window_actor_invalidate_shadow (self);
 }
@ -2323,9 +2282,11 @@ meta_window_actor_update_shape (MetaWindowActor *self)
  MetaWindowActorPrivate *priv = self->priv;

  priv->needs_reshape = TRUE;
-
-  if (is_frozen (self))
-    return;
+  if (priv->shadow_shape != NULL)
+    {
+      meta_window_shape_unref (priv->shadow_shape);
+      priv->shadow_shape = NULL;
+    }

  clutter_actor_queue_redraw (priv->actor);
 }
@ -2383,6 +2344,25 @@ meta_window_actor_handle_updates (MetaWindowActor *self)
  check_needs_pixmap (self);
  check_needs_reshape (self);
  check_needs_shadow (self);
+
+  if (priv->window->needs_frame_drawn)
+    {
+      FrameData *frame = g_slice_new0 (FrameData);
+
+      priv->needs_frame_drawn = TRUE;
+
+      frame->sync_request_serial = priv->window->sync_request_serial;
+
+      priv->frames = g_list_prepend (priv->frames, frame);
+
+      priv->window->needs_frame_drawn = FALSE;
+
+      if (priv->window->no_delay_frame)
+        {
+          ClutterActor *stage = clutter_actor_get_stage (CLUTTER_ACTOR (self));
+          clutter_stage_skip_sync_delay (CLUTTER_STAGE (stage));
+        }
+    }
 }

 void
@ -2410,8 +2390,6 @@ meta_window_actor_post_paint (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;

-  priv->repaint_scheduled = FALSE;
-
  if (priv->needs_frame_drawn)
    {
      MetaScreen  *screen  = priv->screen;
@ -2424,6 +2402,7 @@ meta_window_actor_post_paint (MetaWindowActor *self)

      frame->frame_drawn_time = meta_compositor_monotonic_time_to_server_time (display,
                                                                               g_get_monotonic_time ());
+
      ev.type = ClientMessage;
      ev.window = meta_window_get_xwindow (priv->window);
      ev.message_type = display->atom__NET_WM_FRAME_DRAWN;
@ -2452,7 +2431,7 @@ send_frame_timings (MetaWindowActor  *self,
  MetaDisplay *display = meta_screen_get_display (priv->screen);
  Display *xdisplay = meta_display_get_xdisplay (display);
  float refresh_rate;
-  int refresh_interval;
+  gint64 refresh_interval;

  XClientMessageEvent ev = { 0, };

@ -2464,8 +2443,7 @@ send_frame_timings (MetaWindowActor  *self,
  ev.data.l[1] = frame->sync_request_serial >> 32;

  refresh_rate = cogl_frame_info_get_refresh_rate (frame_info);
-  /* 0.0 is a flag for not known, but sanity-check against other odd numbers */
-  if (refresh_rate >= 1.0)
+  if (refresh_rate != 0.0)
    refresh_interval = (int) (0.5 + 1000000 / refresh_rate);
  else
    refresh_interval = 0;
@ -2482,7 +2460,11 @@ send_frame_timings (MetaWindowActor  *self,
        ev.data.l[2] = presentation_time_offset;
    }

-  ev.data.l[3] = refresh_interval;
+  if (refresh_interval != 0 && (gint32)refresh_interval == refresh_interval)
+    {
+      ev.data.l[3] = refresh_interval;
+    }
+
  ev.data.l[4] = 1000 * META_SYNC_DELAY;

  meta_error_trap_push (display);
@ -2525,10 +2507,6 @@ meta_window_actor_invalidate_shadow (MetaWindowActor *self)

  priv->recompute_focused_shadow = TRUE;
  priv->recompute_unfocused_shadow = TRUE;
-
-  if (is_frozen (self))
-    return;
-
  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
 }

--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@ -7,26 +7,118 @@

 #include <gdk/gdk.h> /* for gdk_rectangle_intersect() */

-#include "clutter-utils.h"
 #include "compositor-private.h"
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
 #include "meta-background-actor-private.h"
-#include "meta-background-group-private.h"

 struct _MetaWindowGroupClass
 {
-  ClutterActorClass parent_class;
+  ClutterGroupClass parent_class;
 };

 struct _MetaWindowGroup
 {
-  ClutterActor parent;
+  ClutterGroup parent;

  MetaScreen *screen;
 };

-G_DEFINE_TYPE (MetaWindowGroup, meta_window_group, CLUTTER_TYPE_ACTOR);
+G_DEFINE_TYPE (MetaWindowGroup, meta_window_group, CLUTTER_TYPE_GROUP);
+
+/* This file uses pixel-aligned region computation to determine what
+ * can be clipped out. This only really works if everything is aligned
+ * to the pixel grid - not scaled or rotated and at integer offsets.
+ *
+ * (This could be relaxed - if we turned off filtering for unscaled
+ * windows then windows would be, by definition aligned to the pixel
+ * grid. And for rectangular windows without a shape, the outline that
+ * we draw for an unrotated window is always a rectangle because we
+ * don't use antialasing for the window boundary - with or without
+ * filtering, with or without a scale. But figuring out exactly
+ * what pixels will be drawn by the graphics system in these cases
+ * gets tricky, so we just go for the easiest part - no scale,
+ * and at integer offsets.)
+ *
+ * The way we check for pixel-aligned is by looking at the
+ * transformation into screen space of the allocation box of an actor
+ * and and checking if the corners are "close enough" to integral
+ * pixel values.
+ */
+
+/* The definition of "close enough" to integral pixel values is
+ * equality when we convert to 24.8 fixed-point.
+ */
+static inline int
+round_to_fixed (float x)
+{
+  return roundf (x * 256);
+}
+
+/* This helper function checks if (according to our fixed point precision)
+ * the vertices @verts form a box of width @widthf and height @heightf
+ * located at integral coordinates. These coordinates are returned
+ * in @x_origin and @y_origin.
+ */
+static gboolean
+vertices_are_untransformed (ClutterVertex *verts,
+                            float          widthf,
+                            float          heightf,
+                            int           *x_origin,
+                            int           *y_origin)
+{
+  int width, height;
+  int v0x, v0y, v1x, v1y, v2x, v2y, v3x, v3y;
+  int x, y;
+
+  width = round_to_fixed (widthf); height = round_to_fixed (heightf);
+
+  v0x = round_to_fixed (verts[0].x); v0y = round_to_fixed (verts[0].y);
+  v1x = round_to_fixed (verts[1].x); v1y = round_to_fixed (verts[1].y);
+  v2x = round_to_fixed (verts[2].x); v2y = round_to_fixed (verts[2].y);
+  v3x = round_to_fixed (verts[3].x); v3y = round_to_fixed (verts[3].y);
+
+  /* Using shifting for converting fixed => int, gets things right for
+   * negative values. / 256. wouldn't do the same
+   */
+  x = v0x >> 8;
+  y = v0y >> 8;
+
+  /* At integral coordinates? */
+  if (x * 256 != v0x || y * 256 != v0y)
+    return FALSE;
+
+  /* Not scaled? */
+  if (v1x - v0x != width || v2y - v0y != height)
+    return FALSE;
+
+  /* Not rotated/skewed? */
+  if (v0x != v2x || v0y != v1y ||
+      v3x != v1x || v3y != v2y)
+    return FALSE;
+
+  *x_origin = x;
+  *y_origin = y;
+
+  return TRUE;
+}
+
+/* Check if an actor is "untransformed" - which actually means transformed by
+ * at most a integer-translation. The integer translation, if any, is returned.
+ */
+static gboolean
+actor_is_untransformed (ClutterActor *actor,
+                        int          *x_origin,
+                        int          *y_origin)
+{
+  gfloat widthf, heightf;
+  ClutterVertex verts[4];
+
+  clutter_actor_get_size (actor, &widthf, &heightf);
+  clutter_actor_get_abs_allocation_vertices (actor, verts);
+
+  return vertices_are_untransformed (verts, widthf, heightf, x_origin, y_origin);
+}

 /* Help macros to scale from OpenGL <-1,1> coordinates system to
 * window coordinates ranging [0,window-size]. Borrowed from clutter-utils.c
@ -83,7 +175,7 @@ painting_untransformed (MetaWindowGroup *window_group,
                                      viewport[3], viewport[1]);
    }

-  return meta_actor_vertices_are_untransformed (vertices, width, height, x_origin, y_origin);
+  return vertices_are_untransformed (vertices, width, height, x_origin, y_origin);
 }

 static void
@ -114,7 +206,7 @@ meta_window_group_paint (ClutterActor *actor)
   * on the stage.
   */
  if (!painting_untransformed (window_group, &paint_x_origin, &paint_y_origin) ||
-      !meta_actor_is_untransformed (actor, &actor_x_origin, &actor_y_origin))
+      !actor_is_untransformed (actor, &actor_x_origin, &actor_y_origin))
    {
      CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);
      return;
@ -127,7 +219,7 @@ meta_window_group_paint (ClutterActor *actor)
   * and subtract the opaque area of each window out of the visible
   * region that we pass to the windows below.
   */
-  children = clutter_actor_get_children (actor);
+  children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
  children = g_list_reverse (children);

  /* Get the clipped redraw bounds from Clutter so that we can avoid
@ -183,7 +275,7 @@ meta_window_group_paint (ClutterActor *actor)
          MetaWindowActor *window_actor = l->data;
          int x, y;

-          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
+          if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
            continue;

          x += paint_x_offset;
@ -204,24 +296,19 @@ meta_window_group_paint (ClutterActor *actor)
          meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
          cairo_region_translate (visible_region, x, y);
        }
-      else if (META_IS_BACKGROUND_ACTOR (l->data) ||
-               META_IS_BACKGROUND_GROUP (l->data))
+      else if (META_IS_BACKGROUND_ACTOR (l->data))
        {
-          ClutterActor *background_actor = l->data;
+          MetaBackgroundActor *background_actor = l->data;
          int x, y;

-          if (!meta_actor_is_untransformed (CLUTTER_ACTOR (background_actor), &x, &y))
+          if (!actor_is_untransformed (CLUTTER_ACTOR (background_actor), &x, &y))
            continue;

          x += paint_x_offset;
          y += paint_y_offset;

          cairo_region_translate (visible_region, - x, - y);
-
-          if (META_IS_BACKGROUND_GROUP (background_actor))
-            meta_background_group_set_visible_region (META_BACKGROUND_GROUP (background_actor), visible_region);
-          else
-            meta_background_actor_set_visible_region (META_BACKGROUND_ACTOR (background_actor), visible_region);
+          meta_background_actor_set_visible_region (background_actor, visible_region);
          cairo_region_translate (visible_region, x, y);
        }
    }
@ -250,20 +337,12 @@ meta_window_group_paint (ClutterActor *actor)
  g_list_free (children);
 }

-static gboolean
-meta_window_group_get_paint_volume (ClutterActor       *actor,
-                                    ClutterPaintVolume *volume)
-{
-  return clutter_paint_volume_set_from_allocation (volume, actor);
-}
-
 static void
 meta_window_group_class_init (MetaWindowGroupClass *klass)
 {
  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);

  actor_class->paint = meta_window_group_paint;
-  actor_class->get_paint_volume = meta_window_group_get_paint_volume;
 }

 static void
--- a/src/compositor/meta-window-group.h
+++ b/src/compositor/meta-window-group.h
@ -10,15 +10,13 @@
 /**
 * MetaWindowGroup:
 *
- * This class is a subclass of ClutterActor with special handling for
- * MetaWindowActor/MetaBackgroundActor/MetaBackgroundGroup when painting
- * children.
- *
- * When we are painting a stack of 5-10 maximized windows, the
- * standard bottom-to-top method of drawing every actor results in a
- * tremendous amount of overdraw and can easily max out the available
- * memory bandwidth on a low-end graphics chipset. It's even worse if
- * window textures are being accessed over the AGP bus.
+ * This class is a subclass of ClutterGroup with special handling for
+ * MetaWindowActor when painting the group. When we are painting a stack
+ * of 5-10 maximized windows, the standard bottom-to-top method of
+ * drawing every actor results in a tremendous amount of overdraw
+ * and can easily max out the available memory bandwidth on a low-end
+ * graphics chipset. It's even worse if window textures are being accessed
+ * over the AGP bus.
 *
 * The basic technique applied here is to do a pre-pass before painting
 * where we walk window from top to bottom and compute the visible area
@ -51,7 +49,4 @@ GType meta_window_group_get_type (void);

 ClutterActor *meta_window_group_new (MetaScreen *screen);

-gboolean meta_window_group_actor_is_untransformed (ClutterActor *actor,
-                                                   int          *x_origin,
-                                                   int          *y_origin);
 #endif /* META_WINDOW_GROUP_H */
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@ -23,7 +23,6 @@

 #include <meta/meta-plugin.h>
 #include <meta/window.h>
-#include <meta/util.h>

 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
@ -69,7 +68,6 @@ struct _MetaDefaultPluginClass

 static GQuark actor_data_quark = 0;

-static void start      (MetaPlugin      *plugin);
 static void minimize   (MetaPlugin      *plugin,
                        MetaWindowActor *actor);
 static void map        (MetaPlugin      *plugin,
@ -193,7 +191,6 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
  gobject_class->set_property    = meta_default_plugin_set_property;
  gobject_class->get_property    = meta_default_plugin_get_property;

-  plugin_class->start            = start;
  plugin_class->map              = map;
  plugin_class->minimize         = minimize;
  plugin_class->maximize         = maximize;
@ -285,29 +282,6 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
  meta_plugin_switch_workspace_completed (plugin);
 }

-static gboolean
-show_stage (MetaPlugin *plugin)
-{
-  MetaScreen *screen;
-  ClutterActor *stage;
-
-  screen = meta_plugin_get_screen (plugin);
-  stage = meta_get_stage_for_screen (screen);
-
-  clutter_actor_show (stage);
-
-  return FALSE;
-}
-
-static void
-start (MetaPlugin *plugin)
-{
-  meta_later_add (META_LATER_BEFORE_REDRAW,
-                  (GSourceFunc) show_stage,
-                  plugin,
-                  NULL);
-}
-
 static void
 switch_workspace (MetaPlugin *plugin,
                  gint from, gint to,
--- a/src/core/barrier.c
+++ b/src/core/barrier.c
@ -1,404 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; c-basic-offset: 2; -*- */
-
-/**
- * SECTION:barrier
- * @Title: MetaBarrier
- * @Short_Description: Pointer barriers
- */
-
-#include "config.h"
-
-#include <glib-object.h>
-
-#include <X11/extensions/XInput2.h>
-#include <X11/extensions/Xfixes.h>
-#include <meta/util.h>
-#include <meta/barrier.h>
-#include "display-private.h"
-#include "mutter-enum-types.h"
-#include "core.h"
-
-G_DEFINE_TYPE (MetaBarrier, meta_barrier, G_TYPE_OBJECT)
-
-enum {
-  PROP_0,
-
-  PROP_DISPLAY,
-
-  PROP_X1,
-  PROP_Y1,
-  PROP_X2,
-  PROP_Y2,
-  PROP_DIRECTIONS,
-
-  PROP_LAST,
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-enum {
-  HIT,
-  LEFT,
-
-  LAST_SIGNAL,
-};
-
-static guint obj_signals[LAST_SIGNAL];
-
-struct _MetaBarrierPrivate
-{
-  MetaDisplay *display;
-
-  int x1;
-  int y1;
-  int x2;
-  int y2;
-
-  MetaBarrierDirection directions;
-
-  PointerBarrier xbarrier;
-};
-
-static void
-meta_barrier_get_property (GObject    *object,
-                           guint       prop_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  MetaBarrier *barrier = META_BARRIER (object);
-  MetaBarrierPrivate *priv = barrier->priv;
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      g_value_set_object (value, priv->display);
-      break;
-    case PROP_X1:
-      g_value_set_int (value, priv->x1);
-      break;
-    case PROP_Y1:
-      g_value_set_int (value, priv->y1);
-      break;
-    case PROP_X2:
-      g_value_set_int (value, priv->x2);
-      break;
-    case PROP_Y2:
-      g_value_set_int (value, priv->y2);
-      break;
-    case PROP_DIRECTIONS:
-      g_value_set_flags (value, priv->directions);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_barrier_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  MetaBarrier *barrier = META_BARRIER (object);
-  MetaBarrierPrivate *priv = barrier->priv;
-  switch (prop_id)
-    {
-    case PROP_DISPLAY:
-      priv->display = g_value_get_object (value);
-      break;
-    case PROP_X1:
-      priv->x1 = g_value_get_int (value);
-      break;
-    case PROP_Y1:
-      priv->y1 = g_value_get_int (value);
-      break;
-    case PROP_X2:
-      priv->x2 = g_value_get_int (value);
-      break;
-    case PROP_Y2:
-      priv->y2 = g_value_get_int (value);
-      break;
-    case PROP_DIRECTIONS:
-      priv->directions = g_value_get_flags (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_barrier_dispose (GObject *object)
-{
-  MetaBarrier *barrier = META_BARRIER (object);
-  MetaBarrierPrivate *priv = barrier->priv;
-
-  if (meta_barrier_is_active (barrier))
-    {
-      meta_bug ("MetaBarrier wrapper %p for X barrier %ld was destroyed"
-                " while the X barrier is still active.",
-                barrier, priv->xbarrier);
-    }
-
-  G_OBJECT_CLASS (meta_barrier_parent_class)->dispose (object);
-}
-
-gboolean
-meta_barrier_is_active (MetaBarrier *barrier)
-{
-  return barrier->priv->xbarrier != 0;
-}
-
-/**
- * meta_barrier_release:
- * @barrier: The barrier to release
- * @event: The event to release the pointer for
- *
- * In XI2.3, pointer barriers provide a feature where they can
- * be temporarily released so that the pointer goes through
- * them. Pass a #MetaBarrierEvent to release the barrier for
- * this event sequence.
- */
-void
-meta_barrier_release (MetaBarrier      *barrier,
-                      MetaBarrierEvent *event)
-{
-#ifdef HAVE_XI23
-  MetaBarrierPrivate *priv = barrier->priv;
-  if (META_DISPLAY_HAS_XINPUT_23 (priv->display))
-    {
-      XIBarrierReleasePointer (priv->display->xdisplay,
-                               META_VIRTUAL_CORE_POINTER_ID,
-                               priv->xbarrier, event->event_id);
-    }
-#endif /* HAVE_XI23 */
-}
-
-static void
-meta_barrier_constructed (GObject *object)
-{
-  MetaBarrier *barrier = META_BARRIER (object);
-  MetaBarrierPrivate *priv = barrier->priv;
-  Display *dpy;
-  Window root;
-
-  g_return_if_fail (priv->x1 == priv->x2 || priv->y1 == priv->y2);
-
-  if (priv->display == NULL)
-    {
-      g_warning ("A display must be provided when constructing a barrier.");
-      return;
-    }
-
-  dpy = priv->display->xdisplay;
-  root = DefaultRootWindow (dpy);
-
-  priv->xbarrier = XFixesCreatePointerBarrier (dpy, root,
-                                               priv->x1, priv->y1,
-                                               priv->x2, priv->y2,
-                                               priv->directions, 0, NULL);
-
-  /* Take a ref that we'll release when the XID dies inside destroy(),
-   * so that the object stays alive and doesn't get GC'd. */
-  g_object_ref (barrier);
-
-  g_hash_table_insert (priv->display->xids, &priv->xbarrier, barrier);
-
-  G_OBJECT_CLASS (meta_barrier_parent_class)->constructed (object);
-}
-
-static void
-meta_barrier_class_init (MetaBarrierClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = meta_barrier_get_property;
-  object_class->set_property = meta_barrier_set_property;
-  object_class->dispose = meta_barrier_dispose;
-  object_class->constructed = meta_barrier_constructed;
-
-  obj_props[PROP_DISPLAY] =
-    g_param_spec_object ("display",
-                         "Display",
-                         "The display to construct the pointer barrier on",
-                         META_TYPE_DISPLAY,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_X1] =
-    g_param_spec_int ("x1",
-                      "X1",
-                      "The first X coordinate of the barrier",
-                      0, G_MAXSHORT, 0,
-                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_Y1] =
-    g_param_spec_int ("y1",
-                      "Y1",
-                      "The first Y coordinate of the barrier",
-                      0, G_MAXSHORT, 0,
-                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_X2] =
-    g_param_spec_int ("x2",
-                      "X2",
-                      "The second X coordinate of the barrier",
-                      0, G_MAXSHORT, G_MAXSHORT,
-                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_Y2] =
-    g_param_spec_int ("y2",
-                      "Y2",
-                      "The second Y coordinate of the barrier",
-                      0, G_MAXSHORT, G_MAXSHORT,
-                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  obj_props[PROP_DIRECTIONS] =
-    g_param_spec_flags ("directions",
-                        "Directions",
-                        "A set of directions to let the pointer through",
-                        META_TYPE_BARRIER_DIRECTION,
-                        0,
-                        G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
-
-  /**
-   * MetaBarrier::hit:
-   * @barrier: The #MetaBarrier that was hit
-   * @event: A #MetaBarrierEvent that has the details of how
-   * the barrier was hit.
-   *
-   * When a pointer barrier is hit, this will trigger. This
-   * requires an XI2-enabled server.
-   */
-  obj_signals[HIT] =
-    g_signal_new ("hit",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  META_TYPE_BARRIER_EVENT);
-
-  /**
-   * MetaBarrier::left:
-   * @barrier: The #MetaBarrier that was left
-   * @event: A #MetaBarrierEvent that has the details of how
-   * the barrier was left.
-   *
-   * When a pointer barrier hitbox was left, this will trigger.
-   * This requires an XI2-enabled server.
-   */
-  obj_signals[LEFT] =
-    g_signal_new ("left",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_FIRST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  META_TYPE_BARRIER_EVENT);
-
-  g_type_class_add_private (object_class, sizeof(MetaBarrierPrivate));
-}
-
-void
-meta_barrier_destroy (MetaBarrier *barrier)
-{
-  MetaBarrierPrivate *priv = barrier->priv;
-  Display *dpy;
-
-  if (priv->display == NULL)
-    return;
-
-  dpy = priv->display->xdisplay;
-
-  if (!meta_barrier_is_active (barrier))
-    return;
-
-  XFixesDestroyPointerBarrier (dpy, priv->xbarrier);
-  g_hash_table_remove (priv->display->xids, &priv->xbarrier);
-  priv->xbarrier = 0;
-
-  g_object_unref (barrier);
-}
-
-static void
-meta_barrier_init (MetaBarrier *barrier)
-{
-  barrier->priv = G_TYPE_INSTANCE_GET_PRIVATE (barrier, META_TYPE_BARRIER, MetaBarrierPrivate);
-}
-
-#ifdef HAVE_XI23
-static void
-meta_barrier_fire_event (MetaBarrier    *barrier,
-                         XIBarrierEvent *xevent)
-{
-  MetaBarrierEvent *event = g_slice_new0 (MetaBarrierEvent);
-
-  event->ref_count = 1;
-  event->event_id = xevent->eventid;
-  event->time = xevent->time;
-  event->dt = xevent->dtime;
-
-  event->x = xevent->root_x;
-  event->y = xevent->root_y;
-  event->dx = xevent->dx;
-  event->dy = xevent->dy;
-
-  event->released = (xevent->flags & XIBarrierPointerReleased) != 0;
-  event->grabbed = (xevent->flags & XIBarrierDeviceIsGrabbed) != 0;
-
-  switch (xevent->evtype)
-    {
-    case XI_BarrierHit:
-      g_signal_emit (barrier, obj_signals[HIT], 0, event);
-      break;
-    case XI_BarrierLeave:
-      g_signal_emit (barrier, obj_signals[LEFT], 0, event);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-}
-
-gboolean
-meta_display_process_barrier_event (MetaDisplay    *display,
-                                    XIBarrierEvent *xev)
-{
-  MetaBarrier *barrier;
-
-  barrier = g_hash_table_lookup (display->xids, &xev->barrier);
-  if (barrier != NULL)
-    {
-      meta_barrier_fire_event (barrier, xev);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-#endif /* HAVE_XI23 */
-
-static MetaBarrierEvent *
-meta_barrier_event_ref (MetaBarrierEvent *event)
-{
-  g_return_val_if_fail (event != NULL, NULL);
-  g_return_val_if_fail (event->ref_count > 0, NULL);
-
-  g_atomic_int_inc ((volatile int *)&event->ref_count);
-  return event;
-}
-
-static void
-meta_barrier_event_unref (MetaBarrierEvent *event)
-{
-  g_return_if_fail (event != NULL);
-  g_return_if_fail (event->ref_count > 0);
-
-  if (g_atomic_int_dec_and_test ((volatile int *)&event->ref_count))
-    g_slice_free (MetaBarrierEvent, event);
-}
-
-G_DEFINE_BOXED_TYPE (MetaBarrierEvent,
-                     meta_barrier_event,
-                     meta_barrier_event_ref,
-                     meta_barrier_event_unref)
--- a/src/core/bell.c
+++ b/src/core/bell.c
@ -22,8 +22,8 @@
 * 02111-1307, USA.
 */

-/*
- * SECTION:bell
+/**
+ * SECTION:Bell
 * @short_description: Ring the bell or flash the screen
 *
 * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
@ -52,9 +52,7 @@
 #include <config.h>
 #include "bell.h"
 #include "screen-private.h"
-#include "window-private.h"
 #include <meta/prefs.h>
-#include <meta/compositor.h>
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
--- a/src/core/bell.h
+++ b/src/core/bell.h
@ -28,35 +28,30 @@

 #ifdef HAVE_XKB
 /**
- * meta_bell_notify:
- * @display: The display the bell event came in on
- * @xkb_ev: The bell event we just received 
- *
 * Gives the user some kind of visual bell; in fact, this is our response
 * to any kind of bell request, but we set it up so that we only get
 * notified about visual bells, and X deals with audible ones.
 *
 * If the configure script found we had no XKB, this does not exist.
+ *
+ * \param display  The display the bell event came in on
+ * \param xkb_ev   The bell event we just received
 */
 void meta_bell_notify (MetaDisplay *display, XkbAnyEvent *xkb_ev);
 #endif

 /**
- * meta_bell_set_audible:
- * @display: The display we're configuring
- * @audible: True for an audible bell, false for a visual bell
- *
 * Turns the bell to audible or visual. This tells X what to do, but
 * not Mutter; you will need to set the "visual bell" pref for that.
 *
 * If the configure script found we had no XKB, this is a no-op.
+ *
+ * \param display  The display we're configuring
+ * \param audible  True for an audible bell, false for a visual bell
 */
 void meta_bell_set_audible (MetaDisplay *display, gboolean audible);

 /**
- * meta_bell_init:
- * @display: The display which is opening
- *
 * Initialises the bell subsystem. This involves intialising
 * XKB (which, despite being a keyboard extension, is the
 * place to look for bell notifications), then asking it
@ -69,6 +64,8 @@ void meta_bell_set_audible (MetaDisplay *display, gboolean audible);
 * we will have HAVE_XKB undefined, which will cause this
 * function to be a no-op.
 *
+ * \param display  The display which is opening
+ *
 * \bug There is a line of code that's never run that tells
 * XKB to reset the bell status after we quit. Bill H said
 * (<http://bugzilla.gnome.org/show_bug.cgi?id=99886#c12>)
@ -78,11 +75,10 @@ void meta_bell_set_audible (MetaDisplay *display, gboolean audible);
 gboolean meta_bell_init (MetaDisplay *display);

 /**
- * meta_bell_shutdown:
- * @display: The display which is closing
- *
 * Shuts down the bell subsystem.
 *
+ * \param display  The display which is closing
+ *
 * \bug This is never called! If we had XkbSetAutoResetControls
 * enabled in meta_bell_init(), this wouldn't be a problem, but
 * we don't.
@ -90,12 +86,11 @@ gboolean meta_bell_init (MetaDisplay *display);
 void meta_bell_shutdown (MetaDisplay *display);

 /**
- * meta_bell_notify_frame_destroy:
- * @frame: The frame which is being destroyed
- *
 * Deals with a frame being destroyed. This is important because if we're
 * using a visual bell, we might be flashing the edges of the frame, and
 * so we'd have a timeout function waiting ready to un-flash them. If the
 * frame's going away, we can tell the timeout not to bother.
+ *
+ * \param frame  The frame which is being destroyed
 */
 void meta_bell_notify_frame_destroy (MetaFrame *frame);
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@ -1,10 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * SECTION:boxes
- * @Title: MetaRectangle
- * @Short_Description: Simple box operations
- */
+/* Simple box operations */

 /* 
 * Copyright (C) 2005, 2006 Elijah Newren
--- a/src/core/core.c
+++ b/src/core/core.c
@ -775,24 +775,3 @@ meta_invalidate_default_icons (void)
  g_slist_free (windows);
 }

-void
-meta_core_add_old_event_mask (Display     *xdisplay,
-                              Window       xwindow,
-                              XIEventMask *mask)
-{
-  XIEventMask *prev;
-  gint n_masks, i, j;
-
-  prev = XIGetSelectedEvents (xdisplay, xwindow, &n_masks);
-
-  for (i = 0; i < n_masks; i++)
-    {
-      if (prev[i].deviceid != XIAllMasterDevices)
-        continue;
-
-      for (j = 0; j < MIN (mask->mask_len, prev[i].mask_len); j++)
-        mask->mask[j] |= prev[i].mask[j];
-    }
-
-  XFree (prev);
-}
--- a/src/core/core.h
+++ b/src/core/core.h
@ -205,8 +205,8 @@ void meta_core_increment_event_serial (Display *display);

 void meta_invalidate_default_icons (void);

-void meta_core_add_old_event_mask (Display     *xdisplay,
-                                   Window       xwindow,
-                                   XIEventMask *mask);
-
 #endif
+
+
+
+
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@ -33,12 +33,12 @@

 #include <glib.h>
 #include <X11/Xlib.h>
+#include "eventqueue.h"
 #include <meta/common.h>
 #include <meta/boxes.h>
 #include <meta/display.h>
 #include "keybindings-private.h"
 #include <meta/prefs.h>
-#include <meta/barrier.h>

 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
@ -92,6 +92,7 @@ struct _MetaDisplay
  
  char *name;
  Display *xdisplay;
+  char *hostname;

  Window leader_window;
  Window timestamp_pinging_window;
@ -141,9 +142,10 @@ struct _MetaDisplay
  
  /*< private-ish >*/
  guint error_trap_synced_at_last_pop : 1;
+  MetaEventQueue *events;
  GSList *screens;
  MetaScreen *active_screen;
-  GHashTable *xids;
+  GHashTable *window_ids;
  int error_traps;
  int (* error_trap_handler) (Display     *display,
                              XErrorEvent *error);  
@ -219,6 +221,9 @@ struct _MetaDisplay
 #ifdef HAVE_XKB
  int         xkb_base_event_type;
  guint32     last_bell_time;
+#endif
+#ifdef HAVE_XSYNC
+  gint64      grab_sync_counter_wait_serial;
 #endif
  int	      grab_resize_timeout_id;

@ -309,14 +314,10 @@ struct _MetaDisplay
 #define META_DISPLAY_HAS_RENDER(display) ((display)->have_render)
  unsigned int have_composite : 1;
  unsigned int have_damage : 1;
+  unsigned int have_xfixes : 1;
 #define META_DISPLAY_HAS_COMPOSITE(display) ((display)->have_composite)
 #define META_DISPLAY_HAS_DAMAGE(display) ((display)->have_damage)
-#ifdef HAVE_XI23
-  gboolean have_xinput_23 : 1;
-#define META_DISPLAY_HAS_XINPUT_23(display) ((display)->have_xinput_23)
-#else
-#define META_DISPLAY_HAS_XINPUT_23(display) FALSE
-#endif /* HAVE_XI23 */
+#define META_DISPLAY_HAS_XFIXES(display) ((display)->have_xfixes)
 };

 struct _MetaDisplayClass
@ -455,16 +456,8 @@ void meta_display_queue_autoraise_callback  (MetaDisplay *display,
 void meta_display_remove_autoraise_callback (MetaDisplay *display);

 void meta_display_overlay_key_activate (MetaDisplay *display);
-void meta_display_accelerator_activate (MetaDisplay *display,
-                                        guint        action,
-                                        guint        deviceid);

 /* In above-tab-keycode.c */
 guint meta_display_get_above_tab_keycode (MetaDisplay *display);

-#ifdef HAVE_XI23
-gboolean meta_display_process_barrier_event (MetaDisplay    *display,
-                                             XIBarrierEvent *event);
-#endif /* HAVE_XI23 */
-
 #endif
--- a/src/core/display.c
+++ b/src/core/display.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/* Mutter X display handler */
+
 /* 
 * Copyright (C) 2001 Havoc Pennington
 * Copyright (C) 2002, 2003, 2004 Red Hat, Inc.
@ -23,9 +25,8 @@
 */

 /**
- * SECTION:display
- * @title: MetaDisplay
- * @short_description: Mutter X display handler
+ * SECTION:MetaDisplay
+ * @short_description: Handles operations on an X display.
 *
 * The display is represented as a #MetaDisplay struct.
 */
@ -70,7 +71,6 @@
 #include <X11/extensions/Xcomposite.h>
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xfixes.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

@ -82,7 +82,7 @@
         g == META_GRAB_OP_KEYBOARD_ESCAPING_DOCK   ||  \
         g == META_GRAB_OP_KEYBOARD_ESCAPING_GROUP)

-/*
+/**
 * SECTION:pings
 *
 * Sometimes we want to see whether a window is responding,
@ -138,7 +138,6 @@ G_DEFINE_TYPE(MetaDisplay, meta_display, G_TYPE_OBJECT);
 enum
 {
  OVERLAY_KEY,
-  ACCELERATOR_ACTIVATED,
  FOCUS_WINDOW,
  WINDOW_CREATED,
  WINDOW_DEMANDS_ATTENTION,
@ -247,14 +246,6 @@ meta_display_class_init (MetaDisplayClass *klass)
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 0);

-  display_signals[ACCELERATOR_ACTIVATED] =
-    g_signal_new ("accelerator-activated",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-
  display_signals[WINDOW_CREATED] =
    g_signal_new ("window-created",
                  G_TYPE_FROM_CLASS (klass),
@ -390,17 +381,20 @@ sn_error_trap_pop (SnDisplay *sn_display,
 #endif

 static void
-enable_compositor (MetaDisplay *display)
+enable_compositor (MetaDisplay *display,
+                   gboolean     composite_windows)
 {
  GSList *list;

  if (!META_DISPLAY_HAS_COMPOSITE (display) ||
      !META_DISPLAY_HAS_DAMAGE (display) ||
+      !META_DISPLAY_HAS_XFIXES (display) ||
      !META_DISPLAY_HAS_RENDER (display))
    {
      meta_warning (_("Missing %s extension required for compositing"),
                    !META_DISPLAY_HAS_COMPOSITE (display) ? "composite" :
-                    !META_DISPLAY_HAS_DAMAGE (display) ? "damage" : "render");
+                    !META_DISPLAY_HAS_DAMAGE (display) ? "damage" :
+                    !META_DISPLAY_HAS_XFIXES (display) ? "xfixes" : "render");
      return;
    }

@ -416,6 +410,9 @@ enable_compositor (MetaDisplay *display)
      
      meta_compositor_manage_screen (screen->display->compositor,
 				     screen);
+
+      if (composite_windows)
+        meta_screen_composite_all_windows (screen);
    }
 }

@ -475,6 +472,7 @@ meta_display_open (void)
  GSList *tmp;
  int i;
  guint32 timestamp;
+  char buf[257];

  /* A list of all atom names, so that we can intern them in one go. */
  char *atom_names[] = {
@ -509,6 +507,13 @@ meta_display_open (void)
   */
  the_display->name = g_strdup (XDisplayName (NULL));
  the_display->xdisplay = xdisplay;
+  if (gethostname (buf, sizeof(buf)-1) == 0)
+    {
+      buf[sizeof(buf)-1] = '\0';
+      the_display->hostname = g_strdup (buf);
+    }
+  else
+    the_display->hostname = NULL;
  the_display->error_trap_synced_at_last_pop = TRUE;
  the_display->error_traps = 0;
  the_display->error_trap_handler = NULL;
@ -573,15 +578,17 @@ meta_display_open (void)
                                        sn_error_trap_push,
                                        sn_error_trap_pop);
 #endif
+  
+  the_display->events = NULL;

  /* Get events */
  meta_ui_add_event_func (the_display->xdisplay,
                          event_callback,
                          the_display);
  
-  the_display->xids = g_hash_table_new (meta_unsigned_long_hash,
-                                        meta_unsigned_long_equal);
-
+  the_display->window_ids = g_hash_table_new (meta_unsigned_long_hash,
+                                          meta_unsigned_long_equal);
+  
  i = 0;
  while (i < N_IGNORED_CROSSING_SERIALS)
    {
@ -749,24 +756,20 @@ meta_display_open (void)
                  the_display->damage_error_base, 
                  the_display->damage_event_base);

+    the_display->have_xfixes = FALSE;
+
    the_display->xfixes_error_base = 0;
    the_display->xfixes_event_base = 0;

-    if (XFixesQueryExtension (the_display->xdisplay,
-                              &the_display->xfixes_event_base,
-                              &the_display->xfixes_error_base))
+    if (!XFixesQueryExtension (the_display->xdisplay,
+                               &the_display->xfixes_event_base,
+                               &the_display->xfixes_error_base))
      {
-        int xfixes_major, xfixes_minor;
-
-        XFixesQueryVersion (the_display->xdisplay, &xfixes_major, &xfixes_minor);
-
-        if (xfixes_major * 100 + xfixes_minor < 500)
-          meta_fatal ("Mutter requires XFixes 5.0");
-      }
+        the_display->xfixes_error_base = 0;
+        the_display->xfixes_event_base = 0;
+      } 
    else
-      {
-        meta_fatal ("Mutter requires XFixes 5.0");
-      }
+      the_display->have_xfixes = TRUE;

    meta_verbose ("Attempted to init XFixes, found error base %d event base %d\n",
                  the_display->xfixes_error_base, 
@ -774,7 +777,7 @@ meta_display_open (void)
  }

  {
-    int major = 2, minor = 3;
+    int major = 2, minor = 2;
    gboolean has_xi = FALSE;

    if (XQueryExtension (the_display->xdisplay,
@ -784,16 +787,8 @@ meta_display_open (void)
                         &the_display->xinput_event_base))
      {
        if (XIQueryVersion (the_display->xdisplay, &major, &minor) == Success)
-          {
-            int version = (major * 10) + minor;
-            if (version >= 22)
-              has_xi = TRUE;
-
-#ifdef HAVE_XI23
-            if (version >= 23)
-              the_display->have_xinput_23 = TRUE;
-#endif /* HAVE_XI23 */
-          }
+          if (((major * 10) + minor) >= 22)
+            has_xi = TRUE;
      }

    if (!has_xi)
@ -900,7 +895,10 @@ meta_display_open (void)
      return FALSE;
    }

-  enable_compositor (the_display);
+  /* We don't composite the windows here because they will be composited 
+     faster with the call to meta_screen_manage_all_windows further down 
+     the code */
+  enable_compositor (the_display, FALSE);
   
  meta_display_grab (the_display);
  
@ -995,14 +993,11 @@ meta_display_list_windows (MetaDisplay          *display,

  winlist = NULL;

-  g_hash_table_iter_init (&iter, display->xids);
+  g_hash_table_iter_init (&iter, display->window_ids);
  while (g_hash_table_iter_next (&iter, &key, &value))
    {
      MetaWindow *window = value;

-      if (!META_IS_WINDOW (window))
-        continue;
-
      if (!window->override_redirect ||
          (flags & META_LIST_INCLUDE_OVERRIDE_REDIRECT) != 0)
        winlist = g_slist_prepend (winlist, window);
@ -1105,7 +1100,7 @@ meta_display_close (MetaDisplay *display,
  /* Must be after all calls to meta_window_unmanage() since they
   * unregister windows
   */
-  g_hash_table_destroy (display->xids);
+  g_hash_table_destroy (display->window_ids);

  if (display->leader_window != None)
    XDestroyWindow (display->xdisplay, display->leader_window);
@ -1115,6 +1110,7 @@ meta_display_close (MetaDisplay *display,
  meta_display_free_window_prop_hooks (display);
  meta_display_free_group_prop_hooks (display);
  
+  g_free (display->hostname);
  g_free (display->name);

  meta_display_shutdown_keys (display);
@ -1131,7 +1127,6 @@ meta_display_close (MetaDisplay *display,
 /**
 * meta_display_screen_for_root:
 * @display: a #MetaDisplay
- * @xroot: a X window
 *
 * Return the #MetaScreen corresponding to a specified X root window ID.
 *
@ -1673,7 +1668,6 @@ window_focus_on_pointer_rest_callback (gpointer data) {
                  &root_x, &root_y, &x, &y,
                  &buttons, &mods, &group);
  meta_error_trap_pop (display);
-  free (buttons.mask);

  if (root_x != focus_data->pointer_x ||
      root_y != focus_data->pointer_y)
@ -1835,14 +1829,6 @@ get_input_event (MetaDisplay *display,
        case XI_Leave:
          if (((XIEnterEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
            return input_event;
-          break;
-#ifdef HAVE_XI23
-        case XI_BarrierHit:
-        case XI_BarrierLeave:
-          if (((XIBarrierEvent *) input_event)->deviceid == META_VIRTUAL_CORE_POINTER_ID)
-            return input_event;
-          break;
-#endif /* HAVE_XI23 */
        default:
          break;
        }
@ -2091,7 +2077,7 @@ event_callback (XEvent   *event,
                                              display->grab_old_window_stacking);
                }
              meta_display_end_grab_op (display,
-                                        device_event->time);
+                                        device_event->detail);
            }
          else if (window && display->grab_op == META_GRAB_OP_NONE)
            {
@ -2411,13 +2397,6 @@ event_callback (XEvent   *event,

            }
          break;
-#ifdef HAVE_XI23
-        case XI_BarrierHit:
-        case XI_BarrierLeave:
-          if (meta_display_process_barrier_event (display, (XIBarrierEvent *) input_event))
-            filter_out_event = bypass_compositor = TRUE;
-          break;
-#endif /* HAVE_XI23 */
        }
    }
  else
@ -2949,11 +2928,6 @@ event_get_modified_window (MetaDisplay *display,
        case XI_Enter:
        case XI_Leave:
          return ((XIEnterEvent *) input_event)->event;
-#ifdef HAVE_XI23
-        case XI_BarrierHit:
-        case XI_BarrierLeave:
-          return ((XIBarrierEvent *) input_event)->event;
-#endif /* HAVE_XI23 */
        }
    }

@ -3198,7 +3172,7 @@ meta_spew_xi2_event (MetaDisplay *display,
  char *extra = NULL;

  XIDeviceEvent *device_event = (XIDeviceEvent *) input_event;
-  XIEnterEvent *enter_event = (XIEnterEvent *) input_event;
+  XIEnterEvent *enter_event = (XIEnterEvent *) enter_event;

  switch (input_event->evtype)
    {
@ -3229,14 +3203,6 @@ meta_spew_xi2_event (MetaDisplay *display,
    case XI_Leave:
      name = "XI_Leave";
      break;
-#ifdef HAVE_XI23
-    case XI_BarrierHit:
-      name = "XI_BarrierHit";
-      break;
-    case XI_BarrierLeave:
-      name = "XI_BarrierLeave";
-      break;
-#endif /* HAVE_XI23 */
    }

  switch (input_event->evtype)
@ -3568,7 +3534,7 @@ MetaWindow*
 meta_display_lookup_x_window (MetaDisplay *display,
                              Window       xwindow)
 {
-  return g_hash_table_lookup (display->xids, &xwindow);
+  return g_hash_table_lookup (display->window_ids, &xwindow);
 }

 void
@ -3576,18 +3542,18 @@ meta_display_register_x_window (MetaDisplay *display,
                                Window      *xwindowp,
                                MetaWindow  *window)
 {
-  g_return_if_fail (g_hash_table_lookup (display->xids, xwindowp) == NULL);
+  g_return_if_fail (g_hash_table_lookup (display->window_ids, xwindowp) == NULL);
  
-  g_hash_table_insert (display->xids, xwindowp, window);
+  g_hash_table_insert (display->window_ids, xwindowp, window);
 }

 void
 meta_display_unregister_x_window (MetaDisplay *display,
                                  Window       xwindow)
 {
-  g_return_if_fail (g_hash_table_lookup (display->xids, &xwindow) != NULL);
+  g_return_if_fail (g_hash_table_lookup (display->window_ids, &xwindow) != NULL);

-  g_hash_table_remove (display->xids, &xwindow);
+  g_hash_table_remove (display->window_ids, &xwindow);

  /* Remove any pending pings */
  remove_pending_pings_for_window (display, xwindow);
@ -3603,7 +3569,7 @@ MetaWindow*
 meta_display_lookup_sync_alarm (MetaDisplay *display,
                                XSyncAlarm   alarm)
 {
-  return g_hash_table_lookup (display->xids, &alarm);
+  return g_hash_table_lookup (display->window_ids, &alarm);
 }

 void
@ -3611,18 +3577,18 @@ meta_display_register_sync_alarm (MetaDisplay *display,
                                  XSyncAlarm  *alarmp,
                                  MetaWindow  *window)
 {
-  g_return_if_fail (g_hash_table_lookup (display->xids, alarmp) == NULL);
+  g_return_if_fail (g_hash_table_lookup (display->window_ids, alarmp) == NULL);

-  g_hash_table_insert (display->xids, alarmp, window);
+  g_hash_table_insert (display->window_ids, alarmp, window);
 }

 void
 meta_display_unregister_sync_alarm (MetaDisplay *display,
                                    XSyncAlarm   alarm)
 {
-  g_return_if_fail (g_hash_table_lookup (display->xids, &alarm) != NULL);
+  g_return_if_fail (g_hash_table_lookup (display->window_ids, &alarm) != NULL);

-  g_hash_table_remove (display->xids, &alarm);
+  g_hash_table_remove (display->window_ids, &alarm);
 }
 #endif /* HAVE_XSYNC */

@ -3638,7 +3604,7 @@ meta_display_notify_window_created (MetaDisplay  *display,
 * @display: A #MetaDisplay
 * @xwindow: An X11 window
 *
- * Returns: %TRUE iff window is one of mutter's internal "no focus" windows
+ * Returns %TRUE iff window is one of mutter's internal "no focus" windows
 * (there is one per screen) which will have the focus when there is no
 * actual client window focused.
 */
@ -3962,6 +3928,8 @@ meta_display_begin_grab_op (MetaDisplay *display,
           display->grab_window->sync_request_counter != None)
        {
          meta_window_create_sync_request_alarm (display->grab_window);
+          window->sync_request_time.tv_sec = 0;
+          window->sync_request_time.tv_usec = 0;
        }
 #endif
    }
@ -4098,8 +4066,6 @@ meta_display_end_grab_op (MetaDisplay *display,

 /**
 * meta_display_get_grab_op:
- * @display: The #MetaDisplay that the window is on
-
 * Gets the current grab operation, if any.
 *
 * Return value: the current grab operation, or %META_GRAB_OP_NONE if
@ -4471,7 +4437,6 @@ meta_is_syncing (void)

 /**
 * meta_set_syncing:
- * @setting: whether to turn syncing on or off
 *
 * A handy way to turn on synchronisation on or off for every display.
 */
@ -4896,13 +4861,25 @@ meta_display_get_tab_list (MetaDisplay   *display,

  mru_list = workspace ? workspace->mru_list : global_mru_list;

-  /* Windows sellout mode - MRU order.
+  /* Windows sellout mode - MRU order. Collect unminimized windows
+   * then minimized so minimized windows aren't in the way so much.
   */
  for (tmp = mru_list; tmp; tmp = tmp->next)
    {
      MetaWindow *window = tmp->data;

-      if (window->screen == screen &&
+      if (!window->minimized &&
+          window->screen == screen &&
+          IN_TAB_CHAIN (window, type))
+        tab_list = g_list_prepend (tab_list, window);
+    }
+
+  for (tmp = mru_list; tmp; tmp = tmp->next)
+    {
+      MetaWindow *window = tmp->data;
+
+      if (window->minimized &&
+          window->screen == screen &&
          IN_TAB_CHAIN (window, type))
        tab_list = g_list_prepend (tab_list, window);
    }
@ -5672,15 +5649,6 @@ meta_display_overlay_key_activate (MetaDisplay *display)
  g_signal_emit (display, display_signals[OVERLAY_KEY], 0);
 }

-void
-meta_display_accelerator_activate (MetaDisplay *display,
-                                   guint        action,
-                                   guint        deviceid)
-{
-  g_signal_emit (display, display_signals[ACCELERATOR_ACTIVATED],
-                 0, action, deviceid);
-}
-
 void
 meta_display_get_compositor_version (MetaDisplay *display,
                                     int         *major,
@ -5692,7 +5660,6 @@ meta_display_get_compositor_version (MetaDisplay *display,

 /**
 * meta_display_get_xinput_opcode: (skip)
- * @display: a #MetaDisplay
 *
 */
 int
@ -5701,26 +5668,8 @@ meta_display_get_xinput_opcode (MetaDisplay *display)
  return display->xinput_opcode;
 }

-/**
- * meta_display_supports_extended_barriers:
- * @display: a #MetaDisplay
- *
- * Returns: whether the X server supports extended barrier
- * features as defined in version 2.3 of the XInput 2
- * specification.
- *
- * Clients should use this method to determine whether their
- * interfaces should depend on new barrier features.
- */
-gboolean
-meta_display_supports_extended_barriers (MetaDisplay *display)
-{
-  return META_DISPLAY_HAS_XINPUT_23 (display);
-}
-
 /**
 * meta_display_get_xdisplay: (skip)
- * @display: a #MetaDisplay
 *
 */
 Display *
@ -5731,7 +5680,6 @@ meta_display_get_xdisplay (MetaDisplay *display)

 /**
 * meta_display_get_compositor: (skip)
- * @display: a #MetaDisplay
 *
 */
 MetaCompositor *
@ -5790,6 +5738,20 @@ meta_display_get_shape_event_base (MetaDisplay *display)
 }
 #endif

+/**
+ * meta_display_get_atom: (skip)
+ *
+ * Gets up an X atom that Mutter prefetched at startup.
+ *
+ * Return value: the X atom corresponding to the given atom enumeration
+ */
+Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
+{
+  Atom *atoms = & display->atom_WM_PROTOCOLS;
+
+  return atoms[meta_atom - 1];
+}
+
 /**
 * meta_display_get_leader_window:
 * @display: a #MetaDisplay
--- a/src/core/errors.c
+++ b/src/core/errors.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/* Mutter X error handling */
+
 /* 
 * Copyright (C) 2001 Havoc Pennington, error trapping inspired by GDK
 * code copyrighted by the GTK team.
@ -20,12 +22,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:errors
- * @title: Errors
- * @short_description: Mutter X error handling
- */
-
 #include <config.h>
 #include <meta/errors.h>
 #include "display-private.h"
--- a/src/core/eventqueue.c
+++ b/src/core/eventqueue.c
@ -0,0 +1,184 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Mutter X event source for main loop */
+
+/* 
+ * Copyright (C) 2001 Havoc Pennington (based on GDK code (C) Owen
+ * Taylor, Red Hat Inc.)
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.  */
+
+#include "eventqueue.h"
+#include <X11/Xlib.h>
+
+static gboolean eq_prepare  (GSource     *source,
+                             gint        *timeout);
+static gboolean eq_check    (GSource     *source);
+static gboolean eq_dispatch (GSource     *source,
+                             GSourceFunc  callback,
+                             gpointer     user_data);
+static void     eq_destroy  (GSource     *source);
+
+static GSourceFuncs eq_funcs = {
+  eq_prepare,
+  eq_check,
+  eq_dispatch,
+  eq_destroy
+};
+
+struct _MetaEventQueue
+{
+  GSource source;
+
+  Display *display;
+  GPollFD poll_fd;
+  int connection_fd;
+  GQueue *events;
+};
+
+MetaEventQueue*
+meta_event_queue_new (Display *display, MetaEventQueueFunc func, gpointer data)
+{
+  GSource *source;
+  MetaEventQueue *eq;
+
+  source = g_source_new (&eq_funcs, sizeof (MetaEventQueue));
+  eq = (MetaEventQueue*) source;
+  
+  eq->connection_fd = ConnectionNumber (display);
+  eq->poll_fd.fd = eq->connection_fd;
+  eq->poll_fd.events = G_IO_IN;
+
+  eq->events = g_queue_new ();
+
+  eq->display = display;
+  
+  g_source_set_priority (source, G_PRIORITY_DEFAULT);
+  g_source_add_poll (source, &eq->poll_fd);
+  g_source_set_can_recurse (source, TRUE);
+
+  g_source_set_callback (source, (GSourceFunc) func, data, NULL);
+  
+  g_source_attach (source, NULL);
+  g_source_unref (source);
+
+  return eq;
+}
+
+void
+meta_event_queue_free (MetaEventQueue *eq)
+{
+  GSource *source;
+
+  source = (GSource*) eq;
+  
+  g_source_destroy (source);
+}
+
+static gboolean
+eq_events_pending (MetaEventQueue *eq)
+{
+  return eq->events->length > 0 || XPending (eq->display);
+}
+
+static void
+eq_queue_events (MetaEventQueue *eq)
+{
+  XEvent xevent;
+
+  while (XPending (eq->display))
+    {
+      XEvent *copy;
+      
+      XNextEvent (eq->display, &xevent);
+
+      copy = g_new (XEvent, 1);
+      *copy = xevent;
+
+      g_queue_push_tail (eq->events, copy);
+    }
+}
+
+static gboolean  
+eq_prepare (GSource *source, gint *timeout)
+{
+  MetaEventQueue *eq;
+
+  eq = (MetaEventQueue*) source;
+  
+  *timeout = -1;
+
+  return eq_events_pending (eq);
+}
+
+static gboolean  
+eq_check (GSource  *source) 
+{
+  MetaEventQueue *eq;
+
+  eq = (MetaEventQueue*) source;
+
+  if (eq->poll_fd.revents & G_IO_IN)
+    return eq_events_pending (eq);
+  else
+    return FALSE;
+}
+
+static gboolean  
+eq_dispatch (GSource *source, GSourceFunc callback, gpointer user_data)
+{
+  MetaEventQueue *eq;
+
+  eq = (MetaEventQueue*) source;
+  
+  eq_queue_events (eq);
+
+  if (eq->events->length > 0)
+    {
+      XEvent *event;
+      MetaEventQueueFunc func;
+
+      event = g_queue_pop_head (eq->events);
+      func = (MetaEventQueueFunc) callback;
+      
+      (* func) (event, user_data);
+
+      g_free (event);
+    }
+  
+  return TRUE;
+}
+
+static void
+eq_destroy (GSource *source)
+{
+  MetaEventQueue *eq;
+
+  eq = (MetaEventQueue*) source;
+
+  while (eq->events->length > 0)
+    {
+      XEvent *event;
+      
+      event = g_queue_pop_head (eq->events);
+
+      g_free (event);
+    }
+
+  g_queue_free (eq->events);
+
+  /* source itself is freed by glib */
+}
--- a/src/compositor/clutter-utils.h
+++ b/src/compositor/clutter-utils.h
@ -1,9 +1,10 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Utilities for use with Clutter
- *
- * Copyright 2010 Red Hat, Inc.
- *
+
+/* Mutter X event source for main loop */
+
+/* 
+ * Copyright (C) 2001 Havoc Pennington
+ * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as
 * published by the Free Software Foundation; either version 2 of the
@ -13,24 +14,27 @@
 * WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
- *
+ * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */

-#ifndef __META_CLUTTER_UTILS_H__
-#define __META_CLUTTER_UTILS_H__
+#ifndef META_EVENT_QUEUE_H
+#define META_EVENT_QUEUE_H

-#include <clutter/clutter.h>
-gboolean meta_actor_vertices_are_untransformed (ClutterVertex *verts,
-                                                float          widthf,
-                                                float          heightf,
-                                                int           *x_origin,
-                                                int           *y_origin);
-gboolean meta_actor_is_untransformed (ClutterActor *actor,
-                                      int          *x_origin,
-                                      int          *y_origin);
+#include <glib.h>
+#include <X11/Xlib.h>

-#endif /* __META_CLUTTER_UTILS_H__ */
+typedef struct _MetaEventQueue MetaEventQueue;
+
+typedef void   (* MetaEventQueueFunc) (XEvent         *event,
+                                       gpointer        data);
+
+MetaEventQueue* meta_event_queue_new  (Display            *display,
+                                       MetaEventQueueFunc  func,
+                                       gpointer            data);
+void            meta_event_queue_free (MetaEventQueue     *eq);
+
+#endif
--- a/src/core/group.c
+++ b/src/core/group.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/* Mutter window groups */
+
 /* 
 * Copyright (C) 2002 Red Hat Inc.
 * Copyright (C) 2003 Rob Adams
@ -20,13 +22,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:group
- * @title: MetaGroup
- * @short_description: Mutter window groups
- *
- */
-
 #include <config.h>
 #include <meta/util.h>
 #include "group-private.h"
@ -111,7 +106,6 @@ meta_group_unref (MetaGroup *group)

 /**
 * meta_window_get_group: (skip)
- * @window: a #MetaWindow
 *
 */
 MetaGroup*
@ -210,8 +204,6 @@ meta_window_shutdown_group (MetaWindow *window)

 /**
 * meta_display_lookup_group: (skip)
- * @display: a #MetaDisplay
- * @group_leader: a X window
 *
 */
 MetaGroup*
@ -287,8 +279,6 @@ meta_group_get_startup_id (MetaGroup *group)

 /**
 * meta_group_property_notify: (skip)
- * @group: a #MetaGroup
- * @event: a X event
 *
 */
 gboolean
--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@ -23,12 +23,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:keybindings
- * @Title: MetaKeybinding
- * @Short_Description: Key bindings
- */
-
 #define _GNU_SOURCE
 #define _SVID_SOURCE /* for putenv() */

@ -147,12 +141,10 @@ static gboolean process_workspace_switch_grab (MetaDisplay   *display,
                                               XIDeviceEvent *event,
                                               KeySym         keysym);

-static void grab_key_bindings           (MetaDisplay *display);
-static void ungrab_key_bindings         (MetaDisplay *display);
+static void regrab_key_bindings         (MetaDisplay *display);


 static GHashTable *key_handlers;
-static GHashTable *external_grabs;

 #define HANDLER(name) g_hash_table_lookup (key_handlers, (name))

@ -165,22 +157,6 @@ key_handler_free (MetaKeyHandler *handler)
  g_free (handler);
 }

-typedef struct _MetaKeyGrab MetaKeyGrab;
-struct _MetaKeyGrab {
-  char *name;
-  guint action;
-  MetaKeyCombo *combo;
-};
-
-static void
-meta_key_grab_free (MetaKeyGrab *grab)
-{
-  g_free (grab->name);
-  g_free (grab->combo);
-  g_free (grab);
-}
-
-
 static void
 reload_keymap (MetaDisplay *display)
 {
@ -414,14 +390,13 @@ static void
 rebuild_binding_table (MetaDisplay     *display,
                       MetaKeyBinding **bindings_p,
                       int             *n_bindings_p,
-                       GList           *prefs,
-                       GList           *grabs)
+                       GList           *prefs)
 {
-  GList *p, *g;
+  GList *p;
  int n_bindings;
  int i;

-  n_bindings = count_bindings (prefs) + g_list_length (grabs);
+  n_bindings = count_bindings (prefs);
  g_free (*bindings_p);
  *bindings_p = g_new0 (MetaKeyBinding, n_bindings);

@ -474,27 +449,6 @@ rebuild_binding_table (MetaDisplay     *display,
      p = p->next;
    }

-  g = grabs;
-  while (g)
-    {
-      MetaKeyGrab *grab = (MetaKeyGrab*)g->data;
-      if (grab->combo && (grab->combo->keysym != None || grab->combo->keycode != 0))
-        {
-          MetaKeyHandler *handler = HANDLER ("external-grab");
-
-          (*bindings_p)[i].name = grab->name;
-          (*bindings_p)[i].handler = handler;
-          (*bindings_p)[i].keysym = grab->combo->keysym;
-          (*bindings_p)[i].keycode = grab->combo->keycode;
-          (*bindings_p)[i].modifiers = grab->combo->modifiers;
-          (*bindings_p)[i].mask = 0;
-
-          ++i;
-        }
-
-      g = g->next;
-    }
-
  g_assert (i == n_bindings);

  *n_bindings_p = i;
@ -507,19 +461,17 @@ rebuild_binding_table (MetaDisplay     *display,
 static void
 rebuild_key_binding_table (MetaDisplay *display)
 {
-  GList *prefs, *grabs;
+  GList *prefs;

  meta_topic (META_DEBUG_KEYBINDINGS,
              "Rebuilding key binding table from preferences\n");

  prefs = meta_prefs_get_keybindings ();
-  grabs = g_hash_table_get_values (external_grabs);
  rebuild_binding_table (display,
                         &display->key_bindings,
                         &display->n_key_bindings,
-                         prefs, grabs);
+                         prefs);
  g_list_free (prefs);
-  g_list_free (grabs);
 }

 static void
@ -532,7 +484,7 @@ rebuild_special_bindings (MetaDisplay *display)
 }

 static void
-ungrab_key_bindings (MetaDisplay *display)
+regrab_key_bindings (MetaDisplay *display)
 {
  GSList *tmp;
  GSList *windows;
@ -545,38 +497,6 @@ ungrab_key_bindings (MetaDisplay *display)
      MetaScreen *screen = tmp->data;

      meta_screen_ungrab_keys (screen);
-
-      tmp = tmp->next;
-    }
-
-  windows = meta_display_list_windows (display, META_LIST_DEFAULT);
-  tmp = windows;
-  while (tmp != NULL)
-    {
-      MetaWindow *w = tmp->data;
-
-      meta_window_ungrab_keys (w);
-
-      tmp = tmp->next;
-    }
-  meta_error_trap_pop (display);
-
-  g_slist_free (windows);
-}
-
-static void
-grab_key_bindings (MetaDisplay *display)
-{
-  GSList *tmp;
-  GSList *windows;
-
-  meta_error_trap_push (display); /* for efficiency push outer trap */
-
-  tmp = display->screens;
-  while (tmp != NULL)
-    {
-      MetaScreen *screen = tmp->data;
-
      meta_screen_grab_keys (screen);

      tmp = tmp->next;
@ -588,6 +508,7 @@ grab_key_bindings (MetaDisplay *display)
    {
      MetaWindow *w = tmp->data;

+      meta_window_ungrab_keys (w);
      meta_window_grab_keys (w);

      tmp = tmp->next;
@ -621,12 +542,6 @@ display_get_keybinding (MetaDisplay  *display,
  return NULL;
 }

-static guint
-next_dynamic_keybinding_action () {
-  static guint num_dynamic_bindings = 0;
-  return META_KEYBINDING_ACTION_LAST + (++num_dynamic_bindings);
-}
-
 static gboolean
 add_keybinding_internal (MetaDisplay          *display,
                         const char           *name,
@ -683,13 +598,13 @@ add_builtin_keybinding (MetaDisplay          *display,
 *
 * Add a keybinding at runtime. The key @name in @schema needs to be of
 * type %G_VARIANT_TYPE_STRING_ARRAY, with each string describing a
- * keybinding in the form of "&lt;Control&gt;a" or "&lt;Shift&gt;&lt;Alt&gt;F1". The parser
+ * keybinding in the form of "<Control>a" or "<Shift><Alt>F1". The parser
 * is fairly liberal and allows lower or upper case, and also abbreviations
- * such as "&lt;Ctl&gt;" and "&lt;Ctrl&gt;". If the key is set to the empty list or a
+ * such as "<Ctl>" and "<Ctrl>". If the key is set to the empty list or a
 * list with a single element of either "" or "disabled", the keybinding is
 * disabled.
 * If %META_KEY_BINDING_REVERSES is specified in @flags, the binding
- * may be reversed by holding down the "shift" key; therefore, "&lt;Shift&gt;"
+ * may be reversed by holding down the "shift" key; therefore, "<Shift>"
 * cannot be one of the keys used. @handler is expected to check for the
 * "shift" modifier in this case and reverse its action.
 *
@ -707,12 +622,14 @@ meta_display_add_keybinding (MetaDisplay         *display,
                             gpointer             user_data,
                             GDestroyNotify       free_data)
 {
-  guint new_action = next_dynamic_keybinding_action ();
+  static guint num_dynamic_bindings = 0;
+  guint new_action = META_KEYBINDING_ACTION_LAST + num_dynamic_bindings;

  if (!add_keybinding_internal (display, name, settings, flags, new_action,
                                handler, 0, user_data, free_data))
    return META_KEYBINDING_ACTION_NONE;

+  ++num_dynamic_bindings;
  return new_action;
 }

@ -778,17 +695,9 @@ meta_display_get_keybinding_action (MetaDisplay  *display,
    binding = display_get_keybinding (display, META_KEY_ABOVE_TAB, keycode, mask);

  if (binding)
-    {
-      MetaKeyGrab *grab = g_hash_table_lookup (external_grabs, binding->name);
-      if (grab)
-        return grab->action;
-      else
-        return (guint) meta_prefs_get_keybinding_action (binding->name);
-    }
+    return (guint) meta_prefs_get_keybinding_action (binding->name);
  else
-    {
-      return META_KEYBINDING_ACTION_NONE;
-    }
+    return META_KEYBINDING_ACTION_NONE;
 }

 void
@ -828,8 +737,6 @@ meta_display_process_mapping_event (MetaDisplay *display,

  if (keymap_changed || modmap_changed)
    {
-      ungrab_key_bindings (display);
-
      if (keymap_changed)
        reload_keymap (display);

@ -843,7 +750,7 @@ meta_display_process_mapping_event (MetaDisplay *display,

      reload_modifiers (display);

-      grab_key_bindings (display);
+      regrab_key_bindings (display);
    }
 }

@ -858,12 +765,11 @@ bindings_changed_callback (MetaPreference pref,
  switch (pref)
    {
    case META_PREF_KEYBINDINGS:
-      ungrab_key_bindings (display);
      rebuild_key_binding_table (display);
      rebuild_special_bindings (display);
      reload_keycodes (display);
      reload_modifiers (display);
-      grab_key_bindings (display);
+      regrab_key_bindings (display);
      break;
    default:
      break;
@ -982,12 +888,21 @@ meta_change_keygrab (MetaDisplay *display,
 }

 static void
-change_binding_keygrabs (MetaKeyBinding *bindings,
-                         int             n_bindings,
-                         MetaDisplay    *display,
-                         Window          xwindow,
-                         gboolean        binding_per_window,
-                         gboolean        grab)
+meta_grab_key (MetaDisplay *display,
+               Window       xwindow,
+               int          keysym,
+               unsigned int keycode,
+               int          modmask)
+{
+  meta_change_keygrab (display, xwindow, TRUE, keysym, keycode, modmask);
+}
+
+static void
+grab_keys (MetaKeyBinding *bindings,
+           int             n_bindings,
+           MetaDisplay    *display,
+           Window          xwindow,
+           gboolean        binding_per_window)
 {
  int i;

@ -1002,10 +917,10 @@ change_binding_keygrabs (MetaKeyBinding *bindings,
          !!(bindings[i].handler->flags & META_KEY_BINDING_PER_WINDOW) &&
          bindings[i].keycode != 0)
        {
-          meta_change_keygrab (display, xwindow, grab,
-                               bindings[i].keysym,
-                               bindings[i].keycode,
-                               bindings[i].mask);
+          meta_grab_key (display, xwindow,
+                         bindings[i].keysym,
+                         bindings[i].keycode,
+                         bindings[i].mask);
        }

      ++i;
@ -1015,33 +930,51 @@ change_binding_keygrabs (MetaKeyBinding *bindings,
 }

 static void
-meta_screen_change_keygrabs (MetaScreen *screen,
-                             gboolean    grab)
+ungrab_all_keys (MetaDisplay *display,
+                 Window       xwindow)
 {
-  MetaDisplay *display = screen->display;
+  if (meta_is_debugging ())
+    meta_error_trap_push_with_return (display);
+  else
+    meta_error_trap_push (display);

-  if (display->overlay_key_combo.keycode != 0)
-    meta_change_keygrab (display, screen->xroot, grab,
-                         display->overlay_key_combo.keysym,
-                         display->overlay_key_combo.keycode,
-                         display->overlay_key_combo.modifiers);
+  XUngrabKey (display->xdisplay, AnyKey, AnyModifier,
+              xwindow);

-  change_binding_keygrabs (screen->display->key_bindings,
-                           screen->display->n_key_bindings,
-                           screen->display, screen->xroot,
-                           FALSE, grab);
+  if (meta_is_debugging ())
+    {
+      int result;
+
+      result = meta_error_trap_pop_with_return (display);
+
+      if (result != Success)
+        meta_topic (META_DEBUG_KEYBINDINGS,
+                    "Ungrabbing all keys on 0x%lx failed\n", xwindow);
+    }
+  else
+    meta_error_trap_pop (display);
 }

 void
 meta_screen_grab_keys (MetaScreen *screen)
 {
+  MetaDisplay *display = screen->display;
  if (screen->all_keys_grabbed)
    return;

  if (screen->keys_grabbed)
    return;

-  meta_screen_change_keygrabs (screen, TRUE);
+  if (display->overlay_key_combo.keycode != 0)
+    meta_grab_key (display, screen->xroot,
+                   display->overlay_key_combo.keysym,
+                   display->overlay_key_combo.keycode,
+                   display->overlay_key_combo.modifiers);
+
+  grab_keys (screen->display->key_bindings,
+             screen->display->n_key_bindings,
+             screen->display, screen->xroot,
+             FALSE);

  screen->keys_grabbed = TRUE;
 }
@ -1049,23 +982,11 @@ meta_screen_grab_keys (MetaScreen *screen)
 void
 meta_screen_ungrab_keys (MetaScreen  *screen)
 {
-  if (!screen->keys_grabbed)
-    return;
-
-  meta_screen_change_keygrabs (screen, FALSE);
-
-  screen->keys_grabbed = FALSE;
-}
-
-static void
-meta_window_change_keygrabs (MetaWindow *window,
-                             Window      xwindow,
-                             gboolean    grab)
-{
-  change_binding_keygrabs (window->display->key_bindings,
-                           window->display->n_key_bindings,
-                           window->display, xwindow,
-                           TRUE, grab);
+  if (screen->keys_grabbed)
+    {
+      ungrab_all_keys (screen->display, screen->xroot);
+      screen->keys_grabbed = FALSE;
+    }
 }

 void
@ -1078,7 +999,7 @@ meta_window_grab_keys (MetaWindow  *window)
      || window->override_redirect)
    {
      if (window->keys_grabbed)
-        meta_window_change_keygrabs (window, window->xwindow, FALSE);
+        ungrab_all_keys (window->display, window->xwindow);
      window->keys_grabbed = FALSE;
      return;
    }
@ -1086,7 +1007,7 @@ meta_window_grab_keys (MetaWindow  *window)
  if (window->keys_grabbed)
    {
      if (window->frame && !window->grab_on_frame)
-        meta_window_change_keygrabs (window, window->xwindow, FALSE);
+        ungrab_all_keys (window->display, window->xwindow);
      else if (window->frame == NULL &&
               window->grab_on_frame)
        ; /* continue to regrab on client window */
@ -1094,9 +1015,11 @@ meta_window_grab_keys (MetaWindow  *window)
        return; /* already all good */
    }

-  meta_window_change_keygrabs (window,
-                               window->frame ? window->frame->xwindow : window->xwindow,
-                               TRUE);
+  grab_keys (window->display->key_bindings,
+             window->display->n_key_bindings,
+             window->display,
+             window->frame ? window->frame->xwindow : window->xwindow,
+             TRUE);

  window->keys_grabbed = TRUE;
  window->grab_on_frame = window->frame != NULL;
@ -1109,136 +1032,16 @@ meta_window_ungrab_keys (MetaWindow  *window)
    {
      if (window->grab_on_frame &&
          window->frame != NULL)
-        meta_window_change_keygrabs (window, window->frame->xwindow, FALSE);
+        ungrab_all_keys (window->display,
+                         window->frame->xwindow);
      else if (!window->grab_on_frame)
-        meta_window_change_keygrabs (window, window->xwindow, FALSE);
+        ungrab_all_keys (window->display,
+                         window->xwindow);

      window->keys_grabbed = FALSE;
    }
 }

-static void
-handle_external_grab (MetaDisplay    *display,
-                      MetaScreen     *screen,
-                      MetaWindow     *window,
-                      XIDeviceEvent  *event,
-                      MetaKeyBinding *binding,
-                      gpointer        user_data)
-{
-  guint action = meta_display_get_keybinding_action (display,
-                                                     binding->keycode,
-                                                     binding->mask);
-  meta_display_accelerator_activate (display, action, event->deviceid);
-}
-
-
-guint
-meta_display_grab_accelerator (MetaDisplay *display,
-                               const char  *accelerator)
-{
-  MetaKeyGrab *grab;
-  guint keysym = 0;
-  guint keycode = 0;
-  guint mask = 0;
-  MetaVirtualModifier modifiers = 0;
-  GSList *l;
-  int i;
-
-  if (!meta_ui_parse_accelerator (accelerator, &keysym, &keycode, &modifiers))
-    {
-      meta_topic (META_DEBUG_KEYBINDINGS,
-                  "Failed to parse accelerator\n");
-      meta_warning (_("\"%s\" is not a valid accelerator\n"), accelerator);
-
-      return META_KEYBINDING_ACTION_NONE;
-    }
-
-  meta_display_devirtualize_modifiers (display, modifiers, &mask);
-  keycode = keysym_to_keycode (display, keysym);
-
-  if (keycode == 0)
-    return META_KEYBINDING_ACTION_NONE;
-
-  for (i = 0; i < display->n_key_bindings; i++)
-    if (display->key_bindings[i].keycode == keycode &&
-        display->key_bindings[i].mask == mask)
-      return META_KEYBINDING_ACTION_NONE;
-
-  for (l = display->screens; l; l = l->next)
-    {
-      MetaScreen *screen = l->data;
-      meta_change_keygrab (display, screen->xroot, TRUE, keysym, keycode, mask);
-    }
-
-  grab = g_new0 (MetaKeyGrab, 1);
-  grab->action = next_dynamic_keybinding_action ();
-  grab->name = meta_external_binding_name_for_action (grab->action);
-  grab->combo = g_malloc0 (sizeof (MetaKeyCombo));
-  grab->combo->keysym = keysym;
-  grab->combo->keycode = keycode;
-  grab->combo->modifiers = modifiers;
-
-  g_hash_table_insert (external_grabs, grab->name, grab);
-
-  display->n_key_bindings++;
-  display->key_bindings = g_renew (MetaKeyBinding,
-                                   display->key_bindings,
-                                   display->n_key_bindings);
-
-  MetaKeyBinding *binding = &display->key_bindings[display->n_key_bindings - 1];
-  binding->name = grab->name;
-  binding->handler = HANDLER ("external-grab");
-  binding->keysym = grab->combo->keysym;
-  binding->keycode = grab->combo->keycode;
-  binding->modifiers = grab->combo->modifiers;
-  binding->mask = mask;
-
-  return grab->action;
-}
-
-gboolean
-meta_display_ungrab_accelerator (MetaDisplay *display,
-                                 guint        action)
-{
-  MetaKeyGrab *grab;
-  char *key;
-  int i;
-
-  g_return_val_if_fail (action != META_KEYBINDING_ACTION_NONE, FALSE);
-
-  key = meta_external_binding_name_for_action (action);
-  grab = g_hash_table_lookup (external_grabs, key);
-  if (!grab)
-    return FALSE;
-
-  for (i = 0; i < display->n_key_bindings; i++)
-    if (display->key_bindings[i].keysym == grab->combo->keysym &&
-        display->key_bindings[i].keycode == grab->combo->keycode &&
-        display->key_bindings[i].modifiers == grab->combo->modifiers)
-      {
-        GSList *l;
-        for (l = display->screens; l; l = l->next)
-          {
-            MetaScreen *screen = l->data;
-            meta_change_keygrab (display, screen->xroot, FALSE,
-                                 display->key_bindings[i].keysym,
-                                 display->key_bindings[i].keycode,
-                                 display->key_bindings[i].mask);
-          }
-
-        display->key_bindings[i].keysym = 0;
-        display->key_bindings[i].keycode = 0;
-        display->key_bindings[i].modifiers = 0;
-        display->key_bindings[i].mask = 0;
-        break;
-      }
-
-  g_hash_table_remove (external_grabs, key);
-  g_free (key);
-
-  return TRUE;
-}
-
 #ifdef WITH_VERBOSE_MODE
 static const char*
 grab_status_to_string (int status)
@ -1566,7 +1369,6 @@ primary_modifier_still_pressed (MetaDisplay *display,
                  &root_x, &root_y,
                  &x, &y,
                  &buttons, &mods, &group);
-  free (buttons.mask);

  meta_topic (META_DEBUG_KEYBINDINGS,
              "Primary modifier 0x%x full grab mask 0x%x current state 0x%x\n",
@ -1730,21 +1532,23 @@ process_overlay_key (MetaDisplay *display,
        }
      else if (event->evtype == XI_KeyRelease)
        {
-          MetaKeyBinding *binding;
-
          display->overlay_key_only_pressed = FALSE;
          /* We want to unfreeze events, but keep the grab so that if the user
           * starts typing into the overlay we get all the keys */
          XIAllowEvents (display->xdisplay, event->deviceid,
                         XIAsyncDevice, event->time);

-          binding = display_get_keybinding (display,
-                                            display->overlay_key_combo.keysym,
-                                            display->overlay_key_combo.keycode,
-                                            display->grab_mask);
-          if (binding &&
-              meta_compositor_filter_keybinding (display->compositor, screen, binding))
-            return TRUE;
+          if (display->grab_op == META_GRAB_OP_COMPOSITOR)
+            {
+              MetaKeyBinding *binding =
+                display_get_keybinding (display,
+                                        display->overlay_key_combo.keysym,
+                                        display->overlay_key_combo.keycode,
+                                        display->grab_mask);
+              if (binding &&
+                  meta_compositor_filter_keybinding (display->compositor, screen, binding))
+                return TRUE;
+            }
          meta_display_overlay_key_activate (display);
        }

@ -3883,11 +3687,6 @@ meta_keybindings_set_custom_handler (const gchar        *name,

 /**
 * meta_keybindings_switch_window: (skip)
- * @display: a #MetaDisplay
- * @screen: a #MetaScreen
- * @event_window: a #MetaWindow
- * @event: a #XIDeviceEvent
- * @binding: a #MetaKeyBinding
 *
 */
 void
@ -4532,17 +4331,6 @@ meta_display_init_keys (MetaDisplay *display)

  g_hash_table_insert (key_handlers, g_strdup ("overlay-key"), handler);

-  handler = g_new0 (MetaKeyHandler, 1);
-  handler->name = g_strdup ("external-grab");
-  handler->func = handle_external_grab;
-  handler->default_func = handle_external_grab;
-
-  g_hash_table_insert (key_handlers, g_strdup ("external-grab"), handler);
-
-  external_grabs = g_hash_table_new_full (g_str_hash, g_str_equal,
-                                          NULL,
-                                          (GDestroyNotify)meta_key_grab_free);
-
  init_builtin_key_bindings (display);

  rebuild_key_binding_table (display);
--- a/src/core/main.c
+++ b/src/core/main.c
@ -24,7 +24,6 @@

 /**
 * SECTION:main
- * @title: Main
 * @short_description: Program startup.
 *
 * Functions which parse the command-line arguments, create the display,
@ -447,49 +446,10 @@ meta_init (void)
  meta_clutter_init ();
 }

-/**
- * meta_register_with_session:
- *
- * Registers mutter with the session manager.  Call this after completing your own
- * initialization.
- *
- * This should be called when the session manager can safely continue to the
- * next phase of startup and potentially display windows.
- */
-void
-meta_register_with_session (void)
-{
-  if (!opt_disable_sm)
-    {
-      if (opt_client_id == NULL)
-        {
-          const gchar *desktop_autostart_id;
-
-          desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
-
-          if (desktop_autostart_id != NULL)
-            opt_client_id = g_strdup (desktop_autostart_id);
-        }
-
-      /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes to
-       * use the same client id. */
-      g_unsetenv ("DESKTOP_AUTOSTART_ID");
-
-      meta_session_init (opt_client_id, opt_save_file);
-    }
-  /* Free memory possibly allocated by the argument parsing which are
-   * no longer needed.
-   */
-  g_free (opt_save_file);
-  g_free (opt_display_name);
-  g_free (opt_client_id);
-}
-
 /**
 * meta_run: (skip)
 *
- * Runs mutter. Call this after completing initialization that doesn't require
- * an event loop.
+ * Runs mutter. Call this after completing your own initialization.
 *
 * Return value: mutter's exit status
 */
@ -549,6 +509,35 @@ meta_run (void)
  if (!meta_ui_have_a_theme ())
    meta_fatal (_("Could not find a theme! Be sure %s exists and contains the usual themes.\n"),
                MUTTER_DATADIR"/themes");
+  
+  /* Connect to SM as late as possible - but before managing display,
+   * or we might try to manage a window before we have the session
+   * info
+   */
+  if (!opt_disable_sm)
+    {
+      if (opt_client_id == NULL)
+        {
+          const gchar *desktop_autostart_id;
+  
+          desktop_autostart_id = g_getenv ("DESKTOP_AUTOSTART_ID");
+ 
+          if (desktop_autostart_id != NULL)
+            opt_client_id = g_strdup (desktop_autostart_id);
+        }
+
+      /* Unset DESKTOP_AUTOSTART_ID in order to avoid child processes to
+       * use the same client id. */
+      g_unsetenv ("DESKTOP_AUTOSTART_ID");
+
+      meta_session_init (opt_client_id, opt_save_file);
+    }
+  /* Free memory possibly allocated by the argument parsing which are
+   * no longer needed.
+   */
+  g_free (opt_save_file);
+  g_free (opt_display_name);
+  g_free (opt_client_id);

  if (!meta_display_open ())
    meta_exit (META_EXIT_ERROR);
@ -582,8 +571,8 @@ meta_quit (MetaExitCode code)

 /**
 * prefs_changed_callback:
- * @pref:  Which preference has changed
- * @data:  Arbitrary data (which we ignore)
+ * @pref  Which preference has changed
+ * @data  Arbitrary data (which we ignore)
 *
 * Called on pref changes. (One of several functions of its kind and purpose.)
 *
--- a/src/core/mutter.c
+++ b/src/core/mutter.c
@ -81,6 +81,5 @@ main (int argc, char **argv)
    meta_plugin_manager_load (plugin);

  meta_init ();
-  meta_register_with_session ();
  return meta_run ();
 }
--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/* Mutter preferences */
+
 /* 
 * Copyright (C) 2001 Havoc Pennington, Copyright (C) 2002 Red Hat Inc.
 * Copyright (C) 2006 Elijah Newren
@ -22,12 +24,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:prefs
- * @title: Preferences
- * @short_description: Mutter preferences
- */
-
 #include <config.h>
 #include <meta/prefs.h>
 #include "ui.h"
@ -704,8 +700,6 @@ handle_preference_update_int (GSettings *settings,

 /**
 * meta_prefs_add_listener: (skip)
- * @func: a #MetaPrefsChangedFunc
- * @user_data: data passed to the function
 *
 */
 void
@ -723,8 +717,6 @@ meta_prefs_add_listener (MetaPrefsChangedFunc func,

 /**
 * meta_prefs_remove_listener: (skip)
- * @func: a #MetaPrefsChangedFunc
- * @user_data: data passed to the function
 *
 */
 void
@ -1823,8 +1815,6 @@ update_binding (MetaKeyPref *binding,
                      binding->name, keysym, keycode, mods);
    }

-  binding->bindings = g_slist_reverse (binding->bindings);
-
  return changed;
 }

--- a/src/core/screen-private.h
+++ b/src/core/screen-private.h
@ -46,7 +46,6 @@ struct _MetaMonitorInfo
  int number;
  MetaRectangle rect;
  gboolean is_primary;
-  gboolean in_fullscreen;
  XID output; /* The primary or first output for this crtc, None if no xrandr */
 };

@ -118,7 +117,6 @@ struct _MetaScreen
  guint32 wm_cm_timestamp;

  guint work_area_later;
-  guint check_fullscreen_later;

  int rows_of_workspaces;
  int columns_of_workspaces;
@ -203,8 +201,6 @@ void          meta_screen_get_natural_monitor_list (MetaScreen *screen,
 void          meta_screen_update_workspace_layout (MetaScreen             *screen);
 void          meta_screen_update_workspace_names  (MetaScreen             *screen);
 void          meta_screen_queue_workarea_recalc   (MetaScreen             *screen);
-void          meta_screen_queue_check_fullscreen  (MetaScreen             *screen);
-

 Window meta_create_offscreen_window (Display *xdisplay,
                                     Window   parent,
@ -245,6 +241,8 @@ void     meta_screen_update_showing_desktop_hint          (MetaScreen *screen);

 gboolean meta_screen_apply_startup_properties (MetaScreen *screen,
                                               MetaWindow *window);
+void	 meta_screen_composite_all_windows (MetaScreen *screen);
+
 void     meta_screen_restacked (MetaScreen *screen);

 void     meta_screen_workspace_switched (MetaScreen         *screen,
--- a/src/core/screen.c
+++ b/src/core/screen.c
@ -1,5 +1,7 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

+/* Mutter X screen handler */
+
 /* 
 * Copyright (C) 2001, 2002 Havoc Pennington
 * Copyright (C) 2002, 2003 Red Hat Inc.
@ -24,12 +26,6 @@
 * 02111-1307, USA.
 */

-/**
- * SECTION:screen
- * @title: MetaScreen
- * @short_description: Mutter X screen handler
- */
-
 #include <config.h>
 #include "screen-private.h"
 #include <meta/main.h>
@ -44,7 +40,6 @@
 #include "xprops.h"
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"
-#include "core.h"

 #include <X11/extensions/Xinerama.h>

@ -56,7 +51,6 @@
 #include <locale.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdlib.h>

 static char* get_screen_name (MetaDisplay *display,
                              int          number);
@ -93,7 +87,6 @@ enum
  STARTUP_SEQUENCE_CHANGED,
  WORKAREAS_CHANGED,
  MONITORS_CHANGED,
-  IN_FULLSCREEN_CHANGED,

  LAST_SIGNAL
 };
@ -248,14 +241,6 @@ meta_screen_class_init (MetaScreenClass *klass)
          NULL, NULL, NULL,
 		  G_TYPE_NONE, 0);

-  screen_signals[IN_FULLSCREEN_CHANGED] =
-    g_signal_new ("in-fullscreen-changed",
-		  G_TYPE_FROM_CLASS (object_class),
-		  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-		  G_TYPE_NONE, 0);
-
  g_object_class_install_property (object_class,
                                   PROP_N_WORKSPACES,
                                   pspec);
@ -489,13 +474,11 @@ reload_monitor_infos (MetaScreen *screen)
      screen->monitor_infos[0].number = 0;
      screen->monitor_infos[0].rect = screen->rect;
      screen->monitor_infos[0].rect.width = screen->rect.width / 2;
-      screen->monitor_infos[0].in_fullscreen = -1;

      screen->monitor_infos[1].number = 1;
      screen->monitor_infos[1].rect = screen->rect;
      screen->monitor_infos[1].rect.x = screen->rect.width / 2;
      screen->monitor_infos[1].rect.width = screen->rect.width / 2;
-      screen->monitor_infos[0].in_fullscreen = -1;
    }

  if (screen->n_monitor_infos == 0 &&
@ -525,7 +508,6 @@ reload_monitor_infos (MetaScreen *screen)
              screen->monitor_infos[i].rect.y = infos[i].y_org;
              screen->monitor_infos[i].rect.width = infos[i].width;
              screen->monitor_infos[i].rect.height = infos[i].height;
-              screen->monitor_infos[i].in_fullscreen = -1;

              meta_topic (META_DEBUG_XINERAMA,
                          "Monitor %d is %d,%d %d x %d\n",
@ -585,7 +567,6 @@ reload_monitor_infos (MetaScreen *screen)
          
      screen->monitor_infos[0].number = 0;
      screen->monitor_infos[0].rect = screen->rect;
-      screen->monitor_infos[0].in_fullscreen = -1;
    }

  filter_mirrored_monitors (screen);
@ -599,10 +580,7 @@ reload_monitor_infos (MetaScreen *screen)
 /* The guard window allows us to leave minimized windows mapped so
 * that compositor code may provide live previews of them.
 * Instead of being unmapped/withdrawn, they get pushed underneath
- * the guard window. We also select events on the guard window, which
- * should effectively be forwarded to events on the background actor,
- * providing that the scene graph is set up correctly.
- */
+ * the guard window. */
 static Window
 create_guard_window (Display *xdisplay, MetaScreen *screen)
 {
@ -630,17 +608,6 @@ create_guard_window (Display *xdisplay, MetaScreen *screen)
 		   CopyFromParent, /* visual */
 		   CWEventMask|CWOverrideRedirect|CWBackPixel,
 		   &attributes);
-
-  {
-    unsigned char mask_bits[XIMaskLen (XI_LASTEVENT)] = { 0 };
-    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
-
-    XISetMask (mask.mask, XI_ButtonPress);
-    XISetMask (mask.mask, XI_ButtonRelease);
-    XISetMask (mask.mask, XI_Motion);
-    XISelectEvents (xdisplay, guard_window, &mask, 1);
-  }
-
  meta_stack_tracker_record_add (screen->stack_tracker,
                                 guard_window,
                                 create_serial);
@ -781,8 +748,6 @@ meta_screen_new (MetaDisplay *display,
    XIEventMask mask = { XIAllMasterDevices, sizeof (mask_bits), mask_bits };
    XWindowAttributes attr;

-    meta_core_add_old_event_mask (xdisplay, xroot, &mask);
-
    XISetMask (mask.mask, XI_KeyPress);
    XISetMask (mask.mask, XI_KeyRelease);
    XISetMask (mask.mask, XI_Enter);
@ -790,13 +755,6 @@ meta_screen_new (MetaDisplay *display,
    XISetMask (mask.mask, XI_FocusIn);
    XISetMask (mask.mask, XI_FocusOut);
    XISetMask (mask.mask, XI_Motion);
-#ifdef HAVE_XI23
-    if (META_DISPLAY_HAS_XINPUT_23 (display))
-      {
-        XISetMask (mask.mask, XI_BarrierHit);
-        XISetMask (mask.mask, XI_BarrierLeave);
-      }
-#endif /* HAVE_XI23 */
    XISelectEvents (xdisplay, xroot, &mask, 1);

    event_mask = (SubstructureRedirectMask | SubstructureNotifyMask |
@ -841,7 +799,6 @@ meta_screen_new (MetaDisplay *display,
                                                                 xroot, 
                                                                 NoEventMask);
  screen->work_area_later = 0;
-  screen->check_fullscreen_later = 0;

  screen->active_workspace = NULL;
  screen->workspaces = NULL;
@ -1005,8 +962,6 @@ meta_screen_free (MetaScreen *screen,
  
  if (screen->work_area_later != 0)
    g_source_remove (screen->work_area_later);
-  if (screen->check_fullscreen_later != 0)
-    g_source_remove (screen->check_fullscreen_later);

  if (screen->monitor_infos)
    g_free (screen->monitor_infos);
@ -1104,6 +1059,34 @@ meta_screen_manage_all_windows (MetaScreen *screen)
  meta_display_ungrab (screen->display);
 }

+void
+meta_screen_composite_all_windows (MetaScreen *screen)
+{
+  MetaDisplay *display;
+  GSList *windows, *tmp;
+
+  display = screen->display;
+  if (!display->compositor)
+    return;
+
+  windows = meta_display_list_windows (display,
+                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
+  for (tmp = windows; tmp != NULL; tmp = tmp->next)
+    {
+      MetaWindow *window = tmp->data;
+
+      meta_compositor_add_window (display->compositor, window);
+      if (window->visible_to_compositor)
+        meta_compositor_show_window (display->compositor, window,
+                                     META_COMP_EFFECT_NONE);
+    }
+
+  g_slist_free (windows);
+  
+  /* initialize the compositor's view of the stacking order */
+  meta_stack_tracker_sync_stack (screen->stack_tracker);
+}
+
 /**
 * meta_screen_for_x_screen:
 * @xscreen: an X screen structure.
@ -1227,7 +1210,7 @@ meta_screen_foreach_window (MetaScreen *screen,
   */
  
  winlist = NULL;
-  g_hash_table_foreach (screen->display->xids,
+  g_hash_table_foreach (screen->display->window_ids,
                        listify_func,
                        &winlist);
  
@ -1244,9 +1227,7 @@ meta_screen_foreach_window (MetaScreen *screen,
        {
          MetaWindow *window = tmp->data;

-          if (META_IS_WINDOW (window) &&
-              window->screen == screen &&
-              !window->override_redirect)
+          if (window->screen == screen && !window->override_redirect)
            (* func) (screen, window, data);
        }
      
@ -2006,7 +1987,6 @@ meta_screen_get_mouse_window (MetaScreen  *screen,
                  &mods,
                  &group);
  meta_error_trap_pop (screen->display);
-  free (buttons.mask);

  window = meta_stack_get_default_focus_window_at_point (screen->stack,
                                                         screen->active_workspace,
@ -2022,39 +2002,27 @@ meta_screen_get_monitor_for_rect (MetaScreen    *screen,
                                  MetaRectangle *rect)
 {
  int i;
-  int best_monitor, monitor_score, rect_area;
+  int best_monitor, monitor_score;

  if (screen->n_monitor_infos == 1)
    return &screen->monitor_infos[0];

  best_monitor = 0;
-  monitor_score = -1;
+  monitor_score = 0;

-  rect_area = meta_rectangle_area (rect);
  for (i = 0; i < screen->n_monitor_infos; i++)
    {
-      gboolean result;
-      int cur;
-
-      if (rect_area > 0)
+      MetaRectangle dest;
+      if (meta_rectangle_intersect (&screen->monitor_infos[i].rect,
+                                    rect,
+                                    &dest))
        {
-          MetaRectangle dest;
-          result = meta_rectangle_intersect (&screen->monitor_infos[i].rect,
-                                             rect,
-                                             &dest);
-          cur = meta_rectangle_area (&dest);
-        }
-      else
-        {
-          result = meta_rectangle_contains_rect (&screen->monitor_infos[i].rect,
-                                                 rect);
-          cur = rect_area;
-        }
-
-      if (result && cur > monitor_score)
-        {
-          monitor_score = cur;
-          best_monitor = i;
+          int cur = meta_rectangle_area (&dest);
+          if (cur > monitor_score)
+            {
+              monitor_score = cur;
+              best_monitor = i;
+            }
        }
    }

@ -2072,14 +2040,6 @@ meta_screen_get_monitor_for_window (MetaScreen *screen,
  return meta_screen_get_monitor_for_rect (screen, &window_rect);
 }

-int
-meta_screen_get_monitor_index_for_rect (MetaScreen    *screen,
-                                        MetaRectangle *rect)
-{
-  const MetaMonitorInfo *monitor = meta_screen_get_monitor_for_rect (screen, rect);
-  return monitor->number;
-}
-
 const MetaMonitorInfo* 
 meta_screen_get_monitor_neighbor (MetaScreen         *screen,
                                  int                 which_monitor,
@ -2258,7 +2218,6 @@ meta_screen_get_current_monitor (MetaScreen *screen)
                      &buttons,
                      &mods,
                      &group);
-      free (buttons.mask);

      pointer_position.x = root_x_return;
      pointer_position.y = root_y_return;
@ -3001,7 +2960,7 @@ meta_screen_resize (MetaScreen *screen,

  /* Fix up monitor for all windows on this screen */
  windows = meta_display_list_windows (screen->display,
-                                       META_LIST_DEFAULT);
+                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
  for (tmp = windows; tmp != NULL; tmp = tmp->next)
    {
      MetaWindow *window = tmp->data;
@ -3013,8 +2972,6 @@ meta_screen_resize (MetaScreen *screen,
  g_free (old_monitor_infos);
  g_slist_free (windows);

-  meta_screen_queue_check_fullscreen (screen);
-
  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0);
 }

@ -3506,7 +3463,6 @@ meta_screen_get_display (MetaScreen *screen)

 /**
 * meta_screen_get_xroot: (skip)
- * @screen: A #MetaScreen
 *
 */
 Window
@ -3537,7 +3493,6 @@ meta_screen_get_size (MetaScreen *screen,

 /**
 * meta_screen_get_compositor_data: (skip)
- * @screen: A #MetaScreen
 *
 */
 gpointer
@ -3606,7 +3561,6 @@ meta_screen_get_active_workspace_index (MetaScreen *screen)

 /**
 * meta_screen_get_active_workspace:
- * @screen: A #MetaScreen
 *
 * Returns: (transfer none): The current workspace
 */
@ -3667,142 +3621,3 @@ meta_screen_set_active_workspace_hint (MetaScreen *screen)
  meta_error_trap_pop (screen->display);
 }

-static gboolean
-check_fullscreen_func (gpointer data)
-{
-  MetaScreen *screen = data;
-  GSList *windows;
-  GSList *tmp;
-  GSList *fullscreen_monitors = NULL;
-  gboolean in_fullscreen_changed = FALSE;
-  int i;
-
-  screen->check_fullscreen_later = 0;
-
-  windows = meta_display_list_windows (screen->display,
-                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
-
-  for (tmp = windows; tmp != NULL; tmp = tmp->next)
-    {
-      MetaWindow *window = tmp->data;
-      gboolean covers_monitors = FALSE;
-
-      if (window->screen != screen || window->hidden)
-        continue;
-
-      if (window->fullscreen)
-        /* The checks for determining a fullscreen window's layer are quite
-         * elaborate, and we do a poor job at keeping it dynamically up-to-date.
-         * (It depends, for example, on whether the focus window is on the
-         * same monitor as the fullscreen window.) But because we minimize
-         * fullscreen windows not in LAYER_FULLSCREEN (see below), if the
-         * layer is stale here, it's really bad, so just force recomputation for
-         * here. This is expensive, but hopefully this function won't be
-         * called too often.
-         */
-        meta_window_update_layer (window);
-
-      if (window->override_redirect)
-        {
-          /* We want to handle the case where an application is creating an
-           * override-redirect window the size of the screen (monitor) and treat
-           * it similarly to a fullscreen window, though it doesn't have fullscreen
-           * window management behavior. (Being O-R, it's not managed at all.)
-           */
-          if (meta_window_is_monitor_sized (window))
-            covers_monitors = TRUE;
-        }
-      else
-        {
-          if (window->layer == META_LAYER_FULLSCREEN)
-            covers_monitors = TRUE;
-        }
-
-      if (covers_monitors)
-        {
-          int *monitors;
-          gsize n_monitors;
-          gsize j;
-
-          monitors = meta_window_get_all_monitors (window, &n_monitors);
-          for (j = 0; j < n_monitors; j++)
-            {
-              /* + 1 to avoid NULL */
-              gpointer monitor_p = GINT_TO_POINTER(monitors[j] + 1);
-              if (!g_slist_find (fullscreen_monitors, monitor_p))
-                fullscreen_monitors = g_slist_prepend (fullscreen_monitors, monitor_p);
-            }
-
-          g_free (monitors);
-        }
-
-      /* If we find a window that is fullscreen but not in the FULLSCREEN
-       * layer, it means that we've kicked it out of the layer because
-       * we've focused another window on the same monitor. In this case
-       * it would be confusing to keep the window fullscreen and visible,
-       * so minimize it. We can't do the same thing for override-redirect
-       * windows, so we just hope the application does the right thing.
-       */
-      if (!covers_monitors && window->fullscreen)
-        {
-          meta_window_minimize (window);
-          meta_topic (META_DEBUG_WINDOW_OPS,
-                      "Minimizing %s: was fullscreen but in a lower layer\n",
-                      window->desc);
-        }
-    }
-
-  g_slist_free (windows);
-
-  for (i = 0; i < screen->n_monitor_infos; i++)
-    {
-      MetaMonitorInfo *info = &screen->monitor_infos[i];
-      gboolean in_fullscreen = g_slist_find (fullscreen_monitors, GINT_TO_POINTER (i + 1)) != NULL;
-      if (in_fullscreen != info->in_fullscreen)
-        {
-          info->in_fullscreen = in_fullscreen;
-          in_fullscreen_changed = TRUE;
-        }
-    }
-
-  g_slist_free (fullscreen_monitors);
-
-  if (in_fullscreen_changed)
-    g_signal_emit (screen, screen_signals[IN_FULLSCREEN_CHANGED], 0, NULL);
-
-  return FALSE;
-}
-
-void
-meta_screen_queue_check_fullscreen (MetaScreen *screen)
-{
-  if (!screen->check_fullscreen_later)
-    screen->check_fullscreen_later = meta_later_add (META_LATER_CHECK_FULLSCREEN,
-                                                     check_fullscreen_func,
-                                                     screen, NULL);
-}
-
-/**
- * meta_screen_get_monitor_in_fullscreen:
- * @screen: a #MetaScreen
- * @monitor: the monitor number
- *
- * Determines whether there is a fullscreen window obscuring the specified
- * monitor. If there is a fullscreen window, the desktop environment will
- * typically hide any controls that might obscure the fullscreen window.
- *
- * You can get notification when this changes by connecting to
- * MetaScreen::in-fullscreen-changed.
- *
- * Returns: %TRUE if there is a fullscreen window covering the specified monitor.
- */
-gboolean
-meta_screen_get_monitor_in_fullscreen (MetaScreen  *screen,
-                                       int          monitor)
-{
-  g_return_val_if_fail (META_IS_SCREEN (screen), FALSE);
-  g_return_val_if_fail (monitor >= 0 && monitor < screen->n_monitor_infos, FALSE);
-
-  /* We use -1 as a flag to mean "not known yet" for notification purposes */
-  return screen->monitor_infos[monitor].in_fullscreen == TRUE;
-}
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@ -1,20 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/*
- * SECTION:stack-tracker
- * @short_description: Track stacking order for compositor
- *
- * #MetaStackTracker maintains the most accurate view we have at a
- * given point of time of the ordering of the children of the root
- * window (including override-redirect windows.) This is used to order
- * the windows when the compositor draws them.
- *
- * By contrast, #MetaStack is responsible for keeping track of how we
- * think that windows *should* be ordered.  For windows we manage
- * (non-override-redirect windows), the two stacking orders will be
- * the same.
- */
-
 /*
 * Copyright (C) 2009 Red Hat, Inc.
 *
@ -631,7 +616,7 @@ meta_stack_tracker_configure_event (MetaStackTracker    *tracker,
 * @windows: location to store list of windows, or %NULL
 * @n_windows: location to store count of windows, or %NULL
 *
- * @windows will contain the most current view we have of the stacking order
+ * Returns the most current view we have of the stacking order
 * of the children of the root window. The returned array contains
 * everything: InputOnly windows, override-redirect windows,
 * hidden windows, etc. Some of these will correspond to MetaWindow
@ -754,7 +739,7 @@ meta_stack_tracker_queue_sync_stack (MetaStackTracker *tracker)
 {
  if (tracker->sync_stack_later == 0)
    {
-      tracker->sync_stack_later = meta_later_add (META_LATER_SYNC_STACK,
+      tracker->sync_stack_later = meta_later_add (META_LATER_BEFORE_REDRAW,
                                                  stack_tracker_sync_stack_later,
                                                  tracker, NULL);
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Owen W. Taylor	d317c1c7e8	Consistently use meta_grab_op_is_resizing() for _NET_WM_SYNC_REQUEST In different places we checked the grab op differently when determing whether we are using _NET_WM_SYNC_REQUEST. This was somewhat covered up previously by the fact that we only had a sync alarm when using _NET_WM_SYNC_REQUEST, but that is no longer the case, so consistently use meta_grab_op_is_resizing() everywhere.	2013-01-30 15:47:52 -05:00
Owen W. Taylor	cf72589635	Distinguish "no delay" frames from spontaneous drawing When a client is drawing as hard as possible (without sleeping between frames) we need to draw as soon possible, since sleeping will decrease the effective frame rate shown to the user, and can also result in the system never kicking out of power-saving mode because it doesn't look fully utilized. Use the amount the client increments the counter value by when ending the frame to distinguish these cases: - Increment by 1: a no-delay frame - Increment by more than 1: a non-urgent frame, handle normally https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	3ae070720d	Send _NET_WM_FRAME_TIMINGS messages We previously had timestamp information stubbed out in _NET_WM_FRAME_DRAWN. Instead of this, add a high-resolution timestamp in _NET_WM_FRAME_DRAWN then send a _NET_WM_FRAME_TIMINGS message after when we have complete frame timing information, representing the "presentation time" of the frame as an offset from the timestamp in _NET_WM_FRAME_DRAWN. To provide maximum space in the messages,_NET_WM_FRAME_DRAWN and _NET_WM_FRAME_TIMINGS are not done as WM_PROTOCOLS messages but have their own message types. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	4b332640eb	Add meta_compositor_monotonic_time_to_server_time() Add a function to convert from g_get_monotonic_time() to a "high-resolution server timestamp" with microsecond precision. These timestamps will be used when communicating frame timing information to the client. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	0d36f4f1dd	Use XSyncSetPriority() Use XSyncSetPriority() to prioritize the compositor above applications for X server priority. In practice, this makes little difference because the Xorg "smart scheduler" will schedule in a single application for time slices that exceed the frame drawing time, but it's theoretically right and might make a difference if the X server scheduler is improved. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	0c2491e3c9	Use clutter_stage_set_sync_delay() Using a "sync delay" where we wait for 2 ms after the vblank before starting to draw the next frame provides for much more predictable latency for applications. An application can know that if it completes a frame any time between 8ms before the vblank to the vblank, it will reliably be drawn on the following vblank period, rather than having an unpredictable latency depending on whether the compositor is currently busy drawing a frame or not. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	6de7f4ce36	Enable CLUTTER / COGL_ENABLE_EXPERIMENTAL_API globally Instead of defining CLUTTER_ENABLE_EXPERIMENTAL_API and COGL_ENABLE_EXPERIMENTAL_API in individual source files, enable them on the command line. We weren't tracking exactly what pieces of experimental API we were using and we were using the experimental API in most source files that used Clutter and Cogl, so the local #defines were annoying rather than useful. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	5f77669ba8	Handle _NET_WM_SYNC_REQUEST_COUNTER updates without redraw It's possible that a client might update the (extended) _NET_WM_SYNC_REQUEST_COUNTER counter twice without actually drawing anything. In that case, we still should send a _NET_WM_FRAME_DRAWN message since it's hard for a client to know every case in which no damage is generated. For now, do it the easy way by forcing a stage repaint. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	7a9663500e	MetaWindow: always resize the frame first when we have synchronization Resizing the frame triggers creation of a new backing pixmap for the window, so we should do that first before we resize the client window and mess up the contents of the old backing pixmap. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	4f79c70002	Send _NET_WM_FRAME_DRAWN messages When the application provides the extended second counter for _NET_WM_SYNC_REQUEST, send a client message with completion information after the next redraw after each counter update by the application. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	81c42a8944	Add support for an extended style of _NET_WM_SYNC_REQUEST_COUNTER If an application provides two values in _NET_WM_SYNC_REQUEST_COUNTER, use that as a signal that the applications wants an extended behavior where it can update the counter as well as the window manager. If the application updates the counter to an odd value, updates of the window are frozen until the counter is updated again to an even value. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	8d9c83ddcf	Support properties with lists of XSyncCounter Add META_PROP_VALUE_SYNC_COUNTER_LIST for a property that contains multiple XSyncCounter values. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	5b6020e90d	Move sync alarms to be per-window and permanent Instead of creating a new alarm each time we resize a window interactively, create an alarm the first time we resize a window and keep it around permanently until we unmanage the window. Doing it this way will be useful when we allow the application to spontaneously generate sync request updates to indicate frames it is drawing. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:52 -05:00
Owen W. Taylor	8b57ecebda	Implement freezing of updates during resize Replace the unused meta_compositor_set_updates() with a reversed-meaning meta_compositor_set_updates_frozen(), and use it to implement freezing application window updates during interactive resizing. This avoids drawing new areas of the window with blank content before the application has a chance to repaint. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:51 -05:00
Owen W. Taylor	f6c3e48aa5	MetaWindowActor: Use guint for bitfields A 1-bit boolean (int) bitfield has the values 0 and -1. Use guint instead for bitfield values. https://bugzilla.gnome.org/show_bug.cgi?id=685463	2013-01-30 15:47:51 -05:00