x11: Add support for _GTK_EDGE_CONSTRAINTS atom

To keep feature parity with the Wayland backend, and to improve the overall tiling experience with GTK apps, add the _GTK_EDGE_CONSTRAINTS X11 atom and update it when necessary. https://bugzilla.gnome.org/show_bug.cgi?id=751857
wayland: Send edge constraints
2017-10-03 18:16:44 -03:00 · 2017-10-03 18:16:41 -03:00 · 2017-10-03 18:16:28 -03:00 · 2017-10-03 18:16:28 -03:00 · 2017-10-03 18:16:28 -03:00 · 2017-10-03 18:16:27 -03:00
400 changed files with 22574 additions and 41010 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -88,19 +88,6 @@ src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
 src/xdg-foreign-unstable-v*-protocol.c
 src/xdg-foreign-unstable-v*-server-protocol.h
-src/xdg-output-unstable-v1-protocol.c
-src/xdg-output-unstable-v1-server-protocol.h
-src/xwayland-keyboard-grab-unstable-v1-protocol.c
-src/xwayland-keyboard-grab-unstable-v1-server-protocol.h
-src/tablet-unstable-v*-protocol.c
-src/tablet-unstable-v*-server-protocol.h
-src/keyboard-shortcuts-inhibit-unstable-v*-protocol.c
-src/keyboard-shortcuts-inhibit-unstable-v*-server-protocol.h
-src/linux-dmabuf-unstable-v*-protocol.c
-src/linux-dmabuf-unstable-v*-server-protocol.h
-src/xdg-shell-protocol.c
-src/xdg-shell-server-protocol.h
-src/wayland-eglstream-controller-server-protocol.h
 src/meta/meta-version.h
 src/libmutter-*.pc
 doc/reference/*.args
--- a/201
+++ b/201
@@ -1,204 +1,3 @@
-3.29.90
-=======
-* Various crash fixes [Olivier, Jonas, Florian; #189, #70, #194, #15, #130]
-* Don't expose resolutions that are below the minimum [Andrea; #793223]
-* Remove support for preference overrides [Florian; #786496]
-* Misc. bug fixes and cleanups [Daniel, Jonas, Florian; #131, #245, !176]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Olivier Fourdan, Florian Müllner, Kevin Tamool,
-  Daniel van Vugt
-
-Translators:
-  Daniel Mustieles [es], Claude Paroz [fr]
-
-3.29.4
-======
-* Fix crash with parent-less modal dialogs [Olivier; #174]
-* Preserve paint volumes where possible to optimize CPU usage [Carlos; #782344]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Iain Lane, Bastien Nocera
-
-Translators:
-  Daniel Șerbănescu [ro]
-
-3.29.3
-======
-* Fix Korean Hangul support on wayland [Changwoo; #152]
-* Improve support for proprietary Nvidia driver [Jonas; #790316]
-* Only upload HW cursor sprite to the GPU that will display them [Jonas; #77]
-* Improve EGLstream support [Miguel; #2, #782575]
-* Remove MetaScreen to prepare for non-mandatary X11 dependency
-  [Armin, Jonas; #759538]
-* Misc. bug fixes [Olivier, Jonas, Sam; #160, !130, #786929, #788834]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Armin Krezović, Corentin Noël,
-  Changwoo Ryu, Sam Spilsbury, Daniel Stone, Marco Trevisan (Treviño),
-  Miguel A. Vico, Daniel van Vugt
-
-Translators:
-  Yi-Jyun Pan [zh_TW], Jordi Mas [ca], Daniel Șerbănescu [ro], Fabio Tomat [fur]
-
-3.29.2
-======
-* Fix size change animations on wayland [Georges; #780292]
-* Handle touch events on server-side titlebars [Carlos; #770185]
-* Misc. bug fixes [Florian, Olivier, Jonas, Georges; #134, #124, !96, #138,
-  !102, #781471, #150]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Florian Müllner,
-  Georges Basile Stavracas Neto, Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Daniel Șerbănescu [ro], Marcos Lans [gl], Dz Chen [zh_CN]
-
-3.29.1
-======
-* Fix various input-method regressions [Carlos, Olivier; #65, #74, #66, #112]
-* Fix wayland build on FreeBSD [Ting-Wei; #792280, #792717]
-* Fix swapped colors in screenshots (again) [Carlos; #72]
-* Allow building with elogind [Rasmus; !46]
-* Consider display rotation for cursor [Olivier; #85]
-* Fall back to non-modifier GBM surfaces [Daniel; #84]
-* Take inhibitors into account for monitoring idle [Bastien; #705942]
-* Misc. bug fixes [handsome-feng, Olivier, Mario, Jonas; !45, #83, #104,
-  gnome-shell#157, #130, #21]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, handsome-feng, Yussuf Khalil,
-  Ting-Wei Lan, Aleksandr Mezin, Alberts Muktupāvels,
-  Georges Basile Stavracas Neto, Bastien Nocera, Benjamin Otte,
-  Mario Sanchez Prada, Daniel Stone, Ray Strode, Rasmus Thomsen,
-  Marco Trevisan (Treviño), Daniel van Vugt
-
-Translators:
-  Emin Tufan Çetin [tr], Dušan Kazik [sk], Matej Urbančič [sl]
-
-3.28.0
-======
-* Fix xdg-foreign regression [Carlos; #63]
-
-Contributors:
-  Carlos Garnacho, Georges Basile Stavracas Neto
-
-Translators:
-  Marek Cernocky [cs], Ask Hjorth Larsen [da], Chao-Hsiung Liao [zh_TW],
-  Anders Jonsson [sv], Mart Raudsepp [et]
-
-3.27.92
-=======
-* Fix use of modifiers with multi-GPU systems [Louis-Francis; #18]
-* Add xdg-shell stable support [Jonas; #791938]
-* Fix scaling of icons in titlebar buttons [Egmont; #23]
-* Implement missing wacom functionality on X11 [Carlos; #48]
-* Force 8-bit RGB config [Jonas; #2]
-* Misc. bug fixes [Jonas, Olivier, Robert; #6, #27, #792203]
-
-Contributors:
-  Jonas Ådahl, Olivier Fourdan, Carlos Garnacho, Egmont Koblinger, Robert Mader,
-  Bastien Nocera, Louis-Francis Ratté-Boulianne
-
-Translators:
-  Daniel Mustieles [es], Марко Костић [sr], Милош Поповић [sr@latin],
-  Fran Dieguez [gl], Balázs Úr [hu], Gwan-gyeong Mun [ko], Rūdolfs Mazurs [lv],
-  Milo Casagrande [it], Mario Blättermann [de], GNOME Translation Robot [gd,
-  nl], Claude Paroz [fr], Aurimas Černius [lt]
-
-3.27.91
-=======
-* Fix handling of trackball settings on wayland [Carlos; #787804]
-* Apply font settings on wayland [Daniel; #645433]
-* Fix keybindings getting mixed up with some layouts [Jonas; #789300]
-* Fix bluetooth mouse cursor disappearing after idle [Benoit; #761067]
-* Support platforms that export EGL_KHR_platform_gbm [memeka; #780668]
-* Add keyboard accessibility support on wayland [Olivier; #788564]
-* Fix missing cursor when using screen magnifier [Carlos; #754806]
-* Fix external monitor shutting off on wayland when lid closes [Jonas; #788915]
-* Add xdg-output support [Olivier; #787363]
-* Add Xwayland grab keyboard support [Olivier; #783342]
-* Allow shortcut inhibition of the super key [Olivier; #790627]
-* Take "panel orientation" drm_connector property into account [Hans; #782294]
-* Fix focus window ending up below other windows on wayland [Olivier; #780820]
-* Fix maximized windows restoring to a tiny size on wayland [Olivier; #783901]
-* Fix tap-and-drag setting on X11 [Jonas; #775755]
-* Fix handling of single-touch devices on wayland [Carlos; #792005]
-* Support tiled/compressed buffers [Daniel; #785779]
-* Port screencast support to pipewire 0.1.8 [Jonas; #792854]
-* Add support for third stylus button on newer tablets [Jason; #790033]
-* Fix background corruption regression on nvidia [Jonas; #739178]
-* Misc. bug fixes [Jonas, Rui, Michael, Marco, Carlos, Olivier, Philip, Piotr,
-  Ting-Wei, Daniel, Jeremy, Hans, Florian, Ray, Jeff, George, Gwan-gyeong;
-  #789153, #788493, #784314, #789227, #789223, #789277, #782344, #789552,
-  #789553, #788695, #789984, #788764, #789386, #784545, #790336, #790358,
-  #791022, #791006, #789070, #772218, #791383, #791809, #776220, #791916,
-  #792281, #790309, #791371, #792527, #792599, #788834, #792765, #792062,
-  #645460, #792853, !2, #792818, #8, #12, #789501, #10, #789961, #13, !15, #1,
-  #26, #28, #35, #36, #38]
-
-Contributors:
-  Jonas Ådahl, Jeremy Bicha, Michael Catanzaro, Piotr Drąg, Olivier Fourdan,
-  Carlos Garnacho, Jason Gerecke, Hans de Goede, Benoit Gschwind,
-  Peter Hutterer, George Kiagiadakis, Ting-Wei Lan, Rui Matos, memeka,
-  Florian Müllner, Gwan-gyeong Mun, Jeremy Nickurak, Marc-Antoine Perennou,
-  Jeff Smith, Daniel Stone, Ray Strode, Marco Trevisan (Treviño),
-  Daniel van Vugt, Philip Withnall
-
-Translators:
-  Khaled Hosny [ar], Kjartan Maraas [nb], Piotr Drąg [pl],
-  Rafael Fontenelle [pt_BR], Christian Kirbach [de], Anders Jonsson [sv],
-  Charles Monzat [fr], Marek Cernocky [cs], Muhammet Kara [tr],
-  Milo Casagrande [it], Pawan Chitrakar [ne], Yosef Or Boczko [he],
-  Kukuh Syafaat [id], Daniel Mustieles [es], Fabio Tomat [fur],
-  Kristjan SCHMIDT [eo], Balázs Úr [hu], Andika Triwidada [id],
-  Fran Dieguez [gl], gogo [hr]
-
-3.27.1
-======
-* Work with clients that require older linux_dmabuf protocol [Daniel; #788558]
-* Support hybrid GPU systems [Jonas; #785381]
-* Prevent crash when closing maximized windows [Jonni; #788666]
-* Use the correct monitor for HiDPI scaling of shell chrome [Jonas; #788820]
-* Fix unredirection of fullscreen windows [Rui, Jonas; #788493]
-* Fix list of supported monitor scales on X11 [Jonas; #788901]
-* Misc. bug fixes [Florian, Jonas, Marco; #788572, #788569, #788607, #788860,
-  #788921]
-
-Contributors:
-  Jonas Ådahl, Carlos Garnacho, Rui Matos, Florian Müllner, Daniel Stone,
-  Marco Trevisan, Jonni Westphalen
-
-Translations:
-  Xavi Ivars [ca@valencia]
-
-3.26.1
-======
-* Fix crash when respawning shortcut inhibitor dialog [Olivier; #787568]
-* Fix crash during monitor configuration migration [Carlos, Jonas; #787668]
-* Fix multihead regressions in X11 session [Jonas; #787477]
-* Fix screen rotation regressions [Hans; #787836]
-* Fix keybindings not being resolved with non-latin layouts [Jonas; #787016]
-* Support snap packages for sandboxed app IDs [Marco; #788217]
-* Fix crash when reconnecting tablet device [Jason; #787649]
-* Support running headless [Jonas; #730551, #787637]
-* Support _NET_RESTACK_WINDOW and ConfigureRequest siblings [Vasilis; #786365]
-* Fix monitor layout not being remembered across sessions [Jonas; #787629]
-* Make sure to export _NET_NUMBER_OF_DESKTOPS [Florian; #760651]
-* Allow resizing of tiled windows [Georges, Florian; #645153]
-* Export tiling information to clients [Georges; #751857]
-* Misc. bug fixes [Jonas, Florian, Jeremy, Rico; #787570, #787715, #787953,
-  #788049, #788199, #788292, #788197]
-
-Contributors:
-  Jonas Ådahl, Andrea Azzarone, Georges Basile Stavracas Neto, Hans de Goede,
-  Olivier Fourdan, Carlos Garnacho, Jason Gerecke, Vasilis Liaskovitis,
-  Rui Matos, Florian Müllner, Jeremy Soller, Marco Trevisan, Rico Tzschichholz
-
-Translations:
-  Matej Urbančič [sl], gogo [hr], Cheng-Chia Tseng [zh_TW]
-
 3.26.0
 ======
 Contributors:
--- a/README.md
+++ b/README.md
@@ -1,30 +0,0 @@
-# Mutter
-
-Mutter is a Wayland display server and X11 window manager and compositor library.
-
-When used as a Wayland display server, it runs on top of KMS and libinput. It
-implements the compositor side of the Wayland core protocol as well as various
-protocol extensions. It also has functionality related to running X11
-applications using Xwayland.
-
-When used on top of Xorg it acts as a X11 window manager and compositing manager.
-
-It contains functionality related to, among other things, window management,
-window compositing, focus tracking, workspace management, keybindings and
-monitor configuration.
-
-Internally it uses a fork of Cogl, a hardware acceleration abstraction library
-used to simplify usage of OpenGL pipelines, as well as a fork af Clutter, a
-scene graph and user interface toolkit.
-
-Mutter is used by GNOME Shell, the GNOME core user interface. It can also be run
-standalone, using the command "mutter", but just running plain mutter is only
-intended for debugging purposes.
-
-## License
-
-Mutter is distributed under the terms of the GNU General Public License,
-version 2 or later. See the [COPYING][license] file for detalis.
-
-[bug-tracker]: https://gitlab.gnome.org/GNOME/mutter/issues
-[license]: COPYING
--- a/clutter/clutter/Makefile.am
+++ b/clutter/clutter/Makefile.am
@@ -87,8 +87,6 @@ source_h =					\
 	clutter-image.h		\
 	clutter-input-device.h	\
 	clutter-input-device-tool.h	\
-	clutter-input-focus.h	\
-	clutter-input-method.h	\
        clutter-interval.h            \
 	clutter-keyframe-transition.h	\
 	clutter-keysyms.h 		\
@@ -171,8 +169,6 @@ source_c = \
 	clutter-image.c		\
 	clutter-input-device.c	\
 	clutter-input-device-tool.c	\
-	clutter-input-focus.c	\
-	clutter-input-method.c	\
 	clutter-virtual-input-device.c	\
 	clutter-interval.c            \
 	clutter-keyframe-transition.c	\
@@ -233,8 +229,6 @@ source_h_priv = \
 	clutter-flatten-effect.h		\
 	clutter-gesture-action-private.h	\
 	clutter-id-pool.h 			\
-	clutter-input-focus-private.h		\
-	clutter-input-method-private.h		\
 	clutter-master-clock.h			\
 	clutter-master-clock-default.h		\
 	clutter-offscreen-effect-private.h	\
@@ -394,7 +388,6 @@ x11_source_c = \
 	x11/clutter-keymap-x11.c		\
 	x11/clutter-stage-x11.c		\
 	x11/clutter-x11-texture-pixmap.c	\
-	x11/clutter-xkb-a11y-x11.c		\
 	$(NULL)

 x11_source_h = \
@@ -409,7 +402,6 @@ x11_source_h_priv = \
 	x11/clutter-keymap-x11.h		\
 	x11/clutter-settings-x11.h		\
 	x11/clutter-stage-x11.h		\
-	x11/clutter-xkb-a11y-x11.h		\
 	$(NULL)

 x11_source_c_priv = \
@@ -692,7 +684,7 @@ Cally_@LIBMUTTER_API_VERSION@_gir_CFLAGS = $(AM_CPPFLAGS) $(CLUTTER_CFLAGS)
 Cally_@LIBMUTTER_API_VERSION@_gir_SCANNERFLAGS = \
 	--warn-all \
 	--c-include='cally/cally.h' \
-	--pkg-export=mutter-clutter-@LIBMUTTER_API_VERSION@ \
+	--pkg-export=mutter-cally-@LIBMUTTER_API_VERSION@ \
 	--include-uninstalled=$(top_builddir)/clutter/Clutter-@LIBMUTTER_API_VERSION@.gir

 INTROSPECTION_GIRS += Cally-@LIBMUTTER_API_VERSION@.gir
--- a/clutter/clutter/cally/cally-util.c
+++ b/clutter/clutter/cally/cally-util.c
@@ -214,8 +214,6 @@ cally_util_simulate_snooper_install (void)
                    G_CALLBACK (cally_util_stage_added_cb), cally_key_snooper);
  g_signal_connect (G_OBJECT (stage_manager), "stage-removed",
                    G_CALLBACK (cally_util_stage_removed_cb), cally_key_snooper);
-
-  g_slist_free (stage_list);
 }

 static void
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -840,7 +840,6 @@ struct _ClutterActorPrivate
  guint needs_compute_expand        : 1;
  guint needs_x_expand              : 1;
  guint needs_y_expand              : 1;
-  guint needs_paint_volume_update   : 1;
 };

 enum
@@ -1093,11 +1092,6 @@ static void clutter_actor_set_child_transform_internal (ClutterActor        *sel
 static void     clutter_actor_realize_internal          (ClutterActor *self);
 static void     clutter_actor_unrealize_internal        (ClutterActor *self);

-static void clutter_actor_push_in_cloned_branch (ClutterActor *self,
-                                                 gulong        count);
-static void clutter_actor_pop_in_cloned_branch (ClutterActor *self,
-                                                gulong        count);
-
 /* Helper macro which translates by the anchor coord, applies the
   given transformation and then translates back */
 #define TRANSFORM_ABOUT_ANCHOR_COORD(a,m,c,_transform)  G_STMT_START { \
@@ -1510,8 +1504,6 @@ clutter_actor_real_map (ClutterActor *self)

  CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_MAPPED);

-  self->priv->needs_paint_volume_update = TRUE;
-
  stage = _clutter_actor_get_stage_internal (self);
  priv->pick_id = _clutter_stage_acquire_pick_id (CLUTTER_STAGE (stage), self);

@@ -2745,7 +2737,6 @@ clutter_actor_real_queue_relayout (ClutterActor *self)
  priv->needs_width_request  = TRUE;
  priv->needs_height_request = TRUE;
  priv->needs_allocation     = TRUE;
-  priv->needs_paint_volume_update = TRUE;

  /* reset the cached size requests */
  memset (priv->width_requests, 0,
@@ -2830,7 +2821,7 @@ _clutter_actor_fully_transform_vertices (ClutterActor *self,
  /* Note: we pass NULL as the ancestor because we don't just want the modelview
   * that gets us to stage coordinates, we want to go all the way to eye
   * coordinates */
-  _clutter_actor_get_relative_transformation_matrix (self, NULL, &modelview);
+  _clutter_actor_apply_relative_transformation_matrix (self, NULL, &modelview);

  /* Fetch the projection and viewport */
  _clutter_stage_get_projection_matrix (CLUTTER_STAGE (stage), &projection);
@@ -4294,9 +4285,6 @@ clutter_actor_remove_child_internal (ClutterActor                 *self,

  self->priv->age += 1;

-  if (self->priv->in_cloned_branch)
-    clutter_actor_pop_in_cloned_branch (child, self->priv->in_cloned_branch);
-
  /* if the child that got removed was visible and set to
   * expand then we want to reset the parent's state in
   * case the child was the only thing that was making it
@@ -4840,6 +4828,7 @@ clutter_actor_set_scale_factor (ClutterActor      *self,
  g_assert (pspec != NULL);
  g_assert (scale_p != NULL);

+  if (*scale_p != factor)
    _clutter_actor_create_transition (self, pspec, *scale_p, factor);
 }

@@ -8530,7 +8519,6 @@ clutter_actor_init (ClutterActor *self)
  priv->needs_width_request = TRUE;
  priv->needs_height_request = TRUE;
  priv->needs_allocation = TRUE;
-  priv->needs_paint_volume_update = TRUE;

  priv->cached_width_age = 1;
  priv->cached_height_age = 1;
@@ -10097,9 +10085,6 @@ clutter_actor_allocate (ClutterActor           *self,
      return;
    }

-  if (CLUTTER_ACTOR_IS_MAPPED (self))
-    self->priv->needs_paint_volume_update = TRUE;
-
  if (!stage_allocation_changed)
    {
      /* If the actor didn't move but needs_allocation is set, we just
@@ -10279,6 +10264,7 @@ clutter_actor_set_position (ClutterActor *self,
  cur_position.x = clutter_actor_get_x (self);
  cur_position.y = clutter_actor_get_y (self);

+  if (!clutter_point_equals (&cur_position, &new_position))
    _clutter_actor_create_transition (self, obj_props[PROP_POSITION],
                                      &cur_position,
                                      &new_position);
@@ -12918,9 +12904,6 @@ clutter_actor_add_child_internal (ClutterActor              *self,

  self->priv->age += 1;

-  if (self->priv->in_cloned_branch)
-    clutter_actor_push_in_cloned_branch (child, self->priv->in_cloned_branch);
-
  /* if push_internal() has been called then we automatically set
   * the flag on the actor
   */
@@ -12991,9 +12974,6 @@ clutter_actor_add_child_internal (ClutterActor              *self,
      child->priv->needs_height_request = TRUE;
      child->priv->needs_allocation = TRUE;

-      if (CLUTTER_ACTOR_IS_MAPPED (child))
-        child->priv->needs_paint_volume_update = TRUE;
-
      /* we only queue a relayout here, because any possible
       * redraw has already been queued either by show() or
       * by our call to queue_redraw() above
@@ -17536,16 +17516,11 @@ _clutter_actor_get_paint_volume_mutable (ClutterActor *self)
  priv = self->priv;

  if (priv->paint_volume_valid)
-    {
-      if (!priv->needs_paint_volume_update)
-        return &priv->paint_volume;
    clutter_paint_volume_free (&priv->paint_volume);
-    }

  if (_clutter_actor_get_paint_volume_real (self, &priv->paint_volume))
    {
      priv->paint_volume_valid = TRUE;
-      priv->needs_paint_volume_update = FALSE;
      return &priv->paint_volume;
    }
  else
@@ -20715,31 +20690,29 @@ clutter_actor_get_child_transform (ClutterActor  *self,
 }

 static void
-clutter_actor_push_in_cloned_branch (ClutterActor *self,
-                                     gulong        count)
+clutter_actor_push_in_cloned_branch (ClutterActor *self)
 {
  ClutterActor *iter;

  for (iter = self->priv->first_child;
       iter != NULL;
       iter = iter->priv->next_sibling)
-    clutter_actor_push_in_cloned_branch (iter, count);
+    clutter_actor_push_in_cloned_branch (iter);

-  self->priv->in_cloned_branch += count;
+  self->priv->in_cloned_branch += 1;
 }

 static void
-clutter_actor_pop_in_cloned_branch (ClutterActor *self,
-                                    gulong        count)
+clutter_actor_pop_in_cloned_branch (ClutterActor *self)
 {
  ClutterActor *iter;

-  self->priv->in_cloned_branch -= count;
+  self->priv->in_cloned_branch -= 1;

  for (iter = self->priv->first_child;
       iter != NULL;
       iter = iter->priv->next_sibling)
-    clutter_actor_pop_in_cloned_branch (iter, count);
+    clutter_actor_pop_in_cloned_branch (iter);
 }

 void
@@ -20755,7 +20728,7 @@ _clutter_actor_attach_clone (ClutterActor *actor,

  g_hash_table_add (priv->clones, clone);

-  clutter_actor_push_in_cloned_branch (actor, 1);
+  clutter_actor_push_in_cloned_branch (actor);
 }

 void
@@ -20770,7 +20743,7 @@ _clutter_actor_detach_clone (ClutterActor *actor,
      g_hash_table_lookup (priv->clones, clone) == NULL)
    return;

-  clutter_actor_pop_in_cloned_branch (actor, 1);
+  clutter_actor_pop_in_cloned_branch (actor);

  g_hash_table_remove (priv->clones, clone);

--- a/clutter/clutter/clutter-backend-private.h
+++ b/clutter/clutter/clutter-backend-private.h
@@ -58,8 +58,6 @@ struct _ClutterBackend
  gint32 units_serial;

  GList *event_translators;
-
-  ClutterInputMethod *input_method;
 };

 struct _ClutterBackendClass
@@ -102,8 +100,6 @@ struct _ClutterBackendClass

  PangoDirection        (* get_keymap_direction) (ClutterBackend   *backend);

-  void                  (* bell_notify)          (ClutterBackend   *backend);
-
  /* signals */
  void (* resolution_changed) (ClutterBackend *backend);
  void (* font_changed)       (ClutterBackend *backend);
--- a/clutter/clutter/clutter-backend.c
+++ b/clutter/clutter/clutter-backend.c
@@ -127,7 +127,6 @@ clutter_backend_finalize (GObject *gobject)

  g_free (backend->font_name);
  clutter_backend_set_font_options (backend, NULL);
-  g_clear_object (&backend->input_method);

  G_OBJECT_CLASS (clutter_backend_parent_class)->finalize (gobject);
 }
@@ -1364,41 +1363,3 @@ clutter_set_allowed_drivers (const char *drivers)

  allowed_drivers = g_strdup (drivers);
 }
-
-void
-clutter_backend_bell_notify (ClutterBackend *backend)
-{
-  ClutterBackendClass *klass;
-
-  klass = CLUTTER_BACKEND_GET_CLASS (backend);
-  if (klass->bell_notify)
-    klass->bell_notify (backend);
-}
-
-/**
- * clutter_backend_get_input_method:
- * @backend: the #CLutterBackend
- *
- * Returns the input method used by Clutter
- *
- * Returns: (transfer none): the input method
- **/
-ClutterInputMethod *
-clutter_backend_get_input_method (ClutterBackend *backend)
-{
-  return backend->input_method;
-}
-
-/**
- * clutter_backend_set_input_method:
- * @backend: the #ClutterBackend
- * @method: the input method
- *
- * Sets the input method to be used by Clutter
- **/
-void
-clutter_backend_set_input_method (ClutterBackend     *backend,
-                                  ClutterInputMethod *method)
-{
-  g_set_object (&backend->input_method, method);
-}
--- a/clutter/clutter/clutter-backend.h
+++ b/clutter/clutter/clutter-backend.h
@@ -74,15 +74,6 @@ const cairo_font_options_t *    clutter_backend_get_font_options        (Clutter
 CLUTTER_AVAILABLE_IN_1_8
 CoglContext *                   clutter_backend_get_cogl_context        (ClutterBackend             *backend);

-CLUTTER_AVAILABLE_IN_ALL
-void                            clutter_backend_bell_notify             (ClutterBackend             *backend);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputMethod *            clutter_backend_get_input_method        (ClutterBackend             *backend);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void                            clutter_backend_set_input_method        (ClutterBackend             *backend,
-                                                                         ClutterInputMethod         *method);
 G_END_DECLS

 #endif /* __CLUTTER_BACKEND_H__ */
--- a/clutter/clutter/clutter-bezier.c
+++ b/clutter/clutter/clutter-bezier.c
@@ -324,7 +324,7 @@ _clutter_bezier_init (ClutterBezier *b,
   * triggers, we need to change those two functions a bit.
   */
  if (b->ax > 0x1fff || b->bx > 0x1fff || b->cx > 0x1fff)
-    g_warning ("Calculated coefficients will result in multiplication "
+    g_warning ("Calculated coefficents will result in multiplication "
               "overflow in clutter_bezier_t2x and clutter_bezier_t2y.");

  /*
--- a/clutter/clutter/clutter-device-manager-private.h
+++ b/clutter/clutter/clutter-device-manager-private.h
@@ -145,9 +145,6 @@ struct _ClutterInputDevice
  guint is_enabled : 1;
 };

-typedef void (*ClutterEmitInputDeviceEvent) (ClutterEvent       *event,
-                                             ClutterInputDevice *device);
-
 struct _ClutterInputDeviceClass
 {
  GObjectClass parent_class;
@@ -166,11 +163,6 @@ struct _ClutterInputDeviceClass

  gboolean (* is_grouped) (ClutterInputDevice *device,
                           ClutterInputDevice *other_device);
-
-  /* Keyboard accessbility */
-  void (* process_kbd_a11y_event) (ClutterEvent               *event,
-                                   ClutterInputDevice         *device,
-                                   ClutterEmitInputDeviceEvent emit_event_func);
 };

 /* Platform-dependent interface */
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -54,9 +54,6 @@ struct _ClutterDeviceManagerPrivate
 {
  /* back-pointer to the backend */
  ClutterBackend *backend;
-
-  /* Keyboard a11y */
-  ClutterKbdA11ySettings kbd_a11y_settings;
 };

 enum
@@ -75,8 +72,6 @@ enum
  DEVICE_ADDED,
  DEVICE_REMOVED,
  TOOL_CHANGED,
-  KBD_A11Y_MASK_CHANGED,
-  KBD_A11Y_FLAGS_CHANGED,

  LAST_SIGNAL
 };
@@ -201,46 +196,6 @@ clutter_device_manager_class_init (ClutterDeviceManagerClass *klass)
                  G_TYPE_NONE, 2,
                  CLUTTER_TYPE_INPUT_DEVICE,
                  CLUTTER_TYPE_INPUT_DEVICE_TOOL);
-
-  /**
-   * ClutterDeviceManager::kbd-a11y-mods-state-changed:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @latched_mask: the latched modifier mask from stickykeys
-   * @locked_mask:  the locked modifier mask from stickykeys
-   *
-   * The ::kbd-a11y-mods-state-changed signal is emitted each time either the
-   * latched modifiers mask or locked modifiers mask are changed as the
-   * result of keyboard accessibilty's sticky keys operations.
-   */
-  manager_signals[KBD_A11Y_MASK_CHANGED] =
-    g_signal_new (I_("kbd-a11y-mods-state-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__UINT_UINT,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_UINT,
-                  G_TYPE_UINT);
-
-  /**
-   * ClutterDeviceManager::kbd-a11y-flags-changed:
-   * @manager: the #ClutterDeviceManager that emitted the signal
-   * @settings_flags: the new ClutterKeyboardA11yFlags configuration
-   * @changed_mask: the ClutterKeyboardA11yFlags changed
-   *
-   * The ::kbd-a11y-flags-changed signal is emitted each time the
-   * ClutterKeyboardA11yFlags configuration is changed as the result of
-   * keyboard accessibilty operations.
-   */
-  manager_signals[KBD_A11Y_FLAGS_CHANGED] =
-    g_signal_new (I_("kbd-a11y-flags-changed"),
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL,
-                  _clutter_marshal_VOID__UINT_UINT,
-                  G_TYPE_NONE, 2,
-                  G_TYPE_UINT,
-                  G_TYPE_UINT);
 }

 static void
@@ -516,21 +471,6 @@ clutter_device_manager_create_virtual_device (ClutterDeviceManager   *device_man
                                               device_type);
 }

-/**
- * clutter_device_manager_supported_virtua_device_types: (skip)
- */
-ClutterVirtualDeviceType
-clutter_device_manager_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_val_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager),
-                        CLUTTER_VIRTUAL_DEVICE_TYPE_NONE);
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  return manager_class->get_supported_virtual_device_types (device_manager);
-}
-
 void
 _clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,
                                         ClutterEvent         *event,
@@ -547,43 +487,3 @@ _clutter_device_manager_compress_motion (ClutterDeviceManager *device_manager,

  manager_class->compress_motion (device_manager, event, to_discard);
 }
-
-static gboolean
-are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
-                             ClutterKbdA11ySettings *b)
-{
-  return (a->controls == b->controls &&
-          a->slowkeys_delay == b->slowkeys_delay &&
-          a->debounce_delay == b->debounce_delay &&
-          a->timeout_delay == b->timeout_delay &&
-          a->mousekeys_init_delay == b->mousekeys_init_delay &&
-          a->mousekeys_max_speed == b->mousekeys_max_speed &&
-          a->mousekeys_accel_time == b->mousekeys_accel_time);
-}
-
-void
-clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                              ClutterKbdA11ySettings *settings)
-{
-  ClutterDeviceManagerClass *manager_class;
-
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  if (are_kbd_a11y_settings_equal (&device_manager->priv->kbd_a11y_settings, settings))
-    return;
-
-  device_manager->priv->kbd_a11y_settings = *settings;
-
-  manager_class = CLUTTER_DEVICE_MANAGER_GET_CLASS (device_manager);
-  if (manager_class->apply_kbd_a11y_settings)
-    manager_class->apply_kbd_a11y_settings (device_manager, settings);
-}
-
-void
-clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                              ClutterKbdA11ySettings *settings)
-{
-  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER (device_manager));
-
-  *settings = device_manager->priv->kbd_a11y_settings;
-}
--- a/clutter/clutter/clutter-device-manager.h
+++ b/clutter/clutter/clutter-device-manager.h
@@ -44,35 +44,6 @@ typedef struct _ClutterDeviceManager            ClutterDeviceManager;
 typedef struct _ClutterDeviceManagerPrivate     ClutterDeviceManagerPrivate;
 typedef struct _ClutterDeviceManagerClass       ClutterDeviceManagerClass;

-/**
- * ClutterVirtualDeviceType:
- */
-typedef enum _ClutterVirtualDeviceType
-{
-  CLUTTER_VIRTUAL_DEVICE_TYPE_NONE = 0,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD = 1 << 0,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER = 1 << 1,
-  CLUTTER_VIRTUAL_DEVICE_TYPE_TOUCHSCREEN = 1 << 2,
-} ClutterVirtualDeviceType;
-
-/**
- * ClutterKbdA11ySettings:
- *
- * The #ClutterKbdA11ySettings structure contains keyboard accessibility
- * settings
- *
- */
-typedef struct _ClutterKbdA11ySettings
-{
-  ClutterKeyboardA11yFlags controls;
-  gint slowkeys_delay;
-  gint debounce_delay;
-  gint timeout_delay;
-  gint mousekeys_init_delay;
-  gint mousekeys_max_speed;
-  gint mousekeys_accel_time;
-} ClutterKbdA11ySettings;
-
 /**
 * ClutterDeviceManager:
 *
@@ -114,13 +85,10 @@ struct _ClutterDeviceManagerClass
                                               ClutterStage       *stage);
  ClutterVirtualInputDevice *(* create_virtual_device) (ClutterDeviceManager  *device_manager,
                                                        ClutterInputDeviceType device_type);
-  ClutterVirtualDeviceType (* get_supported_virtual_device_types) (ClutterDeviceManager *device_manager);
  void                (* compress_motion) (ClutterDeviceManager *device_manger,
                                           ClutterEvent         *event,
                                           const ClutterEvent   *to_discard);
-  /* Keyboard accessbility */
-  void                (* apply_kbd_a11y_settings) (ClutterDeviceManager   *device_manger,
-                                                   ClutterKbdA11ySettings *settings);
+
  /* padding */
  gpointer _padding[6];
 };
@@ -146,16 +114,6 @@ CLUTTER_AVAILABLE_IN_ALL
 ClutterVirtualInputDevice *clutter_device_manager_create_virtual_device (ClutterDeviceManager  *device_manager,
                                                                         ClutterInputDeviceType device_type);

-CLUTTER_AVAILABLE_IN_ALL
-ClutterVirtualDeviceType clutter_device_manager_get_supported_virtual_device_types (ClutterDeviceManager *device_manager);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_device_manager_set_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                   ClutterKbdA11ySettings *settings);
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_device_manager_get_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                   ClutterKbdA11ySettings *settings);
-
 G_END_DECLS

 #endif /* __CLUTTER_DEVICE_MANAGER_H__ */
--- a/clutter/clutter/clutter-enums.h
+++ b/clutter/clutter/clutter-enums.h
@@ -396,43 +396,6 @@ typedef enum {
  CLUTTER_MODIFIER_MASK = 0x5c001fff
 } ClutterModifierType;

-/**
- * ClutterKeyboardA11yFlags:
- * @CLUTTER_A11Y_KEYBOARD_ENABLED:
- * @CLUTTER_A11Y_TIMEOUT_ENABLED:
- * @CLUTTER_A11Y_MOUSE_KEYS_ENABLED:
- * @CLUTTER_A11Y_SLOW_KEYS_ENABLED:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT:
- * @CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT:
- * @CLUTTER_A11Y_BOUNCE_KEYS_ENABLED:
- * @CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT:
- * @CLUTTER_A11Y_TOGGLE_KEYS_ENABLED:
- * @CLUTTER_A11Y_STICKY_KEYS_ENABLED:
- * @CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF:
- * @CLUTTER_A11Y_STICKY_KEYS_BEEP:
- * @CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP:
- *
- * Keyboard accessibility features applied to a ClutterInputDevice keyboard.
- *
- */
-typedef enum {
-  CLUTTER_A11Y_KEYBOARD_ENABLED          = 1 << 0,
-  CLUTTER_A11Y_TIMEOUT_ENABLED           = 1 << 1,
-  CLUTTER_A11Y_MOUSE_KEYS_ENABLED        = 1 << 2,
-  CLUTTER_A11Y_SLOW_KEYS_ENABLED         = 1 << 3,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS      = 1 << 4,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT     = 1 << 5,
-  CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT     = 1 << 6,
-  CLUTTER_A11Y_BOUNCE_KEYS_ENABLED       = 1 << 7,
-  CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT   = 1 << 8,
-  CLUTTER_A11Y_TOGGLE_KEYS_ENABLED       = 1 << 9,
-  CLUTTER_A11Y_STICKY_KEYS_ENABLED       = 1 << 10,
-  CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF   = 1 << 11,
-  CLUTTER_A11Y_STICKY_KEYS_BEEP          = 1 << 12,
-  CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP = 1 << 13,
-} ClutterKeyboardA11yFlags;
-
 /**
 * ClutterActorFlags:
 * @CLUTTER_ACTOR_MAPPED: the actor will be painted (is visible, and inside
@@ -768,8 +731,7 @@ typedef enum { /*< prefix=CLUTTER_DRAG >*/
 */
 typedef enum { /*< flags prefix=CLUTTER_EVENT >*/
  CLUTTER_EVENT_NONE           = 0,
-  CLUTTER_EVENT_FLAG_SYNTHETIC    = 1 << 0,
-  CLUTTER_EVENT_FLAG_INPUT_METHOD = 1 << 1
+  CLUTTER_EVENT_FLAG_SYNTHETIC = 1 << 0
 } ClutterEventFlags;

 /**
@@ -1574,41 +1536,6 @@ typedef enum {
  CLUTTER_INPUT_DEVICE_MAPPING_RELATIVE,
 } ClutterInputDeviceMapping;

-typedef enum {
-  CLUTTER_INPUT_CONTENT_HINT_COMPLETION          = 1 << 0,
-  CLUTTER_INPUT_CONTENT_HINT_SPELLCHECK          = 1 << 1,
-  CLUTTER_INPUT_CONTENT_HINT_AUTO_CAPITALIZATION = 1 << 2,
-  CLUTTER_INPUT_CONTENT_HINT_LOWERCASE           = 1 << 3,
-  CLUTTER_INPUT_CONTENT_HINT_UPPERCASE           = 1 << 4,
-  CLUTTER_INPUT_CONTENT_HINT_TITLECASE           = 1 << 5,
-  CLUTTER_INPUT_CONTENT_HINT_HIDDEN_TEXT         = 1 << 6,
-  CLUTTER_INPUT_CONTENT_HINT_SENSITIVE_DATA      = 1 << 7,
-  CLUTTER_INPUT_CONTENT_HINT_LATIN               = 1 << 8,
-  CLUTTER_INPUT_CONTENT_HINT_MULTILINE           = 1 << 9,
-} ClutterInputContentHintFlags;
-
-typedef enum {
-  CLUTTER_INPUT_CONTENT_PURPOSE_NORMAL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_ALPHA,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DIGITS,
-  CLUTTER_INPUT_CONTENT_PURPOSE_NUMBER,
-  CLUTTER_INPUT_CONTENT_PURPOSE_PHONE,
-  CLUTTER_INPUT_CONTENT_PURPOSE_URL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_EMAIL,
-  CLUTTER_INPUT_CONTENT_PURPOSE_NAME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_PASSWORD,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DATE,
-  CLUTTER_INPUT_CONTENT_PURPOSE_TIME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_DATETIME,
-  CLUTTER_INPUT_CONTENT_PURPOSE_TERMINAL,
-} ClutterInputContentPurpose;
-
-typedef enum {
-  CLUTTER_INPUT_PANEL_STATE_OFF,
-  CLUTTER_INPUT_PANEL_STATE_ON,
-  CLUTTER_INPUT_PANEL_STATE_TOGGLE,
-} ClutterInputPanelState;
-
 G_END_DECLS

 #endif /* __CLUTTER_ENUMS_H__ */
--- a/clutter/clutter/clutter-input-focus-private.h
+++ b/clutter/clutter/clutter-input-focus-private.h
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_FOCUS_PRIVATE_H__
-#define __CLUTTER_INPUT_FOCUS_PRIVATE_H__
-
-void clutter_input_focus_focus_in  (ClutterInputFocus  *focus,
-                                    ClutterInputMethod *method);
-void clutter_input_focus_focus_out (ClutterInputFocus  *focus);
-
-void clutter_input_focus_commit (ClutterInputFocus *focus,
-                                 const gchar       *text);
-void clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                             guint              offset,
-                                             guint              len);
-void clutter_input_focus_request_surrounding (ClutterInputFocus *focus);
-
-void clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                           const gchar       *preedit,
-                                           guint              cursor);
-
-#endif /* __CLUTTER_INPUT_FOCUS_PRIVATE_H__ */
--- a/clutter/clutter/clutter-input-focus.c
+++ b/clutter/clutter/clutter-input-focus.c
@@ -1,243 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter/clutter-input-focus.h"
-#include "clutter/clutter-input-focus-private.h"
-#include "clutter/clutter-input-method-private.h"
-
-typedef struct _ClutterInputFocusPrivate ClutterInputFocusPrivate;
-
-struct _ClutterInputFocusPrivate
-{
-  ClutterInputMethod *im;
-};
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterInputFocus, clutter_input_focus, G_TYPE_OBJECT)
-
-static void
-clutter_input_focus_real_focus_in (ClutterInputFocus  *focus,
-                                   ClutterInputMethod *im)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-  priv->im = im;
-}
-
-static void
-clutter_input_focus_real_focus_out (ClutterInputFocus  *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-  priv->im = NULL;
-}
-
-static void
-clutter_input_focus_class_init (ClutterInputFocusClass *klass)
-{
-  klass->focus_in = clutter_input_focus_real_focus_in;
-  klass->focus_out = clutter_input_focus_real_focus_out;
-}
-
-static void
-clutter_input_focus_init (ClutterInputFocus *focus)
-{
-}
-
-gboolean
-clutter_input_focus_is_focused (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  return !!priv->im;
-}
-
-void
-clutter_input_focus_reset (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_reset (priv->im);
-}
-
-void
-clutter_input_focus_set_cursor_location (ClutterInputFocus *focus,
-                                         const ClutterRect *rect)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_cursor_location (priv->im, rect);
-}
-
-void
-clutter_input_focus_set_surrounding (ClutterInputFocus *focus,
-                                     const gchar       *text,
-                                     guint              cursor,
-                                     guint              anchor)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_surrounding (priv->im, text, cursor, anchor);
-}
-
-void
-clutter_input_focus_set_content_hints (ClutterInputFocus            *focus,
-                                       ClutterInputContentHintFlags  hints)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_content_hints (priv->im, hints);
-}
-
-void
-clutter_input_focus_set_content_purpose (ClutterInputFocus          *focus,
-                                         ClutterInputContentPurpose  purpose)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_content_purpose (priv->im, purpose);
-}
-
-gboolean
-clutter_input_focus_filter_key_event (ClutterInputFocus     *focus,
-                                      const ClutterKeyEvent *key)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_FOCUS (focus), FALSE);
-  g_return_val_if_fail (clutter_input_focus_is_focused (focus), FALSE);
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  return clutter_input_method_filter_key_event (priv->im, key);
-}
-
-void
-clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
-                                          gboolean           can_show_preedit)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_set_can_show_preedit (priv->im, can_show_preedit);
-}
-
-void
-clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus)
-{
-  ClutterInputFocusPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (clutter_input_focus_is_focused (focus));
-
-  priv = clutter_input_focus_get_instance_private (focus);
-
-  clutter_input_method_toggle_input_panel (priv->im);
-}
-
-void
-clutter_input_focus_focus_in (ClutterInputFocus  *focus,
-                              ClutterInputMethod *im)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->focus_in (focus, im);
-}
-
-void
-clutter_input_focus_focus_out (ClutterInputFocus  *focus)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->focus_out (focus);
-}
-
-void
-clutter_input_focus_commit (ClutterInputFocus *focus,
-                            const gchar       *text)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->commit_text (focus, text);
-}
-
-void
-clutter_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                        guint              offset,
-                                        guint              len)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->delete_surrounding (focus, offset, len);
-}
-
-void
-clutter_input_focus_request_surrounding (ClutterInputFocus *focus)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->request_surrounding (focus);
-}
-
-void
-clutter_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                      const gchar       *preedit,
-                                      guint              cursor)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  CLUTTER_INPUT_FOCUS_GET_CLASS (focus)->set_preedit_text (focus, preedit, cursor);
-}
--- a/clutter/clutter/clutter-input-focus.h
+++ b/clutter/clutter/clutter-input-focus.h
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_FOCUS_H__
-#define __CLUTTER_INPUT_FOCUS_H__
-
-#include <clutter/clutter.h>
-
-#define CLUTTER_TYPE_INPUT_FOCUS (clutter_input_focus_get_type ())
-
-CLUTTER_AVAILABLE_IN_MUTTER
-G_DECLARE_DERIVABLE_TYPE (ClutterInputFocus, clutter_input_focus,
-                          CLUTTER, INPUT_FOCUS, GObject)
-
-struct _ClutterInputFocusClass
-{
-  GObjectClass parent_class;
-  GTypeInterface iface;
-
-  void (* focus_in)  (ClutterInputFocus  *focus,
-                      ClutterInputMethod *input_method);
-  void (* focus_out) (ClutterInputFocus  *focus);
-
-  void (* request_surrounding) (ClutterInputFocus *focus);
-  void (* delete_surrounding)  (ClutterInputFocus *focus,
-                                guint              offset,
-                                guint              len);
-  void (* commit_text) (ClutterInputFocus *focus,
-                        const gchar       *text);
-
-  void (* set_preedit_text) (ClutterInputFocus *focus,
-                             const gchar       *preedit,
-                             guint              cursor);
-};
-
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean clutter_input_focus_is_focused (ClutterInputFocus *focus);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_reset (ClutterInputFocus *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_cursor_location (ClutterInputFocus *focus,
-                                              const ClutterRect *rect);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_surrounding (ClutterInputFocus *focus,
-                                          const gchar       *text,
-                                          guint              cursor,
-                                          guint              anchor);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_content_hints (ClutterInputFocus            *focus,
-                                            ClutterInputContentHintFlags  hint);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_content_purpose (ClutterInputFocus          *focus,
-                                              ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean clutter_input_focus_filter_key_event (ClutterInputFocus     *focus,
-                                               const ClutterKeyEvent *key);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_set_can_show_preedit (ClutterInputFocus *focus,
-                                               gboolean           can_show_preedit);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_focus_request_toggle_input_panel (ClutterInputFocus *focus);
-
-#endif /* __CLUTTER_INPUT_FOCUS_H__ */
--- a/clutter/clutter/clutter-input-method-private.h
+++ b/clutter/clutter/clutter-input-method-private.h
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_METHOD_PRIVATE_H__
-#define __CLUTTER_INPUT_METHOD_PRIVATE_H__
-
-ClutterInputFocus * clutter_input_method_get_focus (ClutterInputMethod *method);
-
-void clutter_input_method_reset               (ClutterInputMethod *method);
-
-void clutter_input_method_set_cursor_location (ClutterInputMethod *method,
-                                               const ClutterRect  *rect);
-void clutter_input_method_set_surrounding     (ClutterInputMethod *method,
-                                               const gchar        *text,
-                                               guint               cursor,
-                                               guint               anchor);
-void clutter_input_method_set_content_hints   (ClutterInputMethod           *method,
-                                               ClutterInputContentHintFlags  hints);
-void clutter_input_method_set_content_purpose (ClutterInputMethod         *method,
-                                               ClutterInputContentPurpose  purpose);
-void clutter_input_method_set_can_show_preedit (ClutterInputMethod *method,
-                                                gboolean            can_show_preedit);
-gboolean clutter_input_method_filter_key_event (ClutterInputMethod    *method,
-                                                const ClutterKeyEvent *key);
-
-void clutter_input_method_toggle_input_panel (ClutterInputMethod *method);
-
-#endif /* __CLUTTER_INPUT_METHOD_PRIVATE_H__ */
--- a/clutter/clutter/clutter-input-method.c
+++ b/clutter/clutter/clutter-input-method.c
@@ -1,444 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#include "clutter-build-config.h"
-
-#include "clutter-private.h"
-#include "clutter/clutter-input-method.h"
-#include "clutter/clutter-input-method-private.h"
-#include "clutter/clutter-input-focus-private.h"
-
-typedef struct _ClutterInputMethodPrivate ClutterInputMethodPrivate;
-
-struct _ClutterInputMethodPrivate
-{
-  ClutterInputFocus *focus;
-  ClutterInputContentHintFlags content_hints;
-  ClutterInputContentPurpose content_purpose;
-  gboolean can_show_preedit;
-};
-
-enum {
-  COMMIT,
-  DELETE_SURROUNDING,
-  REQUEST_SURROUNDING,
-  INPUT_PANEL_STATE,
-  CURSOR_LOCATION_CHANGED,
-  N_SIGNALS,
-};
-
-enum {
-  PROP_0,
-  PROP_CONTENT_HINTS,
-  PROP_CONTENT_PURPOSE,
-  PROP_CAN_SHOW_PREEDIT,
-  N_PROPS
-};
-
-static guint signals[N_SIGNALS] = { 0 };
-static GParamSpec *pspecs[N_PROPS] = { 0 };
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (ClutterInputMethod, clutter_input_method, G_TYPE_OBJECT)
-
-static void
-set_content_hints (ClutterInputMethod           *im,
-                   ClutterInputContentHintFlags  content_hints)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->content_hints = content_hints;
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->update_content_hints (im, content_hints);
-}
-
-static void
-set_content_purpose (ClutterInputMethod         *im,
-                     ClutterInputContentPurpose  content_purpose)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->content_purpose = content_purpose;
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->update_content_purpose (im,
-                                                               content_purpose);
-}
-
-static void
-set_can_show_preedit (ClutterInputMethod *im,
-                      gboolean            can_show_preedit)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  priv->can_show_preedit = can_show_preedit;
-}
-
-static void
-clutter_input_method_set_property (GObject      *object,
-                                   guint         prop_id,
-                                   const GValue *value,
-                                   GParamSpec   *pspec)
-{
-  switch (prop_id)
-    {
-    case PROP_CONTENT_HINTS:
-      set_content_hints (CLUTTER_INPUT_METHOD (object),
-                         g_value_get_flags (value));
-      break;
-    case PROP_CONTENT_PURPOSE:
-      set_content_purpose (CLUTTER_INPUT_METHOD (object),
-                           g_value_get_enum (value));
-      break;
-    case PROP_CAN_SHOW_PREEDIT:
-      set_can_show_preedit (CLUTTER_INPUT_METHOD (object),
-                            g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_input_method_get_property (GObject    *object,
-                                   guint       prop_id,
-                                   GValue     *value,
-                                   GParamSpec *pspec)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethod *im;
-
-  im = CLUTTER_INPUT_METHOD (object);
-  priv = clutter_input_method_get_instance_private (im);
-
-  switch (prop_id)
-    {
-    case PROP_CONTENT_HINTS:
-      g_value_set_flags (value, priv->content_hints);
-      break;
-    case PROP_CONTENT_PURPOSE:
-      g_value_set_enum (value, priv->content_purpose);
-      break;
-    case PROP_CAN_SHOW_PREEDIT:
-      g_value_set_boolean (value, priv->can_show_preedit);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-clutter_input_method_class_init (ClutterInputMethodClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->set_property = clutter_input_method_set_property;
-  object_class->get_property = clutter_input_method_get_property;
-
-  signals[COMMIT] =
-    g_signal_new ("commit",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, G_TYPE_STRING);
-  signals[DELETE_SURROUNDING] =
-    g_signal_new ("delete-surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-  signals[REQUEST_SURROUNDING] =
-    g_signal_new ("request-surrounding",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-  signals[INPUT_PANEL_STATE] =
-    g_signal_new ("input-panel-state",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1,
-                  CLUTTER_TYPE_INPUT_PANEL_STATE);
-  signals[CURSOR_LOCATION_CHANGED] =
-    g_signal_new ("cursor-location-changed",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0, NULL, NULL, NULL,
-                  G_TYPE_NONE, 1, CLUTTER_TYPE_RECT);
-
-  pspecs[PROP_CONTENT_HINTS] =
-    g_param_spec_flags ("content-hints",
-                        P_("Content hints"),
-                        P_("Content hints"),
-                        CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS, 0,
-                        G_PARAM_READWRITE |
-                        G_PARAM_STATIC_STRINGS);
-  pspecs[PROP_CONTENT_PURPOSE] =
-    g_param_spec_enum ("content-purpose",
-                       P_("Content purpose"),
-                       P_("Content purpose"),
-                       CLUTTER_TYPE_INPUT_CONTENT_PURPOSE, 0,
-                       G_PARAM_READWRITE |
-                       G_PARAM_STATIC_STRINGS);
-  pspecs[PROP_CAN_SHOW_PREEDIT] =
-    g_param_spec_boolean ("can-show-preedit",
-                          P_("Can show preedit"),
-                          P_("Can show preedit"),
-                          FALSE,
-                          G_PARAM_READWRITE |
-                          G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, pspecs);
-}
-
-static void
-clutter_input_method_init (ClutterInputMethod *im)
-{
-}
-
-void
-clutter_input_method_focus_in (ClutterInputMethod *im,
-                               ClutterInputFocus  *focus)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethodClass *klass;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-  g_return_if_fail (CLUTTER_IS_INPUT_FOCUS (focus));
-
-  priv = clutter_input_method_get_instance_private (im);
-
-  if (priv->focus == focus)
-    return;
-
-  if (priv->focus)
-    clutter_input_method_focus_out (im);
-
-  g_set_object (&priv->focus, focus);
-
-  if (focus)
-    {
-      klass = CLUTTER_INPUT_METHOD_GET_CLASS (im);
-      klass->focus_in (im, focus);
-
-      clutter_input_focus_focus_in (priv->focus, im);
-    }
-}
-
-void
-clutter_input_method_focus_out (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-  ClutterInputMethodClass *klass;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-
-  if (!priv->focus)
-    return;
-
-  clutter_input_focus_focus_out (priv->focus);
-  g_clear_object (&priv->focus);
-
-  klass = CLUTTER_INPUT_METHOD_GET_CLASS (im);
-  klass->focus_out (im);
-
-  g_signal_emit (im, signals[INPUT_PANEL_STATE],
-                 0, CLUTTER_INPUT_PANEL_STATE_OFF);
-}
-
-ClutterInputFocus *
-clutter_input_method_get_focus (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-
-  priv = clutter_input_method_get_instance_private (im);
-  return priv->focus;
-}
-
-void
-clutter_input_method_commit (ClutterInputMethod *im,
-                             const gchar        *text)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_commit (priv->focus, text);
-}
-
-void
-clutter_input_method_delete_surrounding (ClutterInputMethod *im,
-                                         guint               offset,
-                                         guint               len)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_delete_surrounding (priv->focus, offset, len);
-}
-
-void
-clutter_input_method_request_surrounding (ClutterInputMethod *im)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_request_surrounding (priv->focus);
-}
-
-/**
- * clutter_input_method_set_preedit_text:
- * @im: a #ClutterInputMethod
- * @preedit: (nullable): the preedit text, or %NULL
- * @cursor: the cursor
- *
- * Sets the preedit text on the current input focus.
- **/
-void
-clutter_input_method_set_preedit_text (ClutterInputMethod *im,
-                                       const gchar        *preedit,
-                                       guint               cursor)
-{
-  ClutterInputMethodPrivate *priv;
-
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  priv = clutter_input_method_get_instance_private (im);
-  if (priv->focus)
-    clutter_input_focus_set_preedit_text (priv->focus, preedit, cursor);
-}
-
-void
-clutter_input_method_notify_key_event (ClutterInputMethod *im,
-                                       const ClutterEvent *event,
-                                       gboolean            filtered)
-{
-  if (!filtered)
-    {
-      ClutterEvent *copy;
-
-      /* XXX: we rely on the IM implementation to notify back of
-       * key events in the exact same order they were given.
-       */
-      copy = clutter_event_copy (event);
-      clutter_event_set_flags (copy, clutter_event_get_flags (event) |
-                               CLUTTER_EVENT_FLAG_INPUT_METHOD);
-      clutter_event_set_source_device (copy, clutter_event_get_device (copy));
-      clutter_event_put (copy);
-      clutter_event_free (copy);
-    }
-}
-
-void
-clutter_input_method_toggle_input_panel (ClutterInputMethod *im)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_signal_emit (im, signals[INPUT_PANEL_STATE], 0,
-                 CLUTTER_INPUT_PANEL_STATE_TOGGLE);
-}
-
-void
-clutter_input_method_reset (ClutterInputMethod *im)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->reset (im);
-}
-
-void
-clutter_input_method_set_cursor_location (ClutterInputMethod *im,
-                                          const ClutterRect  *rect)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->set_cursor_location (im, rect);
-
-  g_signal_emit (im, signals[CURSOR_LOCATION_CHANGED], 0, rect);
-}
-
-void
-clutter_input_method_set_surrounding (ClutterInputMethod *im,
-                                      const gchar        *text,
-                                      guint               cursor,
-                                      guint               anchor)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  CLUTTER_INPUT_METHOD_GET_CLASS (im)->set_surrounding (im, text,
-                                                        cursor, anchor);
-}
-
-void
-clutter_input_method_set_content_hints (ClutterInputMethod           *im,
-                                        ClutterInputContentHintFlags  hints)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "content-hints", hints, NULL);
-}
-
-void
-clutter_input_method_set_content_purpose (ClutterInputMethod         *im,
-                                          ClutterInputContentPurpose  purpose)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "content-purpose", purpose, NULL);
-}
-
-void
-clutter_input_method_set_can_show_preedit (ClutterInputMethod *im,
-                                           gboolean            can_show_preedit)
-{
-  g_return_if_fail (CLUTTER_IS_INPUT_METHOD (im));
-
-  g_object_set (G_OBJECT (im), "can-show-preedit", can_show_preedit, NULL);
-}
-
-gboolean
-clutter_input_method_filter_key_event (ClutterInputMethod    *im,
-                                       const ClutterKeyEvent *key)
-{
-  ClutterInputMethodClass *im_class = CLUTTER_INPUT_METHOD_GET_CLASS (im);
-
-  g_return_val_if_fail (CLUTTER_IS_INPUT_METHOD (im), FALSE);
-  g_return_val_if_fail (key != NULL, FALSE);
-
-  if (clutter_event_get_flags ((ClutterEvent *) key) & CLUTTER_EVENT_FLAG_INPUT_METHOD)
-    return FALSE;
-  if (!im_class->filter_key_event)
-    return FALSE;
-
-  return im_class->filter_key_event (im, (const ClutterEvent *) key);
-}
--- a/clutter/clutter/clutter-input-method.h
+++ b/clutter/clutter/clutter-input-method.h
@@ -1,88 +0,0 @@
-/*
- * Copyright (C) 2017,2018 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- * Author: Carlos Garnacho <carlosg@gnome.org>
- */
-
-#ifndef __CLUTTER_INPUT_METHOD_H__
-#define __CLUTTER_INPUT_METHOD_H__
-
-#include <clutter/clutter.h>
-
-#define CLUTTER_TYPE_INPUT_METHOD (clutter_input_method_get_type ())
-
-CLUTTER_AVAILABLE_IN_MUTTER
-G_DECLARE_DERIVABLE_TYPE (ClutterInputMethod, clutter_input_method,
-                          CLUTTER, INPUT_METHOD, GObject)
-
-typedef struct _ClutterInputMethodClass ClutterInputMethodClass;
-
-struct _ClutterInputMethodClass
-{
-  GObjectClass parent_class;
-
-  void (* focus_in) (ClutterInputMethod *im,
-                     ClutterInputFocus  *actor);
-  void (* focus_out) (ClutterInputMethod *im);
-
-  void (* reset) (ClutterInputMethod *im);
-
-  void (* set_cursor_location) (ClutterInputMethod          *im,
-                                const ClutterRect           *rect);
-  void (* set_surrounding) (ClutterInputMethod *im,
-                            const gchar        *text,
-                            guint               cursor,
-                            guint               anchor);
-  void (* update_content_hints) (ClutterInputMethod           *im,
-                                 ClutterInputContentHintFlags  hint);
-  void (* update_content_purpose) (ClutterInputMethod         *im,
-                                   ClutterInputContentPurpose  purpose);
-
-  gboolean (* filter_key_event) (ClutterInputMethod *im,
-                                 const ClutterEvent *key);
-};
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_focus_in  (ClutterInputMethod *im,
-                                     ClutterInputFocus  *focus);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_focus_out (ClutterInputMethod *im);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_commit (ClutterInputMethod *im,
-                                  const gchar        *text);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_delete_surrounding (ClutterInputMethod *im,
-                                              guint               offset,
-                                              guint               len);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_request_surrounding (ClutterInputMethod *im);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_set_preedit_text (ClutterInputMethod *im,
-                                            const gchar        *preedit,
-                                            guint               cursor);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_notify_key_event (ClutterInputMethod *im,
-                                            const ClutterEvent *event,
-                                            gboolean            filtered);
-CLUTTER_AVAILABLE_IN_MUTTER
-void clutter_input_method_request_toggle_input_panel (ClutterInputMethod *im);
-
-#endif /* __CLUTTER_INPUT_METHOD_H__ */
--- a/clutter/clutter/clutter-main.c
+++ b/clutter/clutter/clutter-main.c
@@ -2089,21 +2089,6 @@ emit_keyboard_event (ClutterEvent       *event,
    }
 }

-static inline void
-process_key_event (ClutterEvent       *event,
-                   ClutterInputDevice *device)
-{
-  ClutterInputDeviceClass *device_class = CLUTTER_INPUT_DEVICE_GET_CLASS (device);
-
-  if (device_class->process_kbd_a11y_event)
-    {
-      device_class->process_kbd_a11y_event (event, device, emit_keyboard_event);
-      return;
-    }
-
-  emit_keyboard_event (event, device);
-}
-
 static gboolean
 is_off_stage (ClutterActor *stage,
              gfloat        x,
@@ -2191,7 +2176,7 @@ _clutter_process_event_details (ClutterActor        *stage,
                }
            }

-          process_key_event (event, device);
+          emit_keyboard_event (event, device);
        }
        break;

--- a/clutter/clutter/clutter-stage.c
+++ b/clutter/clutter/clutter-stage.c
@@ -1486,8 +1486,7 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
                priv->viewport[1] * fb_scale - viewport_offset_y,
                priv->viewport[2] * fb_scale,
                priv->viewport[3] * fb_scale);
-  cogl_framebuffer_set_viewport (fb,
-                                 priv->viewport[0] * fb_scale - viewport_offset_x,
+  cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
                     priv->viewport[1] * fb_scale - viewport_offset_y,
                     priv->viewport[2] * fb_scale,
                     priv->viewport[3] * fb_scale);
@@ -3618,7 +3617,6 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
                                     ClutterStageView *view)
 {
  ClutterStagePrivate *priv = stage->priv;
-  CoglFramebuffer *fb = clutter_stage_view_get_framebuffer (view);

  if (clutter_stage_view_is_dirty_viewport (view))
    {
@@ -3639,8 +3637,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,

      viewport_offset_x = view_layout.x * fb_scale;
      viewport_offset_y = view_layout.y * fb_scale;
-      cogl_framebuffer_set_viewport (fb,
-                                     priv->viewport[0] * fb_scale - viewport_offset_x,
+      cogl_set_viewport (priv->viewport[0] * fb_scale - viewport_offset_x,
                         priv->viewport[1] * fb_scale - viewport_offset_y,
                         priv->viewport[2] * fb_scale,
                         priv->viewport[3] * fb_scale);
@@ -3682,7 +3679,7 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,

  if (clutter_stage_view_is_dirty_projection (view))
    {
-      cogl_framebuffer_set_projection_matrix (fb, &priv->projection);
+      cogl_set_projection_matrix (&priv->projection);

      clutter_stage_view_set_dirty_projection (view, FALSE);
    }
@@ -4729,8 +4726,8 @@ capture_view (ClutterStage          *stage,

  if (paint)
    {
-      cogl_push_framebuffer (framebuffer);
      _clutter_stage_maybe_setup_viewport (stage, view);
+      cogl_push_framebuffer (framebuffer);
      clutter_stage_do_paint_view (stage, view, rect);
    }

@@ -4832,8 +4829,8 @@ capture_view_into (ClutterStage          *stage,

  if (paint)
    {
-      cogl_push_framebuffer (framebuffer);
      _clutter_stage_maybe_setup_viewport (stage, view);
+      cogl_push_framebuffer (framebuffer);
      clutter_stage_do_paint_view (stage, view, rect);
    }

--- a/clutter/clutter/clutter-text.c
+++ b/clutter/clutter/clutter-text.c
@@ -63,7 +63,6 @@
 #include "clutter-units.h"
 #include "clutter-paint-volume-private.h"
 #include "clutter-scriptable.h"
-#include "clutter-input-focus.h"

 /* cursor width in pixels */
 #define DEFAULT_CURSOR_SIZE     2
@@ -99,12 +98,6 @@ struct _LayoutCache
  guint age;
 };

-struct _ClutterTextInputFocus
-{
-  ClutterInputFocus parent_instance;
-  ClutterText *text;
-};
-
 struct _ClutterTextPrivate
 {
  PangoFontDescription *font_desc;
@@ -183,10 +176,6 @@ struct _ClutterTextPrivate
  /* Signal handler for when the :text-direction changes */
  guint direction_changed_id;

-  ClutterInputFocus *input_focus;
-  ClutterInputContentHintFlags input_hints;
-  ClutterInputContentPurpose input_purpose;
-
  /* bitfields */
  guint alignment               : 2;
  guint wrap                    : 1;
@@ -247,8 +236,6 @@ enum
  PROP_SINGLE_LINE_MODE,
  PROP_SELECTED_TEXT_COLOR,
  PROP_SELECTED_TEXT_COLOR_SET,
-  PROP_INPUT_HINTS,
-  PROP_INPUT_PURPOSE,

  PROP_LAST
 };
@@ -282,112 +269,6 @@ static const ClutterColor default_selected_text_color = {   0,   0,   0, 255 };
 static ClutterAnimatableIface *parent_animatable_iface = NULL;
 static ClutterScriptableIface *parent_scriptable_iface = NULL;

-/* ClutterTextInputFocus */
-#define CLUTTER_TYPE_TEXT_INPUT_FOCUS (clutter_text_input_focus_get_type ())
-
-G_DECLARE_FINAL_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
-                      CLUTTER, TEXT_INPUT_FOCUS, ClutterInputFocus)
-G_DEFINE_TYPE (ClutterTextInputFocus, clutter_text_input_focus,
-               CLUTTER_TYPE_INPUT_FOCUS)
-
-static void
-clutter_text_input_focus_request_surrounding (ClutterInputFocus *focus)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-  ClutterTextBuffer *buffer;
-  const gchar *text;
-  gint anchor_pos, cursor_pos;
-
-  buffer = clutter_text_get_buffer (clutter_text);
-  text = clutter_text_buffer_get_text (buffer);
-
-  cursor_pos = clutter_text_get_cursor_position (clutter_text);
-  if (cursor_pos < 0)
-    cursor_pos = clutter_text_buffer_get_length (buffer);
-
-  anchor_pos = clutter_text_get_selection_bound (clutter_text);
-  if (anchor_pos < 0)
-    anchor_pos = cursor_pos;
-
-  clutter_input_focus_set_surrounding (focus, text,
-                                       g_utf8_offset_to_pointer (text, cursor_pos) - text,
-                                       g_utf8_offset_to_pointer (text, anchor_pos) - text);
-}
-
-static void
-clutter_text_input_focus_delete_surrounding (ClutterInputFocus *focus,
-                                             guint              offset,
-                                             guint              len)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    clutter_text_delete_text (clutter_text, offset, len);
-}
-
-static void
-clutter_text_input_focus_commit_text (ClutterInputFocus *focus,
-                                      const gchar       *text)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    {
-      clutter_text_delete_selection (clutter_text);
-      clutter_text_insert_text (clutter_text, text,
-                                clutter_text_get_cursor_position (clutter_text));
-      clutter_text_set_preedit_string (clutter_text, NULL, NULL, 0);
-    }
-}
-
-static void
-clutter_text_input_focus_set_preedit_text (ClutterInputFocus *focus,
-                                           const gchar       *preedit_text,
-                                           guint              cursor_pos)
-{
-  ClutterText *clutter_text = CLUTTER_TEXT_INPUT_FOCUS (focus)->text;
-
-  if (clutter_text_get_editable (clutter_text))
-    {
-      PangoAttrList *list;
-
-      list = pango_attr_list_new ();
-      pango_attr_list_insert (list, pango_attr_underline_new (PANGO_UNDERLINE_SINGLE));
-      clutter_text_set_preedit_string (clutter_text,
-                                       preedit_text, list,
-                                       cursor_pos);
-      pango_attr_list_unref (list);
-    }
-}
-
-static void
-clutter_text_input_focus_class_init (ClutterTextInputFocusClass *klass)
-{
-  ClutterInputFocusClass *focus_class = CLUTTER_INPUT_FOCUS_CLASS (klass);
-
-  focus_class->request_surrounding = clutter_text_input_focus_request_surrounding;
-  focus_class->delete_surrounding = clutter_text_input_focus_delete_surrounding;
-  focus_class->commit_text = clutter_text_input_focus_commit_text;
-  focus_class->set_preedit_text = clutter_text_input_focus_set_preedit_text;
-}
-
-static void
-clutter_text_input_focus_init (ClutterTextInputFocus *focus)
-{
-}
-
-static ClutterInputFocus *
-clutter_text_input_focus_new (ClutterText *text)
-{
-  ClutterTextInputFocus *focus;
-
-  focus = g_object_new (CLUTTER_TYPE_TEXT_INPUT_FOCUS, NULL);
-  focus->text = text;
-
-  return CLUTTER_INPUT_FOCUS (focus);
-}
-
-/* ClutterText */
 static void clutter_scriptable_iface_init (ClutterScriptableIface *iface);
 static void clutter_animatable_iface_init (ClutterAnimatableIface *iface);

@@ -1128,22 +1009,6 @@ clutter_text_position_to_coords (ClutterText *self,
  return TRUE;
 }

-static inline void
-update_cursor_location (ClutterText *self)
-{
-  ClutterTextPrivate *priv = self->priv;
-  ClutterRect rect;
-  float x, y;
-
-  if (!priv->editable)
-    return;
-
-  rect = priv->cursor_rect;
-  clutter_actor_get_transformed_position (CLUTTER_ACTOR (self), &x, &y);
-  clutter_rect_offset (&rect, x, y);
-  clutter_input_focus_set_cursor_location (priv->input_focus, &rect);
-}
-
 static inline void
 clutter_text_ensure_cursor_position (ClutterText *self)
 {
@@ -1192,8 +1057,6 @@ clutter_text_ensure_cursor_position (ClutterText *self)
      g_signal_emit (self, text_signals[CURSOR_EVENT], 0, &cursor_pos);

      g_signal_emit (self, text_signals[CURSOR_CHANGED], 0);
-
-      update_cursor_location (self);
    }
 }

@@ -1640,8 +1503,6 @@ clutter_text_finalize (GObject *gobject)
  clutter_text_set_buffer (self, NULL);
  g_free (priv->font_name);

-  g_clear_object (&priv->input_focus);
-
  G_OBJECT_CLASS (clutter_text_parent_class)->finalize (gobject);
 }

@@ -1998,7 +1859,6 @@ clutter_text_press (ClutterActor *actor,
    return CLUTTER_EVENT_PROPAGATE;

  clutter_actor_grab_key_focus (actor);
-  clutter_input_focus_request_toggle_input_panel (priv->input_focus);

  /* if the actor is empty we just reset everything and not
   * set up the dragging of the selection since there's nothing
@@ -2224,17 +2084,10 @@ clutter_text_key_press (ClutterActor    *actor,
  pool = clutter_binding_pool_find (g_type_name (CLUTTER_TYPE_TEXT));
  g_assert (pool != NULL);

-  if (!(event->flags & CLUTTER_EVENT_FLAG_INPUT_METHOD) &&
-      clutter_input_focus_is_focused (priv->input_focus) &&
-      clutter_input_focus_filter_key_event (priv->input_focus, event))
-    return CLUTTER_EVENT_STOP;
-
  /* we allow passing synthetic events that only contain
-   * the Unicode value and not the key symbol, unless they
-   * contain the input method flag.
+   * the Unicode value and not the key symbol
   */
-  if (event->keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC) &&
-      !(event->flags & CLUTTER_EVENT_FLAG_INPUT_METHOD))
+  if (event->keyval == 0 && (event->flags & CLUTTER_EVENT_FLAG_SYNTHETIC))
    res = FALSE;
  else
    res = clutter_binding_pool_activate (pool, event->keyval,
@@ -2288,20 +2141,6 @@ clutter_text_key_press (ClutterActor    *actor,
  return CLUTTER_EVENT_PROPAGATE;
 }

-static gboolean
-clutter_text_key_release (ClutterActor    *actor,
-                          ClutterKeyEvent *event)
-{
-  ClutterText *self = CLUTTER_TEXT (actor);
-  ClutterTextPrivate *priv = self->priv;
-
-  if (clutter_input_focus_is_focused (priv->input_focus) &&
-      clutter_input_focus_filter_key_event (priv->input_focus, event))
-    return CLUTTER_EVENT_STOP;
-
-  return CLUTTER_EVENT_PROPAGATE;
-}
-
 static void
 clutter_text_compute_layout_offsets (ClutterText           *self,
                                     PangoLayout           *layout,
@@ -2824,18 +2663,6 @@ static void
 clutter_text_key_focus_in (ClutterActor *actor)
 {
  ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);
-
-  if (method && priv->editable)
-    {
-      clutter_input_method_focus_in (method, priv->input_focus);
-      clutter_input_focus_set_content_purpose (priv->input_focus,
-					       priv->input_purpose);
-      clutter_input_focus_set_content_hints (priv->input_focus,
-					     priv->input_hints);
-      update_cursor_location (CLUTTER_TEXT (actor));
-    }

  priv->has_focus = TRUE;

@@ -2846,17 +2673,9 @@ static void
 clutter_text_key_focus_out (ClutterActor *actor)
 {
  ClutterTextPrivate *priv = CLUTTER_TEXT (actor)->priv;
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);

  priv->has_focus = FALSE;

-  if (priv->editable && clutter_input_focus_is_focused (priv->input_focus))
-    {
-      clutter_text_set_preedit_string (CLUTTER_TEXT (actor), NULL, NULL, 0);
-      clutter_input_method_focus_out (method);
-    }
-
  clutter_text_queue_redraw (actor);
 }

@@ -3550,7 +3369,6 @@ clutter_text_class_init (ClutterTextClass *klass)
  actor_class->get_preferred_height = clutter_text_get_preferred_height;
  actor_class->allocate = clutter_text_allocate;
  actor_class->key_press_event = clutter_text_key_press;
-  actor_class->key_release_event = clutter_text_key_release;
  actor_class->button_press_event = clutter_text_button_press;
  actor_class->button_release_event = clutter_text_button_release;
  actor_class->motion_event = clutter_text_motion;
@@ -4051,22 +3869,6 @@ clutter_text_class_init (ClutterTextClass *klass)
  obj_props[PROP_SELECTED_TEXT_COLOR_SET] = pspec;
  g_object_class_install_property (gobject_class, PROP_SELECTED_TEXT_COLOR_SET, pspec);

-  pspec = g_param_spec_flags ("input-hints",
-                              P_("Input hints"),
-                              P_("Input hints"),
-                              CLUTTER_TYPE_INPUT_CONTENT_HINT_FLAGS,
-                              0, CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_INPUT_HINTS] = pspec;
-  g_object_class_install_property (gobject_class, PROP_INPUT_HINTS, pspec);
-
-  pspec = g_param_spec_enum ("input-purpose",
-                             P_("Input purpose"),
-                             P_("Input purpose"),
-                             CLUTTER_TYPE_INPUT_CONTENT_PURPOSE,
-                             0, CLUTTER_PARAM_READWRITE);
-  obj_props[PROP_INPUT_PURPOSE] = pspec;
-  g_object_class_install_property (gobject_class, PROP_INPUT_PURPOSE, pspec);
-
  /**
   * ClutterText::text-changed:
   * @self: the #ClutterText that emitted the signal
@@ -4367,8 +4169,6 @@ clutter_text_init (ClutterText *self)
    g_signal_connect (self, "notify::text-direction",
                      G_CALLBACK (clutter_text_direction_changed_cb),
                      NULL);
-
-  priv->input_focus = clutter_text_input_focus_new (self);
 }

 /**
@@ -4515,27 +4315,6 @@ buffer_deleted_text (ClutterTextBuffer *buffer,
    }
 }

-static void
-clutter_text_queue_redraw_or_relayout (ClutterText *self)
-{
-  ClutterActor *actor = CLUTTER_ACTOR (self);
-  gfloat preferred_width;
-  gfloat preferred_height;
-
-  clutter_text_dirty_cache (self);
-
-  /* we're using our private implementations here to avoid the caching done by ClutterActor */
-  clutter_text_get_preferred_width (actor, -1, NULL, &preferred_width);
-  clutter_text_get_preferred_height (actor, preferred_width, NULL, &preferred_height);
-
-  if (clutter_actor_has_allocation (actor) &&
-      (fabsf (preferred_width - clutter_actor_get_width (actor)) > 0.001 ||
-       fabsf (preferred_height - clutter_actor_get_height (actor)) > 0.001))
-    clutter_actor_queue_relayout (actor);
-  else
-    clutter_text_queue_redraw (actor);
-}
-
 static void
 buffer_notify_text (ClutterTextBuffer *buffer,
                    GParamSpec        *spec,
@@ -4543,7 +4322,9 @@ buffer_notify_text (ClutterTextBuffer *buffer,
 {
  g_object_freeze_notify (G_OBJECT (self));

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

  g_signal_emit (self, text_signals[TEXT_CHANGED], 0);
  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_TEXT]);
@@ -4678,8 +4459,6 @@ void
 clutter_text_set_editable (ClutterText *self,
                           gboolean     editable)
 {
-  ClutterBackend *backend = clutter_get_default_backend ();
-  ClutterInputMethod *method = clutter_backend_get_input_method (backend);
  ClutterTextPrivate *priv;

  g_return_if_fail (CLUTTER_IS_TEXT (self));
@@ -4690,14 +4469,6 @@ clutter_text_set_editable (ClutterText *self,
    {
      priv->editable = editable;

-      if (method)
-        {
-          if (!priv->editable && clutter_input_focus_is_focused (priv->input_focus))
-            clutter_input_method_focus_out (method);
-          else if (priv->has_focus)
-            clutter_input_method_focus_in (method, priv->input_focus);
-        }
-
      clutter_text_queue_redraw (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_EDITABLE]);
@@ -4895,7 +4666,8 @@ clutter_text_set_cursor_visible (ClutterText *self,
    {
      priv->cursor_visible = cursor_visible;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_CURSOR_VISIBLE]);
    }
@@ -5796,7 +5568,9 @@ clutter_text_set_line_alignment (ClutterText    *self,
    {
      priv->alignment = alignment;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_LINE_ALIGNMENT]);
    }
@@ -5851,7 +5625,9 @@ clutter_text_set_use_markup (ClutterText *self,
  if (setting)
    clutter_text_set_markup_internal (self, text);

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }

 /**
@@ -5898,7 +5674,9 @@ clutter_text_set_justify (ClutterText *self,
    {
      priv->justify = justify;

-      clutter_text_queue_redraw_or_relayout (self);
+      clutter_text_dirty_cache (self);
+
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (self));

      g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_JUSTIFY]);
    }
@@ -6465,7 +6243,8 @@ clutter_text_set_preedit_string (ClutterText   *self,
      priv->preedit_set = TRUE;
    }

-  clutter_text_queue_redraw_or_relayout (self);
+  clutter_text_dirty_cache (self);
+  clutter_actor_queue_relayout (CLUTTER_ACTOR (self));
 }


@@ -6519,53 +6298,3 @@ clutter_text_get_cursor_rect (ClutterText *self,

  *rect = self->priv->cursor_rect;
 }
-
-void
-clutter_text_set_input_hints (ClutterText                  *self,
-                              ClutterInputContentHintFlags  hints)
-{
-  g_return_if_fail (CLUTTER_IS_TEXT (self));
-
-  self->priv->input_hints = hints;
-
-  if (clutter_input_focus_is_focused (self->priv->input_focus))
-    clutter_input_focus_set_content_hints (self->priv->input_focus, hints);
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_INPUT_HINTS]);
-}
-
-ClutterInputContentHintFlags
-clutter_text_get_input_hints (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
-
-  return self->priv->input_hints;
-}
-
-void
-clutter_text_set_input_purpose (ClutterText                *self,
-                                ClutterInputContentPurpose  purpose)
-{
-  g_return_if_fail (CLUTTER_IS_TEXT (self));
-
-  self->priv->input_purpose = purpose;
-
-  if (clutter_input_focus_is_focused (self->priv->input_focus))
-    clutter_input_focus_set_content_purpose (self->priv->input_focus, purpose);
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_INPUT_PURPOSE]);
-}
-
-ClutterInputContentPurpose
-clutter_text_get_input_purpose (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), 0);
-
-  return self->priv->input_purpose;
-}
-
-gboolean
-clutter_text_has_preedit (ClutterText *self)
-{
-  g_return_val_if_fail (CLUTTER_IS_TEXT (self), FALSE);
-
-  return self->priv->preedit_set;
-}
--- a/clutter/clutter/clutter-text.h
+++ b/clutter/clutter/clutter-text.h
@@ -302,20 +302,6 @@ void                  clutter_text_get_layout_offsets   (ClutterText           *
                                                         gint                  *x,
                                                         gint                  *y);

-CLUTTER_AVAILABLE_IN_MUTTER
-void                  clutter_text_set_input_hints (ClutterText                  *self,
-                                                    ClutterInputContentHintFlags  hints);
-CLUTTER_AVAILABLE_IN_MUTTER
-void                  clutter_text_set_input_purpose (ClutterText                *self,
-                                                      ClutterInputContentPurpose  purpose);
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputContentHintFlags clutter_text_get_input_hints (ClutterText *self);
-CLUTTER_AVAILABLE_IN_MUTTER
-ClutterInputContentPurpose clutter_text_get_input_purpose (ClutterText *self);
-
-CLUTTER_AVAILABLE_IN_MUTTER
-gboolean              clutter_text_has_preedit (ClutterText *self);
-
 G_END_DECLS

 #endif /* __CLUTTER_TEXT_H__ */
--- a/clutter/clutter/clutter-types.h
+++ b/clutter/clutter/clutter-types.h
@@ -97,9 +97,6 @@ typedef struct _ClutterInputDeviceTool          ClutterInputDeviceTool;
 typedef struct _ClutterInputDevice              ClutterInputDevice;
 typedef struct _ClutterVirtualInputDevice       ClutterVirtualInputDevice;

-typedef struct _ClutterInputMethod              ClutterInputMethod;
-typedef struct _ClutterInputFocus               ClutterInputFocus;
-
 typedef CoglMatrix                              ClutterMatrix;

 typedef union _ClutterEvent                     ClutterEvent;
--- a/clutter/clutter/clutter-virtual-input-device.c
+++ b/clutter/clutter/clutter-virtual-input-device.c
@@ -128,61 +128,6 @@ clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *
                                 direction, scroll_source);
 }

-void
-clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                       uint64_t                   time_us,
-                                                       double                     dx,
-                                                       double                     dy,
-                                                       ClutterScrollSource        scroll_source,
-                                                       ClutterScrollFinishFlags   finish_flags)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_scroll_continuous (virtual_device, time_us,
-                                   dx, dy, scroll_source, finish_flags);
-}
-
-void
-clutter_virtual_input_device_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                uint64_t                   time_us,
-                                                int                        slot,
-                                                double                     x,
-                                                double                     y)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_down (virtual_device, time_us,
-                            slot, x, y);
-}
-
-void
-clutter_virtual_input_device_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  int                        slot,
-                                                  double                     x,
-                                                  double                     y)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_motion (virtual_device, time_us,
-                              slot, x, y);
-}
-
-void
-clutter_virtual_input_device_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                              uint64_t                   time_us,
-                                              int                        slot)
-{
-  ClutterVirtualInputDeviceClass *klass =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
-
-  klass->notify_touch_up (virtual_device, time_us,
-                          slot);
-}
-
 /**
 * clutter_virtual_input_device_get_manager:
 * @virtual_device: a virtual device
--- a/clutter/clutter/clutter-virtual-input-device.h
+++ b/clutter/clutter/clutter-virtual-input-device.h
@@ -81,29 +81,6 @@ struct _ClutterVirtualInputDeviceClass
                                  uint64_t                   time_us,
                                  ClutterScrollDirection     direction,
                                  ClutterScrollSource        scroll_source);
-
-  void (*notify_scroll_continuous) (ClutterVirtualInputDevice *virtual_device,
-                                    uint64_t                   time_us,
-                                    double                     dx,
-                                    double                     dy,
-                                    ClutterScrollSource        scroll_source,
-                                    ClutterScrollFinishFlags   finish_flags);
-
-  void (*notify_touch_down) (ClutterVirtualInputDevice *virtual_device,
-                             uint64_t                   time_us,
-                             int                        slot,
-                             double                     x,
-                             double                     y);
-
-  void (*notify_touch_motion) (ClutterVirtualInputDevice *virtual_device,
-                               uint64_t                   time_us,
-                               int                        slot,
-                               double                     x,
-                               double                     y);
-
-  void (*notify_touch_up) (ClutterVirtualInputDevice *virtual_device,
-                           uint64_t                   time_us,
-                           int                        slot);
 };

 CLUTTER_AVAILABLE_IN_ALL
@@ -142,32 +119,6 @@ void clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDev
                                                          ClutterScrollDirection     direction,
                                                          ClutterScrollSource        scroll_source);

-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                            uint64_t                   time_us,
-                                                            double                     dx,
-                                                            double                     dy,
-                                                            ClutterScrollSource        scroll_source,
-                                                            ClutterScrollFinishFlags   finish_flags);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                     uint64_t                   time_us,
-                                                     int                        slot,
-                                                     double                     x,
-                                                     double                     y);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                       uint64_t                   time_us,
-                                                       int                        slot,
-                                                       double                     x,
-                                                       double                     y);
-
-CLUTTER_AVAILABLE_IN_ALL
-void clutter_virtual_input_device_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                   uint64_t                   time_us,
-                                                   int                        slot);

 CLUTTER_AVAILABLE_IN_ALL
 ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -72,8 +72,6 @@
 #include "clutter-image.h"
 #include "clutter-input-device.h"
 #include "clutter-input-device-tool.h"
-#include "clutter-input-method.h"
-#include "clutter-input-focus.h"
 #include "clutter-interval.h"
 #include "clutter-keyframe-transition.h"
 #include "clutter-keysyms.h"
--- a/clutter/clutter/egl/clutter-backend-eglnative.c
+++ b/clutter/clutter/egl/clutter-backend-eglnative.c
@@ -48,7 +48,6 @@
 #include "clutter-private.h"
 #include "clutter-main.h"
 #include "clutter-stage-private.h"
-#include "clutter-settings-private.h"

 #ifdef COGL_HAS_EGL_SUPPORT
 #include "clutter-egl.h"
@@ -61,8 +60,6 @@ clutter_backend_egl_native_dispose (GObject *gobject)
 {
  ClutterBackendEglNative *backend_egl_native = CLUTTER_BACKEND_EGL_NATIVE (gobject);

-  g_clear_object (&backend_egl_native->xsettings);
-
  if (backend_egl_native->event_timer != NULL)
    {
      g_timer_destroy (backend_egl_native->event_timer);
@@ -80,181 +77,9 @@ clutter_backend_egl_native_class_init (ClutterBackendEglNativeClass *klass)
  gobject_class->dispose = clutter_backend_egl_native_dispose;
 }

-typedef struct
-{
-  cairo_antialias_t cairo_antialias;
-  gint clutter_font_antialias;
-
-  cairo_hint_style_t cairo_hint_style;
-  const char *clutter_font_hint_style;
-
-  cairo_subpixel_order_t cairo_subpixel_order;
-  const char *clutter_font_subpixel_order;
-} FontSettings;
-
-static void
-get_font_gsettings (GSettings    *xsettings,
-                    FontSettings *output)
-{
-  /* org.gnome.settings-daemon.GsdFontAntialiasingMode */
-  static const struct
-  {
-    cairo_antialias_t cairo_antialias;
-    gint clutter_font_antialias;
-  }
-  antialiasings[] =
-  {
-    /* none=0      */ {CAIRO_ANTIALIAS_NONE,     0},
-    /* grayscale=1 */ {CAIRO_ANTIALIAS_GRAY,     1},
-    /* rgba=2      */ {CAIRO_ANTIALIAS_SUBPIXEL, 1},
-  };
-
-  /* org.gnome.settings-daemon.GsdFontHinting */
-  static const struct
-  {
-    cairo_hint_style_t cairo_hint_style;
-    const char *clutter_font_hint_style;
-  }
-  hintings[] =
-  {
-    /* none=0   */ {CAIRO_HINT_STYLE_NONE,   "hintnone"},
-    /* slight=1 */ {CAIRO_HINT_STYLE_SLIGHT, "hintslight"},
-    /* medium=2 */ {CAIRO_HINT_STYLE_MEDIUM, "hintmedium"},
-    /* full=3   */ {CAIRO_HINT_STYLE_FULL,   "hintfull"},
-  };
-
-  /* org.gnome.settings-daemon.GsdFontRgbaOrder */
-  static const struct
-  {
-    cairo_subpixel_order_t cairo_subpixel_order;
-    const char *clutter_font_subpixel_order;
-  }
-  rgba_orders[] =
-  {
-    /* rgba=0 */ {CAIRO_SUBPIXEL_ORDER_RGB,  "rgb"}, /* XXX what is 'rgba'? */
-    /* rgb=1  */ {CAIRO_SUBPIXEL_ORDER_RGB,  "rgb"},
-    /* bgr=2  */ {CAIRO_SUBPIXEL_ORDER_BGR,  "bgr"},
-    /* vrgb=3 */ {CAIRO_SUBPIXEL_ORDER_VRGB, "vrgb"},
-    /* vbgr=4 */ {CAIRO_SUBPIXEL_ORDER_VBGR, "vbgr"},
-  };
-  guint i;
-
-  i = g_settings_get_enum (xsettings, "hinting");
-  if (i < G_N_ELEMENTS (hintings))
-    {
-      output->cairo_hint_style = hintings[i].cairo_hint_style;
-      output->clutter_font_hint_style = hintings[i].clutter_font_hint_style;
-    }
-  else
-    {
-      output->cairo_hint_style = CAIRO_HINT_STYLE_DEFAULT;
-      output->clutter_font_hint_style = NULL;
-    }
-
-  i = g_settings_get_enum (xsettings, "antialiasing");
-  if (i < G_N_ELEMENTS (antialiasings))
-    {
-      output->cairo_antialias = antialiasings[i].cairo_antialias;
-      output->clutter_font_antialias = antialiasings[i].clutter_font_antialias;
-    }
-  else
-    {
-      output->cairo_antialias = CAIRO_ANTIALIAS_DEFAULT;
-      output->clutter_font_antialias = -1;
-    }
-
-  i = g_settings_get_enum (xsettings, "rgba-order");
-  if (i < G_N_ELEMENTS (rgba_orders))
-    {
-      output->cairo_subpixel_order = rgba_orders[i].cairo_subpixel_order;
-      output->clutter_font_subpixel_order = rgba_orders[i].clutter_font_subpixel_order;
-    }
-  else
-    {
-      output->cairo_subpixel_order = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-      output->clutter_font_subpixel_order = NULL;
-    }
-
-  if (output->cairo_antialias == CAIRO_ANTIALIAS_GRAY)
-    output->clutter_font_subpixel_order = "none";
-}
-
-static void
-init_font_options (ClutterBackendEglNative *backend_egl_native)
-{
-  GSettings *xsettings = backend_egl_native->xsettings;
-  cairo_font_options_t *options = cairo_font_options_create ();
-  FontSettings fs;
-
-  get_font_gsettings (xsettings, &fs);
-
-  cairo_font_options_set_hint_style (options, fs.cairo_hint_style);
-  cairo_font_options_set_antialias (options, fs.cairo_antialias);
-  cairo_font_options_set_subpixel_order (options, fs.cairo_subpixel_order);
-
-  clutter_backend_set_font_options (CLUTTER_BACKEND (backend_egl_native),
-                                    options);
-
-  cairo_font_options_destroy (options);
-}
-
-static gboolean
-on_xsettings_change_event (GSettings *xsettings,
-                           gpointer   keys,
-                           gint       n_keys,
-                           gpointer   user_data)
-{
-  /*
-   * A simpler alternative to this function that does not update the screen
-   * immediately (like macOS :P):
-   *
-   *   init_font_options (CLUTTER_BACKEND_EGL_NATIVE (user_data));
-   *
-   * which has the added benefit of eliminating the need for all the
-   * FontSettings.clutter_ fields. However the below approach is better for
-   * testing settings and more consistent with the existing x11 backend...
-   */
-  ClutterSettings *csettings = clutter_settings_get_default ();
-  FontSettings fs;
-  gint hinting;
-
-  get_font_gsettings (xsettings, &fs);
-  hinting = fs.cairo_hint_style == CAIRO_HINT_STYLE_NONE ? 0 : 1;
-  g_object_set (csettings,
-                "font-hinting",        hinting,
-                "font-hint-style",     fs.clutter_font_hint_style,
-                "font-antialias",      fs.clutter_font_antialias,
-                "font-subpixel-order", fs.clutter_font_subpixel_order,
-                NULL);
-
-  return FALSE;
-}
-
 static void
 clutter_backend_egl_native_init (ClutterBackendEglNative *backend_egl_native)
 {
-  static const gchar xsettings_path[] = "org.gnome.settings-daemon.plugins.xsettings";
-  GSettingsSchemaSource *source = g_settings_schema_source_get_default ();
-  GSettingsSchema *schema = g_settings_schema_source_lookup (source,
-                                                             xsettings_path,
-                                                             FALSE);
-
-  if (!schema)
-    {
-      g_warning ("Failed to find schema: %s", xsettings_path);
-    }
-  else
-    {
-      backend_egl_native->xsettings = g_settings_new_full (schema, NULL, NULL);
-      if (backend_egl_native->xsettings)
-        {
-          init_font_options (backend_egl_native);
-          g_signal_connect (backend_egl_native->xsettings, "change-event",
-                            G_CALLBACK (on_xsettings_change_event),
-                            backend_egl_native);
-        }
-    }
-
  backend_egl_native->event_timer = g_timer_new ();
 }

--- a/clutter/clutter/egl/clutter-backend-eglnative.h
+++ b/clutter/clutter/egl/clutter-backend-eglnative.h
@@ -61,9 +61,6 @@ struct _ClutterBackendEglNative

  /* event timer */
  GTimer *event_timer;
-
-  /* "xsettings" is still the defacto place for Xft settings, even in Wayland */
-  GSettings *xsettings;
 };

 struct _ClutterBackendEglNativeClass
--- a/clutter/clutter/evdev/clutter-device-manager-evdev.c
+++ b/clutter/clutter/evdev/clutter-device-manager-evdev.c
@@ -397,6 +397,54 @@ notify_relative_tool_motion (ClutterInputDevice *input_device,
  queue_event (event);
 }

+static void
+notify_touch_event (ClutterInputDevice *input_device,
+		    ClutterEventType    evtype,
+		    guint64             time_us,
+		    gint32              slot,
+		    gdouble             x,
+		    gdouble             y)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  /* We can drop the event on the floor if no stage has been
+   * associated with the device yet. */
+  stage = _clutter_input_device_get_stage (input_device);
+  if (stage == NULL)
+    return;
+
+  device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (input_device);
+  seat = _clutter_input_device_evdev_get_seat (device_evdev);
+
+  event = clutter_event_new (evtype);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->touch.time = us2ms (time_us);
+  event->touch.stage = CLUTTER_STAGE (stage);
+  event->touch.device = seat->core_pointer;
+  event->touch.x = x;
+  event->touch.y = y;
+  clutter_input_device_evdev_translate_coordinates (input_device, stage,
+                                                    &event->touch.x,
+                                                    &event->touch.y);
+
+  /* "NULL" sequences are special cased in clutter */
+  event->touch.sequence = GINT_TO_POINTER (slot + 1);
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  if (evtype == CLUTTER_TOUCH_BEGIN ||
+      evtype == CLUTTER_TOUCH_UPDATE)
+    event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
+
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+
+  queue_event (event);
+}
+
 static void
 notify_pinch_gesture_event (ClutterInputDevice          *input_device,
                            ClutterTouchpadGesturePhase  phase,
@@ -793,12 +841,10 @@ evdev_add_device (ClutterDeviceManagerEvdev *manager_evdev,
      if (priv->main_seat->libinput_seat == NULL)
        seat = priv->main_seat;
      else
-        {
        seat = clutter_seat_evdev_new (manager_evdev);
-          priv->seats = g_slist_append (priv->seats, seat);
-        }

      clutter_seat_evdev_set_libinput_seat (seat, libinput_seat);
+      priv->seats = g_slist_append (priv->seats, seat);
    }

  device = _clutter_input_device_evdev_new (manager, seat, libinput_device);
@@ -921,6 +967,7 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  ClutterDeviceManagerEvdev *manager_evdev;
  ClutterDeviceManagerEvdevPrivate *priv;
  GSList *l;
+  GSList *device_it;

  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (manager);
  priv = manager_evdev->priv;
@@ -928,11 +975,15 @@ clutter_device_manager_evdev_get_device (ClutterDeviceManager *manager,
  for (l = priv->seats; l; l = l->next)
    {
      ClutterSeatEvdev *seat = l->data;
-      ClutterInputDevice *device = clutter_seat_evdev_get_device (seat, id);

-      if (device)
+      for (device_it = seat->devices; device_it; device_it = device_it->next)
+        {
+          ClutterInputDevice *device = device_it->data;
+
+          if (clutter_input_device_get_device_id (device) == id)
            return device;
        }
+    }

  return NULL;
 }
@@ -1201,7 +1252,6 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
  gboolean handled = TRUE;
  struct libinput_device *libinput_device = libinput_event_get_device(event);
  ClutterInputDevice *device;
-  ClutterInputDeviceEvdev *device_evdev;

  switch (libinput_event_get_type (event))
    {
@@ -1358,7 +1408,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,

    case LIBINPUT_EVENT_TOUCH_DOWN:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        double x, y;
        gfloat stage_width, stage_height;
@@ -1369,8 +1419,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

        stage = _clutter_input_device_get_stage (device);
        if (stage == NULL)
@@ -1379,31 +1428,25 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
        x = libinput_event_touch_get_x_transformed (touch_event,
                                                    stage_width);
        y = libinput_event_touch_get_y_transformed (touch_event,
                                                    stage_height);

-        touch_state =
-          clutter_input_device_evdev_acquire_touch_state (device_evdev,
-                                                          device_slot);
+        touch_state = clutter_seat_evdev_add_touch (seat, slot);
        touch_state->coords.x = x;
        touch_state->coords.y = y;

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_BEGIN,
-                                               time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
+        notify_touch_event (device, CLUTTER_TOUCH_BEGIN, time_us, slot,
+                             touch_state->coords.x, touch_state->coords.y);
        break;
      }

    case LIBINPUT_EVENT_TOUCH_UP:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        ClutterSeatEvdev *seat;
        ClutterTouchState *touch_state;
@@ -1411,30 +1454,22 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
-        touch_state =
-          clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                         device_slot);
-        if (!touch_state)
-          break;
+        touch_state = clutter_seat_evdev_get_touch (seat, slot);
+
+        notify_touch_event (device, CLUTTER_TOUCH_END, time_us, slot,
+			    touch_state->coords.x, touch_state->coords.y);
+        clutter_seat_evdev_remove_touch (seat, slot);

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_END, time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
-        clutter_input_device_evdev_release_touch_state (device_evdev,
-                                                        touch_state);
        break;
      }

    case LIBINPUT_EVENT_TOUCH_MOTION:
      {
-        int device_slot;
+        gint32 slot;
        guint64 time_us;
        double x, y;
        gfloat stage_width, stage_height;
@@ -1445,8 +1480,7 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
          libinput_event_get_touch_event (event);

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
-        seat = _clutter_input_device_evdev_get_seat (device_evdev);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));

        stage = _clutter_input_device_get_stage (device);
        if (stage == NULL)
@@ -1455,41 +1489,42 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
        stage_width = clutter_actor_get_width (CLUTTER_ACTOR (stage));
        stage_height = clutter_actor_get_height (CLUTTER_ACTOR (stage));

-        device_slot = libinput_event_touch_get_slot (touch_event);
+        slot = libinput_event_touch_get_slot (touch_event);
        time_us = libinput_event_touch_get_time_usec (touch_event);
        x = libinput_event_touch_get_x_transformed (touch_event,
                                                    stage_width);
        y = libinput_event_touch_get_y_transformed (touch_event,
                                                    stage_height);

-        touch_state =
-          clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                         device_slot);
-        if (!touch_state)
-          break;
-
+        touch_state = clutter_seat_evdev_get_touch (seat, slot);
        touch_state->coords.x = x;
        touch_state->coords.y = y;

-        clutter_seat_evdev_notify_touch_event (seat, device,
-                                               CLUTTER_TOUCH_UPDATE,
-                                               time_us,
-                                               touch_state->seat_slot,
-                                               touch_state->coords.x,
-                                               touch_state->coords.y);
+        notify_touch_event (device, CLUTTER_TOUCH_UPDATE, time_us, slot,
+			    touch_state->coords.x, touch_state->coords.y);
        break;
      }
    case LIBINPUT_EVENT_TOUCH_CANCEL:
      {
+        ClutterTouchState *touch_state;
+        GHashTableIter iter;
        guint64 time_us;
        struct libinput_event_touch *touch_event =
          libinput_event_get_touch_event (event);
+        ClutterSeatEvdev *seat;

        device = libinput_device_get_user_data (libinput_device);
-        device_evdev = CLUTTER_INPUT_DEVICE_EVDEV (device);
        time_us = libinput_event_touch_get_time_usec (touch_event);
+        seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
+        g_hash_table_iter_init (&iter, seat->touches);

-        clutter_input_device_evdev_release_touch_slots (device_evdev, time_us);
+        while (g_hash_table_iter_next (&iter, NULL, (gpointer*) &touch_state))
+          {
+            notify_touch_event (device, CLUTTER_TOUCH_CANCEL,
+                                time_us, touch_state->id,
+                                touch_state->coords.x, touch_state->coords.y);
+            g_hash_table_iter_remove (&iter);
+          }

        break;
      }
@@ -1863,14 +1898,6 @@ clutter_device_manager_evdev_create_virtual_device (ClutterDeviceManager  *manag
                       NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_evdev_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_TOUCHSCREEN);
-}
-
 static void
 clutter_device_manager_evdev_compress_motion (ClutterDeviceManager *device_manger,
                                              ClutterEvent         *event,
@@ -1896,18 +1923,6 @@ clutter_device_manager_evdev_compress_motion (ClutterDeviceManager *device_mange
                                            dy_unaccel + dst_dy_unaccel);
 }

-static void
-clutter_device_manager_evdev_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                      ClutterKbdA11ySettings *settings)
-{
-  ClutterInputDevice *device;
-
-  device = clutter_device_manager_evdev_get_core_device (device_manager, CLUTTER_KEYBOARD_DEVICE);
-  if (device)
-    clutter_input_device_evdev_apply_kbd_a11y_settings (CLUTTER_INPUT_DEVICE_EVDEV (device),
-                                                        settings);
-}
-
 /*
 * GObject implementation
 */
@@ -1964,7 +1979,6 @@ clutter_device_manager_evdev_constructed (GObject *gobject)
  xkb_context_unref (ctx);

  priv->main_seat = clutter_seat_evdev_new (manager_evdev);
-  priv->seats = g_slist_append (priv->seats, priv->main_seat);

  dispatch_libinput (manager_evdev);

@@ -2050,9 +2064,7 @@ clutter_device_manager_evdev_class_init (ClutterDeviceManagerEvdevClass *klass)
  manager_class->get_core_device = clutter_device_manager_evdev_get_core_device;
  manager_class->get_device = clutter_device_manager_evdev_get_device;
  manager_class->create_virtual_device = clutter_device_manager_evdev_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_evdev_get_supported_virtual_device_types;
  manager_class->compress_motion = clutter_device_manager_evdev_compress_motion;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_evdev_apply_kbd_a11y_settings;
 }

 static void
@@ -2173,7 +2185,7 @@ _clutter_device_manager_evdev_acquire_device_id (ClutterDeviceManagerEvdev *mana

  first = g_list_first (priv->free_device_ids);
  next_id = GPOINTER_TO_INT (first->data);
-  priv->free_device_ids = g_list_delete_link (priv->free_device_ids, first);
+  priv->free_device_ids = g_list_remove_link (priv->free_device_ids, first);

  return next_id;
 }
@@ -2292,7 +2304,7 @@ clutter_evdev_update_xkb_state (ClutterDeviceManagerEvdev *manager_evdev)
                             0, /* depressed */
                             latched_mods,
                             locked_mods,
-                             0, 0, seat->layout_idx);
+                             0, 0, 0);

      seat->caps_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_CAPS);
      seat->num_lock_led = xkb_keymap_led_get_index (priv->keymap, XKB_LED_NAME_NUM);
@@ -2440,7 +2452,6 @@ clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
  xkb_mod_mask_t latched_mods;
  xkb_mod_mask_t locked_mods;
  struct xkb_state *state;
-  GSList *l;

  g_return_if_fail (CLUTTER_IS_DEVICE_MANAGER_EVDEV (evdev));

@@ -2452,12 +2463,6 @@ clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
  locked_mods = xkb_state_serialize_mods (state, XKB_STATE_MODS_LOCKED);

  xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
-  for (l = manager_evdev->priv->seats; l; l = l->next)
-    {
-      ClutterSeatEvdev *seat = l->data;
-
-      seat->layout_idx = idx;
-    }
 }

 /**
@@ -2467,9 +2472,12 @@ xkb_layout_index_t
 clutter_evdev_get_keyboard_layout_index (ClutterDeviceManager *evdev)
 {
  ClutterDeviceManagerEvdev *manager_evdev;
+  struct xkb_state *state;

  manager_evdev = CLUTTER_DEVICE_MANAGER_EVDEV (evdev);
-  return manager_evdev->priv->main_seat->layout_idx;
+  state = manager_evdev->priv->main_seat->xkb;
+
+  return xkb_state_serialize_layout (state, XKB_STATE_LAYOUT_LOCKED);
 }

 /**
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
--- a/clutter/clutter/evdev/clutter-input-device-evdev.h
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.h
@@ -70,31 +70,6 @@ struct _ClutterInputDeviceEvdev
  cairo_matrix_t device_matrix;
  gdouble device_aspect_ratio; /* w:h */
  gdouble output_ratio;        /* w:h */
-
-  GHashTable *touches;
-
-  /* Keyboard a11y */
-  ClutterKeyboardA11yFlags a11y_flags;
-  GList *slow_keys_list;
-  guint debounce_timer;
-  guint16 debounce_key;
-  xkb_mod_mask_t stickykeys_depressed_mask;
-  xkb_mod_mask_t stickykeys_latched_mask;
-  xkb_mod_mask_t stickykeys_locked_mask;
-  guint toggle_slowkeys_timer;
-  guint16 shift_count;
-  guint32 last_shift_time;
-  gint mousekeys_btn;
-  gboolean mousekeys_btn_states[3];
-  guint32 mousekeys_first_motion_time; /* ms */
-  guint32 mousekeys_last_motion_time; /* ms */
-  guint mousekeys_init_delay;
-  guint mousekeys_accel_time;
-  guint mousekeys_max_speed;
-  gdouble mousekeys_curve_factor;
-  guint move_mousekeys_timer;
-  guint16 last_mousekeys_key;
-  ClutterVirtualInputDevice *mousekeys_virtual_device;
 };

 GType                     _clutter_input_device_evdev_get_type        (void) G_GNUC_CONST;
@@ -136,22 +111,6 @@ void                      clutter_input_device_evdev_translate_coordinates (Clut
                                                                            gfloat             *x,
                                                                            gfloat             *y);

-void                      clutter_input_device_evdev_apply_kbd_a11y_settings (ClutterInputDeviceEvdev *device,
-                                                                              ClutterKbdA11ySettings  *settings);
-
-ClutterTouchState *       clutter_input_device_evdev_acquire_touch_state (ClutterInputDeviceEvdev *device,
-                                                                          int                      device_slot);
-
-ClutterTouchState *       clutter_input_device_evdev_lookup_touch_state (ClutterInputDeviceEvdev *device,
-                                                                         int                      device_slot);
-
-void                      clutter_input_device_evdev_release_touch_state (ClutterInputDeviceEvdev *device,
-                                                                          ClutterTouchState       *touch_state);
-
-void                      clutter_input_device_evdev_release_touch_slots (ClutterInputDeviceEvdev *device_evdev,
-                                                                          uint64_t                 time_us);
-
-
 G_END_DECLS

 #endif /* __CLUTTER_INPUT_DEVICE_EVDEV_H__ */
--- a/clutter/clutter/evdev/clutter-seat-evdev.c
+++ b/clutter/clutter/evdev/clutter-seat-evdev.c
@@ -45,10 +45,6 @@

 #define DISCRETE_SCROLL_STEP 10.0

-#ifndef BTN_STYLUS3
-#define BTN_STYLUS3 0x149 /* Linux 4.15 */
-#endif
-
 void
 clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                      struct libinput_seat *libinput_seat)
@@ -92,57 +88,32 @@ clutter_touch_state_free (ClutterTouchState *touch_state)
  g_slice_free (ClutterTouchState, touch_state);
 }

-static void
-ensure_seat_slot_allocated (ClutterSeatEvdev *seat,
-                            int               seat_slot)
-{
-  if (seat_slot >= seat->n_alloc_touch_states)
-    {
-      const int size_increase = 5;
-      int i;
-
-      seat->n_alloc_touch_states += size_increase;
-      seat->touch_states = g_realloc_n (seat->touch_states,
-                                        seat->n_alloc_touch_states,
-                                        sizeof (ClutterTouchState *));
-      for (i = 0; i < size_increase; i++)
-        seat->touch_states[seat->n_alloc_touch_states - (i + 1)] = NULL;
-    }
-}
-
 ClutterTouchState *
-clutter_seat_evdev_acquire_touch_state (ClutterSeatEvdev *seat,
-                                        int               device_slot)
+clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
+                              guint32           id)
 {
-  ClutterTouchState *touch_state;
-  int seat_slot;
+  ClutterTouchState *touch;

-  for (seat_slot = 0; seat_slot < seat->n_alloc_touch_states; seat_slot++)
-    {
-      if (!seat->touch_states[seat_slot])
-        break;
-    }
+  touch = g_slice_new0 (ClutterTouchState);
+  touch->id = id;

-  ensure_seat_slot_allocated (seat, seat_slot);
+  g_hash_table_insert (seat->touches, GUINT_TO_POINTER (id), touch);

-  touch_state = g_slice_new0 (ClutterTouchState);
-  *touch_state = (ClutterTouchState) {
-    .seat = seat,
-    .seat_slot = seat_slot,
-    .device_slot = device_slot,
-  };
-
-  seat->touch_states[seat_slot] = touch_state;
-
-  return touch_state;
+  return touch;
 }

 void
-clutter_seat_evdev_release_touch_state (ClutterSeatEvdev  *seat,
-                                        ClutterTouchState *touch_state)
+clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
+                                 guint32           id)
 {
-  g_clear_pointer (&seat->touch_states[touch_state->seat_slot],
-                   clutter_touch_state_free);
+  g_hash_table_remove (seat->touches, GUINT_TO_POINTER (id));
+}
+
+ClutterTouchState *
+clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
+                              guint32           id)
+{
+  return g_hash_table_lookup (seat->touches, GUINT_TO_POINTER (id));
 }

 ClutterSeatEvdev *
@@ -179,6 +150,9 @@ clutter_seat_evdev_new (ClutterDeviceManagerEvdev *manager_evdev)
  _clutter_device_manager_add_device (manager, device);
  seat->core_keyboard = device;

+  seat->touches = g_hash_table_new_full (NULL, NULL, NULL,
+                                         (GDestroyNotify) clutter_touch_state_free);
+
  seat->repeat = TRUE;
  seat->repeat_delay = 250;     /* ms */
  seat->repeat_interval = 33;   /* ms */
@@ -518,10 +492,6 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
      button_nr = CLUTTER_BUTTON_MIDDLE;
      break;

-    case 0x149: /* BTN_STYLUS3 */
-      button_nr = 8;
-      break;
-
    default:
      /* For compatibility reasons, all additional buttons go after the old 4-7 scroll ones */
      if (clutter_input_device_get_device_type (input_device) == CLUTTER_TABLET_DEVICE)
@@ -790,50 +760,6 @@ clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,

 }

-void
-clutter_seat_evdev_notify_touch_event (ClutterSeatEvdev   *seat,
-                                       ClutterInputDevice *input_device,
-                                       ClutterEventType    evtype,
-                                       uint64_t            time_us,
-                                       int                 slot,
-                                       double              x,
-                                       double              y)
-{
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-
-  /* We can drop the event on the floor if no stage has been
-   * associated with the device yet. */
-  stage = _clutter_input_device_get_stage (input_device);
-  if (stage == NULL)
-    return;
-
-  event = clutter_event_new (evtype);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->touch.time = us2ms (time_us);
-  event->touch.stage = CLUTTER_STAGE (stage);
-  event->touch.device = seat->core_pointer;
-  event->touch.x = x;
-  event->touch.y = y;
-  clutter_input_device_evdev_translate_coordinates (input_device, stage,
-                                                    &event->touch.x,
-                                                    &event->touch.y);
-
-  /* "NULL" sequences are special cased in clutter */
-  event->touch.sequence = GINT_TO_POINTER (MAX (1, slot + 1));
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  if (evtype == CLUTTER_TOUCH_BEGIN ||
-      evtype == CLUTTER_TOUCH_UPDATE)
-    event->touch.modifier_state |= CLUTTER_BUTTON1_MASK;
-
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-
-  queue_event (event);
-}
-
 void
 clutter_seat_evdev_free (ClutterSeatEvdev *seat)
 {
@@ -846,7 +772,7 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
      g_object_unref (device);
    }
  g_slist_free (seat->devices);
-  g_free (seat->touch_states);
+  g_hash_table_unref (seat->touches);

  xkb_state_unref (seat->xkb);

@@ -858,24 +784,6 @@ clutter_seat_evdev_free (ClutterSeatEvdev *seat)
  g_free (seat);
 }

-ClutterInputDevice *
-clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                               gint              id)
-{
-  ClutterInputDevice *device;
-  GSList *l;
-
-  for (l = seat->devices; l; l = l->next)
-    {
-      device = l->data;
-
-      if (clutter_input_device_get_device_id (device) == id)
-        return device;
-    }
-
-  return NULL;
-}
-
 void
 clutter_seat_evdev_set_stage (ClutterSeatEvdev *seat,
                              ClutterStage     *stage)
--- a/clutter/clutter/evdev/clutter-seat-evdev.h
+++ b/clutter/clutter/evdev/clutter-seat-evdev.h
@@ -38,10 +38,7 @@ typedef struct _ClutterTouchState ClutterTouchState;

 struct _ClutterTouchState
 {
-  ClutterSeatEvdev *seat;
-
-  int device_slot;
-  int seat_slot;
+  guint32 id;
  ClutterPoint coords;
 };

@@ -55,14 +52,12 @@ struct _ClutterSeatEvdev
  ClutterInputDevice *core_pointer;
  ClutterInputDevice *core_keyboard;

-  ClutterTouchState **touch_states;
-  int n_alloc_touch_states;
+  GHashTable *touches;

  struct xkb_state *xkb;
  xkb_led_index_t caps_lock_led;
  xkb_led_index_t num_lock_led;
  xkb_led_index_t scroll_lock_led;
-  xkb_layout_index_t layout_idx;
  uint32_t button_state;
  int button_count[KEY_CNT];

@@ -126,27 +121,16 @@ void clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
                                                double               discrete_dy,
                                                ClutterScrollSource  source);

-void clutter_seat_evdev_notify_touch_event (ClutterSeatEvdev   *seat,
-                                            ClutterInputDevice *input_device,
-                                            ClutterEventType    evtype,
-                                            uint64_t            time_us,
-                                            int                 slot,
-                                            double              x,
-                                            double              y);
-
 void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                           struct libinput_seat *libinput_seat);

 void clutter_seat_evdev_sync_leds (ClutterSeatEvdev *seat);

-ClutterInputDevice * clutter_seat_evdev_get_device (ClutterSeatEvdev *seat,
-                                                    gint              id);
+ClutterTouchState * clutter_seat_evdev_add_touch (ClutterSeatEvdev *seat,
+                                                  guint32           id);

-ClutterTouchState * clutter_seat_evdev_acquire_touch_state (ClutterSeatEvdev *seat,
-                                                            int               device_slot);
-
-void clutter_seat_evdev_release_touch_state (ClutterSeatEvdev  *seat,
-                                             ClutterTouchState *touch_state);
+void clutter_seat_evdev_remove_touch (ClutterSeatEvdev *seat,
+                                      guint32           id);

 ClutterTouchState * clutter_seat_evdev_get_touch (ClutterSeatEvdev *seat,
                                                  guint32           id);
--- a/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-virtual-input-device-evdev.c
@@ -448,124 +448,6 @@ clutter_virtual_input_device_evdev_notify_discrete_scroll (ClutterVirtualInputDe
                                             scroll_source);
 }

-static void
-clutter_virtual_input_device_evdev_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                             uint64_t                   time_us,
-                                                             double                     dx,
-                                                             double                     dy,
-                                                             ClutterScrollSource        scroll_source,
-                                                             ClutterScrollFinishFlags   finish_flags)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  clutter_seat_evdev_notify_scroll_continuous (virtual_evdev->seat,
-                                               virtual_evdev->device,
-                                               time_us,
-                                               dx, dy,
-                                               scroll_source,
-                                               CLUTTER_SCROLL_FINISHED_NONE);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                      uint64_t                   time_us,
-                                                      int                        device_slot,
-                                                      double                     x,
-                                                      double                     y)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_acquire_touch_state (device_evdev,
-                                                                device_slot);
-  if (!touch_state)
-    return;
-
-  touch_state->coords.x = x;
-  touch_state->coords.y = y;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                        uint64_t                   time_us,
-                                                        int                        device_slot,
-                                                        double                     x,
-                                                        double                     y)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                               device_slot);
-  if (!touch_state)
-    return;
-
-  touch_state->coords.x = x;
-  touch_state->coords.y = y;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-}
-
-static void
-clutter_virtual_input_device_evdev_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                    uint64_t                   time_us,
-                                                    int                        device_slot)
-{
-  ClutterVirtualInputDeviceEvdev *virtual_evdev =
-    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (virtual_evdev->device);
-  ClutterTouchState *touch_state;
-
-  if (time_us == CLUTTER_CURRENT_TIME)
-    time_us = g_get_monotonic_time ();
-
-  touch_state = clutter_input_device_evdev_lookup_touch_state (device_evdev,
-                                                               device_slot);
-  if (!touch_state)
-    return;
-
-  clutter_seat_evdev_notify_touch_event (virtual_evdev->seat,
-                                         virtual_evdev->device,
-                                         CLUTTER_TOUCH_BEGIN,
-                                         time_us,
-                                         touch_state->seat_slot,
-                                         touch_state->coords.x,
-                                         touch_state->coords.y);
-
-  clutter_input_device_evdev_release_touch_state (device_evdev, touch_state);
-}
-
 static void
 clutter_virtual_input_device_evdev_get_property (GObject    *object,
                                                 guint       prop_id,
@@ -670,10 +552,6 @@ clutter_virtual_input_device_evdev_class_init (ClutterVirtualInputDeviceEvdevCla
  virtual_input_device_class->notify_key = clutter_virtual_input_device_evdev_notify_key;
  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_evdev_notify_keyval;
  virtual_input_device_class->notify_discrete_scroll = clutter_virtual_input_device_evdev_notify_discrete_scroll;
-  virtual_input_device_class->notify_scroll_continuous = clutter_virtual_input_device_evdev_notify_scroll_continuous;
-  virtual_input_device_class->notify_touch_down = clutter_virtual_input_device_evdev_notify_touch_down;
-  virtual_input_device_class->notify_touch_motion = clutter_virtual_input_device_evdev_notify_touch_motion;
-  virtual_input_device_class->notify_touch_up = clutter_virtual_input_device_evdev_notify_touch_up;

  obj_props[PROP_SEAT] = g_param_spec_pointer ("seat",
                                               P_("ClutterSeatEvdev"),
--- a/clutter/clutter/x11/clutter-backend-x11.c
+++ b/clutter/clutter/x11/clutter-backend-x11.c
@@ -109,6 +109,7 @@ static const gchar *atom_names[] = {
 #define N_ATOM_NAMES G_N_ELEMENTS (atom_names)

 /* various flags corresponding to pre init setup calls */
+static gboolean _want_reset_on_video_memory_purge = FALSE;
 static gboolean _no_xevent_retrieval = FALSE;
 static gboolean clutter_enable_xinput = TRUE;
 static gboolean clutter_enable_argb = FALSE;
@@ -681,7 +682,8 @@ clutter_backend_x11_get_renderer (ClutterBackend  *backend,

  /* set the display object we're using */
  cogl_xlib_renderer_set_foreign_display (renderer, xdisplay);
-
+  cogl_xlib_renderer_request_reset_on_video_memory_purge (renderer,
+                                                          _want_reset_on_video_memory_purge);
  return renderer;
 }

@@ -1026,6 +1028,30 @@ clutter_x11_has_event_retrieval (void)
  return !_no_xevent_retrieval;
 }

+/**
+ * clutter_x11_request_reset_on_video_memory_purge:
+ *
+ * If the GL driver supports the NV_robustness_video_memory_purge
+ * extension, this call lets applications request that it gets
+ * initialized, thus allowing cogl_get_graphics_reset_status() to
+ * report memory purged errors if they happen. Checking for the
+ * graphics reset status is the application's responsibility.
+ *
+ * This function can only be called before calling clutter_init().
+ */
+void
+clutter_x11_request_reset_on_video_memory_purge (void)
+{
+  if (_clutter_context_is_initialized ())
+    {
+      g_warning ("%s() can only be used before calling clutter_init()",
+                 G_STRFUNC);
+      return;
+    }
+
+  _want_reset_on_video_memory_purge = TRUE;
+}
+
 /**
 * clutter_x11_get_default_screen:
 *
--- a/clutter/clutter/x11/clutter-device-manager-core-x11.c
+++ b/clutter/clutter/x11/clutter-device-manager-core-x11.c
@@ -37,7 +37,6 @@
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
-#include "clutter-xkb-a11y-x11.h"

 enum
 {
@@ -353,11 +352,9 @@ static void
 clutter_device_manager_x11_constructed (GObject *gobject)
 {
  ClutterDeviceManagerX11 *manager_x11;
-  ClutterDeviceManager *manager;
  ClutterBackendX11 *backend_x11;

  manager_x11 = CLUTTER_DEVICE_MANAGER_X11 (gobject);
-  manager = CLUTTER_DEVICE_MANAGER (gobject);

  g_object_get (gobject, "backend", &backend_x11, NULL);
  g_assert (backend_x11 != NULL);
@@ -392,8 +389,6 @@ clutter_device_manager_x11_constructed (GObject *gobject)
  _clutter_input_device_set_associated_device (manager_x11->core_keyboard,
                                               manager_x11->core_pointer);

-  clutter_device_manager_x11_a11y_init (manager);
-
  if (G_OBJECT_CLASS (clutter_device_manager_x11_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_device_manager_x11_parent_class)->constructed (gobject);
 }
@@ -490,13 +485,6 @@ clutter_device_manager_x11_create_virtual_device (ClutterDeviceManager  *device_
  return g_object_new (CLUTTER_TYPE_VIRTUAL_INPUT_DEVICE_X11, NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_x11_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER);
-}
-
 static void
 clutter_device_manager_x11_set_property (GObject      *gobject,
                                         guint         prop_id,
@@ -544,8 +532,6 @@ clutter_device_manager_x11_class_init (ClutterDeviceManagerX11Class *klass)
  manager_class->get_core_device = clutter_device_manager_x11_get_core_device;
  manager_class->get_device = clutter_device_manager_x11_get_device;
  manager_class->create_virtual_device = clutter_device_manager_x11_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_x11_get_supported_virtual_device_types;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_x11_apply_kbd_a11y_settings;
 }

 static void
--- a/clutter/clutter/x11/clutter-device-manager-xi2.c
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.c
@@ -40,7 +40,6 @@
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"
-#include "clutter-xkb-a11y-x11.h"

 #include <X11/extensions/XInput2.h>

@@ -495,21 +494,13 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
                         "device-node", node_path,
                         "n-rings", num_rings,
                         "n-strips", num_strips,
-                         "n-mode-groups", MAX (num_rings, num_strips),
                         NULL);

  translate_device_classes (backend_x11->xdpy, retval,
                            info->classes,
                            info->num_classes);
-
-#ifdef HAVE_LIBWACOM
-  if (source == CLUTTER_PAD_DEVICE)
-    clutter_input_device_xi2_ensure_wacom_info (retval, manager_xi2->wacom_db);
-#endif
-
  g_free (vendor_id);
  g_free (product_id);
-  g_free (node_path);

  CLUTTER_NOTE (BACKEND, "Created device '%s' (id: %d, has-cursor: %s)",
                info->name,
@@ -1134,7 +1125,7 @@ translate_pad_event (ClutterEvent       *event,
                     ClutterInputDevice *device)
 {
  gdouble value;
-  guint number, mode = 0;
+  guint number;

  if (!translate_pad_axis (device, &xev->valuators,
                           &event->any.type,
@@ -1148,21 +1139,15 @@ translate_pad_event (ClutterEvent       *event,
  if (xev->evtype == XI_Motion)
    value = -1;

-#ifdef HAVE_LIBWACOM
-  mode = clutter_input_device_xi2_get_pad_group_mode (device, number);
-#endif
-
  if (event->any.type == CLUTTER_PAD_RING)
    {
      event->pad_ring.ring_number = number;
      event->pad_ring.angle = value;
-      event->pad_ring.mode = mode;
    }
  else
    {
      event->pad_strip.strip_number = number;
      event->pad_strip.value = value;
-      event->pad_strip.mode = mode;
    }

  event->any.time = xev->time;
@@ -1389,13 +1374,6 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,

            /* Pad buttons are 0-indexed */
            event->pad_button.button = xev->detail - 1;
-#ifdef HAVE_LIBWACOM
-            clutter_input_device_xi2_update_pad_state (device,
-                                                       event->pad_button.button,
-                                                       (xi_event->evtype == XI_ButtonPress),
-                                                       &event->pad_button.group,
-                                                       &event->pad_button.mode);
-#endif
            clutter_event_set_device (event, device);
            clutter_event_set_source_device (event, source_device);

@@ -2009,8 +1987,6 @@ clutter_device_manager_xi2_constructed (GObject *gobject)

  XSync (backend_x11->xdpy, False);

-  clutter_device_manager_x11_a11y_init (manager);
-
  if (G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_device_manager_xi2_parent_class)->constructed (gobject);
 }
@@ -2045,13 +2021,6 @@ clutter_device_manager_xi2_create_virtual_device (ClutterDeviceManager   *manage
                       NULL);
 }

-static ClutterVirtualDeviceType
-clutter_device_manager_xi2_get_supported_virtual_device_types (ClutterDeviceManager *device_manager)
-{
-  return (CLUTTER_VIRTUAL_DEVICE_TYPE_KEYBOARD |
-          CLUTTER_VIRTUAL_DEVICE_TYPE_POINTER);
-}
-
 static void
 clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
 {
@@ -2080,8 +2049,6 @@ clutter_device_manager_xi2_class_init (ClutterDeviceManagerXI2Class *klass)
  manager_class->get_device = clutter_device_manager_xi2_get_device;
  manager_class->select_stage_events = clutter_device_manager_xi2_select_stage_events;
  manager_class->create_virtual_device = clutter_device_manager_xi2_create_virtual_device;
-  manager_class->get_supported_virtual_device_types = clutter_device_manager_xi2_get_supported_virtual_device_types;
-  manager_class->apply_kbd_a11y_settings = clutter_device_manager_x11_apply_kbd_a11y_settings;
 }

 static void
@@ -2092,8 +2059,4 @@ clutter_device_manager_xi2_init (ClutterDeviceManagerXI2 *self)
                                               (GDestroyNotify) g_object_unref);
  self->tools_by_serial = g_hash_table_new_full (NULL, NULL, NULL,
                                                 (GDestroyNotify) g_object_unref);
-
-#ifdef HAVE_LIBWACOM
-  self->wacom_db = libwacom_database_new ();
-#endif
 }
--- a/clutter/clutter/x11/clutter-device-manager-xi2.h
+++ b/clutter/clutter/x11/clutter-device-manager-xi2.h
@@ -26,10 +26,6 @@

 #include <clutter/clutter-device-manager.h>

-#ifdef HAVE_LIBWACOM
-#include <libwacom/libwacom.h>
-#endif
-
 G_BEGIN_DECLS

 #define CLUTTER_TYPE_DEVICE_MANAGER_XI2            (_clutter_device_manager_xi2_get_type ())
@@ -55,10 +51,6 @@ struct _ClutterDeviceManagerXI2
  GList *slave_devices;

  int opcode;
-
-#ifdef HAVE_LIBWACOM
-  WacomDeviceDatabase *wacom_db;
-#endif
 };

 struct _ClutterDeviceManagerXI2Class
--- a/clutter/clutter/x11/clutter-input-device-xi2.c
+++ b/clutter/clutter/x11/clutter-input-device-xi2.c
@@ -45,11 +45,6 @@ struct _ClutterInputDeviceXI2

  gint device_id;
  ClutterInputDeviceTool *current_tool;
-
-#ifdef HAVE_LIBWACOM
-  WacomDevice *wacom_device;
-  GArray *group_modes;
-#endif
 };

 #define N_BUTTONS       5
@@ -69,15 +64,6 @@ clutter_input_device_xi2_constructed (GObject *gobject)

  if (G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->constructed)
    G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->constructed (gobject);
-
-#ifdef HAVE_LIBWACOM
-  if (clutter_input_device_get_device_type (CLUTTER_INPUT_DEVICE (gobject)) == CLUTTER_PAD_DEVICE)
-    {
-      device_xi2->group_modes = g_array_new (FALSE, TRUE, sizeof (guint));
-      g_array_set_size (device_xi2->group_modes,
-                        clutter_input_device_get_n_mode_groups (CLUTTER_INPUT_DEVICE (gobject)));
-    }
-#endif
 }

 static gboolean
@@ -101,85 +87,6 @@ clutter_input_device_xi2_is_grouped (ClutterInputDevice *device,
  return FALSE;
 }

-static void
-clutter_input_device_xi2_finalize (GObject *object)
-{
-#ifdef HAVE_LIBWACOM
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (object);
-
-  if (device_xi2->wacom_device)
-    libwacom_destroy (device_xi2->wacom_device);
-
-  if (device_xi2->group_modes)
-    g_array_unref (device_xi2->group_modes);
-#endif
-
-  G_OBJECT_CLASS (clutter_input_device_xi2_parent_class)->finalize (object);
-}
-
-static gint
-clutter_input_device_xi2_get_group_n_modes (ClutterInputDevice *device,
-                                            gint                group)
-{
-#ifdef HAVE_LIBWACOM
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (device_xi2->wacom_device)
-    {
-      if (group == 0)
-        {
-          if (libwacom_has_ring (device_xi2->wacom_device))
-            return libwacom_get_ring_num_modes (device_xi2->wacom_device);
-          else if (libwacom_get_num_strips (device_xi2->wacom_device) >= 1)
-            return libwacom_get_strips_num_modes (device_xi2->wacom_device);
-        }
-      else if (group == 1)
-        {
-          if (libwacom_has_ring2 (device_xi2->wacom_device))
-            return libwacom_get_ring2_num_modes (device_xi2->wacom_device);
-          else if (libwacom_get_num_strips (device_xi2->wacom_device) >= 2)
-            return libwacom_get_strips_num_modes (device_xi2->wacom_device);
-        }
-    }
-#endif
-
-  return -1;
-}
-
-#ifdef HAVE_LIBWACOM
-static int
-clutter_input_device_xi2_get_button_group (ClutterInputDevice *device,
-                                           guint               button)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (device_xi2->wacom_device)
-    {
-      if (button >= libwacom_get_num_buttons (device_xi2->wacom_device))
-        return -1;
-
-      return libwacom_get_button_led_group (device_xi2->wacom_device,
-                                            'A' + button);
-    }
-  else
-    return -1;
-}
-#endif
-
-static gboolean
-clutter_input_device_xi2_is_mode_switch_button (ClutterInputDevice *device,
-                                                guint               group,
-                                                guint               button)
-{
-  int button_group = -1;
-
-#ifdef HAVE_LIBWACOM
-  button_group = clutter_input_device_xi2_get_button_group (device, button);
-#endif
-
-  return button_group == (int) group;
-}
-
 static void
 clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
 {
@@ -187,12 +94,9 @@ clutter_input_device_xi2_class_init (ClutterInputDeviceXI2Class *klass)
  ClutterInputDeviceClass *device_class = CLUTTER_INPUT_DEVICE_CLASS (klass);

  gobject_class->constructed = clutter_input_device_xi2_constructed;
-  gobject_class->finalize = clutter_input_device_xi2_finalize;

  device_class->keycode_to_evdev = clutter_input_device_xi2_keycode_to_evdev;
  device_class->is_grouped = clutter_input_device_xi2_is_grouped;
-  device_class->get_group_n_modes = clutter_input_device_xi2_get_group_n_modes;
-  device_class->is_mode_switch_button = clutter_input_device_xi2_is_mode_switch_button;
 }

 static void
@@ -292,66 +196,3 @@ clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device)
  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
  return device_xi2->current_tool;
 }
-
-#ifdef HAVE_LIBWACOM
-void
-clutter_input_device_xi2_ensure_wacom_info (ClutterInputDevice  *device,
-                                            WacomDeviceDatabase *wacom_db)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  const gchar *node_path;
-
-  node_path = clutter_input_device_get_device_node (device);
-  device_xi2->wacom_device = libwacom_new_from_path (wacom_db, node_path,
-                                                     WFALLBACK_NONE, NULL);
-}
-
-guint
-clutter_input_device_xi2_get_pad_group_mode (ClutterInputDevice *device,
-                                             guint               group)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-
-  if (group >= device_xi2->group_modes->len)
-    return 0;
-
-  return g_array_index (device_xi2->group_modes, guint, group);
-}
-
-void
-clutter_input_device_xi2_update_pad_state (ClutterInputDevice *device,
-                                           guint               button,
-                                           guint               state,
-                                           guint              *group,
-                                           guint              *mode)
-{
-  ClutterInputDeviceXI2 *device_xi2 = CLUTTER_INPUT_DEVICE_XI2 (device);
-  guint button_group, *group_mode;
-  gboolean is_mode_switch = FALSE;
-
-  button_group = clutter_input_device_xi2_get_button_group (device, button);
-  is_mode_switch = button_group >= 0;
-
-  /* Assign all non-mode-switch buttons to group 0 so far */
-  button_group = MAX (0, button_group);
-
-  if (button_group >= device_xi2->group_modes->len)
-    return;
-
-  group_mode = &g_array_index (device_xi2->group_modes, guint, button_group);
-
-  if (is_mode_switch && state)
-    {
-      guint next, n_modes;
-
-      n_modes = clutter_input_device_get_group_n_modes (device, button_group);
-      next = (*group_mode + 1) % n_modes;
-      *group_mode = next;
-    }
-
-  if (group)
-    *group = button_group;
-  if (mode)
-    *mode = *group_mode;
-}
-#endif
--- a/clutter/clutter/x11/clutter-input-device-xi2.h
+++ b/clutter/clutter/x11/clutter-input-device-xi2.h
@@ -27,10 +27,6 @@
 #include <clutter/clutter-input-device.h>
 #include <X11/extensions/XInput2.h>

-#ifdef HAVE_LIBWACOM
-#include <libwacom/libwacom.h>
-#endif
-
 G_BEGIN_DECLS

 #define CLUTTER_TYPE_INPUT_DEVICE_XI2           (_clutter_input_device_xi2_get_type ())
@@ -49,21 +45,6 @@ void  clutter_input_device_xi2_update_tool      (ClutterInputDevice     *device,
                                                 ClutterInputDeviceTool *tool);
 ClutterInputDeviceTool * clutter_input_device_xi2_get_current_tool (ClutterInputDevice *device);

-#ifdef HAVE_LIBWACOM
-void clutter_input_device_xi2_ensure_wacom_info (ClutterInputDevice  *device,
-                                                 WacomDeviceDatabase *wacom_db);
-
-guint clutter_input_device_xi2_get_pad_group_mode (ClutterInputDevice *device,
-                                                   guint               group);
-
-void clutter_input_device_xi2_update_pad_state (ClutterInputDevice *device,
-                                                guint               button,
-                                                guint               state,
-                                                guint              *group,
-                                                guint              *mode);
-
-#endif
-
 G_END_DECLS

 #endif /* __CLUTTER_INPUT_DEVICE_XI2_H__ */
--- a/clutter/clutter/x11/clutter-virtual-input-device-x11.c
+++ b/clutter/clutter/x11/clutter-virtual-input-device-x11.c
@@ -48,10 +48,6 @@ clutter_virtual_input_device_x11_notify_relative_motion (ClutterVirtualInputDevi
                                                         double                     dx,
                                                         double                     dy)
 {
-  XTestFakeRelativeMotionEvent (clutter_x11_get_default_display (),
-                                (int) dx,
-                                (int) dy,
-                                0);
 }

 static void
@@ -60,11 +56,6 @@ clutter_virtual_input_device_x11_notify_absolute_motion (ClutterVirtualInputDevi
                                                         double                     x,
                                                         double                     y)
 {
-  XTestFakeMotionEvent (clutter_x11_get_default_display (),
-                        clutter_x11_get_default_screen (),
-                        (int) x,
-                        (int) y,
-                        0);
 }

 static void
@@ -77,48 +68,6 @@ clutter_virtual_input_device_x11_notify_button (ClutterVirtualInputDevice *virtu
                        button, button_state == CLUTTER_BUTTON_STATE_PRESSED, 0);
 }

-static void
-clutter_virtual_input_device_x11_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
-                                                         uint64_t                   time_us,
-                                                         ClutterScrollDirection     direction,
-                                                         ClutterScrollSource        scroll_source)
-{
-  Display *xdisplay = clutter_x11_get_default_display ();
-  int button;
-
-  switch (direction)
-    {
-    case CLUTTER_SCROLL_UP:
-      button = 4;
-      break;
-    case CLUTTER_SCROLL_DOWN:
-      button = 5;
-      break;
-    case CLUTTER_SCROLL_LEFT:
-      button = 6;
-      break;
-    case CLUTTER_SCROLL_RIGHT:
-      button = 7;
-      break;
-    default:
-      g_warn_if_reached ();
-      return;
-    }
-
-  XTestFakeButtonEvent (xdisplay, button, True, 0);
-  XTestFakeButtonEvent (xdisplay, button, False, 0);
-}
-
-static void
-clutter_virtual_input_device_x11_notify_scroll_continuous (ClutterVirtualInputDevice *virtual_device,
-                                                           uint64_t                   time_us,
-                                                           double                     dx,
-                                                           double                     dy,
-                                                           ClutterScrollSource        scroll_source,
-                                                           ClutterScrollFinishFlags   finish_flags)
-{
-}
-
 static void
 clutter_virtual_input_device_x11_notify_key (ClutterVirtualInputDevice *virtual_device,
                                             uint64_t                   time_us,
@@ -142,34 +91,6 @@ clutter_virtual_input_device_x11_notify_keyval (ClutterVirtualInputDevice *virtu
                     keycode, key_state == CLUTTER_KEY_STATE_PRESSED, 0);
 }

-static void
-clutter_virtual_input_device_x11_notify_touch_down (ClutterVirtualInputDevice *virtual_device,
-                                                    uint64_t                   time_us,
-                                                    int                        device_slot,
-                                                    double                     x,
-                                                    double                     y)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
-static void
-clutter_virtual_input_device_x11_notify_touch_motion (ClutterVirtualInputDevice *virtual_device,
-                                                      uint64_t                   time_us,
-                                                      int                        device_slot,
-                                                      double                     x,
-                                                      double                     y)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
-static void
-clutter_virtual_input_device_x11_notify_touch_up (ClutterVirtualInputDevice *virtual_device,
-                                                  uint64_t                   time_us,
-                                                  int                        device_slot)
-{
-  g_warning ("Virtual touch motion not implemented under X11");
-}
-
 static void
 clutter_virtual_input_device_x11_init (ClutterVirtualInputDeviceX11 *virtual_device_x11)
 {
@@ -184,11 +105,6 @@ clutter_virtual_input_device_x11_class_init (ClutterVirtualInputDeviceX11Class *
  virtual_input_device_class->notify_relative_motion = clutter_virtual_input_device_x11_notify_relative_motion;
  virtual_input_device_class->notify_absolute_motion = clutter_virtual_input_device_x11_notify_absolute_motion;
  virtual_input_device_class->notify_button = clutter_virtual_input_device_x11_notify_button;
-  virtual_input_device_class->notify_discrete_scroll = clutter_virtual_input_device_x11_notify_discrete_scroll;
-  virtual_input_device_class->notify_scroll_continuous = clutter_virtual_input_device_x11_notify_scroll_continuous;
  virtual_input_device_class->notify_key = clutter_virtual_input_device_x11_notify_key;
  virtual_input_device_class->notify_keyval = clutter_virtual_input_device_x11_notify_keyval;
-  virtual_input_device_class->notify_touch_down = clutter_virtual_input_device_x11_notify_touch_down;
-  virtual_input_device_class->notify_touch_motion = clutter_virtual_input_device_x11_notify_touch_motion;
-  virtual_input_device_class->notify_touch_up = clutter_virtual_input_device_x11_notify_touch_up;
 }
--- a/clutter/clutter/x11/clutter-x11.h
+++ b/clutter/clutter/x11/clutter-x11.h
@@ -161,6 +161,9 @@ gint clutter_x11_event_get_key_group (const ClutterEvent *event);
 CLUTTER_AVAILABLE_IN_ALL
 guint clutter_x11_event_sequence_get_touch_detail (const ClutterEventSequence *sequence);

+CLUTTER_AVAILABLE_IN_ALL
+void clutter_x11_request_reset_on_video_memory_purge (void);
+
 G_END_DECLS

 #endif /* __CLUTTER_X11_H__ */
--- a/clutter/clutter/x11/clutter-xkb-a11y-x11.c
+++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.c
@@ -1,328 +0,0 @@
-/*
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2017 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-#include "clutter-device-manager-private.h"
-#include "clutter-xkb-a11y-x11.h"
-
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBstr.h>
-
-#define DEFAULT_XKB_SET_CONTROLS_MASK XkbSlowKeysMask         | \
-                                      XkbBounceKeysMask       | \
-                                      XkbStickyKeysMask       | \
-                                      XkbMouseKeysMask        | \
-                                      XkbMouseKeysAccelMask   | \
-                                      XkbAccessXKeysMask      | \
-                                      XkbAccessXTimeoutMask   | \
-                                      XkbAccessXFeedbackMask  | \
-                                      XkbControlsEnabledMask
-
-static int _xkb_event_base;
-
-static XkbDescRec *
-get_xkb_desc_rec (ClutterBackendX11 *backend_x11)
-{
-  XkbDescRec *desc;
-  Status      status = Success;
-
-  clutter_x11_trap_x_errors ();
-  desc = XkbGetMap (backend_x11->xdpy, XkbAllMapComponentsMask, XkbUseCoreKbd);
-  if (desc != NULL)
-    {
-      desc->ctrls = NULL;
-      status = XkbGetControls (backend_x11->xdpy, XkbAllControlsMask, desc);
-    }
-  clutter_x11_untrap_x_errors ();
-
-  g_return_val_if_fail (desc != NULL, NULL);
-  g_return_val_if_fail (desc->ctrls != NULL, NULL);
-  g_return_val_if_fail (status == Success, NULL);
-
-  return desc;
-}
-
-static void
-set_xkb_desc_rec (ClutterBackendX11 *backend_x11,
-                  XkbDescRec        *desc)
-{
-  clutter_x11_trap_x_errors ();
-  XkbSetControls (backend_x11->xdpy, DEFAULT_XKB_SET_CONTROLS_MASK, desc);
-  XSync (backend_x11->xdpy, FALSE);
-  clutter_x11_untrap_x_errors ();
-}
-
-static void
-check_settings_changed (ClutterDeviceManager *device_manager)
-{
-  ClutterBackendX11 *backend_x11;
-  ClutterKbdA11ySettings kbd_a11y_settings;
-  ClutterKeyboardA11yFlags what_changed = 0;
-  XkbDescRec *desc;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-  desc = get_xkb_desc_rec (backend_x11);
-  if (!desc)
-    return;
-
-  clutter_device_manager_get_kbd_a11y_settings (device_manager, &kbd_a11y_settings);
-
-  if (desc->ctrls->enabled_ctrls & XkbSlowKeysMask &&
-      !(kbd_a11y_settings.controls & CLUTTER_A11Y_SLOW_KEYS_ENABLED))
-    {
-      what_changed |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-      kbd_a11y_settings.controls |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-    }
-  else if (!(desc->ctrls->enabled_ctrls & XkbSlowKeysMask) &&
-           kbd_a11y_settings.controls & CLUTTER_A11Y_SLOW_KEYS_ENABLED)
-    {
-      what_changed |= CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-      kbd_a11y_settings.controls &= ~CLUTTER_A11Y_SLOW_KEYS_ENABLED;
-    }
-
-  if (desc->ctrls->enabled_ctrls & XkbStickyKeysMask &&
-      !(kbd_a11y_settings.controls & CLUTTER_A11Y_STICKY_KEYS_ENABLED))
-    {
-      what_changed |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-      kbd_a11y_settings.controls |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-    }
-  else if (!(desc->ctrls->enabled_ctrls & XkbStickyKeysMask) &&
-           kbd_a11y_settings.controls & CLUTTER_A11Y_STICKY_KEYS_ENABLED)
-    {
-      what_changed |= CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-      kbd_a11y_settings.controls &= ~CLUTTER_A11Y_STICKY_KEYS_ENABLED;
-    }
-
-  if (what_changed)
-    g_signal_emit_by_name (device_manager,
-                           "kbd-a11y-flags-changed",
-                           kbd_a11y_settings.controls,
-                           what_changed);
-
-  XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE);
-}
-
-static ClutterX11FilterReturn
-xkb_a11y_event_filter (XEvent       *xevent,
-                       ClutterEvent *clutter_event,
-                       gpointer      data)
-{
-  ClutterDeviceManager *device_manager = CLUTTER_DEVICE_MANAGER (data);
-  XkbEvent *xkbev = (XkbEvent *) xevent;
-
-  /* 'event_type' is set to zero on notifying us of updates in
-   * response to client requests (including our own) and non-zero
-   * to notify us of key/mouse events causing changes (like
-   * pressing shift 5 times to enable sticky keys).
-   *
-   * We only want to update out settings when it's in response to an
-   * explicit user input event, so require a non-zero event_type.
-   */
-  if (xevent->xany.type == (_xkb_event_base + XkbEventCode) &&
-      xkbev->any.xkb_type == XkbControlsNotify && xkbev->ctrls.event_type != 0)
-    check_settings_changed (device_manager);
-
-  return  CLUTTER_X11_FILTER_CONTINUE;
-}
-
-static gboolean
-is_xkb_available (ClutterBackendX11 *backend_x11)
-{
-  gint opcode, error_base, event_base, major, minor;
-
-  if (_xkb_event_base)
-    return TRUE;
-
-  if (!XkbQueryExtension (backend_x11->xdpy,
-                          &opcode,
-                          &event_base,
-                          &error_base,
-                          &major,
-                          &minor))
-    return FALSE;
-
-  if (!XkbUseExtension (backend_x11->xdpy, &major, &minor))
-    return FALSE;
-
-  _xkb_event_base = event_base;
-
-  return TRUE;
-}
-
-static unsigned long
-set_value_mask (gboolean      flag,
-                unsigned long value,
-                unsigned long mask)
-{
-  if (flag)
-    return value | mask;
-
-  return value & ~mask;
-}
-
-static gboolean
-set_xkb_ctrl (XkbDescRec               *desc,
-              ClutterKeyboardA11yFlags settings,
-              ClutterKeyboardA11yFlags flag,
-              unsigned long            mask)
-{
-  gboolean result = (settings & flag) == flag;
-  desc->ctrls->enabled_ctrls = set_value_mask (result, desc->ctrls->enabled_ctrls, mask);
-
-  return result;
-}
-
-void
-clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                    ClutterKbdA11ySettings *kbd_a11y_settings)
-{
-  ClutterBackendX11 *backend_x11;
-  XkbDescRec      *desc;
-  gboolean         enable_accessX;
-
-  backend_x11 = CLUTTER_BACKEND_X11 (clutter_get_default_backend ());
-  desc = get_xkb_desc_rec (backend_x11);
-  if (!desc)
-    return;
-
-  /* general */
-  enable_accessX = kbd_a11y_settings->controls & CLUTTER_A11Y_KEYBOARD_ENABLED;
-
-  desc->ctrls->enabled_ctrls = set_value_mask (enable_accessX,
-                                               desc->ctrls->enabled_ctrls,
-                                               XkbAccessXKeysMask);
-
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls, CLUTTER_A11Y_TIMEOUT_ENABLED,
-                    XkbAccessXTimeoutMask))
-    {
-      desc->ctrls->ax_timeout = kbd_a11y_settings->timeout_delay;
-      /* disable only the master flag via the server we will disable
-       * the rest on the rebound without affecting settings state
-       * don't change the option flags at all.
-       */
-      desc->ctrls->axt_ctrls_mask = XkbAccessXKeysMask | XkbAccessXFeedbackMask;
-      desc->ctrls->axt_ctrls_values = 0;
-      desc->ctrls->axt_opts_mask = 0;
-    }
-
-  desc->ctrls->ax_options =
-    set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_FEATURE_STATE_CHANGE_BEEP,
-                    desc->ctrls->ax_options,
-                    XkbAccessXFeedbackMask | XkbAX_FeatureFBMask | XkbAX_SlowWarnFBMask);
-
-  /* bounce keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_BOUNCE_KEYS_ENABLED, XkbBounceKeysMask))
-    {
-      desc->ctrls->debounce_delay = kbd_a11y_settings->debounce_delay;
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_BOUNCE_KEYS_BEEP_REJECT,
-                        desc->ctrls->ax_options,
-                        XkbAccessXFeedbackMask | XkbAX_BKRejectFBMask);
-    }
-
-  /* mouse keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_MOUSE_KEYS_ENABLED, XkbMouseKeysMask | XkbMouseKeysAccelMask))
-    {
-      gint mk_max_speed;
-      gint mk_accel_time;
-
-      desc->ctrls->mk_interval     = 100;     /* msec between mousekey events */
-      desc->ctrls->mk_curve        = 50;
-
-      /* We store pixels / sec, XKB wants pixels / event */
-      mk_max_speed = kbd_a11y_settings->mousekeys_max_speed;
-      desc->ctrls->mk_max_speed = mk_max_speed / (1000 / desc->ctrls->mk_interval);
-      if (desc->ctrls->mk_max_speed <= 0)
-        desc->ctrls->mk_max_speed = 1;
-
-      mk_accel_time = kbd_a11y_settings->mousekeys_accel_time;
-      desc->ctrls->mk_time_to_max = mk_accel_time / desc->ctrls->mk_interval;
-
-      if (desc->ctrls->mk_time_to_max <= 0)
-        desc->ctrls->mk_time_to_max = 1;
-
-      desc->ctrls->mk_delay = kbd_a11y_settings->mousekeys_init_delay;
-    }
-
-  /* slow keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_SLOW_KEYS_ENABLED, XkbSlowKeysMask))
-    {
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_PRESS,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKPressFBMask);
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_ACCEPT,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKAcceptFBMask);
-      desc->ctrls->ax_options =
-        set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_SLOW_KEYS_BEEP_REJECT,
-                        desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_SKRejectFBMask);
-      desc->ctrls->slow_keys_delay = kbd_a11y_settings->slowkeys_delay;
-      /* anything larger than 500 seems to loose all keyboard input */
-      if (desc->ctrls->slow_keys_delay > 500)
-        desc->ctrls->slow_keys_delay = 500;
-    }
-
-  /* sticky keys */
-  if (set_xkb_ctrl (desc, kbd_a11y_settings->controls,
-                    CLUTTER_A11Y_STICKY_KEYS_ENABLED, XkbStickyKeysMask))
-  {
-    desc->ctrls->ax_options |= XkbAX_LatchToLockMask;
-    desc->ctrls->ax_options =
-      set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_STICKY_KEYS_TWO_KEY_OFF,
-                      desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_TwoKeysMask);
-    desc->ctrls->ax_options =
-      set_value_mask (kbd_a11y_settings->controls &  CLUTTER_A11Y_STICKY_KEYS_BEEP,
-                      desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_StickyKeysFBMask);
-  }
-
-  /* toggle keys */
-  desc->ctrls->ax_options =
-    set_value_mask (kbd_a11y_settings->controls & CLUTTER_A11Y_TOGGLE_KEYS_ENABLED,
-                    desc->ctrls->ax_options, XkbAccessXFeedbackMask | XkbAX_IndicatorFBMask);
-
-  set_xkb_desc_rec (backend_x11, desc);
-  XkbFreeKeyboard (desc, XkbAllComponentsMask, TRUE);
-}
-
-gboolean
-clutter_device_manager_x11_a11y_init (ClutterDeviceManager *device_manager)
-{
-  ClutterBackendX11 *backend_x11;
-  guint event_mask;
-
-  backend_x11 =
-    CLUTTER_BACKEND_X11 (_clutter_device_manager_get_backend (device_manager));
-
-  if (!is_xkb_available (backend_x11))
-    return FALSE;
-
-  event_mask = XkbControlsNotifyMask | XkbAccessXNotifyMask;
-
-  XkbSelectEvents (backend_x11->xdpy, XkbUseCoreKbd, event_mask, event_mask);
-
-  clutter_x11_add_filter (xkb_a11y_event_filter, device_manager);
-
-  return TRUE;
-}
--- a/clutter/clutter/x11/clutter-xkb-a11y-x11.h
+++ b/clutter/clutter/x11/clutter-xkb-a11y-x11.h
@@ -1,39 +0,0 @@
-/*
- *
- * Copyright © 2001 Ximian, Inc.
- * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu>
- * Copyright (C) 2017 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- *
- */
-
-#ifndef CLUTTER_XKB_A11Y_X11_H
-#define CLUTTER_XKB_A11Y_X11_H
-
-#include "clutter-device-manager-private.h"
-#include "clutter-backend-x11.h"
-
-#include <X11/Xlib.h>
-
-void
-clutter_device_manager_x11_apply_kbd_a11y_settings (ClutterDeviceManager   *device_manager,
-                                                    ClutterKbdA11ySettings *kbd_a11y_settings);
-
-gboolean
-clutter_device_manager_x11_a11y_init               (ClutterDeviceManager *device_manager);
-
-#endif /* CLUTTER_XKB_A11Y_X11_H */
--- a/clutter/configure.ac
+++ b/clutter/configure.ac
@@ -121,7 +121,6 @@ m4_define([xcomposite_req_version],     [0.4])
 m4_define([gdk_req_version],            [3.3.18])
 m4_define([libinput_req_version],       [1.4.0])
 m4_define([libudev_req_version],        [136])
-m4_define([libwacom_req_version],       [0.13])

 AC_SUBST([GLIB_REQ_VERSION],       [glib_req_version])
 AC_SUBST([COGL_REQ_VERSION],       [cogl_req_version])
@@ -134,7 +133,6 @@ AC_SUBST([XCOMPOSITE_REQ_VERSION], [xcomposite_req_version])
 AC_SUBST([GDK_REQ_VERSION],        [gdk_req_version])
 AC_SUBST([LIBINPUT_REQ_VERSION],   [libinput_req_version])
 AC_SUBST([LIBUDEV_REQ_VERSION],    [libudev_req_version])
-AC_SUBST([LIBWACOM_REQ_VERSION],   [libwacom_req_version])

 # Checks for typedefs, structures, and compiler characteristics.
 AM_PATH_GLIB_2_0([glib_req_version],
@@ -151,7 +149,7 @@ AC_ARG_ENABLE([Bsymbolic],
                saved_LDFLAGS="${LDFLAGS}"
                AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
                LDFLAGS=-Wl,-Bsymbolic-functions
-                AC_TRY_LINK([], [return 0],
+                AC_TRY_LINK([], [int main (void) { return 0; }],
                            [
                              AC_MSG_RESULT([yes])
                              enable_Bsymbolic=yes
@@ -172,7 +170,7 @@ dnl on other compilers, check if we can do -fvisibility=hidden
 SAVED_CFLAGS="${CFLAGS}"
 CFLAGS="-fvisibility=hidden"
 AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-AC_TRY_COMPILE([], [return 0],
+AC_TRY_COMPILE([], [int main (void) { return 0; }],
 	       AC_MSG_RESULT(yes)
 	       enable_fvisibility_hidden=yes,
 	       AC_MSG_RESULT(no)
@@ -510,32 +508,6 @@ X11_EXTS=${X11_EXTS#* }

 AC_CACHE_SAVE

-dnl === Libwacom support for X11 ===============================================
-AC_ARG_WITH(libwacom,
-  AC_HELP_STRING([--without-libwacom],
-                 [disable the use of libwacom for advanced tablet management]),,
-  with_libwacom=auto)
-
-have_libwacom=no
-AC_MSG_CHECKING([libwacom])
-if test x$with_libwacom = xno ; then
-  AC_MSG_RESULT([disabled])
-else
-  if $PKG_CONFIG --exists libwacom '>=' $LIBWACOM_REQ_VERSION; then
-    have_libwacom=yes
-    AC_MSG_RESULT(yes)
-    PKG_CHECK_MODULES([LIBWACOM], [libwacom])
-    AC_SUBST(LIBWACOM_CFLAGS)
-    AC_SUBST(LIBWACOM_LIBS)
-    AC_DEFINE([HAVE_LIBWACOM], 1, [Building with libwacom for advanced tablet management])
-  else
-    AC_MSG_RESULT(no)
-    if test x$with_libwacom = xyes ; then
-      AC_MSG_ERROR([libwacom forced but not found])
-    fi
-  fi
-fi
-
 dnl === Enable GDK-Pixbuf in tests ============================================

 m4_define([pixbuf_default], [yes])
@@ -707,8 +679,8 @@ AS_IF([test "x$CLUTTER_BASE_PC_FILES_PRIVATE" = "x" && test "x$BACKEND_PC_FILES_
 AC_SUBST(CLUTTER_REQUIRES)
 AC_SUBST(CLUTTER_REQUIRES_PRIVATE)

-CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_DEPS_PRIVATE_CFLAGS $GLIB_CFLAGS $LIBWACOM_CFLAGS"
-CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_DEPS_PRIVATE_LIBS $GLIB_LIBS $LIBWACOM_LIBS"
+CLUTTER_CFLAGS="$FLAVOUR_CFLAGS $CLUTTER_DEPS_CFLAGS $CLUTTER_DEPS_PRIVATE_CFLAGS $GLIB_CFLAGS"
+CLUTTER_LIBS="$FLAVOUR_LIBS $CLUTTER_DEPS_LIBS $CLUTTER_DEPS_PRIVATE_LIBS $GLIB_LIBS"
 AC_SUBST(CLUTTER_CFLAGS)
 AC_SUBST(CLUTTER_LIBS)

--- a/clutter/tests/conform/actor-anchors.c
+++ b/clutter/tests/conform/actor-anchors.c
@@ -407,8 +407,7 @@ test_scale_center (TestState *state)
  g_assert (scale_x == 4.0);
  g_assert (scale_y == 2.0);
  g_assert (gravity == CLUTTER_GRAVITY_NONE);
-  assert_notifications (NOTIFY_SCALE_X | NOTIFY_SCALE_Y
-                        | NOTIFY_SCALE_CENTER_X | NOTIFY_SCALE_CENTER_Y
+  assert_notifications (NOTIFY_SCALE_CENTER_X | NOTIFY_SCALE_CENTER_Y
                        | NOTIFY_SCALE_GRAVITY);
  assert_coords (state, 100 + 10 - 10 * 4, 200 + 20 - 20 * 2,
                 100 + 10 + (RECT_WIDTH - 10) * 4,
--- a/clutter/tests/interactive/test-cogl-offscreen.c
+++ b/clutter/tests/interactive/test-cogl-offscreen.c
@@ -61,6 +61,11 @@ G_END_DECLS
 /* Coglbox private declaration
 *--------------------------------------------------*/

+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
  CoglHandle texhand_id;
@@ -68,11 +73,6 @@ struct _TestCoglboxPrivate
  CoglHandle offscreen_id;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
 *--------------------------------------------------*/

@@ -290,6 +290,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)

  actor_class->map            = test_coglbox_map;
  actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }

 static ClutterActor*
--- a/clutter/tests/interactive/test-cogl-tex-convert.c
+++ b/clutter/tests/interactive/test-cogl-tex-convert.c
@@ -61,17 +61,17 @@ G_END_DECLS
 /* Coglbox private declaration
 *--------------------------------------------------*/

+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
  CoglHandle cogl_tex_id[4];
  gint       frame;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
 *--------------------------------------------------*/

@@ -182,6 +182,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
  gobject_class->finalize     = test_coglbox_finalize;
  gobject_class->dispose      = test_coglbox_dispose;  
  actor_class->paint          = test_coglbox_paint;
+  
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }

 static ClutterActor*
--- a/clutter/tests/interactive/test-cogl-tex-foreign.c
+++ b/clutter/tests/interactive/test-cogl-tex-foreign.c
@@ -86,6 +86,11 @@ G_END_DECLS
 /* Coglbox private declaration
 *--------------------------------------------------*/

+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
  guint      gl_handle;
@@ -111,11 +116,6 @@ struct _TestCoglboxPrivate
  (* glBindTexture) (guint target, guint texture);
 };

-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
 *--------------------------------------------------*/

@@ -229,6 +229,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
  gobject_class->finalize     = test_coglbox_finalize;
  gobject_class->dispose      = test_coglbox_dispose;  
  actor_class->paint          = test_coglbox_paint;
+  
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }

 static ClutterActor*
--- a/clutter/tests/interactive/test-cogl-tex-polygon.c
+++ b/clutter/tests/interactive/test-cogl-tex-polygon.c
@@ -61,6 +61,11 @@ G_END_DECLS
 /* Coglbox private declaration
 *--------------------------------------------------*/

+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
  CoglHandle sliced_tex, not_sliced_tex;
@@ -69,11 +74,6 @@ struct _TestCoglboxPrivate
  gboolean   use_linear_filtering;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
 *--------------------------------------------------*/

@@ -293,6 +293,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
  gobject_class->finalize     = test_coglbox_finalize;
  gobject_class->dispose      = test_coglbox_dispose;
  actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }

 static ClutterActor*
--- a/clutter/tests/interactive/test-cogl-tex-tile.c
+++ b/clutter/tests/interactive/test-cogl-tex-tile.c
@@ -62,17 +62,17 @@ G_END_DECLS
 /* Coglbox private declaration
 *--------------------------------------------------*/

+G_DEFINE_TYPE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
+
+#define TEST_COGLBOX_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
+
 struct _TestCoglboxPrivate
 {
  CoglHandle cogl_tex_id;
  gdouble    animation_progress;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (TestCoglbox, test_coglbox, CLUTTER_TYPE_ACTOR);
-
-#define TEST_COGLBOX_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), TEST_TYPE_COGLBOX, TestCoglboxPrivate))
-
 /* Coglbox implementation
 *--------------------------------------------------*/

@@ -158,6 +158,8 @@ test_coglbox_class_init (TestCoglboxClass *klass)
  gobject_class->finalize     = test_coglbox_finalize;
  gobject_class->dispose      = test_coglbox_dispose;
  actor_class->paint          = test_coglbox_paint;
+
+  g_type_class_add_private (gobject_class, sizeof (TestCoglboxPrivate));
 }

 static ClutterActor*
--- a/clutter/tests/interactive/test-layout.c
+++ b/clutter/tests/interactive/test-layout.c
@@ -40,6 +40,11 @@ enum
  PROP_USE_TRANSFORMED_BOX
 };

+G_DEFINE_TYPE (MyThing, my_thing, CLUTTER_TYPE_ACTOR)
+
+#define MY_THING_GET_PRIVATE(obj)    \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MY_TYPE_THING, MyThingPrivate))
+
 struct _MyThingPrivate
 {
  gfloat  spacing;
@@ -48,11 +53,6 @@ struct _MyThingPrivate
  guint   use_transformed_box : 1;
 };

-G_DEFINE_TYPE_WITH_PRIVATE (MyThing, my_thing, CLUTTER_TYPE_ACTOR)
-
-#define MY_THING_GET_PRIVATE(obj)    \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MY_TYPE_THING, MyThingPrivate))
-
 static void
 my_thing_set_property (GObject      *gobject,
                       guint         prop_id,
@@ -409,6 +409,8 @@ my_thing_class_init (MyThingClass *klass)
                                                         "Use transformed box when allocating",
                                                         FALSE,
                                                         G_PARAM_READWRITE));
+
+  g_type_class_add_private (klass, sizeof (MyThingPrivate));
 }

 static void
--- a/cogl/cogl/Makefile.am
+++ b/cogl/cogl/Makefile.am
@@ -452,7 +452,7 @@ libmutter_cogl_@LIBMUTTER_API_VERSION@_la_LDFLAGS = \
 	-avoid-version \
 	-export-dynamic \
 	-rpath $(mutterlibdir) \
-	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_winsys_egl_ensure_current|_cogl_pixel_format_get_bytes_per_pixel).*"
+	-export-symbols-regex "^(cogl|_cogl_debug_flags|_cogl_atlas_new|_cogl_atlas_add_reorganize_callback|_cogl_atlas_reserve_space|_cogl_callback|_cogl_util_get_eye_planes_for_screen_poly|_cogl_atlas_texture_remove_reorganize_callback|_cogl_atlas_texture_add_reorganize_callback|_cogl_texture_get_format|_cogl_texture_foreach_sub_texture_in_region|_cogl_texture_set_region|_cogl_profile_trace_message|_cogl_context_get_default|_cogl_framebuffer_get_stencil_bits|_cogl_clip_stack_push_rectangle|_cogl_framebuffer_get_modelview_stack|_cogl_object_default_unref|_cogl_pipeline_foreach_layer_internal|_cogl_clip_stack_push_primitive|_cogl_buffer_unmap_for_fill_or_fallback|_cogl_framebuffer_draw_primitive|_cogl_debug_instances|_cogl_framebuffer_get_projection_stack|_cogl_pipeline_layer_get_texture|_cogl_buffer_map_for_fill_or_fallback|_cogl_texture_can_hardware_repeat|_cogl_pipeline_prune_to_n_layers|_cogl_primitive_draw|test_|unit_test_|_cogl_winsys_glx_get_vtable|_cogl_winsys_egl_xlib_get_vtable|_cogl_winsys_egl_get_vtable|_cogl_closure_disconnect|_cogl_onscreen_notify_complete|_cogl_onscreen_notify_frame_sync|_cogl_winsys_egl_renderer_connect_common|_cogl_winsys_error_quark|_cogl_set_error|_cogl_poll_renderer_add_fd|_cogl_poll_renderer_add_idle|_cogl_framebuffer_winsys_update_size|_cogl_winsys_egl_make_current|_cogl_pixel_format_get_bytes_per_pixel).*"

 libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(cogl_sources_c)
 nodist_libmutter_cogl_@LIBMUTTER_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
--- a/cogl/cogl/cogl-frame-info.h
+++ b/cogl/cogl/cogl-frame-info.h
@@ -89,8 +89,11 @@ int64_t cogl_frame_info_get_frame_counter (CoglFrameInfo *info);
 * Gets the presentation time for the frame. This is the time at which
 * the frame became visible to the user.
 *
- * The presentation time measured in nanoseconds, is based on
- * cogl_get_clock_time().
+ * The presentation time measured in nanoseconds is based on a
+ * monotonic time source. The time source is not necessarily
+ * correlated with system/wall clock time and may represent the time
+ * elapsed since some undefined system event such as when the system
+ * last booted.
 *
 * <note>Linux kernel version less that 3.8 can result in
 * non-monotonic timestamps being reported when using a drm based
--- a/cogl/cogl/cogl-mutter.h
+++ b/cogl/cogl/cogl-mutter.h
@@ -43,7 +43,6 @@
 #include <cogl/winsys/cogl-winsys-private.h>

 void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                      CoglCustomWinsysVtableGetter winsys_vtable_getter,
-                                      void                        *user_data);
+                                      CoglCustomWinsysVtableGetter winsys_vtable_getter);

 #endif /* __COGL_MUTTER_H___ */
--- a/cogl/cogl/cogl-object.c
+++ b/cogl/cogl/cogl-object.c
@@ -109,11 +109,7 @@ _cogl_object_default_unref (void *object)
 void
 cogl_object_unref (void *obj)
 {
-  void (* unref_func) (void *);
-
-  _COGL_RETURN_IF_FAIL (obj != NULL);
-
-  unref_func = ((CoglObject *) obj)->klass->virt_unref;
+  void (* unref_func) (void *) = ((CoglObject *) obj)->klass->virt_unref;
  unref_func (obj);
 }

--- a/cogl/cogl/cogl-primitives.c
+++ b/cogl/cogl/cogl-primitives.c
@@ -592,7 +592,7 @@ _cogl_rectangles_validate_layer_cb (CoglPipeline *pipeline,

          if (!warning_seen)
            g_warning ("Skipping layer %d of your pipeline consisting of "
-                       "a sliced texture (unsupported for multi texturing)",
+                       "a sliced texture (unsuported for multi texturing)",
                       state->i);
          warning_seen = TRUE;

--- a/cogl/cogl/cogl-renderer-private.h
+++ b/cogl/cogl/cogl-renderer-private.h
@@ -54,7 +54,6 @@ struct _CoglRenderer
  const CoglDriverVtable *driver_vtable;
  const CoglTextureDriver *texture_driver;
  const CoglWinsysVtable *winsys_vtable;
-  void *custom_winsys_user_data;
  CoglCustomWinsysVtableGetter custom_winsys_vtable_getter;
  CoglWinsysID winsys_id_override;
  GList *constraints;
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -566,10 +566,8 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,

 void
 cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                 CoglCustomWinsysVtableGetter winsys_vtable_getter,
-                                 void                        *user_data)
+                                 CoglCustomWinsysVtableGetter winsys_vtable_getter)
 {
-  renderer->custom_winsys_user_data = user_data;
  renderer->custom_winsys_vtable_getter = winsys_vtable_getter;
 }

--- a/cogl/cogl/cogl-texture.c
+++ b/cogl/cogl/cogl-texture.c
@@ -542,6 +542,285 @@ cogl_texture_set_data (CoglTexture *texture,
                                   error);
 }

+/* Reads back the contents of a texture by rendering it to the framebuffer
+ * and reading back the resulting pixels.
+ *
+ * It will perform multiple renders if the texture is larger than the
+ * current glViewport.
+ *
+ * It assumes the projection and modelview have already been setup so
+ * that rendering to 0,0 with the same width and height of the viewport
+ * will exactly cover the viewport.
+ *
+ * NB: Normally this approach isn't normally used since we can just use
+ * glGetTexImage, but may be used as a fallback in some circumstances.
+ */
+static CoglBool
+do_texture_draw_and_read (CoglFramebuffer *fb,
+                          CoglPipeline *pipeline,
+                          CoglTexture *texture,
+                          CoglBitmap *target_bmp,
+                          float *viewport,
+                          CoglError **error)
+{
+  float rx1, ry1;
+  float rx2, ry2;
+  float tx1, ty1;
+  float tx2, ty2;
+  int bw,  bh;
+  CoglBitmap *rect_bmp;
+  unsigned int tex_width, tex_height;
+  CoglContext *ctx = fb->context;
+
+  tex_width = cogl_texture_get_width (texture);
+  tex_height = cogl_texture_get_height (texture);
+
+  ry2 = 0;
+  ty2 = 0;
+
+  /* Walk Y axis until whole bitmap height consumed */
+  for (bh = tex_height; bh > 0; bh -= viewport[3])
+    {
+      /* Rectangle Y coords */
+      ry1 = ry2;
+      ry2 += (bh < viewport[3]) ? bh : viewport[3];
+
+      /* Normalized texture Y coords */
+      ty1 = ty2;
+      ty2 = (ry2 / (float) tex_height);
+
+      rx2 = 0;
+      tx2 = 0;
+
+      /* Walk X axis until whole bitmap width consumed */
+      for (bw = tex_width; bw > 0; bw-=viewport[2])
+        {
+          int width;
+          int height;
+
+          /* Rectangle X coords */
+          rx1 = rx2;
+          rx2 += (bw < viewport[2]) ? bw : viewport[2];
+
+          width = rx2 - rx1;
+          height = ry2 - ry1;
+
+          /* Normalized texture X coords */
+          tx1 = tx2;
+          tx2 = (rx2 / (float) tex_width);
+
+          /* Draw a portion of texture */
+          cogl_framebuffer_draw_textured_rectangle (fb,
+                                                    pipeline,
+                                                    0, 0,
+                                                    rx2 - rx1,
+                                                    ry2 - ry1,
+                                                    tx1, ty1,
+                                                    tx2, ty2);
+
+          /* Read into a temporary bitmap */
+          rect_bmp = _cogl_bitmap_new_with_malloc_buffer
+                                              (ctx,
+                                               width, height,
+                                               COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+                                               error);
+          if (!rect_bmp)
+            return FALSE;
+
+          if (!_cogl_framebuffer_read_pixels_into_bitmap
+                                               (fb,
+                                                viewport[0], viewport[1],
+                                                COGL_READ_PIXELS_COLOR_BUFFER,
+                                                rect_bmp,
+                                                error))
+            {
+              cogl_object_unref (rect_bmp);
+              return FALSE;
+            }
+
+          /* Copy to target bitmap */
+          if (!_cogl_bitmap_copy_subregion (rect_bmp,
+                                            target_bmp,
+                                            0, 0,
+                                            rx1, ry1,
+                                            width,
+                                            height,
+                                            error))
+            {
+              cogl_object_unref (rect_bmp);
+              return FALSE;
+            }
+
+          /* Free temp bitmap */
+          cogl_object_unref (rect_bmp);
+        }
+    }
+
+  return TRUE;
+}
+
+/* Reads back the contents of a texture by rendering it to the framebuffer
+ * and reading back the resulting pixels.
+ *
+ * NB: Normally this approach isn't normally used since we can just use
+ * glGetTexImage, but may be used as a fallback in some circumstances.
+ */
+static CoglBool
+_cogl_texture_draw_and_read (CoglTexture *texture,
+                             CoglBitmap *target_bmp,
+                             GLuint target_gl_format,
+                             GLuint target_gl_type,
+                             CoglError **error)
+{
+  CoglFramebuffer *framebuffer = cogl_get_draw_framebuffer ();
+  CoglContext *ctx = framebuffer->context;
+  float save_viewport[4];
+  float viewport[4];
+  CoglBool status = FALSE;
+
+  viewport[0] = 0;
+  viewport[1] = 0;
+  viewport[2] = cogl_framebuffer_get_width (framebuffer);
+  viewport[3] = cogl_framebuffer_get_height (framebuffer);
+
+  cogl_framebuffer_get_viewport4fv (framebuffer, save_viewport);
+  _cogl_framebuffer_push_projection (framebuffer);
+  cogl_framebuffer_orthographic (framebuffer,
+                                 0, 0,
+                                 viewport[2],
+                                 viewport[3],
+                                 0, 100);
+
+  cogl_framebuffer_push_matrix (framebuffer);
+  cogl_framebuffer_identity_matrix (framebuffer);
+
+  /* Direct copy operation */
+
+  if (ctx->texture_download_pipeline == NULL)
+    {
+      ctx->texture_download_pipeline = cogl_pipeline_new (ctx);
+      cogl_pipeline_set_blend (ctx->texture_download_pipeline,
+                               "RGBA = ADD (SRC_COLOR, 0)",
+                               NULL);
+    }
+
+  cogl_pipeline_set_layer_texture (ctx->texture_download_pipeline, 0, texture);
+
+  cogl_pipeline_set_layer_combine (ctx->texture_download_pipeline,
+                                   0, /* layer */
+                                   "RGBA = REPLACE (TEXTURE)",
+                                   NULL);
+
+  cogl_pipeline_set_layer_filters (ctx->texture_download_pipeline, 0,
+                                   COGL_PIPELINE_FILTER_NEAREST,
+                                   COGL_PIPELINE_FILTER_NEAREST);
+
+  if (!do_texture_draw_and_read (framebuffer,
+                                 ctx->texture_download_pipeline,
+                                 texture, target_bmp, viewport,
+                                 error))
+    return FALSE;
+
+  /* XXX: As an alleged PowerVR driver bug workaround where the driver
+   * is apparently not maintaining the alpha component of some
+   * framebuffers we render the alpha component of the texture
+   * separately to be sure we retrieve all components of the texture.
+   *
+   * TODO: verify if this is still an issue
+   */
+  if ((_cogl_texture_get_format (texture) & COGL_A_BIT)/* && a_bits == 0*/)
+    {
+      uint8_t *srcdata;
+      uint8_t *dstdata;
+      uint8_t *srcpixel;
+      uint8_t *dstpixel;
+      int target_width = cogl_bitmap_get_width (target_bmp);
+      int target_height = cogl_bitmap_get_height (target_bmp);
+      int target_rowstride = cogl_bitmap_get_rowstride (target_bmp);
+      int bpp = _cogl_pixel_format_get_bytes_per_pixel (COGL_PIXEL_FORMAT_RGBA_8888);
+      int alpha_rowstride = bpp * target_width;
+      CoglBitmap *alpha_bmp;
+      int x,y;
+
+      if ((dstdata = _cogl_bitmap_map (target_bmp,
+                                       COGL_BUFFER_ACCESS_WRITE,
+                                       COGL_BUFFER_MAP_HINT_DISCARD,
+                                       error)) == NULL)
+        goto EXIT;
+
+      /* Create temp bitmap for alpha values */
+      alpha_bmp =
+        _cogl_bitmap_new_with_malloc_buffer (ctx,
+                                             target_width,
+                                             target_height,
+                                             COGL_PIXEL_FORMAT_RGBA_8888,
+                                             error);
+      if (!alpha_bmp)
+        {
+          _cogl_bitmap_unmap (target_bmp);
+          goto EXIT;
+        }
+
+
+      /* Draw alpha values into RGB channels */
+      cogl_pipeline_set_layer_combine (ctx->texture_download_pipeline,
+                                       0, /* layer */
+                                       "RGBA = REPLACE (TEXTURE[A])",
+                                       NULL);
+
+      if (!do_texture_draw_and_read (framebuffer,
+                                     ctx->texture_download_pipeline,
+                                     texture, alpha_bmp, viewport,
+                                     error))
+        {
+          cogl_object_unref (alpha_bmp);
+          _cogl_bitmap_unmap (target_bmp);
+          goto EXIT;
+        }
+
+      /* Copy temp R to target A */
+
+      /* Note: we don't try to catch errors since "mapping" an
+       * malloc buffer should never fail */
+      srcdata = _cogl_bitmap_map (alpha_bmp,
+                                  COGL_BUFFER_ACCESS_READ,
+                                  0 /* hints */,
+                                  NULL);
+
+      for (y=0; y<target_height; ++y)
+        {
+          for (x=0; x<target_width; ++x)
+            {
+              srcpixel = srcdata + x*bpp;
+              dstpixel = dstdata + x*bpp;
+              dstpixel[3] = srcpixel[0];
+            }
+          srcdata += alpha_rowstride;
+          dstdata += target_rowstride;
+        }
+
+      _cogl_bitmap_unmap (alpha_bmp);
+
+      _cogl_bitmap_unmap (target_bmp);
+
+      cogl_object_unref (alpha_bmp);
+    }
+
+  status = TRUE;
+
+EXIT:
+  /* Restore old state */
+  cogl_framebuffer_pop_matrix (framebuffer);
+  _cogl_framebuffer_pop_projection (framebuffer);
+  cogl_framebuffer_set_viewport (framebuffer,
+                                 save_viewport[0],
+                                 save_viewport[1],
+                                 save_viewport[2],
+                                 save_viewport[3]);
+
+  return status;
+}
+
 static CoglBool
 get_texture_bits_via_offscreen (CoglTexture *meta_texture,
                                CoglTexture *sub_texture,
@@ -877,14 +1156,26 @@ cogl_texture_get_data (CoglTexture *texture,
      tg_data.success = FALSE;
    }

-  /* XXX: In some cases this api may fail to read back the texture
-   * data; such as for GLES which doesn't support glGetTexImage
-   */
+  /* XXX: In some cases _cogl_texture_2d_download_from_gl may fail
+   * to read back the texture data; such as for GLES which doesn't
+   * support glGetTexImage, so here we fallback to drawing the
+   * texture and reading the pixels from the framebuffer. */
  if (!tg_data.success)
    {
+      if (!_cogl_texture_draw_and_read (texture, target_bmp,
+                                        closest_gl_format,
+                                        closest_gl_type,
+                                        &ignore_error))
+        {
+          /* We have no more fallbacks so we just give up and
+           * hope for the best */
+          g_warning ("Failed to read texture since draw-and-read "
+                     "fallback failed: %s", ignore_error->message);
+          cogl_error_free (ignore_error);
          cogl_object_unref (target_bmp);
          return 0;
        }
+    }

  /* Was intermediate used? */
  if (closest_format != format)
--- a/cogl/cogl/cogl-xlib-renderer.h
+++ b/cogl/cogl/cogl-xlib-renderer.h
@@ -168,7 +168,7 @@ cogl_xlib_renderer_set_event_retrieval_enabled (CoglRenderer *renderer,
                                                CoglBool enable);

 /**
- * cogl_xlib_renderer_set_threaded_swap_wait_enabled: (skip)
+ * cogl_xlib_renderer_set_threaded_swap_wait_enabled:
 * @renderer: a #CoglRenderer
 * @enable: The new value
 *
--- a/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
+++ b/cogl/cogl/driver/gl/cogl-framebuffer-gl.c
@@ -1412,12 +1412,22 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
  if (!cogl_is_offscreen (framebuffer))
    y = framebuffer_height - y - height;

-  required_format = ctx->driver_vtable->pixel_format_to_gl_with_target (ctx,
-                                                                        framebuffer->internal_format,
+  required_format = ctx->driver_vtable->pixel_format_to_gl (ctx,
                                                            format,
                                                            &gl_intformat,
                                                            &gl_format,
                                                            &gl_type);
+#if HAVE_COGL_GL
+  /* As we are reading pixels, we want to consider the bitmap according to
+   * its real pixel format, not the swizzled channels we pretend face to the
+   * pipeline.
+   */
+  if ((ctx->driver == COGL_DRIVER_GL || ctx->driver == COGL_DRIVER_GL3) &&
+      (format == COGL_PIXEL_FORMAT_BGRA_8888 ||
+       format == COGL_PIXEL_FORMAT_BGRA_8888_PRE) &&
+      _cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE))
+    gl_format = GL_BGRA;
+#endif

  /* NB: All offscreen rendering is done upside down so there is no need
   * to flip in this case... */
--- a/cogl/cogl/winsys/cogl-winsys-egl-private.h
+++ b/cogl/cogl/winsys/cogl-winsys-egl-private.h
@@ -90,11 +90,6 @@ typedef struct _CoglWinsysEGLVtable
  (* add_config_attributes) (CoglDisplay *display,
                             CoglFramebufferConfig *config,
                             EGLint *attributes);
-  CoglBool
-  (* choose_config) (CoglDisplay *display,
-                     EGLint *attributes,
-                     EGLConfig *out_config,
-                     CoglError **error);
 } CoglWinsysEGLVtable;

 typedef enum _CoglEGLWinsysFeature
@@ -181,9 +176,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
                               EGLSurface read,
                               EGLContext context);

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display);
-
 #ifdef EGL_KHR_image_base
 EGLImageKHR
 _cogl_egl_create_image (CoglContext *ctx,
--- a/cogl/cogl/winsys/cogl-winsys-egl-x11.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl-x11.c
@@ -336,32 +336,6 @@ _cogl_winsys_egl_add_config_attributes (CoglDisplay *display,
  return i;
 }

-static CoglBool
-_cogl_winsys_egl_choose_config (CoglDisplay *display,
-                                EGLint *attributes,
-                                EGLConfig *out_config,
-                                CoglError **error)
-{
-  CoglRenderer *renderer = display->renderer;
-  CoglRendererEGL *egl_renderer = renderer->winsys;
-  EGLint config_count = 0;
-  EGLBoolean status;
-
-  status = eglChooseConfig (egl_renderer->edpy,
-                            attributes,
-                            out_config, 1,
-                            &config_count);
-  if (status != EGL_TRUE || config_count == 0)
-    {
-      _cogl_set_error (error, COGL_WINSYS_ERROR,
-                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                       "No compatible EGL configs found");
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
 static CoglBool
 _cogl_winsys_egl_display_setup (CoglDisplay *display,
                                CoglError **error)
@@ -867,7 +841,6 @@ static const CoglWinsysEGLVtable
 _cogl_winsys_egl_vtable =
  {
    .add_config_attributes = _cogl_winsys_egl_add_config_attributes,
-    .choose_config = _cogl_winsys_egl_choose_config,
    .display_setup = _cogl_winsys_egl_display_setup,
    .display_destroy = _cogl_winsys_egl_display_destroy,
    .context_created = _cogl_winsys_egl_context_created,
--- a/cogl/cogl/winsys/cogl-winsys-egl.c
+++ b/cogl/cogl/winsys/cogl-winsys-egl.c
@@ -309,18 +309,6 @@ _cogl_winsys_egl_make_current (CoglDisplay *display,
  return ret;
 }

-EGLBoolean
-_cogl_winsys_egl_ensure_current (CoglDisplay *display)
-{
-  CoglDisplayEGL *egl_display = display->winsys;
-  CoglRendererEGL *egl_renderer = display->renderer->winsys;
-
-  return eglMakeCurrent (egl_renderer->edpy,
-                         egl_display->current_draw_surface,
-                         egl_display->current_read_surface,
-                         egl_display->current_context);
-}
-
 static void
 cleanup_context (CoglDisplay *display)
 {
@@ -350,9 +338,10 @@ try_create_context (CoglDisplay *display,
  CoglRendererEGL *egl_renderer = renderer->winsys;
  EGLDisplay edpy;
  EGLConfig config;
+  EGLint config_count = 0;
+  EGLBoolean status;
  EGLint attribs[9];
  EGLint cfg_attribs[MAX_EGL_CONFIG_ATTRIBS];
-  GError *config_error = NULL;
  const char *error_message;

  _COGL_RETURN_VAL_IF_FAIL (egl_display->egl_context == NULL, TRUE);
@@ -367,16 +356,14 @@ try_create_context (CoglDisplay *display,

  edpy = egl_renderer->edpy;

-  if (!egl_renderer->platform_vtable->choose_config (display,
+  status = eglChooseConfig (edpy,
                            cfg_attribs,
-                                                     &config,
-                                                     &config_error))
+                            &config, 1,
+                            &config_count);
+  if (status != EGL_TRUE || config_count == 0)
    {
-      _cogl_set_error (error, COGL_WINSYS_ERROR,
-                       COGL_WINSYS_ERROR_CREATE_CONTEXT,
-                       "Couldn't choose config: %s", config_error->message);
-      g_error_free (config_error);
-      goto err;
+      error_message = "Unable to find a usable EGL configuration";
+      goto fail;
    }

  egl_display->egl_config = config;
@@ -432,7 +419,6 @@ fail:
               COGL_WINSYS_ERROR_CREATE_CONTEXT,
               "%s", error_message);

-err:
  cleanup_context (display);

  return FALSE;
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,15 @@
 AC_PREREQ(2.62)

 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [29])
-m4_define([mutter_micro_version], [90])
+m4_define([mutter_minor_version], [26])
+m4_define([mutter_micro_version], [0])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])

 m4_define([mutter_plugin_api_version], [3])

-m4_define([libmutter_api_version], [3])
+m4_define([libmutter_api_version], [1])

 AC_INIT([mutter], [mutter_version],
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
@@ -80,7 +80,6 @@ CANBERRA_GTK_VERSION=0.26
 LIBWACOM_VERSION=0.13

 MUTTER_PC_MODULES="
-   gl
   egl
   gtk+-3.0 >= 3.19.8
   gio-unix-2.0 >= 2.35.1
@@ -88,6 +87,7 @@ MUTTER_PC_MODULES="
   cairo >= 1.10.0
   gsettings-desktop-schemas >= 3.21.4
   json-glib-1.0
+   upower-glib >= 0.99.0
   gnome-desktop-3.0
   xcomposite >= 0.2
   xcursor
@@ -104,7 +104,6 @@ MUTTER_PC_MODULES="
   xcb-randr
   xcb-res
 "
-XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr"

 GLIB_GSETTINGS

@@ -240,11 +239,12 @@ else
 fi

 AC_ARG_ENABLE(remote-desktop,
-  AS_HELP_STRING([--enable-remote-desktop], [enable support for remote desktop and screen cast]),,
+  AS_HELP_STRING([--enable-remote-desktop], [enable support for remote desktop and screen cast]),
+  enable_remote_desktop=yes,
  enable_remote_desktop=no
 )
 AS_IF([test "$enable_remote_desktop" = "yes"], [
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.2 >= 0.2.2"
+  MUTTER_PC_MODULES="$MUTTER_PC_MODULES libpipewire-0.1 >= 0.1.4"
  AC_DEFINE([HAVE_REMOTE_DESKTOP],[1], [Defined if screen cast and remote desktop support is enabled])
 ])
 AM_CONDITIONAL([HAVE_REMOTE_DESKTOP],[test "$enable_remote_desktop" = "yes"])
@@ -261,19 +261,7 @@ AC_SUBST(XWAYLAND_PATH)

 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

-PKG_CHECK_MODULES(ELOGIND, [libelogind], [have_elogind=yes], [have_elogind=no])
-
-if test x$have_elogind = xyes; then
-     logind_provider="libelogind"
-fi
-
-PKG_CHECK_MODULES(SYSTEMD, [libsystemd], [have_systemd=yes], [have_systemd=no])
-
-if test x$have_systemd = xyes -o -z "$logind_provider"; then
-     logind_provider="libsystemd"
-fi
-
-MUTTER_NATIVE_BACKEND_MODULES="libdrm $logind_provider libinput >= 1.4 gudev-1.0 gbm >= 10.3"
+MUTTER_NATIVE_BACKEND_MODULES="libdrm libsystemd libinput >= 1.4 gudev-1.0 gbm >= 10.3"

 AC_ARG_ENABLE(native-backend,
  AS_HELP_STRING([--disable-native-backend], [disable mutter native (KMS) backend]),,
@@ -289,24 +277,14 @@ AS_IF([test "$have_native_backend" = "yes"], [
 ])
 AM_CONDITIONAL([HAVE_NATIVE_BACKEND],[test "$have_native_backend" = "yes"])

-MUTTER_WAYLAND_EGLSTREAM_MODULES="wayland-eglstream-protocols"
-
 AC_ARG_ENABLE(egl-device,
-  AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),,
+  AS_HELP_STRING([--enable-egl-device], [enable support for EGLDevice on top of KMS]),
+  enable_egl_device=yes,
  enable_egl_device=no
-  have_wayland_eglstream=no
 )
 AS_IF([test "$enable_egl_device" = "yes"], [
  AC_DEFINE([HAVE_EGL_DEVICE],[1], [Defined if EGLDevice support is enabled])
-  PKG_CHECK_EXISTS([$MUTTER_WAYLAND_EGLSTREAM_MODULES], [have_wayland_eglstream=yes], [have_wayland_eglstream=no])
 ])
-AS_IF([test "$have_wayland_eglstream" = "yes"], [
-  AC_DEFINE([HAVE_WAYLAND_EGLSTREAM],[1],[Defined if Wayland EGLStream protocols are available])
-  PKG_CHECK_MODULES(WAYLAND_EGLSTREAM, [$MUTTER_WAYLAND_EGLSTREAM_MODULES],
-                    [ac_wayland_eglstream_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir $MUTTER_WAYLAND_EGLSTREAM_MODULES`])
-  AC_SUBST(WAYLAND_EGLSTREAM_DATADIR, $ac_wayland_eglstream_pkgdatadir)
-])
-AM_CONDITIONAL([HAVE_WAYLAND_EGLSTREAM],[test "$have_wayland_eglstream" = "yes"])

 MUTTER_WAYLAND_MODULES="wayland-server >= 1.13.0"

@@ -325,27 +303,12 @@ AS_IF([test "$have_wayland" = "yes"], [
  AC_SUBST([WAYLAND_SCANNER])
  AC_DEFINE([HAVE_WAYLAND],[1],[Define if you want to enable Wayland support])

-  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.12],
+  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.9],
 		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
  AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
 ])
 AM_CONDITIONAL([HAVE_WAYLAND],[test "$have_wayland" = "yes"])

-AC_ARG_WITH([xwayland-grab-default-access-rules],
-    [AS_HELP_STRING([--with-xwayland-grab-default-access-rules="app-res1,app-res2,..."],
-        [comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland"])],
-    [with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$withval"],
-    [with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$XWAYLAND_GRAB_DEFAULT_ACCESS_RULES"])
-
-case "$with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES" in
-    yes) with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES="$XWAYLAND_GRAB_DEFAULT_ACCESS_RULES" ;;
-    no) with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES='' ;;
-esac
-AC_DEFINE_UNQUOTED([XWAYLAND_GRAB_DEFAULT_ACCESS_RULES],
-                    "$with_XWAYLAND_GRAB_DEFAULT_ACCESS_RULES",
-                    [Xwayland applications allowed to issue keyboard grabs])
-AC_SUBST(XWAYLAND_GRAB_DEFAULT_ACCESS_RULES)
-
 PKG_CHECK_EXISTS([xi >= 1.6.99.1],
                 AC_DEFINE([HAVE_XI23],[1],[Define if you have support for XInput 2.3 or greater]))

@@ -559,7 +522,6 @@ mutter-$VERSION
 	Introspection:            ${found_introspection}
 	Session management:       ${found_sm}
 	Wayland:                  ${have_wayland}
-	Wayland EGLStream:        ${have_wayland_eglstream}
 	Native (KMS) backend:     ${have_native_backend}
 	EGLDevice:                ${enable_egl_device}
 	Remote desktop:           ${enable_remote_desktop}
--- a/data/50-mutter-navigation.xml
+++ b/data/50-mutter-navigation.xml
@@ -20,6 +20,12 @@
        <KeyListEntry name="move-to-workspace-last"
                      description="Move window to last workspace" />

+	<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" />

@@ -119,6 +125,12 @@
 	<KeyListEntry name="switch-to-workspace-last"
 	              description="Switch to last workspace" />

+	<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" />

--- a/data/50-mutter-wayland.xml
+++ b/data/50-mutter-wayland.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.wayland.keybindings"
-                group="system"
-                name="System"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="restore-shortcuts" description="Restore the keyboard shortcuts"/>
-
-</KeyListEntries>
--- a/data/50-mutter-windows.xml
+++ b/data/50-mutter-windows.xml
@@ -15,6 +15,8 @@

 	<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"/>
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,11 +12,6 @@ xml_DATA = \
        50-mutter-system.xml \
        50-mutter-windows.xml

-if HAVE_WAYLAND
-xml_DATA += \
-        50-mutter-wayland.xml
-endif
-
 gschema_in_files = \
 	org.gnome.mutter.gschema.xml.in	\
 	org.gnome.mutter.wayland.gschema.xml.in
@@ -24,7 +19,6 @@ gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)

 %.gschema.xml: %.gschema.xml.in Makefile
 	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_PACKAGE)|g' \
-	                -e 's|@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES[@]|$(XWAYLAND_GRAB_DEFAULT_ACCESS_RULES)|g' \
 	$< > $@ || rm $@

@GSETTINGS_RULES@
--- a/data/org.gnome.mutter.gschema.xml.in
+++ b/data/org.gnome.mutter.gschema.xml.in
@@ -120,6 +120,10 @@
                                        framebuffers instead of window content,
                                        to manage HiDPI monitors. Does not
                                        require a restart.
+        • “remote-desktop”            — enables remote desktop support. To support
+                                        remote desktop with screen sharing,
+                                        “screen-cast” must also be enabled.
+        • “screen-cast”               — enables screen cast support.
      </description>
    </key>

--- a/data/org.gnome.mutter.wayland.gschema.xml.in
+++ b/data/org.gnome.mutter.wayland.gschema.xml.in
@@ -50,52 +50,8 @@
      <summary>Switch to VT 12</summary>
    </key>
    <key name="restore-shortcuts" type="as">
-      <default><![CDATA[['<Super>Escape']]]></default>
+      <default><![CDATA[['<Shift><Control>Escape']]]></default>
      <summary>Re-enable shortcuts</summary>
    </key>
  </schema>
-
-
-  <schema id="org.gnome.mutter.wayland" path="/org/gnome/mutter/wayland/"
-          gettext-domain="@GETTEXT_DOMAIN@">
-
-    <key name="xwayland-allow-grabs" type="b">
-      <default>false</default>
-      <summary>Allow grabs with Xwayland</summary>
-      <description>
-        Allow keyboard grabs issued by X11 applications running in Xwayland
-        to be taken into account.
-
-        For a X11 grab to be taken into account under Wayland, the client must
-        also either send a specific X11 ClientMessage to the root window or be
-        among the applications white-listed in key “xwayland-grab-access-rules”.
-      </description>
-    </key>
-
-    <key name="xwayland-grab-access-rules" type="as">
-      <default>[]</default>
-      <summary>Xwayland applications allowed to issue keyboard grabs</summary>
-      <description>
-        List the resource names or resource class of X11 windows either
-        allowed or not allowed to issue X11 keyboard grabs under Xwayland.
-
-        The resource name or resource class of a given X11 window can be
-        obtained using the command “xprop WM_CLASS”.
-
-        Wildcards “*” and jokers “?” in the values are supported.
-
-        Values starting with “!” are blacklisted, which has precedence over
-        the whitelist, to revoke applications from the default system list.
-
-        The default system list includes the following applications:
-
-        “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”
-
-        Users can break an existing grab by using the specific keyboard
-        shortcut defined by the keybinding key “restore-shortcuts”.
-      </description>
-    </key>
-
-  </schema>
-
 </schemalist>
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@
 # Please keep this file sorted alphabetically.
 data/50-mutter-navigation.xml
 data/50-mutter-system.xml
-data/50-mutter-wayland.xml
 data/50-mutter-windows.xml
 data/mutter.desktop.in
 data/org.gnome.mutter.gschema.xml.in
@@ -14,18 +13,18 @@ src/compositor/meta-background.c
 src/core/bell.c
 src/core/core.c
 src/core/display.c
+src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
 src/core/meta-close-dialog-default.c
 src/core/mutter.c
 src/core/prefs.c
+src/core/screen.c
 src/core/util.c
 src/core/window.c
 src/ui/frames.c
 src/ui/theme.c
 src/wayland/meta-wayland-tablet-pad.c
-src/x11/meta-x11-display.c
-src/x11/meta-x11-errors.c
 src/x11/session.c
 src/x11/window-props.c
 src/x11/xprops.c
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -28,7 +28,6 @@ clutter/clutter/clutter-grid-layout.c
 clutter/clutter/clutter-image.c
 clutter/clutter/clutter-input-device.c
 clutter/clutter/clutter-input-device-tool.c
-clutter/clutter/clutter-input-method.c
 clutter/clutter/clutter-interval.c
 clutter/clutter/clutter-layout-manager.c
 clutter/clutter/clutter-layout-meta.c
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: metacity.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
 "keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-03 10:20+0200\n"
-"PO-Revision-Date: 2017-11-03 10:22+0200\n"
+"POT-Creation-Date: 2017-06-18 21:26+0200\n"
+"PO-Revision-Date: 2017-06-18 21:27+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -24,10 +24,448 @@ msgstr ""
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"

+#: data/50-mutter-navigation.xml:6
+msgid "Navigation"
+msgstr "الإبحار"
+
+#: data/50-mutter-navigation.xml:9
+msgid "Move window to workspace 1"
+msgstr "انقل النافذة إلى مساحة العمل 1"
+
+#: data/50-mutter-navigation.xml:12
+msgid "Move window to workspace 2"
+msgstr "انقل النافذة إلى مساحة العمل 2"
+
+#: data/50-mutter-navigation.xml:15
+msgid "Move window to workspace 3"
+msgstr "انقل النافذة إلى مساحة العمل 3"
+
+#: data/50-mutter-navigation.xml:18
+msgid "Move window to workspace 4"
+msgstr "انقل النافذة إلى مساحة العمل 4"
+
+#: data/50-mutter-navigation.xml:21
+msgid "Move window to last workspace"
+msgstr "انقل النافذة إلى مساحة العمل الأخيرة"
+
+#: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "انقل النافذة مساحة عمل واحدة إلى اليسار"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "انقل النافذة مساحة عمل واحدة إلى اليمين"
+
+#: data/50-mutter-navigation.xml:30
+msgid "Move window one workspace up"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأعلى"
+
+#: data/50-mutter-navigation.xml:33
+msgid "Move window one workspace down"
+msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
+
+#: data/50-mutter-navigation.xml:36
+msgid "Move window one monitor to the left"
+msgstr "انقل النافذة شاشة واحدة إلى اليسار"
+
+#: data/50-mutter-navigation.xml:39
+msgid "Move window one monitor to the right"
+msgstr "انقل النافذة شاشة واحدة إلى اليمين"
+
+#: data/50-mutter-navigation.xml:42
+msgid "Move window one monitor up"
+msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
+
+#: data/50-mutter-navigation.xml:45
+msgid "Move window one monitor down"
+msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
+
+#: data/50-mutter-navigation.xml:49
+msgid "Switch applications"
+msgstr "تنقل بين التطبيقات"
+
+#: data/50-mutter-navigation.xml:54
+msgid "Switch to previous application"
+msgstr "انتقل إلى التطبيق السابق"
+
+#: data/50-mutter-navigation.xml:58
+msgid "Switch windows"
+msgstr "تنقل بين النوافذ"
+
+#: data/50-mutter-navigation.xml:63
+msgid "Switch to previous window"
+msgstr "انتقل إلى النافذة السابقة"
+
+#: data/50-mutter-navigation.xml:67
+msgid "Switch windows of an application"
+msgstr "تنقل بين نوافذ التطبيق"
+
+#: data/50-mutter-navigation.xml:72
+msgid "Switch to previous window of an application"
+msgstr "انتقل إلى نافذة التطبيق السابقة"
+
+#: data/50-mutter-navigation.xml:76
+msgid "Switch system controls"
+msgstr "تنقل بين تحكمات النظام"
+
+#: data/50-mutter-navigation.xml:81
+msgid "Switch to previous system control"
+msgstr "انتقل إلى تحكم النظام السابق"
+
+#: data/50-mutter-navigation.xml:85
+msgid "Switch windows directly"
+msgstr "تنقل مباشرة بين النوافذ"
+
+#: data/50-mutter-navigation.xml:90
+msgid "Switch directly to previous window"
+msgstr "انتقل مباشرة إلى النافذة السابقة"
+
+#: data/50-mutter-navigation.xml:94
+msgid "Switch windows of an app directly"
+msgstr "تنقل مباشرة بين نوافذ التطبيق"
+
+#: data/50-mutter-navigation.xml:99
+msgid "Switch directly to previous window of an app"
+msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
+
+#: data/50-mutter-navigation.xml:103
+msgid "Switch system controls directly"
+msgstr "تنقل مباشرة بين تحكمات النظام"
+
+#: data/50-mutter-navigation.xml:108
+msgid "Switch directly to previous system control"
+msgstr "انتقل مباشرة إلى تحكم النظام السابق"
+
+#: data/50-mutter-navigation.xml:111
+msgid "Hide all normal windows"
+msgstr "أخفِ كل النوافذ العادية"
+
+#: data/50-mutter-navigation.xml:114
+msgid "Switch to workspace 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: data/50-mutter-navigation.xml:117
+msgid "Switch to workspace 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: data/50-mutter-navigation.xml:120
+msgid "Switch to workspace 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: data/50-mutter-navigation.xml:123
+msgid "Switch to workspace 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: data/50-mutter-navigation.xml:126
+msgid "Switch to last workspace"
+msgstr "انتقل إلى مساحة العمل الأخيرة"
+
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "انقل لمساحة العمل على اليسار"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "انقل لمساحة العمل على اليمين"
+
+#: data/50-mutter-navigation.xml:135
+msgid "Move to workspace above"
+msgstr "انقل لمساحة العمل أعلى"
+
+#: data/50-mutter-navigation.xml:138
+msgid "Move to workspace below"
+msgstr "انقل لمساحة العمل أسفل"
+
+#: data/50-mutter-system.xml:6
+msgid "System"
+msgstr "النظام"
+
+#: data/50-mutter-system.xml:8
+msgid "Show the run command prompt"
+msgstr "أظهر محث تشغيل أمر"
+
+#: data/50-mutter-system.xml:10
+msgid "Show the activities overview"
+msgstr "أظهر نظرة عامة على الأنشطة"
+
+#: data/50-mutter-windows.xml:6
+msgid "Windows"
+msgstr "النوافذ"
+
+#: data/50-mutter-windows.xml:8
+msgid "Activate the window menu"
+msgstr "فعّل قائمة النافذة"
+
+#: data/50-mutter-windows.xml:10
+msgid "Toggle fullscreen mode"
+msgstr "بدّل نمط ملء الشاشة"
+
+#: data/50-mutter-windows.xml:12
+msgid "Toggle maximization state"
+msgstr "بدّل حالة التكبير"
+
+#: data/50-mutter-windows.xml:14
+msgid "Maximize window"
+msgstr "كبّر النّافذة"
+
+#: data/50-mutter-windows.xml:16
+msgid "Restore window"
+msgstr "استعد النّافذة"
+
+#: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "بدّل حالة الإخفاء"
+
+#: data/50-mutter-windows.xml:20
+msgid "Close window"
+msgstr "أغلق النّافذة"
+
+#: data/50-mutter-windows.xml:22
+msgid "Hide window"
+msgstr "أخفِ النّافذة"
+
+#: data/50-mutter-windows.xml:24
+msgid "Move window"
+msgstr "انقل النّافذة"
+
+#: data/50-mutter-windows.xml:26
+msgid "Resize window"
+msgstr "حجّم النّافذة"
+
+#: data/50-mutter-windows.xml:29
+msgid "Toggle window on all workspaces or one"
+msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
+
+#: data/50-mutter-windows.xml:31
+msgid "Raise window if covered, otherwise lower it"
+msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
+
+#: data/50-mutter-windows.xml:33
+msgid "Raise window above other windows"
+msgstr "ارفع النافذة فوق النوافذ الأخرى"
+
+#: data/50-mutter-windows.xml:35
+msgid "Lower window below other windows"
+msgstr "اخفض النافذة تحت النوافذ الأخرى"
+
+#: data/50-mutter-windows.xml:37
+msgid "Maximize window vertically"
+msgstr "كبّر النافذة رأسيا"
+
+#: data/50-mutter-windows.xml:39
+msgid "Maximize window horizontally"
+msgstr "كبّر النافذة أفقيا"
+
+#: data/50-mutter-windows.xml:43
+msgid "View split on left"
+msgstr "المنظور مقسوم على اليمين"
+
+#: data/50-mutter-windows.xml:47
+msgid "View split on right"
+msgstr "المنظور مقسوم على اليسار"
+
+#: data/mutter.desktop.in:4
+msgid "Mutter"
+msgstr "مَتَر"
+
+#: data/org.gnome.mutter.gschema.xml.in:7
+msgid "Modifier to use for extended window management operations"
+msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
+
+#: data/org.gnome.mutter.gschema.xml.in:8
+msgid ""
+"This key will initiate the “overlay”, which is a combination window overview "
+"and application launching system. The default is intended to be the “Windows "
+"key” on PC hardware. It’s expected that this binding either the default or "
+"set to the empty string."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:20
+msgid "Attach modal dialogs"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:21
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:30
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:31
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:40
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:41
+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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:50
+msgid "Workspaces only on primary"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:51
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:59
+msgid "No tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:60
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:68
+msgid "Delay focus changes until the pointer stops moving"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:69
+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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:79
+msgid "Draggable border width"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:80
+msgid ""
+"The amount of total draggable borders. If the theme’s visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:89
+msgid "Auto maximize nearly monitor sized windows"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:90
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:98
+msgid "Place new windows in the center"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:99
+msgid ""
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:108
+msgid ""
+"To enable experimental features, add the feature keyword to the list. "
+"Whether the feature requires restarting the compositor depends on the given "
+"feature. Any experimental feature is not required to still be available, or "
+"configurable. Don’t expect adding anything in this setting to be future "
+"proof. Currently possible keywords: • “monitor-config-manager” — use the new "
+"monitor configuration system, aimed to replace the old one. This enables a "
+"higher level configuration API to be used by configuration applications, as "
+"well as the ability to configure per logical monitor scale. • “scale-monitor-"
+"framebuffer” — makes mutter default to layout logical monitors in a logical "
+"pixel coordinate space, while scaling monitor framebuffers instead of window "
+"content, to manage HiDPI monitors. Does not require a restart. Also enabling "
+"“monitor-config-manager” is required for this feature to be enabled."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:151
+msgid "Select window from tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:156
+msgid "Cancel tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#, fuzzy
+msgid "Switch to VT 1"
+msgstr "انتقل إلى مساحة العمل 1"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#, fuzzy
+msgid "Switch to VT 2"
+msgstr "انتقل إلى مساحة العمل 2"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#, fuzzy
+msgid "Switch to VT 3"
+msgstr "انتقل إلى مساحة العمل 3"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#, fuzzy
+msgid "Switch to VT 4"
+msgstr "انتقل إلى مساحة العمل 4"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#, fuzzy
+msgid "Switch to VT 5"
+msgstr "انتقل إلى مساحة العمل 5"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#, fuzzy
+msgid "Switch to VT 6"
+msgstr "انتقل إلى مساحة العمل 6"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#, fuzzy
+msgid "Switch to VT 7"
+msgstr "انتقل إلى مساحة العمل 7"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#, fuzzy
+msgid "Switch to VT 8"
+msgstr "انتقل إلى مساحة العمل 8"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#, fuzzy
+msgid "Switch to VT 9"
+msgstr "انتقل إلى مساحة العمل 9"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#, fuzzy
+msgid "Switch to VT 10"
+msgstr "انتقل إلى مساحة العمل 10"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#, fuzzy
+msgid "Switch to VT 11"
+msgstr "انتقل إلى مساحة العمل 11"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#, fuzzy
+msgid "Switch to VT 12"
+msgstr "انتقل إلى مساحة العمل 12"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: ../src/backends/meta-input-settings.c:2167
+#: src/backends/meta-input-settings.c:1866
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr ""
@@ -35,113 +473,113 @@ msgstr ""
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: ../src/backends/meta-input-settings.c:2190
+#: src/backends/meta-input-settings.c:1888
 msgid "Switch monitor"
 msgstr "غيّر الشاشة"

-#: ../src/backends/meta-input-settings.c:2192
+#: src/backends/meta-input-settings.c:1890
 msgid "Show on-screen help"
-msgstr "اعرض المساعدة على الشاشة"
+msgstr ""

-#: ../src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:879
 msgid "Built-in display"
 msgstr "شاشة مدمجة"

-#: ../src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:902
 msgid "Unknown"
 msgstr "غير معروفة"

-#: ../src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:904
 msgid "Unknown Display"
 msgstr "شاشة غير معروفة"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:912
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:476
-#, c-format
+#: src/compositor/compositor.c:476
+#, fuzzy, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
-msgstr "يعمل مدير مزج آخر على الشاشة %i و العرض ”%s“."
+msgstr "يعمل مدير مزج آخر على الشاشة %i والعرض \"%s\"."

-#: ../src/core/bell.c:194
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "حدث جرس"

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

-#: ../src/core/main.c:189
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "عطّل الاتصال بمدير الجلسة"

-#: ../src/core/main.c:195
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "استبدل بمدير النوافذ الذي يعمل"

-#: ../src/core/main.c:201
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "حدّد رقم هويّة إدارة الجلسة"

-#: ../src/core/main.c:206
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "معراض س الذي سيستعمل"

-#: ../src/core/main.c:212
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "ابدأ الجلسة من ملف محفوظ"

-#: ../src/core/main.c:218
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "اجعل نداءات س متزامنة"

-#: ../src/core/main.c:225
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr ""

-#: ../src/core/main.c:231
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr ""

-#: ../src/core/main.c:239
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr ""

 #. Translators: %s is a window title
-#: ../src/core/meta-close-dialog-default.c:147
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "”‏%s“ لا يستجيب."

-#: ../src/core/meta-close-dialog-default.c:149
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "لا يستجيب التطبيق"

-#: ../src/core/meta-close-dialog-default.c:154
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "ربما ترغب في الانتظار قليلا ليُكمِل أو إجبار التطبيق على الإنهاء كُلّية."

-#: ../src/core/meta-close-dialog-default.c:161
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "أ_جبر الإنهاء"

-#: ../src/core/meta-close-dialog-default.c:161
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "ا_نتظر"

-#: ../src/core/mutter.c:39
-#, c-format
+#: src/core/mutter.c:39
+#, fuzzy, c-format
 msgid ""
 "mutter %s\n"
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
@@ -154,289 +592,56 @@ msgstr ""
 "هذا برنامج حر، راجع المصدر لشروط النسخ.\n"
 "لا يوجد أي ضمان: و لا حتى ضمان قابلية التسويق أو المناسبة لأي هدف.\n"

-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "اطبع الإصدارة"

-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "ملحق مَتَر الذي سيُستخدم"

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

-#: ../src/core/screen.c:583
-#, c-format
+#: src/core/screen.c:580
+#, fuzzy, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
 msgstr ""
-"الشاشة ”%s“ لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace لتحُلّ"
-" محلّ مدير النوافذ الحالي."
+"الشاشة \"%s\" لها مدير نوافذ بالفعل، حاول استعمال خيار التبديل --replace "
+"لتحُلّ محلّ مدير النوافذ الحالي."

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

-#: ../src/core/util.c:120
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "جُمِّع مَتَر دون دعم للنمط المطنب\n"

-#: ../src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr ""

-#: ../src/x11/session.c:1815
+#: src/x11/session.c:1815
+#, fuzzy
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"هذه النوافذ لا تدعم ” الضبط الحالي&quot; إعادة تشغيلها يدويا عند الولوج "
-"المرة القادمة."
+"هذه النوافذ لا تدعم &quot;احفظ الضبط الحالي&quot; يجب إعادة تشغيلها يدويا "
+"عند الولوج المرة القادمة."

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

-#~ msgid "Navigation"
-#~ msgstr "الإبحار"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "انقل النافذة إلى مساحة العمل 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "انقل النافذة إلى مساحة العمل 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "انقل النافذة إلى مساحة العمل 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "انقل النافذة إلى مساحة العمل 4"
-
-#~ msgid "Move window to last workspace"
-#~ 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 one workspace down"
-#~ msgstr "انقل النافذة مساحة عمل واحدة إلى الأسفل"
-
-#~ msgid "Move window one monitor to the left"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليسار"
-
-#~ msgid "Move window one monitor to the right"
-#~ msgstr "انقل النافذة شاشة واحدة إلى اليمين"
-
-#~ msgid "Move window one monitor up"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأعلى"
-
-#~ msgid "Move window one monitor down"
-#~ msgstr "انقل النافذة شاشة واحدة إلى الأسفل"
-
-#~ msgid "Switch applications"
-#~ msgstr "تنقل بين التطبيقات"
-
-#~ msgid "Switch to previous application"
-#~ msgstr "انتقل إلى التطبيق السابق"
-
-#~ msgid "Switch windows"
-#~ msgstr "تنقل بين النوافذ"
-
-#~ msgid "Switch to previous window"
-#~ msgstr "انتقل إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an application"
-#~ msgstr "تنقل بين نوافذ التطبيق"
-
-#~ msgid "Switch to previous window of an application"
-#~ msgstr "انتقل إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls"
-#~ msgstr "تنقل بين تحكمات النظام"
-
-#~ msgid "Switch to previous system control"
-#~ msgstr "انتقل إلى تحكم النظام السابق"
-
-#~ msgid "Switch windows directly"
-#~ msgstr "تنقل مباشرة بين النوافذ"
-
-#~ msgid "Switch directly to previous window"
-#~ msgstr "انتقل مباشرة إلى النافذة السابقة"
-
-#~ msgid "Switch windows of an app directly"
-#~ msgstr "تنقل مباشرة بين نوافذ التطبيق"
-
-#~ msgid "Switch directly to previous window of an app"
-#~ msgstr "انتقل مباشرة إلى نافذة التطبيق السابقة"
-
-#~ msgid "Switch system controls directly"
-#~ msgstr "تنقل مباشرة بين تحكمات النظام"
-
-#~ msgid "Switch directly to previous system control"
-#~ msgstr "انتقل مباشرة إلى تحكم النظام السابق"
-
-#~ msgid "Hide all normal windows"
-#~ msgstr "أخفِ كل النوافذ العادية"
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#~ msgid "Switch to last workspace"
-#~ msgstr "انتقل إلى مساحة العمل الأخيرة"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "انقل لمساحة العمل على اليسار"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "انقل لمساحة العمل على اليمين"
-
-#~ msgid "Move to workspace above"
-#~ msgstr "انقل لمساحة العمل أعلى"
-
-#~ msgid "Move to workspace below"
-#~ msgstr "انقل لمساحة العمل أسفل"
-
-#~ msgid "System"
-#~ msgstr "النظام"
-
-#~ msgid "Show the run command prompt"
-#~ msgstr "أظهر محث تشغيل أمر"
-
-#~ msgid "Show the activities overview"
-#~ msgstr "أظهر نظرة عامة على الأنشطة"
-
-#~ msgid "Windows"
-#~ msgstr "النوافذ"
-
-#~ msgid "Activate the window menu"
-#~ msgstr "فعّل قائمة النافذة"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "بدّل نمط ملء الشاشة"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "بدّل حالة التكبير"
-
-#~ msgid "Maximize window"
-#~ msgstr "كبّر النّافذة"
-
-#~ msgid "Restore window"
-#~ msgstr "استعد النّافذة"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "بدّل حالة الإخفاء"
-
-#~ msgid "Close window"
-#~ msgstr "أغلق النّافذة"
-
-#~ msgid "Hide window"
-#~ msgstr "أخفِ النّافذة"
-
-#~ msgid "Move window"
-#~ msgstr "انقل النّافذة"
-
-#~ msgid "Resize window"
-#~ msgstr "حجّم النّافذة"
-
-#~ msgid "Toggle window on all workspaces or one"
-#~ msgstr "بدّل حالة ظهور النافذة على جميع مساحات العمل أو واحدة منها"
-
-#~ msgid "Raise window if covered, otherwise lower it"
-#~ msgstr "ارفع النافذة إذا كانت أخرى تغطيها، أو أخفضها في ما عدا ذلك"
-
-#~ msgid "Raise window above other windows"
-#~ msgstr "ارفع النافذة فوق النوافذ الأخرى"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "اخفض النافذة تحت النوافذ الأخرى"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "كبّر النافذة رأسيا"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "كبّر النافذة أفقيا"
-
-#~ msgid "View split on left"
-#~ msgstr "المنظور مقسوم على اليمين"
-
-#~ msgid "View split on right"
-#~ msgstr "المنظور مقسوم على اليسار"
-
-#~ msgid "Mutter"
-#~ msgstr "مَتَر"
-
-#~ msgid "Modifier to use for extended window management operations"
-#~ msgstr "المغير الذي سيُستعمل لتمديد عمليات إدارة النوافذ "
-
-#, fuzzy
-#~ msgid "Switch to VT 1"
-#~ msgstr "انتقل إلى مساحة العمل 1"
-
-#, fuzzy
-#~ msgid "Switch to VT 2"
-#~ msgstr "انتقل إلى مساحة العمل 2"
-
-#, fuzzy
-#~ msgid "Switch to VT 3"
-#~ msgstr "انتقل إلى مساحة العمل 3"
-
-#, fuzzy
-#~ msgid "Switch to VT 4"
-#~ msgstr "انتقل إلى مساحة العمل 4"
-
-#, fuzzy
-#~ msgid "Switch to VT 5"
-#~ msgstr "انتقل إلى مساحة العمل 5"
-
-#, fuzzy
-#~ msgid "Switch to VT 6"
-#~ msgstr "انتقل إلى مساحة العمل 6"
-
-#, fuzzy
-#~ msgid "Switch to VT 7"
-#~ msgstr "انتقل إلى مساحة العمل 7"
-
-#, fuzzy
-#~ msgid "Switch to VT 8"
-#~ msgstr "انتقل إلى مساحة العمل 8"
-
-#, fuzzy
-#~ msgid "Switch to VT 9"
-#~ msgstr "انتقل إلى مساحة العمل 9"
-
-#, fuzzy
-#~ msgid "Switch to VT 10"
-#~ msgstr "انتقل إلى مساحة العمل 10"
-
-#, fuzzy
-#~ msgid "Switch to VT 11"
-#~ msgstr "انتقل إلى مساحة العمل 11"
-
-#, fuzzy
-#~ msgid "Switch to VT 12"
-#~ msgstr "انتقل إلى مساحة العمل 12"
-
 #~ msgid "Unknown window information request: %d"
 #~ msgstr "طلب معلومات نافذة مجهول: %d"

--- a/po/ca.po
+++ b/po/ca.po
@@ -11,9 +11,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 2.24\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-06-07 13:00+0000\n"
-"PO-Revision-Date: 2018-06-17 10:25+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-25 13:23+0200\n"
 "Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca\n"
@@ -21,7 +22,7 @@ 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 2.0.6\n"
+"X-Generator: Poedit 2.0.1\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -48,118 +49,134 @@ msgid "Move window to last workspace"
 msgstr "Mou la finestra a l'últim espai de treball"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mou la finestra un espai de treball a l'esquerra"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mou la finestra un espai de treball a la dreta"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Mou la finestra un espai de treball amunt"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Mou la finestra un espai de treball avall"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mou la finestra un monitor a l'esquerra"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mou la finestra un monitor a la dreta"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Mou la finestra un monitor amunt"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Mou la finestra un monitor avall"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Canvia d'aplicacions"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Canvia a l'aplicació anterior"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Canvia de finestres"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Canvia a la finestra anterior"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Canvia entre les finestres d'una aplicació"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Canvia a la finestra anterior d'una aplicació"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Canvia els controls del sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Canvia al control del sistema anterior"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Canvia immediatament entre finestres"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Canvia immediatament a la finestra anterior"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Canvia immediatament entre les finestres d'una aplicació"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Canvia immediatament a la finestra anterior d'una aplicació"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Canvia immediatament entre els controls del sistema"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Canvia immediatament al control del sistema anterior"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Oculta totes les finestres normals"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Canvia a l'espai de treball 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Canvia a l'espai de treball 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Canvia a l'espai de treball 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Canvia a l'espai de treball 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Canvia a l'últim espai de treball"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mou a l'espai de treball de l'esquerra"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mou a l'espai de treball de la dreta"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mou a l'espai de treball de sobre"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mou a l'espai de treball de sota"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@@ -171,10 +188,6 @@ msgstr "Mostra l'indicador d'execució d'aplicacions"
 msgid "Show the activities overview"
 msgstr "Mostra la vista general d'activitats"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaura les dreceres de teclat"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Finestres"
@@ -200,52 +213,56 @@ msgid "Restore window"
 msgstr "Restaura la finestra"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Canvia l'estat d'ombrejat"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Tanca la finestra"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Oculta la finestra"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mou la finestra"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensiona la finestra"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Canvia la funció que fa que la finestra estigui en tots els espais de "
 "treball o només en un"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Alça la finestra si està coberta per una altra; altrament, baixa-la"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Alça la finestra per damunt de les altres"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Baixa la finestra sota les altres"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximitza la finestra verticalment"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximitza la finestra horitzontalment"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Mostra la partició a l'esquerra"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Mostra la partició a la dreta"

@@ -407,22 +424,25 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selecció de finestra entre les emergents d'una pestanya"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancel·lació de les finestres emergents a les pestanyes"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Canvia configuracions de monitor"

-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Gira la configuració del monitor integrada"

@@ -478,41 +498,10 @@ msgstr "Canvia al terminal virtual 12"
 msgid "Re-enable shortcuts"
 msgstr "Torna a habilitar les dreceres"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permetre la captura amb Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Les aplicacions Xwayland poden capturar el teclat"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Mode de commutació (grup %d)"
@@ -520,11 +509,11 @@ msgstr "Mode de commutació (grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Commuta el monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostra l'ajuda en pantalla"

@@ -550,7 +539,7 @@ msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -568,31 +557,31 @@ msgid "Failed to open X Window System display “%s”\n"
 msgstr ""
 "S'ha produït un error en obrir la pantalla del sistema de finestres X «%s»\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Inhabilita la connexió al gestor de sessions"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Reemplaça el gestor de finestres en execució"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Especifica l'ID de gestió de sessió"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Visualització X per usar"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicialitza la sessió des del fitxer desat"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Fes que les crides a l'X siguin síncrones"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Funciona com a compositor de Wayland"

@@ -601,18 +590,14 @@ msgstr "Funciona com a compositor de Wayland"
 #
 # Camins:
 # ../src/core/main.c:223
-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Funciona com a compositor imbricat"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Executa amb un rerefons X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -668,7 +653,7 @@ msgstr "Connector del Mutter a utilitzar"
 msgid "Workspace %d"
 msgstr "Espai de treball %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -677,7 +662,7 @@ msgstr ""
 "La pantalla «%s» ja té un gestor de finestres; proveu l'opció --replace per "
 "reemplaçar el gestor de finestres actual."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
@@ -686,12 +671,12 @@ msgstr "El monitor %d en la pantalla '%s' no és vàlida\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter es va compilar sense compatibilitat per al mode detallat\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Mode de commutació: mode %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -704,21 +689,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (a %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mou la finestra un espai de treball a l'esquerra"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mou la finestra un espai de treball a la dreta"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mou a l'espai de treball de l'esquerra"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mou a l'espai de treball de la dreta"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Canvia l'estat d'ombrejat"
-
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "No s'ha pogut analitzar el directori de temes: %s\n"

--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,16 +6,17 @@
 # Petr Tomeš <ptomes@gmail.com>, 2006.
 # Jakub Friedl <jfriedl@suse.cz>, 2006, 2007.
 # Petr Kovar <pknbe@volny.cz>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014.
-# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016, 2017, 2018.
+# Marek Černocký <marek@manet.cz>, 2012, 2013, 2014, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-01 10:47+0000\n"
-"PO-Revision-Date: 2018-03-07 19:28+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-31 00:11+0200\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
-"Language-Team: čeština <gnome-cs-list@gnome.org>\n"
+"Language-Team: čeština <gnome-cs-list@gnome.org>>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Přesunout okno na poslední pracovní plochu"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Přesunout okno o jednu pracovní plochu doleva"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Přesunout okno o jednu pracovní plochu doprava"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Přesunout okno o jednu pracovní plochu nahoru"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Přesunout okno o jednu pracovní plochu dolů"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Přesunout okno o jeden monitor doleva"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Přesunout okno o jeden monitor doprava"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Přesunout okno o jeden monitor nahoru"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Přesunout okno o jeden monitor dolů"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Přepnout do jiné aplikace"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Přepnout do předchozí aplikaci"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Přepnout do jiného okna"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Přepnout do minulého okna"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Přepnout do jiného okna aplikace"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Přepnout do předchozího okna aplikace"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Přepnout na systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Přepnout na minulý systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Přepnout do minulého okna"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Přepnout přímo na předchozí okno"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Přepnout do jiného okna aplikace"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Přepnout do předchozího okna aplikace"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Přepnout na minulý systémový ovládací prvek"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Přepnout přímo na předchozí systémové ovládací prvky"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Skrýt všechna běžná okna"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Přepnout na plochu 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Přepnout na plochu 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Přepnout na plochu 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Přepnout na plochu 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Přepnout na poslední plochu"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Přesunout na plochu vlevo"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Přesunout na plochu vpravo"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Přesunout na plochu nad"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Přesunout na plochu pod"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Systém"

@@ -172,10 +189,6 @@ msgstr "Zobrazit řádek ke spuštění příkazu"
 msgid "Show the activities overview"
 msgstr "Zobrazit přehled činností"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Obnovit klávesové zkratky"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Okna"
@@ -201,50 +214,54 @@ msgid "Restore window"
 msgstr "Obnovit velikost okna"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Přepnout stav svinutí"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Zavřít okno"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Skrýt okno"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Přesunout okno"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Změnit velikost okna"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Přepnout okno na všechny/jednu pracovní plochu"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Když je okno zakryté vynést jej do popředí, jinak odsunout do pozadí"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Vynést okno do popředí nad ostatní okna"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Odsunout okno do pozadí za ostatní okna"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximalizovat okno svisle"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximalizovat okno vodorovně"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Rozdělit okno přes levou půlku obrazovky"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Rozdělit okno přes pravou půlku obrazovky"

@@ -482,57 +499,10 @@ msgstr "Přepnout na VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Znovu povolit klávesové zkratky"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Povolit zachytávání pomocí Xwaylandu"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Povolit, aby bylo bráno v úvahu zachytávání kláves, o které se stará "
-"aplikace X11 běžící v Xwaylandu. Aby bylo pod Waylandem zachytávání bráno v "
-"úvahu, musí klient navíc buď poslat specifickou zprávu X11 ClientMessage do "
-"kořenového okna, nebo být mezi aplikacemi na bílé listině v klíči „xwayland-"
-"grab-access-rules“."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-"Aplikace pod Xwaylandem mají povoleno se starat o zachytávání klávesnice"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Seznam názvů prostředků nebo tříd prostředků oken X11, které buď mají nebo "
-"nemají povolené se starat o zachytávání klávesnice X11 pod Xwaylandem. Název "
-"nebo třída prostředku daného okna X11 se dá zjistit pomocí příkazu „xprop "
-"WM_CLASS“. V názvech jsou podporované divoké znaky „*“ a „?“. Hodnoty "
-"začínající „!“ jsou na černé listině, což má přednost před bílou listinou, "
-"aby se daly aplikace odvolat z výchozího systémového seznamu. Do výchozího "
-"systémového seznamu patří následující aplikace: "
-"„@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@“. Uživatel může přerušit existující "
-"zachytávání pomocí speciální klávesové zkratky definované klíčem „restore-"
-"shortcuts“."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Přepínač režimu (skupina %d)"
@@ -540,37 +510,37 @@ msgstr "Přepínač režimu (skupina %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Přepnout monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Zobrazit nápovědu na obrazovce"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Vestavěný displej"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Neznámý"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Neznámý displej"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -585,46 +555,42 @@ msgstr "Událost zvonku"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Nelze otevřít displej X Window System „%s“\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Zakáže připojení ke správci sezení"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Nahradí běžícího správce oken"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Určení ID správy sezení"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Displej X, který použije"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Spustí sezení z uloženého souboru"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Provede volání X synchronně"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Spustit jako kompozitor protokolu Wayland"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Spustit jako podkladový kompozitor"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Spustit se serverem X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -680,7 +646,7 @@ msgstr "Zásuvný modul Mutter, který se má použít"
 msgid "Workspace %d"
 msgstr "Plocha %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -689,7 +655,7 @@ msgstr ""
 "Displej „%s“ již správce oken má; zkuste prosím nahradit aktuálního správce "
 "oken pomocí přepínače --replace."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"
@@ -698,12 +664,12 @@ msgstr "Obrazovka %d na displeji „%s“ je neplatná\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter bylo přeloženo bez podpory podrobného režimu\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Přepínač režimu: režim %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -715,18 +681,3 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Přesunout okno o jednu pracovní plochu doleva"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Přesunout okno o jednu pracovní plochu doprava"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Přesunout na plochu vlevo"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Přesunout na plochu vpravo"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Přepnout stav svinutí"
--- a/po/da.po
+++ b/po/da.po
@@ -1,5 +1,5 @@
 # Danish translation of Mutter.
-# Copyright (C) 2002-2009, 2012-2018.
+# Copyright (C) 2002-2009, 2012-2017.
 # This file is distributed under the same license as the metacity package.
 # Kjartan Maraas <kmaraas@gnome.org>, 2002
 # Keld simonsen <keld@dkuug.dk>, 2002
@@ -8,7 +8,7 @@
 # Lasse Bang Mikkelsen <lbm@fatalerror.dk>, 2006.
 # Kenneth Nielsen <k.nielsen81@gmail.com>, 2008.
 # Joe Hansen <joedalton2@yahoo.dk>, 2011.
-# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15, 16, 17, 18.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2007, 09, 10, 12, 13, 14, 15, 16, 17.
 #
 # Ordliste:
 #
@@ -19,9 +19,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-06 04:14+0000\n"
-"PO-Revision-Date: 2018-03-07 22:29+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-03 20:29+0200\n"
 "Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
@@ -54,118 +55,134 @@ msgid "Move window to last workspace"
 msgstr "Flyt vindue til sidste arbejdsområde"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Flyt vindue et arbejdsområde til venstre"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Flyt vindue et arbejdsområde til højre"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Flyt vindue et arbejdsområde op"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Flyt vindue et arbejdsområde ned"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Flyt vindue en skærm til venstre"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Flyt vindue en skærm til højre"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Flyt vindue en skærm op"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Flyt vindue en skærm ned"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Skift mellem programmer"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Skift til forrige program"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Skift mellem vinduer"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Skift til forrige vindue"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Skift mellem vinduer i et program"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Skift til forrige vindue af et program"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Skift mellem systemkontroller"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Skift til forrige systemkontrol"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Skift direkte mellem vinduer"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Skift direkte til forrige vindue"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Skift direkte mellem vinduer i et program"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Skift direkte til forrige vindue af et program"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Skift direkte mellem systemkontroller"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Skift direkte til forrige systemkontrol"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Skjul alle normale vinduer"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Skift til arbejdsområde 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Skift til arbejdsområde 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Skift til arbejdsområde 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Skift til arbejdsområde 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Skift til sidste arbejdsområde"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Flyt til arbejdsområdet til venstre"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Flyt til arbejdsområdet til højre"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Flyt til arbejdsområdet ovenover"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Flyt til arbejdsområdet nedenunder"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"

@@ -177,10 +194,6 @@ msgstr "Vis “kør kommando”-prompten"
 msgid "Show the activities overview"
 msgstr "Vis aktivitetsoversigten"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Gendan tastaturgenvejene"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Vinduer"
@@ -206,50 +219,54 @@ msgid "Restore window"
 msgstr "Gendan vindue"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Slå vinduesoprulning til/fra"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Luk vindue"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Skjul vindue"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Flyt vindue"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Ændr vinduesstørrelse"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Slå visning af vindue på alle arbejdsområder til/fra"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Hæv vindue hvis det er dækket, ellers sænk det"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Hæv vindue over andre vinduer"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Sænk vindue under andre vinduer"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maksimér vindue lodret"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maksimér vindue vandret"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Delt visning venstre"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Delt visning højre"

@@ -407,18 +424,7 @@ msgid ""
 "enables remote desktop support. To support remote desktop with screen "
 "sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
 "screen cast support."
-msgstr ""
-"For at slå eksperimentelle funktioner til, skal du tilføje "
-"funktionsnøgleordet til listen. Om funktionen kræver genstart af "
-"kompositoren afhænger af den givne funktion. Der er ingen garanti for at "
-"eksperimentelle funktion forbliver tilgængelige eller mulige at konfigurere. "
-"Forvent ikke at noget i denne indstilling nødvendigvis fungerer i fremtiden. "
-"Mulige nøgleord i øjeblikket: • “scale-monitor-framebuffer” — får mutter til "
-"som standard at arrangere logiske skærme i et logisk pixelkoordinatrum, mens "
-"skærmes framebuffere skaleres frem for vinduesindholdet for at håndtere "
-"HiDPI-skærme. Fjernskrivebord med skærmdeling understøttes hvis “screen-"
-"cast” også er aktiveret. • “screen-cast” — aktiverer understøttelse af "
-"skærmoptagelse."
+msgstr "For at slå eksperimentelle funktioner til, skal du tilføje funktionsnøgleordet til listen. Om funktionen kræver genstart af kompositoren afhænger af den givne funktion. Der er ingen garanti for at eksperimentelle funktion forbliver tilgængelige eller mulige at konfigurere. Forvent ikke at noget i denne indstilling nødvendigvis fungerer i fremtiden. Mulige nøgleord i øjeblikket: • “scale-monitor-framebuffer” — får mutter til som standard at arrangere logiske skærme i et logisk pixelkoordinatrum, mens skærmes framebuffere skaleres frem for vinduesindholdet for at håndtere HiDPI-skærme. Fjernskrivebord med skærmdeling understøttes hvis “screen-cast” også er aktiveret. • “screen-cast” — aktiverer understøttelse af skærmoptagelse."

 #: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
@@ -489,41 +495,10 @@ msgstr "Skift til VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Genaktivér genveje"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Tillad indfangelse med Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr "Tillad tastaturindfangelse af X11-programmer, som kører i Xwayland. For at en X11-tastaturindfangelse behandles i Wayland, skal klienten også enten sende en specifik X11-ClientMessage til rodvinduet eller være blandt de godkendte programmer i nøglen “xwayland-grab-access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland-programmer, som må indfange tastatur"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr "Anfør navne på ressourcer eller ressourceklasser for X11-vinduer som tillades eller ikke tillades at udføre X11-tastaturindfangelse under Xwayland. Ressourcenavnet eller ressourceklassen for et givent X11-vindue kan findes med kommandoen “xprop WM_CLASS”. Værdierne understøtter jokertegnene “*” og “?”. Værdier som begynder med “!” forbydes, hvilket har præcedens over godkendelse, og dette tillader at fjerne programmer som ellers findes i systemets standardliste. Denne liste inkluderer følgende programmer: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”. Brugere kan afbryde en eksisterende indfangelse ved hjælp af den særlige tastaturgenvej defineret ved nøglen “restore-shortcuts”."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Tilstandsskift (Gruppe %d)"
@@ -531,37 +506,37 @@ msgstr "Tilstandsskift (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Skift skærm"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Vis integreret hjælp"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Indbygget terminal"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ukendt"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Ukendt terminal"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -577,46 +552,42 @@ msgstr "Bip-hændelse"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Kunne ikke åbne X Window System-terminalen “%s”\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Deaktivér forbindelse til sessionshåndtering"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Erstat den kørende vindueshåndtering"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Angiv sessionhåndterings-id"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "X-terminal som bruges"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Initialisér session fra gemt fil"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Gør kald til X synkrone"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Kør som en wayland-kompositor"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Kør som en indlejret kompositor"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Kør som fuld terminalserver, frem for indlejret"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Kør med X11-motor"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -671,7 +642,7 @@ msgstr "Mutter-udvidelsesmodul der skal bruges"
 msgid "Workspace %d"
 msgstr "Arbejdsområde %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -680,7 +651,7 @@ msgstr ""
 "Terminalen “%s” har allerede en vindueshåndtering; prøv tilvalget --replace "
 "for at erstatte den aktuelle vindueshåndtering."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Skærm %d på terminal “%s” er ugyldig\n"
@@ -694,7 +665,7 @@ msgstr "Mutter blev kompileret uden understøttelse for uddybende tilstand\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Tilstandsskift: Tilstand %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -708,21 +679,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (på %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Flyt vindue et arbejdsområde til venstre"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Flyt vindue et arbejdsområde til højre"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Flyt til arbejdsområdet til venstre"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Flyt til arbejdsområdet til højre"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Slå vinduesoprulning til/fra"
-
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "Kunne ikke skanne temamappe: %s\n"

--- a/po/de.po
+++ b/po/de.po
@@ -2,27 +2,27 @@
 # Copyright (C) 2002-2004 Free Software Foundation, Inc.
 # Matthias Warkus <mawarkus@gnome.org>, 2002.
 # Christian Neumair <chris@gnome-de.org>, 2002-2004.
-# Hendrik Richter <hendrikr@gnome.org>, 2005-2008.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2018.
-# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011-2012.
+# Hendrik Richter <hendrikr@gnome.org>, 2005, 2006, 2007, 2008.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2010-2013, 2016-2017.
+# Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2011, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
-# Tim Sabsch <timæsabsch.com>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-04 19:59+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 17:07+0200\n"
+"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.9\n"
+"X-Generator: Poedit 2.0.3\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -49,118 +49,134 @@ msgid "Move window to last workspace"
 msgstr "Fenster auf letzte Arbeitsfläche verschieben"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Fenster eine Arbeitsfläche nach links verschieben"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Fenster eine Arbeitsfläche nach rechts verschieben"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Fenster eine Arbeitsfläche nach oben verschieben"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Fenster eine Arbeitsfläche nach unten verschieben"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Fenster einen Bildschirm nach links verschieben"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Fenster einen Bildschirm nach rechts verschieben"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Fenster einen Bildschirm nach oben verschieben"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Fenster einen Bildschirm nach unten verschieben"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Anwendungen wechseln"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Zur vorherigen Anwendung wechseln"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Fenster wechseln"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Zum vorherigen Fenster wechseln"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Zwischen den Fenstern einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Zum vorherigen Fenster einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Systemsteuerungen umschalten"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Zur vorherigen Systemsteuerungen wechseln"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Fenster sofort wechseln"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Direkt zum vorherigen Fenster wechseln"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Sofort zwischen den Fenstern einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Direkt zum vorherigen Fenster einer Anwendung wechseln"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Systemsteuerungen sofort umschalten"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Direkt zur vorherigen Systemsteuerungen wechseln"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Alle normalen Fenster verbergen"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Zur Arbeitsfläche 1 wechseln"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Zur Arbeitsfläche 2 wechseln"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Zur Arbeitsfläche 3 wechseln"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Zur Arbeitsfläche 4 wechseln"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Zur letzten Arbeitsfläche wechseln"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Auf Arbeitsfläche links verschieben"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Auf Arbeitsfläche rechts verschieben"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Auf Arbeitsfläche darüber verschieben"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Auf Arbeitsfläche darunter verschieben"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"

@@ -172,10 +188,6 @@ msgstr "Den »Befehl ausführen«-Dialog anzeigen"
 msgid "Show the activities overview"
 msgstr "Aktivitäten-Übersicht anzeigen"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Die Tastenkombinationen wiederherstellen"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Fenster"
@@ -201,51 +213,55 @@ msgid "Restore window"
 msgstr "Fenstergröße wiederherstellen"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Fenster ein-/ausrollen"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Fenster schließen"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Fenster verbergen"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Fenster verschieben"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Fenstergröße ändern"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Festlegen, ob das Fenster auf allen oder nur einer Arbeitsfläche sichtbar ist"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Fenster anheben, falls es verdeckt ist, andernfalls absenken"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Fenster vor die anderen Fenster anheben"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Fenster hinter die anderen Fenster absenken"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Fenster vertikal maximieren"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Fenster horizontal maximieren"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Ansicht links teilen"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Ansicht rechts teilen"

@@ -303,7 +319,7 @@ msgstr ""

 #: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
-msgstr "Arbeitsflächen sollen dynamisch verwaltet werden"
+msgstr "Arbeitsflächen sollen dynamisch verwaltet werden "

 #: data/org.gnome.mutter.gschema.xml.in:41
 msgid ""
@@ -389,7 +405,7 @@ msgid ""
 "screen of the monitor."
 msgstr ""
 "Falls wahr, so werden neue Fenster immer in der Mitte des aktiven "
-"Bildschirms platziert."
+"Bildschirms platziert"

 #: data/org.gnome.mutter.gschema.xml.in:107
 msgid "Enable experimental features"
@@ -404,7 +420,10 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Um experimentelle Funktionsmerkmale zu aktivieren, fügen Sie das "
 "entsprechende Schlüsselwort zur Liste hinzu. Möglicherweise muss der "
@@ -415,22 +434,26 @@ msgstr ""
 "framebuffer« – weist Mutter an, in der Voreinstellung logische Bildschirme "
 "in einem logischen Pixel-Koordinatensystem anzuordnen, wobei die Bildschirm-"
 "Framebuffer anstelle der Fensterinhalte skaliert werden, um HiDPI-"
-"Bildschirme besser versorgen zu können. Dafür ist kein Neustart erforderlich."
+"Bildschirme besser versorgen zu können. Dafür ist kein Neustart "
+"erforderlich. • »remote-desktop« – aktiviert Remotedesktop-Unterstützung. Um "
+"das Teilen von Bildschirmen mittels Remotedesktop zu unterstützen, muss "
+"»screen-cast« ebenfalls aktiviert sein. • »screen-cast« – aktiviert »screen "
+"cast«-Unterstützung."

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Fenster aus Tab-Anzeige auswählen"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Tab-Anzeige abbrechen"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Bildschirmkonfigurationen wechseln"

 # Ich denke nicht, dass »rotate« hier die Bildschirmdrehung meint, sondern eher eine Liste aus Konfigurationen rotiert (d.h. umgewälzt) wird.
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"

@@ -486,59 +509,10 @@ msgstr "Zum virtuellen Terminal 12 wechseln"
 msgid "Re-enable shortcuts"
 msgstr "Tastenkombinationen erneut aktivieren"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Tastatur-Kontrollübernahmen in Xwayland erlauben"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Erlauben, dass in Xwayland laufende X11-Anwendungen Kontrolle über die "
-"Tastatur übernehmen dürfen. Damit eine X11-Kontrollübernahme unter Wayland "
-"durchgeführt werden kann, muss der Client auch entweder eine spezifische X11-"
-"ClientMessage an das Root-Fenster senden oder in den als »whitelisted« im "
-"Schlüssel »xwayland-grab-access-rules« aufgelisteten Anwendungen enthalten "
-"sein."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland-Anwendungen mit Erlaubnis zur Kontrollübernahme der Tastatur"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Listet die Ressourcennamen oder -klassen von X11-Fenstern auf, die unter "
-"Xwayland X11-Tastatur-Kontrollübernahmen durchführen dürfen. Ressourcenname "
-"oder -klasse eines bestimmten X11-Fensters kann mit dem Befehl »xprop "
-"WM_CLASS« ermittelt werden. Dabei werden »*« als Platzhalter und »?« als "
-"Joker in den Wertangaben unterstützt. Mit »!« beginnende Werte gelten als "
-"»blacklisted« und werden gegenüber den als »whitelisted« markierten Werten "
-"bevorzugt, um in der Standardliste des Systems aufgeführte Anwendungen außer "
-"Kraft zu setzen. Die Standardliste des Systems enthält die folgenden "
-"Anwendungen: »@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@« Benutzer können eine "
-"existierende Kontrollübernahme unterbrechen, indem sie das spezifische "
-"Tastenkürzel verwenden, wie es im Schlüssel »restore-shortcuts« angegeben "
-"ist."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Moduswechsel (Gruppe %d)"
@@ -546,37 +520,37 @@ msgstr "Moduswechsel (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"

-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"

-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Unbekannt"

-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Unbekannte Anzeige"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -584,65 +558,62 @@ msgstr ""
 "Ein weiterer Compositing-Verwalter läuft bereits auf Bildschirm %i der "
 "Anzeige »%s«."

-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Klangereignis"

-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
+
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"

-#: src/core/main.c:197
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"

-#: src/core/main.c:203
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"

-#: src/core/main.c:208
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"

-#: src/core/main.c:214
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"

-#: src/core/main.c:220
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"

-#: src/core/main.c:227
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"

-#: src/core/main.c:233
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Als eingebetteten Compositor ausführen"

 #: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Wayland-Compositor ausführen, ohne Xwayland zu starten"
-
-#: src/core/main.c:247
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"

-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Mit X11-Backend ausführen"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "»%s« antwortet nicht."

-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Die Anwendung antwortet nicht."

-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -650,11 +621,11 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Warten"

@@ -684,21 +655,12 @@ msgstr "Version ausgeben"
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"

-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"

-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Moduswechsel: Modus %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -707,21 +669,21 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."

-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "GDK konnte nicht initialisiert werden\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"

-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Moduswechsel: Modus %d"
+
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -729,7 +691,7 @@ msgstr ""
 "Diese Fenster unterstützen das Speichern der aktuellen Einstellungen nicht "
 "und müssen bei der nächsten Anmeldung manuell neu gestartet werden."

-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"
--- a/po/eo.po
+++ b/po/eo.po
@@ -2,16 +2,16 @@
 # Copyright (C) 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 # Michael MORONI < >, 2011.
-# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2012, 2015, 2018.
+# Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>, 2011, 2012, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-12-18 16:24+0000\n"
-"PO-Revision-Date: 2018-01-22 20:12+0200\n"
+"POT-Creation-Date: 2015-02-14 11:06+0000\n"
+"PO-Revision-Date: 2015-02-14 22:34+0200\n"
 "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n"
-"Language-Team: Esperanto <gnome-eo-list@gnome.org>\n"
+"Language-Team: Esperanto <gnome-l10n-eo@lists.launchpad.net>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,675 +20,553 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigado"

-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Movi la fenestron al laborspaco 1"

-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Movi la fenestron al laborspaco 2"

-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Movi la fenestron al laborspaco 3"

-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Movi la fenestron al laborspaco 4"

-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Movi la fenestron al lasta laborspaco"

-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
 msgid "Move window one workspace to the left"
 msgstr "Movi la fenestron al la maldekstra laborspaco"

-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:8
 msgid "Move window one workspace to the right"
 msgstr "Movi la fenestron al la dekstra laborspaco"

-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Movi la fenestron al la supra laborspaco"

-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Movi la fenestron al la suba laborspaco"

-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Movi la fenestron al la maldekstra ekrano"

-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Movi la fenestron al la dekstra ekrano"

-#: data/50-mutter-navigation.xml:42
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Movi la fenestron al la supra ekrano"

-#: data/50-mutter-navigation.xml:45
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Movi la fenestron al la suba ekrano"

-#: data/50-mutter-navigation.xml:49
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Ŝanĝi aplikaĵojn"

-#: data/50-mutter-navigation.xml:54
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Ŝalti al antaŭa aplikaĵo"

-#: data/50-mutter-navigation.xml:58
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Ŝanĝi fenestrojn"

-#: data/50-mutter-navigation.xml:63
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Ŝalti al antaŭa fenestro"

-#: data/50-mutter-navigation.xml:67
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Ŝanĝi fenestrojn de aplikaĵo"

-#: data/50-mutter-navigation.xml:72
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Ŝalti al antaŭa fenestro de aplikaĵo"

-#: data/50-mutter-navigation.xml:76
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Ŝanĝi sistem-kontrolojn"

-#: data/50-mutter-navigation.xml:81
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Ŝalti al antaŭa sistem-kontrolo"

-#: data/50-mutter-navigation.xml:85
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Ŝanĝi rekte fenestrojn"

-#: data/50-mutter-navigation.xml:90
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Ŝalti rekte al antaŭa fenestro"

-#: data/50-mutter-navigation.xml:94
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Ŝanĝi rekte fenestrojn de aplikaĵo"

-#: data/50-mutter-navigation.xml:99
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Ŝalti rekte al antaŭa fenestro de aplikaĵo"

-#: data/50-mutter-navigation.xml:103
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Ŝalti rekte sistem-kontrolojn"

-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Ŝalti rekte al antaŭa sistem-kontrolo"

-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Kaŝi ĉiujn normalajn fenestrojn"

-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Ŝalti al laborspaco 1"

-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Ŝalti al laborspaco 2"

-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Ŝalti al laborspaco 3"

-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Ŝalti al laborspaco 4"

-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Ŝalti al lasta laborspaco"

-#: data/50-mutter-navigation.xml:129
+#: ../data/50-mutter-navigation.xml.in.h:35
 msgid "Move to workspace left"
 msgstr "Movi al la maldekstra laborspaco"

-#: data/50-mutter-navigation.xml:132
+#: ../data/50-mutter-navigation.xml.in.h:36
 msgid "Move to workspace right"
 msgstr "Movi al la dekstra laborspaco"

-#: data/50-mutter-navigation.xml:135
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Movi al la supra laborspaco"

-#: data/50-mutter-navigation.xml:138
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Movi al la malsupra laborspaco"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Sistemo"

-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr ""

-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr ""

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr ""
-
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Fenestroj"

-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Aktivigi la fenestromenuon"

-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Baskuligi tutekranan reĝimon"

-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr ""

-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Restaŭri la fenestron"

-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
 msgid "Toggle shaded state"
 msgstr ""

-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Fermi la fenestron"

-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Kaŝi la fenestron"

-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Movi la fenestron"

-#: data/50-mutter-windows.xml:26
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Ŝanĝi la fenestrograndon"

-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr ""

-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""

-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr ""

-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr ""

-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Vertikale maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:39
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Horizontale maksimumigi la fenestron"

-#: data/50-mutter-windows.xml:43
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr ""

-#: data/50-mutter-windows.xml:47
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr ""

-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutero"

-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"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 ""

-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/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."
+"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 ""

-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""

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

-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr ""
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:155
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 #, fuzzy
-#| msgid "Switch applications"
-msgid "Switch monitor configurations"
-msgstr "Ŝanĝi aplikaĵojn"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
-msgstr "Ŝalti al virtuala terminalo 1"
+msgstr "Ŝalti al VT 1"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#, fuzzy
 msgid "Switch to VT 2"
-msgstr "Ŝalti al virtuala terminalo 2"
+msgstr "Ŝalti al VT 2"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#, fuzzy
 msgid "Switch to VT 3"
-msgstr "Ŝalti al virtuala terminalo 3"
+msgstr "Ŝalti al VT 3"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#, fuzzy
 msgid "Switch to VT 4"
-msgstr "Ŝalti al virtuala terminalo 4"
+msgstr "Ŝalti al VT 4"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#, fuzzy
 #| msgid "Switch to workspace 5"
 msgid "Switch to VT 5"
-msgstr "Ŝalti al virtuala terminalo 5"
+msgstr "Ŝalti al VT 5"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#, fuzzy
 #| msgid "Switch to workspace 6"
 msgid "Switch to VT 6"
-msgstr "Ŝalti al virtuala terminalo 6"
+msgstr "Ŝalti al VT 6"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#, fuzzy
 #| msgid "Switch to workspace 7"
 msgid "Switch to VT 7"
-msgstr "Ŝalti al virtuala terminalo 7"
+msgstr "Ŝalti al VT 7"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
-msgid "Switch to VT 8"
-msgstr "Ŝalti al virtuala terminalo 8"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
-msgid "Switch to VT 9"
-msgstr "Ŝalti al virtuala terminalo 9"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
-msgid "Switch to VT 10"
-msgstr "Ŝalti al virtuala terminalo 10"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
-msgid "Switch to VT 11"
-msgstr "Ŝalti al virtuala terminalo 11"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
-msgid "Switch to VT 12"
-msgstr "Ŝalti al virtuala terminalo 12"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Re-ŝalti klavkombinojn"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2260
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr ""
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:2283
-#, fuzzy
-#| msgid "Switch system controls"
-msgid "Switch monitor"
-msgstr "Ŝanĝi sistem-kontrolojn"
-
-#: src/backends/meta-input-settings.c:2285
-msgid "Show on-screen help"
-msgstr "Montri ekranhelpon"
-
-#: src/backends/meta-monitor-manager.c:900
+#: ../src/backends/meta-monitor-manager.c:364
 msgid "Built-in display"
 msgstr ""

-#: src/backends/meta-monitor-manager.c:923
+#: ../src/backends/meta-monitor-manager.c:391
 msgid "Unknown"
 msgstr "Nekonate"

-#: src/backends/meta-monitor-manager.c:925
+#: ../src/backends/meta-monitor-manager.c:393
 msgid "Unknown Display"
 msgstr "Nekonata ekrano"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: ../src/backends/meta-monitor-manager.c:401
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:479
-#, fuzzy, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
+#: ../src/compositor/compositor.c:456
+#, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
-msgstr "Alia kunmetanta administrilo jam rulas sur ekrano %i de montrilo “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
+msgstr "Alia kunmetanta administrilo jam rulas sur ekrano %i de montrilo \"%s\"."

-#: src/core/bell.c:194
+#: ../src/core/bell.c:185
 msgid "Bell event"
 msgstr "Sonoril-evento"

-#: src/core/display.c:608
-#, fuzzy, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Malsukcesis malfermi jenan vidigon de fenestra sistemo X “%s”\n"
-
-#: src/core/main.c:189
-msgid "Disable connection to session manager"
-msgstr "Elŝalti konekton al la seancoadministrilo"
-
-#: src/core/main.c:195
-msgid "Replace the running window manager"
-msgstr "Anstataŭigi la nun ruliĝantan fenestromastrumilon"
-
-#: src/core/main.c:201
-msgid "Specify session management ID"
-msgstr "Specifi identigilon de la seancoadministrilo"
-
-#: src/core/main.c:206
-#, fuzzy
-msgid "X Display to use"
-msgstr "X-Vidigo uzenda"
-
-#: src/core/main.c:212
-msgid "Initialize session from savefile"
-msgstr "Pravalorizi la seancon el konservita dosiero"
-
-#: src/core/main.c:218
-msgid "Make X calls synchronous"
-msgstr "Fari X-vokojn sinkrone"
-
-#: src/core/main.c:225
-msgid "Run as a wayland compositor"
-msgstr ""
-
-#: src/core/main.c:231
-msgid "Run as a nested compositor"
-msgstr ""
-
-#: src/core/main.c:239
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: ../src/core/delete.c:127
 #, c-format
+#| msgid "<tt>%s</tt> is not responding."
 msgid "“%s” is not responding."
 msgstr "“%s” ne respondas."

-#: src/core/meta-close-dialog-default.c:149
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikaĵo ne respondas."

-#: src/core/meta-close-dialog-default.c:154
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Vi povas elekti ĉu atendi iomete por la aplikaĵo aŭ perforte ĉesi ĝin."

-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "Per_forta eliro"
-
-#: src/core/meta-close-dialog-default.c:161
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Atendi"

-#: src/core/mutter.c:39
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "Per_forta eliro"
+
+#: ../src/core/display.c:562
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Malsukcesis malfermi jenan vidigon de fenestra sistemo X: '%s'\n"
+
+#: ../src/core/main.c:176
+msgid "Disable connection to session manager"
+msgstr "Elŝalti konekton al la seancoadministrilo"
+
+#: ../src/core/main.c:182
+msgid "Replace the running window manager"
+msgstr "Anstataŭigi la nun ruliĝantan fenestromastrumilon"
+
+#: ../src/core/main.c:188
+msgid "Specify session management ID"
+msgstr "Specifi identigilon de la seancoadministrilo"
+
+#: ../src/core/main.c:193
+#, fuzzy
+msgid "X Display to use"
+msgstr "X-Vidigo uzenda"
+
+#: ../src/core/main.c:199
+msgid "Initialize session from savefile"
+msgstr "Pravalorizi la seancon el konservita dosiero"
+
+#: ../src/core/main.c:205
+msgid "Make X calls synchronous"
+msgstr "Fari X-vokojn sinkrone"
+
+#: ../src/core/main.c:212
+msgid "Run as a wayland compositor"
+msgstr ""
+
+#: ../src/core/main.c:220
+msgid "Run as a full display server, rather than nested"
+msgstr ""
+
+#: ../src/core/mutter.c:39
 #, c-format
-#| msgid ""
-#| "mutter %s\n"
-#| "Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
-#| "This is free software; see the source for copying conditions.\n"
-#| "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
-#| "PARTICULAR PURPOSE.\n"
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "Mutero %s\n"
-"Kopirajto © 2001-%d Havoc PENNIGTON, Red Hat, Inc., kaj aliaj\n"
-"Ĉi tio estas libera programaro; rigardu la fontkodon por kondiĉoj pri "
-"kopiado.\n"
-"Ekzistas NENIU garantio; nek por NEGOCEBLO nek por ADAPTADO AL IU APARTA "
+"Kopirajto (C) 2001-%d Havoc PENNIGTON, Red Hat, Inc., kaj aliaj\n"
+"Ĉi tio estas libera programaro; rigardu la fontkodon por pli da informoj.\n"
+"Ekzistas neniu GARANTIO; nek por NEGOCEBLO nek por ADAPTADO AL IU APARTA "
 "CELO.\n"

-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Motri version"

-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr ""

-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:2004
 #, c-format
 msgid "Workspace %d"
 msgstr "Laborspaco %d"

-#: src/core/screen.c:583
+#: ../src/core/screen.c:525
 #, c-format
 #| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
+#| "Screen %d on display \"%s\" already has a window manager; try using the --"
+#| "replace option to replace the current window manager.\n"
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"Ekrano “%s” jam havas fenestroadministrilon; provu uzi la opcion --replace "
-"por anstataŭigi la nunan fenestroadministrilon."
+"Ekrano \"%s\" jam havas fenestroadministrilon; provu uzi opcion --replace por "
+"anstataŭigi la nunan fenestroadministrilon."

-#: src/core/screen.c:668
-#, fuzzy, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Ekrano %d en vidigilo “%s” estas nevalida\n"
+#: ../src/core/screen.c:607
+#, c-format
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Ekrano %d en vidigilo '%s' estas nevalida\n"

-#: src/core/util.c:120
+#: ../src/core/util.c:118
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutero estis kompilita sen subteno por eksplicita reĝimo\n"

-#: src/wayland/meta-wayland-tablet-pad.c:563
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Reĝim-ŝaltilo: Reĝimo %d"
-
-#: src/x11/session.c:1815
+#: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""

-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:549
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (ĉe %s)"
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,15 @@
 # Pablo Gonzalo del Campo <pablodc@bigfoot.com>,2002,2003.
 # Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2004, 2005, 2006.
 # Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter.master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-07-23 12:31+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-02 10:05+0000\n"
+"PO-Revision-Date: 2017-08-03 09:59+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: es <gnome-es-list@gnome.org>\n"
 "Language: es\n"
@@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Mover la ventana a la última área de trabajo"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mover la ventana un área de trabajo a la izquierda"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mover la ventana un área de trabajo a la derecha"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Subir la ventana un área de trabajo"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Bajar la ventana un área de trabajo"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mover la ventana una pantalla a la izquierda"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mover la ventana una pantalla a la derecha"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Subir la ventana una pantalla"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Bajar la ventana una pantalla"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Cambiar entre aplicaciones"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Cambiar a la aplicación anterior"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Cambiar entre ventanas"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Cambiar a la ventana anterior"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Cambiar entre ventanas de una aplicación"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Cambiar a la ventana anterior de una aplicación"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Cambiar entre controles del sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Cambiar al control del sistema anterior"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Cambiar entre ventanas directamente"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Cambiar directamente a la ventana anterior"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Cambiar entre ventanas de una aplicación directamente"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Cambiar directamente a la ventana anterior de una aplicación"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Cambiar entre controles del sistema directamente"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Cambiar directamente al control del sistema anterior"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Ocultar todas las ventanas normales"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Cambiar al área de trabajo 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Cambiar al área de trabajo 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Cambiar al área de trabajo 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Cambiar al área de trabajo 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Cambiar a la útima área de trabajo"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mover al área de trabajo de la izquierda"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mover al área de trabajo de la derecha"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mover al área de trabajo de la arriba"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mover al área de trabajo de abajo"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@@ -172,10 +189,6 @@ msgstr "Mostrar el elemento «ejecutar comando»"
 msgid "Show the activities overview"
 msgstr "Mostrar la vista de actividades"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaurar los atajos de teclado"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ventanas"
@@ -201,50 +214,54 @@ msgid "Restore window"
 msgstr "Restaurar la ventana"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Cambiar el estado de enrollado"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Cerrar la ventana"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ocultar la ventana"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mover la ventana"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensionar la ventana"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Conmutar la ventana en todas las áreas de trabajo o sólo en una"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Elevar la ventana si está cubierta, de lo contrario, bajarla"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Elevar la ventana sobre las otras ventanas"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Bajar la ventana por debajo de otras ventanas"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximizar la ventana verticalmente"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximizar la ventana horizontalmente"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Ver división a la izquierda"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Ver división a la derecha"

@@ -397,55 +414,49 @@ msgid "Enable experimental features"
 msgstr "Activar las características experimentales"

 #: data/org.gnome.mutter.gschema.xml.in:108
-#, fuzzy
-#| msgid ""
-#| "To enable experimental features, add the feature keyword to the list. "
-#| "Whether the feature requires restarting the compositor depends on the "
-#| "given feature. Any experimental feature is not required to still be "
-#| "available, or configurable. Don’t expect adding anything in this setting "
-#| "to be future proof. Currently possible keywords: • “scale-monitor-"
-#| "framebuffer” — makes mutter default to layout logical monitors in a "
-#| "logical pixel coordinate space, while scaling monitor framebuffers "
-#| "instead of window content, to manage HiDPI monitors. Does not require a "
-#| "restart. • “remote-desktop” — enables remote desktop support. To support "
-#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • "
-#| "“screen-cast” — enables screen cast support."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
 "feature. Any experimental feature is not required to still be available, or "
 "configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"proof. Currently possible keywords: • “monitor-config-manager” — use the new "
+"monitor configuration system, aimed to replace the old one. This enables a "
+"higher level configuration API to be used by configuration applications, as "
+"well as the ability to configure per logical monitor scale. • “scale-monitor-"
+"framebuffer” — makes mutter default to layout logical monitors in a logical "
+"pixel coordinate space, while scaling monitor framebuffers instead of window "
+"content, to manage HiDPI monitors. Does not require a restart. Also enabling "
+"“monitor-config-manager” is required for this feature to be enabled."
 msgstr ""
 "Para activar las características experimentales, añada la palabra clave de "
 "la característica a la lista. Depende de la característica que se deba "
 "reiniciar o no el compositor. Cualquier característica experimental puede no "
 "estar disponible o ser configurable. No espere que lo que se añada en este "
 "escenario sirva como prueba futura. Las palabras clave actualmente "
-"disponibles son: • \"scale-monitor-framebuffer\" - convierte a mutter en la "
-"manera predeterminada de disponer monitores lógicos en un espacio lógico de "
+"disponibles son: • \"monitor-config-manager\" - utiliza el nuevo sistema de "
+"configuración del monitor, destinado a sustituir el antiguo. Esto permite "
+"que las aplicaciones de configuración usen una API de configuración de nivel "
+"superior, así como la capacidad de configurar el escalado de monitores "
+"lógicos. • \"scale-monitor-framebuffer\" - convierte a mutter en ña manera "
+"predeterminada de disponer monitores lógicos en un espacio lógico de "
 "coordenadas de píxeles, al escalar framebuffers de monitores framebuffers en "
 "lugar del contenido de ventana, para administrar monitores HiDPI. No "
-"requiere un reinicio. • \"remote-desktop\" — activa el escritorio remoto. "
-"Para soportarlo con compartición de pantalla es necesario activar \"screen-"
-"cast\" • \"screen-cast\" — activa el soporte de compartición de pantalla."
+"requiere un reinicio. También es necesario activar \"monitor-config-manager"
+"\" para activar esta función."

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:151
 msgid "Select window from tab popup"
 msgstr "Seleccionar ventana de la pestaña emergente"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:156
 msgid "Cancel tab popup"
 msgstr "Cancelar pestaña emergente"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:161
 msgid "Switch monitor configurations"
 msgstr "Cambiar la configuración del monitor"

-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:166
 msgid "Rotates the built-in monitor configuration"
 msgstr "Rota la configuración del monitor empotrado"

@@ -501,41 +512,10 @@ msgstr "Cambiar al VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Volver a activar los atajos"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permitir capturas con Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Aplicaciones de Xwayland que pueden capturar el teclado"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2118
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambiar modo (grupo %d)"
@@ -543,37 +523,37 @@ msgstr "Cambiar modo (grupo %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2141
 msgid "Switch monitor"
 msgstr "Cambiar monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2143
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"

-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:927
 msgid "Built-in display"
 msgstr "Pantalla integrada"

-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:950
 msgid "Unknown"
 msgstr "Desconocida"

-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:952
 msgid "Unknown Display"
 msgstr "Pantalla desconocida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:960
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -581,65 +561,62 @@ msgstr ""
 "Ya existe un gestor de composición ejecutándose en la monitor %i, pantalla "
 "«%s»."

-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Evento de campana"

-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
+
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Desactivar conexión al gestor de sesión"

-#: src/core/main.c:197
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Reemplazar el gestor de ventanas en ejecución"

-#: src/core/main.c:203
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Especificar el ID se gestión de sesión"

-#: src/core/main.c:208
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Pantalla X que usar"

-#: src/core/main.c:214
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde el archivo de salvaguarda"

-#: src/core/main.c:220
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Hacer que las llamadas a las X sean síncronas"

-#: src/core/main.c:227
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Ejecutar como compositor Wayland"

-#: src/core/main.c:233
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Ejecutar como compositor anidado"

 #: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Ejecutar el compositor wayland sin iniciar Xwayland"
-
-#: src/core/main.c:247
 msgid "Run as a full display server, rather than nested"
 msgstr "Ejecutar como servidor completo, en lugar de anidado"

-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Ejecutar con «backend» de X11"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "«%s» no está respondiendo."

-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "La aplicación no está respondiendo."

-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -647,11 +624,11 @@ msgstr ""
 "Puede elegir esperar un rato para ver si continua o forzar la aplicación "
 "para cerrarla completamente."

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Forzar la salida"

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Esperar"

@@ -679,21 +656,12 @@ msgstr "Imprimir versión"
 msgid "Mutter plugin to use"
 msgstr "Complemento de mutter que usar"

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

-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Cambiar modo: modo %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -702,21 +670,21 @@ msgstr ""
 "La pantalla «%s» ya tiene un gestor de ventanas; pruebe a usar la opción «--"
 "replace» para reemplazar el gestor de ventanas activo."

-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Falló al inicializar GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Ocurrió un error al abrir la pantalla de X Window System «%s»\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "La ventana %d en la pantalla «%s» no es válida\n"

-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter fue compilado sin soporte para modo prolijo\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Cambiar modo: modo %d"
+
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -724,26 +692,11 @@ msgstr ""
 "Estas ventanas no soportan «guardar la configuración actual» y tendrán que "
 "reiniciarse manualmente la próxima vez que inicie una sesión."

-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (on %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mover la ventana un área de trabajo a la izquierda"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mover la ventana un área de trabajo a la derecha"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mover al área de trabajo de la izquierda"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mover al área de trabajo de la derecha"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Cambiar el estado de enrollado"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "no se pudo crear la textura de fondo a partir de archivo"

--- a/po/et.po
+++ b/po/et.po
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,5 +1,5 @@
 # French translation of mutter.
-# Copyright (C) 2002-2018 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the metacity package.
 #
 # Christophe Fergeau <teuf@users.sourceforge.net>, 2002.
@@ -11,24 +11,25 @@
 # Cyprien Le Pannérer <cyplp@free.fr>, 2006.
 # Robert-André Mauchin <zebob.m@gmail.com>, 2007.
 # Stéphane Raimbault <stephane.raimbault@gmail.com>, 2007.
-# Claude Paroz <claude@2xlibre.net>, 2008-2018.
+# Claude Paroz <claude@2xlibre.net>, 2008-2017.
 # Bruno Brouard <annoa.b@gmail.com>, 2011-12.
+# Charles Monzat <superboa@hotmail.fr>, 2016.
 # Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>, 2017.
-# Charles Monzat <superboa@hotmail.fr>, 2016, 2017.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-07-24 10:22+0200\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
-"Language-Team: français <gnomefr@traduc.org>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-05 10:52+0100\n"
+"Last-Translator: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>\n"
+"Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 2.0\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -55,118 +56,134 @@ msgid "Move window to last workspace"
 msgstr "Déplacer la fenêtre vers le dernier espace de travail"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Déplacer la fenêtre d’un espace de travail vers la gauche"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Déplacer la fenêtre d’un espace de travail vers la droite"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Déplacer la fenêtre d’un espace de travail vers le haut"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Déplacer la fenêtre d’un espace de travail vers le bas"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Déplacer la fenêtre d’un écran vers la gauche"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Déplacer la fenêtre d’un écran vers la droite"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Déplacer la fenêtre d’un écran vers le haut"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Déplacer la fenêtre d’un écran vers le bas"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Changer d’application"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Passer à l’application précédente"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Changer de fenêtre"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Passer à la fenêtre précédente"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Changer de fenêtre d’une application"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Passer à la fenêtre précédente d’une application"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Changer les contrôles système"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Passer au contrôle système précédent"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Changer de fenêtre directement"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Passer directement à la fenêtre précédente"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Changer de fenêtre d’une application directement"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Passer directement à la fenêtre précédente d’une application"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Changer les contrôles système directement"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Passer directement au contrôle système précédent"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Masquer toutes les fenêtres normales"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Passer à l’espace de travail 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Passer à l’espace de travail 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Passer à l’espace de travail 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Passer à l’espace de travail 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Passer au dernier espace de travail"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Déplacer vers l’espace de travail de gauche"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Déplacer vers l’espace de travail de droite"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Déplacer vers l’espace de travail du dessus"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Déplacer vers l’espace de travail du dessous"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Système"

@@ -178,10 +195,6 @@ msgstr "Afficher la fenêtre pour lancer une commande"
 msgid "Show the activities overview"
 msgstr "Afficher l’aperçu des activités"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaurer les raccourcis clavier"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Fenêtres"
@@ -207,51 +220,55 @@ msgid "Restore window"
 msgstr "Restaurer la fenêtre"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Basculer l’état de repli"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Fermer la fenêtre"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Masquer la fenêtre"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Déplacer la fenêtre"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensionner la fenêtre"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Placer la fenêtre sur tous les espaces de travail, ou sur un seul"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""
 "Mettre la fenêtre au premier plan si elle est cachée, sinon à l’arrière-plan"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Mettre la fenêtre au premier plan"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Mettre la fenêtre sous les autres fenêtres"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximiser la fenêtre verticalement"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximiser la fenêtre horizontalement"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Vue divisée sur la gauche"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Vue divisée sur la droite"

@@ -401,6 +418,20 @@ msgid "Enable experimental features"
 msgstr "Activer les fonctionnalités expérimentales"

 #: data/org.gnome.mutter.gschema.xml.in:108
+#| msgid ""
+#| "To enable experimental features, add the feature keyword to the list. "
+#| "Whether the feature requires restarting the compositor depends on the "
+#| "given feature. Any experimental feature is not required to still be "
+#| "available, or configurable. Don’t expect adding anything in this setting "
+#| "to be future proof. Currently possible keywords: • “monitor-config-"
+#| "manager” — use the new monitor configuration system, aimed to replace the "
+#| "old one. This enables a higher level configuration API to be used by "
+#| "configuration applications, as well as the ability to configure per "
+#| "logical monitor scale. • “scale-monitor-framebuffer” — makes mutter "
+#| "default to layout logical monitors in a logical pixel coordinate space, "
+#| "while scaling monitor framebuffers instead of window content, to manage "
+#| "HiDPI monitors. Does not require a restart. Also enabling “monitor-config-"
+#| "manager” is required for this feature to be enabled."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -409,34 +440,41 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Pour activer les fonctionnalités expérimentales, ajoutez le mot-clé de la "
 "fonctionnalité dans la liste. Selon la fonctionnalité, il peut être "
 "nécessaire de redémarrer le compositeur. Chaque fonctionnalité expérimentale "
-"peut disparaître ou ne plus être configurable. Ne vous attendez pas à ce que "
-"le contenu de ce réglage soit stable dans le temps. Les mots-clés "
-"actuellement possibles sont : • « scale-monitor-framebuffer » — demande à "
-"mutter d’utiliser par défaut une disposition par moniteur logique dans un "
-"espace de coordonnées de pixels logique, tout en mettant à l’échelle les "
+"peut disparaître ou ne plus être configurable. Ne vous attendez pas à ce que"
+" le "
+"contenu de ce réglage soit stable dans le temps. Les mots-clés actuellement "
+"possibles sont : • « scale-monitor-framebuffer » — demande à mutter "
+"d’utiliser par défaut une disposition par moniteur logique dans un espace de "
+"coordonnées de pixels logique, tout en mettant à l’échelle les "
 "« framebuffers » de moniteur au lieu des contenus de fenêtre pour pouvoir "
-"gérer les moniteurs à haute densité. Cela ne nécessite pas de redémarrage."
+"gérer les moniteurs à haute densité. Cela ne nécessite pas de redémarrage. "
+"• « remote-desktop » — active la prise en charge du bureau à distance. Pour "
+"la prise en charge du bureau distant avec partage de l’écran, « screen-cast » "
+"doit aussi être activé. • « screen-cast »  — active la diffusion de l’écran. "

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr ""
 "Sélectionner la fenêtre dans la vue qui apparaît suite à un appui sur la "
 "touche tab"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Fermer la vue qui apparaît suite à un appui sur la touche tab"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Changer de configuration de moniteur"

-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Passe à la prochaine configuration intégrée de moniteur"

@@ -492,94 +530,48 @@ msgstr "Passer à l’émulateur de terminal 12"
 msgid "Re-enable shortcuts"
 msgstr "Réactiver les raccourcis"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Autoriser les captures clavier avec Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Permettre aux captures de clavier émises par les applications X11 tournant "
-"dans Xwayland d’être prises en compte. Pour que ceci puisse arriver, le "
-"client doit aussi soit envoyer un ClientMessage X11 spécifique à la fenêtre "
-"racine, soit figurer dans les applications autorisées dans la clé « xwayland-"
-"access-rules »."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Applications Xwayland autorisées à émettre des captures clavier"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Liste de noms de ressources ou de classes de ressources de fenêtres X11 "
-"autorisées ou non à émettre des captures clavier sous Xwayland. Le nom ou la "
-"classe de ressource d’une fenêtre X11 donnée peut être obtenue à l’aide de "
-"la commande « xprop WM_CLASS ». Les caractères joker « * » et « ? » sont "
-"acceptées dans les valeurs. Les valeurs commençant pas « ! » sont en liste "
-"noire, qui a priorité sur la liste blanche, pour révoquer les applications "
-"de la liste système par défaut. Celle-ci contient les applications "
-"suivantes : « @XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@ ». Les utilisateurs "
-"peuvent casser une capture existante en utilisant le raccourci clavier "
-"spécifique défini par la combinaison de touches « restore-shortcuts »."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Changement de mode (groupe %d)"

-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets’
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Changer de moniteur"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Afficher l’aide à l’écran"

-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Affichage intégré"

-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Inconnu"

-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Affichage inconnu"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -587,65 +579,62 @@ msgstr ""
 "Un autre gestionnaire de composition est déjà lancé sur l’écran %i de "
 "l’affichage « %s »."

-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Évènement sonore"

-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
+
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Désactiver la connexion au gestionnaire de sessions"

-#: src/core/main.c:197
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"

-#: src/core/main.c:203
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Indiquer l’ID de gestion de sessions"

-#: src/core/main.c:208
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Affichage X à utiliser"

-#: src/core/main.c:214
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Initialiser la session depuis le fichier de sauvegarde"

-#: src/core/main.c:220
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Rendre synchrones les appels à X"

-#: src/core/main.c:227
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Lancer comme un compositeur wayland"

-#: src/core/main.c:233
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Lancer comme un compositeur imbriqué"

 #: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Lancer le compositeur wayland sans démarrer Xwayland"
-
-#: src/core/main.c:247
 msgid "Run as a full display server, rather than nested"
 msgstr "Lancer comme un serveur d’affichage complet, plutôt qu’imbriqué"

-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Lancer avec le moteur X11"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "« %s » ne répond pas."

-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "L’application ne répond pas."

-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -653,11 +642,11 @@ msgstr ""
 "Vous pouvez patienter un instant pour continuer ou forcer l’application à "
 "quitter définitivement."

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Forcer à quitter"

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Attendre"

@@ -685,21 +674,12 @@ msgstr "Afficher la version"
 msgid "Mutter plugin to use"
 msgstr "Greffon de Mutter à utiliser"

-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Espace de travail %d"

-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Changement de mode : mode %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -708,21 +688,21 @@ msgstr ""
 "L’affichage « %s » a déjà un gestionnaire de fenêtres ; essayez d’utiliser "
 "l’option --replace pour remplacer le gestionnaire de fenêtres actuel."

-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "L’initialisation de GDK a échoué\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "L’écran %d sur l’affichage « %s » n’est pas valide\n"

-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter a été compilé sans la prise en charge du mode bavard\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Changement de mode : mode %d"
+
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -731,22 +711,8 @@ msgstr ""
 "configuration actuelle » et devront être redémarrées manuellement à la "
 "prochaine connexion."

-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Déplacer la fenêtre d’un espace de travail vers la gauche"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Déplacer la fenêtre d’un espace de travail vers la droite"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Déplacer vers l’espace de travail de gauche"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Déplacer vers l’espace de travail de droite"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Basculer l’état de repli"
--- a/po/fur.po
+++ b/po/fur.po
@@ -6,16 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-06-07 13:00+0000\n"
-"PO-Revision-Date: 2018-06-29 15:33+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-22 09:45+0000\n"
+"PO-Revision-Date: 2017-07-22 22:53+0200\n"
 "Last-Translator: Fabio Tomat <f.t.public@gmail.com>\n"
 "Language-Team: Friulian <fur@li.org>\n"
 "Language: fur\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.8\n"
+"X-Generator: Poedit 2.0.2\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -42,133 +43,145 @@ msgid "Move window to last workspace"
 msgstr "Sposte barcon tal ultin spazi di lavôr"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Sposte barcon tal spazi di lavôr a çampe"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Sposte barcon tal spazi di lavôr a drete"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Sposte barcon tal spazi di lavôr parsore"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Sposte barcon tal spazi di lavôr sot"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Sposte barcon tal visôr a çampe"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Sposte barcon tal visôr a drete"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Sposte barcon tal visôr parsore"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Sposte barcon tal visôr sot"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Passâ di une aplicazion in chê altre"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Passe ae aplicazion prime"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Passâ di un barcon in chel altri"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Passe al barcon prime"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Passâ di un barcon in chel altri di une aplicazion"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Passe al barcon prime di une aplicazion"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Passâ di un control di sisteme in chel altri"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Passe al control di sisteme precedent"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Passe dret ai barcons"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Passe dret al barcon precedent"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Passe dret a un barcon di une aplicazion"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Passe dret al barcon precedent di une aplicazion"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Passe dret ai controi dal sisteme"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Passe dret al control precedent dal sisteme"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Plate ducj i barcons normâi"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Passe al spazi di lavôr 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Passe al spazi di lavôr 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Passe al spazi di lavôr 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Passe al spazi di lavôr 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Passe al ultin spazi di lavôr"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Sposte il spazi di lavôr a çampe"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Sposte il spazi di lavôr a drete"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Sposte il spazi di lavôr parsore"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Sposte il spazi di lavôr sot"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sisteme"

 #: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
-msgstr "Mostre la richieste “eseguìs comant”"
+msgstr "Mostre la richieste \"eseguìs comant\""

 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "Mostre la panoramiche ativitâts"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Ripristine lis scurtis di tastiere"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Barcons"
@@ -194,50 +207,54 @@ msgid "Restore window"
 msgstr "Ripristine barcon"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Ative/Disative stât inrodolât"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Siere il barcon"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Plate il barcon"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Sposte il barcon"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Ridimensione barcon"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Ative/Disative barcon su ducj i spazis di lavôr o nome un"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Tire sù il barcon se al è cuviert, se no sbassilu"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Met il barcon parsore di chei altris"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Bute il barcon sot di chei altris"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Slargje il barcon par verticâl"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Slargje il barcon par orizontâl"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Slargje dividint ae çampe"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Slargje dividint ae drete"

@@ -388,10 +405,14 @@ msgid ""
 "Whether the feature requires restarting the compositor depends on the given "
 "feature. Any experimental feature is not required to still be available, or "
 "configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"proof. Currently possible keywords: • “monitor-config-manager” — use the new "
+"monitor configuration system, aimed to replace the old one. This enables a "
+"higher level configuration API to be used by configuration applications, as "
+"well as the ability to configure per logical monitor scale. • “scale-monitor-"
+"framebuffer” — makes mutter default to layout logical monitors in a logical "
+"pixel coordinate space, while scaling monitor framebuffers instead of window "
+"content, to manage HiDPI monitors. Does not require a restart. Also enabling "
+"“monitor-config-manager” is required for this feature to be enabled."
 msgstr ""
 "Par abilitâ lis funzionalitâts sperimentâls, zonte la peraule clâf de "
 "funzionalitât ae liste. Il fat che la funzionalitât e vedi bisugne di tornâ "
@@ -399,24 +420,30 @@ msgstr ""
 "funzionalitât sperimentâl no je necessarie che e sedi disponibile o "
 "configurabile. No sta spietâti di zontâ alc in cheste impostazion e pensâ "
 "che e duredi tal timp. Atualmentri lis peraulis clâf pussibilis a son: • "
-"“scale-monitor-framebuffer” — al rint come predefinît par mutter, la "
-"disposizion logjiche dai visôrs intun spazi logjic di coordenadis di pixel, "
-"in plui si fâs il scjalâ dai framebuffer dai visôrs invezit che il contignût "
-"dal barcon; dut chest par gjestî i visôrs HiDPI. Nol covente tornâ a inviâ."
+"“monitor-config-manager” — al dopre il gnûf sisteme di configurazion dal "
+"visôr, fat par sostituî chel vecjo. Chest al abilite une API di nivel "
+"superiôr che e pues jessi doprade di aplicazions di configurazion, cussì "
+"come la capacitât di configurâ par scjale di monitor logjic. • “scale-"
+"monitor-framebuffer” — al rint come predefinît par mutter la disposizion dai "
+"visôrs logjics intun spazi logjic di coordenadis dai pixel, intant i "
+"framebuffer dai visôrs par scjalâ, invezit dal contignût dal barcon, a "
+"gjestissin i visôrs HiDPI. Nol covente tornâ a inviâ. In plui al è necessari "
+"abilitâ “monitor-config-manager” par fâ in mût che cheste funzionalitât e "
+"sedi abilitade."

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:151
 msgid "Select window from tab popup"
 msgstr "Selezione barcon dal tab popup"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:156
 msgid "Cancel tab popup"
 msgstr "Anule tab popup"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:161
 msgid "Switch monitor configurations"
 msgstr "Cambie configurazions visôr"

-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:166
 msgid "Rotates the built-in monitor configuration"
 msgstr "Al volte la configurazion dal visôr integrât"

@@ -468,61 +495,10 @@ msgstr "Passe al VT 11"
 msgid "Switch to VT 12"
 msgstr "Passe al VT 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Torne abilite lis scurtis"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permet cjapadis di control cun Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Permet che il cjapâ il control de tastiere emetût di aplicazions X11 che a "
-"zirin in Xwayland, di jessi tignûts in considerazion. Par une cjapade di "
-"control di X11, par che e sedi tignude in considerazion sot Wayland, il "
-"client al scugne ancje inviâ un specific messaç (X11 ClientMessage) al "
-"barcon lidrîs o jessi tra lis aplicazions metudis te liste blancje inte clâf "
-"“xwayland-grab-access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Aplicazions Xwayland che a puedin cjapâ la tastiere"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Liste di nons di risorsis o classis di risorsis di barcons X11 che a puedin "
-"o no puedin cjapâ i segnâi di tastiere X11 sot di Xwayland. Il non de "
-"risorse o la classe de risorse di un dât barcon X11 al pues jessi otignût "
-"doprant il comant “xprop WM_CLASS”. I caratars “*” e “?” tai valôrs a son "
-"supuartâts. I valôrs che a tachin cun “!” a son metûts te liste nere, che e "
-"à precedence su la liste blancje, par revocâ lis aplicazions de liste di "
-"sisteme predefinide. La liste di sisteme predefinide e inclût lis "
-"aplicazions chi daurman: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” I utents a "
-"puedin interompi il control cjapât doprant la specifiche scurte di tastiere "
-"definide de clâf di associazion tast “restore-shortcuts”."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2118
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambie mût (Grup %d)"
@@ -530,37 +506,37 @@ msgstr "Cambie mût (Grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2141
 msgid "Switch monitor"
 msgstr "Cambie visôr"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2143
 msgid "Show on-screen help"
 msgstr "Mostre jutori a schermi"

-#: src/backends/meta-monitor-manager.c:903
+#: src/backends/meta-monitor-manager.c:925
 msgid "Built-in display"
 msgstr "Display integrât"

-#: src/backends/meta-monitor-manager.c:926
+#: src/backends/meta-monitor-manager.c:948
 msgid "Unknown"
 msgstr "No cognossût"

-#: src/backends/meta-monitor-manager.c:928
+#: src/backends/meta-monitor-manager.c:950
 msgid "Unknown Display"
 msgstr "Display no cognossût"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:936
+#: src/backends/meta-monitor-manager.c:958
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -577,46 +553,42 @@ msgstr "Event cjampane"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Impussibil vierzi il display “%s” di X Window System\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Disabilite la conession al gjestôr de session"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Rimplace il window manager in vore"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Specifiche il ID di gjestion session"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Display X di doprâ"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inizialize session da file salvât"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Fâs lis clamadis X sincronis"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Eseguìs come compositor wayland"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Eseguìs come compositor nidiât"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Eseguìs come servidôr display complet, invezit che nidiât"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Eseguìs cul backend X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -671,7 +643,7 @@ msgstr "Plugin Mutter di doprâ"
 msgid "Workspace %d"
 msgstr "Spazi di lavôr %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -680,7 +652,7 @@ msgstr ""
 "Il display “%s” al à za un window manager; prove dopre la opzion --replace "
 "par rimplaçâ chel atuâl."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Schermi %d su display “%s” no valit\n"
@@ -689,12 +661,12 @@ msgstr "Schermi %d su display “%s” no valit\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter al è stât compilât cence supuart pe modalitât fetose\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Cambie mût: mût %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -706,18 +678,3 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (su %s)"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Sposte barcon tal spazi di lavôr a çampe"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Sposte barcon tal spazi di lavôr a drete"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Sposte il spazi di lavôr a çampe"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Sposte il spazi di lavôr a drete"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Ative/Disative stât inrodolât"
--- a/po/gd.po
+++ b/po/gd.po
@@ -1,13 +1,14 @@
 # Scottish Gaelic translation for mutter.
 # Copyright (C) 2016 mutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the mutter package.
-# GunChleoc <fios@foramnagaidhlig.net>, 2016, 2017, 2018.
+# GunChleoc <fios@foramnagaidhlig.net>, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-01-27 08:02+0000\n"
-"PO-Revision-Date: 2018-03-01 10:45+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutte"
+"r&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-03-02 11:37+0000\n"
+"PO-Revision-Date: 2017-03-07 11:59+0100\n"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
 "Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
@@ -17,7 +18,6 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "
 "(n > 2 && n < 20) ? 2 : 3;\n"
 "X-Generator: Virtaal 0.7.1\n"
-"(n > 2 && n < 20) ? 2: 3;\n"
 "X-Project-Style: gnome\n"

 #: data/50-mutter-navigation.xml:6
@@ -166,13 +166,13 @@ msgstr "Gluais dhan rum-obrach air an taobh deas"

 #: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
-msgstr "Gluais dhan rum-obrach aig a’ bharr"
+msgstr "Gluais dhan rum-obrach aig a' bharr"

 #: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
-msgstr "Gluais dhan rum-obrach aig a’ bhonn"
+msgstr "Gluais dhan rum-obrach aig a' bhonn"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "An siostam"

@@ -184,10 +184,6 @@ msgstr ""
 msgid "Show the activities overview"
 msgstr "Foir-shealladh air na gnìomhachdan"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Aisig ath-ghoiridean a’ mheur-chlàir"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Uinneagan"
@@ -254,7 +250,7 @@ msgstr "Làn-mheudaich an uinneag gu h-ingearach"

 #: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
-msgstr "Làn-mheudaich an uinneag air a’ chòmhnard"
+msgstr "Làn-mheudaich an uinneag air a' chòmhnard"

 #: data/50-mutter-windows.xml:43
 msgid "View split on left"
@@ -266,135 +262,284 @@ msgstr "Sgoilt an t-sealladh air an taobh deas"

 #: data/mutter.desktop.in:4
 msgid "Mutter"
-msgstr "Mutter"
+msgstr ""

-#: data/org.gnome.mutter.gschema.xml.in:155
-#| msgid "Switch monitor"
-msgid "Switch monitor configurations"
-msgstr "Gearr leum eadar rèiteachaidhean monatair"
+#: data/org.gnome.mutter.gschema.xml.in:7
+msgid "Modifier to use for extended window management operations"
+msgstr ""

-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2167
-#, c-format
-#| msgid "Mode Switch: Mode %d"
-msgid "Mode Switch (Group %d)"
-msgstr "Suidse nam modh (Buidheann %d)"
+#: data/org.gnome.mutter.gschema.xml.in:8
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:20
+msgid "Attach modal dialogs"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:21
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:30
+msgid "Enable edge tiling when dropping windows on screen edges"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:31
+msgid ""
+"If enabled, dropping windows on vertical screen edges maximizes them "
+"vertically and resizes them horizontally to cover half of the available "
+"area. Dropping windows on the top screen edge maximizes them completely."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:40
+msgid "Workspaces are managed dynamically"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:41
+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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:50
+msgid "Workspaces only on primary"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:51
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:59
+msgid "No tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:60
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:68
+msgid "Delay focus changes until the pointer stops moving"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:69
+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 ""
+
+#: data/org.gnome.mutter.gschema.xml.in:79
+msgid "Draggable border width"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:80
+msgid ""
+"The amount of total draggable borders. If the theme's visible borders are "
+"not enough, invisible borders will be added to meet this value."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:89
+msgid "Auto maximize nearly monitor sized windows"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:90
+msgid ""
+"If enabled, new windows that are initially the size of the monitor "
+"automatically get maximized."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:98
+msgid "Place new windows in the center"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:99
+msgid ""
+"When true, the new windows will always be put in the center of the active "
+"screen of the monitor."
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:120
+msgid "Select window from tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.gschema.xml.in:125
+msgid "Cancel tab popup"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+msgid "Switch to VT 1"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+msgid "Switch to VT 2"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+msgid "Switch to VT 3"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+msgid "Switch to VT 4"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+msgid "Switch to VT 5"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+msgid "Switch to VT 6"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+msgid "Switch to VT 7"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+msgid "Switch to VT 8"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+msgid "Switch to VT 9"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+msgid "Switch to VT 10"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+msgid "Switch to VT 11"
+msgstr ""
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+msgid "Switch to VT 12"
+msgstr ""

 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2190
+#: src/backends/meta-input-settings.c:1913
+#| msgid "Switch system controls"
 msgid "Switch monitor"
 msgstr "Gearr leum gu monatair eile"

-#: src/backends/meta-input-settings.c:2192
+#: src/backends/meta-input-settings.c:1915
 msgid "Show on-screen help"
-msgstr "Seall a’ chobhair air an sgrìn"
+msgstr "Seall a' chobhair air an sgrìn"

-#: src/backends/meta-monitor-manager.c:908
+#: src/backends/meta-monitor-manager.c:515
 msgid "Built-in display"
-msgstr "Uidheam-taisbeanaidh ’na broinn"
+msgstr "Uidheam-taisbeanaidh 'na broinn"

-#: src/backends/meta-monitor-manager.c:931
+#: src/backends/meta-monitor-manager.c:538
 msgid "Unknown"
 msgstr "Chan eil fhios"

-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:540
 msgid "Unknown Display"
 msgstr "Uidheam-taisbeanaidh nach aithne dhuinn"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:941
+#: src/backends/meta-monitor-manager.c:548
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:479
+#: src/compositor/compositor.c:471
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""

 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr ""

-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr ""
-
-#: src/core/main.c:189
-msgid "Disable connection to session manager"
-msgstr ""
-
-#: src/core/main.c:195
-msgid "Replace the running window manager"
-msgstr ""
-
-#: src/core/main.c:201
-msgid "Specify session management ID"
-msgstr ""
-
-#: src/core/main.c:206
-msgid "X Display to use"
-msgstr ""
-
-#: src/core/main.c:212
-msgid "Initialize session from savefile"
-msgstr ""
-
-#: src/core/main.c:218
-msgid "Make X calls synchronous"
-msgstr ""
-
-#: src/core/main.c:225
-msgid "Run as a wayland compositor"
-msgstr ""
-
-#: src/core/main.c:231
-msgid "Run as a nested compositor"
-msgstr ""
-
-#: src/core/main.c:239
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr ""

-#: src/core/meta-close-dialog-default.c:149
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr ""

-#: src/core/meta-close-dialog-default.c:154
+#: src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr ""

-#: src/core/meta-close-dialog-default.c:161
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Fuirich"
+
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "Sparr _fàgail air"

-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "_Fuirich"
+#: src/core/display.c:590
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr ""
+
+#: src/core/main.c:182
+msgid "Disable connection to session manager"
+msgstr ""
+
+#: src/core/main.c:188
+msgid "Replace the running window manager"
+msgstr ""
+
+#: src/core/main.c:194
+msgid "Specify session management ID"
+msgstr ""
+
+#: src/core/main.c:199
+msgid "X Display to use"
+msgstr ""
+
+#: src/core/main.c:205
+msgid "Initialize session from savefile"
+msgstr ""
+
+#: src/core/main.c:211
+msgid "Make X calls synchronous"
+msgstr ""
+
+#: src/core/main.c:218
+msgid "Run as a wayland compositor"
+msgstr ""
+
+#: src/core/main.c:224
+msgid "Run as a nested compositor"
+msgstr ""
+
+#: src/core/main.c:232
+msgid "Run as a full display server, rather than nested"
+msgstr ""

 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -413,34 +558,34 @@ msgstr ""
 msgid "Workspace %d"
 msgstr "Rum-obrach %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""

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

 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""

-#: src/wayland/meta-wayland-tablet-pad.c:563
+#: src/wayland/meta-wayland-tablet-pad.c:595
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Suidse nam modh: Modh %d"

 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""

-#: src/x11/window-props.c:559
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (air %s)"
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,21 +9,22 @@
 # Mancomún - Centro de Referencia e Servizos de Software Libre <g11n@mancomun.org>, 2009.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro.regueiro@gmail.com>, 2012.
-# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Fran Dieguez <frandieguez@gnome.org>, 2012, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-03-03 13:19+0000\n"
-"PO-Revision-Date: 2018-05-07 19:37+0200\n"
-"Last-Translator: marcos <marcoslansgarza@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 22:29+0200\n"
+"Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
 "Language-Team: Galician\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"

 #: data/50-mutter-navigation.xml:6
@@ -51,118 +52,134 @@ msgid "Move window to last workspace"
 msgstr "Mover xanela ao último espazo de traballo"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mover xanela un espazo de traballo cara á esquerda"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mover xanela un espazo de traballo cara á dereita"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Mover xanela un espazo de traballo cara a arriba"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Mover xanela un espazo de traballo cara a abaixo"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Mover xanela un monitor á esquerda"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Mover xanela un monitor á dereita"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Mover xanela un monitor arriba"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Mover xanela un espazo de traballo abaixo"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Cambiar entre aplicativos"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Cambiar ao aplicativo aplicativos"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Cambiar xanelas"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Cambiar á xanela anterior"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Cambiar entre as xanelas dun aplicativo"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Cambia á xanela anterior dun aplicativo"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
-msgstr "Cambiar entre os controis do sistema"
+msgstr "Cambiar entre os controles do sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Cambia ao control do sistema anterior"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Cambiar xanelas directamente"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Cambia directamente á xanela anterior"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Cambiar entre as xanelas dun aplicativo directamente"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Cambia directamente á xanela anterior do aplicativo"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
-msgstr "Cambiar entre os controis do sistema directamente"
+msgstr "Cambiar entre os controles do sistema directamente"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Cambiar directamente ao control do sistema anterior"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Ocultar todas as xanelas normais"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Cambiar ao espazo de traballo 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Cambiar ao espazo de traballo 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Cambiar ao espazo de traballo 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Cambiar ao espazo de traballo 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Cambiar ao último espazo de traballo"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Mover ao espazo da esquerda"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Mover ao espazo da dereita"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Mover ao espazo de arriba"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Mover ao espazo de traballo de abaixo"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@@ -174,10 +191,6 @@ msgstr "Mostrar o diálogo de executar orde"
 msgid "Show the activities overview"
 msgstr "Mostrar a vista xeral de actividades"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Restaurar os atallos de teclado"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Xanelas"
@@ -203,50 +216,54 @@ msgid "Restore window"
 msgstr "Restaurar xanela"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Trocar o estado ensombrecido"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Pechar xanela"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ocultar xanela"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Mover xanela"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Redimensionar xanela"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Trocar que a xanela apareza en tódolos espazos de traballo ou nun"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Elevar a xanela se está cuberta por outra, en caso contrario baixala"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Subir a xanela por enriba doutras xanelas"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Baixar xanela debaixo doutras xanelas"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maximizar xanela verticalmente"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maximizar xanela horizontalmente"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Dividir vista á esquerda"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Dividir vista á dereita"

@@ -394,6 +411,16 @@ msgid "Enable experimental features"
 msgstr "Activar as características experimentais"

 #: data/org.gnome.mutter.gschema.xml.in:108
+#| msgid ""
+#| "To enable experimental features, add the feature keyword to the list. "
+#| "Whether the feature requires restarting the compositor depends on the "
+#| "given feature. Any experimental feature is not required to still be "
+#| "available, or configurable. Don’t expect adding anything in this setting "
+#| "to be future proof. Currently possible keywords: • “scale-monitor-"
+#| "framebuffer” — makes mutter default to layout logical monitors in a "
+#| "logical pixel coordinate space, while scaling monitor framebuffers "
+#| "instead of window content, to manage HiDPI monitors. Does not require a "
+#| "restart."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -489,56 +516,10 @@ msgstr "Cambiar á VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Reactivar os atallos"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Permitir capturas con Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Permitir que se teña en conta a captura do teclado desde aplicativos X11 "
-"executándose en Xwayland. Para que a captura X11 se teña en conta baixo "
-"Wayland, o cliente debe enviar un ClientMessage de X11 específico á xanela "
-"principal ou estar entre os aplicatios na lista blanca da chave «xwayland-"
-"grab-access-rules»."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Aplicaciones de Xwayland que poden capturar o teclado"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Lista de nomes de recursos ou clases de recursos para as xanelas X11 tanto "
-"permitidas como non permitidas para a captura do teclado en X11 baixo "
-"Xwayland. O nome do recurso ou a clase do recurso da xanela X11 dada pode "
-"obterse usando a orde «xprop WM_CLASS». Admítense os comodíns «*» e os "
-"jokers \"?\" nos valores. Os valores comezando con «!» incluiranse na lista "
-"negra, que ten precedencia sobre a lista branca, para revogar aplicativos "
-"desde a lista por omisión do sistema. A lista por omisión do sitema inclúe "
-"os seguintes aplicativos “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Os usuarios "
-"poden romper unha captura existente usando un atallo de teclado específico "
-"definido na chave de atallo «restore-shortcuts»."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Modo conmutador (Grupo %d)"
@@ -546,37 +527,37 @@ msgstr "Modo conmutador (Grupo %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Cambiar monitor"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostrar axuda en pantalla"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Pantalla embebida"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Descoñecido"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Pantalla descoñecida"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -593,46 +574,42 @@ msgstr "Evento de campá"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Produciuse un erro ao abrir a visualización do X Window System «%s»\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Desactivar a conexión ao xestor de sesión"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Substituír o xestor de xanelas en execución"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Especificar o ID de xestión de sesión"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Pantalla X que se vai usar"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicializar sesión desde o ficheiro de salvagarda"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Facer que as chamadas a X sexan sincrónicas"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Executar como compositor de wayland"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Executar como compositor anidado"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Executar coa infraestructura de X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -687,7 +664,7 @@ msgstr "Engadido de mutter que usar"
 msgid "Workspace %d"
 msgstr "Espazo de traballo %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -696,7 +673,7 @@ msgstr ""
 "A pantalla «%s» ten xa un xestor de xanelas, tente usar a opción --replace "
 "para substituír o xestor de xanelas."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"
@@ -705,12 +682,12 @@ msgstr "A pantalla %d na visualización «%s» non é válida\n"
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter foi compilado sen compatibilidade para o modo detallado\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Modo conmutador: Modo %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -723,21 +700,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (en %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mover xanela un espazo de traballo cara á esquerda"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mover xanela un espazo de traballo cara á dereita"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Mover ao espazo da esquerda"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Mover ao espazo da dereita"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Trocar o estado ensombrecido"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "a textura do fondo non puido crearse desde o ficheiro"

--- a/po/he.po
+++ b/po/he.po
@@ -11,8 +11,8 @@ msgstr ""
 "Project-Id-Version: metacity.HEAD.he\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-26 17:12+0200\n"
-"PO-Revision-Date: 2017-11-26 17:14+0200\n"
+"POT-Creation-Date: 2017-03-30 18:41+0300\n"
+"PO-Revision-Date: 2017-03-30 18:46+0300\n"
 "Last-Translator: Yosef Or Boczko <yoseforb@gmail.com>\n"
 "Language-Team: עברית <>\n"
 "Language: he\n"
@@ -174,7 +174,7 @@ msgstr "העברה למרחב העבודה שמלמעלה"
 msgid "Move to workspace below"
 msgstr "העברה למרחב העבודה שמלמטה"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "מערכת"

@@ -186,10 +186,6 @@ msgstr "הצגת החלונית להרצת פקודה"
 msgid "Show the activities overview"
 msgstr "הצגת סקירת הפעילויות"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "שחזור צירופי מקשים"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "חלונות"
@@ -275,6 +271,7 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Modifier to use for extended window management operations"

 #: data/org.gnome.mutter.gschema.xml.in:8
+#, 
 msgid ""
 "This key will initiate the “overlay”, which is a combination window overview "
 "and application launching system. The default is intended to be the “Windows "
@@ -319,6 +316,7 @@ msgid "Workspaces are managed dynamically"
 msgstr "Workspaces are managed dynamically"

 #: data/org.gnome.mutter.gschema.xml.in:41
+#, 
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -357,6 +355,7 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Delay focus changes until the pointer stops moving"

 #: data/org.gnome.mutter.gschema.xml.in:69
+#, 
 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 "
@@ -402,52 +401,14 @@ msgstr ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Enable experimental features"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Select window from tab popup"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Cancel tab popup"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "החלפה בין תצורות צגים"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Rotates the built-in monitor configuration"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "מעבר ל־VT ‏1"
@@ -496,14 +457,10 @@ msgstr "מעבר ל־VT ‏11"
 msgid "Switch to VT 12"
 msgstr "מעבר ל־VT ‏12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "לאפשר מחדש צירופי מקשים"
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:1848
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "מצב העברה (קבוצה %d)"
@@ -511,37 +468,37 @@ msgstr "מצב העברה (קבוצה %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:1870
 msgid "Switch monitor"
 msgstr "החלפה בין צגים"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:1872
 msgid "Show on-screen help"
 msgstr "הצגת עזרה על המסך"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:630
 msgid "Built-in display"
 msgstr "תצוגה מובנית"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:653
 msgid "Unknown"
 msgstr "לא ידוע"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:655
 msgid "Unknown Display"
 msgstr "תצוגה לא ידועה"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:663
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:479
+#: src/compositor/compositor.c:474
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -551,6 +508,31 @@ msgstr "מנהל תצוגת חלונות אחר כבר פועל במסך %i בת
 msgid "Bell event"
 msgstr "אירוע פעמון"

+#. Translators: %s is a window title
+#: src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "„%s“ אינו מגיב."
+
+#: src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "היישום אינו מגיב."
+
+#: src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"באפשרותך להמתין זמן קצר ולתת ליישום להמשיך או להכריח את היישום להסתיים."
+
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_אילוץ סגירה"
+
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "ה_מתנה"
+
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -592,31 +574,6 @@ msgstr "Run as a nested compositor"
 msgid "Run as a full display server, rather than nested"
 msgstr "Run as a full display server, rather than nested"

-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
-#, c-format
-msgid "“%s” is not responding."
-msgstr "„%s“ אינו מגיב."
-
-#: src/core/meta-close-dialog-default.c:149
-msgid "Application is not responding."
-msgstr "היישום אינו מגיב."
-
-#: src/core/meta-close-dialog-default.c:154
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr ""
-"באפשרותך להמתין זמן קצר ולתת ליישום להמשיך או להכריח את היישום להסתיים."
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_אילוץ סגירה"
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "ה_מתנה"
-
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@@ -644,7 +601,7 @@ msgstr "תוסף ה־mutter לשימוש"
 msgid "Workspace %d"
 msgstr "מרחב עבודה %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -653,7 +610,7 @@ msgstr ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Screen %d on display “%s” is invalid\n"
@@ -672,8 +629,8 @@ msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"חלונות אלו אינם תומכים ב„שמירת ההגדרות הנוכחיות”, ויהיה צורך באתחול ידני "
-"בכניסה הבאה שלך."
+"חלונות אלו אינם תומכים ב„שמירת ההגדרות הנוכחיות”, ויהיה צורך "
+"באתחול ידני בכניסה הבאה שלך."

 #: src/x11/window-props.c:559
 #, c-format
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,9 +4,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity 0\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-06 04:14+0000\n"
-"PO-Revision-Date: 2018-02-17 16:00+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-22 20:51+0200\n"
 "Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
 "Language: hr\n"
@@ -16,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Launchpad-Export-Date: 2008-05-28 13:28+0000\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.3\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -43,118 +44,134 @@ msgid "Move window to last workspace"
 msgstr "Premjesti prozor posljednji radni prostor"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Premjesti prozor jedan radni prostor nalijevo"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Premjesti prozor jedan radni prostor udesno"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Premjesti prozor jedan radni prostor gore"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Premjesti prozor jedan radni prostor dolje"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Premjesti prozor jedan zaslon nalijevo"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Premjesti prozor jedan zaslon udesno"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Premjesti prozor jedan zaslon gore"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Premjesti prozor jedan zaslon dolje"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Prebacivanje aplikacija"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Prebaci na prijašnju aplikaciju"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Prebacivanje prozora"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Prebaci na prijašnji prozor"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Prebacivanje prozora aplikacija"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Prebaci na prijašnji prozor aplikacije"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Prebacivanje upravljanja sustavom"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Prebaci na prijašnje upravljanje sustavom"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Prebacivanje izravno na prozor"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Prebaci izravno na prijašnji prozor"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Prebacivanje prozora aplikacije izravno"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Prebaci izravno na prijašnji prozor aplikacije"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Prebacivanje upravljanja sustavom izravno"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Prebaci izravno na prijašnje upravljanje sustavom"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Sakrij sve normalne prozore"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Prebaci se na radni prostor 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Prebaci se na radni prostor 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Prebaci se na radni prostor 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Prebaci se na radni prostor 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Prebaci na prijašnji radni prostor"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Premjesti na lijevi radni prostor"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Premjesti na desni radni prostor"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Premjesti na gornji radni prostor"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Premjesti na donji radni prostor"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sustav"

@@ -166,10 +183,6 @@ msgstr "Prikaži dijalog pokretanja naredbe"
 msgid "Show the activities overview"
 msgstr "Prikaži pregled aktivnosti"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Vrati izvorne prečace tipkovnice"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Prozori"
@@ -195,50 +208,54 @@ msgid "Restore window"
 msgstr "Vrati prozor"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Uklj/Isklj stanje zasjenjenosti"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Zatvori prozor"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Sakrij prozor"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Premjesti prozor"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Promijeni veličinu prozora"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Uklj/Isklj prozor na svim radnim prostorima"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Podigni prekriven prozor, u suprotnome smanji"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Podigni prozor iznad ostalih prozora"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Spusti prozor ispod ostalih prozora"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Uvećaj prozor okomito"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Uvećaj prozor vodoravno"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Podijeli pogled ulijevo"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Podijeli pogled udesno"

@@ -476,55 +493,10 @@ msgstr "Prebaci na VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Ponovno omogući prečace"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Dopusti hvatanje sa Xwaylandom"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Dopusti hvatanje tipkovnicom aplikacije izdane za X11 pokrenute u Xwaylandu "
-"kako bi se obuhvatile u računu. Kako bi X11 hvatanje bilo obuhvaćeno računom "
-"u Waylandu, klijent mora poslati ili određenu X11 poruku klijenta u "
-"korijenski prozor ili mora biti naveden među aplikacijama dopuštenim u "
-"ključu “xwayland-grab-access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland aplikacije dopuštene za izdavanje hvatanja tipkovnice"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Popis naziva ili razreda resursa X11 prozora koji dopuštaju ili nedopuštaju "
-"izdavanje X11 hvatanja tipkovnice u Xwaylandu. Popis naziva ili razreda "
-"resursa danog X11 prozora može se omogućiti naredbom “xprop WM_CLASS”. "
-"Zvjezdice “*” i upitnici “?” u vrijednostima su podržani. Vrijednosti koje "
-"počinju sa “!” nisu dopuštene, a imaju prednost nad dopuštenim, kako bi "
-"opozvali aplikaciju iz zadanog popisa sustavom. Zadani popis sustava "
-"uključuje sljedeće aplikacije: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” "
-"Korisnici mogu prekinuti postojeće hvatanje koristeći određeni prečac "
-"tipkovnice određen ključem prečaca tipkovnice “restore-shortcuts”."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Način prebacivanja (Grupa %d)"
@@ -532,37 +504,37 @@ msgstr "Način prebacivanja (Grupa %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Prebaci zaslon"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Prikaži zaslonsku pomoć"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Ugrađeni zaslon"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nepoznat"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nepoznat zaslon"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -578,46 +550,42 @@ msgstr "Događaj zvona"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Neuspjelo otvaranje sustava prikaza X prozora \"%s\"\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Onemogući povezivanje sa upraviteljem sesija"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Zamijeni pokrenutoga upravitelja porozora"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Odredite ID upravljanja sesijama"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "X Prikaz za korištenje"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Pokreni sesiju iz spremljene datoteke"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Napravi X pozive usklađenim"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Pokreni wayland kompozitor"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Pokreni kao ugrađeni kompozitor"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Pokreni kao potpuni poslužitelj zaslona, radije nego ugrađeni"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Pokreni s X11 pozadinskim programom"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -672,7 +640,7 @@ msgstr "Mutter priključak koji se koristi"
 msgid "Workspace %d"
 msgstr "Radni prostor %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -681,7 +649,7 @@ msgstr ""
 "Prikaz \"%s\" već ima upravitelja prozora; pokušajte koristiti --replace "
 "mogućnost za zamjenu trenutnog upravitelja prozora."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Zaslon %d na prikazu '%s' je neispravan\n"
@@ -695,7 +663,7 @@ msgstr "Mutter je kompiliran bez podrške za opširan način rada\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Način prebacivanja: Način %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -708,21 +676,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Premjesti prozor jedan radni prostor nalijevo"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Premjesti prozor jedan radni prostor udesno"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Premjesti na lijevi radni prostor"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Premjesti na desni radni prostor"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Uklj/Isklj stanje zasjenjenosti"
-
 #~ msgid "Desktop"
 #~ msgstr "Radna površina"

--- a/po/hu.po
+++ b/po/hu.po
@@ -1,18 +1,19 @@
-# Hungarian translation for mutter.
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Free Software Foundation, Inc.
+# Hungarian translation of mutter.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 #
 # Andras Timar <timar at gnome dot hu>, 2002, 2003.
 # Gabor Sari <saga at externet dot hu>, 2003.
 # Laszlo Dvornik <dvornik at gnome dot hu>, 2004.
 # Gabor Kelemen <kelemeng at gnome dot hu>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013.
-# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Balázs Úr <urbalazs at gmail dot com>, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-07 18:39+0000\n"
-"PO-Revision-Date: 2018-02-23 23:53+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-05 17:35+0200\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <gnome-hu-list at gnome dot org>\n"
 "Language: hu\n"
@@ -47,118 +48,134 @@ msgid "Move window to last workspace"
 msgstr "Ablak áthelyezése az utolsó munkaterületre"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Ablak áthelyezése a balra lévő munkaterületre"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Ablak áthelyezése a jobbra lévő munkaterületre"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Ablak áthelyezése egy munkaterülettel feljebb"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Ablak áthelyezése egy munkaterülettel lejjebb"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Ablak áthelyezése a balra lévő monitorra"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Ablak áthelyezése a jobbra lévő monitorra"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Ablak áthelyezése egy monitorral feljebb"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Ablak áthelyezése egy monitorral lejjebb"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Alkalmazásváltás"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Váltás az előző alkalmazásra"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Ablakváltás"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Váltás az előző ablakra"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Váltás egy alkalmazás ablakai között"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Váltás egy alkalmazás előző ablakára"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Váltás a rendszer vezérlői közt"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Váltás az előző rendszervezérlőre"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Váltás az ablakok közt közvetlenül"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Váltás közvetlenül az előző ablakra"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Váltás egy alkalmazás ablakai között közvetlenül"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Váltás közvetlenül egy alkalmazás előző ablakára"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Váltás a rendszer vezérlői közt közvetlenül"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Váltás közvetlenül az előző rendszervezérlőre"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Minden normál ablak elrejtése"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Váltás az 1. munkaterületre"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Váltás a 2. munkaterületre"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Váltás a 3. munkaterületre"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Váltás a 4. munkaterületre"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Váltás az utolsó munkaterületre"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Áthelyezés a bal oldali munkaterületre"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Áthelyezés a jobb oldali munkaterületre"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Áthelyezés a felső munkaterületre"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Áthelyezés az alsó munkaterületre"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Rendszer"

@@ -170,10 +187,6 @@ msgstr "A parancs futtatása ablak megjelenítése"
 msgid "Show the activities overview"
 msgstr "A tevékenységek áttekintés megjelenítése"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Gyorsbillentyűk helyreállítása"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ablakok"
@@ -199,50 +212,54 @@ msgid "Restore window"
 msgstr "Ablak visszaállítása"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Felgördített állapot átváltása"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Ablak bezárása"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ablak elrejtése"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Ablak áthelyezése"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Ablak átméretezése"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Ablak megjelenítése minden munkaterületen vagy csak az egyiken"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Fedett ablak előtérbe hozása, egyébként háttérbe küldése"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Ablak más ablakok elé hozása"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Ablak más ablakok mögé küldése"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Ablak függőleges maximalizálása"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Ablak vízszintes maximalizálása"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Bal oldali felosztás megjelenítése"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Jobb oldali felosztás megjelenítése"

@@ -387,6 +404,20 @@ msgid "Enable experimental features"
 msgstr "Kísérleti funkciók engedélyezése"

 #: data/org.gnome.mutter.gschema.xml.in:108
+#| msgid ""
+#| "To enable experimental features, add the feature keyword to the list. "
+#| "Whether the feature requires restarting the compositor depends on the "
+#| "given feature. Any experimental feature is not required to still be "
+#| "available, or configurable. Don’t expect adding anything in this setting "
+#| "to be future proof. Currently possible keywords: • “monitor-config-"
+#| "manager” — use the new monitor configuration system, aimed to replace the "
+#| "old one. This enables a higher level configuration API to be used by "
+#| "configuration applications, as well as the ability to configure per "
+#| "logical monitor scale. • “scale-monitor-framebuffer” — makes mutter "
+#| "default to layout logical monitors in a logical pixel coordinate space, "
+#| "while scaling monitor framebuffers instead of window content, to manage "
+#| "HiDPI monitors. Does not require a restart. Also enabling “monitor-config-"
+#| "manager” is required for this feature to be enabled."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -401,12 +432,12 @@ msgid ""
 "screen cast support."
 msgstr ""
 "A kísérleti funkciók engedélyezéséhez adja hozzá a funkció kulcsszavát a "
-"listához. A funkció a betűszedő újraindítását igényelheti az adott "
-"funkciótól függően. Egyik kísérleti funkciónál sem szükséges, hogy továbbra "
-"is elérhető vagy beállítható legyen. Ne várja el azt, hogy ha bármit hozzáad "
-"ehhez a beállításhoz, akkor az a jövőben is elérhető lesz. Jelenleg "
-"lehetséges kulcsszavak: • „scale-monitor-framebuffer” — alapértelmezetté "
-"teszi a mutter programot a logikai monitorok elrendezéséhez egy logikai "
+"listához. A funkció a betűszedő újraindítását igényelheti az adott funkciótól "
+"függően. Egyik kísérleti funkciónál sem szükséges, hogy továbbra is elérhető "
+"vagy beállítható legyen. Ne várja el azt, hogy ha bármit hozzáad ehhez a "
+"beállításhoz, akkor az a jövőben is elérhető lesz. Jelenleg lehetséges "
+"kulcsszavak: • „scale-monitor-framebuffer” — alapértelmezetté teszi a mutter "
+"programot a logikai monitorok elrendezéséhez egy logikai "
 "képpontkoordináta-térben, miközben átméretezi a monitor keretpufferét az "
 "ablaktartalom helyett azért, hogy kezelje a HiDPI monitorokat. Nem igényel "
 "újraindítást. • „remote-desktop” — engedélyezi a távoli asztal támogatást. A "
@@ -482,56 +513,10 @@ msgstr "Váltás a 12. VT-re"
 msgid "Re-enable shortcuts"
 msgstr "Gyorsbillentyűk újraengedélyezése"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Xwayland megragadások engedélyezése"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Engedélyezi az Xwayland alatti X11 alkalmazások által kért billentyűzet "
-"megragadások figyelembe vételét. Ahhoz, hogy Wayland alatt figyelembe "
-"legyenek véve az X11 megragadások, a kliensnek vagy küldenie kell egy "
-"meghatározott X11 ClientMessage üzenetet a gyökérablaknak, vagy az „xwayland-"
-"grab-access-rules” kulcsban megadott fehérlistában kell szerepelnie."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland alkalmazások, amelyek kérhetnek billentyűzet megragadást"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Felsorolja azokat az X11 ablak erőforrásneveket vagy erőforrásosztályokat, "
-"amelyek Xwayland alatt vagy kiadhatnak X11 billentyűzet megragadásokat, vagy "
-"sem. A megadott X11 ablak erőforrásneve vagy erőforrásosztálya az „xprop "
-"WM_CLASS” paranccsal kérhető le. Az értékekben a „*” vagy „?” helyettesítő "
-"karakterek támogatottak. A „!” karakterrel kezdődő értékek feketelistára "
-"kerülnek, és a fehérlista előtt lesznek figyelembe véve, így felülbírálva az "
-"alapértelmezett rendszerlistát. Az alapértelmezett rendszerlistán a "
-"következő alkalmazások szerepelnek: „@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@”. "
-"A felhasználók megszakíthatják a létező megragadásokat a „restore-shortcuts” "
-"kulcsban megadott gyorsbillentyűvel."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Módkapcsoló (%d. csoport)"
@@ -539,37 +524,37 @@ msgstr "Módkapcsoló (%d. csoport)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Monitorváltás"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Képernyősúgó megjelenítése"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Beépített kijelző"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ismeretlen"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Ismeretlen kijelző"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -586,47 +571,43 @@ msgstr "Csengetés esemény"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Nem sikerült megnyitni a(z) „%s” X Window rendszer képernyőt\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "A munkamenet-kezelőhöz való csatlakozás tiltása"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "A futó ablakkezelő helyettesítése"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "A munkamenet-kezelő azonosítójának megadása"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "A használandó X megjelenítő"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "A munkamenet előkészítése a mentési fájlból"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Az X-hívások szinkronná tétele"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Futtatás wayland betűszedőként"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Futtatás beágyazott betűszedőként"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr ""
 "Futtatás teljes megjelenítő kiszolgálóként az egymásba ágyazott helyett"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Futtatás X11 háttérprogrammal"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -681,7 +662,7 @@ msgstr "Használandó Mutter bővítmény"
 msgid "Workspace %d"
 msgstr "%d. munkaterület"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -690,7 +671,7 @@ msgstr ""
 "A(z) „%s” kijelző már rendelkezik ablakkezelővel; próbálja a --replace "
 "kapcsolóval helyettesíteni a jelenlegi ablakkezelőt."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "A(z) %d. képernyő a(z) „%s” megjelenítőn érvénytelen\n"
@@ -704,7 +685,7 @@ msgstr "A Mutter ablakkezelőt a részletes mód támogatása nélkül fordítot
 msgid "Mode Switch: Mode %d"
 msgstr "Módkapcsoló: %d. mód"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
--- a/po/id.po
+++ b/po/id.po
@@ -9,16 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-07 18:39+0000\n"
-"PO-Revision-Date: 2018-02-09 17:00+0700\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 10:46+0700\n"
 "Last-Translator: Kukuh Syafaat <syafaatkukuh@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

 #: data/50-mutter-navigation.xml:6
@@ -46,118 +47,134 @@ msgid "Move window to last workspace"
 msgstr "Pindahkan jendela ke ruang kerja terakhir"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Pindahkan jendela satu ruang kerja ke kiri"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Pindahkan jendela satu ruang kerja ke kanan"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Pindahkan jendela satu ruang kerja ke atas"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Pindahkan jendela satu ruang kerja ke bawah"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Pindahkan jendela satu monitor ke kiri"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Pindahkan jendela satu monitor ke kanan"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Pindahkan jendela satu monitor ke atas"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Pindahkan jendela satu monitor ke bawah"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Bertukar aplikasi"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Bertukar ke aplikasi sebelumnya"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Bertukar jendela"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Bertukar ke jendela sebelumnya"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Bertukar jendela dari suatu aplikasi"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Bertukar ke jendela aplikasi sebelumnya"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Bertukar kendali sistem"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Bertukar ke kendali sistem sebelumnya"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Bertukar jendela secara langsung"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Bertukar secara langsung ke jendela sebelumnya"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Bertukar jendela dari suatu app secara langsung"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Bertukar secara langsung ke jendela sebelumnya dari suatu app"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Bertukar kendali sistem secara langsung"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Bertukar secara langsung ke kendali sistem sebelumnya"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Sembunyikan semua jendela normal"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Bertukar ke ruang kerja 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Bertukar ke ruang kerja 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Bertukar ke ruang kerja 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Bertukar ke ruang kerja 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Bertukar ke ruang kerja terakhir"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Pindahkan ke ruang kerja kiri"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Pindahkan ke ruang kerja kanan"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Pindahkan ke ruang kerja di atas"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Pindahkan ke ruang kerja di bawah"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistem"

@@ -169,10 +186,6 @@ msgstr "Tampilkan sapaan jalankan perintah"
 msgid "Show the activities overview"
 msgstr "Tampilkan ringkasan aktivitas"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Pulihkan pintasan papan tik"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Jendela"
@@ -198,50 +211,54 @@ msgid "Restore window"
 msgstr "Pulihkan jendela"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Jungkitkan keadaan berbayang"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Tutup jendela"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Sembunyikan jendela"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Pindahkan jendela"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Ubah ukuran jendela"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Jungkitkan jendela pada semua atau satu area kerja"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Naikkan jendela bila tertutup jendela lain, sebaliknya turunkan"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Naikkan jendela di atas jendela-jendela lain"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Turunkan jendela di bawah jendela-jendela lain"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maksimalkan ukuran jendela secara vertikal"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maksimalkan ukuran jendela secara horisontal"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Tilik belah di kiri"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Tilik belah di kanan"

@@ -480,59 +497,10 @@ msgstr "Bertukar ke VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Aktifkan kembali pintasan"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Izinkan menggenggam dengan Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Mengizinkan pengambilalihan papan ketik yang dikeluarkan oleh aplikasi X11 "
-"yang berjalan di Xwayland untuk diperhitungkan. Agar pengambilalihan X11 "
-"diperhitungkan di bawah Wayland, klien juga harus mengirimkan ClientMessage "
-"X11 tertentu ke jendela root atau berada di antara aplikasi yang tercantum "
-"dalam daftar putih \"xwayland-grab-access-rules\"."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-"Aplikasi Xwayland yang diizinkan untuk mengeluarkan pengambilalihan papan "
-"ketik"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Buat daftar nama sumber daya atau kelas sumber daya dari jendela X11 yang "
-"diizinkan atau tidak diizinkan untuk melakukan pengambilalihan papan ketik "
-"X11 di bawah Xwayland. Nama sumber daya atau kelas sumber daya dari jendela "
-"X11 yang diberikan dapat diperoleh memakai perintah \"xprop WM_CLASS\". "
-"Wildcard \"*\" dan joker \"?\" dalam nilai didukung. Nilai yang dimulai "
-"dengan \"!\" masuk daftar hitam, yang punya preseden atas daftar putih, "
-"untuk mencabut aplikasi dari daftar sistem bawaan. Daftar sistem bawaan "
-"termasuk aplikasi-aplikasi berikut: \"@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@"
-"\". Pengguna dapat memutus pengambilalihan yang ada dengan memakai pintasan "
-"papan ketik spesifik yang didefinisikan oleh tombol pengikatan \"restore-"
-"shortcuts\"."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Tukar Mode: (Grup %d)"
@@ -540,37 +508,37 @@ msgstr "Tukar Mode: (Grup %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Berpindah monitor"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Tampilkan bantuan pada layar"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Tampilan bawaan"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Tak Dikenal"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Tampilan Tak Dikenal"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -586,46 +554,42 @@ msgstr "Bel peristiwa"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Gagal membuka tampilan X Window System \"%s\"\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Menonaktifkan koneksi ke manajer sesi"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Mengganti manajer jendela yang tengah berjalan"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Tentukan kode pengaturan sesi"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Tampilan X yang digunakna"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Aktifkan sesi dari berkas simpanan"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Buat panggilan X selaras"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Jalankan sebagai kompositor wayland"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Jalankan sebagai kompositor bersarang"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Jalankan sebagai server tampilan penuh, ketimbang tampilan bersarang"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Jalankan dengan backend X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -680,7 +644,7 @@ msgstr "Pengaya Mutter yang dipakai"
 msgid "Workspace %d"
 msgstr "Area kerja %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -689,7 +653,7 @@ msgstr ""
 "Tampilan \"%s\" sudah memiliki manajer jendela; cobalah gunakan pilihan --"
 "replace untuk mengganti manajer jendela saat ini."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Layar %d pada tampilan \"%s\" tidak valid\n"
@@ -703,7 +667,7 @@ msgstr "Muter dikompilasi tanpa dukungan mode riuh\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Tukar Mode: Mode %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -715,18 +679,3 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (pada %s)"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Pindahkan jendela satu ruang kerja ke kiri"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Pindahkan jendela satu ruang kerja ke kanan"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Pindahkan ke ruang kerja kiri"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Pindahkan ke ruang kerja kanan"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Jungkitkan keadaan berbayang"
--- a/po/it.po
+++ b/po/it.po
@@ -2,18 +2,18 @@
 # Based on Italian translation for Metacity
 # This file is distributed under the same license as metacity package
 # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Free Software Foundation, Inc.
-# Copyright (C) 2018 Free Software Foundation, Inc.
 # Pier Luigi Fiorini <plfiorini@libero.it>, 2002.
 # Lapo Calamandrei <lapo.calamandrei@virgilio.it>, 2003.
 # Luca Ferretti <lferrett@gnome.org>, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012.
-# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Milo Casagrande <milo@milo.name>, 2012, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-06 04:14+0000\n"
-"PO-Revision-Date: 2018-02-09 16:49+0100\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 06:41+0000\n"
+"PO-Revision-Date: 2017-08-29 10:21+0200\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
@@ -21,7 +21,7 @@ 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 2.0.4\n"
+"X-Generator: Poedit 1.8.12\n"

 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -48,118 +48,134 @@ msgid "Move window to last workspace"
 msgstr "Sposta la finestra sull'ultimo spazio di lavoro"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Sposta la finestra sullo spazio di lavoro a sinistra"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Sposta la finestra sullo spazio di lavoro a destra"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Sposta la finestra sullo spazio di lavoro in alto"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Sposta la finestra sullo spazio di lavoro in basso"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Sposta la finestra un monitor a sinistra"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Sposta la finestra un monitor a destra"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Sposta la finestra un monitor in su"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Sposta la finestra un monitor in giù"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Evidenzia le applicazioni"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Evidenzia l'applicazione precedente"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Evidenzia direttamente le finestre"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Evidenzia la finestra precedente"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Evidenzia le finestre di un'applicazione"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Evidenzia la finestra precedente di un'applicazione"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Evidenzia i controlli di sistema"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Evidenzia i controlli di sistema precedenti"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Evidenzia direttamente le finestre"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Evidenzia direttamente la finestra precedente"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Evidenzia direttamente le finestre di una applicazione"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Evidenzia direttamente la finestra precedente di un'applicazione"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Evidenzia direttamente i controlli di sistema"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Evidenzia direttamente i controlli di sistema precedenti"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Nasconde tutte le finestre normali"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Passa allo spazio di lavoro 1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Passa allo spazio di lavoro 2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Passa allo spazio di lavoro 3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Passa allo spazio di lavoro 4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Passa all'ultimo spazio di lavoro"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Sposta su spazio di lavoro a sinistra"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Sposta su spazio di lavoro a destra"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Sposta su spazio di lavoro in alto"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Sposta su spazio di lavoro in basso"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@@ -171,10 +187,6 @@ msgstr "Mostra il prompt esegui comando"
 msgid "Show the activities overview"
 msgstr "Mostra la panoramica delle attività"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Ripristina le scorciatoie da tastiera"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Finestre"
@@ -200,54 +212,58 @@ msgid "Restore window"
 msgstr "Ripristina la finestra"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Attiva/Disattiva lo stato arrotolato"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Chiudi la finestra"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ridimensiona la finestra"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Muovi la finestra"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Ridimensiona la finestra"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Attiva/Disattiva la stato «su tutti gli spazi di lavoro» per la finestra"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Solleva la finestra se è coperta, in caso contrario l'abbassa"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Solleva la finestra sopra le altre"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Abbassa la finestra sotto le altre"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Massimizza verticalmente la finestra"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Massimizza orizzontalmente la finestra"

 # scorciatoia per mettere la finestra a mezzo schermo intero sulla sinistra
 #
 # traduzione infedele, ma "frazionamento della vista a sn/ds" mi pare peggio
-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Massimizza a sinistra"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Massimizza a destra"

@@ -494,57 +510,10 @@ msgstr "Passa al VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Riabilita scorciatoie"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Consente la cattura con Xwayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Consente la cattura della tastiera da applicazioni X11 in esecuzione su "
-"Xwayland. Affinché la cattura X11 venga considerata da Wayland, il client "
-"deve inviare uno specifico messaggio ClientMessage X11 alla finestra "
-"principale o essere nell'elenco di applicazioni autorizzate tramite la "
-"chiave \"xwayland-grab-access-rules\"."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr ""
-"Applicazioni Xwayland autorizzare a inizializzare catture della tastiera"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Lista di nomi o classi delle risorse di finestre X11 autorizzate o meno a "
-"inizializzare la cattura della tastiera X11 su Xwayland. Per ottenere i nomi "
-"o le classi delle risorse di una finestra X11 è possibile utilizzare il "
-"comando \"xprop WM_CLASS\". Sono consentiti i caratteri \"*\" e \"?"
-"\" (asterisco e punto di domanda) nei valori. Valori che iniziano con \"!\" "
-"indicano una risorsa da escludere che ha priorità più alta rispetto alle "
-"applicazioni autorizzate. La lista predefinita di sistema include le "
-"seguenti applicazioni: \"@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@\" Gli utenti "
-"possono interrompere una cattura esistente utilizzando la scorciatoia "
-"definita nella chiave \"restore-shortcuts\"."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambio modalità (gruppo %d)"
@@ -552,37 +521,37 @@ msgstr "Cambio modalità (gruppo %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Cambia monitor"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostra aiuto sullo schermo"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Display integrato"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Sconosciuto"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Display sconosciuto"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -599,46 +568,42 @@ msgstr "Evento campanella"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Apertura del display «%s» di X Window System non riuscita\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Disabilita la connessione al gestore di sessione"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Sostituisce il window manager in esecuzione"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Specifica l'ID di gestione sessione"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Display X da usare"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inizializza la sessione da file salvato"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Rende le chiamate X sincrone"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Esegui come compositor Wayland"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Esegui come compositor annidato"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Esegui come display server invece che annidato"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Esegui con sistema X11"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -693,7 +658,7 @@ msgstr "Plugin Mutter da usare"
 msgid "Workspace %d"
 msgstr "Spazio di lavoro %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -702,7 +667,7 @@ msgstr ""
 "Il display «%s» ha già un window manager; provare a utilizzare l'opzione --"
 "replace per sostituirlo."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Lo schermo %d sul display «%s» non è valido\n"
@@ -717,7 +682,7 @@ msgstr ""
 msgid "Mode Switch: Mode %d"
 msgstr "Cambio modalità: modalità %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -729,18 +694,3 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (su %s)"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Sposta la finestra sullo spazio di lavoro a sinistra"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Sposta la finestra sullo spazio di lavoro a destra"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Sposta su spazio di lavoro a sinistra"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Sposta su spazio di lavoro a destra"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Attiva/Disattiva lo stato arrotolato"
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,6 @@
 #
 # Updated in mutter:
 # Changwoo Ryu <cwryu@debian.org>, 2011-2017.
-# Gwan-gyeong Mun <elongbug@gmail.com>, 2018.
 #
 #
 # 주의:
@@ -17,10 +16,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-06 04:14+0000\n"
-"PO-Revision-Date: 2018-02-24 16:14+0900\n"
-"Last-Translator: Gwan-gyeong Mun <elongbug@gmail.com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-02 12:57+0900\n"
+"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: GNOME Korea <gnome-kr@googlegroups.com>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
@@ -53,118 +53,134 @@ msgid "Move window to last workspace"
 msgstr "창을 최근 작업 공간으로 옮기기"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "창을 한칸 왼쪽 작업 공간으로 옮기기"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "창을 한칸 오른쪽 작업 공간으로 옮기기"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "창을 한칸 위 작업 공간으로 옮기기"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "창을 한칸 아래 작업 공간으로 옮기기"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "창을 한칸 왼쪽 모니터로 옮기기"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "창을 한칸 오른쪽 모니터로 옮기기"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "창을 한칸 위 모니터로 옮기기"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "창을 한칸 아래 모니터로 옮기기"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
-msgstr "프로그램 전환"
+msgstr "앱 전환"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
-msgstr "이전 프로그램으로 전환"
+msgstr "이전 앱으로 전환"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "창 전환"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "이전 창으로 전환"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
-msgstr "한 프로그램의 창 전환"
+msgstr "한 앱의 창 전환"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
-msgstr "한 프로그램의 이전 창으로 전환"
+msgstr "한 앱의 이전 창으로 전환"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "시스템 조작 전환"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "이전 시스템 조작으로 전환"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "직접 창 전환"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "직접 이전 창으로 전환"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "직접 한 앱의 창 전환"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "직접 한 앱의 이전 창으로 전환"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "직접 시스템 조작 전환"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "직접 이전 시스템 조작으로 전환"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "모든 일반 창 감추기"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "작업 공간 1로 이동"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "작업 공간 2로 이동"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "작업 공간 3으로 이동"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "작업 공간 4로 이동"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "최근 작업 공간으로 이동"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "왼쪽 작업 공간으로 옮기기"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "오른쪽 작업 공간으로 옮기기"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "위 작업 공간으로 옮기기"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "아래 작업 공간으로 옮기기"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "시스템"

@@ -176,10 +192,6 @@ msgstr "실행 명령 프롬프트 보이기"
 msgid "Show the activities overview"
 msgstr "현재 활동 보이기"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "키보드 바로 가기 복구"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "창"
@@ -205,50 +217,54 @@ msgid "Restore window"
 msgstr "창 복구"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "그림자 상태 토글"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "창 닫기"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "창 감추기"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "창 옮기기"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "창 크기 조정"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "창을 모든/하나의 작업 공간에 두기 토글"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "창이 가려 있으면 올리고 아니면 내리기"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "창을 다른 창 위로 올리기"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "창을 다른 창 아래로 내리기"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "창을 세로 방향으로 최대화"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "창을 가로 방향으로 최대화"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "왼쪽 나눔창 보기"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "오른쪽 나눔창 보기"

@@ -477,53 +493,10 @@ msgstr "가상 터미널 12로 이동"
 msgid "Re-enable shortcuts"
 msgstr "바로 가기 다시 사용하기"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "X웨일랜드에서 잡기 허용"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"X웨일랜드 환경에서 실행하는 X11 프로그램의 키보드 잡기 허용을 고려합니다. 웨"
-"일랜드에서 X11 잡기를 고려하려면, 클라이언트는 특정 X11 클라이언트메시지를 루"
-"트 창에 보내거나 \"xwayland-grab-access-rules\"의 허용 목록에 있는 프로그램 "
-"중 하나여야 합니다."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "X웨일랜드 프로그램에서 키보드 잡기 허용"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"X웨일랜드에서 X11 키보드 잡기를 허용하거나 허용하지 않는 X11 창의 리소스 이"
-"름 또는 리소스 클래스를 나열하세요. X11 창의 리소스 이름 또는 리소스 클래스"
-"는 “xprop WM_CLASS\" 명령을 사용하여 얻을 수 있습니다. 와일드카드 \"*\"와 \"?"
-"\"를 값에서 사용할 수 있습니다. \"!\"로 시작하는 값은 허용 목록보다 높은 우선"
-"순위로 블랙리스트 처리되어, 프로그램이 기본 시스템 목록에서 빠지게 됩니다. 기"
-"본 시스템 목록에 포함된 프로그램: “@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” 사용"
-"자는 “restore-shortcuts” 키 바인딩에 정의된 특정 키보드 바로 가기를 사용하여 "
-"기존 잡기를 중단할 수 있습니다."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "모드 전환 (그룹 %d)"
@@ -531,37 +504,37 @@ msgstr "모드 전환 (그룹 %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "모니터 전환"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "화면 도움말 표시"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "내장 디스플레이"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "알 수 없음"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "알 수 없는 디스플레이"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -578,45 +551,41 @@ msgstr "삑소리 이벤트"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "X 윈도 시스템 디스플레이 “%s”을(를) 여는데 실패하였습니다\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "세션 관리자와 연결 하지 않습니다"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "실행 중인 창 관리자를 바꿉니다"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "세션 관리 ID를 지정합니다"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "사용할 X 디스플레이"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "저장 파일에서 세션을 초기화 합니다"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "동기 X 호출을 합니다"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "웨일랜드 컴포지터로 실행합니다"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
-msgstr "중첩 컴포지터로 실행합니다"
+msgstr "내장 컴포지터로 실행합니다"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
-msgstr "전체 디스플레이 서버로 실행, 중첩 컴포지터가 아님"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "X11 백 엔드로 실행 합니다"
+msgstr "전체 디스플레이 서버로 실행, 내장 프로그램 아님"

 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
@@ -670,7 +639,7 @@ msgstr "사용할 머터 플러그인"
 msgid "Workspace %d"
 msgstr "작업 공간 %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -679,7 +648,7 @@ msgstr ""
 "디스플레이  “%s”에 이미 창 관리자가 있습니다. 현재 창 관리자를 바꾸려면 --"
 "replace 옵션을 써보십시오."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "디스플레이 “%2$s”의 화면 %1$d은(는) 잘못되었습니다\n"
@@ -693,7 +662,7 @@ msgstr "머터가 자세한 모드 지원 없이 컴파일 되었습니다\n"
 msgid "Mode Switch: Mode %d"
 msgstr "모드 전환: 모드 %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -706,18 +675,3 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s에서)"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "창을 한칸 왼쪽 작업 공간으로 옮기기"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "창을 한칸 오른쪽 작업 공간으로 옮기기"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "왼쪽 작업 공간으로 옮기기"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "오른쪽 작업 공간으로 옮기기"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "그림자 상태 토글"
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,14 +6,15 @@
 # Tomas Kuliavas <tokul@users.sourceforge.net>, 2003.
 # Žygimantas Beručka <zygis@gnome.org>, 2004-2007.
 # Gintautas Miliauskas <gintautas@miliauskas.lt>, 2007-2009, 2010.
-# Aurimas Černius <aurisc4@gmail.com>, 2013, 2014, 2015, 2016, 2017, 2018.
+# Aurimas Černius <aurisc4@gmail.com>, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-07-07 09:58+0000\n"
-"PO-Revision-Date: 2018-08-05 23:42+0300\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 06:41+0000\n"
+"PO-Revision-Date: 2017-08-29 15:57+0300\n"
 "Last-Translator: Aurimas Černius <aurisc4@gmail.com>\n"
 "Language-Team: Lietuvių <gnome-lt@lists.akl.lt>\n"
 "Language: lt\n"
@@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Perkelti langą į pastarąją darbo sritį"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Perkelti langą į kairiau esančią darbo sritį"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Perkelti langą į dešiniau esančią darbo sritį"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Perkelti langą į aukščiau esančią darbo sritį"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Perkelti langą į žemiau esančią darbo sritį"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Perkelti langą į kairiau esantį monitorių"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Perkelti langą į dešiniau esantį monitorių"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Perkelti langą į aukščiau esantį monitorių"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Perkelti langą į žemiau esantį monitorių"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Pereiti tarp programų"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Pereiti į ankstesnę programą"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Pereiti tarp langų"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Pereiti į ankstesnį langą"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Pereiti tarp programos langų"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Pereiti į ankstesnį programos langą"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Pereiti tarp sistemos valdiklių"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Pereiti prie ankstesnio sistemos valdiklio"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Tiesiogiai pereiti tarp langų"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Tiesiogiai pereiti į ankstesnį langą"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Tiesiogiai pereiti tarp programos langų"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Tiesiogiai pereiti prie ankstesnio programos lango"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Tiesiogiai pereiti tarp sistemos valdiklių"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Tiesiogiai pereiti prie ankstesnio sistemos valdiklio"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Paslėpti visus įprastinius langus"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Persijungti į darbo sritį Nr.1"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Persijungti į darbo sritį Nr.2"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Persijungti į darbo sritį Nr.3"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Persijungti į darbo sritį Nr.4"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Persijungti į pastarąją darbo sritį"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Perkelti į darbo sritį kairėje"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Perkelti į darbo sritį dešinėje"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Perkelti į darbo sritį viršuje"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Perkelti į darbo sritį apačioje"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistema"

@@ -172,10 +189,6 @@ msgstr "Rodyti komandų paleidimo langelį"
 msgid "Show the activities overview"
 msgstr "Rodyti veiklų apžvalgą"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Atkurti klaviatūros trumpinius"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Langai"
@@ -201,51 +214,55 @@ msgid "Restore window"
 msgstr "Atkurti lango dydį"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Perjungti lango sutraukimo būseną"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Užverti langą"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Slėpti langą"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Perkelti langą"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Keisti lango dydį"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Perjungti lango buvimo visose darbo srityse būseną"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""
 "Iškelti langą, jei jis uždengtas kito lango, priešingu atveju jį nuleisti"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Iškelti langą virš kitų langų"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Nuleisti langą žemiau kitų langų"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Išdidinti langą vertikaliai"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Išdidinti langą horizontaliai"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Rodyti skyrimą kairėje"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Rodyti skyrimą dešinėje"

@@ -398,9 +415,7 @@ msgstr "Įjungti eksperimentines savybes"
 #| "framebuffer” — makes mutter default to layout logical monitors in a "
 #| "logical pixel coordinate space, while scaling monitor framebuffers "
 #| "instead of window content, to manage HiDPI monitors. Does not require a "
-#| "restart. • “remote-desktop” — enables remote desktop support. To support "
-#| "remote desktop with screen sharing, “screen-cast” must also be enabled. • "
-#| "“screen-cast” — enables screen cast support."
+#| "restart."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -409,31 +424,37 @@ msgid ""
 "proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
 "mutter default to layout logical monitors in a logical pixel coordinate "
 "space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart."
+"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
+"enables remote desktop support. To support remote desktop with screen "
+"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
+"screen cast support."
 msgstr ""
 "Norėdami įjungti eksperimentines savybes, pridėkite į sąrašą raktinį žodį. "
 "Ar savybė reikalauja kompozitoriaus paleidimo iš naujo priklauso nuo "
-"konkrečios savybės. Nei viena eksperimentinė savybė neprivalo būti prieinama "
+"konkrečios savybės. Nei viena eksperimentinė savybė privalo būti prieinama "
 "ar konfigūruojama. Nesitikėkite, kad ką nors pridėjus į šį sąrašą, tai "
 "išliks ir ateityje. Šiuo metu galimi raktažodžiai: • „scale-monitor-"
 "framebuffer“ — mutter numatytai išdėsto loginius monitorius loginėje "
 "pikselių koordinačių erdvėje, tuo pat ištempiant monitorių kadrų buferius "
 "vietoje langų turinio, tokiu būdu valdant didelio tankio monitorius. "
-"Nereikalauja paleisti iš naujo."
+"Nereikalauja paleisti iš naujo. • „remote-desktop“ – įjungia nutolusio "
+"darbalaukio palaikymą. Norint nutolusio darbalaukio su dalinimusi ekranu, "
+"taip pat reikia įjungti „screen-cast“. • „screen-cast“ – įjungia ekrano "
+"transliacijos palaikymą."

-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Pasirinkti langą iš tab iššokimo"

-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Atšaukti tab iššokimą"

-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:155
 msgid "Switch monitor configurations"
 msgstr "Perjungti monitorių konfigūracijas"

-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:160
 msgid "Rotates the built-in monitor configuration"
 msgstr "Suka integruotas monitorių konfigūracijas"

@@ -489,56 +510,10 @@ msgstr "Persijungti į VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Iš naujo įjungti trumpinius"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Leisti pagriebimus su XWayland"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Leisti turėti omenyje X11 programų, veikiančių Xwayland, išduotus "
-"klaviatūros pagriebimus. Tam, kad X11 pagriebimas būtų turimas omenyje "
-"naudojant Wayland, klientas privalo arba siųsti tam tikrą X11 ClientMessage "
-"į šakninį langą arba būti tarp programų, esančių rakto „xwayland-grab-access-"
-"rules“ baltajame sąraše."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland programos, kurioms leidžiama išduoti klaviatūros pagriebimus"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Išvardyti X11 langų, kuriems naudojant Wayland leidžiama ar neleidžiama "
-"išduoti X11 klaviatūros pagriebimus, išteklių pavadinimus ar išteklių "
-"klases. Nurodyto lango ištekliaus pavadinimas ar ištekliaus klasė gali būti "
-"gauta naudojant komandą „xprop WM_CLASS“. Reikšmėse yra palaikomi pakaitos "
-"simboliai „*“ ir „?“. Reikšmės prasidedančios „!“ yra įtraukiamos į juodąjį "
-"sąrašą (tam, kad būtų panaikintos iš numatytojo sistemos sąrašo) ir turi "
-"pirmumo teisę baltojo sąrašo atžvilgiu. Į numatytąjį sistemos sąrašą įeina "
-"šios programos: „@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@“. Naudotojai gali "
-"panaikinti esamą pagriebimą, naudodami tam tikrą klaviatūros trumpinį, kuris "
-"apibrėžtas rakto susiejimo raktu „restore-shortcuts“."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2325
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Veiksenos perjungimas (Grupė %d)"
@@ -546,111 +521,108 @@ msgstr "Veiksenos perjungimas (Grupė %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2348
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Perjungti monitorių"

-#: src/backends/meta-input-settings.c:2350
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Rodyti pagalbą ekrane"

-#: src/backends/meta-monitor-manager.c:907
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Integruotas vaizduoklis"

-#: src/backends/meta-monitor-manager.c:930
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nežinomas"

-#: src/backends/meta-monitor-manager.c:932
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nežinomas vaizduoklis"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:940
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "Kita kompozicijos tvarkytuvė jau veikia ekrane %i vaizduoklyje „%s“."

-#: src/core/bell.c:254
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Skambučio įvykis"

-#: src/core/main.c:191
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Nepavyko atverti X Window sistemos vaizduoklio „%s“\n"
+
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Išjungti susijungimą su sesijos tvarkytuve"

-#: src/core/main.c:197
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Pakeisti veikiančią langų tvarkytuvę"

-#: src/core/main.c:203
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Nurodyti sesijos tvarkymo ID"

-#: src/core/main.c:208
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Naudotinas X ekranas"

-#: src/core/main.c:214
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicializuoti sesiją iš išsaugojimo failo"

-#: src/core/main.c:220
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Sinchronizuoti X iškvietimus"

-#: src/core/main.c:227
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Vykdyti kaip wayland kompozitorių"

-#: src/core/main.c:233
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Vykdyti kaip įdėtinį kompozitorių"

 #: src/core/main.c:239
-msgid "Run wayland compositor without starting Xwayland"
-msgstr "Paleisti wayland kompozitorių nepaleidžiant Xwayland"
-
-#: src/core/main.c:247
 msgid "Run as a full display server, rather than nested"
 msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne įdėtinį"

-#: src/core/main.c:253
-msgid "Run with X11 backend"
-msgstr "Paleisti su X11 realizacija"
-
 #. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:148
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "%s neatsiliepia į komandas."

-#: src/core/meta-close-dialog-default.c:150
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Programa neatsiliepia į komandas."

-#: src/core/meta-close-dialog-default.c:155
+#: src/core/meta-close-dialog-default.c:154
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr "Galite šiek tiek palaukti arba priverstinai uždaryti programą."

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Priverstinai išeiti"

-#: src/core/meta-close-dialog-default.c:162
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Laukti"

@@ -678,21 +650,12 @@ msgstr "Parodyti versiją"
 msgid "Mutter plugin to use"
 msgstr "Naudojamas Mutter įskiepis"

-#: src/core/prefs.c:1915
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Darbo sritis %d"

-#: src/core/util.c:120
-msgid "Mutter was compiled without support for verbose mode\n"
-msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"
-
-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Veiksenos perjungimas: veiksena %d"
-
-#: src/x11/meta-x11-display.c:666
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -701,21 +664,21 @@ msgstr ""
 "Vaizduoklis „%s“ jau turi langų tvarkytuvę; pabandykite pakeisti esamą langų "
 "tvarkytuvę, naudodami parametrą --replace."

-#: src/x11/meta-x11-display.c:1010
-msgid "Failed to initialize GDK\n"
-msgstr "Nepavyko inicializuoti GDK\n"
-
-#: src/x11/meta-x11-display.c:1034
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Nepavyko atverti X Window sistemos vaizduoklio „%s“\n"
-
-#: src/x11/meta-x11-display.c:1117
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Ekranas %d vaizduoklyje „%s“ yra netinkamas\n"

-#: src/x11/session.c:1819
+#: src/core/util.c:120
+msgid "Mutter was compiled without support for verbose mode\n"
+msgstr "Mutter buvo sukompiliuota be išsamaus veikimo veiksenos\n"
+
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Veiksenos perjungimas: veiksena %d"
+
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -723,26 +686,11 @@ msgstr ""
 "Šie langai nepalaiko „išsaugoti esamus nustatymus“ komandos ir, kai kitą "
 "kartą prisijungsite, turės būti paleisti rankiniu būdu."

-#: src/x11/window-props.c:565
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (kompiuteryje %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Perkelti langą į kairiau esančią darbo sritį"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Perkelti langą į dešiniau esančią darbo sritį"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Perkelti į darbo sritį kairėje"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Perkelti į darbo sritį dešinėje"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Perjungti lango sutraukimo būseną"
-
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "Nepavyko nuskanuoti temų aplanko: %s\n"

--- a/po/lv.po
+++ b/po/lv.po
@@ -7,13 +7,14 @@
 # Raivis Dejus <orvils@gmail.com>, 2006, 2007, 2009.
 # Rudolfs <rudolfs.mazurs@gmail.com>, 2011.
 # Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011, 2012.
-# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
+# Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: lv\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-06 04:14+0000\n"
-"PO-Revision-Date: 2018-02-25 15:45+0200\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
+"&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-03 19:25+0200\n"
 "Last-Translator: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>\n"
 "Language-Team: Latvian <lata-l10n@googlegroups.com>\n"
 "Language: lv\n"
@@ -49,118 +50,134 @@ msgid "Move window to last workspace"
 msgstr "Pārvietot logu uz pēdējo darbvietu"

 #: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Pārvietot logu uz darbvietu pa kreisi"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Pārvietot logu uz darbvietu pa labi"
+
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Pārvietot logu uz darbvietu augšup"

-#: data/50-mutter-navigation.xml:27
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Pārvietot logu uz darbvietu lejup"

-#: data/50-mutter-navigation.xml:30
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Pārvietot logu uz monitoru pa kreisi"

-#: data/50-mutter-navigation.xml:33
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Pārvietot logu uz monitoru pa labi"

-#: data/50-mutter-navigation.xml:36
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Pārvietot logu uz monitoru augšup"

-#: data/50-mutter-navigation.xml:39
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Pārvietot logu uz monitoru lejup"

-#: data/50-mutter-navigation.xml:43
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Pārslēgt lietotnes"

-#: data/50-mutter-navigation.xml:48
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Pārslēgties uz iepriekšējo lietotni"

-#: data/50-mutter-navigation.xml:52
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Pārslēgt logus"

-#: data/50-mutter-navigation.xml:57
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Pārslēgties uz iepriekšējo logu"

-#: data/50-mutter-navigation.xml:61
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Pārslēgt vienas lietotnes logus"

-#: data/50-mutter-navigation.xml:66
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Pārslēgties uz lietotnes iepriekšējo logu"

-#: data/50-mutter-navigation.xml:70
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Pārslēgt sistēmas vadīklas"

-#: data/50-mutter-navigation.xml:75
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Pārslēgties uz iepriekšējo sistēmas vadīklu"

-#: data/50-mutter-navigation.xml:79
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Pārslēgties starp logiem tieši"

-#: data/50-mutter-navigation.xml:84
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Pārslēgties tieši uz iepriekšējo logu"

-#: data/50-mutter-navigation.xml:88
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Pārslēgties starp lietotnes logiem tieši"

-#: data/50-mutter-navigation.xml:93
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Pārslēgties tieši uz iepriekšējo lietotnes logu"

-#: data/50-mutter-navigation.xml:97
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Pārslēgt sistēmas vadīklas tieši"

-#: data/50-mutter-navigation.xml:102
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Pārslēgties tieši uz iepriekšējo sistēmas vadīklu"

-#: data/50-mutter-navigation.xml:105
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Slēpt visus parastos logus"

-#: data/50-mutter-navigation.xml:108
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Pārslēgties uz 1. darbvietu"

-#: data/50-mutter-navigation.xml:111
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Pārslēgties uz 2. darbvietu"

-#: data/50-mutter-navigation.xml:114
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Pārslēgties uz 3. darbvietu"

-#: data/50-mutter-navigation.xml:117
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Pārslēgties uz 4. darbvietu"

-#: data/50-mutter-navigation.xml:120
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Pārslēgties uz pēdējo darbvietu"

-#: data/50-mutter-navigation.xml:123
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Pāriet uz darbvietu pa kreisi"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Pāriet uz darbvietu pa labi"
+
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Pāriet uz darbvietu augšup"

-#: data/50-mutter-navigation.xml:126
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Pāriet uz darbvietu lejup"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Sistēma"

@@ -172,10 +189,6 @@ msgstr "Rādīt palaišanas komandrindu"
 msgid "Show the activities overview"
 msgstr "Rādīt aktivitāšu pārskatu"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Atjaunot tastatūras saīsnes"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Logi"
@@ -201,50 +214,54 @@ msgid "Restore window"
 msgstr "Atjaunot loga izmēru"

 #: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Pārslēgt ēnoto stāvokli"
+
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Aizvērt logu"

-#: data/50-mutter-windows.xml:20
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Paslēpt logu"

-#: data/50-mutter-windows.xml:22
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Pārvietot logu"

-#: data/50-mutter-windows.xml:24
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Mainīt loga izmēru"

-#: data/50-mutter-windows.xml:27
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "Pārslēgt, vai logam jābūt visās darbvietās vai vienā"

-#: data/50-mutter-windows.xml:29
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Pacelt logu, ja to aizsedz, citādi pazemināt"

-#: data/50-mutter-windows.xml:31
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Pacelt logu virs citiem logiem"

-#: data/50-mutter-windows.xml:33
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Pazemināt logu zem citiem logiem"

-#: data/50-mutter-windows.xml:35
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Maksimizēt logu vertikāli"

-#: data/50-mutter-windows.xml:37
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Maksimizēt logu horizontāli"

-#: data/50-mutter-windows.xml:41
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Izvietot kreisajā ekrāna pusē"

-#: data/50-mutter-windows.xml:45
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Izvietot labajā ekrāna pusē"

@@ -388,6 +405,16 @@ msgid "Enable experimental features"
 msgstr "Ieslēgt eksperimentālās iespējas"

 #: data/org.gnome.mutter.gschema.xml.in:108
+#| msgid ""
+#| "To enable experimental features, add the feature keyword to the list. "
+#| "Whether the feature requires restarting the compositor depends on the "
+#| "given feature. Any experimental feature is not required to still be "
+#| "available, or configurable. Don’t expect adding anything in this setting "
+#| "to be future proof. Currently possible keywords: • “scale-monitor-"
+#| "framebuffer” — makes mutter default to layout logical monitors in a "
+#| "logical pixel coordinate space, while scaling monitor framebuffers "
+#| "instead of window content, to manage HiDPI monitors. Does not require a "
+#| "restart."
 msgid ""
 "To enable experimental features, add the feature keyword to the list. "
 "Whether the feature requires restarting the compositor depends on the given "
@@ -408,10 +435,11 @@ msgstr ""
 "nākotnē strādās. Pašlaik pieejamie atslēgvārdi: • “scale-monitor-"
 "framebuffer” — liek mutter pēc noklusējuma izkārtot loģiskos monitorus "
 "loģisko pikseļu koordināšu telpā, kamēr mērogo monitora kadru buferus, nevis "
-"loga saturu, lai pārvaldītu HiDPI monitorus. Pārstartēšana nav nepieciešama. "
-"• “remote-desktop” — ieslēdz attālinātās darbvirsmas atbalstu. Lai "
-"atbalstītu attālināto darbvirsmu ar ekrāna koplietošanu, jābūt arī ieslēgtam "
-"“screen-cast”. • “screen-cast” — ieslēdz ekrānraides atbalstu."
+"loga saturu, lai pārvaldītu HiDPI monitorus. Pārstartēšana nav nepieciešama."
+" • “remote-desktop” — "
+"ieslēdz attālinātās darbvirsmas atbalstu. Lai atbalstītu attālināto"
+" darbvirsmu ar ekrāna koplietošanu, jābūt arī ieslēgtam “screen-cast”. •"
+" “screen-cast” — ieslēdz ekrānraides atbalstu."

 #: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
@@ -481,55 +509,10 @@ msgstr "Pārslēgties uz VT 12"
 msgid "Re-enable shortcuts"
 msgstr "Atkal ieslēdz saīsnes"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Atļaut Xwayland satvērienus"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Atļaut ņemt vērā tastatūras satveršanu, ko pieprasa X11 lietotnes, kas"
-" darbojas Xwayland vidē. Lai ņemtu vērā X11 tvērienus Wayland vidē, klientam"
-" arī jāsūta specifisks X11 ClientMessage uz root (saknes) logu, vai arī jābūt"
-" lietotņu baltajā sarakstā atslēgā “xwayland-grab-access-rules”."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland lietotnes, kuras drīkst pieprasīt tastatūras satveršanu"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-"Saraksts ar resursu nosaukumiem vai resursu klasi X11 logiem, kuri vai nu"
-" drīkst, vai nedrīkst pieprasīt X11 tastatūras satveršanu zem Xwayland."
-" Resursa nosaukumu vai resursa klasi dotajam X11 logam var iegūt, izmantojot"
-" komandu “xprop WM_CLASS”. Vērtībās ir atbalstītas aizstājējzīmes “*” un “?”."
-" Vērtības, ka sākas ar “!”, ir melnajā sarakstā, kam ir prioritāte pār balto"
-" sarakstu, kad atsauc lietotnes no noklusējuma sistēmas saraksta. Noklusējuma"
-" sistēmas sarakstā iekļauj sekojošās lietotnes: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Lietotāji var pārtraukt esošo"
-" tvērienu, izmantojot noteiktus tastatūras īsinājumtaustiņus, kas ir noteikti"
-" “restore-shortcuts” atslēgā."
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2260
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Režīma slēdzis (grupa %d)"
@@ -537,37 +520,37 @@ msgstr "Režīma slēdzis (grupa %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2283
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Pārslēgt monitoru"

-#: src/backends/meta-input-settings.c:2285
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Rādīt palīdzību uz ekrāna"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Iebūvēts displejs"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nezināms"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nezināms displejs"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -582,46 +565,42 @@ msgstr "Zvana notikums"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n"

-#: src/core/main.c:190
+#: src/core/main.c:189
 msgid "Disable connection to session manager"
 msgstr "Deaktivēt savienojumu ar sesiju pārvaldnieku"

-#: src/core/main.c:196
+#: src/core/main.c:195
 msgid "Replace the running window manager"
 msgstr "Aizvietot darbojošos logu pārvaldnieku"

-#: src/core/main.c:202
+#: src/core/main.c:201
 msgid "Specify session management ID"
 msgstr "Norādiet sesiju pārvaldības ID"

-#: src/core/main.c:207
+#: src/core/main.c:206
 msgid "X Display to use"
 msgstr "Lietojamais X displejs"

-#: src/core/main.c:213
+#: src/core/main.c:212
 msgid "Initialize session from savefile"
 msgstr "Inicializēt sesiju no saglabātās datnes"

-#: src/core/main.c:219
+#: src/core/main.c:218
 msgid "Make X calls synchronous"
 msgstr "Padarīt X izsaukumus sinhronus"

-#: src/core/main.c:226
+#: src/core/main.c:225
 msgid "Run as a wayland compositor"
 msgstr "Palaist kā wayland kompozitoru"

-#: src/core/main.c:232
+#: src/core/main.c:231
 msgid "Run as a nested compositor"
 msgstr "Palaist kā ligzdotu kompozitoru"

-#: src/core/main.c:240
+#: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
 msgstr "Palaist kā pilnu attēlošanas serveri, nevis iegultu"

-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Palaist ar X11 aizmuguri"
-
 #. Translators: %s is a window title
 #: src/core/meta-close-dialog-default.c:147
 #, c-format
@@ -676,7 +655,7 @@ msgstr "Izmantojamais mutter spraudnis"
 msgid "Workspace %d"
 msgstr "Darbvieta %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -685,7 +664,7 @@ msgstr ""
 "Displejam “%s” jau ir logu pārvaldnieks; mēģiniet lietot --replace iespēju, "
 "lai aizvietotu pašreizējo logu pārvaldnieku."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Ekrāna %d displejs “%s“ nav derīgs\n"
@@ -699,7 +678,7 @@ msgstr "Mutter tika kompilēts bez detalizētas izvades režīma atbalsta\n"
 msgid "Mode Switch: Mode %d"
 msgstr "Režīma slēdzis: režīms %d"

-#: src/x11/session.c:1818
+#: src/x11/session.c:1815
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -711,3 +690,4 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (uz %s)"
+
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,10 +4,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter 3.27.x\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-11-10 18:31+0000\n"
-"PO-Revision-Date: 2017-11-11 18:19+0100\n"
+"Project-Id-Version: mutter 3.23.x\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=mutter&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-02-16 21:09+0000\n"
+"PO-Revision-Date: 2017-02-19 17:44+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: nb\n"
@@ -167,7 +168,7 @@ msgstr "Flytt til arbeidsområdet over"
 msgid "Move to workspace below"
 msgstr "Flytt til arbeidsområdet under"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"

@@ -179,10 +180,6 @@ msgstr "Vis kommandolinje"
 msgid "Show the activities overview"
 msgstr "Vis oversikt over aktiviteter"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Gjenopprett tastatursnarveier"
-
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Vinduer"
@@ -396,41 +393,14 @@ msgstr ""
 "Når denne er «true» vil mye vinduer alltid plasseres midt på aktivt område "
 "på skjermen."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Slå på eksperimentelle funksjoner"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Fjern vindu fra tabulatordialog"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Avbryt tabulatordialog"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Bytt skjermkonfigurasjon"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Roterer mellom innebyggede skjermkonfigurasjoner"
-
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Bytt til VT 1"
@@ -479,14 +449,10 @@ msgstr "Bytt til VT 11"
 msgid "Switch to VT 12"
 msgstr "Bytt til VT 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Slå på snarveier igjen"
-
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:2167
+#: src/backends/meta-input-settings.c:1800
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Modusbytte: (Gruppe %d)"
@@ -494,37 +460,37 @@ msgstr "Modusbytte: (Gruppe %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:2190
+#: src/backends/meta-input-settings.c:1822
 msgid "Switch monitor"
 msgstr "Bytt skjerm"

-#: src/backends/meta-input-settings.c:2192
+#: src/backends/meta-input-settings.c:1824
 msgid "Show on-screen help"
 msgstr "Vis hjelp på skjermen"

-#: src/backends/meta-monitor-manager.c:900
+#: src/backends/meta-monitor-manager.c:675
 msgid "Built-in display"
 msgstr "Innebygget skjerm"

-#: src/backends/meta-monitor-manager.c:923
+#: src/backends/meta-monitor-manager.c:698
 msgid "Unknown"
 msgstr "Ukjent"

-#: src/backends/meta-monitor-manager.c:925
+#: src/backends/meta-monitor-manager.c:700
 msgid "Unknown Display"
 msgstr "Ukjent skjerm"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: src/backends/meta-monitor-manager.c:708
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:476
+#: src/compositor/compositor.c:471
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -534,6 +500,32 @@ msgstr "En annen compositing manager kjører skjerm %i på display «%s»."
 msgid "Bell event"
 msgstr "Klokkehendelse"

+#. Translators: %s is a window title
+#: src/core/delete.c:127
+#, c-format
+msgid "“%s” is not responding."
+msgstr "«%s» svarer ikke."
+
+#: src/core/delete.c:129
+msgid "Application is not responding."
+msgstr "Programmet svarer ikke."
+
+#: src/core/delete.c:134
+msgid ""
+"You may choose to wait a short while for it to continue or force the "
+"application to quit entirely."
+msgstr ""
+"Du kan velge å vente en kort stund for å se om det fortsetter eller tvinge "
+"programmet til å avslutte helt."
+
+#: src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "_Tvungen nedstenging"
+
+#: src/core/delete.c:141
+msgid "_Wait"
+msgstr "_Vent"
+
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -575,32 +567,6 @@ msgstr "Kjør som en nøstet kompositør"
 msgid "Run as a full display server, rather than nested"
 msgstr "Kjør som en full skjermtjener, heller enn nøstet"

-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
-#, c-format
-msgid "“%s” is not responding."
-msgstr "«%s» svarer ikke."
-
-#: src/core/meta-close-dialog-default.c:149
-msgid "Application is not responding."
-msgstr "Programmet svarer ikke."
-
-#: src/core/meta-close-dialog-default.c:154
-msgid ""
-"You may choose to wait a short while for it to continue or force the "
-"application to quit entirely."
-msgstr ""
-"Du kan velge å vente en kort stund for å se om det fortsetter eller tvinge "
-"programmet til å avslutte helt."
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "_Tvungen nedstenging"
-
-#: src/core/meta-close-dialog-default.c:161
-msgid "_Wait"
-msgstr "_Vent"
-
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@@ -613,8 +579,7 @@ msgstr ""
 "mutter %s\n"
 "Opphavsrett © 2001-%d Havoc Pennington, Red Hat, Inc, og andre\n"
 "Dette er fri programvare; se i kildekoden for kopibetingelser.\n"
-"Det gis INGEN garanti; ikke en gang for SALGBARHET eller PASSENDE FOR ET "
-"BESTEMT FORMÅL.\n"
+"Det gis INGEN garanti; ikke en gang for SALGBARHET eller PASSENDE FOR ET BESTEMT FORMÅL.\n"

 #: src/core/mutter.c:53
 msgid "Print version"
@@ -629,7 +594,7 @@ msgstr "Mutter-tillegg som skal brukes"
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"

-#: src/core/screen.c:583
+#: src/core/screen.c:580
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -638,7 +603,7 @@ msgstr ""
 "Skjerm «%s» har allerede en vindushåndterer; prøv å bruke flagget --replace "
 "for å erstatte aktiv vindushåndterer."

-#: src/core/screen.c:668
+#: src/core/screen.c:665
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Skjerm %d på display «%s» er ugyldig\n"
@@ -656,9 +621,7 @@ msgstr "Modusbytte: Modus %d"
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
-msgstr ""
-"Disse vinduene støtter ikke «lagre aktiv konfigurasjon», og vil måtte "
-"startes på nytt manuelt neste gang du logger inn."
+msgstr "Disse vinduene støtter ikke «lagre aktiv konfigurasjon», og vil måtte startes på nytt manuelt neste gang du logger inn."

 #: src/x11/window-props.c:559
 #, c-format
--- a/po/ne.po
+++ b/po/ne.po
--- a/po/nl.po
+++ b/po/nl.po
@@ -5,14 +5,13 @@
 # Michiel Sikkes <michiels@gnome.org>, 2005.
 # Wouter Bolsterlee <wbolster@gnome.org>, 2006–2012.
 # Hannie Dumoleyn <hannie@ubuntu-nl.org>, 2016.
-# Nathan Follens <nthn@unseen.is>, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/mutter/issues\n"
-"POT-Creation-Date: 2018-02-26 07:59+0000\n"
-"PO-Revision-Date: 2018-02-26 22:05+0100\n"
-"Last-Translator: Justin van Steijn <jvs@fsfe.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-03-23 22:41+0100\n"
+"PO-Revision-Date: 2016-10-17 18:24+0200\n"
+"Last-Translator: Hannie Dumoleyn <hannie@ubuntu-nl.org>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -20,257 +19,273 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Lokalize 1.5\n"

-#: data/50-mutter-navigation.xml:6
+#: ../data/50-mutter-navigation.xml.in.h:1
 msgid "Navigation"
 msgstr "Navigatie"

-#: data/50-mutter-navigation.xml:9
+#: ../data/50-mutter-navigation.xml.in.h:2
 msgid "Move window to workspace 1"
 msgstr "Venster verplaatsen naar werkblad 1"

-#: data/50-mutter-navigation.xml:12
+#: ../data/50-mutter-navigation.xml.in.h:3
 msgid "Move window to workspace 2"
 msgstr "Venster verplaatsen naar werkblad 2"

-#: data/50-mutter-navigation.xml:15
+#: ../data/50-mutter-navigation.xml.in.h:4
 msgid "Move window to workspace 3"
 msgstr "Venster verplaatsen naar werkblad 3"

-#: data/50-mutter-navigation.xml:18
+#: ../data/50-mutter-navigation.xml.in.h:5
 msgid "Move window to workspace 4"
 msgstr "Venster verplaatsen naar werkblad 4"

-#: data/50-mutter-navigation.xml:21
+#: ../data/50-mutter-navigation.xml.in.h:6
 msgid "Move window to last workspace"
 msgstr "Venster verplaatsen naar laatste werkblad"

-#: data/50-mutter-navigation.xml:24
+#: ../data/50-mutter-navigation.xml.in.h:7
+msgid "Move window one workspace to the left"
+msgstr "Venster één werkblad naar links verplaatsen"
+
+#: ../data/50-mutter-navigation.xml.in.h:8
+msgid "Move window one workspace to the right"
+msgstr "Venster één werkblad naar rechts verplaatsen"
+
+#: ../data/50-mutter-navigation.xml.in.h:9
 msgid "Move window one workspace up"
 msgstr "Venster één werkblad naar boven verplaatsen"

-#: data/50-mutter-navigation.xml:27
+#: ../data/50-mutter-navigation.xml.in.h:10
 msgid "Move window one workspace down"
 msgstr "Venster één werkblad naar beneden verplaatsen"

-#: data/50-mutter-navigation.xml:30
+#: ../data/50-mutter-navigation.xml.in.h:11
 msgid "Move window one monitor to the left"
 msgstr "Venster één monitor naar links verplaatsen"

-#: data/50-mutter-navigation.xml:33
+#: ../data/50-mutter-navigation.xml.in.h:12
 msgid "Move window one monitor to the right"
 msgstr "Venster één monitor naar rechts verplaatsen"

-#: data/50-mutter-navigation.xml:36
+#: ../data/50-mutter-navigation.xml.in.h:13
 msgid "Move window one monitor up"
 msgstr "Venster één monitor naar boven verplaatsen"

-#: data/50-mutter-navigation.xml:39
+#: ../data/50-mutter-navigation.xml.in.h:14
 msgid "Move window one monitor down"
 msgstr "Venster één monitor naar beneden verplaatsen"

-#: data/50-mutter-navigation.xml:43
+#: ../data/50-mutter-navigation.xml.in.h:15
 msgid "Switch applications"
 msgstr "Tussen toepassingen schakelen"

-#: data/50-mutter-navigation.xml:48
+#: ../data/50-mutter-navigation.xml.in.h:16
 msgid "Switch to previous application"
 msgstr "Schakelen naar vorige toepassing"

-#: data/50-mutter-navigation.xml:52
+#: ../data/50-mutter-navigation.xml.in.h:17
 msgid "Switch windows"
 msgstr "Tussen vensters schakelen"

-#: data/50-mutter-navigation.xml:57
+#: ../data/50-mutter-navigation.xml.in.h:18
 msgid "Switch to previous window"
 msgstr "Schakelen naar vorig venster"

-#: data/50-mutter-navigation.xml:61
+#: ../data/50-mutter-navigation.xml.in.h:19
 msgid "Switch windows of an application"
 msgstr "Wisselen van venster binnen een toepassing"

-#: data/50-mutter-navigation.xml:66
+#: ../data/50-mutter-navigation.xml.in.h:20
 msgid "Switch to previous window of an application"
 msgstr "Wisselen naar vorig gebruikte venster van een toepassing"

-#: data/50-mutter-navigation.xml:70
+#: ../data/50-mutter-navigation.xml.in.h:21
 msgid "Switch system controls"
 msgstr "Systeemschermen wisselen"

-#: data/50-mutter-navigation.xml:75
+#: ../data/50-mutter-navigation.xml.in.h:22
 msgid "Switch to previous system control"
 msgstr "Schakelen naar vorige systeemregelaar"

-#: data/50-mutter-navigation.xml:79
+#: ../data/50-mutter-navigation.xml.in.h:23
 msgid "Switch windows directly"
 msgstr "Direct tussen vensters schakelen"

-#: data/50-mutter-navigation.xml:84
+#: ../data/50-mutter-navigation.xml.in.h:24
 msgid "Switch directly to previous window"
 msgstr "Schakel direct naar vorig venster"

-#: data/50-mutter-navigation.xml:88
+#: ../data/50-mutter-navigation.xml.in.h:25
 msgid "Switch windows of an app directly"
 msgstr "Direct wisselen van venster binnen een toepassing"

-#: data/50-mutter-navigation.xml:93
+#: ../data/50-mutter-navigation.xml.in.h:26
 msgid "Switch directly to previous window of an app"
 msgstr "Direct wisselen naar vorig venster van een toepassing"

-#: data/50-mutter-navigation.xml:97
+#: ../data/50-mutter-navigation.xml.in.h:27
 msgid "Switch system controls directly"
 msgstr "Direct tussen systeemschermen wisselen"

-#: data/50-mutter-navigation.xml:102
+#: ../data/50-mutter-navigation.xml.in.h:28
 msgid "Switch directly to previous system control"
 msgstr "Direct schakelen naar vorige systeemregelaar"

-#: data/50-mutter-navigation.xml:105
+#: ../data/50-mutter-navigation.xml.in.h:29
 msgid "Hide all normal windows"
 msgstr "Alle normale vensters verbergen"

-#: data/50-mutter-navigation.xml:108
+#: ../data/50-mutter-navigation.xml.in.h:30
 msgid "Switch to workspace 1"
 msgstr "Schakelen naar werkblad 1"

-#: data/50-mutter-navigation.xml:111
+#: ../data/50-mutter-navigation.xml.in.h:31
 msgid "Switch to workspace 2"
 msgstr "Schakelen naar werkblad 2"

-#: data/50-mutter-navigation.xml:114
+#: ../data/50-mutter-navigation.xml.in.h:32
 msgid "Switch to workspace 3"
 msgstr "Schakelen naar werkblad 3"

-#: data/50-mutter-navigation.xml:117
+#: ../data/50-mutter-navigation.xml.in.h:33
 msgid "Switch to workspace 4"
 msgstr "Schakelen naar werkblad 4"

-#: data/50-mutter-navigation.xml:120
+#: ../data/50-mutter-navigation.xml.in.h:34
 msgid "Switch to last workspace"
 msgstr "Overschakelen naar laatste werkblad"

-#: data/50-mutter-navigation.xml:123
+#: ../data/50-mutter-navigation.xml.in.h:35
+msgid "Move to workspace left"
+msgstr "Verplaatsen naar werkblad links"
+
+#: ../data/50-mutter-navigation.xml.in.h:36
+msgid "Move to workspace right"
+msgstr "Verplaatsen naar werkblad rechts"
+
+#: ../data/50-mutter-navigation.xml.in.h:37
 msgid "Move to workspace above"
 msgstr "Verplaatsen naar werkblad hierboven"

-#: data/50-mutter-navigation.xml:126
+#: ../data/50-mutter-navigation.xml.in.h:38
 msgid "Move to workspace below"
 msgstr "Verplaatsen naar werkblad hieronder"

-#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6
+#: ../data/50-mutter-system.xml.in.h:1
 msgid "System"
 msgstr "Systeem"

-#: data/50-mutter-system.xml:8
+#: ../data/50-mutter-system.xml.in.h:2
 msgid "Show the run command prompt"
 msgstr "Het opdrachtregelvenster tonen"

-#: data/50-mutter-system.xml:10
+#: ../data/50-mutter-system.xml.in.h:3
 msgid "Show the activities overview"
 msgstr "Het activiteitenoverzicht tonen"

-#: data/50-mutter-wayland.xml:8
-msgid "Restore the keyboard shortcuts"
-msgstr "Sneltoetsen opnieuw instellen"
-
-#: data/50-mutter-windows.xml:6
+#: ../data/50-mutter-windows.xml.in.h:1
 msgid "Windows"
 msgstr "Vensters"

-#: data/50-mutter-windows.xml:8
+#: ../data/50-mutter-windows.xml.in.h:2
 msgid "Activate the window menu"
 msgstr "Venstermenu activeren"

-#: data/50-mutter-windows.xml:10
+#: ../data/50-mutter-windows.xml.in.h:3
 msgid "Toggle fullscreen mode"
 msgstr "Volledig-schermmodus omschakelen"

-#: data/50-mutter-windows.xml:12
+#: ../data/50-mutter-windows.xml.in.h:4
 msgid "Toggle maximization state"
 msgstr "Maximalisatie in- of uitschakelen"

-#: data/50-mutter-windows.xml:14
+#: ../data/50-mutter-windows.xml.in.h:5
 msgid "Maximize window"
 msgstr "Venster maximaliseren"

-#: data/50-mutter-windows.xml:16
+#: ../data/50-mutter-windows.xml.in.h:6
 msgid "Restore window"
 msgstr "Venster herstellen"

-#: data/50-mutter-windows.xml:18
+#: ../data/50-mutter-windows.xml.in.h:7
+msgid "Toggle shaded state"
+msgstr "Oprollen in- of uitschakelen"
+
+#: ../data/50-mutter-windows.xml.in.h:8
 msgid "Close window"
 msgstr "Venster sluiten"

-#: data/50-mutter-windows.xml:20
+#: ../data/50-mutter-windows.xml.in.h:9
 msgid "Hide window"
 msgstr "Venster verbergen"

-#: data/50-mutter-windows.xml:22
+#: ../data/50-mutter-windows.xml.in.h:10
 msgid "Move window"
 msgstr "Venster verplaatsen"

-#: data/50-mutter-windows.xml:24
+#: ../data/50-mutter-windows.xml.in.h:11
 msgid "Resize window"
 msgstr "Vensterafmetingen veranderen"

-#: data/50-mutter-windows.xml:27
+#: ../data/50-mutter-windows.xml.in.h:12
 msgid "Toggle window on all workspaces or one"
 msgstr "Schakelen tussen venster op alle werkbladen zichtbaar of op één"

-#: data/50-mutter-windows.xml:29
+#: ../data/50-mutter-windows.xml.in.h:13
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Vensters naar voren halen indien bedekt of anders naar achter brengen"

-#: data/50-mutter-windows.xml:31
+#: ../data/50-mutter-windows.xml.in.h:14
 msgid "Raise window above other windows"
 msgstr "Venster voor andere vensters halen"

-#: data/50-mutter-windows.xml:33
+#: ../data/50-mutter-windows.xml.in.h:15
 msgid "Lower window below other windows"
 msgstr "Venster achter andere vensters brengen"

-#: data/50-mutter-windows.xml:35
+#: ../data/50-mutter-windows.xml.in.h:16
 msgid "Maximize window vertically"
 msgstr "Venster verticaal maximaliseren"

-#: data/50-mutter-windows.xml:37
+#: ../data/50-mutter-windows.xml.in.h:17
 msgid "Maximize window horizontally"
 msgstr "Venster horizontaal maximaliseren"

-#: data/50-mutter-windows.xml:41
+#: ../data/50-mutter-windows.xml.in.h:18
 msgid "View split on left"
 msgstr "Weergave gesplitst op links"

-#: data/50-mutter-windows.xml:45
+#: ../data/50-mutter-windows.xml.in.h:19
 msgid "View split on right"
 msgstr "Weergave gesplitst op rechts"

-#: data/mutter.desktop.in:4
+#: ../data/mutter.desktop.in.h:1
 msgid "Mutter"
 msgstr "Mutter"

-#: data/org.gnome.mutter.gschema.xml.in:7
+#: ../data/org.gnome.mutter.gschema.xml.in.h:1
 msgid "Modifier to use for extended window management operations"
 msgstr "Controletoets voor uitgebreide vensterbeheerfunctionaliteit"

-#: data/org.gnome.mutter.gschema.xml.in:8
+#: ../data/org.gnome.mutter.gschema.xml.in.h:2
 msgid ""
-"This key will initiate the “overlay”, which is a combination window overview "
-"and application launching system. The default is intended to be the “Windows "
-"key” on PC hardware. It’s expected that this binding either the default or "
-"set to the empty string."
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
 msgstr ""
 "Deze sleutel activeert de ‘overlay’, een combinatie van een vensteroverzicht "
-"en een systeem om toepassingen te starten. Standaard is dit de ‘Windows-"
-"toets’ en de bedoeling is dat deze sneltoets ofwel de standaardwaarde bevat "
+"en een systeem om toepassingen te starten. Standaard is dit de ‘Windows’-"
+"toets en de bedoeling is dat deze sneltoets ofwel de standaardwaarde bevat "
 "ofwel leeggemaakt is."

-#: data/org.gnome.mutter.gschema.xml.in:20
+#: ../data/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Blokkerende dialoogvensters vastmaken"

-#: data/org.gnome.mutter.gschema.xml.in:21
+#: ../data/org.gnome.mutter.gschema.xml.in.h:4
 msgid ""
 "When true, instead of having independent titlebars, modal dialogs appear "
 "attached to the titlebar of the parent window and are moved together with "
@@ -280,28 +295,28 @@ msgstr ""
 "maar vastgekoppeld aan het achterliggende venster en bewegen daardoor ook "
 "mee met het achterliggende venster."

-#: data/org.gnome.mutter.gschema.xml.in:30
+#: ../data/org.gnome.mutter.gschema.xml.in.h:5
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Randtegels inschakelen bij het slepen van vensters naar schermranden"

-#: data/org.gnome.mutter.gschema.xml.in:31
+#: ../data/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "If enabled, dropping windows on vertical screen edges maximizes them "
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"Indien ingeschakeld, zal het laten vallen van vensters op verticale "
+"Indien ingeschakeld dan zal het laten vallen van vensters op verticale "
 "schermranden ze verticaal maximaliseren en horizontaal op halve "
 "schermgrootte brengen. Het laten vallen van vensters op de bovenrand van het "
-"scherm maximaliseert ze helemaal."
+"scherm maximaliseert ze helemaal. "

-#: data/org.gnome.mutter.gschema.xml.in:40
+#: ../data/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Workspaces are managed dynamically"
 msgstr "Werkbladen worden dynamisch beheerd"

-#: data/org.gnome.mutter.gschema.xml.in:41
+#: ../data/org.gnome.mutter.gschema.xml.in.h:8
 msgid ""
-"Determines whether workspaces are managed dynamically or whether there’s a "
+"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 ""
@@ -309,11 +324,11 @@ msgstr ""
 "werkbladen is (gegeven door de sleutel num-workspaces in org.gnome.desktop."
 "wm.preferences)."

-#: data/org.gnome.mutter.gschema.xml.in:50
+#: ../data/org.gnome.mutter.gschema.xml.in.h:9
 msgid "Workspaces only on primary"
 msgstr "Werkbladen alleen voor primaire venster"

-#: data/org.gnome.mutter.gschema.xml.in:51
+#: ../data/org.gnome.mutter.gschema.xml.in.h:10
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
@@ -321,11 +336,11 @@ msgstr ""
 "Geeft aan of wisselen van werkblad voor vensters op alle schermen of alleen "
 "voor vensters op het hoofdscherm moet gebeuren."

-#: data/org.gnome.mutter.gschema.xml.in:59
+#: ../data/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Geen tab-pop-up"

-#: data/org.gnome.mutter.gschema.xml.in:60
+#: ../data/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
@@ -333,38 +348,38 @@ msgstr ""
 "Bepaalt of het gebruik van pop-up en markering van het kader uitgeschakeld "
 "wordt voor het vensterbladeren."

-#: data/org.gnome.mutter.gschema.xml.in:68
+#: ../data/org.gnome.mutter.gschema.xml.in.h:13
 msgid "Delay focus changes until the pointer stops moving"
 msgstr "Aandacht vertragen totdat de muispijl stopt met bewegen"

-#: data/org.gnome.mutter.gschema.xml.in:69
+#: ../data/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."
+"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 ""
 "Indien op ‘true’ ingesteld en de aandachtsmodus is ofwel ‘sloppy’ of "
 "‘mouse’, dan zal de aandacht niet direct veranderd worden bij het binnengaan "
 "van een venster, maar slechts wanneer de muispijl stopt met bewegen."

-#: data/org.gnome.mutter.gschema.xml.in:79
+#: ../data/org.gnome.mutter.gschema.xml.in.h:15
 msgid "Draggable border width"
 msgstr "Sleepbare randbreedte"

-#: data/org.gnome.mutter.gschema.xml.in:80
+#: ../data/org.gnome.mutter.gschema.xml.in.h:16
 msgid ""
-"The amount of total draggable borders. If the theme’s visible borders are "
+"The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
 msgstr ""
 "Het totaal aantal sleepbare randen. Als de zichtbare randen in het thema "
 "onvoldoende zijn, worden onzichtbare randen toegevoegd om deze waarde te "
 "bereiken."

-#: data/org.gnome.mutter.gschema.xml.in:89
+#: ../data/org.gnome.mutter.gschema.xml.in.h:17
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "Vensters van bijna-monitorformaat auto-maximaliseren"

-#: data/org.gnome.mutter.gschema.xml.in:90
+#: ../data/org.gnome.mutter.gschema.xml.in.h:18
 msgid ""
 "If enabled, new windows that are initially the size of the monitor "
 "automatically get maximized."
@@ -372,11 +387,11 @@ msgstr ""
 "Indien ingeschakeld, worden vensters die initieel ongeveer even groot zijn "
 "als de monitor automatisch gemaximaliseerd."

-#: data/org.gnome.mutter.gschema.xml.in:98
+#: ../data/org.gnome.mutter.gschema.xml.in.h:19
 msgid "Place new windows in the center"
 msgstr "Plaats nieuwe vensters in het midden"

-#: data/org.gnome.mutter.gschema.xml.in:99
+#: ../data/org.gnome.mutter.gschema.xml.in.h:20
 msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
@@ -384,251 +399,107 @@ msgstr ""
 "Indien waar zullen nieuwe vensters steeds in het midden van het actieve "
 "scherm van de monitor geplaatst worden."

-#: data/org.gnome.mutter.gschema.xml.in:107
-msgid "Enable experimental features"
-msgstr "Experimentele functies inschakelen"
-
-#: data/org.gnome.mutter.gschema.xml.in:108
-msgid ""
-"To enable experimental features, add the feature keyword to the list. "
-"Whether the feature requires restarting the compositor depends on the given "
-"feature. Any experimental feature is not required to still be available, or "
-"configurable. Don’t expect adding anything in this setting to be future "
-"proof. Currently possible keywords: • “scale-monitor-framebuffer” — makes "
-"mutter default to layout logical monitors in a logical pixel coordinate "
-"space, while scaling monitor framebuffers instead of window content, to "
-"manage HiDPI monitors. Does not require a restart. • “remote-desktop” — "
-"enables remote desktop support. To support remote desktop with screen "
-"sharing, “screen-cast” must also be enabled. • “screen-cast” — enables "
-"screen cast support."
-msgstr ""
-"Voeg het sleutelwoord van een experimentele functie toe aan de lijst om deze "
-"in te schakelen. Of de compositor herstart moet worden vooraleer de functie "
-"gebruikt kan worden is afhankelijk van de functie. Experimentele functies "
-"die u aan deze lijst toevoegt kunnen op een later moment weer verwijderd of "
-"op een andere manier ingesteld worden, waardoor het mogelijk is dat ze dan "
-"niet meer werken. Momenteel bruikbare sleutelwoorden: • ‘scale-monitor-"
-"framebuffer’ — zorgt dat mutter standaard logische beeldschermen indeelt in "
-"een logische pixelcoördinaatruimte, en beeldschermframebuffers schaalt in "
-"plaats van vensterinhoud, om HiDPI-beeldschermen te beheren. Hiervoor is "
-"opnieuw opstarten niet vereist. • ‘remote-desktop’ — schakelt ondersteuning "
-"voor bureaubladen op afstand in. Om extern bureaublad met scherm delen in te "
-"schakelen, moet ‘screen-cast’ ook ingeschakeld zijn. • ‘screen-cast’ — "
-"schakelt ondersteuning voor casten van scherm in."
-
-#: data/org.gnome.mutter.gschema.xml.in:145
+#: ../data/org.gnome.mutter.gschema.xml.in.h:21
 msgid "Select window from tab popup"
 msgstr "Venster selecteren uit tab-pop-up"

-#: data/org.gnome.mutter.gschema.xml.in:150
+#: ../data/org.gnome.mutter.gschema.xml.in.h:22
 msgid "Cancel tab popup"
 msgstr "Tab-pop-up annuleren"

-#: data/org.gnome.mutter.gschema.xml.in:155
-msgid "Switch monitor configurations"
-msgstr "Tussen beeldschermconfiguraties schakelen"
-
-#: data/org.gnome.mutter.gschema.xml.in:160
-msgid "Rotates the built-in monitor configuration"
-msgstr "Roteert de ingebouwde beeldschermconfiguratie"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:6
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
 msgid "Switch to VT 1"
 msgstr "Schakelen naar VT 1"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:10
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
 msgid "Switch to VT 2"
 msgstr "Schakelen naar VT 2"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:14
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
 msgid "Switch to VT 3"
 msgstr "Schakelen naar VT 3"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:18
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
 msgid "Switch to VT 4"
 msgstr "Schakelen naar VT 4"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:22
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
 msgid "Switch to VT 5"
 msgstr "Schakelen naar VT 5"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:26
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
 msgid "Switch to VT 6"
 msgstr "Schakelen naar VT 6"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:30
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
 msgid "Switch to VT 7"
 msgstr "Schakelen naar VT 7"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:34
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
 msgid "Switch to VT 8"
 msgstr "Schakelen naar VT 8"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:38
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
 msgid "Switch to VT 9"
 msgstr "Schakelen naar VT 9"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:42
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
 msgid "Switch to VT 10"
 msgstr "Schakelen naar VT 10"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:46
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
 msgid "Switch to VT 11"
 msgstr "Schakelen naar VT 11"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:50
+#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
 msgid "Switch to VT 12"
 msgstr "Schakelen naar VT 12"

-#: data/org.gnome.mutter.wayland.gschema.xml.in:54
-msgid "Re-enable shortcuts"
-msgstr "Sneltoetsen opnieuw inschakelen"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:64
-msgid "Allow grabs with Xwayland"
-msgstr "Grabs met Xwayland toestaan"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:65
-msgid ""
-"Allow keyboard grabs issued by X11 applications running in Xwayland to be "
-"taken into account. For a X11 grab to be taken into account under Wayland, "
-"the client must also either send a specific X11 ClientMessage to the root "
-"window or be among the applications white-listed in key “xwayland-grab-"
-"access-rules”."
-msgstr ""
-"Toestaan dat rekening wordt gehouden met toetsenbord-grabs door X11-"
-"toepassingen die in Xwayland draaien. Om rekening te houden met een X11-grab "
-"onder Wayland, moet de client ook: óf een specifieke X11-ClientMessage naar "
-"het root-venster sturen, óf vermeld staan in de witte lijst van toepassingen "
-"in de sleutel ‘xwayland-grab-access-rules’."
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:77
-msgid "Xwayland applications allowed to issue keyboard grabs"
-msgstr "Xwayland-toepassingen mogen toetsenbord-grabs doen"
-
-#: data/org.gnome.mutter.wayland.gschema.xml.in:78
-msgid ""
-"List the resource names or resource class of X11 windows either allowed or "
-"not allowed to issue X11 keyboard grabs under Xwayland. The resource name or "
-"resource class of a given X11 window can be obtained using the command "
-"“xprop WM_CLASS”. Wildcards “*” and jokers “?” in the values are supported. "
-"Values starting with “!” are blacklisted, which has precedence over the "
-"whitelist, to revoke applications from the default system list. The default "
-"system list includes the following applications: "
-"“@XWAYLAND_GRAB_DEFAULT_ACCESS_RULES@” Users can break an existing grab by "
-"using the specific keyboard shortcut defined by the keybinding key “restore-"
-"shortcuts”."
-msgstr ""
-
-#. TRANSLATORS: This string refers to a button that switches between
-#. * different modes.
-#.
-#: src/backends/meta-input-settings.c:2325
-#, c-format
-msgid "Mode Switch (Group %d)"
-msgstr "Moduswisselaar (groep %d)"
-
-#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
-#. * mapping through the available outputs.
-#.
-#: src/backends/meta-input-settings.c:2348
-msgid "Switch monitor"
-msgstr "Van beeldscherm wisselen"
-
-#: src/backends/meta-input-settings.c:2350
-msgid "Show on-screen help"
-msgstr "Hulptekst op scherm tonen"
-
-#: src/backends/meta-monitor-manager.c:900
+#: ../src/backends/meta-monitor-manager.c:518
 msgid "Built-in display"
 msgstr "Ingebouwd beeldscherm"

-#: src/backends/meta-monitor-manager.c:923
+#: ../src/backends/meta-monitor-manager.c:544
 msgid "Unknown"
 msgstr "Onbekend"

-#: src/backends/meta-monitor-manager.c:925
+#: ../src/backends/meta-monitor-manager.c:546
 msgid "Unknown Display"
 msgstr "Onbekend beeldscherm"

 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:933
+#: ../src/backends/meta-monitor-manager.c:554
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

 #. 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:481
+#: ../src/compositor/compositor.c:456
 #, c-format
 msgid ""
-"Another compositing manager is already running on screen %i on display “%s”."
+"Another compositing manager is already running on screen %i on display \"%s"
+"\"."
 msgstr ""
 "Er is al een andere ‘compositing manager’ actief op scherm %i van "
-"beeldscherm ‘%s’."
+"beeldscherm “%s”."

-#: src/core/bell.c:194
+#: ../src/core/bell.c:194
 msgid "Bell event"
 msgstr "Bel-gebeurtenis"

-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display “%s”\n"
-msgstr "Openen van X Window System display ‘%s’ mislukt\n"
-
-#: src/core/main.c:190
-msgid "Disable connection to session manager"
-msgstr "Schakel de verbinding met het sessiebeheer uit"
-
-#: src/core/main.c:196
-msgid "Replace the running window manager"
-msgstr "De huidige toepassing voor vensterbeheer vervangen"
-
-#: src/core/main.c:202
-msgid "Specify session management ID"
-msgstr "Specificeer de ID van het sessiebeheer"
-
-#: src/core/main.c:207
-msgid "X Display to use"
-msgstr "De te gebruiken X-weergave"
-
-#: src/core/main.c:213
-msgid "Initialize session from savefile"
-msgstr "Initialiseer de sessie middels een opslagbestand"
-
-#: src/core/main.c:219
-msgid "Make X calls synchronous"
-msgstr "X-aanroepen synchroon maken"
-
-#: src/core/main.c:226
-msgid "Run as a wayland compositor"
-msgstr "Uitvoeren als een wayland compositor"
-
-#: src/core/main.c:232
-msgid "Run as a nested compositor"
-msgstr "Uitvoeren als een geneste compositor"
-
-#: src/core/main.c:240
-msgid "Run as a full display server, rather than nested"
-msgstr "Uitvoeren als een volledige displayserver, in plaats van genest"
-
-#: src/core/main.c:246
-msgid "Run with X11 backend"
-msgstr "Uitvoeren met X11-backend"
-
-#. Translators: %s is a window title
-#: src/core/meta-close-dialog-default.c:147
+#: ../src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
-msgstr "‘%s’ reageert niet."
+msgstr "“%s” reageert niet."

-#: src/core/meta-close-dialog-default.c:149
+#: ../src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "De toepassing reageert niet."

-#: src/core/meta-close-dialog-default.c:154
+#: ../src/core/delete.c:134
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
@@ -636,19 +507,60 @@ msgstr ""
 "U kunt ervoor kiezen even te wachten totdat het doorgaat of de toepassing "
 "dwingen om helemaal af te sluiten."

-#: src/core/meta-close-dialog-default.c:161
-msgid "_Force Quit"
-msgstr "Ge_forceerd afsluiten"
-
-#: src/core/meta-close-dialog-default.c:161
+#: ../src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Wachten"

-#: src/core/mutter.c:39
+#: ../src/core/delete.c:141
+msgid "_Force Quit"
+msgstr "Ge_forceerd afsluiten"
+
+#: ../src/core/display.c:555
+#, c-format
+msgid "Failed to open X Window System display '%s'\n"
+msgstr "Openen van X Window System display '%s' mislukt\n"
+
+#: ../src/core/main.c:181
+msgid "Disable connection to session manager"
+msgstr "Schakel de verbinding met het sessiebeheer uit"
+
+#: ../src/core/main.c:187
+msgid "Replace the running window manager"
+msgstr "De huidige toepassing voor vensterbeheer vervangen"
+
+#: ../src/core/main.c:193
+msgid "Specify session management ID"
+msgstr "Specificeer de ID van het sessiebeheer"
+
+#: ../src/core/main.c:198
+msgid "X Display to use"
+msgstr "De te gebruiken X-weergave"
+
+#: ../src/core/main.c:204
+msgid "Initialize session from savefile"
+msgstr "Initialiseer de sessie middels een opslagbestand"
+
+#: ../src/core/main.c:210
+msgid "Make X calls synchronous"
+msgstr "X-aanroepen synchroon maken"
+
+#: ../src/core/main.c:217
+msgid "Run as a wayland compositor"
+msgstr "Uitvoeren als een wayland compositor"
+
+#: ../src/core/main.c:223
+msgid "Run as a nested compositor"
+msgstr "Uitvoeren als een geneste compositor"
+
+#: ../src/core/main.c:231
+msgid "Run as a full display server, rather than nested"
+msgstr "Uitvoeren als een volledige display server, in plaats van genest"
+
+#: ../src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -659,70 +571,50 @@ msgstr ""
 "Er is GEEN garantie; zelfs niet voor VERKOOPBAARHEID of GESCHIKTHEID VOOR "
 "EEN BEPAALD DOEL.\n"

-#: src/core/mutter.c:53
+#: ../src/core/mutter.c:53
 msgid "Print version"
 msgstr "Versie-informatie tonen"

-#: src/core/mutter.c:59
+#: ../src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Te gebruiken Mutter-plug-in"

-#: src/core/prefs.c:1997
+#: ../src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Werkblad %d"

-#: src/core/screen.c:583
+#: ../src/core/screen.c:521
 #, c-format
 msgid ""
-"Display “%s” already has a window manager; try using the --replace option to "
-"replace the current window manager."
+"Display \"%s\" already has a window manager; try using the --replace option "
+"to replace the current window manager."
 msgstr ""
-"Beeldscherm ‘%s’ heeft al een vensterbeheerder; probeer de optie: --replace "
-"te gebruiken om de huidige vensterbeheerder te vervangen."
+"Beeldscherm “%s” heeft al een window manager; probeer de optie: --replace te "
+"gebruiken om de huidige window manager te vervangen."

-#: src/core/screen.c:668
+#: ../src/core/screen.c:603
 #, c-format
-msgid "Screen %d on display “%s” is invalid\n"
-msgstr "Scherm %d op beeldscherm ‘%s’ is ongeldig\n"
+msgid "Screen %d on display '%s' is invalid\n"
+msgstr "Scherm %d op beeldscherm '%s' is ongeldig\n"

-#: src/core/util.c:120
+#: ../src/core/util.c:121
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter is gecompileerd zonder ondersteuning voor verbose-mode\n"

-#: src/wayland/meta-wayland-tablet-pad.c:567
-#, c-format
-msgid "Mode Switch: Mode %d"
-msgstr "Moduswisselaar: modus %d"
-
-#: src/x11/session.c:1818
+#: ../src/x11/session.c:1815
 msgid ""
-"These windows do not support “save current setup” and will have to be "
-"restarted manually next time you log in."
+"These windows do not support &quot;save current setup&quot; and will have to "
+"be restarted manually next time you log in."
 msgstr ""
 "Deze vensters ondersteunen het opslaan van de huidige instellingen niet en "
 "zullen bij een volgende sessie opnieuw moeten worden opgestart."

-#: src/x11/window-props.c:559
+#: ../src/x11/window-props.c:549
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (op %s)"

-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Venster één werkblad naar links verplaatsen"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Venster één werkblad naar rechts verplaatsen"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Verplaatsen naar werkblad links"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Verplaatsen naar werkblad rechts"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Oprollen in- of uitschakelen"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "aanmaken achtergrondstructuur uit bestand mislukt"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Georges Basile Stavracas Neto	446c9b7460	x11: Add support for _GTK_EDGE_CONSTRAINTS atom To keep feature parity with the Wayland backend, and to improve the overall tiling experience with GTK apps, add the _GTK_EDGE_CONSTRAINTS X11 atom and update it when necessary. https://bugzilla.gnome.org/show_bug.cgi?id=751857	2017-10-03 18:16:44 -03:00
Georges Basile Stavracas Neto	437ab625ed	wayland: Send edge constraints Following up the previous patch, this patch makes the Wayland backend send the edge constraints through a custom protocol extension internal to GTK. As it mature, we can think of upstreaming the protocol to Wayland itself. https://bugzilla.gnome.org/show_bug.cgi?id=751857	2017-10-03 18:16:41 -03:00
Georges Basile Stavracas Neto	d89d5af040	window: Track edge constraints GTK has the ability to handle client-decorated windows in such a way that the behavior of these windows must match the behavior of the current window manager. In Mutter, windows can be tiled horizontally (and, in the future, vertically as well), which comes with a few requirements that the toolkit must supply. Tiled windows have their borders' behavior changed depending on the tiled position, and the toolkit must be aware of this information in order to properly match the window manager behavior. In order to provide toolkits with more precise and general data regarding resizable and constrained edges, this patch makes MetaWindow track its own edge constraints. This will later be used by the backends to send information to the toolkit. https://bugzilla.gnome.org/show_bug.cgi?id=751857	2017-10-03 18:16:28 -03:00
Georges Basile Stavracas Neto	5a95e5c80a	window: Also consider touching edges for matching tiled windows When computing a potential match for a tiled window, there is a chance we face the case where 2 windows really complement each other's tile mode (i.e. left and right) but they have different sizes, and their borders don't really touch each other. In that case, the current code would mistakenly assume they're tile matches, and would resize them with either a hole or an overlapping area between windows. This is clearly a misbehavior that is a consequence of the previous assumptions pre-resizable tiles. This patch adapts the tile match algorithm to also consider the touching edges when computing the matching tile, unless: * the window is not currently tiled (for example when computing the tile preview) * the window is currently resized in tandem with an existing tile match https://bugzilla.gnome.org/show_bug.cgi?id=645153 bar	2017-10-03 18:16:28 -03:00
Georges Basile Stavracas Neto	211669ba47	window: Raise and lower tile match in tandem When a pair of tiled windows are grouped together, they are treated as parts of a whole and interacting with one affects the other. Following the idea that sibling tiled windows are treated as part of the same group, they should also be raised and lowered together. It is still possible to break tiled windows grouping by simply untiling the window with the keyboard or by grabbing and resizing or moving the window with the cursor. This patch makes sibling tiled windows be lowered and raised in tandem. For future reference, this behavior is documented in [1]. [1] https://wiki.gnome.org/GeorgesNeto/MinutesOfFeaneron/Tiling https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 18:16:28 -03:00
Georges Basile Stavracas Neto	db5795a7cd	edge-resistance: Remove useless variable There is a variable in meta_window_edge_resistance_for_resize that isn't really helpful: it just assumes TRUE, and is passed to apply_edge_resistance_to_each_side. This patch removes that useless variable and simply pass TRUE instead. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 18:16:27 -03:00
Georges Basile Stavracas Neto	d3527bf99e	edge-resistance: Add snapping for tiled windows When windows are tiled, it improves the interaction with them when they have a set of snapping edges relative to the monitor. For example, when there's a document editor and a PDF file opened, I might want to rescale the former to 2/3 of the screen and the latter to 1/3. These snapping sections are not really tied to any other window, and only depend on the current work area of the window. Thus, it is not necessary to adapt the current snapping edge detection algorithm. This patch adds the necessary code in edge-resistance.c to special-case tiled windows and allow them to cover 1/4, 1/3 and 1/2 (horizontally) of the screen. These values are hardcoded. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 18:16:27 -03:00
Georges Basile Stavracas Neto	94f5a161f9	window: Tile and resize considering the tile match After the introduction of the possibility to resize tiled windows, it is a sensible decision to make windows aware of their tiling match. A tiling match is another window that is tiled in such a way that is the complement of the current window. The newly introduced behavior attepts to make tiling as smooth as possible, with the following rules: * Windows now compute their tile match when tiling and, if there's a match, they automatically complement the sibling's width. * Resizing a window with a sibling automatically resizes the sibling too to be the complement of the window's width. * It is not possible to resize below windows' minimum widths. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 18:16:27 -03:00
Georges Basile Stavracas Neto	209407657d	window: Maximize tiled windows when resizing to work area Now that tiled windows are resizable, the user may grow a tiled windows until it covers the entire work area. As this makes the window state mostly indistinguishable from maximization, avoid subtle differences by properly maximizing the window in that case. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 18:16:27 -03:00
Florian Müllner	ff34e51826	window: Allow resizing of tiled windows Currently tiled windows are not resizable and their size is fixed to half the screen width. Adjust the code to work with fractions other than half, and allow users to adjust the split by dragging the window edge that is not constrained by a monitor edge. Follow-up patches will improve on that by resizing neighboring tiled windows by a shared edge, and making the functionality available to client-side decorated windows implementing the new edge constraints protocol.	2017-10-03 18:16:27 -03:00
Florian Müllner	5b5d8676d4	window: Pass mode as parameter to tile() operation Now that the preview tile mode has been split from the window's tile_mode property, it is much more natural to pass the requested tile_mode to the tile() function instead of setting it externally and calling the function to apply the state.	2017-10-03 18:16:27 -03:00
Florian Müllner	a2dcf44c60	window: Split out preview_tile_mode The existing semantics of the tile_mode property are terribly confusing, as it depends on some other property whether it represents the requested or current mode. Clear this up by just using separate variables for the two. As it is unlikely that we will ever support more than one tile preview, we can track the requested mode globally instead of adding another per-window variable. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 16:00:31 -03:00
Georges Basile Stavracas Neto	ff0eee4331	window: Update tile monitor before move The actual move may involve the tile monitor, so make sure to not use an outdated value by setting it before calling move_between_rects(). https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 16:00:31 -03:00
Florian Müllner	0726d93e79	window: Remove obsolete code Commit `91b7dedf36` removed the ability to temporarily break out of maximization/tiling during grab operations, so this code is no longer necessary. https://bugzilla.gnome.org/show_bug.cgi?id=645153	2017-10-03 16:00:31 -03:00