backends/native: Expose all transform modes in CRTCs

We can only honor this properly in the MUTTER_STAGE_VIEWS=1 case. When using
the legacy view, software implemented transforms are only exposed if there is
only one output, as we can only transform the entire stage there.

https://bugzilla.gnome.org/show_bug.cgi?id=745079

.gitignore

@@ -83,6 +83,8 @@ src/relative-pointer-unstable-v*-protocol.c
 src/relative-pointer-unstable-v*-server-protocol.h
 src/pointer-constraints-unstable-v*-protocol.c
 src/pointer-constraints-unstable-v*-server-protocol.h
+src/xdg-foreign-unstable-v*-protocol.c
+src/xdg-foreign-unstable-v*-server-protocol.h
 src/meta/meta-version.h
 doc/reference/*.args
 doc/reference/*.bak

clutter/clutter/clutter-stage-view.c

@@ -27,6 +27,7 @@ enum
 
   PROP_LAYOUT,
   PROP_FRAMEBUFFER,
+  PROP_OFFSCREEN,
 
   PROP_LAST
 };
@@ -37,6 +38,10 @@ typedef struct _ClutterStageViewPrivate
 {
   cairo_rectangle_int_t layout;
   CoglFramebuffer *framebuffer;
+
+  CoglOffscreen *offscreen;
+  CoglPipeline *pipeline;
+
   guint dirty_viewport   : 1;
   guint dirty_projection : 1;
 } ClutterStageViewPrivate;
@@ -59,9 +64,123 @@ clutter_stage_view_get_framebuffer (ClutterStageView *view)
   ClutterStageViewPrivate *priv =
     clutter_stage_view_get_instance_private (view);
 
+  if (priv->offscreen)
+    return priv->offscreen;
+  else
     return priv->framebuffer;
 }
 
+CoglFramebuffer *
+clutter_stage_view_get_onscreen (ClutterStageView *view)
+{
+  ClutterStageViewPrivate *priv =
+    clutter_stage_view_get_instance_private (view);
+
+  return priv->framebuffer;
+}
+
+static void
+clutter_stage_view_ensure_offscreen_blit_pipeline (ClutterStageView *view)
+{
+  ClutterStageViewPrivate *priv =
+    clutter_stage_view_get_instance_private (view);
+  ClutterStageViewClass *view_class =
+    CLUTTER_STAGE_VIEW_GET_CLASS (view);
+
+  g_assert (priv->offscreen != NULL);
+
+  if (priv->pipeline)
+    return;
+
+  priv->pipeline =
+    cogl_pipeline_new (cogl_framebuffer_get_context (priv->offscreen));
+  cogl_pipeline_set_layer_filters (priv->pipeline, 0,
+                                   COGL_PIPELINE_FILTER_NEAREST,
+                                   COGL_PIPELINE_FILTER_NEAREST);
+  cogl_pipeline_set_layer_texture (priv->pipeline, 0,
+                                   cogl_offscreen_get_texture (priv->offscreen));
+  cogl_pipeline_set_layer_wrap_mode (priv->pipeline, 0,
+                                     COGL_PIPELINE_WRAP_MODE_CLAMP_TO_EDGE);
+
+  if (view_class->setup_offscreen_blit_pipeline)
+    view_class->setup_offscreen_blit_pipeline (view, priv->pipeline);
+}
+
+void
+clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view)
+{
+  ClutterStageViewPrivate *priv =
+    clutter_stage_view_get_instance_private (view);
+
+  g_clear_pointer (&priv->pipeline, cogl_object_unref);
+}
+
+static void
+transform_rect_to_onscreen (ClutterStageView        *view,
+                            const cairo_rectangle_t *rect,
+                            cairo_rectangle_t       *rect_out)
+{
+  float x1, y1, x2, y2;
+
+  x1 = rect->x;
+  y1 = rect->y;
+  clutter_stage_view_transform_to_onscreen (view, &x1, &y1);
+
+  x2 = rect->x + rect->width;
+  y2 = rect->y + rect->height;
+  clutter_stage_view_transform_to_onscreen (view, &x2, &y2);
+
+  *rect_out = (cairo_rectangle_t) {
+    .x = MIN (x1, x2),
+    .y = MIN (y1, y2),
+    .width = ABS (x2 - x1),
+    .height = ABS (y2 - y1)
+  };
+}
+
+void
+clutter_stage_view_blit_offscreen (ClutterStageView            *view,
+                                   const cairo_rectangle_int_t *rect)
+{
+  ClutterStageViewPrivate *priv =
+    clutter_stage_view_get_instance_private (view);
+  cairo_rectangle_t texture_rect, onscreen_rect;
+  CoglMatrix matrix;
+
+  clutter_stage_view_ensure_offscreen_blit_pipeline (view);
+  cogl_framebuffer_push_matrix (priv->framebuffer);
+
+  /* Set transform so 0,0 is on the top left corner and 1,1 on
+   * the bottom right corner.
+   */
+  cogl_matrix_init_identity (&matrix);
+  cogl_matrix_translate (&matrix, -1, 1, 0);
+  cogl_matrix_scale (&matrix, 2, -2, 0);
+  cogl_framebuffer_set_projection_matrix (priv->framebuffer, &matrix);
+
+  texture_rect = (cairo_rectangle_t) {
+    .x = (double) rect->x / cogl_framebuffer_get_width (priv->offscreen),
+    .y = (double) rect->y / cogl_framebuffer_get_height (priv->offscreen),
+    .width = (double) rect->width / cogl_framebuffer_get_width (priv->offscreen),
+    .height = (double) rect->height / cogl_framebuffer_get_height (priv->offscreen)
+  };
+
+  transform_rect_to_onscreen (view, &texture_rect, &onscreen_rect);
+
+  cogl_framebuffer_draw_textured_rectangle (priv->framebuffer,
+                                            priv->pipeline,
+                                            onscreen_rect.x,
+                                            onscreen_rect.y,
+                                            onscreen_rect.x + onscreen_rect.width,
+                                            onscreen_rect.y + onscreen_rect.height,
+                                            texture_rect.x,
+                                            texture_rect.y,
+                                            texture_rect.x + texture_rect.width,
+                                            texture_rect.y + texture_rect.height);
+
+  cogl_framebuffer_pop_matrix (priv->framebuffer);
+}
+
 gboolean
 clutter_stage_view_is_dirty_viewport (ClutterStageView *view)
 {
@@ -100,6 +219,27 @@ clutter_stage_view_set_dirty_projection (ClutterStageView *view,
   priv->dirty_projection = dirty;
 }
 
+void
+clutter_stage_view_transform_to_onscreen (ClutterStageView *view,
+                                          gfloat           *x,
+                                          gfloat           *y)
+{
+  ClutterStageViewClass *view_class = CLUTTER_STAGE_VIEW_GET_CLASS (view);
+  gfloat z = 0, w = 1;
+  CoglMatrix matrix;
+
+  view_class->get_offscreen_transformation_matrix (view, &matrix);
+  cogl_matrix_get_inverse (&matrix, &matrix);
+  cogl_matrix_transform_point (&matrix, x, y, &z, &w);
+}
+
+static void
+clutter_stage_default_get_offscreen_transformation_matrix (ClutterStageView *view,
+                                                           CoglMatrix       *matrix)
+{
+  cogl_matrix_init_identity (matrix);
+}
+
 static void
 clutter_stage_view_get_property (GObject    *object,
                                  guint       prop_id,
@@ -118,6 +258,11 @@ clutter_stage_view_get_property (GObject    *object,
     case PROP_FRAMEBUFFER:
       g_value_set_boxed (value, priv->framebuffer);
       break;
+    case PROP_OFFSCREEN:
+      g_value_set_boxed (value, priv->offscreen);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
@@ -141,6 +286,11 @@ clutter_stage_view_set_property (GObject      *object,
     case PROP_FRAMEBUFFER:
       priv->framebuffer = g_value_dup_boxed (value);
       break;
+    case PROP_OFFSCREEN:
+      priv->offscreen = g_value_dup_boxed (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     }
 }
 
@@ -152,6 +302,10 @@ clutter_stage_view_dispose (GObject *object)
     clutter_stage_view_get_instance_private (view);
 
   g_clear_pointer (&priv->framebuffer, cogl_object_unref);
+  g_clear_pointer (&priv->offscreen, cogl_object_unref);
+  g_clear_pointer (&priv->pipeline, cogl_object_unref);
+
+  G_OBJECT_CLASS (clutter_stage_view_parent_class)->dispose (object);
 }
 
 static void
@@ -169,6 +323,9 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
+  klass->get_offscreen_transformation_matrix =
+    clutter_stage_default_get_offscreen_transformation_matrix;
+
   object_class->get_property = clutter_stage_view_get_property;
   object_class->set_property = clutter_stage_view_set_property;
   object_class->dispose = clutter_stage_view_dispose;
@@ -184,10 +341,19 @@ clutter_stage_view_class_init (ClutterStageViewClass *klass)
   obj_props[PROP_FRAMEBUFFER] =
     g_param_spec_boxed ("framebuffer",
                         "View framebuffer",
-                        "The framebuffer of the view",
+                        "The front buffer of the view",
                         COGL_TYPE_HANDLE,
                         G_PARAM_READWRITE |
                         G_PARAM_STATIC_STRINGS);
 
+  obj_props[PROP_OFFSCREEN] =
+    g_param_spec_boxed ("offscreen",
+                        "Offscreen buffer",
+                        "Framebuffer used as intermediate buffer",
+                        COGL_TYPE_HANDLE,
+                        G_PARAM_READWRITE |
+			G_PARAM_CONSTRUCT_ONLY |
+                        G_PARAM_STATIC_STRINGS);
+
   g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }

clutter/clutter/clutter-stage-view.h

@@ -33,6 +33,12 @@ G_DECLARE_DERIVABLE_TYPE (ClutterStageView, clutter_stage_view,
 struct _ClutterStageViewClass
 {
   GObjectClass parent_class;
+
+  void (* setup_offscreen_blit_pipeline) (ClutterStageView *view,
+                                          CoglPipeline     *pipeline);
+
+  void (* get_offscreen_transformation_matrix) (ClutterStageView *view,
+                                                CoglMatrix       *matrix);
 };
 
 CLUTTER_AVAILABLE_IN_MUTTER
@@ -41,6 +47,18 @@ void clutter_stage_view_get_layout (ClutterStageView      *view,
 
 CLUTTER_AVAILABLE_IN_MUTTER
 CoglFramebuffer *clutter_stage_view_get_framebuffer (ClutterStageView *view);
+CLUTTER_AVAILABLE_IN_MUTTER
+CoglFramebuffer *clutter_stage_view_get_onscreen (ClutterStageView *view);
+CLUTTER_AVAILABLE_IN_MUTTER
+void             clutter_stage_view_invalidate_offscreen_blit_pipeline (ClutterStageView *view);
+
+CLUTTER_AVAILABLE_IN_MUTTER
+void             clutter_stage_view_transform_to_onscreen (ClutterStageView *view,
+                                                           gfloat           *x,
+                                                           gfloat           *y);
+
+void clutter_stage_view_blit_offscreen (ClutterStageView            *view,
+					const cairo_rectangle_int_t *clip);
 
 gboolean clutter_stage_view_is_dirty_viewport (ClutterStageView *view);
 

clutter/clutter/clutter-stage.c

@@ -676,6 +676,12 @@ clutter_stage_do_paint_view (ClutterStage                *stage,
   _clutter_stage_paint_volume_stack_free_all (stage);
   _clutter_stage_update_active_framebuffer (stage, framebuffer);
   clutter_actor_paint (CLUTTER_ACTOR (stage));
+
+  if (clutter_stage_view_get_onscreen (view) !=
+      clutter_stage_view_get_framebuffer (view))
+    {
+      clutter_stage_view_blit_offscreen (view, clip);
+    }
 }
 
 /* This provides a common point of entry for painting the scenegraph

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

@@ -37,6 +37,7 @@
 #include "clutter-stage-cogl.h"
 
 #include <stdlib.h>
+#include <math.h>
 
 #include "clutter-actor-private.h"
 #include "clutter-backend-private.h"
@@ -357,7 +358,7 @@ swap_framebuffer (ClutterStageWindow    *stage_window,
                   cairo_rectangle_int_t *swap_region,
                   gboolean               swap_with_damage)
 {
-  CoglFramebuffer *framebuffer = clutter_stage_view_get_framebuffer (view);
+  CoglFramebuffer *framebuffer = clutter_stage_view_get_onscreen (view);
   int damage[4], ndamage;
 
   damage[0] = swap_region->x;
@@ -438,6 +439,42 @@ fill_current_damage_history_and_step (ClutterStageView *view)
   view_priv->damage_index++;
 }
 
+static void
+transform_swap_region_to_onscreen (ClutterStageView      *view,
+                                   cairo_rectangle_int_t *swap_region)
+{
+  CoglFramebuffer *framebuffer;
+  cairo_rectangle_int_t layout;
+  gfloat x1, y1, x2, y2;
+  gint width, height;
+
+  framebuffer = clutter_stage_view_get_onscreen (view);
+  clutter_stage_view_get_layout (view, &layout);
+
+  x1 = (float) swap_region->x / layout.width;
+  y1 = (float) swap_region->y / layout.height;
+  x2 = (float) (swap_region->x + swap_region->width) / layout.width;
+  y2 = (float) (swap_region->y + swap_region->height) / layout.height;
+
+  clutter_stage_view_transform_to_onscreen (view, &x1, &y1);
+  clutter_stage_view_transform_to_onscreen (view, &x2, &y2);
+
+  width = cogl_framebuffer_get_width (framebuffer);
+  height = cogl_framebuffer_get_height (framebuffer);
+
+  x1 = floor (x1 * width);
+  y1 = floor (height - (y1 * height));
+  x2 = ceil (x2 * width);
+  y2 = ceil (height - (y2 * height));
+
+  *swap_region = (cairo_rectangle_int_t) {
+    .x = x1,
+    .y = y1,
+    .width = x2 - x1,
+    .height = y2 - y1
+  };
+}
+
 static gboolean
 clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
                                 ClutterStageView   *view)
@@ -708,6 +745,12 @@ clutter_stage_cogl_redraw_view (ClutterStageWindow *stage_window,
 
   if (do_swap_buffer)
     {
+      if (clutter_stage_view_get_onscreen (view) !=
+          clutter_stage_view_get_framebuffer (view))
+        {
+          transform_swap_region_to_onscreen (view, &swap_region);
+        }
+
       return swap_framebuffer (stage_window,
                                view,
                                &swap_region,

clutter/tests/interactive/Makefile.am

@@ -109,7 +109,9 @@ clean-wrappers:
 
 .PHONY: wrappers clean-wrappers
 
-common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
+common_ldadd = \
+  $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la \
+  $(top_builddir)/../cogl/cogl/libmutter-cogl.la
 
 check_PROGRAMS = test-interactive
 check_SCRIPTS = wrappers

clutter/tests/micro-bench/Makefile.am

@@ -1,4 +1,7 @@
-common_ldadd = $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la
+common_ldadd = \
+  $(top_builddir)/clutter/libmutter-clutter-@CLUTTER_API_VERSION@.la \
+  $(top_builddir)/../cogl/cogl/libmutter-cogl.la
+
 
 check_PROGRAMS = \
 	test-text \

configure.ac

@@ -272,7 +272,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.5],
+  PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.6],
 		    [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`])
   AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir)
 ])

po/de.po

@@ -13,8 +13,8 @@ msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-02-28 13:37+0000\n"
+"POT-Creation-Date: 2016-08-19 21:04+0000\n"
-"PO-Revision-Date: 2016-02-28 19:15+0100\n"
+"PO-Revision-Date: 2016-08-21 11:45+0200\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -22,259 +22,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.8\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/mutter.desktop.in:4
-msgid "Navigation"
-msgstr "Navigation"
-
-#: ../data/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Fenster auf Arbeitsfläche 1 verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Fenster auf Arbeitsfläche 2 verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Fenster auf Arbeitsfläche 3 verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Fenster auf Arbeitsfläche 4 verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:6
-msgid "Move window to last workspace"
-msgstr "Fenster auf letzte Arbeitsfläche verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Fenster eine Arbeitsfläche nach links verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Fenster eine Arbeitsfläche nach rechts verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Fenster eine Arbeitsfläche nach oben verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:10
-msgid "Move window one workspace down"
-msgstr "Fenster eine Arbeitsfläche nach unten verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:11
-msgid "Move window one monitor to the left"
-msgstr "Fenster einen Bildschirm nach links verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:12
-msgid "Move window one monitor to the right"
-msgstr "Fenster einen Bildschirm nach rechts verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:13
-msgid "Move window one monitor up"
-msgstr "Fenster einen Bildschirm nach oben verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:14
-msgid "Move window one monitor down"
-msgstr "Fenster einen Bildschirm nach unten verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Anwendungen wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:16
-msgid "Switch to previous application"
-msgstr "Zur vorherigen Anwendung wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:17
-msgid "Switch windows"
-msgstr "Fenster wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:18
-msgid "Switch to previous window"
-msgstr "Zum vorherigen Fenster wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:19
-msgid "Switch windows of an application"
-msgstr "Zwischen den Fenstern einer Anwendung wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:20
-msgid "Switch to previous window of an application"
-msgstr "Zum vorherigen Fenster einer Anwendung wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:21
-msgid "Switch system controls"
-msgstr "Systemsteuerungen umschalten"
-
-#: ../data/50-mutter-navigation.xml.in.h:22
-msgid "Switch to previous system control"
-msgstr "Zur vorherigen Systemsteuerungen wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows directly"
-msgstr "Fenster sofort wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:24
-msgid "Switch directly to previous window"
-msgstr "Direkt zum vorherigen Fenster wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:25
-msgid "Switch windows of an app directly"
-msgstr "Sofort zwischen den Fenstern einer Anwendung wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:26
-msgid "Switch directly to previous window of an app"
-msgstr "Direkt zum vorherigen Fenster einer Anwendung wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:27
-msgid "Switch system controls directly"
-msgstr "Systemsteuerungen sofort umschalten"
-
-#: ../data/50-mutter-navigation.xml.in.h:28
-msgid "Switch directly to previous system control"
-msgstr "Direkt zur vorherigen Systemsteuerungen wechselen"
-
-#: ../data/50-mutter-navigation.xml.in.h:29
-msgid "Hide all normal windows"
-msgstr "Alle normalen Fenster verbergen"
-
-#: ../data/50-mutter-navigation.xml.in.h:30
-msgid "Switch to workspace 1"
-msgstr "Zur Arbeitsfläche 1 wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:31
-msgid "Switch to workspace 2"
-msgstr "Zur Arbeitsfläche 2 wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:32
-msgid "Switch to workspace 3"
-msgstr "Zur Arbeitsfläche 3 wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:33
-msgid "Switch to workspace 4"
-msgstr "Zur Arbeitsfläche 4 wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:34
-msgid "Switch to last workspace"
-msgstr "Zur letzten Arbeitsfläche wechseln"
-
-#: ../data/50-mutter-navigation.xml.in.h:35
-msgid "Move to workspace left"
-msgstr "Auf Arbeitsfläche links verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:36
-msgid "Move to workspace right"
-msgstr "Auf Arbeitsfläche rechts verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:37
-msgid "Move to workspace above"
-msgstr "Auf Arbeitsfläche darüber verschieben"
-
-#: ../data/50-mutter-navigation.xml.in.h:38
-msgid "Move to workspace below"
-msgstr "Auf Arbeitsfläche darunter verschieben"
-
-#: ../data/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "System"
-
-#: ../data/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Den »Befehl ausführen«-Dialog anzeigen"
-
-#: ../data/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "Aktivitäten-Übersicht anzeigen"
-
-#: ../data/50-mutter-windows.xml.in.h:1
-msgid "Windows"
-msgstr "Fenster"
-
-#: ../data/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Das Fenstermenü aktivieren"
-
-#: ../data/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Vollbildmodus ein-/ausschalten"
-
-#: ../data/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "Maximierungszustand ein-/ausschalten"
-
-#: ../data/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "Fenster maximieren"
-
-#: ../data/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Fenstergröße wiederherstellen"
-
-#: ../data/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Fenster ein-/ausrollen"
-
-#: ../data/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Fenster schließen"
-
-#: ../data/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Fenster verbergen"
-
-#: ../data/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Fenster verschieben"
-
-#: ../data/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Fenstergröße ändern"
-
-#: ../data/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr ""
-"Festlegen, ob das Fenster auf allen oder nur einer Arbeitsfläche sichtbar ist"
-
-#: ../data/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Fenster anheben, falls es verdeckt ist, andernfalls absenken"
-
-#: ../data/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "Fenster vor die anderen Fenster anheben"
-
-#: ../data/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Fenster hinter die anderen Fenster absenken"
-
-#: ../data/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Fenster vertikal maximieren"
-
-#: ../data/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Fenster horizontal maximieren"
-
-#: ../data/50-mutter-windows.xml.in.h:18
-msgid "View split on left"
-msgstr "Ansicht links teilen"
-
-#: ../data/50-mutter-windows.xml.in.h:19
-msgid "View split on right"
-msgstr "Ansicht rechts teilen"
-
-#: ../data/mutter.desktop.in.h:1
 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 "Zusatztaste für erweiterte Aktionen der Fensterverwaltung"
 
 # bzw- die Apfel-Taste auf Mac-Computern
-#: ../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 "
@@ -287,11 +46,11 @@ msgstr ""
 "vorgesehen. Man geht davon aus, dass diese Tastenverknüpfung entweder die "
 "Vorgabe ist oder als leere Zeichenkette gesetzt ist."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Modale Dialoge anhängen"
 
-#: ../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 "
@@ -301,12 +60,12 @@ msgstr ""
 "die Titelleisten des Elternfensters angehängte modale Dialoge, welche "
 "zusammen mit dem Elternfenster bewegt werden."
 
-#: ../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 ""
 "Kantenplatzierung beim Berühren der Bildschirmränder mit Fenstern aktivieren"
 
-#: ../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 "
@@ -317,11 +76,11 @@ msgstr ""
 "Hälfte des verfügbaren Bereiches zu belegen. Eine Berührung mit dem oberen "
 "Bildschirmrand maximiert das Fenster vollständig."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Arbeitsflächen sollen dynamisch verwaltet werden "
 
-#: ../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."
@@ -331,11 +90,11 @@ msgstr ""
 "eine feste Anzahl Arbeitsflächen gibt (welche durch den Schlüssel num-"
 "workspaces in org.gnome.desktop.wm.preferences festgelegt wird)."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Nur primärer Arbeitsflächenwechsel"
 
-#: ../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,11 +102,11 @@ msgstr ""
 "Legt fest, ob Arbeitsflächenwechsel für alle Fenster auf allen Bildschirmen "
 "oder nur für Fenster auf dem primären Bildschirm ausgeführt werden soll."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "Keine Tab-Anzeige"
 
-#: ../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."
@@ -355,11 +114,11 @@ msgstr ""
 "Legt fest, ob beim Durchblättern der Fenster die Tab-Anzeige und die "
 "Hervorhebung des Rahmens deaktiviert werden soll."
 
-#: ../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 "Fokus-Änderungen verzögern, bis der Zeiger aufhört sich zu bewegen"
 
-#: ../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 "
@@ -369,12 +128,12 @@ msgstr ""
 "»mouse« ist, wird der Fokus nicht sofort beim Erreichen eines Fensters "
 "geändert, sondern erst, wenn der Zeiger aufhört sich zu bewegen."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Breite der ziehbaren Ränder"
 
 # Lange Beschreibung von »Draggable border width«
-#: ../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."
@@ -383,11 +142,11 @@ msgstr ""
 "nicht ausreichen, werden unsichtbare Ränder hinzugefügt, um diesen Wert zu "
 "erreichen."
 
-#: ../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 "Fenster nahe der Bildschirmgröße automatisch maximieren"
 
-#: ../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."
@@ -395,11 +154,11 @@ msgstr ""
 "Wenn aktiviert, werden neue Fenster, die beim Öffnen nahezu die Größe des "
 "Bildschirms haben, direkt maximiert."
 
-#: ../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 "Neue Fenster in der Mitte platzieren"
 
-#: ../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."
@@ -407,85 +166,93 @@ msgstr ""
 "Falls wahr, so werden neue Fenster immer in der Mitte des aktiven "
 "Bildschirms platziert"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Fenster aus Tab-Anzeige auswählen"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Tab-Anzeige abbrechen"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Zum virtuellen Terminal 1 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 2 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 3 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 4 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 5 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 6 wechseln"
 
-#: ../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 "Zum virtuellen Terminal 7 wechseln"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Zum virtuellen Terminal 8 wechseln"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Zum virtuellen Terminal 9 wechseln"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Zum virtuellen Terminal 10 wechseln"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Zum virtuellen Terminal 11 wechseln"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Zum virtuellen Terminal 12 wechseln"
 
-#: ../src/backends/meta-monitor-manager.c:518
+#: src/backends/meta-input-settings.c:1707
+msgid "Switch monitor"
+msgstr "Bildschirm wechseln"
+
+#: src/backends/meta-input-settings.c:1709
+msgid "Show on-screen help"
+msgstr "Bildschirmhilfe anzeigen"
+
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Eingebaute Anzeige"
 
-#: ../src/backends/meta-monitor-manager.c:544
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../src/backends/meta-monitor-manager.c:546
+#: src/backends/meta-monitor-manager.c:539
 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:554
+#: src/backends/meta-monitor-manager.c:547
 #, 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:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -494,20 +261,20 @@ msgstr ""
 "Ein weiterer Compositing-Verwalter läuft bereits auf Bildschirm %i der "
 "Anzeige »%s«."
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Klangereignis"
 
-#: ../src/core/delete.c:127
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "»%s« antwortet nicht."
 
-#: ../src/core/delete.c:129
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Die Anwendung antwortet nicht."
 
-#: ../src/core/delete.c:134
+#: 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."
@@ -515,58 +282,58 @@ msgstr ""
 "Sie können der Anwendung noch etwas Zeit geben oder ein sofortiges Beenden "
 "erzwingen."
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Warten"
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Beenden erzwingen"
 
-#: ../src/core/display.c:555
+#: src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "X-Window-Systemanzeige »%s« konnte nicht geöffnet werden\n"
 
-#: ../src/core/main.c:181
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Verbindung zur Sitzungsverwaltung deaktivieren"
 
-#: ../src/core/main.c:187
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Den aktuellen Fensterverwalter ersetzen"
 
-#: ../src/core/main.c:193
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Kennung der Sitzungsverwaltung angeben"
 
-#: ../src/core/main.c:198
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Zu verwendende X-Anzeige"
 
-#: ../src/core/main.c:204
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Sitzung anhand gespeicherter Datei starten"
 
-#: ../src/core/main.c:210
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "X-Aufrufe abgleichen"
 
-#: ../src/core/main.c:217
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Als Wayland-Compositor ausführen"
 
-#: ../src/core/main.c:223
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Als eingebetteten Compositor ausführen"
 
-#: ../src/core/main.c:231
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Als vollwertigen Display-Server verwenden (nicht eingebettet)"
 
 # CHECK
 # c-format
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -582,20 +349,20 @@ msgstr ""
 "Es besteht KEINE Garantie auf MARKTREIFE oder EIGNUNG für einen BESTIMMTEN "
 "ZWECK.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Version ausgeben"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Zu benutzendes Mutter-Plugin"
 
-#: ../src/core/prefs.c:1997
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeitsfläche %d"
 
-#: ../src/core/screen.c:521
+#: src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -604,16 +371,21 @@ msgstr ""
 "Bildschirm »%s« hat bereits einen Fensterverwalter. Versuchen Sie die Option "
 "»--replace«, um den aktuellen Fensterverwalter zu ersetzen."
 
-#: ../src/core/screen.c:603
+#: src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Bildschirm %d auf Anzeige »%s« ist ungültig\n"
 
-#: ../src/core/util.c:121
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Mutter wurde ohne Unterstützung für den redseligen Modus kompiliert\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:595
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Moduswechsel: Modus %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."
@@ -621,11 +393,190 @@ msgstr ""
 "Diese Fenster unterstützen das Speichern der aktuellen Einstellungen nicht "
 "und müssen bei der nächsten Anmeldung manuell neu gestartet werden."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (auf %s)"
 
+#~ msgid "Navigation"
+#~ msgstr "Navigation"
+
+#~ msgid "Move window to workspace 1"
+#~ msgstr "Fenster auf Arbeitsfläche 1 verschieben"
+
+#~ msgid "Move window to workspace 2"
+#~ msgstr "Fenster auf Arbeitsfläche 2 verschieben"
+
+#~ msgid "Move window to workspace 3"
+#~ msgstr "Fenster auf Arbeitsfläche 3 verschieben"
+
+#~ msgid "Move window to workspace 4"
+#~ msgstr "Fenster auf Arbeitsfläche 4 verschieben"
+
+#~ msgid "Move window to last workspace"
+#~ msgstr "Fenster auf letzte Arbeitsfläche verschieben"
+
+#~ msgid "Move window one workspace to the left"
+#~ msgstr "Fenster eine Arbeitsfläche nach links verschieben"
+
+#~ msgid "Move window one workspace to the right"
+#~ msgstr "Fenster eine Arbeitsfläche nach rechts verschieben"
+
+#~ msgid "Move window one workspace up"
+#~ msgstr "Fenster eine Arbeitsfläche nach oben verschieben"
+
+#~ msgid "Move window one workspace down"
+#~ msgstr "Fenster eine Arbeitsfläche nach unten verschieben"
+
+#~ msgid "Move window one monitor to the left"
+#~ msgstr "Fenster einen Bildschirm nach links verschieben"
+
+#~ msgid "Move window one monitor to the right"
+#~ msgstr "Fenster einen Bildschirm nach rechts verschieben"
+
+#~ msgid "Move window one monitor up"
+#~ msgstr "Fenster einen Bildschirm nach oben verschieben"
+
+#~ msgid "Move window one monitor down"
+#~ msgstr "Fenster einen Bildschirm nach unten verschieben"
+
+#~ msgid "Switch applications"
+#~ msgstr "Anwendungen wechseln"
+
+#~ msgid "Switch to previous application"
+#~ msgstr "Zur vorherigen Anwendung wechseln"
+
+#~ msgid "Switch windows"
+#~ msgstr "Fenster wechseln"
+
+#~ msgid "Switch to previous window"
+#~ msgstr "Zum vorherigen Fenster wechseln"
+
+#~ msgid "Switch windows of an application"
+#~ msgstr "Zwischen den Fenstern einer Anwendung wechseln"
+
+#~ msgid "Switch to previous window of an application"
+#~ msgstr "Zum vorherigen Fenster einer Anwendung wechseln"
+
+#~ msgid "Switch to previous system control"
+#~ msgstr "Zur vorherigen Systemsteuerungen wechseln"
+
+#~ msgid "Switch windows directly"
+#~ msgstr "Fenster sofort wechseln"
+
+#~ msgid "Switch directly to previous window"
+#~ msgstr "Direkt zum vorherigen Fenster wechseln"
+
+#~ msgid "Switch windows of an app directly"
+#~ msgstr "Sofort zwischen den Fenstern einer Anwendung wechseln"
+
+#~ msgid "Switch directly to previous window of an app"
+#~ msgstr "Direkt zum vorherigen Fenster einer Anwendung wechseln"
+
+#~ msgid "Switch system controls directly"
+#~ msgstr "Systemsteuerungen sofort umschalten"
+
+#~ msgid "Switch directly to previous system control"
+#~ msgstr "Direkt zur vorherigen Systemsteuerungen wechselen"
+
+#~ msgid "Hide all normal windows"
+#~ msgstr "Alle normalen Fenster verbergen"
+
+#~ msgid "Switch to workspace 1"
+#~ msgstr "Zur Arbeitsfläche 1 wechseln"
+
+#~ msgid "Switch to workspace 2"
+#~ msgstr "Zur Arbeitsfläche 2 wechseln"
+
+#~ msgid "Switch to workspace 3"
+#~ msgstr "Zur Arbeitsfläche 3 wechseln"
+
+#~ msgid "Switch to workspace 4"
+#~ msgstr "Zur Arbeitsfläche 4 wechseln"
+
+#~ msgid "Switch to last workspace"
+#~ msgstr "Zur letzten Arbeitsfläche wechseln"
+
+#~ msgid "Move to workspace left"
+#~ msgstr "Auf Arbeitsfläche links verschieben"
+
+#~ msgid "Move to workspace right"
+#~ msgstr "Auf Arbeitsfläche rechts verschieben"
+
+#~ msgid "Move to workspace above"
+#~ msgstr "Auf Arbeitsfläche darüber verschieben"
+
+#~ msgid "Move to workspace below"
+#~ msgstr "Auf Arbeitsfläche darunter verschieben"
+
+#~ msgid "System"
+#~ msgstr "System"
+
+#~ msgid "Show the run command prompt"
+#~ msgstr "Den »Befehl ausführen«-Dialog anzeigen"
+
+#~ msgid "Show the activities overview"
+#~ msgstr "Aktivitäten-Übersicht anzeigen"
+
+#~ msgid "Windows"
+#~ msgstr "Fenster"
+
+#~ msgid "Activate the window menu"
+#~ msgstr "Das Fenstermenü aktivieren"
+
+#~ msgid "Toggle fullscreen mode"
+#~ msgstr "Vollbildmodus ein-/ausschalten"
+
+#~ msgid "Toggle maximization state"
+#~ msgstr "Maximierungszustand ein-/ausschalten"
+
+#~ msgid "Maximize window"
+#~ msgstr "Fenster maximieren"
+
+#~ msgid "Restore window"
+#~ msgstr "Fenstergröße wiederherstellen"
+
+#~ msgid "Toggle shaded state"
+#~ msgstr "Fenster ein-/ausrollen"
+
+#~ msgid "Close window"
+#~ msgstr "Fenster schließen"
+
+#~ msgid "Hide window"
+#~ msgstr "Fenster verbergen"
+
+#~ msgid "Move window"
+#~ msgstr "Fenster verschieben"
+
+#~ msgid "Resize window"
+#~ msgstr "Fenstergröße ändern"
+
+#~ msgid "Toggle window on all workspaces or one"
+#~ msgstr ""
+#~ "Festlegen, ob das Fenster auf allen oder nur einer Arbeitsfläche sichtbar "
+#~ "ist"
+
+#~ msgid "Raise window if covered, otherwise lower it"
+#~ msgstr "Fenster anheben, falls es verdeckt ist, andernfalls absenken"
+
+#~ msgid "Raise window above other windows"
+#~ msgstr "Fenster vor die anderen Fenster anheben"
+
+#~ msgid "Lower window below other windows"
+#~ msgstr "Fenster hinter die anderen Fenster absenken"
+
+#~ msgid "Maximize window vertically"
+#~ msgstr "Fenster vertikal maximieren"
+
+#~ msgid "Maximize window horizontally"
+#~ msgstr "Fenster horizontal maximieren"
+
+#~ msgid "View split on left"
+#~ msgstr "Ansicht links teilen"
+
+#~ msgid "View split on right"
+#~ msgstr "Ansicht rechts teilen"
+
 #~ msgid "Failed to scan themes directory: %s\n"
 #~ msgstr "Der Themenordner konnte nicht eingelesen werden: %s\n"
 

po/id.po

@@ -8,11 +8,11 @@
 # Andika Triwidada <andika@gmail.com>, 2011-2015.
 msgid ""
 msgstr ""
-"Project-Id-Version: mutter gnome-3-20\n"
+"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: 2016-05-10 20:26+0000\n"
+"POT-Creation-Date: 2016-08-19 21:04+0000\n"
-"PO-Revision-Date: 2016-06-23 04:18+0700\n"
+"PO-Revision-Date: 2016-08-22 17:38+0700\n"
 "Last-Translator: Andika Triwidada <andika@gmail.com>\n"
 "Language-Team: Indonesian <gnome-l10n-id@googlegroups.com>\n"
 "Language: id\n"
@@ -22,255 +22,15 @@ msgstr ""
 "X-Generator: Poedit 1.8.8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/mutter.desktop.in:4
-msgid "Navigation"
-msgstr "Navigasi"
-
-#: ../data/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Pindahkan jendela ke area kerja 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Pindahkan jendela ke area kerja 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Pindahkan jendela ke area kerja 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Pindahkan jendela ke area kerja 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:6
-msgid "Move window to last workspace"
-msgstr "Pindahkan jendela ke area kerja terakhir"
-
-#: ../data/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Pindahkan jendela satu area kerja ke kiri"
-
-#: ../data/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Pindahkan jendela satu area kerja ke kanan"
-
-#: ../data/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Pindahkan jendela ke area kerja atas"
-
-#: ../data/50-mutter-navigation.xml.in.h:10
-msgid "Move window one workspace down"
-msgstr "Pindahkan jendela ke area kerja bawah"
-
-#: ../data/50-mutter-navigation.xml.in.h:11
-msgid "Move window one monitor to the left"
-msgstr "Pindahkan jendela satu monitor ke kiri"
-
-#: ../data/50-mutter-navigation.xml.in.h:12
-msgid "Move window one monitor to the right"
-msgstr "Pindahkan jendela satu monitor ke kanan"
-
-#: ../data/50-mutter-navigation.xml.in.h:13
-msgid "Move window one monitor up"
-msgstr "Pindahkan jendela satu monitor ke atas"
-
-#: ../data/50-mutter-navigation.xml.in.h:14
-msgid "Move window one monitor down"
-msgstr "Pindahkan jendela satu monitor ke bawah"
-
-#: ../data/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Berpindah aplikasi"
-
-#: ../data/50-mutter-navigation.xml.in.h:16
-msgid "Switch to previous application"
-msgstr "Berpindah ke aplikasi sebelumnya"
-
-#: ../data/50-mutter-navigation.xml.in.h:17
-msgid "Switch windows"
-msgstr "Berpindah jendela"
-
-#: ../data/50-mutter-navigation.xml.in.h:18
-msgid "Switch to previous window"
-msgstr "Berpindah ke jendela sebelumnya"
-
-#: ../data/50-mutter-navigation.xml.in.h:19
-msgid "Switch windows of an application"
-msgstr "Berpindah jendela aplikasi"
-
-#: ../data/50-mutter-navigation.xml.in.h:20
-msgid "Switch to previous window of an application"
-msgstr "Berpindah ke jendela sebelumnya dari suatu aplikasi"
-
-#: ../data/50-mutter-navigation.xml.in.h:21
-msgid "Switch system controls"
-msgstr "Berpindah kendali sistem"
-
-#: ../data/50-mutter-navigation.xml.in.h:22
-msgid "Switch to previous system control"
-msgstr "Berpindah ke kendali sistem sebelumnya"
-
-#: ../data/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows directly"
-msgstr "Berpindah jendela secara langsung"
-
-#: ../data/50-mutter-navigation.xml.in.h:24
-msgid "Switch directly to previous window"
-msgstr "Berpindah langsung ke jendela sebelumnya"
-
-#: ../data/50-mutter-navigation.xml.in.h:25
-msgid "Switch windows of an app directly"
-msgstr "Berpindah jendela aplikasi secara langsung"
-
-#: ../data/50-mutter-navigation.xml.in.h:26
-msgid "Switch directly to previous window of an app"
-msgstr "Berpindah langsung ke jendela sebelumnya dari sebuah aplikasi"
-
-#: ../data/50-mutter-navigation.xml.in.h:27
-msgid "Switch system controls directly"
-msgstr "Berpindah kendali sistem secara langsung"
-
-#: ../data/50-mutter-navigation.xml.in.h:28
-msgid "Switch directly to previous system control"
-msgstr "Berpindah langsung ke kendali sistem sebelumnya"
-
-#: ../data/50-mutter-navigation.xml.in.h:29
-msgid "Hide all normal windows"
-msgstr "Menyembunyikan semua jendela normal"
-
-#: ../data/50-mutter-navigation.xml.in.h:30
-msgid "Switch to workspace 1"
-msgstr "Pindah ke area kerja 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:31
-msgid "Switch to workspace 2"
-msgstr "Pindah ke area kerja 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:32
-msgid "Switch to workspace 3"
-msgstr "Pindah ke area kerja 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:33
-msgid "Switch to workspace 4"
-msgstr "Pindah ke area kerja 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:34
-msgid "Switch to last workspace"
-msgstr "Pindah ke area kerja terakhir"
-
-#: ../data/50-mutter-navigation.xml.in.h:35
-msgid "Move to workspace left"
-msgstr "Pindah ke area kerja kiri"
-
-#: ../data/50-mutter-navigation.xml.in.h:36
-msgid "Move to workspace right"
-msgstr "Pindah ke area kerja kanan"
-
-#: ../data/50-mutter-navigation.xml.in.h:37
-msgid "Move to workspace above"
-msgstr "Pindah ke area kerja atas"
-
-#: ../data/50-mutter-navigation.xml.in.h:38
-msgid "Move to workspace below"
-msgstr "Pindah ke area kerja bawah"
-
-#: ../data/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "Sistem"
-
-#: ../data/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Menampilkan dialog untuk mengetik perintah"
-
-#: ../data/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "Menampilkan ringkasan aktivitas"
-
-#: ../data/50-mutter-windows.xml.in.h:1
-msgid "Windows"
-msgstr "Jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Mengaktifkan menu jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Menjungkit mode layar penuh"
-
-#: ../data/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "Menjungkit kondisi dimaksimalkan"
-
-#: ../data/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "Maksimalkan ukuran jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Kembalikan ukuran jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Jungkitkan kondisi berbayang"
-
-#: ../data/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Tutup jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Sembunyikan jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Pindahkan jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Ubah ukuran jendela"
-
-#: ../data/50-mutter-windows.xml.in.h:12
-msgid "Toggle window on all workspaces or one"
-msgstr "Jungkitkan jendela pada semua atau satu area kerja"
-
-#: ../data/50-mutter-windows.xml.in.h:13
-msgid "Raise window if covered, otherwise lower it"
-msgstr "Naikkan jendela bila tertutup jendela lain, sebaliknya diturunkan"
-
-#: ../data/50-mutter-windows.xml.in.h:14
-msgid "Raise window above other windows"
-msgstr "Naikkan jendela di atas jendela-jendela lain"
-
-#: ../data/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Turunkan jendela di bawah jendela lain"
-
-#: ../data/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Maksimalkan ukuran jendela secara vertikal"
-
-#: ../data/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Maksimalkan ukuran jendela secara horisontal"
-
-#: ../data/50-mutter-windows.xml.in.h:18
-msgid "View split on left"
-msgstr "Tampilan dipisah ke kiri"
-
-#: ../data/50-mutter-windows.xml.in.h:19
-msgid "View split on right"
-msgstr "Tampilan dipisah ke kanan"
-
-#: ../data/mutter.desktop.in.h:1
 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 "Tombol yang digunakan untuk memperluas operasi manajemen jendela"
 
-#: ../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 "
@@ -282,11 +42,11 @@ msgstr ""
 "\"Windows key\" pada perangkat keras PC. Diharapkan agar pengikatan ini "
 "berupa baku atau diisi dengan kalimat kosong."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Lampirkan dialog modal"
 
-#: ../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 "
@@ -295,11 +55,11 @@ msgstr ""
 "Jika bernilai \"true\", maka dialog modal akan muncul menempel pada baris "
 "judul jendela utama dan bergerak seiring perpindahan jendela utama tersebut."
 
-#: ../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 "Fungsikan pengubinan tepi ketika menjatuhkan jendela ke tepi layar"
 
-#: ../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 "
@@ -310,11 +70,11 @@ msgstr ""
 "menutupi separuh dari area yang tersedia. Menjatuhkan jendela pada tepi atas "
 "layar akan memaksimalkan mereka sepenuhnya."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Ruang kerja dikelola secara dinamis"
 
-#: ../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."
@@ -324,11 +84,11 @@ msgstr ""
 "sejumlah tetap ruang kerja (ditentukan oleh kunci num-workspaces dalam org."
 "gnome.desktop.wm.preferences)."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Ruang kerja hanya pada primer"
 
-#: ../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."
@@ -336,11 +96,11 @@ msgstr ""
 "Menentukan apakah perpindahan area kerja hanya terjadi pada jendela aplikasi "
 "di semua monitor atau hanya untuk jendela pada monitor utama."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "Tak ada popup tab"
 
-#: ../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."
@@ -348,11 +108,11 @@ msgstr ""
 "Menentukan apakah penggunaan popup dan rangka penyorot mesti dimatikan bagi "
 "perputaran jendela."
 
-#: ../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 "Tunda perubahan fokus sampai penunjuk berhenti bergerak"
 
-#: ../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 "
@@ -362,11 +122,11 @@ msgstr ""
 "fokus tak akan berubah seketika saat memasuki suatu jendela, tapi hanya "
 "setelah penunjuk berhenti bergerak."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Lebar batas yang dapat diseret"
 
-#: ../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."
@@ -374,11 +134,11 @@ msgstr ""
 "Total banyaknya tepi yang dapat diseret. Bila tepi tema yang nampak tak "
 "cukup, tepi tak nampak akan ditambahkan untuk memenuhi nilai ini."
 
-#: ../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 "Memaksimalkan otomatis hampir memantau jendela yang ditata ukurannya"
 
-#: ../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."
@@ -386,11 +146,11 @@ msgstr ""
 "Bila difungsikan, jendela baru yang awalnya seukuran monitor secara otomatis "
 "dimaksimalkan."
 
-#: ../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 "Tempatkan jendela baru di tengah"
 
-#: ../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."
@@ -398,85 +158,93 @@ msgstr ""
 "Ketika berisi true, jendela baru akan selalu diletakkan di tengah dari layar "
 "aktif dari monitor."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Pilih jendela dari popup tab"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Batalkan popup tab"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Pindah ke 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 "Pindah ke 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 "Pindah ke 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 "Pindah ke 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 "Pindah ke 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 "Pindah ke 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 "Pindah ke VT 7"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Pindah ke VT 8"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Pindah ke VT 9"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Pindah ke VT 10"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Pindah ke VT 11"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Pindah ke VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:515
+#: src/backends/meta-input-settings.c:1707
+msgid "Switch monitor"
+msgstr "Berpindah monitor"
+
+#: src/backends/meta-input-settings.c:1709
+msgid "Show on-screen help"
+msgstr "Tampilkan bantuan pada layar"
+
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Tampilan bawaan"
 
-#: ../src/backends/meta-monitor-manager.c:538
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Tak Dikenal"
 
-#: ../src/backends/meta-monitor-manager.c:540
+#: src/backends/meta-monitor-manager.c:539
 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:548
+#: src/backends/meta-monitor-manager.c:547
 #, 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:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -484,76 +252,76 @@ msgid ""
 msgstr ""
 "Manajer komposit lain telah berjalan pada layar %i pada tampilan \"%s\"."
 
-#: ../src/core/bell.c:194
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Bel peristiwa"
 
-#: ../src/core/delete.c:127
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" tak merespon."
 
-#: ../src/core/delete.c:129
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Aplikasi tak merespon."
 
-#: ../src/core/delete.c:134
+#: 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 ""
 "Anda bisa memilih untuk menunggu sebentar atau memaksa aplikasi keluar."
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Tunggu"
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Matikan Paksa"
 
-#: ../src/core/display.c:555
+#: src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Gagal membuka tampilan X Window System '%s'\n"
 
-#: ../src/core/main.c:181
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Menonaktifkan koneksi ke manajer sesi"
 
-#: ../src/core/main.c:187
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Mengganti manajer jendela yang tengah berjalan"
 
-#: ../src/core/main.c:193
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Tentukan kode pengaturan sesi"
 
-#: ../src/core/main.c:198
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Tampilan X yang digunakna"
 
-#: ../src/core/main.c:204
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Aktifkan sesi dari berkas simpanan"
 
-#: ../src/core/main.c:210
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Buat panggilan X selaras"
 
-#: ../src/core/main.c:217
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Jalankan sebagai kompositor wayland"
 
-#: ../src/core/main.c:223
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Jalankan sebagai kompositor bersarang"
 
-#: ../src/core/main.c:231
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Jalankan sebagai server tampilan penuh, ketimbang tampilan bersarang"
 
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -569,20 +337,20 @@ msgstr ""
 "TIDAK ADA jaminan, bahkan untuk KELAYAKAN JUAL atau KELAYAKAN UNTUK KEGUNAAN "
 "TERTENTU.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Cetak versi"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Pengaya Mutter yang dipakai"
 
-#: ../src/core/prefs.c:1997
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Area kerja %d"
 
-#: ../src/core/screen.c:521
+#: src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -591,16 +359,21 @@ msgstr ""
 "Tampilan \"%s\" sudah memiliki manajer jendela; cobalah gunakan pilihan --"
 "replace untuk mengganti manajer jendela saat ini."
 
-#: ../src/core/screen.c:603
+#: src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Layar %d pada tampilan '%s' tidak benar\n"
 
-#: ../src/core/util.c:121
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "Muter dikompilasi tanpa dukungan mode riuh\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:595
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Tukar Mode: Mode %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."
@@ -608,7 +381,7 @@ msgstr ""
 "Jendela ini tidak bisa &quot;menyimpan setelan aktif saat ini&quot; dan bila "
 "log masuk kali lain Anda harus menjalankannya ulang."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (pada %s)"

po/pl.po

@@ -1,284 +1,280 @@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+# Polish translation for mutter.
-# Aviary.pl
+# Copyright © 2002-2016 the mutter authors.
-# Jeśli masz jakiekolwiek uwagi odnoszące się do tłumaczenia lub chcesz
+# This file is distributed under the same license as the mutter package.
-# pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas:
-# gnomepl@aviary.pl
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 # Zbigniew Chyla <chyla@alice.ci.pwr.wroc.pl>, 2002-2003.
 # Artur Flinta <aflinta@at.kernel.pl>, 2003-2005.
 # Marek Stępień <marcoos@aviary.pl>, 2007.
 # Wadim Dziedzic <wdziedzic@aviary.pl>, 2007.
 # Tomasz Dominikowski <dominikowski@gmail.com>, 2008-2009.
 # Piotr Drąg <piotrdrag@gmail.com>, 2010-2016.
-# Aviary.pl <gnomepl@aviary.pl>, 2007-2016.
+# Aviary.pl <community-poland@mozilla.org>, 2007-2016.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-25 17:29+0100\n"
+"POT-Creation-Date: 2016-08-20 10:10+0200\n"
-"PO-Revision-Date: 2016-02-25 17:30+0100\n"
+"PO-Revision-Date: 2016-08-20 10:12+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
-"Language-Team: Polish <gnomepl@aviary.pl>\n"
+"Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: Poland\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/50-mutter-navigation.xml:6
 msgid "Navigation"
 msgstr "Nawigacja"
 
-#: ../data/50-mutter-navigation.xml.in.h:2
+#: data/50-mutter-navigation.xml:9
 msgid "Move window to workspace 1"
 msgstr "Przeniesienie okna na 1. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:3
+#: data/50-mutter-navigation.xml:12
 msgid "Move window to workspace 2"
 msgstr "Przeniesienie okna na 2. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:4
+#: data/50-mutter-navigation.xml:15
 msgid "Move window to workspace 3"
 msgstr "Przeniesienie okna na 3. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:5
+#: data/50-mutter-navigation.xml:18
 msgid "Move window to workspace 4"
 msgstr "Przeniesienie okna na 4. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:6
+#: data/50-mutter-navigation.xml:21
 msgid "Move window to last workspace"
 msgstr "Przeniesienie okna na ostatni obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:7
+#: data/50-mutter-navigation.xml:24
 msgid "Move window one workspace to the left"
-msgstr "Przeniesienie okna o obszar roboczy w lewo"
+msgstr "Przeniesienie okna o obszar roboczy w lewo"
 
-#: ../data/50-mutter-navigation.xml.in.h:8
+#: data/50-mutter-navigation.xml:27
 msgid "Move window one workspace to the right"
-msgstr "Przeniesienie okna o obszar roboczy w prawo"
+msgstr "Przeniesienie okna o obszar roboczy w prawo"
 
-#: ../data/50-mutter-navigation.xml.in.h:9
+#: data/50-mutter-navigation.xml:30
 msgid "Move window one workspace up"
-msgstr "Przeniesienie okna o obszar roboczy w górę"
+msgstr "Przeniesienie okna o obszar roboczy w górę"
 
-#: ../data/50-mutter-navigation.xml.in.h:10
+#: data/50-mutter-navigation.xml:33
 msgid "Move window one workspace down"
-msgstr "Przeniesienie okna o obszar roboczy w dół"
+msgstr "Przeniesienie okna o obszar roboczy w dół"
 
-#: ../data/50-mutter-navigation.xml.in.h:11
+#: data/50-mutter-navigation.xml:36
 msgid "Move window one monitor to the left"
 msgstr "Przeniesienie okna na monitor po lewej"
 
-#: ../data/50-mutter-navigation.xml.in.h:12
+#: data/50-mutter-navigation.xml:39
 msgid "Move window one monitor to the right"
 msgstr "Przeniesienie okna na monitor po prawej"
 
-#: ../data/50-mutter-navigation.xml.in.h:13
+#: data/50-mutter-navigation.xml:42
 msgid "Move window one monitor up"
 msgstr "Przeniesienie okna na monitor na górze"
 
-#: ../data/50-mutter-navigation.xml.in.h:14
+#: data/50-mutter-navigation.xml:45
 msgid "Move window one monitor down"
 msgstr "Przeniesienie okna na monitor na dole"
 
-#: ../data/50-mutter-navigation.xml.in.h:15
+#: data/50-mutter-navigation.xml:49
 msgid "Switch applications"
 msgstr "Przełączenie programów"
 
-#: ../data/50-mutter-navigation.xml.in.h:16
+#: data/50-mutter-navigation.xml:54
 msgid "Switch to previous application"
 msgstr "Przełączenie na poprzedni program"
 
-#: ../data/50-mutter-navigation.xml.in.h:17
+#: data/50-mutter-navigation.xml:58
 msgid "Switch windows"
 msgstr "Przełączenie okien"
 
-#: ../data/50-mutter-navigation.xml.in.h:18
+#: data/50-mutter-navigation.xml:63
 msgid "Switch to previous window"
 msgstr "Przełączenie na poprzednie okno"
 
-#: ../data/50-mutter-navigation.xml.in.h:19
+#: data/50-mutter-navigation.xml:67
 msgid "Switch windows of an application"
 msgstr "Przełączenie między oknami programu"
 
-#: ../data/50-mutter-navigation.xml.in.h:20
+#: data/50-mutter-navigation.xml:72
 msgid "Switch to previous window of an application"
 msgstr "Przełączenie na poprzednie okno programu"
 
-#: ../data/50-mutter-navigation.xml.in.h:21
+#: data/50-mutter-navigation.xml:76
 msgid "Switch system controls"
 msgstr "Przełączenie kontroli systemowej"
 
-#: ../data/50-mutter-navigation.xml.in.h:22
+#: data/50-mutter-navigation.xml:81
 msgid "Switch to previous system control"
 msgstr "Przełączenie na poprzednią kontrolę systemową"
 
-#: ../data/50-mutter-navigation.xml.in.h:23
+#: data/50-mutter-navigation.xml:85
 msgid "Switch windows directly"
 msgstr "Bezpośrednie przełączenie między oknami"
 
-#: ../data/50-mutter-navigation.xml.in.h:24
+#: data/50-mutter-navigation.xml:90
 msgid "Switch directly to previous window"
 msgstr "Bezpośrednie przełączenie na poprzednie okno"
 
-#: ../data/50-mutter-navigation.xml.in.h:25
+#: data/50-mutter-navigation.xml:94
 msgid "Switch windows of an app directly"
 msgstr "Bezpośrednie przełączenie między oknami programu"
 
-#: ../data/50-mutter-navigation.xml.in.h:26
+#: data/50-mutter-navigation.xml:99
 msgid "Switch directly to previous window of an app"
 msgstr "Bezpośrednie przełączenie na poprzednie okno programu"
 
-#: ../data/50-mutter-navigation.xml.in.h:27
+#: data/50-mutter-navigation.xml:103
 msgid "Switch system controls directly"
 msgstr "Bezpośrednie przełączenie kontroli systemowej"
 
-#: ../data/50-mutter-navigation.xml.in.h:28
+#: data/50-mutter-navigation.xml:108
 msgid "Switch directly to previous system control"
 msgstr "Bezpośrednie przełączenie na poprzednią kontrolę systemową"
 
-#: ../data/50-mutter-navigation.xml.in.h:29
+#: data/50-mutter-navigation.xml:111
 msgid "Hide all normal windows"
 msgstr "Ukrycie wszystkich zwykłych okien"
 
-#: ../data/50-mutter-navigation.xml.in.h:30
+#: data/50-mutter-navigation.xml:114
 msgid "Switch to workspace 1"
 msgstr "Przełączenie na 1. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:31
+#: data/50-mutter-navigation.xml:117
 msgid "Switch to workspace 2"
 msgstr "Przełączenie na 2. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:32
+#: data/50-mutter-navigation.xml:120
 msgid "Switch to workspace 3"
 msgstr "Przełączenie na 3. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:33
+#: data/50-mutter-navigation.xml:123
 msgid "Switch to workspace 4"
 msgstr "Przełączenie na 4. obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:34
+#: data/50-mutter-navigation.xml:126
 msgid "Switch to last workspace"
 msgstr "Przełączenie na ostatni obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:35
+#: data/50-mutter-navigation.xml:129
 msgid "Move to workspace left"
 msgstr "Przeniesienie na lewy obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:36
+#: data/50-mutter-navigation.xml:132
 msgid "Move to workspace right"
 msgstr "Przeniesienie na prawy obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:37
+#: data/50-mutter-navigation.xml:135
 msgid "Move to workspace above"
 msgstr "Przeniesienie na górny obszar roboczy"
 
-#: ../data/50-mutter-navigation.xml.in.h:38
+#: data/50-mutter-navigation.xml:138
 msgid "Move to workspace below"
 msgstr "Przeniesienie na dolny obszar roboczy"
 
-#: ../data/50-mutter-system.xml.in.h:1
+#: data/50-mutter-system.xml:6
 msgid "System"
 msgstr "System"
 
-#: ../data/50-mutter-system.xml.in.h:2
+#: data/50-mutter-system.xml:8
 msgid "Show the run command prompt"
 msgstr "Wyświetlenie okna wykonania polecenia"
 
-#: ../data/50-mutter-system.xml.in.h:3
+#: data/50-mutter-system.xml:10
 msgid "Show the activities overview"
 msgstr "Wyświetlenie podglądu aktywności"
 
-#: ../data/50-mutter-windows.xml.in.h:1
+#: data/50-mutter-windows.xml:6
 msgid "Windows"
 msgstr "Okna"
 
-#: ../data/50-mutter-windows.xml.in.h:2
+#: data/50-mutter-windows.xml:8
 msgid "Activate the window menu"
 msgstr "Otwarcie menu okna"
 
-#: ../data/50-mutter-windows.xml.in.h:3
+#: data/50-mutter-windows.xml:10
 msgid "Toggle fullscreen mode"
 msgstr "Przełączenie trybu pełnoekranowego"
 
-#: ../data/50-mutter-windows.xml.in.h:4
+#: data/50-mutter-windows.xml:12
 msgid "Toggle maximization state"
 msgstr "Przełączenie stanu maksymalizacji"
 
-#: ../data/50-mutter-windows.xml.in.h:5
+#: data/50-mutter-windows.xml:14
 msgid "Maximize window"
 msgstr "Maksymalizacja okna"
 
-#: ../data/50-mutter-windows.xml.in.h:6
+#: data/50-mutter-windows.xml:16
 msgid "Restore window"
 msgstr "Przywrócenie okna"
 
-#: ../data/50-mutter-windows.xml.in.h:7
+#: data/50-mutter-windows.xml:18
 msgid "Toggle shaded state"
 msgstr "Przełączenie trybu zwinięcia"
 
-#: ../data/50-mutter-windows.xml.in.h:8
+#: data/50-mutter-windows.xml:20
 msgid "Close window"
 msgstr "Zamknięcie okna"
 
-#: ../data/50-mutter-windows.xml.in.h:9
+#: data/50-mutter-windows.xml:22
 msgid "Hide window"
 msgstr "Ukrycie okna"
 
-#: ../data/50-mutter-windows.xml.in.h:10
+#: data/50-mutter-windows.xml:24
 msgid "Move window"
 msgstr "Przeniesienie okna"
 
-#: ../data/50-mutter-windows.xml.in.h:11
+#: data/50-mutter-windows.xml:26
 msgid "Resize window"
 msgstr "Zmiana rozmiaru okna"
 
-#: ../data/50-mutter-windows.xml.in.h:12
+#: data/50-mutter-windows.xml:29
 msgid "Toggle window on all workspaces or one"
 msgstr ""
 "Przełączenie obecności okna na wszystkich obszarach roboczych lub jednym"
 
-#: ../data/50-mutter-windows.xml.in.h:13
+#: data/50-mutter-windows.xml:31
 msgid "Raise window if covered, otherwise lower it"
 msgstr ""
-"Wysunięcie okna, jeśli jest zasłonięte, odsunięcie w przeciwnym wypadku"
+"Wysunięcie okna, jeśli jest zasłonięte, odsunięcie w przeciwnym wypadku"
 
-#: ../data/50-mutter-windows.xml.in.h:14
+#: data/50-mutter-windows.xml:33
 msgid "Raise window above other windows"
 msgstr "Wysunięcie okna przed pozostałe"
 
-#: ../data/50-mutter-windows.xml.in.h:15
+#: data/50-mutter-windows.xml:35
 msgid "Lower window below other windows"
 msgstr "Odsunięcie okna pod pozostałe"
 
-#: ../data/50-mutter-windows.xml.in.h:16
+#: data/50-mutter-windows.xml:37
 msgid "Maximize window vertically"
 msgstr "Pionowa maksymalizacja okna"
 
-#: ../data/50-mutter-windows.xml.in.h:17
+#: data/50-mutter-windows.xml:39
 msgid "Maximize window horizontally"
 msgstr "Pozioma maksymalizacja okna"
 
-#: ../data/50-mutter-windows.xml.in.h:18
+#: data/50-mutter-windows.xml:43
 msgid "View split on left"
 msgstr "Podział widoku po lewej"
 
-#: ../data/50-mutter-windows.xml.in.h:19
+#: data/50-mutter-windows.xml:47
 msgid "View split on right"
 msgstr "Podział widoku po prawej"
 
-#: ../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 "Modyfikator używany do rozszerzonych działań menedżera okien"
 
-#: ../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 "
@@ -286,15 +282,15 @@ msgid ""
 "default or set to the empty string."
 msgstr ""
 "Ten klawisz inicjuje tryb „overlay” (nakładki), który jest połączeniem "
-"podglądu okien i systemu uruchamiania programów. Domyślnie jest przeznaczony "
+"podglądu okien i systemu uruchamiania programów. Domyślnie jest przeznaczony "
-"do powiązania z klawiszem „Windows” na komputerach typu PC. Ustawienie tego "
+"do powiązania z klawiszem „Windows” na komputerach typu PC. Ustawienie tego "
 "powiązania powinno być domyślne lub puste."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Dołączanie modalnych okien dialogowych"
 
-#: ../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 "
@@ -302,44 +298,44 @@ msgid ""
 msgstr ""
 "Jeśli wynosi wartość „true”, to modalne okna dialogowe pojawiają się "
 "dołączone do paska tytułowego okna nadrzędnego zamiast posiadać oddzielne "
-"paski tytułowe i są przenoszone razem z nim."
+"paski tytułowe i są przenoszone razem z nim."
 
-#: ../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 ""
 "Włączenie kafelkowania przy krawędziach podczas przenoszenia okien do "
 "krawędzi ekranu"
 
-#: ../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 ""
 "Jeśli jest włączone, to przeniesienie okien do pionowych krawędzi ekranu "
-"spowoduje ich maksymalizację w pionie i zmianę rozmiaru w poziomie, aby "
+"spowoduje ich maksymalizację w pionie i zmianę rozmiaru w poziomie, aby "
 "pokryć połowę dostępnego obszaru. Przeniesienie okien na górną krawędź "
 "ekranu spowoduje ich całkowitą maksymalizację."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Dynamiczne zarządzanie obszarami roboczymi"
 
-#: ../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)."
 msgstr ""
 "Określa, czy obszary robocze są zarządzane dynamicznie, czy istnieje "
-"statyczna liczba obszarów (określona przez klucz „num-workspaces” w „org."
+"statyczna liczba obszarów (określona przez klucz „num-workspaces” w „org."
 "gnome.desktop.wm.preferences”)."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Obszary robocze tylko na pierwszym monitorze"
 
-#: ../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."
@@ -347,11 +343,11 @@ msgstr ""
 "Określa, czy przełączanie obszarów roboczych powinno być wykonywane dla "
 "okien na wszystkich monitorach, czy tylko dla okien na pierwszym monitorze."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "Bez wyskakującego okna dla tabulacji"
 
-#: ../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."
@@ -359,25 +355,25 @@ msgstr ""
 "Określa, czy wyłączyć użycie wyskakującej, wyróżnionej ramki podczas "
 "przełączania między oknami."
 
-#: ../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 "Opóźnienie zmian aktywności do zatrzymania ruchu kursora"
 
-#: ../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."
 msgstr ""
-"Jeśli jest ustawione na wartość „true”, a tryb aktywności to „sloppy” lub "
+"Jeśli jest ustawione na wartość „true”, a tryb aktywności to „sloppy” lub "
 "„mouse”, to aktywność nie będzie zmieniana od razu po przejściu do okna, ale "
 "dopiero po zatrzymaniu ruchu kursora."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Szerokość krawędzi możliwej do przenoszenia"
 
-#: ../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."
@@ -386,25 +382,25 @@ msgstr ""
 "krawędzie motywu nie są dostateczne, to zostaną dodane niewidoczne "
 "krawędzie, aby spełnić tę wartość."
 
-#: ../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 ""
-"Automatyczne maksymalizowanie okien o rozmiarze zbliżonym do rozmiaru "
+"Automatyczne maksymalizowanie okien o rozmiarze zbliżonym do rozmiaru "
 "monitora"
 
-#: ../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 ""
-"Jeśli jest włączone, to nowe okna o początkowym rozmiarze zbliżonym do "
+"Jeśli jest włączone, to nowe okna o początkowym rozmiarze zbliżonym do "
 "rozmiaru monitora zostają automatycznie maksymalizowane."
 
-#: ../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 "Umieszczanie nowych okien na środku"
 
-#: ../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."
@@ -412,85 +408,93 @@ 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.h:21
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
-msgstr "Wybór okna z wyskakującego okna dla tabulacji"
+msgstr "Wybór okna z wyskakującego okna dla tabulacji"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Anulowanie wyskakującego okna dla tabulacji"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Przełączenie na 1. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 2. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 3. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 4. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 5. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 6. konsolę wirtualną"
 
-#: ../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 "Przełączenie na 7. konsolę wirtualną"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Przełączenie na 8. konsolę wirtualną"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Przełączenie na 9. konsolę wirtualną"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Przełączenie na 10. konsolę wirtualną"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Przełączenie na 11. konsolę wirtualną"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Przełączenie na 12. konsolę wirtualną"
 
-#: ../src/backends/meta-monitor-manager.c:518
+#: src/backends/meta-input-settings.c:1707
+msgid "Switch monitor"
+msgstr "Przełączenie monitora"
+
+#: src/backends/meta-input-settings.c:1709
+msgid "Show on-screen help"
+msgstr "Wyświetlenie pomocy na ekranie"
+
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Wbudowany ekran"
 
-#: ../src/backends/meta-monitor-manager.c:544
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../src/backends/meta-monitor-manager.c:546
+#: src/backends/meta-monitor-manager.c:539
 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:554
+#: src/backends/meta-monitor-manager.c:547
 #, 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:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -498,75 +502,75 @@ msgid ""
 msgstr ""
 "Inny menedżer składania jest już uruchomiony na podekranie %i ekranu „%s”."
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Zdarzenie sygnału dźwiękowego"
 
-#: ../src/core/delete.c:127
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "Okno „%s” nie odpowiada."
 
-#: ../src/core/delete.c:129
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "Program nie odpowiada."
 
-#: ../src/core/delete.c:134
+#: 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
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Czekaj"
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Zakończ"
 
-#: ../src/core/display.c:555
+#: src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
-msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
+msgstr "Otwarcie połączenia z ekranem „%s” systemu X Window się nie powiodło\n"
 
-#: ../src/core/main.c:181
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
-msgstr "Rozłącza połączenie z menedżerem sesji"
+msgstr "Rozłącza połączenie z menedżerem sesji"
 
-#: ../src/core/main.c:187
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Zastępuje uruchomionego menedżera okien"
 
-#: ../src/core/main.c:193
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Podaje identyfikator zarządzania sesją"
 
-#: ../src/core/main.c:198
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Używany ekran X"
 
-#: ../src/core/main.c:204
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
-msgstr "Inicjuje sesję z zapisanego pliku"
+msgstr "Inicjuje sesję z zapisanego pliku"
 
-#: ../src/core/main.c:210
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Synchroniczne wywołania X"
 
-#: ../src/core/main.c:217
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Uruchamia jako menedżer składania Wayland"
 
-#: ../src/core/main.c:223
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Uruchamia jako osadzony menedżer składania"
 
-#: ../src/core/main.c:231
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Uruchamia jako pełny serwer wyświetlania zamiast osadzonego"
 
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -582,20 +586,20 @@ msgstr ""
 "Na program nie udziela się ŻADNYCH GWARANCJI, nawet domyślnej gwarancji\n"
 "PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Wyświetla wersję"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Używana wtyczka menedżera Mutter"
 
-#: ../src/core/prefs.c:1997
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "%d. obszar roboczy"
 
-#: ../src/core/screen.c:521
+#: src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -604,17 +608,22 @@ msgstr ""
 "Na ekranie „%s” działa już menedżer okien. Aby zastąpić działającego "
 "menedżera okien, należy użyć opcji „--replace”."
 
-#: ../src/core/screen.c:603
+#: src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "Podekran %d ekranu „%s” jest nieprawidłowy\n"
 
-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr ""
-"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
+"Menedżer Mutter został skompilowany bez obsługi trybu z obszerną informacją\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:595
+#, c-format
+msgid "Mode Switch: Mode %d"
+msgstr "Przełącznik trybu: tryb %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."
@@ -622,7 +631,7 @@ msgstr ""
 "Te okna nie obsługują opcji zapisu obecnego stanu („save current setup”), "
 "więc przy następnym zalogowaniu będą musiały zostać uruchomione ręcznie."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:548
 #, c-format
 msgid "%s (on %s)"
 msgstr "%s (na %s)"

po/pt_BR.po

@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation of mutter.
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2016 Free Software Foundation, Inc.
 # This file is distributed under the same license as the mutter package.
 # Sun G11n <gnome_int_l10n@ireland.sun.com>, 2002.
 # Evandro Fernandes Giovanini <evandrofg@ig.com.br>, 2002, 2003, 2006.
@@ -14,279 +14,35 @@
 # Antonio Fernandes C. Neto <fernandes@pelivre.org>, 2010.
 # Rodrigo Padula de Oliveira <contato@rodrigopadula.com>, 2011.
 # Rafael Ferreira <rafael.f.f1@gmail.com>, 2013, 2014.
-# Enrico Nicoletto <liverig@gmail.com>, 2012, 2014.
 # Artur de Aquino Morais <artur.morais93@outlook.com>, 2016.
+# Enrico Nicoletto <liverig@gmail.com>, 2012, 2014, 2016.
 #
 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: 2016-02-25 13:40+0000\n"
+"POT-Creation-Date: 2016-08-19 21:04+0000\n"
-"PO-Revision-Date: 2016-02-25 13:41-0300\n"
+"PO-Revision-Date: 2016-08-22 18:04-0300\n"
-"Last-Translator: Artur de Aquino Morais <artur.morais93@outlook.com>\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\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 1.8.4\n"
+"X-Generator: Poedit 1.7.3\n"
 
-#: ../data/50-mutter-navigation.xml.in.h:1
+#: data/mutter.desktop.in:4
-msgid "Navigation"
-msgstr "Navegação"
-
-#: ../data/50-mutter-navigation.xml.in.h:2
-msgid "Move window to workspace 1"
-msgstr "Mover a janela para o espaço de trabalho 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:3
-msgid "Move window to workspace 2"
-msgstr "Mover a janela para o espaço de trabalho 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:4
-msgid "Move window to workspace 3"
-msgstr "Mover a janela para o espaço de trabalho 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:5
-msgid "Move window to workspace 4"
-msgstr "Mover a janela para o espaço de trabalho 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:6
-msgid "Move window to last workspace"
-msgstr "Mover a janela para o último espaço de trabalho"
-
-#: ../data/50-mutter-navigation.xml.in.h:7
-msgid "Move window one workspace to the left"
-msgstr "Mover a janela um espaço de trabalho à esquerda"
-
-#: ../data/50-mutter-navigation.xml.in.h:8
-msgid "Move window one workspace to the right"
-msgstr "Mover a janela um espaço de trabalho à direita"
-
-#: ../data/50-mutter-navigation.xml.in.h:9
-msgid "Move window one workspace up"
-msgstr "Mover a janela um espaço de trabalho acima"
-
-#: ../data/50-mutter-navigation.xml.in.h:10
-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.in.h:11
-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.in.h:12
-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.in.h:13
-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.in.h:14
-msgid "Move window one monitor down"
-msgstr "Mover janela para o monitor abaixo"
-
-#: ../data/50-mutter-navigation.xml.in.h:15
-msgid "Switch applications"
-msgstr "Alternar aplicativos"
-
-#: ../data/50-mutter-navigation.xml.in.h:16
-msgid "Switch to previous application"
-msgstr "Alternar para o aplicativo anterior"
-
-#: ../data/50-mutter-navigation.xml.in.h:17
-msgid "Switch windows"
-msgstr "Alternar janelas"
-
-#: ../data/50-mutter-navigation.xml.in.h:18
-msgid "Switch to previous window"
-msgstr "Alternar para a janela anterior"
-
-#: ../data/50-mutter-navigation.xml.in.h:19
-msgid "Switch windows of an application"
-msgstr "Alternar as janelas de um aplicativo"
-
-#: ../data/50-mutter-navigation.xml.in.h:20
-msgid "Switch to previous window of an application"
-msgstr "Alternar para a janela anterior de um aplicativo"
-
-#: ../data/50-mutter-navigation.xml.in.h:21
-msgid "Switch system controls"
-msgstr "Alternar os controles de sistema"
-
-#: ../data/50-mutter-navigation.xml.in.h:22
-msgid "Switch to previous system control"
-msgstr "Alternar para o controle de sistema anterior"
-
-#: ../data/50-mutter-navigation.xml.in.h:23
-msgid "Switch windows directly"
-msgstr "Alternar as janelas diretamente"
-
-#: ../data/50-mutter-navigation.xml.in.h:24
-msgid "Switch directly to previous window"
-msgstr "Alternar diretamente para a janela anterior"
-
-#: ../data/50-mutter-navigation.xml.in.h:25
-msgid "Switch windows of an app directly"
-msgstr "Alternar as janelas de um aplicativo diretamente"
-
-#: ../data/50-mutter-navigation.xml.in.h:26
-msgid "Switch directly to previous window of an app"
-msgstr "Alternar diretamente para a janela anterior de um aplicativo"
-
-#: ../data/50-mutter-navigation.xml.in.h:27
-msgid "Switch system controls directly"
-msgstr "Alternar os controles de sistema diretamente"
-
-#: ../data/50-mutter-navigation.xml.in.h:28
-msgid "Switch directly to previous system control"
-msgstr "Alternar diretamente para o controle de sistema anterior"
-
-#: ../data/50-mutter-navigation.xml.in.h:29
-msgid "Hide all normal windows"
-msgstr "Ocultar todas as janelas normais"
-
-#: ../data/50-mutter-navigation.xml.in.h:30
-msgid "Switch to workspace 1"
-msgstr "Trocar para o espaço de trabalho 1"
-
-#: ../data/50-mutter-navigation.xml.in.h:31
-msgid "Switch to workspace 2"
-msgstr "Trocar para o espaço de trabalho 2"
-
-#: ../data/50-mutter-navigation.xml.in.h:32
-msgid "Switch to workspace 3"
-msgstr "Trocar para o espaço de trabalho 3"
-
-#: ../data/50-mutter-navigation.xml.in.h:33
-msgid "Switch to workspace 4"
-msgstr "Trocar para o espaço de trabalho 4"
-
-#: ../data/50-mutter-navigation.xml.in.h:34
-msgid "Switch to last workspace"
-msgstr "Trocar para o último espaço de trabalho"
-
-#: ../data/50-mutter-navigation.xml.in.h:35
-msgid "Move to workspace left"
-msgstr "Move para o espaço de trabalho à esquerda"
-
-#: ../data/50-mutter-navigation.xml.in.h:36
-msgid "Move to workspace right"
-msgstr "Move para o espaço de trabalho à direita"
-
-#: ../data/50-mutter-navigation.xml.in.h:37
-msgid "Move to workspace above"
-msgstr "Mover para o espaço de trabalho acima"
-
-#: ../data/50-mutter-navigation.xml.in.h:38
-msgid "Move to workspace below"
-msgstr "Mover para o espaço de trabalho abaixo"
-
-#: ../data/50-mutter-system.xml.in.h:1
-msgid "System"
-msgstr "Sistema"
-
-#: ../data/50-mutter-system.xml.in.h:2
-msgid "Show the run command prompt"
-msgstr "Mostrar o prompt de comando de execução"
-
-#: ../data/50-mutter-system.xml.in.h:3
-msgid "Show the activities overview"
-msgstr "Mostrar o panorama de atividades"
-
-#: ../data/50-mutter-windows.xml.in.h:1
-msgid "Windows"
-msgstr "Janelas"
-
-#: ../data/50-mutter-windows.xml.in.h:2
-msgid "Activate the window menu"
-msgstr "Ativar o menu da janela"
-
-#: ../data/50-mutter-windows.xml.in.h:3
-msgid "Toggle fullscreen mode"
-msgstr "Alternar modo de tela inteira"
-
-#: ../data/50-mutter-windows.xml.in.h:4
-msgid "Toggle maximization state"
-msgstr "Alternar estado de maximização"
-
-#: ../data/50-mutter-windows.xml.in.h:5
-msgid "Maximize window"
-msgstr "Maximizar a janela"
-
-#: ../data/50-mutter-windows.xml.in.h:6
-msgid "Restore window"
-msgstr "Restaurar janela"
-
-#: ../data/50-mutter-windows.xml.in.h:7
-msgid "Toggle shaded state"
-msgstr "Alternar estado sombreado"
-
-#: ../data/50-mutter-windows.xml.in.h:8
-msgid "Close window"
-msgstr "Fechar janela"
-
-#: ../data/50-mutter-windows.xml.in.h:9
-msgid "Hide window"
-msgstr "Ocultar janela"
-
-#: ../data/50-mutter-windows.xml.in.h:10
-msgid "Move window"
-msgstr "Mover janela"
-
-#: ../data/50-mutter-windows.xml.in.h:11
-msgid "Resize window"
-msgstr "Redimensionar janela"
-
-#: ../data/50-mutter-windows.xml.in.h:12
-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.in.h:13
-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.in.h:14
-msgid "Raise window above other windows"
-msgstr "Elevar a janela para frente das outras"
-
-#: ../data/50-mutter-windows.xml.in.h:15
-msgid "Lower window below other windows"
-msgstr "Colocar a janela atrás das outras"
-
-#: ../data/50-mutter-windows.xml.in.h:16
-msgid "Maximize window vertically"
-msgstr "Maximizar a janela verticalmente"
-
-#: ../data/50-mutter-windows.xml.in.h:17
-msgid "Maximize window horizontally"
-msgstr "Maximizar a janela horizontalmente"
-
-#: ../data/50-mutter-windows.xml.in.h:18
-msgid "View split on left"
-msgstr "Visualizar divisão à esquerda"
-
-#: ../data/50-mutter-windows.xml.in.h:19
-msgid "View split on right"
-msgstr "Visualizar divisão à direita"
-
-#: ../data/mutter.desktop.in.h:1
 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 ""
 "Modificador a ser usado para operações de gerenciamento de janelas extendido."
 
-#: ../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 "
@@ -298,11 +54,11 @@ msgstr ""
 "\"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.h:3
+#: data/org.gnome.mutter.gschema.xml.in:20
 msgid "Attach modal dialogs"
 msgstr "Anexar diálogos modais"
 
-#: ../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 "
@@ -312,12 +68,12 @@ msgstr ""
 "diálogos modais surgem anexados à barra de título da janela pai e são "
 "movidos juntamente com a janela pai."
 
-#: ../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 ""
 "Habilitar contorno ladrilhado ao arrastar janelas sobre as bordas da tela"
 
-#: ../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 "
@@ -328,11 +84,11 @@ msgstr ""
 "metade da área disponível. Arrastar janelas no topo da borda da tela as "
 "maximiza completamente."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:7
+#: data/org.gnome.mutter.gschema.xml.in:40
 msgid "Workspaces are managed dynamically"
 msgstr "Áreas de trabalho são gerenciadas dinamicamente"
 
-#: ../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."
@@ -342,11 +98,11 @@ msgstr ""
 "um número estático de áreas de trabalho (determinado pela chave num-"
 "workspaces em org.gnome.desktop.wm.preferences)."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:9
+#: data/org.gnome.mutter.gschema.xml.in:50
 msgid "Workspaces only on primary"
 msgstr "Áreas de trabalho apenas para a principal"
 
-#: ../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."
@@ -354,11 +110,11 @@ msgstr ""
 "Determina se a troca de área de trabalho deve ocorrer para janelas em todos "
 "os monitores ou apenas para janelas no monitor principal."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:11
+#: data/org.gnome.mutter.gschema.xml.in:59
 msgid "No tab popup"
 msgstr "Nenhuma aba instantânea"
 
-#: ../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."
@@ -366,11 +122,11 @@ msgstr ""
 "Determina se a utilização de quadros instantâneos e destacados devem ser "
 "desabilitados na alternância de janelas."
 
-#: ../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 "Atrasar alterações de foco até que o ponteiro pare de mover"
 
-#: ../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 "
@@ -380,11 +136,11 @@ msgstr ""
 "alterado imediatamente quando o ponteiro do mouse entrar na janela, e sim "
 "quando parar de mover."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:15
+#: data/org.gnome.mutter.gschema.xml.in:79
 msgid "Draggable border width"
 msgstr "Largura da borda arrastável"
 
-#: ../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."
@@ -393,11 +149,11 @@ msgstr ""
 "não são suficientes, as bordas invisíveis serão adicionadas para encontrar "
 "este valor."
 
-#: ../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 "Maximizar automaticamente janelas com tamanho próximo ao do monitor"
 
-#: ../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."
@@ -405,11 +161,11 @@ msgstr ""
 "Se habilitado, novas janelas que, ao iniciar, possuírem o tamanho do monitor "
 "serão maximizadas automaticamente."
 
-#: ../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 "Posicionar novas janelas ao centro"
 
-#: ../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."
@@ -417,85 +173,93 @@ msgstr ""
 "Quando verdadeiro, as novas janelas serão sempre colocadas no centro da tela "
 "ativa do monitor."
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:21
+#: data/org.gnome.mutter.gschema.xml.in:120
 msgid "Select window from tab popup"
 msgstr "Selecione a janela a partir da aba instantânea"
 
-#: ../data/org.gnome.mutter.gschema.xml.in.h:22
+#: data/org.gnome.mutter.gschema.xml.in:125
 msgid "Cancel tab popup"
 msgstr "Cancelar aba instantânea"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:1
+#: data/org.gnome.mutter.wayland.gschema.xml.in:6
 msgid "Switch to VT 1"
 msgstr "Trocar para o 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 "Trocar para o 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 "Trocar para o 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 "Trocar para o 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 "Trocar para o 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 "Trocar para o 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 "Trocar para o VT 7"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:8
+#: data/org.gnome.mutter.wayland.gschema.xml.in:34
 msgid "Switch to VT 8"
 msgstr "Trocar para o VT 8"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:9
+#: data/org.gnome.mutter.wayland.gschema.xml.in:38
 msgid "Switch to VT 9"
 msgstr "Trocar para o VT 9"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:10
+#: data/org.gnome.mutter.wayland.gschema.xml.in:42
 msgid "Switch to VT 10"
 msgstr "Trocar para o VT 10"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:11
+#: data/org.gnome.mutter.wayland.gschema.xml.in:46
 msgid "Switch to VT 11"
 msgstr "Trocar para o VT 11"
 
-#: ../data/org.gnome.mutter.wayland.gschema.xml.in.h:12
+#: data/org.gnome.mutter.wayland.gschema.xml.in:50
 msgid "Switch to VT 12"
 msgstr "Trocar para o VT 12"
 
-#: ../src/backends/meta-monitor-manager.c:518
+#: src/backends/meta-input-settings.c:1707
+msgid "Switch monitor"
+msgstr "Trocar monitor"
+
+#: src/backends/meta-input-settings.c:1709
+msgid "Show on-screen help"
+msgstr "Mostrar ajuda na tela"
+
+#: src/backends/meta-monitor-manager.c:514
 msgid "Built-in display"
 msgstr "Tela embutida"
 
-#: ../src/backends/meta-monitor-manager.c:544
+#: src/backends/meta-monitor-manager.c:537
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/backends/meta-monitor-manager.c:546
+#: src/backends/meta-monitor-manager.c:539
 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:554
+#: src/backends/meta-monitor-manager.c:547
 #, 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:456
+#: src/compositor/compositor.c:463
 #, c-format
 msgid ""
 "Another compositing manager is already running on screen %i on display \"%s"
@@ -503,20 +267,20 @@ msgid ""
 msgstr ""
 "Outro compositor de janelas está em execução na tela %i na área \"%s\"."
 
-#: ../src/core/bell.c:185
+#: src/core/bell.c:194
 msgid "Bell event"
 msgstr "Evento de som"
 
-#: ../src/core/delete.c:127
+#: src/core/delete.c:127
 #, c-format
 msgid "“%s” is not responding."
 msgstr "\"%s\" não está respondendo."
 
-#: ../src/core/delete.c:129
+#: src/core/delete.c:129
 msgid "Application is not responding."
 msgstr "O aplicativo não está respondendo."
 
-#: ../src/core/delete.c:134
+#: 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."
@@ -524,56 +288,56 @@ msgstr ""
 "Você pode escolher aguardar um pouco e continuar ou forçar o aplicativo a "
 "sair completamente."
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Wait"
 msgstr "_Esperar"
 
-#: ../src/core/delete.c:141
+#: src/core/delete.c:141
 msgid "_Force Quit"
 msgstr "_Forçar sair"
 
-#: ../src/core/display.c:555
+#: src/core/display.c:590
 #, c-format
 msgid "Failed to open X Window System display '%s'\n"
 msgstr "Falha ao abrir a exibição \"%s\" do sistema de janelas X\n"
 
-#: ../src/core/main.c:181
+#: src/core/main.c:182
 msgid "Disable connection to session manager"
 msgstr "Desabilitar a conexão com o gerenciador de sessões"
 
-#: ../src/core/main.c:187
+#: src/core/main.c:188
 msgid "Replace the running window manager"
 msgstr "Substituir o gerenciador de janelas em execução"
 
-#: ../src/core/main.c:193
+#: src/core/main.c:194
 msgid "Specify session management ID"
 msgstr "Especificar o ID do gerenciador de sessões"
 
-#: ../src/core/main.c:198
+#: src/core/main.c:199
 msgid "X Display to use"
 msgstr "Exibição do X a ser utilizada"
 
-#: ../src/core/main.c:204
+#: src/core/main.c:205
 msgid "Initialize session from savefile"
 msgstr "Inicializar a sessão a partir do arquivo salvo"
 
-#: ../src/core/main.c:210
+#: src/core/main.c:211
 msgid "Make X calls synchronous"
 msgstr "Fazer X chamadas síncronas"
 
-#: ../src/core/main.c:217
+#: src/core/main.c:218
 msgid "Run as a wayland compositor"
 msgstr "Executar como um compositor wayland"
 
-#: ../src/core/main.c:223
+#: src/core/main.c:224
 msgid "Run as a nested compositor"
 msgstr "Executar como um compositor aninhado"
 
-#: ../src/core/main.c:231
+#: src/core/main.c:232
 msgid "Run as a full display server, rather than nested"
 msgstr "Executar como um servidor de tela cheia, ao invés de aninhado"
 
-#: ../src/core/mutter.c:39
+#: src/core/mutter.c:39
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -589,20 +353,20 @@ msgstr ""
 "Não há NENHUMA garantia; nem mesmo para a COMERCIALIZAÇÃO ou ADEQUAÇÃO\n"
 "PARA UM PROPÓSITO PARTICULAR.\n"
 
-#: ../src/core/mutter.c:53
+#: src/core/mutter.c:53
 msgid "Print version"
 msgstr "Versão impressa"
 
-#: ../src/core/mutter.c:59
+#: src/core/mutter.c:59
 msgid "Mutter plugin to use"
 msgstr "Plug-in do Mutter para usar"
 
-#: ../src/core/prefs.c:1997
+#: src/core/prefs.c:1997
 #, c-format
 msgid "Workspace %d"
 msgstr "Espaço de trabalho %d"
 
-#: ../src/core/screen.c:521
+#: src/core/screen.c:521
 #, c-format
 msgid ""
 "Display \"%s\" already has a window manager; try using the --replace option "
@@ -611,16 +375,21 @@ msgstr ""
 "A exibição \"%s\" já possui um gerenciador de janelas; tente usar a opção --"
 "replace para substituir o gerenciador de janelas atual."
 
-#: ../src/core/screen.c:603
+#: src/core/screen.c:606
 #, c-format
 msgid "Screen %d on display '%s' is invalid\n"
 msgstr "A tela %d na exibição \"%s\" é inválida\n"
 
-#: ../src/core/util.c:118
+#: src/core/util.c:120
 msgid "Mutter was compiled without support for verbose mode\n"
 msgstr "O Mutter foi compilado sem suporte para modo detalhado\n"
 
-#: ../src/x11/session.c:1815
+#: src/wayland/meta-wayland-tablet-pad.c:595
+#, c-format
+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."
@@ -629,11 +398,192 @@ msgstr ""
 "atual&quot; e precisarão ser reiniciadas manualmente quando você reiniciar a "
 "sessão."
 
-#: ../src/x11/window-props.c:549
+#: src/x11/window-props.c:548
 #, c-format
 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 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"
 

src/Makefile.am

@@ -69,6 +69,8 @@ mutter_built_sources += \
 	pointer-constraints-unstable-v1-server-protocol.h		\
 	tablet-unstable-v2-protocol.c					\
 	tablet-unstable-v2-server-protocol.h				\
+	xdg-foreign-unstable-v1-protocol.c				\
+	xdg-foreign-unstable-v1-server-protocol.h			\
 	$(NULL)
 endif
 
@@ -337,6 +339,8 @@ libmutter_la_SOURCES +=				\
 	wayland/meta-wayland-versions.h		\
 	wayland/meta-wayland-outputs.c		\
 	wayland/meta-wayland-outputs.h		\
+	wayland/meta-wayland-xdg-foreign.c     	\
+	wayland/meta-wayland-xdg-foreign.h     	\
 	wayland/meta-window-wayland.c		\
 	wayland/meta-window-wayland.h		\
 	wayland/meta-wayland-xdg-shell.c	\

src/backends/meta-input-settings.c

@@ -1247,8 +1247,8 @@ apply_device_settings (MetaInputSettings  *input_settings,
   update_touchpad_left_handed (input_settings, device);
   update_touchpad_tap_enabled (input_settings, device);
   update_touchpad_send_events (input_settings, device);
-  update_touchpad_edge_scroll (input_settings, device);
   update_touchpad_two_finger_scroll (input_settings, device);
+  update_touchpad_edge_scroll (input_settings, device);
   update_touchpad_click_method (input_settings, device);
 
   update_trackball_scroll_button (input_settings, device);

src/backends/meta-renderer-view.c

@@ -27,6 +27,7 @@ enum
   PROP_0,
 
   PROP_MONITOR_INFO,
+  PROP_TRANSFORM,
 
   PROP_LAST
 };
@@ -37,6 +38,7 @@ struct _MetaRendererView
 {
   ClutterStageViewCogl parent;
 
+  MetaMonitorTransform transform;
   MetaMonitorInfo *monitor_info;
 };
 
@@ -49,6 +51,72 @@ meta_renderer_view_get_monitor_info (MetaRendererView *view)
   return view->monitor_info;
 }
 
+static void
+meta_renderer_view_get_offscreen_transformation_matrix (ClutterStageView *view,
+                                                        CoglMatrix       *matrix)
+{
+  MetaRendererView *renderer_view = META_RENDERER_VIEW (view);
+
+  cogl_matrix_init_identity (matrix);
+
+  switch (renderer_view->transform)
+    {
+    case META_MONITOR_TRANSFORM_NORMAL:
+      break;
+    case META_MONITOR_TRANSFORM_90:
+      cogl_matrix_rotate (matrix, 90, 0, 0, 1);
+      cogl_matrix_translate (matrix, 0, -1, 0);
+      break;
+    case META_MONITOR_TRANSFORM_180:
+      cogl_matrix_rotate (matrix, 180, 0, 0, 1);
+      cogl_matrix_translate (matrix, -1, -1, 0);
+      break;
+    case META_MONITOR_TRANSFORM_270:
+      cogl_matrix_rotate (matrix, 270, 0, 0, 1);
+      cogl_matrix_translate (matrix, -1, 0, 0);
+      break;
+    case META_MONITOR_TRANSFORM_FLIPPED:
+      cogl_matrix_scale (matrix, -1, 1, 1);
+      cogl_matrix_translate (matrix, -1, 0, 0);
+      break;
+    case META_MONITOR_TRANSFORM_FLIPPED_90:
+      cogl_matrix_scale (matrix, -1, 1, 1);
+      cogl_matrix_rotate (matrix, 90, 0, 0, 1);
+      break;
+    case META_MONITOR_TRANSFORM_FLIPPED_180:
+      cogl_matrix_scale (matrix, -1, 1, 1);
+      cogl_matrix_rotate (matrix, 180, 0, 0, 1);
+      cogl_matrix_translate (matrix, 0, -1, 0);
+      break;
+    case META_MONITOR_TRANSFORM_FLIPPED_270:
+      cogl_matrix_scale (matrix, -1, 1, 1);
+      cogl_matrix_rotate (matrix, 270, 0, 0, 1);
+      cogl_matrix_translate (matrix, -1, -1, 0);
+      break;
+    }
+}
+
+static void
+meta_renderer_view_setup_offscreen_blit_pipeline (ClutterStageView *view,
+                                                  CoglPipeline     *pipeline)
+{
+  CoglMatrix matrix;
+
+  meta_renderer_view_get_offscreen_transformation_matrix (view, &matrix);
+  cogl_pipeline_set_layer_matrix (pipeline, 0, &matrix);
+}
+
+static void
+meta_renderer_view_set_transform (MetaRendererView     *view,
+                                  MetaMonitorTransform  transform)
+{
+  if (view->transform == transform)
+    return;
+
+  view->transform = transform;
+  clutter_stage_view_invalidate_offscreen_blit_pipeline (CLUTTER_STAGE_VIEW (view));
+}
+
 static void
 meta_renderer_view_get_property (GObject    *object,
                                  guint       prop_id,
@@ -62,6 +130,9 @@ meta_renderer_view_get_property (GObject    *object,
     case PROP_MONITOR_INFO:
       g_value_set_pointer (value, view->monitor_info);
       break;
+    case PROP_TRANSFORM:
+      g_value_set_uint (value, view->transform);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -81,6 +152,9 @@ meta_renderer_view_set_property (GObject      *object,
     case PROP_MONITOR_INFO:
       view->monitor_info = g_value_get_pointer (value);
       break;
+    case PROP_TRANSFORM:
+      meta_renderer_view_set_transform (view, g_value_get_uint (value));
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -96,6 +170,12 @@ static void
 meta_renderer_view_class_init (MetaRendererViewClass *klass)
 {
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
+  ClutterStageViewClass *view_class = CLUTTER_STAGE_VIEW_CLASS (klass);
+
+  view_class->setup_offscreen_blit_pipeline =
+    meta_renderer_view_setup_offscreen_blit_pipeline;
+  view_class->get_offscreen_transformation_matrix =
+    meta_renderer_view_get_offscreen_transformation_matrix;
 
   object_class->get_property = meta_renderer_view_get_property;
   object_class->set_property = meta_renderer_view_set_property;
@@ -105,7 +185,18 @@ meta_renderer_view_class_init (MetaRendererViewClass *klass)
                           "MetaMonitorInfo",
                           "The monitor info of the view",
                           G_PARAM_READWRITE |
+                          G_PARAM_STATIC_STRINGS |
                           G_PARAM_CONSTRUCT_ONLY);
+  obj_props[PROP_TRANSFORM] =
+    g_param_spec_uint ("transform",
+                       "Transform",
+                       "Transform to apply to the view",
+                       META_MONITOR_TRANSFORM_NORMAL,
+                       META_MONITOR_TRANSFORM_FLIPPED_270,
+                       META_MONITOR_TRANSFORM_NORMAL,
+                       G_PARAM_READWRITE |
+                       G_PARAM_CONSTRUCT_ONLY |
+                       G_PARAM_STATIC_STRINGS);
 
   g_object_class_install_properties (object_class, PROP_LAST, obj_props);
 }

src/backends/native/meta-monitor-manager-kms.c

@@ -46,6 +46,7 @@
 #include <gudev/gudev.h>
 
 #define ALL_TRANSFORMS (META_MONITOR_TRANSFORM_FLIPPED_270 + 1)
+#define ALL_TRANSFORMS_MASK ((1 << ALL_TRANSFORMS) - 1)
 
 typedef struct {
   drmModeConnector *connector;
@@ -77,6 +78,7 @@ typedef struct {
   uint32_t primary_plane_id;
   uint32_t rotation_prop_id;
   uint32_t rotation_map[ALL_TRANSFORMS];
+  uint32_t all_hw_transforms;
 } MetaCRTCKms;
 
 typedef struct
@@ -530,7 +532,7 @@ parse_transforms (MetaMonitorManager *manager,
 
       if (cur != -1)
         {
-          crtc->all_transforms |= 1 << cur;
+          crtc_kms->all_hw_transforms |= 1 << cur;
           crtc_kms->rotation_map[cur] = 1 << prop->enums[i].value;
         }
     }
@@ -606,6 +608,8 @@ init_crtc_rotations (MetaMonitorManager *manager,
       drmModeFreePlane (drm_plane);
     }
 
+  crtc->all_transforms |= crtc_kms->all_hw_transforms;
+
   drmModeFreePlaneResources (planes);
 }
 
@@ -623,8 +627,8 @@ init_crtc (MetaCRTC           *crtc,
   crtc->rect.height = drm_crtc->height;
   crtc->is_dirty = FALSE;
   crtc->transform = META_MONITOR_TRANSFORM_NORMAL;
-  /* FIXME: implement! */
+  crtc->all_transforms = meta_is_stage_views_enabled () ?
-  crtc->all_transforms = 1 << META_MONITOR_TRANSFORM_NORMAL;
+    ALL_TRANSFORMS_MASK : META_MONITOR_TRANSFORM_NORMAL;
 
   if (drm_crtc->mode_valid)
     {
@@ -1184,6 +1188,7 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
       MetaCRTCInfo *crtc_info = crtcs[i];
       MetaCRTC *crtc = crtc_info->crtc;
       MetaCRTCKms *crtc_kms = crtc->driver_private;
+      MetaMonitorTransform hw_transform;
 
       crtc->is_dirty = TRUE;
 
@@ -1234,14 +1239,17 @@ meta_monitor_manager_kms_apply_configuration (MetaMonitorManager *manager,
             }
         }
 
-      if (crtc->all_transforms & (1 << crtc->transform))
+      if (crtc_kms->all_hw_transforms & (1 << crtc->transform))
+        hw_transform = crtc->transform;
+      else
+        hw_transform = META_MONITOR_TRANSFORM_NORMAL;
+
       drmModeObjectSetProperty (manager_kms->fd,
                                 crtc_kms->primary_plane_id,
                                 DRM_MODE_OBJECT_PLANE,
                                 crtc_kms->rotation_prop_id,
-                                  crtc_kms->rotation_map[crtc->transform]);
+                                crtc_kms->rotation_map[hw_transform]);
     }
-
   /* Disable CRTCs not mentioned in the list (they have is_dirty == FALSE,
      because they weren't seen in the first loop) */
   for (i = 0; i < manager->n_crtcs; i++)
@@ -1617,3 +1625,18 @@ meta_monitor_manager_kms_class_init (MetaMonitorManagerKmsClass *klass)
   manager_class->set_crtc_gamma = meta_monitor_manager_kms_set_crtc_gamma;
 }
 
+MetaMonitorTransform
+meta_monitor_manager_kms_get_view_transform (MetaMonitorManagerKms *manager,
+                                             MetaCRTC              *crtc)
+{
+  MetaCRTCKms *crtc_kms;
+
+  crtc_kms = crtc->driver_private;
+  if ((1 << crtc->transform) & crtc_kms->all_hw_transforms)
+    {
+      /* Transform is managed by the hardware, the view is untransformed */
+      return META_MONITOR_TRANSFORM_NORMAL;
+    }
+
+  return crtc->transform;
+}

src/backends/native/meta-monitor-manager-kms.h

@@ -57,4 +57,9 @@ gboolean meta_monitor_manager_kms_flip_crtc (MetaMonitorManagerKms *manager_kms,
 
 void meta_monitor_manager_kms_wait_for_flip (MetaMonitorManagerKms *manager_kms);
 
+MetaMonitorTransform
+meta_monitor_manager_kms_get_view_transform (MetaMonitorManagerKms *manager,
+                                             MetaCRTC              *crtc);
+
+
 #endif /* META_MONITOR_MANAGER_KMS_H */

src/backends/native/meta-renderer-native.c

@@ -379,7 +379,7 @@ on_crtc_flipped (GClosure         *closure,
 {
   ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view);
   CoglFramebuffer *framebuffer =
-    clutter_stage_view_get_framebuffer (stage_view);
+    clutter_stage_view_get_onscreen (stage_view);
   CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
   CoglOnscreenEGL *egl_onscreen =  onscreen->winsys;
   MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -397,7 +397,7 @@ flip_closure_destroyed (MetaRendererView *view)
 {
   ClutterStageView *stage_view = CLUTTER_STAGE_VIEW (view);
   CoglFramebuffer *framebuffer =
-    clutter_stage_view_get_framebuffer (stage_view);
+    clutter_stage_view_get_onscreen (stage_view);
   CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
   CoglOnscreenEGL *egl_onscreen =  onscreen->winsys;
   MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -589,8 +589,6 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
   CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
   MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
   CoglFrameInfo *frame_info;
-  MetaRendererView *view;
-  cairo_rectangle_int_t view_layout;
   uint32_t handle, stride;
 
   frame_info = g_queue_peek_tail (&onscreen->pending_frame_infos);
@@ -600,9 +598,6 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
   while (onscreen_native->next_fb_id != 0)
     meta_monitor_manager_kms_wait_for_flip (monitor_manager_kms);
 
-  view = onscreen_native->view;
-  clutter_stage_view_get_layout (CLUTTER_STAGE_VIEW (view), &view_layout);
-
   parent_vtable->onscreen_swap_buffers_with_damage (onscreen,
                                                     rectangles,
                                                     n_rectangles);
@@ -615,8 +610,8 @@ meta_onscreen_native_swap_buffers_with_damage (CoglOnscreen *onscreen,
   handle = gbm_bo_get_handle (onscreen_native->next_bo).u32;
 
   if (drmModeAddFB (renderer_native->kms_fd,
-                    view_layout.width,
+                    cogl_framebuffer_get_width (COGL_FRAMEBUFFER (onscreen)),
-                    view_layout.height,
+                    cogl_framebuffer_get_height (COGL_FRAMEBUFFER (onscreen)),
                     24, /* depth */
                     32, /* bpp */
                     stride,
@@ -751,17 +746,11 @@ meta_renderer_native_init_onscreen (CoglOnscreen *onscreen,
   if (width == 0 || height == 0)
     return TRUE;
 
-  if (!meta_renderer_native_create_surface (renderer_native,
+  return meta_renderer_native_create_surface (renderer_native,
                                               width, height,
                                               &onscreen_native->surface,
                                               &egl_onscreen->egl_surface,
-                                            error))
+                                              error);
-    return FALSE;
-
-
-  _cogl_framebuffer_winsys_update_size (framebuffer, width, height);
-
-  return TRUE;
 }
 
 static void
@@ -834,7 +823,7 @@ meta_renderer_native_queue_modes_reset (MetaRendererNative *renderer_native)
     {
       ClutterStageView *stage_view = l->data;
       CoglFramebuffer *framebuffer =
-        clutter_stage_view_get_framebuffer (stage_view);
+        clutter_stage_view_get_onscreen (stage_view);
       CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
       CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
       MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
@@ -843,6 +832,92 @@ meta_renderer_native_queue_modes_reset (MetaRendererNative *renderer_native)
     }
 }
 
+static MetaMonitorTransform
+meta_renderer_native_get_monitor_info_transform (MetaRenderer    *renderer,
+                                                 MetaMonitorInfo *monitor_info)
+{
+  MetaBackend *backend = meta_get_backend ();
+  MetaMonitorManager *monitor_manager =
+    meta_backend_get_monitor_manager (backend);
+  MetaMonitorManagerKms *monitor_manager_kms =
+    META_MONITOR_MANAGER_KMS (monitor_manager);
+
+  g_assert (monitor_info->n_outputs > 0);
+
+  return meta_monitor_manager_kms_get_view_transform (monitor_manager_kms,
+                                                      monitor_info->outputs[0]->crtc);
+}
+
+static CoglOnscreen *
+meta_renderer_native_create_onscreen (MetaRendererNative    *renderer,
+                                      CoglContext           *context,
+                                      MetaMonitorTransform   transform,
+                                      gint                   view_width,
+                                      gint                   view_height)
+{
+  CoglOnscreen *onscreen;
+  gint width, height;
+  GError *error = NULL;
+
+  if (meta_monitor_transform_is_rotated (transform))
+    {
+      width = view_height;
+      height = view_width;
+    }
+  else
+    {
+      width = view_width;
+      height = view_height;
+    }
+
+  onscreen = cogl_onscreen_new (context, width, height);
+  cogl_onscreen_set_swap_throttled (onscreen,
+                                    _clutter_get_sync_to_vblank ());
+
+  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (onscreen), &error))
+    {
+      g_warning ("Could not create onscreen: %s", error->message);
+      cogl_object_unref (onscreen);
+      g_error_free (error);
+      return NULL;
+    }
+
+  return onscreen;
+}
+
+static CoglOffscreen *
+meta_renderer_native_create_offscreen (MetaRendererNative    *renderer,
+                                       CoglContext           *context,
+                                       MetaMonitorTransform   transform,
+                                       gint                   view_width,
+                                       gint                   view_height)
+{
+  CoglOffscreen *fb;
+  CoglTexture2D *tex;
+  GError *error = NULL;
+
+  tex = cogl_texture_2d_new_with_size (context, view_width, view_height);
+  cogl_primitive_texture_set_auto_mipmap (COGL_PRIMITIVE_TEXTURE (tex), FALSE);
+
+  if (!cogl_texture_allocate (COGL_TEXTURE (tex), &error))
+    {
+      cogl_object_unref (tex);
+      return FALSE;
+    }
+
+  fb = cogl_offscreen_new_with_texture (COGL_TEXTURE (tex));
+  cogl_object_unref (tex);
+  if (!cogl_framebuffer_allocate (COGL_FRAMEBUFFER (fb), &error))
+    {
+      g_warning ("Could not create offscreen: %s", error->message);
+      g_error_free (error);
+      cogl_object_unref (fb);
+      return FALSE;
+    }
+
+  return fb;
+}
+
 gboolean
 meta_renderer_native_set_legacy_view_size (MetaRendererNative *renderer_native,
                                            MetaRendererView   *view,
@@ -867,13 +942,14 @@ meta_renderer_native_set_legacy_view_size (MetaRendererNative *renderer_native,
       MetaMonitorManagerKms *monitor_manager_kms =
         META_MONITOR_MANAGER_KMS (monitor_manager);
       CoglFramebuffer *framebuffer =
-        clutter_stage_view_get_framebuffer (stage_view);
+        clutter_stage_view_get_onscreen (stage_view);
       CoglOnscreen *onscreen = COGL_ONSCREEN (framebuffer);
       CoglOnscreenEGL *egl_onscreen = onscreen->winsys;
       MetaOnscreenNative *onscreen_native = egl_onscreen->platform;
       CoglDisplayEGL *egl_display = cogl_display->winsys;
       struct gbm_surface *new_surface;
       EGLSurface new_egl_surface;
+      cairo_rectangle_int_t view_layout;
 
       /*
        * Ensure we don't have any pending flips that will want
@@ -920,6 +996,14 @@ meta_renderer_native_set_legacy_view_size (MetaRendererNative *renderer_native,
                                      egl_onscreen->egl_surface,
                                      egl_display->egl_context);
 
+      view_layout = (cairo_rectangle_int_t) {
+        .width = width,
+        .height = height
+      };
+      g_object_set (G_OBJECT (view),
+                    "layout", &view_layout,
+                    NULL);
+
       _cogl_framebuffer_winsys_update_size (framebuffer, width, height);
     }
 
@@ -992,13 +1076,11 @@ meta_renderer_native_create_legacy_view (MetaRendererNative *renderer_native)
   MetaBackend *backend = meta_get_backend ();
   MetaMonitorManager *monitor_manager =
     meta_backend_get_monitor_manager (backend);
-  CoglOnscreen *onscreen;
+  CoglOnscreen *onscreen = NULL;
-  CoglFramebuffer *framebuffer;
   ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
   CoglContext *cogl_context = clutter_backend_get_cogl_context (clutter_backend);
   cairo_rectangle_int_t view_layout = { 0 };
   MetaRendererView *view;
-  GError *error = NULL;
 
   if (!monitor_manager)
     return NULL;
@@ -1007,22 +1089,20 @@ meta_renderer_native_create_legacy_view (MetaRendererNative *renderer_native)
                                         &view_layout.width,
                                         &view_layout.height);
 
-  onscreen = cogl_onscreen_new (cogl_context,
+  onscreen = meta_renderer_native_create_onscreen (renderer_native,
+                                                   cogl_context,
+                                                   META_MONITOR_TRANSFORM_NORMAL,
                                                    view_layout.width,
                                                    view_layout.height);
-  cogl_onscreen_set_swap_throttled (onscreen,
-                                    _clutter_get_sync_to_vblank ());
 
-  framebuffer = COGL_FRAMEBUFFER (onscreen);
+  if (!onscreen)
-  if (!cogl_framebuffer_allocate (framebuffer, &error))
+    meta_fatal ("Failed to allocate onscreen framebuffer\n");
-    meta_fatal ("Failed to allocate onscreen framebuffer: %s\n",
-                error->message);
 
   view = g_object_new (META_TYPE_RENDERER_VIEW,
                        "layout", &view_layout,
-                       "framebuffer", framebuffer,
+                       "framebuffer", onscreen,
                        NULL);
-  cogl_object_unref (framebuffer);
+  cogl_object_unref (onscreen);
 
   meta_onscreen_native_set_view (onscreen, view);
 
@@ -1036,28 +1116,52 @@ meta_renderer_native_create_view (MetaRenderer    *renderer,
   MetaBackend *backend = meta_get_backend ();
   ClutterBackend *clutter_backend = meta_backend_get_clutter_backend (backend);
   CoglContext *cogl_context = clutter_backend_get_cogl_context (clutter_backend);
-  CoglOnscreen *onscreen;
+  CoglDisplay *cogl_display = cogl_context_get_display (cogl_context);
-  CoglFramebuffer *framebuffer;
+  CoglDisplayEGL *egl_display = cogl_display->winsys;
+  CoglOnscreenEGL *egl_onscreen;
+  MetaMonitorTransform transform;
+  CoglOnscreen *onscreen = NULL;
+  CoglOffscreen *offscreen = NULL;
   MetaRendererView *view;
-  GError *error = NULL;
 
-  onscreen = cogl_onscreen_new (cogl_context,
+  transform = meta_renderer_native_get_monitor_info_transform (renderer,
+                                                               monitor_info);
+
+  onscreen = meta_renderer_native_create_onscreen (META_RENDERER_NATIVE (renderer),
+                                                   cogl_context,
+                                                   transform,
                                                    monitor_info->rect.width,
                                                    monitor_info->rect.height);
-  cogl_onscreen_set_swap_throttled (onscreen,
+  if (!onscreen)
-                                    _clutter_get_sync_to_vblank ());
+    meta_fatal ("Failed to allocate onscreen framebuffer\n");
 
-  framebuffer = COGL_FRAMEBUFFER (onscreen);
+  /* Ensure we don't point to stale surfaces when creating the offscreen */
-  if (!cogl_framebuffer_allocate (framebuffer, &error))
+  egl_onscreen = onscreen->winsys;
-    meta_fatal ("Failed to allocate onscreen framebuffer: %s\n",
+  _cogl_winsys_egl_make_current (cogl_display,
-                error->message);
+                                 egl_onscreen->egl_surface,
+                                 egl_onscreen->egl_surface,
+                                 egl_display->egl_context);
+
+  if (transform != META_MONITOR_TRANSFORM_NORMAL)
+    {
+      offscreen = meta_renderer_native_create_offscreen (META_RENDERER_NATIVE (renderer),
+                                                         cogl_context,
+                                                         transform,
+                                                         monitor_info->rect.width,
+                                                         monitor_info->rect.height);
+      if (!offscreen)
+        meta_fatal ("Failed to allocate back buffer texture\n");
+    }
 
   view = g_object_new (META_TYPE_RENDERER_VIEW,
                        "layout", &monitor_info->rect,
-                       "framebuffer", framebuffer,
+                       "framebuffer", onscreen,
+                       "offscreen", offscreen,
                        "monitor-info", monitor_info,
+                       "transform", transform,
                        NULL);
-  cogl_object_unref (framebuffer);
+  cogl_object_unref (onscreen);
+  g_clear_pointer (&offscreen, cogl_object_unref);
 
   meta_onscreen_native_set_view (onscreen, view);
 

src/backends/native/meta-stage-native.c

@@ -127,7 +127,7 @@ ensure_frame_callback (MetaStageNative  *stage_native,
   if (closure)
     return;
 
-  framebuffer = clutter_stage_view_get_framebuffer (stage_view);
+  framebuffer = clutter_stage_view_get_onscreen (stage_view);
   onscreen = COGL_ONSCREEN (framebuffer);
   closure = cogl_onscreen_add_frame_callback (onscreen,
                                               frame_cb,
@@ -270,7 +270,6 @@ maybe_resize_legacy_view (MetaStageNative *stage_native)
   int width = stage_native->pending_width;
   int height = stage_native->pending_height;
   GError *error = NULL;
-  cairo_rectangle_int_t view_layout;
 
   if (!stage_native->pending_resize)
     return;
@@ -288,16 +287,7 @@ maybe_resize_legacy_view (MetaStageNative *stage_native)
       meta_warning ("Applying display configuration failed: %s\n",
                     error->message);
       g_error_free (error);
-      return;
     }
-
-  view_layout = (cairo_rectangle_int_t) {
-    .width = width,
-    .height = height
-  };
-  g_object_set (G_OBJECT (legacy_view),
-                "layout", &view_layout,
-                NULL);
 }
 
 static void

src/wayland/meta-wayland-surface.c

@@ -120,6 +120,7 @@ G_DEFINE_TYPE (MetaWaylandSurfaceRoleDND,
 
 enum {
   SURFACE_DESTROY,
+  SURFACE_UNMAPPED,
   N_SURFACE_SIGNALS
 };
 
@@ -1100,9 +1101,14 @@ void
 meta_wayland_surface_set_window (MetaWaylandSurface *surface,
                                  MetaWindow         *window)
 {
+  gboolean was_unmapped = surface->window && !window;
+
   surface->window = window;
   sync_reactive (surface);
   sync_drag_dest_funcs (surface);
+
+  if (was_unmapped)
+    g_signal_emit (surface, surface_signals[SURFACE_UNMAPPED], 0);
 }
 
 static void
@@ -1855,6 +1861,14 @@ meta_wayland_surface_class_init (MetaWaylandSurfaceClass *klass)
                   0, NULL, NULL,
                   g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
+
+  surface_signals[SURFACE_UNMAPPED] =
+    g_signal_new ("unmapped",
+                  G_TYPE_FROM_CLASS (object_class),
+                  G_SIGNAL_RUN_LAST,
+                  0, NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
+                  G_TYPE_NONE, 0);
 }
 
 static void

src/wayland/meta-wayland-versions.h

@@ -45,5 +45,7 @@
 #define META_GTK_SHELL1_VERSION             1
 #define META_WL_SUBCOMPOSITOR_VERSION       1
 #define META_ZWP_POINTER_GESTURES_V1_VERSION    1
+#define META_ZXDG_EXPORTER_V1_VERSION       1
+#define META_ZXDG_IMPORTER_V1_VERSION       1
 
 #endif

src/wayland/meta-wayland-xdg-foreign.c

@@ -0,0 +1,464 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#include "config.h"
+
+#include "wayland/meta-wayland-xdg-foreign.h"
+
+#include <wayland-server.h>
+
+#include "wayland/meta-wayland-private.h"
+#include "wayland/meta-wayland-versions.h"
+#include "wayland/meta-wayland-xdg-shell.h"
+
+#include "xdg-foreign-unstable-v1-server-protocol.h"
+
+#define META_XDG_FOREIGN_HANDLE_LENGTH 32
+
+typedef struct _MetaWaylandXdgExported MetaWaylandXdgExported;
+typedef struct _MetaWaylandXdgImported MetaWaylandXdgImported;
+
+typedef struct _MetaWaylandXdgForeign
+{
+  MetaWaylandCompositor *compositor;
+  GRand *rand;
+
+  GHashTable *exported_surfaces;
+} MetaWaylandXdgForeign;
+
+struct _MetaWaylandXdgExported
+{
+  MetaWaylandXdgForeign *foreign;
+  struct wl_resource *resource;
+
+  MetaWaylandSurface *surface;
+  gulong surface_unmapped_handler_id;
+  char *handle;
+
+  GList *imported;
+};
+
+struct _MetaWaylandXdgImported
+{
+  MetaWaylandXdgForeign *foreign;
+  struct wl_resource *resource;
+
+  MetaWaylandSurface *parent_of;
+  gulong parent_of_unmapped_handler_id;
+
+  MetaWaylandXdgExported *exported;
+};
+
+static void
+meta_wayland_xdg_imported_destroy (MetaWaylandXdgImported *imported);
+
+static void
+xdg_exporter_destroy (struct wl_client   *client,
+                      struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static char *
+generate_handle (MetaWaylandXdgForeign *foreign)
+{
+  char *handle = g_new0 (char, META_XDG_FOREIGN_HANDLE_LENGTH + 1);
+  int i;
+
+  /*
+   * Generate a random string of printable ASCII characters.
+   */
+  for (i = 0; i < META_XDG_FOREIGN_HANDLE_LENGTH; i++)
+    handle[i] = (char) g_rand_int_range (foreign->rand, 32, 127);
+
+  return handle;
+}
+
+static void
+xdg_exported_destroy (struct wl_client   *client,
+                      struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static const struct zxdg_exported_v1_interface meta_xdg_exported_interface = {
+  xdg_exported_destroy,
+};
+
+static void
+meta_wayland_xdg_exported_destroy (MetaWaylandXdgExported *exported)
+{
+  MetaWaylandXdgForeign *foreign = exported->foreign;
+
+  while (exported->imported)
+    {
+      MetaWaylandXdgImported *imported = exported->imported->data;
+
+      zxdg_imported_v1_send_destroyed (imported->resource);
+      meta_wayland_xdg_imported_destroy (imported);
+    }
+
+  g_signal_handler_disconnect (exported->surface,
+                               exported->surface_unmapped_handler_id);
+  wl_resource_set_user_data (exported->resource, NULL);
+
+  g_hash_table_remove (foreign->exported_surfaces, exported->handle);
+
+  g_free (exported->handle);
+  g_free (exported);
+}
+
+static void
+xdg_exported_destructor (struct wl_resource *resource)
+{
+  MetaWaylandXdgExported *exported = wl_resource_get_user_data (resource);
+
+  if (exported)
+    meta_wayland_xdg_exported_destroy (exported);
+}
+
+static void
+exported_surface_unmapped (MetaWaylandSurface     *surface,
+                           MetaWaylandXdgExported *exported)
+{
+  meta_wayland_xdg_exported_destroy (exported);
+}
+
+static void
+xdg_exporter_export (struct wl_client   *client,
+                     struct wl_resource *resource,
+                     uint32_t            id,
+                     struct wl_resource *surface_resource)
+{
+  MetaWaylandXdgForeign *foreign = wl_resource_get_user_data (resource);
+  MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource);
+  struct wl_resource *xdg_exported_resource;
+  MetaWaylandXdgExported *exported;
+  char *handle;
+
+  if (!surface->role ||
+      !META_IS_WAYLAND_XDG_SURFACE (surface->role) ||
+      !surface->window)
+    {
+      wl_resource_post_error (resource,
+                              WL_DISPLAY_ERROR_INVALID_OBJECT,
+                              "exported surface had an invalid role");
+      return;
+    }
+
+  xdg_exported_resource =
+    wl_resource_create (client,
+                        &zxdg_exported_v1_interface,
+                        wl_resource_get_version (resource),
+                        id);
+  if (!xdg_exported_resource)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  exported = g_new0 (MetaWaylandXdgExported, 1);
+  exported->foreign = foreign;
+  exported->surface = surface;
+  exported->resource = xdg_exported_resource;
+
+  exported->surface_unmapped_handler_id =
+    g_signal_connect (surface, "unmapped",
+                      G_CALLBACK (exported_surface_unmapped),
+                      exported);
+
+  wl_resource_set_implementation (xdg_exported_resource,
+                                  &meta_xdg_exported_interface,
+                                  exported,
+                                  xdg_exported_destructor);
+
+  while (TRUE)
+    {
+      handle = generate_handle (foreign);
+
+      if (!g_hash_table_contains (foreign->exported_surfaces, handle))
+        {
+          g_hash_table_insert (foreign->exported_surfaces, handle, exported);
+          break;
+        }
+
+      g_free (handle);
+    }
+
+  exported->handle = handle;
+
+  zxdg_exported_v1_send_handle (xdg_exported_resource, handle);
+}
+
+static const struct zxdg_exporter_v1_interface meta_xdg_exporter_interface = {
+  xdg_exporter_destroy,
+  xdg_exporter_export,
+};
+
+static void
+bind_xdg_exporter (struct wl_client *client,
+                   void             *data,
+                   uint32_t          version,
+                   uint32_t          id)
+{
+  MetaWaylandXdgForeign *foreign = data;
+  struct wl_resource *resource;
+
+  resource = wl_resource_create (client,
+                                 &zxdg_exporter_v1_interface,
+                                 META_ZXDG_EXPORTER_V1_VERSION,
+                                 id);
+
+  if (resource == NULL)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  wl_resource_set_implementation (resource,
+                                  &meta_xdg_exporter_interface,
+                                  foreign, NULL);
+}
+
+static void
+xdg_imported_destroy (struct wl_client   *client,
+                      struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static void
+imported_parent_of_unmapped (MetaWaylandSurface     *surface,
+                             MetaWaylandXdgImported *imported)
+{
+  imported->parent_of = NULL;
+}
+
+static gboolean
+is_valid_child (MetaWaylandSurface *surface)
+{
+  if (!surface)
+    return TRUE;
+
+  if (!surface->role)
+    return FALSE;
+
+  if (!META_IS_WAYLAND_XDG_SURFACE (surface->role))
+    return FALSE;
+
+  if (!surface->window)
+    return FALSE;
+
+  return TRUE;
+}
+
+static void
+xdg_imported_set_parent_of (struct wl_client   *client,
+                            struct wl_resource *resource,
+                            struct wl_resource *surface_resource)
+{
+  MetaWaylandXdgImported *imported = wl_resource_get_user_data (resource);
+  MetaWaylandSurface *surface;
+
+  if (!imported)
+    return;
+
+  if (surface_resource)
+    surface = wl_resource_get_user_data (surface_resource);
+  else
+    surface = NULL;
+
+  if (!is_valid_child (surface))
+    {
+      wl_resource_post_error (imported->resource,
+                              WL_DISPLAY_ERROR_INVALID_OBJECT,
+                              "set_parent_of was called with an invalid child");
+      return;
+    }
+
+  if (imported->parent_of)
+    g_signal_handler_disconnect (imported->parent_of,
+                                 imported->parent_of_unmapped_handler_id);
+
+  imported->parent_of = surface;
+
+  if (surface)
+    {
+      imported->parent_of_unmapped_handler_id =
+        g_signal_connect (surface, "unmapped",
+                          G_CALLBACK (imported_parent_of_unmapped),
+                          imported);
+      meta_window_set_transient_for (surface->window,
+                                     imported->exported->surface->window);
+    }
+}
+
+static const struct zxdg_imported_v1_interface meta_xdg_imported_interface = {
+  xdg_imported_destroy,
+  xdg_imported_set_parent_of,
+};
+
+static void
+xdg_importer_destroy (struct wl_client   *client,
+                      struct wl_resource *resource)
+{
+  wl_resource_destroy (resource);
+}
+
+static void
+meta_wayland_xdg_imported_destroy (MetaWaylandXdgImported *imported)
+{
+  MetaWaylandXdgExported *exported = imported->exported;
+
+  exported->imported = g_list_remove (exported->imported, imported);
+
+  if (imported->parent_of)
+    {
+      MetaWindow *window;
+
+      g_signal_handler_disconnect (imported->parent_of,
+                                   imported->parent_of_unmapped_handler_id);
+
+      window = imported->parent_of->window;
+      if (window)
+        meta_window_set_transient_for (window, NULL);
+    }
+
+  wl_resource_set_user_data (imported->resource, NULL);
+
+  g_free (imported);
+}
+
+static void
+xdg_imported_destructor (struct wl_resource *resource)
+{
+  MetaWaylandXdgImported *imported = wl_resource_get_user_data (resource);
+
+  if (!imported)
+    return;
+
+  meta_wayland_xdg_imported_destroy (imported);
+}
+
+static void
+xdg_importer_import (struct wl_client   *client,
+                     struct wl_resource *resource,
+                     uint32_t            id,
+                     const char         *handle)
+{
+  MetaWaylandXdgForeign *foreign = wl_resource_get_user_data (resource);
+  struct wl_resource *xdg_imported_resource;
+  MetaWaylandXdgImported *imported;
+  MetaWaylandXdgExported *exported;
+
+  xdg_imported_resource =
+    wl_resource_create (client,
+                        &zxdg_imported_v1_interface,
+                        wl_resource_get_version (resource),
+                        id);
+  if (!xdg_imported_resource)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  wl_resource_set_implementation (xdg_imported_resource,
+                                  &meta_xdg_imported_interface,
+                                  NULL,
+                                  xdg_imported_destructor);
+
+  exported = g_hash_table_lookup (foreign->exported_surfaces, handle);
+  if (!exported || !META_IS_WAYLAND_XDG_SURFACE (exported->surface->role))
+    {
+      zxdg_imported_v1_send_destroyed (resource);
+      return;
+    }
+
+  imported = g_new0 (MetaWaylandXdgImported, 1);
+  imported->foreign = foreign;
+  imported->exported = exported;
+  imported->resource = xdg_imported_resource;
+
+  wl_resource_set_user_data (xdg_imported_resource, imported);
+
+  exported->imported = g_list_prepend (exported->imported, imported);
+}
+
+static const struct zxdg_importer_v1_interface meta_xdg_importer_interface = {
+  xdg_importer_destroy,
+  xdg_importer_import,
+};
+
+static void
+bind_xdg_importer (struct wl_client *client,
+                   void             *data,
+                   uint32_t          version,
+                   uint32_t          id)
+{
+  MetaWaylandXdgForeign *foreign = data;
+  struct wl_resource *resource;
+
+  resource = wl_resource_create (client,
+                                 &zxdg_importer_v1_interface,
+                                 META_ZXDG_IMPORTER_V1_VERSION,
+                                 id);
+
+  if (resource == NULL)
+    {
+      wl_client_post_no_memory (client);
+      return;
+    }
+
+  wl_resource_set_implementation (resource,
+                                  &meta_xdg_importer_interface,
+                                  foreign,
+                                  NULL);
+}
+
+gboolean
+meta_wayland_xdg_foreign_init (MetaWaylandCompositor *compositor)
+{
+  MetaWaylandXdgForeign *foreign;
+
+  foreign = g_new0 (MetaWaylandXdgForeign, 1);
+
+  foreign->compositor = compositor;
+  foreign->rand = g_rand_new ();
+  foreign->exported_surfaces = g_hash_table_new ((GHashFunc) g_str_hash,
+                                                 (GEqualFunc) g_str_equal);
+
+  if (wl_global_create (compositor->wayland_display,
+                        &zxdg_exporter_v1_interface, 1,
+                        foreign,
+                        bind_xdg_exporter) == NULL)
+    return FALSE;
+
+  if (wl_global_create (compositor->wayland_display,
+                        &zxdg_importer_v1_interface, 1,
+                        foreign,
+                        bind_xdg_importer) == NULL)
+    return FALSE;
+
+  return TRUE;
+}

src/wayland/meta-wayland-xdg-foreign.h

@@ -0,0 +1,34 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2015 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.
+ *
+ * Written by:
+ *     Jonas Ådahl <jadahl@gmail.com>
+ */
+
+#ifndef META_WAYLAND_FOREIGN_H
+#define META_WAYLAND_FOREIGN_H
+
+#include <glib.h>
+
+#include "wayland/meta-wayland-types.h"
+
+gboolean meta_wayland_xdg_foreign_init (MetaWaylandCompositor *compositor);
+
+#endif /* META_WAYLAND_FOREIGN_H */

src/wayland/meta-wayland.c

@@ -40,6 +40,7 @@
 #include "meta-wayland-outputs.h"
 #include "meta-wayland-data-device.h"
 #include "meta-wayland-tablet-manager.h"
+#include "meta-wayland-xdg-foreign.h"
 
 static MetaWaylandCompositor _meta_wayland_compositor;
 
@@ -339,6 +340,7 @@ meta_wayland_init (void)
   meta_wayland_seat_init (compositor);
   meta_wayland_relative_pointer_init (compositor);
   meta_wayland_pointer_constraints_init (compositor);
+  meta_wayland_xdg_foreign_init (compositor);
 
   if (!meta_xwayland_start (&compositor->xwayland_manager, compositor->wayland_display))
     g_error ("Failed to start X Wayland");