display: Unset grab_frame_action in meta_display_end_grab_op

Otherwise, if the user had moved the windows around using a mouse, they can not be moved beyond the top edge of the primary monitor when the tray needs to be brought up, . This is because constrain_titlebar_visible looks at grab_frame_action and thinks that the movement is being caused by the user trying to move the windows up by grabbing the frame. Fixes: https://bugzilla.gnome.org/677215
2012-07-18 17:06:43 +02:00
262 changed files with 69399 additions and 65815 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -19,8 +19,6 @@ libtool
 ltmain.sh
 missing
 .deps
 src/50-mutter-navigation.xml
 src/50-mutter-system.xml
 src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop
@@ -46,6 +44,7 @@ POTFILES
 po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
 inlinepixbufs.h
 libmutter.pc
 mutter
 mutter-theme-viewer
@@ -55,14 +54,12 @@ org.gnome.mutter.gschema.xml
 testasyncgetprop
 testboxes
 testgradient
 m4/*
 mutter-grayscale
 mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
 test-attached
 test-focus
 test-gravity
 test-resizing
 test-size-hints
@@ -75,23 +72,4 @@ src/mutter-enum-types.[ch]
 src/stamp-mutter-enum-types.h
 src/mutter-marshal.[ch]
 src/stamp-mutter-marshal.h
 src/meta-dbus-xrandr.[ch]
 src/meta-dbus-idle-monitor.[ch]
 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/41
+++ b/41
@@ -1,12 +1,12 @@
-                    GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+		       Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.
-                            Preamble
+			    Preamble
  The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
+the GNU Library General Public License instead.)  You can apply it to
 your programs, too.
  When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
  The precise terms and conditions for copying, distribution and
 modification follow.
-
+
-                    GNU GENERAL PUBLIC LICENSE
+		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
  0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
  4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
  8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
-                            NO WARRANTY
+			    NO WARRANTY
  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
-                     END OF TERMS AND CONDITIONS
+		     END OF TERMS AND CONDITIONS
-
+
-            How to Apply These Terms to Your New Programs
+	    How to Apply These Terms to Your New Programs
  If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,16 +303,17 @@ the "copyright" line and a pointer to where the full notice is found.
    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
+    You should have received a copy of the GNU General Public License
-    with this program; if not, write to the Free Software Foundation, Inc.,
+    along with this program; if not, write to the Free Software
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Also add information on how to contact you by electronic and paper mail.
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
-    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision version 69, Copyright (C) year  name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.
@@ -335,5 +336,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
+library.  If this is what you want to do, use the GNU Library General
 Public License instead of this License.
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,6 @@
 SUBDIRS=src po doc
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 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
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
--- a/585
+++ b/585
@@ -1,588 +1,3 @@
 3.12.2
 ======
 * Fix in-fullscreen state when moving between monitors [Florian; #728395]
 * Fix crash when monitors change during suspend [Giovanni; #725637]
 * Misc. bug fixes [Florian, Giovanni; #728423, #729732]
 Contributors:
  Giovanni Campagna, Florian Müllner
 Translations:
  Christian Kirbach [de], Pau Iranzo [ca]
 3.12.1
 ======
 * Fix opacity values from _NET_WM_WINDOW_OPACITY [Nirbheek; #727874]
 * Misc. cleanups [Jasper; #720631]
 Contributors:
  Nirbheek Chauhan, Jasper St. Pierre
 Translations:
  Inaki Larranaga Murgoitio [eu], marablack3 [el]
 3.12.0
 ======
 Translations:
  Ask H. Larsen [da], Мирослав Николић [sr, sr@latin], Andika Triwidada [id],
  Daniel Korostil [uk], Petr Kovar [cs]
 3.11.92
 =======
 * Fix identification of CSD windows [Owen; #723029]
 * Add minimal handling of touch events [Carlos; #723552]
 * Misc bug fixes and cleanups [Owen, Adel, Jasper; #723580, #726352]
 Contributors:
  Adel Gadllah, Carlos Garnacho, Rui Matos, Jasper St. Pierre, Owen W. Taylor
 Translations:
  Changwoo Ryu [ko], Rūdolfs Mazurs [lv], Wylmer Wang [zh_CN],
  Chao-Hsiung Liao [zh_HK, zh_TW], Yuri Myasoedov [ru], Tiagosdot [pt],
  Claude Paroz [fr], Duarte Loreto [pt], A S Alam [pa]
 3.11.91
 =======
 * Don't use keysym to match keybindings [Rui; #678001]
 * Fix message tray icons showing up blank (again) [Adel; #725180]
 * Improve keybinding lookups [Rui; #725588]
 * Fix dynamic updates of titlebar style properties [Owen; #725751]
 * Fix positioning of manually positioned windows [Owen; #724049]
 * Misc. bug fixes [Carlos, Giovanni, Florian, Jasper; #724969, #724402, #722266,
  #725338]
 Contributors:
  Giovanni Campagna, Adel Gadllah, Carlos Garnacho, Rui Matos, Florian Müllner,
  Jasper St. Pierre
 Translations:
  Aurimas Černius [lt], Milo Casagrande [it], Balázs Úr [hu],
  Matej Urbančič [sl], Enrico Nicoletto [pt_BR], Yosef Or Boczko [he],
  Piotr Drąg [pl], Fran Diéguez [gl]
 3.11.90
 =======
 * Use correct output property for backlight control [Robert; #723606]
 * Fix double-scaling on high DPI resolutions [Adel; #723931]
 * Make tile previews a compositor effect [Stefano, Florian; #665758]
 * Misc. bug fixes and cleanups [Ryan, Giovanni, Jasper; #722530, #724257,
  #724258, #724364, #720631, #707851, #707897]
 Contributors:
  Robert Ancell, Giovanni Campagna, Stefano Facchini, Adel Gadllah,
  Ryan Lortie, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
 Translations:
  Shankar Prasad [kn], Khaled Hosny [ar], Marek Černocký [cs],
  Kjartan Maraas [nb], Daniel Korostil [uk]
 3.11.5
 ======
 * Fix CSD titlebars being placed off-screen [Jasper; #719772]
 * Expose MetaWindow:skip-taskbar property [Florian; #723307]
 * Fix legacy tray icons showing up blank [Adel; #721596]
 * Fix configuration of cloned monitors [Adel; #710610]
 * Misc bug fixes and cleanups [Jasper, Adel, Jonas; #720631, #723468, #723563]
 Contributors:
  Jonas Ådahl, Marek Ch, Adel Gadllah, Florian Müllner, Jasper St. Pierre
 Translations:
  Rafael Ferreira [pt_BR], Enrico Nicoletto [pt_BR], Fran Diéguez [gl],
  Chao-Hsiung Liao [zh_HK, zh_TW]
 3.11.4
 ======
 * Don't leave focus on windows that are being unmanaged [Owen; #711618]
 * Reduce server grabs [Daniel Drake; #721345, #721709]
 * Improve heuristic to determine display output name [Cosimo Cecchi; #721674]
 * Atomically unmaximize both directions [Jasper; #722108]
 * Misc bug fixes [Debarshi, Andika; #721517, #721674]
 Contributors:
  Cosimo Cecchi, Daniel Drake, Debarshi Ray, Jasper St. Pierre,
  Andika Triwidada, Owen W. Taylor
 Translations:
  Rafael Ferreira [pt_BR], Dimitris Spingos [el], Daniel Mustieles [es],
  Milo Casagrande [it], Yosef Or Boczko [he]
 3.11.3
 ======
 * xrandr: Use "hotplug_mode_update" property [Marc-André; #711216]
 * Fix position of attached dialogs for CSD windows [Giovanni, Owen; #707194]
 * Fix focus issues with external OSKs [Jasper; #715030]
 * Add a MetaCullable interface [Jasper; #714706]
 * Fix window group paint volume [Owen; #719669]
 * Fix frame extents problems [Owen; #714707]
 * Add shortcut to move windows between monitors [Florian; #671054]
 * Fix problems with focus tracking [Owen; #720558]
 * Misc. bug fixes and cleanups [Rui, Jasper, Owen; #712833, #678989, #720106,
  #720417, #720630]
 Contributors:
  Robert Bragg, Giovanni Campagna, Marc-André Lureau, Rui Matos, Alberto Milone,
  Florian Müllner, Sindhu S, Jasper St. Pierre, Rico Tzschichholz,
  Owen W. Taylor
 Translations:
  甘露(Gan  Lu) [zh_CN], Khaled Hosny [ar]
 3.11.2
 ======
 * Fix resize operations using mouse-button-modifier [Lionel; #710251]
 * Misc. fixes and cleanups [Jasper, Rico, Florian; #711731]
 Contributors:
  Lionel Landwerlin, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz
 3.11.1
 ======
 * Don't require at least one output device to be connected [Giovanni; #709009]
 * Name the guard window [Andrew; #710346]
 * Use new UPower API [Bastien]
 * Expose min-backlight-step [Asad; #710380]
 * Don't focus the no-focus-window for globally active windows [Jasper; #710296]
 * Misc. fixes and cleanups [Jasper, Rico, Olav, Magdalen; #709776]
 Contributors:
  Magdalen Berns, Giovanni Campagna, Asad Mehmood, Bastien Nocera,
  Jasper St. Pierre, Rico Tzschichholz, Olav Vitters, Andrew Walton
 Translations:
  Reinout van Schouwen [nl]
 3.10.1
 ======
 * Don't apply fullscreen workarounds to CSD windows [Giovanni; #708718]
 * Fix hangs during DND operations [Adel; #709340]
 * Use nearest-pixel interpolation when possible [Hans; #708389]
 * Fix tile previews getting stuck on right click during drags [Lionel; #704759]
 * Misc bug fixes [Giovanni, Jasper; #708420]
 Contributors:
  Giovanni Campagna, Adel Gadllah, Lionel Landwerlin, Hans Petter Jansson,
  Jasper St. Pierre
 Translations:
  Khaled Hosny [ar], Reinout van Schouwen [nl], Carles Ferrando [ca@valencia]
 3.10.0.1
 ========
 * Fix bug when a window changed size twice in a single frame - this
  can happen with GTK+ client-side decorations [Giovanni, Owen; #708367]
 Contributors:
  Giovanni Campagna, Owen Taylor
 3.10.0
 ======
 Translations:
  Ask H. Larsen [da], Gabor Kelemen [hu], Duarte Loreto [pt],
  Yosef Or Boczko [he]
 3.9.92
 ======
 * Don't create a dummy texture for the texture pipeline template [Neil; #707458]
 * Remove holes generated by disabling the laptop lid [Giovanni; #707473]
 * https://bugzilla.gnome.org/show_bug.cgi?id=707474 [Giovanni; #707474]
 * Don't require plugins to pass event to Clutter [Giovanni; #707482]
 * Add support for more cursor types [Giovanni; #707919]
 * Immediately fire idle watches that are already expired [Giovanni; #707302]
 * Misc bug fixes [Giovanni, Colin, Pavel; #707649, #707563, #708070]
 Contributors:
  Giovanni Campagna, Adel Gadllah, Colin Guthrie, Neil Roberts,
  Jasper St. Pierre, Ray Strode, Pavel Vasin
 Translations:
  Мирослав Николић po/sr, sr@latin.po, Мирослав Николић [sr, sr@latin],
  Chao-Hsiung Liao [zh_HK, zh_TW], Yuri Myasoedov [ru],
  Ville-Pekka Vainio [fi], Changwoo Ryu [ko], A S Alam [pa],
  Mattias Põldaru [et], Rūdolfs Mazurs [lv], Ihar Hrachyshka [be],
  Nilamdyuti Goswami [as], Andika Triwidada [id], Baurzhan Muftakhidinov [kk],
  Benjamin Steinwender [de]
 3.9.91
 ======
 * Drop man pages for removed utilities [Kalev; #706579]
 * Add support for idle tracking [Giovanni; #706005]
 * Skip CRTC reconfigurations that have no effect [Giovanni; #706672]
 * Ignore skip-taskbar hints on parentless dialogs [Giovanni; #673399]
 * Don't save pixbuf data in user data [Tim; #706777]
 * Don't queue redraws for obscured regions [Adel; #703332]
 * Turn blending off when drawing entirely opaque regions [Jasper; #706930]
 * Check event timestamps before reconfiguring [Giovanni; #706735]
 * Misc bug fixes [Giovanni, Colin, Seán, Jasper, Cosimo; #706582, #706598,
  #706787, #706729, #706825, #707081, #707090, #707250, #707267]
 Contributors:
  Giovanni Campagna, Cosimo Cecchi, Adel Gadllah, Colin Guthrie, Kalev Lember,
  Tim Lunn, Jasper St. Pierre, Rico Tzschichholz, Seán de Búrca
 Translations:
  Piotr Drąg [pl], Alexandre Franke [fr], Kjartan Maraas [nb],
  Milo Casagrande [it], Balázs Úr [hu], Seán de Búrca [ga], Fran Diéguez [gl],
  Daniel Mustieles [es], Aurimas Černius [lt], Gil Forcada [ca]
 3.9.90
 ======
 * Add support for _GTK_FRAME_EXTENTS [Jasper; #705766]
 * Fix quick consecutive <super> presses breaking keyboard input [Alban; #666101]
 * Work towards running as wayland compositor [Giovanni]
 - Add DBus API for display configuration
   [#705670, #706231, #706233, #706322, #706382]
 - Add abstraction layer for cursor tracking [#705911]
 - Add support for plugin modality under wayland [#705917]
 * Disable GTK+ scaling [Alexander; #706388]
 * Disable blending while updating tower [Robert]
 * Misc bug fixes and cleanups [Adel, Jasper, Giovanni, Colin, Rico, Florian;
  #703332, #704437, #706207]
 Contributors:
  Robert Bragg, Giovanni Campagna, Alban Crequy, Adel Gadllah,
  Alexander Larsson, Florian Müllner, Jasper St. Pierre, Rico Tzschichholz,
  Colin Walters
 Translations:
  Jiro Matsuzawa [ja], Kjartan Maraas [nb], Matej Urbančič [sl],
  Marek Černocký [cs], Daniel Mustieles [es], Rafael Ferreira [pt_BR],
  Yaron Shahrabani [he], Ján Kyselica [sk]
 3.9.5
 =====
 * Don't select for touch events on the stage [Jasper; #697192]
 * Don't queue redraws for obscured regions [Adel; #703332]
 * Export timestamp of global keybinding events [Bastien; #704858]
 * Misc bug fixes and cleanups [Jasper, Rico; #703970]
 Contributors:
  Adel Gadllah, Bastien Nocera, Jasper St. Pierre, Rico Tzschichholz
 3.9.4
 =====
 * Tweak window shadows [Allan; #702141]
 * Ignore our own focus events for focus prediction [Jasper; #701017]
 * Add API to query if the stage is focused [Jasper; #700735]
 * Add API to query the monitor for a given position [Adel]
 * Don't force attached dialogs to be border-only [Florian; #702764]
 * Allow slicing of backgrounds to avoid texture size limits [Ray; #702283]
 * Miscellaneous bug fixes and cleanups [Adel; #701224, #702564]
 Contributors:
  Allan Day, Adel Gadllah, Florian Müllner, Jasper St. Pierre, Ray Strode
 3.9.3
 =====
 * Ensure events are always reported to the grab window [Rui; #701219]
 * Use new clutter_stage_set_paint_callback() function to prevent dropping
  frames with frame synced toolkits [Owen; #698794]
 Contributors:
  Rui Matos, Owen W. Taylor
 3.9.2
 =====
 * Add meta_window_can_close() function [Jasper; #699269]
 * Add support for string-array preferences [Florian; #700223]
 * Fix a potential race condition with _NET_WM_MOVERESIZE [Jasper; #699777]
 * Fix shade window action [Stef; #693714]
 * Remove overlay_group [Giovanni; #700735]
 * Improve tracking of the focus window [Dan, Jasper; #647706]
 * Add API to freeze/unfreeze the keyboard [Rui; #697001]
 * Grab and emit a signal when XK_ISO_Next_Group is pressed [Rui; #697002]
 * Misc bug fixes and cleanups [Dieter, Jasper, Rui; #699636, #700735, #697000]
 Contributors:
  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
  Dieter Verfaillie, Stef Walter, Dan Winship
 Translations:
  Kjartan Maraas [nb], Ján Kyselica [sk]
 3.9.1
 =====
 * Fix miscellaneous memory leaks [Pavel; #698710]
 * Misc fixes and cleanups [Stef, Simon; #698179, #697758]
 Contributors:
  Simon McVittie, Pavel Vasin, Stef Walter
 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]
 * Make automaximization optional [Adel; #680990]
 * Add method for checking if the application is responding [Giovanni; #684340]
 * Expose the xinput opcode [Jasper; #690590]
 * Rebrand "minimize" as "hide" [Florian; #682887]
 * Misc bug fixes and cleanups [Giovanni, Ray, Jasper, Matthias, Debarshi,
  Florian, Rui; #690454, #690573, #690593, #690956, #691363, #690609, #690317,
  #689263]
 Contributors:
  Giovanni Campagna, Matthias Clasen, Adel Gadllah, Rui Matos, Florian Müllner,
  Debarshi Ray, Jasper St. Pierre, Ray Strode
 Translations:
  Mattias Põldaru [et], Yaron Shahrabani [he], Daniel Mustieles [es],
  Khaled Hosny [ar], Fran Diéguez [gl], A S Alam [pa], Piotr Drąg [pl],
  Rafael Ferreira [pt_BR], Nilamdyuti Goswami [as], Alexander Shopov [bg],
  Matej Urbančič [sl]
 3.7.3
 =====
 * Fix maximized windows jumping to other monitors [Alban; #556696]
 * Add 'switch-applications' keybinding [Florian; #688913]
 * Add a convenience method to focus the default window [Jasper; #689652]
 * Increase typical icon size to 96 [Jasper; #689651]
 * Port to XInput2 [Jasper; #688779]
 * Give dynamic keybindings a keybinding action [Florian; #682315]
 * Misc. fixes and cleanups [Jasper, Rui; #688777]
 Contributors:
  Alban Crequy, Rui Matos, Florian Müllner, Jasper St. Pierre
 Translations:
  Nilamdyuti Goswami [as], Piotr Drąg [pl], Yaron Shahrabani [he],
  Dr.T.Vasudevan [ta], ManojKumar Giri [or], Shankar Prasad [kn]
 3.7.2
 =====
 * Fix spurious focus changes when showing desktop [Florian; #686928]
 * MetaPluginManager: don't send events to Clutter twice [Owen; #686406]
 * Add the ability to add shader hooks to MetaBackgroundActor [Giovanni; #669798]
 * Only process keyboard mapping events for the core X keyboard [Rui; #674859]
 * Import keybinding files from Metacity [Florian; #687672]
 * Add compositor hook to process keybindings selectively [Florian; #688202]
 * MetaBackgroundActor: add a setter for GLSL uniforms [Giovanni; #682536]
 * Misc. fixes and cleanups [Jasper, Rui, Florian, Rico; #688182]
 Contributors:
  Giovanni Campagna, Rui Matos, Florian Müllner, Jasper St. Pierre,
  Owen Taylor, Rico Tzschichholz
 Translations:
  Rafael Ferreira [pt_BR], Tobias Endrigkeit [de], Yaron Shahrabani [he]
 3.7.1
 =====
 * screen: Ignore num-workspaces when using dynamic workspaces [Florian; #685439]
 Contributors:
  Florian Müllner
 Translations:
  Mattias Põldaru [et], Kjartan Maraas [nb], Мирослав Николић [sr, sr@latin],
  Marek Černocký [cs], Andika Triwidada [id], Daniel Mustieles [es],
  Fran Diéguez [gl], Matej Urbančič [sl]
 3.6.1
 =====
 * Fix crash when opening large popup menus [Jasper; #681676]
 * window: Don't move the desktop window after monitor hotplug [Jasper; #681159]
 * Expose MetaPlugin to introspection [Evan; #671098]
 * Optionally delay focus changes in focus-follows-mouse mode [Florian; #678169]
 * Resize the guard window when the X screen is resized [Benjamin; #670396]
 * display: Only manage the default X screen [Jürg; #648156]
 * Misc cleanups: [Owen; #587255]
 Contributors:
  Benjamin Berg, Jürg Billeter, Evan Broder, Florian Müllner, Jasper St. Pierre,
  Owen Taylor
 Translations:
  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Sayak Sarkar [bn_IN],
  Sandeep Sheshrao Shedmake [mr], Ask H. Larsen [da], Shankar Prasad [kn],
  Alexander Shopov [bg], Aurimas Černius [lt], Ihar Hrachyshka [be],
  Kjartan Maraas [nb], Daniel Mustieles [es], Changwoo Ryu [ko],
  Yuri Myasoedov [ru], Tom Tryfonidis [el], Rūdolfs Mazurs [lv],
  Chris Leonard [en_GB], Piotr Drąg [pl], Fran Diéguez [gl], Gil Forcada [ca],
  Matej Urbančič [sl], Andika Triwidada [id], Carles Ferrando [ca]
 3.6.0
 =====
 Translations:
  Alexander Shopov [bg], Daniel Korostil [uk], Rajesh Ranjan [hi],
  Krishnababu Krothapalli [te], Ani Peter [ml], Rūdolfs Mazurs [lv],
  Sweta Kothari [gu], Ihar Hrachyshka [be], Noriko Mizumoto [ja],
  Timo Jyrinki [fi], Mattias Põldaru [et]
 3.5.92
 ======
 * screen: Allow NULL out arguments in meta_screen_get_size [Tomeu]
 * display: Add API to set wm_name / wm_keybindings [Florian; #671010]
 * Improve the not responding dialog [Jon, Florian; #684306]
 * Misc. bugfixes [Jasper]
 Contributors:
  William Jon McCann, Florian Müllner, Jasper St. Pierre, Tomeu Vizoso
 Translations:
  Gabor Kelemen [hu], Piotr Drąg [pl], Dr.T.Vasudevan [ta], Bruce Cowan [en_GB],
  Alexandre Franke [fr], Theppitak Karoonboonyanan [th], Gil Forcada [ca],
  Carles Ferrando [ca@valencia], Tobias Endrigkeit [de], Tom Tryfonidis [el],
  Nguyễn Thái Ngọc Duy [vi], Changwoo Ryu [ko], Ask H. Larsen [da],
  Rafael Ferreira [pt_BR], Marek Černocký [cs]
 3.5.91
 ======
 * Do not include markup in app not responding dialog [Alex]
 * Fix subtracting unredirected windows from visible region [Jasper; #677116]
 * Minor improvements and bugfixes [Jasper, Florian; #682648, #682993]
 Contributors:
  Alexander Larsson, Florian Müllner, Jasper St. Pierre
 Translations:
  Dirgita [id], Piotr Drąg [pl], A S Alam [pa], Yuri Myasoedov [ru],
  Milo Casagrande [it], Nilamdyuti Goswami [as], Tom Tryfonidis [el],
  Duarte Loreto [pt], Fran Diéguez [gl], Nguyễn Thái Ngọc Duy [vi],
  Aurimas Černius [lt], Daniel Nylander [sv]
 3.5.90
 ======
 * Fix logic for handling translations of the windows group [Owen; #681221]
 * Handle painting inside a Clutter clone [Owen; #681953]
 * Update overlay-key on settings changes [Florian; #681906]
 * Add keybinding for overlay-key [Florian; #665547]
 * Minor fixes and improvements [Javier, Florian]
 Contributors:
  Javier Jardón, Florian Müllner, Owen Taylor
 Translations:
  Sweta Kothari [gu], Muhammet Kara [tr], Khaled Hosny [ar],
  Sandeep Sheshrao Shedmake [mr]
 3.5.5
 =====
 * Fix flickering around windows when using window group [Tom; #681221]
 Contributor(s):
  Tom Beckmann
 Translations:
  Chao-Hsiung Liao [zh_HK, zh_TW], Matej Urbančič [sl], Fran Diéguez [gl],
  Мирослав Николић [sr, sr@latin], Yaron Shahrabani [he], Kjartan Maraas [nb]
 3.5.4
 =====
 * Make it possible to reimplement move-to-workspace keybindings from plugins
--- a/18
+++ b/18
@@ -1,10 +1,16 @@
-The original codebase named "Metacity" is not a meta-City as in an
+Metacity is not a meta-City as in an urban center, but rather
-urban center, but rather Meta-ness as in the state of being
+Meta-ness as in the state of being meta. i.e. metacity : meta as
-meta. i.e. metacity : meta as opacity : opaque. Also it may have
+opacity : opaque. Also it may have something to do with the Meta key
-something to do with the Meta key on UNIX keyboards.
+on UNIX keyboards.
-Since then, it has been renamed mutter after a rebase on top of
+The first release of Metacity was version 2.3. Metacity has no need for
-clutter as a compositing manager.
+your petty hangups about version numbers.
 The stable releases so far are 2.4.x, 2.6.x, 2.8.[01], 2.8.1.x, 2.8.5-,
 2.10.x, 2.12.x, 2.14.x, 2.16.x.
 Unstable branches are 2.3.x, 2.5.x, 2.8.2-4, 2.9.x, 2.11.x, 2.13.x,
 2.15.x, 2.17.x.
 COMPILING MUTTER
 ===
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Run this to generate all the initial makefiles, etc.
 srcdir=`dirname $0`
@@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
 PKG_NAME="mutter"
 REQUIRED_AUTOMAKE_VERSION=1.10
-(test -f $srcdir/configure.ac \
+(test -f $srcdir/configure.in \
  && test -d $srcdir/src) || {
    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
    echo " top-level metacity directory"
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,8 @@
 AC_PREREQ(2.50)
 AC_CONFIG_MACRO_DIR([m4])
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [12])
+m4_define([mutter_minor_version], [5])
-m4_define([mutter_micro_version], [2])
+m4_define([mutter_micro_version], [4])
 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -13,7 +12,6 @@ m4_define([mutter_plugin_api_version], [3])
 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
@@ -69,16 +67,14 @@ CANBERRA_GTK_VERSION=0.26
 CLUTTER_PACKAGE=clutter-1.0
 MUTTER_PC_MODULES="
-   gtk+-3.0 >= 3.9.11
+   gtk+-3.0 >= 3.3.7
   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
+   xcomposite >= 0.2 xfixes xrender xdamage
-   $CLUTTER_PACKAGE >= 1.15.90
+   $CLUTTER_PACKAGE >= 1.9.10
-   cogl-1.0 >= 1.17.1
+   cogl-1.0 >= 1.9.6
   upower-glib >= 0.99.0
   gnome-desktop-3.0
 "
 GLIB_GSETTINGS
@@ -122,6 +118,9 @@ AM_GLIB_GNU_GETTEXT
 ## here we get the flags we'll actually use
 # GRegex requires Glib-2.14.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
 # gtk_window_set_icon_name requires gtk2+-2.6.0
 PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0)
 PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0)
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -202,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)
@@ -308,6 +304,9 @@ if test "x$found_xsync" = "xyes"; then
 fi
 MUTTER_LIBS="$MUTTER_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 MUTTER_MESSAGE_LIBS="$MUTTER_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 MUTTER_WINDOW_DEMO_LIBS="$MUTTER_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm"
 MUTTER_PROPS_LIBS="$MUTTER_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
 found_sm=no
 case "$MUTTER_LIBS" in
@@ -362,7 +361,11 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
-GTK_DOC_CHECK([1.15], [--flavour no-tmpl])
+# For fix-meta-rectangle.py
 AM_PATH_PYTHON([2.5])
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])
 #### Warnings (last since -Werror can disturb other tests)
@@ -434,11 +437,11 @@ 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
 src/mutter-plugins.pc
 src/tools/Makefile
 src/compositor/plugins/Makefile
 po/Makefile.in
 ])
--- 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/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,3 +1,4 @@
-man_MANS = mutter.1
+man_MANS = mutter.1 mutter-theme-viewer.1 \
 	   mutter-window-demo.1 mutter-message.1
 EXTRA_DIST = $(man_MANS)
--- a/doc/man/mutter-message.1
+++ b/doc/man/mutter-message.1
@@ -0,0 +1,60 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
 .\" -----
 .\" This file was confirmed to be licenced under the GPL
 .\" by its author and copyright holder, Akira TAGOH, on June 1st 2008:
 .\"
 .\" > I'm comfortable with DFSG-free. that sounds great if you think it's
 .\" > useful and worth containing it in upstream.
 .\" ...
 .\" > Right I know. any licenses that is DFSG-free, I'm ok with whatever,
 .\" > since I have contributed that for Debian. so GPL is no problem for me.
 .\" -----
 .TH MUTTER\-MESSAGE 1 "28 August 2002"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
 .\" .nh        disable hyphenation
 .\" .hy        enable hyphenation
 .\" .ad l      left justify
 .\" .ad b      justify to both left and right margins
 .\" .nf        disable filling
 .\" .fi        enable filling
 .\" .br        insert line break
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
 MUTTER\-MESSAGE \- a command to send a message to Mutter
 .SH SYNOPSIS
 .B MUTTER\-MESSAGE
 [restart|reload\-theme|enable\-keybindings|disable\-keybindings]
 .SH DESCRIPTION
 This manual page documents briefly the
 .B mutter\-message\fP.
 This manual page was written for the Debian distribution
 because the original program does not have a manual page.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
 .\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
 .\" respectively.
 \fBmutter\-message\fP send a specified message to \fBmutter\fP(1).
 .SH OPTIONS
 .TP
 .B restart
 Restart \fBmutter\fP(1) which is running.
 .TP
 .B reload-theme
 Reload a theme which is specified on gsettings database.
 .TP
 .B enable-keybindings
 Enable all of keybindings which is specified on gsettings database.
 .TP
 .B disable-keybindings
 Disable all of keybindings which is specified on gsettings database.
 .SH SEE ALSO
 .BR mutter (1)
 .SH AUTHOR
 This manual page was written by Akira TAGOH <tagoh@debian.org>,
 for the Debian GNU/Linux system (but may be used by others).
--- a/doc/man/mutter-theme-viewer.1
+++ b/doc/man/mutter-theme-viewer.1
@@ -0,0 +1,43 @@
 .\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
 .\" other parms are allowed: see man(7), man(1)
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
 .TH MUTTER-THEME-VIEWER 1 "1 June 2004" 
 .SH NAME
 mutter-theme-viewer \- view mutter themes
 .SH SYNOPSIS
 .B mutter-theme-viewer
 [
 .I THEMENAME
 ]
 .SH DESCRIPTION
 .\" Putting a newline after each sentence can generate better output.
 .B mutter-theme-viewer
 allows you to preview any installed Mutter theme.
 .PP
 When designing a new Mutter theme, you can use
 .B mutter-theme-viewer
 to measure the performance of a window frame option, and to preview
 the option.
 .SH OPTIONS
 .TP
 .I THEMENAME
 Name of the theme to be shown (\fIAtlanta\fR by default).
 It is case-sensitive.
 .SH FILES
 .br
 .nf
 .TP
 .I /usr/share/themes
 system themes directory
 .TP
 .I /usr/share/themes/*/mutter-1/mutter-theme-1.xml
 theme specification file
 .SH AUTHOR
 This manual page was written by Jose M. Moya <josem@die.upm.es>, for
 the Debian  GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
 .\" Always quote multiple words for .SH
 .BR mutter (1),
 .BR mutter-window-demo (1).
--- a/doc/man/mutter-window-demo.1
+++ b/doc/man/mutter-window-demo.1
@@ -0,0 +1,25 @@
 .\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
 .\" other parms are allowed: see man(7), man(1)
 .\"
 .\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
 .\" 
 .TH MUTTER-WINDOW-DEMO 1 "1 June 2004" 
 .SH NAME
 mutter-window-demo \- demo of window features
 .SH SYNOPSIS
 .B mutter-window-demo
 .SH DESCRIPTION
 .\" Putting a newline after each sentence can generate better output.
 This program demonstrates various kinds of windows that window
 managers and window manager themes should handle.
 .PP
 Be sure to tear off the menu and toolbar, those are also a special
 kind of window.
 .SH AUTHOR
 This manual page was written by Jose M. Moya <josem@die.upm.es>, for
 the Debian  GNU/Linux system (but may be used by others).
 .SH "SEE ALSO"
 .\" Always quote multiple words for .SH
 .BR x-window-manager (1),
 .BR mutter (1),
 .BR mutter-theme-viewer (1).
--- 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,683 +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_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_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>meta-cullable</FILE>
 <TITLE>MetaCullable</TITLE>
 MetaCullable
 MetaCullableInterface
 meta_cullable_cull_out
 meta_cullable_reset_culling
 meta_cullable_cull_out_children
 meta_cullable_reset_culling_children
 <SUBSECTION Standard>
 META_TYPE_CULLABLE
 META_CULLABLE
 META_IS_CULLABLE
 META_CULLABLE_GET_IFACE
 meta_cullable_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_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_frame_rect
 meta_window_get_outer_rect
 meta_window_client_rect_to_frame_rect
 meta_window_frame_rect_to_client_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/mutter.doap
+++ b/mutter.doap
@@ -21,7 +21,6 @@ environment.</description>
  -->
  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnome-shell-list" />
  <download-page rdf:resource="http://download.gnome.org/sources/mutter/" />
  <download-page rdf:resource="http://download.gnome.org/sources/mutter-wayland/" />
  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=mutter" />
  <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
@@ -40,11 +39,4 @@ environment.</description>
      <gnome:userid>otaylor</gnome:userid>
    </foaf:Person>
  </maintainer>
  <maintainer>
    <foaf:Person>
      <foaf:name>Florian Müllner</foaf:name>
      <foaf:mbox rdf:resource="mailto:fmuellner@gnome.org" />
      <gnome:userid>fmuellner</gnome:userid>
    </foaf:Person>
  </maintainer>
 </Project>
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -44,7 +44,6 @@ is
 it
 ja
 ka
 kk
 kn
 ko
 ku
@@ -81,7 +80,6 @@ sr@latin
 sv
 ta
 te
 tg
 th
 tk
 tr
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,7 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 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
@@ -12,7 +9,6 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
 src/core/monitor.c
 src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
@@ -24,9 +20,12 @@ src/core/xprops.c
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
 src/org.gnome.mutter.gschema.xml.in
 src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c
 src/ui/metaaccellabel.c
 src/ui/resizepopup.c
 src/ui/theme.c
 src/ui/theme-parser.c
 src/ui/theme-viewer.c
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/as.po
+++ b/po/as.po
--- a/po/ast.po
+++ b/po/ast.po
@@ -37,6 +37,7 @@ msgstr "Petición d'información ventana desconocida: %d"
 #. Translators: %s is a window title
 #: ../src/core/delete.c:95
 #, c-format
 #, c-format
 msgid "<tt>%s</tt> is not responding."
 msgstr "<tt>%s</tt> nun ta respondiendo."
@@ -121,6 +122,7 @@ msgstr "Comandu de terminal nun definíu.\n"
 #: ../src/core/main.c:130
 #, c-format
 #, c-format
 msgid ""
 "mutter %s\n"
 "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@@ -259,6 +261,7 @@ msgstr "Error axustando númberu d'arees de trabayu a %d: %s\n"
 #: ../src/core/prefs.c:2028 ../src/core/prefs.c:2531
 #, c-format
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaciu de Trabayu %d"
@@ -272,6 +275,7 @@ msgstr "\"%s\" atopau na base de datos de configuración nun ye un valor válidu
 #: ../src/core/prefs.c:2612
 #, c-format
 #, c-format
 msgid "Error setting name for workspace %d to \"%s\": %s\n"
 msgstr "Fallu al afitar nome pal espaciu de trabayu %d a \"%s\": %s\n"
@@ -282,16 +286,19 @@ msgstr "Fallu al afitar l'estáu del compositor: %s\n"
 #: ../src/core/prefs.c:2845
 #, c-format
 #, c-format
 msgid "Error setting clutter plugin list: %s\n"
 msgstr "Fallu al afitar la llista desordenada de plugin: %s\n"
 #: ../src/core/prefs.c:2889
 #, c-format
 #, c-format
 msgid "Error setting live hidden windows status status: %s\n"
 msgstr "Fallu al afitar l'estáu de les ventanes anubríes: %s\n"
 #: ../src/core/prefs.c:2917
 #, c-format
 #, c-format
 msgid "Error setting no tab popup status: %s\n"
 msgstr "Fallu al afitar l'estáu de les llingüetes emerxentes: %s\n"
@@ -351,6 +358,7 @@ msgstr "Falló analizar ficheru de sesión guardáu: %s\n"
 #: ../src/core/session.c:1198
 #, c-format
 #, c-format
 msgid "<mutter_session> attribute seen but we already have the session ID"
 msgstr "Vióse l'atributu <mutter_session> pero yá tenemos la ID de sesión"
@@ -396,6 +404,7 @@ msgstr "Abiertu archivu log %s\n"
 #: ../src/core/util.c:139 ../src/tools/mutter-message.c:176
 #, c-format
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter compilose ensin sofitu pal mou testu\n"
@@ -490,19 +499,19 @@ msgid ""
 msgstr "La propiedá %s del ventanu 0x%lx contien un códigu UTF-8 non válidu pal "
 "elementu %d na llista\n"
-#: ../src/include/all-keybindings.h:88 ../src/50-mutter-navigation.xml.in.h:18
+#: ../src/include/all-keybindings.h:88
 msgid "Switch to workspace 1"
 msgstr "Cambiar a espaciu de trabayu 1"
-#: ../src/include/all-keybindings.h:90 ../src/50-mutter-navigation.xml.in.h:19
+#: ../src/include/all-keybindings.h:90
 msgid "Switch to workspace 2"
 msgstr "Cambiar a espaciu de trabayu 2"
-#: ../src/include/all-keybindings.h:92 ../src/50-mutter-navigation.xml.in.h:20
+#: ../src/include/all-keybindings.h:92
 msgid "Switch to workspace 3"
 msgstr "Cambiar a espaciu de trabayu 3"
-#: ../src/include/all-keybindings.h:94 ../src/50-mutter-navigation.xml.in.h:21
+#: ../src/include/all-keybindings.h:94
 msgid "Switch to workspace 4"
 msgstr "Cambiar a espaciu de trabayu 4"
@@ -631,57 +640,47 @@ msgstr "Saca una semeya d'una ventana"
 msgid "Run a terminal"
 msgstr "Executar una terminal"
-#: ../src/include/all-keybindings.h:271 ../src/50-mutter-windows.xml.in.h:1
+#: ../src/include/all-keybindings.h:271
 msgid "Activate the window menu"
 msgstr "Activar el menú de la ventana"
-#: ../src/include/all-keybindings.h:274 ../src/50-mutter-windows.xml.in.h:13
+#: ../src/include/all-keybindings.h:274
 #, fuzzy
 msgid "Toggle fullscreen mode"
-msgstr ""
+msgstr "Camudar a modu pantalla completa"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Camudar a modu pantalla completa\n"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Camudar a mou pantalla completa"
-#: ../src/include/all-keybindings.h:276 ../src/50-mutter-windows.xml.in.h:14
+#: ../src/include/all-keybindings.h:276
 #, fuzzy
 msgid "Toggle maximization state"
-msgstr ""
+msgstr "Camudar a estáu maximizáu"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Camudar a estáu maximizáu\n"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Conmutar l'estáu maximizáu"
 #: ../src/include/all-keybindings.h:278
 msgid "Toggle whether a window will always be visible over other windows"
 msgstr "Conmutar si una ventana siempres se verá encima d'otres ventanes"
-#: ../src/include/all-keybindings.h:280 ../src/50-mutter-windows.xml.in.h:4
+#: ../src/include/all-keybindings.h:280
 msgid "Maximize window"
 msgstr "Maximizar ventana"
-#: ../src/include/all-keybindings.h:282 ../src/50-mutter-windows.xml.in.h:12
+#: ../src/include/all-keybindings.h:282
 msgid "Restore window"
 msgstr "Restaurar la ventana"
-#: ../src/include/all-keybindings.h:284 ../src/50-mutter-windows.xml.in.h:15
+#: ../src/include/all-keybindings.h:284
 msgid "Toggle shaded state"
 msgstr "Activa estáu endolcáu"
-#: ../src/include/all-keybindings.h:286 ../src/50-mutter-windows.xml.in.h:7
+#: ../src/include/all-keybindings.h:286
 msgid "Minimize window"
 msgstr "Minimizar ventana"
-#: ../src/include/all-keybindings.h:288 ../src/50-mutter-windows.xml.in.h:2
+#: ../src/include/all-keybindings.h:288
 msgid "Close window"
 msgstr "Zarrar ventana"
-#: ../src/include/all-keybindings.h:290 ../src/50-mutter-windows.xml.in.h:8
+#: ../src/include/all-keybindings.h:290
 msgid "Move window"
 msgstr "Mover ventana"
-#: ../src/include/all-keybindings.h:292 ../src/50-mutter-windows.xml.in.h:11
+#: ../src/include/all-keybindings.h:292
 msgid "Resize window"
 msgstr "Cambiar el tamañu la ventana"
@@ -690,22 +689,18 @@ msgid "Toggle whether window is on all workspaces or just one"
 msgstr "Conmutar si la ventana apaez en toles árees de trabayu o namái nuna"
 #: ../src/include/all-keybindings.h:299
 #: ../src/50-mutter-navigation.xml.in.h:10
 msgid "Move window to workspace 1"
 msgstr "Mover ventana al espaciu de trabayu 1"
 #: ../src/include/all-keybindings.h:302
 #: ../src/50-mutter-navigation.xml.in.h:11
 msgid "Move window to workspace 2"
 msgstr "Mover ventana al espaciu de trabayu 2"
 #: ../src/include/all-keybindings.h:305
 #: ../src/50-mutter-navigation.xml.in.h:12
 msgid "Move window to workspace 3"
 msgstr "Mover ventana al espaciu de trabayu 3"
 #: ../src/include/all-keybindings.h:308
 #: ../src/50-mutter-navigation.xml.in.h:13
 msgid "Move window to workspace 4"
 msgstr "Mover ventana al espaciu de trabayu 4"
@@ -741,24 +736,19 @@ msgstr "Mover ventana al espaciu de trabayu 11"
 msgid "Move window to workspace 12"
 msgstr "Mover ventana al espaciu de trabayu 12"
-#: ../src/include/all-keybindings.h:344 ../src/50-mutter-navigation.xml.in.h:7
+#: ../src/include/all-keybindings.h:344
 msgid "Move window one workspace to the left"
 msgstr "Mover ventana un espaciu de trabayu a manzorga"
-#: ../src/include/all-keybindings.h:347 ../src/50-mutter-navigation.xml.in.h:8
+#: ../src/include/all-keybindings.h:347
 #, fuzzy
 msgid "Move window one workspace to the right"
-msgstr ""
+msgstr "Mover ventana un espaciu de trabayu a derecha"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Mover ventana un espaciu de trabayu a derecha\n"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Mover ventana un espaciu de trabayu a madrecha"
-#: ../src/include/all-keybindings.h:350 ../src/50-mutter-navigation.xml.in.h:9
+#: ../src/include/all-keybindings.h:350
 msgid "Move window one workspace up"
 msgstr "Mover ventana un espaciu de trabayu p'arriba"
-#: ../src/include/all-keybindings.h:353 ../src/50-mutter-navigation.xml.in.h:6
+#: ../src/include/all-keybindings.h:353
 msgid "Move window one workspace down"
 msgstr "Mover ventana un espaciu de trabayu p'abaxo"
@@ -767,29 +757,19 @@ msgid "Raise window if it's covered by another window, otherwise lower it"
 msgstr ""
 "Llevantar la ventana si ta cubierta por otra ventana, minimizala n'otru casu"
-#: ../src/include/all-keybindings.h:358 ../src/50-mutter-windows.xml.in.h:9
+#: ../src/include/all-keybindings.h:358
 #, fuzzy
 msgid "Raise window above other windows"
-msgstr ""
+msgstr "Poner el ventanu en primer planu"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Poner el ventanu en primer planu\n"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Poner la ventana en primer planu"
-#: ../src/include/all-keybindings.h:360 ../src/50-mutter-windows.xml.in.h:3
+#: ../src/include/all-keybindings.h:360
 #, fuzzy
 msgid "Lower window below other windows"
-msgstr ""
+msgstr "Ventanu más baxu per debaxo d'otros ventanos"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Ventanu más baxu per debaxo d'otros ventanos\n"
 "#-#-#-#-#  ast.po (metacity)  #-#-#-#-#\n"
 "Ventana más baxa per debaxo d'otres ventanes"
-#: ../src/include/all-keybindings.h:364 ../src/50-mutter-windows.xml.in.h:6
+#: ../src/include/all-keybindings.h:364
 msgid "Maximize window vertically"
 msgstr "Maximizar ventana verticalmente"
-#: ../src/include/all-keybindings.h:368 ../src/50-mutter-windows.xml.in.h:5
+#: ../src/include/all-keybindings.h:368
 msgid "Maximize window horizontally"
 msgstr "Maximizar ventana horizontalmente"
@@ -1003,6 +983,7 @@ msgstr "Espaciu de Trabayu %d%n"
 #: ../src/ui/menu.c:213
 #, c-format
 #, c-format
 msgid "Workspace 1_0"
 msgstr "Espaciu de Trabayu 1_0"
@@ -1743,6 +1724,7 @@ msgstr "Nun se permite testu dientro del elementu <%s>"
 #: ../src/ui/theme-parser.c:3748 ../src/ui/theme-parser.c:3760
 #: ../src/ui/theme-parser.c:3772
 #, c-format
 #, c-format
 msgid "<%s> specified twice for this theme"
 msgstr "<%s> especificáu dos vegaes pa esti tema"
@@ -1954,96 +1936,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%d espresiones de coordenaes interpretaes en %g segundos (%g segundos de "
 "media)\n"
 #: ../src/50-mutter-navigation.xml.in.h:1
 #, fuzzy
 msgid "Hide all normal windows"
 msgstr "Anubrir toles ventanes normales"
 #: ../src/50-mutter-navigation.xml.in.h:2
 #, fuzzy
 msgid "Move to workspace above"
 msgstr "Mover al área de trabayu d'arriba"
 #: ../src/50-mutter-navigation.xml.in.h:3
 #, fuzzy
 msgid "Move to workspace below"
 msgstr "Mover al área de trabayu d'abaxo"
 #: ../src/50-mutter-navigation.xml.in.h:4
 #, fuzzy
 msgid "Move to workspace left"
 msgstr "Mover al área de trabayu de la izquierda"
 #: ../src/50-mutter-navigation.xml.in.h:5
 #, fuzzy
 msgid "Move to workspace right"
 msgstr "Mover al área de trabayu de la derecha"
 #: ../src/50-mutter-navigation.xml.in.h:14
 #, fuzzy
 msgid "Navigation"
 msgstr "Navegación"
 #: ../src/50-mutter-navigation.xml.in.h:15
 #, fuzzy
 msgid "Switch applications"
 msgstr "Movese ente aplicaciones"
 #: ../src/50-mutter-navigation.xml.in.h:16
 #, fuzzy
 msgid "Switch system controls"
 msgstr "Cambiar ente controles del sistema"
 #: ../src/50-mutter-navigation.xml.in.h:17
 #, fuzzy
 msgid "Switch system controls directly"
 msgstr "Movese ente los controles del sistema direutamente"
 #: ../src/50-mutter-navigation.xml.in.h:22
 #, fuzzy
 msgid "Switch windows directly"
 msgstr "Cambiar ventanes direutamente"
 #: ../src/50-mutter-navigation.xml.in.h:23
 #, fuzzy
 msgid "Switch windows of an app directly"
 msgstr "Movese ente les ventanes d'una aplicación direutamente"
 #: ../src/50-mutter-navigation.xml.in.h:24
 #, fuzzy
 msgid "Switch windows of an application"
 msgstr "Movese ente les ventanes d'una aplicación"
 #: ../src/50-mutter-system.xml.in.h:1
 #, fuzzy
 msgid "Show the activities overview"
 msgstr "Amosar el resume d'actividaes"
 #: ../src/50-mutter-system.xml.in.h:2
 #, fuzzy
 msgid "Show the run command prompt"
 msgstr "Amosar l'elementu «executar comando»"
 #: ../src/50-mutter-system.xml.in.h:3
 #, fuzzy
 msgid "System"
 msgstr "Sistema"
 #: ../src/50-mutter-windows.xml.in.h:10
 #, fuzzy
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Llevantar la ventana si ta cubierta, minimizala n'otru casu"
 #: ../src/50-mutter-windows.xml.in.h:16
 #, fuzzy
 msgid "Toggle window on all workspaces or one"
 msgstr "Conmutar la ventana en toles árees de trabayu o namái nuna"
 #: ../src/50-mutter-windows.xml.in.h:17
 #, fuzzy
 msgid "Windows"
 msgstr "Ventanes"
 #~ msgid "Desktop"
 #~ msgstr "Escritoriu"
--- a/po/be.po
+++ b/po/be.po
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,7 +1,7 @@
 # Bulgarian translation of mutter po-file.
 # Copyright (C) 2002, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
-# Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+# Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Alexander Shopov <ash@kambanaria.org>, 2002, 2006, 2007, 2009, 2010, 2011, 2012, 2013.
+# Alexander Shopov <ash@kambanaria.org>, 2002, 2006, 2007, 2009, 2010, 2011, 2012.
 # Vladimir Petkov <kaladan@gmail.com>, 2004. 
 # Rostislav Raykov <zbrox@i-space.org>, 2004.
 # Yavor Doganov <yavor@gnu.org>, 2008.
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-01-12 06:33+0200\n"
+"POT-Creation-Date: 2012-07-04 07:13+0300\n"
-"PO-Revision-Date: 2013-01-12 06:33+0200\n"
+"PO-Revision-Date: 2012-07-04 07:12+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -21,197 +21,21 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 #: ../src/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Навигация"
 #: ../src/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Преместване на прозореца в работен плот 1"
 #: ../src/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Преместване на прозореца в работен плот 2"
 #: ../src/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Преместване на прозореца в работен плот 3"
 #: ../src/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Преместване на прозореца в работен плот 4"
 #: ../src/50-mutter-navigation.xml.in.h:6
 msgid "Move window one workspace to the left"
 msgstr "Преместване на прозореца един работен плот наляво"
 #: ../src/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the right"
 msgstr "Преместване на прозореца един работен плот надясно"
 #: ../src/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace up"
 msgstr "Преместване на прозореца един работен плот нагоре"
 #: ../src/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace down"
 msgstr "Преместване на прозореца един работен плот надолу"
 #: ../src/50-mutter-navigation.xml.in.h:10
 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
 msgid "Switch system controls"
 msgstr "Преместване на фокуса между служебните обекти"
 #: ../src/50-mutter-navigation.xml.in.h:14
 msgid "Switch windows directly"
 msgstr "Незабавно преместване на фокуса между прозорците"
 #: ../src/50-mutter-navigation.xml.in.h:15
 msgid "Switch windows of an app directly"
 msgstr "Незабавно преместване на фокуса между прозорците на едно приложение"
 #: ../src/50-mutter-navigation.xml.in.h:16
 msgid "Switch system controls directly"
 msgstr "Незабавно преместване на фокуса между служебните обекти"
 #: ../src/50-mutter-navigation.xml.in.h:17
 msgid "Hide all normal windows"
 msgstr "Скриване на всички обикновени прозорци"
 #: ../src/50-mutter-navigation.xml.in.h:18
 msgid "Switch to workspace 1"
 msgstr "Превключване към работен плот 1"
 #: ../src/50-mutter-navigation.xml.in.h:19
 msgid "Switch to workspace 2"
 msgstr "Превключване към работен плот 2"
 #: ../src/50-mutter-navigation.xml.in.h:20
 msgid "Switch to workspace 3"
 msgstr "Превключване към работен плот 3"
 #: ../src/50-mutter-navigation.xml.in.h:21
 msgid "Switch to workspace 4"
 msgstr "Превключване към работен плот 4"
 #: ../src/50-mutter-navigation.xml.in.h:22
 msgid "Move to workspace left"
 msgstr "Преместване на левия работен плот"
 #: ../src/50-mutter-navigation.xml.in.h:23
 msgid "Move to workspace right"
 msgstr "Преместване на десния работен плот"
 #: ../src/50-mutter-navigation.xml.in.h:24
 msgid "Move to workspace above"
 msgstr "Преместване на горния работен плот"
 #: ../src/50-mutter-navigation.xml.in.h:25
 msgid "Move to workspace below"
 msgstr "Преместване на долния работен плот"
 #: ../src/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Система"
 #: ../src/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Показване на прозореца за стартиране на команда"
 #: ../src/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Преглед на дейностите"
 #: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Прозорци"
 #: ../src/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Задействане на менюто за прозорците"
 #: ../src/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Превключване на режима за цял екран"
 #: ../src/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Превключване на състоянието на максимизиране"
 #: ../src/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Максимизиране на прозорец"
 #: ../src/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Възстановяване на прозорец"
 #: ../src/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr "Превключване на състоянието на навиване"
 #: ../src/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Затваряне на прозореца"
 #: ../src/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Скриване на прозорец"
 #: ../src/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Преместване на прозорец"
 #: ../src/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Оразмеряване на прозорец"
 #: ../src/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Превключване на появата на прозореца на всички работни места"
 #: ../src/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Ако прозорецът е под друг, го издига, иначе го понижава"
 #: ../src/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Издигане на прозореца над другите"
 #: ../src/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Понижаване на прозореца под другите прозорци"
 #: ../src/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Максимизиране на прозореца вертикално"
 #: ../src/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Максимизиране на прозореца хоризонтално"
 #: ../src/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Изглед разделен отляво"
-#: ../src/50-mutter-windows.xml.in.h:19
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 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:512
+#: ../src/compositor/compositor.c:492
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -229,14 +53,14 @@ msgstr "Неизвестна заявка за информация за про
 #: ../src/core/delete.c:111
 #, c-format
-msgid "“%s” is not responding."
+msgid "<tt>%s</tt> is not responding."
-msgstr "„%s“ не отговаря на съобщенията."
+msgstr "<tt>%s</tt> не отговаря на съобщенията."
-#: ../src/core/delete.c:113
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "Програмата не отговаря на съобщенията."
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:119
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -244,25 +68,25 @@ msgstr ""
 "Можете да изчакате малко преди изрично да накарате приложението да спре "
 "работата си."
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "Из_чакване"
-#: ../src/core/delete.c:125
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_Принудително спиране"
-#: ../src/core/display.c:394
+#: ../src/core/display.c:380
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Липсва разширението „%s“, необходимо за наслагване"
-#: ../src/core/display.c:491
+#: ../src/core/display.c:446
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Неуспех при отварянето на дисплея на X Window „%s“\n"
-#: ../src/core/keybindings.c:876
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -332,7 +156,7 @@ msgstr "Отпечатване на версията на програмата"
 msgid "Mutter plugin to use"
 msgstr "Приставка, която да се ползва"
-#: ../src/core/prefs.c:1087
+#: ../src/core/prefs.c:1065
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -340,14 +164,14 @@ msgstr ""
 "Триковете за развалените програми са изключени. Някои програми могат да са с "
 "неправилно поведение.\n"
-#: ../src/core/prefs.c:1162
+#: ../src/core/prefs.c:1140
 #, 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:1206
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -356,7 +180,7 @@ msgstr ""
 "„%s“, който е открит в базата от данни с настройките, не е валиден "
 "модификатор на бутон на мишката\n"
-#: ../src/core/prefs.c:1780
+#: ../src/core/prefs.c:1724
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -365,17 +189,17 @@ msgstr ""
 "Низът „%s“ открит в базата от данни с настройки е невалиден за стойност на "
 "клавишната комбинация „%s“\n"
-#: ../src/core/prefs.c:1877
+#: ../src/core/prefs.c:1821
 #, c-format
 msgid "Workspace %d"
 msgstr "Работен плот %d"
-#: ../src/core/screen.c:658
+#: ../src/core/screen.c:652
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Екранът %d на дисплей „%s“ е невалиден\n"
-#: ../src/core/screen.c:674
+#: ../src/core/screen.c:668
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -384,7 +208,7 @@ msgstr ""
 "Екранът %d на дисплей „%s“ вече има мениджър на прозорци; пробвайте да го "
 "замените с опцията --replace.\n"
-#: ../src/core/screen.c:701
+#: ../src/core/screen.c:695
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -392,12 +216,12 @@ msgstr ""
 "Неуспех при получаването на избрания мениджър за прозорци на екран %d, "
 "дисплей „%s“\n"
-#: ../src/core/screen.c:770
+#: ../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:955
+#: ../src/core/screen.c:935
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "Неуспех при отстъпването на екран %d на дисплей „%s“\n"
@@ -495,7 +319,7 @@ msgid "Window manager error: "
 msgstr "Грешка от мениджъра на прозорци: "
 #. first time through
-#: ../src/core/window.c:7279
+#: ../src/core/window.c:7237
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -511,7 +335,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7945
+#: ../src/core/window.c:7902
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -521,22 +345,22 @@ msgstr ""
 "променя, но едновременно с това указва минимален размер %d x %d и максимален "
 "размер %d x %d. Това не е смислено.\n"
-#: ../src/core/window-props.c:274
+#: ../src/core/window-props.c:310
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Приложението зададе неверен _NET_WM_PID %lu\n"
-#: ../src/core/window-props.c:393
+#: ../src/core/window-props.c:429
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (от %s)"
-#: ../src/core/window-props.c:1448
+#: ../src/core/window-props.c:1484
 #, 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:1459
+#: ../src/core/window-props.c:1495
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR за прозорец 0x%lx за %s ще зацикли.\n"
@@ -618,7 +442,7 @@ msgstr ""
 "Ако е включено, прозорците ще се максимизират по вертикала и ще заемат "
 "половината площ по хоризонтала при поставянето им край вертикалните граници "
 "на екрана. При поставянето им край горната граница прозорците ще се "
-"максимизират изцяло."
+"максимзират изцяло."
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
@@ -659,24 +483,10 @@ msgstr ""
 "прозорците да се изключат."
 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
 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 focus will not be changed immediately when entering a window, but only "
 "after the pointer stops moving."
 msgstr ""
 "Ако е зададено като истина и начинът за фокусиране е „sloppy“ или „mouse“, "
 "тогава фокусът няма да се предава веднага при навлизането в прозорец, а едва "
 "след като показалецът спре да се движи."
 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Широчина на границата за влачене"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
 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."
@@ -684,24 +494,11 @@ msgstr ""
 "Общ размер на границите за влачене. Ако видимите граници на темата са по-"
 "малки, се добавят невидими граници, за да се достигне тази величина."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:17
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 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."
 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:16
 msgid "Cancel tab popup"
 msgstr "Без изскачащ прозорец при обхождане"
@@ -909,48 +706,48 @@ msgstr "Mod5"
 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
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -959,7 +756,7 @@ msgstr ""
 "Цветовата спецификация на GTK трябва да съдържа в скоби име на основен и "
 "резервен цвят: напр. 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-"
@@ -968,7 +765,7 @@ msgstr ""
 "Неправилен знак „%c“ в параметъра за име на цвят (color_name) на gtk:custom. "
 "Позволени са само A-Za-z0-9-_."
-#: ../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 "
@@ -977,7 +774,7 @@ msgstr ""
 "Форматът на Gtk:custom е „gtk:custom(основен_цвят,резервен_цвят)“, „%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] "
@@ -987,7 +784,7 @@ 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:"
@@ -997,17 +794,17 @@ msgstr ""
 "състоянието, напр. 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 "
@@ -1016,17 +813,17 @@ 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"
@@ -1034,27 +831,27 @@ msgstr ""
 "Форматът на навиването е „shade/base_color/factor“, „%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 "
@@ -1063,14 +860,14 @@ 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: "
@@ -1079,24 +876,24 @@ 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"
@@ -1104,18 +901,18 @@ 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 "
@@ -1124,38 +921,38 @@ 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 "
@@ -1164,25 +961,25 @@ msgstr ""
 "За този стил на рамката трябва да се укаже <button function=\"%s\" state=\"%s"
 "\" draw_ops=\"нещо си\"/>"
-#: ../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=\"нещо си\"/>"
-#: ../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:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
-#: ../src/ui/theme.c:5240 ../src/ui/theme.c:5247
+#: ../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 "
@@ -1191,7 +988,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: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"
@@ -1199,7 +996,7 @@ 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“ вече е дефинирана"
@@ -1709,31 +1506,31 @@ msgstr "Грешка при зареждането на темата: %s\n"
 msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Темата „%s“ е заредена за %g секунди\n"
-#: ../src/ui/theme-viewer.c:871
+#: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
 msgstr "Нормален шрифт на заглавието"
-#: ../src/ui/theme-viewer.c:877
+#: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
 msgstr "Малък шрифт на заглавието"
-#: ../src/ui/theme-viewer.c:883
+#: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
 msgstr "Голям шрифт на заглавието"
-#: ../src/ui/theme-viewer.c:888
+#: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
 msgstr "Изглед на бутоните"
-#: ../src/ui/theme-viewer.c:893
+#: ../src/ui/theme-viewer.c:892
 msgid "Benchmark"
 msgstr "Статистика"
-#: ../src/ui/theme-viewer.c:949
+#: ../src/ui/theme-viewer.c:944
 msgid "Window Title Goes Here"
 msgstr "Тук се поставя заглавието на прозорците"
-#: ../src/ui/theme-viewer.c:1055
+#: ../src/ui/theme-viewer.c:1047
 #, c-format
 msgid ""
 "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and %g "
@@ -1744,43 +1541,43 @@ msgstr ""
 "на кадър) и %g секунди нормално време, което включва ресурси от страна на "
 "сървъра X (по %g милисекунди на кадър)\n"
-#: ../src/ui/theme-viewer.c:1275
+#: ../src/ui/theme-viewer.c:1266
 msgid "position expression test returned TRUE but set error"
 msgstr ""
 "изразът за проверка на разположението върна TRUE, но зададе състояние за "
 "грешка"
-#: ../src/ui/theme-viewer.c:1277
+#: ../src/ui/theme-viewer.c:1268
 msgid "position expression test returned FALSE but didn't set error"
 msgstr ""
 "изразът за проверка на разположението върна FALSE, но не зададе състояние за "
 "грешка"
-#: ../src/ui/theme-viewer.c:1281
+#: ../src/ui/theme-viewer.c:1272
 msgid "Error was expected but none given"
 msgstr "Очакваше се грешка, но не беше дадена никаква"
-#: ../src/ui/theme-viewer.c:1283
+#: ../src/ui/theme-viewer.c:1274
 #, c-format
 msgid "Error %d was expected but %d given"
 msgstr "Очакваше се грешка %d, но беше дадена %d"
-#: ../src/ui/theme-viewer.c:1289
+#: ../src/ui/theme-viewer.c:1280
 #, c-format
 msgid "Error not expected but one was returned: %s"
 msgstr "Не се очакваше грешка, но беше върната една: %s"
-#: ../src/ui/theme-viewer.c:1293
+#: ../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:1296
+#: ../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:1361
+#: ../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"
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
--- 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/eo.po
+++ b/po/eo.po
@@ -1493,260 +1493,17 @@ msgstr "Y-valoro estis %d, %d estis atendita"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
-#: ../src/50-mutter-navigation.xml.in.h:17
+#~ msgid "Switch to workspace 1"
-#, fuzzy
+#~ msgstr "Ŝalti al laborspaco 1"
 msgid "Switch to workspace 1"
 msgstr "Ŝalti al laborspaco 1"
-#: ../src/50-mutter-navigation.xml.in.h:18
+#~ msgid "Switch to workspace 2"
-#, fuzzy
+#~ msgstr "Ŝalti al laborspaco 2"
 msgid "Switch to workspace 2"
 msgstr "Ŝalti al laborspaco 2"
-#: ../src/50-mutter-navigation.xml.in.h:19
+#~ msgid "Switch to workspace 3"
-#, fuzzy
+#~ msgstr "Ŝalti al laborspaco 3"
 msgid "Switch to workspace 3"
 msgstr "Ŝalti al laborspaco 3"
-#: ../src/50-mutter-navigation.xml.in.h:20
+#~ msgid "Switch to workspace 4"
-#, fuzzy
+#~ msgstr "Ŝalti al laborspaco 4"
 msgid "Switch to workspace 4"
 msgstr "Ŝalti al laborspaco 4"
 #: ../src/50-mutter-windows.xml.in.h:2
 #, fuzzy
 msgid "Activate the window menu"
 msgstr "Aktivigi la fenestromenuon"
 #: ../src/50-mutter-windows.xml.in.h:3
 #, fuzzy
 msgid "Toggle fullscreen mode"
 msgstr "Baskuligi tutekranan reĝimon"
 #: ../src/50-mutter-windows.xml.in.h:5
 #, fuzzy
 msgid "Maximize window"
 msgstr "Maksimumigi la fenestron"
 #: ../src/50-mutter-windows.xml.in.h:6
 #, fuzzy
 msgid "Restore window"
 msgstr "Restaŭri fenestron"
 #: ../src/50-mutter-windows.xml.in.h:9
 #, fuzzy
 msgid "Minimize window"
 msgstr "Minimumigi fenestron"
 #: ../src/50-mutter-windows.xml.in.h:8
 #, fuzzy
 msgid "Close window"
 msgstr "Fermi la fenestron"
 #: ../src/50-mutter-windows.xml.in.h:10
 #, fuzzy
 msgid "Move window"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron"
 #: ../src/50-mutter-windows.xml.in.h:11
 #, fuzzy
 msgid "Resize window"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Ŝanĝi la fenestrograndon\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Ŝanĝi fenestrograndon"
 #: ../src/50-mutter-navigation.xml.in.h:2
 #, fuzzy
 msgid "Move window to workspace 1"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al laborspaco 1\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al laborspaco 1"
 #: ../src/50-mutter-navigation.xml.in.h:3
 #, fuzzy
 msgid "Move window to workspace 2"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al laborspaco 2\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al laborspaco 2"
 #: ../src/50-mutter-navigation.xml.in.h:4
 #, fuzzy
 msgid "Move window to workspace 3"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al laborspaco 3\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al laborspaco 3"
 #: ../src/50-mutter-navigation.xml.in.h:5
 #, fuzzy
 msgid "Move window to workspace 4"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al laborspaco 4\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al laborspaco 4"
 #: ../src/50-mutter-navigation.xml.in.h:6
 #, fuzzy
 msgid "Move window one workspace to the left"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al la maldekstra laborspaco\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al la maldekstra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:7
 #, fuzzy
 msgid "Move window one workspace to the right"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al la dekstra laborspaco\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al la dekstra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:8
 #, fuzzy
 msgid "Move window one workspace up"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al la supra laborspaco\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al la supra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:9
 #, fuzzy
 msgid "Move window one workspace down"
 msgstr ""
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi la fenestron al la suba laborspaco\n"
 "#-#-#-#-#  eo.po (mutter)  #-#-#-#-#\n"
 "Movi fenestron al la suba laborspaco"
 #: ../src/50-mutter-windows.xml.in.h:16
 #, fuzzy
 msgid "Maximize window vertically"
 msgstr "Vertikale maksimumigi la fenestron"
 #: ../src/50-mutter-windows.xml.in.h:17
 #, fuzzy
 msgid "Maximize window horizontally"
 msgstr "Horizontale maksimumigi la fenestron"
 #: ../src/50-mutter-navigation.xml.in.h:1
 #, fuzzy
 msgid "Navigation"
 msgstr "Navigado"
 #: ../src/50-mutter-navigation.xml.in.h:10
 #, fuzzy
 msgid "Switch applications"
 msgstr ""
 #: ../src/50-mutter-navigation.xml.in.h:11
 #, fuzzy
 msgid "Switch windows of an application"
 msgstr "Ŝalti fenestrojn de aplikaĵo"
 #: ../src/50-mutter-navigation.xml.in.h:12
 #, fuzzy
 msgid "Switch system controls"
 msgstr ""
 #: ../src/50-mutter-navigation.xml.in.h:13
 #, fuzzy
 msgid "Switch windows directly"
 msgstr ""
 #: ../src/50-mutter-navigation.xml.in.h:14
 #, fuzzy
 msgid "Switch windows of an app directly"
 msgstr ""
 #: ../src/50-mutter-navigation.xml.in.h:15
 #, fuzzy
 msgid "Switch system controls directly"
 msgstr ""
 #: ../src/50-mutter-navigation.xml.in.h:16
 #, fuzzy
 msgid "Hide all normal windows"
 msgstr "Kaŝi ĉiujn normalajn fenestrojn"
 #: ../src/50-mutter-navigation.xml.in.h:21
 #, fuzzy
 msgid "Move to workspace left"
 msgstr "Movi al la maldekstra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:22
 #, fuzzy
 msgid "Move to workspace right"
 msgstr "Movi al la dekstra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:23
 #, fuzzy
 msgid "Move to workspace above"
 msgstr "Movi al la supra laborspaco"
 #: ../src/50-mutter-navigation.xml.in.h:24
 #, fuzzy
 msgid "Move to workspace below"
 msgstr "Movi al la malsupra laborspaco"
 #: ../src/50-mutter-system.xml.in.h:1
 #, fuzzy
 msgid "System"
 msgstr "Sistemo"
 #: ../src/50-mutter-system.xml.in.h:2
 #, fuzzy
 msgid "Show the run command prompt"
 msgstr ""
 #: ../src/50-mutter-system.xml.in.h:3
 #, fuzzy
 msgid "Show the activities overview"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:4
 #, fuzzy
 msgid "Toggle maximization state"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:7
 #, fuzzy
 msgid "Toggle shaded state"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:12
 #, fuzzy
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:13
 #, fuzzy
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:14
 #, fuzzy
 msgid "Raise window above other windows"
 msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:15
 #, fuzzy
 msgid "Lower window below other windows"
 msgstr ""
 #~ msgid "Switch to workspace 5"
 #~ msgstr "Ŝalti al laborspaco 5"
@@ -1841,6 +1598,42 @@ msgstr ""
 #~ msgid "Run a terminal"
 #~ msgstr "Ruli terminalon"
 #~ msgid "Activate the window menu"
 #~ msgstr "Aktivigi la fenestromenuon"
 #~ msgid "Toggle fullscreen mode"
 #~ msgstr "Baskuligi tutekranan reĝimon"
 #~ msgid "Maximize window"
 #~ msgstr "Maksimumigi la fenestron"
 #~ msgid "Restore window"
 #~ msgstr "Restaŭri fenestron"
 #~ msgid "Minimize window"
 #~ msgstr "Minimumigi fenestron"
 #~ msgid "Close window"
 #~ msgstr "Fermi la fenestron"
 #~ msgid "Move window"
 #~ msgstr "Movi la fenestron"
 #~ msgid "Resize window"
 #~ msgstr "Ŝanĝi la fenestrograndon"
 #~ msgid "Move window to workspace 1"
 #~ msgstr "Movi la fenestron al laborspaco 1"
 #~ msgid "Move window to workspace 2"
 #~ msgstr "Movi la fenestron al laborspaco 2"
 #~ msgid "Move window to workspace 3"
 #~ msgstr "Movi la fenestron al laborspaco 3"
 #~ msgid "Move window to workspace 4"
 #~ msgstr "Movi la fenestron al laborspaco 4"
 #~ msgid "Move window to workspace 5"
 #~ msgstr "Movi la fenestron al laborspaco 5"
@@ -1865,6 +1658,24 @@ msgstr ""
 #~ msgid "Move window to workspace 12"
 #~ msgstr "Movi la fenestron al laborspaco 12"
 #~ msgid "Move window one workspace to the left"
 #~ msgstr "Movi la fenestron al la maldekstra laborspaco"
 #~ msgid "Move window one workspace to the right"
 #~ msgstr "Movi la fenestron al la dekstra laborspaco"
 #~ msgid "Move window one workspace up"
 #~ msgstr "Movi la fenestron al la supra laborspaco"
 #~ msgid "Move window one workspace down"
 #~ msgstr "Movi la fenestron al la suba laborspaco"
 #~ msgid "Maximize window vertically"
 #~ msgstr "Vertikale maksimumigi la fenestron"
 #~ msgid "Maximize window horizontally"
 #~ msgstr "Horizontale maksimumigi la fenestron"
 #~ msgid ""
 #~ "There was an error running <tt>%s</tt>:\n"
 #~ "\n"
--- a/po/es.po
+++ b/po/es.po
--- 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-09-10 15:25+0000\n"
+"POT-Creation-Date: 2012-03-11 22:19+0000\n"
-"PO-Revision-Date: 2013-09-11 23:20+0300\n"
+"PO-Revision-Date: 2012-03-12 00:47+0200\n"
 "Last-Translator: Mattias Põldaru <mahfiaz@gmail.com>\n"
 "Language-Team: Estonian <>\n"
 "Language: et\n"
@@ -23,143 +23,10 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: Poedit 1.5.4\n"
 msgid "Navigation"
 msgstr "Navigeerimine"
 msgid "Move window to workspace 1"
 msgstr "Akna liigutamine 1. tööalale"
 msgid "Move window to workspace 2"
 msgstr "Akna liigutamine 2. tööalale"
 msgid "Move window to workspace 3"
 msgstr "Akna liigutamine 3. tööalale"
 msgid "Move window to workspace 4"
 msgstr "Akna liigutamine 4. tööalale"
 msgid "Move window one workspace to the left"
 msgstr "Akna tõstmine vasakpoolsele tööalale"
 msgid "Move window one workspace to the right"
 msgstr "Akna tõstmine parempoolsele tööalale"
 msgid "Move window one workspace up"
 msgstr "Akna tõstmine ülemisele tööalale"
 msgid "Move window one workspace down"
 msgstr "Akna tõstmine alumisele tööalale"
 msgid "Switch applications"
 msgstr "Rakenduste vahetamine"
 msgid "Switch windows"
 msgstr "Akende vahetamine"
 msgid "Switch windows of an application"
 msgstr "Rakenduse akende vahetamine"
 msgid "Switch system controls"
 msgstr "Süsteemi juhtalade vahetamine"
 msgid "Switch windows directly"
 msgstr "Akende kohene vahetamine"
 msgid "Switch windows of an app directly"
 msgstr "Rakenduse akende kohene vahetamine"
 msgid "Switch system controls directly"
 msgstr "Süsteemi juhtalade kohene vahetamine"
 msgid "Hide all normal windows"
 msgstr "Kõigi tavaliste akende peitmine"
 msgid "Switch to workspace 1"
 msgstr "1. tööalale liikumine"
 msgid "Switch to workspace 2"
 msgstr "2. tööalale liikumine"
 msgid "Switch to workspace 3"
 msgstr "3. tööalale liikumine"
 msgid "Switch to workspace 4"
 msgstr "4. tööalale liikumine"
 msgid "Move to workspace left"
 msgstr "Vasakpoolsele tööalale liikumine"
 msgid "Move to workspace right"
 msgstr "Parempoolsele tööalale liikumine"
 msgid "Move to workspace above"
 msgstr "Ülemisele tööalale liikumine"
 msgid "Move to workspace below"
 msgstr "Alumisele tööalale liikumine"
 msgid "System"
 msgstr "Süsteem"
 msgid "Show the run command prompt"
 msgstr "Käsuviiba kuvamine"
 msgid "Show the activities overview"
 msgstr "Tegevuste ülevaate avamine"
 msgid "Windows"
 msgstr "Aknad"
 msgid "Activate the window menu"
 msgstr "Aknamenüü avamine"
 msgid "Toggle fullscreen mode"
 msgstr "Täisekraanoleku vahetamine"
 msgid "Toggle maximization state"
 msgstr "Maksimeeritud oleku vahetamine"
 msgid "Maximize window"
 msgstr "Akna maksimeerimine"
 msgid "Restore window"
 msgstr "Akna taastamine"
 msgid "Toggle shaded state"
 msgstr "Varjatud oleku vahetamine"
 msgid "Close window"
 msgstr "Akna sulgemine"
 msgid "Hide window"
 msgstr "Peida aken"
 msgid "Move window"
 msgstr "Akna liigutamine"
 msgid "Resize window"
 msgstr "Akna suuruse muutmine"
 msgid "Toggle window on all workspaces or one"
 msgstr "Akna kõigil või ühel tööalal olemise vahetamine"
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Akna tõstmine, kui see on kaetud, muul juhul langetamine"
 msgid "Raise window above other windows"
 msgstr "Akna tõstmine teiste kohale"
 msgid "Lower window below other windows"
 msgstr "Akna langetamine teiste taha"
 msgid "Maximize window vertically"
 msgstr "Akna vertikaalne maksimeerimine"
 msgid "Maximize window horizontally"
 msgstr "Akna horisontaalne maksimeerimine"
 msgid "View split on left"
 msgstr "Vaade poolitatakse vasakult"
@@ -174,9 +41,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"
@@ -185,8 +49,8 @@ msgid "Unknown window information request: %d"
 msgstr "Tundmatu aknateabe päring: %d"
 #, c-format
-msgid "“%s” is not responding."
+msgid "<tt>%s</tt> is not responding."
-msgstr "„%s” ei vasta."
+msgstr "<tt>%s</tt> ei vasta."
 msgid "Application is not responding."
 msgstr "Rakendus ei vasta."
@@ -218,10 +82,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"
@@ -250,17 +110,6 @@ msgid ""
 msgstr ""
 "Teemat ei leitud! Veendu, et %s on olemas ja sisaldab harilikke teemasid.\n"
 msgid "Built-in display"
 msgstr "Sisseehitatud kuva"
 #. TRANSLATORS: this is a monitor name (in case we don't know
 #. the vendor), it's Unknown followed by a size in inches,
 #. like 'Unknown 15"'
 #.
 #, c-format
 msgid "Unknown %s"
 msgstr "Tundmatu %s"
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -279,8 +128,8 @@ msgstr ""
 msgid "Print version"
 msgstr "Versiooni printimine"
-msgid "Mutter plugin to use"
+msgid "Comma-separated list of compositor plugins"
-msgstr "Millist Mutteri pluginat kasutada"
+msgstr "Komaga eraldatud nimekiri komposiitmontaaži pluginatest"
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
@@ -393,6 +242,7 @@ msgstr "Tõrge logifaili %s avamisel funktsiooniga fdopen(): %s\n"
 msgid "Opened log file %s\n"
 msgstr "Avati logifail %s\n"
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter kompileeriti ilma jutuka režiimi toeta\n"
@@ -503,6 +353,16 @@ msgstr ""
 "Kui märgitud, siis eraldi tiitliribade asemel on moodaalsed dialoogid "
 "emaakna tiitliribade küljes ning liiguvad koos emaaknaga."
 msgid "Live Hidden Windows"
 msgstr "Varjatud akende aktiivsus"
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
 msgstr ""
 "Määrab, kas varjatud aknaid (nt minimeeritud ja teistel tööaladel aknad) "
 "hoitakse elus."
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Akna ümberpaigutamine selle lohistamisel ekraani serva"
@@ -546,17 +406,6 @@ msgstr ""
 "Kui märgitud, siis on hüpikaken ja esiletõstmise raam keelatud akende "
 "vahetamisel."
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Fookusemuutused lükatakse edasi kuni kursor peatub"
 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 "
 "after the pointer stops moving."
 msgstr ""
 "Kui tõene ning fookusrežiim on kas \"sloppy\" või \"mouse\", siis fookust ei "
 "vahetata kohe, kui kursor aknale liigub, vaid alles pärast kursori peatumist."
 msgid "Draggable border width"
 msgstr "Lohistatava äärise laius."
@@ -567,22 +416,49 @@ 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"
 msgid "Cancel tab popup"
 msgstr "Tabulaatori hüpikakna katkestamine"
 #, c-format
 msgid "Usage: %s\n"
 msgstr "Kasutamine: %s\n"
 msgid "Close Window"
 msgstr "Sulge aken"
 msgid "Window Menu"
 msgstr "Aknamenüü"
 msgid "Minimize Window"
 msgstr "Akna minimeerimine"
 msgid "Maximize Window"
 msgstr "Akna maksimeerimine"
 msgid "Restore Window"
 msgstr "Akna taastamine"
 msgid "Roll Up Window"
 msgstr "Akna kokkukerimine"
 msgid "Unroll Window"
 msgstr "Akna lahtikerimine"
 msgid "Keep Window On Top"
 msgstr "Akna kõige pealmiseks määramine"
 msgid "Remove Window From Top"
 msgstr "Eemalda aken kõige pealmise kohalt"
 msgid "Always On Visible Workspace"
 msgstr "Alati nähtaval tööalal"
 msgid "Put Window On Only One Workspace"
 msgstr "Tõsta aken ainult ühele tööalale"
 #. Translators: Translate this string the same way as you do in libwnck!
 msgid "Mi_nimize"
 msgstr "_Minimeeri"
@@ -1288,151 +1164,156 @@ msgstr "Selle teema jaoks on <%s> määratud kaks korda"
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Tõrge %s teema jaoks korrektse faili leidmisel\n"
-#~ msgid "Usage: %s\n"
+msgid "_Windows"
-#~ msgstr "Kasutamine: %s\n"
+msgstr "_Aknad"
-#~ msgid "_Windows"
+msgid "_Dialog"
-#~ msgstr "_Aknad"
+msgstr "_Dialoog"
-#~ msgid "_Dialog"
+msgid "_Modal dialog"
-#~ msgstr "_Dialoog"
+msgstr "_Modaaldialoog"
-#~ msgid "_Modal dialog"
+msgid "_Utility"
-#~ msgstr "_Modaaldialoog"
+msgstr "_Utiliit"
-#~ msgid "_Utility"
+msgid "_Splashscreen"
-#~ msgstr "_Utiliit"
+msgstr "_Käivitusekraan"
-#~ msgid "_Splashscreen"
+msgid "_Top dock"
-#~ msgstr "_Käivitusekraan"
+msgstr "Ü_lemine dokk"
-#~ msgid "_Top dock"
+msgid "_Bottom dock"
-#~ msgstr "Ü_lemine dokk"
+msgstr "_Alumine dokk"
-#~ msgid "_Bottom dock"
+msgid "_Left dock"
-#~ msgstr "_Alumine dokk"
+msgstr "_Vasak dokk"
-#~ msgid "_Left dock"
+msgid "_Right dock"
-#~ msgstr "_Vasak dokk"
+msgstr "_Parem dokk"
-#~ msgid "_Right dock"
+msgid "_All docks"
-#~ msgstr "_Parem dokk"
+msgstr "_Kõik dokid"
-#~ msgid "_All docks"
+msgid "Des_ktop"
-#~ msgstr "_Kõik dokid"
+msgstr "_Töölaud"
-#~ msgid "Des_ktop"
+msgid "Open another one of these windows"
-#~ msgstr "_Töölaud"
+msgstr "Ava neist akendest järgmine"
-#~ msgid "Open another one of these windows"
+msgid "This is a demo button with an 'open' icon"
-#~ msgstr "Ava neist akendest järgmine"
+msgstr "See on näidisnupp koos 'ava' ikooniga"
-#~ msgid "This is a demo button with an 'open' icon"
+msgid "This is a demo button with a 'quit' icon"
-#~ msgstr "See on näidisnupp koos 'ava' ikooniga"
+msgstr "See on näidisnupp koos 'lõpeta' ikooniga"
-#~ msgid "This is a demo button with a 'quit' icon"
+msgid "This is a sample message in a sample dialog"
-#~ msgstr "See on näidisnupp koos 'lõpeta' ikooniga"
+msgstr "See on näidisteade näidisdialoogis"
-#~ msgid "This is a sample message in a sample dialog"
+#, c-format
-#~ msgstr "See on näidisteade näidisdialoogis"
+msgid "Fake menu item %d\n"
 msgstr "Võltsitud menüüpunkt %d\n"
-#~ msgid "Fake menu item %d\n"
+msgid "Border-only window"
-#~ msgstr "Võltsitud menüüpunkt %d\n"
+msgstr "Ainult raamiga aken"
-#~ msgid "Border-only window"
+msgid "Bar"
-#~ msgstr "Ainult raamiga aken"
+msgstr "Riba"
-#~ msgid "Bar"
+msgid "Normal Application Window"
-#~ msgstr "Riba"
+msgstr "Tavaline rakenduseaken"
-#~ msgid "Normal Application Window"
+msgid "Dialog Box"
-#~ msgstr "Tavaline rakenduseaken"
+msgstr "Dialoogikast"
-#~ msgid "Dialog Box"
+msgid "Modal Dialog Box"
-#~ msgstr "Dialoogikast"
+msgstr "Modaalne dialoogikast"
-#~ msgid "Modal Dialog Box"
+msgid "Utility Palette"
-#~ msgstr "Modaalne dialoogikast"
+msgstr "Rakendite palett"
-#~ msgid "Utility Palette"
+msgid "Torn-off Menu"
-#~ msgstr "Rakendite palett"
+msgstr "Ärarebitav menüü"
-#~ msgid "Torn-off Menu"
+msgid "Border"
-#~ msgstr "Ärarebitav menüü"
+msgstr "Raam"
-#~ msgid "Border"
+msgid "Attached Modal Dialog"
-#~ msgstr "Raam"
+msgstr "Kinnistatud modaaldialoog"
-#~ msgid "Attached Modal Dialog"
+#, c-format
-#~ msgstr "Kinnistatud modaaldialoog"
+msgid "Button layout test %d"
 msgstr "Nuppude paigutuse test %d"
-#~ msgid "Button layout test %d"
+#, c-format
-#~ msgstr "Nuppude paigutuse test %d"
+msgid "%g milliseconds to draw one window frame"
 msgstr "%g millisekundit kulub ühe akna raami joonistamiseks"
-#~ msgid "%g milliseconds to draw one window frame"
+#, c-format
-#~ msgstr "%g millisekundit kulub ühe akna raami joonistamiseks"
+msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
 msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n"
-#~ msgid "Usage: metacity-theme-viewer [THEMENAME]\n"
+#, c-format
-#~ msgstr "Kasutamine: metacity-theme-viewer [TEEMANIMI]\n"
+msgid "Error loading theme: %s\n"
 msgstr "Viga teema laadimisel: %s\n"
-#~ msgid "Error loading theme: %s\n"
+#, c-format
-#~ msgstr "Viga teema laadimisel: %s\n"
+msgid "Loaded theme \"%s\" in %g seconds\n"
 msgstr "Teema \"%s\" laaditi %g sekundiga\n"
-#~ msgid "Loaded theme \"%s\" in %g seconds\n"
+msgid "Normal Title Font"
-#~ msgstr "Teema \"%s\" laaditi %g sekundiga\n"
+msgstr "Tiitli tavasuurusega kirjatüüp"
-#~ msgid "Normal Title Font"
+msgid "Small Title Font"
-#~ msgstr "Tiitli tavasuurusega kirjatüüp"
+msgstr "Tiitli väike kirjatüüp"
-#~ msgid "Small Title Font"
+msgid "Large Title Font"
-#~ msgstr "Tiitli väike kirjatüüp"
+msgstr "Tiitli suur kirjatüüp"
-#~ msgid "Large Title Font"
+msgid "Button Layouts"
-#~ msgstr "Tiitli suur kirjatüüp"
+msgstr "Nuppude paigutus"
-#~ msgid "Button Layouts"
+msgid "Benchmark"
-#~ msgstr "Nuppude paigutus"
+msgstr "Jõudlus"
-#~ msgid "Benchmark"
+msgid "Window Title Goes Here"
-#~ msgstr "Jõudlus"
+msgstr "Siia tuleb akna pealkiri"
-#~ msgid "Window Title Goes Here"
+#, c-format
-#~ msgstr "Siia tuleb akna pealkiri"
+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 ""
 "Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit kaadrile) "
 "ja %g sekundiga seinakella järgi, millesse on kaasatud X-serveri "
 "ressursikasutus (%g millisekundit kaadrile)\n"
-#~ msgid ""
+msgid "position expression test returned TRUE but set error"
-#~ "Drew %d frames in %g client-side seconds (%g milliseconds per frame) and "
+msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea"
 #~ "%g seconds wall clock time including X server resources (%g milliseconds "
 #~ "per frame)\n"
 #~ msgstr ""
 #~ "Joonistati %d kaadrit %g kliendi-kella sekundiga (%g millisekundit "
 #~ "kaadrile) ja %g sekundiga seinakella järgi, millesse on kaasatud X-"
 #~ "serveri ressursikasutus (%g millisekundit kaadrile)\n"
-#~ msgid "position expression test returned TRUE but set error"
+msgid "position expression test returned FALSE but didn't set error"
-#~ msgstr "asukoha avaldise kontroll tagastas TÕENE, aga määras vea"
+msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga"
-#~ msgid "position expression test returned FALSE but didn't set error"
+msgid "Error was expected but none given"
-#~ msgstr "asukoha avaldise kontroll tagastas VÄÄR, aga ei määranud viga"
+msgstr "Oodati viga, aga ühtegi ei edastatud"
-#~ msgid "Error was expected but none given"
+#, c-format
-#~ msgstr "Oodati viga, aga ühtegi ei edastatud"
+msgid "Error %d was expected but %d given"
 msgstr "Oodati viga %d, aga edastati viga %d"
-#~ msgid "Error %d was expected but %d given"
+#, c-format
-#~ msgstr "Oodati viga %d, aga edastati viga %d"
+msgid "Error not expected but one was returned: %s"
 msgstr "Viga ei oodatud, aga üks edastati: %s"
-#~ msgid "Error not expected but one was returned: %s"
+#, c-format
-#~ msgstr "Viga ei oodatud, aga üks edastati: %s"
+msgid "x value was %d, %d was expected"
 msgstr "x väärtus oli %d, oodati väärtust %d"
-#~ msgid "x value was %d, %d was expected"
+#, c-format
-#~ msgstr "x väärtus oli %d, oodati väärtust %d"
+msgid "y value was %d, %d was expected"
 msgstr "y väärtus oli %d, oodati väärtust %d"
-#~ msgid "y value was %d, %d was expected"
+#, c-format
-#~ msgstr "y väärtus oli %d, oodati väärtust %d"
+msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
-
+msgstr ""
-#~ msgid ""
+"%d koordinaatide avaldis töödeldi %g sekundiga (keskmine %g sekundit)\n"
 #~ "%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/fa.po
+++ b/po/fa.po
@@ -20,7 +20,8 @@ msgstr ""
 "X-Poedit-Country: IRAN, ISLAMIC REPUBLIC OF\n"
 "X-Poedit-SourceCharset: utf-8\n"
-#: ../src/50-mutter-windows.xml.in.h:1 ../src/50-mutter-windows.xml.in.h:17
+#: ../src/50-mutter-windows.xml.in.h:1
 #| msgid "/_Windows"
 msgid "Windows"
 msgstr "پنجره‌ها"
@@ -1485,291 +1486,6 @@ msgstr "مقدار y %Id بود، %Id انتظار می‌رفت"
 msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr "%Id عبارت مختصاتی در %Ig ثانیه تجزیه شد (متوسط %Ig ثانیه)\n"
 #: ../src/50-mutter-windows.xml.in.h:2
 #, fuzzy
 msgid "Close window"
 msgstr "بستن پنجره"
 #: ../src/50-mutter-windows.xml.in.h:3
 #, fuzzy
 msgid "Lower window below other windows"
 msgstr "پایین بردن پنجره زیر پنجره‌های دیگر"
 #: ../src/50-mutter-windows.xml.in.h:4
 #, fuzzy
 msgid "Maximize window"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "حداکثر کردن پنجره\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "بیشینه کردن پنجره"
 #: ../src/50-mutter-windows.xml.in.h:5
 #, fuzzy
 msgid "Maximize window horizontally"
 msgstr "حداکثر کردن افقی پنجره"
 #: ../src/50-mutter-windows.xml.in.h:6
 #, fuzzy
 msgid "Maximize window vertically"
 msgstr "حداکثر کردن عمودی پنجره"
 #: ../src/50-mutter-windows.xml.in.h:7
 #, fuzzy
 msgid "Minimize window"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "حداقل کردن پنجره\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "کمینه کردن پنجره"
 #: ../src/50-mutter-windows.xml.in.h:8
 #, fuzzy
 msgid "Move window"
 msgstr "جابه‌جایی پنجره"
 #: ../src/50-mutter-navigation.xml.in.h:6
 #, fuzzy
 msgid "Move window one workspace down"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری پایینی\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری پایینی"
 #: ../src/50-mutter-navigation.xml.in.h:7
 #, fuzzy
 msgid "Move window one workspace to the left"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری چپ \n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری چپ "
 #: ../src/50-mutter-navigation.xml.in.h:8
 #, fuzzy
 msgid "Move window one workspace to the right"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری راست\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری راست"
 #: ../src/50-mutter-navigation.xml.in.h:9
 #, fuzzy
 msgid "Move window one workspace up"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری بالایی\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری بالایی"
 #: ../src/50-mutter-navigation.xml.in.h:10
 #, fuzzy
 msgid "Move window to workspace 1"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری ۱\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری ۱"
 #: ../src/50-mutter-navigation.xml.in.h:11
 #, fuzzy
 msgid "Move window to workspace 2"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری ۲\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری ۲"
 #: ../src/50-mutter-navigation.xml.in.h:12
 #, fuzzy
 msgid "Move window to workspace 3"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "نقل‌مکان پنجره به فضای کاری ۳\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری ۳"
 #: ../src/50-mutter-navigation.xml.in.h:13
 #, fuzzy
 msgid "Move window to workspace 4"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای کاری ۴\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "جابه‌جایی پنجره به فضای‌کاری ۴"
 #: ../src/50-mutter-windows.xml.in.h:9
 #, fuzzy
 msgid "Raise window above other windows"
 msgstr "پیش آوردن پنجره روی همه‌ی پنجره‌ها"
 #: ../src/50-mutter-windows.xml.in.h:11
 #, fuzzy
 msgid "Resize window"
 msgstr "تغییر اندازه‌ی پنجره"
 #: ../src/50-mutter-navigation.xml.in.h:18
 #, fuzzy
 msgid "Switch to workspace 1"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "تعویض به فضای کاری ۱\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "رفتن به فضای‌کاری ۱"
 #: ../src/50-mutter-navigation.xml.in.h:19
 #, fuzzy
 msgid "Switch to workspace 2"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "تعویض به فضای کاری ۲\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "رفتن به فضای‌کاری ۲"
 #: ../src/50-mutter-navigation.xml.in.h:20
 #, fuzzy
 msgid "Switch to workspace 3"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "تعویض به فضای کاری ۳\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "رفتن به فضای‌کاری ۳"
 #: ../src/50-mutter-navigation.xml.in.h:21
 #, fuzzy
 msgid "Switch to workspace 4"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "تعویض به فضای کاری ۴\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "رفتن به فضای‌کاری ۴"
 #: ../src/50-mutter-windows.xml.in.h:13
 #, fuzzy
 msgid "Toggle fullscreen mode"
 msgstr "ضامن حالت تمام صفحه"
 #: ../src/50-mutter-windows.xml.in.h:14
 #, fuzzy
 msgid "Toggle maximization state"
 msgstr ""
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "ضامن همیشه در وضیعت حداکثر\n"
 "#-#-#-#-#  fa.po (metacity HEAD)  #-#-#-#-#\n"
 "ضامن همیشه در وضعیت حداکثر"
 #: ../src/50-mutter-windows.xml.in.h:15
 #, fuzzy
 msgid "Toggle shaded state"
 msgstr "ضامن وضعیت سایه خورده"
 #: ../src/50-mutter-navigation.xml.in.h:1
 #, fuzzy
 #| msgid "Hide all normal windows and set focus to the desktop"
 msgid "Hide all normal windows"
 msgstr "مخفی کردن همه‌ی پنجره‌های معمول"
 #: ../src/50-mutter-navigation.xml.in.h:2
 #, fuzzy
 #| msgid "Move to Workspace _Left"
 msgid "Move to workspace above"
 msgstr "جابه‌جایی به فضای‌کاری _چپ"
 #: ../src/50-mutter-navigation.xml.in.h:3
 #, fuzzy
 #| msgid "Move to Workspace _Down"
 msgid "Move to workspace below"
 msgstr "جابه‌جایی به فضای‌کاری پایین"
 #: ../src/50-mutter-navigation.xml.in.h:4
 #, fuzzy
 #| msgid "Move to Workspace _Left"
 msgid "Move to workspace left"
 msgstr "جابه‌جایی به فضای‌کاری سمت چپ"
 #: ../src/50-mutter-navigation.xml.in.h:5
 #, fuzzy
 #| msgid "Move to Workspace R_ight"
 msgid "Move to workspace right"
 msgstr "جابه‌جایی به فضای‌کاری سمت راست"
 #: ../src/50-mutter-navigation.xml.in.h:14
 #, fuzzy
 msgid "Navigation"
 msgstr "جابه‌جایی"
 #: ../src/50-mutter-navigation.xml.in.h:15
 #, fuzzy
 msgid "Switch applications"
 msgstr "تعویض برنامه‌ها"
 #: ../src/50-mutter-navigation.xml.in.h:16
 #, fuzzy
 msgid "Switch system controls"
 msgstr "تعویض کنترل‌های سیستم"
 #: ../src/50-mutter-navigation.xml.in.h:17
 #, fuzzy
 msgid "Switch system controls directly"
 msgstr "تعویض مستقیمِ کنترل‌های سیستم"
 #: ../src/50-mutter-navigation.xml.in.h:22
 #, fuzzy
 msgid "Switch windows directly"
 msgstr "تعویض مستیقیم پنجره‌ها"
 #: ../src/50-mutter-navigation.xml.in.h:23
 #, fuzzy
 #| msgid "Move between windows of an application immediately"
 msgid "Switch windows of an app directly"
 msgstr "تعویض مستقیمِ پنجره‌های یک برنامه"
 #: ../src/50-mutter-navigation.xml.in.h:24
 #, fuzzy
 #| msgid "Move between windows of an application immediately"
 msgid "Switch windows of an application"
 msgstr "تعویض پنجره‌های یک برنامه"
 #: ../src/50-mutter-system.xml.in.h:1
 #, fuzzy
 msgid "Show the activities overview"
 msgstr "نمایش نمای‌کلی فعالیت‌ها"
 #: ../src/50-mutter-system.xml.in.h:2
 #, fuzzy
 #| msgid "Show the panel's main menu"
 msgid "Show the run command prompt"
 msgstr "نمایش خط فرمان اجرا"
 #: ../src/50-mutter-system.xml.in.h:3
 #, fuzzy
 msgid "System"
 msgstr "سیستم"
 #: ../src/50-mutter-windows.xml.in.h:1
 #, fuzzy
 msgid "Activate the window menu"
 msgstr "فعال کردن منوی پنجره"
 #: ../src/50-mutter-windows.xml.in.h:10
 #, fuzzy
 #| msgid "Raise window if it's covered by another window, otherwise lower it"
 msgid "Raise window if covered, otherwise lower it"
 msgstr "بالا آوردن پنجره در صورتی که پوشیده شده است، در غیر اینصورت پایین برود"
 #: ../src/50-mutter-windows.xml.in.h:12
 #, fuzzy
 msgid "Restore window"
 msgstr "بازگرداندن پنجره"
 #: ../src/50-mutter-windows.xml.in.h:16
 #, fuzzy
 #| msgid "Toggle whether window is on all workspaces or just one"
 msgid "Toggle window on all workspaces or one"
 msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌کاری"
 #~ msgid "Failed to parse message \"%s\" from dialog process\n"
 #~ msgstr "شکست در تجزیه پیغام «%s» از پردازش محاوره\n"
@@ -1906,6 +1622,9 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "(کلیک راست) می‌شود. تغییردهنده به صورت مثلاً«&lt;Alt&gt;» یا «&lt;Super&gt;» "
 #~ "نمایش داده می‌شود."
 #~ msgid "Close window"
 #~ msgstr "بستن پنجره"
 #~ msgid "Commands to run in response to keybindings"
 #~ msgstr "فرمان‌هایی که در پاسخ به کلیدهای مقید اجرا می‌شوند"
@@ -1984,6 +1703,21 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgstr ""
 #~ "اگر درست بود از قابلیت کاربری در قبال استفاده‌ی کمتر از منابع صرف نظر شود"
 #~ msgid "Lower window below other windows"
 #~ msgstr "پایین بردن پنجره زیر پنجره‌های دیگر"
 #~ msgid "Maximize window"
 #~ msgstr "حداکثر کردن پنجره"
 #~ msgid "Maximize window horizontally"
 #~ msgstr "حداکثر کردن افقی پنجره"
 #~ msgid "Maximize window vertically"
 #~ msgstr "حداکثر کردن عمودی پنجره"
 #~ msgid "Minimize window"
 #~ msgstr "حداقل کردن پنجره"
 #~ msgid "Move backward between panels and the desktop immediately"
 #~ msgstr "جابه‌جایی آنی به عقب بین تابلو و رومیزی"
@@ -2005,6 +1739,24 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Move focus backwards between windows using popup display"
 #~ msgstr "انتقال تمرکز به عقب بین پنجره‌ها با نمایش واشو"
 #~ msgid "Move window"
 #~ msgstr "جابه‌جایی پنجره"
 #~ msgid "Move window one workspace down"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری پایینی"
 #~ msgid "Move window one workspace to the left"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری چپ "
 #~ msgid "Move window one workspace to the right"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری راست"
 #~ msgid "Move window one workspace up"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری بالایی"
 #~ msgid "Move window to workspace 1"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۱"
 #~ msgid "Move window to workspace 10"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۱۰"
@@ -2014,6 +1766,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Move window to workspace 12"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۱۲"
 #~ msgid "Move window to workspace 2"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۲"
 #~ msgid "Move window to workspace 3"
 #~ msgstr "نقل‌مکان پنجره به فضای کاری ۳"
 #~ msgid "Move window to workspace 4"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۴"
 #~ msgid "Move window to workspace 5"
 #~ msgstr "جابه‌جایی پنجره به فضای کاری ۵"
@@ -2043,6 +1804,12 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "تعداد فضاهای کاری. باید بیش از صفر باشد و حداکثر مشخصی دارد (برای این که "
 #~ "اتفاقی رومیزی‌تان را با درخواست ۳۴ میلیون فضای کاری از بین نبرید)."
 #~ msgid "Raise window above other windows"
 #~ msgstr "پیش آوردن پنجره روی همه‌ی پنجره‌ها"
 #~ msgid "Resize window"
 #~ msgstr "تغییر اندازه‌ی پنجره"
 #~ msgid "Run a defined command"
 #~ msgstr "اجرای یک فرمان تعریف شده"
@@ -2083,6 +1850,9 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ "بعضی از دور زدن‌ها دورزدن کمبودهای خود قواعد جزئی هستند، بنابراین بعضی "
 #~ "وقت‌ها اشکال در حالت دور زدن بدون دستکاری قواعد قبل رفع نیست."
 #~ msgid "Switch to workspace 1"
 #~ msgstr "تعویض به فضای کاری ۱"
 #~ msgid "Switch to workspace 10"
 #~ msgstr "تعویض به فضای کاری ۱۰"
@@ -2092,6 +1862,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Switch to workspace 12"
 #~ msgstr "تعویض به فضای کاری ۱۲"
 #~ msgid "Switch to workspace 2"
 #~ msgstr "تعویض به فضای کاری ۲"
 #~ msgid "Switch to workspace 3"
 #~ msgstr "تعویض به فضای کاری ۳"
 #~ msgid "Switch to workspace 4"
 #~ msgstr "تعویض به فضای کاری ۴"
 #~ msgid "Switch to workspace 5"
 #~ msgstr "تعویض به فضای کاری ۵"
@@ -3146,6 +2925,15 @@ msgstr "تغییر حالت پنجره در یک یا تمام فضاهای‌ک
 #~ msgid "Toggle always on top state"
 #~ msgstr "ضامن همیشه در وضعیت بالایی"
 #~ msgid "Toggle fullscreen mode"
 #~ msgstr "ضامن حالت تمام صفحه"
 #~ msgid "Toggle maximization state"
 #~ msgstr "ضامن همیشه در وضیعت حداکثر"
 #~ msgid "Toggle shaded state"
 #~ msgstr "ضامن وضعیت سایه خورده"
 #~ msgid "Toggle window on all workspaces"
 #~ msgstr "ضامن پنجره در تمام فضاهای کاری"
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/ga.po
+++ b/po/ga.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/gu.po
+++ b/po/gu.po
--- a/po/he.po
+++ b/po/he.po
--- 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/kk.po
+++ b/po/kk.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
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/or.po
+++ b/po/or.po
--- a/po/pa.po
+++ b/po/pa.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
@@ -1944,33 +1944,6 @@ msgstr ""
 "Expresiile pentru coordonate %d parsate în %g secunde (o medie de %g "
 "secunde)\n"
 #: ../src/50-mutter-launchers.xml.in.h:1
 #, fuzzy
 msgid "Launchers"
 msgstr "Lansatori"
 #: ../src/50-mutter-navigation.xml.in.h:1
 #, fuzzy
 msgid "Navigation"
 msgstr "Navigare"
 #: ../src/50-mutter-screenshot.xml.in.h:1
 #, fuzzy
 #| msgid "Take a screenshot"
 msgid "Screenshots"
 msgstr "Capturi de ecran"
 #: ../src/50-mutter-system.xml.in.h:1
 #, fuzzy
 msgid "System"
 msgstr "Sistem"
 #: ../src/50-mutter-windows.xml.in.h:1
 #, fuzzy
 #| msgid "/_Windows"
 msgid "Windows"
 msgstr "Ferestre"
 #~ msgid "Window Management"
 #~ msgstr "Administrare ferestre"
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/ta.po
+++ b/po/ta.po
--- a/po/te.po
+++ b/po/te.po
--- a/po/tg.po
+++ b/po/tg.po
--- a/po/th.po
+++ b/po/th.po
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,22 +6,22 @@
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2008, 2009.
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
-# Muhammet Kara <muhammetk@acikkaynak.name.tr>, 2011, 2012.
+# Muhammet Kara <muhammet.k@gmail.com>, 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: 2012-08-06 23:35+0000\n"
+"POT-Creation-Date: 2012-03-15 21:29+0000\n"
-"PO-Revision-Date: 2012-08-09 16:48+0000\n"
+"PO-Revision-Date: 2012-03-23 21:56+0000\n"
-"Last-Translator: Muhammet Kara <muhammetk@acikkaynak.name.tr>\n"
+"Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "Language: tr\n"
 #: ../src/50-mutter-windows.xml.in.h:1
 msgid "Windows"
@@ -46,7 +46,7 @@ msgstr ""
 "\"%2$s\" monitöründeki %1$i ekranında zaten başka bir birleştirme yöneticisi "
 "çalışıyor."
-#: ../src/core/bell.c:320
+#: ../src/core/bell.c:307
 msgid "Bell event"
 msgstr "Etkinlik zili"
@@ -55,17 +55,16 @@ msgstr "Etkinlik zili"
 msgid "Unknown window information request: %d"
 msgstr "Bilinmeyen pencere bilgi isteği: %d"
-#: ../src/core/delete.c:114
+#: ../src/core/delete.c:111
 #, c-format
-#| msgid "<tt>%s</tt> is not responding."
+msgid "<tt>%s</tt> is not responding."
-msgid "%s is not responding."
+msgstr "<tt>%s</tt> cevap vermiyor."
 msgstr "%s yanıt vermiyor."
-#: ../src/core/delete.c:118
+#: ../src/core/delete.c:114
 msgid "Application is not responding."
 msgstr "Uygulama cevap vermiyor"
-#: ../src/core/delete.c:123
+#: ../src/core/delete.c:119
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -73,25 +72,25 @@ msgstr ""
 "Uygulamanın devam etmesi için bir müddet bekleyi seçebilirsiniz ya d a "
 "uygulamanın tamamen çıkması için onu zorlayabilirsiniz."
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Wait"
 msgstr "_Bekle"
-#: ../src/core/delete.c:130
+#: ../src/core/delete.c:126
 msgid "_Force Quit"
 msgstr "_Sonlandır"
-#: ../src/core/display.c:380
+#: ../src/core/display.c:387
 #, c-format
 msgid "Missing %s extension required for compositing"
 msgstr "Kompozisyon için gerekli olan %s eklentisi eksik"
-#: ../src/core/display.c:446
+#: ../src/core/display.c:453
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X Pencere Sistemi '%s' ekranı açılamadı\n"
-#: ../src/core/keybindings.c:844
+#: ../src/core/keybindings.c:852
 #, c-format
 msgid ""
 "Some other program is already using the key %s with modifiers %x as a "
@@ -100,36 +99,36 @@ msgstr ""
 "%s tuşu %x değiştiricileriyle birlikte başka bir uygulama tarafından tuş "
 "bağıolarak kullanılıyor\n"
-#: ../src/core/main.c:196
+#: ../src/core/main.c:206
 msgid "Disable connection to session manager"
 msgstr "Ortam yöneticisine olan bağlantıyı kapat"
-#: ../src/core/main.c:202
+#: ../src/core/main.c:212
 msgid "Replace the running window manager"
 msgstr "Çalışan pencere yöneticisinin yerini al"
-#: ../src/core/main.c:208
+#: ../src/core/main.c:218
 msgid "Specify session management ID"
 msgstr "Ortam yönetim ID'sini belirtin"
-#: ../src/core/main.c:213
+#: ../src/core/main.c:223
 msgid "X Display to use"
 msgstr "Kullanılacak X Ekranı"
-#: ../src/core/main.c:219
+#: ../src/core/main.c:229
 msgid "Initialize session from savefile"
 msgstr "Ortamı kayıtlı dosyadan başlat"
-#: ../src/core/main.c:225
+#: ../src/core/main.c:235
 msgid "Make X calls synchronous"
 msgstr "X çağrılarını eşazamanlı yap"
-#: ../src/core/main.c:494
+#: ../src/core/main.c:504
 #, c-format
 msgid "Failed to scan themes directory: %s\n"
 msgstr "Tema dizini taranırken hata oluştu: %s\n"
-#: ../src/core/main.c:510
+#: ../src/core/main.c:520
 #, c-format
 msgid ""
 "Could not find a theme! Be sure %s exists and contains the usual themes.\n"
@@ -156,10 +155,10 @@ msgid "Print version"
 msgstr "Sürümü yazdır"
 #: ../src/core/mutter.c:60
-msgid "Mutter plugin to use"
+msgid "Comma-separated list of compositor plugins"
-msgstr "Kullanılacak Mutter eklentisi"
+msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"
-#: ../src/core/prefs.c:1065
+#: ../src/core/prefs.c:1077
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -167,13 +166,13 @@ msgstr ""
 "Hatalı uygulamalara yönelik çözümler devre dışı. Bazı uygulamalar düzgün "
 "işlemeyebilir.\n"
-#: ../src/core/prefs.c:1140
+#: ../src/core/prefs.c:1152
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr ""
 "\"%s\" yazıtipi tanımlaması, %s GSettings anahtarından ayrıştırılamadı\n"
-#: ../src/core/prefs.c:1206
+#: ../src/core/prefs.c:1218
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -182,7 +181,7 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", fare düğme düzenleyicisi olarak "
 "geçerli bir değer değil\n"
-#: ../src/core/prefs.c:1724
+#: ../src/core/prefs.c:1739
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -191,17 +190,17 @@ msgstr ""
 "Yapılandırma veritabanında bulunan \"%s\", \"%s\" tuş bağı olarak geçerli "
 "bir değer değil\n"
-#: ../src/core/prefs.c:1821
+#: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
 msgstr "Çalışma Alanı %d"
-#: ../src/core/screen.c:652
+#: ../src/core/screen.c:730
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "'%2$s' X oturumundaki ekran %1$d geçersiz\n"
-#: ../src/core/screen.c:668
+#: ../src/core/screen.c:746
 #, c-format
 msgid ""
 "Screen %d on display \"%s\" already has a window manager; try using the --"
@@ -211,7 +210,7 @@ msgstr ""
 "geçerli pencere yöneticisinin yerine bir başkasını koymak için --replace "
 "seçeneğini kullanmayı deneyin.\n"
-#: ../src/core/screen.c:695
+#: ../src/core/screen.c:773
 #, c-format
 msgid ""
 "Could not acquire window manager selection on screen %d display \"%s\"\n"
@@ -219,13 +218,13 @@ msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d hangi pencere yöneticisine "
 "sahipöğrenilemedi\n"
-#: ../src/core/screen.c:750
+#: ../src/core/screen.c:828
 #, c-format
 msgid "Screen %d on display \"%s\" already has a window manager\n"
 msgstr ""
 "\"%2$s\" X oturumundaki ekran %1$d bir pencere yöneticisine zaten sahip\n"
-#: ../src/core/screen.c:935
+#: ../src/core/screen.c:1013
 #, c-format
 msgid "Could not release screen %d on display \"%s\"\n"
 msgstr "\"%2$s\" X oturumundaki ekran %1$d serberst bırakılamadı\"\n"
@@ -287,44 +286,44 @@ msgstr ""
 "Bu pencereler, &quot;geçerli ayarları kaydet&quot; özelliğini desteklemiyor "
 "ve bir dahaki girişinizde elle yeniden başlatmanız gerekecek."
-#: ../src/core/util.c:80
+#: ../src/core/util.c:111
 #, c-format
 msgid "Failed to open debug log: %s\n"
 msgstr "Hata ayıklama günlüğü açılamadı: %s\n"
-#: ../src/core/util.c:90
+#: ../src/core/util.c:121
 #, c-format
 msgid "Failed to fdopen() log file %s: %s\n"
 msgstr "fdopen() günlük dosyası %s açılamadı: %s\n"
-#: ../src/core/util.c:96
+#: ../src/core/util.c:127
 #, c-format
 msgid "Opened log file %s\n"
 msgstr "%s günlük dosyası açıldı\n"
-#: ../src/core/util.c:115 ../src/tools/mutter-message.c:149
+#: ../src/core/util.c:146 ../src/tools/mutter-message.c:149
 #, c-format
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter, ayrıntılı kip desteği olmadan derlenmiş\n"
-#: ../src/core/util.c:259
+#: ../src/core/util.c:290
 msgid "Window manager: "
 msgstr "Pencere yöneticisi: "
-#: ../src/core/util.c:407
+#: ../src/core/util.c:438
 msgid "Bug in window manager: "
 msgstr "Pencere yöneticisinde hata: "
-#: ../src/core/util.c:438
+#: ../src/core/util.c:471
 msgid "Window manager warning: "
 msgstr "Pencere yöneticisi uyarısı: "
-#: ../src/core/util.c:466
+#: ../src/core/util.c:499
 msgid "Window manager error: "
 msgstr "Pencere yöneticisi hatası: "
 #. first time through
-#: ../src/core/window.c:7234
+#: ../src/core/window.c:7269
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -340,32 +339,32 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7899
+#: ../src/core/window.c:7932
 #, c-format
 msgid ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
+"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"
+"d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr ""
 "%s penceresi bir yandan yeniden boyutlandırılamaz olduğunu gösteren bir MWM "
 "ipucu verirken anlamsız bir biçimde en küçük (%d x %d) ve en büyük (%d x %d) "
 "boyut sınırlarını da atıyor.\n"
-#: ../src/core/window-props.c:310
+#: ../src/core/window-props.c:309
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
 msgstr "Uygulama geçersiz _NET_WM_PID %lu atadı\n"
-#: ../src/core/window-props.c:429
+#: ../src/core/window-props.c:426
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s üzerinde)"
-#: ../src/core/window-props.c:1484
+#: ../src/core/window-props.c:1481
 #, c-format
 msgid "Invalid WM_TRANSIENT_FOR window 0x%lx specified for %s.\n"
 msgstr "Geçersiz WM_TRANSIENT_FOR pencere 0x%lx belirtilen %s.\n"
-#: ../src/core/window-props.c:1495
+#: ../src/core/window-props.c:1492
 #, c-format
 msgid "WM_TRANSIENT_FOR window 0x%lx for %s would create loop.\n"
 msgstr "WM_TRANSIENT_FOR penceresi 0x%lx  (%s için) döngü oluşturacak.\n"
@@ -433,11 +432,23 @@ msgstr ""
 "birlikte hareket eder."
 #: ../src/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Live Hidden Windows"
 msgstr "Çalışır Durumdaki Gizli Pencereler"
 #: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
 msgstr ""
 "Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma alanındaki "
 "pencereler) çalışır bırakılıp bırakılmayacağını belirler."
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
 "Pencereler ekran kenarlarında bırakıldığında kenar döşemeyi etkinleştir."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
+#: ../src/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
@@ -448,25 +459,26 @@ msgstr ""
 "şekilde yeniden boyutlandırılır. Ekranın tepedeki kenarına bırakılan "
 "pencereler ekranı tamamen kaplar."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:7
+#: ../src/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces are managed dynamically"
 msgstr "Çalışma alanları dinamik olarak yönetilir"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:8
+#: ../src/org.gnome.mutter.gschema.xml.in.h:10
 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 ""
 "Çalışma alanlarının dinamik olarak mı yönetileceğini yoksa sabit sayıda "
-"çalışma alanı mı olacağını belirler (org.gnome.desktop.wm.preferences "
+"çalışma alanı mı olacağını "
-"içindeki num-workspaces değişkeni tarafından belirlenir)."
+"belirler (org.gnome.desktop.wm.preferences içindeki num-workspaces değişkeni "
 "tarafından belirlenir)."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:9
+#: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Workspaces only on primary"
 msgstr "Sadece birincil monitördeki çalışma alanları"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:10
+#: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -474,11 +486,11 @@ msgstr ""
 "Çalışma alanı değiştirilmesinin, tüm monitörlerdeki pencerelerde mi yoksa "
 "sadece birincil monitördekilerde mi gerçekleşeceğini belirler."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:11
+#: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
 msgstr "Sekme açılır penceresi yok"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:12
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -486,11 +498,11 @@ msgstr ""
 "Pencere geçişinde çerçeve vurgulanması ve açılır pencere kullanımının "
 "kapatılıp kapatılmayacağını belirler."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:13
+#: ../src/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Sürüklenebilir kenarlık genişliği"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
+#: ../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."
@@ -499,11 +511,11 @@ msgstr ""
 "kenarlıkları yetersiz gelirse, bu değere ulaşmak için görünmez kenarlıklar "
 "eklenir."
-#: ../src/org.gnome.mutter.gschema.xml.in.h:15
+#: ../src/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Select window from tab popup"
 msgstr "Pencereyi, sekme açılır penceresinden seç"
-#: ../src/org.gnome.mutter.gschema.xml.in.h:16
+#: ../src/org.gnome.mutter.gschema.xml.in.h:18
 msgid "Cancel tab popup"
 msgstr "Sekmeyi yeni pencerede açmayı iptal et"
@@ -711,49 +723,49 @@ msgstr "Mod5"
 msgid "%d x %d"
 msgstr "%d x %d"
-#: ../src/ui/theme.c:234
+#: ../src/ui/theme.c:253
 msgid "top"
 msgstr "üst"
-#: ../src/ui/theme.c:236
+#: ../src/ui/theme.c:255
 msgid "bottom"
 msgstr "alt"
-#: ../src/ui/theme.c:238
+#: ../src/ui/theme.c:257
 msgid "left"
 msgstr "sol"
-#: ../src/ui/theme.c:240
+#: ../src/ui/theme.c:259
 msgid "right"
 msgstr "sağ"
-#: ../src/ui/theme.c:268
+#: ../src/ui/theme.c:286
 #, c-format
 msgid "frame geometry does not specify \"%s\" dimension"
 msgstr "çerçeve geometrisi \"%s\" boyutunu tanımlamıyor"
-#: ../src/ui/theme.c:287
+#: ../src/ui/theme.c:305
 #, c-format
 msgid "frame geometry does not specify dimension \"%s\" for border \"%s\""
 msgstr ""
 "çerçeve geometrisi \"%s\" boyutunu \"%s\" pencere kenarı için tanımlamıyor"
-#: ../src/ui/theme.c:324
+#: ../src/ui/theme.c:342
 #, c-format
 msgid "Button aspect ratio %g is not reasonable"
 msgstr "%g kabul edilebilir bir düğme en-boy oranı değil"
-#: ../src/ui/theme.c:336
+#: ../src/ui/theme.c:354
 #, c-format
 msgid "Frame geometry does not specify size of buttons"
 msgstr "Çerçeve geometrisi düğmelerin boyutunu tanımlamıyor"
-#: ../src/ui/theme.c:1049
+#: ../src/ui/theme.c:1067
 #, c-format
 msgid "Gradients should have at least two colors"
 msgstr "Renk geçişlerinde en az iki renk olmalı"
-#: ../src/ui/theme.c:1201
+#: ../src/ui/theme.c:1219
 #, c-format
 msgid ""
 "GTK custom color specification must have color name and fallback in "
@@ -762,7 +774,7 @@ msgstr ""
 "GTK özel renk belirtiminde parantez içinde renk adı ve fallback kelimesi yer "
 "almalıdır; örneğin, gtk:custom[foo,bar]; \"%s\" ayrıştırılamadı"
-#: ../src/ui/theme.c:1217
+#: ../src/ui/theme.c:1235
 #, c-format
 msgid ""
 "Invalid character '%c' in color_name parameter of gtk:custom, only A-Za-z0-9-"
@@ -771,7 +783,7 @@ msgstr ""
 "gtk:custom color_name parametresinin adında geçersiz karakter '%c'; sadece A-"
 "Za-z0-9-_ karakterleri geçerlidir"
-#: ../src/ui/theme.c:1231
+#: ../src/ui/theme.c:1249
 #, c-format
 msgid ""
 "Gtk:custom format is \"gtk:custom(color_name,fallback)\", \"%s\" does not "
@@ -780,7 +792,7 @@ msgstr ""
 "Gtk:custom biçimi \"gtk:custom(color_name,fallback)\" şeklindedir; \"%s\" "
 "biçime uymuyor"
-#: ../src/ui/theme.c:1276
+#: ../src/ui/theme.c:1294
 #, c-format
 msgid ""
 "GTK color specification must have the state in brackets, e.g. gtk:fg[NORMAL] "
@@ -790,7 +802,7 @@ msgstr ""
 "örneğin, gtk:fg[NORMAL] belirtiminde NORMAL, durumu gösterir; \"%s\" "
 "ayrıştırılamadı"
-#: ../src/ui/theme.c:1290
+#: ../src/ui/theme.c:1308
 #, c-format
 msgid ""
 "GTK color specification must have a close bracket after the state, e.g. gtk:"
@@ -800,17 +812,17 @@ msgstr ""
 "örneğin, gtk:fg[NORMAL] belirtiminde NORMAL, durumu gösterir; \"%s\" "
 "ayrıştırılamadı"
-#: ../src/ui/theme.c:1301
+#: ../src/ui/theme.c:1319
 #, c-format
 msgid "Did not understand state \"%s\" in color specification"
 msgstr "Renk belirtimindeki \"%s\" durumu anlaşılamadı"
-#: ../src/ui/theme.c:1314
+#: ../src/ui/theme.c:1332
 #, c-format
 msgid "Did not understand color component \"%s\" in color specification"
 msgstr "Renk belirtimindeki \"%s\" renk bileşeni anlaşılamadı"
-#: ../src/ui/theme.c:1343
+#: ../src/ui/theme.c:1361
 #, c-format
 msgid ""
 "Blend format is \"blend/bg_color/fg_color/alpha\", \"%s\" does not fit the "
@@ -819,17 +831,17 @@ msgstr ""
 "Renk karışımının doğru biçimi \"blend/bg_color/fg_color/alpha\"dır; \"%s\" "
 "bu biçime uymuyor"
-#: ../src/ui/theme.c:1354
+#: ../src/ui/theme.c:1372
 #, c-format
 msgid "Could not parse alpha value \"%s\" in blended color"
 msgstr "Renk karışımındaki \"%s\" alfa değeri ayrıştırılamadı"
-#: ../src/ui/theme.c:1364
+#: ../src/ui/theme.c:1382
 #, c-format
 msgid "Alpha value \"%s\" in blended color is not between 0.0 and 1.0"
 msgstr "Renk karışımının alfa değeri \"%s\", 0.0 ile 1.0 arasında değil"
-#: ../src/ui/theme.c:1411
+#: ../src/ui/theme.c:1429
 #, c-format
 msgid ""
 "Shade format is \"shade/base_color/factor\", \"%s\" does not fit the format"
@@ -837,27 +849,27 @@ msgstr ""
 "Gölgelendirmenin doğru biçimi \"shade/bas_color/factor\"dır; \"%s\" bu "
 "biçime uymuyor"
-#: ../src/ui/theme.c:1422
+#: ../src/ui/theme.c:1440
 #, c-format
 msgid "Could not parse shade factor \"%s\" in shaded color"
 msgstr "Gölgeli rengin gölge katsayısı olan \"%s\" ayrıştırılamadı"
-#: ../src/ui/theme.c:1432
+#: ../src/ui/theme.c:1450
 #, c-format
 msgid "Shade factor \"%s\" in shaded color is negative"
 msgstr "Gölgeli rengin gölge katsayısı olan \"%s\", negatif"
-#: ../src/ui/theme.c:1461
+#: ../src/ui/theme.c:1479
 #, c-format
 msgid "Could not parse color \"%s\""
 msgstr "\"%s\" rengi ayrıştırılamadı"
-#: ../src/ui/theme.c:1778
+#: ../src/ui/theme.c:1790
 #, c-format
 msgid "Coordinate expression contains character '%s' which is not allowed"
 msgstr "Kordinat ifadesi izin verilmeyen '%s' karakterini içeriyor"
-#: ../src/ui/theme.c:1805
+#: ../src/ui/theme.c:1817
 #, c-format
 msgid ""
 "Coordinate expression contains floating point number '%s' which could not be "
@@ -865,12 +877,12 @@ msgid ""
 msgstr ""
 "Kordinat ifadesi '%s' gerçel sayısını içeriyor ve bu sayı ayrıştırılamıyor"
-#: ../src/ui/theme.c:1819
+#: ../src/ui/theme.c:1831
 #, c-format
 msgid "Coordinate expression contains integer '%s' which could not be parsed"
 msgstr "Kordinat ifadesi ayrıştırılamayan '%s' tamsayısını içeriyor"
-#: ../src/ui/theme.c:1940
+#: ../src/ui/theme.c:1953
 #, c-format
 msgid ""
 "Coordinate expression contained unknown operator at the start of this text: "
@@ -878,17 +890,17 @@ msgid ""
 msgstr ""
 "Kordinat ifadesi bu metnin başında bilinmeyen bir işleç içeriyor: \"%s\""
-#: ../src/ui/theme.c:1997
+#: ../src/ui/theme.c:2010
 #, c-format
 msgid "Coordinate expression was empty or not understood"
 msgstr "Kordinat ifadesi boş ya da anlaşılamadı"
-#: ../src/ui/theme.c:2110 ../src/ui/theme.c:2120 ../src/ui/theme.c:2154
+#: ../src/ui/theme.c:2121 ../src/ui/theme.c:2131 ../src/ui/theme.c:2165
 #, c-format
 msgid "Coordinate expression results in division by zero"
 msgstr "Kordinat ifadesi sıfıra bölümle sonuçlanıyor"
-#: ../src/ui/theme.c:2162
+#: ../src/ui/theme.c:2173
 #, c-format
 msgid ""
 "Coordinate expression tries to use mod operator on a floating-point number"
@@ -896,23 +908,23 @@ msgstr ""
 "Kordinat ifadesi bir gerçel sayı üzerinde mod (kalan bulma) işlecini "
 "kullanmaya çalıştı"
-#: ../src/ui/theme.c:2218
+#: ../src/ui/theme.c:2229
 #, c-format
 msgid ""
 "Coordinate expression has an operator \"%s\" where an operand was expected"
 msgstr "Kordinat ifadesi işleneni beklenen \"%s\", işlecini içeriyor"
-#: ../src/ui/theme.c:2227
+#: ../src/ui/theme.c:2238
 #, c-format
 msgid "Coordinate expression had an operand where an operator was expected"
 msgstr "Kordinat ifadesi işleci beklenen bir işlenen içeriyor"
-#: ../src/ui/theme.c:2235
+#: ../src/ui/theme.c:2246
 #, c-format
 msgid "Coordinate expression ended with an operator instead of an operand"
 msgstr "Kordinat ifadesi bir işlenen yerine işleçle bitiyor"
-#: ../src/ui/theme.c:2245
+#: ../src/ui/theme.c:2256
 #, c-format
 msgid ""
 "Coordinate expression has operator \"%c\" following operator \"%c\" with no "
@@ -921,38 +933,38 @@ msgstr ""
 "Kordinat ifadesi birbirlerinin izleyen ve aralarında işlenen olmayan \"%2$c"
 "\" ve \"%1$c\" işleçlerini içeriyor"
-#: ../src/ui/theme.c:2396 ../src/ui/theme.c:2441
+#: ../src/ui/theme.c:2407 ../src/ui/theme.c:2452
 #, c-format
 msgid "Coordinate expression had unknown variable or constant \"%s\""
 msgstr ""
 "Kordinat ifadesi bilinmeyen bir değişken ya da sabit olan \"%s\" içeriyor"
-#: ../src/ui/theme.c:2495
+#: ../src/ui/theme.c:2506
 #, c-format
 msgid "Coordinate expression parser overflowed its buffer."
 msgstr "Kordinat belirtim ayrıştırıcısı tamponundan taştı."
-#: ../src/ui/theme.c:2524
+#: ../src/ui/theme.c:2535
 #, c-format
 msgid "Coordinate expression had a close parenthesis with no open parenthesis"
 msgstr "Kordinat ifadesi sol parantezi olmayan bir sağ parantez içeriyor"
-#: ../src/ui/theme.c:2588
+#: ../src/ui/theme.c:2599
 #, c-format
 msgid "Coordinate expression had an open parenthesis with no close parenthesis"
 msgstr "Kordinat ifadesi sağ parantezi olmayan bir sol parantez içeriyor"
-#: ../src/ui/theme.c:2599
+#: ../src/ui/theme.c:2610
 #, c-format
 msgid "Coordinate expression doesn't seem to have any operators or operands"
 msgstr "Kordinat ifadesi göründüğü kadarıyla ne işleç ne de işlenen içeriyor"
-#: ../src/ui/theme.c:2812 ../src/ui/theme.c:2832 ../src/ui/theme.c:2852
+#: ../src/ui/theme.c:2822 ../src/ui/theme.c:2842 ../src/ui/theme.c:2862
 #, c-format
 msgid "Theme contained an expression that resulted in an error: %s\n"
 msgstr "Tema bir hata ile sonuçlanan ifadeye sahip: %s\n"
-#: ../src/ui/theme.c:4498
+#: ../src/ui/theme.c:4533
 #, c-format
 msgid ""
 "<button function=\"%s\" state=\"%s\" draw_ops=\"whatever\"/> must be "
@@ -961,25 +973,25 @@ msgstr ""
 "Bu çerçeve biçeminde <button function=\"%s\" state=\"%s\" draw_ops=\"her "
 "neyse\"/> belirtilmek zorunda"
-#: ../src/ui/theme.c:5009 ../src/ui/theme.c:5034
+#: ../src/ui/theme.c:5066 ../src/ui/theme.c:5091
 #, c-format
 msgid ""
 "Missing <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"whatever\"/>"
 msgstr ""
 "Eksik <frame state=\"%s\" resize=\"%s\" focus=\"%s\" style=\"her neyse\"/>"
-#: ../src/ui/theme.c:5082
+#: ../src/ui/theme.c:5139
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
 msgstr "\"%s\" teması yüklenemedi: %s\n"
-#: ../src/ui/theme.c:5218 ../src/ui/theme.c:5225 ../src/ui/theme.c:5232
+#: ../src/ui/theme.c:5275 ../src/ui/theme.c:5282 ../src/ui/theme.c:5289
-#: ../src/ui/theme.c:5239 ../src/ui/theme.c:5246
+#: ../src/ui/theme.c:5296 ../src/ui/theme.c:5303
 #, c-format
 msgid "No <%s> set for theme \"%s\""
 msgstr "\"%2$s\" temasında hiç <%1$s> atanmamış"
-#: ../src/ui/theme.c:5254
+#: ../src/ui/theme.c:5311
 #, c-format
 msgid ""
 "No frame style set for window type \"%s\" in theme \"%s\", add a <window "
@@ -988,14 +1000,14 @@ msgstr ""
 "\"%2$s\" temasında \"%1$s\" pencere türüne çerçeve biçemi atanmamış, bir "
 "<window type=\"%3$s\" style_set=\"her neyse\"/> öğesi ekleyin"
-#: ../src/ui/theme.c:5650 ../src/ui/theme.c:5712 ../src/ui/theme.c:5775
+#: ../src/ui/theme.c:5709 ../src/ui/theme.c:5771 ../src/ui/theme.c:5834
 #, c-format
 msgid ""
 "User-defined constants must begin with a capital letter; \"%s\" does not"
 msgstr ""
 "Kullanıcı tanımlı sabitler büyük harfle başlamalıdır; \"%s\" buna uymuyor"
-#: ../src/ui/theme.c:5658 ../src/ui/theme.c:5720 ../src/ui/theme.c:5783
+#: ../src/ui/theme.c:5717 ../src/ui/theme.c:5779 ../src/ui/theme.c:5842
 #, c-format
 msgid "Constant \"%s\" has already been defined"
 msgstr "\"%s\" sabit değeri zaten tanımlanmış"
@@ -1378,7 +1390,7 @@ msgstr "<%s> öğesinin içinde metin bulunmamalıdır"
 msgid "<%s> specified twice for this theme"
 msgstr "Bu tema için <%s> iki kez belirtilmiş"
-#: ../src/ui/theme-parser.c:4334
+#: ../src/ui/theme-parser.c:4348
 #, c-format
 msgid "Failed to find a valid file for theme %s\n"
 msgstr "Tema %s için geçerli bir dosya bulunamadı\n"
@@ -1582,19 +1594,6 @@ msgid "%d coordinate expressions parsed in %g seconds (%g seconds average)\n"
 msgstr ""
 "%d kordinat ifadesi %g saniye içinde ayrıştırıldı (%g saniye ortalama ile)\n"
 #~ msgid "Comma-separated list of compositor plugins"
 #~ msgstr "Kompozisyon eklentilerinin listesi (virgül ile ayrılmış)"
 #~ msgid "Live Hidden Windows"
 #~ msgstr "Çalışır Durumdaki Gizli Pencereler"
 #~ msgid ""
 #~ "Determines whether hidden windows (i.e., minimized windows and windows on "
 #~ "other workspaces than the current one) should be kept alive."
 #~ msgstr ""
 #~ "Gizli pencerelerin (ö.r. küçültülmüş pencereler ve diğer çalışma "
 #~ "alanındaki pencereler) çalışır bırakılıp bırakılmayacağını belirler."
 #~ msgid "Close Window"
 #~ msgstr "Pencereyi Kapat"
--- a/po/ug.po
+++ b/po/ug.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/vi.po
+++ b/po/vi.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/50-mutter-navigation.xml.in
+++ b/src/50-mutter-navigation.xml.in
@@ -1,92 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.desktop.wm.keybindings"
                group="system"
                _name="Navigation"
                wm_name="Mutter"
                package="mutter">
 	<KeyListEntry name="move-to-workspace-1"
 	              _description="Move window to workspace 1" />
 	<KeyListEntry name="move-to-workspace-2"
 	              _description="Move window to workspace 2" />
 	<KeyListEntry name="move-to-workspace-3"
 	              _description="Move window to workspace 3" />
 	<KeyListEntry name="move-to-workspace-4"
 	              _description="Move window to workspace 4" />
 	<KeyListEntry name="move-to-workspace-left"
 	              _description="Move window one workspace to the left" />
 	<KeyListEntry name="move-to-workspace-right"
 	              _description="Move window one workspace to the right" />
 	<KeyListEntry name="move-to-workspace-up"
 	              _description="Move window one workspace up" />
 	<KeyListEntry name="move-to-workspace-down"
 	              _description="Move window one workspace down" />
 	<KeyListEntry name="move-to-monitor-left"
 	              _description="Move window one monitor to the left" />
 	<KeyListEntry name="move-to-monitor-right"
 	              _description="Move window one monitor to the right" />
 	<KeyListEntry name="move-to-monitor-up"
 	              _description="Move window one monitor up" />
 	<KeyListEntry name="move-to-monitor-down"
 	              _description="Move window one monitor down" />
 	<KeyListEntry name="switch-applications"
 	              _description="Switch applications"/>
 	<KeyListEntry name="switch-windows"
 	              _description="Switch windows"/>
 	<KeyListEntry name="switch-group"
 	              _description="Switch windows of an application"/>
 	<KeyListEntry name="switch-panels"
 	              _description="Switch system controls"/>
 	<KeyListEntry name="cycle-windows"
 	              _description="Switch windows directly"/>
 	<KeyListEntry name="cycle-group"
 	              _description="Switch windows of an app directly"/>
 	<KeyListEntry name="cycle-panels"
 	              _description="Switch system controls directly"/>
 	<KeyListEntry name="show-desktop"
 	              _description="Hide all normal windows"/>
 	<KeyListEntry name="switch-to-workspace-1"
 	              _description="Switch to workspace 1" />
 	<KeyListEntry name="switch-to-workspace-2"
 	              _description="Switch to workspace 2" />
 	<KeyListEntry name="switch-to-workspace-3"
 	              _description="Switch to workspace 3" />
 	<KeyListEntry name="switch-to-workspace-4"
 	              _description="Switch to workspace 4" />
 	<KeyListEntry name="switch-to-workspace-left"
 	              _description="Move to workspace left" />
 	<KeyListEntry name="switch-to-workspace-right"
 	              _description="Move to workspace right" />
 	<KeyListEntry name="switch-to-workspace-up"
 	              _description="Move to workspace above" />
 	<KeyListEntry name="switch-to-workspace-down"
 	              _description="Move to workspace below" />
 </KeyListEntries>
--- a/src/50-mutter-system.xml.in
+++ b/src/50-mutter-system.xml.in
@@ -1,13 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <KeyListEntries schema="org.gnome.desktop.wm.keybindings"
                group="system"
                _name="System"
                wm_name="Mutter"
                package="mutter">
 	<KeyListEntry name="panel-run-dialog" _description="Show the run command prompt"/>
 	<KeyListEntry name="panel-main-menu" _description="Show the activities overview"/>
 </KeyListEntries>
--- a/src/50-mutter-windows.xml.in
+++ b/src/50-mutter-windows.xml.in
@@ -1,49 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.desktop.wm.keybindings"
+<KeyListEntries schema="org.gnome.mutter.keybindings"
                group="system"
                _name="Windows"
                wm_name="Mutter"
                package="mutter">
 	<KeyListEntry name="activate-window-menu" _description="Activate the window menu"/>
 	<KeyListEntry name="toggle-fullscreen" _description="Toggle fullscreen mode"/>
 	<KeyListEntry name="toggle-maximized" _description="Toggle maximization state"/>
 	<KeyListEntry name="maximize" _description="Maximize window"/>
 	<KeyListEntry name="unmaximize" _description="Restore window"/>
 	<KeyListEntry name="toggle-shaded" _description="Toggle shaded state"/>
 	<KeyListEntry name="close" _description="Close window"/>
 	<KeyListEntry name="minimize" _description="Hide window"/>
 	<KeyListEntry name="begin-move" _description="Move window"/>
 	<KeyListEntry name="begin-resize" _description="Resize window"/>
 	<KeyListEntry name="toggle-on-all-workspaces"
 	              _description="Toggle window on all workspaces or one"/>
 	<KeyListEntry name="raise-or-lower" _description="Raise window if covered, otherwise lower it"/>
 	<KeyListEntry name="raise" _description="Raise window above other windows"/>
 	<KeyListEntry name="lower" _description="Lower window below other windows"/>
 	<KeyListEntry name="maximize-vertically" _description="Maximize window vertically"/>
 	<KeyListEntry name="maximize-horizontally" _description="Maximize window horizontally"/>
 	<KeyListEntry name="toggle-tiled-left"
                      schema="org.gnome.mutter.keybindings"
                      _description="View split on left"/>
 	<KeyListEntry name="toggle-tiled-right"
                      schema="org.gnome.mutter.keybindings"
                      _description="View split on right"/>
 </KeyListEntries>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,12 +3,9 @@
 lib_LTLIBRARIES = libmutter.la
-SUBDIRS=compositor/plugins
+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						\
@@ -30,33 +27,23 @@ INCLUDES=								\
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
 mutter_built_sources = \
-	$(dbus_idle_built_sources)	\
+	mutter-enum-types.h \
 	$(dbus_xrandr_built_sources)	\
 	mutter-enum-types.h		\
 	mutter-enum-types.c
 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-cullable.c		\
 	compositor/meta-cullable.h		\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -65,7 +52,6 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
 	compositor/meta-shaped-texture-private.h	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@@ -79,9 +65,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		\
@@ -94,12 +78,14 @@ libmutter_la_SOURCES =				\
 	core/display.c				\
 	core/display-private.h			\
 	meta/display.h				\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
 	core/edid-parse.c			\
 	core/edid.h				\
 	core/errors.c				\
 	meta/errors.h				\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
 	core/frame.h				\
 	ui/gradient.c				\
@@ -114,15 +100,6 @@ libmutter_la_SOURCES =				\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
 	core/meta-cursor-tracker.c		\
 	core/meta-cursor-tracker-private.h	\
 	core/meta-idle-monitor.c		\
 	core/meta-idle-monitor-private.h	\
 	core/meta-xrandr-shared.h		\
 	core/monitor.c				\
 	core/monitor-config.c			\
 	core/monitor-private.h			\
 	core/monitor-xrandr.c			\
 	core/mutter-Xatomtype.h			\
 	core/place.c				\
 	core/place.h				\
@@ -140,7 +117,6 @@ libmutter_la_SOURCES =				\
 	core/stack-tracker.h			\
 	core/util.c				\
 	meta/util.h				\
 	core/util-private.h			\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
@@ -153,6 +129,7 @@ libmutter_la_SOURCES =				\
 	meta/common.h				\
 	core/core.h				\
 	ui/ui.h					\
 	inlinepixbufs.h				\
 	ui/frames.c				\
 	ui/frames.h				\
 	ui/menu.c				\
@@ -161,13 +138,17 @@ libmutter_la_SOURCES =				\
 	ui/metaaccellabel.h			\
 	ui/resizepopup.c			\
 	ui/resizepopup.h			\
 	ui/tabpopup.c				\
 	ui/tabpopup.h				\
 	ui/tile-preview.c			\
 	ui/tile-preview.h			\
 	ui/theme-parser.c			\
 	ui/theme.c				\
 	meta/theme.h				\
 	ui/theme-private.h			\
-	ui/ui.c
+	ui/ui.c					\
-
+	meta/preview-widget.h			\
-nodist_libmutter_la_SOURCES =			\
+	ui/preview-widget.c			\
 	$(mutter_built_sources)
 libmutter_la_LDFLAGS = -no-undefined
@@ -176,7 +157,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		\
@@ -188,10 +168,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-cursor-tracker.h		\
 	meta/meta-idle-monitor.h		\
 	meta/meta-plugin.h			\
 	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
@@ -207,6 +183,7 @@ libmutterinclude_base_headers =		\
 # Excluded from scanning for introspection but installed
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
 	meta/preview-widget.h			\
 	meta/atomnames.h
 libmutterincludedir = $(includedir)/mutter/meta
@@ -215,7 +192,10 @@ libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)
-bin_PROGRAMS=mutter
+mutter_theme_viewer_SOURCES=  \
 	ui/theme-viewer.c
 bin_PROGRAMS=mutter mutter-theme-viewer
 mutter_SOURCES = core/mutter.c
 mutter_LDADD = $(MUTTER_LIBS) libmutter.la
@@ -241,18 +221,20 @@ typelib_DATA = Meta-$(api_version).typelib
 INTROSPECTION_GIRS = Meta-$(api_version).gir
 Meta-$(api_version).gir: libmutter.la
-@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0 Cogl-1.0
+@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
@META_GIR@_EXPORT_PACKAGES = libmutter
@META_GIR@_CFLAGS = $(INCLUDES)
@META_GIR@_LIBS = libmutter.la
@META_GIR@_FILES =				\
 	mutter-enum-types.h			\
 	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_la_SOURCES) $(nodist_libmutter_la_SOURCES))
+	$(filter %.c,$(libmutter_la_SOURCES))
@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
 endif
 mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
 testboxes_SOURCES = core/testboxes.c
 testgradient_SOURCES = ui/testgradient.c
 testasyncgetprop_SOURCES = core/testasyncgetprop.c
@@ -277,8 +259,6 @@ wmproperties_DATA = $(wmproperties_files)
 xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
 xml_in_files = \
        50-mutter-navigation.xml.in	\
        50-mutter-system.xml.in		\
        50-mutter-windows.xml.in
 xml_DATA     = $(xml_in_files:.xml.in=.xml)
@@ -289,7 +269,14 @@ gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
 convertdir = $(datadir)/GConf/gsettings
 convert_DATA = mutter-schemas.convert
 IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
          stock_minimize_data $(srcdir)/stock_minimize.png \
          stock_delete_data $(srcdir)/stock_delete.png
 BUILT_SOURCES = inlinepixbufs.h
 CLEANFILES =					\
 	inlinepixbufs.h				\
 	mutter.desktop				\
 	mutter-wm.desktop			\
 	org.gnome.mutter.gschema.xml		\
@@ -298,6 +285,9 @@ CLEANFILES =					\
 	$(typelib_DATA)				\
 	$(gir_DATA)
 inlinepixbufs.h: $(IMAGES)
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libmutter.pc mutter-plugins.pc
@@ -309,15 +299,13 @@ EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_in_files)	\
 	$(xml_in_files)			\
 	org.gnome.mutter.gschema.xml.in \
 	idle-monitor.xml \
 	xrandr.xml \
 	mutter-schemas.convert \
 	libmutter.pc.in \
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
 	mutter-enum-types.c.in
-BUILT_SOURCES = $(mutter_built_sources)
+BUILT_SOURCES += $(mutter_built_sources)
 MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)
@@ -339,22 +327,3 @@ mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc
 dbus_xrandr_built_sources = meta-dbus-xrandr.c meta-dbus-xrandr.h
 $(dbus_xrandr_built_sources) : Makefile.am xrandr.xml
 	$(AM_V_GEN)gdbus-codegen							\
 		--interface-prefix org.gnome.Mutter					\
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-xrandr					\
 		$(srcdir)/xrandr.xml
 dbus_idle_built_sources = meta-dbus-idle-monitor.c meta-dbus-idle-monitor.h
 $(dbus_idle_built_sources) : Makefile.am idle-monitor.xml
 	$(AM_V_GEN)gdbus-codegen							\
 		--interface-prefix org.gnome.Mutter					\
 		--c-namespace MetaDBus							\
 		--generate-c-code meta-dbus-idle-monitor				\
 		--c-generate-object-manager						\
 		$(srcdir)/idle-monitor.xml
--- 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, see <http://www.gnu.org/licenses/>.
 */
 #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;
  if (x_origin)
    *x_origin = x;
  if (y_origin)
    *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/clutter-utils.h
+++ b/src/compositor/clutter-utils.h
@@ -1,34 +0,0 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Utilities for use with Clutter
 *
 * Copyright 2010 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, see <http://www.gnu.org/licenses/>.
 */
 #ifndef __META_CLUTTER_UTILS_H__
 #define __META_CLUTTER_UTILS_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);
 #endif /* __META_CLUTTER_UTILS_H__ */
--- a/src/compositor/cogl-utils.c
+++ b/src/compositor/cogl-utils.c
@@ -16,18 +16,19 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * 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/clutter.h>
 #include "cogl-utils.h"
 /**
 * meta_create_color_texture_4ub:
- * @red: red component
+ * @red:
- * @green: green component
+ * @green:
- * @blue: blue component
+ * @blue:
- * @alpha: alpha component
+ * @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
@@ -38,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,
@@ -48,7 +49,7 @@ meta_create_color_texture_4ub (guint8           red,
  CoglColor color;
  guint8 pixel[4];
-  cogl_color_init_from_4ub (&color, red, green, blue, alpha);
+  cogl_color_set_from_4ub (&color, red, green, blue, alpha);
  cogl_color_premultiply (&color);
  pixel[0] = cogl_color_get_red_byte (&color);
@@ -67,42 +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
- * makes it easier for Cogl to share a shader for different uses in
+ * allows sharing a shader for different uses in Mutter. To share the same
- * Mutter.
+ * 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 *
+CoglHandle
-meta_create_texture_pipeline (CoglTexture *src_texture)
+meta_create_texture_material (CoglHandle src_texture)
 {
-  static CoglPipeline *texture_pipeline_template = NULL;
+  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
-  CoglPipeline *pipeline;
+  CoglHandle material;
-  /* The only state used in the pipeline that would affect the shader
+  /* We use a material that has a dummy texture as a base for all
-     generation is the texture type on the layer. Therefore we create
+     texture materials. The idea is that only the Cogl texture object
-     a template pipeline which sets this state and all texture
+     would be different in the children so it is likely that Cogl will
-     pipelines are created as a copy of this. That way Cogl can find
+     be able to share GL programs between all the textures. */
-     the shader state for the pipeline more quickly by looking at the
+  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
     pipeline ancestry instead of resorting to the shader cache. */
  if (G_UNLIKELY (texture_pipeline_template == NULL))
    {
-      CoglContext *ctx =
+      CoglHandle dummy_texture;
        clutter_backend_get_cogl_context (clutter_get_default_backend ());
-      texture_pipeline_template = cogl_pipeline_new (ctx);
+      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
-      cogl_pipeline_set_layer_null_texture (texture_pipeline_template,
+                                                     COGL_TEXTURE_NONE);
-                                            0, /* layer */
+
-                                            COGL_TEXTURE_TYPE_2D);
+      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)
+  if (src_texture != COGL_INVALID_HANDLE)
-    cogl_pipeline_set_layer_texture (pipeline, 0, src_texture);
+    cogl_material_set_layer (material, 0, src_texture);
-  return pipeline;
+  return material;
 }
--- a/src/compositor/cogl-utils.h
+++ b/src/compositor/cogl-utils.h
@@ -15,7 +15,9 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * 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_COGL_UTILS_H__
@@ -23,11 +25,11 @@
 #include <cogl/cogl.h>
-CoglTexture * meta_create_color_texture_4ub (guint8           red,
+CoglHandle meta_create_color_texture_4ub (guint8           red,
-                                             guint8           green,
+                                          guint8           green,
-                                             guint8           blue,
+                                          guint8           blue,
-                                             guint8           alpha,
+                                          guint8           alpha,
-                                             CoglTextureFlags flags);
+                                          CoglTextureFlags flags);
-CoglPipeline * meta_create_texture_pipeline (CoglTexture *texture);
+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
@@ -17,59 +17,55 @@ struct _MetaCompositor
 {
  MetaDisplay    *display;
  Atom            atom_x_root_pixmap;
  Atom            atom_x_set_root;
  Atom            atom_net_wm_window_opacity;
  guint           repaint_func_id;
  ClutterActor   *shadow_src;
  MetaPlugin     *modal_plugin;
-  gint64          server_time_query_time;
+  gboolean        show_redraw : 1;
-  gint64          server_time_offset;
+  gboolean        debug       : 1;
-
+  gboolean        no_mipmaps  : 1;
  guint           server_time_is_monotonic_time : 1;
  guint           show_redraw : 1;
  guint           debug       : 1;
  guint           no_mipmaps  : 1;
 };
 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;
  CoglOnscreen          *onscreen;
  CoglFrameClosure      *frame_closure;
  /* Used for unredirecting fullscreen windows */
-  guint                  disable_unredirect_count;
+  guint                   disable_unredirect_count;
-  MetaWindow            *unredirected_window;
+  MetaWindowActor             *unredirected_window;
  /* Before we create the output window */
  XserverRegion     pending_input_region;
  gint                   switch_workspace_in_progress;
  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);
 gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
                                      MetaPlugin       *plugin,
                                      Window            grab_window,
                                      Cursor            cursor,
                                      MetaModalOptions  options,
                                      guint32           timestamp);
 void     meta_end_modal_for_plugin   (MetaScreen       *screen,
                                      MetaPlugin       *plugin,
                                      guint32           timestamp);
 gint64 meta_compositor_monotonic_time_to_server_time (MetaDisplay *display,
                                                      gint64       monotonic_time);
 void meta_check_end_modal (MetaScreen *screen);
 #endif /* META_COMPOSITOR_PRIVATE_H */
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
--- a/src/compositor/meta-background-actor-private.h
+++ b/src/compositor/meta-background-actor-private.h
@@ -6,6 +6,10 @@
 #include <meta/screen.h>
 #include <meta/meta-background-actor.h>
-cairo_region_t *meta_background_actor_get_clip_region (MetaBackgroundActor *self);
+void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
                                                cairo_region_t      *visible_region);
 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.
 *
@@ -14,22 +16,19 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 *
 * 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>
 #define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 #define CLUTTER_ENABLE_EXPERIMENTAL_API
 #include <clutter/clutter.h>
 #include <X11/Xatom.h>
@@ -37,37 +36,225 @@
 #include "cogl-utils.h"
 #include "compositor-private.h"
 #include <meta/errors.h>
 #include <meta/meta-background.h>
 #include "meta-background-actor-private.h"
-#include "meta-cullable.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;
  CoglHandle texture;
  CoglMaterialWrapMode wrap_mode;
  guint have_pixmap : 1;
 };
 struct _MetaBackgroundActorPrivate
 {
-  cairo_region_t *clip_region;
+  MetaScreenBackground *background;
  CoglHandle material;
  cairo_region_t *visible_region;
  float dim_factor;
 };
-static void cullable_iface_init (MetaCullableInterface *iface);
+enum
 {
  PROP_0,
-G_DEFINE_TYPE_WITH_CODE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR,
+  PROP_DIM_FACTOR,
-                         G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init));
+
  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
-set_clip_region (MetaBackgroundActor *self,
+on_notify_stage_color (GObject              *stage,
-                 cairo_region_t      *clip_region)
+                       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;
-  g_clear_pointer (&priv->clip_region, (GDestroyNotify) cairo_region_destroy);
+  cogl_material_set_layer_wrap_mode (priv->material, 0, priv->background->wrap_mode);
-  if (clip_region)
+}
-    priv->clip_region = cairo_region_copy (clip_region);
+
 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_material_set_layer (priv->material, 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 material 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;
-  set_clip_region (self, NULL);
+  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;
    }
  if (priv->material != COGL_INVALID_HANDLE)
    {
      cogl_handle_unref (priv->material);
      priv->material = COGL_INVALID_HANDLE;
    }
  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }
@@ -78,15 +265,11 @@ meta_background_actor_get_preferred_width (ClutterActor *actor,
                                           gfloat       *min_width_p,
                                           gfloat       *natural_width_p)
 {
-  ClutterContent *content;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  gfloat width;
+  MetaBackgroundActorPrivate *priv = self->priv;
  int width, height;
-  content = clutter_actor_get_content (actor);
+  meta_screen_get_size (priv->background->screen, &width, &height);
  if (content)
    clutter_content_get_preferred_size (content, &width, NULL);
  else
    width = 0;
  if (min_width_p)
    *min_width_p = width;
@@ -101,15 +284,11 @@ meta_background_actor_get_preferred_height (ClutterActor *actor,
                                            gfloat       *natural_height_p)
 {
-  ClutterContent *content;
+  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  gfloat height;
+  MetaBackgroundActorPrivate *priv = self->priv;
  int width, height;
-  content = clutter_actor_get_content (actor);
+  meta_screen_get_size (priv->background->screen, &width, &height);
  if (content)
    clutter_content_get_preferred_size (content, NULL, &height);
  else
    height = 0;
  if (min_height_p)
    *min_height_p = height;
@@ -117,100 +296,332 @@ 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_material_set_color4ub (priv->material,
                              color_component,
                              color_component,
                              color_component,
                              opacity);
  cogl_set_source (priv->material);
  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)
 {
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
  MetaBackgroundActorPrivate *priv = self->priv;
  int 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);
  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,
+  MetaBackgroundActorPrivate *priv;
-                                            META_TYPE_BACKGROUND_ACTOR,
+
-                                            MetaBackgroundActorPrivate);
+  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.
+ * Creates a new actor to draw the background for the given screen.
 * This actor should be associated with a #MetaBackground using
 * clutter_actor_set_content()
 *
 * 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);
  priv->material = meta_create_texture_material (NULL);
  set_texture_on_actor (self);
  update_wrap_mode_of_actor (self);
  return CLUTTER_ACTOR (self);
 }
-static void
+/**
-meta_background_actor_cull_out (MetaCullable   *cullable,
+ * meta_background_actor_update:
-                                cairo_region_t *unobscured_region,
+ * @screen: a #MetaScreen
-                                cairo_region_t *clip_region)
+ *
 * 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)
 {
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (cullable);
+  MetaScreenBackground *background;
-  set_clip_region (self, clip_region);
+  MetaDisplay *display;
-}
+  MetaCompositor *compositor;
  Atom type;
  int format;
  gulong nitems;
  gulong bytes_after;
  guchar *data;
  Pixmap root_pixmap_id;
-static void
+  background = meta_screen_background_get (screen);
-meta_background_actor_reset_culling (MetaCullable *cullable)
+  display = meta_screen_get_display (screen);
-{
+  compositor = meta_display_get_compositor (display);
  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (cullable);
  set_clip_region (self, NULL);
 }
-static void
+  root_pixmap_id = None;
-cullable_iface_init (MetaCullableInterface *iface)
+  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
-{
+                           meta_screen_get_xroot (screen),
-  iface->cull_out = meta_background_actor_cull_out;
+                           compositor->atom_x_root_pixmap,
-  iface->reset_culling = meta_background_actor_reset_culling;
+                           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_get_clip_region:
+ * meta_background_actor_set_visible_region:
 * @self: a #MetaBackgroundActor
 * @visible_region: (allow-none): the area of the actor (in allocate-relative
 *   coordinates) that is visible.
 *
- * Return value (transfer full): a #cairo_region_t that represents the part of
+ * Sets the area of the background that is unobscured by overlapping windows.
- * the background not obscured by other #MetaBackgroundActor or
+ * This is used to optimize and only paint the visible portions.
 * #MetaWindowActor objects.
 */
-cairo_region_t *
+void
-meta_background_actor_get_clip_region (MetaBackgroundActor *self)
+meta_background_actor_set_visible_region (MetaBackgroundActor *self,
                                          cairo_region_t      *visible_region)
 {
-  MetaBackgroundActorPrivate *priv = self->priv;
+  MetaBackgroundActorPrivate *priv;
  ClutterActorBox content_box;
  cairo_rectangle_int_t content_area = { 0 };
  cairo_region_t *clip_region;
-  g_return_val_if_fail (META_IS_BACKGROUND_ACTOR (self), NULL);
+  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
-  if (!priv->clip_region)
+  priv = self->priv;
      return NULL;
-  clutter_actor_get_content_box (CLUTTER_ACTOR (self), &content_box);
+  if (priv->visible_region)
    {
      cairo_region_destroy (priv->visible_region);
      priv->visible_region = NULL;
    }
-  content_area.x = content_box.x1;
+  if (visible_region)
-  content_area.y = content_box.y1;
+    {
-  content_area.width = content_box.x2 - content_box.x1;
+      cairo_rectangle_int_t screen_rect = { 0 };
-  content_area.height = content_box.y2 - content_box.y1;
+      meta_screen_get_size (priv->background->screen, &screen_rect.width, &screen_rect.height);
-  clip_region = cairo_region_create_rectangle (&content_area);
+      /* Doing the intersection here is probably unnecessary - MetaWindowGroup
-  cairo_region_intersect (clip_region, priv->clip_region);
+       * should never compute a visible area that's larger than the root screen!
-
+       * but it's not that expensive and adds some extra robustness.
-  return clip_region;
+       */
      priv->visible_region = cairo_region_create_rectangle (&screen_rect);
      cairo_region_intersect (priv->visible_region, visible_region);
    }
 }
 /**
 * meta_background_actor_screen_size_changed:
 * @screen: a #MetaScreen
 *
 * Called by the compositor when the size of the #MetaScreen changes
 */
 void
 meta_background_actor_screen_size_changed (MetaScreen *screen)
 {
  MetaScreenBackground *background = meta_screen_background_get (screen);
  GSList *l;
  update_wrap_mode (background);
  for (l = background->actors; l; l = l->next)
    clutter_actor_queue_relayout (l->data);
 }
--- a/src/compositor/meta-background-group.c
+++ b/src/compositor/meta-background-group.c
@@ -1,66 +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 <meta/meta-background-group.h>
 #include "meta-cullable.h"
 static void cullable_iface_init (MetaCullableInterface *iface);
 G_DEFINE_TYPE_WITH_CODE (MetaBackgroundGroup, meta_background_group, CLUTTER_TYPE_ACTOR,
                         G_IMPLEMENT_INTERFACE (META_TYPE_CULLABLE, cullable_iface_init));
 static void
 meta_background_group_class_init (MetaBackgroundGroupClass *klass)
 {
 }
 static void
 meta_background_group_cull_out (MetaCullable   *cullable,
                                cairo_region_t *unobscured_region,
                                cairo_region_t *clip_region)
 {
  meta_cullable_cull_out_children (cullable, unobscured_region, clip_region);
 }
 static void
 meta_background_group_reset_culling (MetaCullable *cullable)
 {
  meta_cullable_reset_culling_children (cullable);
 }
 static void
 cullable_iface_init (MetaCullableInterface *iface)
 {
  iface->cull_out = meta_background_group_cull_out;
  iface->reset_culling = meta_background_group_reset_culling;
 }
 static void
 meta_background_group_init (MetaBackgroundGroup *self)
 {
 }
 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-cullable.c
+++ b/src/compositor/meta-cullable.c
@@ -1,201 +0,0 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Copyright (C) 2013 Red Hat
 *
 * 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, see <http://www.gnu.org/licenses/>.
 *
 * Written by:
 *     Owen Taylor <otaylor@redhat.com>
 *     Ray Strode <rstrode@redhat.com>
 *     Jasper St. Pierre <jstpierre@mecheye.net>
 */
 #include "config.h"
 #include "meta-cullable.h"
 #include "clutter-utils.h"
 G_DEFINE_INTERFACE (MetaCullable, meta_cullable, CLUTTER_TYPE_ACTOR);
 /**
 * SECTION:meta-cullable
 * @title: MetaCullable
 * @short_description: CPU culling operations for efficient drawing
 *
 * When we are painting a stack of 5-10 large actors, the standard
 * bottom-to-top method of drawing every actor results in a tremendous
 * amount of overdraw. If these actors are painting textures like
 * windows, it 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.
 *
 * #MetaCullable is our solution. The basic technique applied here is to
 * do a pre-pass before painting where we walk each actor from top to bottom
 * and ask each actor to "cull itself out". We pass in a region it can copy
 * to clip its drawing to, and the actor can subtract its fully opaque pixels
 * so that actors underneath know not to draw there as well.
 */
 /**
 * meta_cullable_cull_out_children:
 * @cullable: The #MetaCullable
 * @unobscured_region: The unobscured region, as passed into cull_out()
 * @clip_region: The clip region, as passed into cull_out()
 *
 * This is a helper method for actors that want to recurse over their
 * child actors, and cull them out.
 *
 * See #MetaCullable and meta_cullable_cull_out() for more details.
 */
 void
 meta_cullable_cull_out_children (MetaCullable   *cullable,
                                 cairo_region_t *unobscured_region,
                                 cairo_region_t *clip_region)
 {
  ClutterActor *actor = CLUTTER_ACTOR (cullable);
  ClutterActor *child;
  ClutterActorIter iter;
  clutter_actor_iter_init (&iter, actor);
  while (clutter_actor_iter_prev (&iter, &child))
    {
      float x, y;
      gboolean needs_culling;
      if (!META_IS_CULLABLE (child))
        continue;
      needs_culling = (unobscured_region != NULL && clip_region != NULL);
      if (needs_culling && !CLUTTER_ACTOR_IS_VISIBLE (child))
        needs_culling = FALSE;
      /* If an actor has effects applied, then that can change the area
       * it paints and the opacity, so we no longer can figure out what
       * portion of the actor is obscured and what portion of the screen
       * it obscures, so we skip the actor.
       *
       * This has a secondary beneficial effect: if a ClutterOffscreenEffect
       * is applied to an actor, then our clipped redraws interfere with the
       * caching of the FBO - even if we only need to draw a small portion
       * of the window right now, ClutterOffscreenEffect may use other portions
       * of the FBO later. So, skipping actors with effects applied also
       * prevents these bugs.
       *
       * Theoretically, we should check clutter_actor_get_offscreen_redirect()
       * as well for the same reason, but omitted for simplicity in the
       * hopes that no-one will do that.
       */
      if (needs_culling && clutter_actor_has_effects (child))
        needs_culling = FALSE;
      if (needs_culling && !meta_actor_is_untransformed (child, NULL, NULL))
        needs_culling = FALSE;
      if (needs_culling)
        {
          clutter_actor_get_position (child, &x, &y);
          /* Temporarily move to the coordinate system of the actor */
          cairo_region_translate (unobscured_region, - x, - y);
          cairo_region_translate (clip_region, - x, - y);
          meta_cullable_cull_out (META_CULLABLE (child), unobscured_region, clip_region);
          cairo_region_translate (unobscured_region, x, y);
          cairo_region_translate (clip_region, x, y);
        }
      else
        {
          meta_cullable_cull_out (META_CULLABLE (child), NULL, NULL);
        }
    }
 }
 /**
 * meta_cullable_reset_culling_children:
 * @cullable: The #MetaCullable
 *
 * This is a helper method for actors that want to recurse over their
 * child actors, and cull them out.
 *
 * See #MetaCullable and meta_cullable_reset_culling() for more details.
 */
 void
 meta_cullable_reset_culling_children (MetaCullable *cullable)
 {
  ClutterActor *actor = CLUTTER_ACTOR (cullable);
  ClutterActor *child;
  ClutterActorIter iter;
  clutter_actor_iter_init (&iter, actor);
  while (clutter_actor_iter_next (&iter, &child))
    {
      if (!META_IS_CULLABLE (child))
        continue;
      meta_cullable_reset_culling (META_CULLABLE (child));
    }
 }
 static void
 meta_cullable_default_init (MetaCullableInterface *iface)
 {
 }
 /**
 * meta_cullable_cull_out:
 * @cullable: The #MetaCullable
 * @unobscured_region: The unobscured region, in @cullable's space.
 * @clip_region: The clip region, in @cullable's space.
 *
 * When #MetaWindowGroup is painted, we walk over its direct cullable
 * children from top to bottom and ask themselves to "cull out". Cullables
 * can use @unobscured_region and @clip_region to clip their drawing. Actors
 * interested in eliminating overdraw should copy the @clip_region and only
 * paint those parts, as everything else has been obscured by actors above it.
 *
 * Actors that may have fully opaque parts should also subtract out a region
 * that is fully opaque from @unobscured_region and @clip_region.
 *
 * @unobscured_region and @clip_region are extremely similar. The difference
 * is that @clip_region starts off with the stage's clip, if Clutter detects
 * that we're doing a clipped redraw. @unobscured_region, however, starts off
 * with the full stage size, so actors that may want to record what parts of
 * their window are unobscured for e.g. scheduling repaints can do so.
 *
 * Actors that have children can also use the meta_cullable_cull_out_children()
 * helper method to do a simple cull across all their children.
 */
 void
 meta_cullable_cull_out (MetaCullable   *cullable,
                        cairo_region_t *unobscured_region,
                        cairo_region_t *clip_region)
 {
  META_CULLABLE_GET_IFACE (cullable)->cull_out (cullable, unobscured_region, clip_region);
 }
 /**
 * meta_cullable_reset_culling:
 * @cullable: The #MetaCullable
 *
 * Actors that copied data in their cull_out() implementation can now
 * reset their data, as the paint is now over. Additional paints may be
 * done by #ClutterClone or similar, and they should not be affected by
 * the culling operation.
 */
 void
 meta_cullable_reset_culling (MetaCullable *cullable)
 {
  META_CULLABLE_GET_IFACE (cullable)->reset_culling (cullable);
 }
--- a/src/compositor/meta-cullable.h
+++ b/src/compositor/meta-cullable.h
@@ -1,66 +0,0 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
 * Copyright (C) 2013 Red Hat
 *
 * 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, see <http://www.gnu.org/licenses/>.
 *
 * Written by:
 *     Owen Taylor <otaylor@redhat.com>
 *     Ray Strode <rstrode@redhat.com>
 *     Jasper St. Pierre <jstpierre@mecheye.net>
 */
 #ifndef __META_CULLABLE_H__
 #define __META_CULLABLE_H__
 #include <clutter/clutter.h>
 G_BEGIN_DECLS
 #define META_TYPE_CULLABLE             (meta_cullable_get_type ())
 #define META_CULLABLE(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_CULLABLE, MetaCullable))
 #define META_IS_CULLABLE(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_CULLABLE))
 #define META_CULLABLE_GET_IFACE(obj)   (G_TYPE_INSTANCE_GET_INTERFACE ((obj),  META_TYPE_CULLABLE, MetaCullableInterface))
 typedef struct _MetaCullable MetaCullable;
 typedef struct _MetaCullableInterface MetaCullableInterface;
 struct _MetaCullableInterface
 {
  GTypeInterface g_iface;
  void (* cull_out)      (MetaCullable   *cullable,
                          cairo_region_t *unobscured_region,
                          cairo_region_t *clip_region);
  void (* reset_culling) (MetaCullable  *cullable);
 };
 GType meta_cullable_get_type (void);
 void meta_cullable_cull_out (MetaCullable   *cullable,
                             cairo_region_t *unobscured_region,
                             cairo_region_t *clip_region);
 void meta_cullable_reset_culling (MetaCullable *cullable);
 /* Utility methods for implementations */
 void meta_cullable_cull_out_children (MetaCullable   *cullable,
                                      cairo_region_t *unobscured_region,
                                      cairo_region_t *clip_region);
 void meta_cullable_reset_culling_children (MetaCullable *cullable);
 G_END_DECLS
 #endif /* __META_CULLABLE_H__ */
--- a/src/compositor/meta-module.c
+++ b/src/compositor/meta-module.c
@@ -16,7 +16,9 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */
 #include <meta/meta-plugin.h>
@@ -190,7 +192,10 @@ meta_module_class_init (MetaModuleClass *klass)
 static void
 meta_module_init (MetaModule *self)
 {
-  self->priv = META_MODULE_GET_PRIVATE (self);
+  MetaModulePrivate *priv;
  self->priv = priv = META_MODULE_GET_PRIVATE (self);
 }
 GType
--- a/src/compositor/meta-module.h
+++ b/src/compositor/meta-module.h
@@ -16,7 +16,9 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * 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_MODULE_H_
--- a/src/compositor/meta-plugin-manager.c
+++ b/src/compositor/meta-plugin-manager.c
@@ -16,7 +16,9 @@
 * General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 * 02111-1307, USA.
 */
 #include "config.h"
@@ -83,20 +85,12 @@ meta_plugin_manager_load (const gchar       *plugin_name)
  g_free (path);
 }
 static void
 on_confirm_display_change (MetaMonitorManager *monitors,
                           MetaPluginManager  *plugin_mgr)
 {
  meta_plugin_manager_confirm_display_change (plugin_mgr);
 }
 MetaPluginManager *
 meta_plugin_manager_new (MetaScreen *screen)
 {
  MetaPluginManager *plugin_mgr;
  MetaPluginClass *klass;
  MetaPlugin *plugin;
  MetaMonitorManager *monitors;
  plugin_mgr = g_new0 (MetaPluginManager, 1);
  plugin_mgr->screen = screen;
@@ -107,10 +101,6 @@ meta_plugin_manager_new (MetaScreen *screen)
  if (klass->start)
    klass->start (plugin);
  monitors = meta_monitor_manager_get ();
  g_signal_connect (monitors, "confirm-display-change",
                    G_CALLBACK (on_confirm_display_change), plugin_mgr);
  return plugin_mgr;
 }
@@ -291,77 +281,32 @@ meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
  return retval;
 }
-gboolean
+/*
-meta_plugin_manager_filter_keybinding (MetaPluginManager *plugin_mgr,
+ * The public method that the compositor hooks into for desktop switching.
-                                       MetaKeyBinding    *binding)
+ *
-{
+ * Returns TRUE if the plugin handled the event type (i.e.,
-  MetaPlugin *plugin = plugin_mgr->plugin;
+ * if the return value is FALSE, there will be no subsequent call to the
-  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
+ * manager completed() callback, and the compositor must ensure that any
-
+ * appropriate post-effect cleanup is carried out.
-  if (klass->keybinding_filter)
+ */
    return klass->keybinding_filter (plugin, binding);
  return FALSE;
 }
 gboolean
 meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
                                   XEvent            *xev)
 {
  MetaPlugin *plugin = plugin_mgr->plugin;
  return _meta_plugin_xevent_filter (plugin, xev);
 }
 void
 meta_plugin_manager_confirm_display_change (MetaPluginManager *plugin_mgr)
 {
  MetaPlugin *plugin = plugin_mgr->plugin;
  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
-  if (klass->confirm_display_change)
+  if (!plugin_mgr)
-    return klass->confirm_display_change (plugin);
+    return FALSE;
  /* We need to make sure that clutter gets certain events, like
   * ConfigureNotify on the stage window. If there is a plugin that
   * provides an xevent_filter function, then it's the responsibility
   * of that plugin to pass events to Clutter. Otherwise, we send the
   * event directly to Clutter ourselves.
   */
  if (klass->xevent_filter && klass->xevent_filter (plugin, xev))
    return TRUE;
  else
-    return meta_plugin_complete_display_change (plugin, TRUE);
+    return clutter_x11_handle_event (xev) != CLUTTER_X11_FILTER_CONTINUE;
 }
 gboolean
 meta_plugin_manager_show_tile_preview (MetaPluginManager *plugin_mgr,
                                       MetaWindow        *window,
                                       MetaRectangle     *tile_rect,
                                       int                tile_monitor_number)
 {
  MetaPlugin *plugin = plugin_mgr->plugin;
  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
  if (display->display_opening)
    return FALSE;
  if (klass->show_tile_preview)
    {
      klass->show_tile_preview (plugin, window, tile_rect, tile_monitor_number);
      return TRUE;
    }
  return FALSE;
 }
 gboolean
 meta_plugin_manager_hide_tile_preview (MetaPluginManager *plugin_mgr)
 {
  MetaPlugin *plugin = plugin_mgr->plugin;
  MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
  MetaDisplay *display  = meta_screen_get_display (plugin_mgr->screen);
  if (display->display_opening)
    return FALSE;
  if (klass->hide_tile_preview)
    {
      klass->hide_tile_preview (plugin);
      return TRUE;
    }
  return FALSE;
 }
--- a/Show More
+++ b/Show More
 it
 ja
 ka
-kk
 kn
 ko
 ku
 sv
 ta
 te
-tg
 th
 tk
 tr