Bump version to 3.27.1

Update NEWS.

.gitignore

@@ -55,6 +55,7 @@ mutter-restart-helper
 mutter-test-client
 mutter-test-runner
 mutter-test-unit-tests
+mutter-test-headless-start-test
 mutter-all.test
 org.gnome.mutter.gschema.valid
 org.gnome.mutter.gschema.xml
@@ -71,6 +72,8 @@ src/stamp-meta-enum-types.h
 src/meta-dbus-display-config.[ch]
 src/meta-dbus-idle-monitor.[ch]
 src/meta-dbus-login1.[ch]
+src/meta-dbus-remote-desktop.[ch]
+src/meta-dbus-screen-cast.[ch]
 src/gtk-primary-selection-protocol.c
 src/gtk-primary-selection-server-protocol.h
 src/gtk-shell-protocol.c
@@ -112,3 +115,4 @@ ltsugar.m4
 ltversion.m4
 lt~obsolete.m4
 .dirstamp
+**/tags.*

NEWS

@@ -1,3 +1,132 @@
+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:
+  Florian Müllner
+
+Translations:
+  Trần Ngọc Quân [vi], Inaki Larranaga Murgoitio [eu], Jordi Mas [ca],
+  Anders Jonsson [sv], Alexander Shopov [bg], Ask Hjorth Larsen [da],
+  Jean-Baptiste Holcroft [fr], A S Alam [pa]
+
+3.25.92
+=======
+* Add screencast and remote desktop support [Jonas; #784199]
+* Support running with no attached monitors [Jonas; #730551]
+* Add a vertical gradient effect to background actor [Alessandro; #786618]
+* Misc. bug fixes [Mario, Daniel, Piotr, Jonas, Bastien; #786619, #786677,
+  #772218, #786918, #760670]
+
+Contributors:
+  Jonas Ådahl, Alessandro Bono, Piotr Drąg, Bastien Nocera,
+  Mario Sanchez Prada, Daniel Stone
+
+Translations:
+  Marek Cernocky [cs], Aurimas Černius [lt], Piotr Drąg [pl],
+  Fran Dieguez [gl], gogo [hr], Dušan Kazik [sk], Milo Casagrande [it],
+  Jordi Mas [ca], Cheng-Chia Tseng [zh_TW], Марко Костић [sr],
+  Милош Поповић [sr@latin], Rūdolfs Mazurs [lv], Matej Urbančič [sl],
+  Ask Hjorth Larsen [da], Piotr Drąg [it, lt], Jiri Grönroos [fi],
+  Emin Tufan Çetin [tr], Wolfgang Stöggl [de], Kukuh Syafaat [id],
+  Yuras Shumovich [be], Changwoo Ryu [ko], Alexander Shopov [bg],
+  Rafael Fontenelle [pt_BR], Balázs Úr [hu]
+
+3.25.91
+=======
+* Reduce memory use of suspended instances [Jonas; #786299]
+* Make supported scales determination saner [Rui; #786474]
+* Fix crash on inhibit-shortcuts dialog reponse [Jonas; #786385]
+* Support libinput's tag-and-drag setting [freeroot; #775755]
+* Avoid overlapping keybindings with multiple layouts [Jonas; #786408]
+* Fix non-transformed cursor on rotated monitors [Jonas; #786023]
+* Avoid unnecessary work during background painting [Alessandro; #783512]
+* Misc. bug fixes [Alberts, Jonas, Mario; #691611, #786300, #777732, #786568]
+
+Contributors:
+  freeroot, Jonas Ådahl, Alessandro Bono, Carlos Garnacho, Rui Matos,
+  Alberts Muktupāvels, Mario Sanchez Prada
+
+Translations:
+  Muhammet Kara [tr], Claude Paroz [fr], Мирослав Николић [sr, sr@latin],
+  Pawan Chitrakar [ne], Kukuh Syafaat [id]
+
+3.25.90
+=======
+* Add zwp_linux_dmabuf_v1 support [Daniel; #785262]
+* Add (x)wayland shortcut inhibitor support [Olivier; #783342]
+* Misc. bug fixes [Daniel, Carlos, Cosimo; #785263, #785347, #767805]
+
+Contributors:
+  Jonas Ådahl, Cosimo Cecchi, Olivier Fourdan, Carlos Garnacho, Daniel Stone
+
+Translations:
+  Fabio Tomat [fur], Kukuh Syafaat [id], Aurimas Černius [lt],
+  Daniel Mustieles [es], Baurzhan Muftakhidinov [kk], Jordi Mas [ca],
+  Matej Urbančič [sl], Marek Cernocky [cs], gogo [hr], Fran Dieguez [gl],
+  Balázs Meskó [hu]
+
+3.25.4
+======
+* Do not throttle motion events on tablet tools [Carlos; #783535]
+* Handle left-handed mode on pen/eraser devices [Carlos; #782027]
+* Add wl_surface.damage_buffer() support [Jonas; #784080]
+* Fix crash when moving across on-adjacent monitors [Jonas; #783630]
+* Fix window moving/resizing via tablet tools [Jason; #777333]
+* Support fractional monitor scaling [Jonas, Marco; #765011]
+* Keep override-redirect windows stacked on top [Rui; #780485]
+* Implement tablet rings/strips configuration [Carlos; #782033]
+* Support tablet wheel events on wayland [Jason; #783716]
+* Move g-s-d xrandr functionality into mutter [Rui; #781906]
+* Misc. bug fixes [Florian, Jason, Miguel, Carlos, Jonas; #783502, #784009,
+  #784223, #784272, #784402, #784881, #762083, #784867, #781723]
+
+Contributors:
+  Jonas Ådahl, Miguel A. Vico, Emmanuele Bassi, Carlos Garnacho, Jason Gerecke,
+  Rui Matos, Florian Müllner, Marco Trevisan (Treviño)
+
 3.25.3
 ======
 * Ignore hotplug-mode-update value on startup [Marco; #783073]

clutter/clutter/Makefile.am.marshal

@@ -34,6 +34,7 @@ stamp-marshal: $(marshal_list)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--header \
+		--valist-marshallers \
 	$(marshal_list) > xgen-mh \
 	&& (cmp -s xgen-mh $(marshal_h) || cp -f xgen-mh $(marshal_h)) \
 	&& rm -f xgen-mh \
@@ -46,6 +47,8 @@ $(marshal_c): $(marshal_h)
 	$(AM_V_GEN)$(GLIB_GENMARSHAL) \
 		--prefix=$(glib_marshal_prefix) \
 		--body \
+		--valist-marshallers \
+		--prototypes \
 	$(marshal_list) > xgen-mc \
 	&& (cmp -s xgen-mc $(marshal_c) || cp -f xgen-mc $(marshal_c)) \
 	&& rm -f xgen-mc

clutter/clutter/clutter-event.c

@@ -2179,3 +2179,61 @@ clutter_event_get_mode_group (const ClutterEvent *event)
       return 0;
     }
 }
+
+/**
+ * clutter_event_get_pad_event_details:
+ * @event: a pad event
+ * @number: (out) (optional): ring/strip/button number
+ * @mode: (out) (optional): pad mode as per the event
+ * @value: (out) (optional): event axis value
+ *
+ * Returns the details of a pad event.
+ *
+ * Returns: #TRUE if event details could be obtained
+ **/
+gboolean
+clutter_event_get_pad_event_details (const ClutterEvent *event,
+                                     guint              *number,
+                                     guint              *mode,
+                                     gdouble            *value)
+{
+  guint n, m;
+  gdouble v;
+
+  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail (event->type == CLUTTER_PAD_BUTTON_PRESS ||
+                        event->type == CLUTTER_PAD_BUTTON_RELEASE ||
+                        event->type == CLUTTER_PAD_RING ||
+                        event->type == CLUTTER_PAD_STRIP, FALSE);
+
+  switch (event->type)
+    {
+    case CLUTTER_PAD_BUTTON_PRESS:
+    case CLUTTER_PAD_BUTTON_RELEASE:
+      n = event->pad_button.button;
+      m = event->pad_button.mode;
+      v = 0.0;
+      break;
+    case CLUTTER_PAD_RING:
+      n = event->pad_ring.ring_number;
+      m = event->pad_ring.mode;
+      v = event->pad_ring.angle;
+      break;
+    case CLUTTER_PAD_STRIP:
+      n = event->pad_strip.strip_number;
+      m = event->pad_strip.mode;
+      v = event->pad_strip.value;
+      break;
+    default:
+      return FALSE;
+    }
+
+  if (number)
+    *number = n;
+  if (mode)
+    *mode = m;
+  if (value)
+    *value = v;
+
+  return TRUE;
+}

clutter/clutter/clutter-event.h

@@ -778,6 +778,12 @@ ClutterScrollFinishFlags clutter_event_get_scroll_finish_flags       (const Clut
 CLUTTER_AVAILABLE_IN_ALL
 guint                    clutter_event_get_mode_group                (const ClutterEvent     *event);
 
+CLUTTER_AVAILABLE_IN_MUTTER
+gboolean                 clutter_event_get_pad_event_details         (const ClutterEvent     *event,
+                                                                      guint                  *number,
+                                                                      guint                  *mode,
+                                                                      gdouble                *value);
+
 
 G_END_DECLS
 

clutter/clutter/clutter-input-device.c

@@ -2243,10 +2243,15 @@ clutter_input_device_get_device_node (ClutterInputDevice *device)
 ClutterInputDeviceMapping
 clutter_input_device_get_mapping_mode (ClutterInputDevice *device)
 {
+  ClutterInputDeviceType device_type;
+
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (device),
                         CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);
-  g_return_val_if_fail (clutter_input_device_get_device_type (device) ==
-                        CLUTTER_TABLET_DEVICE,
+
+  device_type = clutter_input_device_get_device_type (device);
+  g_return_val_if_fail (device_type == CLUTTER_TABLET_DEVICE ||
+                        device_type == CLUTTER_PEN_DEVICE ||
+                        device_type == CLUTTER_ERASER_DEVICE,
                         CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE);
 
   return device->mapping_mode;
@@ -2256,9 +2261,14 @@ void
 clutter_input_device_set_mapping_mode (ClutterInputDevice        *device,
                                        ClutterInputDeviceMapping  mapping)
 {
+  ClutterInputDeviceType device_type;
+
   g_return_if_fail (CLUTTER_IS_INPUT_DEVICE (device));
-  g_return_if_fail (clutter_input_device_get_device_type (device) ==
-                    CLUTTER_TABLET_DEVICE);
+
+  device_type = clutter_input_device_get_device_type (device);
+  g_return_if_fail (device_type == CLUTTER_TABLET_DEVICE ||
+                    device_type == CLUTTER_PEN_DEVICE ||
+                    device_type == CLUTTER_ERASER_DEVICE);
 
   if (device->mapping_mode == mapping)
     return;

clutter/clutter/clutter-mutter.h

@@ -40,6 +40,12 @@ gboolean        _clutter_get_sync_to_vblank     (void);
 CLUTTER_AVAILABLE_IN_MUTTER
 int64_t clutter_stage_get_frame_counter (ClutterStage *stage);
 
+CLUTTER_AVAILABLE_IN_MUTTER
+void clutter_stage_capture_into (ClutterStage          *stage,
+                                 gboolean               paint,
+                                 cairo_rectangle_int_t *rect,
+                                 uint8_t               *data);
+
 #undef __CLUTTER_H_INSIDE__
 
 #endif /* __CLUTTER_MUTTER_H__ */

clutter/clutter/clutter-stage-view.c

@@ -20,6 +20,7 @@
 #include "clutter/clutter-stage-view.h"
 
 #include <cairo-gobject.h>
+#include <math.h>
 
 enum
 {
@@ -38,7 +39,7 @@ static GParamSpec *obj_props[PROP_LAST];
 typedef struct _ClutterStageViewPrivate
 {
   cairo_rectangle_int_t layout;
-  int scale;
+  float scale;
   CoglFramebuffer *framebuffer;
 
   CoglOffscreen *offscreen;
@@ -143,7 +144,7 @@ clutter_stage_view_blit_offscreen (ClutterStageView            *view,
   cogl_framebuffer_pop_matrix (priv->framebuffer);
 }
 
-int
+float
 clutter_stage_view_get_scale (ClutterStageView *view)
 {
   ClutterStageViewPrivate *priv =
@@ -241,7 +242,7 @@ clutter_stage_view_get_property (GObject    *object,
       g_value_set_boxed (value, priv->offscreen);
       break;
     case PROP_SCALE:
-      g_value_set_int (value, priv->scale);
+      g_value_set_float (value, priv->scale);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -267,12 +268,26 @@ clutter_stage_view_set_property (GObject      *object,
       break;
     case PROP_FRAMEBUFFER:
       priv->framebuffer = g_value_dup_boxed (value);
+#ifndef G_DISABLE_CHECKS
+      if (priv->framebuffer)
+        {
+          int fb_width, fb_height;
+
+          fb_width = cogl_framebuffer_get_width (priv->framebuffer);
+          fb_height = cogl_framebuffer_get_height (priv->framebuffer);
+
+          g_warn_if_fail (fabsf (roundf (fb_width / priv->scale) -
+                                 fb_width / priv->scale) < FLT_EPSILON);
+          g_warn_if_fail (fabsf (roundf (fb_height / priv->scale) -
+                                 fb_height / priv->scale) < FLT_EPSILON);
+        }
+#endif
       break;
     case PROP_OFFSCREEN:
       priv->offscreen = g_value_dup_boxed (value);
       break;
     case PROP_SCALE:
-      priv->scale = g_value_get_int (value);
+      priv->scale = g_value_get_float (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -301,7 +316,7 @@ clutter_stage_view_init (ClutterStageView *view)
 
   priv->dirty_viewport = TRUE;
   priv->dirty_projection = TRUE;
-  priv->scale = 1;
+  priv->scale = 1.0;
 }
 
 static void
@@ -322,6 +337,7 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                         "The view layout on the screen",
                         CAIRO_GOBJECT_TYPE_RECTANGLE_INT,
                         G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT |
                         G_PARAM_STATIC_STRINGS);
 
   obj_props[PROP_FRAMEBUFFER] =
@@ -330,6 +346,7 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                         "The front buffer of the view",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT |
                         G_PARAM_STATIC_STRINGS);
 
   obj_props[PROP_OFFSCREEN] =
@@ -338,16 +355,17 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
                         "Framebuffer used as intermediate buffer",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
-			G_PARAM_CONSTRUCT_ONLY |
+                        G_PARAM_CONSTRUCT_ONLY |
                         G_PARAM_STATIC_STRINGS);
 
   obj_props[PROP_SCALE] =
-    g_param_spec_int ("scale",
-                      "View scale",
-                      "The view scale",
-                      1, G_MAXINT, 1,
-                      G_PARAM_READWRITE |
-                      G_PARAM_STATIC_STRINGS);
+    g_param_spec_float ("scale",
+                        "View scale",
+                        "The view scale",
+                        0.5, G_MAXFLOAT, 1.0,
+                        G_PARAM_READWRITE |
+                        G_PARAM_CONSTRUCT |
+                        G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }

clutter/clutter/clutter-stage-view.h

@@ -61,7 +61,7 @@ void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
 					const cairo_rectangle_int_t *clip);
 
 CLUTTER_AVAILABLE_IN_MUTTER
-int clutter_stage_view_get_scale (ClutterStageView *view);
+float clutter_stage_view_get_scale (ClutterStageView *view);
 
 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
 

clutter/clutter/clutter-stage.c

@@ -962,6 +962,7 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
       ClutterEvent *next_event;
       ClutterInputDevice *device;
       ClutterInputDevice *next_device;
+      ClutterInputDeviceType device_type;
       gboolean check_device = FALSE;
 
       event = l->data;
@@ -977,8 +978,16 @@ _clutter_stage_process_queued_events (ClutterStage *stage)
       if (device != NULL && next_device != NULL)
         check_device = TRUE;
 
-      /* Skip consecutive motion events coming from the same device */
-      if (priv->throttle_motion_events && next_event != NULL)
+      device_type = clutter_input_device_get_device_type (device);
+
+      /* Skip consecutive motion events coming from the same device,
+       * except those of tablet tools, since users of these events
+       * want no precision loss.
+       */
+      if (priv->throttle_motion_events && next_event != NULL &&
+          device_type != CLUTTER_TABLET_DEVICE &&
+          device_type != CLUTTER_PEN_DEVICE &&
+          device_type != CLUTTER_ERASER_DEVICE)
         {
           if (event->type == CLUTTER_MOTION &&
               (next_event->type == CLUTTER_MOTION ||
@@ -1436,9 +1445,9 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
   gint read_x;
   gint read_y;
   float fb_width, fb_height;
-  int fb_scale;
-  int viewport_offset_x;
-  int viewport_offset_y;
+  float fb_scale;
+  float viewport_offset_x;
+  float viewport_offset_y;
 
   priv = stage->priv;
 
@@ -1465,8 +1474,8 @@ _clutter_stage_do_pick_on_view (ClutterStage     *stage,
   if (G_LIKELY (!(clutter_pick_debug_flags & CLUTTER_DEBUG_DUMP_PICK_BUFFERS)))
     {
       CLUTTER_NOTE (PICK, "Pushing pick scissor clip x: %d, y: %d, 1x1",
-                    dirty_x * fb_scale,
-                    dirty_y * fb_scale);
+                    (int) dirty_x * fb_scale,
+                    (int) dirty_y * fb_scale);
       cogl_framebuffer_push_scissor_clip (fb, dirty_x * fb_scale, dirty_y * fb_scale, 1, 1);
     }
 
@@ -3613,9 +3622,9 @@ _clutter_stage_maybe_setup_viewport (ClutterStage     *stage,
     {
       cairo_rectangle_int_t view_layout;
       ClutterPerspective perspective;
-      int fb_scale;
-      int viewport_offset_x;
-      int viewport_offset_y;
+      float fb_scale;
+      float viewport_offset_x;
+      float viewport_offset_y;
       float z_2d;
 
       CLUTTER_NOTE (PAINT,
@@ -4711,6 +4720,7 @@ capture_view (ClutterStage          *stage,
   int stride;
   CoglBitmap *bitmap;
   cairo_rectangle_int_t view_layout;
+  float view_scale;
 
   framebuffer = clutter_stage_view_get_framebuffer (view);
 
@@ -4721,8 +4731,11 @@ capture_view (ClutterStage          *stage,
       clutter_stage_do_paint_view (stage, view, rect);
     }
 
+  view_scale = clutter_stage_view_get_scale (view);
   image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                      rect->width, rect->height);
+                                      rect->width * view_scale,
+                                      rect->height * view_scale);
+  cairo_surface_set_device_scale (image, view_scale, view_scale);
 
   data = cairo_image_surface_get_data (image);
   stride = cairo_image_surface_get_stride (image);
@@ -4730,7 +4743,8 @@ capture_view (ClutterStage          *stage,
   backend = clutter_get_default_backend ();
   context = clutter_backend_get_cogl_context (backend);
   bitmap = cogl_bitmap_new_for_data (context,
-                                     rect->width, rect->height,
+                                     rect->width * view_scale,
+                                     rect->height * view_scale,
                                      CLUTTER_CAIRO_FORMAT_ARGB32,
                                      stride,
                                      data);
@@ -4738,8 +4752,8 @@ capture_view (ClutterStage          *stage,
   clutter_stage_view_get_layout (view, &view_layout);
 
   cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
-                                            rect->x - view_layout.x,
-                                            rect->y - view_layout.y,
+                                            (rect->x - view_layout.x) * view_scale,
+                                            (rect->y - view_layout.y) * view_scale,
                                             COGL_READ_PIXELS_COLOR_BUFFER,
                                             bitmap);
 
@@ -4796,3 +4810,93 @@ clutter_stage_capture (ClutterStage          *stage,
 
   return TRUE;
 }
+
+static void
+capture_view_into (ClutterStage          *stage,
+                   gboolean               paint,
+                   ClutterStageView      *view,
+                   cairo_rectangle_int_t *rect,
+                   uint8_t               *data,
+                   int                    stride)
+{
+  CoglFramebuffer *framebuffer;
+  ClutterBackend *backend;
+  CoglContext *context;
+  CoglBitmap *bitmap;
+  cairo_rectangle_int_t view_layout;
+
+  framebuffer = clutter_stage_view_get_framebuffer (view);
+
+  if (paint)
+    {
+      _clutter_stage_maybe_setup_viewport (stage, view);
+      cogl_push_framebuffer (framebuffer);
+      clutter_stage_do_paint_view (stage, view, rect);
+    }
+
+  backend = clutter_get_default_backend ();
+  context = clutter_backend_get_cogl_context (backend);
+  bitmap = cogl_bitmap_new_for_data (context,
+                                     rect->width, rect->height,
+                                     CLUTTER_CAIRO_FORMAT_ARGB32,
+                                     stride,
+                                     data);
+
+  clutter_stage_view_get_layout (view, &view_layout);
+
+  cogl_framebuffer_read_pixels_into_bitmap (framebuffer,
+                                            rect->x - view_layout.x,
+                                            rect->y - view_layout.y,
+                                            COGL_READ_PIXELS_COLOR_BUFFER,
+                                            bitmap);
+
+  if (paint)
+    cogl_pop_framebuffer ();
+
+  cogl_object_unref (bitmap);
+}
+
+static ClutterStageView *
+get_view_at_rect (ClutterStage          *stage,
+                  cairo_rectangle_int_t *rect)
+{
+  ClutterStagePrivate *priv = stage->priv;
+  GList *views = _clutter_stage_window_get_views (priv->impl);
+  GList *l;
+
+  for (l = views; l; l = l->next)
+    {
+      ClutterStageView *view = l->data;
+      cairo_rectangle_int_t view_layout;
+      cairo_region_t *region;
+      cairo_rectangle_int_t view_capture_rect;
+
+      clutter_stage_view_get_layout (view, &view_layout);
+      region = cairo_region_create_rectangle (&view_layout);
+      cairo_region_intersect_rectangle (region, rect);
+      cairo_region_get_extents (region, &view_capture_rect);
+      cairo_region_destroy (region);
+
+      if (view_capture_rect.width == 0 || view_capture_rect.height == 0)
+        continue;
+
+      g_assert (view_capture_rect.width == rect->width &&
+                view_capture_rect.height == rect->height);
+      return view;
+    }
+
+  return NULL;
+}
+
+void
+clutter_stage_capture_into (ClutterStage          *stage,
+                            gboolean               paint,
+                            cairo_rectangle_int_t *rect,
+                            uint8_t               *data)
+{
+  ClutterStageView *view;
+  int bpp = 4;
+
+  view = get_view_at_rect (stage, rect);
+  capture_view_into (stage, paint, view, rect, data, rect->width * bpp);
+}

clutter/clutter/clutter-virtual-input-device.c

@@ -115,6 +115,19 @@ clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virtual_d
   klass->notify_keyval (virtual_device, time_us, keyval, key_state);
 }
 
+void
+clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                     uint64_t                   time_us,
+                                                     ClutterScrollDirection     direction,
+                                                     ClutterScrollSource        scroll_source)
+{
+  ClutterVirtualInputDeviceClass *klass =
+    CLUTTER_VIRTUAL_INPUT_DEVICE_GET_CLASS (virtual_device);
+
+  klass->notify_discrete_scroll (virtual_device, time_us,
+                                 direction, scroll_source);
+}
+
 /**
  * clutter_virtual_input_device_get_manager:
  * @virtual_device: a virtual device

clutter/clutter/clutter-virtual-input-device.h

@@ -76,6 +76,11 @@ struct _ClutterVirtualInputDeviceClass
                          uint64_t                   time_us,
                          uint32_t                   keyval,
                          ClutterKeyState            key_state);
+
+  void (*notify_discrete_scroll) (ClutterVirtualInputDevice *virtual_device,
+                                  uint64_t                   time_us,
+                                  ClutterScrollDirection     direction,
+                                  ClutterScrollSource        scroll_source);
 };
 
 CLUTTER_AVAILABLE_IN_ALL
@@ -108,6 +113,13 @@ void clutter_virtual_input_device_notify_keyval (ClutterVirtualInputDevice *virt
                                                  uint32_t                   keyval,
                                                  ClutterKeyState            key_state);
 
+CLUTTER_AVAILABLE_IN_ALL
+void clutter_virtual_input_device_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                          uint64_t                   time_us,
+                                                          ClutterScrollDirection     direction,
+                                                          ClutterScrollSource        scroll_source);
+
+
 CLUTTER_AVAILABLE_IN_ALL
 ClutterDeviceManager * clutter_virtual_input_device_get_manager (ClutterVirtualInputDevice *virtual_device);
 

clutter/clutter/cogl/clutter-stage-cogl.c

@@ -51,7 +51,9 @@
 
 typedef struct _ClutterStageViewCoglPrivate
 {
-  /* Stores a list of previous damaged areas in the stage coordinate space */
+  /*
+   * List of previous damaged areas in stage view framebuffer coordinate space.
+   */
 #define DAMAGE_HISTORY_MAX 16
 #define DAMAGE_HISTORY(x) ((x) & (DAMAGE_HISTORY_MAX - 1))
   cairo_rectangle_int_t damage_history[DAMAGE_HISTORY_MAX];
@@ -435,13 +437,20 @@ fill_current_damage_history_and_step (ClutterStageView *view)
   ClutterStageViewCoglPrivate *view_priv =
     clutter_stage_view_cogl_get_instance_private (view_cogl);
   cairo_rectangle_int_t view_rect;
-  cairo_rectangle_int_t *current_damage;
+  float fb_scale;
+  cairo_rectangle_int_t *current_fb_damage;
 
-  current_damage =
+  current_fb_damage =
     &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index)];
   clutter_stage_view_get_layout (view, &view_rect);
+  fb_scale = clutter_stage_view_get_scale (view);
 
-  *current_damage = view_rect;
+  *current_fb_damage = (cairo_rectangle_int_t) {
+    .x = 0,
+    .y = 0,
+    .width = view_rect.width * fb_scale,
+    .height = view_rect.height * fb_scale
+  };
   view_priv->damage_index++;
 }
 
@@ -481,6 +490,40 @@ transform_swap_region_to_onscreen (ClutterStageView      *view,
   };
 }
 
+static void
+calculate_scissor_region (cairo_rectangle_int_t *fb_clip_region,
+                          int                    subpixel_compensation,
+                          int                    fb_width,
+                          int                    fb_height,
+                          cairo_rectangle_int_t *out_scissor_rect)
+{
+  int scissor_x;
+  int scissor_y;
+  int scissor_width;
+  int scissor_height;
+
+  scissor_x = fb_clip_region->x;
+  scissor_y = fb_clip_region->y;
+  scissor_width = fb_clip_region->width;
+  scissor_height = fb_clip_region->height;
+
+  if (fb_clip_region->x > 0)
+    scissor_x += subpixel_compensation;
+  if (fb_clip_region->y > 0)
+    scissor_y += subpixel_compensation;
+  if (fb_clip_region->x + fb_clip_region->width < fb_width)
+    scissor_width -= 2 * subpixel_compensation;
+  if (fb_clip_region->y + fb_clip_region->height < fb_height)
+    scissor_height -= 2 * subpixel_compensation;
+
+  *out_scissor_rect = (cairo_rectangle_int_t) {
+    .x = scissor_x,
+    .y = scissor_y,
+    .width = scissor_width,
+    .height = scissor_height
+  };
+}
+
 static gboolean
 clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                 ClutterStageView   *view)
@@ -501,13 +544,18 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
   ClutterActor *wrapper;
   cairo_rectangle_int_t redraw_clip;
   cairo_rectangle_int_t swap_region;
-  cairo_rectangle_int_t clip_region;
+  cairo_rectangle_int_t fb_clip_region;
   gboolean clip_region_empty;
-  int fb_scale;
+  float fb_scale;
+  int subpixel_compensation = 0;
+  int fb_width, fb_height;
 
   wrapper = CLUTTER_ACTOR (stage_cogl->wrapper);
 
   clutter_stage_view_get_layout (view, &view_rect);
+  fb_scale = clutter_stage_view_get_scale (view);
+  fb_width = cogl_framebuffer_get_width (fb);
+  fb_height = cogl_framebuffer_get_height (fb);
 
   can_blit_sub_buffer =
     cogl_is_onscreen (fb) &&
@@ -542,11 +590,24 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
       cogl_onscreen_get_frame_counter (COGL_ONSCREEN (fb)) > 3)
     {
       may_use_clipped_redraw = TRUE;
-      clip_region = redraw_clip;
+
+      if (fb_scale != floorf (fb_scale))
+        subpixel_compensation = ceilf (fb_scale);
+
+      fb_clip_region = (cairo_rectangle_int_t) {
+        .x = (floorf ((redraw_clip.x - view_rect.x) * fb_scale) -
+              subpixel_compensation),
+        .y = (floorf ((redraw_clip.y - view_rect.y) * fb_scale) -
+              subpixel_compensation),
+        .width = (ceilf (redraw_clip.width * fb_scale) +
+                  (2 * subpixel_compensation)),
+        .height = (ceilf (redraw_clip.height * fb_scale) +
+                   (2 * subpixel_compensation))
+      };
     }
   else
     {
-      clip_region = (cairo_rectangle_int_t){ 0 };
+      fb_clip_region = (cairo_rectangle_int_t) { 0 };
     }
 
   if (may_use_clipped_redraw &&
@@ -555,9 +616,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
   else
     use_clipped_redraw = FALSE;
 
-  clip_region_empty = may_use_clipped_redraw && clip_region.width == 0;
-
-  fb_scale = clutter_stage_view_get_scale (view);
+  clip_region_empty = may_use_clipped_redraw && fb_clip_region.width == 0;
 
   swap_with_damage = FALSE;
   if (has_buffer_age)
@@ -565,34 +624,44 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
       if (use_clipped_redraw && !clip_region_empty)
         {
           int age, i;
-          cairo_rectangle_int_t *current_damage =
+          cairo_rectangle_int_t *current_fb_damage =
             &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index++)];
 
           age = cogl_onscreen_get_buffer_age (COGL_ONSCREEN (fb));
 
           if (valid_buffer_age (view_cogl, age))
             {
-              *current_damage = clip_region;
+              cairo_rectangle_int_t damage_region;
+
+              *current_fb_damage = fb_clip_region;
 
               for (i = 1; i <= age; i++)
                 {
-                  cairo_rectangle_int_t *damage =
+                  cairo_rectangle_int_t *fb_damage =
                     &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - i - 1)];
 
-                  _clutter_util_rectangle_union (&clip_region, damage, &clip_region);
+                  _clutter_util_rectangle_union (&fb_clip_region,
+                                                 fb_damage,
+                                                 &fb_clip_region);
                 }
 
               /* Update the bounding redraw clip state with the extra damage. */
+              damage_region = (cairo_rectangle_int_t) {
+                .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
+                .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
+                .width = ceilf (fb_clip_region.width / fb_scale),
+                .height = ceilf (fb_clip_region.height / fb_scale)
+              };
               _clutter_util_rectangle_union (&stage_cogl->bounding_redraw_clip,
-                                             &clip_region,
+                                             &damage_region,
                                              &stage_cogl->bounding_redraw_clip);
 
               CLUTTER_NOTE (CLIPPING, "Reusing back buffer(age=%d) - repairing region: x=%d, y=%d, width=%d, height=%d\n",
                             age,
-                            clip_region.x,
-                            clip_region.y,
-                            clip_region.width,
-                            clip_region.height);
+                            fb_clip_region.x,
+                            fb_clip_region.y,
+                            fb_clip_region.width,
+                            fb_clip_region.height);
 
               swap_with_damage = TRUE;
             }
@@ -600,7 +669,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
             {
               CLUTTER_NOTE (CLIPPING, "Invalid back buffer(age=%d): forcing full redraw\n", age);
               use_clipped_redraw = FALSE;
-              *current_damage = view_rect;
+              *current_fb_damage = (cairo_rectangle_int_t) {
+                .x = 0,
+                .y = 0,
+                .width = view_rect.width * fb_scale,
+                .height = view_rect.height * fb_scale
+              };
             }
         }
       else if (!use_clipped_redraw)
@@ -616,26 +690,34 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
     }
   else if (use_clipped_redraw)
     {
-      int scissor_x;
-      int scissor_y;
+      cairo_rectangle_int_t scissor_rect;
+
+      calculate_scissor_region (&fb_clip_region,
+                                subpixel_compensation,
+                                fb_width, fb_height,
+                                &scissor_rect);
 
       CLUTTER_NOTE (CLIPPING,
                     "Stage clip pushed: x=%d, y=%d, width=%d, height=%d\n",
-                    clip_region.x,
-                    clip_region.y,
-                    clip_region.width,
-                    clip_region.height);
+                    scissor_rect.x,
+                    scissor_rect.y,
+                    scissor_rect.width,
+                    scissor_rect.height);
 
       stage_cogl->using_clipped_redraw = TRUE;
 
-      scissor_x = (clip_region.x - view_rect.x) * fb_scale;
-      scissor_y = (clip_region.y - view_rect.y) * fb_scale;
       cogl_framebuffer_push_scissor_clip (fb,
-                                          scissor_x,
-                                          scissor_y,
-                                          clip_region.width * fb_scale,
-                                          clip_region.height * fb_scale);
-      paint_stage (stage_cogl, view, &clip_region);
+                                          scissor_rect.x,
+                                          scissor_rect.y,
+                                          scissor_rect.width,
+                                          scissor_rect.height);
+      paint_stage (stage_cogl, view,
+                   &(cairo_rectangle_int_t) {
+                     .x = view_rect.x + floorf ((fb_clip_region.x - 0) / fb_scale),
+                     .y = view_rect.y + floorf ((fb_clip_region.y - 0) / fb_scale),
+                     .width = ceilf ((fb_clip_region.width + 0) / fb_scale),
+                     .height = ceilf ((fb_clip_region.height + 0) / fb_scale)
+                   });
       cogl_framebuffer_pop_clip (fb);
 
       stage_cogl->using_clipped_redraw = FALSE;
@@ -650,17 +732,25 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
           may_use_clipped_redraw &&
           !clip_region_empty)
         {
-          int scissor_x;
-          int scissor_y;
+          cairo_rectangle_int_t scissor_rect;
+
+          calculate_scissor_region (&fb_clip_region,
+                                    subpixel_compensation,
+                                    fb_width, fb_height,
+                                    &scissor_rect);
 
-          scissor_x = (clip_region.x - view_rect.x) * fb_scale;;
-          scissor_y = (clip_region.y - view_rect.y) * fb_scale;
           cogl_framebuffer_push_scissor_clip (fb,
-                                              scissor_x,
-                                              scissor_y,
-                                              clip_region.width * fb_scale,
-                                              clip_region.height * fb_scale);
-          paint_stage (stage_cogl, view, &clip_region);
+                                              scissor_rect.x,
+                                              scissor_rect.y,
+                                              scissor_rect.width,
+                                              scissor_rect.height);
+          paint_stage (stage_cogl, view,
+                       &(cairo_rectangle_int_t) {
+                         .x = view_rect.x + floorf (fb_clip_region.x / fb_scale),
+                         .y = view_rect.y + floorf (fb_clip_region.y / fb_scale),
+                         .width = ceilf (fb_clip_region.width / fb_scale),
+                         .height = ceilf (fb_clip_region.height / fb_scale)
+                       });
           cogl_framebuffer_pop_clip (fb);
         }
       else
@@ -723,12 +813,7 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
         }
       else if (use_clipped_redraw)
         {
-          swap_region = (cairo_rectangle_int_t) {
-            .x = (clip_region.x - view_rect.x) * fb_scale,
-            .y = (clip_region.y - view_rect.y) * fb_scale,
-            .width = clip_region.width * fb_scale,
-            .height = clip_region.height * fb_scale,
-          };
+          swap_region = fb_clip_region;
           g_assert (swap_region.width > 0);
           do_swap_buffer = TRUE;
         }
@@ -810,9 +895,25 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
   gboolean has_buffer_age =
     cogl_is_onscreen (framebuffer) &&
     cogl_clutter_winsys_has_feature (COGL_WINSYS_FEATURE_BUFFER_AGE);
-  cairo_rectangle_int_t *rect;
+  float fb_scale;
+  gboolean scale_is_fractional;
 
-  if (!has_buffer_age)
+  fb_scale = clutter_stage_view_get_scale (view);
+  if (fb_scale != floorf (fb_scale))
+    scale_is_fractional = TRUE;
+  else
+    scale_is_fractional = FALSE;
+
+  /*
+   * Buffer damage is tracked in the framebuffer coordinate space
+   * using the damage history. When fractional scaling is used, a
+   * coordinate on the stage might not correspond to the exact position of any
+   * physical pixel, which causes issues when painting using the pick mode.
+   *
+   * For now, always use the (0, 0) pixel for picking when using fractional
+   * framebuffer scaling.
+   */
+  if (!has_buffer_age || scale_is_fractional)
     {
       *x = 0;
       *y = 0;
@@ -823,12 +924,13 @@ clutter_stage_cogl_get_dirty_pixel (ClutterStageWindow *stage_window,
       ClutterStageViewCoglPrivate *view_priv =
         clutter_stage_view_cogl_get_instance_private (view_cogl);
       cairo_rectangle_int_t view_layout;
+      cairo_rectangle_int_t *fb_damage;
 
       clutter_stage_view_get_layout (view, &view_layout);
 
-      rect = &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - 1)];
-      *x = rect->x - view_layout.x;
-      *y = rect->y - view_layout.y;
+      fb_damage = &view_priv->damage_history[DAMAGE_HISTORY (view_priv->damage_index - 1)];
+      *x = fb_damage->x / fb_scale;
+      *y = fb_damage->y / fb_scale;
     }
 }
 

clutter/clutter/evdev/clutter-device-manager-evdev.c

@@ -59,9 +59,6 @@
 
 #include "clutter-device-manager-evdev.h"
 
-#define DISCRETE_SCROLL_STEP 10.0
-
-
 /*
  * Clutter makes the assumption that two core devices have ID's 2 and 3 (core
  * pointer and core keyboard).
@@ -400,120 +397,6 @@ notify_relative_tool_motion (ClutterInputDevice *input_device,
   queue_event (event);
 }
 
-static ClutterScrollDirection
-discrete_to_direction (gdouble discrete_x,
-                       gdouble discrete_y)
-{
-  if (discrete_x > 0)
-    return CLUTTER_SCROLL_RIGHT;
-  else if (discrete_x < 0)
-    return CLUTTER_SCROLL_LEFT;
-  else if (discrete_y > 0)
-    return CLUTTER_SCROLL_DOWN;
-  else if (discrete_y < 0)
-    return CLUTTER_SCROLL_UP;
-  else
-    return CLUTTER_SCROLL_SMOOTH;
-}
-
-static void
-notify_discrete_scroll (ClutterInputDevice     *input_device,
-                        guint64                 time_us,
-                        ClutterScrollDirection  direction,
-                        ClutterScrollSource     scroll_source,
-                        gboolean                emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-
-  if (direction == CLUTTER_SCROLL_SMOOTH)
-    return;
-
-  /* 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 (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  event->scroll.direction = direction;
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = scroll_source;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
-static void
-notify_scroll (ClutterInputDevice       *input_device,
-               guint64                   time_us,
-               gdouble                   dx,
-               gdouble                   dy,
-               ClutterScrollSource       source,
-               ClutterScrollFinishFlags  flags,
-               gboolean                  emulated)
-{
-  ClutterInputDeviceEvdev *device_evdev;
-  ClutterSeatEvdev *seat;
-  ClutterStage *stage;
-  ClutterEvent *event = NULL;
-  gdouble scroll_factor;
-
-  /* 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 (CLUTTER_SCROLL);
-
-  _clutter_evdev_event_set_time_usec (event, time_us);
-  event->scroll.time = us2ms (time_us);
-  event->scroll.stage = CLUTTER_STAGE (stage);
-  event->scroll.device = seat->core_pointer;
-  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
-
-  /* libinput pointer axis events are in pointer motion coordinate space.
-   * To convert to Xi2 discrete step coordinate space, multiply the factor
-   * 1/10. */
-  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
-  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
-  clutter_event_set_scroll_delta (event,
-                                  scroll_factor * dx,
-                                  scroll_factor * dy);
-
-  event->scroll.x = seat->pointer_x;
-  event->scroll.y = seat->pointer_y;
-  clutter_event_set_device (event, seat->core_pointer);
-  clutter_event_set_source_device (event, input_device);
-  event->scroll.scroll_source = source;
-  event->scroll.finish_flags = flags;
-
-  _clutter_event_set_pointer_emulated (event, emulated);
-
-  queue_event (event);
-}
-
 static void
 notify_touch_event (ClutterInputDevice *input_device,
 		    ClutterEventType    evtype,
@@ -1153,40 +1036,6 @@ process_base_event (ClutterDeviceManagerEvdev *manager_evdev,
   return handled;
 }
 
-static void
-check_notify_discrete_scroll (ClutterDeviceManagerEvdev *manager_evdev,
-                              ClutterInputDevice        *device,
-                              guint64                    time_us,
-                              ClutterScrollSource        scroll_source)
-{
-  ClutterInputDeviceEvdev *device_evdev =
-    CLUTTER_INPUT_DEVICE_EVDEV (device);
-  ClutterSeatEvdev *seat = _clutter_input_device_evdev_get_seat (device_evdev);
-  int i, n_xscrolls, n_yscrolls;
-
-  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
-  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
-
-  for (i = 0; i < n_xscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dx > 0 ?
-                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
-                              scroll_source, TRUE);
-    }
-
-  for (i = 0; i < n_yscrolls; i++)
-    {
-      notify_discrete_scroll (device, time_us,
-                              seat->accum_scroll_dy > 0 ?
-                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
-                              scroll_source, TRUE);
-    }
-
-  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
-  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
-}
-
 static ClutterScrollSource
 translate_scroll_source (enum libinput_pointer_axis_source source)
 {
@@ -1334,6 +1183,68 @@ seat_from_device (ClutterInputDevice *device)
   return _clutter_input_device_evdev_get_seat (device_evdev);
 }
 
+static void
+notify_continuous_axis (ClutterSeatEvdev              *seat,
+                        ClutterInputDevice            *device,
+                        uint64_t                       time_us,
+                        ClutterScrollSource            scroll_source,
+                        struct libinput_event_pointer *axis_event)
+{
+  gdouble dx = 0.0, dy = 0.0;
+  ClutterScrollFinishFlags finish_flags = CLUTTER_SCROLL_FINISHED_NONE;
+
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+    {
+      dx = libinput_event_pointer_get_axis_value (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+
+      if (fabs (dx) < DBL_EPSILON)
+        finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
+    }
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+    {
+      dy = libinput_event_pointer_get_axis_value (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+
+      if (fabs (dy) < DBL_EPSILON)
+        finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
+    }
+
+  clutter_seat_evdev_notify_scroll_continuous (seat, device, time_us,
+                                               dx, dy,
+                                               scroll_source, finish_flags);
+}
+
+static void
+notify_discrete_axis (ClutterSeatEvdev              *seat,
+                      ClutterInputDevice            *device,
+                      uint64_t                       time_us,
+                      ClutterScrollSource            scroll_source,
+                      struct libinput_event_pointer *axis_event)
+{
+  gdouble discrete_dx = 0.0, discrete_dy = 0.0;
+
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL))
+    {
+      discrete_dx = libinput_event_pointer_get_axis_value_discrete (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL);
+    }
+  if (libinput_event_pointer_has_axis (axis_event,
+                                       LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL))
+    {
+      discrete_dy = libinput_event_pointer_get_axis_value_discrete (
+          axis_event, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
+    }
+
+  clutter_seat_evdev_notify_discrete_scroll (seat, device,
+                                             time_us,
+                                             discrete_dx, discrete_dy,
+                                             scroll_source);
+}
+
 static gboolean
 process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
                       struct libinput_event *event)
@@ -1460,17 +1371,12 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
 
     case LIBINPUT_EVENT_POINTER_AXIS:
       {
-        gdouble dx = 0.0, dy = 0.0;
-        gdouble discrete_x = 0.0, discrete_y = 0.0;
         guint64 time_us;
-        gboolean wheel = FALSE;
-        enum libinput_pointer_axis axis;
         enum libinput_pointer_axis_source source;
         struct libinput_event_pointer *axis_event =
           libinput_event_get_pointer_event (event);
         ClutterSeatEvdev *seat;
         ClutterScrollSource scroll_source;
-        ClutterScrollFinishFlags finish_flags = 0;
 
         device = libinput_device_get_user_data (libinput_device);
         seat = _clutter_input_device_evdev_get_seat (CLUTTER_INPUT_DEVICE_EVDEV (device));
@@ -1484,63 +1390,20 @@ process_device_event (ClutterDeviceManagerEvdev *manager_evdev,
            backwards-compat with existing clients, we just send multiples of
            the click count. */
 
-        if (source == LIBINPUT_POINTER_AXIS_SOURCE_WHEEL)
-            wheel = TRUE;
-
-        axis = LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL;
-        if (libinput_event_pointer_has_axis (axis_event, axis))
+        switch (scroll_source)
           {
-            discrete_y = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
-            dy = libinput_event_pointer_get_axis_value (axis_event, axis);
-
-            if (wheel)
-              seat->accum_scroll_dy = 0;
-            else if (fabs (dy) < DBL_EPSILON)
-              {
-                finish_flags |= CLUTTER_SCROLL_FINISHED_VERTICAL;
-                seat->accum_scroll_dy = 0;
-              }
-            else
-              seat->accum_scroll_dy += dy;
+          case CLUTTER_SCROLL_SOURCE_WHEEL:
+            notify_discrete_axis (seat, device, time_us, scroll_source,
+                                  axis_event);
+            break;
+          case CLUTTER_SCROLL_SOURCE_FINGER:
+          case CLUTTER_SCROLL_SOURCE_CONTINUOUS:
+          case CLUTTER_SCROLL_SOURCE_UNKNOWN:
+            notify_continuous_axis (seat, device, time_us, scroll_source,
+                                    axis_event);
+            break;
           }
-
-        axis = LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL;
-        if (libinput_event_pointer_has_axis (axis_event, axis))
-          {
-            discrete_x = libinput_event_pointer_get_axis_value_discrete (axis_event, axis);
-            dx = libinput_event_pointer_get_axis_value (axis_event, axis);
-
-            if (wheel)
-              seat->accum_scroll_dx = 0;
-            else if (fabs (dx) < DBL_EPSILON)
-              {
-                finish_flags |= CLUTTER_SCROLL_FINISHED_HORIZONTAL;
-                seat->accum_scroll_dx = 0;
-              }
-            else
-              seat->accum_scroll_dx += dx;
-          }
-
-        if (wheel)
-          {
-            notify_scroll (device, time_us,
-                           discrete_x * DISCRETE_SCROLL_STEP,
-                           discrete_y * DISCRETE_SCROLL_STEP,
-                           scroll_source, finish_flags, TRUE);
-            notify_discrete_scroll (device, time_us,
-                                    discrete_to_direction (discrete_x, discrete_y),
-                                    scroll_source, FALSE);
-          }
-        else
-          {
-            notify_scroll (device, time_us, dx, dy,
-                           scroll_source, finish_flags, FALSE);
-            check_notify_discrete_scroll (manager_evdev, device,
-                                          time_us, scroll_source);
-          }
-
         break;
-
       }
 
     case LIBINPUT_EVENT_TOUCH_DOWN:
@@ -2602,6 +2465,21 @@ clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
   xkb_state_update_mask (state, depressed_mods, latched_mods, locked_mods, 0, 0, idx);
 }
 
+/**
+ * clutter_evdev_get_keyboard_layout_index: (skip)
+ */
+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);
+  state = manager_evdev->priv->main_seat->xkb;
+
+  return xkb_state_serialize_layout (state, XKB_STATE_LAYOUT_LOCKED);
+}
+
 /**
  * clutter_evdev_set_keyboard_numlock: (skip)
  * @evdev: the #ClutterDeviceManager created by the evdev backend

clutter/clutter/evdev/clutter-evdev.h

@@ -120,6 +120,9 @@ CLUTTER_AVAILABLE_IN_1_20
 void clutter_evdev_set_keyboard_layout_index (ClutterDeviceManager *evdev,
                                               xkb_layout_index_t    idx);
 
+CLUTTER_AVAILABLE_IN_MUTTER
+xkb_layout_index_t clutter_evdev_get_keyboard_layout_index (ClutterDeviceManager *evdev);
+
 CLUTTER_AVAILABLE_IN_1_26
 void clutter_evdev_set_keyboard_numlock (ClutterDeviceManager *evdev,
                                          gboolean              numlock_state);

clutter/clutter/evdev/clutter-input-device-evdev.c

@@ -163,6 +163,9 @@ clutter_input_device_evdev_update_from_tool (ClutterInputDevice     *device,
   if (libinput_tablet_tool_has_slider (evdev_tool->tool))
     _clutter_input_device_add_axis (device, CLUTTER_INPUT_AXIS_SLIDER, -1, 1, 0);
 
+  if (libinput_tablet_tool_has_wheel (evdev_tool->tool))
+    _clutter_input_device_add_axis (device, CLUTTER_INPUT_AXIS_WHEEL, -180, 180, 0);
+
   g_object_thaw_notify (G_OBJECT (device));
 }
 

clutter/clutter/evdev/clutter-seat-evdev.c

@@ -29,6 +29,7 @@
 #include "clutter-seat-evdev.h"
 
 #include <linux/input.h>
+#include <math.h>
 
 #include "clutter-event-private.h"
 #include "clutter-input-device-evdev.h"
@@ -42,6 +43,8 @@
 
 #define AUTOREPEAT_VALUE 2
 
+#define DISCRETE_SCROLL_STEP 10.0
+
 void
 clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                       struct libinput_seat *libinput_seat)
@@ -569,6 +572,194 @@ clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
   queue_event (event);
 }
 
+static void
+notify_scroll (ClutterInputDevice       *input_device,
+               guint64                   time_us,
+               gdouble                   dx,
+               gdouble                   dy,
+               ClutterScrollSource       scroll_source,
+               ClutterScrollFinishFlags  flags,
+               gboolean                  emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+  gdouble scroll_factor;
+
+  /* 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 (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  /* libinput pointer axis events are in pointer motion coordinate space.
+   * To convert to Xi2 discrete step coordinate space, multiply the factor
+   * 1/10. */
+  event->scroll.direction = CLUTTER_SCROLL_SMOOTH;
+  scroll_factor = 1.0 / DISCRETE_SCROLL_STEP;
+  clutter_event_set_scroll_delta (event,
+                                  scroll_factor * dx,
+                                  scroll_factor * dy);
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = scroll_source;
+  event->scroll.finish_flags = flags;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+notify_discrete_scroll (ClutterInputDevice     *input_device,
+                        uint64_t                time_us,
+                        ClutterScrollDirection  direction,
+                        ClutterScrollSource     scroll_source,
+                        gboolean                emulated)
+{
+  ClutterInputDeviceEvdev *device_evdev;
+  ClutterSeatEvdev *seat;
+  ClutterStage *stage;
+  ClutterEvent *event = NULL;
+
+  if (direction == CLUTTER_SCROLL_SMOOTH)
+    return;
+
+  /* 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 (CLUTTER_SCROLL);
+
+  _clutter_evdev_event_set_time_usec (event, time_us);
+  event->scroll.time = us2ms (time_us);
+  event->scroll.stage = CLUTTER_STAGE (stage);
+  event->scroll.device = seat->core_pointer;
+  _clutter_xkb_translate_state (event, seat->xkb, seat->button_state);
+
+  event->scroll.direction = direction;
+
+  event->scroll.x = seat->pointer_x;
+  event->scroll.y = seat->pointer_y;
+  clutter_event_set_device (event, seat->core_pointer);
+  clutter_event_set_source_device (event, input_device);
+  event->scroll.scroll_source = scroll_source;
+
+  _clutter_event_set_pointer_emulated (event, emulated);
+
+  queue_event (event);
+}
+
+static void
+check_notify_discrete_scroll (ClutterSeatEvdev   *seat,
+                              ClutterInputDevice *device,
+                              uint64_t            time_us,
+                              ClutterScrollSource scroll_source)
+{
+  int i, n_xscrolls, n_yscrolls;
+
+  n_xscrolls = floor (fabs (seat->accum_scroll_dx) / DISCRETE_SCROLL_STEP);
+  n_yscrolls = floor (fabs (seat->accum_scroll_dy) / DISCRETE_SCROLL_STEP);
+
+  for (i = 0; i < n_xscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dx > 0 ?
+                              CLUTTER_SCROLL_RIGHT : CLUTTER_SCROLL_LEFT,
+                              scroll_source, TRUE);
+    }
+
+  for (i = 0; i < n_yscrolls; i++)
+    {
+      notify_discrete_scroll (device, time_us,
+                              seat->accum_scroll_dy > 0 ?
+                              CLUTTER_SCROLL_DOWN : CLUTTER_SCROLL_UP,
+                              scroll_source, TRUE);
+    }
+
+  seat->accum_scroll_dx = fmodf (seat->accum_scroll_dx, DISCRETE_SCROLL_STEP);
+  seat->accum_scroll_dy = fmodf (seat->accum_scroll_dy, DISCRETE_SCROLL_STEP);
+}
+
+void
+clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
+                                             ClutterInputDevice       *input_device,
+                                             uint64_t                  time_us,
+                                             double                    dx,
+                                             double                    dy,
+                                             ClutterScrollSource       scroll_source,
+                                             ClutterScrollFinishFlags  finish_flags)
+{
+  if (finish_flags & CLUTTER_SCROLL_FINISHED_HORIZONTAL)
+    seat->accum_scroll_dx = 0;
+  else
+    seat->accum_scroll_dx += dx;
+
+  if (finish_flags & CLUTTER_SCROLL_FINISHED_VERTICAL)
+    seat->accum_scroll_dy = 0;
+  else
+    seat->accum_scroll_dy += dy;
+
+  notify_scroll (input_device, time_us, dx, dy, scroll_source,
+                 finish_flags, FALSE);
+  check_notify_discrete_scroll (seat, input_device, time_us, scroll_source);
+}
+
+static ClutterScrollDirection
+discrete_to_direction (double discrete_dx,
+                       double discrete_dy)
+{
+  if (discrete_dx > 0)
+    return CLUTTER_SCROLL_RIGHT;
+  else if (discrete_dx < 0)
+    return CLUTTER_SCROLL_LEFT;
+  else if (discrete_dy > 0)
+    return CLUTTER_SCROLL_DOWN;
+  else if (discrete_dy < 0)
+    return CLUTTER_SCROLL_UP;
+  else
+    g_assert_not_reached ();
+}
+
+void
+clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
+                                           ClutterInputDevice  *input_device,
+                                           uint64_t             time_us,
+                                           double               discrete_dx,
+                                           double               discrete_dy,
+                                           ClutterScrollSource  scroll_source)
+{
+  notify_scroll (input_device, time_us,
+                 discrete_dx * DISCRETE_SCROLL_STEP,
+                 discrete_dy * DISCRETE_SCROLL_STEP,
+                 scroll_source, CLUTTER_SCROLL_FINISHED_NONE,
+                 TRUE);
+  notify_discrete_scroll (input_device, time_us,
+                          discrete_to_direction (discrete_dx, discrete_dy),
+                          scroll_source, FALSE);
+
+}
+
 void
 clutter_seat_evdev_free (ClutterSeatEvdev *seat)
 {

clutter/clutter/evdev/clutter-seat-evdev.h

@@ -106,6 +106,21 @@ void clutter_seat_evdev_notify_button (ClutterSeatEvdev   *seat,
                                        uint32_t            button,
                                        uint32_t            state);
 
+void clutter_seat_evdev_notify_scroll_continuous (ClutterSeatEvdev         *seat,
+                                                  ClutterInputDevice       *input_device,
+                                                  uint64_t                  time_us,
+                                                  double                    dx,
+                                                  double                    dy,
+                                                  ClutterScrollSource       source,
+                                                  ClutterScrollFinishFlags  flags);
+
+void clutter_seat_evdev_notify_discrete_scroll (ClutterSeatEvdev    *seat,
+                                                ClutterInputDevice  *input_device,
+                                                uint64_t             time_us,
+                                                double               discrete_dx,
+                                                double               discrete_dy,
+                                                ClutterScrollSource  source);
+
 void clutter_seat_evdev_set_libinput_seat (ClutterSeatEvdev     *seat,
                                            struct libinput_seat *libinput_seat);
 

clutter/clutter/evdev/clutter-virtual-input-device-evdev.c

@@ -156,6 +156,9 @@ clutter_virtual_input_device_evdev_notify_relative_motion (ClutterVirtualInputDe
   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_relative_motion (virtual_evdev->seat,
                                              virtual_evdev->device,
                                              time_us,
@@ -172,6 +175,9 @@ clutter_virtual_input_device_evdev_notify_absolute_motion (ClutterVirtualInputDe
   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_absolute_motion (virtual_evdev->seat,
                                              virtual_evdev->device,
                                              time_us,
@@ -189,6 +195,9 @@ clutter_virtual_input_device_evdev_notify_button (ClutterVirtualInputDevice *vir
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
   int button_count;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (get_button_type (button) != EVDEV_BUTTON_TYPE_BUTTON)
     {
       g_warning ("Unknown/invalid virtual device button 0x%x pressed",
@@ -222,6 +231,9 @@ clutter_virtual_input_device_evdev_notify_key (ClutterVirtualInputDevice *virtua
     CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
   int key_count;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (get_button_type (key) != EVDEV_BUTTON_TYPE_KEY)
     {
       g_warning ("Unknown/invalid virtual device key 0x%x pressed\n", key);
@@ -343,6 +355,9 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
   int key_count;
   guint keycode = 0, level = 0, evcode = 0;
 
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
   if (!pick_keycode_for_keyval_in_current_group (virtual_device,
                                                  keyval, &keycode, &level))
     {
@@ -382,6 +397,57 @@ clutter_virtual_input_device_evdev_notify_keyval (ClutterVirtualInputDevice *vir
     apply_level_modifiers (virtual_device, time_us, level, key_state);
 }
 
+static void
+direction_to_discrete (ClutterScrollDirection direction,
+                       double                *discrete_dx,
+                       double                *discrete_dy)
+{
+  switch (direction)
+    {
+    case CLUTTER_SCROLL_UP:
+      *discrete_dx = 0.0;
+      *discrete_dy = -1.0;
+      break;
+    case CLUTTER_SCROLL_DOWN:
+      *discrete_dx = 0.0;
+      *discrete_dy = 1.0;
+      break;
+    case CLUTTER_SCROLL_LEFT:
+      *discrete_dx = -1.0;
+      *discrete_dy = 0.0;
+      break;
+    case CLUTTER_SCROLL_RIGHT:
+      *discrete_dx = 1.0;
+      *discrete_dy = 0.0;
+      break;
+    case CLUTTER_SCROLL_SMOOTH:
+      g_assert_not_reached ();
+      break;
+    }
+}
+
+static void
+clutter_virtual_input_device_evdev_notify_discrete_scroll (ClutterVirtualInputDevice *virtual_device,
+                                                           uint64_t                   time_us,
+                                                           ClutterScrollDirection     direction,
+                                                           ClutterScrollSource        scroll_source)
+{
+  ClutterVirtualInputDeviceEvdev *virtual_evdev =
+    CLUTTER_VIRTUAL_INPUT_DEVICE_EVDEV (virtual_device);
+  double discrete_dx = 0.0, discrete_dy = 0.0;
+
+  if (time_us == CLUTTER_CURRENT_TIME)
+    time_us = g_get_monotonic_time ();
+
+  direction_to_discrete (direction, &discrete_dx, &discrete_dy);
+
+  clutter_seat_evdev_notify_discrete_scroll (virtual_evdev->seat,
+                                             virtual_evdev->device,
+                                             time_us,
+                                             discrete_dx, discrete_dy,
+                                             scroll_source);
+}
+
 static void
 clutter_virtual_input_device_evdev_get_property (GObject    *object,
                                                  guint       prop_id,
@@ -485,6 +551,7 @@ clutter_virtual_input_device_evdev_class_init (ClutterVirtualInputDeviceEvdevCla
   virtual_input_device_class->notify_button = clutter_virtual_input_device_evdev_notify_button;
   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;
 
   obj_props[PROP_SEAT] = g_param_spec_pointer ("seat",
                                                P_("ClutterSeatEvdev"),

clutter/clutter/x11/clutter-device-manager-xi2.c

@@ -66,6 +66,14 @@ static const char *clutter_input_axis_atom_names[] = {
 
 #define N_AXIS_ATOMS    G_N_ELEMENTS (clutter_input_axis_atom_names)
 
+enum {
+  PAD_AXIS_FIRST  = 3, /* First axes are always x/y/pressure, ignored in pads */
+  PAD_AXIS_STRIP1 = PAD_AXIS_FIRST,
+  PAD_AXIS_STRIP2,
+  PAD_AXIS_RING1,
+  PAD_AXIS_RING2,
+};
+
 static Atom clutter_input_axis_atoms[N_AXIS_ATOMS] = { 0, };
 
 static void clutter_event_translator_iface_init (ClutterEventTranslatorIface *iface);
@@ -359,6 +367,36 @@ get_device_node_path (ClutterBackendX11  *backend_x11,
   return node_path;
 }
 
+static void
+get_pad_features (XIDeviceInfo *info,
+                  guint        *n_rings,
+                  guint        *n_strips)
+{
+  gint i, rings = 0, strips = 0;
+
+  for (i = PAD_AXIS_FIRST; i < info->num_classes; i++)
+    {
+      XIValuatorClassInfo *valuator = (XIValuatorClassInfo*) info->classes[i];
+      int axis = valuator->number;
+
+      if (valuator->type != XIValuatorClass)
+        continue;
+      if (valuator->max <= 1)
+        continue;
+
+      /* Ring/strip axes are fixed in pad devices as handled by the
+       * wacom driver. Match those to detect pad features.
+       */
+      if (axis == PAD_AXIS_STRIP1 || axis == PAD_AXIS_STRIP2)
+        strips++;
+      else if (axis == PAD_AXIS_RING1 || axis == PAD_AXIS_RING2)
+        rings++;
+    }
+
+  *n_rings = rings;
+  *n_strips = strips;
+}
+
 static ClutterInputDevice *
 create_device (ClutterDeviceManagerXI2 *manager_xi2,
                ClutterBackendX11       *backend_x11,
@@ -368,7 +406,7 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
   ClutterInputDevice *retval;
   ClutterInputMode mode;
   gboolean is_enabled;
-  guint num_touches = 0;
+  guint num_touches = 0, num_rings = 0, num_strips = 0;
   gchar *vendor_id = NULL, *product_id = NULL, *node_path = NULL;
 
   if (info->use == XIMasterKeyboard || info->use == XISlaveKeyboard)
@@ -436,6 +474,12 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
       node_path = get_device_node_path (backend_x11, info);
     }
 
+  if (source == CLUTTER_PAD_DEVICE)
+    {
+      is_enabled = TRUE;
+      get_pad_features (info, &num_rings, &num_strips);
+    }
+
   retval = g_object_new (CLUTTER_TYPE_INPUT_DEVICE_XI2,
                          "name", info->name,
                          "id", info->deviceid,
@@ -448,6 +492,8 @@ create_device (ClutterDeviceManagerXI2 *manager_xi2,
                          "vendor-id", vendor_id,
                          "product-id", product_id,
                          "device-node", node_path,
+                         "n-rings", num_rings,
+                         "n-strips", num_strips,
                          NULL);
 
   translate_device_classes (backend_x11->xdpy, retval,
@@ -847,6 +893,54 @@ translate_axes (ClutterInputDevice *device,
   return retval;
 }
 
+static gboolean
+translate_pad_axis (ClutterInputDevice *device,
+                    XIValuatorState    *valuators,
+                    ClutterEventType   *evtype,
+                    guint              *number,
+                    gdouble            *value)
+{
+  double *values;
+  gint i;
+
+  values = valuators->values;
+
+  for (i = PAD_AXIS_FIRST; i < valuators->mask_len * 8; i++)
+    {
+      gdouble val;
+      guint axis_number = 0;
+
+      if (!XIMaskIsSet (valuators->mask, i))
+        continue;
+
+      val = *values++;
+      if (val <= 0)
+        continue;
+
+      _clutter_input_device_translate_axis (device, i, val, value);
+
+      if (i == PAD_AXIS_RING1 || i == PAD_AXIS_RING2)
+        {
+          *evtype = CLUTTER_PAD_RING;
+          (*value) *= 360.0;
+        }
+      else if (i == PAD_AXIS_STRIP1 || i == PAD_AXIS_STRIP2)
+        {
+          *evtype = CLUTTER_PAD_STRIP;
+        }
+      else
+        continue;
+
+      if (i == PAD_AXIS_STRIP2 || i == PAD_AXIS_RING2)
+        axis_number++;
+
+      *number = axis_number;
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
 static void
 translate_coords (ClutterStageX11 *stage_x11,
                   gdouble          event_x,
@@ -1025,6 +1119,54 @@ handle_property_event (ClutterDeviceManagerXI2 *manager_xi2,
     }
 }
 
+static gboolean
+translate_pad_event (ClutterEvent       *event,
+                     XIDeviceEvent      *xev,
+                     ClutterInputDevice *device)
+{
+  gdouble value;
+  guint number;
+
+  if (!translate_pad_axis (device, &xev->valuators,
+                           &event->any.type,
+                           &number, &value))
+    return FALSE;
+
+  /* When touching a ring/strip a first XI_Motion event
+   * is generated. Use it to reset the pad state, so
+   * later events actually have a directionality.
+   */
+  if (xev->evtype == XI_Motion)
+    value = -1;
+
+  if (event->any.type == CLUTTER_PAD_RING)
+    {
+      event->pad_ring.ring_number = number;
+      event->pad_ring.angle = value;
+    }
+  else
+    {
+      event->pad_strip.strip_number = number;
+      event->pad_strip.value = value;
+    }
+
+  event->any.time = xev->time;
+  clutter_event_set_device (event, device);
+  clutter_event_set_source_device (event, device);
+
+  CLUTTER_NOTE (EVENT,
+                "%s: win:0x%x, device:%d '%s', time:%d "
+                "(value:%f)",
+                event->any.type == CLUTTER_PAD_RING
+                ? "pad ring  "
+                : "pad strip",
+                (unsigned int) xev->event,
+                device->id,
+                device->device_name,
+                event->any.time, value);
+  return TRUE;
+}
+
 static ClutterTranslateReturn
 clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                                             gpointer                native,
@@ -1206,15 +1348,23 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
                            XIAsyncDevice,
                            xev->time);
 
-	    /* Ignore 4-7 buttons */
-            if (xev->detail >= 4 && xev->detail <= 7)
-              return CLUTTER_TRANSLATE_REMOVE;
+            event->any.stage = stage;
 
-            event->pad_button.type =
+            if (xev->detail >= 4 && xev->detail <= 7)
+              {
+                retval = CLUTTER_TRANSLATE_REMOVE;
+
+                if (xi_event->evtype == XI_ButtonPress &&
+                    translate_pad_event (event, xev, source_device))
+                  retval = CLUTTER_TRANSLATE_QUEUE;
+
+                break;
+              }
+
+            event->any.type =
               (xi_event->evtype == XI_ButtonPress) ? CLUTTER_PAD_BUTTON_PRESS
                                                    : CLUTTER_PAD_BUTTON_RELEASE;
-            event->pad_button.time = xev->time;
-            event->pad_button.stage = stage;
+            event->any.time = xev->time;
 
             /* The 4-7 button range is taken as non-existent on pad devices,
              * let the buttons above that take over this range.
@@ -1224,6 +1374,7 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
 
             /* Pad buttons are 0-indexed */
             event->pad_button.button = xev->detail - 1;
+            clutter_event_set_device (event, device);
             clutter_event_set_source_device (event, source_device);
 
             CLUTTER_NOTE (EVENT,
@@ -1380,6 +1531,15 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
         device = g_hash_table_lookup (manager_xi2->devices_by_id,
                                       GINT_TO_POINTER (xev->deviceid));
 
+        if (clutter_input_device_get_device_type (source_device) == CLUTTER_PAD_DEVICE)
+          {
+            event->any.stage = stage;
+
+            if (translate_pad_event (event, xev, source_device))
+              retval = CLUTTER_TRANSLATE_QUEUE;
+            break;
+          }
+
         /* Set the stage for core events coming out of nowhere (see bug #684509) */
         if (clutter_input_device_get_device_mode (device) == CLUTTER_INPUT_MODE_MASTER &&
             clutter_input_device_get_pointer_stage (device) == NULL &&

clutter/clutter/x11/clutter-settings-x11.h

@@ -10,12 +10,10 @@ static const struct {
   { "Net/DndDragThreshold",    "dnd-drag-threshold" },
   { "Gtk/FontName",            "font-name" },
   { "Xft/Antialias",           "font-antialias" },
-  { "Xft/DPI",                 "font-dpi" },
   { "Xft/Hinting",             "font-hinting" },
   { "Xft/HintStyle",           "font-hint-style" },
   { "Xft/RGBA",                "font-subpixel-order" },
   { "Fontconfig/Timestamp",    "fontconfig-timestamp" },
-  { "Gdk/UnscaledDPI",         "unscaled-font-dpi" },
 };
 
 static const gint _n_clutter_settings_map = G_N_ELEMENTS (_clutter_settings_map);

cogl/cogl/cogl-mutter.h

@@ -43,6 +43,7 @@
 #include <cogl/winsys/cogl-winsys-private.h>
 
 void cogl_renderer_set_custom_winsys (CoglRenderer                *renderer,
-                                      CoglCustomWinsysVtableGetter winsys_vtable_getter);
+                                      CoglCustomWinsysVtableGetter winsys_vtable_getter,
+                                      void                        *user_data);
 
 #endif /* __COGL_MUTTER_H___ */

cogl/cogl/cogl-renderer-private.h

@@ -54,6 +54,7 @@ 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;

cogl/cogl/cogl-renderer.c

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

cogl/cogl/driver/gl/cogl-framebuffer-gl.c

@@ -1417,15 +1417,17 @@ _cogl_framebuffer_gl_read_pixels_into_bitmap (CoglFramebuffer *framebuffer,
                                                             &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 ((format == COGL_PIXEL_FORMAT_BGRA_8888 ||
+  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... */

configure.ac

@@ -1,15 +1,15 @@
 AC_PREREQ(2.62)
 
 m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [25])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_minor_version], [27])
+m4_define([mutter_micro_version], [1])
 
 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], [0])
+m4_define([libmutter_api_version], [1])
 
 AC_INIT([mutter], [mutter_version],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=mutter])
@@ -80,6 +80,7 @@ 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
@@ -225,10 +226,10 @@ AC_MSG_CHECKING([gudev])
 if test x$with_gudev = xno ; then
   AC_MSG_RESULT([disabled])
 else
-  if $PKG_CONFIG --exists gudev-1.0; then
+  if $PKG_CONFIG --exists "gudev-1.0 >= 232"; then
     have_gudev=yes
     AC_MSG_RESULT(yes)
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0"
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gudev-1.0 >= 232"
     AC_DEFINE([HAVE_LIBGUDEV], 1, [Building with gudev for device type detection])
   else
     AC_MSG_RESULT(no)
@@ -238,6 +239,21 @@ else
   fi
 fi
 
+AC_ARG_ENABLE(remote-desktop,
+  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.1 >= 0.1.4"
+  PKG_CHECK_EXISTS([libpipewire-0.1], [
+    pw_micro=`$PKG_CONFIG --modversion libpipewire-0.1 | cut -d. -f3`
+    AC_DEFINE_UNQUOTED([PIPEWIRE_VERSION_MICRO],[$pw_micro], [Pipewire micro version used])
+  ])
+  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"])
+
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
 
@@ -275,7 +291,7 @@ AS_IF([test "$enable_egl_device" = "yes"], [
   AC_DEFINE([HAVE_EGL_DEVICE],[1], [Defined if EGLDevice support is enabled])
 ])
 
-MUTTER_WAYLAND_MODULES="wayland-server >= 1.6.90"
+MUTTER_WAYLAND_MODULES="wayland-server >= 1.13.0"
 
 AC_ARG_ENABLE(wayland,
   AS_HELP_STRING([--disable-wayland], [disable mutter on wayland support]),,
@@ -292,7 +308,7 @@ 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.7],
+  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)
 ])
@@ -513,6 +529,7 @@ mutter-$VERSION
 	Wayland:                  ${have_wayland}
 	Native (KMS) backend:     ${have_native_backend}
 	EGLDevice:                ${enable_egl_device}
+	Remote desktop:           ${enable_remote_desktop}
 "
 
 

data/Makefile.am

@@ -18,7 +18,7 @@ gschema_in_files = \
 gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml)
 
 %.gschema.xml: %.gschema.xml.in Makefile
-	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_DOMAIN)|g' \
+	$(AM_V_GEN) sed -e 's|@GETTEXT_DOMAIN[@]|$(GETTEXT_PACKAGE)|g' \
 	$< > $@ || rm $@
 
 @GSETTINGS_RULES@

data/org.gnome.mutter.gschema.xml.in

@@ -1,6 +1,6 @@
 <schemalist>
   <schema id="org.gnome.mutter" path="/org/gnome/mutter/"
-          gettext-domain="@GETTEXT_DOMAIN">
+          gettext-domain="@GETTEXT_DOMAIN@">
 
     <key name="overlay-key" type="s">
       <default>'Super_L'</default>
@@ -114,22 +114,16 @@
 
         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.
+        • “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>
 
@@ -156,5 +150,15 @@
       <summary>Cancel tab popup</summary>
     </key>
 
+    <key name="switch-monitor" type="as">
+      <default><![CDATA[['<Super>p','XF86Display']]]></default>
+      <summary>Switch monitor configurations</summary>
+    </key>
+
+    <key name="rotate-monitor" type="as">
+      <default><![CDATA[['XF86RotateWindows']]]></default>
+      <summary>Rotates the built-in monitor configuration</summary>
+    </key>
+
   </schema>
 </schemalist>

data/org.gnome.mutter.wayland.gschema.xml.in

@@ -49,5 +49,9 @@
       <default><![CDATA[['<Primary><Alt>F12']]]></default>
       <summary>Switch to VT 12</summary>
     </key>
+    <key name="restore-shortcuts" type="as">
+      <default><![CDATA[['<Shift><Control>Escape']]]></default>
+      <summary>Re-enable shortcuts</summary>
+    </key>
   </schema>
 </schemalist>

po/be.po

@@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-04-21 21:33+0000\n"
-"PO-Revision-Date: 2017-04-23 16:56+0300\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-01 18:44+0300\n"
 "Last-Translator: Yuras Shumovich <shumovichy@gmail.com>\n"
 "Language-Team: Belarusian <i18n-bel-gnome@googlegroups.com>\n"
 "Language: be\n"
@@ -409,7 +409,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 ""
 "Каб уключыць эксперыментальныя функцыі, дадайце адпаведнае ключавое слова ў "
 "гэты ліст. Некаторыя функцыі могуць патрабаваць перазапуску кампазітара. "
@@ -418,16 +421,27 @@ msgstr ""
 "\"scale-monitor-framebuffer\" - прымушае mutter прадвызначана размяшчаць "
 "лагічныя маніторы ў лагічнай прасторы каардынат пікселаў, пры гэтым "
 "маштабаваць кадравы буфер, а не змесціва акна, для падтрымкі HiDPI "
-"манітораў. Не патрабуе перазапуску."
+"манітораў. Не патрабуе перазапуску. • \"remote-desktop\" - уключае падтрымку "
+"аддаленых манітораў. Для падтрымкі аддаленых манітораў з супольным доступам "
+"да экрана трэба таксама ўключыць \"screen-cast\". • \"screen-cast\" - "
+"уключае падтрымку скрынкасту."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Выбраць акно з выплыўнога акенца"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Закрыць выплыўное акенца"
 
+#: 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 "Паварочвае убудаваны манітор"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Перайсці ў віртуальны тэрмінал 1"
@@ -476,10 +490,14 @@ msgstr "Перайсці ў віртуальны тэрмінал 11"
 msgid "Switch to VT 12"
 msgstr "Перайсці ў віртуальны тэрмінал 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:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Пераключыць рэжым (група %d)"
@@ -487,37 +505,37 @@ msgstr "Пераключыць рэжым (група %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Пераключыць манітор"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Паказаць экранную даведку"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Убудаваны дысплей"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Невядомы"
 
-#: src/backends/meta-monitor-manager.c:808
+#: 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:816
+#: 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -528,31 +546,6 @@ msgstr ""
 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"
@@ -594,6 +587,31 @@ msgstr "Запусціць у якасці ўложанага кампазіта
 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
+#, 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 ""

po/ca.po

@@ -5,7 +5,7 @@
 # Jesús Moreno <jmmolas@wanadoo.es>, 2002.
 # Jordi Mallach <jordi@sindominio.net>, 2003, 2004, 2005, 2006, 2007, 2008.
 # David Planella <david.planella@gmail.com>, 2008, 2009, 2011, 2012.
-# Jordi Serratosa <jordis@softcatala.cat>, 2012.
+# Jordi Serratosa <jordis@softcatala.cat>, 2012, 2017.
 # Gil Forcada <gilforcada@guifi.net>, 2012, 2013, 2014, 2016.
 #
 msgid ""
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: metacity 2.24\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-04-21 21:33+0000\n"
-"PO-Revision-Date: 2016-03-13 14:45+0100\n"
-"Last-Translator: Gil Forcada <gilforcada@guifi.net>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 2.0.1\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -105,10 +105,8 @@ msgid "Switch to previous window of an application"
 msgstr "Canvia a la finestra anterior d'una aplicació"
 
 #: data/50-mutter-navigation.xml:76
-#, fuzzy
-#| msgid "Switch system controls directly"
 msgid "Switch system controls"
-msgstr "Canvia immediatament entre els controls del sistema"
+msgstr "Canvia els controls del sistema"
 
 #: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
@@ -242,7 +240,7 @@ msgstr ""
 
 #: 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, o sinó baixa-la"
+msgstr "Alça la finestra si està coberta per una altra; altrament, baixa-la"
 
 #: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
@@ -279,12 +277,6 @@ msgstr ""
 "finestres"
 
 #: data/org.gnome.mutter.gschema.xml.in:8
-#, fuzzy
-#| 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."
 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 "
@@ -314,7 +306,7 @@ msgstr ""
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr ""
-"Habilita la tesselització a les vores en deixar anar les finestres a les "
+"Habilita la tessel·lització a les vores en deixar anar les finestres a les "
 "vores de la pantalla"
 
 #: data/org.gnome.mutter.gschema.xml.in:31
@@ -333,11 +325,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Els espais de treball es gestionen dinàmicament"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
-#, fuzzy
-#| 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -376,11 +363,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Retarda el canvi del focus fins que s'aturi el punter"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
-#, fuzzy
-#| 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."
 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 "
@@ -395,10 +377,6 @@ msgid "Draggable border width"
 msgstr "Amplada del contorn arrossegable"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
-#, fuzzy
-#| 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."
 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."
@@ -435,7 +413,7 @@ msgstr ""
 
 #: data/org.gnome.mutter.gschema.xml.in:107
 msgid "Enable experimental features"
-msgstr ""
+msgstr "Habilita les funcionalitats experimentals"
 
 #: data/org.gnome.mutter.gschema.xml.in:108
 msgid ""
@@ -446,17 +424,28 @@ 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:155
+msgid "Switch monitor configurations"
+msgstr "Canvia configuracions de monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Gira la configuració del monitor integrada"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Canvia al terminal virtual 1"
@@ -505,10 +494,14 @@ msgstr "Canvia al terminal virtual 11"
 msgid "Switch to VT 12"
 msgstr "Canvia al terminal virtual 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Torna a habilitar les dreceres"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Mode de commutació (grup %d)"
@@ -516,37 +509,37 @@ 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:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Commuta el monitor"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostra l'ajuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Desconeguda"
 
-#: src/backends/meta-monitor-manager.c:808
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Pantalla desconeguda"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:816
+#: 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -558,32 +551,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Esdeveniment de campana"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "«%s» no està responent."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "L'aplicació no està responent."
-
-#: 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 ""
-"Podeu esperar un moment perquè continuï o podeu forçar-ne la sortida "
-"completa."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Força'n la sortida"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Espera"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -631,6 +598,32 @@ msgstr "Funciona com a compositor imbricat"
 msgid "Run as a full display server, rather than nested"
 msgstr "Funciona com a servidor de pantalla completa, en comptes d'imbricat"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "«%s» no està responent."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "L'aplicació no està responent."
+
+#: 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 ""
+"Podeu esperar un moment perquè continuï o podeu forçar-ne la sortida "
+"completa."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Força'n la sortida"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Espera"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/cs.po

@@ -13,10 +13,10 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-07 12:40+0000\n"
-"PO-Revision-Date: 2017-03-09 07:51+0100\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"
@@ -361,9 +361,8 @@ msgid ""
 "focus will not be changed immediately when entering a window, but only after "
 "the pointer stops moving."
 msgstr ""
-"Je-li zapnuto a režim zaměření je buď „sloppy“ nebo „mouse“, pak se "
-"zaměření nezmění hned, když vstoupíte do kona, ale až se přestane pohybovat "
-"ukazatel."
+"Je-li zapnuto a režim zaměření je buď „sloppy“ nebo „mouse“, pak se zaměření "
+"nezmění hned, když vstoupíte do kona, ale až se přestane pohybovat ukazatel."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@@ -401,14 +400,53 @@ msgstr ""
 "Je-li zapnuto, nová okna budou vždy umístěna ve středu aktivní obrazovky "
 "monitoru."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Povolit experimentální funkce"
+
+#: 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 ""
+"Chcete-li povolit experimentální funkce, přidejte klíčové slovo funkce do "
+"seznamu. Zda funkce vyžaduje restartování kompozitoru, závisí na dané "
+"funkci. Ne u každé experimentální funkce je vyžadováno, aby byla stále "
+"dostupná nebo konfigurovatelná. Neočekávejte, že by bylo v tomto nastavení "
+"přidáno něco, co by do budoucna přineslo vylepšení. V současné době jsou "
+"možná tato klíčová slova: • „scale-monitor-framebuffer“ – zajistí, aby byl "
+"mutter výchozí pro logické uspořádání monitorů v logickém souřadnicovém "
+"prostoru pixelů, zatímco škáluje přímo v grafické vyrovnávací paměti, "
+"namísto v obsahu oken, aby se postaral o správu montorů s HiDPI. Nevyžaduje "
+"restart. • „remote-desktop“ – zapne podporu pro vzdálenou pracovní plochu. "
+"Pro podporu vzdálené plochy se sdílením obrazovky musít být zapnuto také "
+"„screen-cast“. • „screen-cast“ – zapne podporu pro vysílání obsahu obrazovky."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Vybrat okno z překryvné nabídky tabulátoru"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Zrušit překryvné okno tabulátoru"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Přepnout nastavení monitoru"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Postupně mění vestavěná nastavení monitoru"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Přepnout na VT 1"
@@ -457,10 +495,14 @@ msgstr "Přepnout na VT 11"
 msgid "Switch to VT 12"
 msgstr "Přepnout na VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Znovu povolit klávesové zkratky"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Přepínač režimu (skupina %d)"
@@ -468,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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Přepnout monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: 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:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Vestavěný displej"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -508,32 +550,6 @@ msgstr "Jiný kompozitní správce již běží na obrazovce %i displeje „%s
 msgid "Bell event"
 msgstr "Událost zvonku"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "„%s“ nereaguje."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Aplikace nereaguje."
-
-#: 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 ""
-"Je možné chvíli počkat, aby aplikace mohla pokračovat, nebo si vynutit úplné "
-"ukončení aplikace."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Vynutit ukončení"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Počkat"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -575,6 +591,32 @@ msgstr "Spustit jako podkladový kompozitor"
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustit jako plnohodnotný server displeje, nikoliv vnořeně"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "„%s“ nereaguje."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Aplikace nereaguje."
+
+#: 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 ""
+"Je možné chvíli počkat, aby aplikace mohla pokračovat, nebo si vynutit úplné "
+"ukončení aplikace."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Vynutit ukončení"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Počkat"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@@ -632,11 +674,10 @@ msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"Tato okna nepodporují „uložení aktuálního nastavení“ a po svém "
-"příštím přihlášení je budete muset spustit ručně."
+"Tato okna nepodporují „uložení aktuálního nastavení“ a po svém příštím "
+"přihlášení je budete muset spustit ručně."
 
 #: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"
-

po/de.po

@@ -5,7 +5,7 @@
 # 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.
+# Wolfgang Stöggl <c72578@yahoo.de> 2011, 2017.
 # Tobias Endrigkeit <tobiasendrigkeit@googlemail.com>, 2012.
 #
 msgid ""
@@ -13,16 +13,16 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-10 19:07+0000\n"
-"PO-Revision-Date: 2017-05-12 17:35+0200\n"
-"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\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.1\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -134,7 +134,7 @@ msgstr "Systemsteuerungen sofort umschalten"
 
 #: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
-msgstr "Direkt zur vorherigen Systemsteuerungen wechselen"
+msgstr "Direkt zur vorherigen Systemsteuerungen wechseln"
 
 #: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
@@ -412,7 +412,6 @@ msgid "Enable experimental features"
 msgstr "Experimentelle Funktionsmerkmale aktivieren"
 
 #: 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 "
@@ -421,23 +420,43 @@ 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 "
-"Compositor neu gestartet werden, um es zu aktivieren. Für diese "
-"experimentellen Funktionsmerkmale gilt, dass sie nicht unbedingt dauerhaft "
-"verfügbar sein werden, oder Einstellungen möglich sind. Derzeit mögliche "
-"Schlüsselwörter: • “scale-monitor-framebuffer” — "
+"Compositor neu gestartet werden, um es zu aktivieren, dies ist vom "
+"Funktionsmerkmal abhängig. Für diese experimentellen Funktionsmerkmale gilt, "
+"dass sie nicht unbedingt dauerhaft verfügbar sein werden, oder Einstellungen "
+"möglich sind. Derzeit mögliche Schlüsselwörter: • »scale-monitor-"
+"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. • »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: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:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Wechselt die Konfiguration des eingebauten Bildschirms"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Zum virtuellen Terminal 1 wechseln"
@@ -486,10 +505,14 @@ msgstr "Zum virtuellen Terminal 11 wechseln"
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Tastenkombinationen erneut aktivieren"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Moduswechsel (Gruppe %d)"
@@ -497,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:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Bildschirm wechseln"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Bildschirmhilfe anzeigen"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/backends/meta-monitor-manager.c:808
+#: 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:816
+#: 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -539,32 +562,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "»%s« antwortet nicht."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Die Anwendung antwortet nicht."
-
-#: 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 ""
-"Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
-"erzwingen."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Beenden erzwingen"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Warten"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -606,6 +603,32 @@ msgstr "Als eingebetteten Compositor ausführen"
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
+#. Translators: %s is a window title
+#: 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:149
+msgid "Application is not responding."
+msgstr "Die Anwendung antwortet nicht."
+
+#: 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 ""
+"Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
+"erzwingen."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Beenden erzwingen"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Warten"
+
 # CHECK
 # c-format
 #: src/core/mutter.c:39

po/es.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter.master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-06-01 06:38+0000\n"
-"PO-Revision-Date: 2017-06-19 13:47+0200\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"
@@ -414,7 +414,6 @@ 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 "
@@ -432,7 +431,18 @@ 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. "
+"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: • \"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. También es necesario activar \"monitor-config-manager"
+"\" para activar esta función."
 
 #: data/org.gnome.mutter.gschema.xml.in:151
 msgid "Select window from tab popup"
@@ -442,6 +452,14 @@ msgstr "Seleccionar ventana de la pestaña emergente"
 msgid "Cancel tab popup"
 msgstr "Cancelar pestaña emergente"
 
+#: 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:166
+msgid "Rotates the built-in monitor configuration"
+msgstr "Rota la configuración del monitor empotrado"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Cambiar al VT 1"
@@ -490,10 +508,14 @@ msgstr "Cambiar al VT 11"
 msgid "Switch to VT 12"
 msgstr "Cambiar al VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Volver a activar los atajos"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1866
+#: src/backends/meta-input-settings.c:2118
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambiar modo (grupo %d)"
@@ -501,30 +523,30 @@ 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:1888
+#: src/backends/meta-input-settings.c:2141
 msgid "Switch monitor"
 msgstr "Cambiar monitor"
 
-#: src/backends/meta-input-settings.c:1890
+#: src/backends/meta-input-settings.c:2143
 msgid "Show on-screen help"
 msgstr "Mostrar la ayuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:879
+#: src/backends/meta-monitor-manager.c:927
 msgid "Built-in display"
 msgstr "Pantalla integrada"
 
-#: src/backends/meta-monitor-manager.c:902
+#: src/backends/meta-monitor-manager.c:950
 msgid "Unknown"
 msgstr "Desconocida"
 
-#: src/backends/meta-monitor-manager.c:904
+#: 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:912
+#: src/backends/meta-monitor-manager.c:960
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/eu.po

@@ -8,10 +8,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-16 22:07+0100\n"
+"POT-Creation-Date: 2017-08-21 04:46+0000\n"
+"PO-Revision-Date: 2017-08-27 16:47+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <librezale@librezale.eus>\n"
 "Language: eu\n"
@@ -270,11 +270,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Aldatzailea leihoak kudeatzeko eragiketa hedatuetan erabiltzeko"
 
 #: 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."
 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 "
@@ -320,10 +315,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Laneko areak dinamikoki kudeatzen dira"
 
 #: 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -362,10 +353,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atzeratu fokuaren aldaketa erakuslea mugitzeari utzi arte"
 
 #: 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."
 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 "
@@ -380,9 +367,6 @@ msgid "Draggable border width"
 msgstr "Ertz arrastragarriaren zabalera"
 
 #: 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."
 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."
@@ -414,14 +398,50 @@ msgstr ""
 "TRUE (egia) denean, leiho berriak beti jarriko dira monitorearen pantaila "
 "aktiboaren zentroan."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Gaitu eginbide esperimentalak"
+
+#: 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."
+msgstr ""
+"Eginbide esperimentalak gaitzeko, gehitu eginbidearen gakoa zerrendari. "
+"Eginbideak osatzailea berrabiaraztea behar duen edo ez emandako eginbidearen "
+"arabera dago. Ez da derrigorrezkoa edozer eginbide esperimental eskuragarri "
+"edo konfiguragarria egotea. Ez uste ezarpen honetan edozer gehitzeak "
+"etorkizuneko "
+"proba izango denik. Gako erabilgarriak: "
+"• “scale-monitor-framebuffer” — honek mutter monitoreen diseinu logikoetara "
+"lehenesten du espazioaren koordenatuko pixel logikoetan (leihoaren edukiaren "
+"ordez "
+"monitorearen framebufferra eskalatzean) HiDPI monitoreak kudeatzeko. Ez du "
+"berrabiaraztea eskatzen."
+
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "Hautatu leihoa laster-fitxatik"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "Utzi laster-fitxa"
 
+#: data/org.gnome.mutter.gschema.xml.in:151
+#| msgid "Switch monitor"
+msgid "Switch monitor configurations"
+msgstr "Aldatu monitorearen konfigurazioak"
+
+#: data/org.gnome.mutter.gschema.xml.in:156
+msgid "Rotates the built-in monitor configuration"
+msgstr "Biratu barneko monitorearen konfigurazioa"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Aldatu 1. TBra"
@@ -470,92 +490,65 @@ msgstr "Aldatu 11. TBra"
 msgid "Switch to VT 12"
 msgstr "Aldatu 12. TBra"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Gaitu berriro laster-teklak"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Modu aldaketa (%d taldea)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Aldatu monitorea"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Erakutsi pantailako laguntza"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Bertako pantaila"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Pantaila ezezaguna"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ "
-"pantailako %1$i. monitorean."
+"Dagoeneko beste konposatze-kudeatzailea ari da exekutatzen “%2$s“ pantailako "
+"%1$i. monitorean."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Soinuaren gertaera"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "'%s'(e)k ez du erantzuten."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Aplikazioak ez du erantzuten."
-
-#: 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 ""
-"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
-"aplikazioa erabat ixtea."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Behartu ixtera"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Itxaron"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Huts egin du X Window sistemaren “%s“ pantaila irekitzean\n"
 
@@ -595,14 +588,34 @@ msgstr "Exekutatu habiaratutako konposatzaile gisa"
 msgid "Run as a full display server, rather than nested"
 msgstr "Exekutatu pantaila-zerbitzari oso bezala, habiaratuta baino"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "'%s'(e)k ez du erantzuten."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Aplikazioak ez du erantzuten."
+
+#: 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 ""
+"Aukeratu piskatean zai egotea aplikazioak jarraitzeko edo derrigortu "
+"aplikazioa erabat ixtea."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Behartu ixtera"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Itxaron"
+
 #: 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"
@@ -631,9 +644,6 @@ msgstr "%d. laneko area"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -643,7 +653,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "“%2$s“ bistaratzeko %1$d pantaila ez da baliozkoa\n"
 
@@ -657,9 +666,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Modu aldaketa: %d modua"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."

po/fi.po

@@ -12,10 +12,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-13 11:15+0000\n"
-"PO-Revision-Date: 2015-03-13 17:52+0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-30 19:16+0300\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
 "Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
 "Language: fi\n"
@@ -24,282 +24,288 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-POT-Import-Date: 2012-02-19 15:25:23+0000\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.7.1\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "Navigointi"
 
-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "Siirrä ikkuna työtilaan 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "Siirrä ikkuna työtilaan 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "Siirrä ikkuna työtilaan 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "Siirrä ikkuna työtilaan 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "Siirrä ikkuna viimeiseen työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:7
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
 msgstr "Siirrä ikkunaa yksi työtila vasemmalle"
 
-#: ../data/50-mutter-navigation.xml.in.h:8
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
 msgstr "Siirrä ikkunaa yksi työtila oikealle"
 
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "Siirrä ikkunaa yksi työtila ylös"
 
-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "Siirrä ikkunaa yksi työtila alas"
 
-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Siirrä ikkuna yhden näytön verran vasemmalle"
 
-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Siirrä ikkuna yhden näytön verran oikealle"
 
-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Siirrä ikkuna yhden näytön verran ylös"
 
-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Siirrä ikkuna yhden näytön verran alas"
 
-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Vaihda sovelluksia"
 
-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Vaihda edelliseen sovellukseen"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Vaihda ikkunoita"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Vaihda edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Vaihda sovelluksen ikkunoiden välillä"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Vaihda sovelluksen edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:76
 #, fuzzy
 msgid "Switch system controls"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:81
 #, fuzzy
 msgid "Switch to previous system control"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Vaihda ikkunoita suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Vaihda suoraan edelliseen ikkunaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Vaihda sovelluksen ikkunoiden välillä suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:99
 #, fuzzy
 #| msgid "Switch windows of an application"
 msgid "Switch directly to previous window of an app"
 msgstr "Vaihda sovelluksen ikkunoiden välillä"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:103
 #, fuzzy
 msgid "Switch system controls directly"
 msgstr "Vaihda järjestelmän kontrolleja suoraan"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:108
 #, fuzzy
 msgid "Switch directly to previous system control"
 msgstr "Vaihda järjestelmän kontrolleja"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Piilota kaikki tavalliset ikkunat"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Siirry työtilaan 1"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Siirry työtilaan 2"
 
-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Siirry työtilaan 3"
 
-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Siirry työtilaan 4"
 
-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Siirry viimeiseen työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:35
+#: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
 msgstr "Siirrä vasemmalla olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:36
+#: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
 msgstr "Siirrä oikealla olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Siirrä yllä olevaan työtilaan"
 
-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Siirrä alla olevaan työtilaan"
 
-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "Järjestelmä"
 
-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "Näytä komennonsuorituskehote"
 
-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "Näytä toimintojen yleisnäkymä"
 
-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Ikkunat"
 
-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "Aktivoi ikkunavalikko"
 
-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "Vaihda koko näytön tilaan tai pois"
 
-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 #, fuzzy
 msgid "Toggle maximization state"
 msgstr "Vaihda suurennustilaa"
 
-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "Suurenna ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "Palauta ikkunan koko"
 
-#: ../data/50-mutter-windows.xml.in.h:7
+#: data/50-mutter-windows.xml:18
 #, fuzzy
 msgid "Toggle shaded state"
 msgstr "Vaihda rullaustilaa"
 
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Sulje ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Piilota ikkuna"
 
-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Siirrä ikkunaa"
 
-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Muuta ikkunan kokoa"
 
-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:29
 #, fuzzy
 msgid "Toggle window on all workspaces or one"
 msgstr "Valitse onko ikkuna yhdessä vai kaikissa työtiloissa"
 
-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "Nosta ikkuna, jos se on peittynyt, muuten laske se"
 
-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Nosta ikkuna muiden päälle"
 
-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Laske ikkuna muiden alle"
 
-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Suurenna ikkuna pystysuunnassa"
 
-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Suurenna ikkuna vaakasuunnassa"
 
-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr ""
 
-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr ""
 
-#: ../data/mutter.desktop.in.h:1
+#: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:7
 msgid "Modifier to use for extended window management operations"
 msgstr "Muunnosnäppäin laajennettuja ikkunoidenhallintatoimintoja varten"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:2
+#: data/org.gnome.mutter.gschema.xml.in:8
+#, fuzzy
+#| 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."
 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 ""
 "Tämä avain asettaa ”overlay”-tilan (peite), joka on yhdistelmä "
 "ikkunoidenhallintaa ja sovellusten käynnistämisjärjestelmää. Oletuksena "
 "käytetään ”Windows”-näppäintä PC-tietokoneissa. Odotuksena on, että tämä "
 "näppäinsidos on joko oletus tai sen arvona on tyhjä."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Liitä modaalisia valintaikkunoita"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+#: 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 "
@@ -309,33 +315,33 @@ msgstr ""
 "liitetään pääikkunan otsikkopalkkiin ja niitä siirretään yhdessä pääikkunan "
 "kanssa."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:5
+#: 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.h:6
+#: 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.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Työtilat hallitaan dynaamisesti"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+#: data/org.gnome.mutter.gschema.xml.in:41
 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.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Työtilat vain ensisijaisella"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+#: 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."
@@ -343,222 +349,289 @@ msgstr ""
 "Määrittää tapahtuuko työtilan vaihto ikkunoille kaikilla näytöillä vaiko "
 "vain ikkunoille ensisijaisella näytöllä."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+#: 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.h:13
+#: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
 msgstr ""
 "Viivästytä kohdistuksen vaihtumista, kunnes osoitin lopettaa liikkumisen"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:14
+#: 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."
+"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.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Raahattava reunaleveys"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#: data/org.gnome.mutter.gschema.xml.in:80
+#, fuzzy
+#| 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."
 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 ""
 "Raahattavien reunojen määrä yhteensä. Mikäli teeman näkyvät reunat eivät "
 "riitä, näkymätöntä reunaa lisätään täyttämään tämä arvo."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:17
+#: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+#: 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.h:19
+#: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
 msgstr "Aseta uudet ikkunat keskelle näyttöä"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+#: 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.h:21
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Ota käyttöön kokeelliset ominaisuudet"
+
+#: 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
 #, fuzzy
 msgid "Select window from tab popup"
 msgstr "Poista ikkuna päältä"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr ""
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:155
+#, fuzzy
+#| msgid "Switch applications"
+msgid "Switch monitor configurations"
+msgstr "Vaihda sovelluksia"
+
+#: 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 "Siirry virtuaalikonsoliin 1"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
 msgstr "Siirry virtuaalikonsoliin 2"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
 msgstr "Siirry virtuaalikonsoliin 3"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
 msgstr "Siirry virtuaalikonsoliin 4"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
 msgstr "Siirry virtuaalikonsoliin 5"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
 msgstr "Siirry virtuaalikonsoliin 6"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
 msgstr "Siirry virtuaalikonsoliin 7"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Siirry virtuaalikonsoliin 8"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Siirry virtuaalikonsoliin 9"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Siirry virtuaalikonsoliin 10"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Siirry virtuaalikonsoliin 11"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Siirry virtuaalikonsoliin 12"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: 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:2151
+#, 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:2174
+#, fuzzy
+msgid "Switch monitor"
+msgstr "Vaihda järjestelmän kontrolleja"
+
+#: src/backends/meta-input-settings.c:2176
+msgid "Show on-screen help"
+msgstr ""
+
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Sisäänrakennettu näyttö"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Tuntematon näyttö"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: ../src/backends/meta-monitor-manager.c:401
+#: 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:456
-#, c-format
+#: src/compositor/compositor.c:476
+#, fuzzy, c-format
+#| msgid ""
+#| "Another compositing manager is already running on screen %i on display "
+#| "\"%s\"."
 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 ""
 "Näytön ”%2$s” ruudullä %1$d on jo käynnissä toinen ikkunoidenladontaohjelman."
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Äänimerkki"
 
-#: ../src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X-ikkunointijärjestelmän näytön “%s” avaaminen epäonnistui\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Estä yhteys sessionhallintaan"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Vaihda käytössä oleva ikkunanhallinta"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Anna sessionhallinnan ID"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Käytettävä X-näyttö"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Alusta sessio tiedostosta"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Käytä synkronisia X-kutsuja"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Suorita wayland-koostajana"
+
+#: src/core/main.c:231
+#, fuzzy
+#| msgid "Run as a wayland compositor"
+msgid "Run as a nested compositor"
+msgstr "Suorita wayland-koostajana"
+
+#: 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
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" ei vastaa."
 
-#: ../src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Sovellus ei vastaa."
 
-#: ../src/core/delete.c:134
+#: 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 ""
 "Voit odottaa sovellusta vielä hetken tai sulkea sovelluksen väkisin heti."
 
-#: ../src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Odota"
-
-#: ../src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "Sulje _väkisin"
 
-#: ../src/core/display.c:562
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "X-ikkunointijärjestelmän näytön ”%s” avaaminen epäonnistui\n"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Odota"
 
-#: ../src/core/main.c:176
-msgid "Disable connection to session manager"
-msgstr "Estä yhteys sessionhallintaan"
-
-#: ../src/core/main.c:182
-msgid "Replace the running window manager"
-msgstr "Vaihda käytössä oleva ikkunanhallinta"
-
-#: ../src/core/main.c:188
-msgid "Specify session management ID"
-msgstr "Anna sessionhallinnan ID"
-
-#: ../src/core/main.c:193
-msgid "X Display to use"
-msgstr "Käytettävä X-näyttö"
-
-#: ../src/core/main.c:199
-msgid "Initialize session from savefile"
-msgstr "Alusta sessio tiedostosta"
-
-#: ../src/core/main.c:205
-msgid "Make X calls synchronous"
-msgstr "Käytä synkronisia X-kutsuja"
-
-#: ../src/core/main.c:212
-msgid "Run as a wayland compositor"
-msgstr "Suorita wayland-koostajana"
-
-#: ../src/core/main.c:220
-msgid "Run as a full display server, rather than nested"
-msgstr ""
-
-#: ../src/core/mutter.c:39
-#, c-format
+#: src/core/mutter.c:39
+#, fuzzy, 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 (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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"
@@ -569,49 +642,59 @@ msgstr ""
 "Ei MINKÄÄNLAISTA takuuta: ei edes takuuta MYYNTIKELPOISUUDESTA tai\n"
 "SOPIVUUDESTA JOHONKIN KÄYTTÖÖN.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Näytä versio"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Käytettävä Mutter-liitännäinen"
 
-#: ../src/core/prefs.c:2004
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Työtila %d"
 
-#: ../src/core/screen.c:525
-#, c-format
+#: src/core/screen.c:580
+#, fuzzy, c-format
 #| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 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 ""
 "Näytöllä ”%s” on jo ikkunointiohjelma: kokeile valitsinta --replace, jos "
 "haluat korvata nykyisen ikkunointiohjelman."
 
-#: ../src/core/screen.c:607
-#, c-format
-msgid "Screen %d on display '%s' is invalid\n"
+#: src/core/screen.c:665
+#, fuzzy, c-format
+#| msgid "Screen %d on display '%s' is invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Näytön ”%2$s” ruutu %1$d ei ole kelvollinen\n"
 
-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter on käännetty ilman tukea monisanaisille ilmoituksille\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr ""
+
+#: src/x11/session.c:1815
+#, fuzzy
+#| msgid ""
+#| "These windows do not support &quot;save current setup&quot; and will have "
+#| "to be restarted manually next time you log in."
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
 "Nämä ikkunat eivät ymmärrä ”tallenna nykyinen tila”-komentoa, ja ne täytyy "
 "käynnistää käsin uudelleen kun kirjaudut seuraavan kerran sisään."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s @ %s"

po/fr.po

@@ -14,19 +14,22 @@
 # 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-17 21:09+0100\n"
-"Last-Translator: Claude Paroz <claude@2xlibre.net>\n"
-"Language-Team: GNOME French Team <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"
@@ -34,19 +37,19 @@ msgstr "Navigation"
 
 #: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
-msgstr "Déplacer la fenêtre vers l'espace de travail 1"
+msgstr "Déplacer la fenêtre vers l’espace de travail 1"
 
 #: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
-msgstr "Déplacer la fenêtre vers l'espace de travail 2"
+msgstr "Déplacer la fenêtre vers l’espace de travail 2"
 
 #: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
-msgstr "Déplacer la fenêtre vers l'espace de travail 3"
+msgstr "Déplacer la fenêtre vers l’espace de travail 3"
 
 #: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
-msgstr "Déplacer la fenêtre vers l'espace de travail 4"
+msgstr "Déplacer la fenêtre vers l’espace de travail 4"
 
 #: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
@@ -54,43 +57,43 @@ 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"
+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"
+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"
+msgstr "Déplacer la fenêtre d’un espace de travail vers le haut"
 
 #: 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"
+msgstr "Déplacer la fenêtre d’un espace de travail vers le bas"
 
 #: 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"
+msgstr "Déplacer la fenêtre d’un écran vers la gauche"
 
 #: 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"
+msgstr "Déplacer la fenêtre d’un écran vers la droite"
 
 #: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
-msgstr "Déplacer la fenêtre d'un écran vers le haut"
+msgstr "Déplacer la fenêtre d’un écran vers le haut"
 
 #: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
-msgstr "Déplacer la fenêtre d'un écran vers le bas"
+msgstr "Déplacer la fenêtre d’un écran vers le bas"
 
 #: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
-msgstr "Changer d'application"
+msgstr "Changer d’application"
 
 #: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
-msgstr "Passer à l'application précédente"
+msgstr "Passer à l’application précédente"
 
 #: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
@@ -102,11 +105,11 @@ msgstr "Passer à la fenêtre précédente"
 
 #: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
-msgstr "Changer de fenêtre d'une application"
+msgstr "Changer de fenêtre d’une application"
 
 #: 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"
+msgstr "Passer à la fenêtre précédente d’une application"
 
 #: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
@@ -126,11 +129,11 @@ msgstr "Passer directement à la fenêtre précédente"
 
 #: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
-msgstr "Changer de fenêtre d'une application directement"
+msgstr "Changer de fenêtre d’une application directement"
 
 #: 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"
+msgstr "Passer directement à la fenêtre précédente d’une application"
 
 #: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
@@ -146,19 +149,19 @@ msgstr "Masquer toutes les fenêtres normales"
 
 #: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
-msgstr "Passer à l'espace de travail 1"
+msgstr "Passer à l’espace de travail 1"
 
 #: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
-msgstr "Passer à l'espace de travail 2"
+msgstr "Passer à l’espace de travail 2"
 
 #: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
-msgstr "Passer à l'espace de travail 3"
+msgstr "Passer à l’espace de travail 3"
 
 #: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
-msgstr "Passer à l'espace de travail 4"
+msgstr "Passer à l’espace de travail 4"
 
 #: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
@@ -166,19 +169,19 @@ msgstr "Passer au dernier espace de travail"
 
 #: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
-msgstr "Déplacer vers l'espace de travail de gauche"
+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"
+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"
+msgstr "Déplacer vers l’espace de travail du dessus"
 
 #: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
-msgstr "Déplacer vers l'espace de travail du dessous"
+msgstr "Déplacer vers l’espace de travail du dessous"
 
 #: data/50-mutter-system.xml:6
 msgid "System"
@@ -190,7 +193,7 @@ msgstr "Afficher la fenêtre pour lancer une commande"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
-msgstr "Afficher l'aperçu des activités"
+msgstr "Afficher l’aperçu des activités"
 
 #: data/50-mutter-windows.xml:6
 msgid "Windows"
@@ -206,7 +209,7 @@ msgstr "Basculer le mode plein écran"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Basculer l'état d'agrandissement"
+msgstr "Basculer l’état d’agrandissement"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -218,7 +221,7 @@ msgstr "Restaurer la fenêtre"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Basculer l'état de repli"
+msgstr "Basculer l’état de repli"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -243,7 +246,7 @@ msgstr "Placer la fenêtre sur tous les espaces de travail, ou sur un seul"
 #: 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"
+"Mettre la fenêtre au premier plan si elle est cachée, sinon à l’arrière-plan"
 
 #: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
@@ -284,8 +287,8 @@ msgid ""
 "key” on PC hardware. It’s expected that this binding either the default or "
 "set to the empty string."
 msgstr ""
-"Cette touche initie l'« overlay », une combinaison d'aperçu des fenêtres et "
-"d'un système de lancement d'applications. La touche par défaut sur le "
+"Cette touche initie l’« overlay », une combinaison d’aperçu des fenêtres et "
+"d’un système de lancement d’applications. La touche par défaut sur le "
 "matériel PC est la touche Windows. En principe, ce raccourci est configuré "
 "sur le réglage par défaut ou sur la chaîne vide."
 
@@ -299,13 +302,13 @@ msgid ""
 "attached to the titlebar of the parent window and are moved together with "
 "the parent window."
 msgstr ""
-"Si vrai, au lieu d'avoir des barres de titre indépendantes, les boîtes de "
+"Si vrai, au lieu d’avoir des barres de titre indépendantes, les boîtes de "
 "dialogue apparaissent attachées à la barre de titre de la fenêtre parente et "
 "sont déplacées ensembles avec elle."
 
 #: data/org.gnome.mutter.gschema.xml.in:30
 msgid "Enable edge tiling when dropping windows on screen edges"
-msgstr "Activer l'empilage des fenêtres déposées sur les bords de l'écran"
+msgstr "Activer l’empilage des fenêtres déposées sur les bords de l’écran"
 
 #: data/org.gnome.mutter.gschema.xml.in:31
 msgid ""
@@ -313,10 +316,10 @@ msgid ""
 "vertically and resizes them horizontally to cover half of the available "
 "area. Dropping windows on the top screen edge maximizes them completely."
 msgstr ""
-"Si activé, le dépôt des fenêtres sur les bords verticaux de l'écran les "
+"Si activé, le dépôt des fenêtres sur les bords verticaux de l’écran les "
 "maximise verticalement et les redimensionne horizontalement pour recouvrir "
 "la moitié de la zone disponible. Le dépôt des fenêtres sur le bord supérieur "
-"de l'écran les maximise complètement."
+"de l’écran les maximise complètement."
 
 #: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
@@ -329,20 +332,20 @@ msgid ""
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Détermine si les espaces de travail sont gérés de manière dynamique ou si le "
-"nombre d'espaces de travail est fixe (déterminé par la clé num-workspaces "
+"nombre d’espaces de travail est fixe (déterminé par la clé num-workspaces "
 "dans org.gnome.desktop.wm.preferences)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
-msgstr "Espaces de travail seulement sur l'écran principal"
+msgstr "Espaces de travail seulement sur l’écran principal"
 
 #: 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 ""
-"Détermine si le changement d'espace de travail doit se produire pour les "
-"fenêtres de tous les écrans ou seulement pour les fenêtres de l'écran "
+"Détermine si le changement d’espace de travail doit se produire pour les "
+"fenêtres de tous les écrans ou seulement pour les fenêtres de l’écran "
 "principal."
 
 #: data/org.gnome.mutter.gschema.xml.in:59
@@ -354,12 +357,12 @@ msgid ""
 "Determines whether the use of popup and highlight frame should be disabled "
 "for window cycling."
 msgstr ""
-"Détermine si l'utilisation de fenêtres surgissantes et de mise en valeur "
+"Détermine si l’utilisation de fenêtres surgissantes et de mise en valeur "
 "doit être désactivée pour la consultation des fenêtres."
 
 #: data/org.gnome.mutter.gschema.xml.in:68
 msgid "Delay focus changes until the pointer stops moving"
-msgstr "Attend l'arrêt du pointeur avant le changement de focus"
+msgstr "Attend l’arrêt du pointeur avant le changement de focus"
 
 #: data/org.gnome.mutter.gschema.xml.in:69
 msgid ""
@@ -369,7 +372,7 @@ msgid ""
 msgstr ""
 "Si défini à true et que le mode de focus est soit « sloppy » ou « souris », "
 "alors le focus ne sera pas changé immédiatement en passant sur une fenêtre, "
-"mais seulement après que le pointeur s'arrête."
+"mais seulement après que le pointeur s’arrête."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@@ -380,7 +383,7 @@ 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 ""
-"La taille totale des bordures que l'on peut déplacer. Si les bordures "
+"La taille totale des bordures que l’on peut déplacer. Si les bordures "
 "visibles du thème ne sont pas suffisantes, des bordures invisibles sont "
 "ajoutées pour arriver à cette valeur."
 
@@ -388,15 +391,15 @@ msgstr ""
 msgid "Auto maximize nearly monitor sized windows"
 msgstr ""
 "Maximiser automatiquement les fenêtres dont la taille est proche de celle de "
-"l'écran"
+"l’écran"
 
 #: 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 ""
-"Si activé, les nouvelles fenêtres qui ont presque la taille de l'écran à "
-"l'ouverture seront maximisées automatiquement."
+"Si activé, les nouvelles fenêtres qui ont presque la taille de l’écran à "
+"l’ouverture seront maximisées automatiquement."
 
 #: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
@@ -408,149 +411,182 @@ msgid ""
 "screen of the monitor."
 msgstr ""
 "Si true (vrai), les nouvelles fenêtres seront toujours placées au centre de "
-"l'écran actif du moniteur."
+"l’écran actif du moniteur."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+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 "
+"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 ""
+"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 "
+"« 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. "
+"• « 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: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:125
+#: 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:155
+msgid "Switch monitor configurations"
+msgstr "Changer de configuration de moniteur"
+
+#: 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"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
-msgstr "Passer à l'émulateur de terminal 1"
+msgstr "Passer à l’émulateur de terminal 1"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
-msgstr "Passer à l'émulateur de terminal 2"
+msgstr "Passer à l’émulateur de terminal 2"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
-msgstr "Passer à l'émulateur de terminal 3"
+msgstr "Passer à l’émulateur de terminal 3"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
-msgstr "Passer à l'émulateur de terminal 4"
+msgstr "Passer à l’émulateur de terminal 4"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
-msgstr "Passer à l'émulateur de terminal 5"
+msgstr "Passer à l’émulateur de terminal 5"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
-msgstr "Passer à l'émulateur de terminal 6"
+msgstr "Passer à l’émulateur de terminal 6"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
-msgstr "Passer à l'émulateur de terminal 7"
+msgstr "Passer à l’émulateur de terminal 7"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
-msgstr "Passer à l'émulateur de terminal 8"
+msgstr "Passer à l’émulateur de terminal 8"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
-msgstr "Passer à l'émulateur de terminal 9"
+msgstr "Passer à l’émulateur de terminal 9"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
-msgstr "Passer à l'émulateur de terminal 10"
+msgstr "Passer à l’émulateur de terminal 10"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
-msgstr "Passer à l'émulateur de terminal 11"
+msgstr "Passer à l’émulateur de terminal 11"
 
 #: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
-msgstr "Passer à l'émulateur de terminal 12"
+msgstr "Passer à l’émulateur de terminal 12"
+
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Réactiver les raccourcis"
 
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: 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:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Changer de moniteur"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
-msgstr "Afficher l'aide à l'écran"
+msgstr "Afficher l’aide à l’écran"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Affichage intégré"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"Un autre gestionnaire de composition est déjà lancé sur l'écran %i de "
-"l'affichage « %s »."
+"Un autre gestionnaire de composition est déjà lancé sur l’écran %i de "
+"l’affichage « %s »."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Évènement sonore"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "« %s » ne répond pas."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "L'application ne répond pas."
-
-#: 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 ""
-"Vous pouvez patienter un instant pour continuer ou forcer l'application à "
-"quitter définitivement."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forcer à quitter"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Attendre"
-
 #: 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"
+msgstr "Impossible d’ouvrir l’affichage « %s » du système X Window\n"
 
 #: src/core/main.c:189
 msgid "Disable connection to session manager"
@@ -562,7 +598,7 @@ msgstr "Remplacer le gestionnaire de fenêtres en cours de fonctionnement"
 
 #: src/core/main.c:201
 msgid "Specify session management ID"
-msgstr "Indiquer l'ID de gestion de sessions"
+msgstr "Indiquer l’ID de gestion de sessions"
 
 #: src/core/main.c:206
 msgid "X Display to use"
@@ -586,7 +622,33 @@ msgstr "Lancer comme un compositeur imbriqué"
 
 #: src/core/main.c:239
 msgid "Run as a full display server, rather than nested"
-msgstr "Lancer comme un serveur d'affichage complet, plutôt qu'imbriqué"
+msgstr "Lancer comme un serveur d’affichage complet, plutôt qu’imbriqué"
+
+#. Translators: %s is a window title
+#: 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:149
+msgid "Application is not responding."
+msgstr "L’application ne répond pas."
+
+#: 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 ""
+"Vous pouvez patienter un instant pour continuer ou forcer l’application à "
+"quitter définitivement."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Forcer à quitter"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Attendre"
 
 #: src/core/mutter.c:39
 #, c-format
@@ -601,8 +663,8 @@ msgstr ""
 "Copyright © 2001-%d Havoc Pennington, Red Hat, Inc., et autres.\n"
 "Ceci est un logiciel libre ; consultez le code source pour les\n"
 "conditions de copie.\n"
-"Il n'y a AUCUNE garantie ; même pas de VALEUR MARCHANDE ou\n"
-"d'ADÉQUATION À UN USAGE PARTICULIER.\n"
+"Il n’y a AUCUNE garantie ; même pas de VALEUR MARCHANDE ou\n"
+"d’ADÉQUATION À UN USAGE PARTICULIER.\n"
 
 #: src/core/mutter.c:53
 msgid "Print version"
@@ -623,13 +685,13 @@ msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
 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."
+"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/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"
+msgstr "L’écran %d sur l’affichage « %s » n’est pas valide\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
@@ -645,7 +707,7 @@ msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
 msgstr ""
-"Ces fenêtres ne prennent pas en charge « l'enregistrement de la "
+"Ces fenêtres ne prennent pas en charge « l’enregistrement de la "
 "configuration actuelle » et devront être redémarrées manuellement à la "
 "prochaine connexion."
 
@@ -653,3 +715,4 @@ msgstr ""
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (sur %s)"
+

po/fur.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-26 14:16+0000\n"
-"PO-Revision-Date: 2017-05-27 22:55+0200\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 1.8.12\n"
+"X-Generator: Poedit 2.0.2\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -439,6 +439,14 @@ msgstr "Selezione barcon dal tab popup"
 msgid "Cancel tab popup"
 msgstr "Anule tab popup"
 
+#: data/org.gnome.mutter.gschema.xml.in:161
+msgid "Switch monitor configurations"
+msgstr "Cambie configurazions visôr"
+
+#: 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"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Passe al VT 1"
@@ -490,7 +498,7 @@ msgstr "Passe al VT 12"
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1866
+#: src/backends/meta-input-settings.c:2118
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambie mût (Grup %d)"
@@ -498,30 +506,30 @@ 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:1888
+#: src/backends/meta-input-settings.c:2141
 msgid "Switch monitor"
 msgstr "Cambie visôr"
 
-#: src/backends/meta-input-settings.c:1890
+#: src/backends/meta-input-settings.c:2143
 msgid "Show on-screen help"
 msgstr "Mostre jutori a schermi"
 
-#: src/backends/meta-monitor-manager.c:876
+#: src/backends/meta-monitor-manager.c:925
 msgid "Built-in display"
 msgstr "Display integrât"
 
-#: src/backends/meta-monitor-manager.c:899
+#: src/backends/meta-monitor-manager.c:948
 msgid "Unknown"
 msgstr "No cognossût"
 
-#: src/backends/meta-monitor-manager.c:901
+#: 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:909
+#: src/backends/meta-monitor-manager.c:958
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/gl.po

@@ -10,22 +10,21 @@
 # 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.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-11 03:02+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-30 22:29+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galician <gnome-l10n-gl@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: Gtranslator 2.91.7\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -278,11 +277,6 @@ msgstr ""
 "Modificador que se vai usar para as accións modificadas de xestión de xanela"
 
 #: 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."
 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 "
@@ -328,10 +322,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Os espazos de traballo xestiónanse dinamicamente"
 
 #: 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -370,10 +360,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Retrasar o cambio de enfoque até que o punteiro se deteña ao moverse"
 
 #: 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."
 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 "
@@ -388,9 +374,6 @@ msgid "Draggable border width"
 msgstr "Anchura arrastrábel do bordo"
 
 #: 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."
 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."
@@ -423,14 +406,64 @@ msgstr ""
 "Cando está verdadeiro, as novas xanelas sempre se porán no centro da "
 "pantalla activa."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+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 "
+"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 ""
+"Para activar as características experimentais, engada a palabra chave da "
+"característica á lista. Depende da característica que se deba reiniciar ou "
+"non o compositor. Calquera característica experimental pode non estar "
+"dispoñíbel ou ser configurábel. Non agarde que o que se engada neste "
+"escenario sirva como proba futura. As palabras chave actualmente dispoñíbeis "
+"son: «scale-monitor-framebuffer» — fai que mutter de maneira predeterminada "
+"dispoña os monitores lóxicos nun espacio lóxico de coordenadas de píxeles, "
+"mentres escala framebuffers de monitores no lugar do contido de xanela, para "
+"administrar monitores HiDPI. Non require un reinicio. «remote-desktop» — "
+"permite a compatibilidade con compartición de pantalla. Para admitir o "
+"escritorio remoto con compartición de pantalla tamén debe activar «screen-"
+"cast». • «screen-cast» — permite a compatibilidade coa retransmisión de "
+"pantalla."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Seleccionar xanela da lapela emerxente"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancelar lapela emerxente"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Cambiar preferencias do monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Rota a configuración do monitor embebido"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Cambiar á VT 1"
@@ -479,53 +512,53 @@ msgstr "Cambiar á VT 11"
 msgid "Switch to VT 12"
 msgstr "Cambiar á VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Reactivar os atallos"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Cambiar monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostrar axuda en pantalla"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Pantalla embebida"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
@@ -536,35 +569,8 @@ msgstr ""
 msgid "Bell event"
 msgstr "Evento de campá"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "«%s» non está respondendo."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "O Aplicativo non está respondendo."
-
-#: 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 ""
-"Pode elixir esperar un momento para ver se continúa ou forzar ao aplicativo "
-"a pechar completamente."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forzar a saída"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "Espe_rar"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 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"
 
@@ -604,14 +610,34 @@ msgstr "Executar como compositor anidado"
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como un servidor de pantalla completo, fronte a un aniñado"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "«%s» non está respondendo."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "O Aplicativo non está respondendo."
+
+#: 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 ""
+"Pode elixir esperar un momento para ver se continúa ou forzar ao aplicativo "
+"a pechar completamente."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Forzar a saída"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "Espe_rar"
+
 #: 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"
@@ -640,9 +666,6 @@ msgstr "Espazo de traballo %d"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -652,7 +675,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "A pantalla %d na visualización «%s» non é válida\n"
 
@@ -666,9 +688,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Modo conmutador: Modo %d"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."

po/hu.po

@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-14 09:49+0000\n"
-"PO-Revision-Date: 2017-05-14 21:36+0200\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"
@@ -404,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 "
@@ -412,7 +426,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 ""
 "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 "
@@ -423,16 +440,27 @@ msgstr ""
 "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."
+"újraindítást. • „remote-desktop” — engedélyezi a távoli asztal támogatást. A "
+"távoli asztal képernyőmegosztással való támogatásához a „screen-cast” "
+"funkciónak is engedélyezve kell lennie. • „screen-cast” — engedélyezi a "
+"képernyőrögzítés támogatását."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Ablakok kiválasztása tab billentyűre felugró ablakból"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Tab felugró kikapcsolása"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Monitorkonfiguráció átváltása"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Cserélgeti a beépített monitorkonfigurációkat"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Váltás az 1. VT-re"
@@ -481,10 +509,14 @@ msgstr "Váltás a 11. VT-re"
 msgid "Switch to VT 12"
 msgstr "Váltás a 12. VT-re"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Gyorsbillentyűk újraengedélyezése"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Módkapcsoló (%d. csoport)"
@@ -492,30 +524,30 @@ 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:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Monitorváltás"
 
-#: src/backends/meta-input-settings.c:1872
+#: 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:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Beépített kijelző"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/backends/meta-monitor-manager.c:808
+#: 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:816
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -534,32 +566,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Csengetés esemény"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "„%s” nem válaszol."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Az alkalmazás nem válaszol."
-
-#: 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 ""
-"Várhat egy kicsit a folytatódására, vagy kikényszerítheti az alkalmazás "
-"teljes kilépését."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Erőltetett kilépés"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "Vá_rakozás"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -602,6 +608,32 @@ 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"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "„%s” nem válaszol."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Az alkalmazás nem válaszol."
+
+#: 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 ""
+"Várhat egy kicsit a folytatódására, vagy kikényszerítheti az alkalmazás "
+"teljes kilépését."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Erőltetett kilépés"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "Vá_rakozás"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/id.po

@@ -11,15 +11,15 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-31 14:13+0000\n"
-"PO-Revision-Date: 2017-06-07 15:00+0700\n"
-"Last-Translator: Andika Triwidada <andika@gmail.com>\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 1.6.10\n"
+"X-Generator: Poedit 2.0.3\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: data/50-mutter-navigation.xml:6
@@ -408,38 +408,43 @@ 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: • “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."
+"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 ""
 "Untuk mengaktifkan fitur eksperimental, tambahkan kata kunci fitur ke dalam "
 "daftar. Apakah fitur memerlukan nyala ulang kompositor tergantung pada fitur "
 "yang diberikan. Setiap fitur eksperimental tidak diharuskan tetap tersedia, "
 "atau dapat dikonfigurasi. Jangan berharap menambahkan apapun dalam "
 "pengaturan ini kebal perubahan di masa depan. Saat ini kata kunci yang "
-"mungkin: • \"monitor-config-manager\" — gunakan sistem konfigurasi monitor "
-"baru, yang ditujukan untuk mengganti yang lama. Hal ini memungkinkan tingkat "
-"konfigurasi API yang lebih tinggi untuk digunakan oleh aplikasi konfigurasi, "
-"serta kemampuan untuk mengkonfigurasi per skala monitor logikal. • “scale-"
-"monitor-framebuffer” — membuat bawaan mutter untuk tata letak monitor "
-"logikal dalam ruang koordinat pixel logikal, sambil menskalakan framebuffer "
-"monitor alih-alih konten jendela, untuk mengelola monitor HiDPI. Tidak perlu "
-"mulai ulang. Juga mengaktifkan “monitor-config-manager” diperlukan agar "
-"fitur ini diaktifkan."
+"mungkin: • “scale-monitor-framebuffer” — membuat bawaan mutter untuk tata "
+"letak monitor logikal dalam ruang koordinat pixel logikal, sambil "
+"menskalakan framebuffer monitor alih-alih konten jendela, untuk mengelola "
+"monitor HiDPI. Tidak perlu mulai ulang. • “remote-desktop” — aktifkan "
+"dukungan destop jauh. Untuk mendukung destop jauh dengan berbagi layar, "
+"“screen-cast” juga harus diaktifkan. • “screen-cast” — aktifkan dukungan "
+"screen cast."
 
-#: data/org.gnome.mutter.gschema.xml.in:151
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Pilih jendela dari popup tab"
 
-#: data/org.gnome.mutter.gschema.xml.in:156
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Batalkan popup tab"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Tukar konfigurasi monitor bawaan"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Memutar konfigurasi monitor bawaan"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Bertukar ke VT 1"
@@ -488,10 +493,14 @@ msgstr "Bertukar ke VT 11"
 msgid "Switch to VT 12"
 msgstr "Bertukar ke VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Aktifkan kembali pintasan"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1866
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Tukar Mode: (Grup %d)"
@@ -499,30 +508,30 @@ 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:1888
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Berpindah monitor"
 
-#: src/backends/meta-input-settings.c:1890
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Tampilkan bantuan pada layar"
 
-#: src/backends/meta-monitor-manager.c:879
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Tampilan bawaan"
 
-#: src/backends/meta-monitor-manager.c:902
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Tak Dikenal"
 
-#: src/backends/meta-monitor-manager.c:904
+#: 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:912
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"

po/it.po

@@ -10,10 +10,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 15:52+0000\n"
-"PO-Revision-Date: 2017-02-17 22:11+0100\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.0beta3\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -410,14 +410,54 @@ msgstr ""
 "Se impostata a VERO, le nuove finestre verranno sempre posizionate al centro "
 "dello schermo attivo."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Abilita funzionalità sperimentali"
+
+#: 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 ""
+"Per abilitare le funzionalità sperimentali, aggiungere la parola chiave di "
+"tale funzionalità nella lista. Se la funzionalità desiderata richiede il "
+"riavvio del compositor, dipende dalla funzionalità stessa. Una qualsiasi "
+"funzionalità sperimentale non è richiesta, ma può essere disponibile e "
+"configurabile. Le funzionalità offerte potrebbero rendere il sistema "
+"instabile. I possibili valori sono: • \"scale-monitor-framebuffer\" — Fa in "
+"modo che mutter disponga gli schermi logici secondo uno spazio logico di "
+"coordinate pixel, applicando il ridimensionamento ai framebuffer invece che "
+"al contenuto della finestra, per gestire schermi HiDPI (non richiede il "
+"riavvio). • \"remote-desktop\" — Abilita il supporto al desktop remoto. Per "
+"supportare il desktop remoto con la condivisione dello schermo, è necessario "
+"abilitare anche \"screen-cast\". • “screen-cast” — Abilita il supporto alla "
+"registrazione dello schermo."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Seleziona finestra dal tab popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Annulla tab popup"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Cambia le configurazioni del monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Passa da una configurazione integrata all'altra del monitor"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Passa al VT 1"
@@ -466,10 +506,14 @@ msgstr "Passa al VT 11"
 msgid "Switch to VT 12"
 msgstr "Passa al VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Riabilita scorciatoie"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Cambio modalità (gruppo %d)"
@@ -477,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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Cambia monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostra aiuto sullo schermo"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Display integrato"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -519,32 +563,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Evento campanella"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "Nessuna risposta da %s."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "L'applicazione non risponde."
-
-#: 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 ""
-"È possibile scegliere di attendere un po' lasciando che l'applicazione "
-"continui, oppure forzare la terminazione dell'applicazione."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forza uscita"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Attendi"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -586,6 +604,32 @@ msgstr "Esegui come compositor annidato"
 msgid "Run as a full display server, rather than nested"
 msgstr "Esegui come display server invece che annidato"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "Nessuna risposta da %s."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "L'applicazione non risponde."
+
+#: 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 ""
+"È possibile scegliere di attendere un po' lasciando che l'applicazione "
+"continui, oppure forzare la terminazione dell'applicazione."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Forza uscita"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Attendi"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/kk.po

@@ -6,17 +6,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-07 09:27+0000\n"
-"PO-Revision-Date: 2016-09-09 21:12+0500\n"
+"POT-Creation-Date: 2017-07-19 09:20+0000\n"
+"PO-Revision-Date: 2017-07-27 17:28+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh <kk@li.org>\n"
 "Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -270,10 +270,10 @@ 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."
+"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
@@ -306,7 +306,7 @@ msgstr "Жұмыс орындары динамикалы түрде басқар
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 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 ""
@@ -337,9 +337,9 @@ 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."
+"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
@@ -348,7 +348,7 @@ msgstr ""
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 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 ""
 
@@ -372,14 +372,42 @@ msgid ""
 "screen of the monitor."
 msgstr ""
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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:125
+#: data/org.gnome.mutter.gschema.xml.in:156
 msgid "Cancel tab popup"
 msgstr ""
 
+#: data/org.gnome.mutter.gschema.xml.in:161
+msgid "Switch monitor configurations"
+msgstr "Монитор баптауларын ауыстыру"
+
+#: data/org.gnome.mutter.gschema.xml.in:166
+msgid "Rotates the built-in monitor configuration"
+msgstr ""
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Бірінші виртуалды терминалына ауысу"
@@ -428,57 +456,109 @@ msgstr "Он бірінші виртуалды терминалына ауысу
 msgid "Switch to VT 12"
 msgstr "Он екінші виртуалды терминалына ауысу"
 
-#: src/backends/meta-input-settings.c:1707
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2118
+#, 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:2141
 msgid "Switch monitor"
 msgstr "Мониторды ауыстыру"
 
-#: src/backends/meta-input-settings.c:1709
+#: src/backends/meta-input-settings.c:2143
 msgid "Show on-screen help"
 msgstr "Экрандағы көмекті көрсету"
 
-#: src/backends/meta-monitor-manager.c:514
+#: src/backends/meta-monitor-manager.c:925
 msgid "Built-in display"
 msgstr "Құрамындағы экран"
 
-#: src/backends/meta-monitor-manager.c:537
+#: src/backends/meta-monitor-manager.c:948
 msgid "Unknown"
 msgstr "Белгісіз"
 
-#: src/backends/meta-monitor-manager.c:539
+#: src/backends/meta-monitor-manager.c:950
 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:547
+#: 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:463
+#: src/compositor/compositor.c:476
 #, 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/delete.c:127
+#: 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 "Сессия менеджментінің ID-ін көрсету"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Қолданылатын X дисплейі"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr ""
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "X сервер шақыруларын синхронды қылу"
+
+#: 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
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” жауап бермейді."
 
-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Қолданба жауап бермейді."
 
-#: src/core/delete.c:134
+#: 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."
@@ -486,60 +566,19 @@ msgstr ""
 "Сіз қолданба өз жұмысын жалғастырғанды күтіп, немесе оны мәжбүрлетіп жаба "
 "аласыз."
 
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Күту"
-
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Мәжбүрлі шығу"
 
-#: 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 "Сессия менеджментінің ID-ін көрсету"
-
-#: src/core/main.c:199
-msgid "X Display to use"
-msgstr "Қолданылатын X дисплейі"
-
-#: src/core/main.c:205
-msgid "Initialize session from savefile"
-msgstr ""
-
-#: src/core/main.c:211
-msgid "Make X calls synchronous"
-msgstr "X сервер шақыруларын синхронды қылу"
-
-#: 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/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Күту"
 
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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"
@@ -558,34 +597,34 @@ msgstr ""
 msgid "Workspace %d"
 msgstr "Жұмыс орны %d"
 
-#: src/core/screen.c:521
+#: src/core/screen.c:580
 #, 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:606
+#: src/core/screen.c:665
 #, 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:595
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr ""
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"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:548
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s жерінде)"

po/ko.po

@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-04 03:25+0900\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"
@@ -397,14 +397,50 @@ msgid ""
 "screen of the monitor."
 msgstr "참이면, 새로운 창은 항상 사용 중인 모니터 화면의 중앙에 놓습니다."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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 ""
+"실험적인 기능을 사용하려면, 해당 기능 키워드를 목록에 추가하십시오. 기능에 따"
+"라 컴포지터를 다시 시작해야 할 수도 있습니다. 실험적인 기능은 사용할 수 없을 "
+"수도 있고, 설정할 수 없을 수도 있습니다. 이 설정에 추가한 사항이 앞으로 버전"
+"에서도 동작할 거라고 기대하지 마십시오. 현재 가능한 값은: • “scale-monitor-"
+"framebuffer” — 머터에서 논리적인 모니터를 논리적인 픽셀 좌표계로 배치합니다. "
+"창의 내용의 크기를 조정하지 않고 모니터 프레임버퍼 크기를 조정합니다. 재시작"
+"은 필요하지 않습니다. • “remote-desktop” — 원격 데스크톱 기능을 사용합니다.  "
+"원격 데스크톱을 화면 공유와 같이 사용하려면, “screen-cast” 설정도 켜져 있어"
+"야 합니다. • “screen-cast” — 화면 전송 기능을 사용합니다."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "탭 팝업에서 창 선택"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "탭 팝업 취소"
 
+#: 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 "내장된 모니터 설정을 돌아가면서 전환합니다"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "가상 터미널 1로 이동"
@@ -453,10 +489,14 @@ msgstr "가상 터미널 11로 이동"
 msgid "Switch to VT 12"
 msgstr "가상 터미널 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:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "모드 전환 (그룹 %d)"
@@ -464,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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "모니터 전환"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "화면 도움말 표시"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "내장 디스플레이"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "알 수 없음"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -506,30 +546,6 @@ msgstr ""
 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 "강제로 끝내기(_F)"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "기다리기(_W)"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -571,6 +587,30 @@ msgstr "내장 컴포지터로 실행합니다"
 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
+#, 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 "강제로 끝내기(_F)"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "기다리기(_W)"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/lt.po

@@ -6,16 +6,16 @@
 # 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.
+# Aurimas Černius <aurisc4@gmail.com>, 2013, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: lt\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-02 18:41+0000\n"
-"PO-Revision-Date: 2017-03-03 20:29+0200\n"
-"Last-Translator: Moo\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"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -401,14 +401,63 @@ msgstr ""
 "Kai teigiama, nauji langai bus visada patalpinti aktyvaus monitoriaus ekrano "
 "viduryje."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Įjungti eksperimentines savybes"
+
+#: 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 "
+"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 ""
+"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ė 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. • „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:145
 msgid "Select window from tab popup"
 msgstr "Pasirinkti langą iš tab iššokimo"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: 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:155
+msgid "Switch monitor configurations"
+msgstr "Perjungti monitorių konfigūracijas"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Suka integruotas monitorių konfigūracijas"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Persijungti į VT 1"
@@ -457,10 +506,14 @@ msgstr "Persijungti į VT 11"
 msgid "Switch to VT 12"
 msgstr "Persijungti į VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Iš naujo įjungti trumpinius"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Veiksenos perjungimas (Grupė %d)"
@@ -468,37 +521,37 @@ 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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Perjungti monitorių"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Rodyti pagalbą ekrane"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Integruotas vaizduoklis"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -508,30 +561,6 @@ msgstr "Kita kompozicijos tvarkytuvė jau veikia ekrane %i vaizduoklyje „%s“
 msgid "Bell event"
 msgstr "Skambučio įvykis"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "%s neatsiliepia į komandas."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Programa neatsiliepia į komandas."
-
-#: 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 "Galite šiek tiek palaukti arba priverstinai uždaryti programą."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Priverstinai išeiti"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Laukti"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -573,6 +602,30 @@ msgstr "Vykdyti kaip įdėtinį kompozitorių"
 msgid "Run as a full display server, rather than nested"
 msgstr "Vykdyti kaip visą vaizduoklio serverį, o ne įdėtinį"
 
+#. Translators: %s is a window title
+#: 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:149
+msgid "Application is not responding."
+msgstr "Programa neatsiliepia į komandas."
+
+#: 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:161
+msgid "_Force Quit"
+msgstr "_Priverstinai išeiti"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Laukti"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/lv.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-18 12:09+0200\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"
@@ -274,11 +274,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Modifikators, kuru lietot paplašinātām loga pārvaldības darbībām"
 
 #: 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."
 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 "
@@ -323,10 +318,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Darbvirsmas tiek pārvaldītas dinamiski"
 
 #: 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -365,27 +356,20 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Aizkavēt fokusa izmaiņas, līdz rādītājs pārstāj kustēties"
 
 #: 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."
 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 ""
-"Ja patiess un fokusēšanas režīms ir vai nu “sloppy” (paviršs) vai “mouse”"
-" (pele), tad fokuss nemainīsies uzreiz pēc ieiešanas logā, bet tikai pēc tam,"
-" kad rādītājs beidzis kustēties."
+"Ja patiess un fokusēšanas režīms ir vai nu “sloppy” (paviršs) vai "
+"“mouse” (pele), tad fokuss nemainīsies uzreiz pēc ieiešanas logā, bet tikai "
+"pēc tam, kad rādītājs beidzis kustēties."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Velkams malas platums"
 
 #: 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."
 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."
@@ -416,14 +400,63 @@ msgid ""
 msgstr ""
 "Ja patiess, jaunie logi vienmēr tiks novietoti monitora aktīvā ekrāna vidū."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+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 "
+"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 ""
+"Lai ieslēgtu eksperimentālās iespējas, pievienojiet iespējas atslēgvārdu "
+"sarakstam. Vai iespējai būs nepieciešama kompozitora pārstartēšana, būs "
+"atkarīga no dotās iespējas. Jebkura eksperimentāla iespēja var būt "
+"nepieejama vai nekonfigurējama. Negaidiet, ka jebkura no šīm iespējām "
+"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."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Izvēlēties logu no tabulatora izvēlnes"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Atcelt logu rādīšanu"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Pārslēgt monitoru konfigurācijas"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Pagriež iebūvētā monitora konfigurāciju"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Pārslēgties uz VT 1"
@@ -472,53 +505,53 @@ msgstr "Pārslēgties uz VT 11"
 msgid "Switch to VT 12"
 msgstr "Pārslēgties uz VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Atkal ieslēdz saīsnes"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Pārslēgt monitoru"
 
-#: src/backends/meta-input-settings.c:1824
+#: 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:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Iebūvēts displejs"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "Cits kompozīcijas pārvaldnieks jau darbojas ekrānā %d displejā “%s”."
@@ -527,35 +560,8 @@ msgstr "Cits kompozīcijas pārvaldnieks jau darbojas ekrānā %d displejā “%
 msgid "Bell event"
 msgstr "Zvana notikums"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” nereaģē."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Lietotne nereaģē."
-
-#: 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 ""
-"Var uzgaidīt neilgu brīdi, līdz tā atgūstas, vai arī aizvērt to piespiedu "
-"kārtā."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "Aizvērt _piespiedu kārtā"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Gaidīt"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Neizdevās atvērt X logu sistēmas displeju “%s”\n"
 
@@ -595,14 +601,34 @@ msgstr "Palaist kā ligzdotu kompozitoru"
 msgid "Run as a full display server, rather than nested"
 msgstr "Palaist kā pilnu attēlošanas serveri, nevis iegultu"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” nereaģē."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Lietotne nereaģē."
+
+#: 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 ""
+"Var uzgaidīt neilgu brīdi, līdz tā atgūstas, vai arī aizvērt to piespiedu "
+"kārtā."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "Aizvērt _piespiedu kārtā"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Gaidīt"
+
 #: 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"
@@ -631,9 +657,6 @@ msgstr "Darbvieta %d"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -643,7 +666,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Ekrāna %d displejs “%s“ nav derīgs\n"
 
@@ -657,9 +679,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Režīma slēdzis: režīms %d"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."

po/pa.po

@@ -8,622 +8,709 @@
 # A S Alam <aalam@users.sf.net>, 2006.
 # A S Alam <aalam@users.sf.net>, 2007, 2009, 2010, 2011.
 # ASB <aalam@users.sf.net>, 2007.
-# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012, 2013, 2014, 2015.
+# Amanpreet Singh Alam <aalam@users.sf.net>, 2009, 2012, 2013, 2014, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2015-03-13 23:12+0000\n"
-"PO-Revision-Date: 2015-03-13 19:14-0500\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-10 18:24-0600\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
 "Language: pa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "ਨੇਵੀਗੇਸ਼ਨ"
 
-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:7
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:8
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਉੱਤੇ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਵਰਕਸਪੇਸ ਹੇਠਾਂ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਖੱਬੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਸੱਜੇ ਵੱਲ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਉੱਤੇ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਇੱਕ ਮਾਨੀਟਰ ਹੇਠਾਂ ਲਿਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "ਪਿਛਲੀ ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "ਵਿੰਡੋਜ਼ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀਆਂ ਵਿੰਡੋਜ਼ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਪਿਛਲੀ ਵਿੰਡੋ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "ਪਿਛਲੇ ਸਿਸਟਮ ਕੰਟਰੋਲ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "ਵਿੰਡੋਜ਼ ਸਿੱਧੀਆਂ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "ਸਿੱਧਾ ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਦੀ ਵਿੰਡੋਜ਼ ਸਿੱਧੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "ਸਿੱਧਾ ਐਪ ਦੀ ਪਿਛਲੀ ਵਿੰਡੋ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "ਸਿਸਟਮ ਕੰਟਰੋਲ ਸਿੱਧੇ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "ਸਿੱਧਾ ਪਿਛਲੇ ਸਿਸਟਮ ਕੰਟਰੋਲ ਲਈ ਬਦਲੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "ਸਭ ਸਧਾਰਨ ਵਿੰਡੋਜ਼ ਓਹਲੇ ਕਰੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "ਵਰਕਸਪੇਸ ੧ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "ਵਰਕਸਪੇਸ ੨ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "ਵਰਕਸਪੇਸ ੩ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "ਵਰਕਸਪੇਸ ੪ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "ਪਿਛਲੇ ਵਰਕਸਪੇਸ ਵਿੱਚ ਜਾਓ"
 
-#: ../data/50-mutter-navigation.xml.in.h:35
+#: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
 msgstr "ਖੱਬੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:36
+#: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
 msgstr "ਸੱਜੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "ਉੱਤੇ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "ਹੇਠਾਂ ਵਰਕਸਪੇਸ 'ਚ ਭੇਜੋ"
 
-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "ਸਿਸਟਮ"
 
-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "ਕਮਾਂਡ ਚਲਾਉ ਪਰੋਉਟ ਵੇਖੋ"
 
-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "ਸਰਗਰਮੀ ਸੰਖੇਪ ਜਾਣਕਾਰੀ ਵੇਖੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "ਵਿੰਡੋਜ਼"
 
-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "ਐਕਟਿਵੇਟ ਵਿੰਡੋ ਮੇਨੂ"
 
-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "ਪੂਰੀ ਸਕਰੀਨ ਮੋਡ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
 msgstr "ਅਧਿਕਤਮ ਸਥਿਤੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "ਵਿੰਡੋ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "ਵਿੰਡੋ ਮੁੜ-ਸਟੋਰ"
 
-#: ../data/50-mutter-windows.xml.in.h:7
+#: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
 msgstr "ਰੰਗਤ ਸਥਿਤੀ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "ਵਿੰਡੋ ਬੰਦ ਕਰੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "ਵਿੰਡੋ ਓਹਲੇ"
 
-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "ਵਿੰਡੋ ਹਿਲਾਓ"
 
-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "ਵਿੰਡੋ ਮੁੜ-ਅਕਾਰ"
 
-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr "ਵਿੰਡੋ ਸਭ ਵਰਕਸਪੇਸ ਜਾਂ ਇੱਕ ਵਿੱਚ ਬਦਲੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr "ਵਿੰਡੋ ਉਭਾਰੋ, ਜੇ ਢੱਕੀ ਹੈ, ਨਹੀਂ ਤਾਂ ਹੇਠਾਂ ਭੇਜੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਹੋਰ ਵਿੰਡੋਜ਼ ਤੋਂ ਉੱਤੇ ਲਿਆਓ"
 
-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "ਵਿੰਡੋ ਨੂੰ ਹੋਰ ਵਿੰਡੋ ਤੋਂ ਹੇਠਾਂ ਲੈ ਜਾਉ"
 
-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "ਵਿੰਡੋ ਖੜਵੇਂ ਰੂਪ ਵਿੱਚ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "ਵਿੰਡੋ ਲੇਟਵੇਂ ਰੂਪ ਵਿੱਚ ਵੱਧੋ-ਵੱਧ"
 
-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "ਖੱਬੇ ਪਾਸੇ ਵੰਡ ਵੇਖੋ"
 
-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "ਸੱਜੇ ਪਾਸੇ ਵੰਡ ਵੇਖੋ"
 
-#: ../data/mutter.desktop.in.h:1
+#: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "ਮੱਟਰ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:1
+#: 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.h:2
+#: 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."
 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 ""
-"ਇਹ ਸਵਿੱਚ \"ਓਵਰਲੇ\" ਸ਼ੁਰੂ ਕਰਦੀ ਹੈ, ਜੋ ਕਿ ਵਿੰਡੋ ਸੰਖੇਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਉਣ ਸਿਸਟਮ "
-"ਦੀ ਜੋੜ ਹੈ। "
-"ਡਿਫਾਲਟ ਇਹ PC ਹਾਰਡਵੇਅਰ ਉੱਤੇ \"ਵਿੰਡੋਜ਼ ਸਵਿੱਚ\" ਨਾਲ ਵਰਤਣ ਲਈ ਹੈ। ਇਹ ਉਮੀਦ ਕੀਤੀ "
-"ਜਾਂਦੀ ਹੈ ਕਿ "
+"ਇਹ ਸਵਿੱਚ ”ਓਵਰਲੇ” ਸ਼ੁਰੂ ਕਰਦੀ ਹੈ, ਜੋ ਕਿ ਵਿੰਡੋ ਸੰਖੇਪ ਤੇ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਉਣ ਸਿਸਟਮ ਦੀ"
+" ਜੋੜ ਹੈ। "
+"ਡਿਫਾਲਟ ਇਹ PC ਹਾਰਡਵੇਅਰ ਉੱਤੇ ”ਵਿੰਡੋਜ਼ ਸਵਿੱਚ” ਨਾਲ ਵਰਤਣ ਲਈ ਹੈ। ਇਹ ਉਮੀਦ ਕੀਤੀ ਜਾਂਦੀ"
+" ਹੈ ਕਿ "
 "ਜਾਂ ਤਾਂ ਡਿਫਾਲਟ ਬਾਈਡਿੰਗ ਰੱਖੀ ਜਾਵੇ ਜਾਂ ਖਾਲੀ ਲਾਈਨ ਵਰਤੀ ਜਾਵੇ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "ਮਾਡਲ ਡਾਈਲਾਗ ਅਟੈਚਮੈਂਟ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:4
+#: 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.h:5
+#: 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.h:6
+#: 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.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "ਵਰਕਸਪੇਸ ਦਾ ਪਰਬੰਧ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਕੀਤਾ ਜਾਂਦਾ ਹੈ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:8
+#: 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)."
 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 ""
-"ਦੱਸੋ ਕਿ ਕੀ ਵਰਕਸਪੇਸ ਨੂੰ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਰੱਖਣਾ ਹੈ ਜਾਂ ਵਰਕਸਪੇਸ ਦੀ ਗਿਣਤੀ ਸਥਿਰ ਹੋਵੇ "
-"(ਜੋ ਕਿ org."
+"ਦੱਸੋ ਕਿ ਕੀ ਵਰਕਸਪੇਸ ਨੂੰ ਚਲਵੇਂ ਰੂਪ ਵਿੱਚ ਰੱਖਣਾ ਹੈ ਜਾਂ ਵਰਕਸਪੇਸ ਦੀ ਗਿਣਤੀ ਸਥਿਰ ਹੋਵੇ"
+" (ਜੋ ਕਿ org."
 "gnome.desktop.wm.preferences ਵਿੱਚ num-workspaces ਕੁੰਜੀ ਰਾਹੀਂ ਦੱਸੀ ਜਾਂਦੀ ਹੈ)।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "ਵਰਕਸਪੇਸ ਕੇਵਲ ਪ੍ਰਾਇਮਰੀ ਉੱਤੇ ਹੀ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:10
+#: 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.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "ਕੋਈ ਟੈਬ ਪੋਪਅੱਪ ਨਹੀਂ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:12
+#: 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.h:13
+#: 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.h:14
+#: 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."
 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 ""
-"ਜੇ ਇਹ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਫੋਕਸ ਢੰਗ ਜਾਂ ਤਾਂ \"ਸਲੋਪੀ\" ਜਾਂ \"ਮਾਊਂਸ\" ਹੁੰਦਾ ਹੈ ਤਾਂ "
-"ਫੋਕਸ ਹੋਇਆ ਵਿੰਡੋ "
+"ਜੇ ਇਹ ਸਹੀਂ ਹੋਵੇ ਤਾਂ ਫੋਕਸ ਢੰਗ ਜਾਂ ਤਾਂ ”ਸਲੋਪੀ” ਜਾਂ ”ਮਾਊਂਸ” ਹੁੰਦਾ ਹੈ ਤਾਂ ਫੋਕਸ"
+" ਹੋਇਆ ਵਿੰਡੋ "
 "auto_raise_delay ਕੁੰਜੀ ਵਲੋਂ ਦਿੱਤੇ ਇੱਕ ਅੰਤਰਾਲ ਬਾਅਦ ਆਟੋਮੈਟਿਕ ਹੀ ਉਭਾਰਿਆ ਜਾਵੇਗਾ।"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "ਡਰੈਗ ਹੋਣ ਯੋਗ ਬਾਰਡਰ ਚੌੜਾਈ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:16
+#: 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."
 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.h:17
+#: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
 msgstr "ਲਗਭਗ ਮਾਨੀਟਰ ਆਕਾਰ ਦੀਆਂ ਵਿੰਡੋਜ਼ ਆਪਣੇ-ਆਪ ਵੱਧੋ-ਵੱਧੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:18
+#: 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.h:19
+#: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
 msgstr "ਨਵੀਆਂ ਵਿੰਡੋ ਕੇਂਦਰ ਵਿੱਚ ਰੱਖੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:20
+#: 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.h:21
+#: 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
 msgid "Select window from tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਤੋਂ ਵਿੰਡੋ ਚੁਣੋ"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "ਟੈਬ ਪੋਪਅੱਪ ਰੱਦ ਕਰੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.gschema.xml.in:155
+#| msgid "Switch applications"
+msgid "Switch monitor configurations"
+msgstr "ਮਾਨੀਟਰ ਸੰਰਚਨਾ ਨੂੰ ਬਦਲੋ"
+
+#: 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 "VT 1 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:2
+#: data/org.gnome.mutter.wayland.gschema.xml.in:10
 msgid "Switch to VT 2"
 msgstr "VT 2 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:3
+#: data/org.gnome.mutter.wayland.gschema.xml.in:14
 msgid "Switch to VT 3"
 msgstr "VT 3 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:4
+#: data/org.gnome.mutter.wayland.gschema.xml.in:18
 msgid "Switch to VT 4"
 msgstr "VT 4 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:5
+#: data/org.gnome.mutter.wayland.gschema.xml.in:22
 msgid "Switch to VT 5"
 msgstr "VT 5 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:6
+#: data/org.gnome.mutter.wayland.gschema.xml.in:26
 msgid "Switch to VT 6"
 msgstr "VT 6 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:7
+#: data/org.gnome.mutter.wayland.gschema.xml.in:30
 msgid "Switch to VT 7"
 msgstr "VT 7 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "VT 8 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "VT 9 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "VT 10 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "VT 11 ਲਈ ਬਦਲੋ"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
-#| msgid "Switch to VT 1"
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "VT 12 ਲਈ ਬਦਲੋ"
 
-#: ../src/backends/meta-monitor-manager.c:364
+#: 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:2151
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "ਮੋਡ ਬਦਲੋ (ਗਰੁੱਪ %d)"
+
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. * mapping through the available outputs.
+#.
+#: src/backends/meta-input-settings.c:2174
+#| msgid "Switch system controls"
+msgid "Switch monitor"
+msgstr "ਮਾਨੀਟਰ ਨੂੰ ਬਦਲੋ"
+
+#: src/backends/meta-input-settings.c:2176
+msgid "Show on-screen help"
+msgstr "ਆਨ-ਸਕਰੀਨ ਮਦਦ ਵੇਖੋ"
+
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "ਬਿਲਟ-ਇਨ ਡਿਸਪਲੇਅ"
 
-#: ../src/backends/meta-monitor-manager.c:391
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "ਅਣਜਾਣ"
 
-#: ../src/backends/meta-monitor-manager.c:393
+#: 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:401
+#: 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:456
+#: src/compositor/compositor.c:476
 #, c-format
+#| msgid ""
+#| "Another compositing manager is already running on screen %i on display "
+#| "\"%s\"."
 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 ""
-"ਇੱਕ ਹੋਰ ਕੰਪੋਜ਼ਟਿੰਗ ਮੈਨੇਜਰ %i ਸਕਰੀਨ ਉੱਤੇ ਡਿਸਪਲੇਅ \"%s\" ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਚੱਲ "
-"ਰਿਹਾ ਹੈ।"
+"ਇੱਕ ਹੋਰ ਕੰਪੋਜ਼ਟਿੰਗ ਮੈਨੇਜਰ %i ਸਕਰੀਨ ਉੱਤੇ ਡਿਸਪਲੇਅ ”%s” ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ"
+" ਹੈ।"
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "ਘੰਟੀ ਈਵੈਂਟ"
 
-#: ../src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+#| msgid "Failed to open X Window System display '%s'\n"
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "X ਵਿੰਡੋ ਸਿਸਟਮ ਡਿਸਪਲੇਅ ”%s” ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰਥ\n"
+
+#: 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 "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧਨ ID ਦਿਓ"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "ਵਰਤਣ ਲਈ X ਡਿਸਪਲੇਅ"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "ਸੰਭਾਲੀ ਫਾਇਲ ਤੋਂ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "X ਕਾਲ ਸੈਕਰੋਨਸ ਬਣਾਓ"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "ਵੇਲੈਂਡ ਕੰਪੋਜ਼ਰ ਵਜੋਂ ਚਲਾਓ"
+
+#: src/core/main.c:231
+#| msgid "Run as a wayland compositor"
+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
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।"
 
-#: ../src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "ਐਪਲੀਕੇਸ਼ਨ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਹੀ ਹੈ।"
 
-#: ../src/core/delete.c:134
+#: 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/delete.c:141
-msgid "_Wait"
-msgstr "ਉਡੀਕੋ(_W)"
-
-#: ../src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "ਧੱਕੇ ਨਾਲ ਬੰਦ(_F)"
 
-#: ../src/core/display.c:562
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "X ਵਿੰਡੋ ਸਿਸਟਮ ਡਿਸਪਲੇਅ '%s' ਨੂੰ ਖੋਲਣ ਵਿੱਚ ਅਸਮਰਥ\n"
-
-#: ../src/core/main.c:176
-msgid "Disable connection to session manager"
-msgstr "ਸ਼ੈਸ਼ਨ ਮੈਨੇਜਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਯੋਗ"
-
-#: ../src/core/main.c:182
-msgid "Replace the running window manager"
-msgstr "ਚੱਲ ਰਹੇ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ ਬਦਲੋ"
-
-#: ../src/core/main.c:188
-msgid "Specify session management ID"
-msgstr "ਸ਼ੈਸ਼ਨ ਪਰਬੰਧਨ ID ਦਿਓ"
-
-#: ../src/core/main.c:193
-msgid "X Display to use"
-msgstr "ਵਰਤਣ ਲਈ X ਡਿਸਪਲੇਅ"
-
-#: ../src/core/main.c:199
-msgid "Initialize session from savefile"
-msgstr "ਸੰਭਾਲੀ ਫਾਇਲ ਤੋਂ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ"
-
-#: ../src/core/main.c:205
-msgid "Make X calls synchronous"
-msgstr "X ਕਾਲ ਸੈਕਰੋਨਸ ਬਣਾਓ"
-
-#: ../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
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "ਉਡੀਕੋ(_W)"
+
+#: 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 (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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 ""
-"ਮੱਟਰ %s\n"
-"ਹੱਕ ਰਾਖਵੇਂ ਹਨ(C) ੨੦੦੧-%d ਹਾਵੇਨ ਪੈਨਿੰਗਟੋਨ, ਰੈੱਡ ਹੈੱਟ, ਅਤੇ ਹੋਰ\n"
+"ਮੁੱਟਰ %s\n"
+"ਹੱਕ ਰਾਖਵੇਂ ਹਨ ©  ੨੦੦੧-%d ਹਾਵੇਨ ਪੈਨਿੰਗਟੋਨ, ਰੈੱਡ ਹੈੱਟ, ਅਤੇ ਹੋਰ\n"
 "ਇਹ ਮੁਫਤ ਸਾਫਟਵੇਅਰ ਹੈ; ਉਤਾਰਾ ਹਾਲਤਾਂ ਲਈ ਸਰੋਤ ਵੇਖੋ।\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:2004
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "ਵਰਕਸਪੇਸ %d"
 
-#: ../src/core/screen.c:525
+#: src/core/screen.c:580
 #, c-format
 #| msgid ""
-#| "Screen %d on display \"%s\" already has a window manager; try using the --"
-#| "replace option to replace the current window manager.\n"
+#| "Display \"%s\" already has a window manager; try using the --replace "
+#| "option to replace the current window manager."
 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 ""
-"ਡਿਸਪਲੇਅ \"%s\" ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਵਿੰਡੋ ਮੈਨੇਜਰ ਮੌਜੂਦ ਹੈ; ਮੌਜੂਦਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ "
-"ਬਦਲਣ ਲਈ --replace "
+"ਡਿਸਪਲੇਅ ”%s” ਉੱਤੇ ਪਹਿਲਾਂ ਹੀ ਵਿੰਡੋ ਮੈਨੇਜਰ ਮੌਜੂਦ ਹੈ; ਮੌਜੂਦਾ ਵਿੰਡੋ ਮੈਨੇਜਰ ਨੂੰ"
+" ਬਦਲਣ ਲਈ --replace "
 "ਚੋਣ ਵਰਤ ਕੇ ਦੇਖੋ।"
 
-#: ../src/core/screen.c:607
+#: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "ਡਿਸਪਲੇਅ '%2$s' ਉੱਤੇ ਸਕਰੀਨ %1$d ਗਲਤ ਹੈ\n"
+#| msgid "Screen %d on display '%s' is invalid\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "ਡਿਸਪਲੇਅ ”%2$s” ਉੱਤੇ ਸਕਰੀਨ %1$d ਗਲਤ ਹੈ\n"
 
-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "ਮੱਟਰ, ਵਰਬੋਜ਼ ਮੋਡ ਲਈ ਸਹਾਰੇ ਤੋਂ ਬਿਨਾਂ ਕੰਪਾਇਲ ਹੋਇਆ\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:563
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "ਮੋਡ ਬਦਲੋ: ਮੋਡ %d"
+
+#: src/x11/session.c:1815
+#| msgid ""
+#| "These windows do not support &quot;save current setup&quot; and will have "
+#| "to be restarted manually next time you log in."
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"ਇਹ ਵਿੰਡੋ &quot;ਮੌਜੂਦਾ ਸੈਟਅੱਪ ਸੰਭਾਲੋ&quot; ਵਾਸਤੇ ਸਹਾਇਕ ਨਹੀਂ ਅਤੇ ਅਗਲੀ ਵਾਰ ਜਦੋਂ "
-"ਤੁਸੀਂ ਲਾਗਇਨ "
+"ਇਹ ਵਿੰਡੋ ”ਮੌਜੂਦਾ ਸੈਟਅੱਪ ਸੰਭਾਲੋ” ਵਾਸਤੇ ਸਹਾਇਕ ਨਹੀਂ ਅਤੇ ਅਗਲੀ ਵਾਰ ਜਦੋਂ ਤੁਸੀਂ"
+" ਲਾਗਇਨ "
 "ਕਰੋਗੇ ਤਾਂ ਮੁੜ ਸ਼ੁਰੂ ਕਰਨਾ ਪਵੇਗਾ।"
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (%s ਉੱਤੇ)"

po/pl.po

@@ -12,10 +12,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://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 21:52+0100\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-29 18:14+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -409,14 +409,52 @@ msgstr ""
 "Jeśli wynosi wartość „true”, to nowe okna będą zawsze umieszczane na środku "
 "aktywnego ekranu monitora."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Funkcje eksperymentalne"
+
+#: 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 ""
+"Aby włączyć eksperymentalne funkcje, należy dodać słowo kluczowe funkcji do "
+"tej listy. Niektóre funkcje wymagają ponownego uruchomienia menedżera okien. "
+"Dostępność funkcji eksperymentalnych nie jest gwarantowana. W przyszłości "
+"każda funkcja może zostać usunięta. Obecnie obsługiwane słowa kluczowe: • "
+"„scale-monitor-framebuffer” — sprawia, że menedżer okien do zarządzania "
+"monitorami o wysokiej rozdzielczości domyślnie układa logiczne monitory "
+"w przestrzeni współrzędnych logicznych pikseli, jednocześnie skalując bufory "
+"ramki monitorów zamiast zawartości okien. Nie wymaga ponownego uruchomienia. "
+"• „remote-desktop” — włącza obsługę zdalnego pulpitu. Aby dodać "
+"udostępnianie ekranu, należy włączyć także opcję „screen-cast”. • "
+"„screen-cast” — włącza obsługę nagrywania ekranu."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Wybór okna z wyskakującego okna dla tabulacji"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Anulowanie wyskakującego okna dla tabulacji"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Przełączenie konfiguracji monitorów"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Obrócenie wbudowanego monitora"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Przełączenie na 1. konsolę wirtualną"
@@ -465,10 +503,14 @@ msgstr "Przełączenie na 11. konsolę wirtualną"
 msgid "Switch to VT 12"
 msgstr "Przełączenie na 12. konsolę wirtualną"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Ponowne włączenie skrótów"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Przełącznik trybu (%d. grupa)"
@@ -476,37 +518,37 @@ msgstr "Przełącznik trybu (%d. grupa)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Przełączenie monitora"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
-msgstr "Wyświetlenie pomocy na ekranie"
+msgstr "Ekran pomocy"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Wbudowany ekran"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nieznany ekran"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -517,30 +559,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "Okno „%s” nie odpowiada."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Program nie odpowiada."
-
-#: 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 "Można poczekać chwilę dłużej lub wymusić zakończenie programu."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Zakończ"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Czekaj"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -582,6 +600,30 @@ msgstr "Uruchamia jako osadzony menedżer składania"
 msgid "Run as a full display server, rather than nested"
 msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "Okno „%s” nie odpowiada."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Program nie odpowiada."
+
+#: 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 "Można poczekać chwilę dłużej lub wymusić zakończenie programu."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Zakończ"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Czekaj"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/pt_BR.po

@@ -21,8 +21,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=mutter"
 "&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-22 19:28+0000\n"
-"PO-Revision-Date: 2017-02-25 17:53-0200\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-09-03 11:06-0200\n"
 "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
@@ -33,6 +33,250 @@ msgstr ""
 "X-Generator: Virtaal 1.0.0-beta1\n"
 "X-Project-Style: gnome\n"
 
+#: data/50-mutter-navigation.xml:6
+msgid "Navigation"
+msgstr "Navegação"
+
+#: data/50-mutter-navigation.xml:9
+msgid "Move window to workspace 1"
+msgstr "Mover a janela para o espaço de trabalho 1"
+
+#: data/50-mutter-navigation.xml:12
+msgid "Move window to workspace 2"
+msgstr "Mover a janela para o espaço de trabalho 2"
+
+#: data/50-mutter-navigation.xml:15
+msgid "Move window to workspace 3"
+msgstr "Mover a janela para o espaço de trabalho 3"
+
+#: data/50-mutter-navigation.xml:18
+msgid "Move window to workspace 4"
+msgstr "Mover a janela para o espaço de trabalho 4"
+
+#: data/50-mutter-navigation.xml:21
+msgid "Move window to last workspace"
+msgstr "Mover a janela para o último espaço de trabalho"
+
+#: data/50-mutter-navigation.xml:24
+msgid "Move window one workspace to the left"
+msgstr "Mover a janela um espaço de trabalho à esquerda"
+
+#: data/50-mutter-navigation.xml:27
+msgid "Move window one workspace to the right"
+msgstr "Mover a janela um espaço de trabalho à direita"
+
+#: data/50-mutter-navigation.xml:30
+msgid "Move window one workspace up"
+msgstr "Mover a janela um espaço de trabalho acima"
+
+#: data/50-mutter-navigation.xml:33
+msgid "Move window one workspace down"
+msgstr "Mover a janela um espaço de trabalho abaixo"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:36
+msgid "Move window one monitor to the left"
+msgstr "Mover janela para o monitor da esquerda"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:39
+msgid "Move window one monitor to the right"
+msgstr "Mover janela para o monitor da direita"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:42
+msgid "Move window one monitor up"
+msgstr "Mover janela para o monitor acima"
+
+# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
+#: data/50-mutter-navigation.xml:45
+msgid "Move window one monitor down"
+msgstr "Mover janela para o monitor abaixo"
+
+#: data/50-mutter-navigation.xml:49
+msgid "Switch applications"
+msgstr "Alternar aplicativos"
+
+#: data/50-mutter-navigation.xml:54
+msgid "Switch to previous application"
+msgstr "Alternar para o aplicativo anterior"
+
+#: data/50-mutter-navigation.xml:58
+msgid "Switch windows"
+msgstr "Alternar janelas"
+
+#: data/50-mutter-navigation.xml:63
+msgid "Switch to previous window"
+msgstr "Alternar para a janela anterior"
+
+#: data/50-mutter-navigation.xml:67
+msgid "Switch windows of an application"
+msgstr "Alternar as janelas de um aplicativo"
+
+#: data/50-mutter-navigation.xml:72
+msgid "Switch to previous window of an application"
+msgstr "Alternar para a janela anterior de um aplicativo"
+
+#: data/50-mutter-navigation.xml:76
+msgid "Switch system controls"
+msgstr "Alternar controles do sistema"
+
+#: data/50-mutter-navigation.xml:81
+msgid "Switch to previous system control"
+msgstr "Alternar para o controle de sistema anterior"
+
+#: data/50-mutter-navigation.xml:85
+msgid "Switch windows directly"
+msgstr "Alternar as janelas diretamente"
+
+#: data/50-mutter-navigation.xml:90
+msgid "Switch directly to previous window"
+msgstr "Alternar diretamente para a janela anterior"
+
+#: data/50-mutter-navigation.xml:94
+msgid "Switch windows of an app directly"
+msgstr "Alternar as janelas de um aplicativo diretamente"
+
+#: data/50-mutter-navigation.xml:99
+msgid "Switch directly to previous window of an app"
+msgstr "Alternar diretamente para a janela anterior de um aplicativo"
+
+#: data/50-mutter-navigation.xml:103
+msgid "Switch system controls directly"
+msgstr "Alternar os controles de sistema diretamente"
+
+#: data/50-mutter-navigation.xml:108
+msgid "Switch directly to previous system control"
+msgstr "Alternar diretamente para o controle de sistema anterior"
+
+#: data/50-mutter-navigation.xml:111
+msgid "Hide all normal windows"
+msgstr "Ocultar todas as janelas normais"
+
+#: data/50-mutter-navigation.xml:114
+msgid "Switch to workspace 1"
+msgstr "Trocar para o espaço de trabalho 1"
+
+#: data/50-mutter-navigation.xml:117
+msgid "Switch to workspace 2"
+msgstr "Trocar para o espaço de trabalho 2"
+
+#: data/50-mutter-navigation.xml:120
+msgid "Switch to workspace 3"
+msgstr "Trocar para o espaço de trabalho 3"
+
+#: data/50-mutter-navigation.xml:123
+msgid "Switch to workspace 4"
+msgstr "Trocar para o espaço de trabalho 4"
+
+#: data/50-mutter-navigation.xml:126
+msgid "Switch to last workspace"
+msgstr "Trocar para o último espaço de trabalho"
+
+#: data/50-mutter-navigation.xml:129
+msgid "Move to workspace left"
+msgstr "Move para o espaço de trabalho à esquerda"
+
+#: data/50-mutter-navigation.xml:132
+msgid "Move to workspace right"
+msgstr "Move para o espaço de trabalho à direita"
+
+#: data/50-mutter-navigation.xml:135
+msgid "Move to workspace above"
+msgstr "Mover para o espaço de trabalho acima"
+
+#: data/50-mutter-navigation.xml:138
+msgid "Move to workspace below"
+msgstr "Mover para o espaço de trabalho abaixo"
+
+#: data/50-mutter-system.xml:6
+msgid "System"
+msgstr "Sistema"
+
+#: data/50-mutter-system.xml:8
+msgid "Show the run command prompt"
+msgstr "Mostrar o prompt de comando de execução"
+
+#: data/50-mutter-system.xml:10
+msgid "Show the activities overview"
+msgstr "Mostrar o panorama de atividades"
+
+#: data/50-mutter-windows.xml:6
+msgid "Windows"
+msgstr "Janelas"
+
+#: data/50-mutter-windows.xml:8
+msgid "Activate the window menu"
+msgstr "Ativar o menu da janela"
+
+#: data/50-mutter-windows.xml:10
+msgid "Toggle fullscreen mode"
+msgstr "Alternar modo de tela inteira"
+
+#: data/50-mutter-windows.xml:12
+msgid "Toggle maximization state"
+msgstr "Alternar estado de maximização"
+
+#: data/50-mutter-windows.xml:14
+msgid "Maximize window"
+msgstr "Maximizar a janela"
+
+#: data/50-mutter-windows.xml:16
+msgid "Restore window"
+msgstr "Restaurar janela"
+
+#: data/50-mutter-windows.xml:18
+msgid "Toggle shaded state"
+msgstr "Alternar estado sombreado"
+
+#: data/50-mutter-windows.xml:20
+msgid "Close window"
+msgstr "Fechar janela"
+
+#: data/50-mutter-windows.xml:22
+msgid "Hide window"
+msgstr "Ocultar janela"
+
+#: data/50-mutter-windows.xml:24
+msgid "Move window"
+msgstr "Mover janela"
+
+#: data/50-mutter-windows.xml:26
+msgid "Resize window"
+msgstr "Redimensionar janela"
+
+#: data/50-mutter-windows.xml:29
+msgid "Toggle window on all workspaces or one"
+msgstr "Alternar a janela em todos os espaços de trabalho ou em apenas um"
+
+#: data/50-mutter-windows.xml:31
+msgid "Raise window if covered, otherwise lower it"
+msgstr "Elevar a janela se estiver coberta; caso contrário, a abaixa"
+
+#: data/50-mutter-windows.xml:33
+msgid "Raise window above other windows"
+msgstr "Elevar a janela para frente das outras"
+
+#: data/50-mutter-windows.xml:35
+msgid "Lower window below other windows"
+msgstr "Colocar a janela atrás das outras"
+
+#: data/50-mutter-windows.xml:37
+msgid "Maximize window vertically"
+msgstr "Maximizar a janela verticalmente"
+
+#: data/50-mutter-windows.xml:39
+msgid "Maximize window horizontally"
+msgstr "Maximizar a janela horizontalmente"
+
+#: data/50-mutter-windows.xml:43
+msgid "View split on left"
+msgstr "Visualizar divisão à esquerda"
+
+#: data/50-mutter-windows.xml:47
+msgid "View split on right"
+msgstr "Visualizar divisão à direita"
+
 #: data/mutter.desktop.in:4
 msgid "Mutter"
 msgstr "Mutter"
@@ -43,11 +287,6 @@ msgstr ""
 "Modificador a ser usado para operações de gerenciamento de janelas estendido"
 
 #: 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."
 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 "
@@ -55,8 +294,8 @@ msgid ""
 "set to the empty string."
 msgstr ""
 "Esta chave irá iniciar a “sobreposição”, que é a combinação de visão de "
-"janela e sistema de lançamento de aplicativos. O padrão pretendido é a “"
-"tecla Windows” no hardware do computador. É esperada para esta associação "
+"janela e sistema de lançamento de aplicativos. O padrão pretendido é a "
+"“tecla Windows” no hardware do computador. É esperada para esta associação "
 "tanto o padrão quanto a definição de uma string vazia."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
@@ -94,10 +333,6 @@ msgid "Workspaces are managed dynamically"
 msgstr "Áreas de trabalho são gerenciadas dinamicamente"
 
 #: 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
@@ -136,10 +371,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Atrasar alterações de foco até que o ponteiro pare de mover"
 
 #: 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."
 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 "
@@ -154,9 +385,6 @@ msgid "Draggable border width"
 msgstr "Largura da borda arrastável"
 
 #: 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."
 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."
@@ -189,14 +417,54 @@ msgstr ""
 "Quando verdadeiro, as novas janelas serão sempre colocadas no centro da tela "
 "ativa do monitor."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Habilitar recursos 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. • “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 ""
+"Para habilitar recursos experimentais, adicione a palavra-chave do recurso à "
+"lista. Se o recurso exige ou não reiniciar o compositor, depende do recurso "
+"dado. Qualquer recurso experimental não precisa estar disponível ou ser "
+"configurável. Não espere que adicionar alguma coisa nesta configuração seja "
+"a prova de futuro. Atualmente, palavras-chaves possíveis: • “scale-monitor-"
+"framebuffer” — torna o mutter padrão para a disposição de monitores lógicos "
+"em um espaço lógico coordenado por pixels, ao dimensionar buffers de quadros "
+"de monitor em vez de conteúdo de janela, para gerenciar monitores HiDPI. Não "
+"exige uma reinicialização. • “remote-desktop” — habilita suporte remoto. "
+"Para oferecer suporte a desktop remoto com compartilhamento de tela, “screen-"
+"cast” também deve estar habilitado. • “screen-cast” — habilita suporte a "
+"gravação de tela."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Selecione a janela a partir da aba instantânea"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Cancelar aba instantânea"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+#| msgid "Switch monitor"
+msgid "Switch monitor configurations"
+msgstr "Trocar configurações de monitor"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Gira a configuração de monitor embutido"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Trocar para o VT 1"
@@ -245,53 +513,53 @@ msgstr "Trocar para o VT 11"
 msgid "Switch to VT 12"
 msgstr "Trocar para o VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Reabilita atalhos"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Alternador de modo (Grupo %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Trocar monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Mostrar ajuda na tela"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Tela embutida"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Monitor desconhecido"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s de %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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr "Outro compositor de janelas está em execução na tela %i na área “%s”."
@@ -300,35 +568,8 @@ msgstr "Outro compositor de janelas está em execução na tela %i na área “%
 msgid "Bell event"
 msgstr "Evento de som"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” não está respondendo."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "O aplicativo não está respondendo."
-
-#: 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 ""
-"Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
-"sair completamente."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Forçar sair"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Esperar"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Falha ao abrir a exibição “%s” do sistema de janelas X\n"
 
@@ -368,14 +609,34 @@ msgstr "Executar como um compositor aninhado"
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” não está respondendo."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "O aplicativo não está respondendo."
+
+#: 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 ""
+"Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
+"sair completamente."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Forçar sair"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Esperar"
+
 #: 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"
@@ -405,9 +666,6 @@ msgstr "Espaço de trabalho %d"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
@@ -417,7 +675,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "A tela %d na exibição “%s” é inválida\n"
 
@@ -431,9 +688,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Alternador de modo: Modo %d"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."
@@ -446,191 +700,6 @@ msgstr ""
 msgid "%s (on %s)"
 msgstr "%s (em %s)"
 
-#~ msgid "Navigation"
-#~ msgstr "Navegação"
-
-#~ msgid "Move window to workspace 1"
-#~ msgstr "Mover a janela para o espaço de trabalho 1"
-
-#~ msgid "Move window to workspace 2"
-#~ msgstr "Mover a janela para o espaço de trabalho 2"
-
-#~ msgid "Move window to workspace 3"
-#~ msgstr "Mover a janela para o espaço de trabalho 3"
-
-#~ msgid "Move window to workspace 4"
-#~ msgstr "Mover a janela para o espaço de trabalho 4"
-
-#~ msgid "Move window to last workspace"
-#~ msgstr "Mover a janela para o último espaço de trabalho"
-
-#~ msgid "Move window one workspace to the left"
-#~ msgstr "Mover a janela um espaço de trabalho à esquerda"
-
-#~ msgid "Move window one workspace to the right"
-#~ msgstr "Mover a janela um espaço de trabalho à direita"
-
-#~ msgid "Move window one workspace up"
-#~ msgstr "Mover a janela um espaço de trabalho acima"
-
-#~ msgid "Move window one workspace down"
-#~ msgstr "Mover a janela um espaço de trabalho abaixo"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor to the left"
-#~ msgstr "Mover janela para o monitor da esquerda"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor to the right"
-#~ msgstr "Mover janela para o monitor da direita"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor up"
-#~ msgstr "Mover janela para o monitor acima"
-
-# Em conformidade com a tradução do gsettings-desktop-schemas --Enrico
-#~ msgid "Move window one monitor down"
-#~ msgstr "Mover janela para o monitor abaixo"
-
-#~ msgid "Switch applications"
-#~ msgstr "Alternar aplicativos"
-
-#~ msgid "Switch to previous application"
-#~ msgstr "Alternar para o aplicativo anterior"
-
-#~ msgid "Switch windows"
-#~ msgstr "Alternar janelas"
-
-#~ msgid "Switch to previous window"
-#~ msgstr "Alternar para a janela anterior"
-
-#~ msgid "Switch windows of an application"
-#~ msgstr "Alternar as janelas de um aplicativo"
-
-#~ msgid "Switch to previous window of an application"
-#~ msgstr "Alternar para a janela anterior de um aplicativo"
-
-#~| msgid "Switch system controls directly"
-#~ msgid "Switch system controls"
-#~ msgstr "Alternar controles do sistema"
-
-#~ msgid "Switch to previous system control"
-#~ msgstr "Alternar para o controle de sistema anterior"
-
-#~ msgid "Switch windows directly"
-#~ msgstr "Alternar as janelas diretamente"
-
-#~ msgid "Switch directly to previous window"
-#~ msgstr "Alternar diretamente para a janela anterior"
-
-#~ msgid "Switch windows of an app directly"
-#~ msgstr "Alternar as janelas de um aplicativo diretamente"
-
-#~ msgid "Switch directly to previous window of an app"
-#~ msgstr "Alternar diretamente para a janela anterior de um aplicativo"
-
-#~ msgid "Switch system controls directly"
-#~ msgstr "Alternar os controles de sistema diretamente"
-
-#~ msgid "Switch directly to previous system control"
-#~ msgstr "Alternar diretamente para o controle de sistema anterior"
-
-#~ msgid "Hide all normal windows"
-#~ msgstr "Ocultar todas as janelas normais"
-
-#~ msgid "Switch to workspace 1"
-#~ msgstr "Trocar para o espaço de trabalho 1"
-
-#~ msgid "Switch to workspace 2"
-#~ msgstr "Trocar para o espaço de trabalho 2"
-
-#~ msgid "Switch to workspace 3"
-#~ msgstr "Trocar para o espaço de trabalho 3"
-
-#~ msgid "Switch to workspace 4"
-#~ msgstr "Trocar para o espaço de trabalho 4"
-
-#~ msgid "Switch to last workspace"
-#~ msgstr "Trocar para o último espaço de trabalho"
-
-#~ msgid "Move to workspace left"
-#~ msgstr "Move para o espaço de trabalho à esquerda"
-
-#~ msgid "Move to workspace right"
-#~ msgstr "Move para o espaço de trabalho à direita"
-
-#~ msgid "Move to workspace above"
-#~ msgstr "Mover para o espaço de trabalho acima"
-
-#~ msgid "Move to workspace below"
-#~ msgstr "Mover para o espaço de trabalho abaixo"
-
-#~ msgid "System"
-#~ msgstr "Sistema"
-
-#~ msgid "Show the run command prompt"
-#~ msgstr "Mostrar o prompt de comando de execução"
-
-#~ msgid "Show the activities overview"
-#~ msgstr "Mostrar o panorama de atividades"
-
-#~ msgid "Windows"
-#~ msgstr "Janelas"
-
-#~ msgid "Activate the window menu"
-#~ msgstr "Ativar o menu da janela"
-
-#~ msgid "Toggle fullscreen mode"
-#~ msgstr "Alternar modo de tela inteira"
-
-#~ msgid "Toggle maximization state"
-#~ msgstr "Alternar estado de maximização"
-
-#~ msgid "Maximize window"
-#~ msgstr "Maximizar a janela"
-
-#~ msgid "Restore window"
-#~ msgstr "Restaurar janela"
-
-#~ msgid "Toggle shaded state"
-#~ msgstr "Alternar estado sombreado"
-
-#~ msgid "Close window"
-#~ msgstr "Fechar janela"
-
-#~ msgid "Hide window"
-#~ msgstr "Ocultar janela"
-
-#~ msgid "Move window"
-#~ msgstr "Mover janela"
-
-#~ msgid "Resize window"
-#~ msgstr "Redimensionar janela"
-
-#~ msgid "Toggle window on all workspaces or one"
-#~ msgstr "Alternar a janela em todos os espaços de trabalho ou em apenas um"
-
-#~ msgid "Raise window if covered, otherwise lower it"
-#~ msgstr "Elevar a janela se estiver coberta; caso contrário, a abaixa"
-
-#~ msgid "Raise window above other windows"
-#~ msgstr "Elevar a janela para frente das outras"
-
-#~ msgid "Lower window below other windows"
-#~ msgstr "Colocar a janela atrás das outras"
-
-#~ msgid "Maximize window vertically"
-#~ msgstr "Maximizar a janela verticalmente"
-
-#~ msgid "Maximize window horizontally"
-#~ msgstr "Maximizar a janela horizontalmente"
-
-#~ msgid "View split on left"
-#~ msgstr "Visualizar divisão à esquerda"
-
-#~ msgid "View split on right"
-#~ msgstr "Visualizar divisão à direita"
-
 #~ msgid "background texture could not be created from file"
 #~ msgstr "textura de plano de fundo não pôde ser criado de arquivo"
 

po/sk.po

@@ -14,8 +14,8 @@ msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-03-07 12:40+0000\n"
-"PO-Revision-Date: 2017-03-12 10:28+0100\n"
+"POT-Creation-Date: 2017-08-21 04:46+0000\n"
+"PO-Revision-Date: 2017-08-23 19:50+0200\n"
 "Last-Translator: Dušan Kazik <prescott66@gmail.com>\n"
 "Language-Team: Slovak <gnome-sk-list@gnome.org>\n"
 "Language: sk\n"
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -477,16 +477,42 @@ msgstr ""
 "Ak je nastavené na true, budú nové okná vždy umiestnené v strede aktívnej "
 "obrazovky monitoru."
 
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Povoliť experimentálne funkcie"
+
+#: 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."
+msgstr ""
+
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:141
 msgid "Select window from tab popup"
 msgstr "Vybrať okno z rozbaľovacej ponuky tabulátora"
 
 # summary
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:146
 msgid "Cancel tab popup"
 msgstr "Zrušit rozbaľovaciu ponuku tabulátora"
 
+# PK: predpokladam ze to prepisane medzi tlacidlami
+# description
+#: data/org.gnome.mutter.gschema.xml.in:151
+msgid "Switch monitor configurations"
+msgstr "Prepnúť nastavenia monitorov"
+
+#: data/org.gnome.mutter.gschema.xml.in:156
+msgid "Rotates the built-in monitor configuration"
+msgstr "Otočí nastavenie vstavaného monitora"
+
 # description
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
@@ -542,10 +568,14 @@ msgstr "Prepnúť na VT č. 11"
 msgid "Switch to VT 12"
 msgstr "Prepnúť na VT č. 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Znovu povoliť klávesové skratky"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Prepínač režimu (skupina č. %d)"
@@ -555,37 +585,37 @@ msgstr "Prepí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:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Prepnúť monitor"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Zobraziť pomocníka na obrazovke"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Vstavaný displej"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Neznámy"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Neznámy displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:474
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -596,32 +626,6 @@ msgstr ""
 msgid "Bell event"
 msgstr "Udalosť zvončeka"
 
-# %s is a window title
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "„%s“ neodpovedá."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Aplikácia neodpovedá."
-
-#: 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 ""
-"Môžete chvíľu počkať na pokračovanie aplikácie, alebo ju môžete ukončiť."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Vynútiť ukončenie"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Počkať"
-
 # X window system preloz, napr. system na spravu okien X
 #: src/core/display.c:608
 #, c-format
@@ -671,6 +675,32 @@ msgstr "Spustí ako kompozitor s vnoreným režimom"
 msgid "Run as a full display server, rather than nested"
 msgstr "Spustí ako plnohodnotný zobrazovací server, namiesto vnoreného režimu"
 
+# %s is a window title
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "„%s“ neodpovedá."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Aplikácia neodpovedá."
+
+#: 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 ""
+"Môžete chvíľu počkať na pokračovanie aplikácie, alebo ju môžete ukončiť."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Vynútiť ukončenie"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Počkať"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/sl.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-14 08:48+0100\n"
-"PO-Revision-Date: 2017-02-14 08:48+0100\n"
+"POT-Creation-Date: 2017-09-08 11:30+0200\n"
+"PO-Revision-Date: 2017-09-08 11:36+0200\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 2.0.1\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -274,15 +275,15 @@ msgstr "Spremenilnik, ki naj se uporabi za upravljanje oken"
 
 #: 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."
+"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 ""
-"Ta vrednost določa \"prevleko\", ki združuje predogled okna in zaganjalnik "
-"programa. Vrednost je zamišljena kot \"ključ oken\" na strojni opremi "
-"računalnika. Pričakovano je, da je vrednost določena privzeto ali pa ni "
-"določena."
+"Ta vrednost določa »prekrivno plast«, ki združuje predogled okna in "
+"zaganjalnik programa. Vrednost je zamišljena kot »ključ oken« na strojni "
+"opremi računalnika. Pričakovano je, da je vrednost določena privzeto ali pa "
+"ni določena."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -317,7 +318,7 @@ msgstr "Število delovnih površin je spremenljivo"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 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 ""
@@ -355,12 +356,12 @@ msgstr "Zamakni spremembe žarišča, dokler se kazalnik še premika"
 
 #: 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."
+"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 ""
-"Izbrana možnost omogoča, da se žarišče, v kolikor je izbran način \"sloppy\" "
-"ali \"miška\", ne spremeni takoj ob izbiri okna. Žarišče se spremeni, ko se "
+"Izbrana možnost omogoča, da se žarišče, v kolikor je izbran način »sloppy« "
+"ali »miška«, ne spremeni takoj ob izbiri okna. Žarišče se spremeni, ko se "
 "kazalnik preneha premikati."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
@@ -369,11 +370,11 @@ msgstr "Prilagodljiva obroba pravokotnika"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 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 ""
 "Delež skupne prilagodljive obrobe. V kolikor vidni robovi teme niso dovolj, "
-"so dodane nevidne obrobe, za dodatno prilagajanje."
+"so dodane nevidne obrobe za dodatno prilagajanje."
 
 #: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
@@ -398,14 +399,51 @@ msgid ""
 msgstr ""
 "Izbrana možnost določa, da bo novo okno vedno v središču dejavnega zaslona."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Omogoči preizkusne možnosti"
+
+#: 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 ""
+"Za omogočanje preizkusnih možnosti, dodajte na seznam ključne besedo "
+"možnosti. Ali vpisana možnost zahteva ponovni zagon sestavljalnika, je "
+"odvisno od posamezne možnosti. Te možnosti niso zahtevane niti nastavljive. "
+"Trenutno so na voljo ključne besede: • »scale-monitor-framebuffer« – določi "
+"privzeto rabo sistema mutter za logične zaslone v logičnem točkovnem "
+"koordinatnem prostoru, pri čemer prilagaja predpomnilnik in ne vsebine za "
+"upravljanje z zasloni HiDPI. Možnost ne zahteva ponovnega zagona. • »remote-"
+"desktop« – omogoči podporo oddaljenim namizjem. Za souporabo zaslona mora "
+"biti omogočena tudi možnost »screen-cast«. • »screen-cast« – omogoči podporo "
+"objavljanja na zaslon."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Izbor okna iz pojavnega zavihka"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Prekliči pojavni zavihek"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Nastavitve nadzornika preklopa"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Zavrti vgrajene nastavitve zaslona"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Preklopi na VT 1"
@@ -454,10 +492,14 @@ msgstr "Preklopi na VT 11"
 msgid "Switch to VT 12"
 msgstr "Preklopi na VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Ponovno omogoči tipkovne bližnjice"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Preklop načina (skupina %d)"
@@ -465,59 +507,99 @@ msgstr "Preklop načina (skupina %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Nadzornik preklopa"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Pokaži zaslonsko pomoč"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Vgrajen zaslon"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Neznano"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Neznan zaslon"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, 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 ""
-"Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza \"%s\"."
+"Drug upravljalnik sestavljanja je že zagnan na zaslonu %i prikaza »%s«."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Dogodek zvonjenja"
 
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Odpiranje zaslona »%s« okenskega sistema X je spodletelo\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Onemogoči povezavo z upravljalnikom sej"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Zamenjaj trenutni upravljalnik oken"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Navedite ID upravljanja seje"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Zaslon X za uporabo"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Začni sejo iz shranjene datoteke"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Uskladi klice X"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Zaženi izbirnik wayland"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Zaženi kot gnezden vpisovalnik"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
+
 #. Translators: %s is a window title
-#: src/core/delete.c:127
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
-msgstr "“%s” se ne odziva."
+msgstr "Okno »%s« se ne odziva."
 
-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Program se ne odziva."
 
-#: src/core/delete.c:134
+#: 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."
@@ -525,68 +607,26 @@ msgstr ""
 "Lahko še malo počakate, če program morda spet začne delovati, ali pa vsilite "
 "končanje delovanja."
 
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Vsili konec"
 
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Wait"
 msgstr "_Počakaj"
 
-#: src/core/display.c:608
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Ni mogoče odpreti zaslona '%s' okenskega sistema X\n"
-
-#: src/core/main.c:187
-msgid "Disable connection to session manager"
-msgstr "Onemogoči povezavo z upravljalnikom sej"
-
-#: src/core/main.c:193
-msgid "Replace the running window manager"
-msgstr "Zamenjaj trenutni upravljalnik oken"
-
-#: src/core/main.c:199
-msgid "Specify session management ID"
-msgstr "Navedite ID upravljanja seje"
-
-#: src/core/main.c:204
-msgid "X Display to use"
-msgstr "Zaslon X za uporabo"
-
-#: src/core/main.c:210
-msgid "Initialize session from savefile"
-msgstr "Začni sejo iz shranjene datoteke"
-
-#: src/core/main.c:216
-msgid "Make X calls synchronous"
-msgstr "Uskladi klice X"
-
-#: src/core/main.c:223
-msgid "Run as a wayland compositor"
-msgstr "Zaženi izbirnik wayland"
-
-#: src/core/main.c:229
-msgid "Run as a nested compositor"
-msgstr "Zaženi kot gnezden vpisovalnik"
-
-#: src/core/main.c:237
-msgid "Run as a full display server, rather than nested"
-msgstr "Zaženi kot polni strežnik zaslona in ne vstavljeno"
-
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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 ""
 "mutter %s\n"
 "Avtorske pravice pridržane (C) 2001-%d Havoc Pennington, Red Hat in drugi\n"
-"To je prosta programska oprema; za pogoje kopiranja si poglejte izvorno "
-"kodo.\n"
+"To je prosta programska oprema; za pogoje kopiranja si oglejte dovoljenje.\n"
 "Program je na voljo BREZ KAKRŠNIHKOLI ZAGOTOVIL.\n"
 
 #: src/core/mutter.c:53
@@ -606,16 +646,16 @@ msgstr "Delovna površina %d"
 #: src/core/screen.c:580
 #, 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 ""
-"Zaslon \"%s\" že ima določen upravljalnik oken; poskušajte uporabiti možnost "
-"--replace za zamenjavo trenutnega upravljalnika zaslona."
+"Zaslon »%s« že ima določen upravljalnik oken; poskušajte uporabiti možnost --"
+"replace za zamenjavo trenutnega upravljalnika zaslona."
 
 #: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Zaslon %d na prikazu '%s' ni veljaven\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Zaslon %d na prikazu »%s« ni veljaven\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
@@ -630,11 +670,11 @@ msgstr "Način preklopa: način %d"
 # G:2 K:6 O:0
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"Ta okna ne podpirajo možnosti &quot;shranjevanja trenutnih nastavitev&quot;, "
-"zato jih bo treba ob naslednji prijavi zagnati ročno."
+"Ta okna ne podpirajo možnosti »shranjevanja trenutnih nastavitev«, zato jih "
+"bo treba ob naslednji prijavi zagnati ročno."
 
 #: src/x11/window-props.c:559
 #, c-format

po/sr.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-21 07:16+0200\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\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-29 20:46+0200\n"
+"Last-Translator: Марко М. Костић <marko.m.kostic@gmail.com>\n"
+"Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -181,7 +182,7 @@ msgstr "Систем"
 
 #: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
-msgstr "Приказује промпт за покретање наредбе"
+msgstr "Приказује упит за извршавање наредбе"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
@@ -197,11 +198,11 @@ msgstr "Активира мени прозора"
 
 #: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
-msgstr "Искључује/укључује приказ преко целог екрана"
+msgstr "Искључује или укључује приказ преко целог екрана"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Искључује/укључује стање увећања"
+msgstr "Искључује или укључује стање увећања"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -213,7 +214,7 @@ msgstr "Враћа величину прозора"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Искључује/укључује стање засенчености"
+msgstr "Искључује или укључује стање засенчености"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -272,11 +273,6 @@ 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."
 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 "
@@ -322,18 +318,14 @@ 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)."
 msgid ""
 "Determines whether workspaces are managed dynamically or whether there’s a "
 "static number of workspaces (determined by the num-workspaces key in org."
 "gnome.desktop.wm.preferences)."
 msgstr ""
 "Одређује да ли се радним просторима управља динамички или ће постојати "
-"стални број радних простора (одређен бројем радних простора у "
-"„org.gnome.desktop.wm.preferences“)."
+"стални број радних простора (одређен бројем радних простора у „org.gnome."
+"desktop.wm.preferences“)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
@@ -364,10 +356,6 @@ 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."
 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 "
@@ -382,9 +370,6 @@ 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."
 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."
@@ -416,14 +401,53 @@ msgstr ""
 "Ако је изабрано, нови прозори ће увек бити постављени на средину радног "
 "екрана монитора."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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 ""
+"Да укључите пробне функције, додајте кључну реч функције на списак. Да ли "
+"функција захтева поновно покретање састављача зависи од дате функције. Није "
+"потребно да нека пробна могућност буде и даље доступна или подесива. Немојте "
+"очекивати да додавање било чега у овом подешавању буде отпорно на будуће "
+"измене. Тренутно могуће кључне речи су: • „scale-monitor-framebuffer“ — чини "
+"да матер подразумевано распоређује логичке екране у логичком координантном "
+"простору пиксела, приликом промене величине спремишта кадрова екрана уместо "
+"садржаја прозора, зарад управљања екранима високе резолуције. Не захтева "
+"поновно покретање. • “remote-desktop” — омогућава удаљену техничку подршку. "
+"Да бисте подржали удаљену техничку подршку са дељењем екрана, “screen-cast” "
+"такође мора бити омогућен. • “screen-cast” — омогућава подршку за "
+"пројектовање екрана."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Бира прозор из језичка искакања"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Отказивање језичка искакања"
 
+#: 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 "Заокреће уграђена подешавања монитора"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Прелазак на ВТ 1"
@@ -472,53 +496,53 @@ msgstr "Прелазак на ВТ 11"
 msgid "Switch to VT 12"
 msgstr "Прелазак на ВТ 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:1759
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Режим прекидача (група %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Промени монитор"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Прикажи помоћ на екрану"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Уграђени дисплеј"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Непознато"
 
-#: src/backends/meta-monitor-manager.c:700
+#: 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:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
@@ -528,35 +552,8 @@ msgstr ""
 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"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Нисам успео да отворим екран „%s“ Икс система прозора\n"
 
@@ -596,14 +593,34 @@ msgstr "Ради као угнеждени саставник"
 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
+#, 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 ""
-#| "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"
@@ -632,19 +649,15 @@ msgstr "%d. радни простор"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 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:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Приказ „%d“ на екрану „%s“ није исправан\n"
 
@@ -658,9 +671,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Режим прекидача: Режим %d"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."

po/sr@latin.po

@@ -9,19 +9,20 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&"
-"keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-16 01:44+0000\n"
-"PO-Revision-Date: 2017-02-21 07:16+0200\n"
-"Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\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:15+0000\n"
+"PO-Revision-Date: 2017-08-29 20:46+0200\n"
+"Last-Translator: Marko M. Kostić <marko.m.kostic@gmail.com>\n"
+"Language-Team: srpski <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -181,7 +182,7 @@ msgstr "Sistem"
 
 #: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
-msgstr "Prikazuje prompt za pokretanje naredbe"
+msgstr "Prikazuje upit za izvršavanje naredbe"
 
 #: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
@@ -197,11 +198,11 @@ msgstr "Aktivira meni prozora"
 
 #: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
-msgstr "Isključuje/uključuje prikaz preko celog ekrana"
+msgstr "Isključuje ili uključuje prikaz preko celog ekrana"
 
 #: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
-msgstr "Isključuje/uključuje stanje uvećanja"
+msgstr "Isključuje ili uključuje stanje uvećanja"
 
 #: data/50-mutter-windows.xml:14
 msgid "Maximize window"
@@ -213,7 +214,7 @@ msgstr "Vraća veličinu prozora"
 
 #: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
-msgstr "Isključuje/uključuje stanje zasenčenosti"
+msgstr "Isključuje ili uključuje stanje zasenčenosti"
 
 #: data/50-mutter-windows.xml:20
 msgid "Close window"
@@ -272,11 +273,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Taster koji se koristi za proširene radnje upravnika prozorima"
 
 #: 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."
 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 "
@@ -322,18 +318,14 @@ msgid "Workspaces are managed dynamically"
 msgstr "Radnim prostorima se upravlja dinamički"
 
 #: 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)."
 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 ""
 "Određuje da li se radnim prostorima upravlja dinamički ili će postojati "
-"stalni broj radnih prostora (određen brojem radnih prostora u "
-"„org.gnome.desktop.wm.preferences“)."
+"stalni broj radnih prostora (određen brojem radnih prostora u „org.gnome."
+"desktop.wm.preferences“)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
@@ -364,10 +356,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Zastoj prvog plana se menja dok se pokazivač ne zaustavi"
 
 #: 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."
 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 "
@@ -382,9 +370,6 @@ msgid "Draggable border width"
 msgstr "Širina ivice za prevlačenje"
 
 #: 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."
 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."
@@ -416,14 +401,53 @@ msgstr ""
 "Ako je izabrano, novi prozori će uvek biti postavljeni na sredinu radnog "
 "ekrana monitora."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Uključuje eksperimentalne funkcije"
+
+#: 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 ""
+"Da uključite probne funkcije, dodajte ključnu reč funkcije na spisak. Da li "
+"funkcija zahteva ponovno pokretanje sastavljača zavisi od date funkcije. Nije "
+"potrebno da neka probna mogućnost bude i dalje dostupna ili podesiva. Nemojte "
+"očekivati da dodavanje bilo čega u ovom podešavanju bude otporno na buduće "
+"izmene. Trenutno moguće ključne reči su: • „scale-monitor-framebuffer“ — čini "
+"da mater podrazumevano raspoređuje logičke ekrane u logičkom koordinantnom "
+"prostoru piksela, prilikom promene veličine spremišta kadrova ekrana umesto "
+"sadržaja prozora, zarad upravljanja ekranima visoke rezolucije. Ne zahteva "
+"ponovno pokretanje. • “remote-desktop” — omogućava udaljenu tehničku podršku. "
+"Da biste podržali udaljenu tehničku podršku sa deljenjem ekrana, “screen-cast” "
+"takođe mora biti omogućen. • “screen-cast” — omogućava podršku za "
+"projektovanje ekrana."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Bira prozor iz jezička iskakanja"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Otkazivanje jezička iskakanja"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Menja podešavanja monitora"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Zaokreće ugrađena podešavanja monitora"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Prelazak na VT 1"
@@ -472,53 +496,53 @@ msgstr "Prelazak na VT 11"
 msgid "Switch to VT 12"
 msgstr "Prelazak na VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Ponovo uključivanje prečica"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1759
+#: src/backends/meta-input-settings.c:2151
 #, c-format
-#| msgid "Mode Switch: Mode %d"
 msgid "Mode Switch (Group %d)"
 msgstr "Režim prekidača (grupa %d)"
 
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1781
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Promeni monitor"
 
-#: src/backends/meta-input-settings.c:1783
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Prikaži pomoć na ekranu"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Ugrađeni displej"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Nepoznat displej"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
@@ -528,35 +552,8 @@ msgstr ""
 msgid "Bell event"
 msgstr "Zvonca"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "„%s“ ne daje odziv."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Program ne daje odziv."
-
-#: 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 ""
-"Možete malo sačekati dok se program ne sabere ili primorati program da "
-"kompletno prekine sa radom."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Primoraj izlaz"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Sačekaj"
-
 #: src/core/display.c:608
 #, c-format
-#| msgid "Failed to open X Window System display '%s'\n"
 msgid "Failed to open X Window System display “%s”\n"
 msgstr "Nisam uspeo da otvorim ekran „%s“ Iks sistema prozora\n"
 
@@ -596,14 +593,34 @@ msgstr "Radi kao ugneždeni sastavnik"
 msgid "Run as a full display server, rather than nested"
 msgstr "Radi kao puni server prikaza, umesto kao ugneždeni"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "„%s“ ne daje odziv."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Program ne daje odziv."
+
+#: 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 ""
+"Možete malo sačekati dok se program ne sabere ili primorati program da "
+"kompletno prekine sa radom."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Primoraj izlaz"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Sačekaj"
+
 #: 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"
@@ -632,19 +649,15 @@ msgstr "%d. radni prostor"
 
 #: src/core/screen.c:580
 #, c-format
-#| msgid ""
-#| "Display \"%s\" already has a window manager; try using the --replace "
-#| "option to replace the current window manager."
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
 "replace the current window manager."
 msgstr ""
-"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju "
-"„--replace“ da zamenite trenutnog upravnika prozora."
+"Prikaz „%s“ već ima upravnika prozora; probajte da koristite opciju „--"
+"replace“ da zamenite trenutnog upravnika prozora."
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "Prikaz „%d“ na ekranu „%s“ nije ispravan\n"
 
@@ -658,9 +671,6 @@ msgid "Mode Switch: Mode %d"
 msgstr "Režim prekidača: Režim %d"
 
 #: src/x11/session.c:1815
-#| msgid ""
-#| "These windows do not support &quot;save current setup&quot; and will have "
-#| "to be restarted manually next time you log in."
 msgid ""
 "These windows do not support “save current setup” and will have to be "
 "restarted manually next time you log in."

po/sv.po

@@ -9,17 +9,17 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://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-21 01:20+0100\n"
+"POT-Creation-Date: 2017-09-04 14:39+0000\n"
+"PO-Revision-Date: 2017-09-05 00:14+0200\n"
 "Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -397,14 +397,54 @@ msgstr ""
 "När satt till \"true\", kommer nya fönster alltid att placeras centrerat på "
 "den aktiva skärmen."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Aktivera experimentella funktioner"
+
+#: 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 ""
+"För att aktivera experimentella funktioner, lägg till funktionens nyckelord "
+"till listan. Huruvida funktionen kräver att kompositionshanteraren startas "
+"om beror på den angivna funktionen. En experimentell funktion har inget krav "
+"på sig att fortfarande vara tillgänglig eller konfigurerbar. Förvänta dig "
+"inte att något som läggs till i denna inställning garanterat kommer att "
+"fungera i framtiden. För närvarande möjliga nyckelord: • ”scale-monitor-"
+"framebuffer” — gör så att mutter som standard använder en layout med logiska "
+"skärmar i en rymd av logiska bildpunktskoordinater, medan skärmars "
+"rambuffert skalas i stället för fönsterinnehållet, för att hantera HiDPI-"
+"skärmar. Kräver inte en omstart. • ”remote-desktop” — aktiverar stöd för "
+"fjärrskrivbord. För stöd för fjärrskrivbord med skärmdelning måste “screen-"
+"cast” också vara aktiverat. • “screen-cast” — aktiverar stöd för "
+"skärminspelning."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Välj fönster från flik-popup"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Avbryt flik-popup"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Växla skärmkonfiguration"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Roterar den inbyggda skärmkonfigurationen"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Växla till VT 1"
@@ -453,10 +493,14 @@ msgstr "Växla till VT 11"
 msgid "Switch to VT 12"
 msgstr "Växla till VT 12"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Återaktivera genvägar"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1800
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Lägesväxel (grupp %d)"
@@ -464,37 +508,37 @@ msgstr "Lägesväxel (grupp %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Växla skärm"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Visa hjälp på skärmen"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Inbyggd display"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Okänd"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Okänd display"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:708
+#: 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -504,32 +548,6 @@ msgstr "En annan kompositionshanterare körs redan på skärm %i på display ”
 msgid "Bell event"
 msgstr "Ljudsignalhändelse"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "”%s” svarar inte."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Programmet svarar inte."
-
-#: 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 välja att vänta en kort stund på det för att fortsätta eller tvinga "
-"programmet att helt avslutas."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Tvinga avslut"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Vänta"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -571,6 +589,32 @@ msgstr "Kör som en nästlad kompositionshanterare"
 msgid "Run as a full display server, rather than nested"
 msgstr "Kör som en full display-tjänst, i stället för nästlad"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "”%s” svarar inte."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Programmet svarar inte."
+
+#: 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 välja att vänta en kort stund på det för att fortsätta eller tvinga "
+"programmet att helt avslutas."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Tvinga avslut"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Vänta"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""

po/tr.po

@@ -6,8 +6,8 @@
 # Baris Cicek <baris@teamforce.name.tr>, 2004, 2005, 2008, 2009.
 # İlker DAĞLI <ilker@ilkerdagli.info>, 2011.
 # Muhammed EKEN <gnome@m-eken.com>, 2011.
-# Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2014, 2015, 2016.
 # Furkan Ahmet Kara <furkanahmetkara.fk@gmail.com>, 2017.
+# Muhammet Kara <muhammetk@gmail.com>, 2011, 2012, 2014, 2015, 2016, 2017.
 # Emin Tufan Çetin <etcetin@gmail.com>, 2017.
 #
 msgid ""
@@ -15,16 +15,17 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-05-11 12:29+0000\n"
-"PO-Revision-Date: 2017-05-13 17:23+0300\n"
+"POT-Creation-Date: 2017-08-29 16:09+0000\n"
+"PO-Revision-Date: 2017-08-29 23:17+0300\n"
 "Last-Translator: Emin Tufan Çetin <etcetin@gmail.com>\n"
-"Language-Team: Türkçe <>\n"
+"Language-Team: Türkçe <gnome-turk@gnome.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Gtranslator 2.91.7\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-DamnedLies-Scope: partial\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -277,11 +278,6 @@ msgid "Modifier to use for extended window management operations"
 msgstr "Genişletilmiş pencere yönetimi işlemleri için kullanılacak değiştirici"
 
 #: 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."
 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 "
@@ -366,10 +362,6 @@ msgid "Delay focus changes until the pointer stops moving"
 msgstr "Odak değişikliklerini işaretçi hareketi durana kadar ertele"
 
 #: 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."
 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 "
@@ -394,15 +386,15 @@ msgstr ""
 
 #: data/org.gnome.mutter.gschema.xml.in:89
 msgid "Auto maximize nearly monitor sized windows"
-msgstr "Ekran boyutuna yakın pencereleri otomatik ekranı kaplat"
+msgstr "Ekran boyutuna yakın pencereleri kendiliğinden ekranı kaplattır"
 
 #: 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 ""
-"Etkinleştirildiğinde ekran boyutunda başlayan yeni pencereler otomatik "
-"olarak ekranı kaplar."
+"Etkinleştirildiğinde ekran boyutunda başlayan yeni pencereler kendiliğinden "
+"ekranı kaplar."
 
 #: data/org.gnome.mutter.gschema.xml.in:98
 msgid "Place new windows in the center"
@@ -421,6 +413,20 @@ msgid "Enable experimental features"
 msgstr "Deneysel özellikleri etkinleştir"
 
 #: 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 "
@@ -429,26 +435,45 @@ 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 ""
 "Deneysel özellikleri etkinleştirmek için özelliğin anahtar sözcüğünü listeye "
 "ekleyin. Özelliğin yeniden başlatmayı gerektirip gerektirmeyeceği verilen "
 "özelliğe bağlıdır. Hiçbir deneysel özellik hala kullanılabilir veya "
 "yapılandırılabilir olmak zorunda değildir. Bu ayara eklenecek herhangi bir "
 "şeyin gelecekte olabilecek değişikliklerden etkilenmeyeceğini düşünmeyin. Şu "
-"anda kullanılabilir anahtar sözcükler: • “scale-monitor-framebuffer” — "
-"mutter’in HiDPI monitörleri yönetmesi için pencere içeriği yerine monitör "
-"çerçeve arabelleğini ölçeklendirirken, mantıksal monitörleri mantıksal "
-"piksel koordinat aralığına yerleştirmesini öntanımlı yapar."
+"anda kullanılabilir anahtar sözcükler: • “monitor-config-manager” — "
+"eskisinin yerini alması amaçlanan yeni monitör yapılandırma sistemini "
+"kullan. Bu, yapılandırma uygulamaları tarafından kullanılmak üzere daha "
+"yüksek düzeyde bir yapılandırma API’sini etkinleştirir ve ayrıca mantıksal "
+"monitör ölçeğinde yapılandırma yapmaya olanak tanır.• “scale-monitor-"
+"framebuffer” — mutter’in HiDPI monitörleri yönetmesi için pencere içeriği "
+"yerine monitör çerçeve arabelleğini ölçeklendirirken, mantıksal monitörleri "
+"mantıksal piksel koordinat aralığına yerleştirmesini öntanımlı yapar. "
+"Yeniden başlatma gerektirmez. • “remote-desktop” — uzak masaüstü desteğini "
+"etkinleştirir. Uzak masaüstünü ekran paylaşmayla desteklemek için “screen-"
+"cast” mutlaka etkinleştirilmelidir. • “screen-cast” — ekran kaydı desteğini "
+"etkinleştirir."
 
-#: data/org.gnome.mutter.gschema.xml.in:141
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Pencereyi, sekme açılır penceresinden seç"
 
-#: data/org.gnome.mutter.gschema.xml.in:146
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Sekmeyi yeni pencerede açmayı iptal et"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Monitör yapılandırmaları arasında geçiş yap"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Yerleşik monitör yapılandırmaları arasında geçiş yapar"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "VT 1’e geç"
@@ -497,10 +522,14 @@ msgstr "VT 11’e geç"
 msgid "Switch to VT 12"
 msgstr "VT 12’ye geç"
 
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Kısayolları yeniden etkinleştir"
+
 #. TRANSLATORS: This string refers to a button that switches between
 #. * different modes.
 #.
-#: src/backends/meta-input-settings.c:1848
+#: src/backends/meta-input-settings.c:2151
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "Kip anahtarı (Group %d)"
@@ -508,30 +537,30 @@ msgstr "Kip anahtarı (Group %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1870
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Monitör değiştir"
 
-#: src/backends/meta-input-settings.c:1872
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Ekranda yardımı göster"
 
-#: src/backends/meta-monitor-manager.c:783
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Yerleşik ekran"
 
-#: src/backends/meta-monitor-manager.c:806
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Bilinmiyor"
 
-#: src/backends/meta-monitor-manager.c:808
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Bilinmeyen Ekran"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:816
+#: src/backends/meta-monitor-manager.c:936
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -540,44 +569,16 @@ msgstr "%s %s"
 #. * we have no way to get it to exit
 #: src/compositor/compositor.c:476
 #, c-format
-#| msgid ""
-#| "Another compositing manager is already running on screen %i on display "
-#| "\"%s\"."
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
 msgstr ""
-"“%2$s” monitöründeki %1$i ekranında zaten başka bir birleştirme yöneticisi çalışıyor."
+"“%2$s” monitöründeki %1$i ekranında zaten başka bir birleştirme yöneticisi "
+"çalışıyor."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Etkinlik zili"
 
-#. Translators: %s is a window title
-#: src/core/delete.c:127
-#, c-format
-msgid "“%s” is not responding."
-msgstr "“%s” yanıt vermiyor."
-
-#: src/core/delete.c:129
-msgid "Application is not responding."
-msgstr "Uygulama cevap vermiyor"
-
-#: 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 ""
-"Uygulamanın devam etmesi için bir müddet bekleyi seçebilirsiniz ya da "
-"uygulamanın tamamen çıkması için onu zorlayabilirsiniz."
-
-#: src/core/delete.c:141
-msgid "_Force Quit"
-msgstr "_Sonlandır"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Bekle"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -619,14 +620,34 @@ msgstr "Yuvalanmış dizgici olarak çalıştır"
 msgid "Run as a full display server, rather than nested"
 msgstr "İç içe değil tam ekran sunucusu olarak çalıştır"
 
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
+#, c-format
+msgid "“%s” is not responding."
+msgstr "“%s” yanıt vermiyor."
+
+#: src/core/meta-close-dialog-default.c:149
+msgid "Application is not responding."
+msgstr "Uygulama yanıt vermiyor"
+
+#: 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 ""
+"Uygulamanın devam etmesi için bir süre beklemeyi seçebilir veya tümüyle "
+"çıkması için zorlayabilirsiniz."
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Force Quit"
+msgstr "_Zorla Çık"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Bekle"
+
 #: 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"
@@ -665,7 +686,6 @@ msgstr ""
 
 #: src/core/screen.c:665
 #, c-format
-#| msgid "Screen %d on display '%s' is invalid\n"
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "“%2$s” monitöründeki %1$d ekranı geçersiz\n"
 
@@ -684,7 +704,7 @@ msgid ""
 "restarted manually next time you log in."
 msgstr ""
 "Bu pencereler, “geçerli ayarları kaydet” özelliğini desteklemiyor ve bir "
-"dahaki girişinizde elle yeniden başlatılmak zorunda."
+"dahaki girişinizde elle yeniden başlatılmak zorundadır."
 
 #: src/x11/window-props.c:559
 #, c-format

po/vi.po

@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the Metacity package.
 # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2002-2004, 2007, 2008, 2011-2013.
 # Clytie Siddall <clytie@riverland.net.au>, 2005-2009.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2014, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-09-08 21:37+0000\n"
-"PO-Revision-Date: 2016-09-09 08:14+0700\n"
+"POT-Creation-Date: 2017-09-07 15:44+0000\n"
+"PO-Revision-Date: 2017-09-09 08:26+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
 "Language: vi\n"
@@ -59,7 +59,7 @@ msgstr "Chuyển cửa sổ lên một không gian làm việc"
 
 #: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
-msgstr "Chuyển cửa sổ xuống vùng một làm việc"
+msgstr "Chuyển cửa sổ xuống một không gian làm việc"
 
 #: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
@@ -271,14 +271,14 @@ msgstr "Phím bổ trợ dùng cho chức năng quản lý cửa sổ mở rộn
 
 #: 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."
+"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 ""
-"Phím này kích hoạt \"overlay\", một tổ hợp tổng quát cửa sổ và hệ thống chạy "
-"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Chứa một tổ hợp "
-"phím, hoặc mặc định, hoặc chuỗi rỗng."
+"Phím này khởi tạo “overlay”, nơi mà tổ hợp tổng quát cửa sổ và hệ thống chạy "
+"ứng dụng. Mặc định là \"phím Windows\" trên phần cứng PC. Nó được kỳ vọng "
+"rằng tổ hợp hoặc là mặc định, hoặc chuỗi rỗng."
 
 #: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
@@ -314,13 +314,13 @@ msgstr "Không gian làm việc được quản lý động"
 
 #: data/org.gnome.mutter.gschema.xml.in:41
 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 ""
 "Xác định không gian làm việc được quản lý động, hay cố định số không gian "
-"làm việc, xác định bởi khóa num-workspaces trong org.gnome.desktop.wm."
-"preferences."
+"làm việc (xác định bởi khóa num-workspaces trong org.gnome.desktop.wm."
+"preferences)."
 
 #: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
@@ -350,13 +350,13 @@ msgstr "Khoảng chờ con trỏ dừng di chuyển trước khi thay đổi ti
 
 #: 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."
+"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 ""
-"Nếu bật, và chế độ tiêu điểm là \"sloppy\" hay \"mouse\" thì cửa sổ có tiêu "
-"điểm sẽ được thay đổi tức thì khi vào cửa sổ, nhưng chỉ sau khi chuột ngừng "
-"di chuyển."
+"Nếu bật, và chế độ kích hoạt là “sloppy” hay “mouse” thì sự kích hoạt sẽ "
+"không thay đổi tức thì khi vào cửa sổ, mà chỉ sau khi con trỏ ngừng di "
+"chuyển."
 
 #: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
@@ -364,7 +364,7 @@ msgstr "Độ rộng biên có thể kéo"
 
 #: data/org.gnome.mutter.gschema.xml.in:80
 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 ""
 "Kích thước biên có thể kéo. Nếu biên thấy được của chủ đề không đủ, biên vô "
@@ -389,17 +389,55 @@ msgid ""
 "When true, the new windows will always be put in the center of the active "
 "screen of the monitor."
 msgstr ""
-"Nếu đúng, các cửa sổ mới sẽ luôn được đặt tại trung tâm của màn hình đang "
+"Nếu chọn, các cửa sổ mới sẽ luôn được đặt tại trung tâm của màn hình đang "
 "hoạt động của màn hình."
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: data/org.gnome.mutter.gschema.xml.in:107
+msgid "Enable experimental features"
+msgstr "Bật các tính băng thử nghiệm"
+
+#: 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 ""
+"Để bật các tính năng thử nghiệm, thêm các từ khóa tính năng vào danh sách. "
+"Việc tính năng mới có yêu cầu khởi động lại hay không là phụ thuộc vào tính "
+"năng đã cho. Bất kỳ tính năng thử nghiệp nào không được yêu cầu vẫn sẵn "
+"sàng, hoặc cấu hình được. Đừng cho rằng thêm bất kỳ thứ gì trong cài đặt này "
+"thử nghiệm trong tương lai. Các từ khóa hiện có thể là: • “scale-monitor-"
+"framebuffer” — làm cho mutter default to layout logical monitors trong một "
+"không gian tọa độ điểm ảnh lôgíc, trong khi while scaling monitor "
+"framebuffers instead of window content, để quản lý các màn hình HiDPI. Không "
+"yêu cầu khởi động lại. • “remote-desktop” — cho phép điều khiển màn hình từ "
+"xa. Để hỗ trợ điều khiển màn hình từ xa bằng cách chia sẻ màn hình, “screen-"
+"cast” cũng phải được bật. • “screen-cast” — bật hỗ trợ chia sẻ màn hình."
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "Chọn cửa sổ từ thanh nổi lên"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "Hủy thanh nổi lên"
 
+#: data/org.gnome.mutter.gschema.xml.in:155
+msgid "Switch monitor configurations"
+msgstr "Chuyển các cấu hình màn hình"
+
+#: data/org.gnome.mutter.gschema.xml.in:160
+msgid "Rotates the built-in monitor configuration"
+msgstr "Quay cấu hình màn hình tích hợp"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Chuyển sang VT 1"
@@ -448,58 +486,114 @@ msgstr "Chuyển sang VT 11"
 msgid "Switch to VT 12"
 msgstr "Chuyển sang VT 12"
 
-#: src/backends/meta-input-settings.c:1707
+#: data/org.gnome.mutter.wayland.gschema.xml.in:54
+msgid "Re-enable shortcuts"
+msgstr "Bật-lại phím tắt"
+
+#. TRANSLATORS: This string refers to a button that switches between
+#. * different modes.
+#.
+#: src/backends/meta-input-settings.c:2151
+#, c-format
+msgid "Mode Switch (Group %d)"
+msgstr "Chuyển chế độ(Nhóm %d)"
+
+#. TRANSLATORS: This string refers to an action, cycles drawing tablets'
+#. * mapping through the available outputs.
+#.
+#: src/backends/meta-input-settings.c:2174
 msgid "Switch monitor"
 msgstr "Chuyển màn hình"
 
-#: src/backends/meta-input-settings.c:1709
+#: src/backends/meta-input-settings.c:2176
 msgid "Show on-screen help"
 msgstr "Hiển thị trợ giúp trên-màn-hình"
 
-#: src/backends/meta-monitor-manager.c:514
+#: src/backends/meta-monitor-manager.c:903
 msgid "Built-in display"
 msgstr "Màn hình tích hợp"
 
-#: src/backends/meta-monitor-manager.c:537
+#: src/backends/meta-monitor-manager.c:926
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: src/backends/meta-monitor-manager.c:539
+#: src/backends/meta-monitor-manager.c:928
 msgid "Unknown Display"
 msgstr "Không hiểu màn hình"
 
 #. TRANSLATORS: this is a monitor vendor name, followed by a
 #. * size in inches, like 'Dell 15"'
 #.
-#: src/backends/meta-monitor-manager.c:547
+#: 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:463
+#: src/compositor/compositor.c:476
 #, 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 ""
-"Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày \"%s\"."
+"Bộ quản lý cửa sổ đã đang chạy trên Màn hình %i trên bộ trình bày “%s”."
 
 #: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Sự kiện chuông"
 
-#: src/core/delete.c:127
+#: src/core/display.c:608
+#, c-format
+msgid "Failed to open X Window System display “%s”\n"
+msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X “%s”\n"
+
+#: src/core/main.c:189
+msgid "Disable connection to session manager"
+msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"
+
+#: src/core/main.c:195
+msgid "Replace the running window manager"
+msgstr "Thay thế bộ quản lý cửa sổ đang chạy"
+
+#: src/core/main.c:201
+msgid "Specify session management ID"
+msgstr "Ghi rõ mã số quản lý phiên làm việc"
+
+#: src/core/main.c:206
+msgid "X Display to use"
+msgstr "Bộ trình bày X cần dùng"
+
+#: src/core/main.c:212
+msgid "Initialize session from savefile"
+msgstr "Khởi động phiên làm việc từ tập tin lưu"
+
+#: src/core/main.c:218
+msgid "Make X calls synchronous"
+msgstr "Khiến các cú gọi X đồng bộ với nhau"
+
+#: src/core/main.c:225
+msgid "Run as a wayland compositor"
+msgstr "Chạy như là một “wayland compositor”"
+
+#: src/core/main.c:231
+msgid "Run as a nested compositor"
+msgstr "Chạy như là một “nested compositor”"
+
+#: src/core/main.c:239
+msgid "Run as a full display server, rather than nested"
+msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"
+
+#. Translators: %s is a window title
+#: src/core/meta-close-dialog-default.c:147
 #, c-format
 msgid "“%s” is not responding."
 msgstr "“%s” không trả lời."
 
-#: src/core/delete.c:129
+#: src/core/meta-close-dialog-default.c:149
 msgid "Application is not responding."
 msgstr "Ứng dụng không trả lời."
 
-#: src/core/delete.c:134
+#: 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."
@@ -507,60 +601,19 @@ msgstr ""
 "Bạn có thể chọn chờ một lúc cho nó tiếp tục hoặc buộc chấm dứt hoàn toàn ứng "
 "dụng."
 
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "_Chờ"
-
-#: src/core/delete.c:141
+#: src/core/meta-close-dialog-default.c:161
 msgid "_Force Quit"
 msgstr "_Buộc thoát"
 
-#: src/core/display.c:590
-#, c-format
-msgid "Failed to open X Window System display '%s'\n"
-msgstr "Gặp lỗi khi mở bộ trình bày Hệ thống Cửa sổ X \"%s\".\n"
-
-#: src/core/main.c:182
-msgid "Disable connection to session manager"
-msgstr "Vô hiệu hóa kết nối với bộ quản lý phiên làm việc"
-
-#: src/core/main.c:188
-msgid "Replace the running window manager"
-msgstr "Thay thế bộ quản lý cửa sổ đang chạy"
-
-#: src/core/main.c:194
-msgid "Specify session management ID"
-msgstr "Ghi rõ mã số quản lý phiên làm việc"
-
-#: src/core/main.c:199
-msgid "X Display to use"
-msgstr "Bộ trình bày X cần dùng"
-
-#: src/core/main.c:205
-msgid "Initialize session from savefile"
-msgstr "Khởi động phiên làm việc từ tập tin lưu"
-
-#: src/core/main.c:211
-msgid "Make X calls synchronous"
-msgstr "Khiến các cú gọi X đồng bộ với nhau"
-
-#: src/core/main.c:218
-msgid "Run as a wayland compositor"
-msgstr "Chạy như là một “wayland compositor”"
-
-#: src/core/main.c:224
-msgid "Run as a nested compositor"
-msgstr "Chạy như là một “nested compositor”"
-
-#: src/core/main.c:232
-msgid "Run as a full display server, rather than nested"
-msgstr "Chạy như là một dịch vụ hiển thị đầy đủ, thay cho lồng nhau"
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "_Chờ"
 
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"Copyright © 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"
@@ -585,38 +638,38 @@ msgstr "Phần bổ sung Mutter cần dùng"
 msgid "Workspace %d"
 msgstr "Không gian làm việc %d"
 
-#: src/core/screen.c:521
+#: src/core/screen.c:580
 #, 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 ""
-"Màn hình \"%s\" đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn “--"
-"replace” để thay thế bộ quản lý cửa sổ đang dùng."
+"Màn hình “%s” đã có bộ quản lý cửa sổ rồi; hãy thử dùng tùy chọn --replace "
+"để thay thế bộ quản lý cửa sổ đang dùng."
 
-#: src/core/screen.c:606
+#: src/core/screen.c:665
 #, c-format
-msgid "Screen %d on display '%s' is invalid\n"
-msgstr "Màn hình %d trên bộ trình bày \"%s\" không hợp lệ.\n"
+msgid "Screen %d on display “%s” is invalid\n"
+msgstr "Màn hình %d trên bộ trình bày “%s” không hợp lệ.\n"
 
 #: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter đã được biên dịch không hỗ trợ chế độ chi tiết\n"
 
-#: src/wayland/meta-wayland-tablet-pad.c:595
+#: src/wayland/meta-wayland-tablet-pad.c:563
 #, c-format
 msgid "Mode Switch: Mode %d"
 msgstr "Chuyển chế độ: Chế độ %d"
 
 #: src/x11/session.c:1815
 msgid ""
-"These windows do not support &quot;save current setup&quot; and will have to "
-"be restarted manually next time you log in."
+"These windows do not support “save current setup” and will have to be "
+"restarted manually next time you log in."
 msgstr ""
-"Những cửa sổ này không hỗ trợ &quot;lưu cài đặt hiện thời&quot; và sẽ phải "
-"khởi động lại bằng tay lần kế bạn đăng nhập."
+"Những cửa sổ này không hỗ trợ “lưu cài đặt hiện tại” và sẽ phải khởi động "
+"lại bằng tay lần kế bạn đăng nhập."
 
-#: src/x11/window-props.c:548
+#: src/x11/window-props.c:559
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (trên %s)"

po/zh_TW.po

@@ -10,16 +10,16 @@ msgstr ""
 "Project-Id-Version: metacity 3.3.4\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 06:20+0000\n"
-"PO-Revision-Date: 2017-03-01 10:24+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
+"POT-Creation-Date: 2017-09-29 14:36+0000\n"
+"PO-Revision-Date: 2017-10-01 22:57+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: data/50-mutter-navigation.xml:6
 msgid "Navigation"
@@ -383,14 +383,48 @@ msgid ""
 "screen of the monitor."
 msgstr "當設定為「true」時，新視窗會永遠置於使用中螢幕畫面的正中央。"
 
-#: data/org.gnome.mutter.gschema.xml.in:120
+#: 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 ""
+"若要啟用實驗性功能，請將功能關鍵字加入列表中。置於該功能是否須要重新啟動混成"
+"器則視給予的功能而定。任何實驗性功能不一定能用、或是可以調整設定。請不要預期"
+"在此設定中加入的任何東西未來都能存在。目前可用的關鍵字有： • “scale-monitor-"
+"framebuffer” — 讓 mutter 預設採用邏輯像素座標空間的配置邏輯螢幕，而縮放螢幕 "
+"framebuffer 則取代視窗內容以管理 HiDPI 螢幕。不須要重新啟動。 • “remote-"
+"desktop” — 啟用遠端桌面支援。若要支援遠端桌面的螢幕分享，則必須也啟用“screen-"
+"cast”。• “screen-cast” — 啟用螢幕投放支援。"
+
+#: data/org.gnome.mutter.gschema.xml.in:145
 msgid "Select window from tab popup"
 msgstr "從分頁彈出項選擇視窗"
 
-#: data/org.gnome.mutter.gschema.xml.in:125
+#: data/org.gnome.mutter.gschema.xml.in:150
 msgid "Cancel tab popup"
 msgstr "取消分頁彈出項"
 
+#: 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 "旋轉切換內建螢幕組態"
+
 #: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "切換至 VT 1"
@@ -439,10 +473,14 @@ 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:1800
+#: src/backends/meta-input-settings.c:2157
 #, c-format
 msgid "Mode Switch (Group %d)"
 msgstr "模式切換( 群組 %d)"
@@ -450,30 +488,30 @@ msgstr "模式切換( 群組 %d)"
 #. TRANSLATORS: This string refers to an action, cycles drawing tablets'
 #. * mapping through the available outputs.
 #.
-#: src/backends/meta-input-settings.c:1822
+#: src/backends/meta-input-settings.c:2180
 msgid "Switch monitor"
-msgstr "切換監視器"
+msgstr "切換螢幕"
 
-#: src/backends/meta-input-settings.c:1824
+#: src/backends/meta-input-settings.c:2182
 msgid "Show on-screen help"
 msgstr "顯示螢幕求助"
 
-#: src/backends/meta-monitor-manager.c:675
+#: src/backends/meta-monitor-manager.c:894
 msgid "Built-in display"
 msgstr "內建顯示"
 
-#: src/backends/meta-monitor-manager.c:698
+#: src/backends/meta-monitor-manager.c:917
 msgid "Unknown"
 msgstr "不明"
 
-#: src/backends/meta-monitor-manager.c:700
+#: src/backends/meta-monitor-manager.c:919
 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:708
+#: src/backends/meta-monitor-manager.c:927
 #, c-format
 msgid "%s %s"
 msgstr "%s %s"
@@ -481,7 +519,7 @@ msgstr "%s %s"
 # FIXME: I'm still unclear about the meaning of XGetSelectionOwner -- Abel
 #. 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:471
+#: src/compositor/compositor.c:476
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display “%s”."
@@ -491,30 +529,6 @@ msgstr "在畫面「%2$s」中的第 %1$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 "強制結束(_F)"
-
-#: src/core/delete.c:141
-msgid "_Wait"
-msgstr "等待(_W)"
-
 #: src/core/display.c:608
 #, c-format
 msgid "Failed to open X Window System display “%s”\n"
@@ -556,6 +570,30 @@ msgstr "以巢狀組合器執行"
 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
+#, 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 "強制退出(_F)"
+
+#: src/core/meta-close-dialog-default.c:161
+msgid "_Wait"
+msgstr "等待(_W)"
+
 #: src/core/mutter.c:39
 #, c-format
 msgid ""
@@ -566,8 +604,8 @@ msgid ""
 "PARTICULAR PURPOSE.\n"
 msgstr ""
 "mutter %s\n"
-"版權所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc. 及其它開發者\n"
-"本程式是自由軟體；有關版權的詳情請參考源程式碼。\n"
+"著作權所有 (C) 2001-%d Havoc Pennington, Red Hat, Inc. 及其它開發者\n"
+"本程式是自由軟體；有關著作權的詳情請參考源始程式碼。\n"
 "本程式不負任何擔保責任；亦無對適售性或特定目的適用性所為的默示性擔保。\n"
 
 #: src/core/mutter.c:53
@@ -584,7 +622,7 @@ msgstr "要使用的 Mutter 外掛程式"
 msgid "Workspace %d"
 msgstr "工作區 %d"
 
-#: src/core/screen.c:580
+#: src/core/screen.c:582
 #, c-format
 msgid ""
 "Display “%s” already has a window manager; try using the --replace option to "
@@ -593,7 +631,7 @@ msgstr ""
 "畫面「%s」已經有了視窗管理員；請嘗試使用 --replace 選項來替換目前的視窗管理"
 "員。"
 
-#: src/core/screen.c:665
+#: src/core/screen.c:667
 #, c-format
 msgid "Screen %d on display “%s” is invalid\n"
 msgstr "畫面「%2$s」中的第 %1$d 個螢幕無效\n"

src/Makefile-tests.am

@@ -2,6 +2,13 @@
 
 if HAVE_WAYLAND
 
+test_programs = \
+	mutter-test-client \
+	mutter-test-runner \
+	mutter-test-unit-tests \
+	mutter-test-headless-start-test \
+	$(NULL)
+
 if BUILDOPT_INSTALL_TESTS
 stackingdir = $(pkgdatadir)/tests/stacking
 dist_stacking_DATA =				\
@@ -19,9 +26,9 @@ installedtestsdir = $(datadir)/installed-tests/mutter
 installedtests_DATA = mutter-all.test
 
 installedtestsbindir = $(libexecdir)/installed-tests/mutter
-installedtestsbin_PROGRAMS = mutter-test-client mutter-test-runner mutter-test-unit-tests
+installedtestsbin_PROGRAMS = $(test_programs)
 else
-noinst_PROGRAMS += mutter-test-client mutter-test-runner mutter-test-unit-tests
+noinst_PROGRAMS += $(test_programs)
 endif
 
 EXTRA_DIST += tests/mutter-all.test.in
@@ -29,15 +36,22 @@ EXTRA_DIST += tests/mutter-all.test.in
 mutter_test_client_SOURCES = tests/test-client.c
 mutter_test_client_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
-mutter_test_runner_SOURCES = tests/test-runner.c
+mutter_test_runner_SOURCES = \
+	tests/test-utils.c \
+	tests/test-utils.h \
+	tests/test-runner.c
 mutter_test_runner_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
 mutter_test_unit_tests_SOURCES = \
+	tests/test-utils.c \
+	tests/test-utils.h \
 	tests/unit-tests.c \
 	tests/meta-backend-test.c \
 	tests/meta-backend-test.h \
 	tests/meta-monitor-manager-test.c \
 	tests/meta-monitor-manager-test.h \
+	tests/monitor-config-migration-unit-tests.c \
+	tests/monitor-config-migration-unit-tests.h \
 	tests/monitor-store-unit-tests.c \
 	tests/monitor-store-unit-tests.h \
 	tests/monitor-test-utils.c \
@@ -47,7 +61,16 @@ mutter_test_unit_tests_SOURCES = \
 	$(NULL)
 mutter_test_unit_tests_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
 
-.PHONY: run-tests run-test-runner-tests run-unit-tests
+mutter_test_headless_start_test_SOURCES = \
+	tests/headless-start-test.c \
+	tests/meta-backend-test.c \
+	tests/meta-backend-test.h \
+	tests/meta-monitor-manager-test.c \
+	tests/meta-monitor-manager-test.h \
+	$(NULL)
+mutter_test_headless_start_test_LDADD = $(MUTTER_LIBS) libmutter-$(LIBMUTTER_API_VERSION).la
+
+.PHONY: run-tests run-test-runner-tests run-unit-tests run-headless-start-test
 
 run-test-runner-tests: mutter-test-client mutter-test-runner
 	./mutter-test-runner $(dist_stacking_DATA)
@@ -55,7 +78,10 @@ run-test-runner-tests: mutter-test-client mutter-test-runner
 run-unit-tests: mutter-test-unit-tests
 	./mutter-test-unit-tests
 
-run-tests: run-test-runner-tests run-unit-tests
+run-headless-start-test: mutter-test-headless-start-test
+	./mutter-test-headless-start-test
+
+run-tests: run-test-runner-tests run-unit-tests run-headless-start-test
 
 endif
 

src/Makefile.am

@@ -53,6 +53,13 @@ mutter_built_sources = \
 	meta-enum-types.c			\
 	$(NULL)
 
+if HAVE_REMOTE_DESKTOP
+mutter_built_sources += \
+	$(dbus_remote_desktop_built_sources)	\
+	$(dbus_screen_cast_built_sources)	\
+	$(NULL)
+endif
+
 if HAVE_WAYLAND
 mutter_built_sources += \
 	pointer-gestures-unstable-v1-protocol.c				\
@@ -71,6 +78,10 @@ mutter_built_sources += \
 	tablet-unstable-v2-server-protocol.h				\
 	xdg-foreign-unstable-v1-protocol.c				\
 	xdg-foreign-unstable-v1-server-protocol.h			\
+	linux-dmabuf-unstable-v1-protocol.c					\
+	linux-dmabuf-unstable-v1-server-protocol.h				\
+	keyboard-shortcuts-inhibit-unstable-v1-protocol.c		\
+	keyboard-shortcuts-inhibit-unstable-v1-server-protocol.h	\
 	$(NULL)
 endif
 
@@ -86,6 +97,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-backend-private.h		\
 	backends/meta-barrier.c			\
 	backends/meta-barrier-private.h		\
+	backends/meta-crtc.c			\
+	backends/meta-crtc.h			\
 	backends/meta-cursor.c			\
 	backends/meta-cursor.h			\
 	backends/meta-cursor-tracker.c		\
@@ -96,6 +109,11 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-egl.c			\
 	backends/meta-egl.h			\
 	backends/meta-egl-ext.h			\
+	backends/meta-gles3.c			\
+	backends/meta-gles3.h			\
+	backends/meta-gles3-table.h		\
+	backends/meta-gpu.c			\
+	backends/meta-gpu.h			\
 	backends/meta-display-config-shared.h	\
 	backends/meta-idle-monitor.c		\
 	backends/meta-idle-monitor-private.h	\
@@ -105,10 +123,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-input-settings-private.h	\
 	backends/meta-logical-monitor.c		\
 	backends/meta-logical-monitor.h		\
-	backends/meta-monitor-config.c		\
-	backends/meta-monitor-config.h		\
 	backends/meta-monitor-config-manager.c	\
 	backends/meta-monitor-config-manager.h	\
+	backends/meta-monitor-config-migration.c	\
+	backends/meta-monitor-config-migration.h	\
 	backends/meta-monitor-config-store.c	\
 	backends/meta-monitor-config-store.h	\
 	backends/meta-monitor.c			\
@@ -118,6 +136,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/meta-monitor-manager-private.h	\
 	backends/meta-monitor-manager-dummy.c	\
 	backends/meta-monitor-manager-dummy.h	\
+	backends/meta-orientation-manager.c	\
+	backends/meta-orientation-manager.h	\
+	backends/meta-output.c			\
+	backends/meta-output.h			\
 	backends/meta-pointer-constraint.c	\
 	backends/meta-pointer-constraint.h	\
 	backends/meta-settings.c		\
@@ -136,8 +158,12 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-barrier-x11.h			\
 	backends/x11/meta-clutter-backend-x11.c		\
 	backends/x11/meta-clutter-backend-x11.h		\
+	backends/x11/meta-crtc-xrandr.c			\
+	backends/x11/meta-crtc-xrandr.h			\
 	backends/x11/meta-cursor-renderer-x11.c		\
 	backends/x11/meta-cursor-renderer-x11.h		\
+	backends/x11/meta-gpu-xrandr.c			\
+	backends/x11/meta-gpu-xrandr.h			\
 	backends/x11/cm/meta-backend-x11-cm.c		\
 	backends/x11/cm/meta-backend-x11-cm.h		\
 	backends/x11/cm/meta-renderer-x11-cm.c		\
@@ -154,6 +180,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	backends/x11/meta-input-settings-x11.h		\
 	backends/x11/meta-monitor-manager-xrandr.c	\
 	backends/x11/meta-monitor-manager-xrandr.h	\
+	backends/x11/meta-output-xrandr.c		\
+	backends/x11/meta-output-xrandr.h		\
 	backends/x11/meta-renderer-x11.c		\
 	backends/x11/meta-renderer-x11.h		\
 	backends/x11/meta-stage-x11-nested.c		\
@@ -168,6 +196,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	meta/boxes.h				\
 	core/meta-border.c			\
 	core/meta-border.h			\
+	core/meta-fraction.c			\
+	core/meta-fraction.h			\
 	compositor/clutter-utils.c		\
 	compositor/clutter-utils.h		\
 	compositor/cogl-utils.c			\
@@ -229,6 +259,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	meta/meta-close-dialog.h		\
 	core/meta-close-dialog-default.c	\
 	core/meta-close-dialog-default-private.h	\
+	core/meta-inhibit-shortcuts-dialog.c	\
+	meta/meta-inhibit-shortcuts-dialog.h	\
+	core/meta-inhibit-shortcuts-dialog-default.c	\
+	core/meta-inhibit-shortcuts-dialog-default-private.h \
 	core/delete.c				\
 	core/display.c				\
 	core/display-private.h			\
@@ -301,6 +335,29 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\
 	x11/mutter-Xatomtype.h			\
 	$(NULL)
 
+if HAVE_REMOTE_DESKTOP
+libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
+	backends/meta-dbus-session-watcher.c	\
+	backends/meta-dbus-session-watcher.h	\
+	backends/meta-remote-desktop.c		\
+	backends/meta-remote-desktop.h		\
+	backends/meta-remote-desktop-session.c	\
+	backends/meta-remote-desktop-session.h	\
+	backends/meta-screen-cast.c		\
+	backends/meta-screen-cast.h		\
+	backends/meta-screen-cast-monitor-stream.c	\
+	backends/meta-screen-cast-monitor-stream.h	\
+	backends/meta-screen-cast-monitor-stream-src.c	\
+	backends/meta-screen-cast-monitor-stream-src.h	\
+	backends/meta-screen-cast-session.c	\
+	backends/meta-screen-cast-session.h	\
+	backends/meta-screen-cast-stream.c	\
+	backends/meta-screen-cast-stream.h	\
+	backends/meta-screen-cast-stream-src.c	\
+	backends/meta-screen-cast-stream-src.h	\
+	$(NULL)
+endif
+
 if HAVE_WAYLAND
 libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	compositor/meta-surface-actor-wayland.c	\
@@ -315,6 +372,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	wayland/meta-xwayland-private.h		\
 	wayland/meta-wayland-buffer.c      	\
 	wayland/meta-wayland-buffer.h      	\
+	wayland/meta-wayland-dma-buf.c      	\
+	wayland/meta-wayland-dma-buf.h      	\
 	wayland/meta-wayland-region.c      	\
 	wayland/meta-wayland-region.h      	\
 	wayland/meta-wayland-data-device.c      \
@@ -382,6 +441,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\
 	wayland/meta-wayland-wl-shell.h		\
 	wayland/meta-wayland-gtk-shell.c	\
 	wayland/meta-wayland-gtk-shell.h	\
+	wayland/meta-wayland-inhibit-shortcuts.c \
+	wayland/meta-wayland-inhibit-shortcuts.h \
+	wayland/meta-wayland-inhibit-shortcuts-dialog.c	\
+	wayland/meta-wayland-inhibit-shortcuts-dialog.h	\
 	$(NULL)
 endif
 
@@ -392,11 +455,15 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	backends/native/meta-backend-native-private.h	\
 	backends/native/meta-barrier-native.c		\
 	backends/native/meta-barrier-native.h		\
+	backends/native/meta-crtc-kms.c			\
+	backends/native/meta-crtc-kms.h			\
 	backends/native/meta-clutter-backend-native.c	\
 	backends/native/meta-clutter-backend-native.h	\
 	backends/native/meta-cursor-renderer-native.c	\
 	backends/native/meta-cursor-renderer-native.h	\
 	backends/native/meta-default-modes.h		\
+	backends/native/meta-gpu-kms.c			\
+	backends/native/meta-gpu-kms.h			\
 	backends/native/meta-idle-monitor-native.c	\
 	backends/native/meta-idle-monitor-native.h	\
 	backends/native/meta-input-settings-native.c	\
@@ -405,8 +472,12 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=		\
 	backends/native/meta-monitor-manager-kms.h	\
 	backends/native/meta-launcher.c			\
 	backends/native/meta-launcher.h			\
+	backends/native/meta-output-kms.c		\
+	backends/native/meta-output-kms.h		\
 	backends/native/meta-renderer-native.c		\
 	backends/native/meta-renderer-native.h		\
+	backends/native/meta-renderer-native-gles3.c	\
+	backends/native/meta-renderer-native-gles3.h	\
 	backends/native/meta-stage-native.c		\
 	backends/native/meta-stage-native.h		\
 	backends/native/dbus-utils.c			\
@@ -443,6 +514,7 @@ libmutterinclude_headers =			\
 	meta/meta-background-image.h		\
 	meta/meta-background-group.h		\
 	meta/meta-close-dialog.h		\
+	meta/meta-inhibit-shortcuts-dialog.h	\
 	meta/meta-cursor-tracker.h		\
 	meta/meta-dnd.h			\
 	meta/meta-idle-monitor.h		\
@@ -562,6 +634,8 @@ EXTRA_DIST +=					\
 	org.freedesktop.login1.xml		\
 	org.gnome.Mutter.DisplayConfig.xml	\
 	org.gnome.Mutter.IdleMonitor.xml	\
+	org.gnome.Mutter.RemoteDesktop.xml	\
+	org.gnome.Mutter.ScreenCast.xml	\
 	backends/native/gen-default-modes.py	\
 	$(NULL)
 
@@ -578,7 +652,7 @@ stamp-meta-enum-types.h: $(libmutterinclude_headers) meta-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template meta-enum-types.h.in \
-	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
+	  $(libmutterinclude_headers) ) > xgen-teth && \
 	(cmp -s xgen-teth meta/meta-enum-types.h || cp xgen-teth meta/meta-enum-types.h) && \
 	rm -f xgen-teth && \
 	echo timestamp > $(@F)
@@ -587,7 +661,7 @@ meta-enum-types.c: stamp-meta-enum-types.h meta-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
 	    --template meta-enum-types.c.in \
-	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
+	  $(libmutterinclude_headers) ) > xgen-tetc && \
 	cp xgen-tetc meta-enum-types.c && \
 	rm -f xgen-tetc
 
@@ -610,6 +684,26 @@ $(dbus_idle_built_sources) : Makefile.am org.gnome.Mutter.IdleMonitor.xml
 		--c-generate-autocleanup all						\
 		$(srcdir)/org.gnome.Mutter.IdleMonitor.xml
 
+if HAVE_REMOTE_DESKTOP
+dbus_remote_desktop_built_sources = meta-dbus-remote-desktop.c meta-dbus-remote-desktop.h
+
+$(dbus_remote_desktop_built_sources) : Makefile.am org.gnome.Mutter.RemoteDesktop.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-remote-desktop				\
+		$(srcdir)/org.gnome.Mutter.RemoteDesktop.xml
+
+dbus_screen_cast_built_sources = meta-dbus-screen-cast.c meta-dbus-screen-cast.h
+
+$(dbus_screen_cast_built_sources) : Makefile.am org.gnome.Mutter.ScreenCast.xml
+	$(AM_V_GEN)gdbus-codegen							\
+		--interface-prefix org.gnome.Mutter					\
+		--c-namespace MetaDBus							\
+		--generate-c-code meta-dbus-screen-cast					\
+		$(srcdir)/org.gnome.Mutter.ScreenCast.xml
+endif
+
 dbus_login1_built_sources = meta-dbus-login1.c meta-dbus-login1.h
 
 $(dbus_login1_built_sources) : Makefile.am org.freedesktop.login1.xml
@@ -644,3 +738,7 @@ endef
 	$(AM_V_GEN)$(WAYLAND_SCANNER) code $< $@
 %-server-protocol.h : $(srcdir)/wayland/protocol/%.xml
 	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header $< $@
+keyboard-shortcuts-inhibit-unstable-v1-protocol.c : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
+	$(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+keyboard-shortcuts-inhibit-unstable-v1-server-protocol.h : $(WAYLAND_PROTOCOLS_DATADIR)/unstable/keyboard-shortcuts-inhibit/keyboard-shortcuts-inhibit-unstable-v1.xml
+	$(AM_V_GEN)$(WAYLAND_SCANNER) server-header < $< > $@

src/backends/meta-backend-private.h

@@ -34,9 +34,13 @@
 #include <meta/meta-idle-monitor.h>
 #include "meta-cursor-renderer.h"
 #include "meta-monitor-manager-private.h"
+#include "meta-orientation-manager.h"
 #include "meta-input-settings-private.h"
 #include "backends/meta-egl.h"
 #include "backends/meta-pointer-constraint.h"
+#ifdef HAVE_REMOTE_DESKTOP
+#include "backends/meta-remote-desktop.h"
+#endif
 #include "backends/meta-renderer.h"
 #include "backends/meta-settings-private.h"
 #include "core/util-private.h"
@@ -57,9 +61,11 @@ struct _MetaBackendClass
 
   MetaIdleMonitor * (* create_idle_monitor) (MetaBackend *backend,
                                              int          device_id);
-  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend);
+  MetaMonitorManager * (* create_monitor_manager) (MetaBackend *backend,
+                                                   GError     **error);
   MetaCursorRenderer * (* create_cursor_renderer) (MetaBackend *backend);
-  MetaRenderer * (* create_renderer) (MetaBackend *backend);
+  MetaRenderer * (* create_renderer) (MetaBackend *backend,
+                                      GError     **error);
   MetaInputSettings * (* create_input_settings) (MetaBackend *backend);
 
   gboolean (* grab_device) (MetaBackend *backend,
@@ -82,6 +88,8 @@ struct _MetaBackendClass
 
   struct xkb_keymap * (* get_keymap) (MetaBackend *backend);
 
+  xkb_layout_index_t (* get_keymap_layout_group) (MetaBackend *backend);
+
   void (* lock_layout_group) (MetaBackend *backend,
                               guint        idx);
 
@@ -101,8 +109,6 @@ struct _MetaBackendClass
 
 void meta_init_backend (GType backend_gtype);
 
-void meta_backend_x11_display_opened (MetaBackend *backend);
-
 ClutterBackend * meta_backend_get_clutter_backend (MetaBackend *backend);
 
 MetaIdleMonitor * meta_backend_get_idle_monitor (MetaBackend *backend,
@@ -112,12 +118,17 @@ void meta_backend_foreach_device_monitor (MetaBackend *backend,
                                           gpointer     user_data);
 
 MetaMonitorManager * meta_backend_get_monitor_manager (MetaBackend *backend);
+MetaOrientationManager * meta_backend_get_orientation_manager (MetaBackend *backend);
 MetaCursorTracker * meta_backend_get_cursor_tracker (MetaBackend *backend);
 MetaCursorRenderer * meta_backend_get_cursor_renderer (MetaBackend *backend);
 MetaRenderer * meta_backend_get_renderer (MetaBackend *backend);
 MetaEgl * meta_backend_get_egl (MetaBackend *backend);
 MetaSettings * meta_backend_get_settings (MetaBackend *backend);
 
+#ifdef HAVE_REMOTE_DESKTOP
+MetaRemoteDesktop * meta_backend_get_remote_desktop (MetaBackend *backend);
+#endif
+
 gboolean meta_backend_grab_device (MetaBackend *backend,
                                    int          device_id,
                                    uint32_t     timestamp);
@@ -133,6 +144,8 @@ MetaLogicalMonitor * meta_backend_get_current_logical_monitor (MetaBackend *back
 
 struct xkb_keymap * meta_backend_get_keymap (MetaBackend *backend);
 
+xkb_layout_index_t meta_backend_get_keymap_layout_group (MetaBackend *backend);
+
 void meta_backend_update_last_device (MetaBackend *backend,
                                       int          device_id);
 

src/backends/meta-backend.c

@@ -29,13 +29,19 @@
 #include <clutter/clutter-mutter.h>
 #include <meta/meta-backend.h>
 #include <meta/main.h>
+#include <meta/util.h>
 #include "meta-backend-private.h"
 #include "meta-input-settings-private.h"
-
 #include "backends/x11/meta-backend-x11.h"
 #include "meta-cursor-tracker-private.h"
 #include "meta-stage.h"
 
+#ifdef HAVE_REMOTE_DESKTOP
+#include "backends/meta-dbus-session-watcher.h"
+#include "backends/meta-screen-cast.h"
+#include "backends/meta-remote-desktop.h"
+#endif
+
 #ifdef HAVE_NATIVE_BACKEND
 #include "backends/native/meta-backend-native.h"
 #endif
@@ -52,7 +58,6 @@ enum
   KEYMAP_CHANGED,
   KEYMAP_LAYOUT_GROUP_CHANGED,
   LAST_DEVICE_CHANGED,
-  X11_DISPLAY_OPENED,
 
   N_SIGNALS
 };
@@ -79,16 +84,24 @@ meta_get_backend (void)
 struct _MetaBackendPrivate
 {
   MetaMonitorManager *monitor_manager;
+  MetaOrientationManager *orientation_manager;
   MetaCursorTracker *cursor_tracker;
   MetaCursorRenderer *cursor_renderer;
   MetaInputSettings *input_settings;
   MetaRenderer *renderer;
   MetaEgl *egl;
   MetaSettings *settings;
+#ifdef HAVE_REMOTE_DESKTOP
+  MetaDbusSessionWatcher *dbus_session_watcher;
+  MetaScreenCast *screen_cast;
+  MetaRemoteDesktop *remote_desktop;
+#endif
 
   ClutterBackend *clutter_backend;
   ClutterActor *stage;
 
+  gboolean is_pointer_position_initialized;
+
   guint device_update_idle_id;
 
   GHashTable *device_monitors;
@@ -115,7 +128,13 @@ meta_backend_finalize (GObject *object)
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
 
   g_clear_object (&priv->monitor_manager);
+  g_clear_object (&priv->orientation_manager);
   g_clear_object (&priv->input_settings);
+#ifdef HAVE_REMOTE_DESKTOP
+  g_clear_object (&priv->remote_desktop);
+  g_clear_object (&priv->screen_cast);
+  g_clear_object (&priv->dbus_session_watcher);
+#endif
 
   if (priv->device_update_idle_id)
     g_source_remove (priv->device_update_idle_id);
@@ -168,13 +187,17 @@ meta_backend_monitors_changed (MetaBackend *backend)
   if (clutter_input_device_get_coords (device, NULL, &point))
     {
       /* If we're outside all monitors, warp the pointer back inside */
-      if (!meta_monitor_manager_get_logical_monitor_at (monitor_manager,
-                                                        point.x, point.y) &&
+      if ((!meta_monitor_manager_get_logical_monitor_at (monitor_manager,
+                                                         point.x, point.y) ||
+           !priv->is_pointer_position_initialized) &&
           !meta_monitor_manager_is_headless (monitor_manager))
-        center_pointer (backend);
+        {
+          center_pointer (backend);
+          priv->is_pointer_position_initialized = TRUE;
+        }
     }
 
-  meta_settings_update_ui_scaling_factor (priv->settings);
+  meta_cursor_renderer_force_update (priv->cursor_renderer);
 }
 
 void
@@ -332,15 +355,6 @@ on_device_removed (ClutterDeviceManager *device_manager,
     }
 }
 
-static MetaMonitorManager *
-create_monitor_manager (MetaBackend *backend)
-{
-  if (g_getenv ("META_DUMMY_MONITORS"))
-    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
-
-  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend);
-}
-
 static void
 create_device_monitors (MetaBackend          *backend,
                         ClutterDeviceManager *device_manager)
@@ -386,6 +400,28 @@ meta_backend_create_input_settings (MetaBackend *backend)
   return META_BACKEND_GET_CLASS (backend)->create_input_settings (backend);
 }
 
+#ifdef HAVE_REMOTE_DESKTOP
+static gboolean
+is_screen_cast_enabled (MetaBackend *backend)
+{
+  MetaSettings *settings = meta_backend_get_settings (backend);
+
+  return meta_settings_is_experimental_feature_enabled (
+    settings,
+    META_EXPERIMENTAL_FEATURE_SCREEN_CAST);
+}
+
+static gboolean
+is_remote_desktop_enabled (MetaBackend *backend)
+{
+  MetaSettings *settings = meta_backend_get_settings (backend);
+
+  return meta_settings_is_experimental_feature_enabled (
+    settings,
+    META_EXPERIMENTAL_FEATURE_REMOTE_DESKTOP);
+}
+#endif /* HAVE_REMOTE_DESKTOP */
+
 static void
 meta_backend_real_post_init (MetaBackend *backend)
 {
@@ -396,7 +432,7 @@ meta_backend_real_post_init (MetaBackend *backend)
   clutter_actor_realize (priv->stage);
   META_BACKEND_GET_CLASS (backend)->select_stage_events (backend);
 
-  priv->monitor_manager = create_monitor_manager (backend);
+  meta_monitor_manager_setup (priv->monitor_manager);
 
   meta_backend_sync_screen_size (backend);
 
@@ -417,7 +453,19 @@ meta_backend_real_post_init (MetaBackend *backend)
 
   priv->input_settings = meta_backend_create_input_settings (backend);
 
-  center_pointer (backend);
+#ifdef HAVE_REMOTE_DESKTOP
+  priv->dbus_session_watcher = g_object_new (META_TYPE_DBUS_SESSION_WATCHER, NULL);
+  if (is_screen_cast_enabled (backend))
+    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
+  if (is_remote_desktop_enabled (backend))
+    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+#endif /* HAVE_REMOTE_DESKTOP */
+
+  if (!meta_monitor_manager_is_headless (priv->monitor_manager))
+    {
+      center_pointer (backend);
+      priv->is_pointer_position_initialized = TRUE;
+    }
 }
 
 static MetaCursorRenderer *
@@ -497,18 +545,49 @@ meta_backend_class_init (MetaBackendClass *klass)
                   0,
                   NULL, NULL, NULL,
                   G_TYPE_NONE, 1, G_TYPE_INT);
-  signals[X11_DISPLAY_OPENED] =
-    g_signal_new ("x11-display-opened",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
 
   mutter_stage_views = g_getenv ("MUTTER_STAGE_VIEWS");
   stage_views_disabled = g_strcmp0 (mutter_stage_views, "0") == 0;
 }
 
+static void
+experimental_features_changed (MetaSettings            *settings,
+                               MetaExperimentalFeature  old_experimental_features,
+                               MetaBackend             *backend)
+{
+#ifdef HAVE_REMOTE_DESKTOP
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  if (is_screen_cast_enabled (backend) && !priv->screen_cast)
+    priv->screen_cast = meta_screen_cast_new (priv->dbus_session_watcher);
+  else if (!is_screen_cast_enabled (backend))
+    g_clear_object (&priv->screen_cast);
+
+  if (is_remote_desktop_enabled (backend) && !priv->remote_desktop)
+    priv->remote_desktop = meta_remote_desktop_new (priv->dbus_session_watcher);
+  else if (!is_remote_desktop_enabled (backend))
+    g_clear_object (&priv->remote_desktop);
+#endif /* HAVE_REMOTE_DESKTOP */
+}
+
+static MetaMonitorManager *
+meta_backend_create_monitor_manager (MetaBackend *backend,
+                                     GError     **error)
+{
+  if (g_getenv ("META_DUMMY_MONITORS"))
+    return g_object_new (META_TYPE_MONITOR_MANAGER_DUMMY, NULL);
+
+  return META_BACKEND_GET_CLASS (backend)->create_monitor_manager (backend,
+                                                                   error);
+}
+
+static MetaRenderer *
+meta_backend_create_renderer (MetaBackend *backend,
+                              GError     **error)
+{
+  return META_BACKEND_GET_CLASS (backend)->create_renderer (backend, error);
+}
+
 static gboolean
 meta_backend_initable_init (GInitable     *initable,
                             GCancellable  *cancellable,
@@ -518,17 +597,21 @@ meta_backend_initable_init (GInitable     *initable,
   MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
 
   priv->settings = meta_settings_new (backend);
+  g_signal_connect (priv->settings, "experimental-features-changed",
+                    G_CALLBACK (experimental_features_changed),
+                    backend);
 
   priv->egl = g_object_new (META_TYPE_EGL, NULL);
 
-  priv->renderer = META_BACKEND_GET_CLASS (backend)->create_renderer (backend);
+  priv->orientation_manager = g_object_new (META_TYPE_ORIENTATION_MANAGER, NULL);
+
+  priv->monitor_manager = meta_backend_create_monitor_manager (backend, error);
+  if (!priv->monitor_manager)
+    return FALSE;
+
+  priv->renderer = meta_backend_create_renderer (backend, error);
   if (!priv->renderer)
-    {
-      g_set_error (error, G_IO_ERROR,
-                   G_IO_ERROR_FAILED,
-                   "Failed to create MetaRenderer");
-      return FALSE;
-    }
+    return FALSE;
 
   priv->cursor_tracker = g_object_new (META_TYPE_CURSOR_TRACKER, NULL);
 
@@ -582,6 +665,17 @@ meta_backend_get_monitor_manager (MetaBackend *backend)
   return priv->monitor_manager;
 }
 
+/**
+ * meta_backend_get_orientation_manager: (skip)
+ */
+MetaOrientationManager *
+meta_backend_get_orientation_manager (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  return priv->orientation_manager;
+}
+
 MetaCursorTracker *
 meta_backend_get_cursor_tracker (MetaBackend *backend)
 {
@@ -634,6 +728,19 @@ meta_backend_get_settings (MetaBackend *backend)
   return priv->settings;
 }
 
+#ifdef HAVE_REMOTE_DESKTOP
+/**
+ * meta_backend_get_remote_desktop: (skip)
+ */
+MetaRemoteDesktop *
+meta_backend_get_remote_desktop (MetaBackend *backend)
+{
+  MetaBackendPrivate *priv = meta_backend_get_instance_private (backend);
+
+  return priv->remote_desktop;
+}
+#endif /* HAVE_REMOTE_DESKTOP */
+
 /**
  * meta_backend_grab_device: (skip)
  */
@@ -692,6 +799,12 @@ meta_backend_get_keymap (MetaBackend *backend)
   return META_BACKEND_GET_CLASS (backend)->get_keymap (backend);
 }
 
+xkb_layout_index_t
+meta_backend_get_keymap_layout_group (MetaBackend *backend)
+{
+  return META_BACKEND_GET_CLASS (backend)->get_keymap_layout_group (backend);
+}
+
 void
 meta_backend_lock_layout_group (MetaBackend *backend,
                                 guint idx)
@@ -929,12 +1042,6 @@ meta_clutter_init (void)
   meta_backend_post_init (_backend);
 }
 
-void
-meta_backend_x11_display_opened (MetaBackend *backend)
-{
-  g_signal_emit (backend, signals[X11_DISPLAY_OPENED], 0);
-}
-
 gboolean
 meta_is_stage_views_enabled (void)
 {

src/backends/meta-crtc.c

@@ -0,0 +1,80 @@
+/*
+ * 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 "config.h"
+
+#include "backends/meta-crtc.h"
+
+G_DEFINE_TYPE (MetaCrtc, meta_crtc, G_TYPE_OBJECT)
+
+G_DEFINE_TYPE (MetaCrtcMode, meta_crtc_mode, G_TYPE_OBJECT)
+
+MetaGpu *
+meta_crtc_get_gpu (MetaCrtc *crtc)
+{
+  return crtc->gpu;
+}
+
+static void
+meta_crtc_finalize (GObject *object)
+{
+  MetaCrtc *crtc = META_CRTC (object);
+
+  if (crtc->driver_notify)
+    crtc->driver_notify (crtc);
+
+  G_OBJECT_CLASS (meta_crtc_parent_class)->finalize (object);
+}
+
+static void
+meta_crtc_init (MetaCrtc *crtc)
+{
+}
+
+static void
+meta_crtc_class_init (MetaCrtcClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_crtc_finalize;
+}
+
+static void
+meta_crtc_mode_finalize (GObject *object)
+{
+  MetaCrtcMode *crtc_mode = META_CRTC_MODE (object);
+
+  if (crtc_mode->driver_notify)
+    crtc_mode->driver_notify (crtc_mode);
+
+  G_OBJECT_CLASS (meta_crtc_mode_parent_class)->finalize (object);
+}
+
+static void
+meta_crtc_mode_init (MetaCrtcMode *crtc_mode)
+{
+}
+
+static void
+meta_crtc_mode_class_init (MetaCrtcModeClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_crtc_mode_finalize;
+}

src/backends/meta-crtc.h

@@ -0,0 +1,98 @@
+/*
+ * 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 META_CRTC_H
+#define META_CRTC_H
+
+#include <glib-object.h>
+
+#include "backends/meta-gpu.h"
+
+/* Same as KMS mode flags and X11 randr flags */
+typedef enum _MetaCrtcModeFlag
+{
+  META_CRTC_MODE_FLAG_NONE = 0,
+  META_CRTC_MODE_FLAG_PHSYNC = (1 << 0),
+  META_CRTC_MODE_FLAG_NHSYNC = (1 << 1),
+  META_CRTC_MODE_FLAG_PVSYNC = (1 << 2),
+  META_CRTC_MODE_FLAG_NVSYNC = (1 << 3),
+  META_CRTC_MODE_FLAG_INTERLACE = (1 << 4),
+  META_CRTC_MODE_FLAG_DBLSCAN = (1 << 5),
+  META_CRTC_MODE_FLAG_CSYNC = (1 << 6),
+  META_CRTC_MODE_FLAG_PCSYNC = (1 << 7),
+  META_CRTC_MODE_FLAG_NCSYNC = (1 << 8),
+  META_CRTC_MODE_FLAG_HSKEW = (1 << 9),
+  META_CRTC_MODE_FLAG_BCAST = (1 << 10),
+  META_CRTC_MODE_FLAG_PIXMUX = (1 << 11),
+  META_CRTC_MODE_FLAG_DBLCLK = (1 << 12),
+  META_CRTC_MODE_FLAG_CLKDIV2 = (1 << 13),
+
+  META_CRTC_MODE_FLAG_MASK = 0x3fff
+} MetaCrtcModeFlag;
+
+struct _MetaCrtc
+{
+  GObject parent;
+
+  MetaGpu *gpu;
+
+  glong crtc_id;
+  MetaRectangle rect;
+  MetaCrtcMode *current_mode;
+  MetaMonitorTransform transform;
+  unsigned int all_transforms;
+
+  MetaLogicalMonitor *logical_monitor;
+
+  /* Used when changing configuration */
+  gboolean is_dirty;
+
+  /* Used by cursor renderer backend */
+  void *cursor_renderer_private;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
+};
+
+struct _MetaCrtcMode
+{
+  GObject parent;
+
+  /* The low-level ID of this mode, used to apply back configuration */
+  glong mode_id;
+  char *name;
+
+  int width;
+  int height;
+  float refresh_rate;
+  MetaCrtcModeFlag flags;
+
+  gpointer driver_private;
+  GDestroyNotify driver_notify;
+};
+
+#define META_TYPE_CRTC (meta_crtc_get_type ())
+G_DECLARE_FINAL_TYPE (MetaCrtc, meta_crtc, META, CRTC, GObject)
+
+#define META_TYPE_CRTC_MODE (meta_crtc_mode_get_type ())
+G_DECLARE_FINAL_TYPE (MetaCrtcMode, meta_crtc_mode, META, CRTC_MODE, GObject)
+
+MetaGpu * meta_crtc_get_gpu (MetaCrtc *crtc);
+
+#endif /* META_CRTC_H */

src/backends/meta-cursor-renderer.c

@@ -37,7 +37,8 @@
 
 struct _MetaCursorRendererPrivate
 {
-  int current_x, current_y;
+  float current_x;
+  float current_y;
 
   MetaCursorSprite *displayed_cursor;
   MetaOverlay *stage_overlay;
@@ -69,7 +70,7 @@ queue_redraw (MetaCursorRenderer *renderer,
   MetaBackend *backend = meta_get_backend ();
   ClutterActor *stage = meta_backend_get_stage (backend);
   CoglTexture *texture;
-  MetaRectangle rect = { 0 };
+  ClutterRect rect = { 0 };
 
   if (cursor_sprite)
     rect = meta_cursor_renderer_calculate_rect (renderer, cursor_sprite);
@@ -159,7 +160,7 @@ meta_cursor_renderer_init (MetaCursorRenderer *renderer)
                                            NULL);
 }
 
-MetaRectangle
+ClutterRect
 meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
                                      MetaCursorSprite   *cursor_sprite)
 {
@@ -172,18 +173,22 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
 
   texture = meta_cursor_sprite_get_cogl_texture (cursor_sprite);
   if (!texture)
-    return (MetaRectangle) { 0 };
+    return (ClutterRect) { 0 };
 
   meta_cursor_sprite_get_hotspot (cursor_sprite, &hot_x, &hot_y);
   texture_scale = meta_cursor_sprite_get_texture_scale (cursor_sprite);
   width = cogl_texture_get_width (texture);
   height = cogl_texture_get_height (texture);
 
-  return (MetaRectangle) {
-    .x = (int)roundf (priv->current_x - (hot_x * texture_scale)),
-    .y = (int)roundf (priv->current_y - (hot_y * texture_scale)),
-    .width = (int)roundf (width * texture_scale),
-    .height = (int)roundf (height * texture_scale),
+  return (ClutterRect) {
+    .origin = {
+      .x = priv->current_x - (hot_x * texture_scale),
+      .y = priv->current_y - (hot_y * texture_scale)
+    },
+    .size = {
+      .width = width * texture_scale,
+      .height = height * texture_scale
+    }
   };
 }
 
@@ -197,8 +202,8 @@ update_cursor (MetaCursorRenderer *renderer,
 
   if (cursor_sprite)
     meta_cursor_sprite_prepare_at (cursor_sprite,
-                                   priv->current_x,
-                                   priv->current_y);
+                                   (int) priv->current_x,
+                                   (int) priv->current_y);
 
   handled_by_backend =
     META_CURSOR_RENDERER_GET_CLASS (renderer)->update_cursor (renderer,
@@ -246,7 +251,8 @@ meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)
 
 void
 meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
-                                   int x, int y)
+                                   float               x,
+                                   float               y)
 {
   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);
 

src/backends/meta-cursor-renderer.h

@@ -60,13 +60,14 @@ void meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,
                                       MetaCursorSprite   *cursor_sprite);
 
 void meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,
-                                        int x, int y);
+                                        float               x,
+                                        float               y);
 void meta_cursor_renderer_force_update (MetaCursorRenderer *renderer);
 
 MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer);
 
-MetaRectangle meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
-                                                   MetaCursorSprite   *cursor_sprite);
+ClutterRect meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,
+                                                 MetaCursorSprite   *cursor_sprite);
 
 #ifdef HAVE_WAYLAND
 void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,

src/backends/meta-cursor-tracker-private.h

@@ -62,8 +62,8 @@ void     meta_cursor_tracker_set_root_cursor     (MetaCursorTracker *tracker,
                                                   MetaCursorSprite  *cursor_sprite);
 
 void     meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
-					      int                new_x,
-					      int                new_y);
+                                              float              new_x,
+                                              float              new_y);
 
 MetaCursorSprite * meta_cursor_tracker_get_displayed_cursor (MetaCursorTracker *tracker);
 

src/backends/meta-cursor-tracker.c

@@ -350,8 +350,8 @@ meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
 
 void
 meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
-                                     int                new_x,
-                                     int                new_y)
+                                     float              new_x,
+                                     float              new_y)
 {
   MetaBackend *backend = meta_get_backend ();
   MetaCursorRenderer *cursor_renderer =

src/backends/meta-dbus-session-watcher.c

@@ -0,0 +1,235 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015-2017 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ */
+
+#include "config.h"
+
+#include "backends/meta-dbus-session-watcher.h"
+
+#include <gio/gio.h>
+
+enum
+{
+  SESSION_SIGNAL_SESSION_CLOSED,
+
+  N_SESSION_SIGNALS
+};
+
+static guint session_signals[N_SESSION_SIGNALS];
+
+G_DEFINE_INTERFACE (MetaDbusSession, meta_dbus_session, G_TYPE_OBJECT)
+
+struct _MetaDbusSessionWatcher
+{
+  GObject parent;
+
+  GHashTable *clients;
+};
+
+G_DEFINE_TYPE (MetaDbusSessionWatcher,
+               meta_dbus_session_watcher,
+               G_TYPE_OBJECT)
+
+typedef struct _MetaDbusSessionClient
+{
+  MetaDbusSessionWatcher *session_watcher;
+  MetaDbusSession *session;
+  char *dbus_name;
+  guint name_watcher_id;
+  GList *sessions;
+} MetaDbusSessionClient;
+
+static void
+meta_dbus_session_client_vanished (MetaDbusSession *session)
+{
+  META_DBUS_SESSION_GET_IFACE (session)->client_vanished (session);
+}
+
+static void
+meta_dbus_session_client_destroy (MetaDbusSessionClient *client)
+{
+  while (TRUE)
+    {
+      GList *l;
+      MetaDbusSession *session;
+
+      l = client->sessions;
+      if (!l)
+        break;
+
+      session = l->data;
+
+      /*
+       * This will invoke on_session_closed which removes the session from the
+       * list.
+       */
+      meta_dbus_session_client_vanished (session);
+    }
+
+  if (client->name_watcher_id)
+    g_bus_unwatch_name (client->name_watcher_id);
+
+  g_free (client->dbus_name);
+  g_free (client);
+}
+
+static void
+meta_dbus_session_watcher_destroy_client (MetaDbusSessionWatcher *session_watcher,
+                                          MetaDbusSessionClient  *client)
+{
+  g_hash_table_remove (session_watcher->clients, client->dbus_name);
+}
+
+static void
+name_vanished_callback (GDBusConnection *connection,
+                        const char      *name,
+                        gpointer         user_data)
+{
+  MetaDbusSessionClient *client = user_data;
+
+  g_warning ("D-Bus client with active sessions vanished");
+
+  client->name_watcher_id = 0;
+
+  meta_dbus_session_watcher_destroy_client (client->session_watcher, client);
+}
+
+static MetaDbusSessionClient *
+meta_dbus_session_client_new (MetaDbusSessionWatcher *session_watcher,
+                              MetaDbusSession        *session,
+                              const char             *dbus_name)
+{
+  GDBusInterfaceSkeleton *interface_skeleton =
+    G_DBUS_INTERFACE_SKELETON (session);
+  GDBusConnection *connection =
+    g_dbus_interface_skeleton_get_connection (interface_skeleton);
+  MetaDbusSessionClient *client;
+
+  client = g_new0 (MetaDbusSessionClient, 1);
+  client->session_watcher = session_watcher;
+  client->session = session;
+  client->dbus_name = g_strdup (dbus_name);
+
+  client->name_watcher_id =
+    g_bus_watch_name_on_connection (connection,
+                                    dbus_name,
+                                    G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                    NULL,
+                                    name_vanished_callback,
+                                    client,
+                                    NULL);
+
+  return client;
+}
+
+static void
+on_session_closed (MetaDbusSession       *session,
+                   MetaDbusSessionClient *client)
+{
+  client->sessions = g_list_remove (client->sessions, session);
+
+  if (!client->sessions)
+    meta_dbus_session_watcher_destroy_client (client->session_watcher, client);
+}
+
+static void
+meta_dbus_session_client_add_session (MetaDbusSessionClient *client,
+                                      MetaDbusSession       *session)
+{
+  client->sessions = g_list_append (client->sessions, session);
+
+  g_signal_connect (session, "session-closed",
+                    G_CALLBACK (on_session_closed),
+                    client);
+}
+
+static MetaDbusSessionClient *
+meta_dbus_session_watcher_get_client (MetaDbusSessionWatcher *session_watcher,
+                                      const char             *dbus_name)
+{
+  return g_hash_table_lookup (session_watcher->clients, dbus_name);
+}
+
+void
+meta_dbus_session_watcher_watch_session (MetaDbusSessionWatcher *session_watcher,
+                                         const char             *client_dbus_name,
+                                         MetaDbusSession        *session)
+{
+  MetaDbusSessionClient *client;
+
+  client = meta_dbus_session_watcher_get_client (session_watcher,
+                                                 client_dbus_name);
+  if (!client)
+    {
+      client = meta_dbus_session_client_new (session_watcher,
+                                             session,
+                                             client_dbus_name);
+      g_hash_table_insert (session_watcher->clients,
+                           g_strdup (client_dbus_name),
+                           client);
+    }
+
+  meta_dbus_session_client_add_session (client, session);
+}
+
+void
+meta_dbus_session_notify_closed (MetaDbusSession *session)
+{
+  g_signal_emit (session, session_signals[SESSION_SIGNAL_SESSION_CLOSED], 0);
+}
+
+static void
+meta_dbus_session_default_init (MetaDbusSessionInterface *iface)
+{
+  session_signals[SESSION_SIGNAL_SESSION_CLOSED] =
+    g_signal_new ("session-closed",
+                  G_TYPE_FROM_INTERFACE (iface),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+}
+
+static void
+meta_dbus_session_watcher_finalize (GObject *object)
+{
+  MetaDbusSessionWatcher *session_watcher = META_DBUS_SESSION_WATCHER (object);
+
+  g_hash_table_destroy (session_watcher->clients);
+}
+
+static void
+meta_dbus_session_watcher_init (MetaDbusSessionWatcher *session_watcher)
+{
+  session_watcher->clients =
+    g_hash_table_new_full (g_str_hash,
+                           g_str_equal,
+                           g_free,
+                           (GDestroyNotify) meta_dbus_session_client_destroy);
+}
+
+static void
+meta_dbus_session_watcher_class_init (MetaDbusSessionWatcherClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->finalize = meta_dbus_session_watcher_finalize;
+}

src/backends/meta-dbus-session-watcher.h

@@ -0,0 +1,52 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2017 Red Hat Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ *
+ */
+
+#ifndef META_DBUS_SESSION_WATCHER_H
+#define META_DBUS_SESSION_WATCHER_H
+
+#include <glib-object.h>
+
+#define META_TYPE_DBUS_SESSION (meta_dbus_session_get_type ())
+G_DECLARE_INTERFACE (MetaDbusSession, meta_dbus_session,
+                     META, DBUS_SESSION,
+                     GObject)
+
+struct _MetaDbusSessionInterface
+{
+  GTypeInterface parent_iface;
+
+  void (* client_vanished) (MetaDbusSession *session);
+};
+
+#define META_TYPE_DBUS_SESSION_WATCHER (meta_dbus_session_watcher_get_type ())
+G_DECLARE_FINAL_TYPE (MetaDbusSessionWatcher,
+                      meta_dbus_session_watcher,
+                      META, DBUS_SESSION_WATCHER,
+                      GObject)
+
+void meta_dbus_session_watcher_watch_session (MetaDbusSessionWatcher *session_watcher,
+                                              const char             *client_dbus_name,
+                                              MetaDbusSession        *session);
+
+void meta_dbus_session_notify_closed (MetaDbusSession *session);
+
+#endif /* META_DBUS_SESSION_WATCHER_H */

src/backends/meta-egl.c

@@ -66,6 +66,9 @@ struct _MetaEgl
 
   PFNEGLSTREAMCONSUMERACQUIREKHRPROC eglStreamConsumerAcquireKHR;
   PFNEGLSTREAMCONSUMERACQUIREATTRIBNVPROC eglStreamConsumerAcquireAttribNV;
+
+  PFNEGLQUERYDMABUFFORMATSEXTPROC eglQueryDmaBufFormatsEXT;
+  PFNEGLQUERYDMABUFMODIFIERSEXTPROC eglQueryDmaBufModifiersEXT;
 };
 
 G_DEFINE_TYPE (MetaEgl, meta_egl, G_TYPE_OBJECT)
@@ -157,11 +160,11 @@ set_egl_error (GError **error)
                        error_str);
 }
 
-static gboolean
-extensions_string_has_extensions_valist (const char *extensions_str,
-                                         char     ***missing_extensions,
-                                         char       *first_extension,
-                                         va_list     var_args)
+gboolean
+meta_extensions_string_has_extensions_valist (const char *extensions_str,
+                                              char     ***missing_extensions,
+                                              char       *first_extension,
+                                              va_list     var_args)
 {
   char **extensions;
   char *extension;
@@ -219,10 +222,11 @@ meta_egl_has_extensions (MetaEgl   *egl,
     }
 
   va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
   va_end (var_args);
 
   return has_extensions;
@@ -242,6 +246,25 @@ meta_egl_initialize (MetaEgl   *egl,
   return TRUE;
 }
 
+gpointer
+meta_egl_get_proc_address (MetaEgl    *egl,
+                           const char *procname,
+                           GError    **error)
+{
+  gpointer func;
+
+  func = (gpointer) eglGetProcAddress (procname);
+  if (!func)
+    {
+      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                   "Could not load symbol '%s': Not found",
+                   procname);
+      return NULL;
+    }
+
+  return func;
+}
+
 gboolean
 meta_egl_choose_config (MetaEgl      *egl,
                         EGLDisplay    display,
@@ -286,6 +309,27 @@ meta_egl_choose_config (MetaEgl      *egl,
   return TRUE;
 }
 
+EGLSurface
+meta_egl_create_window_surface (MetaEgl            *egl,
+                                EGLDisplay          display,
+                                EGLConfig           config,
+                                EGLNativeWindowType native_window_type,
+                                const EGLint       *attrib_list,
+                                GError            **error)
+{
+  EGLSurface surface;
+
+  surface = eglCreateWindowSurface (display, config,
+                                    native_window_type, attrib_list);
+  if (surface == EGL_NO_SURFACE)
+    {
+      set_egl_error (error);
+      return EGL_NO_SURFACE;
+    }
+
+  return surface;
+}
+
 EGLSurface
 meta_egl_create_pbuffer_surface (MetaEgl      *egl,
                                  EGLDisplay    display,
@@ -305,6 +349,21 @@ meta_egl_create_pbuffer_surface (MetaEgl      *egl,
   return surface;
 }
 
+gboolean
+meta_egl_destroy_surface (MetaEgl   *egl,
+                          EGLDisplay display,
+                          EGLSurface surface,
+                          GError   **error)
+{
+  if (!eglDestroySurface (display, surface))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 static gboolean
 is_egl_proc_valid_real (void       *proc,
                         const char *proc_name,
@@ -349,6 +408,55 @@ meta_egl_get_platform_display (MetaEgl      *egl,
   return display;
 }
 
+gboolean
+meta_egl_terminate (MetaEgl   *egl,
+                    EGLDisplay display,
+                    GError   **error)
+{
+  if (!eglTerminate (display))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+EGLContext
+meta_egl_create_context (MetaEgl      *egl,
+                         EGLDisplay    display,
+                         EGLConfig     config,
+                         EGLContext    share_context,
+                         const EGLint *attrib_list,
+                         GError      **error)
+{
+  EGLContext context;
+
+  context = eglCreateContext (display, config, share_context, attrib_list);
+  if (context == EGL_NO_CONTEXT)
+    {
+      set_egl_error (error);
+      return EGL_NO_CONTEXT;
+    }
+
+  return context;
+}
+
+gboolean
+meta_egl_destroy_context (MetaEgl   *egl,
+                          EGLDisplay display,
+                          EGLContext context,
+                          GError   **error)
+{
+  if (!eglDestroyContext (display, context))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 EGLImageKHR
 meta_egl_create_image (MetaEgl        *egl,
                        EGLDisplay      display,
@@ -392,6 +500,38 @@ meta_egl_destroy_image (MetaEgl    *egl,
   return TRUE;
 }
 
+gboolean
+meta_egl_make_current (MetaEgl   *egl,
+                       EGLDisplay display,
+                       EGLSurface draw,
+                       EGLSurface read,
+                       EGLContext context,
+                       GError   **error)
+{
+  if (!eglMakeCurrent (display, draw, read, context))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_egl_swap_buffers (MetaEgl   *egl,
+                       EGLDisplay display,
+                       EGLSurface surface,
+                       GError   **error)
+{
+  if (!eglSwapBuffers (display, surface))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
 gboolean
 meta_egl_query_wayland_buffer (MetaEgl            *egl,
                                EGLDisplay          display,
@@ -476,10 +616,11 @@ meta_egl_egl_device_has_extensions (MetaEgl     *egl,
     }
 
   va_start (var_args, first_extension);
-  has_extensions = extensions_string_has_extensions_valist (extensions_str,
-                                                            missing_extensions,
-                                                            first_extension,
-                                                            var_args);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
   va_end (var_args);
 
   return has_extensions;
@@ -711,22 +852,60 @@ meta_egl_stream_consumer_acquire (MetaEgl     *egl,
   return TRUE;
 }
 
+gboolean
+meta_egl_query_dma_buf_formats (MetaEgl   *egl,
+                                EGLDisplay display,
+                                EGLint     max_formats,
+                                EGLint    *formats,
+                                EGLint    *num_formats,
+                                GError   **error)
+{
+  if (!is_egl_proc_valid (egl->eglQueryDmaBufFormatsEXT, error))
+    return FALSE;
+
+  if (!egl->eglQueryDmaBufFormatsEXT (display, max_formats, formats,
+                                      num_formats))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+    return TRUE;
+}
+
+gboolean
+meta_egl_query_dma_buf_modifiers (MetaEgl      *egl,
+                                  EGLDisplay    display,
+                                  EGLint        format,
+                                  EGLint        max_modifiers,
+                                  EGLuint64KHR *modifiers,
+                                  EGLBoolean   *external_only,
+                                  EGLint       *num_modifiers,
+                                  GError      **error)
+{
+  if (!is_egl_proc_valid (egl->eglQueryDmaBufModifiersEXT, error))
+    return FALSE;
+
+  if (!egl->eglQueryDmaBufModifiersEXT (display, format, max_modifiers,
+                                        modifiers, external_only,
+                                        num_modifiers))
+    {
+      set_egl_error (error);
+      return FALSE;
+    }
+
+    return TRUE;
+}
+
 #define GET_EGL_PROC_ADDR(proc) \
   egl->proc = (void *) eglGetProcAddress (#proc);
 
-#define GET_EGL_PROC_ADDR_REQUIRED(proc) \
-  GET_EGL_PROC_ADDR(proc) \
-  if (!egl->proc) \
-    { \
-      meta_fatal ("Failed to get proc address for '%s'\n", #proc); \
-    }
-
 static void
 meta_egl_constructed (GObject *object)
 {
   MetaEgl *egl = META_EGL (object);
 
-  GET_EGL_PROC_ADDR_REQUIRED (eglGetPlatformDisplayEXT);
+  GET_EGL_PROC_ADDR (eglGetPlatformDisplayEXT);
 
   GET_EGL_PROC_ADDR (eglCreateImageKHR);
   GET_EGL_PROC_ADDR (eglDestroyImageKHR);
@@ -753,6 +932,9 @@ meta_egl_constructed (GObject *object)
 
   GET_EGL_PROC_ADDR (eglStreamConsumerAcquireKHR);
   GET_EGL_PROC_ADDR (eglStreamConsumerAcquireAttribNV);
+
+  GET_EGL_PROC_ADDR (eglQueryDmaBufFormatsEXT);
+  GET_EGL_PROC_ADDR (eglQueryDmaBufModifiersEXT);
 }
 
 #undef GET_EGL_PROC_ADDR

src/backends/meta-egl.h

@@ -36,6 +36,12 @@ G_DECLARE_FINAL_TYPE (MetaEgl, meta_egl, META, EGL, GObject)
 
 GQuark meta_egl_error_quark (void);
 
+gboolean
+meta_extensions_string_has_extensions_valist (const char *extensions_str,
+                                              char     ***missing_extensions,
+                                              char       *first_extension,
+                                              va_list     var_args);
+
 gboolean meta_egl_has_extensions (MetaEgl   *egl,
                                   EGLDisplay display,
                                   char    ***missing_extensions,
@@ -46,12 +52,28 @@ gboolean meta_egl_initialize (MetaEgl   *egl,
                               EGLDisplay display,
                               GError   **error);
 
+gpointer meta_egl_get_proc_address (MetaEgl    *egl,
+                                    const char *procname,
+                                    GError    **error);
+
 gboolean meta_egl_choose_config (MetaEgl      *egl,
                                  EGLDisplay    display,
                                  const EGLint *attrib_list,
                                  EGLConfig    *chosen_config,
                                  GError      **error);
 
+EGLContext meta_egl_create_context (MetaEgl      *egl,
+                                    EGLDisplay    display,
+                                    EGLConfig     config,
+                                    EGLContext    share_context,
+                                    const EGLint *attrib_list,
+                                    GError      **error);
+
+gboolean meta_egl_destroy_context (MetaEgl   *egl,
+                                   EGLDisplay display,
+                                   EGLContext context,
+                                   GError   **error);
+
 EGLImageKHR meta_egl_create_image (MetaEgl        *egl,
                                    EGLDisplay      display,
                                    EGLContext      context,
@@ -65,18 +87,46 @@ gboolean meta_egl_destroy_image (MetaEgl    *egl,
                                  EGLImageKHR image,
                                  GError    **error);
 
+EGLSurface meta_egl_create_window_surface (MetaEgl            *egl,
+                                           EGLDisplay          display,
+                                           EGLConfig           config,
+                                           EGLNativeWindowType native_window_type,
+                                           const EGLint       *attrib_list,
+                                           GError            **error);
+
 EGLSurface meta_egl_create_pbuffer_surface (MetaEgl      *egl,
                                             EGLDisplay    display,
                                             EGLConfig     config,
                                             const EGLint *attrib_list,
                                             GError      **error);
 
+gboolean meta_egl_destroy_surface (MetaEgl   *egl,
+                                   EGLDisplay display,
+                                   EGLSurface surface,
+                                   GError   **error);
+
 EGLDisplay meta_egl_get_platform_display (MetaEgl      *egl,
                                           EGLenum       platform,
                                           void         *native_display,
                                           const EGLint *attrib_list,
                                           GError      **error);
 
+gboolean meta_egl_terminate (MetaEgl   *egl,
+                             EGLDisplay display,
+                             GError   **error);
+
+gboolean meta_egl_make_current (MetaEgl   *egl,
+                                EGLDisplay display,
+                                EGLSurface draw,
+                                EGLSurface read,
+                                EGLContext context,
+                                GError   **error);
+
+gboolean meta_egl_swap_buffers (MetaEgl   *egl,
+                                EGLDisplay display,
+                                EGLSurface surface,
+                                GError   **error);
+
 gboolean meta_egl_query_wayland_buffer (MetaEgl            *egl,
                                         EGLDisplay          display,
                                         struct wl_resource *buffer,
@@ -167,4 +217,20 @@ gboolean meta_egl_stream_consumer_gl_texture_external (MetaEgl     *egl,
                                                        EGLStreamKHR stream,
                                                        GError     **error);
 
+gboolean meta_egl_query_dma_buf_formats (MetaEgl    *egl,
+                                         EGLDisplay  display,
+                                         EGLint      max_formats,
+                                         EGLint     *formats,
+                                         EGLint     *num_formats,
+                                         GError    **error);
+
+gboolean meta_egl_query_dma_buf_modifiers (MetaEgl      *egl,
+                                           EGLDisplay    display,
+                                           EGLint        format,
+                                           EGLint        max_modifiers,
+                                           EGLuint64KHR *modifiers,
+                                           EGLBoolean   *external_only,
+                                           EGLint       *num_formats,
+                                           GError      **error);
+
 #endif /* META_EGL_H */

src/backends/meta-gles3-table.h

@@ -0,0 +1,36 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 META_GLES3_TABLE_H
+#define META_GLES3_TABLE_H
+
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <GLES3/gl3.h>
+
+typedef struct _MetaGles3Table
+{
+  void (* glEGLImageTargetTexture2DOES) (GLenum        target,
+                                         GLeglImageOES image);
+} MetaGles3Table;
+
+#endif /* META_GLES3_TABLE */

src/backends/meta-gles3.c

@@ -0,0 +1,163 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 <stdio.h>
+
+#include "config.h"
+
+#include "backends/meta-gles3.h"
+
+#include <dlfcn.h>
+#include <gio/gio.h>
+
+#include "backends/meta-gles3-table.h"
+
+struct _MetaGles3
+{
+  GObject parent;
+
+  MetaEgl *egl;
+
+  MetaGles3Table table;
+};
+
+G_DEFINE_TYPE (MetaGles3, meta_gles3, G_TYPE_OBJECT)
+
+MetaGles3Table *
+meta_gles3_get_table (MetaGles3 *gles3)
+{
+  return &gles3->table;
+}
+
+void
+meta_gles3_ensure_loaded (MetaGles3  *gles3,
+                          gpointer   *func,
+                          const char *name)
+{
+  GError *error = NULL;
+
+  if (*func)
+    return;
+
+  *func = meta_egl_get_proc_address (gles3->egl, name, &error);
+  if (!*func)
+    g_error ("Failed to load GLES3 symbol: %s", error->message);
+}
+
+static const char *
+get_gl_error_str (GLenum gl_error)
+{
+  switch (gl_error)
+    {
+    case GL_NO_ERROR:
+      return "No error has been recorded.";
+    case GL_INVALID_ENUM:
+      return "An unacceptable value is specified for an enumerated argument.";
+    case GL_INVALID_VALUE:
+        return "A numeric argument is out of range.";
+    case GL_INVALID_OPERATION:
+        return "The specified operation is not allowed in the current state.";
+    case GL_INVALID_FRAMEBUFFER_OPERATION:
+        return "The framebuffer object is not complete.";
+    case GL_OUT_OF_MEMORY:
+        return "There is not enough memory left to execute the command.";
+    default:
+        return "Unknown error";
+    }
+}
+
+void
+meta_gles3_clear_error (MetaGles3 *gles3)
+{
+  while (TRUE)
+    {
+      GLenum gl_error = glGetError ();
+
+      if (gl_error == GL_NO_ERROR)
+        break;
+    }
+}
+
+gboolean
+meta_gles3_validate (MetaGles3 *gles3,
+                     GError   **error)
+{
+  GLenum gl_error;
+
+  gl_error = glGetError ();
+  if (gl_error != GL_NO_ERROR)
+    {
+      g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                           get_gl_error_str (gl_error));
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_gles3_has_extensions (MetaGles3 *gles3,
+                           char    ***missing_extensions,
+                           char      *first_extension,
+                           ...)
+{
+  va_list var_args;
+  const char *extensions_str;
+  gboolean has_extensions;
+
+  extensions_str = (const char *) glGetString (GL_EXTENSIONS);
+  if (!extensions_str)
+    {
+      g_warning ("Failed to get string: %s", get_gl_error_str (glGetError ()));
+      return FALSE;
+    }
+
+  va_start (var_args, first_extension);
+  has_extensions =
+    meta_extensions_string_has_extensions_valist (extensions_str,
+                                                  missing_extensions,
+                                                  first_extension,
+                                                  var_args);
+  va_end (var_args);
+
+  return has_extensions;
+}
+
+MetaGles3 *
+meta_gles3_new (MetaEgl *egl)
+{
+  MetaGles3 *gles3;
+
+  gles3 = g_object_new (META_TYPE_GLES3, NULL);
+  gles3->egl = egl;
+
+  return gles3;
+}
+
+static void
+meta_gles3_init (MetaGles3 *gles3)
+{
+}
+
+static void
+meta_gles3_class_init (MetaGles3Class *klass)
+{
+}

src/backends/meta-gles3.h

@@ -0,0 +1,83 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 META_GLES3_H
+#define META_GLES3_H
+
+#include <glib-object.h>
+
+#include "backends/meta-egl.h"
+
+typedef struct _MetaGles3Table MetaGles3Table;
+
+#define META_TYPE_GLES3 (meta_gles3_get_type ())
+G_DECLARE_FINAL_TYPE (MetaGles3, meta_gles3, META, GLES3, GObject)
+
+MetaGles3Table * meta_gles3_get_table (MetaGles3 *gles3);
+
+void meta_gles3_clear_error (MetaGles3 *gles3);
+
+gboolean meta_gles3_validate (MetaGles3 *gles3,
+                              GError   **error);
+
+void meta_gles3_ensure_loaded (MetaGles3  *gles,
+                               gpointer   *func,
+                               const char *name);
+
+gboolean meta_gles3_has_extensions (MetaGles3 *gles3,
+                                    char    ***missing_extensions,
+                                    char      *first_extension,
+                                    ...);
+
+MetaGles3 * meta_gles3_new (MetaEgl *egl);
+
+#define GLBAS(gles3, func, args)                                               \
+{                                                                              \
+  GError *_error = NULL;                                                       \
+                                                                               \
+  func args;                                                                   \
+                                                                               \
+  if (!meta_gles3_validate (gles3, &_error))                                   \
+    {                                                                          \
+      g_warning ("%s %s failed: %s", #func, #args, _error->message);           \
+      g_error_free (_error);                                                   \
+    }                                                                          \
+}
+
+#define GLEXT(gles3, func, args)                                               \
+{                                                                              \
+  GError *_error = NULL;                                                       \
+  MetaGles3Table *table;                                                       \
+                                                                               \
+  table = meta_gles3_get_table (gles3);                                        \
+  meta_gles3_ensure_loaded (gles3, (gpointer *) &table->func, #func);          \
+                                                                               \
+  table->func args;                                                            \
+                                                                               \
+  if (!meta_gles3_validate (gles3, &_error))                                   \
+    {                                                                          \
+      g_warning ("%s %s failed: %s", #func, #args, _error->message);           \
+      g_error_free (_error);                                                   \
+    }                                                                          \
+}
+
+#endif /* META_GLES3_H */

src/backends/meta-gpu.c

@@ -0,0 +1,224 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 "config.h"
+
+#include "backends/meta-gpu.h"
+
+#include "backends/meta-output.h"
+
+enum
+{
+  PROP_0,
+
+  PROP_MONITOR_MANAGER,
+
+  PROP_LAST
+};
+
+static GParamSpec *obj_props[PROP_LAST];
+
+typedef struct _MetaGpuPrivate
+{
+  MetaMonitorManager *monitor_manager;
+
+  GList *outputs;
+  GList *crtcs;
+  GList *modes;
+} MetaGpuPrivate;
+
+G_DEFINE_TYPE_WITH_PRIVATE (MetaGpu, meta_gpu, G_TYPE_OBJECT)
+
+gboolean
+meta_gpu_has_hotplug_mode_update (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+  GList *l;
+
+  for (l = priv->outputs; l; l = l->next)
+    {
+      MetaOutput *output = l->data;
+
+      if (output->hotplug_mode_update)
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
+meta_gpu_read_current (MetaGpu  *gpu,
+                       GError  **error)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+  gboolean ret;
+  GList *old_outputs;
+  GList *old_crtcs;
+  GList *old_modes;
+
+  /* TODO: Get rid of this when objects incref:s what they need instead */
+  old_outputs = priv->outputs;
+  old_crtcs = priv->crtcs;
+  old_modes = priv->modes;
+
+  ret = META_GPU_GET_CLASS (gpu)->read_current (gpu, error);
+
+  g_list_free_full (old_outputs, g_object_unref);
+  g_list_free_full (old_modes, g_object_unref);
+  g_list_free_full (old_crtcs, g_object_unref);
+
+  return ret;
+}
+
+MetaMonitorManager *
+meta_gpu_get_monitor_manager (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->monitor_manager;
+}
+
+GList *
+meta_gpu_get_outputs (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->outputs;
+}
+
+GList *
+meta_gpu_get_crtcs (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->crtcs;
+}
+
+GList *
+meta_gpu_get_modes (MetaGpu *gpu)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  return priv->modes;
+}
+
+void
+meta_gpu_take_outputs (MetaGpu *gpu,
+                       GList   *outputs)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->outputs = outputs;
+}
+
+void
+meta_gpu_take_crtcs (MetaGpu *gpu,
+                    GList   *crtcs)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->crtcs = crtcs;
+}
+
+void
+meta_gpu_take_modes (MetaGpu *gpu,
+                     GList   *modes)
+{
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  priv->modes = modes;
+}
+
+static void
+meta_gpu_set_property (GObject      *object,
+                       guint         prop_id,
+                       const GValue *value,
+                       GParamSpec   *pspec)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR_MANAGER:
+      priv->monitor_manager = g_value_get_object (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_gpu_get_property (GObject    *object,
+                       guint       prop_id,
+                       GValue     *value,
+                       GParamSpec *pspec)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  switch (prop_id)
+    {
+    case PROP_MONITOR_MANAGER:
+      g_value_set_object (value, priv->monitor_manager);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+    }
+}
+
+static void
+meta_gpu_finalize (GObject *object)
+{
+  MetaGpu *gpu = META_GPU (object);
+  MetaGpuPrivate *priv = meta_gpu_get_instance_private (gpu);
+
+  g_list_free_full (priv->outputs, g_object_unref);
+  g_list_free_full (priv->modes, g_object_unref);
+  g_list_free_full (priv->crtcs, g_object_unref);
+
+  G_OBJECT_CLASS (meta_gpu_parent_class)->finalize (object);
+}
+
+static void
+meta_gpu_init (MetaGpu *gpu)
+{
+}
+
+static void
+meta_gpu_class_init (MetaGpuClass *klass)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+  object_class->set_property = meta_gpu_set_property;
+  object_class->get_property = meta_gpu_get_property;
+  object_class->finalize = meta_gpu_finalize;
+
+  obj_props[PROP_MONITOR_MANAGER] =
+    g_param_spec_object ("monitor-manager",
+                         "monitor-manager",
+                         "MetaMonitorManager",
+                         META_TYPE_MONITOR_MANAGER,
+                         G_PARAM_READWRITE |
+                         G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_STATIC_STRINGS);
+  g_object_class_install_properties (object_class, PROP_LAST, obj_props);
+}

src/backends/meta-gpu.h

@@ -0,0 +1,66 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 META_GPU_H
+#define META_GPU_H
+
+#include <glib-object.h>
+
+#include "backends/meta-monitor-manager-private.h"
+
+#define META_TYPE_GPU (meta_gpu_get_type ())
+G_DECLARE_DERIVABLE_TYPE (MetaGpu, meta_gpu, META, GPU, GObject)
+
+struct _MetaGpuClass
+{
+  GObjectClass parent_class;
+
+  gboolean (* read_current) (MetaGpu  *gpu,
+                             GError  **error);
+};
+
+int meta_gpu_get_kms_fd (MetaGpu *gpu);
+
+const char * meta_gpu_get_kms_file_path (MetaGpu *gpu);
+
+gboolean meta_gpu_read_current (MetaGpu  *gpu,
+                                GError  **error);
+
+gboolean meta_gpu_has_hotplug_mode_update (MetaGpu *gpu);
+
+MetaMonitorManager * meta_gpu_get_monitor_manager (MetaGpu *gpu);
+
+GList * meta_gpu_get_outputs (MetaGpu *gpu);
+
+GList * meta_gpu_get_crtcs (MetaGpu *gpu);
+
+GList * meta_gpu_get_modes (MetaGpu *gpu);
+
+void meta_gpu_take_outputs (MetaGpu *gpu,
+                            GList   *outputs);
+
+void meta_gpu_take_crtcs (MetaGpu *gpu,
+                          GList   *crtcs);
+
+void meta_gpu_take_modes (MetaGpu *gpu,
+                          GList   *modes);
+
+#endif /* META_GPU_H */

src/backends/meta-input-settings-private.h

@@ -54,6 +54,9 @@ struct _MetaInputSettingsClass
   void (* set_tap_enabled)   (MetaInputSettings  *settings,
                               ClutterInputDevice *device,
                               gboolean            enabled);
+  void (* set_tap_and_drag_enabled) (MetaInputSettings  *settings,
+                                     ClutterInputDevice *device,
+                                     gboolean            enabled);
   void (* set_disable_while_typing) (MetaInputSettings  *settings,
                                      ClutterInputDevice *device,
                                      gboolean            enabled);
@@ -125,11 +128,12 @@ gboolean                   meta_input_settings_is_pad_button_grabbed     (MetaIn
                                                                           ClutterInputDevice *pad,
                                                                           guint               button);
 
-gboolean                   meta_input_settings_handle_pad_button         (MetaInputSettings           *input_settings,
-                                                                          const ClutterPadButtonEvent *event);
-gchar *                    meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_settings,
-                                                                            ClutterInputDevice *pad,
-                                                                            guint               button);
+gboolean                   meta_input_settings_handle_pad_event          (MetaInputSettings    *input_settings,
+                                                                          const ClutterEvent   *event);
+gchar *                    meta_input_settings_get_pad_action_label      (MetaInputSettings  *input_settings,
+                                                                          ClutterInputDevice *pad,
+                                                                          MetaPadActionType   action,
+                                                                          guint               number);
 
 #ifdef HAVE_LIBWACOM
 WacomDevice * meta_input_settings_get_tablet_wacom_device (MetaInputSettings *settings,

src/backends/meta-input-settings.c

@@ -47,9 +47,11 @@ struct _DeviceMappingInfo
   MetaInputSettings *input_settings;
   ClutterInputDevice *device;
   GSettings *settings;
+  guint changed_id;
 #ifdef HAVE_LIBWACOM
   WacomDevice *wacom_device;
 #endif
+  guint *group_modes;
 };
 
 struct _MetaInputSettingsPrivate
@@ -73,6 +75,14 @@ struct _MetaInputSettingsPrivate
 #endif
 
   GHashTable *two_finger_devices;
+
+  /* Pad ring/strip emission */
+  struct {
+    ClutterInputDevice *pad;
+    MetaPadActionType action;
+    guint number;
+    gdouble value;
+  } last_pad_action_info;
 };
 
 typedef void (*ConfigBoolFunc)   (MetaInputSettings  *input_settings,
@@ -85,6 +95,14 @@ typedef void (*ConfigUintFunc)   (MetaInputSettings  *input_settings,
                                   ClutterInputDevice *device,
                                   guint               value);
 
+typedef enum {
+  META_PAD_DIRECTION_NONE = -1,
+  META_PAD_DIRECTION_UP = 0,
+  META_PAD_DIRECTION_DOWN,
+  META_PAD_DIRECTION_CW,
+  META_PAD_DIRECTION_CCW,
+} MetaPadDirection;
+
 G_DEFINE_TYPE_WITH_PRIVATE (MetaInputSettings, meta_input_settings, G_TYPE_OBJECT)
 
 static GSList *
@@ -510,6 +528,36 @@ update_touchpad_tap_enabled (MetaInputSettings  *input_settings,
     }
 }
 
+static void
+update_touchpad_tap_and_drag_enabled (MetaInputSettings  *input_settings,
+                                      ClutterInputDevice *device)
+{
+  MetaInputSettingsClass *input_settings_class;
+  MetaInputSettingsPrivate *priv;
+  gboolean enabled;
+
+  if (device &&
+      clutter_input_device_get_device_type (device) != CLUTTER_TOUCHPAD_DEVICE)
+    return;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
+  enabled = g_settings_get_boolean (priv->touchpad_settings, "tap-and-drag");
+
+  if (device)
+    {
+      settings_device_set_bool_setting (input_settings, device,
+                                        input_settings_class->set_tap_and_drag_enabled,
+                                        enabled);
+    }
+  else
+    {
+      settings_set_bool_setting (input_settings, CLUTTER_TOUCHPAD_DEVICE,
+                                 input_settings_class->set_tap_and_drag_enabled,
+                                 enabled);
+    }
+}
+
 static void
 update_touchpad_edge_scroll (MetaInputSettings *input_settings,
                              ClutterInputDevice *device)
@@ -753,6 +801,7 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsPrivate *priv;
   MetaMonitorManager *monitor_manager;
+  MetaLogicalMonitor *ret = NULL;
   guint n_values;
   GList *logical_monitors;
   GList *l;
@@ -767,11 +816,11 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
       g_warning ("EDID configuration for device '%s' "
                  "is incorrect, must have 3 values",
                  clutter_input_device_get_device_name (device));
-      return NULL;
+      goto out;
     }
 
   if (!*edid[0] && !*edid[1] && !*edid[2])
-    return NULL;
+    goto out;
 
   monitor_manager = priv->monitor_manager;
   logical_monitors =
@@ -785,10 +834,15 @@ meta_input_settings_find_logical_monitor (MetaInputSettings  *input_settings,
                                        edid[0],
                                        edid[1],
                                        edid[2]))
-        return logical_monitor;
+        {
+          ret = logical_monitor;
+          break;
+        }
     }
 
-  return NULL;
+out:
+  g_strfreev (edid);
+  return ret;
 }
 
 static void
@@ -857,7 +911,7 @@ update_device_display (MetaInputSettings  *input_settings,
   input_settings_class = META_INPUT_SETTINGS_GET_CLASS (input_settings);
 
   /* If mapping is relative, the device can move on all displays */
-  if (clutter_input_device_get_device_type (device) != CLUTTER_TABLET_DEVICE ||
+  if (clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE ||
       clutter_input_device_get_mapping_mode (device) ==
       CLUTTER_INPUT_DEVICE_MAPPING_ABSOLUTE)
     logical_monitor = meta_input_settings_find_logical_monitor (input_settings,
@@ -1021,6 +1075,8 @@ meta_input_settings_changed_cb (GSettings  *settings,
         update_device_natural_scroll (input_settings, NULL);
       else if (strcmp (key, "tap-to-click") == 0)
         update_touchpad_tap_enabled (input_settings, NULL);
+      else if (strcmp (key, "tap-and_drag") == 0)
+        update_touchpad_tap_and_drag_enabled (input_settings, NULL);
       else if (strcmp(key, "disable-while-typing") == 0)
         update_touchpad_disable_while_typing (input_settings, NULL);
       else if (strcmp (key, "send-events") == 0)
@@ -1069,10 +1125,15 @@ static void
 apply_mappable_device_settings (MetaInputSettings *input_settings,
                                 DeviceMappingInfo *info)
 {
-  update_device_display (input_settings, info->settings, info->device);
+  ClutterInputDeviceType device_type;
 
-  if (clutter_input_device_get_device_type (info->device) == CLUTTER_TABLET_DEVICE ||
-      clutter_input_device_get_device_type (info->device) == CLUTTER_PAD_DEVICE)
+  update_device_display (input_settings, info->settings, info->device);
+  device_type = clutter_input_device_get_device_type (info->device);
+
+  if (device_type == CLUTTER_TABLET_DEVICE ||
+      device_type == CLUTTER_PEN_DEVICE ||
+      device_type == CLUTTER_ERASER_DEVICE ||
+      device_type == CLUTTER_PAD_DEVICE)
     {
       update_tablet_mapping (input_settings, info->settings, info->device);
       update_tablet_area (input_settings, info->settings, info->device);
@@ -1155,20 +1216,58 @@ lookup_tool_settings (ClutterInputDeviceTool *tool,
 }
 
 static GSettings *
-lookup_pad_button_settings (ClutterInputDevice *device,
-                            guint               button)
+lookup_pad_action_settings (ClutterInputDevice *device,
+                            MetaPadActionType   action,
+                            guint               number,
+                            MetaPadDirection    direction,
+                            gint                mode)
 {
-  const gchar *vendor, *product;
+  const gchar *vendor, *product, *action_type, *detail_type = NULL;
   GSettings *settings;
-  gchar *path;
+  GString *path;
+  gchar action_label;
 
   vendor = clutter_input_device_get_vendor_id (device);
   product = clutter_input_device_get_product_id (device);
-  path = g_strdup_printf ("/org/gnome/desktop/peripherals/tablets/%s:%s/button%c/",
-                          vendor, product, 'A' + button);
+
+  action_label = 'A' + number;
+
+  switch (action)
+    {
+    case META_PAD_ACTION_BUTTON:
+      action_type = "button";
+      break;
+    case META_PAD_ACTION_RING:
+      g_assert (direction == META_PAD_DIRECTION_CW ||
+                direction == META_PAD_DIRECTION_CCW);
+      action_type = "ring";
+      detail_type = (direction == META_PAD_DIRECTION_CW) ? "cw" : "ccw";
+      break;
+    case META_PAD_ACTION_STRIP:
+      g_assert (direction == META_PAD_DIRECTION_UP ||
+                direction == META_PAD_DIRECTION_DOWN);
+      action_type = "strip";
+      detail_type = (direction == META_PAD_DIRECTION_UP) ? "up" : "down";
+      break;
+    default:
+      return NULL;
+    }
+
+  path = g_string_new (NULL);
+  g_string_append_printf (path, "/org/gnome/desktop/peripherals/tablets/%s:%s/%s%c",
+                          vendor, product, action_type, action_label);
+
+  if (detail_type)
+    g_string_append_printf (path, "-%s", detail_type);
+
+  if (mode >= 0)
+    g_string_append_printf (path, "-mode-%d", mode);
+
+  g_string_append_c (path, '/');
+
   settings = g_settings_new_with_path ("org.gnome.desktop.peripherals.tablet.pad-button",
-                                       path);
-  g_free (path);
+                                       path->str);
+  g_string_free (path, TRUE);
 
   return settings;
 }
@@ -1197,7 +1296,9 @@ device_mapping_info_free (DeviceMappingInfo *info)
   if (info->wacom_device)
     libwacom_destroy (info->wacom_device);
 #endif
+  g_signal_handler_disconnect (info->settings, info->changed_id);
   g_object_unref (info->settings);
+  g_free (info->group_modes);
   g_slice_free (DeviceMappingInfo, info);
 }
 
@@ -1207,8 +1308,18 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
 {
   MetaInputSettingsPrivate *priv;
   DeviceMappingInfo *info;
+  ClutterInputDeviceType device_type;
   GSettings *settings;
 
+  device_type = clutter_input_device_get_device_type (device);
+
+  if ((device_type == CLUTTER_TABLET_DEVICE ||
+       device_type == CLUTTER_PEN_DEVICE ||
+       device_type == CLUTTER_ERASER_DEVICE ||
+       device_type == CLUTTER_PAD_DEVICE) &&
+      g_getenv ("MUTTER_DISABLE_WACOM_CONFIGURATION") != NULL)
+    return FALSE;
+
   settings = lookup_device_settings (device);
 
   if (!settings)
@@ -1222,8 +1333,8 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
   info->settings = settings;
 
 #ifdef HAVE_LIBWACOM
-  if (clutter_input_device_get_device_type (device) == CLUTTER_TABLET_DEVICE ||
-      clutter_input_device_get_device_type (device) == CLUTTER_PAD_DEVICE)
+  if (device_type == CLUTTER_TABLET_DEVICE ||
+      device_type == CLUTTER_PAD_DEVICE)
     {
       WacomError *error = libwacom_error_new ();
 
@@ -1241,8 +1352,15 @@ check_add_mappable_device (MetaInputSettings  *input_settings,
     }
 #endif
 
-  g_signal_connect (settings, "changed",
-                    G_CALLBACK (mapped_device_changed_cb), info);
+  if (device_type == CLUTTER_PAD_DEVICE)
+    {
+      info->group_modes =
+        g_new0 (guint, clutter_input_device_get_n_mode_groups (device));
+    }
+
+  info->changed_id = g_signal_connect (settings, "changed",
+                                       G_CALLBACK (mapped_device_changed_cb),
+                                       info);
 
   g_hash_table_insert (priv->mappable_devices, device, info);
 
@@ -1268,6 +1386,7 @@ apply_device_settings (MetaInputSettings  *input_settings,
 
   update_touchpad_left_handed (input_settings, device);
   update_touchpad_tap_enabled (input_settings, device);
+  update_touchpad_tap_and_drag_enabled (input_settings, device);
   update_touchpad_disable_while_typing (input_settings, device);
   update_touchpad_send_events (input_settings, device);
   update_touchpad_two_finger_scroll (input_settings, device);
@@ -1498,7 +1617,7 @@ meta_input_settings_init (MetaInputSettings *settings)
     g_hash_table_new_full (NULL, NULL, NULL, (GDestroyNotify) device_mapping_info_free);
 
   priv->monitor_manager = g_object_ref (meta_monitor_manager_get ());
-  g_signal_connect (priv->monitor_manager, "monitors-changed",
+  g_signal_connect (priv->monitor_manager, "monitors-changed-internal",
                     G_CALLBACK (monitors_changed_cb), settings);
 
 #ifdef HAVE_LIBWACOM
@@ -1581,7 +1700,8 @@ meta_input_settings_get_pad_button_action (MetaInputSettings   *input_settings,
   g_return_val_if_fail (CLUTTER_IS_INPUT_DEVICE (pad),
                         G_DESKTOP_PAD_BUTTON_ACTION_NONE);
 
-  settings = lookup_pad_button_settings (pad, button);
+  settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
+                                         button, META_PAD_DIRECTION_NONE, -1);
   action = g_settings_get_enum (settings, "action");
   g_object_unref (settings);
 
@@ -1730,24 +1850,20 @@ emulate_modifiers (ClutterVirtualInputDevice *device,
 
 static void
 meta_input_settings_emulate_keybinding (MetaInputSettings  *input_settings,
-                                        ClutterInputDevice *pad,
-                                        guint               button,
+                                        const gchar        *accel,
                                         gboolean            is_press)
 {
   MetaInputSettingsPrivate *priv;
   ClutterKeyState state;
-  GSettings *settings;
   guint key, mods;
-  gchar *accel;
+
+  if (!accel || !*accel)
+    return;
 
   priv = meta_input_settings_get_instance_private (input_settings);
-  settings = lookup_pad_button_settings (pad, button);
-  accel = g_settings_get_string (settings, "keybinding");
-  g_object_unref (settings);
 
   /* FIXME: This is appalling */
   gtk_accelerator_parse (accel, &key, &mods);
-  g_free (accel);
 
   if (!priv->virtual_pad_keyboard)
     {
@@ -1784,20 +1900,21 @@ meta_input_settings_is_pad_button_grabbed (MetaInputSettings  *input_settings,
           G_DESKTOP_PAD_BUTTON_ACTION_NONE);
 }
 
-gboolean
+static gboolean
 meta_input_settings_handle_pad_button (MetaInputSettings           *input_settings,
+                                       ClutterInputDevice          *pad,
                                        const ClutterPadButtonEvent *event)
 {
   GDesktopPadButtonAction action;
-  ClutterInputDevice *pad;
   gint button, group, mode;
   gboolean is_press;
+  GSettings *settings;
+  gchar *accel;
 
   g_return_val_if_fail (META_IS_INPUT_SETTINGS (input_settings), FALSE);
   g_return_val_if_fail (event->type == CLUTTER_PAD_BUTTON_PRESS ||
                         event->type == CLUTTER_PAD_BUTTON_RELEASE, FALSE);
 
-  pad = clutter_event_get_source_device ((ClutterEvent *) event);
   button = event->button;
   mode = event->mode;
   group = clutter_input_device_get_mode_switch_button_group (pad, button);
@@ -1807,18 +1924,19 @@ meta_input_settings_handle_pad_button (MetaInputSettings           *input_settin
     {
       guint n_modes = clutter_input_device_get_group_n_modes (pad, group);
       const gchar *pretty_name = NULL;
-#ifdef HAVE_LIBWACOM
       MetaInputSettingsPrivate *priv;
       DeviceMappingInfo *info;
 
       priv = meta_input_settings_get_instance_private (input_settings);
       info = g_hash_table_lookup (priv->mappable_devices, pad);
 
+#ifdef HAVE_LIBWACOM
       if (info && info->wacom_device)
         pretty_name = libwacom_get_name (info->wacom_device);
 #endif
       meta_display_notify_pad_group_switch (meta_get_display (), pad,
                                             pretty_name, group, mode, n_modes);
+      info->group_modes[group] = mode;
     }
 
   action = meta_input_settings_get_pad_button_action (input_settings, pad, button);
@@ -1834,8 +1952,12 @@ meta_input_settings_handle_pad_button (MetaInputSettings           *input_settin
         meta_display_request_pad_osd (meta_get_display (), pad, FALSE);
       return TRUE;
     case G_DESKTOP_PAD_BUTTON_ACTION_KEYBINDING:
-      meta_input_settings_emulate_keybinding (input_settings, pad,
-                                              button, is_press);
+      settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
+                                             button, META_PAD_DIRECTION_NONE, -1);
+      accel = g_settings_get_string (settings, "keybinding");
+      meta_input_settings_emulate_keybinding (input_settings, accel, is_press);
+      g_object_unref (settings);
+      g_free (accel);
       return TRUE;
     case G_DESKTOP_PAD_BUTTON_ACTION_NONE:
     default:
@@ -1843,10 +1965,189 @@ meta_input_settings_handle_pad_button (MetaInputSettings           *input_settin
     }
 }
 
-gchar *
-meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_settings,
-                                                 ClutterInputDevice *pad,
-                                                 guint               button)
+static gboolean
+meta_input_settings_handle_pad_action (MetaInputSettings         *input_settings,
+                                       ClutterInputDevice        *pad,
+                                       MetaPadActionType          action,
+                                       guint                      number,
+                                       MetaPadDirection           direction,
+                                       guint                      mode)
+{
+  GSettings *settings;
+  gboolean handled = FALSE;
+  gchar *accel;
+
+  settings = lookup_pad_action_settings (pad, action, number, direction, mode);
+  accel = g_settings_get_string (settings, "keybinding");
+
+  if (accel && *accel)
+    {
+      meta_input_settings_emulate_keybinding (input_settings, accel, TRUE);
+      meta_input_settings_emulate_keybinding (input_settings, accel, FALSE);
+      handled = TRUE;
+    }
+
+  g_object_unref (settings);
+  g_free (accel);
+
+  return handled;
+}
+
+static gboolean
+meta_input_settings_get_pad_action_direction (MetaInputSettings  *input_settings,
+                                              const ClutterEvent *event,
+                                              MetaPadDirection   *direction)
+{
+  MetaInputSettingsPrivate *priv;
+  ClutterInputDevice *pad = clutter_event_get_device (event);
+  MetaPadActionType pad_action;
+  gboolean has_direction = FALSE;
+  MetaPadDirection inc_dir, dec_dir;
+  guint number;
+  gdouble value;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  *direction = META_PAD_DIRECTION_NONE;
+
+  switch (event->type)
+    {
+    case CLUTTER_PAD_RING:
+      pad_action = META_PAD_ACTION_RING;
+      number = event->pad_ring.ring_number;
+      value = event->pad_ring.angle;
+      inc_dir = META_PAD_DIRECTION_CW;
+      dec_dir = META_PAD_DIRECTION_CCW;
+      break;
+    case CLUTTER_PAD_STRIP:
+      pad_action = META_PAD_ACTION_STRIP;
+      number = event->pad_strip.strip_number;
+      value = event->pad_strip.value;
+      inc_dir = META_PAD_DIRECTION_DOWN;
+      dec_dir = META_PAD_DIRECTION_UP;
+      break;
+    default:
+      return FALSE;
+    }
+
+  if (priv->last_pad_action_info.pad == pad &&
+      priv->last_pad_action_info.action == pad_action &&
+      priv->last_pad_action_info.number == number &&
+      value >= 0 && priv->last_pad_action_info.value >= 0)
+    {
+      *direction = (value - priv->last_pad_action_info.value) > 0 ?
+        inc_dir : dec_dir;
+      has_direction = TRUE;
+    }
+
+  priv->last_pad_action_info.pad = pad;
+  priv->last_pad_action_info.action = pad_action;
+  priv->last_pad_action_info.number = number;
+  priv->last_pad_action_info.value = value;
+  return has_direction;
+}
+
+gboolean
+meta_input_settings_handle_pad_event (MetaInputSettings  *input_settings,
+                                      const ClutterEvent *event)
+{
+  ClutterInputDevice *pad;
+  MetaPadDirection direction = META_PAD_DIRECTION_NONE;
+
+  pad = clutter_event_get_source_device ((ClutterEvent *) event);
+
+  switch (event->type)
+    {
+    case CLUTTER_PAD_BUTTON_PRESS:
+    case CLUTTER_PAD_BUTTON_RELEASE:
+      return meta_input_settings_handle_pad_button (input_settings, pad,
+                                                    &event->pad_button);
+    case CLUTTER_PAD_RING:
+      if (!meta_input_settings_get_pad_action_direction (input_settings,
+                                                         event, &direction))
+        return FALSE;
+      return meta_input_settings_handle_pad_action (input_settings, pad,
+                                                    META_PAD_ACTION_RING,
+                                                    event->pad_ring.ring_number,
+                                                    direction,
+                                                    event->pad_ring.mode);
+    case CLUTTER_PAD_STRIP:
+      if (!meta_input_settings_get_pad_action_direction (input_settings,
+                                                         event, &direction))
+        return FALSE;
+      return meta_input_settings_handle_pad_action (input_settings, pad,
+                                                    META_PAD_ACTION_STRIP,
+                                                    event->pad_strip.strip_number,
+                                                    direction,
+                                                    event->pad_strip.mode);
+    default:
+      return FALSE;
+    }
+}
+
+static gchar *
+compose_directional_action_label (GSettings *direction1,
+                                  GSettings *direction2)
+{
+  gchar *accel1, *accel2, *str = NULL;
+
+  accel1 = g_settings_get_string (direction1, "keybinding");
+  accel2 = g_settings_get_string (direction2, "keybinding");
+
+  if (accel1 && *accel1 && accel2 && *accel2)
+    str = g_strdup_printf ("%s / %s", accel1, accel2);
+
+  g_free (accel1);
+  g_free (accel2);
+
+  return str;
+}
+
+static gchar *
+meta_input_settings_get_ring_label (MetaInputSettings  *settings,
+                                    ClutterInputDevice *pad,
+                                    guint               number,
+                                    guint               mode)
+{
+  GSettings *settings1, *settings2;
+  gchar *label;
+
+  /* We only allow keybinding actions with those */
+  settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number,
+                                          META_PAD_DIRECTION_CW, mode);
+  settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_RING, number,
+                                          META_PAD_DIRECTION_CCW, mode);
+  label = compose_directional_action_label (settings1, settings2);
+  g_object_unref (settings1);
+  g_object_unref (settings2);
+
+  return label;
+}
+
+static gchar *
+meta_input_settings_get_strip_label (MetaInputSettings  *settings,
+                                     ClutterInputDevice *pad,
+                                     guint               number,
+                                     guint               mode)
+{
+  GSettings *settings1, *settings2;
+  gchar *label;
+
+  /* We only allow keybinding actions with those */
+  settings1 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number,
+                                          META_PAD_DIRECTION_UP, mode);
+  settings2 = lookup_pad_action_settings (pad, META_PAD_ACTION_STRIP, number,
+                                          META_PAD_DIRECTION_DOWN, mode);
+  label = compose_directional_action_label (settings1, settings2);
+  g_object_unref (settings1);
+  g_object_unref (settings2);
+
+  return label;
+}
+
+static gchar *
+meta_input_settings_get_button_label (MetaInputSettings  *input_settings,
+                                      ClutterInputDevice *pad,
+                                      guint               button)
 {
   GDesktopPadButtonAction action;
   gint group;
@@ -1875,7 +2176,8 @@ meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_setti
         GSettings *settings;
         gchar *accel;
 
-        settings = lookup_pad_button_settings (pad, button);
+        settings = lookup_pad_action_settings (pad, META_PAD_ACTION_BUTTON,
+                                               button, META_PAD_DIRECTION_NONE, -1);
         accel = g_settings_get_string (settings, "keybinding");
         g_object_unref (settings);
 
@@ -1893,3 +2195,55 @@ meta_input_settings_get_pad_button_action_label (MetaInputSettings  *input_setti
       return NULL;
     }
 }
+
+static guint
+get_current_pad_mode (MetaInputSettings  *input_settings,
+                      ClutterInputDevice *pad,
+                      MetaPadActionType   action_type,
+                      guint               number)
+{
+  MetaInputSettingsPrivate *priv;
+  DeviceMappingInfo *info;
+  guint group = 0, n_groups;
+
+  priv = meta_input_settings_get_instance_private (input_settings);
+  info = g_hash_table_lookup (priv->mappable_devices, pad);
+  n_groups = clutter_input_device_get_n_mode_groups (pad);
+
+  if (!info->group_modes || n_groups == 0)
+    return 0;
+
+  if (action_type == META_PAD_ACTION_RING ||
+      action_type == META_PAD_ACTION_STRIP)
+    {
+      /* Assume features are evenly distributed in groups */
+      group = number % n_groups;
+    }
+
+  return info->group_modes[group];
+}
+
+gchar *
+meta_input_settings_get_pad_action_label (MetaInputSettings  *input_settings,
+                                          ClutterInputDevice *pad,
+                                          MetaPadActionType   action_type,
+                                          guint               number)
+{
+  guint mode;
+
+  switch (action_type)
+    {
+    case META_PAD_ACTION_BUTTON:
+      return meta_input_settings_get_button_label (input_settings, pad, number);
+    case META_PAD_ACTION_RING:
+      mode = get_current_pad_mode (input_settings, pad, action_type, number);
+      return meta_input_settings_get_ring_label (input_settings, pad,
+                                                 number, mode);
+    case META_PAD_ACTION_STRIP:
+      mode = get_current_pad_mode (input_settings, pad, action_type, number);
+      return meta_input_settings_get_strip_label (input_settings, pad,
+                                                  number, mode);
+    }
+
+  return NULL;
+}

src/backends/meta-logical-monitor.c

@@ -21,9 +21,12 @@
 
 #include "config.h"
 
-#include "backends/meta-backend-private.h"
 #include "backends/meta-logical-monitor.h"
 
+#include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-output.h"
+
 G_DEFINE_TYPE (MetaLogicalMonitor, meta_logical_monitor, G_TYPE_OBJECT)
 
 static MetaMonitor *
@@ -107,7 +110,7 @@ MetaLogicalMonitor *
 meta_logical_monitor_new_derived (MetaMonitorManager *monitor_manager,
                                   MetaMonitor        *monitor,
                                   MetaRectangle      *layout,
-                                  int                 scale,
+                                  float               scale,
                                   int                 monitor_number)
 {
   MetaLogicalMonitor *logical_monitor;
@@ -175,18 +178,75 @@ meta_logical_monitor_make_primary (MetaLogicalMonitor *logical_monitor)
   logical_monitor->is_primary = TRUE;
 }
 
-int
+float
 meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor)
 {
   return logical_monitor->scale;
 }
 
+MetaMonitorTransform
+meta_logical_monitor_get_transform (MetaLogicalMonitor *logical_monitor)
+{
+  return logical_monitor->transform;
+}
+
+MetaRectangle
+meta_logical_monitor_get_layout (MetaLogicalMonitor *logical_monitor)
+{
+  return logical_monitor->rect;
+}
+
 GList *
 meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor)
 {
   return logical_monitor->monitors;
 }
 
+typedef struct _ForeachCrtcData
+{
+  MetaLogicalMonitor *logical_monitor;
+  MetaLogicalMonitorCrtcFunc func;
+  gpointer user_data;
+} ForeachCrtcData;
+
+static gboolean
+foreach_crtc (MetaMonitor         *monitor,
+              MetaMonitorMode     *mode,
+              MetaMonitorCrtcMode *monitor_crtc_mode,
+              gpointer             user_data,
+              GError             **error)
+{
+  ForeachCrtcData *data = user_data;
+
+  data->func (data->logical_monitor,
+              monitor_crtc_mode->output->crtc,
+              data->user_data);
+
+  return TRUE;
+}
+
+void
+meta_logical_monitor_foreach_crtc (MetaLogicalMonitor        *logical_monitor,
+                                   MetaLogicalMonitorCrtcFunc func,
+                                   gpointer                   user_data)
+{
+  GList *l;
+
+  for (l = logical_monitor->monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaMonitorMode *mode;
+      ForeachCrtcData data = {
+        .logical_monitor = logical_monitor,
+        .func = func,
+        .user_data = user_data
+      };
+
+      mode = meta_monitor_get_current_mode (monitor);
+      meta_monitor_mode_foreach_crtc (monitor, mode, foreach_crtc, &data, NULL);
+    }
+}
+
 static void
 meta_logical_monitor_init (MetaLogicalMonitor *logical_monitor)
 {

src/backends/meta-logical-monitor.h

@@ -40,7 +40,7 @@ struct _MetaLogicalMonitor
   gboolean is_primary;
   gboolean is_presentation; /* XXX: not yet used */
   gboolean in_fullscreen;
-  int scale;
+  float scale;
   MetaMonitorTransform transform;
 
   /* The primary or first output for this monitor, 0 if we can't figure out.
@@ -61,6 +61,10 @@ G_DECLARE_FINAL_TYPE (MetaLogicalMonitor, meta_logical_monitor,
                       META, LOGICAL_MONITOR,
                       GObject)
 
+typedef void (* MetaLogicalMonitorCrtcFunc) (MetaLogicalMonitor *logical_monitor,
+                                             MetaCrtc           *crtc,
+                                             gpointer            user_data);
+
 MetaLogicalMonitor * meta_logical_monitor_new (MetaMonitorManager       *monitor_manager,
                                                MetaLogicalMonitorConfig *logical_monitor_config,
                                                int                       monitor_number);
@@ -68,7 +72,7 @@ MetaLogicalMonitor * meta_logical_monitor_new (MetaMonitorManager       *monitor
 MetaLogicalMonitor * meta_logical_monitor_new_derived (MetaMonitorManager *monitor_manager,
                                                        MetaMonitor        *monitor,
                                                        MetaRectangle      *layout,
-                                                       int                 scale,
+                                                       float               scale,
                                                        int                 monitor_number);
 
 void meta_logical_monitor_add_monitor (MetaLogicalMonitor *logical_monitor,
@@ -78,7 +82,11 @@ gboolean meta_logical_monitor_is_primary (MetaLogicalMonitor *logical_monitor);
 
 void meta_logical_monitor_make_primary (MetaLogicalMonitor *logical_monitor);
 
-int meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor);
+float meta_logical_monitor_get_scale (MetaLogicalMonitor *logical_monitor);
+
+MetaMonitorTransform meta_logical_monitor_get_transform (MetaLogicalMonitor *logical_monitor);
+
+MetaRectangle meta_logical_monitor_get_layout (MetaLogicalMonitor *logical_monitor);
 
 GList * meta_logical_monitor_get_monitors (MetaLogicalMonitor *logical_monitor);
 
@@ -86,4 +94,8 @@ gboolean meta_logical_monitor_has_neighbor (MetaLogicalMonitor  *logical_monitor
                                             MetaLogicalMonitor  *neighbor,
                                             MetaScreenDirection  neighbor_dir);
 
+void meta_logical_monitor_foreach_crtc (MetaLogicalMonitor        *logical_monitor,
+                                        MetaLogicalMonitorCrtcFunc func,
+                                        gpointer                   user_data);
+
 #endif /* META_LOGICAL_MONITOR_H */

src/backends/meta-monitor-config-manager.c

@@ -23,10 +23,14 @@
 
 #include "backends/meta-monitor-config-manager.h"
 
+#include "backends/meta-monitor-config-migration.h"
 #include "backends/meta-monitor-config-store.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-output.h"
 #include "core/boxes-private.h"
 
+#define CONFIG_HISTORY_MAX_SIZE 3
+
 struct _MetaMonitorConfigManager
 {
   GObject parent;
@@ -36,7 +40,7 @@ struct _MetaMonitorConfigManager
   MetaMonitorConfigStore *config_store;
 
   MetaMonitorsConfig *current_config;
-  MetaMonitorsConfig *previous_config;
+  GQueue config_history;
 };
 
 G_DEFINE_TYPE (MetaMonitorConfigManager, meta_monitor_config_manager,
@@ -45,6 +49,12 @@ G_DEFINE_TYPE (MetaMonitorConfigManager, meta_monitor_config_manager,
 G_DEFINE_TYPE (MetaMonitorsConfig, meta_monitors_config,
                G_TYPE_OBJECT)
 
+static void
+meta_crtc_info_free (MetaCrtcInfo *info);
+
+static void
+meta_output_info_free (MetaOutputInfo *info);
+
 MetaMonitorConfigManager *
 meta_monitor_config_manager_new (MetaMonitorManager *monitor_manager)
 {
@@ -355,10 +365,12 @@ create_key_for_current_state (MetaMonitorManager *monitor_manager)
 MetaMonitorsConfig *
 meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager)
 {
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
   MetaMonitorsConfigKey *config_key;
   MetaMonitorsConfig *config;
+  GError *error = NULL;
 
-  config_key = create_key_for_current_state (config_manager->monitor_manager);
+  config_key = create_key_for_current_state (monitor_manager);
   if (!config_key)
     return NULL;
 
@@ -366,6 +378,22 @@ meta_monitor_config_manager_get_stored (MetaMonitorConfigManager *config_manager
                                              config_key);
   meta_monitors_config_key_free (config_key);
 
+  if (!config)
+    return NULL;
+
+  if (config->flags & META_MONITORS_CONFIG_FLAG_MIGRATED)
+    {
+      if (!meta_finish_monitors_config_migration (monitor_manager, config,
+                                                  &error))
+        {
+          g_warning ("Failed to finish monitors config migration: %s",
+                     error->message);
+          g_error_free (error);
+          meta_monitor_config_store_remove (config_manager->config_store, config);
+          return NULL;
+        }
+    }
+
   return config;
 }
 
@@ -488,7 +516,7 @@ create_preferred_logical_monitor_config (MetaMonitorManager          *monitor_ma
 {
   MetaMonitorMode *mode;
   int width, height;
-  int scale;
+  float scale;
   MetaMonitorConfig *monitor_config;
   MetaLogicalMonitorConfig *logical_monitor_config;
 
@@ -585,7 +613,10 @@ meta_monitor_config_manager_create_linear (MetaMonitorConfigManager *config_mana
       x += logical_monitor_config->layout.width;
     }
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode);
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
 }
 
 MetaMonitorsConfig *
@@ -613,7 +644,10 @@ meta_monitor_config_manager_create_fallback (MetaMonitorConfigManager *config_ma
   logical_monitor_configs = g_list_append (NULL,
                                            primary_logical_monitor_config);
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode);
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
 }
 
 MetaMonitorsConfig *
@@ -688,15 +722,311 @@ meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_m
   if (!logical_monitor_configs)
     return NULL;
 
-  return meta_monitors_config_new (logical_monitor_configs, layout_mode);
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
+}
+
+static MetaMonitorsConfig *
+create_for_builtin_display_rotation (MetaMonitorConfigManager *config_manager,
+                                     gboolean                  rotate,
+                                     MetaMonitorTransform      transform)
+{
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+  MetaLogicalMonitorConfig *logical_monitor_config;
+  MetaLogicalMonitorConfig *current_logical_monitor_config;
+  GList *logical_monitor_configs;
+  MetaLogicalMonitorLayoutMode layout_mode;
+  MetaMonitorConfig *monitor_config;
+  MetaMonitorConfig *current_monitor_config;
+
+  if (!meta_monitor_manager_get_is_builtin_display_on (config_manager->monitor_manager))
+    return NULL;
+
+  if (!config_manager->current_config)
+    return NULL;
+
+  if (g_list_length (config_manager->current_config->logical_monitor_configs) != 1)
+    return NULL;
+
+  current_logical_monitor_config = config_manager->current_config->logical_monitor_configs->data;
+
+  if (rotate)
+    transform = (current_logical_monitor_config->transform + 1) % META_MONITOR_TRANSFORM_FLIPPED;
+
+  if (current_logical_monitor_config->transform == transform)
+    return NULL;
+
+  if (g_list_length (current_logical_monitor_config->monitor_configs) != 1)
+    return NULL;
+
+  current_monitor_config = current_logical_monitor_config->monitor_configs->data;
+
+  monitor_config = g_new0 (MetaMonitorConfig, 1);
+  *monitor_config = (MetaMonitorConfig) {
+    .monitor_spec = meta_monitor_spec_clone (current_monitor_config->monitor_spec),
+    .mode_spec = g_memdup (current_monitor_config->mode_spec, sizeof (MetaMonitorModeSpec)),
+    .enable_underscanning = current_monitor_config->enable_underscanning
+  };
+
+  logical_monitor_config = g_memdup (current_logical_monitor_config, sizeof (MetaLogicalMonitorConfig));
+  logical_monitor_config->monitor_configs = g_list_append (NULL, monitor_config);
+  logical_monitor_config->transform = transform;
+
+  if (meta_monitor_transform_is_rotated (current_logical_monitor_config->transform) !=
+      meta_monitor_transform_is_rotated (logical_monitor_config->transform))
+    {
+      int temp = logical_monitor_config->layout.width;
+      logical_monitor_config->layout.width = logical_monitor_config->layout.height;
+      logical_monitor_config->layout.height = temp;
+    }
+
+  logical_monitor_configs = g_list_append (NULL, logical_monitor_config);
+  layout_mode = config_manager->current_config->layout_mode;
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
+}
+
+MetaMonitorsConfig *
+meta_monitor_config_manager_create_for_orientation (MetaMonitorConfigManager *config_manager,
+                                                    MetaMonitorTransform      transform)
+{
+  return create_for_builtin_display_rotation (config_manager, FALSE, transform);
+}
+
+MetaMonitorsConfig *
+meta_monitor_config_manager_create_for_rotate_monitor (MetaMonitorConfigManager *config_manager)
+{
+  return create_for_builtin_display_rotation (config_manager, TRUE, META_MONITOR_TRANSFORM_NORMAL);
+}
+
+static MetaMonitorsConfig *
+create_for_switch_config_all_mirror (MetaMonitorConfigManager *config_manager)
+{
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+  MetaLogicalMonitorLayoutMode layout_mode;
+  MetaLogicalMonitorConfig *logical_monitor_config = NULL;
+  GList *logical_monitor_configs;
+  GList *monitor_configs = NULL;
+  gint common_mode_w = 0, common_mode_h = 0;
+  float best_scale = 1.0;
+  MetaMonitor *monitor;
+  GList *modes;
+  GList *monitors;
+  GList *l;
+
+  monitors = meta_monitor_manager_get_monitors (monitor_manager);
+  monitor = monitors->data;
+  modes = meta_monitor_get_modes (monitor);
+  for (l = modes; l; l = l->next)
+    {
+      MetaMonitorMode *mode = l->data;
+      gboolean common_mode_size = TRUE;
+      gint mode_w, mode_h;
+      GList *ll;
+
+      meta_monitor_mode_get_resolution (mode, &mode_w, &mode_h);
+
+      for (ll = monitors->next; ll; ll = ll->next)
+        {
+          MetaMonitor *monitor_b = ll->data;
+          gboolean have_same_mode_size = FALSE;
+          GList *mm;
+
+          for (mm = meta_monitor_get_modes (monitor_b); mm; mm = mm->next)
+            {
+              MetaMonitorMode *mode_b = mm->data;
+              gint mode_b_w, mode_b_h;
+
+              meta_monitor_mode_get_resolution (mode_b, &mode_b_w, &mode_b_h);
+
+              if (mode_w == mode_b_w &&
+                  mode_h == mode_b_h)
+                {
+                  have_same_mode_size = TRUE;
+                  break;
+                }
+            }
+
+          if (!have_same_mode_size)
+            {
+              common_mode_size = FALSE;
+              break;
+            }
+        }
+
+      if (common_mode_size &&
+          common_mode_w * common_mode_h < mode_w * mode_h)
+        {
+          common_mode_w = mode_w;
+          common_mode_h = mode_h;
+        }
+    }
+
+  if (common_mode_w == 0 || common_mode_h == 0)
+    return NULL;
+
+  for (l = monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaMonitorMode *mode = NULL;
+      GList *ll;
+      float scale;
+
+      for (ll = meta_monitor_get_modes (monitor); ll; ll = ll->next)
+        {
+          gint mode_w, mode_h;
+
+          mode = ll->data;
+          meta_monitor_mode_get_resolution (mode, &mode_w, &mode_h);
+
+          if (mode_w == common_mode_w && mode_h == common_mode_h)
+            break;
+        }
+
+      if (!mode)
+        continue;
+
+      scale = meta_monitor_manager_calculate_monitor_mode_scale (monitor_manager, monitor, mode);
+      best_scale = MAX (best_scale, scale);
+      monitor_configs = g_list_prepend (monitor_configs, create_monitor_config (monitor, mode));
+    }
+
+  logical_monitor_config = g_new0 (MetaLogicalMonitorConfig, 1);
+  *logical_monitor_config = (MetaLogicalMonitorConfig) {
+    .layout = (MetaRectangle) {
+      .x = 0,
+      .y = 0,
+      .width = common_mode_w,
+      .height = common_mode_h
+    },
+    .scale = best_scale,
+    .monitor_configs = monitor_configs
+  };
+
+  logical_monitor_configs = g_list_append (NULL, logical_monitor_config);
+  layout_mode = meta_monitor_manager_get_default_layout_mode (monitor_manager);
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
+}
+
+static MetaMonitorsConfig *
+create_for_switch_config_external (MetaMonitorConfigManager *config_manager)
+{
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+  GList *logical_monitor_configs = NULL;
+  int x = 0;
+  MetaLogicalMonitorLayoutMode layout_mode;
+  GList *monitors;
+  GList *l;
+
+  layout_mode = meta_monitor_manager_get_default_layout_mode (monitor_manager);
+
+  monitors = meta_monitor_manager_get_monitors (monitor_manager);
+  for (l = monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaLogicalMonitorConfig *logical_monitor_config;
+
+      if (meta_monitor_is_laptop_panel (monitor))
+        continue;
+
+      logical_monitor_config =
+        create_preferred_logical_monitor_config (monitor_manager,
+                                                 monitor,
+                                                 x, 0,
+                                                 NULL,
+                                                 layout_mode);
+      logical_monitor_configs = g_list_append (logical_monitor_configs,
+                                               logical_monitor_config);
+
+      if (x == 0)
+        logical_monitor_config->is_primary = TRUE;
+
+      x += logical_monitor_config->layout.width;
+    }
+
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
+}
+
+static MetaMonitorsConfig *
+create_for_switch_config_builtin (MetaMonitorConfigManager *config_manager)
+{
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+  MetaLogicalMonitorLayoutMode layout_mode;
+  GList *logical_monitor_configs;
+  MetaLogicalMonitorConfig *primary_logical_monitor_config;
+  MetaMonitor *monitor;
+
+  monitor = meta_monitor_manager_get_laptop_panel (monitor_manager);
+  if (!monitor)
+    return NULL;
+
+  layout_mode = meta_monitor_manager_get_default_layout_mode (monitor_manager);
+
+  primary_logical_monitor_config =
+    create_preferred_logical_monitor_config (monitor_manager,
+                                             monitor,
+                                             0, 0,
+                                             NULL,
+                                             layout_mode);
+  primary_logical_monitor_config->is_primary = TRUE;
+  logical_monitor_configs = g_list_append (NULL,
+                                           primary_logical_monitor_config);
+
+  return meta_monitors_config_new (monitor_manager,
+                                   logical_monitor_configs,
+                                   layout_mode,
+                                   META_MONITORS_CONFIG_FLAG_NONE);
+}
+
+MetaMonitorsConfig *
+meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager    *config_manager,
+                                                      MetaMonitorSwitchConfigType  config_type)
+{
+  MetaMonitorManager *monitor_manager = config_manager->monitor_manager;
+
+  if (!meta_monitor_manager_can_switch_config (monitor_manager))
+    return NULL;
+
+  switch (config_type)
+    {
+    case META_MONITOR_SWITCH_CONFIG_ALL_MIRROR:
+      return create_for_switch_config_all_mirror (config_manager);
+    case META_MONITOR_SWITCH_CONFIG_ALL_LINEAR:
+      return meta_monitor_config_manager_create_linear (config_manager);
+    case META_MONITOR_SWITCH_CONFIG_EXTERNAL:
+      return create_for_switch_config_external (config_manager);
+    case META_MONITOR_SWITCH_CONFIG_BUILTIN:
+      return create_for_switch_config_builtin (config_manager);
+    case META_MONITOR_SWITCH_CONFIG_UNKNOWN:
+      g_warn_if_reached ();
+      break;
+    }
+  return NULL;
 }
 
 void
 meta_monitor_config_manager_set_current (MetaMonitorConfigManager *config_manager,
                                          MetaMonitorsConfig       *config)
 {
-  g_set_object (&config_manager->previous_config,
-                config_manager->current_config);
+  if (config_manager->current_config)
+    {
+      g_queue_push_head (&config_manager->config_history,
+                         g_object_ref (config_manager->current_config));
+      if (g_queue_get_length (&config_manager->config_history) >
+          CONFIG_HISTORY_MAX_SIZE)
+        g_object_unref (g_queue_pop_tail (&config_manager->config_history));
+    }
+
   g_set_object (&config_manager->current_config, config);
 }
 
@@ -715,10 +1045,23 @@ meta_monitor_config_manager_get_current (MetaMonitorConfigManager *config_manage
   return config_manager->current_config;
 }
 
+MetaMonitorsConfig *
+meta_monitor_config_manager_pop_previous (MetaMonitorConfigManager *config_manager)
+{
+  return g_queue_pop_head (&config_manager->config_history);
+}
+
 MetaMonitorsConfig *
 meta_monitor_config_manager_get_previous (MetaMonitorConfigManager *config_manager)
 {
-  return config_manager->previous_config;
+  return g_queue_peek_head (&config_manager->config_history);
+}
+
+void
+meta_monitor_config_manager_clear_history (MetaMonitorConfigManager *config_manager)
+{
+  g_queue_foreach (&config_manager->config_history, (GFunc) g_object_unref, NULL);
+  g_queue_clear (&config_manager->config_history);
 }
 
 static void
@@ -728,7 +1071,7 @@ meta_monitor_config_manager_dispose (GObject *object)
     META_MONITOR_CONFIG_MANAGER (object);
 
   g_clear_object (&config_manager->current_config);
-  g_clear_object (&config_manager->previous_config);
+  meta_monitor_config_manager_clear_history (config_manager);
 
   G_OBJECT_CLASS (meta_monitor_config_manager_parent_class)->dispose (object);
 }
@@ -736,6 +1079,7 @@ meta_monitor_config_manager_dispose (GObject *object)
 static void
 meta_monitor_config_manager_init (MetaMonitorConfigManager *config_manager)
 {
+  g_queue_init (&config_manager->config_history);
 }
 
 static void
@@ -763,7 +1107,8 @@ meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor_conf
 }
 
 static MetaMonitorsConfigKey *
-meta_monitors_config_key_new (GList *logical_monitor_configs)
+meta_monitors_config_key_new (GList *logical_monitor_configs,
+                              GList *disabled_monitor_specs)
 {
   MetaMonitorsConfigKey *config_key;
   GList *monitor_specs;
@@ -785,6 +1130,14 @@ meta_monitors_config_key_new (GList *logical_monitor_configs)
         }
     }
 
+  for (l = disabled_monitor_specs; l; l = l->next)
+    {
+      MetaMonitorSpec *monitor_spec = l->data;
+
+      monitor_spec = meta_monitor_spec_clone (monitor_spec);
+      monitor_specs = g_list_prepend (monitor_specs, monitor_spec);
+    }
+
   monitor_specs = g_list_sort (monitor_specs,
                                (GCompareFunc) meta_monitor_spec_compare);
 
@@ -851,19 +1204,56 @@ meta_monitors_config_key_equal (gconstpointer data_a,
 }
 
 MetaMonitorsConfig *
-meta_monitors_config_new (GList                       *logical_monitor_configs,
-                          MetaLogicalMonitorLayoutMode layout_mode)
+meta_monitors_config_new_full (GList                        *logical_monitor_configs,
+                               GList                        *disabled_monitor_specs,
+                               MetaLogicalMonitorLayoutMode  layout_mode,
+                               MetaMonitorsConfigFlag        flags)
 {
   MetaMonitorsConfig *config;
 
   config = g_object_new (META_TYPE_MONITORS_CONFIG, NULL);
   config->logical_monitor_configs = logical_monitor_configs;
-  config->key = meta_monitors_config_key_new (logical_monitor_configs);
+  config->disabled_monitor_specs = disabled_monitor_specs;
+  config->key = meta_monitors_config_key_new (logical_monitor_configs,
+                                              disabled_monitor_specs);
   config->layout_mode = layout_mode;
+  config->flags = flags;
 
   return config;
 }
 
+MetaMonitorsConfig *
+meta_monitors_config_new (MetaMonitorManager           *monitor_manager,
+                          GList                        *logical_monitor_configs,
+                          MetaLogicalMonitorLayoutMode  layout_mode,
+                          MetaMonitorsConfigFlag        flags)
+{
+  GList *disabled_monitor_specs = NULL;
+  GList *monitors;
+  GList *l;
+
+  monitors = meta_monitor_manager_get_monitors (monitor_manager);
+  for (l = monitors; l; l = l->next)
+    {
+      MetaMonitor *monitor = l->data;
+      MetaMonitorSpec *monitor_spec;
+
+      monitor_spec = meta_monitor_get_spec (monitor);
+      if (meta_logical_monitor_configs_have_monitor (logical_monitor_configs,
+                                                     monitor_spec))
+        continue;
+
+      disabled_monitor_specs =
+        g_list_prepend (disabled_monitor_specs,
+                        meta_monitor_spec_clone (monitor_spec));
+    }
+
+  return meta_monitors_config_new_full (logical_monitor_configs,
+                                        disabled_monitor_specs,
+                                        layout_mode,
+                                        flags);
+}
+
 static void
 meta_monitors_config_finalize (GObject *object)
 {
@@ -872,6 +1262,10 @@ meta_monitors_config_finalize (GObject *object)
   meta_monitors_config_key_free (config->key);
   g_list_free_full (config->logical_monitor_configs,
                     (GDestroyNotify) meta_logical_monitor_config_free);
+  g_list_free_full (config->disabled_monitor_specs,
+                    (GDestroyNotify) meta_monitor_spec_free);
+
+  G_OBJECT_CLASS (meta_monitors_config_parent_class)->finalize (object);
 }
 
 static void
@@ -887,6 +1281,19 @@ meta_monitors_config_class_init (MetaMonitorsConfigClass *klass)
   object_class->finalize = meta_monitors_config_finalize;
 }
 
+static void
+meta_crtc_info_free (MetaCrtcInfo *info)
+{
+  g_ptr_array_free (info->outputs, TRUE);
+  g_slice_free (MetaCrtcInfo, info);
+}
+
+static void
+meta_output_info_free (MetaOutputInfo *info)
+{
+  g_slice_free (MetaOutputInfo, info);
+}
+
 gboolean
 meta_verify_monitor_mode_spec (MetaMonitorModeSpec *monitor_mode_spec,
                                GError             **error)
@@ -943,20 +1350,13 @@ meta_verify_monitor_config (MetaMonitorConfig *monitor_config,
 gboolean
 meta_verify_logical_monitor_config (MetaLogicalMonitorConfig    *logical_monitor_config,
                                     MetaLogicalMonitorLayoutMode layout_mode,
+                                    MetaMonitorManager          *monitor_manager,
                                     GError                     **error)
 {
   GList *l;
   int expected_mode_width = 0;
   int expected_mode_height = 0;
 
-  if (logical_monitor_config->scale < 1)
-    {
-      g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                   "Invalid logical monitor config scale %d",
-                   logical_monitor_config->scale);
-      return FALSE;
-    }
-
   if (logical_monitor_config->layout.x < 0 ||
       logical_monitor_config->layout.y < 0)
     {
@@ -988,8 +1388,10 @@ meta_verify_logical_monitor_config (MetaLogicalMonitorConfig    *logical_monitor
   switch (layout_mode)
     {
     case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
-      expected_mode_width *= logical_monitor_config->scale;
-      expected_mode_height *= logical_monitor_config->scale;
+      expected_mode_width = roundf (expected_mode_width *
+                                    logical_monitor_config->scale);
+      expected_mode_height = roundf (expected_mode_height *
+                                     logical_monitor_config->scale);
       break;
     case META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL:
       break;
@@ -1039,6 +1441,38 @@ has_adjecent_neighbour (MetaMonitorsConfig       *config,
   return FALSE;
 }
 
+gboolean
+meta_logical_monitor_configs_have_monitor (GList           *logical_monitor_configs,
+                                           MetaMonitorSpec *monitor_spec)
+{
+  GList *l;
+
+  for (l = logical_monitor_configs; l; l = l->next)
+    {
+      MetaLogicalMonitorConfig *logical_monitor_config = l->data;
+      GList *k;
+
+      for (k = logical_monitor_config->monitor_configs; k; k = k->next)
+        {
+          MetaMonitorConfig *monitor_config = k->data;
+
+          if (meta_monitor_spec_equals (monitor_spec,
+                                        monitor_config->monitor_spec))
+            return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static gboolean
+meta_monitors_config_is_monitor_enabled (MetaMonitorsConfig *config,
+                                         MetaMonitorSpec    *monitor_spec)
+{
+  return meta_logical_monitor_configs_have_monitor (config->logical_monitor_configs,
+                                                    monitor_spec);
+}
+
 gboolean
 meta_verify_monitors_config (MetaMonitorsConfig *config,
                              MetaMonitorManager *monitor_manager,
@@ -1120,6 +1554,18 @@ meta_verify_monitors_config (MetaMonitorsConfig *config,
 
   g_list_free (region);
 
+  for (l = config->disabled_monitor_specs; l; l = l->next)
+    {
+      MetaMonitorSpec *monitor_spec = l->data;
+
+      if (meta_monitors_config_is_monitor_enabled (config, monitor_spec))
+        {
+          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+                       "Assigned monitor explicitly disabled");
+          return FALSE;
+        }
+    }
+
   if (min_x != 0 || min_y != 0)
     {
       g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,

src/backends/meta-monitor-config-manager.h

@@ -41,7 +41,7 @@ typedef struct _MetaLogicalMonitorConfig
   MetaRectangle layout;
   GList *monitor_configs;
   MetaMonitorTransform transform;
-  int scale;
+  float scale;
   gboolean is_primary;
   gboolean is_presentation;
 } MetaLogicalMonitorConfig;
@@ -51,6 +51,12 @@ typedef struct _MetaMonitorsConfigKey
   GList *monitor_specs;
 } MetaMonitorsConfigKey;
 
+typedef enum _MetaMonitorsConfigFlag
+{
+  META_MONITORS_CONFIG_FLAG_NONE = 0,
+  META_MONITORS_CONFIG_FLAG_MIGRATED = (1 << 0),
+} MetaMonitorsConfigFlag;
+
 struct _MetaMonitorsConfig
 {
   GObject parent;
@@ -58,6 +64,10 @@ struct _MetaMonitorsConfig
   MetaMonitorsConfigKey *key;
   GList *logical_monitor_configs;
 
+  GList *disabled_monitor_specs;
+
+  MetaMonitorsConfigFlag flags;
+
   MetaLogicalMonitorLayoutMode layout_mode;
 };
 
@@ -83,17 +93,36 @@ MetaMonitorsConfig * meta_monitor_config_manager_create_fallback (MetaMonitorCon
 
 MetaMonitorsConfig * meta_monitor_config_manager_create_suggested (MetaMonitorConfigManager *config_manager);
 
+MetaMonitorsConfig * meta_monitor_config_manager_create_for_orientation (MetaMonitorConfigManager *config_manager,
+                                                                         MetaMonitorTransform      transform);
+
+MetaMonitorsConfig * meta_monitor_config_manager_create_for_rotate_monitor (MetaMonitorConfigManager *config_manager);
+
+MetaMonitorsConfig * meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager    *config_manager,
+                                                                           MetaMonitorSwitchConfigType  config_type);
+
 void meta_monitor_config_manager_set_current (MetaMonitorConfigManager *config_manager,
                                               MetaMonitorsConfig       *config);
 
 MetaMonitorsConfig * meta_monitor_config_manager_get_current (MetaMonitorConfigManager *config_manager);
 
+MetaMonitorsConfig * meta_monitor_config_manager_pop_previous (MetaMonitorConfigManager *config_manager);
+
 MetaMonitorsConfig * meta_monitor_config_manager_get_previous (MetaMonitorConfigManager *config_manager);
 
+void meta_monitor_config_manager_clear_history (MetaMonitorConfigManager *config_manager);
+
 void meta_monitor_config_manager_save_current (MetaMonitorConfigManager *config_manager);
 
-MetaMonitorsConfig * meta_monitors_config_new (GList                       *logical_monitor_configs,
-                                               MetaLogicalMonitorLayoutMode layout_mode);
+MetaMonitorsConfig * meta_monitors_config_new_full (GList                        *logical_monitor_configs,
+                                                    GList                        *disabled_monitors,
+                                                    MetaLogicalMonitorLayoutMode  layout_mode,
+                                                    MetaMonitorsConfigFlag        flags);
+
+MetaMonitorsConfig * meta_monitors_config_new (MetaMonitorManager           *monitor_manager,
+                                               GList                        *logical_monitor_configs,
+                                               MetaLogicalMonitorLayoutMode  layout_mode,
+                                               MetaMonitorsConfigFlag        flags);
 
 unsigned int meta_monitors_config_key_hash (gconstpointer config_key);
 
@@ -106,6 +135,9 @@ void meta_logical_monitor_config_free (MetaLogicalMonitorConfig *logical_monitor
 
 void meta_monitor_config_free (MetaMonitorConfig *monitor_config);
 
+gboolean meta_logical_monitor_configs_have_monitor (GList           *logical_monitor_configs,
+                                                    MetaMonitorSpec *monitor_spec);
+
 gboolean meta_verify_monitor_mode_spec (MetaMonitorModeSpec *monitor_mode_spec,
                                         GError             **error);
 
@@ -117,6 +149,7 @@ gboolean meta_verify_monitor_config (MetaMonitorConfig *monitor_config,
 
 gboolean meta_verify_logical_monitor_config (MetaLogicalMonitorConfig    *logical_monitor_config,
                                              MetaLogicalMonitorLayoutMode layout_mode,
+                                             MetaMonitorManager          *monitor_manager,
                                              GError                     **error);
 
 gboolean meta_verify_monitors_config (MetaMonitorsConfig *config,

src/backends/meta-monitor-config-migration.h

@@ -0,0 +1,38 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 META_MONITOR_CONFIG_MIGRATION_H
+#define META_MONITOR_CONFIG_MIGRATION_H
+
+#include "backends/meta-monitor-manager-private.h"
+
+gboolean meta_migrate_old_monitors_config (MetaMonitorConfigStore *config_store,
+                                           GFile                  *in_file,
+                                           GError                **error);
+
+gboolean meta_migrate_old_user_monitors_config (MetaMonitorConfigStore *config_store,
+                                                GError                **error);
+
+gboolean meta_finish_monitors_config_migration (MetaMonitorManager *monitor_manager,
+                                                MetaMonitorsConfig *config,
+                                                GError            **error);
+
+#endif /* META_MONITOR_CONFIG_MIGRATION_H */

src/backends/meta-monitor-config-store.c

@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "backends/meta-monitor-config-manager.h"
+#include "backends/meta-monitor-config-migration.h"
 
 #define MONITORS_CONFIG_XML_FORMAT_VERSION 2
 
@@ -53,6 +54,7 @@
  *           <width>1920</width>
  *           <height>1080</height>
  *           <rate>60.049972534179688</rate>
+ *           <flag>interlace</flag>
  *         </mode>
  *       </monitor>
  *       <transform>
@@ -81,6 +83,14 @@
  *       </monitor>
  *       <presentation>yes</presentation>
  *     </logicalmonitor>
+ *     <disabled>
+ *       <monitorspec>
+ *         <connector>LVDS3</connector>
+ *         <vendor>Vendor C</vendor>
+ *         <product>Product C</product>
+ *         <serial>Serial C</serial>
+ *       </monitorspec>
+ *     </disabled>
  *   </configuration>
  * </monitors>
  *
@@ -108,14 +118,27 @@ struct _MetaMonitorConfigStore
   GCancellable *save_cancellable;
 
   GFile *user_file;
-  GFile *custom_file;
+  GFile *custom_read_file;
+  GFile *custom_write_file;
 };
 
+#define META_MONITOR_CONFIG_STORE_ERROR (meta_monitor_config_store_error_quark ())
+static GQuark meta_monitor_config_store_error_quark (void);
+
+enum
+{
+  META_MONITOR_CONFIG_STORE_ERROR_NEEDS_MIGRATION
+};
+
+G_DEFINE_QUARK (meta-monitor-config-store-error-quark,
+                meta_monitor_config_store_error)
+
 typedef enum
 {
   STATE_INITIAL,
   STATE_MONITORS,
   STATE_CONFIGURATION,
+  STATE_MIGRATED,
   STATE_LOGICAL_MONITOR,
   STATE_LOGICAL_MONITOR_X,
   STATE_LOGICAL_MONITOR_Y,
@@ -135,7 +158,9 @@ typedef enum
   STATE_MONITOR_MODE_WIDTH,
   STATE_MONITOR_MODE_HEIGHT,
   STATE_MONITOR_MODE_RATE,
-  STATE_MONITOR_UNDERSCANNING
+  STATE_MONITOR_MODE_FLAG,
+  STATE_MONITOR_UNDERSCANNING,
+  STATE_DISABLED,
 } ParserState;
 
 typedef struct
@@ -143,6 +168,9 @@ typedef struct
   ParserState state;
   MetaMonitorConfigStore *config_store;
 
+  ParserState monitor_spec_parent_state;
+
+  gboolean current_was_migrated;
   GList *current_logical_monitor_configs;
   MetaMonitorSpec *current_monitor_spec;
   gboolean current_transform_flipped;
@@ -150,6 +178,7 @@ typedef struct
   MetaMonitorModeSpec *current_monitor_mode_spec;
   MetaMonitorConfig *current_monitor_config;
   MetaLogicalMonitorConfig *current_logical_monitor_config;
+  GList *current_disabled_monitor_specs;
 } ConfigParser;
 
 G_DEFINE_TYPE (MetaMonitorConfigStore, meta_monitor_config_store,
@@ -187,7 +216,14 @@ handle_start_element (GMarkupParseContext  *context,
                          "Missing config file format version");
           }
         
-        /* TODO: Handle converting version 1 configuration files. */
+        if (g_str_equal (version, "1"))
+          {
+            g_set_error_literal (error,
+                                 META_MONITOR_CONFIG_STORE_ERROR,
+                                 META_MONITOR_CONFIG_STORE_ERROR_NEEDS_MIGRATION,
+                                 "monitors.xml has the old format");
+            return;
+          }
 
         if (!g_str_equal (version, QUOTE (MONITORS_CONFIG_XML_FORMAT_VERSION)))
           {
@@ -210,22 +246,44 @@ handle_start_element (GMarkupParseContext  *context,
           }
 
         parser->state = STATE_CONFIGURATION;
+        parser->current_was_migrated = FALSE;
+
         return;
       }
 
     case STATE_CONFIGURATION:
       {
-        if (!g_str_equal (element_name, "logicalmonitor"))
+        if (g_str_equal (element_name, "logicalmonitor"))
+          {
+            parser->current_logical_monitor_config =
+              g_new0 (MetaLogicalMonitorConfig, 1);
+
+            parser->state = STATE_LOGICAL_MONITOR;
+          }
+        else if (g_str_equal (element_name, "migrated"))
+          {
+            parser->current_was_migrated = TRUE;
+
+            parser->state = STATE_MIGRATED;
+          }
+        else if (g_str_equal (element_name, "disabled"))
+          {
+            parser->state = STATE_DISABLED;
+          }
+        else
           {
             g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
                          "Invalid configuration element '%s'", element_name);
             return;
           }
 
-        parser->current_logical_monitor_config =
-          g_new0 (MetaLogicalMonitorConfig, 1);
+        return;
+      }
 
-        parser->state = STATE_LOGICAL_MONITOR;
+    case STATE_MIGRATED:
+      {
+        g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
+                     "Unexpected element '%s'", element_name);
         return;
       }
 
@@ -309,7 +367,7 @@ handle_start_element (GMarkupParseContext  *context,
         if (g_str_equal (element_name, "monitorspec"))
           {
             parser->current_monitor_spec = g_new0 (MetaMonitorSpec, 1);
-
+            parser->monitor_spec_parent_state = STATE_MONITOR;
             parser->state = STATE_MONITOR_SPEC;
           }
         else if (g_str_equal (element_name, "mode"))
@@ -384,6 +442,10 @@ handle_start_element (GMarkupParseContext  *context,
           {
             parser->state = STATE_MONITOR_MODE_RATE;
           }
+        else if (g_str_equal (element_name, "flag"))
+          {
+            parser->state = STATE_MONITOR_MODE_FLAG;
+          }
         else
           {
             g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
@@ -397,6 +459,7 @@ handle_start_element (GMarkupParseContext  *context,
     case STATE_MONITOR_MODE_WIDTH:
     case STATE_MONITOR_MODE_HEIGHT:
     case STATE_MONITOR_MODE_RATE:
+    case STATE_MONITOR_MODE_FLAG:
       {
         g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
                      "Invalid mode sub element '%s'", element_name);
@@ -409,6 +472,22 @@ handle_start_element (GMarkupParseContext  *context,
                      "Invalid element '%s' under underscanning", element_name);
         return;
       }
+
+    case STATE_DISABLED:
+      {
+        if (!g_str_equal (element_name, "monitorspec"))
+          {
+            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_UNKNOWN_ELEMENT,
+                         "Invalid element '%s' under disabled", element_name);
+            return;
+          }
+
+        parser->current_monitor_spec = g_new0 (MetaMonitorSpec, 1);
+        parser->monitor_spec_parent_state = STATE_DISABLED;
+        parser->state = STATE_MONITOR_SPEC;
+
+        return;
+      }
     }
 }
 
@@ -453,8 +532,8 @@ derive_logical_monitor_layout (MetaLogicalMonitorConfig    *logical_monitor_conf
   switch (layout_mode)
     {
     case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
-      width /= logical_monitor_config->scale;
-      height /= logical_monitor_config->scale;
+      width = roundf (width / logical_monitor_config->scale);
+      height = roundf (height / logical_monitor_config->scale);
       break;
     case META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL:
       break;
@@ -466,6 +545,34 @@ derive_logical_monitor_layout (MetaLogicalMonitorConfig    *logical_monitor_conf
   return TRUE;
 }
 
+static void
+finish_monitor_spec (ConfigParser *parser)
+{
+  switch (parser->monitor_spec_parent_state)
+    {
+    case STATE_MONITOR:
+      {
+        parser->current_monitor_config->monitor_spec =
+          parser->current_monitor_spec;
+        parser->current_monitor_spec = NULL;
+
+        return;
+      }
+    case STATE_DISABLED:
+      {
+        parser->current_disabled_monitor_specs =
+          g_list_prepend (parser->current_disabled_monitor_specs,
+                          parser->current_monitor_spec);
+        parser->current_monitor_spec = NULL;
+
+        return;
+      }
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
 static void
 handle_end_element (GMarkupParseContext  *context,
                     const char           *element_name,
@@ -528,17 +635,16 @@ handle_end_element (GMarkupParseContext  *context,
         if (!meta_verify_monitor_spec (parser->current_monitor_spec, error))
           return;
 
-        parser->current_monitor_config->monitor_spec =
-          parser->current_monitor_spec;
-        parser->current_monitor_spec = NULL;
+        finish_monitor_spec (parser);
 
-        parser->state = STATE_MONITOR;
+        parser->state = parser->monitor_spec_parent_state;
         return;
       }
 
     case STATE_MONITOR_MODE_WIDTH:
     case STATE_MONITOR_MODE_HEIGHT:
     case STATE_MONITOR_MODE_RATE:
+    case STATE_MONITOR_MODE_FLAG:
       {
         parser->state = STATE_MONITOR_MODE;
         return;
@@ -595,7 +701,9 @@ handle_end_element (GMarkupParseContext  *context,
 
         g_assert (g_str_equal (element_name, "logicalmonitor"));
 
-        if (logical_monitor_config->scale == 0)
+        if (parser->current_was_migrated)
+          logical_monitor_config->scale = -1;
+        else if (logical_monitor_config->scale == 0)
           logical_monitor_config->scale = 1;
 
         parser->current_logical_monitor_configs =
@@ -607,17 +715,37 @@ handle_end_element (GMarkupParseContext  *context,
         return;
       }
 
+    case STATE_MIGRATED:
+      {
+        g_assert (g_str_equal (element_name, "migrated"));
+
+        parser->state = STATE_CONFIGURATION;
+        return;
+      }
+
+    case STATE_DISABLED:
+      {
+        g_assert (g_str_equal (element_name, "disabled"));
+
+        parser->state = STATE_CONFIGURATION;
+        return;
+      }
+
     case STATE_CONFIGURATION:
       {
         MetaMonitorConfigStore *store = parser->config_store;
         MetaMonitorsConfig *config;
         GList *l;
         MetaLogicalMonitorLayoutMode layout_mode;
+        MetaMonitorsConfigFlag config_flags = META_MONITORS_CONFIG_FLAG_NONE;
 
         g_assert (g_str_equal (element_name, "configuration"));
 
-        layout_mode =
-          meta_monitor_manager_get_default_layout_mode (store->monitor_manager);
+        if (parser->current_was_migrated)
+          layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL;
+        else
+          layout_mode =
+            meta_monitor_manager_get_default_layout_mode (store->monitor_manager);
 
         for (l = parser->current_logical_monitor_configs; l; l = l->next)
           {
@@ -630,15 +758,22 @@ handle_end_element (GMarkupParseContext  *context,
 
             if (!meta_verify_logical_monitor_config (logical_monitor_config,
                                                      layout_mode,
+                                                     store->monitor_manager,
                                                      error))
               return;
           }
 
+        if (parser->current_was_migrated)
+          config_flags |= META_MONITORS_CONFIG_FLAG_MIGRATED;
+
         config =
-          meta_monitors_config_new (parser->current_logical_monitor_configs,
-                                    layout_mode);
+          meta_monitors_config_new_full (parser->current_logical_monitor_configs,
+                                         parser->current_disabled_monitor_specs,
+                                         layout_mode,
+                                         config_flags);
 
         parser->current_logical_monitor_configs = NULL;
+        parser->current_disabled_monitor_specs = NULL;
 
         if (!meta_verify_monitors_config (config, store->monitor_manager,
                                           error))
@@ -776,11 +911,13 @@ handle_text (GMarkupParseContext *context,
     case STATE_INITIAL:
     case STATE_MONITORS:
     case STATE_CONFIGURATION:
+    case STATE_MIGRATED:
     case STATE_LOGICAL_MONITOR:
     case STATE_MONITOR:
     case STATE_MONITOR_SPEC:
     case STATE_MONITOR_MODE:
     case STATE_TRANSFORM:
+    case STATE_DISABLED:
       {
         if (!is_all_whitespace (text, text_len))
           g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
@@ -828,14 +965,14 @@ handle_text (GMarkupParseContext *context,
 
     case STATE_LOGICAL_MONITOR_SCALE:
       {
-        if (!read_int (text, text_len,
-                       &parser->current_logical_monitor_config->scale, error))
+        if (!read_float (text, text_len,
+                         &parser->current_logical_monitor_config->scale, error))
           return;
 
-        if (parser->current_logical_monitor_config->scale <= 0)
+        if (parser->current_logical_monitor_config->scale <= 0.0)
           {
             g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
-                         "Logical monitor scale '%d' invalid",
+                         "Logical monitor scale '%g' invalid",
                          parser->current_logical_monitor_config->scale);
             return;
           }
@@ -908,6 +1045,22 @@ handle_text (GMarkupParseContext *context,
         return;
       }
 
+    case STATE_MONITOR_MODE_FLAG:
+      {
+        if (strncmp (text, "interlace", text_len) == 0)
+          {
+            parser->current_monitor_mode_spec->flags |=
+              META_CRTC_MODE_FLAG_INTERLACE;
+          }
+        else
+          {
+            g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
+                         "Invalid mode flag %.*s", (int) text_len, text);
+          }
+
+        return;
+      }
+
     case STATE_MONITOR_UNDERSCANNING:
       {
         read_bool (text, text_len,
@@ -974,6 +1127,27 @@ meta_monitor_config_store_lookup (MetaMonitorConfigStore *config_store,
                                                     key));
 }
 
+static void
+append_monitor_spec (GString         *buffer,
+                     MetaMonitorSpec *monitor_spec,
+                     const char      *indentation)
+{
+  g_string_append_printf (buffer, "%s<monitorspec>\n", indentation);
+  g_string_append_printf (buffer, "%s  <connector>%s</connector>\n",
+                          indentation,
+                          monitor_spec->connector);
+  g_string_append_printf (buffer, "%s  <vendor>%s</vendor>\n",
+                          indentation,
+                          monitor_spec->vendor);
+  g_string_append_printf (buffer, "%s  <product>%s</product>\n",
+                          indentation,
+                          monitor_spec->product);
+  g_string_append_printf (buffer, "%s  <serial>%s</serial>\n",
+                          indentation,
+                          monitor_spec->serial);
+  g_string_append_printf (buffer, "%s</monitorspec>\n", indentation);
+}
+
 static void
 append_monitors (GString *buffer,
                  GList   *monitor_configs)
@@ -989,16 +1163,7 @@ append_monitors (GString *buffer,
                       monitor_config->mode_spec->refresh_rate);
 
       g_string_append (buffer, "      <monitor>\n");
-      g_string_append (buffer, "        <monitorspec>\n");
-      g_string_append_printf (buffer, "          <connector>%s</connector>\n",
-                              monitor_config->monitor_spec->connector);
-      g_string_append_printf (buffer, "          <vendor>%s</vendor>\n",
-                              monitor_config->monitor_spec->vendor);
-      g_string_append_printf (buffer, "          <product>%s</product>\n",
-                              monitor_config->monitor_spec->product);
-      g_string_append_printf (buffer, "          <serial>%s</serial>\n",
-                              monitor_config->monitor_spec->serial);
-      g_string_append (buffer, "        </monitorspec>\n");
+      append_monitor_spec (buffer, monitor_config->monitor_spec, "        ");
       g_string_append (buffer, "        <mode>\n");
       g_string_append_printf (buffer, "          <width>%d</width>\n",
                               monitor_config->mode_spec->width);
@@ -1006,6 +1171,8 @@ append_monitors (GString *buffer,
                               monitor_config->mode_spec->height);
       g_string_append_printf (buffer, "          <rate>%s</rate>\n",
                               rate_str);
+      if (monitor_config->mode_spec->flags & META_CRTC_MODE_FLAG_INTERLACE)
+        g_string_append_printf (buffer, "          <flag>interlace</flag>\n");
       g_string_append (buffer, "        </mode>\n");
       if (monitor_config->enable_underscanning)
         g_string_append (buffer, "        <underscanning>yes</underscanning>\n");
@@ -1067,15 +1234,21 @@ append_transform (GString             *buffer,
 
 static void
 append_logical_monitor_xml (GString                  *buffer,
+                            MetaMonitorsConfig       *config,
                             MetaLogicalMonitorConfig *logical_monitor_config)
 {
+  char scale_str[G_ASCII_DTOSTR_BUF_SIZE];
+
   g_string_append (buffer, "    <logicalmonitor>\n");
   g_string_append_printf (buffer, "      <x>%d</x>\n",
                           logical_monitor_config->layout.x);
   g_string_append_printf (buffer, "      <y>%d</y>\n",
                           logical_monitor_config->layout.y);
-  g_string_append_printf (buffer, "      <scale>%d</scale>\n",
-                          logical_monitor_config->scale);
+  g_ascii_dtostr (scale_str, G_ASCII_DTOSTR_BUF_SIZE,
+                  logical_monitor_config->scale);
+  if ((config->flags & META_MONITORS_CONFIG_FLAG_MIGRATED) == 0)
+    g_string_append_printf (buffer, "      <scale>%s</scale>\n",
+                            scale_str);
   if (logical_monitor_config->is_primary)
     g_string_append (buffer, "      <primary>yes</primary>\n");
   if (logical_monitor_config->is_presentation)
@@ -1103,11 +1276,26 @@ generate_config_xml (MetaMonitorConfigStore *config_store)
 
       g_string_append (buffer, "  <configuration>\n");
 
+      if (config->flags & META_MONITORS_CONFIG_FLAG_MIGRATED)
+        g_string_append (buffer, "    <migrated/>\n");
+
       for (l = config->logical_monitor_configs; l; l = l->next)
         {
           MetaLogicalMonitorConfig *logical_monitor_config = l->data;
 
-          append_logical_monitor_xml (buffer, logical_monitor_config);
+          append_logical_monitor_xml (buffer, config, logical_monitor_config);
+        }
+
+      if (config->disabled_monitor_specs)
+        {
+          g_string_append (buffer, "    <disabled>\n");
+          for (l = config->disabled_monitor_specs; l; l = l->next)
+            {
+              MetaMonitorSpec *monitor_spec = l->data;
+
+              append_monitor_spec (buffer, monitor_spec, "      ");
+            }
+          g_string_append (buffer, "    </disabled>\n");
         }
 
       g_string_append (buffer, "  </configuration>\n");
@@ -1135,9 +1323,10 @@ saved_cb (GObject      *object,
   if (!g_file_replace_contents_finish (G_FILE (object), result, NULL, &error))
     {
       if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Saving monitor configuration failed: %s\n", error->message);
-      else
-        g_clear_object (&data->config_store->save_cancellable);
+        {
+          g_warning ("Saving monitor configuration failed: %s\n", error->message);
+          g_clear_object (&data->config_store->save_cancellable);
+        }
 
       g_error_free (error);
     }
@@ -1151,6 +1340,37 @@ saved_cb (GObject      *object,
   g_free (data);
 }
 
+static void
+meta_monitor_config_store_save_sync (MetaMonitorConfigStore *config_store)
+{
+  GError *error = NULL;
+  GFile *file;
+  GString *buffer;
+
+  if (config_store->custom_write_file)
+    file = config_store->custom_write_file;
+  else
+    file = config_store->user_file;
+
+  buffer = generate_config_xml (config_store);
+
+  if (!g_file_replace_contents (file,
+                                buffer->str, buffer->len,
+                                NULL,
+                                FALSE,
+                                G_FILE_CREATE_REPLACE_DESTINATION,
+                                NULL,
+                                NULL,
+                                &error))
+    {
+      g_warning ("Saving monitor configuration failed: %s\n",
+                 error->message);
+      g_error_free (error);
+    }
+
+  g_string_free (buffer, TRUE);
+}
+
 static void
 meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
 {
@@ -1163,6 +1383,17 @@ meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
       g_clear_object (&config_store->save_cancellable);
     }
 
+  /*
+   * Custom write file is only ever used by the test suite, and the test suite
+   * will want to have be able to read back the content immediately, so for
+   * custom write files, do the content replacement synchronously.
+   */
+  if (config_store->custom_write_file)
+    {
+      meta_monitor_config_store_save_sync (config_store);
+      return;
+    }
+
   config_store->save_cancellable = g_cancellable_new ();
 
   buffer = generate_config_xml (config_store);
@@ -1182,6 +1413,18 @@ meta_monitor_config_store_save (MetaMonitorConfigStore *config_store)
                                  saved_cb, data);
 }
 
+static void
+maybe_save_configs (MetaMonitorConfigStore *config_store)
+{
+  /*
+   * If a custom file is used, it means we are run by the test suite. When this
+   * is done, avoid replacing the user configuration file with test data,
+   * except if a custom write file is set as well.
+   */
+  if (!config_store->custom_read_file || config_store->custom_write_file)
+    meta_monitor_config_store_save (config_store);
+}
+
 void
 meta_monitor_config_store_add (MetaMonitorConfigStore *config_store,
                                MetaMonitorsConfig     *config)
@@ -1189,21 +1432,33 @@ meta_monitor_config_store_add (MetaMonitorConfigStore *config_store,
   g_hash_table_replace (config_store->configs,
                         config->key, g_object_ref (config));
 
-  if (!config_store->custom_file)
-    meta_monitor_config_store_save (config_store);
+  maybe_save_configs (config_store);
+}
+
+void
+meta_monitor_config_store_remove (MetaMonitorConfigStore *config_store,
+                                  MetaMonitorsConfig     *config)
+{
+  g_hash_table_remove (config_store->configs, config->key);
+
+  maybe_save_configs (config_store);
 }
 
 gboolean
 meta_monitor_config_store_set_custom (MetaMonitorConfigStore *config_store,
-                                      const char             *path,
+                                      const char             *read_path,
+                                      const char             *write_path,
                                       GError                **error)
 {
-  g_clear_object (&config_store->custom_file);
+  g_clear_object (&config_store->custom_read_file);
+  g_clear_object (&config_store->custom_write_file);
   g_hash_table_remove_all (config_store->configs);
 
-  config_store->custom_file = g_file_new_for_path (path);
+  config_store->custom_read_file = g_file_new_for_path (read_path);
+  if (write_path)
+    config_store->custom_write_file = g_file_new_for_path (write_path);
 
-  return read_config_file (config_store, config_store->custom_file, error);
+  return read_config_file (config_store, config_store->custom_read_file, error);
 }
 
 int
@@ -1212,6 +1467,12 @@ meta_monitor_config_store_get_config_count (MetaMonitorConfigStore *config_store
   return (int) g_hash_table_size (config_store->configs);
 }
 
+MetaMonitorManager *
+meta_monitor_config_store_get_monitor_manager (MetaMonitorConfigStore *config_store)
+{
+  return config_store->monitor_manager;
+}
+
 MetaMonitorConfigStore *
 meta_monitor_config_store_new (MetaMonitorManager *monitor_manager)
 {
@@ -1228,7 +1489,7 @@ meta_monitor_config_store_constructed (GObject *object)
   GError *error = NULL;
 
   user_file_path = g_build_filename (g_get_user_config_dir (),
-                                     "monitors-experimental.xml",
+                                     "monitors.xml",
                                      NULL);
   config_store->user_file = g_file_new_for_path (user_file_path);
 
@@ -1236,13 +1497,29 @@ meta_monitor_config_store_constructed (GObject *object)
     {
       if (!read_config_file (config_store, config_store->user_file, &error))
         {
-          g_warning ("Failed to read monitors config file '%s': %s",
-                     user_file_path, error->message);
-          g_error_free (error);
+          if (error->domain == META_MONITOR_CONFIG_STORE_ERROR &&
+              error->code == META_MONITOR_CONFIG_STORE_ERROR_NEEDS_MIGRATION)
+            {
+              g_clear_error (&error);
+              if (!meta_migrate_old_user_monitors_config (config_store, &error))
+                {
+                  g_warning ("Failed to migrate old monitors config file: %s",
+                             error->message);
+                  g_error_free (error);
+                }
+            }
+          else
+            {
+              g_warning ("Failed to read monitors config file '%s': %s",
+                         user_file_path, error->message);
+              g_error_free (error);
+            }
         }
     }
 
   g_free (user_file_path);
+
+  G_OBJECT_CLASS (meta_monitor_config_store_parent_class)->constructed (object);
 }
 
 static void
@@ -1250,10 +1527,19 @@ meta_monitor_config_store_dispose (GObject *object)
 {
   MetaMonitorConfigStore *config_store = META_MONITOR_CONFIG_STORE (object);
 
+  if (config_store->save_cancellable)
+    {
+      g_cancellable_cancel (config_store->save_cancellable);
+      g_clear_object (&config_store->save_cancellable);
+
+      meta_monitor_config_store_save_sync (config_store);
+    }
+
   g_clear_pointer (&config_store->configs, g_hash_table_destroy);
 
   g_clear_object (&config_store->user_file);
-  g_clear_object (&config_store->custom_file);
+  g_clear_object (&config_store->custom_read_file);
+  g_clear_object (&config_store->custom_write_file);
 
   G_OBJECT_CLASS (meta_monitor_config_store_parent_class)->dispose (object);
 }

src/backends/meta-monitor-config-store.h

@@ -38,10 +38,16 @@ MetaMonitorsConfig * meta_monitor_config_store_lookup (MetaMonitorConfigStore *c
 void meta_monitor_config_store_add (MetaMonitorConfigStore *config_store,
                                     MetaMonitorsConfig     *config);
 
+void meta_monitor_config_store_remove (MetaMonitorConfigStore *config_store,
+                                       MetaMonitorsConfig     *config);
+
 gboolean meta_monitor_config_store_set_custom (MetaMonitorConfigStore *config_store,
-                                               const char             *path,
+                                               const char             *read_path,
+                                               const char             *write_path,
                                                GError                **error);
 
 int meta_monitor_config_store_get_config_count (MetaMonitorConfigStore *config_store);
 
+MetaMonitorManager * meta_monitor_config_store_get_monitor_manager (MetaMonitorConfigStore *config_store);
+
 #endif /* META_MONITOR_CONFIG_STORE_H */

src/backends/meta-monitor-config.h

@@ -1,52 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2001 Havoc Pennington
- * Copyright (C) 2003 Rob Adams
- * Copyright (C) 2004-2006 Elijah Newren
- * Copyright (C) 2013 Red Hat Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef META_MONITOR_CONFIG_H
-#define META_MONITOR_CONFIG_H
-
-#include "meta-monitor-manager-private.h"
-
-#define META_TYPE_MONITOR_CONFIG (meta_monitor_config_get_type ())
-G_DECLARE_FINAL_TYPE (MetaMonitorConfig, meta_monitor_config,
-                      META, MONITOR_CONFIG, GObject)
-
-MetaMonitorConfig *meta_monitor_config_new (MetaMonitorManager *manager);
-
-gboolean           meta_monitor_config_apply_stored (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_make_default (MetaMonitorConfig  *config,
-                                                     MetaMonitorManager *manager);
-
-void               meta_monitor_config_update_current (MetaMonitorConfig  *config,
-                                                       MetaMonitorManager *manager);
-void               meta_monitor_config_make_persistent (MetaMonitorConfig *config);
-
-void               meta_monitor_config_restore_previous (MetaMonitorConfig  *config,
-                                                         MetaMonitorManager *manager);
-
-gboolean           meta_monitor_config_get_is_builtin_display_on (MetaMonitorConfig *config);
-
-void               meta_monitor_config_lid_is_closed_changed (MetaMonitorConfig  *self,
-                                                              MetaMonitorManager *manager);
-
-#endif /* META_MONITOR_CONFIG_H */

src/backends/meta-monitor-manager-dummy.c

@@ -31,7 +31,10 @@
 
 #include <meta/util.h>
 #include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-monitor.h"
 #include "backends/meta-monitor-config-manager.h"
+#include "backends/meta-output.h"
 
 #define ALL_TRANSFORMS ((1 << (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)) - 1)
 
@@ -40,15 +43,12 @@
 #define MAX_CRTCS (MAX_MONITORS * 2)
 #define MAX_MODES (MAX_MONITORS * 4)
 
-static float supported_scales_dummy[] = {
-  1.0,
-  2.0
-};
-
 struct _MetaMonitorManagerDummy
 {
   MetaMonitorManager parent_instance;
 
+  MetaGpu *gpu;
+
   gboolean is_transform_handled;
 };
 
@@ -59,24 +59,54 @@ struct _MetaMonitorManagerDummyClass
 
 typedef struct _MetaOutputDummy
 {
-  int scale;
+  float scale;
 } MetaOutputDummy;
 
 G_DEFINE_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy, META_TYPE_MONITOR_MANAGER);
 
+struct _MetaGpuDummy
+{
+  MetaGpu parent;
+};
+
+G_DEFINE_TYPE (MetaGpuDummy, meta_gpu_dummy, META_TYPE_GPU)
+
 static void
 meta_output_dummy_notify_destroy (MetaOutput *output);
 
-#define array_last(a, t) \
-  g_array_index (a, t, a->len - 1)
+typedef struct _CrtcModeSpec
+{
+  int width;
+  int height;
+  float refresh_rate;
+} CrtcModeSpec;
+
+static MetaCrtcMode *
+create_mode (CrtcModeSpec *spec,
+             long          mode_id)
+{
+  MetaCrtcMode *mode;
+
+  mode = g_object_new (META_TYPE_CRTC_MODE, NULL);
+
+  mode->mode_id = mode_id;
+  mode->width = spec->width;
+  mode->height = spec->height;
+  mode->refresh_rate = spec->refresh_rate;
+
+  return mode;
+}
 
 static void
-append_monitor (GArray *modes,
-                GArray *crtcs,
-                GArray *outputs,
-                int     scale)
+append_monitor (MetaMonitorManager *manager,
+                GList             **modes,
+                GList             **crtcs,
+                GList             **outputs,
+                float               scale)
 {
-  MetaCrtcMode modes_decl[] = {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
+  CrtcModeSpec mode_specs[] = {
     {
       .width = 800,
       .height = 600,
@@ -88,65 +118,84 @@ append_monitor (GArray *modes,
       .refresh_rate = 60.0
     }
   };
-  MetaCrtc crtc;
+  GList *new_modes = NULL;
+  MetaCrtc *crtc;
   MetaOutputDummy *output_dummy;
-  MetaOutput output;
+  MetaOutput *output;
   unsigned int i;
+  unsigned int number;
+  GList *l;
 
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    modes_decl[i].mode_id = modes->len + i;
-  g_array_append_vals (modes, modes_decl, G_N_ELEMENTS (modes_decl));
+  for (i = 0; i < G_N_ELEMENTS (mode_specs); i++)
+    {
+      long mode_id;
+      MetaCrtcMode *mode;
 
-  crtc = (MetaCrtc) {
-    .crtc_id = crtcs->len + 1,
-    .all_transforms = ALL_TRANSFORMS,
-  };
-  g_array_append_val (crtcs, crtc);
+      mode_id = g_list_length (*modes) + i + 1;
+      mode = create_mode (&mode_specs[i], mode_id);
+
+      new_modes = g_list_append (new_modes, mode);
+    }
+  *modes = g_list_concat (*modes, new_modes);
+
+  crtc = g_object_new (META_TYPE_CRTC, NULL);
+  crtc->crtc_id = g_list_length (*crtcs) + 1;
+  crtc->all_transforms = ALL_TRANSFORMS;
+  *crtcs = g_list_append (*crtcs, crtc);
+
+  output = g_object_new (META_TYPE_OUTPUT, NULL);
 
   output_dummy = g_new0 (MetaOutputDummy, 1);
   *output_dummy = (MetaOutputDummy) {
     .scale = scale
   };
 
-  output = (MetaOutput) {
-    .winsys_id = outputs->len + 1,
-    .name = g_strdup_printf ("LVDS%d", outputs->len + 1),
-    .vendor = g_strdup ("MetaProducts Inc."),
-    .product = g_strdup ("MetaMonitor"),
-    .serial = g_strdup_printf ("0xC0FFEE-%d", outputs->len + 1),
-    .suggested_x = -1,
-    .suggested_y = -1,
-    .width_mm = 222,
-    .height_mm = 125,
-    .subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN,
-    .preferred_mode = &array_last (modes, MetaCrtcMode),
-    .n_possible_clones = 0,
-    .backlight = -1,
-    .connector_type = META_CONNECTOR_TYPE_LVDS,
-    .driver_private = output_dummy,
-    .driver_notify =
-      (GDestroyNotify) meta_output_dummy_notify_destroy
-  };
+  number = g_list_length (*outputs) + 1;
 
-  output.modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (modes_decl));
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    output.modes[i] = &g_array_index (modes, MetaCrtcMode,
-                                      modes->len - (i + 1));
-  output.n_modes = G_N_ELEMENTS (modes_decl);
-  output.possible_crtcs = g_new0 (MetaCrtc *, 1);
-  output.possible_crtcs[0] = &array_last (crtcs, MetaCrtc);
-  output.n_possible_crtcs = 1;
+  output->gpu = gpu;
+  output->winsys_id = number;
+  output->name = g_strdup_printf ("LVDS%d", number);
+  output->vendor = g_strdup ("MetaProducts Inc.");
+  output->product = g_strdup ("MetaMonitor");
+  output->serial = g_strdup_printf ("0xC0FFEE-%d", number);
+  output->suggested_x = -1;
+  output->suggested_y = -1;
+  output->width_mm = 222;
+  output->height_mm = 125;
+  output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+  output->preferred_mode = g_list_last (*modes)->data;
+  output->n_possible_clones = 0;
+  output->backlight = -1;
+  output->connector_type = META_CONNECTOR_TYPE_LVDS;
+  output->driver_private = output_dummy;
+  output->driver_notify =
+    (GDestroyNotify) meta_output_dummy_notify_destroy;
 
-  g_array_append_val (outputs, output);
+  output->modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (mode_specs));
+  for (l = new_modes, i = 0; l; l = l->next, i++)
+    {
+      MetaCrtcMode *mode = l->data;
+
+      output->modes[i] = mode;
+    }
+  output->n_modes = G_N_ELEMENTS (mode_specs);
+  output->possible_crtcs = g_new0 (MetaCrtc *, 1);
+  output->possible_crtcs[0] = g_list_last (*crtcs)->data;
+  output->n_possible_crtcs = 1;
+
+  *outputs = g_list_append (*outputs, output);
 }
 
 static void
-append_tiled_monitor (GArray *modes,
-                      GArray *crtcs,
-                      GArray *outputs,
-                      int     scale)
+append_tiled_monitor (MetaMonitorManager *manager,
+                      GList             **modes,
+                      GList             **crtcs,
+                      GList             **outputs,
+                      int                 scale)
 {
-  MetaCrtcMode modes_decl[] = {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
+  CrtcModeSpec mode_specs[] = {
     {
       .width = 800,
       .height = 600,
@@ -158,81 +207,105 @@ append_tiled_monitor (GArray *modes,
       .refresh_rate = 60.0
     }
   };
-  MetaCrtc crtcs_decl[] = {
-    {
-      .all_transforms = ALL_TRANSFORMS,
-    },
-    {
-      .all_transforms = ALL_TRANSFORMS,
-    },
-  };
-  MetaOutput output;
+  unsigned int n_tiles = 2;
+  GList *new_modes = NULL;
+  GList *new_crtcs = NULL;
+  MetaOutput *output;
   unsigned int i;
   uint32_t tile_group_id;
 
-  for (i = 0; i < G_N_ELEMENTS (modes_decl); i++)
-    modes_decl[i].mode_id = modes->len + i;
-  g_array_append_vals (modes, modes_decl, G_N_ELEMENTS (modes_decl));
+  for (i = 0; i < G_N_ELEMENTS (mode_specs); i++)
+    {
+      long mode_id;
+      MetaCrtcMode *mode;
 
-  for (i = 0; i < G_N_ELEMENTS (crtcs_decl); i++)
-    crtcs_decl[i].crtc_id = crtcs->len + i + 1;
-  g_array_append_vals (crtcs, crtcs_decl, G_N_ELEMENTS (crtcs_decl));
+      mode_id = g_list_length (*modes) + i + 1;
+      mode = create_mode (&mode_specs[i], mode_id);
 
-  tile_group_id = outputs->len + 1;
-  for (i = 0; i < G_N_ELEMENTS (crtcs_decl); i++)
+      new_modes = g_list_append (new_modes, mode);
+    }
+  *modes = g_list_concat (*modes, new_modes);
+
+  for (i = 0; i < n_tiles; i++)
+    {
+      MetaCrtc *crtc;
+
+      crtc = g_object_new (META_TYPE_CRTC, NULL);
+      crtc->gpu = gpu;
+      crtc->crtc_id = g_list_length (*crtcs) + i + 1;
+      crtc->all_transforms = ALL_TRANSFORMS;
+      new_crtcs = g_list_append (new_crtcs, crtc);
+    }
+  *crtcs = g_list_concat (*crtcs, new_crtcs);
+
+  tile_group_id = g_list_length (*outputs) + 1;
+  for (i = 0; i < n_tiles; i++)
     {
       MetaOutputDummy *output_dummy;
       MetaCrtcMode *preferred_mode;
       unsigned int j;
+      unsigned int number;
+      GList *l;
 
       output_dummy = g_new0 (MetaOutputDummy, 1);
       *output_dummy = (MetaOutputDummy) {
         .scale = scale
       };
 
-      preferred_mode = &array_last (modes, MetaCrtcMode),
-      output = (MetaOutput) {
-        .winsys_id = outputs->len + 1,
-        .name = g_strdup_printf ("LVDS%d", outputs->len + 1),
-        .vendor = g_strdup ("MetaProducts Inc."),
-        .product = g_strdup ("MetaMonitor"),
-        .serial = g_strdup_printf ("0xC0FFEE-%d", outputs->len + 1),
-        .suggested_x = -1,
-        .suggested_y = -1,
-        .width_mm = 222,
-        .height_mm = 125,
-        .subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN,
-        .preferred_mode = preferred_mode,
-        .n_possible_clones = 0,
-        .backlight = -1,
-        .connector_type = META_CONNECTOR_TYPE_LVDS,
-        .tile_info = (MetaTileInfo) {
-          .group_id = tile_group_id,
-          .max_h_tiles = G_N_ELEMENTS (crtcs_decl),
-          .max_v_tiles = 1,
-          .loc_h_tile = i,
-          .loc_v_tile = 0,
-          .tile_w = preferred_mode->width,
-          .tile_h = preferred_mode->height
-        },
-        .driver_private = output_dummy,
-        .driver_notify =
-          (GDestroyNotify) meta_output_dummy_notify_destroy
-      };
+      /* Arbitrary ID unique for this output */
+      number = g_list_length (*outputs) + 1;
 
-      output.modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (modes_decl));
-      for (j = 0; j < G_N_ELEMENTS (modes_decl); j++)
-        output.modes[j] = &g_array_index (modes, MetaCrtcMode,
-                                          modes->len - (j + 1));
-      output.n_modes = G_N_ELEMENTS (modes_decl);
+      preferred_mode = g_list_last (*modes)->data;
 
-      output.possible_crtcs = g_new0 (MetaCrtc *, G_N_ELEMENTS (crtcs_decl));
-      for (j = 0; j < G_N_ELEMENTS (crtcs_decl); j++)
-        output.possible_crtcs[j] = &g_array_index (crtcs, MetaCrtc,
-                                                   crtcs->len - (j + 1));
-      output.n_possible_crtcs = G_N_ELEMENTS (crtcs_decl);
+      output = g_object_new (META_TYPE_OUTPUT, NULL);
 
-      g_array_append_val (outputs, output);
+      output->gpu = gpu;
+      output->winsys_id = number;
+      output->name = g_strdup_printf ("LVDS%d", number);
+      output->vendor = g_strdup ("MetaProducts Inc.");
+      output->product = g_strdup ("MetaMonitor");
+      output->serial = g_strdup_printf ("0xC0FFEE-%d", number);
+      output->suggested_x = -1;
+      output->suggested_y = -1;
+      output->width_mm = 222;
+      output->height_mm = 125;
+      output->subpixel_order = COGL_SUBPIXEL_ORDER_UNKNOWN;
+      output->preferred_mode = preferred_mode;
+      output->n_possible_clones = 0;
+      output->backlight = -1;
+      output->connector_type = META_CONNECTOR_TYPE_LVDS;
+      output->tile_info = (MetaTileInfo) {
+        .group_id = tile_group_id,
+        .max_h_tiles = n_tiles,
+        .max_v_tiles = 1,
+        .loc_h_tile = i,
+        .loc_v_tile = 0,
+        .tile_w = preferred_mode->width,
+        .tile_h = preferred_mode->height
+      },
+      output->driver_private = output_dummy;
+      output->driver_notify =
+        (GDestroyNotify) meta_output_dummy_notify_destroy;
+
+      output->modes = g_new0 (MetaCrtcMode *, G_N_ELEMENTS (mode_specs));
+      for (l = new_modes, j = 0; l; l = l->next, j++)
+        {
+          MetaCrtcMode *mode = l->data;
+
+          output->modes[j] = mode;
+        }
+      output->n_modes = G_N_ELEMENTS (mode_specs);
+
+      output->possible_crtcs = g_new0 (MetaCrtc *, n_tiles);
+      for (l = new_crtcs, j = 0; l; l = l->next, j++)
+        {
+          MetaCrtc *crtc = l->data;
+
+          output->possible_crtcs[j] = crtc;
+        }
+      output->n_possible_crtcs = n_tiles;
+
+      *outputs = g_list_append (*outputs, output);
     }
 }
 
@@ -245,16 +318,18 @@ meta_output_dummy_notify_destroy (MetaOutput *output)
 static void
 meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
 {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  MetaGpu *gpu = manager_dummy->gpu;
   unsigned int num_monitors = 1;
-  int *monitor_scales = NULL;
+  float *monitor_scales = NULL;
   const char *num_monitors_str;
   const char *monitor_scales_str;
   const char *tiled_monitors_str;
   gboolean tiled_monitors;
   unsigned int i;
-  GArray *outputs;
-  GArray *crtcs;
-  GArray *modes;
+  GList *outputs;
+  GList *crtcs;
+  GList *modes;
 
   /* To control what monitor configuration is generated, there are two available
    * environmental variables that can be used:
@@ -298,9 +373,9 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
         }
     }
 
-  monitor_scales = g_newa (int, num_monitors);
+  monitor_scales = g_newa (typeof (*monitor_scales), num_monitors);
   for (i = 0; i < num_monitors; i++)
-    monitor_scales[i] = 1;
+    monitor_scales[i] = 1.0;
 
   monitor_scales_str = getenv ("MUTTER_DEBUG_DUMMY_MONITOR_SCALES");
   if (monitor_scales_str)
@@ -313,11 +388,9 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
                       "of monitors (defaults to 1).\n");
       for (i = 0; i < num_monitors && scales_str_list[i]; i++)
         {
-          int scale = g_ascii_strtoll (scales_str_list[i], NULL, 10);
-          if (scale == 1 || scale == 2)
-            monitor_scales[i] = scale;
-          else
-            meta_warning ("Invalid dummy monitor scale");
+          float scale = g_ascii_strtod (scales_str_list[i], NULL);
+
+          monitor_scales[i] = scale;
         }
       g_strfreev (scales_str_list);
     }
@@ -325,28 +398,22 @@ meta_monitor_manager_dummy_read_current (MetaMonitorManager *manager)
   tiled_monitors_str = g_getenv ("MUTTER_DEBUG_TILED_DUMMY_MONITORS");
   tiled_monitors = g_strcmp0 (tiled_monitors_str, "1") == 0;
 
-  modes = g_array_sized_new (FALSE, TRUE, sizeof (MetaCrtcMode), MAX_MODES);
-  crtcs = g_array_sized_new (FALSE, TRUE, sizeof (MetaCrtc), MAX_CRTCS);
-  outputs = g_array_sized_new (FALSE, TRUE, sizeof (MetaOutput), MAX_OUTPUTS);
+  modes = NULL;
+  crtcs = NULL;
+  outputs = NULL;
 
   for (i = 0; i < num_monitors; i++)
     {
       if (tiled_monitors)
-        append_tiled_monitor (modes, crtcs, outputs, monitor_scales[i]);
+        append_tiled_monitor (manager,
+                              &modes, &crtcs, &outputs, monitor_scales[i]);
       else
-        append_monitor (modes, crtcs, outputs, monitor_scales[i]);
+        append_monitor (manager, &modes, &crtcs, &outputs, monitor_scales[i]);
     }
 
-  manager->modes = (MetaCrtcMode *) modes->data;
-  manager->n_modes = modes->len;
-  manager->crtcs = (MetaCrtc *) crtcs->data;
-  manager->n_crtcs = crtcs->len;
-  manager->outputs = (MetaOutput *) outputs->data;
-  manager->n_outputs = outputs->len;
-
-  g_array_free (modes, FALSE);
-  g_array_free (crtcs, FALSE);
-  g_array_free (outputs, FALSE);
+  meta_gpu_take_modes (gpu, modes);
+  meta_gpu_take_crtcs (gpu, crtcs);
+  meta_gpu_take_outputs (gpu, outputs);
 }
 
 static void
@@ -356,17 +423,10 @@ meta_monitor_manager_dummy_ensure_initial_config (MetaMonitorManager *manager)
 
   config = meta_monitor_manager_ensure_configured (manager);
 
-  if (meta_is_monitor_config_manager_enabled ())
-    {
-      meta_monitor_manager_update_logical_state (manager, config);
-    }
+  if (meta_is_stage_views_enabled ())
+    meta_monitor_manager_update_logical_state (manager, config);
   else
-    {
-      MetaMonitorManagerDeriveFlag flags =
-        META_MONITOR_MANAGER_DERIVE_FLAG_NONE;
-
-      meta_monitor_manager_update_logical_state_derived (manager, flags);
-    }
+    meta_monitor_manager_update_logical_state_derived (manager, NULL);
 }
 
 static void
@@ -376,6 +436,8 @@ apply_crtc_assignments (MetaMonitorManager *manager,
                         MetaOutputInfo    **outputs,
                         unsigned int        n_outputs)
 {
+  MetaMonitorManagerDummy *manager_dummy = META_MONITOR_MANAGER_DUMMY (manager);
+  GList *l;
   unsigned i;
 
   for (i = 0; i < n_crtcs; i++)
@@ -439,9 +501,9 @@ apply_crtc_assignments (MetaMonitorManager *manager,
     }
 
   /* Disable CRTCs not mentioned in the list */
-  for (i = 0; i < manager->n_crtcs; i++)
+  for (l = meta_gpu_get_crtcs (manager_dummy->gpu); l; l = l->next)
     {
-      MetaCrtc *crtc = &manager->crtcs[i];
+      MetaCrtc *crtc = l->data;
 
       crtc->logical_monitor = NULL;
 
@@ -459,9 +521,9 @@ apply_crtc_assignments (MetaMonitorManager *manager,
     }
 
   /* Disable outputs not mentioned in the list */
-  for (i = 0; i < manager->n_outputs; i++)
+  for (l = meta_gpu_get_outputs (manager_dummy->gpu); l; l = l->next)
     {
-      MetaOutput *output = &manager->outputs[i];
+      MetaOutput *output = l->data;
 
       if (output->is_dirty)
         {
@@ -514,10 +576,11 @@ meta_monitor_manager_dummy_apply_monitors_config (MetaMonitorManager      *manag
 
   if (!config)
     {
-      manager->screen_width = 0;
-      manager->screen_height = 0;
+      manager->screen_width = META_MONITOR_MANAGER_MIN_SCREEN_WIDTH;
+      manager->screen_height = META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT;
 
       meta_monitor_manager_rebuild (manager, NULL);
+      return TRUE;
     }
 
   if (!meta_monitor_config_manager_assign (manager, config,
@@ -547,41 +610,6 @@ meta_monitor_manager_dummy_apply_monitors_config (MetaMonitorManager      *manag
   return TRUE;
 }
 
-static void
-legacy_calculate_screen_size (MetaMonitorManager *manager)
-{
-  unsigned int i;
-  int width = 0, height = 0;
-
-  for (i = 0; i < manager->n_crtcs; i++)
-    {
-      MetaCrtc *crtc = &manager->crtcs[i];
-
-      width = MAX (width, crtc->rect.x + crtc->rect.width);
-      height = MAX (height, crtc->rect.y + crtc->rect.height);
-    }
-
-  manager->screen_width = width;
-  manager->screen_height = height;
-}
-
-static void
-meta_monitor_manager_dummy_apply_config (MetaMonitorManager *manager,
-                                         MetaCrtcInfo      **crtcs,
-                                         unsigned int        n_crtcs,
-                                         MetaOutputInfo    **outputs,
-                                         unsigned int        n_outputs)
-{
-  MetaMonitorManagerDeriveFlag flags =
-    META_MONITOR_MANAGER_DERIVE_FLAG_NONE;
-
-  apply_crtc_assignments (manager, crtcs, n_crtcs, outputs, n_outputs);
-
-  legacy_calculate_screen_size (manager);
-
-  meta_monitor_manager_rebuild_derived (manager, flags);
-}
-
 static gboolean
 meta_monitor_manager_dummy_is_transform_handled (MetaMonitorManager  *manager,
                                                  MetaCrtc            *crtc,
@@ -592,7 +620,7 @@ meta_monitor_manager_dummy_is_transform_handled (MetaMonitorManager  *manager,
   return manager_dummy->is_transform_handled;
 }
 
-static int
+static float
 meta_monitor_manager_dummy_calculate_monitor_mode_scale (MetaMonitorManager *manager,
                                                          MetaMonitor        *monitor,
                                                          MetaMonitorMode    *monitor_mode)
@@ -606,13 +634,28 @@ meta_monitor_manager_dummy_calculate_monitor_mode_scale (MetaMonitorManager *man
   return output_dummy->scale;
 }
 
-static void
-meta_monitor_manager_dummy_get_supported_scales (MetaMonitorManager *manager,
-                                                 float             **scales,
-                                                 int                *n_scales)
+static float *
+meta_monitor_manager_dummy_calculate_supported_scales (MetaMonitorManager          *manager,
+                                                       MetaLogicalMonitorLayoutMode layout_mode,
+                                                       MetaMonitor                 *monitor,
+                                                       MetaMonitorMode             *monitor_mode,
+                                                       int                         *n_supported_scales)
 {
-  *scales = supported_scales_dummy;
-  *n_scales = G_N_ELEMENTS (supported_scales_dummy);
+  MetaMonitorScalesConstraint constraints =
+    META_MONITOR_SCALES_CONSTRAINT_NONE;
+
+  switch (layout_mode)
+    {
+    case META_LOGICAL_MONITOR_LAYOUT_MODE_LOGICAL:
+      break;
+    case META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL:
+      constraints |= META_MONITOR_SCALES_CONSTRAINT_NO_FRAC;
+      break;
+    }
+
+  return meta_monitor_calculate_supported_scales (monitor, monitor_mode,
+                                                  constraints,
+                                                  n_supported_scales);
 }
 
 static gboolean
@@ -675,27 +718,55 @@ meta_monitor_manager_dummy_class_init (MetaMonitorManagerDummyClass *klass)
 {
   MetaMonitorManagerClass *manager_class = META_MONITOR_MANAGER_CLASS (klass);
 
-  manager_class->read_current = meta_monitor_manager_dummy_read_current;
   manager_class->ensure_initial_config = meta_monitor_manager_dummy_ensure_initial_config;
   manager_class->apply_monitors_config = meta_monitor_manager_dummy_apply_monitors_config;
-  manager_class->apply_configuration = meta_monitor_manager_dummy_apply_config;
   manager_class->is_transform_handled = meta_monitor_manager_dummy_is_transform_handled;
   manager_class->calculate_monitor_mode_scale = meta_monitor_manager_dummy_calculate_monitor_mode_scale;
-  manager_class->get_supported_scales = meta_monitor_manager_dummy_get_supported_scales;
+  manager_class->calculate_supported_scales = meta_monitor_manager_dummy_calculate_supported_scales;
   manager_class->get_capabilities = meta_monitor_manager_dummy_get_capabilities;
   manager_class->get_max_screen_size = meta_monitor_manager_dummy_get_max_screen_size;
   manager_class->get_default_layout_mode = meta_monitor_manager_dummy_get_default_layout_mode;
 }
 
 static void
-meta_monitor_manager_dummy_init (MetaMonitorManagerDummy *manager)
+meta_monitor_manager_dummy_init (MetaMonitorManagerDummy *manager_dummy)
 {
+  MetaMonitorManager *manager = META_MONITOR_MANAGER (manager_dummy);
   const char *nested_offscreen_transform;
 
   nested_offscreen_transform =
     g_getenv ("MUTTER_DEBUG_NESTED_OFFSCREEN_TRANSFORM");
   if (g_strcmp0 (nested_offscreen_transform, "1") == 0)
-    manager->is_transform_handled = FALSE;
+    manager_dummy->is_transform_handled = FALSE;
   else
-    manager->is_transform_handled = TRUE;
+    manager_dummy->is_transform_handled = TRUE;
+
+  manager_dummy->gpu = g_object_new (META_TYPE_GPU_DUMMY,
+                                     "monitor-manager", manager,
+                                     NULL);
+  meta_monitor_manager_add_gpu (manager, manager_dummy->gpu);
+}
+
+static gboolean
+meta_gpu_dummy_read_current (MetaGpu  *gpu,
+                             GError  **error)
+{
+  MetaMonitorManager *manager = meta_gpu_get_monitor_manager (gpu);
+
+  meta_monitor_manager_dummy_read_current (manager);
+
+  return TRUE;
+}
+
+static void
+meta_gpu_dummy_init (MetaGpuDummy *gpu_dummy)
+{
+}
+
+static void
+meta_gpu_dummy_class_init (MetaGpuDummyClass *klass)
+{
+  MetaGpuClass *gpu_class = META_GPU_CLASS (klass);
+
+  gpu_class->read_current = meta_gpu_dummy_read_current;
 }

src/backends/meta-monitor-manager-dummy.h

@@ -24,17 +24,13 @@
 #define META_MONITOR_MANAGER_DUMMY_H
 
 #include "meta-monitor-manager-private.h"
+#include "backends/meta-gpu.h"
 
-#define META_TYPE_MONITOR_MANAGER_DUMMY            (meta_monitor_manager_dummy_get_type ())
-#define META_MONITOR_MANAGER_DUMMY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummy))
-#define META_MONITOR_MANAGER_DUMMY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass))
-#define META_IS_MONITOR_MANAGER_DUMMY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_MONITOR_MANAGER_DUMMY))
-#define META_IS_MONITOR_MANAGER_DUMMY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MONITOR_MANAGER_DUMMY))
-#define META_MONITOR_MANAGER_DUMMY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MONITOR_MANAGER_DUMMY, MetaMonitorManagerDummyClass))
+#define META_TYPE_MONITOR_MANAGER_DUMMY (meta_monitor_manager_dummy_get_type ())
+G_DECLARE_FINAL_TYPE (MetaMonitorManagerDummy, meta_monitor_manager_dummy,
+                      META, MONITOR_MANAGER_DUMMY, MetaMonitorManager)
 
-typedef struct _MetaMonitorManagerDummyClass    MetaMonitorManagerDummyClass;
-typedef struct _MetaMonitorManagerDummy         MetaMonitorManagerDummy;
-
-GType meta_monitor_manager_dummy_get_type (void);
+#define META_TYPE_GPU_DUMMY (meta_gpu_dummy_get_type ())
+G_DECLARE_FINAL_TYPE (MetaGpuDummy, meta_gpu_dummy, META, GPU_DUMMY, MetaGpu)
 
 #endif /* META_MONITOR_MANAGER_DUMMY_H */

src/backends/meta-monitor-manager-private.h

@@ -48,7 +48,6 @@
 #include "meta-dbus-display-config.h"
 #include "meta-cursor.h"
 
-typedef struct _MetaMonitorConfig MetaMonitorConfig;
 typedef struct _MetaMonitorConfigManager MetaMonitorConfigManager;
 typedef struct _MetaMonitorConfigStore MetaMonitorConfigStore;
 typedef struct _MetaMonitorsConfig MetaMonitorsConfig;
@@ -61,6 +60,8 @@ typedef struct _MetaLogicalMonitor MetaLogicalMonitor;
 
 typedef struct _MetaMonitorMode MetaMonitorMode;
 
+typedef struct _MetaGpu MetaGpu;
+
 typedef struct _MetaCrtc MetaCrtc;
 typedef struct _MetaOutput MetaOutput;
 typedef struct _MetaCrtcMode MetaCrtcMode;
@@ -68,6 +69,9 @@ typedef struct _MetaCrtcInfo MetaCrtcInfo;
 typedef struct _MetaOutputInfo MetaOutputInfo;
 typedef struct _MetaTileInfo MetaTileInfo;
 
+#define META_MONITOR_MANAGER_MIN_SCREEN_WIDTH 640
+#define META_MONITOR_MANAGER_MIN_SCREEN_HEIGHT 480
+
 typedef enum _MetaMonitorManagerCapability
 {
   META_MONITOR_MANAGER_CAPABILITY_NONE = 0,
@@ -91,12 +95,6 @@ typedef enum _MetaLogicalMonitorLayoutMode
   META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL = 2
 } MetaLogicalMonitorLayoutMode;
 
-typedef enum _MetaMonitorManagerDeriveFlag
-{
-  META_MONITOR_MANAGER_DERIVE_FLAG_NONE = 0,
-  META_MONITOR_MANAGER_DERIVE_FLAG_CONFIGURED_SCALE = (1 << 0)
-} MetaMonitorManagerDeriveFlag;
-
 typedef enum
 {
   META_MONITOR_TRANSFORM_NORMAL,
@@ -109,141 +107,11 @@ typedef enum
   META_MONITOR_TRANSFORM_FLIPPED_270,
 } MetaMonitorTransform;
 
-/* This matches the values in drm_mode.h */
-typedef enum
-{
-  META_CONNECTOR_TYPE_Unknown = 0,
-  META_CONNECTOR_TYPE_VGA = 1,
-  META_CONNECTOR_TYPE_DVII = 2,
-  META_CONNECTOR_TYPE_DVID = 3,
-  META_CONNECTOR_TYPE_DVIA = 4,
-  META_CONNECTOR_TYPE_Composite = 5,
-  META_CONNECTOR_TYPE_SVIDEO = 6,
-  META_CONNECTOR_TYPE_LVDS = 7,
-  META_CONNECTOR_TYPE_Component = 8,
-  META_CONNECTOR_TYPE_9PinDIN = 9,
-  META_CONNECTOR_TYPE_DisplayPort = 10,
-  META_CONNECTOR_TYPE_HDMIA = 11,
-  META_CONNECTOR_TYPE_HDMIB = 12,
-  META_CONNECTOR_TYPE_TV = 13,
-  META_CONNECTOR_TYPE_eDP = 14,
-  META_CONNECTOR_TYPE_VIRTUAL = 15,
-  META_CONNECTOR_TYPE_DSI = 16,
-} MetaConnectorType;
-
-struct _MetaTileInfo
-{
-  guint32 group_id;
-  guint32 flags;
-  guint32 max_h_tiles;
-  guint32 max_v_tiles;
-  guint32 loc_h_tile;
-  guint32 loc_v_tile;
-  guint32 tile_w;
-  guint32 tile_h;
-};
-
-struct _MetaOutput
-{
-  /* The CRTC driving this output, NULL if the output is not enabled */
-  MetaCrtc *crtc;
-  /* The low-level ID of this output, used to apply back configuration */
-  glong winsys_id;
-  char *name;
-  char *vendor;
-  char *product;
-  char *serial;
-  int width_mm;
-  int height_mm;
-  CoglSubpixelOrder subpixel_order;
-
-  MetaConnectorType connector_type;
-
-  MetaCrtcMode *preferred_mode;
-  MetaCrtcMode **modes;
-  unsigned int n_modes;
-
-  MetaCrtc **possible_crtcs;
-  unsigned int n_possible_crtcs;
-
-  MetaOutput **possible_clones;
-  unsigned int n_possible_clones;
-
-  int backlight;
-  int backlight_min;
-  int backlight_max;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-
-  /* The low-level bits used to build the high-level info
-     in MetaLogicalMonitor
-
-     XXX: flags maybe?
-     There is a lot of code that uses MonitorInfo->is_primary,
-     but nobody uses MetaOutput yet
-  */
-  gboolean is_primary;
-  gboolean is_presentation;
-  gboolean is_underscanning;
-  gboolean supports_underscanning;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-
-  /* get a new preferred mode on hotplug events, to handle dynamic guest resizing */
-  gboolean hotplug_mode_update;
-  gint suggested_x;
-  gint suggested_y;
-
-  MetaTileInfo tile_info;
-};
-
-struct _MetaCrtc
-{
-  glong crtc_id;
-  MetaRectangle rect;
-  MetaCrtcMode *current_mode;
-  MetaMonitorTransform transform;
-  unsigned int all_transforms;
-
-  /* Only used to build the logical configuration
-     from the HW one
-  */
-  MetaLogicalMonitor *logical_monitor;
-
-  /* Used when changing configuration */
-  gboolean is_dirty;
-
-  /* Used by cursor renderer backend */
-  void *cursor_renderer_private;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-};
-
-struct _MetaCrtcMode
-{
-  /* The low-level ID of this mode, used to apply back configuration */
-  glong mode_id;
-  char *name;
-
-  int width;
-  int height;
-  float refresh_rate;
-  guint32 flags;
-
-  gpointer driver_private;
-  GDestroyNotify driver_notify;
-};
-
 /*
  * MetaCrtcInfo:
- * This represents the writable part of a CRTC, as deserialized from DBus
- * or built by MetaMonitorConfig
  *
- * Note: differently from the other structures in this file, MetaCrtcInfo
- * is handled by pointer. This is to accomodate the usage in MetaMonitorConfig
+ * A representation of a CRTC configuration, generated by
+ * MetaMonitorConfigManager.
  */
 struct _MetaCrtcInfo
 {
@@ -257,7 +125,9 @@ struct _MetaCrtcInfo
 
 /*
  * MetaOutputInfo:
- * this is the same as MetaCrtcInfo, but for outputs
+ *
+ * A representation of a connector configuration, generated by
+ * MetaMonitorConfigManager.
  */
 struct _MetaOutputInfo
 {
@@ -267,12 +137,6 @@ struct _MetaOutputInfo
   gboolean     is_underscanning;
 };
 
-typedef enum _MetaMonitorConfigSystem
-{
-  META_MONITOR_CONFIG_SYSTEM_LEGACY,
-  META_MONITOR_CONFIG_SYSTEM_MANAGER
-} MetaMonitorConfigSystem;
-
 #define META_TYPE_MONITOR_MANAGER            (meta_monitor_manager_get_type ())
 #define META_MONITOR_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MONITOR_MANAGER, MetaMonitorManager))
 #define META_MONITOR_MANAGER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MONITOR_MANAGER, MetaMonitorManagerClass))
@@ -286,6 +150,8 @@ struct _MetaMonitorManager
 {
   MetaDBusDisplayConfigSkeleton parent_instance;
 
+  MetaBackend *backend;
+
   /* XXX: this structure is very badly
      packed, but I like the logical organization
      of fields */
@@ -300,19 +166,7 @@ struct _MetaMonitorManager
   int screen_width;
   int screen_height;
 
-  /* Outputs refer to physical screens,
-     CRTCs refer to stuff that can drive outputs
-     (like encoders, but less tied to the HW),
-     while logical_monitors refer to logical ones.
-  */
-  MetaOutput *outputs;
-  unsigned int n_outputs;
-
-  MetaCrtcMode *modes;
-  unsigned int n_modes;
-
-  MetaCrtc *crtcs;
-  unsigned int n_crtcs;
+  GList *gpus;
 
   GList *monitors;
 
@@ -321,25 +175,22 @@ struct _MetaMonitorManager
 
   int dbus_name_id;
 
-  MetaMonitorConfigSystem pending_persistent_system;
   int persistent_timeout_id;
 
-  MetaMonitorConfig *legacy_config;
-
   MetaMonitorConfigManager *config_manager;
 
   GnomePnpIds *pnp_ids;
   UpClient *up_client;
 
   gulong experimental_features_changed_handler_id;
+
+  MetaMonitorSwitchConfigType current_switch_config;
 };
 
 struct _MetaMonitorManagerClass
 {
   MetaDBusDisplayConfigSkeletonClass parent_class;
 
-  void (*read_current) (MetaMonitorManager *);
-
   char* (*get_edid_file) (MetaMonitorManager *,
                           MetaOutput         *);
   GBytes* (*read_edid) (MetaMonitorManager *,
@@ -354,12 +205,6 @@ struct _MetaMonitorManagerClass
                                      MetaMonitorsConfigMethod ,
                                      GError                 **);
 
-  void (*apply_configuration) (MetaMonitorManager  *,
-                               MetaCrtcInfo       **,
-                               unsigned int         ,
-                               MetaOutputInfo     **,
-                               unsigned int);
-
   void (*set_power_save_mode) (MetaMonitorManager *,
                                MetaPowerSave);
 
@@ -390,13 +235,15 @@ struct _MetaMonitorManagerClass
                                     MetaCrtc            *,
                                     MetaMonitorTransform);
 
-  int (*calculate_monitor_mode_scale) (MetaMonitorManager *,
-                                       MetaMonitor        *,
-                                       MetaMonitorMode    *);
+  float (*calculate_monitor_mode_scale) (MetaMonitorManager *,
+                                         MetaMonitor        *,
+                                         MetaMonitorMode    *);
 
-  void (*get_supported_scales) (MetaMonitorManager *,
-                                float             **,
-                                int                *);
+  float * (*calculate_supported_scales) (MetaMonitorManager          *,
+                                         MetaLogicalMonitorLayoutMode ,
+                                         MetaMonitor                 *,
+                                         MetaMonitorMode             *,
+                                         int                         *);
 
   MetaMonitorManagerCapability (*get_capabilities) (MetaMonitorManager *);
 
@@ -407,12 +254,14 @@ struct _MetaMonitorManagerClass
   MetaLogicalMonitorLayoutMode (*get_default_layout_mode) (MetaMonitorManager *);
 };
 
-gboolean            meta_is_monitor_config_manager_enabled (void);
+MetaBackend *       meta_monitor_manager_get_backend (MetaMonitorManager *manager);
+
+void                meta_monitor_manager_setup (MetaMonitorManager *manager);
 
 void                meta_monitor_manager_rebuild (MetaMonitorManager *manager,
                                                   MetaMonitorsConfig *config);
-void                meta_monitor_manager_rebuild_derived (MetaMonitorManager          *manager,
-                                                          MetaMonitorManagerDeriveFlag flags);
+void                meta_monitor_manager_rebuild_derived (MetaMonitorManager *manager,
+                                                          MetaMonitorsConfig *config);
 
 int                 meta_monitor_manager_get_num_logical_monitors (MetaMonitorManager *manager);
 
@@ -441,29 +290,20 @@ MetaMonitor *       meta_monitor_manager_get_laptop_panel (MetaMonitorManager *m
 MetaMonitor *       meta_monitor_manager_get_monitor_from_spec (MetaMonitorManager *manager,
                                                                 MetaMonitorSpec    *monitor_spec);
 
+MetaMonitor *       meta_monitor_manager_get_monitor_from_connector (MetaMonitorManager *manager,
+                                                                     const char         *connector);
+
 GList *             meta_monitor_manager_get_monitors      (MetaMonitorManager *manager);
 
-MetaOutput         *meta_monitor_manager_get_outputs       (MetaMonitorManager *manager,
-							    unsigned int       *n_outputs);
+void                meta_monitor_manager_add_gpu (MetaMonitorManager *manager,
+                                                  MetaGpu            *gpu);
 
-void                meta_monitor_manager_get_resources     (MetaMonitorManager  *manager,
-                                                            MetaCrtcMode       **modes,
-                                                            unsigned int        *n_modes,
-                                                            MetaCrtc           **crtcs,
-                                                            unsigned int        *n_crtcs,
-                                                            MetaOutput         **outputs,
-                                                            unsigned int        *n_outputs);
+GList *             meta_monitor_manager_get_gpus (MetaMonitorManager *manager);
 
 void                meta_monitor_manager_get_screen_size   (MetaMonitorManager *manager,
                                                             int                *width,
                                                             int                *height);
 
-void                meta_monitor_manager_apply_configuration (MetaMonitorManager  *manager,
-                                                              MetaCrtcInfo       **crtcs,
-                                                              unsigned int         n_crtcs,
-                                                              MetaOutputInfo     **outputs,
-                                                              unsigned int         n_outputs);
-
 void                meta_monitor_manager_confirm_configuration (MetaMonitorManager *manager,
                                                                 gboolean            ok);
 
@@ -471,9 +311,6 @@ void               meta_output_parse_edid (MetaOutput *output,
                                            GBytes     *edid);
 gboolean           meta_output_is_laptop  (MetaOutput *output);
 
-void               meta_crtc_info_free   (MetaCrtcInfo   *info);
-void               meta_output_info_free (MetaOutputInfo *info);
-
 gboolean           meta_monitor_manager_has_hotplug_mode_update (MetaMonitorManager *manager);
 void               meta_monitor_manager_read_current_state (MetaMonitorManager *manager);
 void               meta_monitor_manager_on_hotplug (MetaMonitorManager *manager);
@@ -495,8 +332,8 @@ MetaMonitorsConfig * meta_monitor_manager_ensure_configured (MetaMonitorManager
 
 void               meta_monitor_manager_update_logical_state (MetaMonitorManager *manager,
                                                               MetaMonitorsConfig *config);
-void               meta_monitor_manager_update_logical_state_derived (MetaMonitorManager          *manager,
-                                                                      MetaMonitorManagerDeriveFlag flags);
+void               meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager,
+                                                                      MetaMonitorsConfig *config);
 
 gboolean           meta_monitor_manager_is_lid_closed (MetaMonitorManager *manager);
 
@@ -504,10 +341,22 @@ void               meta_monitor_manager_lid_is_closed_changed (MetaMonitorManage
 
 gboolean           meta_monitor_manager_is_headless (MetaMonitorManager *manager);
 
-int                meta_monitor_manager_calculate_monitor_mode_scale (MetaMonitorManager *manager,
+float              meta_monitor_manager_calculate_monitor_mode_scale (MetaMonitorManager *manager,
                                                                       MetaMonitor        *monitor,
                                                                       MetaMonitorMode    *monitor_mode);
 
+float *            meta_monitor_manager_calculate_supported_scales (MetaMonitorManager          *,
+                                                                    MetaLogicalMonitorLayoutMode ,
+                                                                    MetaMonitor                 *,
+                                                                    MetaMonitorMode             *,
+                                                                    int                         *);
+
+gboolean           meta_monitor_manager_is_scale_supported (MetaMonitorManager          *manager,
+                                                            MetaLogicalMonitorLayoutMode layout_mode,
+                                                            MetaMonitor                 *monitor,
+                                                            MetaMonitorMode             *monitor_mode,
+                                                            float                        scale);
+
 MetaMonitorManagerCapability
                    meta_monitor_manager_get_capabilities (MetaMonitorManager *manager);
 
@@ -518,6 +367,11 @@ gboolean           meta_monitor_manager_get_max_screen_size (MetaMonitorManager
 MetaLogicalMonitorLayoutMode
                    meta_monitor_manager_get_default_layout_mode (MetaMonitorManager *manager);
 
+MetaMonitorConfigManager *
+                   meta_monitor_manager_get_config_manager (MetaMonitorManager *manager);
+
+void meta_monitor_manager_rotate_monitor (MetaMonitorManager *manager);
+
 void meta_monitor_manager_clear_output (MetaOutput *output);
 void meta_monitor_manager_clear_mode (MetaCrtcMode *mode);
 void meta_monitor_manager_clear_crtc (MetaCrtc *crtc);

src/backends/meta-monitor.c

@@ -24,11 +24,24 @@
 #include "backends/meta-monitor.h"
 
 #include "backends/meta-backend-private.h"
+#include "backends/meta-crtc.h"
+#include "backends/meta-gpu.h"
 #include "backends/meta-monitor-manager-private.h"
 #include "backends/meta-settings-private.h"
+#include "backends/meta-output.h"
+
+#define SCALE_FACTORS_PER_INTEGER 4
+#define MINIMUM_SCALE_FACTOR 1.0f
+#define MAXIMUM_SCALE_FACTOR 4.0f
+#define MINIMUM_LOGICAL_WIDTH 800
+#define MINIMUM_LOGICAL_HEIGHT 600
+#define MAXIMUM_REFRESH_RATE_DIFF 0.001
+
+#define HANDLED_CRTC_MODE_FLAGS (META_CRTC_MODE_FLAG_INTERLACE)
 
 typedef struct _MetaMonitorMode
 {
+  char *id;
   MetaMonitorModeSpec spec;
   MetaMonitorCrtcMode *crtc_modes;
 } MetaMonitorMode;
@@ -42,10 +55,11 @@ typedef struct _MetaMonitorModeTiled
 
 typedef struct _MetaMonitorPrivate
 {
-  MetaMonitorManager *monitor_manager;
+  MetaGpu *gpu;
 
   GList *outputs;
   GList *modes;
+  GHashTable *mode_ids;
 
   MetaMonitorMode *preferred_mode;
   MetaMonitorMode *current_mode;
@@ -166,6 +180,14 @@ meta_monitor_generate_spec (MetaMonitor *monitor)
   priv->spec = monitor_spec;
 }
 
+MetaGpu *
+meta_monitor_get_gpu (MetaMonitor *monitor)
+{
+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
+
+  return priv->gpu;
+}
+
 GList *
 meta_monitor_get_outputs (MetaMonitor *monitor)
 {
@@ -238,6 +260,18 @@ meta_monitor_is_laptop_panel (MetaMonitor *monitor)
     }
 }
 
+gboolean
+meta_monitor_is_same_as (MetaMonitor *monitor,
+                         MetaMonitor *other_monitor)
+{
+  MetaMonitorPrivate *priv =
+    meta_monitor_get_instance_private (monitor);
+  MetaMonitorPrivate *other_priv =
+    meta_monitor_get_instance_private (other_monitor);
+
+  return priv->winsys_id == other_priv->winsys_id;
+}
+
 void
 meta_monitor_get_current_resolution (MetaMonitor *monitor,
                                      int         *width,
@@ -250,11 +284,10 @@ meta_monitor_get_current_resolution (MetaMonitor *monitor,
 }
 
 void
-meta_monitor_derive_dimensions (MetaMonitor   *monitor,
-                                int           *width,
-                                int           *height)
+meta_monitor_derive_layout (MetaMonitor   *monitor,
+                            MetaRectangle *layout)
 {
-  META_MONITOR_GET_CLASS (monitor)->derive_dimensions (monitor, width, height);
+  META_MONITOR_GET_CLASS (monitor)->derive_layout (monitor, layout);
 }
 
 void
@@ -329,14 +362,20 @@ meta_monitor_finalize (GObject *object)
   MetaMonitor *monitor = META_MONITOR (object);
   MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
 
+  g_hash_table_destroy (priv->mode_ids);
   g_list_free_full (priv->modes, (GDestroyNotify) meta_monitor_mode_free);
   g_clear_pointer (&priv->outputs, g_list_free);
   meta_monitor_spec_free (priv->spec);
+
+  G_OBJECT_CLASS (meta_monitor_parent_class)->finalize (object);
 }
 
 static void
 meta_monitor_init (MetaMonitor *monitor)
 {
+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
+
+  priv->mode_ids = g_hash_table_new (g_str_hash, g_str_equal);
 }
 
 static void
@@ -347,6 +386,39 @@ meta_monitor_class_init (MetaMonitorClass *klass)
   object_class->finalize = meta_monitor_finalize;
 }
 
+static char *
+generate_mode_id (MetaMonitorModeSpec *monitor_mode_spec)
+{
+  gboolean is_interlaced;
+  char refresh_rate_str[G_ASCII_DTOSTR_BUF_SIZE];
+
+  is_interlaced = !!(monitor_mode_spec->flags & META_CRTC_MODE_FLAG_INTERLACE);
+  g_ascii_dtostr (refresh_rate_str, G_ASCII_DTOSTR_BUF_SIZE,
+                  monitor_mode_spec->refresh_rate);
+
+  return g_strdup_printf ("%dx%d%s@%s",
+                          monitor_mode_spec->width,
+                          monitor_mode_spec->height,
+                          is_interlaced ? "i" : "",
+                          refresh_rate_str);
+}
+
+static gboolean
+meta_monitor_add_mode (MetaMonitor     *monitor,
+                       MetaMonitorMode *monitor_mode)
+{
+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
+
+  if (g_hash_table_lookup (priv->mode_ids,
+                           meta_monitor_mode_get_id (monitor_mode)))
+    return FALSE;
+
+  priv->modes = g_list_append (priv->modes, monitor_mode);
+  g_hash_table_insert (priv->mode_ids, monitor_mode->id, monitor_mode);
+
+  return TRUE;
+}
+
 static void
 meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)
 {
@@ -366,8 +438,10 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)
       mode->spec = (MetaMonitorModeSpec) {
         .width = crtc_mode->width,
         .height = crtc_mode->height,
-        .refresh_rate = crtc_mode->refresh_rate
+        .refresh_rate = crtc_mode->refresh_rate,
+        .flags = crtc_mode->flags & HANDLED_CRTC_MODE_FLAGS
       },
+      mode->id = generate_mode_id (&mode->spec);
       mode->crtc_modes = g_new (MetaMonitorCrtcMode, 1);
       mode->crtc_modes[0] = (MetaMonitorCrtcMode) {
         .output = output,
@@ -379,13 +453,14 @@ meta_monitor_normal_generate_modes (MetaMonitorNormal *monitor_normal)
       if (output->crtc && crtc_mode == output->crtc->current_mode)
         monitor_priv->current_mode = mode;
 
-      monitor_priv->modes = g_list_append (monitor_priv->modes, mode);
+      if (!meta_monitor_add_mode (monitor, mode))
+        meta_monitor_mode_free (mode);
     }
 }
 
 MetaMonitorNormal *
-meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
-                         MetaOutput         *output)
+meta_monitor_normal_new (MetaGpu    *gpu,
+                         MetaOutput *output)
 {
   MetaMonitorNormal *monitor_normal;
   MetaMonitor *monitor;
@@ -395,7 +470,7 @@ meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
   monitor = META_MONITOR (monitor_normal);
   monitor_priv = meta_monitor_get_instance_private (monitor);
 
-  monitor_priv->monitor_manager = monitor_manager;
+  monitor_priv->gpu = gpu;
 
   monitor_priv->outputs = g_list_append (NULL, output);
   monitor_priv->winsys_id = output->winsys_id;
@@ -416,15 +491,18 @@ meta_monitor_normal_get_main_output (MetaMonitor *monitor)
 }
 
 static void
-meta_monitor_normal_derive_dimensions (MetaMonitor   *monitor,
-                                       int           *width,
-                                       int           *height)
+meta_monitor_normal_derive_layout (MetaMonitor   *monitor,
+                                   MetaRectangle *layout)
 {
   MetaOutput *output;
 
   output = meta_monitor_get_main_output (monitor);
-  *width = output->crtc->rect.width;
-  *height = output->crtc->rect.height;
+  *layout = (MetaRectangle) {
+    .x = output->crtc->rect.x,
+    .y = output->crtc->rect.y,
+    .width = output->crtc->rect.width,
+    .height = output->crtc->rect.height
+  };
 }
 
 static gboolean
@@ -467,7 +545,7 @@ meta_monitor_normal_class_init (MetaMonitorNormalClass *klass)
   MetaMonitorClass *monitor_class = META_MONITOR_CLASS (klass);
 
   monitor_class->get_main_output = meta_monitor_normal_get_main_output;
-  monitor_class->derive_dimensions = meta_monitor_normal_derive_dimensions;
+  monitor_class->derive_layout = meta_monitor_normal_derive_layout;
   monitor_class->calculate_crtc_pos = meta_monitor_normal_calculate_crtc_pos;
   monitor_class->get_suggested_position = meta_monitor_normal_get_suggested_position;
 }
@@ -488,16 +566,18 @@ meta_monitor_get_suggested_position (MetaMonitor *monitor,
 }
 
 static void
-add_tiled_monitor_outputs (MetaMonitorManager *monitor_manager,
-                           MetaMonitorTiled   *monitor_tiled)
+add_tiled_monitor_outputs (MetaGpu          *gpu,
+                           MetaMonitorTiled *monitor_tiled)
 {
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (META_MONITOR (monitor_tiled));
-  unsigned int i;
+  GList *outputs;
+  GList *l;
 
-  for (i = 0; i < monitor_manager->n_outputs; i++)
+  outputs = meta_gpu_get_outputs (gpu);
+  for (l = outputs; l; l = l->next)
     {
-      MetaOutput *output = &monitor_manager->outputs[i];
+      MetaOutput *output = l->data;
 
       if (output->tile_info.group_id != monitor_tiled->tile_group_id)
         continue;
@@ -632,8 +712,8 @@ is_crtc_mode_tiled (MetaOutput   *output,
 }
 
 static MetaCrtcMode *
-find_tiled_crtc_mode (MetaOutput *output,
-                      float       refresh_rate)
+find_tiled_crtc_mode (MetaOutput   *output,
+                      MetaCrtcMode *reference_crtc_mode)
 {
   MetaCrtcMode *crtc_mode;
   unsigned int i;
@@ -649,7 +729,10 @@ find_tiled_crtc_mode (MetaOutput *output,
       if (!is_crtc_mode_tiled (output, crtc_mode))
         continue;
 
-      if (crtc_mode->refresh_rate != refresh_rate)
+      if (crtc_mode->refresh_rate != reference_crtc_mode->refresh_rate)
+        continue;
+
+      if (crtc_mode->flags != reference_crtc_mode->flags)
         continue;
 
       return crtc_mode;
@@ -660,22 +743,30 @@ find_tiled_crtc_mode (MetaOutput *output,
 
 static MetaMonitorMode *
 create_tiled_monitor_mode (MetaMonitorTiled *monitor_tiled,
-                           float             refresh_rate,
+                           MetaCrtcMode     *reference_crtc_mode,
                            gboolean         *out_is_preferred)
 {
   MetaMonitor *monitor = META_MONITOR (monitor_tiled);
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
   MetaMonitorModeTiled *mode;
+  int width, height;
   GList *l;
   unsigned int i;
   gboolean is_preferred = TRUE;
 
   mode = g_new0 (MetaMonitorModeTiled, 1);
   mode->is_tiled = TRUE;
-  meta_monitor_tiled_calculate_tiled_size (monitor,
-                                           &mode->parent.spec.width,
-                                           &mode->parent.spec.height);
+  meta_monitor_tiled_calculate_tiled_size (monitor, &width, &height);
+
+  mode->parent.spec = (MetaMonitorModeSpec) {
+    .width = width,
+    .height = height,
+    .refresh_rate = reference_crtc_mode->refresh_rate,
+    .flags = reference_crtc_mode->flags & HANDLED_CRTC_MODE_FLAGS
+  };
+  mode->parent.id = generate_mode_id (&mode->parent.spec);
+
   mode->parent.crtc_modes = g_new0 (MetaMonitorCrtcMode,
                                     g_list_length (monitor_priv->outputs));
   for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
@@ -683,11 +774,10 @@ create_tiled_monitor_mode (MetaMonitorTiled *monitor_tiled,
       MetaOutput *output = l->data;
       MetaCrtcMode *tiled_crtc_mode;
 
-      tiled_crtc_mode = find_tiled_crtc_mode (output, refresh_rate);
+      tiled_crtc_mode = find_tiled_crtc_mode (output, reference_crtc_mode);
       if (!tiled_crtc_mode)
         {
-          g_warning ("No tiled mode with refresh rate %f on %s",
-                     refresh_rate, output->name);
+          g_warning ("No tiled mode found on %s", output->name);
           meta_monitor_mode_free ((MetaMonitorMode *) mode);
           return NULL;
         }
@@ -697,8 +787,6 @@ create_tiled_monitor_mode (MetaMonitorTiled *monitor_tiled,
         .crtc_mode = tiled_crtc_mode
       };
 
-      mode->parent.spec.refresh_rate = refresh_rate;
-
       is_preferred = is_preferred && tiled_crtc_mode == output->preferred_mode;
     }
 
@@ -716,19 +804,21 @@ generate_tiled_monitor_modes (MetaMonitorTiled *monitor_tiled)
   MetaOutput *main_output;
   GList *tiled_modes = NULL;
   unsigned int i;
+  MetaMonitorMode *best_mode = NULL;
+  GList *l;
 
   main_output = meta_monitor_get_main_output (META_MONITOR (monitor_tiled));
 
   for (i = 0; i < main_output->n_modes; i++)
     {
-      MetaCrtcMode *crtc_mode = main_output->modes[i];
+      MetaCrtcMode *reference_crtc_mode = main_output->modes[i];
       MetaMonitorMode *mode;
       gboolean is_preferred;
 
-      if (!is_crtc_mode_tiled (main_output, crtc_mode))
+      if (!is_crtc_mode_tiled (main_output, reference_crtc_mode))
         continue;
 
-      mode = create_tiled_monitor_mode (monitor_tiled, crtc_mode->refresh_rate,
+      mode = create_tiled_monitor_mode (monitor_tiled, reference_crtc_mode,
                                         &is_preferred);
       if (!mode)
         continue;
@@ -742,24 +832,28 @@ generate_tiled_monitor_modes (MetaMonitorTiled *monitor_tiled)
         monitor_priv->preferred_mode = mode;
     }
 
-  if (!monitor_priv->preferred_mode)
+  while ((l = tiled_modes))
     {
-      MetaMonitorMode *best_mode = NULL;
-      GList *l;
+      MetaMonitorMode *mode = l->data;
 
-      for (l = tiled_modes; l; l = l->next)
+      tiled_modes = g_list_remove_link (tiled_modes, l);
+
+      if (!meta_monitor_add_mode (monitor, mode))
         {
-          MetaMonitorMode *mode = l->data;
+          meta_monitor_mode_free (mode);
+          continue;
+        }
 
+      if (!monitor_priv->preferred_mode)
+        {
           if (!best_mode ||
               mode->spec.refresh_rate > best_mode->spec.refresh_rate)
             best_mode = mode;
         }
-
-      monitor_priv->preferred_mode = best_mode;
     }
 
-  monitor_priv->modes = g_list_concat (monitor_priv->modes, tiled_modes);
+  if (best_mode)
+    monitor_priv->preferred_mode = best_mode;
 }
 
 static MetaMonitorMode *
@@ -783,10 +877,12 @@ create_untiled_monitor_mode (MetaMonitorTiled *monitor_tiled,
   mode->parent.spec = (MetaMonitorModeSpec) {
     .width = crtc_mode->width,
     .height = crtc_mode->height,
-    .refresh_rate = crtc_mode->refresh_rate
+    .refresh_rate = crtc_mode->refresh_rate,
+    .flags = crtc_mode->flags & HANDLED_CRTC_MODE_FLAGS
   };
+  mode->parent.id = generate_mode_id (&mode->parent.spec);
   mode->parent.crtc_modes = g_new0 (MetaMonitorCrtcMode,
-                             g_list_length (monitor_priv->outputs));
+                                    g_list_length (monitor_priv->outputs));
 
   for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
     {
@@ -884,7 +980,11 @@ generate_untiled_monitor_modes (MetaMonitorTiled *monitor_tiled)
       if (!mode)
         continue;
 
-      monitor_priv->modes = g_list_append (monitor_priv->modes, mode);
+      if (!meta_monitor_add_mode (monitor, mode))
+        {
+          meta_monitor_mode_free (mode);
+          continue;
+        }
 
       if (is_monitor_mode_assigned (monitor, mode))
         {
@@ -993,9 +1093,10 @@ meta_monitor_tiled_generate_modes (MetaMonitorTiled *monitor_tiled)
 }
 
 MetaMonitorTiled *
-meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
-                        MetaOutput         *output)
+meta_monitor_tiled_new (MetaGpu    *gpu,
+                        MetaOutput *output)
 {
+  MetaMonitorManager *monitor_manager;
   MetaMonitorTiled *monitor_tiled;
   MetaMonitor *monitor;
   MetaMonitorPrivate *monitor_priv;
@@ -1004,18 +1105,19 @@ meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
   monitor = META_MONITOR (monitor_tiled);
   monitor_priv = meta_monitor_get_instance_private (monitor);
 
-  monitor_priv->monitor_manager = monitor_manager;
+  monitor_priv->gpu = gpu;
 
   monitor_tiled->tile_group_id = output->tile_info.group_id;
   monitor_priv->winsys_id = output->winsys_id;
 
   monitor_tiled->origin_output = output;
-  add_tiled_monitor_outputs (monitor_manager, monitor_tiled);
+  add_tiled_monitor_outputs (gpu, monitor_tiled);
 
   monitor_tiled->main_output = find_untiled_output (monitor_tiled);
 
   meta_monitor_generate_spec (monitor);
 
+  monitor_manager = meta_gpu_get_monitor_manager (gpu);
   meta_monitor_manager_tiled_monitor_added (monitor_manager,
                                             META_MONITOR (monitor_tiled));
 
@@ -1033,9 +1135,8 @@ meta_monitor_tiled_get_main_output (MetaMonitor *monitor)
 }
 
 static void
-meta_monitor_tiled_derive_dimensions (MetaMonitor   *monitor,
-                                      int           *out_width,
-                                      int           *out_height)
+meta_monitor_derived_derive_layout (MetaMonitor   *monitor,
+                                    MetaRectangle *layout)
 {
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
@@ -1059,8 +1160,12 @@ meta_monitor_tiled_derive_dimensions (MetaMonitor   *monitor,
       max_y = MAX (output->crtc->rect.y + output->crtc->rect.height, max_y);
     }
 
-  *out_width = max_x - min_x;
-  *out_height = max_y - min_y;
+  *layout = (MetaRectangle) {
+    .x = min_x,
+    .y = min_y,
+    .width = max_x - min_x,
+    .height = max_y - min_y
+  };
 }
 
 static gboolean
@@ -1099,9 +1204,13 @@ meta_monitor_tiled_finalize (GObject *object)
   MetaMonitor *monitor = META_MONITOR (object);
   MetaMonitorPrivate *monitor_priv =
     meta_monitor_get_instance_private (monitor);
+  MetaMonitorManager *monitor_manager;
 
-  meta_monitor_manager_tiled_monitor_removed (monitor_priv->monitor_manager,
+  monitor_manager = meta_gpu_get_monitor_manager (monitor_priv->gpu);
+  meta_monitor_manager_tiled_monitor_removed (monitor_manager,
                                               monitor);
+
+  G_OBJECT_CLASS (meta_monitor_tiled_parent_class)->finalize (object);
 }
 
 static void
@@ -1118,7 +1227,7 @@ meta_monitor_tiled_class_init (MetaMonitorTiledClass *klass)
   object_class->finalize = meta_monitor_tiled_finalize;
 
   monitor_class->get_main_output = meta_monitor_tiled_get_main_output;
-  monitor_class->derive_dimensions = meta_monitor_tiled_derive_dimensions;
+  monitor_class->derive_layout = meta_monitor_derived_derive_layout;
   monitor_class->calculate_crtc_pos = meta_monitor_tiled_calculate_crtc_pos;
   monitor_class->get_suggested_position = meta_monitor_tiled_get_suggested_position;
 }
@@ -1126,6 +1235,7 @@ meta_monitor_tiled_class_init (MetaMonitorTiledClass *klass)
 static void
 meta_monitor_mode_free (MetaMonitorMode *monitor_mode)
 {
+  g_free (monitor_mode->id);
   g_free (monitor_mode->crtc_modes);
   g_free (monitor_mode);
 }
@@ -1149,14 +1259,24 @@ meta_monitor_get_logical_monitor (MetaMonitor *monitor)
     return NULL;
 }
 
+MetaMonitorMode *
+meta_monitor_get_mode_from_id (MetaMonitor *monitor,
+                               const char  *monitor_mode_id)
+{
+  MetaMonitorPrivate *priv = meta_monitor_get_instance_private (monitor);
+
+  return g_hash_table_lookup (priv->mode_ids, monitor_mode_id);
+}
+
 static gboolean
 meta_monitor_mode_spec_equals (MetaMonitorModeSpec *monitor_mode_spec,
                                MetaMonitorModeSpec *other_monitor_mode_spec)
 {
   return (monitor_mode_spec->width == other_monitor_mode_spec->width &&
           monitor_mode_spec->height == other_monitor_mode_spec->height &&
-          (monitor_mode_spec->refresh_rate ==
-           other_monitor_mode_spec->refresh_rate));
+          ABS (monitor_mode_spec->refresh_rate -
+               other_monitor_mode_spec->refresh_rate) < MAXIMUM_REFRESH_RATE_DIFF &&
+          monitor_mode_spec->flags == other_monitor_mode_spec->flags);
 }
 
 MetaMonitorMode *
@@ -1261,7 +1381,7 @@ meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
 /* From http://en.wikipedia.org/wiki/4K_resolution#Resolutions_of_common_formats */
 #define SMALLEST_4K_WIDTH 3656
 
-static int
+static float
 calculate_scale (MetaMonitor     *monitor,
                  MetaMonitorMode *monitor_mode)
 {
@@ -1269,7 +1389,7 @@ calculate_scale (MetaMonitor     *monitor,
   int width_mm, height_mm;
   int scale;
 
-  scale = 1;
+  scale = 1.0;
 
   meta_monitor_mode_get_resolution (monitor_mode,
                                     &resolution_width,
@@ -1314,14 +1434,14 @@ calculate_scale (MetaMonitor     *monitor,
        * pick higher ratio than 2 automatically.
        */
       if (dpi_x > HIDPI_LIMIT && dpi_y > HIDPI_LIMIT)
-        scale = 2;
+        scale = 2.0;
     }
 
 out:
   return scale;
 }
 
-int
+float
 meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
                                    MetaMonitorMode *monitor_mode)
 {
@@ -1336,12 +1456,141 @@ meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
   return calculate_scale (monitor, monitor_mode);
 }
 
+static float
+get_closest_scale_factor_for_resolution (float width,
+                                         float height,
+                                         float scale,
+                                         float scale_step)
+{
+  unsigned int i, j;
+  float scaled_h;
+  float scaled_w;
+  float best_scale;
+  int base_scaled_w;
+  gboolean limit_exceeded;
+  gboolean found_one;
+
+  best_scale = 0;
+  scaled_w = width / scale;
+  scaled_h = height / scale;
+
+  if (scale < MINIMUM_SCALE_FACTOR ||
+      scale > MAXIMUM_SCALE_FACTOR ||
+      floorf (scaled_w) < MINIMUM_LOGICAL_WIDTH ||
+      floorf (scaled_h) < MINIMUM_LOGICAL_HEIGHT)
+    goto out;
+
+  if (floorf (scaled_w) == scaled_w && floorf (scaled_h) == scaled_h)
+    return scale;
+
+  i = 0;
+  found_one = FALSE;
+  limit_exceeded = FALSE;
+  base_scaled_w = floorf (scaled_w);
+
+  do
+    {
+
+      for (j = 0; j < 2; j++)
+        {
+          float current_scale;
+          int offset = i * (j ? 1 : -1);
+
+          scaled_w = base_scaled_w + offset;
+          current_scale = width / scaled_w;
+          scaled_h = height / current_scale;
+
+          if (current_scale >= scale + scale_step ||
+              current_scale <= scale - scale_step ||
+              current_scale < MINIMUM_SCALE_FACTOR ||
+              current_scale > MAXIMUM_SCALE_FACTOR)
+            {
+              limit_exceeded = TRUE;
+              continue;
+            }
+
+          if (floorf (scaled_h) == scaled_h)
+            {
+              found_one = TRUE;
+
+              if (fabsf (current_scale - scale) < fabsf (best_scale - scale))
+                best_scale = current_scale;
+            }
+        }
+
+      i++;
+    }
+  while (!found_one && !limit_exceeded);
+
+out:
+  return best_scale;
+}
+
+float *
+meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
+                                         MetaMonitorMode            *monitor_mode,
+                                         MetaMonitorScalesConstraint constraints,
+                                         int                        *n_supported_scales)
+{
+  unsigned int i, j;
+  int width, height;
+  float scale_steps;
+  GArray *supported_scales;
+
+  scale_steps = 1.0 / (float) SCALE_FACTORS_PER_INTEGER;
+  supported_scales = g_array_new (FALSE, FALSE, sizeof (float));
+
+  meta_monitor_mode_get_resolution (monitor_mode, &width, &height);
+
+  for (i = floorf (MINIMUM_SCALE_FACTOR);
+       i <= ceilf (MAXIMUM_SCALE_FACTOR);
+       i++)
+    {
+      for (j = 0; j < SCALE_FACTORS_PER_INTEGER; j++)
+        {
+          float scale;
+          float scale_value = i + j * scale_steps;
+
+          if ((constraints & META_MONITOR_SCALES_CONSTRAINT_NO_FRAC) &&
+              fmodf (scale_value, 1.0) != 0.0)
+            {
+              continue;
+            }
+
+          scale = get_closest_scale_factor_for_resolution (width,
+                                                           height,
+                                                           scale_value,
+                                                           scale_steps);
+
+          if (scale > 0.0f)
+            g_array_append_val (supported_scales, scale);
+        }
+    }
+
+  if (supported_scales->len == 0)
+    {
+      float fallback_scale;
+
+      fallback_scale = 1.0;
+      g_array_append_val (supported_scales, fallback_scale);
+    }
+
+  *n_supported_scales = supported_scales->len;
+  return (float *) g_array_free (supported_scales, FALSE);
+}
+
 MetaMonitorModeSpec *
 meta_monitor_mode_get_spec (MetaMonitorMode *monitor_mode)
 {
   return &monitor_mode->spec;
 }
 
+const char *
+meta_monitor_mode_get_id (MetaMonitorMode *monitor_mode)
+{
+  return monitor_mode->id;
+}
+
 void
 meta_monitor_mode_get_resolution (MetaMonitorMode *monitor_mode,
                                   int             *width,
@@ -1357,6 +1606,12 @@ meta_monitor_mode_get_refresh_rate (MetaMonitorMode *monitor_mode)
   return monitor_mode->spec.refresh_rate;
 }
 
+MetaCrtcModeFlag
+meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode)
+{
+  return monitor_mode->spec.flags;
+}
+
 gboolean
 meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
                                 MetaMonitorMode    *mode,
@@ -1369,6 +1624,32 @@ meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
   GList *l;
   int i;
 
+  for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
+    {
+      MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];
+
+      if (!monitor_crtc_mode->crtc_mode)
+        continue;
+
+      if (!func (monitor, mode, monitor_crtc_mode, user_data, error))
+        return FALSE;
+    }
+
+  return TRUE;
+}
+
+gboolean
+meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
+                                  MetaMonitorMode    *mode,
+                                  MetaMonitorModeFunc func,
+                                  gpointer            user_data,
+                                  GError            **error)
+{
+  MetaMonitorPrivate *monitor_priv =
+    meta_monitor_get_instance_private (monitor);
+  GList *l;
+  int i;
+
   for (l = monitor_priv->outputs, i = 0; l; l = l->next, i++)
     {
       MetaMonitorCrtcMode *monitor_crtc_mode = &mode->crtc_modes[i];

src/backends/meta-monitor.h

@@ -24,7 +24,9 @@
 
 #include <glib-object.h>
 
+#include "backends/meta-crtc.h"
 #include "backends/meta-monitor-manager-private.h"
+#include "backends/meta-output.h"
 
 typedef struct _MetaMonitorSpec
 {
@@ -39,6 +41,7 @@ typedef struct _MetaMonitorModeSpec
   int width;
   int height;
   float refresh_rate;
+  MetaCrtcModeFlag flags;
 } MetaMonitorModeSpec;
 
 typedef struct _MetaMonitorCrtcMode
@@ -53,6 +56,12 @@ typedef gboolean (* MetaMonitorModeFunc) (MetaMonitor         *monitor,
                                           gpointer             user_data,
                                           GError             **error);
 
+typedef enum _MetaMonitorScalesConstraint
+{
+  META_MONITOR_SCALES_CONSTRAINT_NONE = 0,
+  META_MONITOR_SCALES_CONSTRAINT_NO_FRAC = (1 << 0),
+} MetaMonitorScalesConstraint;
+
 #define META_TYPE_MONITOR (meta_monitor_get_type ())
 G_DECLARE_DERIVABLE_TYPE (MetaMonitor, meta_monitor, META, MONITOR, GObject)
 
@@ -61,9 +70,8 @@ struct _MetaMonitorClass
   GObjectClass parent_class;
 
   MetaOutput * (* get_main_output) (MetaMonitor *monitor);
-  void (* derive_dimensions) (MetaMonitor   *monitor,
-                              int           *width,
-                              int           *height);
+  void (* derive_layout) (MetaMonitor   *monitor,
+                          MetaRectangle *layout);
   void (* calculate_crtc_pos) (MetaMonitor         *monitor,
                                MetaMonitorMode     *monitor_mode,
                                MetaOutput          *output,
@@ -85,14 +93,16 @@ G_DECLARE_FINAL_TYPE (MetaMonitorTiled, meta_monitor_tiled,
                       META, MONITOR_TILED,
                       MetaMonitor)
 
-MetaMonitorTiled * meta_monitor_tiled_new (MetaMonitorManager *monitor_manager,
-                                           MetaOutput         *main_output);
+MetaMonitorTiled * meta_monitor_tiled_new (MetaGpu    *gpu,
+                                           MetaOutput *output);
 
-MetaMonitorNormal * meta_monitor_normal_new (MetaMonitorManager *monitor_manager,
-                                             MetaOutput         *output);
+MetaMonitorNormal * meta_monitor_normal_new (MetaGpu    *gpu,
+                                             MetaOutput *output);
 
 MetaMonitorSpec * meta_monitor_get_spec (MetaMonitor *monitor);
 
+MetaGpu * meta_monitor_get_gpu (MetaMonitor *monitor);
+
 gboolean meta_monitor_is_active (MetaMonitor *monitor);
 
 MetaOutput * meta_monitor_get_main_output (MetaMonitor *monitor);
@@ -105,15 +115,17 @@ gboolean meta_monitor_is_underscanning (MetaMonitor *monitor);
 
 gboolean meta_monitor_is_laptop_panel (MetaMonitor *monitor);
 
+gboolean meta_monitor_is_same_as (MetaMonitor *monitor,
+                                  MetaMonitor *other_monitor);
+
 GList * meta_monitor_get_outputs (MetaMonitor *monitor);
 
 void meta_monitor_get_current_resolution (MetaMonitor *monitor,
                                           int           *width,
                                           int           *height);
 
-void meta_monitor_derive_dimensions (MetaMonitor   *monitor,
-                                     int           *width,
-                                     int           *height);
+void meta_monitor_derive_layout (MetaMonitor   *monitor,
+                                 MetaRectangle *layout);
 
 void meta_monitor_get_physical_dimensions (MetaMonitor *monitor,
                                            int         *width_mm,
@@ -139,6 +151,9 @@ gboolean meta_monitor_get_suggested_position (MetaMonitor *monitor,
 
 MetaLogicalMonitor * meta_monitor_get_logical_monitor (MetaMonitor *monitor);
 
+MetaMonitorMode * meta_monitor_get_mode_from_id (MetaMonitor *monitor,
+                                                 const char  *monitor_mode_id);
+
 MetaMonitorMode * meta_monitor_get_mode_from_spec (MetaMonitor         *monitor,
                                                    MetaMonitorModeSpec *monitor_mode_spec);
 
@@ -160,8 +175,15 @@ void meta_monitor_calculate_crtc_pos (MetaMonitor         *monitor,
                                       int                 *out_x,
                                       int                 *out_y);
 
-int meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
-                                       MetaMonitorMode *monitor_mode);
+float meta_monitor_calculate_mode_scale (MetaMonitor     *monitor,
+                                         MetaMonitorMode *monitor_mode);
+
+float * meta_monitor_calculate_supported_scales (MetaMonitor                *monitor,
+                                                 MetaMonitorMode            *monitor_mode,
+                                                 MetaMonitorScalesConstraint constraints,
+                                                 int                        *n_supported_scales);
+
+const char * meta_monitor_mode_get_id (MetaMonitorMode *monitor_mode);
 
 MetaMonitorModeSpec * meta_monitor_mode_get_spec (MetaMonitorMode *monitor_mode);
 
@@ -171,12 +193,20 @@ void meta_monitor_mode_get_resolution (MetaMonitorMode *monitor_mode,
 
 float meta_monitor_mode_get_refresh_rate (MetaMonitorMode *monitor_mode);
 
+MetaCrtcModeFlag meta_monitor_mode_get_flags (MetaMonitorMode *monitor_mode);
+
 gboolean meta_monitor_mode_foreach_crtc (MetaMonitor        *monitor,
                                          MetaMonitorMode    *mode,
                                          MetaMonitorModeFunc func,
                                          gpointer            user_data,
                                          GError            **error);
 
+gboolean meta_monitor_mode_foreach_output (MetaMonitor        *monitor,
+                                           MetaMonitorMode    *mode,
+                                           MetaMonitorModeFunc func,
+                                           gpointer            user_data,
+                                           GError            **error);
+
 MetaMonitorSpec * meta_monitor_spec_clone (MetaMonitorSpec *monitor_id);
 
 gboolean meta_monitor_spec_equals (MetaMonitorSpec *monitor_id,

src/backends/meta-orientation-manager.c

@@ -0,0 +1,280 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * 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 "config.h"
+
+#include <gio/gio.h>
+
+#include "backends/meta-orientation-manager.h"
+
+enum
+{
+  ORIENTATION_CHANGED,
+
+  N_SIGNALS
+};
+
+static guint signals[N_SIGNALS];
+
+struct _MetaOrientationManager
+{
+  GObject parent_instance;
+
+  GCancellable *cancellable;
+
+  guint iio_watch_id;
+  GDBusProxy *iio_proxy;
+  MetaOrientation prev_orientation;
+  MetaOrientation curr_orientation;
+
+  GSettings *settings;
+};
+
+G_DEFINE_TYPE (MetaOrientationManager, meta_orientation_manager, G_TYPE_OBJECT)
+
+#define CONF_SCHEMA "org.gnome.settings-daemon.peripherals.touchscreen"
+#define ORIENTATION_LOCK_KEY "orientation-lock"
+
+static MetaOrientation
+orientation_from_string (const char *orientation)
+{
+  if (g_strcmp0 (orientation, "normal") == 0)
+    return META_ORIENTATION_NORMAL;
+  if (g_strcmp0 (orientation, "bottom-up") == 0)
+    return META_ORIENTATION_BOTTOM_UP;
+  if (g_strcmp0 (orientation, "left-up") == 0)
+    return META_ORIENTATION_LEFT_UP;
+  if (g_strcmp0 (orientation, "right-up") == 0)
+    return META_ORIENTATION_RIGHT_UP;
+
+  return META_ORIENTATION_UNDEFINED;
+}
+
+static void
+read_iio_proxy (MetaOrientationManager *self)
+{
+  gboolean has_accel = FALSE;
+  GVariant *v;
+
+  self->curr_orientation = META_ORIENTATION_UNDEFINED;
+
+  if (!self->iio_proxy)
+    return;
+
+  v = g_dbus_proxy_get_cached_property (self->iio_proxy, "HasAccelerometer");
+  if (v)
+    {
+      has_accel = g_variant_get_boolean (v);
+      g_variant_unref (v);
+    }
+
+  if (has_accel)
+    {
+      v = g_dbus_proxy_get_cached_property (self->iio_proxy, "AccelerometerOrientation");
+      if (v)
+        {
+          self->curr_orientation = orientation_from_string (g_variant_get_string (v, NULL));
+          g_variant_unref (v);
+        }
+    }
+}
+
+static void
+sync_state (MetaOrientationManager *self)
+{
+  read_iio_proxy (self);
+
+  if (self->prev_orientation == self->curr_orientation)
+    return;
+
+  self->prev_orientation = self->curr_orientation;
+
+  if (self->curr_orientation == META_ORIENTATION_UNDEFINED)
+    return;
+
+  if (g_settings_get_boolean (self->settings, ORIENTATION_LOCK_KEY))
+    return;
+
+  g_signal_emit (self, signals[ORIENTATION_CHANGED], 0);
+}
+
+static void
+orientation_lock_changed (GSettings *settings,
+                          gchar     *key,
+                          gpointer   user_data)
+{
+  MetaOrientationManager *self = user_data;
+  sync_state (self);
+}
+
+static void
+iio_properties_changed (GDBusProxy *proxy,
+                        GVariant   *changed_properties,
+                        GStrv       invalidated_properties,
+                        gpointer    user_data)
+{
+  MetaOrientationManager *self = user_data;
+  sync_state (self);
+}
+
+static void
+accelerometer_claimed (GObject      *source,
+                       GAsyncResult *res,
+                       gpointer      user_data)
+{
+  MetaOrientationManager *self = user_data;
+  GVariant *v;
+  GError *error = NULL;
+
+  v = g_dbus_proxy_call_finish (G_DBUS_PROXY (source), res, &error);
+  if (!v)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Failed to claim accelerometer: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  g_variant_unref (v);
+
+  sync_state (self);
+}
+
+static void
+iio_proxy_ready (GObject      *source,
+                 GAsyncResult *res,
+                 gpointer      user_data)
+{
+  MetaOrientationManager *self = user_data;
+  GDBusProxy *proxy;
+  GError *error = NULL;
+
+  proxy = g_dbus_proxy_new_finish (res, &error);
+  if (!proxy)
+    {
+      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+        g_warning ("Failed to obtain IIO DBus proxy: %s", error->message);
+      g_error_free (error);
+      return;
+    }
+
+  self->iio_proxy = proxy;
+  g_signal_connect_object (self->iio_proxy, "g-properties-changed",
+                           G_CALLBACK (iio_properties_changed), self, 0);
+  g_dbus_proxy_call (self->iio_proxy,
+                     "ClaimAccelerometer",
+                     NULL,
+                     G_DBUS_CALL_FLAGS_NONE,
+                     -1,
+                     self->cancellable,
+                     accelerometer_claimed,
+                     self);
+}
+
+static void
+iio_sensor_appeared_cb (GDBusConnection *connection,
+                        const gchar     *name,
+                        const gchar     *name_owner,
+                        gpointer         user_data)
+{
+  MetaOrientationManager *self = user_data;
+
+  self->cancellable = g_cancellable_new ();
+  g_dbus_proxy_new (connection,
+                    G_DBUS_PROXY_FLAGS_NONE,
+                    NULL,
+                    "net.hadess.SensorProxy",
+                    "/net/hadess/SensorProxy",
+                    "net.hadess.SensorProxy",
+                    self->cancellable,
+                    iio_proxy_ready,
+                    self);
+}
+
+static void
+iio_sensor_vanished_cb (GDBusConnection *connection,
+                        const gchar     *name,
+                        gpointer         user_data)
+{
+  MetaOrientationManager *self = user_data;
+
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
+
+  g_clear_object (&self->iio_proxy);
+
+  sync_state (self);
+}
+
+static void
+meta_orientation_manager_init (MetaOrientationManager *self)
+{
+  self->iio_watch_id = g_bus_watch_name (G_BUS_TYPE_SYSTEM,
+                                         "net.hadess.SensorProxy",
+                                         G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                         iio_sensor_appeared_cb,
+                                         iio_sensor_vanished_cb,
+                                         self,
+                                         NULL);
+
+  self->settings = g_settings_new (CONF_SCHEMA);
+  g_signal_connect_object (self->settings, "changed::"ORIENTATION_LOCK_KEY,
+                           G_CALLBACK (orientation_lock_changed), self, 0);
+  sync_state (self);
+}
+
+static void
+meta_orientation_manager_finalize (GObject *object)
+{
+  MetaOrientationManager *self = META_ORIENTATION_MANAGER (object);
+
+  g_cancellable_cancel (self->cancellable);
+  g_clear_object (&self->cancellable);
+
+  g_bus_unwatch_name (self->iio_watch_id);
+  g_clear_object (&self->iio_proxy);
+
+  g_clear_object (&self->settings);
+
+  G_OBJECT_CLASS (meta_orientation_manager_parent_class)->finalize (object);
+}
+
+static void
+meta_orientation_manager_class_init (MetaOrientationManagerClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+
+  gobject_class->finalize = meta_orientation_manager_finalize;
+
+  signals[ORIENTATION_CHANGED] =
+    g_signal_new ("orientation-changed",
+                  G_TYPE_FROM_CLASS (gobject_class),
+                  G_SIGNAL_RUN_LAST,
+                  0,
+                  NULL, NULL, NULL,
+                  G_TYPE_NONE, 0);
+}
+
+MetaOrientation
+meta_orientation_manager_get_orientation (MetaOrientationManager *self)
+{
+  return self->curr_orientation;
+}